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

fix more NPEs in ManageSecurityTokenFragment

Browse Source
This commit is contained in:
Vincent Breitmoser
2017-09-29 23:41:27 +02:00
parent 565c237903
commit 95e6562386
1 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -146,6 +146,8 @@ public class ManageSecurityTokenFragment extends Fragment implements ManageSecur
super.onDestroyView();
presenter.detach();
currentImportKeyringParcel = null;
currentPromoteKeyringParcel = null;
}
@Override
@@ -462,12 +464,20 @@ public class ManageSecurityTokenFragment extends Fragment implements ManageSecur
@Override
public void onCryptoOperationSuccess(ImportKeyResult result) {
if (currentImportKeyringParcel == null) {
return;
}
currentImportKeyringParcel = null;
presenter.onImportSuccess(result);
}
@Override
public void onCryptoOperationError(ImportKeyResult result) {
if (currentImportKeyringParcel == null) {
return;
}
currentImportKeyringParcel = null;
presenter.onImportError(result);
}
@@ -482,12 +492,20 @@ public class ManageSecurityTokenFragment extends Fragment implements ManageSecur
@Override
public void onCryptoOperationSuccess(PromoteKeyResult result) {
if (currentPromoteKeyringParcel == null) {
return;
}
currentPromoteKeyringParcel = null;
presenter.onPromoteSuccess(result);
}
@Override
public void onCryptoOperationError(PromoteKeyResult result) {
if (currentPromoteKeyringParcel == null) {
return;
}
currentPromoteKeyringParcel = null;
presenter.onPromoteError(result);
}