From d6b10d559f345eab2dd3dd89b07cfc3fd79c59bc Mon Sep 17 00:00:00 2001 From: wangqi Date: Thu, 12 Apr 2018 14:44:06 -0700 Subject: Add RTT transcript to call details. 1. Save RTT transcript when call is destroyed 2. Show RTT transcript link when it's available Bug: 67596257,77717594 Test: manual PiperOrigin-RevId: 192673172 Change-Id: If541ad9137c965166548d2fb449e835b95566727 --- .../dialer/calldetails/CallDetailsActivity.java | 1 - .../calldetails/CallDetailsActivityCommon.java | 50 +++++++++++++++++++++- .../calldetails/CallDetailsAdapterCommon.java | 3 ++ .../calldetails/CallDetailsEntryViewHolder.java | 17 ++++++++ .../calldetails/proto/call_details_entries.proto | 1 + .../calldetails/res/layout/call_details_entry.xml | 37 ++++++++++------ .../dialer/calldetails/res/values/strings.xml | 6 +++ .../dialer/calldetails/res/values/styles.xml | 12 ++++++ 8 files changed, 112 insertions(+), 15 deletions(-) (limited to 'java/com/android/dialer/calldetails') diff --git a/java/com/android/dialer/calldetails/CallDetailsActivity.java b/java/com/android/dialer/calldetails/CallDetailsActivity.java index 4dc294e76..f0f9711ca 100644 --- a/java/com/android/dialer/calldetails/CallDetailsActivity.java +++ b/java/com/android/dialer/calldetails/CallDetailsActivity.java @@ -134,7 +134,6 @@ public final class CallDetailsActivity extends CallDetailsActivityCommon { private void updateCallDetailsEntries(CallDetailsEntries newEntries) { activity.setCallDetailsEntries(newEntries); - activity.getAdapter().updateCallDetailsEntries(newEntries); EnrichedCallComponent.get(activity) .getEnrichedCallManager() .requestAllHistoricalData(activity.getNumber(), newEntries); diff --git a/java/com/android/dialer/calldetails/CallDetailsActivityCommon.java b/java/com/android/dialer/calldetails/CallDetailsActivityCommon.java index dea1b8cda..46705eb2a 100644 --- a/java/com/android/dialer/calldetails/CallDetailsActivityCommon.java +++ b/java/com/android/dialer/calldetails/CallDetailsActivityCommon.java @@ -26,9 +26,11 @@ import android.os.Bundle; import android.provider.CallLog; import android.provider.CallLog.Calls; import android.support.annotation.CallSuper; +import android.support.annotation.MainThread; import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.support.annotation.RequiresPermission; +import android.support.annotation.WorkerThread; import android.support.v7.app.AppCompatActivity; import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.RecyclerView; @@ -45,6 +47,7 @@ import com.android.dialer.common.concurrent.DialerExecutor.FailureListener; import com.android.dialer.common.concurrent.DialerExecutor.SuccessListener; import com.android.dialer.common.concurrent.DialerExecutor.Worker; import com.android.dialer.common.concurrent.DialerExecutorComponent; +import com.android.dialer.common.concurrent.UiListener; import com.android.dialer.common.database.Selection; import com.android.dialer.constants.ActivityRequestCodes; import com.android.dialer.duo.Duo; @@ -58,7 +61,9 @@ import com.android.dialer.logging.UiAction; import com.android.dialer.performancereport.PerformanceReport; import com.android.dialer.postcall.PostCall; import com.android.dialer.precall.PreCall; +import com.android.dialer.rtt.RttTranscriptUtil; import com.google.common.base.Preconditions; +import com.google.common.util.concurrent.ListenableFuture; import com.google.i18n.phonenumbers.NumberParseException; import com.google.i18n.phonenumbers.PhoneNumberUtil; import com.google.i18n.phonenumbers.Phonenumber.PhoneNumber; @@ -91,6 +96,7 @@ abstract class CallDetailsActivityCommon extends AppCompatActivity { private CallDetailsAdapterCommon adapter; private CallDetailsEntries callDetailsEntries; + private UiListener checkRttTranscriptAvailabilityListener; /** * Handles the intent that launches {@link OldCallDetailsActivity} or {@link CallDetailsActivity}, @@ -121,6 +127,9 @@ abstract class CallDetailsActivityCommon extends AppCompatActivity { }); handleIntent(getIntent()); setupRecyclerViewForEntries(); + checkRttTranscriptAvailabilityListener = + DialerExecutorComponent.get(this) + .createUiListener(getFragmentManager(), "Query RTT transcript availability"); } @Override @@ -143,6 +152,40 @@ abstract class CallDetailsActivityCommon extends AppCompatActivity { EnrichedCallComponent.get(this) .getEnrichedCallManager() .requestAllHistoricalData(getNumber(), callDetailsEntries); + checkRttTranscriptAvailabilityListener.listen( + this, + checkRttTranscriptAvailability(), + this::setCallDetailsEntries, + throwable -> { + throw new RuntimeException(throwable); + }); + } + + private ListenableFuture checkRttTranscriptAvailability() { + return DialerExecutorComponent.get(this) + .backgroundExecutor() + .submit(() -> checkRttTranscriptAvailabilityInBackground(callDetailsEntries)); + } + + /** + * Check RTT transcript availability. + * + * @param input the original {@link CallDetailsEntries} + * @return {@link CallDetailsEntries} with updated RTT transcript availability. + */ + @WorkerThread + private CallDetailsEntries checkRttTranscriptAvailabilityInBackground( + @Nullable CallDetailsEntries input) { + RttTranscriptUtil rttTranscriptUtil = new RttTranscriptUtil(this); + + CallDetailsEntries.Builder mutableCallDetailsEntries = CallDetailsEntries.newBuilder(); + for (CallDetailsEntry entry : input.getEntriesList()) { + CallDetailsEntry.Builder newEntry = CallDetailsEntry.newBuilder().mergeFrom(entry); + newEntry.setHasRttTranscript( + rttTranscriptUtil.checkRttTranscriptAvailability(String.valueOf(entry.getDate()))); + mutableCallDetailsEntries.addEntries(newEntry.build()); + } + return mutableCallDetailsEntries.build(); } @Override @@ -185,8 +228,13 @@ abstract class CallDetailsActivityCommon extends AppCompatActivity { super.onBackPressed(); } + @MainThread protected final void setCallDetailsEntries(CallDetailsEntries entries) { + Assert.isMainThread(); this.callDetailsEntries = entries; + if (adapter != null) { + adapter.updateCallDetailsEntries(entries); + } } protected final CallDetailsEntries getCallDetailsEntries() { @@ -415,7 +463,7 @@ abstract class CallDetailsActivityCommon extends AppCompatActivity { Map> mappedResults = getAllHistoricalData(activity.getNumber(), activity.callDetailsEntries); - activity.adapter.updateCallDetailsEntries( + activity.setCallDetailsEntries( generateAndMapNewCallDetailsEntriesHistoryResults( activity.getNumber(), activity.callDetailsEntries, mappedResults)); } diff --git a/java/com/android/dialer/calldetails/CallDetailsAdapterCommon.java b/java/com/android/dialer/calldetails/CallDetailsAdapterCommon.java index 27feff89d..a79642bad 100644 --- a/java/com/android/dialer/calldetails/CallDetailsAdapterCommon.java +++ b/java/com/android/dialer/calldetails/CallDetailsAdapterCommon.java @@ -18,6 +18,7 @@ package com.android.dialer.calldetails; import android.content.Context; import android.support.annotation.CallSuper; +import android.support.annotation.MainThread; import android.support.v7.widget.RecyclerView; import android.support.v7.widget.RecyclerView.ViewHolder; import android.view.LayoutInflater; @@ -137,7 +138,9 @@ abstract class CallDetailsAdapterCommon extends RecyclerView.Adapter + android:maxLines="100"/> + android:layout_marginStart="@dimen/call_entry_text_left_margin" + android:layout_below="@+id/call_type"/> + android:layout_alignParentEnd="true"/> + android:visibility="gone"/> + \ No newline at end of file diff --git a/java/com/android/dialer/calldetails/res/values/strings.xml b/java/com/android/dialer/calldetails/res/values/strings.xml index f81696034..c3fff20bc 100644 --- a/java/com/android/dialer/calldetails/res/values/strings.xml +++ b/java/com/android/dialer/calldetails/res/values/strings.xml @@ -55,4 +55,10 @@ Assisted dialing was used + + + Transcript available only for calls with messaging + + + See transcript diff --git a/java/com/android/dialer/calldetails/res/values/styles.xml b/java/com/android/dialer/calldetails/res/values/styles.xml index 1a2b52994..93567ef73 100644 --- a/java/com/android/dialer/calldetails/res/values/styles.xml +++ b/java/com/android/dialer/calldetails/res/values/styles.xml @@ -27,4 +27,16 @@ #8A000000 14sp + + + \ No newline at end of file -- cgit v1.2.3