aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeyserverSyncAdapterService.java
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2015-11-23 11:43:44 +0100
committerDominik Schürmann <dominik@dominikschuermann.de>2015-11-23 11:43:44 +0100
commiteda53d42de111bbba199060e77881fa044a71c7a (patch)
tree0630a14e9f41410a3c383a2ae154a7c5e270483a /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeyserverSyncAdapterService.java
parentcd601988db41f7651f376ef419be3dd50aaa4e10 (diff)
downloadopen-keychain-eda53d42de111bbba199060e77881fa044a71c7a.tar.gz
open-keychain-eda53d42de111bbba199060e77881fa044a71c7a.tar.bz2
open-keychain-eda53d42de111bbba199060e77881fa044a71c7a.zip
Disable contact sync by default on Android >= 6
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeyserverSyncAdapterService.java')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeyserverSyncAdapterService.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeyserverSyncAdapterService.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeyserverSyncAdapterService.java
index 122eb6cf4..fc3224e39 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeyserverSyncAdapterService.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeyserverSyncAdapterService.java
@@ -512,7 +512,7 @@ public class KeyserverSyncAdapterService extends Service {
Account account = new Account(Constants.ACCOUNT_NAME, Constants.ACCOUNT_TYPE);
if (accounts.length == 0) {
if (!manager.addAccountExplicitly(account, null, null)) {
- Log.e(Constants.TAG, "Adding account failed!");
+ Log.d(Constants.TAG, "account already exists, the account is null, or another error occured");
}
}
// for keyserver sync