UTD pagination: clean up and add developer settings to enable complet…

…e history

vector/src/main/java/im/vector/app/features/home/room/detail/timeline/TimelineEventController.kt

@@ -50,6 +50,7 @@ import im.vector.app.features.home.room.detail.timeline.item.ReadReceiptData
 import im.vector.app.features.home.room.detail.timeline.item.TimelineReadMarkerItem_
 import im.vector.app.features.media.ImageContentRenderer
 import im.vector.app.features.media.VideoContentRenderer
+import im.vector.app.features.settings.VectorPreferences
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.events.model.EventType
 import org.matrix.android.sdk.api.session.events.model.toModel
@@ -64,6 +65,7 @@ import javax.inject.Inject
 private const val DEFAULT_PREFETCH_THRESHOLD = 30
 
 class TimelineEventController @Inject constructor(private val dateFormatter: VectorDateFormatter,
+                                                  private val vectorPreferences: VectorPreferences,
                                                   private val contentUploadStateTrackerBinder: ContentUploadStateTrackerBinder,
                                                   private val contentDownloadStateTrackerBinder: ContentDownloadStateTrackerBinder,
                                                   private val timelineItemFactory: TimelineItemFactory,
@@ -394,6 +396,9 @@ class TimelineEventController @Inject constructor(private val dateFormatter: Vec
     }
 
     private fun updateUTDStates(event: TimelineEvent, nextEvent: TimelineEvent?) {
+        if (vectorPreferences.labShowCompleteHistoryInEncryptedRoom()) {
+            return
+        }
         if (event.root.type == EventType.STATE_ROOM_MEMBER
                 && event.root.stateKey == session.myUserId) {
             val content = event.root.content.toModel<RoomMemberContent>()

vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MergedHeaderItemFactory.kt

@@ -30,16 +30,13 @@ import im.vector.app.features.home.room.detail.timeline.item.MergedMembershipEve
 import im.vector.app.features.home.room.detail.timeline.item.MergedMembershipEventsItem_
 import im.vector.app.features.home.room.detail.timeline.item.MergedRoomCreationItem
 import im.vector.app.features.home.room.detail.timeline.item.MergedRoomCreationItem_
-import im.vector.app.features.home.room.detail.timeline.item.MergedUTDItem
-import im.vector.app.features.home.room.detail.timeline.item.MergedUTDItem_
 import im.vector.app.features.settings.VectorPreferences
 import org.matrix.android.sdk.api.session.events.model.EventType
 import org.matrix.android.sdk.api.session.events.model.toModel
 import org.matrix.android.sdk.api.session.room.model.create.RoomCreateContent
 import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
 import org.matrix.android.sdk.internal.crypto.MXCRYPTO_ALGORITHM_MEGOLM
 import org.matrix.android.sdk.internal.crypto.model.event.EncryptionEventContent
-import timber.log.Timber
 import javax.inject.Inject
 
 class MergedHeaderItemFactory @Inject constructor(private val activeSessionHolder: ActiveSessionHolder,
@@ -63,10 +60,7 @@ class MergedHeaderItemFactory @Inject constructor(private val activeSessionHolde
                callback: TimelineEventController.Callback?,
                requestModelBuild: () -> Unit)
             : BasedMergedItem<*>? {
-        return if (shouldMergedAsCannotDecryptGroup(event, nextEvent)) {
-            Timber.v("## MERGE: Candidate for merge, top event ${event.eventId}")
-            buildUTDMergedSummary(currentPosition, items, event, eventIdToHighlight, /*requestModelBuild,*/ callback)
-        } else if (nextEvent?.root?.getClearType() == EventType.STATE_ROOM_CREATE
+        return if (nextEvent?.root?.getClearType() == EventType.STATE_ROOM_CREATE
                 && event.isRoomConfiguration(nextEvent.root.getClearContent()?.toModel<RoomCreateContent>()?.creator)) {
             // It's the first item before room.create
             // Collapse all room configuration events
@@ -138,82 +132,6 @@ class MergedHeaderItemFactory @Inject constructor(private val activeSessionHolde
         }
     }
 
-    // Event should be UTD
-    // Next event should not
-    private fun shouldMergedAsCannotDecryptGroup(event: TimelineEvent, nextEvent: TimelineEvent?): Boolean {
-        if (!vectorPreferences.mergeUTDinTimeline()) return false
-        // if event is not UTD return false
-        if (!isEventUTD(event)) return false
-        // At this point event cannot be decrypted
-        // Let's check if older event is not UTD
-        return nextEvent == null || !isEventUTD(event)
-    }
-
-    private fun isEventUTD(event: TimelineEvent): Boolean {
-        return event.root.getClearType() == EventType.ENCRYPTED && !event.root.isRedacted()
-    }
-
-    private fun buildUTDMergedSummary(currentPosition: Int,
-                                      items: List<TimelineEvent>,
-                                      event: TimelineEvent,
-                                      eventIdToHighlight: String?,
-                                      // requestModelBuild: () -> Unit,
-                                      callback: TimelineEventController.Callback?): MergedUTDItem_? {
-        Timber.v("## MERGE: buildUTDMergedSummary from position $currentPosition")
-        var prevEvent = items.prevOrNull(currentPosition)
-        var tmpPos = currentPosition - 1
-        val mergedEvents = ArrayList<TimelineEvent>().also { it.add(event) }
-
-        while (prevEvent != null && isEventUTD(prevEvent)) {
-            mergedEvents.add(prevEvent)
-            tmpPos--
-            prevEvent = if (tmpPos >= 0) items[tmpPos] else null
-        }
-
-        Timber.v("## MERGE: buildUTDMergedSummary merge group size ${mergedEvents.size}")
-        if (mergedEvents.size < 3) return null
-
-        var highlighted = false
-        val mergedData = ArrayList<BasedMergedItem.Data>(mergedEvents.size)
-        mergedEvents.reversed()
-                .forEach { mergedEvent ->
-                    if (!highlighted && mergedEvent.root.eventId == eventIdToHighlight) {
-                        highlighted = true
-                    }
-                    val senderAvatar = mergedEvent.senderInfo.avatarUrl
-                    val senderName = mergedEvent.senderInfo.disambiguatedDisplayName
-                    val data = BasedMergedItem.Data(
-                            userId = mergedEvent.root.senderId ?: "",
-                            avatarUrl = senderAvatar,
-                            memberName = senderName,
-                            localId = mergedEvent.localId,
-                            eventId = mergedEvent.root.eventId ?: ""
-                    )
-                    mergedData.add(data)
-                }
-        val mergedEventIds = mergedEvents.map { it.localId }
-
-        collapsedEventIds.addAll(mergedEventIds)
-
-        val mergeId = mergedEventIds.joinToString(separator = "_") { it.toString() }
-
-        val attributes = MergedUTDItem.Attributes(
-                isCollapsed = true,
-                mergeData = mergedData,
-                avatarRenderer = avatarRenderer,
-                onCollapsedStateChanged = {}
-        )
-        return MergedUTDItem_()
-                .id(mergeId)
-                .big(mergedEventIds.size > 5)
-                .leftGuideline(avatarSizeProvider.leftGuideline)
-                .highlighted(highlighted)
-                .attributes(attributes)
-                .also {
-                    it.setOnVisibilityStateChanged(MergedTimelineEventVisibilityStateChangedListener(callback, mergedEvents))
-                }
-    }
-
     private fun buildRoomCreationMergedSummary(currentPosition: Int,
                                                items: List<TimelineEvent>,
                                                event: TimelineEvent,

vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt

@@ -153,7 +153,7 @@ class VectorPreferences @Inject constructor(private val context: Context) {
         private const val SETTINGS_DEVELOPER_MODE_FAIL_FAST_PREFERENCE_KEY = "SETTINGS_DEVELOPER_MODE_FAIL_FAST_PREFERENCE_KEY"
 
         // SETTINGS_LABS_HIDE_TECHNICAL_E2E_ERRORS
-        private const val SETTINGS_LABS_MERGE_E2E_ERRORS = "SETTINGS_LABS_MERGE_E2E_ERRORS"
+        private const val SETTINGS_LABS_SHOW_COMPLETE_HISTORY_IN_ENCRYPTED_ROOM = "SETTINGS_LABS_SHOW_COMPLETE_HISTORY_IN_ENCRYPTED_ROOM"
         const val SETTINGS_LABS_UNREAD_NOTIFICATIONS_AS_TAB = "SETTINGS_LABS_UNREAD_NOTIFICATIONS_AS_TAB"
 
         // analytics
@@ -285,8 +285,8 @@ class VectorPreferences @Inject constructor(private val context: Context) {
         return defaultPrefs.getBoolean(SETTINGS_LABS_ENABLE_SWIPE_TO_REPLY, true)
     }
 
-    fun mergeUTDinTimeline(): Boolean {
-        return defaultPrefs.getBoolean(SETTINGS_LABS_MERGE_E2E_ERRORS, false)
+    fun labShowCompleteHistoryInEncryptedRoom(): Boolean {
+        return defaultPrefs.getBoolean(SETTINGS_LABS_SHOW_COMPLETE_HISTORY_IN_ENCRYPTED_ROOM, false)
     }
 
     fun labAllowedExtendedLogging(): Boolean {

vector/src/main/res/values/strings.xml

@@ -1708,6 +1708,7 @@
     <string name="send_suggestion_failed">The suggestion failed to be sent (%s)</string>
 
     <string name="settings_labs_show_hidden_events_in_timeline">Show hidden events in timeline</string>
+    <string name="settings_labs_show_complete_history_in_encrypted_room">"Show complete history in encrypted rooms"</string>
 
     <string name="bottom_action_people_x">Direct Messages</string>
 

vector/src/main/res/xml/vector_settings_advanced_settings.xml

@@ -16,6 +16,12 @@
             android:key="SETTINGS_LABS_SHOW_HIDDEN_EVENTS_PREFERENCE_KEY"
             android:title="@string/settings_labs_show_hidden_events_in_timeline" />
 
+        <im.vector.app.core.preference.VectorSwitchPreference
+            android:defaultValue="false"
+            android:dependency="SETTINGS_DEVELOPER_MODE_PREFERENCE_KEY"
+            android:key="SETTINGS_LABS_SHOW_COMPLETE_HISTORY_IN_ENCRYPTED_ROOM"
+            android:title="@string/settings_labs_show_complete_history_in_encrypted_room" />
+
         <im.vector.app.core.preference.VectorSwitchPreference
             android:defaultValue="false"
             android:dependency="SETTINGS_DEVELOPER_MODE_PREFERENCE_KEY"

vector/src/main/res/xml/vector_settings_labs.xml

@@ -39,13 +39,6 @@
         android:key="SETTINGS_LABS_ENABLE_SWIPE_TO_REPLY"
         android:title="@string/labs_swipe_to_reply_in_timeline" />
 
-
-    <im.vector.app.core.preference.VectorSwitchPreference
-        android:defaultValue="false"
-        android:key="SETTINGS_LABS_MERGE_E2E_ERRORS"
-        android:title="@string/labs_merge_e2e_in_timeline" />
-
-
     <im.vector.app.core.preference.VectorSwitchPreference
         android:defaultValue="false"
         android:key="SETTINGS_LABS_UNREAD_NOTIFICATIONS_AS_TAB"