Merge branch 'master' of github.com:open-keychain/open-keychain

2015-12-21 20:32:02 +01:00
parent e7c9be9556 92d2a052f1
commit 6c25cb1927
9 changed files with 78 additions and 45 deletions
--- 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;
            }