Merge pull request #64 from pnemonic78/issue_not-attached-to-window-m…

…anager Progress dialog can cancel.
GnuCash-Pocket · Mar 19, 2024 · 400afc4 · 400afc4
2 parents 208e910 + 5287815
commit 400afc4
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 5 deletions.
diff --git a/app/src/main/java/org/gnucash/android/export/ExportAsyncTask.java b/app/src/main/java/org/gnucash/android/export/ExportAsyncTask.java
@@ -118,6 +118,8 @@ protected void onPreExecute() {
         if (mContext instanceof Activity) {
             mProgressDialog = new GnucashProgressDialog((Activity) mContext);
             mProgressDialog.setTitle(R.string.title_progress_exporting_transactions);
+            mProgressDialog.setCancelable(true);
+            mProgressDialog.setOnCancelListener(dialogInterface -> cancel(true));
             mProgressDialog.show();
         }
     }
@@ -209,8 +211,9 @@ protected void onPostExecute(Integer exportSuccessful) {
 
     private void dismissProgressDialog() {
         if (mContext instanceof Activity) {
-            if (mProgressDialog != null && mProgressDialog.isShowing())
+            if (mProgressDialog != null && mProgressDialog.isShowing()) {
                 mProgressDialog.dismiss();
+            }
             ((Activity) mContext).finish();
         }
     }

diff --git a/app/src/main/java/org/gnucash/android/importer/ImportAsyncTask.java b/app/src/main/java/org/gnucash/android/importer/ImportAsyncTask.java
@@ -68,6 +68,8 @@ protected void onPreExecute() {
         super.onPreExecute();
         mProgressDialog = new GnucashProgressDialog(mContext);
         mProgressDialog.setTitle(R.string.title_progress_importing_accounts);
+        mProgressDialog.setCancelable(true);
+        mProgressDialog.setOnCancelListener(dialogInterface -> cancel(true));
         mProgressDialog.show();
     }
 
@@ -130,8 +132,9 @@ public void run() {
     @Override
     protected void onPostExecute(Boolean importSuccess) {
         try {
-            if (mProgressDialog != null && mProgressDialog.isShowing())
+            if (mProgressDialog != null && mProgressDialog.isShowing()) {
                 mProgressDialog.dismiss();
+            }
         } catch (IllegalArgumentException ex) {
             //TODO: This is a hack to catch "View not attached to window" exceptions
             //FIXME by moving the creation and display of the progress dialog to the Fragment

diff --git a/app/src/main/java/org/gnucash/android/ui/settings/dialog/DoubleConfirmationDialog.java b/app/src/main/java/org/gnucash/android/ui/settings/dialog/DoubleConfirmationDialog.java
@@ -69,8 +69,9 @@ public void onClick(DialogInterface dialog, int which) {
     @Override
     public void onStart() {
         super.onStart();
-        if (getDialog() != null) {
-            ((AlertDialog) getDialog()).getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(false);
+        final AlertDialog dialog = (AlertDialog) getDialog();
+        if (dialog != null) {
+            dialog.getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(false);
             setUpConfirmCheckBox();
         }
     }
@@ -93,6 +94,6 @@ public void onCheckedChanged(CompoundButton compoundButton, boolean b) {
      * <p>By default it just dismisses the dialog.</p>
      */
     protected void onNegativeButton() {
-        getDialog().dismiss();
+        dismiss();
     }
 }
diff --git a/app/src/main/java/org/gnucash/android/util/BackupManager.java b/app/src/main/java/org/gnucash/android/util/BackupManager.java
@@ -195,6 +195,8 @@ protected void onPreExecute() {
                 if (activity != null) {
                     mProgressDialog = new GnucashProgressDialog(activity);
                     mProgressDialog.setTitle(R.string.title_create_backup_pref);
+                    mProgressDialog.setCancelable(true);
+                    mProgressDialog.setOnCancelListener(dialogInterface -> cancel(true));
                     mProgressDialog.show();
                 }
             }
@@ -224,6 +226,8 @@ protected void onPreExecute() {
                 if (activity != null) {
                     mProgressDialog = new GnucashProgressDialog(activity);
                     mProgressDialog.setTitle(R.string.title_create_backup_pref);
+                    mProgressDialog.setCancelable(true);
+                    mProgressDialog.setOnCancelListener(dialogInterface -> cancel(true));
                     mProgressDialog.show();
                 }
             }