diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-12-21 20:32:02 +0100 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-12-21 20:32:02 +0100 |
| commit | 6c25cb19270b70eb8dd20f9731b3b65cbc198f11 (patch) | |
| tree | d85014dfbcf01f486fef9c0920e7c9fb239fa7de /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui | |
| parent | e7c9be955630a763a4d67a00fd8dbc195b2675b9 (diff) | |
| parent | 92d2a052f1e660f498294bdb57f1237ae81fc770 (diff) | |
| download | open-keychain-6c25cb19270b70eb8dd20f9731b3b65cbc198f11.tar.gz open-keychain-6c25cb19270b70eb8dd20f9731b3b65cbc198f11.tar.bz2 open-keychain-6c25cb19270b70eb8dd20f9731b3b65cbc198f11.zip | |
Merge branch 'master' of github.com:open-keychain/open-keychain
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SettingsActivity.java | 2 |
1 files changed, 2 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 2b994e11c..cd754d60e 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SettingsActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SettingsActivity.java @@ -476,6 +476,8 @@ public class SettingsActivity extends AppCompatPreferenceActivity { private boolean checkContactsPermission(String authority) { if (!ContactsContract.AUTHORITY.equals(authority)) { + // provides convenience of not using separate checks for keyserver and contact sync + // in initializeSyncCheckBox return true; } |