Stop relying on conversationTitle, always use profile data

Author: nmalzieu

android/app/src/main/java/com/converse/dev/PushNotificationsService.kt

@@ -70,6 +70,8 @@ import java.util.*
 import kotlin.reflect.full.declaredMemberProperties
 import kotlin.reflect.jvm.isAccessible
 import kotlin.reflect.jvm.javaField
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.ProcessLifecycleOwner
 
 class PushNotificationsService : FirebaseMessagingService() {
     companion object {
@@ -111,6 +113,12 @@ class PushNotificationsService : FirebaseMessagingService() {
                 return
             }
 
+            val appIsInForeground = ProcessLifecycleOwner.get().lifecycle.currentState.isAtLeast(Lifecycle.State.STARTED)
+            val currentAccount = getCurrentAccount(this)
+            if (appIsInForeground && currentAccount !== null && currentAccount.lowercase() == notificationData.account.lowercase()) {
+                Log.d(TAG, "Preventing notification for ${notificationData.account} because user is on it")
+                return
+            }
             Log.d(TAG, "INSTANTIATED XMTP CLIENT FOR ${notificationData.contentTopic}")
 
             val encryptedMessageData = Base64.decode(notificationData.message, Base64.NO_WRAP)

android/app/src/main/java/com/converse/dev/xmtp/Conversations.kt

@@ -135,18 +135,6 @@ fun persistNewConversation(appContext:Context, account: String, conversation: Co
     }
 }
 
-fun getSavedConversationTitle(appContext: Context, topic: String): String {
-    try {
-        Log.d("PushNotificationsService", "Getting data conversation-$topic")
-        val mmkv = getMmkv(appContext)
-        val savedConversationDict = mmkv?.decodeString("conversation-$topic") ?: return ""
-        val parsedConversationDict = Klaxon().parse<ConversationDictData>(savedConversationDict)
-        return parsedConversationDict?.title ?: parsedConversationDict?.shortAddress ?: ""
-    } catch (e: Exception) {
-        return ""
-    }
-}
-
 suspend fun getNewGroup(xmtpClient: Client, contentTopic: String): Group? {
     return try {
         if (isGroupWelcomeTopic(contentTopic)) {

android/app/src/main/java/com/converse/dev/xmtp/Messages.kt

@@ -192,15 +192,18 @@ suspend fun handleOngoingConversationMessage(
         }
 
     val message = conversation.decode(envelope)
-    val contentTopic = envelope.contentTopic
-    var conversationTitle = getSavedConversationTitle(appContext, contentTopic)
+    var conversationTitle = ""
 
     val decodedMessageResult = handleMessageByContentType(
         appContext,
         message,
         xmtpClient,
     )
 
+    decodedMessageResult.senderAddress?.let {
+        conversationTitle = shortAddress(it)
+    }
+
     val senderProfile =
         decodedMessageResult.senderAddress?.let { getProfile(appContext, xmtpClient.address, it) }
     var senderAvatar: String? = null
@@ -210,7 +213,7 @@ suspend fun handleOngoingConversationMessage(
     }
 
     val shouldShowNotification = if (decodedMessageResult.senderAddress != xmtpClient.address && !decodedMessageResult.forceIgnore && decodedMessageResult.content != null) {
-        if (conversationTitle.isEmpty() && decodedMessageResult.senderAddress != null) {
+        if ((conversationTitle == null || conversationTitle!!.isEmpty()) && decodedMessageResult.senderAddress != null) {
             conversationTitle = shortAddress(decodedMessageResult.senderAddress)
         }
         true

components/Conversation/ConversationTitle.tsx

@@ -77,7 +77,7 @@ export default function ConversationTitle({
       conversation.peerAddress !== previousConversation.peerAddress ||
       conversation.context?.conversationId !==
         previousConversation.context?.conversationId ||
-      conversation.conversationTitle ||
+      conversationName(conversation) ||
       (previousConversation.isGroup &&
         conversation.isGroup &&
         previousConversation.groupName !== conversation.groupName)

components/PinnedConversations/PinnedConversation.tsx

@@ -5,6 +5,7 @@ import { backgroundColor, textSecondaryColor } from "@styles/colors";
 import { AvatarSizes } from "@styles/sizes";
 import { ConversationWithLastMessagePreview } from "@utils/conversation";
 import { showUnreadOnConversation } from "@utils/conversation/showUnreadOnConversation";
+import { conversationName } from "@utils/str";
 import { FC, useCallback, useMemo } from "react";
 import {
   StyleSheet,
@@ -41,7 +42,7 @@ export const PinnedConversation: FC<Props> = ({ conversation }) => {
   const { data: groupPhoto } = useGroupPhotoQuery(account, topic, {
     refetchOnMount: false,
   });
-  const title = isGroup ? groupName : conversation.conversationTitle;
+  const title = isGroup ? groupName : conversationName(conversation);
   const socials = getProfile(conversation.peerAddress, profiles)?.socials;
   const avatar = isGroup ? groupPhoto : getPreferredAvatar(socials);
   const setPinnedConversations = useChatStore((s) => s.setPinnedConversations);

data/helpers/conversations/upsertConversations.ts

@@ -6,14 +6,12 @@ import {
   navigateToTopicWithRetry,
   topicToNavigateTo,
 } from "../../../utils/navigation";
-import { saveConversationIdentifiersForNotifications } from "../../../utils/notifications";
-import { getPreferredName, getProfile } from "../../../utils/profile";
 import { getRepository } from "../../db";
 import { getExistingDataSource } from "../../db/datasource";
 import { Conversation } from "../../db/entities/conversationEntity";
 import { upsertRepository } from "../../db/upsert";
 import { xmtpConversationToDb } from "../../mappers";
-import { getChatStore, getProfilesStore } from "../../store/accountsStore";
+import { getChatStore } from "../../store/accountsStore";
 import { XmtpConversation } from "../../store/chatStore";
 import { refreshProfilesIfNeeded } from "../profiles/profilesUpdate";
 
@@ -81,26 +79,12 @@ const setupAndSaveConversations = async (
     const alreadyConversationInDbWithTopic =
       alreadyConversationsByTopic[conversation.topic];
 
-    if (!conversation.isGroup) {
-      const profileSocials = getProfile(
-        conversation.peerAddress,
-        getProfilesStore(account).getState().profiles
-      )?.socials;
-
-      conversation.conversationTitle = getPreferredName(
-        profileSocials,
-        conversation.peerAddress,
-        conversation.context?.conversationId
-      );
-    }
-
     conversation.readUntil =
       conversation.readUntil ||
       alreadyConversationInDbWithTopic?.readUntil ||
       0;
 
     conversationsToUpsert.push(xmtpConversationToDb(conversation));
-    saveConversationIdentifiersForNotifications(conversation);
   });
 
   // Let's save by batch to avoid hermes issues

data/helpers/profiles/profilesUpdate.ts

@@ -1,9 +1,7 @@
 import { getCleanAddress } from "@utils/eth";
-import logger from "@utils/logger";
 
 import { getProfilesForAddresses } from "../../../utils/api";
-import { saveConversationIdentifiersForNotifications } from "../../../utils/notifications";
-import { getPreferredName, getProfile } from "../../../utils/profile";
+import { getProfile } from "../../../utils/profile";
 import { getChatStore, getProfilesStore } from "../../store/accountsStore";
 import { XmtpConversation } from "../../store/chatStore";
 import { ProfileSocials } from "../../store/profilesStore";
@@ -17,7 +15,6 @@ export const updateProfilesForConvos = async (
   account: string,
   profilesWithGroups: Map<string, XmtpConversation[]>
 ) => {
-  const updates: ConversationHandlesUpdate[] = [];
   let batch: string[] = [];
   let rest = Array.from(profilesWithGroups.keys());
 
@@ -40,40 +37,7 @@ export const updateProfilesForConvos = async (
       };
     }
     getProfilesStore(account).getState().setProfiles(socialsToDispatch);
-    const handleConversation = async (conversation: XmtpConversation) => {
-      if (conversation.isGroup) return;
-      const currentTitle = conversation.conversationTitle;
-      let updated = false;
-      try {
-        const profileForConversation =
-          profilesByAddress[conversation.peerAddress];
-
-        const newTitle = getPreferredName(
-          profileForConversation,
-          conversation.peerAddress,
-          conversation.context?.conversationId
-        );
-
-        if (newTitle !== currentTitle) {
-          updated = true;
-        }
-        conversation.conversationTitle = newTitle;
-      } catch (e) {
-        // Error (probably rate limited)
-        logger.warn("Could not resolve handles:", conversation.peerAddress, e);
-      }
-
-      updates.push({ conversation, updated });
-      saveConversationIdentifiersForNotifications(conversation);
-    };
-    const allGroups: XmtpConversation[] = [];
-    batch.forEach((address) => {
-      allGroups.push(...(profilesWithGroups.get(address) || []));
-    });
-    await Promise.all(allGroups.map(handleConversation));
   }
-
-  return updates;
 };
 
 export const refreshProfileForAddress = async (
@@ -134,17 +98,6 @@ export const refreshProfilesIfNeeded = async (account: string) => {
   });
 
   if (staleProfilesWithConversations.size > 0) {
-    updateProfilesForConvos(account, staleProfilesWithConversations).then(
-      (resolveResult) => {
-        const updatedConversations = resolveResult
-          .filter((r) => r.updated)
-          .map((r) => r.conversation);
-        if (updatedConversations.length > 0) {
-          getChatStore(account)
-            .getState()
-            .setConversations(updatedConversations);
-        }
-      }
-    );
+    updateProfilesForConvos(account, staleProfilesWithConversations);
   }
 };

data/index.ts

@@ -1,5 +1,6 @@
 import "reflect-metadata";
 
+import logger from "@utils/logger";
 import { getProfile } from "@utils/profile";
 
 import { getRepository } from "./db";
@@ -33,6 +34,10 @@ export const loadDataToContext = async (account: string) => {
     isActive: getTypeormBoolValue(c.isActive),
   }));
 
+  logger.debug(
+    `[InitialData] ${account}: Loading ${conversationsWithMessages.length} conversations from local db`
+  );
+
   const conversationsMessages: Message[][] = await Promise.all(
     conversationsWithMessages.map((c) =>
       messageRepository
@@ -48,6 +53,15 @@ export const loadDataToContext = async (account: string) => {
     )
   );
 
+  const totalMessagesCount = conversationsMessages.reduce(
+    (count, conversation) => count + conversation.length,
+    0
+  );
+
+  logger.debug(
+    `[InitialData] ${account}: Loading ${totalMessagesCount} messages from local db`
+  );
+
   conversationsWithMessages.forEach((conversation, index) => {
     // If no limit => ASC then no reverse
     conversation.messages = conversationsMessages[index]

data/mappers.ts

@@ -104,11 +104,7 @@ export const xmtpConversationFromDb = (
   }
 
   const conversationTitle = dbConversation.peerAddress
-    ? getPreferredName(
-        socials,
-        dbConversation.peerAddress,
-        dbConversation.contextConversationId
-      )
+    ? getPreferredName(socials, dbConversation.peerAddress)
     : undefined;
 
   const hasOneMessageFromMe = !!dbConversation.messages?.find(

data/store/chatStore.ts

@@ -39,7 +39,6 @@ type XmtpConversationShared = {
   context?: XmtpConversationContext;
   messages: Map<string, XmtpMessage>;
   messagesIds: string[];
-  conversationTitle?: string | null;
   messageDraft?: string;
   mediaPreview?: MediaPreview;
   readUntil: number; // UNUSED
@@ -388,7 +387,6 @@ export const initChatStore = (account: string) => {
                   messages: oldMessages,
                   messagesIds: oldMessagesIds,
                   hasOneMessageFromMe: oldHasOneMessageFromMe,
-                  conversationTitle: existingConversation.conversationTitle,
                 };
                 newState.lastUpdateAt = now();
                 delete newState.conversations[oldTopic];

ios/ConverseNotificationExtension/NotificationService.swift

@@ -209,8 +209,6 @@ class NotificationService: UNNotificationServiceExtension {
     sentryTrackMessage(message: "NOTIFICATION_TIMEOUT", extras: ["body": bestAttemptContent?.userInfo["body"]])
     if let contentHandler = contentHandler, let bestAttemptContent =  bestAttemptContent {
       if let body = bestAttemptContent.userInfo["body"] as? [String: Any], let contentTopic = body["contentTopic"] as? String {
-        let conversationTitle = getSavedConversationTitle(contentTopic: contentTopic);
-        bestAttemptContent.title = conversationTitle;
         incrementBadge(for: bestAttemptContent)
       }
       contentHandler(bestAttemptContent)

ios/ConverseNotificationExtension/Profile.swift

@@ -11,8 +11,8 @@ import web3
 
 func getProfile(account: String, address: String) async -> Profile? {
   var profileState = getProfilesStore(account: account)?.state
-  var lowercasedAddress = address.lowercased()
-  var formattedAddress = EthereumAddress(lowercasedAddress).toChecksumAddress()
+  let lowercasedAddress = address.lowercased()
+  let formattedAddress = EthereumAddress(lowercasedAddress).toChecksumAddress()
   if let profile = profileState?.profiles?[address] ?? profileState?.profiles?[formattedAddress] ?? profileState?.profiles?[lowercasedAddress] {
     return profile
   }

ios/ConverseNotificationExtension/Xmtp/Conversations.swift

@@ -72,19 +72,6 @@ func saveConversation(account: String, topic: String, peerAddress: String, creat
   mmkv?.set(encodedString!, forKey: "saved-notifications-conversations")
 }
 
-func getSavedConversationTitle(contentTopic: String)-> String {
-  let mmkv = getMmkv()
-  let conversationDictString = mmkv?.string(forKey: "conversation-\(contentTopic)")
-  if let data = conversationDictString?.data(using: .utf8) {
-    if let conversationDict = try! JSONSerialization.jsonObject(with: data, options: .allowFragments) as? [String: Any] {
-      let shortAddress = conversationDict["shortAddress"]
-      let title = conversationDict["title"]
-      return "\(title ?? shortAddress ?? "")"
-    }
-  }
-  return "";
-}
-
 func getPersistedConversation(xmtpClient: XMTP.Client, contentTopic: String) async -> XMTP.Conversation? {
   let secureMmkv = getSecureMmkvForAccount(account: xmtpClient.address)
   if let mmkv = secureMmkv {

ios/ConverseNotificationExtension/Xmtp/Messages.swift

@@ -58,7 +58,13 @@ func handleNewConversationFirstMessage(xmtpClient: XMTP.Client, apiURI: String?,
             print("[NotificationExtension] Not showing a notification")
             break
           } else if let content = decodedMessageResult.content {
-            bestAttemptContent.title = shortAddress(address: try conversation.peerAddress)
+            let senderAddress = try conversation.peerAddress
+            let conversationTitle: String? = nil
+            if let senderProfile = await getProfile(account: xmtpClient.address, address: senderAddress) {
+              bestAttemptContent.title = getPreferredName(address: senderAddress, socials: senderProfile.socials)
+            } else {
+              bestAttemptContent.title = shortAddress(address: senderAddress)
+            }
             bestAttemptContent.body = content
             shouldShowNotification = true
             messageId = decodedMessageResult.id // @todo probably remove this?
@@ -198,15 +204,15 @@ func handleGroupMessage(xmtpClient: XMTP.Client, envelope: XMTP.Envelope, apiURI
 func handleOngoingConversationMessage(xmtpClient: XMTP.Client, envelope: XMTP.Envelope, bestAttemptContent: inout UNMutableNotificationContent, body: [String: Any]) async -> (shouldShowNotification: Bool, messageId: String?, messageIntent: INSendMessageIntent?) {
   var shouldShowNotification = false
   let contentTopic = envelope.contentTopic
-  var conversationTitle = getSavedConversationTitle(contentTopic: contentTopic)
+  var conversationTitle: String? = nil
   var messageId: String? = nil
   var messageIntent: INSendMessageIntent? = nil
 
   let decodedMessage = try? await decodeMessage(xmtpClient: xmtpClient, envelope: envelope)
   // If couldn't decode the message, not showing
   if let message = decodedMessage {
     let decodedMessageResult = handleMessageByContentType(decodedMessage: message, xmtpClient: xmtpClient);
-    
+
     if decodedMessageResult.senderAddress == xmtpClient.address || decodedMessageResult.forceIgnore {
       // Message is from me or a reaction removal, let's drop it
       print("[NotificationExtension] Not showing a notification")
@@ -218,11 +224,14 @@ func handleOngoingConversationMessage(xmtpClient: XMTP.Client, envelope: XMTP.En
         conversationTitle = getPreferredName(address: senderAddress, socials: senderProfile.socials)
         senderAvatar = getPreferredAvatar(socials: senderProfile.socials)
       }
-    
-      if conversationTitle.isEmpty, let senderAddress = decodedMessageResult.senderAddress {
+      
+      if (conversationTitle == nil), let senderAddress = decodedMessageResult.senderAddress {
         conversationTitle = shortAddress(address: senderAddress)
       }
-      bestAttemptContent.title = conversationTitle
+      if let convoTitle = conversationTitle {
+        bestAttemptContent.title = convoTitle
+      }
+      
       shouldShowNotification = true
       messageId = decodedMessageResult.id
       messageIntent = getIncoming1v1MessageIntent(topic: envelope.contentTopic, senderId: decodedMessage?.senderAddress ?? "", senderName: bestAttemptContent.title, senderAvatar: senderAvatar, content: bestAttemptContent.body)