handle database for message deleted by unsend request

app/src/main/java/org/thoughtcrime/securesms/attachments/DatabaseAttachmentProvider.kt

@@ -179,7 +179,10 @@ class DatabaseAttachmentProvider(context: Context, helper: SQLCipherOpenHelper)
     }
 
     override fun updateMessageAsDeleted(messageID: Long) {
-        TODO("Not yet implemented")
+        val smsDatabase = DatabaseFactory.getSmsDatabase(context)
+        val mmsDatabase = DatabaseFactory.getMmsDatabase(context)
+        smsDatabase.markAsDeleted(messageID)
+        mmsDatabase.markAsDeleted(messageID)
     }
 
     override fun getServerHashForMessage(messageID: Long): String? {

app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/DeletedMessageView.kt

@@ -28,9 +28,9 @@ class DeletedMessageView : LinearLayout {
 
     // region Updating
     fun bind(message: MessageRecord, @ColorInt textColor: Int) {
-        assert(message.deleted)
+        assert(message.isDeleted)
-        deleteTextView.text = context.getString(R.string.deleted_message)
+        deleteTitleTextView.text = context.getString(R.string.deleted_message)
-        deleteTextView.setTextColor(textColor)
+        deleteTitleTextView.setTextColor(textColor)
         deletedMessageViewIconImageView.imageTintList = ColorStateList.valueOf(textColor)
     }
     // endregion

app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageContentView.kt

@@ -76,7 +76,7 @@ class VisibleMessageContentView : LinearLayout {
         mainContainer.removeAllViews()
         onContentClick = null
         onContentDoubleTap = null
-        if (message.deleted) {
+        if (message.isDeleted) {
             val deletedMessageView = DeletedMessageView(context)
             deletedMessageView.bind(message, VisibleMessageContentView.getTextColor(context,message))
             mainContainer.addView(deletedMessageView)

app/src/main/java/org/thoughtcrime/securesms/database/MessagingDatabase.java

@@ -38,6 +38,8 @@ public abstract class MessagingDatabase extends Database implements MmsSmsColumn
   public abstract void markAsSent(long messageId, boolean secure);
   public abstract void markUnidentified(long messageId, boolean unidentified);
 
+  public abstract void markAsDeleted(long messageId);
+
   public void addMismatchedIdentity(long messageId, Address address, IdentityKey identityKey) {
     try {
       addToDocument(messageId, MISMATCHED_IDENTITIES,

app/src/main/java/org/thoughtcrime/securesms/database/MmsDatabase.java

@@ -391,6 +391,22 @@ public class MmsDatabase extends MessagingDatabase {
     db.update(TABLE_NAME, contentValues, ID_WHERE, new String[] {String.valueOf(messageId)});
   }
 
+  @Override
+  public void markAsDeleted(long messageId) {
+    SQLiteDatabase database     = databaseHelper.getWritableDatabase();
+    ContentValues contentValues = new ContentValues();
+    contentValues.put(READ, 1);
+    contentValues.put(BODY, "");
+    database.update(TABLE_NAME, contentValues, ID_WHERE, new String[] {String.valueOf(messageId)});
+
+    AttachmentDatabase attachmentDatabase = DatabaseFactory.getAttachmentDatabase(context);
+    ThreadUtils.queue(() -> attachmentDatabase.deleteAttachmentsForMessage(messageId));
+
+    long threadId = getThreadIdForMessage(messageId);
+    updateMailboxBitmask(messageId, Types.BASE_TYPE_MASK, Types.BASE_DELETED_TYPE, Optional.of(threadId));
+    notifyConversationListeners(threadId);
+  }
+
   @Override
   public void markExpireStarted(long messageId) {
     markExpireStarted(messageId, System.currentTimeMillis());

app/src/main/java/org/thoughtcrime/securesms/database/MmsSmsColumns.java

@@ -40,6 +40,7 @@ public interface MmsSmsColumns {
     protected static final long BASE_PENDING_SECURE_SMS_FALLBACK   = 25;
     protected static final long BASE_PENDING_INSECURE_SMS_FALLBACK = 26;
     public    static final long BASE_DRAFT_TYPE                    = 27;
+    protected static final long BASE_DELETED_TYPE                  = 28;
 
     protected static final long[] OUTGOING_MESSAGE_TYPES = {BASE_OUTBOX_TYPE, BASE_SENT_TYPE,
                                                             BASE_SENDING_TYPE, BASE_SENT_FAILED_TYPE,
@@ -152,6 +153,8 @@ public interface MmsSmsColumns {
       return (type & BASE_TYPE_MASK) == BASE_INBOX_TYPE;
     }
 
+    public static boolean isDeletedMessage(long type) { return (type & BASE_TYPE_MASK) == BASE_DELETED_TYPE; }
+
     public static boolean isJoinedType(long type) {
       return (type & BASE_TYPE_MASK) == JOINED_TYPE;
     }

app/src/main/java/org/thoughtcrime/securesms/database/SmsDatabase.java

@@ -183,6 +183,16 @@ public class SmsDatabase extends MessagingDatabase {
     db.update(TABLE_NAME, contentValues, ID_WHERE, new String[] {String.valueOf(id)});
   }
 
+  @Override
+  public void markAsDeleted(long messageId) {
+    SQLiteDatabase database     = databaseHelper.getWritableDatabase();
+    ContentValues contentValues = new ContentValues();
+    contentValues.put(READ, 1);
+    contentValues.put(BODY, "");
+    database.update(TABLE_NAME, contentValues, ID_WHERE, new String[] {String.valueOf(messageId)});
+    updateTypeBitmask(messageId, Types.BASE_TYPE_MASK, Types.BASE_DELETED_TYPE);
+  }
+
   @Override
   public void markExpireStarted(long id) {
     markExpireStarted(id, System.currentTimeMillis());

app/src/main/java/org/thoughtcrime/securesms/database/model/DisplayRecord.java

@@ -117,6 +117,7 @@ public abstract class DisplayRecord {
   public boolean isMissedCall() {
     return SmsDatabase.Types.isMissedCall(type);
   }
+  public boolean isDeleted() { return  MmsSmsColumns.Types.isDeletedMessage(type); }
 
   public boolean isControlMessage() {
     return isGroupUpdateMessage() || isExpirationTimerUpdate() || isDataExtractionNotification();

app/src/main/java/org/thoughtcrime/securesms/database/model/MessageRecord.java

@@ -49,7 +49,6 @@ public abstract class MessageRecord extends DisplayRecord {
   private final long                      expireStarted;
   private final boolean                   unidentified;
   public  final long                      id;
-  public  final boolean                   deleted;
 
   public abstract boolean isMms();
   public abstract boolean isMmsNotification();
@@ -72,7 +71,6 @@ public abstract class MessageRecord extends DisplayRecord {
     this.expiresIn           = expiresIn;
     this.expireStarted       = expireStarted;
     this.unidentified        = unidentified;
-    this.deleted             = false;
   }
 
   public long getId() {
@@ -105,9 +103,7 @@ public abstract class MessageRecord extends DisplayRecord {
 
   @Override
   public SpannableString getDisplayBody(@NonNull Context context) {
-    if (this.deleted) {
+    if (isGroupUpdateMessage()) {
-      return new SpannableString("This message has been deleted."); // TODO: localize
-    } else if (isGroupUpdateMessage()) {
       UpdateMessageData updateMessageData = UpdateMessageData.Companion.fromJSON(getBody());
       return new SpannableString(UpdateMessageBuilder.INSTANCE.buildGroupUpdateMessage(context, updateMessageData, getIndividualRecipient().getAddress().serialize(), isOutgoing()));
     } else if (isExpirationTimerUpdate()) {

app/src/main/res/layout/view_deleted_message.xml

@@ -6,21 +6,23 @@
     android:layout_height="wrap_content"
     xmlns:tools="http://schemas.android.com/tools"
     android:orientation="horizontal"
-    android:padding="@dimen/medium_spacing"
+    android:padding="@dimen/small_spacing"
     android:gravity="center">
 
     <ImageView
         android:id="@+id/deletedMessageViewIconImageView"
-        android:layout_width="24dp"
+        android:layout_width="16dp"
-        android:layout_height="24dp"
+        android:layout_height="16dp"
+        android:layout_marginStart="@dimen/small_spacing"
         android:src="?menu_trash_icon"
         app:tint="@color/text" />
 
     <TextView
-        android:id="@+id/documentTitleTextView"
+        android:id="@+id/deleteTitleTextView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="4dp"
+        android:layout_marginEnd="@dimen/small_spacing"
         android:textSize="@dimen/very_small_font_size"
         android:textColor="@color/text"
         tools:text="This message has been deleted"