Skip to content

Commit ea57855

Browse files
committed
Fix memory leak C, I hope
1 parent 59a7428 commit ea57855

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

app/src/main/java/fr/free/nrw/commons/nearby/NearbyActivity.java

+8-3
Original file line numberDiff line numberDiff line change
@@ -262,8 +262,6 @@ protected void onStart() {
262262
@Override
263263
protected void onStop() {
264264
super.onStop();
265-
locationManager.removeLocationListener(this);
266-
locationManager.unregisterLocationManager();
267265
}
268266

269267
@Override
@@ -292,8 +290,13 @@ public void onPause() {
292290
// to the retained fragment object to perform its own cleanup.
293291
removeMapFragment();
294292
removeListFragment();
295-
unregisterReceiver(broadcastReceiver);
293+
296294
}
295+
unregisterReceiver(broadcastReceiver);
296+
broadcastReceiver = null;
297+
locationManager.removeLocationListener(this);
298+
locationManager.unregisterLocationManager();
299+
297300
}
298301

299302
private void addNetworkBroadcastReceiver() {
@@ -422,6 +425,7 @@ private void removeMapFragment() {
422425
if (nearbyMapFragment != null) {
423426
android.support.v4.app.FragmentManager fm = getSupportFragmentManager();
424427
fm.beginTransaction().remove(nearbyMapFragment).commit();
428+
nearbyMapFragment = null;
425429
}
426430
}
427431

@@ -433,6 +437,7 @@ private void removeListFragment() {
433437
if (nearbyListFragment != null) {
434438
android.support.v4.app.FragmentManager fm = getSupportFragmentManager();
435439
fm.beginTransaction().remove(nearbyListFragment).commit();
440+
nearbyListFragment = null;
436441
}
437442
}
438443

0 commit comments

Comments
 (0)