diff options
author | Vincent <valodim@mugenguild.com> | 2015-06-12 14:59:26 +0200 |
---|---|---|
committer | Vincent <valodim@mugenguild.com> | 2015-06-12 14:59:26 +0200 |
commit | d57324aa4b23633f5da995ba71d8fbb5690bae45 (patch) | |
tree | 27898f27a06d544c99ad0de2f0767cdcaf459ccf /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysProxyActivity.java | |
parent | 4f55b1f5d1bc35a8a6b49dfe520ce641b6667f3d (diff) | |
parent | 5d652e4c418b42eef0517d1110b782908bfd8235 (diff) | |
download | open-keychain-d57324aa4b23633f5da995ba71d8fbb5690bae45.tar.gz open-keychain-d57324aa4b23633f5da995ba71d8fbb5690bae45.tar.bz2 open-keychain-d57324aa4b23633f5da995ba71d8fbb5690bae45.zip |
Merge pull request #1331 from open-keychain/v/eventbus
replace messenger hack with eventbus
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysProxyActivity.java')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysProxyActivity.java | 11 |
1 files changed, 4 insertions, 7 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 42efbf0f8..9f3beff43 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysProxyActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysProxyActivity.java @@ -206,12 +206,7 @@ public class ImportKeysProxyActivity extends FragmentActivity { private void startImportService(ArrayList<ParcelableKeyRing> keyRings) { // Message is received after importing is done in KeychainService - 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 @@ -273,7 +268,9 @@ public class ImportKeysProxyActivity extends FragmentActivity { 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); |