PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Settings: Fix sometimes reset progress dialog not dismissed"

Browse Source
This commit is contained in:
Treehugger Robot
2022-04-08 09:46:39 +00:00
committed by Gerrit Code Review
parent c68e241fa6 6771edae5c
commit d6d6c5c020
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/com/android/settings/ResetNetworkConfirm.java
View File

@@ -150,7 +150,10 @@ public class ResetNetworkConfirm extends InstrumentedFragment {
@Override @Override
protected void onPostExecute(Boolean succeeded) { protected void onPostExecute(Boolean succeeded) {
mProgressDialog.dismiss(); if (mProgressDialog != null && mProgressDialog.isShowing()) {
mProgressDialog.dismiss();
}
if (succeeded) { if (succeeded) {
Toast.makeText(mContext, R.string.reset_network_complete_toast, Toast.LENGTH_SHORT) Toast.makeText(mContext, R.string.reset_network_complete_toast, Toast.LENGTH_SHORT)
.show(); .show();
@@ -189,6 +192,12 @@ public class ResetNetworkConfirm extends InstrumentedFragment {
} }
} }
// Should dismiss the progress dialog firstly if it is showing
// Or not the progress dialog maybe not dismissed in fast clicking.
if (mProgressDialog != null && mProgressDialog.isShowing()) {
mProgressDialog.dismiss();
}
mProgressDialog = getProgressDialog(mActivity); mProgressDialog = getProgressDialog(mActivity);
mProgressDialog.show(); mProgressDialog.show();