Merge "Mark spam voicemail as old after we auto block it."
diff --git a/java/com/android/dialer/app/calllog/CallLogNotificationsService.java b/java/com/android/dialer/app/calllog/CallLogNotificationsService.java
index 10e30ff..d84bd42 100644
--- a/java/com/android/dialer/app/calllog/CallLogNotificationsService.java
+++ b/java/com/android/dialer/app/calllog/CallLogNotificationsService.java
@@ -150,12 +150,12 @@
LogUtil.i("CallLogNotificationsService.onHandleIntent", "action: " + action);
switch (action) {
case ACTION_MARK_ALL_NEW_VOICEMAILS_AS_OLD:
- VoicemailQueryHandler.markAllNewVoicemailsAsRead(this);
+ VoicemailQueryHandler.markAllNewVoicemailsAsOld(this);
VisualVoicemailNotifier.cancelAllVoicemailNotifications(this);
break;
case ACTION_MARK_SINGLE_NEW_VOICEMAIL_AS_OLD:
Uri voicemailUri = intent.getData();
- VoicemailQueryHandler.markSingleNewVoicemailAsRead(this, voicemailUri);
+ VoicemailQueryHandler.markSingleNewVoicemailAsOld(this, voicemailUri);
VisualVoicemailNotifier.cancelSingleVoicemailNotification(this, voicemailUri);
break;
case ACTION_LEGACY_VOICEMAIL_DISMISSED:
diff --git a/java/com/android/dialer/app/calllog/VisualVoicemailUpdateTask.java b/java/com/android/dialer/app/calllog/VisualVoicemailUpdateTask.java
index b353b3a..bae30fa 100644
--- a/java/com/android/dialer/app/calllog/VisualVoicemailUpdateTask.java
+++ b/java/com/android/dialer/app/calllog/VisualVoicemailUpdateTask.java
@@ -212,6 +212,10 @@
"found voicemail from spam number, suppressing notification");
Logger.get(context)
.logImpression(DialerImpression.Type.INCOMING_VOICEMAIL_AUTO_BLOCKED_AS_SPAM);
+ if (newCall.voicemailUri != null) {
+ // Mark auto blocked voicemail as old so that we don't process it again.
+ VoicemailQueryHandler.markSingleNewVoicemailAsOld(context, newCall.voicemailUri);
+ }
} else {
result.add(newCall);
}
diff --git a/java/com/android/dialer/app/calllog/VoicemailQueryHandler.java b/java/com/android/dialer/app/calllog/VoicemailQueryHandler.java
index 169d0fd..5d8144c 100644
--- a/java/com/android/dialer/app/calllog/VoicemailQueryHandler.java
+++ b/java/com/android/dialer/app/calllog/VoicemailQueryHandler.java
@@ -42,7 +42,7 @@
}
@WorkerThread
- public static void markAllNewVoicemailsAsRead(final @NonNull Context context) {
+ public static void markAllNewVoicemailsAsOld(final @NonNull Context context) {
ThreadUtil.postOnUiThread(
() -> {
new VoicemailQueryHandler(context.getContentResolver())
@@ -51,10 +51,10 @@
}
@WorkerThread
- public static void markSingleNewVoicemailAsRead(
+ public static void markSingleNewVoicemailAsOld(
final @NonNull Context context, final Uri voicemailUri) {
if (voicemailUri == null) {
- LogUtil.e("VoicemailQueryHandler.markSingleNewVoicemailAsRead", "voicemail URI is null");
+ LogUtil.e("VoicemailQueryHandler.markSingleNewVoicemailAsOld", "voicemail URI is null");
return;
}
ThreadUtil.postOnUiThread(