diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-07-08 15:24:30 +0200 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-07-08 15:24:30 +0200 |
commit | e0cb891a1f1eafa2d3e522b557169afcd1be9ed6 (patch) | |
tree | 7dc5ac76205cb388b33c43ca94f17b41ebe0d897 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/ImportOperation.java | |
parent | 6565adc5ccf713da73650b19d203831e25446f80 (diff) | |
parent | 17ba1751f13984cd7aabb377377e18e692d12d0d (diff) | |
download | open-keychain-e0cb891a1f1eafa2d3e522b557169afcd1be9ed6.tar.gz open-keychain-e0cb891a1f1eafa2d3e522b557169afcd1be9ed6.tar.bz2 open-keychain-e0cb891a1f1eafa2d3e522b557169afcd1be9ed6.zip |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/ImportOperation.java')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/ImportOperation.java | 4 |
1 files changed, 3 insertions, 1 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); |