fix more NPEs in ManageSecurityTokenFragment

This commit is contained in:
Vincent Breitmoser
2017-09-29 23:41:27 +02:00
parent 565c237903
commit 95e6562386

View File

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