cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

token-import: allow detaching of presenter

Browse Source
This commit is contained in:
Vincent Breitmoser
2017-09-05 21:05:23 +02:00
parent 16d6f07fe7
commit 292b35c26d
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/token/ManageSecurityTokenFragment.java
View File

@@ -159,6 +159,13 @@ public class ManageSecurityTokenFragment extends Fragment implements ManageSecur
return view; return view;
} }
@Override
public void onDestroyView() {
super.onDestroyView();
presenter.setView(null);
}
@Override @Override
public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
inflater.inflate(R.menu.token_setup, menu); inflater.inflate(R.menu.token_setup, menu);

8
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/token/ManageSecurityTokenPresenter.java
View File

@@ -96,7 +96,9 @@ class ManageSecurityTokenPresenter implements ManageSecurityTokenMvpPresenter {
@Override @Override
public void onActivityCreated() { public void onActivityCreated() {
continueSearch(); if (!searchedLocally || !searchedAtUri || !searchedKeyservers) {
continueSearch();
}
} }
private void continueSearchAfterError() { private void continueSearchAfterError() {
@@ -145,6 +147,10 @@ class ManageSecurityTokenPresenter implements ManageSecurityTokenMvpPresenter {
@Override @Override
public void onLoadFinished(Loader<KeyRetrievalResult> loader, KeyRetrievalResult data) { public void onLoadFinished(Loader<KeyRetrievalResult> loader, KeyRetrievalResult data) {
if (view == null) {
return;
}
switch (loader.getId()) { switch (loader.getId()) {
case LOADER_LOCAL: { case LOADER_LOCAL: {
searchedLocally = true; searchedLocally = true;