aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
diff options
context:
space:
mode:
authorVincent Breitmoser <valodim@mugenguild.com>2015-06-10 15:43:00 +0200
committerVincent Breitmoser <valodim@mugenguild.com>2015-06-10 15:45:10 +0200
commit61dce088c25ea68cbff59b5d8b1af80b39d5cc59 (patch)
tree8d2756bd493e005d96dc31f88b88fe4351fb5f43 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
parent9b6416943b49d620c73bd24fb334ec338d95c5a8 (diff)
downloadopen-keychain-61dce088c25ea68cbff59b5d8b1af80b39d5cc59.tar.gz
open-keychain-61dce088c25ea68cbff59b5d8b1af80b39d5cc59.tar.bz2
open-keychain-61dce088c25ea68cbff59b5d8b1af80b39d5cc59.zip
backport CryptoOperationFragment changes without eventbus
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java18
1 files changed, 10 insertions, 8 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
index 06d824f94..07ab88b02 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
@@ -388,12 +388,7 @@ public class ImportKeysActivity extends BaseNfcActivity {
return;
}
- ServiceProgressHandler serviceHandler = new ServiceProgressHandler(
- this,
- getString(R.string.progress_importing),
- ProgressDialog.STYLE_HORIZONTAL,
- true
- ) {
+ ServiceProgressHandler serviceHandler = new ServiceProgressHandler(this) {
@Override
public void handleMessage(Message message) {
// handle messages by standard KeychainIntentServiceHandler first
@@ -435,7 +430,11 @@ public class ImportKeysActivity extends BaseNfcActivity {
intent.putExtra(KeychainService.EXTRA_MESSENGER, messenger);
// show progress dialog
- serviceHandler.showProgressDialog(this);
+ serviceHandler.showProgressDialog(
+ getString(R.string.progress_importing),
+ ProgressDialog.STYLE_HORIZONTAL,
+ true
+ );
// start service with intent
startService(intent);
@@ -469,7 +468,10 @@ public class ImportKeysActivity extends BaseNfcActivity {
intent.putExtra(KeychainService.EXTRA_MESSENGER, messenger);
// show progress dialog
- serviceHandler.showProgressDialog(this);
+ serviceHandler.showProgressDialog(
+ getString(R.string.progress_importing),
+ ProgressDialog.STYLE_HORIZONTAL, true
+ );
// start service with intent
startService(intent);