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

Commit 15820796 authored by Flavio Lerda's avatar Flavio Lerda
Browse files

Correctly handle missing URI. 

If the SETTINGS_URI or VOICEMAIL_ACCESS_URI is null, the application
will fail when trying to process the status of a voicemail source.

This fixes this issue by correctly handling the case of a missing URI.

Change-Id: I329bf2d0c203306b770d10317867fe703e0a569c
parent 37bddc2f

src/com/android/contacts/voicemail/VoicemailStatusHelperImpl.java

+3 −2
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import static android.provider.VoicemailContract.Status.NOTIFICATION_CHANNEL_STA 


import com.android.common.io.MoreCloseables;

import com.android.contacts.R;

import com.android.contacts.util.UriUtils;



import android.database.Cursor;

import android.net.Uri;
@@ -205,9 +206,9 @@ public class VoicemailStatusHelperImpl implements VoicemailStatusHelper { 


        Uri actionUri = null;

        if (action == Action.CALL_VOICEMAIL) {

            actionUri = Uri.parse(cursor.getString(VOICEMAIL_ACCESS_URI_INDEX));

            actionUri = UriUtils.parseUriOrNull(cursor.getString(VOICEMAIL_ACCESS_URI_INDEX));

        } else if (action == Action.CONFIGURE_VOICEMAIL) {

            actionUri = Uri.parse(cursor.getString(SETTINGS_URI_INDEX));

            actionUri = UriUtils.parseUriOrNull(cursor.getString(SETTINGS_URI_INDEX));

        }

        return new MessageStatusWithPriority(

                new StatusMessage(sourcePackage, overallState.getCallLogMessageId(),