Remove Google Analytics

prey · Apr 14, 2014 · b4d9aaf · b4d9aaf
1 parent 0168735
commit b4d9aaf
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 45 deletions.
diff --git a/libs/libGoogleAnalytics.jar b/libs/libGoogleAnalytics.jar
diff --git a/src/com/prey/activities/AddDeviceToAccountActivity.java b/src/com/prey/activities/AddDeviceToAccountActivity.java
@@ -22,7 +22,6 @@
 import android.widget.EditText;
 import android.widget.Toast;
 
-import com.google.android.apps.analytics.GoogleAnalyticsTracker;
 import com.prey.PreyAccountData;
 import com.prey.R;
 import com.prey.exceptions.NoMoreDevicesAllowedException;
@@ -183,11 +182,6 @@ protected void onPostExecute(Void unused) {
 					String message = getString(R.string.device_added_congratulations_text);
 					Bundle bundle = new Bundle();
 					bundle.putString("message", message);
-					GoogleAnalyticsTracker.getInstance().trackEvent(
-							"Device",  // Category
-				            "Added",  // Action
-				            "", // Label
-				            1);
 					Intent intent = new Intent(AddDeviceToAccountActivity.this, PermissionInformationActivity.class);
 					intent.putExtras(bundle);
 					startActivity(intent);

diff --git a/src/com/prey/activities/CreateAccountActivity.java b/src/com/prey/activities/CreateAccountActivity.java
@@ -8,7 +8,6 @@
 
 import android.app.AlertDialog;
 
-import com.google.android.apps.analytics.GoogleAnalyticsTracker;
 import com.prey.R;
 import android.app.Dialog;
 import android.app.ProgressDialog;
@@ -116,11 +115,6 @@ protected void onPostExecute(Void unused) {
 				String message = getString(R.string.new_account_congratulations_text, email);
 				Bundle bundle = new Bundle();
 				bundle.putString("message", message);
-				GoogleAnalyticsTracker.getInstance().trackEvent(
-						"Account",  // Category
-			            "Created",  // Action
-			            "", // Label
-			            1);
 				Intent intent = new Intent(CreateAccountActivity.this, PermissionInformationActivity.class);
 				intent.putExtras(bundle);
 				startActivity(intent);

diff --git a/src/com/prey/activities/PreyActivity.java b/src/com/prey/activities/PreyActivity.java
@@ -10,10 +10,8 @@
 import android.os.Bundle;
 import android.view.Window;
 
-import com.google.android.apps.analytics.GoogleAnalyticsTracker;
 import com.prey.PreyConfig;
 import com.prey.PreyUtils;
-import com.prey.analytics.GoogleAnalyticsSessionManager;
 
 public class PreyActivity extends Activity {
 
@@ -23,28 +21,19 @@ protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 		requestWindowFeature(Window.FEATURE_NO_TITLE);
 
-		// Need to do this for every activity that uses google analytics
-        GoogleAnalyticsSessionManager.getInstance(getApplication()).incrementActivityCount();
 	}
 
 
     @Override
     protected void onResume() {
         super.onResume();
-
-        // Example of how to track a pageview event
-        GoogleAnalyticsTracker.getInstance().trackPageView(getClass().getSimpleName());
     }
 
     @Override
     protected void onDestroy() {
         super.onDestroy();
 
-        // Purge analytics so they don't hold references to this activity
-        GoogleAnalyticsTracker.getInstance().dispatch();
 
-        // Need to do this for every activity that uses google analytics
-        GoogleAnalyticsSessionManager.getInstance().decrementActivityCount();
     }
 
 	/*

diff --git a/src/com/prey/activities/WelcomeBatchActivity.java b/src/com/prey/activities/WelcomeBatchActivity.java
@@ -12,7 +12,6 @@
 import android.os.AsyncTask;
 import android.os.Bundle;
 
-import com.google.android.apps.analytics.GoogleAnalyticsTracker;
 import com.prey.PreyAccountData;
 import com.prey.PreyConfig;
 import com.prey.R;
@@ -67,11 +66,6 @@ protected void onPostExecute(Void unused) {
 				String message = getString(R.string.device_added_congratulations_text);
 				Bundle bundle = new Bundle();
 				bundle.putString("message", message);
-				GoogleAnalyticsTracker.getInstance().trackEvent(
-						"Device",  // Category
-			            "Added",  // Action
-			            "", // Label
-			            1);
 				PreyConfig.getPreyConfig(WelcomeBatchActivity.this).setCamouflageSet(true);
 				Intent intent = new Intent(WelcomeBatchActivity.this, PermissionInformationBatchActivity.class);
 				intent.putExtras(bundle);

diff --git a/src/com/prey/analytics/GoogleAnalyticsSessionManager.java b/src/com/prey/analytics/GoogleAnalyticsSessionManager.java
@@ -9,7 +9,7 @@
 import android.app.Application;
 import android.content.Context;
 
-import com.google.android.apps.analytics.GoogleAnalyticsTracker;
+
 import com.prey.FileConfigReader;
 
 public class GoogleAnalyticsSessionManager {
@@ -43,12 +43,12 @@ protected GoogleAnalyticsSessionManager( String apiKey, int dispatchIntervalSecs
      * unusual you should synchronize them yourself.
      */
     public void incrementActivityCount() {
-        if( activityCount==0 )
-            if( dispatchIntervalSecs==null )
+    	 /*  if( activityCount==0 )
+          if( dispatchIntervalSecs==null )
                 GoogleAnalyticsTracker.getInstance().startNewSession(apiKey,context);
             else
                 GoogleAnalyticsTracker.getInstance().startNewSession(apiKey,dispatchIntervalSecs,context);
-
+*/
         ++activityCount;
     }
 
@@ -61,8 +61,8 @@ public void incrementActivityCount() {
     public void decrementActivityCount() {
         activityCount = Math.max(activityCount-1, 0);
 
-        if( activityCount==0 )
-            GoogleAnalyticsTracker.getInstance().stopSession();
+       // if( activityCount==0 )
+          //  GoogleAnalyticsTracker.getInstance().stopSession();
     }
 
 

diff --git a/src/com/prey/net/PreyWebServices.java b/src/com/prey/net/PreyWebServices.java
@@ -39,7 +39,6 @@
 import android.os.Build;
 import android.telephony.TelephonyManager;
 
-import com.google.android.apps.analytics.GoogleAnalyticsTracker;
 import com.prey.FileConfigReader;
 import com.prey.PreyAccountData;
 import com.prey.PreyConfig;
@@ -49,7 +48,6 @@
 import com.prey.PreyPhone.Wifi;
 import com.prey.actions.HttpDataService;
 import com.prey.actions.observer.ActionsController;
-import com.prey.analytics.PreyGoogleAnalytics;
 import com.prey.backwardcompatibility.AboveCupcakeSupport;
 import com.prey.events.Event;
 import com.prey.exceptions.NoMoreDevicesAllowedException;
@@ -305,12 +303,6 @@ public String sendPreyHttpReport(Context ctx, ArrayList<HttpDataService> dataToS
 				httpResponse = PreyRestHttpClient.getInstance(ctx).post(url, parameters, preyConfig,entityFiles);
 			response=httpResponse.getResponseAsString();
 			PreyLogger.i("Report sent:["+httpResponse.getStatusLine()+"]" + response);
-			try{
-				GoogleAnalyticsTracker.getInstance().trackEvent("Report","Sent", "", 1);
-			}catch(NullPointerException ex){
-				GoogleAnalyticsTracker.getInstance().startNewSession(FileConfigReader.getInstance(ctx).getAnalyticsUA(),ctx);
-				GoogleAnalyticsTracker.getInstance().trackEvent("Report","Sent", "", 1);
-			}
 			if (preyConfig.isShouldNotify()) {
 				this.notifyUser(ctx);
 			}
@@ -705,7 +697,6 @@ public PreyHttpResponse sendPreyHttpData(Context ctx, ArrayList<HttpDataService>
 			else
 				preyHttpResponse = PreyRestHttpClient.getInstance(ctx).postAutentication(url, parameters, preyConfig,entityFiles);
 			//PreyLogger.d("Data sent_: " + preyHttpResponse.getResponseAsString());
-			PreyGoogleAnalytics.getInstance().trackAsynchronously(ctx,"Data/Sent");
 			if (preyConfig.isShouldNotify()) {
 				this.notifyUser(ctx);
 			}
@@ -835,7 +826,6 @@ public PreyHttpResponse sendPreyHttpReport(Context ctx, List<HttpDataService> da
 			else
 				preyHttpResponse = PreyRestHttpClient.getInstance(ctx).postAutentication(url, parameters, preyConfig,entityFiles);
 			PreyLogger.i("Report sent: " + preyHttpResponse.getResponseAsString());
-			PreyGoogleAnalytics.getInstance().trackAsynchronously(ctx,"Report/Sent");
 			if (preyConfig.isShouldNotify()) {
 				this.notifyUser(ctx);
 			}