Dbrant has submitted this change and it was merged. Change subject: Mark non-cancelable dialogs as non-cancelable ......................................................................
Mark non-cancelable dialogs as non-cancelable Bug: 64469 Change-Id: I8b7db62454319f8790046bac4c024997d5daa61b --- M wikipedia/src/main/java/org/wikipedia/createaccount/CreateAccountActivity.java M wikipedia/src/main/java/org/wikipedia/editing/EditPreviewFragment.java M wikipedia/src/main/java/org/wikipedia/login/LoginActivity.java 3 files changed, 3 insertions(+), 0 deletions(-) Approvals: Dbrant: Looks good to me, approved jenkins-bot: Verified diff --git a/wikipedia/src/main/java/org/wikipedia/createaccount/CreateAccountActivity.java b/wikipedia/src/main/java/org/wikipedia/createaccount/CreateAccountActivity.java index fdcd502..e4e9d12 100644 --- a/wikipedia/src/main/java/org/wikipedia/createaccount/CreateAccountActivity.java +++ b/wikipedia/src/main/java/org/wikipedia/createaccount/CreateAccountActivity.java @@ -69,6 +69,7 @@ progressDialog = new ProgressDialog(this); progressDialog.setIndeterminate(true); + progressDialog.setCancelable(false); progressDialog.setMessage(getString(R.string.dialog_create_account_checking_progress)); captchaHandler = new CaptchaHandler(this, app.getPrimarySite(), progressDialog, primaryContainer, R.string.create_account_activity_title); diff --git a/wikipedia/src/main/java/org/wikipedia/editing/EditPreviewFragment.java b/wikipedia/src/main/java/org/wikipedia/editing/EditPreviewFragment.java index 8e032f7..6223a49 100644 --- a/wikipedia/src/main/java/org/wikipedia/editing/EditPreviewFragment.java +++ b/wikipedia/src/main/java/org/wikipedia/editing/EditPreviewFragment.java @@ -69,6 +69,7 @@ final ProgressDialog dialog = new ProgressDialog(getActivity()); dialog.setIndeterminate(true); dialog.setMessage(getString(R.string.edit_preview_fetching_dialog_message)); + dialog.setCancelable(false); if (!isDirectionSetup) { Utils.setupDirectionality(title.getSite().getLanguage(), Locale.getDefault().getLanguage(), bridge); diff --git a/wikipedia/src/main/java/org/wikipedia/login/LoginActivity.java b/wikipedia/src/main/java/org/wikipedia/login/LoginActivity.java index 6fd18ac..5c60747 100644 --- a/wikipedia/src/main/java/org/wikipedia/login/LoginActivity.java +++ b/wikipedia/src/main/java/org/wikipedia/login/LoginActivity.java @@ -115,6 +115,7 @@ private void doLogin() { final ProgressDialog progressDialog = new ProgressDialog(this); progressDialog.setMessage(getString(R.string.login_in_progress_dialog_message)); + progressDialog.setCancelable(false); final String username = usernameText.getText().toString(); final String password = passwordText.getText().toString(); -- To view, visit https://gerrit.wikimedia.org/r/129888 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8b7db62454319f8790046bac4c024997d5daa61b Gerrit-PatchSet: 1 Gerrit-Project: apps/android/wikipedia Gerrit-Branch: master Gerrit-Owner: Yuvipanda <yuvipa...@gmail.com> Gerrit-Reviewer: Dbrant <dbr...@wikimedia.org> Gerrit-Reviewer: Yuvipanda <yuvipa...@gmail.com> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits