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

Make predicate names in KeychainProvider consistent

Browse Source
This commit is contained in:
Christian Hagau
2018-01-21 00:00:00 +00:00
parent ac96fea1fc
commit 9c749658a0
7 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/CertifyKeySpinner.java
View File

@@ -60,7 +60,7 @@ public class CertifyKeySpinner extends KeySpinner {
Uri baseUri = KeychainContract.KeyRings.buildUnifiedKeyRingsUri();
String[] projection = KeyAdapter.getProjectionWith(new String[] {
KeychainContract.KeyRings.HAS_CERTIFY,
KeychainContract.KeyRings.HAS_CERTIFY_SECRET,
});
String where = KeychainContract.KeyRings.HAS_ANY_SECRET + " = 1 AND "
@@ -79,7 +79,7 @@ public class CertifyKeySpinner extends KeySpinner {
super.onLoadFinished(loader, data);
if (loader.getId() == LOADER_ID) {
mIndexHasCertify = data.getColumnIndex(KeychainContract.KeyRings.HAS_CERTIFY);
mIndexHasCertify = data.getColumnIndex(KeychainContract.KeyRings.HAS_CERTIFY_SECRET);
// If:
// - no key has been pre-selected (e.g. by SageSlinger)

4
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/SignKeySpinner.java
View File

@@ -49,7 +49,7 @@ public class SignKeySpinner extends KeySpinner {
Uri baseUri = KeychainContract.KeyRings.buildUnifiedKeyRingsUri();
String[] projection = KeyAdapter.getProjectionWith(new String[] {
KeychainContract.KeyRings.HAS_SIGN,
KeychainContract.KeyRings.HAS_SIGN_SECRET,
});
String where = KeychainContract.KeyRings.HAS_ANY_SECRET + " = 1";
@@ -66,7 +66,7 @@ public class SignKeySpinner extends KeySpinner {
super.onLoadFinished(loader, data);
if (loader.getId() == LOADER_ID) {
mIndexHasSign = data.getColumnIndex(KeychainContract.KeyRings.HAS_SIGN);
mIndexHasSign = data.getColumnIndex(KeychainContract.KeyRings.HAS_SIGN_SECRET);
}
}