1 files changed, 21 insertions, 39 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 b9f1bf870..29f2511a0 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysProxyActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysProxyActivity.java
@@ -58,13 +58,12 @@ import java.util.Locale;
 public class ImportKeysProxyActivity extends FragmentActivity {
 
     public static final String ACTION_QR_CODE_API = OpenKeychainIntents.IMPORT_KEY_FROM_QR_CODE;
+    // implies activity returns scanned fingerprint as extra and does not import
     public static final String ACTION_SCAN_WITH_RESULT = Constants.INTENT_PREFIX + "SCAN_QR_CODE_WITH_RESULT";
     public static final String ACTION_SCAN_IMPORT = Constants.INTENT_PREFIX + "SCAN_QR_CODE_IMPORT";
 
     public static final String EXTRA_FINGERPRINT = "fingerprint";
 
-    boolean returnResult;
-
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -82,18 +81,9 @@ public class ImportKeysProxyActivity extends FragmentActivity {
         if (scheme != null && scheme.toLowerCase(Locale.ENGLISH).equals(Constants.FINGERPRINT_SCHEME)) {
             // Scanning a fingerprint directly with Barcode Scanner, thus we already have scanned
 
-            returnResult = false;
             processScannedContent(dataUri);
-        } else if (ACTION_SCAN_IMPORT.equals(action) || ACTION_QR_CODE_API.equals(action)) {
-            returnResult = false;
-            IntentIntegrator integrator = new IntentIntegrator(this);
-            integrator.setDesiredBarcodeFormats(IntentIntegrator.QR_CODE_TYPES)
-                    .setPrompt(getString(R.string.import_qr_code_text))
-                    .setResultDisplayDuration(0);
-            integrator.setOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
-            integrator.initiateScan();
-        } else if (ACTION_SCAN_WITH_RESULT.equals(action)) {
-            returnResult = true;
+        } else if (ACTION_SCAN_WITH_RESULT.equals(action)
+                || ACTION_SCAN_IMPORT.equals(action) || ACTION_QR_CODE_API.equals(action)) {
             IntentIntegrator integrator = new IntentIntegrator(this);
             integrator.setDesiredBarcodeFormats(IntentIntegrator.QR_CODE_TYPES)
                     .setPrompt(getString(R.string.import_qr_code_text))
@@ -103,7 +93,6 @@ public class ImportKeysProxyActivity extends FragmentActivity {
         } else if (NfcAdapter.ACTION_NDEF_DISCOVERED.equals(getIntent().getAction())) {
             // Check to see if the Activity started due to an Android Beam
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
-                returnResult = false;
                 handleActionNdefDiscovered(getIntent());
             } else {
                 Log.e(Constants.TAG, "Android Beam not supported by Android < 4.1");
@@ -147,69 +136,63 @@ public class ImportKeysProxyActivity extends FragmentActivity {
     }
 
     private void processScannedContent(Uri uri) {
+        String action = getIntent().getAction();
 
         Log.d(Constants.TAG, "scanned: " + uri);
 
-        String fingerprint = null;
-
         // example: openpgp4fpr:73EE2314F65FA92EC2390D3A718C070100012282
         if (uri != null && uri.getScheme() != null && uri.getScheme().toLowerCase(Locale.ENGLISH).equals(Constants.FINGERPRINT_SCHEME)) {
-            fingerprint = uri.getEncodedSchemeSpecificPart().toLowerCase(Locale.ENGLISH);
-        }
+            String fingerprint = uri.getEncodedSchemeSpecificPart().toLowerCase(Locale.ENGLISH);
 
-        if (fingerprint == null) {
+            if (ACTION_SCAN_WITH_RESULT.equals(action)) {
+                Intent result = new Intent();
+                result.putExtra(EXTRA_FINGERPRINT, fingerprint);
+                setResult(RESULT_OK, result);
+                finish();
+            } else {
+                importKeys(fingerprint);
+            }
+        } else {
             SingletonResult result = new SingletonResult(
                     SingletonResult.RESULT_ERROR, OperationResult.LogType.MSG_WRONG_QR_CODE);
             Intent intent = new Intent();
             intent.putExtra(SingletonResult.EXTRA_RESULT, result);
             returnResult(intent);
-            return;
-        }
-
-        if (returnResult) {
-            Intent result = new Intent();
-            result.putExtra(EXTRA_FINGERPRINT, fingerprint);
-            setResult(RESULT_OK, result);
-            finish();
-        } else {
-            importKeys(fingerprint);
         }
     }
 
     public void returnResult(Intent data) {
-        if (returnResult) {
-            setResult(RESULT_OK, data);
-            finish();
-        } else {
+        String action = getIntent().getAction();
+
+        if (ACTION_QR_CODE_API.equals(action)) {
             // display last log message but as Toast for calls from outside OpenKeychain
             OperationResult result = data.getParcelableExtra(OperationResult.EXTRA_RESULT);
             String str = getString(result.getLog().getLast().mType.getMsgId());
             Toast.makeText(this, str, Toast.LENGTH_LONG).show();
             finish();
+        } else {
+            setResult(RESULT_OK, data);
+            finish();
         }
     }
 
     public void importKeys(byte[] keyringData) {
-
         ParcelableKeyRing keyEntry = new ParcelableKeyRing(keyringData);
         ArrayList<ParcelableKeyRing> selectedEntries = new ArrayList<>();
         selectedEntries.add(keyEntry);
 
         startImportService(selectedEntries);
-
     }
 
     public void importKeys(String fingerprint) {
-
         ParcelableKeyRing keyEntry = new ParcelableKeyRing(fingerprint, null, null);
         ArrayList<ParcelableKeyRing> selectedEntries = new ArrayList<>();
         selectedEntries.add(keyEntry);
 
         startImportService(selectedEntries);
-
     }
 
-    private void startImportService (ArrayList<ParcelableKeyRing> keyRings) {
+    private void startImportService(ArrayList<ParcelableKeyRing> keyRings) {
 
         // Message is received after importing is done in KeychainIntentService
         ServiceProgressHandler serviceHandler = new ServiceProgressHandler(
@@ -282,7 +265,6 @@ public class ImportKeysProxyActivity extends FragmentActivity {
 
         // start service with intent
         startService(intent);
-
     }
 
     /**