Merge branch 'release/1.28.2' into merge/1.28.2-pt2

Author: ThomasSession

app/src/main/AndroidManifest.xml

@@ -432,10 +432,7 @@
             </intent-filter>
         </receiver>
         <receiver android:name="org.thoughtcrime.securesms.notifications.DeleteNotificationReceiver"
-            android:exported="true">
-            <intent-filter>
-                <action android:name="network.loki.securesms.DELETE_NOTIFICATION" />
-            </intent-filter>
+            android:exported="false">
         </receiver>
         <receiver
             android:name="org.thoughtcrime.securesms.service.PanicResponderListener"

app/src/main/java/org/session/libsession/database/StorageProtocol.kt

@@ -181,7 +181,7 @@ interface StorageProtocol {
         attachments: List<Attachment>,
         runThreadUpdate: Boolean
     ): MessageId?
-    fun markConversationAsRead(threadId: Long, lastSeenTime: Long, force: Boolean = false)
+    fun markConversationAsRead(threadId: Long, lastSeenTime: Long, force: Boolean = false, updateNotification: Boolean = true)
     fun markConversationAsUnread(threadId: Long)
     fun getLastSeen(threadId: Long): Long
     fun ensureMessageHashesAreSender(hashes: Set<String>, sender: String, closedGroupId: String): Boolean

app/src/main/java/org/session/libsession/messaging/sending_receiving/notifications/MessageNotifier.kt

@@ -5,11 +5,8 @@ import android.content.Context
 interface MessageNotifier {
     fun setHomeScreenVisible(isVisible: Boolean)
     fun setVisibleThread(threadId: Long)
-    fun setLastDesktopActivityTimestamp(timestamp: Long)
-    fun cancelDelayedNotifications()
     fun updateNotification(context: Context)
     fun updateNotification(context: Context, threadId: Long)
     fun updateNotification(context: Context, threadId: Long, signal: Boolean)
     fun updateNotification(context: Context, signal: Boolean, reminderCount: Int)
-    fun clearReminder(context: Context)
 }

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

@@ -1381,10 +1381,18 @@ class ConversationActivityV2 : ScreenLockActionBarActivity(), InputBarDelegate,
         val maybeTargetVisiblePosition = layoutManager?.findLastVisibleItemPosition()
         val targetVisiblePosition = maybeTargetVisiblePosition ?: RecyclerView.NO_POSITION
         if (!firstLoad.get() && targetVisiblePosition != RecyclerView.NO_POSITION) {
-            adapter.getTimestampForItemAt(targetVisiblePosition)?.let { visibleItemTimestamp ->
-                    bufferedLastSeenChannel.trySend(visibleItemTimestamp).apply {
-                        if (isFailure) Log.e(TAG, "trySend failed", exceptionOrNull())
-                    }
+            val timestampToSend: Long? = if (binding.conversationRecyclerView.isFullyScrolled) {
+                // We are at the bottom, so mark "now" as the last seen time
+                clock.currentTimeMills()
+            } else {
+                // We are not at the bottom, so just mark the timestamp of the last visible message
+                adapter.getTimestampForItemAt(targetVisiblePosition)
+            }
+
+            timestampToSend?.let {
+                bufferedLastSeenChannel.trySend(it).apply {
+                    if (isFailure) Log.e(TAG, "trySend failed", exceptionOrNull())
+                }
             }
         }
 

app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt

@@ -191,16 +191,17 @@ open class Storage @Inject constructor(
         return messages.map { it.second } // return the message hashes
     }
 
-    override fun markConversationAsRead(threadId: Long, lastSeenTime: Long, force: Boolean) {
+    override fun markConversationAsRead(threadId: Long, lastSeenTime: Long, force: Boolean, updateNotification: Boolean) {
         val threadDb = threadDatabase
         getRecipientForThread(threadId)?.let { recipient ->
-            val currentLastRead = threadDb.getLastSeenAndHasSent(threadId).first()
             // don't set the last read in the volatile if we didn't set it in the DB
-            if (!threadDb.markAllAsRead(threadId, lastSeenTime, force) && !force) return
+            if (!threadDb.markAllAsRead(threadId, lastSeenTime, force, updateNotification) && !force) return
 
             // don't process configs for inbox recipients
             if (recipient.isCommunityInboxRecipient) return
 
+            val currentLastRead = threadDb.getLastSeenAndHasSent(threadId).first()
+
             configFactory.withMutableUserConfigs { configs ->
                 val config = configs.convoInfoVolatile
                 val convo = getConvo(recipient, config)  ?: return@withMutableUserConfigs

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

@@ -761,13 +761,15 @@ public boolean isRead(long threadId) {
   /**
    * @param threadId
    * @param lastSeenTime
+   * @param force
+   * @param updateNotifications - if true, update the notification state. Set to false if you already came from a notification interaction
    * @return true if we have set the last seen for the thread, false if there were no messages in the thread
    */
-  public boolean markAllAsRead(long threadId, long lastSeenTime, boolean force) {
+  public boolean markAllAsRead(long threadId, long lastSeenTime, boolean force, boolean updateNotifications) {
     if (mmsSmsDatabase.get().getConversationCount(threadId) <= 0 && !force) return false;
     List<MarkedMessageInfo> messages = setRead(threadId, lastSeenTime);
     MarkReadReceiver.process(context, messages);
-    messageNotifier.get().updateNotification(context, threadId);
+    if(updateNotifications) messageNotifier.get().updateNotification(context, threadId);
     return setLastSeen(threadId, lastSeenTime);
   }
 

app/src/main/java/org/thoughtcrime/securesms/dependencies/DatabaseComponent.kt

@@ -29,24 +29,10 @@ interface DatabaseComponent {
     fun mediaDatabase(): MediaDatabase
     fun threadDatabase(): ThreadDatabase
     fun mmsSmsDatabase(): MmsSmsDatabase
-    fun draftDatabase(): DraftDatabase
-    fun pushDatabase(): PushDatabase
     fun groupDatabase(): GroupDatabase
     fun recipientDatabase(): RecipientDatabase
-    fun groupReceiptDatabase(): GroupReceiptDatabase
-    fun searchDatabase(): SearchDatabase
     fun lokiAPIDatabase(): LokiAPIDatabase
     fun lokiMessageDatabase(): LokiMessageDatabase
-    fun lokiUserDatabase(): LokiUserDatabase
-    fun lokiBackupFilesDatabase(): LokiBackupFilesDatabase
-    fun sessionJobDatabase(): SessionJobDatabase
-    fun sessionContactDatabase(): SessionContactDatabase
     fun reactionDatabase(): ReactionDatabase
-    fun emojiSearchDatabase(): EmojiSearchDatabase
     fun storage(): Storage
-    fun attachmentProvider(): MessageDataProvider
-    fun blindedIdMappingDatabase(): BlindedIdMappingDatabase
-    fun groupMemberDatabase(): GroupMemberDatabase
-    fun expirationConfigurationDatabase(): ExpirationConfigurationDatabase
-    fun configDatabase(): ConfigDatabase
 }