From 4a43ebaafc8a9c589ff62d7986222d8b3e9b7b80 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sun, 12 Aug 2018 08:16:41 +0000
Subject: [PATCH] Fail on inserting when record exists

---
 app/src/main/java/eu/faircode/email/DaoAccount.java    |  3 +--
 app/src/main/java/eu/faircode/email/DaoAttachment.java |  3 +--
 app/src/main/java/eu/faircode/email/DaoFolder.java     |  3 +--
 app/src/main/java/eu/faircode/email/DaoIdentity.java   |  3 +--
 app/src/main/java/eu/faircode/email/DaoOperation.java  | 10 +++-------
 5 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/DaoAccount.java b/app/src/main/java/eu/faircode/email/DaoAccount.java
index 6018b8b158..1087c83eaa 100644
--- a/app/src/main/java/eu/faircode/email/DaoAccount.java
+++ b/app/src/main/java/eu/faircode/email/DaoAccount.java
@@ -24,7 +24,6 @@ import java.util.List;
 import androidx.lifecycle.LiveData;
 import androidx.room.Dao;
 import androidx.room.Insert;
-import androidx.room.OnConflictStrategy;
 import androidx.room.Query;
 import androidx.room.Update;
 
@@ -59,7 +58,7 @@ public interface DaoAccount {
             "     AND folder.type = '" + EntityFolder.INBOX + "') AS unseen")
     LiveData<TupleAccountStats> liveStats();
 
-    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    @Insert
     long insertAccount(EntityAccount account);
 
     @Update
diff --git a/app/src/main/java/eu/faircode/email/DaoAttachment.java b/app/src/main/java/eu/faircode/email/DaoAttachment.java
index 4f8f5136be..6ca55552c2 100644
--- a/app/src/main/java/eu/faircode/email/DaoAttachment.java
+++ b/app/src/main/java/eu/faircode/email/DaoAttachment.java
@@ -24,7 +24,6 @@ import java.util.List;
 import androidx.lifecycle.LiveData;
 import androidx.room.Dao;
 import androidx.room.Insert;
-import androidx.room.OnConflictStrategy;
 import androidx.room.Query;
 import androidx.room.Update;
 
@@ -63,7 +62,7 @@ public interface DaoAttachment {
     @Query("SELECT content FROM attachment WHERE id = :id")
     byte[] getContent(long id);
 
-    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    @Insert
     long insertAttachment(EntityAttachment attachment);
 
     @Update
diff --git a/app/src/main/java/eu/faircode/email/DaoFolder.java b/app/src/main/java/eu/faircode/email/DaoFolder.java
index 06f42387e1..64581717da 100644
--- a/app/src/main/java/eu/faircode/email/DaoFolder.java
+++ b/app/src/main/java/eu/faircode/email/DaoFolder.java
@@ -24,7 +24,6 @@ import java.util.List;
 import androidx.lifecycle.LiveData;
 import androidx.room.Dao;
 import androidx.room.Insert;
-import androidx.room.OnConflictStrategy;
 import androidx.room.Query;
 import androidx.room.Update;
 
@@ -80,7 +79,7 @@ public interface DaoFolder {
     @Query("SELECT * FROM folder WHERE type = '" + EntityFolder.OUTBOX + "'")
     EntityFolder getOutbox();
 
-    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    @Insert
     long insertFolder(EntityFolder folder);
 
     @Update
diff --git a/app/src/main/java/eu/faircode/email/DaoIdentity.java b/app/src/main/java/eu/faircode/email/DaoIdentity.java
index 97b5ab33e2..727feaa93a 100644
--- a/app/src/main/java/eu/faircode/email/DaoIdentity.java
+++ b/app/src/main/java/eu/faircode/email/DaoIdentity.java
@@ -24,7 +24,6 @@ import java.util.List;
 import androidx.lifecycle.LiveData;
 import androidx.room.Dao;
 import androidx.room.Insert;
-import androidx.room.OnConflictStrategy;
 import androidx.room.Query;
 import androidx.room.Update;
 
@@ -43,7 +42,7 @@ public interface DaoIdentity {
     @Query("SELECT * FROM identity WHERE id = :id")
     LiveData<EntityIdentity> liveIdentity(long id);
 
-    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    @Insert
     long insertIdentity(EntityIdentity identity);
 
     @Update
diff --git a/app/src/main/java/eu/faircode/email/DaoOperation.java b/app/src/main/java/eu/faircode/email/DaoOperation.java
index aa065b24a1..cdc93f5d19 100644
--- a/app/src/main/java/eu/faircode/email/DaoOperation.java
+++ b/app/src/main/java/eu/faircode/email/DaoOperation.java
@@ -23,27 +23,23 @@ import java.util.List;
 
 import androidx.room.Dao;
 import androidx.room.Insert;
-import androidx.room.OnConflictStrategy;
 import androidx.room.Query;
 import androidx.room.Update;
 
 @Dao
 public interface DaoOperation {
-    @Insert(onConflict = OnConflictStrategy.REPLACE)
-    long insertOperation(EntityOperation operation);
-
     @Query("SELECT * FROM operation WHERE folder = :folder ORDER BY id")
     List<EntityOperation> getOperations(long folder);
 
     @Query("SELECT COUNT(id) FROM operation WHERE folder = :folder")
     int getOperationCount(long folder);
 
+    @Insert
+    long insertOperation(EntityOperation operation);
+
     @Update
     void updateOperation(EntityOperation operation);
 
     @Query("DELETE FROM operation WHERE id = :id")
     void deleteOperation(long id);
-
-    @Query("DELETE FROM operation WHERE message = :id AND name = :name")
-    int deleteOperations(long id, String name);
 }