diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-07-08 11:41:46 +0200 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-07-08 11:41:46 +0200 |
commit | 7b35f9b07aef6b36e7cb7bdedf178d2c5a4588ad (patch) | |
tree | b7275511e3014002f6cfc9072d0af08e45b3814a /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/UploadKeyActivity.java | |
parent | 9eee9acba28cea2e97d0de653e5f6c07e01b12b6 (diff) | |
parent | be6b7ff89993de4eff1eb2499f7537ab74a6d8c8 (diff) | |
download | open-keychain-7b35f9b07aef6b36e7cb7bdedf178d2c5a4588ad.tar.gz open-keychain-7b35f9b07aef6b36e7cb7bdedf178d2c5a4588ad.tar.bz2 open-keychain-7b35f9b07aef6b36e7cb7bdedf178d2c5a4588ad.zip |
Merge pull request #1424 from open-keychain/import-proxy
Shifted proxy logic to ImportKeysListCloudLoader
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/UploadKeyActivity.java')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/UploadKeyActivity.java | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/UploadKeyActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/UploadKeyActivity.java index 703a85b0f..067b6c15e 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/UploadKeyActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/UploadKeyActivity.java @@ -37,7 +37,6 @@ import org.sufficientlysecure.keychain.ui.base.BaseActivity; import org.sufficientlysecure.keychain.ui.base.CryptoOperationHelper; import org.sufficientlysecure.keychain.util.Log; import org.sufficientlysecure.keychain.util.Preferences; -import org.sufficientlysecure.keychain.util.orbot.OrbotHelper; /** * Sends the selected public key to a keyserver |