diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-12-10 13:16:28 +0100 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-12-10 13:16:28 +0100 |
commit | 1b141c61e15526d8a979c917b632bba91b77b859 (patch) | |
tree | f7085ba8e0143e3c023c2ba3412fea8333f99ebc /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysProxyActivity.java | |
parent | a5d7a8ddf2c0fd03b386284bf0cdde9aba8dcee3 (diff) | |
parent | f29280bbb268d112426c6662e1227118819fb904 (diff) | |
download | open-keychain-1b141c61e15526d8a979c917b632bba91b77b859.tar.gz open-keychain-1b141c61e15526d8a979c917b632bba91b77b859.tar.bz2 open-keychain-1b141c61e15526d8a979c917b632bba91b77b859.zip |
Merge pull request #1610 from open-keychain/facebook
Basic Facebook Support
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysProxyActivity.java')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysProxyActivity.java | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysProxyActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysProxyActivity.java index 45ce604c3..3969f4039 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysProxyActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysProxyActivity.java @@ -19,7 +19,6 @@ package org.sufficientlysecure.keychain.ui; import android.annotation.TargetApi; import android.content.Intent; -import android.content.pm.ActivityInfo; import android.net.Uri; import android.nfc.NdefMessage; import android.nfc.NfcAdapter; @@ -130,7 +129,6 @@ public class ImportKeysProxyActivity extends FragmentActivity String scannedContent = scanResult.getContents(); processScannedContent(scannedContent); - return; } } @@ -199,7 +197,7 @@ public class ImportKeysProxyActivity extends FragmentActivity } public void importKeys(String fingerprint) { - ParcelableKeyRing keyEntry = new ParcelableKeyRing(fingerprint, null, null); + ParcelableKeyRing keyEntry = new ParcelableKeyRing(fingerprint, null); ArrayList<ParcelableKeyRing> selectedEntries = new ArrayList<>(); selectedEntries.add(keyEntry); @@ -209,12 +207,7 @@ public class ImportKeysProxyActivity extends FragmentActivity private void startImportService(ArrayList<ParcelableKeyRing> keyRings) { // search config - { - Preferences prefs = Preferences.getPreferences(this); - Preferences.CloudSearchPrefs cloudPrefs = - new Preferences.CloudSearchPrefs(true, true, prefs.getPreferredKeyserver()); - mKeyserver = cloudPrefs.keyserver; - } + mKeyserver = Preferences.getPreferences(this).getPreferredKeyserver(); mKeyList = keyRings; |