From d0e41480403b28be5e9f3b3cd50d2d46005ba9e8 Mon Sep 17 00:00:00 2001 From: fanchao Date: Tue, 11 Jun 2024 15:26:01 +1000 Subject: [PATCH] Remove view pools --- .../conversation/v2/ConversationActivityV2.kt | 3 --- .../securesms/dependencies/UiModule.kt | 19 ------------------- .../dependencies/ViewPoolQualifiers.kt | 7 ------- 3 files changed, 29 deletions(-) delete mode 100644 app/src/main/java/org/thoughtcrime/securesms/dependencies/UiModule.kt delete mode 100644 app/src/main/java/org/thoughtcrime/securesms/dependencies/ViewPoolQualifiers.kt diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt index 62704f1b1c..187ded770e 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt @@ -145,7 +145,6 @@ import org.thoughtcrime.securesms.database.model.MessageId import org.thoughtcrime.securesms.database.model.MessageRecord import org.thoughtcrime.securesms.database.model.MmsMessageRecord import org.thoughtcrime.securesms.database.model.ReactionRecord -import org.thoughtcrime.securesms.dependencies.ConversationViewPool import org.thoughtcrime.securesms.giph.ui.GiphyActivity import org.thoughtcrime.securesms.groups.OpenGroupManager import org.thoughtcrime.securesms.linkpreview.LinkPreviewRepository @@ -216,7 +215,6 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe @Inject lateinit var storage: Storage @Inject lateinit var reactionDb: ReactionDatabase @Inject lateinit var viewModelFactory: ConversationViewModel.AssistedFactory - @Inject @ConversationViewPool lateinit var viewPool: RecyclerView.RecycledViewPool private val screenshotObserver by lazy { ScreenshotObserver(this, Handler(Looper.getMainLooper())) { @@ -569,7 +567,6 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe // called from onCreate private fun setUpRecyclerView() { binding!!.conversationRecyclerView.adapter = adapter - binding!!.conversationRecyclerView.setRecycledViewPool(viewPool) val layoutManager = LinearLayoutManager(this, LinearLayoutManager.VERTICAL, reverseMessageList) binding!!.conversationRecyclerView.layoutManager = layoutManager // Workaround for the fact that CursorRecyclerViewAdapter doesn't auto-update automatically (even though it says it will) diff --git a/app/src/main/java/org/thoughtcrime/securesms/dependencies/UiModule.kt b/app/src/main/java/org/thoughtcrime/securesms/dependencies/UiModule.kt deleted file mode 100644 index 7a552c00a3..0000000000 --- a/app/src/main/java/org/thoughtcrime/securesms/dependencies/UiModule.kt +++ /dev/null @@ -1,19 +0,0 @@ -package org.thoughtcrime.securesms.dependencies - -import androidx.recyclerview.widget.RecyclerView -import dagger.Module -import dagger.Provides -import dagger.hilt.InstallIn -import dagger.hilt.components.SingletonComponent -import javax.inject.Singleton - -@Module -@InstallIn(SingletonComponent::class) -class UiModule { - @Singleton - @Provides - @ConversationViewPool - fun provideConversationRecycledViewPool(): RecyclerView.RecycledViewPool { - return RecyclerView.RecycledViewPool() - } -} \ No newline at end of file diff --git a/app/src/main/java/org/thoughtcrime/securesms/dependencies/ViewPoolQualifiers.kt b/app/src/main/java/org/thoughtcrime/securesms/dependencies/ViewPoolQualifiers.kt deleted file mode 100644 index 0d10cfd0df..0000000000 --- a/app/src/main/java/org/thoughtcrime/securesms/dependencies/ViewPoolQualifiers.kt +++ /dev/null @@ -1,7 +0,0 @@ -package org.thoughtcrime.securesms.dependencies - -import javax.inject.Qualifier - -@Qualifier -@Retention(AnnotationRetention.SOURCE) -annotation class ConversationViewPool