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

Commit add54797 authored by roldenburg's avatar roldenburg Committed by android-build-merger
Browse files

Merge "Hide "Invite" and "Set up" Duo buttons for spam and voicemail calls"... 

Merge "Hide "Invite" and "Set up" Duo buttons for spam and voicemail calls" am: 1f9a4262 am: 8bf0e00f
am: 5275fcbf

Change-Id: I6a64a9afe142ef38fa112dc2edd5c06821d77012
parents fbee8845 5275fcbf

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

+17 −8
Original line number Diff line number Diff line
@@ -359,15 +359,15 @@ public final class CallLogListItemViewHolder extends RecyclerView.ViewHolder 
  }



  public static CallLogListItemViewHolder createForTest(Context context) {

    return createForTest(context, null, null);

    return createForTest(context, null, null, new CallLogCache(context));

  }



  public static CallLogListItemViewHolder createForTest(

      Context context,

      View.OnClickListener expandCollapseListener,

      VoicemailPlaybackPresenter voicemailPlaybackPresenter) {

      VoicemailPlaybackPresenter voicemailPlaybackPresenter,

      CallLogCache callLogCache) {

    Resources resources = context.getResources();

    CallLogCache callLogCache = new CallLogCache(context);

    PhoneCallDetailsHelper phoneCallDetailsHelper =

        new PhoneCallDetailsHelper(context, resources, callLogCache);
@@ -661,6 +661,8 @@ public final class CallLogListItemViewHolder extends RecyclerView.ViewHolder 
      callButtonView.setVisibility(View.VISIBLE);

    }



    boolean isVoicemailNumber = mCallLogCache.isVoicemailNumber(accountHandle, number);



    switch (callbackAction) {

      case CallbackAction.IMS_VIDEO:

      case CallbackAction.DUO:
@@ -677,13 +679,21 @@ public final class CallLogListItemViewHolder extends RecyclerView.ViewHolder 
            && (hasPlacedCarrierVideoCall() || canSupportCarrierVideoCall())) {

          videoCallButtonView.setTag(IntentProvider.getReturnVideoCallIntentProvider(number));

          videoCallButtonView.setVisibility(View.VISIBLE);

        } else if (duo.isReachable(mContext, number)) {

          break;

        }



        if (isVoicemailNumber) {

          break;

        }



        boolean identifiedSpamCall = isSpamFeatureEnabled && isSpam;

        if (duo.isReachable(mContext, number)) {

          videoCallButtonView.setTag(IntentProvider.getDuoVideoIntentProvider(number));

          videoCallButtonView.setVisibility(View.VISIBLE);

        } else if (duo.isActivated(mContext)) {

        } else if (duo.isActivated(mContext) && !identifiedSpamCall) {

          inviteVideoButtonView.setTag(IntentProvider.getDuoInviteIntentProvider(number));

          inviteVideoButtonView.setVisibility(View.VISIBLE);

        } else if (duo.isEnabled(mContext)) {

        } else if (duo.isEnabled(mContext) && !identifiedSpamCall) {

          if (!duo.isInstalled(mContext)) {

            setUpVideoButtonView.setTag(IntentProvider.getInstallDuoIntentProvider());

          } else {
@@ -746,7 +756,6 @@ public final class CallLogListItemViewHolder extends RecyclerView.ViewHolder 
      addToExistingContactButtonView.setVisibility(View.GONE);

    }



    boolean isVoicemailNumber = mCallLogCache.isVoicemailNumber(accountHandle, number);

    if (canPlaceCallToNumber && !isBlockedOrSpam && !isVoicemailNumber) {

      sendMessageView.setTag(IntentProvider.getSendSmsIntentProvider(number));

      sendMessageView.setVisibility(View.VISIBLE);