diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2016-02-06 14:17:49 +0100 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2016-02-06 14:17:49 +0100 |
commit | 2c7e5ab8df69f461758c112f0e0e8d44f479b7e8 (patch) | |
tree | 75dda98111cc15eef8fdca548bc518255f0cd705 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SettingsActivity.java | |
parent | cbf6f15d91f53f460584d959fcd16440c9309be1 (diff) | |
parent | d2cf56f42ed0b37f9a51418c0eefdc951abe10e5 (diff) | |
download | open-keychain-2c7e5ab8df69f461758c112f0e0e8d44f479b7e8.tar.gz open-keychain-2c7e5ab8df69f461758c112f0e0e8d44f479b7e8.tar.bz2 open-keychain-2c7e5ab8df69f461758c112f0e0e8d44f479b7e8.zip |
Merge pull request #1713 from open-keychain/unlink-contact
Deletes linked OpenKeychain contacts if sync is disabled
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SettingsActivity.java')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SettingsActivity.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SettingsActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SettingsActivity.java index 7666a230a..ea70cde2a 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SettingsActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SettingsActivity.java @@ -51,6 +51,8 @@ import android.widget.LinearLayout; import org.sufficientlysecure.keychain.Constants; import org.sufficientlysecure.keychain.R; import org.sufficientlysecure.keychain.compatibility.AppCompatPreferenceActivity; +import org.sufficientlysecure.keychain.service.ContactSyncAdapterService; +import org.sufficientlysecure.keychain.ui.base.BaseActivity; import org.sufficientlysecure.keychain.ui.util.Notify; import org.sufficientlysecure.keychain.ui.util.ThemeChanger; import org.sufficientlysecure.keychain.util.Log; @@ -79,6 +81,7 @@ public class SettingsActivity extends AppCompatPreferenceActivity { @Override protected void onResume() { super.onResume(); + BaseActivity.onResumeChecks(this); if (mThemeChanger.changeTheme()) { Intent intent = getIntent(); @@ -463,6 +466,8 @@ public class SettingsActivity extends AppCompatPreferenceActivity { } else { // disable syncs ContentResolver.setSyncAutomatically(account, authority, false); + // immediately delete any linked contacts + ContactSyncAdapterService.deleteIfSyncDisabled(getActivity()); // cancel any ongoing/pending syncs ContentResolver.cancelSync(account, authority); setSummary(syncCheckBox, authority, false); |