Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2025-12-24 21:15:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Utilize Bitmap shortcut on API29 and under.

Browse Source
This commit is contained in:
Alex Hart
2023-09-07 10:42:39 -03:00
parent 0a78bcb374
commit 48ae8c2465
3 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/thoughtcrime/securesms/notifications/v2/NotificationBuilder.kt
View File

@@ -360,7 +360,7 @@ sealed class NotificationBuilder(protected val context: Context) {
)
if (intent != null) {
val bubbleMetadata = NotificationCompat.BubbleMetadata.Builder(intent, AvatarUtil.getIconCompatForShortcut(conversation.recipient))
val bubbleMetadata = NotificationCompat.BubbleMetadata.Builder(intent, AvatarUtil.getIconCompatForShortcut(context, conversation.recipient))
.setAutoExpandBubble(bubbleState === BubbleUtil.BubbleState.SHOWN)
.setDesiredHeight(600)
.setSuppressNotification(bubbleState === BubbleUtil.BubbleState.SHOWN)

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

@@ -3,6 +3,7 @@ package org.thoughtcrime.securesms.util;
import android.content.Context;
import android.graphics.Bitmap;
import android.graphics.drawable.Drawable;
import android.os.Build;
import android.view.View;
import android.widget.ImageView;
@@ -114,8 +115,12 @@ public final class AvatarUtil {
}
@WorkerThread
public static @NonNull IconCompat getIconCompatForShortcut(@NonNull Recipient recipient) {
return getIconWithUriForNotification(recipient.getId());
public static @NonNull IconCompat getIconCompatForShortcut(@NonNull Context context, @NonNull Recipient recipient) {
if (Build.VERSION.SDK_INT > 29) {
return getIconWithUriForNotification(recipient.getId());
} else {
return IconCompat.createWithBitmap(getBitmapForNotification(context, recipient));
}
}
@WorkerThread

2
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(resolved))
.setIcon(AvatarUtil.getIconCompatForShortcut(context, resolved))
.setPersons(persons)
.setCategories(Sets.newHashSet(CATEGORY_SHARE_TARGET))
.setActivity(activity)