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

Ensure lower api levels do not try to use Uri based IconCompat.

Browse Source
This commit is contained in:
Alex Hart
2023-09-11 15:27:58 -03:00
committed by GitHub
parent b72fe0d7a2
commit 18b33a7776
6 changed files with 119 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
app/src/main/java/org/thoughtcrime/securesms/util/AvatarUtil.java
View File

@@ -22,7 +22,7 @@ import com.bumptech.glide.request.target.CustomTarget;
import com.bumptech.glide.request.target.CustomViewTarget;
import com.bumptech.glide.request.transition.Transition;
import org.signal.core.util.concurrent.SignalExecutors;
import org.signal.core.util.ThreadUtil;
import org.signal.core.util.logging.Log;
import org.thoughtcrime.securesms.R;
import org.thoughtcrime.securesms.contacts.avatars.ContactPhoto;
@@ -30,10 +30,11 @@ import org.thoughtcrime.securesms.contacts.avatars.GeneratedContactPhoto;
import org.thoughtcrime.securesms.contacts.avatars.ProfileContactPhoto;
import org.thoughtcrime.securesms.mms.GlideApp;
import org.thoughtcrime.securesms.mms.GlideRequest;
import org.thoughtcrime.securesms.mms.GlideRequests;
import org.thoughtcrime.securesms.providers.AvatarProvider;
import org.thoughtcrime.securesms.recipients.Recipient;
import org.thoughtcrime.securesms.recipients.RecipientId;
import java.util.Objects;
import java.util.Optional;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.ExecutionException;
@@ -91,7 +92,7 @@ public final class AvatarUtil {
}
public static void loadIconIntoImageView(@NonNull Recipient recipient, @NonNull ImageView target, int requestedSize) {
Context context = target.getContext();
Context context = target.getContext();
requestCircle(GlideApp.with(context).asDrawable(), context, recipient, requestedSize).into(target);
}
@@ -103,23 +104,18 @@ public final class AvatarUtil {
throws ExecutionException, InterruptedException
{
return requestSquare(GlideApp.with(context).asBitmap(), context, recipient)
.skipMemoryCache(true)
.diskCacheStrategy(DiskCacheStrategy.NONE)
.submit(width, height)
.get();
.skipMemoryCache(true)
.diskCacheStrategy(DiskCacheStrategy.NONE)
.submit(width, height)
.get();
}
@WorkerThread
public static IconCompat getIconWithUriForNotification(@NonNull RecipientId recipientId) {
return IconCompat.createWithContentUri(AvatarProvider.getContentUri(recipientId));
}
@WorkerThread
public static @NonNull IconCompat getIconCompatForShortcut(@NonNull Context context, @NonNull Recipient recipient) {
public static @NonNull IconCompat getIconCompat(@NonNull Context context, @NonNull Recipient recipient) {
if (Build.VERSION.SDK_INT > 29) {
return getIconWithUriForNotification(recipient.getId());
return IconCompat.createWithContentUri(AvatarProvider.getContentUri(recipient.getId()));
} else {
return IconCompat.createWithBitmap(getBitmapForNotification(context, recipient));
return IconCompat.createWithBitmap(getBitmapForNotification(context, recipient, DrawableUtil.SHORTCUT_INFO_WRAPPED_SIZE));
}
}
@@ -129,17 +125,19 @@ public final class AvatarUtil {
}
@WorkerThread
public static Bitmap getBitmapForNotification(@NonNull Context context, @NonNull Recipient recipient, int size) {
public static @NonNull Bitmap getBitmapForNotification(@NonNull Context context, @NonNull Recipient recipient, int size) {
ThreadUtil.assertNotMainThread();
try {
AvatarTarget avatarTarget = new AvatarTarget(size);
AvatarTarget avatarTarget = new AvatarTarget(size);
GlideRequests glideRequests = GlideApp.with(context);
SignalExecutors.BOUNDED_IO.submit(() -> {
requestCircle(GlideApp.with(context).asBitmap(), context, recipient, size).into(avatarTarget);
});
requestCircle(glideRequests.asBitmap(), context, recipient, size).into(avatarTarget);
return avatarTarget.await();
Bitmap bitmap = avatarTarget.await();
return Objects.requireNonNullElseGet(bitmap, () -> DrawableUtil.toBitmap(getFallback(context, recipient, size), size, size));
} catch (InterruptedException e) {
return null;
return DrawableUtil.toBitmap(getFallback(context, recipient, size), size, size);
}
}
@@ -156,6 +154,7 @@ public final class AvatarUtil {
}
private static <T> GlideRequest<T> request(@NonNull GlideRequest<T> glideRequest, @NonNull Context context, @NonNull Recipient recipient, boolean loadSelf, int targetSize, @Nullable BitmapTransformation transformation) {
final ContactPhoto photo;
if (Recipient.self().equals(recipient) && loadSelf) {
photo = new ProfileContactPhoto(recipient);
@@ -163,10 +162,11 @@ public final class AvatarUtil {
photo = recipient.getContactPhoto();
}
final int size = targetSize == -1 ? DrawableUtil.SHORTCUT_INFO_WRAPPED_SIZE : targetSize;
final GlideRequest<T> request = glideRequest.load(photo)
.error(getFallback(context, recipient, targetSize))
.error(getFallback(context, recipient, size))
.diskCacheStrategy(DiskCacheStrategy.ALL)
.override(targetSize);
.override(size);
if (recipient.shouldBlurAvatar()) {
BlurTransformation blur = new BlurTransformation(context, 0.25f, BlurTransformation.MAX_RADIUS);
@@ -203,7 +203,6 @@ public final class AvatarUtil {
}
public @Nullable Bitmap await() throws InterruptedException {
Log.d(TAG, "AvatarTarget#await:");
if (countDownLatch.await(1, TimeUnit.SECONDS)) {
return bitmap.get();
} else {
@@ -212,17 +211,28 @@ public final class AvatarUtil {
}
}
@Override
public void onDestroy() {
Log.d(TAG, "AvatarTarget: onDestroy");
super.onDestroy();
}
@Override
public void onLoadStarted(@Nullable Drawable placeholder) {
Log.d(TAG, "AvatarTarget: onLoadStarted");
super.onLoadStarted(placeholder);
}
@Override
public void onResourceReady(@NonNull Bitmap resource, @Nullable Transition<? super Bitmap> transition) {
Log.d(TAG, "AvatarTarget#onResourceReady: " + resource.getWidth() + ", " + resource.getHeight() + ", s:" + size);
Log.d(TAG, "AvatarTarget: onResourceReady");
bitmap.set(resource);
countDownLatch.countDown();
}
@Override
public void onLoadFailed(@Nullable Drawable errorDrawable) {
Log.d(TAG, "AvatarTarget#onLoadFailed:");
Log.d(TAG, "AvatarTarget: onLoadFailed");
if (errorDrawable == null) {
throw new AssertionError("Expected an error drawable.");
}
@@ -234,8 +244,7 @@ public final class AvatarUtil {
@Override
public void onLoadCleared(@Nullable Drawable placeholder) {
Log.d(TAG, "AvatarTarget#onLoadCleared:");
Log.d(TAG, "AvatarTarget: onLoadCleared");
bitmap.set(null);
countDownLatch.countDown();
}

5
app/src/main/java/org/thoughtcrime/securesms/util/ConversationUtil.java
View File

@@ -226,7 +226,7 @@ public final class ConversationUtil {
.setIntent(ConversationIntents.createBuilderSync(context, resolved.getId(), threadId).build())
.setShortLabel(shortName)
.setLongLabel(longName)
.setIcon(AvatarUtil.getIconCompatForShortcut(context, resolved))
.setIcon(AvatarUtil.getIconCompat(context, resolved))
.setPersons(persons)
.setCategories(Sets.newHashSet(CATEGORY_SHARE_TARGET))
.setActivity(activity)
@@ -286,11 +286,12 @@ public final class ConversationUtil {
/**
* @return A Compat Library Person object representing the given Recipient
*/
@WorkerThread
public static @NonNull Person buildPerson(@NonNull Context context, @NonNull Recipient recipient) {
return new Person.Builder()
.setKey(getShortcutId(recipient.getId()))
.setName(recipient.getDisplayName(context))
.setIcon(AvatarUtil.getIconWithUriForNotification(recipient.getId()))
.setIcon(AvatarUtil.getIconCompat(context, recipient))
.setUri(recipient.isSystemContact() ? recipient.getContactUri().toString() : null)
.build();
}