Dialogs should be displayed again after activity recreation if needed

collect_app/src/main/java/org/odk/collect/android/activities/FormDownloadList.java

@@ -211,6 +211,7 @@ public void onClick(View v) {
         refreshButton.setOnClickListener(new OnClickListener() {
             @Override
             public void onClick(View v) {
+                viewModel.setLoadingCanceled(false);
                 viewModel.clearFormList();
                 updateAdapter();
                 clearChoices();
@@ -233,6 +234,7 @@ public void onClick(View v) {
             if (downloadFormListTask.getStatus() == AsyncTask.Status.FINISHED) {
                 try {
                     progressDialog.dismiss();
+                    viewModel.setProgressDialogShowing(false);
                 } catch (IllegalArgumentException e) {
                     Timber.i("Attempting to close a dialog that was not previously opened");
                 }
@@ -243,12 +245,15 @@ public void onClick(View v) {
             if (downloadFormsTask.getStatus() == AsyncTask.Status.FINISHED) {
                 try {
                     progressDialog.dismiss();
+                    viewModel.setProgressDialogShowing(false);
                 } catch (IllegalArgumentException e) {
                     Timber.i("Attempting to close a dialog that was not previously opened");
                 }
                 downloadFormsTask = null;
             }
-        } else if (viewModel.getFormNamesAndURLs().isEmpty() && getLastCustomNonConfigurationInstance() == null) {
+        } else if (viewModel.getFormNamesAndURLs().isEmpty()
+                && getLastCustomNonConfigurationInstance() == null
+                && !viewModel.wasLoadingCanceled()) {
             // first time, so get the formlist
             downloadFormList();
         }
@@ -464,6 +469,12 @@ protected void onResume() {
         if (viewModel.isAlertShowing()) {
             createAlertDialog(viewModel.getAlertTitle(), viewModel.getAlertMsg(), viewModel.shouldExit());
         }
+        if (viewModel.isProgressDialogShowing() && (progressDialog == null || !progressDialog.isShowing())) {
+            createProgressDialog();
+        }
+        if (viewModel.isCancelDialogShowing()) {
+            createCancelDialog();
+        }
         super.onResume();
     }
 
@@ -511,6 +522,7 @@ private void selectSupersededForms() {
      */
     public void formListDownloadingComplete(HashMap<String, FormDetails> result) {
         progressDialog.dismiss();
+        viewModel.setProgressDialogShowing(false);
         downloadFormListTask.setDownloaderListener(null);
         downloadFormListTask = null;
 
@@ -676,6 +688,8 @@ public void onClick(DialogInterface dialog, int which) {
                             createCancelDialog();
                             downloadFormsTask.cancel(true);
                         }
+                        viewModel.setLoadingCanceled(true);
+                        viewModel.setProgressDialogShowing(false);
                     }
                 };
         progressDialog.setTitle(getString(R.string.downloading_data));
@@ -684,6 +698,7 @@ public void onClick(DialogInterface dialog, int which) {
         progressDialog.setIndeterminate(true);
         progressDialog.setCancelable(false);
         progressDialog.setButton(getString(R.string.cancel), loadingButtonListener);
+        viewModel.setProgressDialogShowing(true);
         DialogUtils.showDialog(progressDialog, this);
     }
 
@@ -705,6 +720,7 @@ private void createCancelDialog() {
         cancelDialog.setIcon(android.R.drawable.ic_dialog_info);
         cancelDialog.setIndeterminate(true);
         cancelDialog.setCancelable(false);
+        viewModel.setCancelDialogShowing(true);
         DialogUtils.showDialog(cancelDialog, this);
     }
 
@@ -725,6 +741,7 @@ public void formsDownloadingComplete(HashMap<FormDetails, String> result) {
         if (progressDialog.isShowing()) {
             // should always be true here
             progressDialog.dismiss();
+            viewModel.setProgressDialogShowing(false);
         }
 
         createAlertDialog(getString(R.string.download_forms_result), getDownloadResultMessage(result), EXIT);
@@ -769,6 +786,7 @@ public void formsDownloadingCancelled() {
 
         if (cancelDialog != null && cancelDialog.isShowing()) {
             cancelDialog.dismiss();
+            viewModel.setCancelDialogShowing(false);
         }
 
         if (viewModel.isDownloadOnlyMode()) {

collect_app/src/main/java/org/odk/collect/android/activities/viewmodels/FormDownloadListViewModel.java

@@ -41,8 +41,11 @@ public class FormDownloadListViewModel extends ViewModel {
     private String username;
     private String password;
 
+    private boolean progressDialogShowing;
     private boolean alertShowing;
+    private boolean cancelDialogShowing;
     private boolean shouldExit;
+    private boolean loadingCanceled;
     // Variables for the external app intent call
     private boolean isDownloadOnlyMode;
 
@@ -169,4 +172,28 @@ public String[] getFormIdsToDownload() {
     public void setFormIdsToDownload(String[] formIdsToDownload) {
         this.formIdsToDownload = formIdsToDownload;
     }
+
+    public boolean isProgressDialogShowing() {
+        return progressDialogShowing;
+    }
+
+    public void setProgressDialogShowing(boolean progressDialogShowing) {
+        this.progressDialogShowing = progressDialogShowing;
+    }
+
+    public boolean isCancelDialogShowing() {
+        return cancelDialogShowing;
+    }
+
+    public void setCancelDialogShowing(boolean cancelDialogShowing) {
+        this.cancelDialogShowing = cancelDialogShowing;
+    }
+
+    public boolean wasLoadingCanceled() {
+        return loadingCanceled;
+    }
+
+    public void setLoadingCanceled(boolean loadingCanceled) {
+        this.loadingCanceled = loadingCanceled;
+    }
 }