Add the Statistics class. Put in Activity hooks.

9 files changed, 169 insertions, 0 deletions

diff --git a/android/src/com/mapswithme/maps/DownloadResourcesActivity.java b/android/src/com/mapswithme/maps/DownloadResourcesActivity.java
index 5f43a8bc37..a2253d02d8 100644
--- a/android/src/com/mapswithme/maps/DownloadResourcesActivity.java
+++ b/android/src/com/mapswithme/maps/DownloadResourcesActivity.java
@@ -18,6 +18,7 @@ import android.widget.Toast;
 import com.mapswithme.maps.MapStorage.Index;
 import com.mapswithme.maps.location.LocationService;
 import com.mapswithme.util.ConnectionState;
+import com.mapswithme.util.Statistics;
 
 public class DownloadResourcesActivity extends Activity implements LocationService.Listener, MapStorage.Listener
 {
@@ -352,6 +353,22 @@ public class DownloadResourcesActivity extends Activity implements LocationServi
   }
 
   @Override
+  protected void onStart()
+  {
+    super.onStart();
+    
+    Statistics.INSTANCE.startActivity(this.getClass().getSimpleName());
+  }
+  
+  @Override
+  protected void onStop()
+  {
+    super.onStop();
+    
+    Statistics.INSTANCE.stopActivity(this.getClass().getSimpleName());
+  }
+  
+  @Override
   protected void onDestroy()
   {
     super.onDestroy();
diff --git a/android/src/com/mapswithme/maps/DownloadUI.java b/android/src/com/mapswithme/maps/DownloadUI.java
index 541a5ac365..718d29b1ae 100644
--- a/android/src/com/mapswithme/maps/DownloadUI.java
+++ b/android/src/com/mapswithme/maps/DownloadUI.java
@@ -24,6 +24,7 @@ import android.widget.TextView;
 
 import com.mapswithme.maps.MapStorage.Index;
 import com.mapswithme.util.ConnectionState;
+import com.mapswithme.util.Statistics;
 
 
 public class DownloadUI extends ListActivity implements MapStorage.Listener
@@ -611,6 +612,22 @@ public class DownloadUI extends ListActivity implements MapStorage.Listener
 
     setListAdapter(new DownloadAdapter(this));
   }
+  
+  @Override
+  protected void onStart()
+  {
+    super.onStart();
+    
+    Statistics.INSTANCE.startActivity(this.getClass().getSimpleName());
+  }
+  
+  @Override
+  protected void onStop()
+  {
+    super.onStop();
+    
+    Statistics.INSTANCE.stopActivity(this.getClass().getSimpleName());
+  }
 
   private DownloadAdapter getDA()
   {
diff --git a/android/src/com/mapswithme/maps/SearchActivity.java b/android/src/com/mapswithme/maps/SearchActivity.java
index 06b47e530a..a91d9dc373 100644
--- a/android/src/com/mapswithme/maps/SearchActivity.java
+++ b/android/src/com/mapswithme/maps/SearchActivity.java
@@ -24,6 +24,7 @@ import android.widget.Spinner;
 import android.widget.TextView;
 
 import com.mapswithme.maps.location.LocationService;
+import com.mapswithme.util.Statistics;
 import com.mapswithme.util.Utils;
 
 
@@ -461,6 +462,22 @@ public class SearchActivity extends ListActivity implements LocationService.List
   }
 
   @Override
+  protected void onStart()
+  {
+    super.onStart();
+    
+    Statistics.INSTANCE.startActivity(this.getClass().getSimpleName());
+  }
+  
+  @Override
+  protected void onStop()
+  {
+    super.onStop();
+    
+    Statistics.INSTANCE.stopActivity(this.getClass().getSimpleName());
+  }
+
+  @Override
   protected void onResume()
   {
     super.onResume();
diff --git a/android/src/com/mapswithme/maps/bookmarks/AbstractBookmarkActivity.java b/android/src/com/mapswithme/maps/bookmarks/AbstractBookmarkActivity.java
index 79ddf9a2d1..5cfe4c4f45 100644
--- a/android/src/com/mapswithme/maps/bookmarks/AbstractBookmarkActivity.java
+++ b/android/src/com/mapswithme/maps/bookmarks/AbstractBookmarkActivity.java
@@ -9,6 +9,7 @@ import android.view.MenuItem;
 import android.view.inputmethod.InputMethodManager;
 
 import com.mapswithme.maps.bookmarks.data.BookmarkManager;
+import com.mapswithme.util.Statistics;
 
 public abstract class AbstractBookmarkActivity extends Activity
 {
@@ -29,6 +30,22 @@ public abstract class AbstractBookmarkActivity extends Activity
         bar.setDisplayHomeAsUpEnabled(true);
     }
   }
+  
+  @Override
+  protected void onStart()
+  {
+    super.onStart();
+    
+    Statistics.INSTANCE.startActivity(this.getClass().getSimpleName());
+  }
+  
+  @Override
+  protected void onStop()
+  {
+    super.onStop();
+    
+    Statistics.INSTANCE.stopActivity(this.getClass().getSimpleName());
+  }
 
   @Override
   public boolean onOptionsItemSelected(MenuItem item)
diff --git a/android/src/com/mapswithme/maps/bookmarks/AbstractBookmarkListActivity.java b/android/src/com/mapswithme/maps/bookmarks/AbstractBookmarkListActivity.java
index 2ca566a996..afb07e9359 100644
--- a/android/src/com/mapswithme/maps/bookmarks/AbstractBookmarkListActivity.java
+++ b/android/src/com/mapswithme/maps/bookmarks/AbstractBookmarkListActivity.java
@@ -10,6 +10,7 @@ import android.view.MenuItem;
 import android.view.inputmethod.InputMethodManager;
 
 import com.mapswithme.maps.bookmarks.data.BookmarkManager;
+import com.mapswithme.util.Statistics;
 
 public abstract class AbstractBookmarkListActivity extends ListActivity
 {
@@ -32,6 +33,22 @@ public abstract class AbstractBookmarkListActivity extends ListActivity
   }
 
   @Override
+  protected void onStart()
+  {
+    super.onStart();
+    
+    Statistics.INSTANCE.startActivity(this.getClass().getSimpleName());
+  }
+  
+  @Override
+  protected void onStop()
+  {
+    super.onStop();
+    
+    Statistics.INSTANCE.stopActivity(this.getClass().getSimpleName());
+  }
+
+  @Override
   public boolean onOptionsItemSelected(MenuItem item)
   {
     if (item.getItemId() == android.R.id.home)
diff --git a/android/src/com/mapswithme/maps/settings/SettingsActivity.java b/android/src/com/mapswithme/maps/settings/SettingsActivity.java
index 8bdd4c86da..f6f325a80f 100644
--- a/android/src/com/mapswithme/maps/settings/SettingsActivity.java
+++ b/android/src/com/mapswithme/maps/settings/SettingsActivity.java
@@ -10,6 +10,7 @@ import android.preference.Preference.OnPreferenceClickListener;
 import android.preference.PreferenceActivity;
 
 import com.mapswithme.maps.R;
+import com.mapswithme.util.Statistics;
 
 public class SettingsActivity extends PreferenceActivity
 {
@@ -45,4 +46,20 @@ public class SettingsActivity extends PreferenceActivity
       }
     });
   }
+  
+  @Override
+  protected void onStart()
+  {
+    super.onStart();
+    
+    Statistics.INSTANCE.startActivity(this.getClass().getSimpleName());
+  }
+  
+  @Override
+  protected void onStop()
+  {
+    super.onStop();
+    
+    Statistics.INSTANCE.stopActivity(this.getClass().getSimpleName());
+  }
 }
diff --git a/android/src/com/mapswithme/maps/settings/StoragePathActivity.java b/android/src/com/mapswithme/maps/settings/StoragePathActivity.java
index 7fe7ec8611..50bee410a3 100644
--- a/android/src/com/mapswithme/maps/settings/StoragePathActivity.java
+++ b/android/src/com/mapswithme/maps/settings/StoragePathActivity.java
@@ -26,6 +26,7 @@ import android.widget.ListView;
 import android.widget.TextView;
 
 import com.mapswithme.maps.R;
+import com.mapswithme.util.Statistics;
 import com.mapswithme.util.Utils;
 
 
@@ -488,6 +489,22 @@ public class StoragePathActivity extends ListActivity
   }
 
   @Override
+  protected void onStart()
+  {
+    super.onStart();
+    
+    Statistics.INSTANCE.startActivity(this.getClass().getSimpleName());
+  }
+  
+  @Override
+  protected void onStop()
+  {
+    super.onStop();
+    
+    Statistics.INSTANCE.stopActivity(this.getClass().getSimpleName());
+  }
+
+  @Override
   protected void onListItemClick(final ListView l, View v, final int position, long id)
   {
     // Do not process clicks on header items.
diff --git a/android/src/com/mapswithme/util/Statistics.java b/android/src/com/mapswithme/util/Statistics.java
new file mode 100644
index 0000000000..99e5addc07
--- /dev/null
+++ b/android/src/com/mapswithme/util/Statistics.java
@@ -0,0 +1,45 @@
+package com.mapswithme.util;
+
+import android.util.Log;
+
+public enum Statistics
+{
+  INSTANCE;
+	private Statistics() 
+	{
+		Log.d("Stats", "Created Statistics instance.");
+	}
+	
+	public void startActivity(String name)
+	{
+	  synchronized ("live") 
+	  {
+  	  if (liveActivities == 0)
+	    {
+  	    Log.d(TAG, "NEW SESSION.");
+  	  }
+	  
+	    ++liveActivities;
+	  }
+	  
+    Log.d(TAG, "Started activity: " + name + ".");
+	}
+	
+  public void stopActivity(String name)
+  {
+    Log.d(TAG, "Stopped activity: " + name + ".");
+    
+    synchronized ("live") 
+    {
+      --liveActivities;
+      if (liveActivities == 0)
+      {
+        Log.d(TAG, "FINISHED SESSION.");
+      }
+    }
+  }
+  
+	private int liveActivities = 0;
+	private final String TAG = "Stats";
+	// private FlurryAgent flurryAgent;
+}
\ No newline at end of file
diff --git a/android/src/com/nvidia/devtech/NvEventQueueActivity.java b/android/src/com/nvidia/devtech/NvEventQueueActivity.java
index 79bcbf4867..02a88b4a6a 100644
--- a/android/src/com/nvidia/devtech/NvEventQueueActivity.java
+++ b/android/src/com/nvidia/devtech/NvEventQueueActivity.java
@@ -20,6 +20,7 @@ import android.view.SurfaceHolder.Callback;
 import android.view.SurfaceView;
 
 import com.mapswithme.maps.R;
+import com.mapswithme.util.Statistics;
 
 public abstract class NvEventQueueActivity extends Activity
 {
@@ -159,6 +160,8 @@ public abstract class NvEventQueueActivity extends Activity
     System.out.println("**** onStart");
     super.onStart();
 
+    Statistics.INSTANCE.startActivity(this.getClass().getSimpleName());
+
     if (m_nativeLaunched)
       onStartNative();
   }
@@ -220,6 +223,8 @@ public abstract class NvEventQueueActivity extends Activity
   {
     System.out.println("**** onStop");
     super.onStop();
+    
+    Statistics.INSTANCE.stopActivity(this.getClass().getSimpleName());
 
     if (m_nativeLaunched)
       onStopNative();