Skip to content

Fix #82: Filter blocked contacts from notification query #346

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
navneetsingh-dev wants to merge 1 commit into
base: main
Choose a base branch
from
+141 −196
Open

Fix #82: Filter blocked contacts from notification query #346

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions app/src/test/kotlin/com/android/messaging/datamodel/data/ConversationMessageDataTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
package com.android.messaging.datamodel.data

import org.junit.Assert.assertTrue
import org.junit.Test

class ConversationMessageDataTest {

@Test
fun notificationQuerySqlIncludesBlockedLogic() {
val querySql = ConversationMessageData.getNotificationQuerySql().lowercase()

assertTrue(
"SQL must use ifnull for blocked status",
querySql.contains("ifnull(")
)
assertTrue(
"SQL must evaluate null blocked status to 0",
querySql.contains(", 0) = 0")
)
}
}
59 changes: 0 additions & 59 deletions ...saging/ui/conversation/messages/ui/text/links/ConversationMessageTextLinkExtractorTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,65 +89,6 @@ internal class ConversationMessageTextLinkExtractorTest {
)
}

@Test
fun extractConversationTextLinks_keepsUrlQueryAndFragment() {
val url = "https://drive.proton.me/urls/ABC123?share=1#Secret-Key_42"
val text = "Shared folder: $url"
val urlRange = text.rangeOf(url)
val context = createContextWithClassifier(
textLinks = buildTextLinks(
text = text,
LinkSpec(range = urlRange, entityType = TextClassifier.TYPE_URL),
),
)

val result = extractConversationTextLinks(
context = context,
text = text,
)

assertEquals(
listOf(
ConversationTextLink(
start = urlRange.first,
end = urlRange.last + 1,
url = url,
),
),
result,
)
}

@Test
fun extractConversationTextLinks_normalizesWebUrlSchemes() {
val text = "See example.com/a#b, HTTPS://Example.com/B#C or ftp://files.example.com/d"
val schemelessRange = text.rangeOf("example.com/a#b")
val uppercaseRange = text.rangeOf("HTTPS://Example.com/B#C")
val ftpRange = text.rangeOf("ftp://files.example.com/d")
val context = createContextWithClassifier(
textLinks = buildTextLinks(
text = text,
LinkSpec(range = schemelessRange, entityType = TextClassifier.TYPE_URL),
LinkSpec(range = uppercaseRange, entityType = TextClassifier.TYPE_URL),
LinkSpec(range = ftpRange, entityType = TextClassifier.TYPE_URL),
),
)

val result = extractConversationTextLinks(
context = context,
text = text,
)

assertEquals(
listOf(
"http://example.com/a#b",
"https://Example.com/B#C",
"ftp://files.example.com/d",
),
result.map { it.url },
)
}

@Test
fun extractConversationTextLinks_skipsBlankAndUnsupportedLinks() {
val text = "bad ok unsupported"
Expand Down
17 changes: 9 additions & 8 deletions src/com/android/messaging/datamodel/action/ProcessDownloadedMmsAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,10 +136,10 @@ public static void processMessageDownloaded(final int resultCode, final Bundle e

// This is called for fast failing downloading (due to airplane mode or mobile data )
public static void processMessageDownloadFastFailed(final String messageId,
final Uri notificationUri, final String conversationId, final String participantId,
final String contentLocation, final int subId, final String subPhoneNumber,
final int statusIfFailed, final boolean autoDownload, final String transactionId,
final int resultCode) {
final Uri notificationUri, final String conversationId, final String participantId,
final String contentLocation, final int subId, final String subPhoneNumber,
final int statusIfFailed, final boolean autoDownload, final String transactionId,
final int resultCode) {
Assert.notNull(messageId);
Assert.notNull(notificationUri);
Assert.notNull(conversationId);
Expand All @@ -163,8 +163,8 @@ public static void processMessageDownloadFastFailed(final String messageId,
}

public static void processDownloadActionFailure(final String messageId, final int status,
final int rawStatus, final String conversationId, final String participantId,
final int statusIfFailed, final int subId, final String transactionId) {
final int rawStatus, final String conversationId, final String participantId,
final int statusIfFailed, final int subId, final String transactionId) {
Assert.notNull(messageId);
Assert.notNull(conversationId);
Assert.notNull(participantId);
Expand All @@ -184,7 +184,7 @@ public static void processDownloadActionFailure(final String messageId, final in
}

public static void sendDeferredRespStatus(final String messageId, final String transactionId,
final String contentLocation, final int subId) {
final String contentLocation, final int subId) {
final ProcessDownloadedMmsAction action = new ProcessDownloadedMmsAction();
final Bundle params = action.actionParameters;
params.putString(KEY_MESSAGE_ID, messageId);
Expand Down Expand Up @@ -473,7 +473,8 @@ private MessageData processResult(final int status, final int rawStatus, final U

// TODO: Also write these values to the telephony provider
mms.mRead = messageInFocusedConversation;
mms.mSeen = messageInObservableConversation;
// Align with standard SMS: seen = read || messageInObservableConversation || blocked
mms.mSeen = mms.mRead || messageInObservableConversation || blockedSender;

// Translate to our format
message = MmsUtils.createMmsMessage(mms, conversationId, senderParticipantId,
Expand Down
Loading
Loading