Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-21 00:59:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update Glide to use ksp, drop kapt.

Browse Source 
Resolves #13381
This commit is contained in:
Jameson Williams
2024-01-24 02:54:09 -06:00
committed by Nicholas Tinsley
parent aa33fd44b8
commit ec96b4e3aa
132 changed files with 755 additions and 679 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/src/main/java/org/thoughtcrime/securesms/mediaoverview/MediaGalleryAllAdapter.java
View File

@@ -32,6 +32,7 @@ import androidx.recyclerview.widget.RecyclerView;
import com.annimon.stream.Collectors;
import com.annimon.stream.Stream;
import com.bumptech.glide.RequestManager;
import com.codewaves.stickyheadergrid.StickyHeaderGridAdapter;
import org.signal.libsignal.protocol.util.Pair;
@@ -45,7 +46,6 @@ import org.thoughtcrime.securesms.database.MediaTable.MediaRecord;
import org.thoughtcrime.securesms.database.loaders.GroupedThreadMediaLoader.GroupedThreadMedia;
import org.thoughtcrime.securesms.mediapreview.MediaPreviewCache;
import org.thoughtcrime.securesms.mms.AudioSlide;
import org.thoughtcrime.securesms.mms.GlideRequests;
import org.thoughtcrime.securesms.mms.Slide;
import org.thoughtcrime.securesms.recipients.LiveRecipient;
import org.thoughtcrime.securesms.recipients.Recipient;
@@ -70,7 +70,7 @@ final class MediaGalleryAllAdapter extends StickyHeaderGridAdapter {
private final Context context;
private final boolean showThread;
private final GlideRequests glideRequests;
private final RequestManager requestManager;
private final ItemClickListener itemClickListener;
private final Map<AttachmentId, MediaRecord> selected = new HashMap<>();
private final AudioItemListener audioItemListener;
@@ -102,7 +102,7 @@ final class MediaGalleryAllAdapter extends StickyHeaderGridAdapter {
}
MediaGalleryAllAdapter(@NonNull Context context,
@NonNull GlideRequests glideRequests,
@NonNull RequestManager requestManager,
GroupedThreadMedia media,
ItemClickListener clickListener,
@NonNull AudioItemListener audioItemListener,
@@ -110,7 +110,7 @@ final class MediaGalleryAllAdapter extends StickyHeaderGridAdapter {
boolean showThread)
{
this.context = context;
this.glideRequests = glideRequests;
this.requestManager = requestManager;
this.media = media;
this.itemClickListener = clickListener;
this.audioItemListener = audioItemListener;
@@ -345,7 +345,7 @@ final class MediaGalleryAllAdapter extends StickyHeaderGridAdapter {
imageFileSize.setVisibility(View.GONE);
}
thumbnailView.setImageResource(glideRequests, slide, false, false);
thumbnailView.setImageResource(requestManager, slide, false, false);
thumbnailView.setOnClickListener(view -> {
MediaPreviewCache.INSTANCE.setDrawable(thumbnailView.getImageDrawable());
itemClickListener.onMediaClicked(thumbnailView, mediaRecord);
@@ -366,13 +366,13 @@ final class MediaGalleryAllAdapter extends StickyHeaderGridAdapter {
@Override
void rebind() {
thumbnailView.setImageResource(glideRequests, slide, false, false);
thumbnailView.setImageResource(requestManager, slide, false, false);
super.rebind();
}
@Override
void unbind() {
thumbnailView.clear(glideRequests);
thumbnailView.clear(requestManager);
super.unbind();
}
@@ -591,7 +591,7 @@ final class MediaGalleryAllAdapter extends StickyHeaderGridAdapter {
public void bind(@NonNull Context context, @NonNull MediaTable.MediaRecord mediaRecord, @NonNull Slide slide) {
super.bind(context, mediaRecord, slide);
this.slide = slide;
thumbnailView.setImageResource(glideRequests, slide, false, false);
thumbnailView.setImageResource(requestManager, slide, false, false);
thumbnailView.setOnClickListener(view -> itemClickListener.onMediaClicked(thumbnailView, mediaRecord));
thumbnailView.setOnLongClickListener(view -> onLongClick());
}
@@ -611,13 +611,13 @@ final class MediaGalleryAllAdapter extends StickyHeaderGridAdapter {
@Override
void rebind() {
thumbnailView.setImageResource(glideRequests, slide, false, false);
thumbnailView.setImageResource(requestManager, slide, false, false);
super.rebind();
}
@Override
void unbind() {
thumbnailView.clear(glideRequests);
thumbnailView.clear(requestManager);
super.unbind();
}
}

4
app/src/main/java/org/thoughtcrime/securesms/mediaoverview/MediaOverviewPageFragment.java
View File

@@ -26,6 +26,7 @@ import androidx.loader.app.LoaderManager;
import androidx.loader.content.Loader;
import androidx.recyclerview.widget.RecyclerView;
import com.bumptech.glide.Glide;
import com.codewaves.stickyheadergrid.StickyHeaderGridLayoutManager;
import org.signal.core.util.DimensionUnit;
@@ -41,7 +42,6 @@ import org.thoughtcrime.securesms.database.loaders.GroupedThreadMediaLoader;
import org.thoughtcrime.securesms.database.loaders.MediaLoader;
import org.thoughtcrime.securesms.mediapreview.MediaIntentFactory;
import org.thoughtcrime.securesms.mediapreview.MediaPreviewV2Activity;
import org.thoughtcrime.securesms.mms.GlideApp;
import org.thoughtcrime.securesms.mms.PartAuthority;
import org.thoughtcrime.securesms.util.BottomOffsetDecoration;
import org.thoughtcrime.securesms.util.MediaUtil;
@@ -125,7 +125,7 @@ public final class MediaOverviewPageFragment extends Fragment
this.gridManager = new StickyHeaderGridLayoutManager(spans);
this.adapter = new MediaGalleryAllAdapter(context,
GlideApp.with(this),
Glide.with(this),
new GroupedThreadMediaLoader.EmptyGroupedThreadMedia(),
this,
this,