DROID-3298 fixes

uburoiubu · uburoiubu · commit a679186becf6 · 2025-04-30T20:04:09.000+02:00
diff --git a/core-models/src/main/java/com/anytypeio/anytype/core_models/Command.kt b/core-models/src/main/java/com/anytypeio/anytype/core_models/Command.kt
@@ -650,7 +650,7 @@ sealed class Command {
             val beforeOrderId: Id? = null,
             val afterOrderId: Id? = null,
             val limit: Int,
-            val includeBoundary: Boolean
+            val includeBoundary: Boolean = false
         ) : ChatCommand() {
             data class Response(
                 val messages: List<Chat.Message>,
diff --git a/domain/src/main/java/com/anytypeio/anytype/domain/chats/ChatContainer.kt b/domain/src/main/java/com/anytypeio/anytype/domain/chats/ChatContainer.kt
@@ -120,8 +120,8 @@ class ChatContainer @Inject constructor(
         var intent: Intent = Intent.None
 
         val initial = buildList<Chat.Message> {
-            if (false) {
-                val aroundUnread = loadToMessageOrder(
+            if (state.hasUnReadMessages && !state.olderMessageOrderId.isNullOrEmpty()) {
+                val aroundUnread = loadAroundMessageOrder(
                     chat = chat,
                     order = state.olderMessageOrderId.orEmpty()
                 ).also {
@@ -167,7 +167,7 @@ class ChatContainer @Inject constructor(
                     }
                     is Transformation.Commands.LoadAround -> {
                         val messages = try {
-                            loadToMessage(chat, transform.message)
+                            loadAroundMessage(chat, transform.message)
                         } catch (e: Exception) {
                             logger.logException(e, "DROID-2966 Error while loading reply context")
                             state.messages
@@ -248,7 +248,7 @@ class ChatContainer @Inject constructor(
     }
 
     @Throws
-    private suspend fun loadToMessage(
+    private suspend fun loadAroundMessage(
         chat: Id,
         msg: Id
     ): List<Chat.Message> {
@@ -288,7 +288,7 @@ class ChatContainer @Inject constructor(
     }
 
     @Throws
-    private suspend fun loadToMessageOrder(
+    private suspend fun loadAroundMessageOrder(
         chat: Id,
         order: Id
     ): List<Chat.Message> {
@@ -304,7 +304,8 @@ class ChatContainer @Inject constructor(
             Command.ChatCommand.GetMessages(
                 chat = chat,
                 afterOrderId = order,
-                limit = DEFAULT_CHAT_PAGING_SIZE
+                limit = DEFAULT_CHAT_PAGING_SIZE,
+                includeBoundary = true
             )
         ).messages
 
diff --git a/feature-chats/src/main/java/com/anytypeio/anytype/feature_chats/presentation/ChatViewModel.kt b/feature-chats/src/main/java/com/anytypeio/anytype/feature_chats/presentation/ChatViewModel.kt
@@ -137,8 +137,9 @@ class ChatViewModel @Inject constructor(
             chatContainer.fetchAttachments(vmParams.space).distinctUntilChanged(),
             chatContainer.fetchReplies(chat = chat).distinctUntilChanged()
         ) { result, dependencies, replies ->
-            Timber.d("DROID-2966 Chat counter state: ${result.state}")
-            Timber.d("DROID-2966 Got chat results: ${result.messages.size}")
+            Timber.d("DROID-2966 Chat counter state from container: ${result.state}")
+            Timber.d("DROID-2966 Intent from container: ${result.intent}")
+            Timber.d("DROID-2966 Message results size from container: ${result.messages.size}")
             var previousDate: ChatView.DateSection? = null
             val messageViews = buildList<ChatView> {
                 result.messages.forEach { msg ->
diff --git a/feature-chats/src/main/java/com/anytypeio/anytype/feature_chats/ui/ChatScreen.kt b/feature-chats/src/main/java/com/anytypeio/anytype/feature_chats/ui/ChatScreen.kt
@@ -239,56 +239,6 @@ fun ChatScreenWrapper(
     }
 }
 
-@Composable
-fun LazyListState.OnBottomReached(
-    thresholdItems: Int = 0,
-    onBottomReached: () -> Unit
-) {
-    LaunchedEffect(this) {
-        var prevIndex = firstVisibleItemIndex
-        snapshotFlow { firstVisibleItemIndex }
-            .distinctUntilChanged()
-            .collect { index ->
-                Timber.d("DROID-2966 OnBottomReached scroll index: $index")
-                val isDragging = isScrollInProgress
-
-                // Are we scrolling *toward* the bottom edge?
-                val scrollingDown = isDragging && prevIndex > index
-
-                // Have we crossed into the threshold zone?
-                val atBottom = index <= thresholdItems
-
-                if (scrollingDown && atBottom) {
-                    onBottomReached()
-                }
-                prevIndex = index
-            }
-    }
-}
-
-@Composable
-private fun LazyListState.OnTopReached(
-    thresholdItems: Int = 0,
-    onTopReached: () -> Unit
-) {
-    val isReached = remember {
-        derivedStateOf {
-            val lastVisibleItem = layoutInfo.visibleItemsInfo.lastOrNull()
-            if (lastVisibleItem != null) {
-                lastVisibleItem.index >= layoutInfo.totalItemsCount - 1 - thresholdItems
-            } else {
-                false
-            }
-        }
-    }
-
-    LaunchedEffect(isReached) {
-        snapshotFlow { isReached.value }
-            .distinctUntilChanged()
-            .collect { if (it) onTopReached() }
-    }
-}
-
 @Composable
 private fun LazyListState.OnTopReachedSafely(
     thresholdItems: Int = 0,
@@ -303,7 +253,6 @@ private fun LazyListState.OnTopReachedSafely(
                 if (lastVisibleItem != null) {
                     val isTop = lastVisibleItem.index >= info.totalItemsCount - 1 - thresholdItems
                     if (isTop) {
-                        Timber.d("DROID-2966 Safe onTopReached triggered")
                         onTopReached()
                     }
                 }
@@ -325,7 +274,6 @@ private fun LazyListState.OnBottomReachedSafely(
                 if (firstVisibleItem != null) {
                     val isBottom = firstVisibleItem.index <= thresholdItems
                     if (isBottom) {
-                        Timber.d("DROID-2966 Safe onBottomReached triggered")
                         onBottomReached()
                     }
                 }
@@ -369,7 +317,7 @@ fun ChatScreen(
     onScrollToBottomClicked: () -> Unit
 ) {
 
-    Timber.d("DROID-2966 Render called with state")
+    Timber.d("DROID-2966 Render called with state, number of messages: ${uiMessageState.messages.size}")
 
     var text by rememberSaveable(stateSaver = TextFieldValue.Saver) {
         mutableStateOf(TextFieldValue())
@@ -381,15 +329,20 @@ fun ChatScreen(
 
     val scope = rememberCoroutineScope()
 
+    val latestMessages by rememberUpdatedState(uiMessageState.messages)
+
+    val isPerformingScrollIntent = remember { mutableStateOf(false) }
+
     LaunchedEffect(uiMessageState.intent) {
         when (val intent = uiMessageState.intent) {
             is ChatContainer.Intent.ScrollToMessage -> {
+                isPerformingScrollIntent.value = true
                 val index = uiMessageState.messages.indexOfFirst {
                     it is ChatView.Message && it.id == intent.id
                 }
 
                 if (index >= 0) {
-                    Timber.d("DROID-2966 Waiting for layout to stabilize...")
+                    Timber.d("DROID-2966 Found the scrolling target at index: $index. Waiting for layout to stabilize...")
 
                     snapshotFlow { lazyListState.layoutInfo.totalItemsCount }
                         .first { it > index }
@@ -409,20 +362,24 @@ fun ChatScreen(
 
                         val delta = itemCenterFromTop - viewportCenter
 
-                        Timber.d("DROID-2966 Calculated delta for centering (reverseLayout-aware): $delta")
+                        Timber.d("DROID-2966 Found scroll-target item info and Calculated delta for centering (reverseLayout-aware): $delta")
 
                         // move negatively because reverseLayout flips
-                        lazyListState.animateScrollBy(delta.toFloat())
+//                        lazyListState.animateScrollBy(delta.toFloat())
 
                         Timber.d("DROID-2966 Scroll complete. Now clearing intent.")
 
-                        onClearIntent()
                     } else {
                         Timber.w("DROID-2966 Target item not found after scroll!")
                     }
+                } else {
+                    Timber.d("DROID-2966 Could not found the scrolling target for the intent")
                 }
+//                onClearIntent()
+                isPerformingScrollIntent.value = false
             }
             is ChatContainer.Intent.ScrollToBottom -> {
+                Timber.d("DROID-2966 COMPOSE scroll to bottom")
                 smoothScrollToBottom2(lazyListState)
                 onClearIntent()
             }
@@ -433,32 +390,36 @@ fun ChatScreen(
         }
     }
 
-    val latestMessages by rememberUpdatedState(uiMessageState.messages)
-
     // Scrolling to bottom when list size changes and we are at the bottom of the list
-    LaunchedEffect(latestMessages) {
-        if (lazyListState.firstVisibleItemScrollOffset == 0) {
-            scope.launch {
-                lazyListState.animateScrollToItem(0)
-            }
-        }
-    }
-
-    lazyListState.OnBottomReachedSafely(
-        thresholdItems = 3
-    ) {
-        if (latestMessages.isNotEmpty()) {
-            onChatScrolledToBottom()
-        }
-    }
-
-    lazyListState.OnTopReachedSafely(
-        thresholdItems = 3
-    ) {
-        if (latestMessages.isNotEmpty()) {
-            onChatScrolledToTop()
-        }
-    }
+//    LaunchedEffect(latestMessages) {
+//        if (lazyListState.firstVisibleItemScrollOffset == 0) {
+//            scope.launch {
+//                lazyListState.animateScrollToItem(0)
+//            }
+//        }
+//    }
+
+//    lazyListState.OnBottomReachedSafely(
+//        thresholdItems = 3
+//    ) {
+//        if (!isPerformingScrollIntent.value && latestMessages.isNotEmpty()) {
+//            Timber.d("DROID-2966 Safe onBottomReached dispatched from compose to VM")
+//            onChatScrolledToBottom()
+//        } else {
+//            Timber.d("DROID-2966 Safe onBottomReached skipped")
+//        }
+//    }
+//
+//    lazyListState.OnTopReachedSafely(
+//        thresholdItems = 3
+//    ) {
+//        if (!isPerformingScrollIntent.value && latestMessages.isNotEmpty()) {
+//            Timber.d("DROID-2966 Safe onTopReached dispatched from compose to VM")
+//            onChatScrolledToTop()
+//        } else {
+//            Timber.d("DROID-2966 Safe onTopReached skipped")
+//        }
+//    }
 
     Column(
         modifier = Modifier.fillMaxSize()
@@ -684,7 +645,7 @@ fun Messages(
     onMentionClicked: (Id) -> Unit,
     onScrollToReplyClicked: (Id) -> Unit,
 ) {
-    Timber.d("DROID-2966 Messages composition: ${messages.map { if (it is ChatView.Message) it.content.msg else it }}")
+//    Timber.d("DROID-2966 Messages composition: ${messages.map { if (it is ChatView.Message) it.content.msg else it }}")
     val scope = rememberCoroutineScope()
     LazyColumn(
         modifier = modifier,
diff --git a/middleware/src/main/java/com/anytypeio/anytype/middleware/interactor/Middleware.kt b/middleware/src/main/java/com/anytypeio/anytype/middleware/interactor/Middleware.kt
@@ -2787,7 +2787,8 @@ class Middleware @Inject constructor(
             chatObjectId = command.chat,
             beforeOrderId = command.beforeOrderId.orEmpty(),
             afterOrderId = command.afterOrderId.orEmpty(),
-            limit = command.limit
+            limit = command.limit,
+            includeBoundary = command.includeBoundary
         )
         logRequestIfDebug(request)
         val (response, time) = measureTimedValue { service.chatGetMessages(request) }
