Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-03-02 23:38:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Do not link contacts to notification unless we have permission.

Browse Source
This commit is contained in:
Greyson Parrelli
2024-08-27 11:38:26 -04:00
committed by Nicholas Tinsley
parent b7af1e09e2
commit b61ca37523
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,6 @@
package org.thoughtcrime.securesms.util;
import android.Manifest;
import android.content.ComponentName;
import android.content.Context;
@@ -24,6 +25,7 @@ import org.thoughtcrime.securesms.database.SignalDatabase;
import org.thoughtcrime.securesms.groups.GroupId;
import org.thoughtcrime.securesms.jobs.ConversationShortcutUpdateJob;
import org.thoughtcrime.securesms.notifications.NotificationChannels;
import org.thoughtcrime.securesms.permissions.Permissions;
import org.thoughtcrime.securesms.recipients.Recipient;
import org.thoughtcrime.securesms.recipients.RecipientId;
@@ -292,7 +294,7 @@ public final class ConversationUtil {
.setKey(getShortcutId(recipient.getId()))
.setName(recipient.getDisplayName(context))
.setIcon(AvatarUtil.getIconCompat(context, recipient))
.setUri(recipient.isSystemContact() ? recipient.getContactUri().toString() : null)
.setUri(recipient.isSystemContact() && Permissions.hasAny(context, Manifest.permission.READ_CONTACTS, Manifest.permission.WRITE_CONTACTS) ? recipient.getContactUri().toString() : null)
.build();
}

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

@@ -87,8 +87,7 @@ public class CallNotificationBuilder {
Recipient recipient,
boolean isVideoCall,
boolean skipPersonIcon
)
{
) {
PendingIntent pendingIntent = getActivityPendingIntent(context, LaunchCallScreenIntentState.CONTENT);
NotificationCompat.Builder builder = new NotificationCompat.Builder(context, getNotificationChannel(type))
.setSmallIcon(R.drawable.ic_call_secure_white_24dp)