Do not allow self certifying

1 files changed, 14 insertions, 2 deletions

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/CertifyKeySpinner.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/CertifyKeySpinner.java
index b686d108b..030a76136 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/CertifyKeySpinner.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/CertifyKeySpinner.java
@@ -6,9 +6,13 @@ import android.net.Uri;
 import android.support.v4.content.CursorLoader;
 import android.support.v4.content.Loader;
 import android.util.AttributeSet;
+import org.sufficientlysecure.keychain.Constants;
 import org.sufficientlysecure.keychain.provider.KeychainContract;
+import org.sufficientlysecure.keychain.provider.KeychainDatabase;
 
 public class CertifyKeySpinner extends KeySpinner {
+    private long mHiddenMasterKeyId = Constants.key.none;
+
     public CertifyKeySpinner(Context context) {
         super(context);
     }
@@ -21,6 +25,11 @@ public class CertifyKeySpinner extends KeySpinner {
         super(context, attrs, defStyle);
     }
 
+    public void setHiddenMasterKeyId(long hiddenMasterKeyId) {
+        this.mHiddenMasterKeyId = hiddenMasterKeyId;
+        reload();
+    }
+
     @Override
     public Loader<Cursor> onCreateLoader() {
         // This is called when a new Loader needs to be created. This
@@ -38,8 +47,11 @@ public class CertifyKeySpinner extends KeySpinner {
                 KeychainContract.KeyRings.HAS_ANY_SECRET
         };
 
-        String where = KeychainContract.KeyRings.HAS_ANY_SECRET + " = 1 AND " + KeychainContract.KeyRings.HAS_CERTIFY + " NOT NULL AND "
-                + KeychainContract.KeyRings.IS_REVOKED + " = 0 AND " + KeychainContract.KeyRings.IS_EXPIRED + " = 0";
+        String where = KeychainContract.KeyRings.HAS_ANY_SECRET + " = 1 AND "
+                + KeychainContract.KeyRings.HAS_CERTIFY + " NOT NULL AND "
+                + KeychainContract.KeyRings.IS_REVOKED + " = 0 AND "
+                + KeychainContract.KeyRings.IS_EXPIRED + " = 0 AND " + KeychainDatabase.Tables.KEYS + "."
+                + KeychainContract.KeyRings.MASTER_KEY_ID + " != " + mHiddenMasterKeyId;
 
         // Now create and return a CursorLoader that will take care of
         // creating a Cursor for the data being displayed.