From a69eaab0ea4aa063ef5766dd9be3c917198c201a Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <look@my.amazin.horse>
Date: Sat, 14 Jul 2018 12:03:44 +0200
Subject: [PATCH] fix insertion of data into KeySignature table

---
 .../keychain/daos/DatabaseBatchInteractor.java                 | 2 ++
 .../org/sufficientlysecure/keychain/model/KeySignature.java    | 2 +-
 .../sqldelight/org/sufficientlysecure/keychain/UserPackets.sq  | 3 +--
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/daos/DatabaseBatchInteractor.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/daos/DatabaseBatchInteractor.java
index 151e2b346..67913ab53 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/daos/DatabaseBatchInteractor.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/daos/DatabaseBatchInteractor.java
@@ -57,6 +57,8 @@ public class DatabaseBatchInteractor {
             } else if (op.keySignature != null) {
                 op.keySignature.bindTo(insertKeySignerStatement);
                 insertKeySignerStatement.executeInsert();
+            } else {
+                throw new IllegalStateException();
             }
         }
     }
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/model/KeySignature.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/model/KeySignature.java
index c093d2336..a79621e21 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/model/KeySignature.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/model/KeySignature.java
@@ -22,6 +22,6 @@ public abstract class KeySignature implements KeySignaturesModel {
     }
 
     public static KeySignature create(long masterKeyId, long certId) {
-        return null;
+        return new AutoValue_KeySignature(masterKeyId, certId);
     }
 }
diff --git a/OpenKeychain/src/main/sqldelight/org/sufficientlysecure/keychain/UserPackets.sq b/OpenKeychain/src/main/sqldelight/org/sufficientlysecure/keychain/UserPackets.sq
index e152d7fed..a6a58179d 100644
--- a/OpenKeychain/src/main/sqldelight/org/sufficientlysecure/keychain/UserPackets.sq
+++ b/OpenKeychain/src/main/sqldelight/org/sufficientlysecure/keychain/UserPackets.sq
@@ -12,8 +12,7 @@ CREATE TABLE IF NOT EXISTS user_packets(
     is_primary INTEGER AS Boolean NOT NULL,
     is_revoked INTEGER AS Boolean NOT NULL,
     PRIMARY KEY(master_key_id, rank),
-    FOREIGN KEY(master_key_id) REFERENCES
-    keyrings_public(master_key_id) ON DELETE CASCADE
+    FOREIGN KEY(master_key_id) REFERENCES keyrings_public(master_key_id) ON DELETE CASCADE
 );
 
 insertUserPacket: