Messaging: Use textutils to match against SIP scheme.stable/cm-13.0-ZNH2KB

Change-Id: Ica8ddc9fc405dc6eedc0b808897513078c64e752
TICKET: CYNGNOS-2982
(cherry picked from commit ea62dcab0bf227d99f947c8afc34d1b3e75d20ed)

2 files changed, 12 insertions, 6 deletions

diff --git a/src/com/android/messaging/ui/conversation/ComposeMessageView.java b/src/com/android/messaging/ui/conversation/ComposeMessageView.java
index dc2b231..cb6562f 100644
--- a/src/com/android/messaging/ui/conversation/ComposeMessageView.java
+++ b/src/com/android/messaging/ui/conversation/ComposeMessageView.java
@@ -85,6 +85,7 @@ import com.android.messaging.util.UnicodeFilter;
 
 import com.cyanogenmod.messaging.util.PrefsUtils;
 
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 
@@ -224,14 +225,16 @@ public class ComposeMessageView extends LinearLayout
         final TelecomManager telecomMgr =
                 (TelecomManager) activity.getSystemService(Context.TELECOM_SERVICE);
         final List<PhoneAccountHandle> handles = telecomMgr.getCallCapablePhoneAccounts();
+        final List<PhoneAccountHandle> filteredHandles = new ArrayList<>();
 
         //trim out SIP accounts
         for (PhoneAccountHandle handle : handles) {
             PhoneAccount phoneAccount = PhoneUtils.getAccountOrNull(activity, handle);
             if (phoneAccount != null) {
                 Uri address = phoneAccount.getAddress();
-                if (address != null && address.getScheme() == PhoneAccount.SCHEME_SIP) {
-                    handles.remove(handle);
+                if (address != null &&
+                        !TextUtils.equals(address.getScheme(), PhoneAccount.SCHEME_SIP)) {
+                    filteredHandles.add(handle);
                 }
             }
         }
@@ -251,7 +254,7 @@ public class ComposeMessageView extends LinearLayout
         DialogFragment dialogFragment = SelectPhoneAccountDialogFragment.newInstance(
                 R.string.select_phone_account_title,
                 false /* canSetDefault */,
-                handles, listener);
+                filteredHandles, listener);
         dialogFragment.show(activity.getFragmentManager(), "SELECT_PHONE_ACCOUNT_DIALOG_FRAGMENT");
     }
 
diff --git a/src/com/cyanogenmod/messaging/quickmessage/QuickMessagePopup.java b/src/com/cyanogenmod/messaging/quickmessage/QuickMessagePopup.java
index 82331b2..6c4af67 100755
--- a/src/com/cyanogenmod/messaging/quickmessage/QuickMessagePopup.java
+++ b/src/com/cyanogenmod/messaging/quickmessage/QuickMessagePopup.java
@@ -31,6 +31,7 @@ import android.telecom.PhoneAccountHandle;
 import android.telecom.TelecomManager;
 import android.telephony.TelephonyManager;
 import android.text.InputType;
+import android.text.TextUtils;
 import android.util.Log;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
@@ -381,14 +382,16 @@ public class QuickMessagePopup extends Activity {
         final TelecomManager telecomMgr =
                 (TelecomManager) activity.getSystemService(Context.TELECOM_SERVICE);
         final List<PhoneAccountHandle> handles = telecomMgr.getCallCapablePhoneAccounts();
+        final List<PhoneAccountHandle> filteredHandles = new ArrayList<>();
 
         //trim out SIP accounts
         for (PhoneAccountHandle handle : handles) {
             PhoneAccount phoneAccount = PhoneUtils.getAccountOrNull(activity, handle);
             if (phoneAccount != null) {
                 Uri address = phoneAccount.getAddress();
-                if (address != null && address.getScheme() == PhoneAccount.SCHEME_SIP) {
-                    handles.remove(handle);
+                if (address != null &&
+                        !TextUtils.equals(address.getScheme(), PhoneAccount.SCHEME_SIP)) {
+                    filteredHandles.add(handle);
                 }
             }
         }
@@ -408,7 +411,7 @@ public class QuickMessagePopup extends Activity {
         DialogFragment dialogFragment = SelectPhoneAccountDialogFragment.newInstance(
                 R.string.select_phone_account_title,
                 false /* canSetDefault */,
-                handles, listener);
+                filteredHandles, listener);
         dialogFragment.show(activity.getFragmentManager(), "SELECT_PHONE_ACCOUNT_DIALOG_FRAGMENT");
     }