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

Commit 6551bd4d authored by Nancy Chen's avatar Nancy Chen
Browse files

Revert "Use telephony voicemail notification settings for vvm."

This reverts commit 5cfa2c31.

Change-Id: Iabae03ca3dc671775779e2a61e380193341fad8a
parent 5cfa2c31
Loading
Loading
Loading
Loading
+1 −19
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ import com.google.common.collect.Maps;
import android.app.Notification;
import android.app.NotificationManager;
import android.app.PendingIntent;
import android.content.ComponentName;
import android.content.ContentResolver;
import android.content.ContentUris;
import android.content.Context;
@@ -34,9 +33,7 @@ import android.database.Cursor;
import android.net.Uri;
import android.provider.CallLog.Calls;
import android.provider.ContactsContract.PhoneLookup;
import android.telecom.PhoneAccountHandle;
import android.telephony.PhoneNumberUtils;
import android.telephony.TelephonyManager;
import android.text.TextUtils;
import android.util.Log;

@@ -197,24 +194,13 @@ public class DefaultVoicemailNotifier {
        // TODO: Use the photo of contact if all calls are from the same person.
        final int icon = android.R.drawable.stat_notify_voicemail;

        Uri ringtoneUri = null;
        boolean shouldVibrate = callToNotify != null;
        if (callToNotify != null) {
            PhoneAccountHandle accountHandle = new PhoneAccountHandle(
                    ComponentName.unflattenFromString(callToNotify.accountComponentName),
                    callToNotify.accountId);
            ringtoneUri = getTelephonyManager().getVoicemailRingtoneUri(accountHandle);
            shouldVibrate = getTelephonyManager().isVoicemailVibrationEnabled(accountHandle);
        }

        Notification.Builder notificationBuilder = new Notification.Builder(mContext)
                .setSmallIcon(icon)
                .setContentTitle(title)
                .setContentText(callers)
                .setStyle(new Notification.BigTextStyle().bigText(transcription))
                .setSound(ringtoneUri)
                .setColor(resources.getColor(R.color.dialer_theme_color))
                .setDefaults(shouldVibrate ? Notification.DEFAULT_VIBRATE : 0)
                .setDefaults(callToNotify != null ? Notification.DEFAULT_ALL : 0)
                .setDeleteIntent(createMarkNewVoicemailsAsOldIntent())
                .setAutoCancel(true);

@@ -238,10 +224,6 @@ public class DefaultVoicemailNotifier {
        mNotificationManager.notify(NOTIFICATION_TAG, NOTIFICATION_ID, notificationBuilder.build());
    }

    private TelephonyManager getTelephonyManager() {
        return (TelephonyManager) mContext.getSystemService(Context.TELEPHONY_SERVICE);
    }

    /** Creates a pending intent that marks all new voicemails as old. */
    private PendingIntent createMarkNewVoicemailsAsOldIntent() {
        Intent intent = new Intent(mContext, CallLogNotificationsService.class);