Add safety checks when showing dialog to prevent illegal state

lloydtorres · Oct 30, 2016 · adf2b72 · adf2b72
1 parent 3dee3e6
commit adf2b72
Show file tree

Hide file tree

Showing 14 changed files with 112 additions and 15 deletions.
diff --git a/Stately/app/src/main/java/com/lloydtorres/stately/census/TrendsActivity.java b/Stately/app/src/main/java/com/lloydtorres/stately/census/TrendsActivity.java
@@ -377,10 +377,12 @@ public boolean onOptionsItemSelected(MenuItem item) {
                 finish();
                 return true;
             case R.id.nav_dataset:
-                FragmentManager fm = getSupportFragmentManager();
-                DatasetDialog dialog = new DatasetDialog();
-                dialog.setDatasets(WORLD_CENSUS_ITEMS, id);
-                dialog.show(fm, DatasetDialog.DIALOG_TAG);
+                if (!isFinishing()) {
+                    FragmentManager fm = getSupportFragmentManager();
+                    DatasetDialog dialog = new DatasetDialog();
+                    dialog.setDatasets(WORLD_CENSUS_ITEMS, id);
+                    dialog.show(fm, DatasetDialog.DIALOG_TAG);
+                }
                 return true;
         }
         return super.onOptionsItemSelected(item);

diff --git a/Stately/app/src/main/java/com/lloydtorres/stately/core/StatelyActivity.java b/Stately/app/src/main/java/com/lloydtorres/stately/core/StatelyActivity.java
@@ -322,11 +322,13 @@ public void onClick(DialogInterface dialog, int which) {
             }
         };
 
-        AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(this, RaraHelper.getThemeMaterialDialog(this));
-        dialogBuilder.setTitle(R.string.exit_confirm)
-                .setPositiveButton(R.string.exit, dialogListener)
-                .setNegativeButton(R.string.explore_negative, null)
-                .show();
+        if (!isFinishing()) {
+            AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(this, RaraHelper.getThemeMaterialDialog(this));
+            dialogBuilder.setTitle(R.string.exit_confirm)
+                    .setPositiveButton(R.string.exit, dialogListener)
+                    .setNegativeButton(R.string.explore_negative, null)
+                    .show();
+        }
     }
 
     @Override
@@ -504,6 +506,10 @@ private boolean isNoSelect(int key) {
      * Start exploration dialog
      */
     private void explore() {
+        if (isFinishing()) {
+            return;
+        }
+
         FragmentManager fm = getSupportFragmentManager();
         ExploreDialog exploreDialog = new ExploreDialog();
         exploreDialog.show(fm, ExploreDialog.DIALOG_TAG);
@@ -513,6 +519,10 @@ private void explore() {
      * Start switch nation dialog.
      */
     private void switchNation() {
+        if (isFinishing()) {
+            return;
+        }
+
         List<UserLogin> logins = UserLogin.listAll(UserLogin.class);
         // If no other nations besides current one, show warning dialog
         // with link to login activity
@@ -552,6 +562,10 @@ private void startSettings() {
      * Start logout process
      */
     private void logout() {
+        if (isFinishing()) {
+            return;
+        }
+
         DialogInterface.OnClickListener dialogListener = new DialogInterface.OnClickListener() {
             @Override
             public void onClick(DialogInterface dialog, int which) {

diff --git a/Stately/app/src/main/java/com/lloydtorres/stately/explore/ExploreActivity.java b/Stately/app/src/main/java/com/lloydtorres/stately/explore/ExploreActivity.java
@@ -540,6 +540,10 @@ private void handleEndorsement() {
             return;
         }
 
+        if (isFinishing()) {
+            return;
+        }
+
         AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(this, RaraHelper.getThemeMaterialDialog(this));
         DialogInterface.OnClickListener dialogClickListener = new DialogInterface.OnClickListener() {
             @Override
@@ -615,6 +619,10 @@ private void handleDossier() {
             return;
         }
 
+        if (isFinishing()) {
+            return;
+        }
+
         AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(this, RaraHelper.getThemeMaterialDialog(this));
         DialogInterface.OnClickListener dialogClickListener = new DialogInterface.OnClickListener() {
             @Override
@@ -709,6 +717,10 @@ public void handleRegionMove() {
             return;
         }
 
+        if (isFinishing()) {
+            return;
+        }
+
         AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(this, RaraHelper.getThemeMaterialDialog(this));
         LayoutInflater inflater = getLayoutInflater();
         final View dialogView = inflater.inflate(R.layout.fragment_dialog_move_password, null);
@@ -807,6 +819,10 @@ public void onErrorResponse(VolleyError error) {
      * Opens the explore dialog.
      */
     private void openExploreDialog(boolean closeOnFinish) {
+        if (isFinishing()) {
+            return;
+        }
+
         ExploreDialog exploreDialog = new ExploreDialog();
 
         if (closeOnFinish) {
@@ -866,6 +882,10 @@ public void onErrorResponse(VolleyError error) {
      * Call to show the superweapon dialog.
      */
     public void showSuperweaponDialog() {
+        if (isFinishing()) {
+            return;
+        }
+
         // Only show dialog if at least one superweapon is available
         if (superweaponStatus != null &&
                 (superweaponStatus.isTZES || superweaponStatus.isCure || superweaponStatus.isHorde)) {

diff --git a/Stately/app/src/main/java/com/lloydtorres/stately/feed/ActivityFeedFragment.java b/Stately/app/src/main/java/com/lloydtorres/stately/feed/ActivityFeedFragment.java
@@ -435,9 +435,11 @@ public boolean onOptionsItemSelected(MenuItem item) {
                 showRegionDossier(fm);
                 return true;
             case R.id.nav_subscriptions:
-                SubscriptionsDialog subscriptionsDialog = new SubscriptionsDialog();
-                subscriptionsDialog.setCallback(this);
-                subscriptionsDialog.show(fm, SubscriptionsDialog.DIALOG_TAG);
+                if (getActivity() != null && isAdded()) {
+                    SubscriptionsDialog subscriptionsDialog = new SubscriptionsDialog();
+                    subscriptionsDialog.setCallback(this);
+                    subscriptionsDialog.show(fm, SubscriptionsDialog.DIALOG_TAG);
+                }
                 return true;
         }
         return super.onOptionsItemSelected(item);
@@ -448,6 +450,10 @@ public boolean onOptionsItemSelected(MenuItem item) {
      * @param fm Fragment Manager
      */
     private void showNationDossier(FragmentManager fm) {
+        if (getActivity() == null || !isAdded()) {
+            return;
+        }
+
         if (dossierNations.size() > 0) {
             Collections.sort(dossierNations);
             NameListDialog nameListDialog = new NameListDialog();
@@ -469,6 +475,10 @@ private void showNationDossier(FragmentManager fm) {
      * @param fm Fragment Manager
      */
     private void showRegionDossier(FragmentManager fm) {
+        if (getActivity() == null || !isAdded()) {
+            return;
+        }
+
         if (dossierRegions.size() > 0) {
             Collections.sort(dossierRegions);
             NameListDialog nameListDialog = new NameListDialog();

diff --git a/Stately/app/src/main/java/com/lloydtorres/stately/issues/IssueDecisionActivity.java b/Stately/app/src/main/java/com/lloydtorres/stately/issues/IssueDecisionActivity.java
@@ -177,7 +177,9 @@ public void onClick(DialogInterface dialog, int which) {
                     break;
             }
 
-            dialogBuilder.show();
+            if (!isFinishing()) {
+                dialogBuilder.show();
+            }
         }
         else {
             startPostAdoptPosition(option);

diff --git a/Stately/app/src/main/java/com/lloydtorres/stately/login/LoginActivity.java b/Stately/app/src/main/java/com/lloydtorres/stately/login/LoginActivity.java
@@ -335,6 +335,10 @@ private void executeRequest(NSStringRequest stringRequest, String lockedMessage)
      * @param v
      */
     public void startCreateNation(View v) {
+        if (isFinishing()) {
+            return;
+        }
+
         DialogInterface.OnClickListener dialogListener = new DialogInterface.OnClickListener() {
             @Override
             public void onClick(DialogInterface dialog, int which) {
@@ -399,6 +403,10 @@ private void continueToVerifyAccount(UserLogin u) {
 
     @Override
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        if (isFinishing()) {
+            return;
+        }
+
         if (requestCode == WebRegisterActivity.REGISTER_RESULT && resultCode == Activity.RESULT_OK) {
             AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(this, RaraHelper.getThemeMaterialDialog(this));
             dialogBuilder.setTitle(R.string.create_nation)

diff --git a/Stately/app/src/main/java/com/lloydtorres/stately/region/MessageBoardActivity.java b/Stately/app/src/main/java/com/lloydtorres/stately/region/MessageBoardActivity.java
@@ -647,6 +647,10 @@ public void onErrorResponse(VolleyError error) {
      * @param id
      */
     public void confirmDelete(final int pos, final int id) {
+        if (isFinishing()) {
+            return;
+        }
+
         DialogInterface.OnClickListener dialogClickListener = new DialogInterface.OnClickListener() {
             @Override
             public void onClick(DialogInterface dialog, int which) {

diff --git a/Stately/app/src/main/java/com/lloydtorres/stately/region/RegionCommunitySubFragment.java b/Stately/app/src/main/java/com/lloydtorres/stately/region/RegionCommunitySubFragment.java
@@ -212,6 +212,10 @@ public void onErrorResponse(VolleyError error) {
      * @param pollData Data for the target poll.
      */
     public void showPollVoteDialog(Poll pollData) {
+        if (getActivity() == null || !isAdded()) {
+            return;
+        }
+
         PollVoteDialog voteDialog = new PollVoteDialog();
         voteDialog.setData(this, pollData);
         voteDialog.show(getFragmentManager(), PollVoteDialog.DIALOG_TAG);

diff --git a/Stately/app/src/main/java/com/lloydtorres/stately/report/ReportActivity.java b/Stately/app/src/main/java/com/lloydtorres/stately/report/ReportActivity.java
@@ -198,6 +198,10 @@ private void setToolbar(Toolbar t) {
      * Wrapper for sending the report to NS servers.
      */
     private void startSendReport() {
+        if (isFinishing()) {
+            return;
+        }
+
         String reportText = reportContent.getText().toString();
         if (reportText.length() <= 0) {
             SparkleHelper.makeSnackbar(view, getString(R.string.report_blank));

diff --git a/Stately/app/src/main/java/com/lloydtorres/stately/settings/SettingsActivity.java b/Stately/app/src/main/java/com/lloydtorres/stately/settings/SettingsActivity.java
@@ -140,6 +140,9 @@ public void onDestroy() {
     public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
         switch (key) {
             case SETTING_CRASHREPORT:
+                if (isFinishing()) {
+                    return;
+                }
                 dialogBuilder.setMessage(getString(R.string.warn_crashreport)).setPositiveButton(getString(R.string.got_it), null).show();
                 break;
             case SETTING_NOTIFS:

diff --git a/Stately/app/src/main/java/com/lloydtorres/stately/telegrams/TelegramsFragment.java b/Stately/app/src/main/java/com/lloydtorres/stately/telegrams/TelegramsFragment.java
@@ -358,6 +358,10 @@ private void refreshRecycler(int direction) {
      * @param fm
      */
     private void showFoldersDialog(FragmentManager fm) {
+        if (getActivity() == null || !isAdded()) {
+            return;
+        }
+
         FoldersDialog foldersDialog = new FoldersDialog();
         foldersDialog.setFragment(this);
         foldersDialog.setFolders(folders);
@@ -418,6 +422,10 @@ private void invalidateTelegram(int id) {
      * Wrappers to call on NS to archive a telegram.
      */
     public void showArchiveTelegramDialog(final int id) {
+        if (getActivity() == null || !isAdded()) {
+            return;
+        }
+
         AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(getContext(), RaraHelper.getThemeMaterialDialog(getContext()));
         dialogBuilder
                 .setTitle(getString(R.string.telegrams_archive_confirm))
@@ -449,6 +457,10 @@ private void archiveTelegram(final int id) {
     }
 
     public void showMoveTelegramDialog(final int id) {
+        if (getActivity() == null || !isAdded()) {
+            return;
+        }
+
         ArrayList<TelegramFolder> moveableFolders = new ArrayList<TelegramFolder>();
         for (int i=0; i<folders.size(); i++) {
             String name = folders.get(i).name;
@@ -551,6 +563,10 @@ public void onErrorResponse(VolleyError error) {
     }
 
     public void showDeleteTelegramDialog(final int id) {
+        if (getActivity() == null || !isAdded()) {
+            return;
+        }
+
         AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(getContext(), RaraHelper.getThemeMaterialDialog(getContext()));
         dialogBuilder
             .setTitle(getString(R.string.telegrams_delete_confirm))

diff --git a/Stately/app/src/main/java/com/lloydtorres/stately/wa/ResolutionActivity.java b/Stately/app/src/main/java/com/lloydtorres/stately/wa/ResolutionActivity.java
@@ -272,6 +272,10 @@ public void onErrorResponse(VolleyError error) {
      * @param vote Current choice in voting
      */
     public void showVoteDialog(int vote) {
+        if (isFinishing()) {
+            return;
+        }
+
         FragmentManager fm = getSupportFragmentManager();
         VoteDialog voteDialog = new VoteDialog();
         voteDialog.setChoice(vote);

diff --git a/Stately/app/src/main/java/com/lloydtorres/stately/world/WorldFragment.java b/Stately/app/src/main/java/com/lloydtorres/stately/world/WorldFragment.java
@@ -215,8 +215,10 @@ public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
             case R.id.nav_explore:
-                ExploreDialog exploreDialog = new ExploreDialog();
-                exploreDialog.show(getFragmentManager(), ExploreDialog.DIALOG_TAG);
+                if (getActivity() != null && isAdded()) {
+                    ExploreDialog exploreDialog = new ExploreDialog();
+                    exploreDialog.show(getFragmentManager(), ExploreDialog.DIALOG_TAG);
+                }
                 return true;
         }
         return super.onOptionsItemSelected(item);

diff --git a/Stately/app/src/main/java/com/lloydtorres/stately/zombie/ZombieControlActivity.java b/Stately/app/src/main/java/com/lloydtorres/stately/zombie/ZombieControlActivity.java
@@ -275,6 +275,10 @@ private void initRecycler() {
      * Either shows the zombie decision dialog or a message saying that no actions are available.
      */
     public void showDecisionDialog() {
+        if (isFinishing()) {
+            return;
+        }
+
         ZombieDecisionDialog zombieDialog = new ZombieDecisionDialog();
         zombieDialog.setZombieData(userData.zombieData);
         zombieDialog.show(getSupportFragmentManager(), VoteDialog.DIALOG_TAG);