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/KeychainApplication.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/KeychainApplication.java')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java index 381af0af8..c9b9e305f 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java @@ -118,8 +118,8 @@ public class KeychainApplication extends Application { } /** - * @return the OpenKeychain contact/sync account if it exists or was successfully created, null - * otherwise + * @return the OpenKeychain contact/keyserver sync account if it exists or was successfully + * created, null otherwise */ public static @Nullable Account createAccountIfNecessary(Context context) { try { |