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/base/BaseActivity.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/base/BaseActivity.java')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseActivity.java | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseActivity.java index aa4e7d840..c9aaa9da5 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseActivity.java @@ -18,6 +18,7 @@ package org.sufficientlysecure.keychain.ui.base; import android.app.Activity; +import android.content.Context; import android.content.Intent; import android.os.Bundle; import android.support.v7.app.ActionBar; @@ -30,6 +31,7 @@ import android.view.ViewGroup; import android.widget.TextView; import org.sufficientlysecure.keychain.R; +import org.sufficientlysecure.keychain.service.ContactSyncAdapterService; import org.sufficientlysecure.keychain.service.KeyserverSyncAdapterService; import org.sufficientlysecure.keychain.ui.util.ThemeChanger; @@ -52,7 +54,7 @@ public abstract class BaseActivity extends AppCompatActivity { @Override protected void onResume() { super.onResume(); - KeyserverSyncAdapterService.cancelUpdates(this); + onResumeChecks(this); if (mThemeChanger.changeTheme()) { Intent intent = getIntent(); @@ -63,6 +65,12 @@ public abstract class BaseActivity extends AppCompatActivity { } } + public static void onResumeChecks(Context context) { + KeyserverSyncAdapterService.cancelUpdates(context); + // in case user has disabled sync from settings + ContactSyncAdapterService.deleteIfSyncDisabled(context); + } + protected void initLayout() { } |