Merge branch 'development' of github.com:open-keychain/open-keychain into development

1 files changed, 9 insertions, 0 deletions

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
index 05dc99c5e..4f1b4b6c1 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
@@ -192,6 +192,9 @@ public class ProviderHelper {
                     }
                     pos += 1;
                 }
+            } else {
+                // If no data was found, throw an appropriate exception
+                throw new NotFoundException();
             }
 
             return result;
@@ -540,6 +543,7 @@ public class ProviderHelper {
                 UserIdItem item = uids.get(userIdRank);
                 operations.add(buildUserIdOperations(masterKeyId, item, userIdRank));
                 if (item.selfCert != null) {
+                    // TODO get rid of "self verified" status? this cannot even happen anymore!
                     operations.add(buildCertOperations(masterKeyId, userIdRank, item.selfCert,
                             selfCertsAreTrusted ? Certs.VERIFIED_SECRET : Certs.VERIFIED_SELF));
                 }
@@ -682,6 +686,11 @@ public class ProviderHelper {
                                         KeyFormattingUtils.convertKeyIdToHex(id)
                                 );
                                 break;
+                            case PIN:
+                                log(LogType.MSG_IS_SUBKEY_PIN,
+                                        KeyFormattingUtils.convertKeyIdToHex(id)
+                                );
+                                break;
                             case GNU_DUMMY:
                                 log(LogType.MSG_IS_SUBKEY_STRIPPED,
                                         KeyFormattingUtils.convertKeyIdToHex(id)