Merge pull request #741 from garvankeeley/amend727

Amendment to 727, track locations when the activity is not showing.

Author: garvankeeley

src/org/mozilla/mozstumbler/client/MainApp.java

@@ -20,6 +20,7 @@
 import org.mozilla.mozstumbler.BuildConfig;
 import org.mozilla.mozstumbler.R;
 import org.mozilla.mozstumbler.client.cellscanner.DefaultCellScanner;
+import org.mozilla.mozstumbler.client.mapview.MapActivity;
 import org.mozilla.mozstumbler.service.AppGlobals;
 import org.mozilla.mozstumbler.service.Prefs;
 import org.mozilla.mozstumbler.service.StumblerService;
@@ -88,6 +89,9 @@ public void onServiceConnected(ComponentName className, IBinder binder) {
 
                 AppGlobals.dataStorageManager.setMaxStorageOnDisk(MAX_BYTES_DISK_STORAGE);
                 AppGlobals.dataStorageManager.setMaxWeeksStored(MAX_WEEKS_OLD_STORED);
+
+                MapActivity.createGpsTrackLocationReceiver(MainApp.this);
+
                 Log.d(LOGTAG, "Service connected");
                 if (mMainActivity != null) {
                     mMainActivity.updateUiOnMainThread();

src/org/mozilla/mozstumbler/client/mapview/MapActivity.java

@@ -66,8 +66,6 @@ public final class MapActivity extends Activity {
     private static final String LON_KEY = "longitude";
     private static final String LOCATIONS_KEY = "locations";
 
-    private final ArrayList<GeoPoint> mLocations = new ArrayList<GeoPoint>();
-
     private MapView mMap;
     private PathOverlay mPathOverlay;
     private AccuracyCircleOverlay mAccuracyOverlay;
@@ -77,6 +75,34 @@ public final class MapActivity extends Activity {
     Timer mGetUrl = new Timer();
     TilesOverlay mCoverageTilesOverlay = null;
 
+    static GpsTrackLocationReceiver sGpsTrackLocationReceiver;
+
+    public static void createGpsTrackLocationReceiver(Context context) {
+        sGpsTrackLocationReceiver = new GpsTrackLocationReceiver();
+        LocalBroadcastManager.getInstance(context).registerReceiver(sGpsTrackLocationReceiver, new IntentFilter(GPSScanner.ACTION_GPS_UPDATED));
+        Log.d(LOGTAG, "Received location");
+    }
+
+    // Create in MainApp, used to grab locations at all times, for drawing the GPS track on the map
+    // The location list stored here is only used in MapActivity onCreate to bootstrap the mPathOverlay
+    public static class GpsTrackLocationReceiver extends BroadcastReceiver {
+        ArrayList<GeoPoint> mLocations = new ArrayList<GeoPoint>();
+
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            String action = intent.getAction();
+            String subject = intent.getStringExtra(Intent.EXTRA_SUBJECT);
+            assert (action.equals(GPSScanner.ACTION_GPS_UPDATED));
+            if (!subject.equals(GPSScanner.SUBJECT_NEW_LOCATION))
+                return;
+
+            Location newPosition = intent.getParcelableExtra(GPSScanner.NEW_LOCATION_ARG_LOCATION);
+            if (newPosition != null) {
+                mLocations.add(new GeoPoint(newPosition));
+            }
+        }
+    }
+
     private class ReporterBroadcastReceiver extends BroadcastReceiver {
         public void reset()
         {
@@ -119,6 +145,7 @@ protected void onCreate(Bundle savedInstanceState) {
         sGPSColor = getResources().getColor(R.color.gps_track);
         mPathOverlay = new PathOverlay(sGPSColor, this);
         mMap.getOverlays().add(mPathOverlay);
+        mPathOverlay.getPaint().setStrokeWidth(8.0f);
 
         mFirstLocationFix = true;
         int zoomLevel = DEFAULT_ZOOM; // Default to seeing the world, until we get a fix
@@ -130,21 +157,17 @@ protected void onCreate(Bundle savedInstanceState) {
                 final double longitude = savedInstanceState.getDouble(LON_KEY);
                 mMap.getController().setCenter(new GeoPoint(latitude, longitude));
             }
-            if (savedInstanceState.containsKey(LOCATIONS_KEY)) {
-                final List<GeoPoint> prevLocations = savedInstanceState.getParcelableArrayList(LOCATIONS_KEY);
-                mLocations.clear();
-                mLocations.addAll(prevLocations);
-                for (GeoPoint p: prevLocations) {
-                    mPathOverlay.addPoint(p);
-                }
-            }
         } else {
             final StumblerService service = ((MainApp) getApplication()).getService();
             final GeoPoint lastLoc = new GeoPoint(service.getLatitude(), service.getLongitude());
             mMap.getController().setCenter(lastLoc);
         }
         mMap.getController().setZoom(zoomLevel);
 
+        for (GeoPoint p : sGpsTrackLocationReceiver.mLocations) {
+            mPathOverlay.addPoint(p);
+        }
+
         Log.d(LOGTAG, "onCreate");
 
         // @TODO: we do a similar "read from URL" in Updater, AbstractCommunicator, make one function for this
@@ -344,7 +367,6 @@ protected void onSaveInstanceState(Bundle bundle) {
         bundle.putInt(ZOOM_KEY, mMap.getZoomLevel());
         bundle.putDouble(LON_KEY, mMap.getMapCenter().getLongitude());
         bundle.putDouble(LAT_KEY, mMap.getMapCenter().getLatitude());
-        bundle.putParcelableArrayList(LOCATIONS_KEY, mLocations);
     }
 
     @Override
@@ -374,6 +396,7 @@ private void updateUI(StumblerService service) {
                 service.getAPCount());
     }
 
+
     private final class GetLocationAndMapItTask extends AsyncTask<StumblerService, Void, Location> {
         @Override
         public Location doInBackground(StumblerService... params) {
@@ -387,7 +410,6 @@ public Location doInBackground(StumblerService... params) {
             final double longitude = result.getLongitude();
             if (Math.abs(latitude) >= 0.01 && Math.abs(longitude) >= 0.01) {
                 final GeoPoint point = new GeoPoint(result.getLatitude(), result.getLongitude());
-                mLocations.add(point);
                 mPathOverlay.addPoint(point);
             }
             return result;