Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b185066a authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

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

Merge "Settings: Fix sometimes reset progress dialog not dismissed" am: d6d6c5c0 am: 02701dd8 am: a1e66c3a am: c77a56af

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2049363



Change-Id: Id4fe93a2dec86b544cc980e7f927245be94d2d82
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ee09af71 c77a56af

src/com/android/settings/ResetNetworkConfirm.java

+10 −1
Original line number Original line Diff line number Diff line
@@ -150,7 +150,10 @@ public class ResetNetworkConfirm extends InstrumentedFragment { 




        @Override

        @Override

        protected void onPostExecute(Boolean succeeded) {

        protected void onPostExecute(Boolean succeeded) {

            if (mProgressDialog != null && mProgressDialog.isShowing()) {

                mProgressDialog.dismiss();

                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();