Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

store "Add Repo" AlertDialog to prevent crash on rotation

Browse Source 
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...
This commit is contained in:
Hans-Christoph Steiner 2014-05-15 11:46:17 -04:00
parent 09cbd036fa
commit 8a6204205f
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/org/fdroid/fdroid/views/fragments/RepoListFragment.java
View File

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