Clean up DisplayRecord

app/src/main/java/org/thoughtcrime/securesms/MessageDetailsActivity.java

@@ -272,9 +272,7 @@ public class MessageDetailsActivity extends PassphraseRequiredActionBarActivity
 
   private void inflateMessageViewIfAbsent(MessageRecord messageRecord) {
     if (conversationItem == null) {
-      if (messageRecord.isGroupAction()) {
+      if (messageRecord.isOutgoing()) {
-        conversationItem = (ConversationItem) inflater.inflate(R.layout.conversation_item_update, itemParent, false);
-      } else if (messageRecord.isOutgoing()) {
         conversationItem = (ConversationItem) inflater.inflate(R.layout.conversation_item_sent, itemParent, false);
       } else {
         conversationItem = (ConversationItem) inflater.inflate(R.layout.conversation_item_received, itemParent, false);

app/src/main/java/org/thoughtcrime/securesms/components/ConversationItemFooter.java

@@ -4,14 +4,15 @@ import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.os.AsyncTask;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 import android.util.AttributeSet;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 import org.thoughtcrime.securesms.ApplicationContext;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.database.model.MessageRecord;
@@ -88,8 +89,6 @@ public class ConversationItemFooter extends LinearLayout {
 
     if (messageRecord.isFailed()) {
       dateView.setText(R.string.ConversationItem_error_not_delivered);
-    } else if (messageRecord.isPendingInsecureSmsFallback()) {
-      dateView.setText(R.string.ConversationItem_click_to_approve_unencrypted);
     } else {
       dateView.setText(DateUtils.getExtendedRelativeTimeSpanString(getContext(), locale, messageRecord.getTimestamp()));
     }
@@ -135,10 +134,10 @@ public class ConversationItemFooter extends LinearLayout {
   }
 
   private void presentDeliveryStatus(@NonNull MessageRecord messageRecord) {
-    if (!messageRecord.isFailed() && !messageRecord.isPendingInsecureSmsFallback()) {
+    if (!messageRecord.isFailed()) {
       if      (!messageRecord.isOutgoing())  deliveryStatusView.setNone();
       else if (messageRecord.isPending())    deliveryStatusView.setPending();
-      else if (messageRecord.isRemoteRead()) deliveryStatusView.setRead();
+      else if (messageRecord.isRead())       deliveryStatusView.setRead();
       else if (messageRecord.isDelivered())  deliveryStatusView.setDelivered();
       else                                   deliveryStatusView.setSent();
     } else {

app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java

@@ -351,10 +351,9 @@ public class ConversationFragment extends Fragment
     }
 
     for (MessageRecord messageRecord : messageRecords) {
-      if (messageRecord.isGroupAction() || messageRecord.isCallLog() ||
+      if (messageRecord.isCallLog() || messageRecord.isExpirationTimerUpdate() ||
-          messageRecord.isJoined() || messageRecord.isExpirationTimerUpdate() ||
+          messageRecord.isIdentityUpdate() || messageRecord.isIdentityVerified() ||
-          messageRecord.isEndSession() || messageRecord.isIdentityUpdate() ||
+          messageRecord.isIdentityDefault())
-          messageRecord.isIdentityVerified() || messageRecord.isIdentityDefault() || messageRecord.isLokiSessionRestoreSent() || messageRecord.isLokiSessionRestoreDone())
       {
         actionMessage = true;
       }

app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java

@@ -784,12 +784,10 @@ public class ConversationItem extends LinearLayout
   }
 
   private void setStatusIcons(MessageRecord messageRecord) {
-    bodyText.setCompoundDrawablesWithIntrinsicBounds(0, 0, messageRecord.isKeyExchange() ? R.drawable.ic_menu_login : 0, 0);
+    bodyText.setCompoundDrawablesWithIntrinsicBounds(0, 0, 0, 0);
 
     if (messageRecord.isFailed()) {
       alertView.setFailed();
-    } else if (messageRecord.isPendingInsecureSmsFallback()) {
-      alertView.setPendingApproval();
     } else {
       alertView.setNone();
     }
@@ -859,7 +857,7 @@ public class ConversationItem extends LinearLayout
 
     boolean differentTimestamps = next.isPresent() && !DateUtils.isSameExtendedRelativeTimestamp(context, locale, next.get().getTimestamp(), current.getTimestamp());
 
-    if (current.getExpiresIn() > 0 || !current.isSecure() || current.isPending() || current.isPendingInsecureSmsFallback() ||
+    if (current.getExpiresIn() > 0 || !current.isSecure() || current.isPending() ||
         current.isFailed() || differentTimestamps || isEndOfMessageCluster(current, next, isGroupThread))
     {
       ConversationItemFooter activeFooter = getActiveFooter(current);
@@ -883,7 +881,6 @@ public class ConversationItem extends LinearLayout
   private boolean shouldInterceptClicks(MessageRecord messageRecord) {
     return batchSelected.isEmpty() &&
             ((messageRecord.isFailed() && !messageRecord.isMmsNotification()) ||
-            messageRecord.isPendingInsecureSmsFallback() ||
             messageRecord.isBundleKeyExchange());
   }
 

app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationUpdateItem.java

@@ -101,18 +101,13 @@ public class ConversationUpdateItem extends LinearLayout
 
     this.sender.addListener(this);
 
-    if      (messageRecord.isGroupAction())            setGroupRecord(messageRecord);
+    if (messageRecord.isCallLog())                setCallRecord(messageRecord);
-    else if (messageRecord.isCallLog())                setCallRecord(messageRecord);
-    else if (messageRecord.isJoined())                 setJoinedRecord(messageRecord);
     else if (messageRecord.isExpirationTimerUpdate())  setTimerRecord(messageRecord);
-    else if (messageRecord.isScreenshotExtraction())   setDataExtractionRecord(messageRecord, DataExtractionNotificationInfoMessage.Kind.SCREENSHOT);
+    else if (messageRecord.isScreenshotNotification())   setDataExtractionRecord(messageRecord, DataExtractionNotificationInfoMessage.Kind.SCREENSHOT);
-    else if (messageRecord.isMediaSavedExtraction())   setDataExtractionRecord(messageRecord, DataExtractionNotificationInfoMessage.Kind.MEDIA_SAVED);
+    else if (messageRecord.isMediaSavedNotification())   setDataExtractionRecord(messageRecord, DataExtractionNotificationInfoMessage.Kind.MEDIA_SAVED);
-    else if (messageRecord.isEndSession())             setEndSessionRecord(messageRecord);
     else if (messageRecord.isIdentityUpdate())         setIdentityRecord(messageRecord);
     else if (messageRecord.isIdentityVerified() ||
              messageRecord.isIdentityDefault())        setIdentityVerifyUpdate(messageRecord);
-    else if (messageRecord.isLokiSessionRestoreSent()) setTextMessageRecord(messageRecord);
-    else if (messageRecord.isLokiSessionRestoreDone()) setTextMessageRecord(messageRecord);
     else                                               throw new AssertionError("Neither group nor log nor joined.");
 
     if (batchSelected.contains(messageRecord)) setSelected(true);

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

@@ -582,7 +582,7 @@ public class ThreadDatabase extends Database {
   }
 
   private @Nullable Uri getAttachmentUriFor(MessageRecord record) {
-    if (!record.isMms() || record.isMmsNotification() || record.isGroupAction()) return null;
+    if (!record.isMms() || record.isMmsNotification()) return null;
 
     SlideDeck slideDeck = ((MediaMmsMessageRecord)record).getSlideDeck();
     Slide     thumbnail = slideDeck.getThumbnailSlide();

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

@@ -17,12 +17,13 @@
 package org.thoughtcrime.securesms.database.model;
 
 import android.content.Context;
-import androidx.annotation.NonNull;
 import android.text.SpannableString;
 
+import androidx.annotation.NonNull;
+
+import org.session.libsession.utilities.recipients.Recipient;
 import org.thoughtcrime.securesms.database.MmsSmsColumns;
 import org.thoughtcrime.securesms.database.SmsDatabase;
-import org.session.libsession.utilities.recipients.Recipient;
 
 /**
  * The base class for all message record models.  Encapsulates basic data
@@ -33,9 +34,7 @@ import org.session.libsession.utilities.recipients.Recipient;
  */
 
 public abstract class DisplayRecord {
-
   protected final long type;
-
   private final Recipient  recipient;
   private final long       dateSent;
   private final long       dateReceived;
@@ -63,138 +62,69 @@ public abstract class DisplayRecord {
   public @NonNull String getBody() {
     return body == null ? "" : body;
   }
-
-  public boolean isFailed() {
-    return
-        MmsSmsColumns.Types.isFailedMessageType(type)            ||
-        MmsSmsColumns.Types.isPendingSecureSmsFallbackType(type) ||
-        deliveryStatus >= SmsDatabase.Status.STATUS_FAILED;
-  }
-
-  public boolean isPending() {
-    return MmsSmsColumns.Types.isPendingMessageType(type) &&
-           !MmsSmsColumns.Types.isIdentityVerified(type)  &&
-           !MmsSmsColumns.Types.isIdentityDefault(type);
-  }
-
-  public boolean isOutgoing() {
-    return MmsSmsColumns.Types.isOutgoingMessageType(type);
-  }
-
   public abstract SpannableString getDisplayBody(@NonNull Context context);
-
   public Recipient getRecipient() {
     return recipient;
   }
-
   public long getDateSent() {
     return dateSent;
   }
-
   public long getDateReceived() {
     return dateReceived;
   }
-
   public long getThreadId() {
     return threadId;
   }
-
-  public boolean isKeyExchange() {
-    return SmsDatabase.Types.isKeyExchangeType(type);
-  }
-
-  public boolean isEndSession() { return SmsDatabase.Types.isEndSessionType(type); }
-
-  public boolean isLokiSessionRestoreSent() { return SmsDatabase.Types.isLokiSessionRestoreSentType(type); }
-
-  public boolean isLokiSessionRestoreDone() { return SmsDatabase.Types.isLokiSessionRestoreDoneType(type); }
-
-  // TODO isGroupUpdate and isGroupQuit are kept for compatibility with old update messages, they can be removed later on
-  public boolean isGroupUpdate() {
-    return SmsDatabase.Types.isGroupUpdate(type);
-  }
-
-  public boolean isGroupQuit() {
-    return SmsDatabase.Types.isGroupQuit(type);
-  }
-
-  public boolean isGroupUpdateMessage() {
-    return SmsDatabase.Types.isGroupUpdateMessage(type);
-  }
-
-  //TODO isGroupAction can be replaced by isGroupUpdateMessage in the code when the 2 functions above are removed
-  public boolean isGroupAction() {
-    return isGroupUpdate() || isGroupQuit() || isGroupUpdateMessage();
-  }
-
-  public boolean isExpirationTimerUpdate() {
-    return SmsDatabase.Types.isExpirationTimerUpdate(type);
-  }
-
-  // Data extraction
-
-  public boolean isMediaSavedExtraction() {
-    return MmsSmsColumns.Types.isMediaSavedExtraction(type);
-  }
-
-  public boolean isScreenshotExtraction() {
-    return MmsSmsColumns.Types.isScreenshotExtraction(type);
-  }
-
-  public boolean isDataExtraction() {
-    return isMediaSavedExtraction() || isScreenshotExtraction();
-  }
-
-  public boolean isOpenGroupInvitation() {
-    return MmsSmsColumns.Types.isOpenGroupInvitation(type);
-  }
-
-  public boolean isCallLog() {
-    return SmsDatabase.Types.isCallLog(type);
-  }
-
-  public boolean isJoined() {
-    return SmsDatabase.Types.isJoinedType(type);
-  }
-
-  public boolean isIncomingCall() {
-    return SmsDatabase.Types.isIncomingCall(type);
-  }
-
-  public boolean isOutgoingCall() {
-    return SmsDatabase.Types.isOutgoingCall(type);
-  }
-
-  public boolean isMissedCall() {
-    return SmsDatabase.Types.isMissedCall(type);
-  }
-
-  public boolean isVerificationStatusChange() {
-    return SmsDatabase.Types.isIdentityDefault(type) || SmsDatabase.Types.isIdentityVerified(type);
-  }
-
   public int getDeliveryStatus() {
     return deliveryStatus;
   }
-
   public int getDeliveryReceiptCount() {
     return deliveryReceiptCount;
   }
-
   public int getReadReceiptCount() {
     return readReceiptCount;
   }
 
   public boolean isDelivered() {
-    return (deliveryStatus >= SmsDatabase.Status.STATUS_COMPLETE &&
+    return (deliveryStatus >= SmsDatabase.Status.STATUS_COMPLETE
-            deliveryStatus < SmsDatabase.Status.STATUS_PENDING) || deliveryReceiptCount > 0;
+      && deliveryStatus < SmsDatabase.Status.STATUS_PENDING) || deliveryReceiptCount > 0;
   }
 
-  public boolean isRemoteRead() {
+  public boolean isFailed() {
-    return readReceiptCount > 0;
+    return MmsSmsColumns.Types.isFailedMessageType(type)
+      || MmsSmsColumns.Types.isPendingSecureSmsFallbackType(type)
+      || deliveryStatus >= SmsDatabase.Status.STATUS_FAILED;
   }
 
-  public boolean isPendingInsecureSmsFallback() {
+  public boolean isPending() {
-    return SmsDatabase.Types.isPendingInsecureSmsFallbackType(type);
+    return MmsSmsColumns.Types.isPendingMessageType(type)
+      && !MmsSmsColumns.Types.isIdentityVerified(type)
+      && !MmsSmsColumns.Types.isIdentityDefault(type);
+  }
+
+  public boolean isRead() { return readReceiptCount > 0; }
+
+  public boolean isOutgoing() {
+    return MmsSmsColumns.Types.isOutgoingMessageType(type);
+  }
+  public boolean isGroupUpdateMessage() {
+    return SmsDatabase.Types.isGroupUpdateMessage(type);
+  }
+  public boolean isExpirationTimerUpdate() { return SmsDatabase.Types.isExpirationTimerUpdate(type); }
+  public boolean isMediaSavedNotification() { return MmsSmsColumns.Types.isMediaSavedExtraction(type); }
+  public boolean isScreenshotNotification() { return MmsSmsColumns.Types.isScreenshotExtraction(type); }
+  public boolean isDataExtractionNotification() { return isMediaSavedNotification() || isScreenshotNotification(); }
+  public boolean isOpenGroupInvitation() { return MmsSmsColumns.Types.isOpenGroupInvitation(type); }
+  public boolean isCallLog() {
+    return SmsDatabase.Types.isCallLog(type);
+  }
+  public boolean isIncomingCall() {
+    return SmsDatabase.Types.isIncomingCall(type);
+  }
+  public boolean isOutgoingCall() {
+    return SmsDatabase.Types.isOutgoingCall(type);
+  }
+  public boolean isMissedCall() {
+    return SmsDatabase.Types.isMissedCall(type);
   }
 }

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

@@ -17,23 +17,21 @@
 package org.thoughtcrime.securesms.database.model;
 
 import android.content.Context;
-import androidx.annotation.NonNull;
 import android.text.Spannable;
 import android.text.SpannableString;
 import android.text.style.RelativeSizeSpan;
 import android.text.style.StyleSpan;
 
-import network.loki.messenger.R;
+import androidx.annotation.NonNull;
 
 import org.session.libsession.messaging.sending_receiving.data_extraction.DataExtractionNotificationInfoMessage;
 import org.session.libsession.messaging.utilities.UpdateMessageBuilder;
 import org.session.libsession.messaging.utilities.UpdateMessageData;
-import org.thoughtcrime.securesms.database.MmsSmsColumns;
-import org.thoughtcrime.securesms.database.SmsDatabase;
 import org.session.libsession.utilities.IdentityKeyMismatch;
 import org.session.libsession.utilities.NetworkFailure;
-
 import org.session.libsession.utilities.recipients.Recipient;
+import org.thoughtcrime.securesms.database.MmsSmsColumns;
+import org.thoughtcrime.securesms.database.SmsDatabase;
 
 import java.util.List;
 
@@ -98,19 +96,9 @@ public abstract class MessageRecord extends DisplayRecord {
     } else if (isExpirationTimerUpdate()) {
       int seconds = (int) (getExpiresIn() / 1000);
       return new SpannableString(UpdateMessageBuilder.INSTANCE.buildExpirationTimerMessage(context, seconds, getIndividualRecipient().getAddress().serialize(), isOutgoing()));
-    } else if (isDataExtraction()) {
+    } else if (isDataExtractionNotification()) {
-      if (isScreenshotExtraction()) return new SpannableString((UpdateMessageBuilder.INSTANCE.buildDataExtractionMessage(context, DataExtractionNotificationInfoMessage.Kind.SCREENSHOT, getIndividualRecipient().getAddress().serialize())));
+      if (isScreenshotNotification()) return new SpannableString((UpdateMessageBuilder.INSTANCE.buildDataExtractionMessage(context, DataExtractionNotificationInfoMessage.Kind.SCREENSHOT, getIndividualRecipient().getAddress().serialize())));
-      else if (isMediaSavedExtraction()) return new SpannableString((UpdateMessageBuilder.INSTANCE.buildDataExtractionMessage(context, DataExtractionNotificationInfoMessage.Kind.MEDIA_SAVED, getIndividualRecipient().getAddress().serialize())));
+      else if (isMediaSavedNotification()) return new SpannableString((UpdateMessageBuilder.INSTANCE.buildDataExtractionMessage(context, DataExtractionNotificationInfoMessage.Kind.MEDIA_SAVED, getIndividualRecipient().getAddress().serialize())));
-    }
-    // TODO below lines are left here for compatibility with older group update messages, it can be deleted later on
-    else if (isGroupUpdate() && isOutgoing()) {
-      return new SpannableString(context.getString(R.string.MessageRecord_you_updated_group));
-    } else if (isGroupUpdate()) {
-      return new SpannableString(context.getString(R.string.MessageRecord_s_updated_group, getIndividualRecipient().toShortString()));
-    } else if (isGroupQuit() && isOutgoing()) {
-      return new SpannableString(context.getString(R.string.MessageRecord_left_group));
-    } else if (isGroupQuit()) {
-      return new SpannableString(context.getString(R.string.ConversationItem_group_action_left, getIndividualRecipient().toShortString()));
     }
 
     return new SpannableString(getBody());
@@ -163,8 +151,8 @@ public abstract class MessageRecord extends DisplayRecord {
   }
 
   public boolean isUpdate() {
-    return isGroupAction() || isJoined() || isExpirationTimerUpdate() || isCallLog() || isDataExtraction() ||
+    return isExpirationTimerUpdate() || isCallLog() || isDataExtractionNotification() ||
-           isEndSession()  || isIdentityUpdate() || isIdentityVerified() || isIdentityDefault() || isLokiSessionRestoreSent() || isLokiSessionRestoreDone();
+           isIdentityUpdate() || isIdentityVerified() || isIdentityDefault();
   }
 
   public boolean isMediaPending() {

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

@@ -74,22 +74,10 @@ public class SmsMessageRecord extends MessageRecord {
       return emphasisAdded(context.getString(R.string.MessageRecord_message_encrypted_with_a_legacy_protocol_version_that_is_no_longer_supported));
     } else if (isBundleKeyExchange()) {
       return emphasisAdded(context.getString(R.string.SmsMessageRecord_received_message_with_new_safety_number_tap_to_process));
-    } else if (isKeyExchange() && isOutgoing()) {
-      return new SpannableString("");
-    } else if (isKeyExchange() && !isOutgoing()) {
-      return emphasisAdded(context.getString(R.string.ConversationItem_received_key_exchange_message_tap_to_process));
     } else if (SmsDatabase.Types.isDuplicateMessageType(type)) {
       return emphasisAdded(context.getString(R.string.SmsMessageRecord_duplicate_message));
     } else if (SmsDatabase.Types.isNoRemoteSessionType(type)) {
       return emphasisAdded(context.getString(R.string.MessageDisplayHelper_message_encrypted_for_non_existing_session));
-    } else if (isLokiSessionRestoreSent()) {
-      return emphasisAdded(context.getString(R.string.SmsMessageRecord_secure_session_reset));
-    } else if (isLokiSessionRestoreDone()) {
-      return emphasisAdded(context.getString(R.string.view_reset_secure_session_done_message));
-    } else if (isEndSession() && isOutgoing()) {
-      return emphasisAdded(context.getString(R.string.SmsMessageRecord_secure_session_reset));
-    } else if (isEndSession()) {
-      return emphasisAdded(context.getString(R.string.SmsMessageRecord_secure_session_reset_s, getIndividualRecipient().toShortString()));
     } else {
       return super.getDisplayBody(context);
     }

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

@@ -73,22 +73,14 @@ public class ThreadRecord extends DisplayRecord {
   @Override
   public SpannableString getDisplayBody(@NonNull Context context) {
     Recipient recipient = getRecipient();
-    if (isGroupUpdate() || isGroupUpdateMessage()) {
+    if (isGroupUpdateMessage()) {
       return emphasisAdded(context.getString(R.string.ThreadRecord_group_updated));
-    } else if (isGroupQuit()) {
-      return emphasisAdded(context.getString(R.string.ThreadRecord_left_the_group));
     } else if (isOpenGroupInvitation()) {
       return emphasisAdded(context.getString(R.string.ThreadRecord_open_group_invitation));
-    } else if (isKeyExchange()) {
-      return emphasisAdded(context.getString(R.string.ConversationListItem_key_exchange_message));
     } else if (SmsDatabase.Types.isFailedDecryptType(type)) {
       return emphasisAdded(context.getString(R.string.MessageDisplayHelper_bad_encrypted_message));
     } else if (SmsDatabase.Types.isNoRemoteSessionType(type)) {
       return emphasisAdded(context.getString(R.string.MessageDisplayHelper_message_encrypted_for_non_existing_session));
-    } else if (isLokiSessionRestoreSent()) {
-      return emphasisAdded(context.getString(R.string.SmsMessageRecord_secure_session_reset));
-    } else if (isLokiSessionRestoreDone()) {
-      return emphasisAdded(context.getString(R.string.view_reset_secure_session_done_message));
     } else if (SmsDatabase.Types.isEndSessionType(type)) {
       return emphasisAdded(context.getString(R.string.ThreadRecord_secure_session_reset));
     } else if (MmsSmsColumns.Types.isLegacyType(type)) {

app/src/main/java/org/thoughtcrime/securesms/loki/views/ConversationView.kt

@@ -73,7 +73,7 @@ class ConversationView : LinearLayout {
             !thread.isOutgoing -> statusIndicatorImageView.visibility = View.GONE
             thread.isFailed -> statusIndicatorImageView.setImageResource(R.drawable.ic_error)
             thread.isPending -> statusIndicatorImageView.setImageResource(R.drawable.ic_circle_dot_dot_dot)
-            thread.isRemoteRead -> statusIndicatorImageView.setImageResource(R.drawable.ic_filled_circle_check)
+            thread.isRead -> statusIndicatorImageView.setImageResource(R.drawable.ic_filled_circle_check)
             else -> statusIndicatorImageView.setImageResource(R.drawable.ic_circle_check)
         }
     }