From ec1bab9d13bda7ade3642751052a2b10e0812d2c Mon Sep 17 00:00:00 2001 From: roldenburg Date: Thu, 14 Dec 2017 15:19:11 -0800 Subject: Use Dagger to get Duo instance in CallLogListItemViewHolder Bug: 70402153 Test: GoogleCallLogAdapterTest PiperOrigin-RevId: 179106427 Change-Id: I2c82e95022c461d251d3385841640bc31d8aa765 --- java/com/android/dialer/app/calllog/CallLogAdapter.java | 1 - java/com/android/dialer/app/calllog/CallLogListItemViewHolder.java | 5 +++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'java/com/android/dialer/app') diff --git a/java/com/android/dialer/app/calllog/CallLogAdapter.java b/java/com/android/dialer/app/calllog/CallLogAdapter.java index 0459519d5..f3d04d935 100644 --- a/java/com/android/dialer/app/calllog/CallLogAdapter.java +++ b/java/com/android/dialer/app/calllog/CallLogAdapter.java @@ -844,7 +844,6 @@ public class CallLogAdapter extends GroupingListAdapter // attempt to set the field properly in that case viewHolder.isCallComposerCapable = isCallComposerCapable(viewHolder.number); viewHolder.setDetailedPhoneDetails(callDetailsEntries); - viewHolder.duo = getDuo(); final AsyncTask loadDataTask = new AsyncTask() { @Override diff --git a/java/com/android/dialer/app/calllog/CallLogListItemViewHolder.java b/java/com/android/dialer/app/calllog/CallLogListItemViewHolder.java index 922a086bd..0aa46c561 100644 --- a/java/com/android/dialer/app/calllog/CallLogListItemViewHolder.java +++ b/java/com/android/dialer/app/calllog/CallLogListItemViewHolder.java @@ -79,6 +79,7 @@ import com.android.dialer.contactphoto.ContactPhotoManager; import com.android.dialer.dialercontact.DialerContact; import com.android.dialer.dialercontact.SimDetails; import com.android.dialer.duo.Duo; +import com.android.dialer.duo.DuoComponent; import com.android.dialer.duo.DuoConstants; import com.android.dialer.lettertile.LetterTileDrawable; import com.android.dialer.lettertile.LetterTileDrawable.ContactType; @@ -231,7 +232,6 @@ public final class CallLogListItemViewHolder extends RecyclerView.ViewHolder public boolean isSpam; public boolean isCallComposerCapable; - public Duo duo; private View.OnClickListener mExpandCollapseListener; private final OnActionModeStateChangedListener onActionModeStateChangedListener; @@ -670,6 +670,7 @@ public final class CallLogListItemViewHolder extends RecyclerView.ViewHolder videoCallButtonView.setVisibility(View.GONE); break; case CallbackAction.VOICE: + Duo duo = DuoComponent.get(mContext).getDuo(); // For a voice call, set the secondary callback action to be an IMS video call if it is // available. Otherwise try to set it as a Duo call. if (CallUtil.isVideoEnabled(mContext) @@ -776,7 +777,7 @@ public final class CallLogListItemViewHolder extends RecyclerView.ViewHolder private boolean showDuoPrimaryButton() { return accountHandle != null && accountHandle.getComponentName().equals(DuoConstants.PHONE_ACCOUNT_COMPONENT_NAME) - && duo.isReachable(mContext, number); + && DuoComponent.get(mContext).getDuo().isReachable(mContext, number); } private static boolean hasDialableChar(CharSequence number) { -- cgit v1.2.3