@@ -262,8 +262,6 @@ protected void onStart() {
262
262
@ Override
263
263
protected void onStop () {
264
264
super .onStop ();
265
- locationManager .removeLocationListener (this );
266
- locationManager .unregisterLocationManager ();
267
265
}
268
266
269
267
@ Override
@@ -292,8 +290,13 @@ public void onPause() {
292
290
// to the retained fragment object to perform its own cleanup.
293
291
removeMapFragment ();
294
292
removeListFragment ();
295
- unregisterReceiver ( broadcastReceiver );
293
+
296
294
}
295
+ unregisterReceiver (broadcastReceiver );
296
+ broadcastReceiver = null ;
297
+ locationManager .removeLocationListener (this );
298
+ locationManager .unregisterLocationManager ();
299
+
297
300
}
298
301
299
302
private void addNetworkBroadcastReceiver () {
@@ -422,6 +425,7 @@ private void removeMapFragment() {
422
425
if (nearbyMapFragment != null ) {
423
426
android .support .v4 .app .FragmentManager fm = getSupportFragmentManager ();
424
427
fm .beginTransaction ().remove (nearbyMapFragment ).commit ();
428
+ nearbyMapFragment = null ;
425
429
}
426
430
}
427
431
@@ -433,6 +437,7 @@ private void removeListFragment() {
433
437
if (nearbyListFragment != null ) {
434
438
android .support .v4 .app .FragmentManager fm = getSupportFragmentManager ();
435
439
fm .beginTransaction ().remove (nearbyListFragment ).commit ();
440
+ nearbyListFragment = null ;
436
441
}
437
442
}
438
443
0 commit comments