diff options
author | twyen <twyen@google.com> | 2018-05-01 14:53:14 -0700 |
---|---|---|
committer | Weijia Xu <weijiaxu@google.com> | 2018-05-04 06:14:46 +0000 |
commit | 34b1662b7532343341bbee22227e8ed82575864f (patch) | |
tree | b58aa9f0742adf3808b07c9e195336552f1ca64c /java/com/android/dialer/calllog | |
parent | 27faa86cb0488d6c77dc5ff9946e58ae9ca40485 (diff) |
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
Diffstat (limited to 'java/com/android/dialer/calllog')
-rw-r--r-- | java/com/android/dialer/calllog/datasources/systemcalllog/SystemCallLogDataSource.java | 16 | ||||
-rw-r--r-- | java/com/android/dialer/calllog/ui/menu/Modules.java | 5 |
2 files changed, 9 insertions, 12 deletions
diff --git a/java/com/android/dialer/calllog/datasources/systemcalllog/SystemCallLogDataSource.java b/java/com/android/dialer/calllog/datasources/systemcalllog/SystemCallLogDataSource.java index 661b2495b..588e64c5c 100644 --- a/java/com/android/dialer/calllog/datasources/systemcalllog/SystemCallLogDataSource.java +++ b/java/com/android/dialer/calllog/datasources/systemcalllog/SystemCallLogDataSource.java @@ -47,7 +47,7 @@ import com.android.dialer.common.Assert; import com.android.dialer.common.LogUtil; import com.android.dialer.common.concurrent.Annotations.BackgroundExecutor; import com.android.dialer.compat.android.provider.VoicemailCompat; -import com.android.dialer.duo.DuoConstants; +import com.android.dialer.duo.Duo; import com.android.dialer.inject.ApplicationContext; import com.android.dialer.phonenumberproto.DialerPhoneNumberUtil; import com.android.dialer.storage.Unencrypted; @@ -78,6 +78,7 @@ public class SystemCallLogDataSource implements CallLogDataSource { private final MarkDirtyObserver markDirtyObserver; private final SharedPreferences sharedPreferences; private final AnnotatedCallLogDatabaseHelper annotatedCallLogDatabaseHelper; + private final Duo duo; @Nullable private Long lastTimestampProcessed; @@ -87,12 +88,14 @@ public class SystemCallLogDataSource implements CallLogDataSource { @BackgroundExecutor ListeningExecutorService backgroundExecutorService, MarkDirtyObserver markDirtyObserver, @Unencrypted SharedPreferences sharedPreferences, - AnnotatedCallLogDatabaseHelper annotatedCallLogDatabaseHelper) { + AnnotatedCallLogDatabaseHelper annotatedCallLogDatabaseHelper, + Duo duo) { this.appContext = appContext; this.backgroundExecutorService = backgroundExecutorService; this.markDirtyObserver = markDirtyObserver; this.sharedPreferences = sharedPreferences; this.annotatedCallLogDatabaseHelper = annotatedCallLogDatabaseHelper; + this.duo = duo; } @Override @@ -384,18 +387,15 @@ public class SystemCallLogDataSource implements CallLogDataSource { * <p>Characteristics of a Duo audio call are as follows. * * <ul> - * <li>The phone account component name is {@link DuoConstants#PHONE_ACCOUNT_COMPONENT_NAME}; - * and + * <li>The phone account is {@link Duo#isDuoAccount(String)}; and * <li>The features don't include {@link Calls#FEATURES_VIDEO}. * </ul> * * <p>It is the caller's responsibility to ensure the phone account component name and the * features come from the same call log entry. */ - private static boolean isDuoAudioCall(@Nullable String phoneAccountComponentName, int features) { - return DuoConstants.PHONE_ACCOUNT_COMPONENT_NAME - .flattenToString() - .equals(phoneAccountComponentName) + private boolean isDuoAudioCall(@Nullable String phoneAccountComponentName, int features) { + return duo.isDuoAccount(phoneAccountComponentName) && ((features & Calls.FEATURES_VIDEO) != Calls.FEATURES_VIDEO); } diff --git a/java/com/android/dialer/calllog/ui/menu/Modules.java b/java/com/android/dialer/calllog/ui/menu/Modules.java index 2f6c1fb36..a56d6d5e2 100644 --- a/java/com/android/dialer/calllog/ui/menu/Modules.java +++ b/java/com/android/dialer/calllog/ui/menu/Modules.java @@ -30,7 +30,6 @@ import com.android.dialer.calllogutils.CallLogEntryText; import com.android.dialer.calllogutils.NumberAttributesConverter; import com.android.dialer.duo.Duo; import com.android.dialer.duo.DuoComponent; -import com.android.dialer.duo.DuoConstants; import com.android.dialer.glidephotomanager.PhotoInfo; import com.android.dialer.historyitemactions.DividerModule; import com.android.dialer.historyitemactions.DuoCallModule; @@ -127,9 +126,7 @@ final class Modules { } boolean isDuoCall = - DuoConstants.PHONE_ACCOUNT_COMPONENT_NAME - .flattenToString() - .equals(row.getPhoneAccountComponentName()); + DuoComponent.get(context).getDuo().isDuoAccount(row.getPhoneAccountComponentName()); List<HistoryItemActionModule> modules = new ArrayList<>(); |