mirror of
https://github.com/syncthing/syncthing-android.git
synced 2025-02-10 19:14:45 +00:00
Fix implementation of ContentResolver.removeStatusChangeListener
This commit is contained in:
parent
b040a6e4bc
commit
0d337d97b7
1 changed files with 8 additions and 4 deletions
|
@ -43,9 +43,10 @@ public class RunConditionMonitor {
|
|||
private static final String POWER_SOURCE_AC = "ac_power";
|
||||
private static final String POWER_SOURCE_BATTERY = "battery_power";
|
||||
|
||||
private @Nullable Object mSyncStatusObserverHandle = null;
|
||||
private final SyncStatusObserver mSyncStatusObserver = new SyncStatusObserver() {
|
||||
@Override
|
||||
public void onStatusChanged(int i) {
|
||||
public void onStatusChanged(int which) {
|
||||
updateShouldRunDecision();
|
||||
}
|
||||
};
|
||||
|
@ -94,8 +95,8 @@ public class RunConditionMonitor {
|
|||
}
|
||||
|
||||
// SyncStatusObserver to monitor android's "AutoSync" quick toggle.
|
||||
ContentResolver.addStatusChangeListener(ContentResolver.SYNC_OBSERVER_TYPE_SETTINGS,
|
||||
mSyncStatusObserver);
|
||||
mSyncStatusObserverHandle = ContentResolver.addStatusChangeListener(
|
||||
ContentResolver.SYNC_OBSERVER_TYPE_SETTINGS, mSyncStatusObserver);
|
||||
|
||||
// Initially determine if syncthing should run under current circumstances.
|
||||
updateShouldRunDecision();
|
||||
|
@ -103,7 +104,10 @@ public class RunConditionMonitor {
|
|||
|
||||
public void shutdown() {
|
||||
Log.v(TAG, "Shutting down");
|
||||
ContentResolver.removeStatusChangeListener(mSyncStatusObserver);
|
||||
if (mSyncStatusObserverHandle != null) {
|
||||
ContentResolver.removeStatusChangeListener(mSyncStatusObserverHandle);
|
||||
mSyncStatusObserverHandle = null;
|
||||
}
|
||||
mReceiverManager.unregisterAllReceivers(mContext);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue