Merge remote-tracking branch 'origin/master'

OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/ImportOperation.java

@@ -155,7 +155,9 @@ public class ImportOperation extends BaseOperation<ImportKeyringParcel> {
     public ImportKeyResult serialKeyRingImport(Iterator<ParcelableKeyRing> entries, int num,
                                                String keyServerUri, Progressable progressable,
                                                Proxy proxy) {
-        updateProgress(R.string.progress_importing, 0, 100);
+        if (progressable != null) {
+            progressable.setProgress(R.string.progress_importing, 0, 100);
+        }
 
         OperationLog log = new OperationLog();
         log.add(LogType.MSG_IMPORT, 0, num);

OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysProxyActivity.java

@@ -110,7 +110,16 @@ public class ImportKeysProxyActivity extends FragmentActivity
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         if (mImportOpHelper != null) {
-            mImportOpHelper.cryptoOperation();
+            if (!mImportOpHelper.handleActivityResult(requestCode, resultCode, data)) {
+                // if a result has been returned, and it does not belong to mImportOpHelper,
+                // return it down to other activity
+                if (data != null && data.hasExtra(OperationResult.EXTRA_RESULT)) {
+                    returnResult(data);
+                } else {
+                    super.onActivityResult(requestCode, resultCode, data);
+                    finish();
+                }
+            }
         }
 
         if (requestCode == IntentIntegratorSupportV4.REQUEST_CODE) {
@@ -128,13 +137,6 @@ public class ImportKeysProxyActivity extends FragmentActivity
 
             return;
         }
-        // if a result has been returned, return it down to other activity
-        if (data != null && data.hasExtra(OperationResult.EXTRA_RESULT)) {
-            returnResult(data);
-        } else {
-            super.onActivityResult(requestCode, resultCode, data);
-            finish();
-        }
     }
 
     private void processScannedContent(String content) {

OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/CryptoOperationHelper.java

@@ -171,6 +171,7 @@ public class CryptoOperationHelper<T extends Parcelable, S extends OperationResu
             // this wasn't meant for us to handle
             return false;
         } else {
+            // reset mRequestedCode because we have finished what we started
             mRequestedCode = -1;
         }
         if (resultCode == Activity.RESULT_CANCELED) {