Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d3d4066f authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Mark spam voicemail as old after we auto block it."

parents 8bb8b998 d6a2f81c

java/com/android/dialer/app/calllog/CallLogNotificationsService.java

+2 −2
Original line number Diff line number Diff line
@@ -150,12 +150,12 @@ public class CallLogNotificationsService extends IntentService { 
    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:

java/com/android/dialer/app/calllog/VisualVoicemailUpdateTask.java

+4 −0
Original line number Diff line number Diff line
@@ -212,6 +212,10 @@ class VisualVoicemailUpdateTask implements Worker<VisualVoicemailUpdateTask.Inpu 
            "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);

      }

java/com/android/dialer/app/calllog/VoicemailQueryHandler.java

+3 −3
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ public class VoicemailQueryHandler extends AsyncQueryHandler { 
  }



  @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 @@ public class VoicemailQueryHandler extends AsyncQueryHandler { 
  }



  @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(