Clean

src/org/thoughtcrime/securesms/notifications/MarkReadReceiver.java

@@ -21,16 +21,18 @@ import org.thoughtcrime.securesms.jobs.MultiDeviceReadUpdateJob;
 import org.thoughtcrime.securesms.jobs.SendReadReceiptJob;
 import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.loki.MultiDeviceUtilities;
+import org.thoughtcrime.securesms.loki.protocol.SessionMetaProtocol;
+import org.thoughtcrime.securesms.loki.protocol.SyncMessagesProtocol;
 import org.thoughtcrime.securesms.service.ExpiringMessageManager;
 import org.thoughtcrime.securesms.util.Util;
-import org.whispersystems.signalservice.loki.api.fileserver.LokiFileServerAPI;
+import org.whispersystems.signalservice.loki.protocol.multidevice.MultiDeviceProtocol;
 
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 import kotlin.Unit;
-import kotlin.contracts.Returns;
 
 public class MarkReadReceiver extends BroadcastReceiver {
 
@@ -78,7 +80,8 @@ public class MarkReadReceiver extends BroadcastReceiver {
 
     for (MarkedMessageInfo messageInfo : markedReadMessages) {
       scheduleDeletion(context, messageInfo.getExpirationInfo());
-      if (!messageInfo.getSyncMessageId().getAddress().isGroup()) {
+
+      if (SyncMessagesProtocol.shouldSyncReadReceipt(messageInfo.getSyncMessageId().getAddress())) {
         syncMessageIds.add(messageInfo.getSyncMessageId());
       }
     }
@@ -93,17 +96,13 @@ public class MarkReadReceiver extends BroadcastReceiver {
 
     for (Address address : addressMap.keySet()) {
       List<Long> timestamps = Stream.of(addressMap.get(address)).map(SyncMessageId::getTimetamp).toList();
-      MultiDeviceUtilities.getAllDevicePublicKeysWithFriendStatus(context, address.serialize()).success(devices -> {
-        for (Map.Entry<String, Boolean> entry : devices.entrySet()) {
-          String device = entry.getKey();
-          boolean isFriend = entry.getValue();
-          // Loki - This also prevents read receipts from being sent in group chats as they don't maintain a friend request status
-          if (isFriend) {
-            Util.runOnMain(() -> ApplicationContext.getInstance(context).getJobManager().add(new SendReadReceiptJob(Address.fromSerialized(device), timestamps)));
-          }
-        }
-        return Unit.INSTANCE;
-      });
+      Set<String> linkedDevices = MultiDeviceProtocol.shared.getAllLinkedDevices(address.serialize());
+      for (String device : linkedDevices) {
+        if (!SessionMetaProtocol.shouldSendReadReceipt(device, context)) { continue; }
+        ApplicationContext.getInstance(context)
+                .getJobManager()
+                .add(new SendReadReceiptJob(address, timestamps));
+      }
     }
   }
 

src/org/thoughtcrime/securesms/notifications/MessageNotifier.java

@@ -50,6 +50,7 @@ import org.thoughtcrime.securesms.database.model.MessageRecord;
 import org.thoughtcrime.securesms.database.model.MmsMessageRecord;
 import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.loki.MultiDeviceUtilities;
+import org.thoughtcrime.securesms.loki.protocol.SessionMetaProtocol;
 import org.thoughtcrime.securesms.mms.SlideDeck;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.service.IncomingMessageObserver;
@@ -75,7 +76,6 @@ import me.leolin.shortcutbadger.ShortcutBadger;
 import network.loki.messenger.R;
 import nl.komponents.kovenant.Promise;
 
-
 /**
  * Handles posting system notifications for new messages.
  *
@@ -320,25 +320,11 @@ public class MessageNotifier {
     long timestamp = notifications.get(0).getTimestamp();
     if (timestamp != 0) builder.setWhen(timestamp);
 
-    long threadId = notifications.get(0).getThreadId();
+    long threadID = notifications.get(0).getThreadId();
 
     ReplyMethod replyMethod = ReplyMethod.forRecipient(context, recipient);
 
-
-    // We can only reply if we are friends with the user or we're messaging a group
-    boolean isGroup = recipient.isGroupRecipient();
-    boolean isRSSFeed = isGroup && recipient.getAddress().isRSSFeed();
-    boolean isFriend = false;
-    if (!isGroup) {
-        isFriend = DatabaseFactory.getLokiThreadDatabase(context).getFriendRequestStatus(threadId) == LokiThreadFriendRequestStatus.FRIENDS;
-        // If we're not friends then we need to check if we're friends with any of the linked devices
-        if (!isFriend) {
-            Promise<Boolean, Exception> promise = PromiseUtil.timeout(MultiDeviceUtilities.isFriendsWithAnyLinkedDevice(context, recipient), 5000);
-            isFriend = PromiseUtil.get(promise, false);
-        }
-    }
-
-    boolean canReply = (isGroup && !isRSSFeed) || isFriend;
+    boolean canReply = SessionMetaProtocol.canUserReplyToNotification(recipient, context);
 
     PendingIntent quickReplyIntent = canReply ? notificationState.getQuickReplyIntent(context, recipient) :  null;
     PendingIntent remoteReplyIntent = canReply ? notificationState.getRemoteReplyIntent(context, recipient, replyMethod) : null;

src/org/thoughtcrime/securesms/notifications/MultipleRecipientNotificationBuilder.java

@@ -10,6 +10,7 @@ import android.support.v4.app.NotificationCompat;
 import android.text.SpannableStringBuilder;
 
 import org.thoughtcrime.securesms.loki.activities.HomeActivity;
+import org.thoughtcrime.securesms.loki.utilities.NotificationUtilities;
 import org.thoughtcrime.securesms.preferences.widgets.NotificationPrivacyPreference;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
@@ -52,8 +53,7 @@ public class MultipleRecipientNotificationBuilder extends AbstractNotificationBu
       displayName = NotificationUtilities.getOpenGroupDisplayName(recipient, threadRecipient, context);
     }
     if (privacy.isDisplayContact()) {
-      setContentText(context.getString(R.string.MessageNotifier_most_recent_from_s,
-              displayName));
+      setContentText(context.getString(R.string.MessageNotifier_most_recent_from_s, displayName));
     }
 
     if (recipient.getNotificationChannel() != null) {

src/org/thoughtcrime/securesms/notifications/NotificationUtilities.kt

@@ -1,18 +0,0 @@
-@file:JvmName("NotificationUtilities")
-package org.thoughtcrime.securesms.notifications
-
-import android.content.Context
-import org.thoughtcrime.securesms.database.DatabaseFactory
-import org.thoughtcrime.securesms.recipients.Recipient
-
-fun getOpenGroupDisplayName(recipient: Recipient, threadRecipient: Recipient, context: Context): String {
-    val threadID = DatabaseFactory.getThreadDatabase(context).getThreadIdFor(threadRecipient)
-    val publicChat = DatabaseFactory.getLokiThreadDatabase(context).getPublicChat(threadID)
-    val hexEncodedPublicKey = recipient.address.toString()
-    val displayName = if (publicChat != null) {
-        DatabaseFactory.getLokiUserDatabase(context).getServerDisplayName(publicChat.id, hexEncodedPublicKey)
-    } else {
-        DatabaseFactory.getLokiUserDatabase(context).getDisplayName(hexEncodedPublicKey)
-    }
-    return displayName ?: hexEncodedPublicKey
-}

src/org/thoughtcrime/securesms/notifications/SingleRecipientNotificationBuilder.java

@@ -29,6 +29,7 @@ import org.thoughtcrime.securesms.contacts.avatars.ContactPhoto;
 import org.thoughtcrime.securesms.contacts.avatars.FallbackContactPhoto;
 import org.thoughtcrime.securesms.contacts.avatars.GeneratedContactPhoto;
 import org.thoughtcrime.securesms.logging.Log;
+import org.thoughtcrime.securesms.loki.utilities.NotificationUtilities;
 import org.thoughtcrime.securesms.mms.DecryptableStreamUriLoader;
 import org.thoughtcrime.securesms.mms.GlideApp;
 import org.thoughtcrime.securesms.mms.Slide;
@@ -170,24 +171,20 @@ public class SingleRecipientNotificationBuilder extends AbstractNotificationBuil
       String actionName = context.getString(R.string.MessageNotifier_reply);
       String label = context.getString(replyMethodLongDescription(replyMethod));
 
-      Action replyAction = new Action(R.drawable.ic_reply_white_36dp,
-              actionName,
-              quickReplyIntent);
+      Action replyAction = new Action(R.drawable.ic_reply_white_36dp, actionName, quickReplyIntent);
 
       if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
         replyAction = new Action.Builder(R.drawable.ic_reply_white_36dp,
                 actionName,
                 wearableReplyIntent)
-                .addRemoteInput(new RemoteInput.Builder(MessageNotifier.EXTRA_REMOTE_REPLY)
-                        .setLabel(label).build())
+                .addRemoteInput(new RemoteInput.Builder(MessageNotifier.EXTRA_REMOTE_REPLY).setLabel(label).build())
                 .build();
       }
 
       Action wearableReplyAction = new Action.Builder(R.drawable.ic_reply,
               actionName,
               wearableReplyIntent)
-              .addRemoteInput(new RemoteInput.Builder(MessageNotifier.EXTRA_REMOTE_REPLY)
-                      .setLabel(label).build())
+              .addRemoteInput(new RemoteInput.Builder(MessageNotifier.EXTRA_REMOTE_REPLY).setLabel(label).build())
               .build();
 
 
@@ -244,12 +241,12 @@ public class SingleRecipientNotificationBuilder extends AbstractNotificationBuil
       Bitmap recipientPhotoBitmap = BitmapUtil.createFromDrawable(drawable, largeIconTargetSize, largeIconTargetSize);
 
       if (recipientPhotoBitmap != null) {
-        setLargeIcon(getCircleBitmap(recipientPhotoBitmap));
+        setLargeIcon(getCircularBitmap(recipientPhotoBitmap));
       }
     }
   }
 
-  private Bitmap getCircleBitmap(Bitmap bitmap) {
+  private Bitmap getCircularBitmap(Bitmap bitmap) {
     final Bitmap output = Bitmap.createBitmap(bitmap.getWidth(),
             bitmap.getHeight(), Bitmap.Config.ARGB_8888);
     final Canvas canvas = new Canvas(output);