From 8a6204205f1e7d380cf78c1e1626eb5b573c6451 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Thu, 15 May 2014 11:46:17 -0400
Subject: [PATCH] store "Add Repo" AlertDialog to prevent crash on rotation

When the "Add Repo" dialog was showing and the screen was rotated, it would
first leak the AlertDialog because it was not dismissed, then it would
crash after rotation, because the AlertDialog was trying to be restored but
no longer existed.  That's what I think was happening at least... the
solution surprised me a bit here...
---
 .../views/fragments/RepoListFragment.java     | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/org/fdroid/fdroid/views/fragments/RepoListFragment.java b/src/org/fdroid/fdroid/views/fragments/RepoListFragment.java
index 07ae9a41f..0fc2b8fa1 100644
--- a/src/org/fdroid/fdroid/views/fragments/RepoListFragment.java
+++ b/src/org/fdroid/fdroid/views/fragments/RepoListFragment.java
@@ -58,6 +58,7 @@ import java.util.Locale;
 public class RepoListFragment extends ListFragment
         implements LoaderManager.LoaderCallbacks<Cursor>, RepoAdapter.EnabledListener {
 
+    private AlertDialog addRepoDialog;
     private static final String DEFAULT_NEW_REPO_TEXT = "https://";
     private final int ADD_REPO = 1;
     private final int UPDATE_REPOS = 2;
@@ -309,7 +310,7 @@ public class RepoListFragment extends ListFragment
 
     private void showAddRepo(String newAddress, String newFingerprint) {
         View view = getLayoutInflater(null).inflate(R.layout.addrepo, null);
-        final AlertDialog alrt = new AlertDialog.Builder(getActivity()).setView(view).create();
+        addRepoDialog = new AlertDialog.Builder(getActivity()).setView(view).create();
         final EditText uriEditText = (EditText) view.findViewById(R.id.edit_uri);
         final EditText fingerprintEditText = (EditText) view.findViewById(R.id.edit_fingerprint);
 
@@ -322,9 +323,9 @@ public class RepoListFragment extends ListFragment
                 ? RepoProvider.Helper.findByAddress(getActivity(), newAddress)
                 : null;
 
-        alrt.setIcon(android.R.drawable.ic_menu_add);
-        alrt.setTitle(getString(R.string.repo_add_title));
-        alrt.setButton(DialogInterface.BUTTON_POSITIVE,
+        addRepoDialog.setIcon(android.R.drawable.ic_menu_add);
+        addRepoDialog.setTitle(getString(R.string.repo_add_title));
+        addRepoDialog.setButton(DialogInterface.BUTTON_POSITIVE,
                 getString(R.string.repo_add_add),
                 new DialogInterface.OnClickListener() {
                     @Override
@@ -344,7 +345,7 @@ public class RepoListFragment extends ListFragment
                     }
                 });
 
-        alrt.setButton(DialogInterface.BUTTON_NEGATIVE,
+        addRepoDialog.setButton(DialogInterface.BUTTON_NEGATIVE,
                 getString(R.string.cancel),
                 new DialogInterface.OnClickListener() {
                     @Override
@@ -352,7 +353,7 @@ public class RepoListFragment extends ListFragment
                         dialog.dismiss();
                     }
                 });
-        alrt.show();
+        addRepoDialog.show();
 
         final TextView overwriteMessage = (TextView) view.findViewById(R.id.overwrite_message);
         overwriteMessage.setVisibility(View.GONE);
@@ -361,8 +362,8 @@ public class RepoListFragment extends ListFragment
             positiveAction = PositiveAction.ADD_NEW;
         } else {
             // found the address in the DB of existing repos
-            final Button addButton = alrt.getButton(DialogInterface.BUTTON_POSITIVE);
-            alrt.setTitle(R.string.repo_exists);
+            final Button addButton = addRepoDialog.getButton(DialogInterface.BUTTON_POSITIVE);
+            addRepoDialog.setTitle(R.string.repo_exists);
             overwriteMessage.setVisibility(View.VISIBLE);
             if (newFingerprint != null)
                 newFingerprint = newFingerprint.toUpperCase(Locale.ENGLISH);
@@ -375,7 +376,7 @@ public class RepoListFragment extends ListFragment
                 // this entry already exists and is not enabled, offer to enable
                 // it
                 if (repo.inuse) {
-                    alrt.dismiss();
+                    addRepoDialog.dismiss();
                     Toast.makeText(getActivity(), R.string.repo_exists_and_enabled,
                             Toast.LENGTH_LONG).show();
                     return;
@@ -439,6 +440,7 @@ public class RepoListFragment extends ListFragment
      */
     private void finishedAddingRepo() {
         changed = true;
+        addRepoDialog = null;
         if (isImportingRepo) {
             getActivity().setResult(Activity.RESULT_OK);
             getActivity().finish();