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

Hopeful fix for remote notification crash.

Browse Source
This commit is contained in:
Alex Hart
2023-08-22 15:02:16 -03:00
committed by GitHub
parent 4fa3570d1e
commit 38940e0111
4 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/org/thoughtcrime/securesms/providers/AvatarProvider.kt
View File

@@ -59,11 +59,8 @@ class AvatarProvider : BaseContentProvider() {
}
@JvmStatic
fun getContentUri(context: Context, recipientId: RecipientId): Uri {
val uri = ContentUris.withAppendedId(CONTENT_URI, recipientId.toLong())
context.applicationContext.grantUriPermission("com.android.systemui", uri, Intent.FLAG_GRANT_READ_URI_PERMISSION)
return uri
fun getContentUri(recipientId: RecipientId): Uri {
return ContentUris.withAppendedId(CONTENT_URI, recipientId.toLong())
}
}

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

@@ -109,8 +109,8 @@ public final class AvatarUtil {
}
@WorkerThread
public static IconCompat getIconWithUriForNotification(@NonNull Context context, @NonNull RecipientId recipientId) {
return IconCompat.createWithContentUri(AvatarProvider.getContentUri(context, recipientId));
public static IconCompat getIconWithUriForNotification(@NonNull RecipientId recipientId) {
return IconCompat.createWithContentUri(AvatarProvider.getContentUri(recipientId));
}
@WorkerThread

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

@@ -290,7 +290,7 @@ public final class ConversationUtil {
return new Person.Builder()
.setKey(getShortcutId(recipient.getId()))
.setName(recipient.getDisplayName(context))
.setIcon(AvatarUtil.getIconWithUriForNotification(context, recipient.getId()))
.setIcon(AvatarUtil.getIconWithUriForNotification(recipient.getId()))
.setUri(recipient.isSystemContact() ? recipient.getContactUri().toString() : null)
.build();
}

8
app/src/main/java/org/thoughtcrime/securesms/webrtc/CallNotificationBuilder.java
View File

@@ -80,8 +80,10 @@ public class CallNotificationBuilder {
builder.setCategory(NotificationCompat.CATEGORY_CALL);
builder.setFullScreenIntent(pendingIntent, true);
Person person = ConversationUtil.buildPerson(context, recipient);
builder.addPerson(person);
if (deviceVersionSupportsIncomingCallStyle()) {
Person person = ConversationUtil.buildPerson(context, recipient);
builder.setStyle(NotificationCompat.CallStyle.forIncomingCall(
person,
getServicePendingIntent(context, WebRtcCallService.denyCallIntent(context)),
@@ -100,8 +102,10 @@ public class CallNotificationBuilder {
builder.setPriority(NotificationCompat.PRIORITY_DEFAULT);
builder.setCategory(NotificationCompat.CATEGORY_CALL);
Person person = ConversationUtil.buildPerson(context, recipient);
builder.addPerson(person);
if (deviceVersionSupportsIncomingCallStyle()) {
Person person = ConversationUtil.buildPerson(context, recipient);
builder.setStyle(NotificationCompat.CallStyle.forOngoingCall(
person,
getServicePendingIntent(context, WebRtcCallService.hangupIntent(context))