From 34b1662b7532343341bbee22227e8ed82575864f Mon Sep 17 00:00:00 2001
From: twyen <twyen@google.com>
Date: Tue, 1 May 2018 14:53:14 -0700
Subject: Replace DuoConstants with interface.

They are not constant across different Duo implementations.

TEST=TAP
Bug: 76430187,78783816
Test: TAP
PiperOrigin-RevId: 195001650
Change-Id: I4356d04c9eeac50fefd41e1142f3123591e93bc0
---
 java/com/android/dialer/calllogutils/CallLogEntryText.java  |  6 ++----
 .../android/dialer/calllogutils/CallbackActionHelper.java   | 13 ++++++-------
 2 files changed, 8 insertions(+), 11 deletions(-)

(limited to 'java/com/android/dialer/calllogutils')

diff --git a/java/com/android/dialer/calllogutils/CallLogEntryText.java b/java/com/android/dialer/calllogutils/CallLogEntryText.java
index a1a2a3b48..1b7bb06fa 100644
--- a/java/com/android/dialer/calllogutils/CallLogEntryText.java
+++ b/java/com/android/dialer/calllogutils/CallLogEntryText.java
@@ -20,7 +20,7 @@ import android.content.Context;
 import android.provider.CallLog.Calls;
 import android.text.TextUtils;
 import com.android.dialer.calllog.model.CoalescedRow;
-import com.android.dialer.duo.DuoConstants;
+import com.android.dialer.duo.DuoComponent;
 import com.android.dialer.time.Clock;
 import com.google.common.base.Optional;
 import com.google.common.collect.Collections2;
@@ -202,9 +202,7 @@ public final class CallLogEntryText {
       }
 
       boolean isDuoCall =
-          DuoConstants.PHONE_ACCOUNT_COMPONENT_NAME
-              .flattenToString()
-              .equals(row.getPhoneAccountComponentName());
+          DuoComponent.get(context).getDuo().isDuoAccount(row.getPhoneAccountComponentName());
       secondaryText.append(
           context.getText(
               isDuoCall ? R.string.new_call_log_duo_video : R.string.new_call_log_carrier_video));
diff --git a/java/com/android/dialer/calllogutils/CallbackActionHelper.java b/java/com/android/dialer/calllogutils/CallbackActionHelper.java
index 1e219f144..838bc4f11 100644
--- a/java/com/android/dialer/calllogutils/CallbackActionHelper.java
+++ b/java/com/android/dialer/calllogutils/CallbackActionHelper.java
@@ -16,10 +16,11 @@
 
 package com.android.dialer.calllogutils;
 
+import android.content.Context;
 import android.provider.CallLog.Calls;
 import android.support.annotation.IntDef;
 import android.text.TextUtils;
-import com.android.dialer.duo.DuoConstants;
+import com.android.dialer.duo.DuoComponent;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
@@ -46,8 +47,8 @@ public class CallbackActionHelper {
    * @return One of the values in {@link CallbackAction}
    */
   public static @CallbackAction int getCallbackAction(
-      String number, int features, String phoneAccountComponentName) {
-    return getCallbackAction(number, features, isDuoCall(phoneAccountComponentName));
+      Context context, String number, int features, String phoneAccountComponentName) {
+    return getCallbackAction(number, features, isDuoCall(context, phoneAccountComponentName));
   }
 
   /**
@@ -75,9 +76,7 @@ public class CallbackActionHelper {
     return CallbackAction.VOICE;
   }
 
-  private static boolean isDuoCall(String phoneAccountComponentName) {
-    return DuoConstants.PHONE_ACCOUNT_COMPONENT_NAME
-        .flattenToString()
-        .equals(phoneAccountComponentName);
+  private static boolean isDuoCall(Context context, String phoneAccountComponentName) {
+    return DuoComponent.get(context).getDuo().isDuoAccount(phoneAccountComponentName);
   }
 }
-- 
cgit v1.2.3