aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/UploadKeyActivity.java
diff options
context:
space:
mode:
authorAdithya Abraham Philip <adithyaphilip@gmail.com>2015-06-11 05:33:31 +0530
committerAdithya Abraham Philip <adithyaphilip@gmail.com>2015-07-03 20:46:15 +0530
commit79fc0f97eafd6a70bd40bb8cddd50de52ef84f7c (patch)
treeb98f56851448e3ee5f49d548fcf414074ebdd5ba /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/UploadKeyActivity.java
parentaa7ad4ac634123db73dbbd59930df49086c9395c (diff)
downloadopen-keychain-79fc0f97eafd6a70bd40bb8cddd50de52ef84f7c.tar.gz
open-keychain-79fc0f97eafd6a70bd40bb8cddd50de52ef84f7c.tar.bz2
open-keychain-79fc0f97eafd6a70bd40bb8cddd50de52ef84f7c.zip
added proxy to all import operations using KeychainService
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.java16
1 files changed, 15 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 8b49f3b96..ee37b4b98 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,9 @@ import org.sufficientlysecure.keychain.service.ExportKeyringParcel;
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.ParcelableProxy;
import org.sufficientlysecure.keychain.util.Preferences;
+import org.sufficientlysecure.keychain.util.orbot.OrbotHelper;
/**
* Sends the selected public key to a keyserver
@@ -76,7 +78,19 @@ public class UploadKeyActivity extends BaseActivity
mUploadButton.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View v) {
- uploadKey();
+ final Preferences.ProxyPrefs proxyPrefs = Preferences.getPreferences(UploadKeyActivity.this)
+ .getProxyPrefs();
+ Runnable ignoreTor = new Runnable() {
+ @Override
+ public void run() {
+ uploadKey(proxyPrefs.parcelableProxy);
+ }
+ };
+
+ if (OrbotHelper.isOrbotInRequiredState(R.string.orbot_ignore_tor, ignoreTor, proxyPrefs,
+ UploadKeyActivity.this)) {
+ uploadKey(proxyPrefs.parcelableProxy);
+ }
}
});