diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-11-23 09:06:12 +0100 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-11-23 09:06:12 +0100 |
commit | c5bcbce28fa45d8d1e5714d111f3cc24a2c99d0e (patch) | |
tree | d7feab97088262b21343ae8e98955c0cc42b5378 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/ImportOperation.java | |
parent | dc631e5c1542b09e1359a861e98a2c03b93e05cd (diff) | |
download | open-keychain-c5bcbce28fa45d8d1e5714d111f3cc24a2c99d0e.tar.gz open-keychain-c5bcbce28fa45d8d1e5714d111f3cc24a2c99d0e.tar.bz2 open-keychain-c5bcbce28fa45d8d1e5714d111f3cc24a2c99d0e.zip |
Show notification when READ_CONTACTS permission is denied in sync service, hide linked contact card if permission is denied
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/ImportOperation.java')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/ImportOperation.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/ImportOperation.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/ImportOperation.java index 19a05790f..70288123f 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/ImportOperation.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/ImportOperation.java @@ -124,7 +124,7 @@ public class ImportOperation extends BaseOperation<ImportKeyringParcel> { /** * Since the introduction of multithreaded import, we expect calling functions to handle the - * contact-to-key sync i.e ContactSyncAdapterService.requestSync() + * contact-to-key sync i.e ContactSyncAdapterService.requestContactsSync() * * @param entries keys to import * @param num number of keys to import @@ -325,7 +325,7 @@ public class ImportOperation extends BaseOperation<ImportKeyringParcel> { // Special: make sure new data is synced into contacts // disabling sync right now since it reduces speed while multi-threading // so, we expect calling functions to take care of it. KeychainService handles this - // ContactSyncAdapterService.requestSync(); + // ContactSyncAdapterService.requestContactsSync(); // convert to long array long[] importedMasterKeyIdsArray = new long[importedMasterKeyIds.size()]; @@ -405,7 +405,7 @@ public class ImportOperation extends BaseOperation<ImportKeyringParcel> { result = multiThreadedKeyImport(keyList.iterator(), keyList.size(), keyServer, proxy); } - ContactSyncAdapterService.requestSync(); + ContactSyncAdapterService.requestContactsSync(); return result; } |