From 6e5aba25350d4a4d4444461d8093a630eed130ea Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Thu, 23 May 2019 07:09:13 +0200
Subject: [PATCH] Simplification

---
 app/src/main/java/eu/faircode/email/AdapterMessage.java | 3 +--
 app/src/main/java/eu/faircode/email/DaoOperation.java   | 5 -----
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index b1c60b9c20..75bee8fe2c 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -3068,8 +3068,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                         EntityOperation.queue(context, message, EntityOperation.ADD);
 
                         // Delete from outbox
-                        db.operation().deleteOperation(id, EntityOperation.SEND);
-                        db.message().deleteMessage(id);
+                        db.message().deleteMessage(id); // will delete operation too
 
                         db.setTransactionSuccessful();
                     } finally {
diff --git a/app/src/main/java/eu/faircode/email/DaoOperation.java b/app/src/main/java/eu/faircode/email/DaoOperation.java
index 655bd7f1c2..a20012791b 100644
--- a/app/src/main/java/eu/faircode/email/DaoOperation.java
+++ b/app/src/main/java/eu/faircode/email/DaoOperation.java
@@ -104,9 +104,4 @@ public interface DaoOperation {
 
     @Query("DELETE FROM operation WHERE id = :id")
     int deleteOperation(long id);
-
-    @Query("DELETE FROM operation" +
-            " WHERE message = :message" +
-            " AND name = :name")
-    int deleteOperation(long message, String name);
 }