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

Stricter null check for selected master key id

Browse Source
This commit is contained in:
Vincent Breitmoser
2018-07-02 17:10:48 +02:00
parent 5e2330c63f
commit b7dcb5d98d
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/dialog/RemoteSelectIdentityKeyPresenter.java
View File

@@ -21,6 +21,7 @@ package org.sufficientlysecure.keychain.remote.ui.dialog;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Objects;
import android.arch.lifecycle.LifecycleOwner; import android.arch.lifecycle.LifecycleOwner;
import android.content.Context; import android.content.Context;
@@ -55,7 +56,7 @@ class RemoteSelectIdentityKeyPresenter {
private List<UnifiedKeyInfo> keyInfoData; private List<UnifiedKeyInfo> keyInfoData;
private UserId userId; private UserId userId;
private long selectedMasterKeyId; private Long selectedMasterKeyId;
private byte[] generatedKeyData; private byte[] generatedKeyData;
private ApiAppDao apiAppDao; private ApiAppDao apiAppDao;
private ApiApp apiApp; private ApiApp apiApp;
@@ -214,7 +215,7 @@ class RemoteSelectIdentityKeyPresenter {
void onHighlightFinished() { void onHighlightFinished() {
apiAppDao.insertApiApp(apiApp); apiAppDao.insertApiApp(apiApp);
apiAppDao.addAllowedKeyIdForApp(apiApp.package_name(), selectedMasterKeyId); apiAppDao.addAllowedKeyIdForApp(apiApp.package_name(), Objects.requireNonNull(selectedMasterKeyId));
view.finishAndReturn(selectedMasterKeyId); view.finishAndReturn(selectedMasterKeyId);
} }