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

No bouncy castle objects in key view

Browse Source
This commit is contained in:
Dominik Schürmann
2014-02-01 16:34:42 +01:00
parent 5359205b50
commit c4340b2379
7 changed files with 25 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java
View File

@@ -346,7 +346,7 @@ public class KeychainProvider extends ContentProvider {
}
/**
* Set result of query to specific columns, don't show blob column for external content provider
* Set result of query to specific columns, don't show blob column
*
* @return
*/
@@ -367,7 +367,7 @@ public class KeychainProvider extends ContentProvider {
}
/**
* Set result of query to specific columns, don't show blob column for external content provider
* Set result of query to specific columns, don't show blob column
*
* @return
*/
@@ -388,6 +388,7 @@ public class KeychainProvider extends ContentProvider {
projectionMap.put(KeysColumns.KEY_RING_ROW_ID, KeysColumns.KEY_RING_ROW_ID);
projectionMap.put(KeysColumns.KEY_DATA, KeysColumns.KEY_DATA);
projectionMap.put(KeysColumns.RANK, KeysColumns.RANK);
projectionMap.put(KeysColumns.FINGERPRINT, KeysColumns.FINGERPRINT);
return projectionMap;
}

2
OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
View File

@@ -488,7 +488,7 @@ public class ProviderHelper {
String[] projection = new String[]{KeyRings.MASTER_KEY_ID};
Cursor cursor = context.getContentResolver().query(queryUri, projection, null, null, null);
long masterKeyId = -1;
long masterKeyId = 0;
try {
if (cursor != null && cursor.moveToFirst()) {
int masterKeyIdCol = cursor.getColumnIndexOrThrow(KeyRings.MASTER_KEY_ID);