aboutsummaryrefslogtreecommitdiffstats
path: root/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2014-03-10 22:37:13 +0100
committerDominik Schürmann <dominik@dominikschuermann.de>2014-03-10 22:37:13 +0100
commit59091e417ffbd8eb6d66d1ef4fe6ce2505d6577d (patch)
tree34f44d898aa0ffe5bcbfd8adc5f0ee2fef7df9be /OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog
parentbac68c4c730ba033df411215f4982b0dd2d24b1a (diff)
downloadopen-keychain-59091e417ffbd8eb6d66d1ef4fe6ce2505d6577d.tar.gz
open-keychain-59091e417ffbd8eb6d66d1ef4fe6ce2505d6577d.tar.bz2
open-keychain-59091e417ffbd8eb6d66d1ef4fe6ce2505d6577d.zip
getString before init of KeychainIntentHandler
Diffstat (limited to 'OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog')
-rw-r--r--OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ProgressDialogFragment.java13
1 files changed, 6 insertions, 7 deletions
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ProgressDialogFragment.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ProgressDialogFragment.java
index 90947e42b..b7a1882ef 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ProgressDialogFragment.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ProgressDialogFragment.java
@@ -30,7 +30,7 @@ import android.view.KeyEvent;
import org.sufficientlysecure.keychain.R;
public class ProgressDialogFragment extends DialogFragment {
- private static final String ARG_MESSAGE = "message_id";
+ private static final String ARG_MESSAGE = "message";
private static final String ARG_STYLE = "style";
private static final String ARG_CANCELABLE = "cancelable";
@@ -128,11 +128,11 @@ public class ProgressDialogFragment extends DialogFragment {
dialog.setButton(DialogInterface.BUTTON_NEGATIVE,
activity.getString(R.string.progress_cancel),
new DialogInterface.OnClickListener() {
- @Override
- public void onClick(DialogInterface dialog, int which) {
- dialog.cancel();
- }
- });
+ @Override
+ public void onClick(DialogInterface dialog, int which) {
+ dialog.cancel();
+ }
+ });
}
// Disable the back button
@@ -140,7 +140,6 @@ public class ProgressDialogFragment extends DialogFragment {
@Override
public boolean onKey(DialogInterface dialog, int keyCode, KeyEvent event) {
-
if (keyCode == KeyEvent.KEYCODE_BACK) {
return true;
}