From 31737efd87cfe6b0695aec60d640074307e2f508 Mon Sep 17 00:00:00 2001
From: Rodrigo Damazio <Rodrigo Damazio@localhost>
Date: Wed, 1 Jun 2011 01:44:07 -0300
Subject: [PATCH] And the moment we've been all waiting for....MyTracks is no
 longer a singleton.

---
 .../com/google/android/apps/mytracks/ChartActivity.java   | 2 +-
 .../src/com/google/android/apps/mytracks/MapActivity.java | 4 ++--
 .../src/com/google/android/apps/mytracks/MyTracks.java    | 8 --------
 .../com/google/android/apps/mytracks/StatsActivity.java   | 4 ++--
 .../com/google/android/apps/mytracks/MyTracksTest.java    | 1 -
 5 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/MyTracks/src/com/google/android/apps/mytracks/ChartActivity.java b/MyTracks/src/com/google/android/apps/mytracks/ChartActivity.java
index 470518987..45a92f2a6 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/ChartActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/ChartActivity.java
@@ -107,7 +107,7 @@ public class ChartActivity extends Activity implements TrackDataListener {
   protected void onCreate(Bundle savedInstanceState) {
     Log.w(TAG, "ChartActivity.onCreate");
     super.onCreate(savedInstanceState);
-    dataHub = MyTracks.getInstance().getDataHub();
+    dataHub = TrackDataHub.getInstance(this);
 
     // The volume we want to control is the Text-To-Speech volume
     int volumeStream =
diff --git a/MyTracks/src/com/google/android/apps/mytracks/MapActivity.java b/MyTracks/src/com/google/android/apps/mytracks/MapActivity.java
index 4ee5d26cd..69ccad437 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/MapActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/MapActivity.java
@@ -123,7 +123,7 @@ public class MapActivity extends com.google.android.maps.MapActivity
   // ------------------------
 
   @Override
-  public void onCreate(Bundle bundle) {
+  protected void onCreate(Bundle bundle) {
     Log.d(TAG, "MapActivity.onCreate");
     super.onCreate(bundle);
 
@@ -132,7 +132,7 @@ public class MapActivity extends com.google.android.maps.MapActivity
         new StatusAnnouncerFactory(ApiFeatures.getInstance()).getVolumeStream();
     setVolumeControlStream(volumeStream);
 
-    dataHub = MyTracks.getInstance().getDataHub();
+    dataHub = TrackDataHub.getInstance(this);
 
     // We don't need a window title bar:
     requestWindowFeature(Window.FEATURE_NO_TITLE);
diff --git a/MyTracks/src/com/google/android/apps/mytracks/MyTracks.java b/MyTracks/src/com/google/android/apps/mytracks/MyTracks.java
index 29af80da0..14273d723 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/MyTracks.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/MyTracks.java
@@ -120,7 +120,6 @@ public class MyTracks extends TabActivity implements OnTouchListener {
   protected void onCreate(Bundle savedInstanceState) {
     Log.d(TAG, "MyTracks.onCreate");
     super.onCreate(savedInstanceState);
-    instance = this;
     ApiFeatures apiFeatures = ApiFeatures.getInstance();
     if (!SystemUtils.isRelease(this)) {
       apiFeatures.getApiPlatformAdapter().enableStrictMode();
@@ -480,11 +479,4 @@ public class MyTracks extends TabActivity implements OnTouchListener {
   public TrackDataHub getDataHub() {
     return dataHub;
   }
-
-  // TODO: Remove very soon
-  private static MyTracks instance;
-
-  public static MyTracks getInstance() {
-    return instance;
-  }
 }
diff --git a/MyTracks/src/com/google/android/apps/mytracks/StatsActivity.java b/MyTracks/src/com/google/android/apps/mytracks/StatsActivity.java
index d11e7d56d..c4490fa1d 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/StatsActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/StatsActivity.java
@@ -105,11 +105,11 @@ public class StatsActivity extends Activity implements TrackDataListener {
 
   /** Called when the activity is first created. */
   @Override
-  public void onCreate(Bundle savedInstanceState) {
+  protected void onCreate(Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
 
     preferences = getSharedPreferences(Constants.SETTINGS_NAME, 0);
-    dataHub = MyTracks.getInstance().getDataHub();
+    dataHub = TrackDataHub.getInstance(this);
     utils = new StatsUtilities(this);
 
     // The volume we want to control is the Text-To-Speech volume
diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/MyTracksTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/MyTracksTest.java
index 6f836a91c..d3b54a869 100644
--- a/MyTracksTest/src/com/google/android/apps/mytracks/MyTracksTest.java
+++ b/MyTracksTest/src/com/google/android/apps/mytracks/MyTracksTest.java
@@ -180,7 +180,6 @@ public class MyTracksTest extends ActivityInstrumentationTestCase2<MyTracks>{
 
   private void assertInitialized() {
     assertNotNull(getActivity());
-    assertNotNull(MyTracks.getInstance());
   }
 
   /**