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

Commit ec1bab9d authored by roldenburg's avatar roldenburg Committed by Copybara-Service
Browse files

Use Dagger to get Duo instance in CallLogListItemViewHolder 

Bug: 70402153
Test: GoogleCallLogAdapterTest
PiperOrigin-RevId: 179106427
Change-Id: I2c82e95022c461d251d3385841640bc31d8aa765
parent 6b91ad30

java/com/android/dialer/app/calllog/CallLogAdapter.java

+0 −1
Original line number Diff line number Diff line
@@ -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<Void, Void, Boolean> loadDataTask =

        new AsyncTask<Void, Void, Boolean>() {

          @Override

java/com/android/dialer/app/calllog/CallLogListItemViewHolder.java

+3 −2
Original line number Diff line number Diff line
@@ -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) {