diff options
39 files changed, 24 insertions, 241 deletions
@@ -3,7 +3,6 @@ <classpathentry kind="src" path="src"/> <classpathentry kind="src" path="gen"/> <classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/> - <classpathentry kind="lib" path="libs/libGoogleAnalytics.jar"/> <classpathentry kind="lib" path="libs/mapsforge-map-0.2.4.jar"/> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/libs/libGoogleAnalytics.jar b/libs/libGoogleAnalytics.jar Binary files differdeleted file mode 100644 index d3f7193..0000000 --- a/libs/libGoogleAnalytics.jar +++ /dev/null diff --git a/src/cgeo/geocaching/apps/AbstractApp.java b/src/cgeo/geocaching/apps/AbstractApp.java index c00880f..155c9fd 100644 --- a/src/cgeo/geocaching/apps/AbstractApp.java +++ b/src/cgeo/geocaching/apps/AbstractApp.java @@ -9,8 +9,6 @@ import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import cgeo.geocaching.cgSettings; -import com.google.android.apps.analytics.GoogleAnalyticsTracker; - public abstract class AbstractApp implements App { protected String packageName; @@ -69,12 +67,6 @@ public abstract class AbstractApp implements App { return getName().hashCode(); } - protected void sendAnal(Activity activity, GoogleAnalyticsTracker tracker, - String string) { - // TODO Auto-generated method stub - - } - protected cgSettings getSettings(Activity activity) { return new cgSettings(activity, activity.getSharedPreferences(cgSettings.preferences, 0)); diff --git a/src/cgeo/geocaching/apps/cache/navi/GoogleMapsApp.java b/src/cgeo/geocaching/apps/cache/navi/GoogleMapsApp.java index 3de80c3..3b20210 100644 --- a/src/cgeo/geocaching/apps/cache/navi/GoogleMapsApp.java +++ b/src/cgeo/geocaching/apps/cache/navi/GoogleMapsApp.java @@ -13,8 +13,6 @@ import cgeo.geocaching.cgSettings; import cgeo.geocaching.cgWarning; import cgeo.geocaching.cgWaypoint; -import com.google.android.apps.analytics.GoogleAnalyticsTracker; - class GoogleMapsApp extends AbstractNavigationApp implements NavigationApp { GoogleMapsApp(final Resources res) { @@ -27,7 +25,7 @@ class GoogleMapsApp extends AbstractNavigationApp implements NavigationApp { } public boolean invoke(cgGeo geo, Activity activity, Resources res, - cgWarning warning, GoogleAnalyticsTracker tracker, cgCache cache, + cgWarning warning, cgCache cache, Long searchId, cgWaypoint waypoint, Double latitude, Double longitude) { if (cache == null && waypoint == null && latitude == null && longitude == null) { return false; @@ -42,8 +40,6 @@ class GoogleMapsApp extends AbstractNavigationApp implements NavigationApp { // INFO: q parameter works with Google Maps, but breaks cooperation with all other apps } - sendAnal(activity, tracker, "/external/native/maps"); - return true; } catch (Exception e) { // nothing diff --git a/src/cgeo/geocaching/apps/cache/navi/GoogleNavigationApp.java b/src/cgeo/geocaching/apps/cache/navi/GoogleNavigationApp.java index 5785ae4..68b93cb 100644 --- a/src/cgeo/geocaching/apps/cache/navi/GoogleNavigationApp.java +++ b/src/cgeo/geocaching/apps/cache/navi/GoogleNavigationApp.java @@ -13,8 +13,6 @@ import cgeo.geocaching.cgSettings; import cgeo.geocaching.cgWarning; import cgeo.geocaching.cgWaypoint; -import com.google.android.apps.analytics.GoogleAnalyticsTracker; - class GoogleNavigationApp extends AbstractNavigationApp implements NavigationApp { @@ -29,7 +27,7 @@ class GoogleNavigationApp extends AbstractNavigationApp implements @Override public boolean invoke(cgGeo geo, Activity activity, Resources res, - cgWarning warning, GoogleAnalyticsTracker tracker, cgCache cache, + cgWarning warning, cgCache cache, Long searchId, cgWaypoint waypoint, Double latitude, Double longitude) { if (activity == null) { return false; @@ -50,8 +48,6 @@ class GoogleNavigationApp extends AbstractNavigationApp implements .parse("google.navigation:ll=" + latitude + "," + longitude))); - sendAnal(activity, tracker, "/external/native/navigation"); - return true; } catch (Exception e) { // nothing @@ -71,8 +67,6 @@ class GoogleNavigationApp extends AbstractNavigationApp implements + latitude + "," + longitude))); } - sendAnal(activity, tracker, "/external/native/maps"); - return true; } catch (Exception e) { // nothing diff --git a/src/cgeo/geocaching/apps/cache/navi/InternalMap.java b/src/cgeo/geocaching/apps/cache/navi/InternalMap.java index b0eb5c8..cda7804 100644 --- a/src/cgeo/geocaching/apps/cache/navi/InternalMap.java +++ b/src/cgeo/geocaching/apps/cache/navi/InternalMap.java @@ -10,8 +10,6 @@ import cgeo.geocaching.cgSettings; import cgeo.geocaching.cgWarning; import cgeo.geocaching.cgWaypoint; -import com.google.android.apps.analytics.GoogleAnalyticsTracker; - class InternalMap extends AbstractInternalMap implements NavigationApp { @@ -21,7 +19,7 @@ class InternalMap extends AbstractInternalMap implements @Override public boolean invoke(cgGeo geo, Activity activity, Resources res, - cgWarning warning, GoogleAnalyticsTracker tracker, cgCache cache, + cgWarning warning, cgCache cache, Long searchId, cgWaypoint waypoint, Double latitude, Double longitude) { cgSettings settings = getSettings(activity); Intent mapIntent = new Intent(activity, settings.getMapFactory().getMapClass()); diff --git a/src/cgeo/geocaching/apps/cache/navi/LocusApp.java b/src/cgeo/geocaching/apps/cache/navi/LocusApp.java index cc19328..6624d86 100644 --- a/src/cgeo/geocaching/apps/cache/navi/LocusApp.java +++ b/src/cgeo/geocaching/apps/cache/navi/LocusApp.java @@ -17,8 +17,6 @@ import cgeo.geocaching.cgWarning; import cgeo.geocaching.cgWaypoint; import cgeo.geocaching.apps.AbstractLocusApp; -import com.google.android.apps.analytics.GoogleAnalyticsTracker; - class LocusApp extends AbstractLocusApp implements NavigationApp { LocusApp(Resources res) { @@ -27,7 +25,7 @@ class LocusApp extends AbstractLocusApp implements NavigationApp { @Override public boolean invoke(cgGeo geo, Activity activity, Resources res, - cgWarning warning, GoogleAnalyticsTracker tracker, cgCache cache, + cgWarning warning, cgCache cache, Long searchId, cgWaypoint waypoint, Double latitude, Double longitude) { if (cache == null && waypoint == null && latitude == null && longitude == null) { @@ -196,8 +194,6 @@ class LocusApp extends AbstractLocusApp implements NavigationApp { activity.startActivity(intent); - sendAnal(activity, tracker, "/external/locus"); - return true; } } catch (Exception e) { diff --git a/src/cgeo/geocaching/apps/cache/navi/NavigationApp.java b/src/cgeo/geocaching/apps/cache/navi/NavigationApp.java index f1a6259..d3b3c36 100644 --- a/src/cgeo/geocaching/apps/cache/navi/NavigationApp.java +++ b/src/cgeo/geocaching/apps/cache/navi/NavigationApp.java @@ -8,12 +8,10 @@ import cgeo.geocaching.cgWarning; import cgeo.geocaching.cgWaypoint; import cgeo.geocaching.apps.App; -import com.google.android.apps.analytics.GoogleAnalyticsTracker; - interface NavigationApp extends App { public boolean invoke(final cgGeo geo, final Activity activity, final Resources res, final cgWarning warning, - final GoogleAnalyticsTracker tracker, final cgCache cache, + final cgCache cache, final Long searchId, final cgWaypoint waypoint, final Double latitude, final Double longitude); } diff --git a/src/cgeo/geocaching/apps/cache/navi/NavigationAppFactory.java b/src/cgeo/geocaching/apps/cache/navi/NavigationAppFactory.java index fa8afd7..47ec473 100644 --- a/src/cgeo/geocaching/apps/cache/navi/NavigationAppFactory.java +++ b/src/cgeo/geocaching/apps/cache/navi/NavigationAppFactory.java @@ -12,8 +12,6 @@ import cgeo.geocaching.cgWarning; import cgeo.geocaching.cgWaypoint; import cgeo.geocaching.apps.AbstractAppFactory; -import com.google.android.apps.analytics.GoogleAnalyticsTracker; - public final class NavigationAppFactory extends AbstractAppFactory { private static NavigationApp[] apps = new NavigationApp[] {}; @@ -40,7 +38,7 @@ public final class NavigationAppFactory extends AbstractAppFactory { public static boolean onMenuItemSelected(final MenuItem item, final cgGeo geo, Activity activity, Resources res, - cgWarning warning, GoogleAnalyticsTracker tracker, cgCache cache, + cgWarning warning, cgCache cache, Long searchId, cgWaypoint waypoint, ArrayList<Double> destination) { NavigationApp app = (NavigationApp) getAppFromMenuItem(item, apps); if (app != null) { @@ -50,7 +48,7 @@ public final class NavigationAppFactory extends AbstractAppFactory { latitude = destination.get(0); longitude = destination.get(1); } - return app.invoke(geo, activity, res, warning, tracker, cache, + return app.invoke(geo, activity, res, warning, cache, searchId, waypoint, latitude, longitude); } return false; diff --git a/src/cgeo/geocaching/apps/cache/navi/RMapsApp.java b/src/cgeo/geocaching/apps/cache/navi/RMapsApp.java index d1f8a73..9de0053 100644 --- a/src/cgeo/geocaching/apps/cache/navi/RMapsApp.java +++ b/src/cgeo/geocaching/apps/cache/navi/RMapsApp.java @@ -12,8 +12,6 @@ import cgeo.geocaching.cgGeo; import cgeo.geocaching.cgWarning; import cgeo.geocaching.cgWaypoint; -import com.google.android.apps.analytics.GoogleAnalyticsTracker; - class RMapsApp extends AbstractNavigationApp implements NavigationApp { private static final String INTENT = "com.robert.maps.action.SHOW_POINTS"; @@ -24,7 +22,7 @@ class RMapsApp extends AbstractNavigationApp implements NavigationApp { @Override public boolean invoke(cgGeo geo, Activity activity, Resources res, - cgWarning warning, GoogleAnalyticsTracker tracker, cgCache cache, + cgWarning warning, cgCache cache, Long searchId, cgWaypoint waypoint, Double latitude, Double longitude) { if (cache == null && waypoint == null && latitude == null && longitude == null) { @@ -63,8 +61,6 @@ class RMapsApp extends AbstractNavigationApp implements NavigationApp { activity.startActivity(intent); - sendAnal(activity, tracker, "/external/rmaps"); - return true; } } catch (Exception e) { diff --git a/src/cgeo/geocaching/apps/cache/navi/RadarApp.java b/src/cgeo/geocaching/apps/cache/navi/RadarApp.java index c7e8277..5bb1e6c 100644 --- a/src/cgeo/geocaching/apps/cache/navi/RadarApp.java +++ b/src/cgeo/geocaching/apps/cache/navi/RadarApp.java @@ -10,8 +10,6 @@ import cgeo.geocaching.cgGeo; import cgeo.geocaching.cgWarning; import cgeo.geocaching.cgWaypoint; -import com.google.android.apps.analytics.GoogleAnalyticsTracker; - class RadarApp extends AbstractNavigationApp implements NavigationApp { private static final String INTENT = "com.google.android.radar.SHOW_RADAR"; @@ -35,7 +33,7 @@ class RadarApp extends AbstractNavigationApp implements NavigationApp { @Override public boolean invoke(cgGeo geo, Activity activity, Resources res, - cgWarning warning, GoogleAnalyticsTracker tracker, cgCache cache, + cgWarning warning, cgCache cache, Long searchId, cgWaypoint waypoint, Double latitude, Double longitude) { if (cache != null) { if (cache.latitude != null && cache.longitude != null) { diff --git a/src/cgeo/geocaching/apps/cache/navi/StaticMapApp.java b/src/cgeo/geocaching/apps/cache/navi/StaticMapApp.java index 24bdd47..9082dd5 100644 --- a/src/cgeo/geocaching/apps/cache/navi/StaticMapApp.java +++ b/src/cgeo/geocaching/apps/cache/navi/StaticMapApp.java @@ -11,8 +11,6 @@ import cgeo.geocaching.cgWarning; import cgeo.geocaching.cgWaypoint; import cgeo.geocaching.cgeosmaps; -import com.google.android.apps.analytics.GoogleAnalyticsTracker; - class StaticMapApp extends AbstractNavigationApp implements NavigationApp { @@ -27,7 +25,7 @@ class StaticMapApp extends AbstractNavigationApp implements @Override public boolean invoke(cgGeo geo, Activity activity, Resources res, - cgWarning warning, GoogleAnalyticsTracker tracker, cgCache cache, + cgWarning warning, cgCache cache, Long searchId, cgWaypoint waypoint, Double latitude, Double longitude) { if (cache == null || cache.reason == 0) { diff --git a/src/cgeo/geocaching/apps/cachelist/CacheListApp.java b/src/cgeo/geocaching/apps/cachelist/CacheListApp.java index 1d10cc1..250ddbb 100644 --- a/src/cgeo/geocaching/apps/cachelist/CacheListApp.java +++ b/src/cgeo/geocaching/apps/cachelist/CacheListApp.java @@ -8,12 +8,10 @@ import cgeo.geocaching.cgCache; import cgeo.geocaching.cgGeo; import cgeo.geocaching.apps.App; -import com.google.android.apps.analytics.GoogleAnalyticsTracker; - interface CacheListApp extends App { boolean invoke(final cgGeo geo, final List<cgCache> caches, final Activity activity, final Resources res, - final GoogleAnalyticsTracker tracker, final Integer searchId); + final Integer searchId); } diff --git a/src/cgeo/geocaching/apps/cachelist/CacheListAppFactory.java b/src/cgeo/geocaching/apps/cachelist/CacheListAppFactory.java index 1f80e77..5bdd7aa 100644 --- a/src/cgeo/geocaching/apps/cachelist/CacheListAppFactory.java +++ b/src/cgeo/geocaching/apps/cachelist/CacheListAppFactory.java @@ -13,8 +13,6 @@ import cgeo.geocaching.cgCache; import cgeo.geocaching.cgGeo; import cgeo.geocaching.apps.AbstractAppFactory; -import com.google.android.apps.analytics.GoogleAnalyticsTracker; - public final class CacheListAppFactory extends AbstractAppFactory { private static CacheListApp[] apps = new CacheListApp[] {}; @@ -60,11 +58,11 @@ public final class CacheListAppFactory extends AbstractAppFactory { public static boolean onMenuItemSelected(final MenuItem item, final cgGeo geo, final List<cgCache> caches, final Activity activity, final Resources res, - final GoogleAnalyticsTracker tracker, final Integer searchId) { + final Integer searchId) { CacheListApp app = (CacheListApp) getAppFromMenuItem( item, apps); if (app != null) { - return app.invoke(geo, caches, activity, res, tracker, searchId); + return app.invoke(geo, caches, activity, res, searchId); } return false; } diff --git a/src/cgeo/geocaching/apps/cachelist/InternalCacheListMap.java b/src/cgeo/geocaching/apps/cachelist/InternalCacheListMap.java index 041466f..1ee0c91 100644 --- a/src/cgeo/geocaching/apps/cachelist/InternalCacheListMap.java +++ b/src/cgeo/geocaching/apps/cachelist/InternalCacheListMap.java @@ -11,8 +11,6 @@ import cgeo.geocaching.cgCache; import cgeo.geocaching.cgGeo; import cgeo.geocaching.apps.AbstractApp; -import com.google.android.apps.analytics.GoogleAnalyticsTracker; - class InternalCacheListMap extends AbstractApp implements CacheListApp { InternalCacheListMap(Resources res) { @@ -25,7 +23,7 @@ class InternalCacheListMap extends AbstractApp implements CacheListApp { } @Override - public boolean invoke(cgGeo geo, List<cgCache> caches, Activity activity, Resources res, GoogleAnalyticsTracker tracker, Integer searchId) { + public boolean invoke(cgGeo geo, List<cgCache> caches, Activity activity, Resources res, Integer searchId) { Intent mapIntent = new Intent(activity, getSettings(activity).getMapFactory() .getMapClass()); mapIntent.putExtra("detail", false); // this is the main difference to the activity for a single point diff --git a/src/cgeo/geocaching/apps/cachelist/LocusCacheListApp.java b/src/cgeo/geocaching/apps/cachelist/LocusCacheListApp.java index 70b8251..b69cfb2 100644 --- a/src/cgeo/geocaching/apps/cachelist/LocusCacheListApp.java +++ b/src/cgeo/geocaching/apps/cachelist/LocusCacheListApp.java @@ -16,8 +16,6 @@ import cgeo.geocaching.cgCache; import cgeo.geocaching.cgGeo; import cgeo.geocaching.apps.AbstractLocusApp; -import com.google.android.apps.analytics.GoogleAnalyticsTracker; - class LocusCacheListApp extends AbstractLocusApp implements CacheListApp { LocusCacheListApp(Resources res) { @@ -25,7 +23,7 @@ class LocusCacheListApp extends AbstractLocusApp implements CacheListApp { } @Override - public boolean invoke(cgGeo geo, List<cgCache> cacheList, Activity activity, Resources res, GoogleAnalyticsTracker tracker, final Integer searchId) { + public boolean invoke(cgGeo geo, List<cgCache> cacheList, Activity activity, Resources res, final Integer searchId) { if (cacheList == null || cacheList.isEmpty() == true) { return false; } @@ -95,8 +93,6 @@ class LocusCacheListApp extends AbstractLocusApp implements CacheListApp { intent.putExtra("data", baos.toByteArray()); activity.startActivity(intent); - - sendAnal(activity, tracker, "/external/locus"); } catch (Exception e) { // nothing } diff --git a/src/cgeo/geocaching/cgBase.java b/src/cgeo/geocaching/cgBase.java index f4ad6d9..3a5c3b6 100644 --- a/src/cgeo/geocaching/cgBase.java +++ b/src/cgeo/geocaching/cgBase.java @@ -69,8 +69,6 @@ import android.view.WindowManager; import android.widget.ProgressBar; import android.widget.TextView; -import com.google.android.apps.analytics.GoogleAnalyticsTracker; - public class cgBase { public static HashMap<String, String> cacheTypes = new HashMap<String, String>(); @@ -5411,11 +5409,11 @@ public class cgBase { return icon; } - public boolean runNavigation(Activity activity, Resources res, cgSettings settings, cgWarning warning, GoogleAnalyticsTracker tracker, Double latitude, Double longitude) { - return runNavigation(activity, res, settings, warning, tracker, latitude, longitude, null, null); + public boolean runNavigation(Activity activity, Resources res, cgSettings settings, cgWarning warning, Double latitude, Double longitude) { + return runNavigation(activity, res, settings, warning, latitude, longitude, null, null); } - public boolean runNavigation(Activity activity, Resources res, cgSettings settings, cgWarning warning, GoogleAnalyticsTracker tracker, Double latitude, Double longitude, Double latitudeNow, Double longitudeNow) { + public boolean runNavigation(Activity activity, Resources res, cgSettings settings, cgWarning warning, Double latitude, Double longitude, Double latitudeNow, Double longitudeNow) { if (activity == null) { return false; } @@ -5428,8 +5426,6 @@ public class cgBase { try { activity.startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("google.navigation:ll=" + latitude + "," + longitude))); - sendAnal(activity, tracker, "/external/native/navigation"); - return true; } catch (Exception e) { // nothing @@ -5444,8 +5440,6 @@ public class cgBase { activity.startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("http://maps.google.com/maps?f=d&daddr=" + latitude + "," + longitude))); } - sendAnal(activity, tracker, "/external/native/maps"); - return true; } catch (Exception e) { // nothing @@ -5483,54 +5477,6 @@ public class cgBase { return usertoken; } - public void sendAnal(Context context, String page) { - (new sendAnalThread(context, null, page)).start(); - } - - public void sendAnal(Context context, GoogleAnalyticsTracker tracker, String page) { - (new sendAnalThread(context, tracker, page)).start(); - } - - private class sendAnalThread extends Thread { - - Context context = null; - GoogleAnalyticsTracker tracker = null; - String page = null; - boolean startedHere = false; - - public sendAnalThread(Context contextIn, GoogleAnalyticsTracker trackerIn, String pageIn) { - context = contextIn; - tracker = trackerIn; - page = pageIn; - } - - @Override - public void run() { - try { - if (page == null || page.length() == 0) { - page = "/"; - } - - if (tracker == null && context != null) { - startedHere = true; - tracker = GoogleAnalyticsTracker.getInstance(); - tracker.start(cgSettings.analytics, context); - } - - tracker.trackPageView(page); - tracker.dispatch(); - - Log.i(cgSettings.tag, "Logged use of " + page); - - if (startedHere == true) { - tracker.stop(); - } - } catch (Exception e) { - // nothing - } - } - } - public Double getElevation(Double latitude, Double longitude) { Double elv = null; diff --git a/src/cgeo/geocaching/cgFileList.java b/src/cgeo/geocaching/cgFileList.java index e62f459..a9371be 100644 --- a/src/cgeo/geocaching/cgFileList.java +++ b/src/cgeo/geocaching/cgFileList.java @@ -92,9 +92,6 @@ public abstract class cgFileList<T extends ArrayAdapter<File>> extends ListActiv setContentView(R.layout.gpx); getBase().setTitle(getActivity(), getRes().getString(R.string.gpx_import_title)); - // google analytics - getBase().sendAnal(getActivity(), "/file-import"); - Bundle extras = getIntent().getExtras(); if (extras != null) { listId = extras.getInt("list"); diff --git a/src/cgeo/geocaching/cgeo.java b/src/cgeo/geocaching/cgeo.java index 5ab26ab..e6c2063 100644 --- a/src/cgeo/geocaching/cgeo.java +++ b/src/cgeo/geocaching/cgeo.java @@ -144,13 +144,11 @@ public class cgeo extends Activity { version = info.versionCode; - base.sendAnal(context, "/?ver=" + info.versionCode); Log.i(cgSettings.tag, "Starting " + info.packageName + " " + info.versionCode + " a.k.a " + info.versionName + "..."); info = null; manager = null; } catch (Exception e) { - base.sendAnal(context, "/"); Log.i(cgSettings.tag, "No info."); } diff --git a/src/cgeo/geocaching/cgeoabout.java b/src/cgeo/geocaching/cgeoabout.java index 06ac46b..3fe2f25 100644 --- a/src/cgeo/geocaching/cgeoabout.java +++ b/src/cgeo/geocaching/cgeoabout.java @@ -37,9 +37,6 @@ public class cgeoabout extends Activity { setContentView(R.layout.about); base.setTitle(activity, res.getString(R.string.about)); - // google analytics - base.sendAnal(activity, "/about"); - init(); } diff --git a/src/cgeo/geocaching/cgeoaddresses.java b/src/cgeo/geocaching/cgeoaddresses.java index c917d50..e723260 100644 --- a/src/cgeo/geocaching/cgeoaddresses.java +++ b/src/cgeo/geocaching/cgeoaddresses.java @@ -114,9 +114,6 @@ public class cgeoaddresses extends Activity { setContentView(R.layout.addresses); base.setTitle(activity, res.getString(R.string.search_address_result)); - // google analytics - base.sendAnal(activity, "/addresses"); - // get parameters Bundle extras = getIntent().getExtras(); diff --git a/src/cgeo/geocaching/cgeoadvsearch.java b/src/cgeo/geocaching/cgeoadvsearch.java index 568cbce..da2b8c0 100644 --- a/src/cgeo/geocaching/cgeoadvsearch.java +++ b/src/cgeo/geocaching/cgeoadvsearch.java @@ -72,9 +72,6 @@ public class cgeoadvsearch extends Activity { setContentView(R.layout.search); base.setTitle(activity, res.getString(R.string.search)); - // google analytics - base.sendAnal(activity, "/advanced-search"); - init(); } diff --git a/src/cgeo/geocaching/cgeoauth.java b/src/cgeo/geocaching/cgeoauth.java index 018dbfc..9dc1c32 100644 --- a/src/cgeo/geocaching/cgeoauth.java +++ b/src/cgeo/geocaching/cgeoauth.java @@ -118,9 +118,6 @@ public class cgeoauth extends Activity { setContentView(R.layout.auth); base.setTitle(activity, res.getString(R.string.auth_twitter)); - // google analytics - base.sendAnal(activity, "/auth"); - init(); } diff --git a/src/cgeo/geocaching/cgeocaches.java b/src/cgeo/geocaching/cgeocaches.java index c2c668d..ffb987b 100644 --- a/src/cgeo/geocaching/cgeocaches.java +++ b/src/cgeo/geocaching/cgeocaches.java @@ -61,8 +61,6 @@ import cgeo.geocaching.sorting.SizeComparator; import cgeo.geocaching.sorting.TerrainComparator; import cgeo.geocaching.sorting.VoteComparator; -import com.google.android.apps.analytics.GoogleAnalyticsTracker; - public class cgeocaches extends ListActivity { private static final int MENU_COMPASS = 1; @@ -126,7 +124,6 @@ public class cgeocaches extends ListActivity { private static final int SUBMENU_IMPORT = 59; private static final int SUBMENU_MANAGE_HISTORY = 60; - private GoogleAnalyticsTracker tracker = null; private String action = null; private String type = null; private Double latitude = null; @@ -557,12 +554,6 @@ public class cgeocaches extends ListActivity { setContentView(R.layout.caches); base.setTitle(activity, "caches"); - // google analytics - tracker = GoogleAnalyticsTracker.getInstance(); - tracker.start(cgSettings.analytics, this); - tracker.dispatch(); - base.sendAnal(activity, tracker, "/cache/list"); - // get parameters Bundle extras = getIntent().getExtras(); if (extras != null) { @@ -722,9 +713,6 @@ public class cgeocaches extends ListActivity { if (geo != null) { geo = app.removeGeo(); } - if (tracker != null) { - tracker.stop(); - } super.onDestroy(); } @@ -1001,7 +989,7 @@ public class cgeocaches extends ListActivity { return false; } - return CacheListAppFactory.onMenuItemSelected(item, geo, cacheList, activity, res, tracker, null); + return CacheListAppFactory.onMenuItemSelected(item, geo, cacheList, activity, res, null); } private void setComparator(MenuItem item, @@ -1228,7 +1216,7 @@ public class cgeocaches extends ListActivity { lastMenuInfo = info; return NavigationAppFactory.onMenuItemSelected(item, geo, activity, - res, warning, tracker, cache, null, null, null); + res, warning, cache, null, null, null); } private boolean setFilter(cgFilter filter) { diff --git a/src/cgeo/geocaching/cgeodate.java b/src/cgeo/geocaching/cgeodate.java index b0d5b5b..b1ec258 100644 --- a/src/cgeo/geocaching/cgeodate.java +++ b/src/cgeo/geocaching/cgeodate.java @@ -41,9 +41,6 @@ public class cgeodate extends Dialog { setContentView(R.layout.date); - // google analytics - base.sendAnal(this.getContext(), "/date"); - DatePicker picker = (DatePicker) findViewById(R.id.picker); picker.init(date.get(Calendar.YEAR), date.get(Calendar.MONTH), date.get(Calendar.DATE), new pickerListener()); } diff --git a/src/cgeo/geocaching/cgeodetail.java b/src/cgeo/geocaching/cgeodetail.java index fa41293..cc3d621 100644 --- a/src/cgeo/geocaching/cgeodetail.java +++ b/src/cgeo/geocaching/cgeodetail.java @@ -52,15 +52,12 @@ import android.widget.TextView; import cgeo.geocaching.apps.cache.GeneralAppsFactory; import cgeo.geocaching.apps.cache.navi.NavigationAppFactory; -import com.google.android.apps.analytics.GoogleAnalyticsTracker; - public class cgeodetail extends Activity { public Long searchId = null; public cgCache cache = null; public String geocode = null; public String name = null; public String guid = null; - private GoogleAnalyticsTracker tracker = null; private Resources res = null; private Activity activity = null; private LayoutInflater inflater = null; @@ -340,14 +337,6 @@ public class cgeodetail extends Activity { } } - // google analytics - tracker = GoogleAnalyticsTracker.getInstance(); - tracker.start(cgSettings.analytics, this); - tracker.dispatch(); - if (geocode != null) { - base.sendAnal(activity, tracker, "/cache/detail#" + geocode); - } - // no given data if (geocode == null && guid == null) { warning.showToast(res.getString(R.string.err_detail_cache)); @@ -398,7 +387,6 @@ public class cgeodetail extends Activity { if (geo != null) { geo = app.removeGeo(); } - if (tracker != null) tracker.stop(); super.onDestroy(); } @@ -547,7 +535,7 @@ public class cgeodetail extends Activity { shareCache(); return true; } - if (NavigationAppFactory.onMenuItemSelected(item, geo, activity, res, warning, tracker, cache, searchId, null, null)) { + if (NavigationAppFactory.onMenuItemSelected(item, geo, activity, res, warning, cache, searchId, null, null)) { return true; } return GeneralAppsFactory.onMenuItemSelected(item, activity, cache); @@ -601,12 +589,6 @@ public class cgeodetail extends Activity { return; } - if (cache.reason >= 1) { - base.sendAnal(activity, tracker, "/cache/detail/stored"); - } else { - base.sendAnal(activity, tracker, "/cache/detail/online"); - } - try { if (gcIcons == null || gcIcons.isEmpty()) { gcIcons.put("ape", R.drawable.type_ape); diff --git a/src/cgeo/geocaching/cgeohelpers.java b/src/cgeo/geocaching/cgeohelpers.java index cb38b64..3461cdc 100644 --- a/src/cgeo/geocaching/cgeohelpers.java +++ b/src/cgeo/geocaching/cgeohelpers.java @@ -40,9 +40,6 @@ public class cgeohelpers extends Activity { } setContentView(R.layout.helpers); base.setTitle(activity, res.getString(R.string.helpers)); - - // google analytics - base.sendAnal(activity, "/helpers"); } @Override diff --git a/src/cgeo/geocaching/cgeoimages.java b/src/cgeo/geocaching/cgeoimages.java index 4e6b493..118730e 100644 --- a/src/cgeo/geocaching/cgeoimages.java +++ b/src/cgeo/geocaching/cgeoimages.java @@ -162,10 +162,8 @@ public class cgeoimages extends Activity { if (img_type == SPOILER_IMAGE) { base.setTitle(activity, res.getString(R.string.cache_spoiler_images_title)); - base.sendAnal(activity, "/spoilers"); } else if (img_type == LOG_IMAGE) { base.setTitle(activity, res.getString(R.string.cache_log_images_title)); - base.sendAnal(activity, "/logimg"); } if (geocode == null) { diff --git a/src/cgeo/geocaching/cgeoinit.java b/src/cgeo/geocaching/cgeoinit.java index 25693e0..ce13b74 100644 --- a/src/cgeo/geocaching/cgeoinit.java +++ b/src/cgeo/geocaching/cgeoinit.java @@ -124,9 +124,6 @@ public class cgeoinit extends Activity { setContentView(R.layout.init); base.setTitle(activity, res.getString(R.string.settings)); - // google analytics - base.sendAnal(activity, "/init"); - init(); } diff --git a/src/cgeo/geocaching/cgeonavigate.java b/src/cgeo/geocaching/cgeonavigate.java index 7640a0e..6421376 100644 --- a/src/cgeo/geocaching/cgeonavigate.java +++ b/src/cgeo/geocaching/cgeonavigate.java @@ -87,9 +87,6 @@ public class cgeonavigate extends Activity { setContentView(R.layout.navigate); base.setTitle(activity, res.getString(R.string.compass_title)); - // google analytics - base.sendAnal(activity, "/navigate"); - // sensor & geolocation manager if (geo == null) { geo = app.startGeo(activity, geoUpdate, base, settings, warning, 0, 0); diff --git a/src/cgeo/geocaching/cgeopoint.java b/src/cgeo/geocaching/cgeopoint.java index d474edc..4b22876 100644 --- a/src/cgeo/geocaching/cgeopoint.java +++ b/src/cgeo/geocaching/cgeopoint.java @@ -36,8 +36,6 @@ import android.widget.ListView; import android.widget.TextView; import cgeo.geocaching.apps.cache.navi.NavigationAppFactory; -import com.google.android.apps.analytics.GoogleAnalyticsTracker; - public class cgeopoint extends Activity { private class DestinationHistoryAdapter extends ArrayAdapter<cgDestination> { @@ -93,7 +91,6 @@ public class cgeopoint extends Activity { private cgBase base = null; private cgWarning warning = null; private Activity activity = null; - private GoogleAnalyticsTracker tracker = null; private cgGeo geo = null; private cgUpdateLoc geoUpdate = new update(); private EditText latEdit = null; @@ -128,12 +125,6 @@ public class cgeopoint extends Activity { setContentView(R.layout.point); base.setTitle(activity, res.getString(R.string.search_destination)); - // google analytics - tracker = GoogleAnalyticsTracker.getInstance(); - tracker.start(cgSettings.analytics, this); - tracker.dispatch(); - base.sendAnal(activity, tracker, "/point"); - createHistoryView(); init(); @@ -241,9 +232,6 @@ public class cgeopoint extends Activity { if (geo != null) { geo = app.removeGeo(); } - if (tracker != null) { - tracker.stop(); - } super.onDestroy(); } @@ -366,7 +354,7 @@ public class cgeopoint extends Activity { return true; } - return NavigationAppFactory.onMenuItemSelected(item, geo, activity, res, warning, tracker, null, null, null, coords); + return NavigationAppFactory.onMenuItemSelected(item, geo, activity, res, warning, null, null, null, coords); } private void addToHistory(ArrayList<Double> coords) { diff --git a/src/cgeo/geocaching/cgeopopup.java b/src/cgeo/geocaching/cgeopopup.java index fac27cf..d9de22d 100644 --- a/src/cgeo/geocaching/cgeopopup.java +++ b/src/cgeo/geocaching/cgeopopup.java @@ -30,11 +30,8 @@ import android.widget.ScrollView; import android.widget.TextView; import cgeo.geocaching.apps.cache.navi.NavigationAppFactory; -import com.google.android.apps.analytics.GoogleAnalyticsTracker; - public class cgeopopup extends Activity { - private GoogleAnalyticsTracker tracker = null; private Activity activity = null; private Resources res = null; private cgeoapplication app = null; @@ -128,12 +125,6 @@ public class cgeopopup extends Activity { setContentView(R.layout.popup); base.setTitle(activity, res.getString(R.string.detail)); - // google analytics - tracker = GoogleAnalyticsTracker.getInstance(); - tracker.start(cgSettings.analytics, this); - tracker.dispatch(); - base.sendAnal(activity, tracker, "/popup"); - // get parameters Bundle extras = getIntent().getExtras(); if (extras != null) { @@ -220,7 +211,7 @@ public class cgeopopup extends Activity { return true; } - return NavigationAppFactory.onMenuItemSelected(item, geo, activity, res, warning, tracker, cache, null, null, null); + return NavigationAppFactory.onMenuItemSelected(item, geo, activity, res, warning, cache, null, null, null); } private void init() { @@ -530,9 +521,6 @@ public class cgeopopup extends Activity { if (geo != null) { geo = app.removeGeo(); } - if (tracker != null) { - tracker.stop(); - } super.onDestroy(); } diff --git a/src/cgeo/geocaching/cgeotouch.java b/src/cgeo/geocaching/cgeotouch.java index 07f83d5..4f6fd73 100644 --- a/src/cgeo/geocaching/cgeotouch.java +++ b/src/cgeo/geocaching/cgeotouch.java @@ -139,9 +139,6 @@ public class cgeotouch extends cgLogForm { setContentView(R.layout.touch); base.setTitle(activity, res.getString(R.string.trackable_touch)); - // google analytics - base.sendAnal(activity, "/trackable/touch"); - // get parameters Bundle extras = getIntent().getExtras(); if (extras != null) { diff --git a/src/cgeo/geocaching/cgeotrackable.java b/src/cgeo/geocaching/cgeotrackable.java index 7e714f1..7319aa6 100644 --- a/src/cgeo/geocaching/cgeotrackable.java +++ b/src/cgeo/geocaching/cgeotrackable.java @@ -330,9 +330,6 @@ public class cgeotrackable extends Activity { setContentView(R.layout.trackable_detail); base.setTitle(activity, res.getString(R.string.trackable)); - // google analytics - base.sendAnal(activity, "/trackable/detail"); - // get parameters Bundle extras = getIntent().getExtras(); Uri uri = getIntent().getData(); diff --git a/src/cgeo/geocaching/cgeotrackables.java b/src/cgeo/geocaching/cgeotrackables.java index d414e16..b578cc9 100644 --- a/src/cgeo/geocaching/cgeotrackables.java +++ b/src/cgeo/geocaching/cgeotrackables.java @@ -99,9 +99,6 @@ public class cgeotrackables extends Activity { setContentView(R.layout.trackables); base.setTitle(activity, "Trackables"); - // google analytics - base.sendAnal(activity, "/trackable/list"); - // get parameters Bundle extras = getIntent().getExtras(); diff --git a/src/cgeo/geocaching/cgeovisit.java b/src/cgeo/geocaching/cgeovisit.java index 61d23f4..433ef86 100644 --- a/src/cgeo/geocaching/cgeovisit.java +++ b/src/cgeo/geocaching/cgeovisit.java @@ -240,9 +240,6 @@ public class cgeovisit extends cgLogForm { setContentView(R.layout.visit); base.setTitle(activity, res.getString(R.string.log_new_log)); - // google analytics - base.sendAnal(activity, "/visit"); - // get parameters Bundle extras = getIntent().getExtras(); if (extras != null) { diff --git a/src/cgeo/geocaching/cgeowaypoint.java b/src/cgeo/geocaching/cgeowaypoint.java index e02a0b0..543312c 100644 --- a/src/cgeo/geocaching/cgeowaypoint.java +++ b/src/cgeo/geocaching/cgeowaypoint.java @@ -24,14 +24,11 @@ import android.widget.ImageView; import android.widget.TextView; import cgeo.geocaching.apps.cache.navi.NavigationAppFactory; -import com.google.android.apps.analytics.GoogleAnalyticsTracker; - public class cgeowaypoint extends Activity { private static final int MENU_ID_NAVIGATION = 0; private static final int MENU_ID_CACHES_AROUND = 5; private static final int MENU_ID_COMPASS = 2; - private GoogleAnalyticsTracker tracker = null; private cgWaypoint waypoint = null; private String geocode = null; private int id = -1; @@ -155,12 +152,6 @@ public class cgeowaypoint extends Activity { setContentView(R.layout.waypoint); base.setTitle(activity, "waypoint"); - // google analytics - tracker = GoogleAnalyticsTracker.getInstance(); - tracker.start(cgSettings.analytics, this); - tracker.dispatch(); - base.sendAnal(activity, tracker, "/waypoint/detail"); - // get parameters Bundle extras = getIntent().getExtras(); @@ -209,9 +200,6 @@ public class cgeowaypoint extends Activity { if (geo != null) { geo = app.removeGeo(); } - if (tracker != null) { - tracker.stop(); - } super.onDestroy(); } @@ -277,7 +265,7 @@ public class cgeowaypoint extends Activity { return true; } - return NavigationAppFactory.onMenuItemSelected(item, geo, activity, res, warning, tracker, null, null, waypoint, null); + return NavigationAppFactory.onMenuItemSelected(item, geo, activity, res, warning, null, null, waypoint, null); } private void cachesAround() { diff --git a/src/cgeo/geocaching/cgeowaypointadd.java b/src/cgeo/geocaching/cgeowaypointadd.java index ec58257..e039a43 100644 --- a/src/cgeo/geocaching/cgeowaypointadd.java +++ b/src/cgeo/geocaching/cgeowaypointadd.java @@ -104,9 +104,6 @@ public class cgeowaypointadd extends Activity { setContentView(R.layout.waypoint_new); base.setTitle(activity, "waypoint"); - // google analytics - base.sendAnal(activity, "/waypoint/new"); - if (geo == null) { geo = app.startGeo(activity, geoUpdate, base, settings, warning, 0, 0); } diff --git a/src/cgeo/geocaching/mapcommon/cgeomap.java b/src/cgeo/geocaching/mapcommon/cgeomap.java index cf1760f..38a350e 100644 --- a/src/cgeo/geocaching/mapcommon/cgeomap.java +++ b/src/cgeo/geocaching/mapcommon/cgeomap.java @@ -339,12 +339,8 @@ public class cgeomap extends MapBase { // google analytics if (live) { - base.sendAnal(activity, "/map/live"); - followMyLocation = true; } else { - base.sendAnal(activity, "/map/normal"); - followMyLocation = false; } if (geocodeIntent != null || searchIdIntent != null || (latitudeIntent != null && longitudeIntent != null) || mapStateIntent != null) { |