From b2b6365629aed422a006529fe7940612f778baed Mon Sep 17 00:00:00 2001
From: twyen <twyen@google.com>
Date: Mon, 7 May 2018 16:36:17 -0700
Subject: Place Duo calls with PreCall

This CL consolidates common duo calling operations into precall, including checking reachability, falling back to carrier video call, placing the call to duo with startActivityForResult.

TEST=TAP
Bug: 78783816
Test: TAP
PiperOrigin-RevId: 195742478
Change-Id: I9fea1e4999f604e1f3a153b28079cd0db77b7393
---
 .../android/dialer/speeddial/DisambigDialog.java   | 10 ++--------
 .../dialer/speeddial/SpeedDialFragment.java        | 22 ++++++----------------
 2 files changed, 8 insertions(+), 24 deletions(-)

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

diff --git a/java/com/android/dialer/speeddial/DisambigDialog.java b/java/com/android/dialer/speeddial/DisambigDialog.java
index 98fc992f8..2dd43fa0a 100644
--- a/java/com/android/dialer/speeddial/DisambigDialog.java
+++ b/java/com/android/dialer/speeddial/DisambigDialog.java
@@ -18,7 +18,6 @@ package com.android.dialer.speeddial;
 
 import android.app.Dialog;
 import android.content.Context;
-import android.content.Intent;
 import android.os.Bundle;
 import android.support.annotation.VisibleForTesting;
 import android.support.annotation.WorkerThread;
@@ -40,8 +39,6 @@ import com.android.dialer.common.Assert;
 import com.android.dialer.common.LogUtil;
 import com.android.dialer.common.concurrent.DefaultFutureCallback;
 import com.android.dialer.common.concurrent.DialerExecutorComponent;
-import com.android.dialer.constants.ActivityRequestCodes;
-import com.android.dialer.duo.DuoComponent;
 import com.android.dialer.logging.DialerImpression;
 import com.android.dialer.logging.Logger;
 import com.android.dialer.precall.PreCall;
@@ -184,16 +181,13 @@ public class DisambigDialog extends DialogFragment {
       Logger.get(getContext())
           .logImpression(
               DialerImpression.Type.LIGHTBRINGER_VIDEO_REQUESTED_FOR_FAVORITE_CONTACT_DISAMBIG);
-      Intent intent =
-          DuoComponent.get(getContext()).getDuo().getCallIntent(channel.number()).orNull();
-      getActivity().startActivityForResult(intent, ActivityRequestCodes.DIALTACTS_DUO);
-      return;
     }
 
     PreCall.start(
         getContext(),
         new CallIntentBuilder(channel.number(), CallInitiationType.Type.SPEED_DIAL)
-            .setIsVideoCall(true));
+            .setIsVideoCall(true)
+            .setIsDuoCall(channel.technology() == Channel.DUO));
     dismiss();
   }
 
diff --git a/java/com/android/dialer/speeddial/SpeedDialFragment.java b/java/com/android/dialer/speeddial/SpeedDialFragment.java
index aa306d214..fac9a13d2 100644
--- a/java/com/android/dialer/speeddial/SpeedDialFragment.java
+++ b/java/com/android/dialer/speeddial/SpeedDialFragment.java
@@ -41,7 +41,6 @@ import com.android.dialer.common.concurrent.DefaultFutureCallback;
 import com.android.dialer.common.concurrent.DialerExecutorComponent;
 import com.android.dialer.common.concurrent.SupportUiListener;
 import com.android.dialer.constants.ActivityRequestCodes;
-import com.android.dialer.duo.DuoComponent;
 import com.android.dialer.historyitemactions.DividerModule;
 import com.android.dialer.historyitemactions.HistoryItemActionBottomSheet;
 import com.android.dialer.historyitemactions.HistoryItemActionModule;
@@ -243,16 +242,13 @@ public class SpeedDialFragment extends Fragment {
       if (channel.technology() == Channel.DUO) {
         Logger.get(activity)
             .logImpression(DialerImpression.Type.LIGHTBRINGER_VIDEO_REQUESTED_FOR_FAVORITE_CONTACT);
-        Intent intent =
-            DuoComponent.get(activity).getDuo().getCallIntent(channel.number()).orNull();
-        activity.startActivityForResult(intent, ActivityRequestCodes.DIALTACTS_DUO);
-        return;
       }
 
       PreCall.start(
           activity,
           new CallIntentBuilder(channel.number(), CallInitiationType.Type.SPEED_DIAL)
-              .setIsVideoCall(channel.isVideoTechnology()));
+              .setIsVideoCall(channel.isVideoTechnology())
+              .setIsDuoCall(channel.technology() == Channel.DUO));
     }
 
     @Override
@@ -341,15 +337,12 @@ public class SpeedDialFragment extends Fragment {
         Logger.get(getContext())
             .logImpression(
                 DialerImpression.Type.LIGHTBRINGER_VIDEO_REQUESTED_FOR_SUGGESTED_CONTACT);
-        Intent intent =
-            DuoComponent.get(getContext()).getDuo().getCallIntent(channel.number()).orNull();
-        getActivity().startActivityForResult(intent, ActivityRequestCodes.DIALTACTS_DUO);
-        return;
       }
       PreCall.start(
           getContext(),
           new CallIntentBuilder(channel.number(), CallInitiationType.Type.SPEED_DIAL)
-              .setIsVideoCall(channel.isVideoTechnology()));
+              .setIsVideoCall(channel.isVideoTechnology())
+              .setIsDuoCall(channel.technology() == Channel.DUO));
     }
 
     private final class StarContactModule implements HistoryItemActionModule {
@@ -426,15 +419,12 @@ public class SpeedDialFragment extends Fragment {
       if (channel.technology() == Channel.DUO) {
         Logger.get(activity)
             .logImpression(DialerImpression.Type.LIGHTBRINGER_VIDEO_REQUESTED_FOR_FAVORITE_CONTACT);
-        Intent intent =
-            DuoComponent.get(activity).getDuo().getCallIntent(channel.number()).orNull();
-        activity.startActivityForResult(intent, ActivityRequestCodes.DIALTACTS_DUO);
-        return;
       }
       PreCall.start(
           activity,
           new CallIntentBuilder(channel.number(), CallInitiationType.Type.SPEED_DIAL)
-              .setIsVideoCall(channel.isVideoTechnology()));
+              .setIsVideoCall(channel.isVideoTechnology())
+              .setIsDuoCall(channel.technology() == Channel.DUO));
     }
 
     @Override
-- 
cgit v1.2.3