missytake/fdroiddata
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Remove unused osmand patches

Browse source
This commit is contained in:
Daniel Martí 2014-07-23 20:16:06 +02:00
parent 490e9bb9a9
commit ad39f27543
3 changed files with 0 additions and 319 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

153
metadata/net.osmand.plus/analytics_165.diff
View file

@ -1,153 +0,0 @@
diff --git a/android/OsmAnd/src/net/osmand/plus/download/DownloadIndexesThread.java b/android/OsmAnd/src/net/osmand/plus/download/DownloadIndexesThread.java
index 4d2c627..9608fa7 100644
--- a/android/OsmAnd/src/net/osmand/plus/download/DownloadIndexesThread.java
+++ b/android/OsmAnd/src/net/osmand/plus/download/DownloadIndexesThread.java
@@ -238,7 +238,6 @@ public class DownloadIndexesThread {
if (entry.existingBackupFile != null) {
Algorithms.removeAllFiles(entry.existingBackupFile);
}
- trackEvent(entry);
publishProgress(entry);
}
}
@@ -296,17 +295,6 @@ public class DownloadIndexesThread {
return null;
}
- private void trackEvent(DownloadEntry entry) {
- String v = Version.getAppName(app);
- if (Version.isProductionVersion(app)) {
- v = Version.getFullVersion(app);
- } else {
- v += " test";
- }
- new DownloadTracker().trackEvent(app, v, Version.getAppName(app),
- entry.baseName, 1, app.getString(R.string.ga_api_key));
- }
-
@Override
public void showWarning(String warning) {
publishProgress(warning);
@@ -615,4 +603,4 @@ public class DownloadIndexesThread {
}
-}
\ No newline at end of file
+}
diff --git a/android/OsmAnd/src/net/osmand/plus/download/DownloadTracker.java b/android/OsmAnd/src/net/osmand/plus/download/DownloadTracker.java
deleted file mode 100644
index 843f865..0000000
--- a/android/OsmAnd/src/net/osmand/plus/download/DownloadTracker.java
+++ /dev/null
@@ -1,110 +0,0 @@
-package net.osmand.plus.download;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.net.URLEncoder;
-import java.text.MessageFormat;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Random;
-
-import net.osmand.PlatformUtil;
-import net.osmand.plus.ClientContext;
-import net.osmand.plus.Version;
-
-import org.apache.commons.logging.Log;
-
-public class DownloadTracker {
- private static final Log log = PlatformUtil.getLog(DownloadTracker.class);
-
- private Map<String, String> getCustomVars(ClientContext ctx) {
- Map<String, String> map = new LinkedHashMap<String, String>();
- map.put("App", Version.getFullVersion(ctx));
- map.put("Device", ctx.getInternalAPI().getDeviceName());
- map.put("Brand", ctx.getInternalAPI().getBrandName());
- map.put("Model", ctx.getInternalAPI().getModelName());
- map.put("Package", ctx.getInternalAPI().getPackageName());
-
- map.put("Version name", ctx.getInternalAPI().getVersionName());
- map.put("Version code", ctx.getInternalAPI().getVersionCode()+"");
- return map;
- }
-
- private String randomNumber() {
- return (new Random(System.currentTimeMillis()).nextInt(100000000) + 100000000) + "";
- }
-
- static final String beaconUrl = "http://www.google-analytics.com/__utm.gif";
- static final String analyticsVersion = "4.3"; // Analytics version - AnalyticsVersion
-
- public void trackEvent(ClientContext a,
- String category, String action, String label, int value, String trackingAcount) {
- Map<String, String> parameters = new LinkedHashMap<String, String>();
- try {
- Map<String, String> customVariables = getCustomVars(a);
- parameters.put("AnalyticsVersion", analyticsVersion);
- parameters.put("utmn", randomNumber());
- parameters.put("utmhn", "http://app.osmand.net");
- parameters.put("utmni", "1");
- parameters.put("utmt", "event");
-
- StringBuilder customVars = new StringBuilder();
- Iterator<Entry<String, String>> customs = customVariables.entrySet().iterator();
- for (int i = 0; i < customVariables.size(); i++) {
- Entry<String, String> n = customs.next();
- if (i > 0) {
- customVars.append("*");
- }
- // "'" => "'0", ')' => "'1", '*' => "'2", '!' => "'3",
- customVars.append((i + 1) + "!").append((n.getKey() + n.getValue()));
- }
-
- parameters.put("utmcs", "UTF-8");
- parameters.put("utmul", "en");
- parameters.put("utmhid", (System.currentTimeMillis() / 1000) + "");
- parameters.put("utmac", trackingAcount);
- String domainHash = "app.osmand.net".hashCode() + "";
-
- String utma = domainHash + ".";
- File fl = a.getAppPath(".nomedia");
- if (fl.exists()) {
- utma += (fl.lastModified()) + ".";
- } else {
- utma += (randomNumber()) + ".";
- }
- utma += ((System.currentTimeMillis() / 1000) + ".");
- utma += ((System.currentTimeMillis() / 1000) + ".");
- utma += ((System.currentTimeMillis() / 1000) + ".");
- utma += "1";
- parameters.put("utmcc", "__utma=" + utma + ";");
- parameters.put("utme", MessageFormat.format("5({0}*{1}*{2})({3})", category, action, label == null ? "" : label, value)
- + customVars);
-
- StringBuilder urlString = new StringBuilder(beaconUrl + "?");
- Iterator<Entry<String, String>> it = parameters.entrySet().iterator();
- while (it.hasNext()) {
- Entry<String, String> e = it.next();
- urlString.append(e.getKey()).append("=").append(URLEncoder.encode(e.getValue(), "UTF-8"));
- if (it.hasNext()) {
- urlString.append("&");
- }
- }
-
- log.debug(urlString);
- URL url = new URL(urlString.toString());
- HttpURLConnection conn = (HttpURLConnection) url.openConnection();
- conn.setConnectTimeout(5000);
- conn.setDoInput(false);
- conn.setDoOutput(false);
- conn.connect();
- log.info("Response analytics is " + conn.getResponseCode() + " " + conn.getResponseMessage());
- } catch (IOException e) {
- log.error(e.getMessage(), e);
- }
- }
-
-}

13
metadata/net.osmand.plus/osmand_enable_parking_148.diff
View file

@ -1,13 +0,0 @@
diff --git a/OsmAnd/src/net/osmand/plus/OsmandPlugin.java b/OsmAnd/src/net/osmand/plus/OsmandPlugin.java
index d0f6080..00b7d87 100644
--- a/OsmAnd/src/net/osmand/plus/OsmandPlugin.java
+++ b/OsmAnd/src/net/osmand/plus/OsmandPlugin.java
@@ -75,7 +75,7 @@ public abstract class OsmandPlugin {
installPlugin(SRTM_PLUGIN_COMPONENT, SRTMPlugin.ID, app,
new SRTMPlugin(app, false));
}
- installPlugin(PARKING_PLUGIN_COMPONENT, ParkingPositionPlugin.ID, app, new ParkingPositionPlugin(app));
+ installedPlugins.add(new ParkingPositionPlugin(app));
installPlugin(OSMODROID_PLUGIN_COMPONENT, OsMoDroidPlugin.ID, app, new OsMoDroidPlugin(app));
installedPlugins.add(new DistanceCalculatorPlugin(app));
installedPlugins.add(new AudioVideoNotesPlugin(app));

153
metadata/net.osmand.plus/remove_analytics_android_145.diff
View file

@ -1,153 +0,0 @@
diff --git a/OsmAnd/src/net/osmand/plus/download/DownloadIndexesThread.java b/OsmAnd/src/net/osmand/plus/download/DownloadIndexesThread.java
index 072fd1a..f4f7033 100644
--- a/OsmAnd/src/net/osmand/plus/download/DownloadIndexesThread.java
+++ b/OsmAnd/src/net/osmand/plus/download/DownloadIndexesThread.java
@@ -234,7 +234,6 @@ public class DownloadIndexesThread {
if (entry.existingBackupFile != null) {
Algorithms.removeAllFiles(entry.existingBackupFile);
}
- trackEvent(entry);
publishProgress(entry);
}
}
@@ -293,17 +292,6 @@ public class DownloadIndexesThread {
return null;
}
- private void trackEvent(DownloadEntry entry) {
- String v = Version.getAppName(app);
- if (Version.isProductionVersion(app)) {
- v = Version.getFullVersion(app);
- } else {
- v += " test";
- }
- new DownloadTracker().trackEvent(app, v, Version.getAppName(app),
- entry.baseName, 1, app.getString(R.string.ga_api_key));
- }
-
@Override
public void showWarning(String warning) {
publishProgress(warning);
@@ -607,4 +595,4 @@ public class DownloadIndexesThread {
}
-}
\ No newline at end of file
+}
diff --git a/OsmAnd/src/net/osmand/plus/download/DownloadTracker.java b/OsmAnd/src/net/osmand/plus/download/DownloadTracker.java
deleted file mode 100644
index e21529c..0000000
--- a/OsmAnd/src/net/osmand/plus/download/DownloadTracker.java
+++ /dev/null
@@ -1,110 +0,0 @@
-package net.osmand.plus.download;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.net.URLEncoder;
-import java.text.MessageFormat;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Random;
-
-import net.osmand.PlatformUtil;
-import net.osmand.plus.ClientContext;
-import net.osmand.plus.Version;
-
-import org.apache.commons.logging.Log;
-
-public class DownloadTracker {
- private static final Log log = PlatformUtil.getLog(DownloadTracker.class);
-
- private Map<String, String> getCustomVars(ClientContext ctx) {
- Map<String, String> map = new LinkedHashMap<String, String>();
- map.put("App", Version.getFullVersion(ctx));
- map.put("Device", ctx.getInternalAPI().getDeviceName());
- map.put("Brand", ctx.getInternalAPI().getBrandName());
- map.put("Model", ctx.getInternalAPI().getModelName());
- map.put("Package", ctx.getInternalAPI().getPackageName());
-
- map.put("Version name", ctx.getInternalAPI().getVersionName());
- map.put("Version code", ctx.getInternalAPI().getVersionCode()+"");
- return map;
- }
-
- private String randomNumber() {
- return (new Random(System.currentTimeMillis()).nextInt(100000000) + 100000000) + "";
- }
-
- final String beaconUrl = "http://www.google-analytics.com/__utm.gif";
- final String analyticsVersion = "4.3"; // Analytics version - AnalyticsVersion
-
- public void trackEvent(ClientContext a,
- String category, String action, String label, int value, String trackingAcount) {
- Map<String, String> parameters = new LinkedHashMap<String, String>();
- try {
- Map<String, String> customVariables = getCustomVars(a);
- parameters.put("AnalyticsVersion", analyticsVersion);
- parameters.put("utmn", randomNumber());
- parameters.put("utmhn", "http://app.osmand.net");
- parameters.put("utmni", "1");
- parameters.put("utmt", "event");
-
- StringBuilder customVars = new StringBuilder();
- Iterator<Entry<String, String>> customs = customVariables.entrySet().iterator();
- for (int i = 0; i < customVariables.size(); i++) {
- Entry<String, String> n = customs.next();
- if (i > 0) {
- customVars.append("*");
- }
- // "'" => "'0", ')' => "'1", '*' => "'2", '!' => "'3",
- customVars.append((i + 1) + "!").append((n.getKey() + n.getValue()));
- }
-
- parameters.put("utmcs", "UTF-8");
- parameters.put("utmul", "en");
- parameters.put("utmhid", (System.currentTimeMillis() / 1000) + "");
- parameters.put("utmac", trackingAcount);
- String domainHash = "app.osmand.net".hashCode() + "";
-
- String utma = domainHash + ".";
- File fl = a.getAppPath(".nomedia");
- if (fl.exists()) {
- utma += (fl.lastModified()) + ".";
- } else {
- utma += (randomNumber()) + ".";
- }
- utma += ((System.currentTimeMillis() / 1000) + ".");
- utma += ((System.currentTimeMillis() / 1000) + ".");
- utma += ((System.currentTimeMillis() / 1000) + ".");
- utma += "1";
- parameters.put("utmcc", "__utma=" + utma + ";");
- parameters.put("utme", MessageFormat.format("5({0}*{1}*{2})({3})", category, action, label == null ? "" : label, value)
- + customVars);
-
- StringBuilder urlString = new StringBuilder(beaconUrl + "?");
- Iterator<Entry<String, String>> it = parameters.entrySet().iterator();
- while (it.hasNext()) {
- Entry<String, String> e = it.next();
- urlString.append(e.getKey()).append("=").append(URLEncoder.encode(e.getValue(), "UTF-8"));
- if (it.hasNext()) {
- urlString.append("&");
- }
- }
-
- log.debug(urlString);
- URL url = new URL(urlString.toString());
- HttpURLConnection conn = (HttpURLConnection) url.openConnection();
- conn.setConnectTimeout(5000);
- conn.setDoInput(false);
- conn.setDoOutput(false);
- conn.connect();
- log.info("Response analytics is " + conn.getResponseCode() + " " + conn.getResponseMessage());
- } catch (IOException e) {
- log.error(e.getMessage(), e);
- }
- }
-
-}