Skip to content

Commit ec96b4e

Browse files
jamesonwilliamsnicholas-signal
authored andcommittedFeb 1, 2024
Update Glide to use ksp, drop kapt.
Resolves #13381
1 parent aa33fd4 commit ec96b4e

File tree

132 files changed

+755
-679
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

132 files changed

+755
-679
lines changed
 

‎app/src/androidTest/java/org/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemShapeTest.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ package org.thoughtcrime.securesms.conversation.v2.items
88
import android.net.Uri
99
import android.view.View
1010
import androidx.lifecycle.Observer
11+
import com.bumptech.glide.RequestManager
1112
import io.mockk.mockk
1213
import org.junit.Assert.assertEquals
1314
import org.junit.Rule
@@ -29,7 +30,6 @@ import org.thoughtcrime.securesms.groups.GroupId
2930
import org.thoughtcrime.securesms.groups.GroupMigrationMembershipChange
3031
import org.thoughtcrime.securesms.linkpreview.LinkPreview
3132
import org.thoughtcrime.securesms.mediapreview.MediaIntentFactory
32-
import org.thoughtcrime.securesms.mms.GlideRequests
3333
import org.thoughtcrime.securesms.recipients.Recipient
3434
import org.thoughtcrime.securesms.recipients.RecipientId
3535
import org.thoughtcrime.securesms.stickers.StickerLocator
@@ -209,7 +209,7 @@ class V2ConversationItemShapeTest {
209209
override val selectedItems: Set<MultiselectPart> = emptySet()
210210
override val isMessageRequestAccepted: Boolean = true
211211
override val searchQuery: String? = null
212-
override val glideRequests: GlideRequests = mockk()
212+
override val requestManager: RequestManager = mockk()
213213
override val isParentInScroll: Boolean = false
214214
override fun getChatColorsData(): ChatColorsDrawable.ChatColorsData = ChatColorsDrawable.ChatColorsData(null, null)
215215

‎app/src/debug/java/org/thoughtcrime/securesms/components/settings/app/internal/conversation/test/InternalConversationTestFragment.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import androidx.fragment.app.Fragment
1313
import androidx.fragment.app.viewModels
1414
import androidx.lifecycle.Observer
1515
import androidx.navigation.navGraphViewModels
16+
import com.bumptech.glide.Glide
1617
import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
1718
import io.reactivex.rxjava3.kotlin.subscribeBy
1819
import org.signal.core.util.concurrent.LifecycleDisposable
@@ -42,7 +43,6 @@ import org.thoughtcrime.securesms.groups.GroupId
4243
import org.thoughtcrime.securesms.groups.GroupMigrationMembershipChange
4344
import org.thoughtcrime.securesms.linkpreview.LinkPreview
4445
import org.thoughtcrime.securesms.mediapreview.MediaIntentFactory
45-
import org.thoughtcrime.securesms.mms.GlideApp
4646
import org.thoughtcrime.securesms.recipients.Recipient
4747
import org.thoughtcrime.securesms.recipients.RecipientId
4848
import org.thoughtcrime.securesms.stickers.StickerLocator
@@ -62,7 +62,7 @@ class InternalConversationTestFragment : Fragment(R.layout.conversation_test_fra
6262
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
6363
val adapter = ConversationAdapterV2(
6464
lifecycleOwner = viewLifecycleOwner,
65-
glideRequests = GlideApp.with(this),
65+
requestManager = Glide.with(this),
6666
clickListener = ClickListener(),
6767
hasWallpaper = springboardViewModel.hasWallpaper.value,
6868
colorizer = Colorizer(),

0 commit comments

Comments
 (0)
Please sign in to comment.