merge heads

MyTracks/AndroidManifest.xml

@@ -21,6 +21,7 @@ limitations under the License.
           android:versionName="1.1.9">
   <application android:icon="@drawable/arrow_icon"
                android:label="@string/app_name"
+               android:name="com.google.android.apps.mytracks.MyTracksApplication"
                android:backupAgent="com.google.android.apps.mytracks.io.backup.MyTracksBackupAgent">
     <uses-library android:name="com.google.android.maps" />
 

MyTracks/src/com/google/android/apps/mytracks/ChartActivity.java

@@ -20,11 +20,11 @@ import static com.google.android.apps.mytracks.Constants.TAG;
 import com.google.android.apps.mytracks.ChartView.Mode;
 import com.google.android.apps.mytracks.content.MyTracksLocation;
 import com.google.android.apps.mytracks.content.Sensor;
-import com.google.android.apps.mytracks.content.TrackDataHub;
-import com.google.android.apps.mytracks.content.TrackDataListener;
 import com.google.android.apps.mytracks.content.Sensor.SensorDataSet;
-import com.google.android.apps.mytracks.content.TrackDataHub.ListenerDataType;
 import com.google.android.apps.mytracks.content.Track;
+import com.google.android.apps.mytracks.content.TrackDataHub;
+import com.google.android.apps.mytracks.content.TrackDataHub.ListenerDataType;
+import com.google.android.apps.mytracks.content.TrackDataListener;
 import com.google.android.apps.mytracks.content.Waypoint;
 import com.google.android.apps.mytracks.services.tasks.StatusAnnouncerFactory;
 import com.google.android.apps.mytracks.stats.DoubleBuffer;
@@ -148,7 +148,7 @@ public class ChartActivity extends Activity implements TrackDataListener {
   protected void onResume() {
     super.onResume();
 
-    dataHub = TrackDataHub.getStartedInstance();
+    dataHub = ((MyTracksApplication) getApplication()).getTrackDataHub();
     dataHub.registerTrackDataListener(this, EnumSet.of(
         ListenerDataType.SELECTED_TRACK_CHANGED,
         ListenerDataType.TRACK_UPDATES,

MyTracks/src/com/google/android/apps/mytracks/MapActivity.java

@@ -185,7 +185,7 @@ public class MapActivity extends com.google.android.maps.MapActivity
     Log.d(TAG, "MapActivity.onResume");
     super.onResume();
 
-    dataHub = TrackDataHub.getStartedInstance();
+    dataHub = ((MyTracksApplication) getApplication()).getTrackDataHub();
     dataHub.registerTrackDataListener(this, EnumSet.of(
         ListenerDataType.SELECTED_TRACK_CHANGED,
         ListenerDataType.POINT_UPDATES,

MyTracks/src/com/google/android/apps/mytracks/MyTracks.java

@@ -146,7 +146,7 @@ public class MyTracks extends TabActivity implements OnTouchListener {
 
     providerUtils = MyTracksProviderUtils.Factory.get(this);
     preferences = getSharedPreferences(Constants.SETTINGS_NAME, 0);
-    dataHub = TrackDataHub.newInstance(this);
+    dataHub = ((MyTracksApplication) getApplication()).getTrackDataHub();
     menuManager = new MenuManager(this);
     serviceConnection = new TrackRecordingServiceConnection(this, serviceBindCallback);
 
@@ -249,7 +249,6 @@ public class MyTracks extends TabActivity implements OnTouchListener {
   protected void onDestroy() {
     Log.d(TAG, "MyTracks.onDestroy");
     serviceConnection.unbind();
-
     super.onDestroy();
   }
 

MyTracks/src/com/google/android/apps/mytracks/MyTracksApplication.java

@@ -0,0 +1,42 @@
+/*
+ * Copyright 2008 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.google.android.apps.mytracks;
+
+import com.google.android.apps.mytracks.content.TrackDataHub;
+
+import android.app.Application;
+
+/**
+ * MyTracksApplication for keeping global state.
+ *
+ * @author jshih@google.com (Jimmy Shih)
+ */
+public class MyTracksApplication extends Application {
+
+  private TrackDataHub trackDataHub;
+
+  /**
+   * Gets the application's TrackDataHub.
+   * 
+   * Note: use synchronized to make sure only one instance is created per application.
+   */
+  public synchronized TrackDataHub getTrackDataHub() {
+    if (trackDataHub == null) {
+      trackDataHub = TrackDataHub.newInstance(getApplicationContext());
+    }
+    return trackDataHub;
+  }
+}

MyTracks/src/com/google/android/apps/mytracks/StatsActivity.java

@@ -137,7 +137,7 @@ public class StatsActivity extends Activity implements TrackDataListener {
   protected void onResume() {
     super.onResume();
 
-    dataHub = TrackDataHub.getStartedInstance();
+    dataHub = ((MyTracksApplication) getApplication()).getTrackDataHub();
     dataHub.registerTrackDataListener(this, EnumSet.of(
         ListenerDataType.SELECTED_TRACK_CHANGED,
         ListenerDataType.TRACK_UPDATES,

MyTracks/src/com/google/android/apps/mytracks/content/TrackDataHub.java

@@ -195,15 +195,12 @@ public class TrackDataHub {
   private int lastSamplingFrequency;
   private DoubleBufferedLocationFactory locationFactory;
 
-  private static TrackDataHub startedInstance;
-
+  private boolean started = false;
+  
   /**
    * Builds a new {@link TrackDataHub} instance.
    */
   public synchronized static TrackDataHub newInstance(Context context) {
-    // Ensure our singleton is never bound to an activity, to avoid memory leaks.
-    context = context.getApplicationContext();
-
     SharedPreferences preferences = context.getSharedPreferences(Constants.SETTINGS_NAME, 0);
     MyTracksProviderUtils providerUtils = MyTracksProviderUtils.Factory.get(context);
     return new TrackDataHub(context,
@@ -240,11 +237,11 @@ public class TrackDataHub {
    */
   public void start() {
     Log.i(TAG, "TrackDataHub.start");
-    if (startedInstance != null) {
+    if (isStarted()) {
       Log.w(TAG, "Already started, ignoring");
       return;
     }
-    startedInstance = this;
+    started = true;
 
     listenerHandlerThread = new HandlerThread("trackDataContentThread");
     listenerHandlerThread.start();
@@ -266,20 +263,6 @@ public class TrackDataHub {
     return new DataSourcesWrapperImpl(context, preferences);
   }
 
-  /**
-   * If there's an instance for which {@link start} has been called, returns it.
-   *
-   * @return the started instance
-   * @throws IllegalStateException if there isn't a started instance
-   */
-  public static TrackDataHub getStartedInstance() {
-    if (startedInstance == null) {
-      throw new IllegalStateException("Data hub not started");
-    }
-
-    return startedInstance;
-  }
-
   /**
    * Stops listening to data sources and reporting the data to external
    * listeners.
@@ -290,12 +273,12 @@ public class TrackDataHub {
       Log.w(TAG, "Not started, ignoring");
       return;
     }
-
+    
     // Unregister internal listeners even if there are external listeners registered.
     dataSourceManager.unregisterAllListeners();
     listenerHandlerThread.getLooper().quit();
 
-    startedInstance = null;
+    started = false;
 
     dataSources = null;
     dataSourceManager = null;
@@ -304,7 +287,7 @@ public class TrackDataHub {
   }
 
   private boolean isStarted() {
-    return startedInstance != null;
+    return started;
   }
 
   @Override

MyTracks/src/com/google/android/apps/mytracks/io/file/WriteProgressController.java

@@ -70,6 +70,11 @@ class WriteProgressController {
   public void setOnCompletionListener(OnCompletionListener onCompletionListener) {
     this.onCompletionListener = onCompletionListener;
   }
+  
+  // For testing purpose
+  OnCompletionListener getOnCompletionListener() {
+    return onCompletionListener;
+  }
 
   public ProgressDialog createProgressDialog() {
     dialog = new ProgressDialog(activity);