Merge branch 'development' of github.com:open-keychain/open-keychain into development

2014-10-26 22:38:35 +01:00
parent fa73362a9f 84b234af37
commit be31815ee8
8 changed files with 31 additions and 5 deletions
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ProgressDialogFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ProgressDialogFragment.java
@@ -145,7 +145,7 @@ public class ProgressDialogFragment extends DialogFragment {

        mPreventCancel = preventCancel;
        final Button negative = ((ProgressDialog) getDialog()).getButton(DialogInterface.BUTTON_NEGATIVE);
-        negative.setVisibility(preventCancel ? View.GONE : View.VISIBLE);
+        negative.setEnabled(mIsCancelled && !preventCancel);
    }

    @Override