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

Commit 00c1fda0 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Reformat phone number to show for quick respond message result toast."...

Merge "Reformat phone number to show for quick respond message result toast." am: c534a8e6 am: 00178f9b

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telecomm/+/2141375



Change-Id: I18a2da0178628d5800fd451e85ac09d43447e48a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents aa3966f2 00178f9b
Loading
Loading
Loading
Loading
+6 −1
Original line number Diff line number Diff line
@@ -31,11 +31,13 @@ import android.telecom.Response;
import android.telephony.PhoneNumberUtils;
import android.telephony.SmsManager;
import android.telephony.SubscriptionManager;
import android.text.BidiFormatter;
import android.text.Spannable;
import android.text.SpannableString;
import android.text.TextUtils;
import android.widget.Toast;

import java.text.Bidi;
import java.util.ArrayList;
import java.util.List;

@@ -158,7 +160,9 @@ public class RespondViaSmsManager extends CallsManagerListenerBase {
        final String formatString = res.getString(success
                ? R.string.respond_via_sms_confirmation_format
                : R.string.respond_via_sms_failure_format);
        final String confirmationMsg = String.format(formatString, phoneNumber);
        final BidiFormatter phoneNumberFormatter = BidiFormatter.getInstance();
        final String confirmationMsg = String.format(formatString,
                phoneNumberFormatter.unicodeWrap(phoneNumber));
        int startingPosition = confirmationMsg.indexOf(phoneNumber);
        int endingPosition = startingPosition + phoneNumber.length();

@@ -207,6 +211,7 @@ public class RespondViaSmsManager extends CallsManagerListenerBase {
                        PendingIntent.FLAG_ONE_SHOT | PendingIntent.FLAG_IMMUTABLE);
                sentIntents.add(pendingIntent);
            }

            MessageSentReceiver receiver = new MessageSentReceiver(
                    !TextUtils.isEmpty(contactName) ? contactName : phoneNumber,
                    messageParts.size());