aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main
diff options
context:
space:
mode:
authorAdithya Abraham Philip <adithyaphilip@gmail.com>2015-07-08 18:11:10 +0530
committerAdithya Abraham Philip <adithyaphilip@gmail.com>2015-07-08 18:40:17 +0530
commita038a038c3807da59809c8898300ab51e372c762 (patch)
treed5cfe62da772ecb36a0219af0c287bc7f30443ae /OpenKeychain/src/main
parenteab46df9a3d838b8c5f0542183f1872f2b77e751 (diff)
downloadopen-keychain-a038a038c3807da59809c8898300ab51e372c762.tar.gz
open-keychain-a038a038c3807da59809c8898300ab51e372c762.tar.bz2
open-keychain-a038a038c3807da59809c8898300ab51e372c762.zip
fixed QR code scan and serialKeyImport progress
Diffstat (limited to 'OpenKeychain/src/main')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/ImportOperation.java4
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysProxyActivity.java2
2 files changed, 4 insertions, 2 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/ImportOperation.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/ImportOperation.java
index a89b46cca..256f1bb82 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/ImportOperation.java
+++ b/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);
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 00425d8ad..a2976b437 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysProxyActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysProxyActivity.java
@@ -110,7 +110,7 @@ public class ImportKeysProxyActivity extends FragmentActivity
@Override
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
if (mImportOpHelper != null) {
- mImportOpHelper.cryptoOperation();
+ mImportOpHelper.handleActivityResult(requestCode, resultCode, data);
}
if (requestCode == IntentIntegratorSupportV4.REQUEST_CODE) {