From bed9e2f7d26e21c4f68cb5b3f0641e3110fbef77 Mon Sep 17 00:00:00 2001 From: wangqi Date: Mon, 30 Apr 2018 11:55:07 -0700 Subject: Store RTT transcript message received when UI is in background. If the call disconnects when RTT UI is in background, any messages received from remote should be saved to transcript. RttCallPrensenter might not be available at this point, so the job is done inside DialerCall#onRemovedFromCallList Bug: 78576798 Test: presubmit PiperOrigin-RevId: 194821868 Change-Id: I10381b1c292f918763360c7a4bcd0470250f2293 --- java/com/android/incallui/call/DialerCall.java | 30 ++- .../android/incallui/rtt/impl/RttChatAdapter.java | 1 + .../android/incallui/rtt/impl/RttChatMessage.java | 217 ------------------- .../rtt/impl/RttChatMessageViewHolder.java | 1 + .../incallui/rtt/protocol/RttChatMessage.java | 230 +++++++++++++++++++++ 5 files changed, 258 insertions(+), 221 deletions(-) delete mode 100644 java/com/android/incallui/rtt/impl/RttChatMessage.java create mode 100644 java/com/android/incallui/rtt/protocol/RttChatMessage.java (limited to 'java/com/android') diff --git a/java/com/android/incallui/call/DialerCall.java b/java/com/android/incallui/call/DialerCall.java index d57de15e5..d736edc94 100644 --- a/java/com/android/incallui/call/DialerCall.java +++ b/java/com/android/incallui/call/DialerCall.java @@ -83,6 +83,7 @@ import com.android.dialer.util.PermissionsUtil; import com.android.incallui.audiomode.AudioModeProvider; import com.android.incallui.call.state.DialerCallState; import com.android.incallui.latencyreport.LatencyReport; +import com.android.incallui.rtt.protocol.RttChatMessage; import com.android.incallui.speakeasy.runtime.Constraints; import com.android.incallui.videotech.VideoTech; import com.android.incallui.videotech.VideoTech.VideoTechListener; @@ -92,6 +93,7 @@ import com.android.incallui.videotech.ims.ImsVideoTech; import com.android.incallui.videotech.utils.VideoUtils; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.MoreExecutors; +import java.io.IOException; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.util.ArrayList; @@ -1084,6 +1086,28 @@ public class DialerCall implements VideoTechListener, StateChangedListener, Capa getTelecomCall().respondToRttRequest(rttRequestId, accept); } + @TargetApi(28) + private void saveRttTranscript() { + if (!BuildCompat.isAtLeastP()) { + return; + } + // Save any remaining text in the buffer that's not shown by UI yet. + // This may happen when the call is switched to background before disconnect. + try { + String messageLeft = getRttCall().readImmediately(); + if (!TextUtils.isEmpty(messageLeft)) { + rttTranscript = + RttChatMessage.getRttTranscriptWithNewRemoteMessage(rttTranscript, messageLeft); + } + } catch (IOException e) { + LogUtil.e("DialerCall.saveRttTranscript", "error when reading remaining message", e); + } + Futures.addCallback( + RttTranscriptUtil.saveRttTranscript(context, rttTranscript), + new DefaultFutureCallback<>(), + MoreExecutors.directExecutor()); + } + public boolean hasReceivedVideoUpgradeRequest() { return VideoUtils.hasReceivedVideoUpgradeRequest(getVideoTech().getSessionModificationState()); } @@ -1615,11 +1639,9 @@ public class DialerCall implements VideoTechListener, StateChangedListener, Capa videoTechManager.dispatchRemovedFromCallList(); } // TODO(a bug): Add tests for it to make sure no crash on subsequent call to this method. + // TODO(wangqi): Consider moving this to a DialerCallListener. if (rttTranscript != null && !isCallRemoved) { - Futures.addCallback( - RttTranscriptUtil.saveRttTranscript(context, rttTranscript), - new DefaultFutureCallback<>(), - MoreExecutors.directExecutor()); + saveRttTranscript(); } isCallRemoved = true; } diff --git a/java/com/android/incallui/rtt/impl/RttChatAdapter.java b/java/com/android/incallui/rtt/impl/RttChatAdapter.java index f1cde759c..96ff58b79 100644 --- a/java/com/android/incallui/rtt/impl/RttChatAdapter.java +++ b/java/com/android/incallui/rtt/impl/RttChatAdapter.java @@ -29,6 +29,7 @@ import android.view.ViewGroup; import com.android.dialer.common.LogUtil; import com.android.dialer.rtt.RttTranscript; import com.android.dialer.rtt.RttTranscriptMessage; +import com.android.incallui.rtt.protocol.RttChatMessage; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.util.ArrayList; diff --git a/java/com/android/incallui/rtt/impl/RttChatMessage.java b/java/com/android/incallui/rtt/impl/RttChatMessage.java deleted file mode 100644 index 2f3933a50..000000000 --- a/java/com/android/incallui/rtt/impl/RttChatMessage.java +++ /dev/null @@ -1,217 +0,0 @@ -/* - * Copyright (C) 2018 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License - */ - -package com.android.incallui.rtt.impl; - -import android.support.annotation.NonNull; -import com.android.dialer.common.Assert; -import com.android.dialer.rtt.RttTranscript; -import com.android.dialer.rtt.RttTranscriptMessage; -import com.android.incallui.rtt.protocol.Constants; -import com.google.common.base.Splitter; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; - -/** Message class that holds one RTT chat content. */ -final class RttChatMessage { - - private static final Splitter SPLITTER = Splitter.on(Constants.BUBBLE_BREAKER); - - boolean isRemote; - long timstamp; - private final StringBuilder content = new StringBuilder(); - private boolean isFinished; - - public boolean isFinished() { - return isFinished; - } - - public void finish() { - isFinished = true; - } - - void unfinish() { - isFinished = false; - } - - public void append(String text) { - for (int i = 0; i < text.length(); i++) { - char c = text.charAt(i); - if (c == '\b' && content.length() > 0 && content.charAt(content.length() - 1) != '\b') { - content.deleteCharAt(content.length() - 1); - } else { - content.append(c); - } - } - } - - public String getContent() { - return content.toString(); - } - - /** - * Computes delta change of two string. - * - *

e.g. "hello world" -> "hello" : "\b\b\b\b\b\b" - * - *

"hello world" -> "hello mom!" : "\b\b\b\b\bmom!" - * - *

"hello world" -> "hello d" : "\b\b\b\b\bd" - * - *

"hello world" -> "hello new world" : "\b\b\b\b\bnew world" - */ - static String computeChangedString(String oldMessage, String newMesssage) { - StringBuilder modify = new StringBuilder(); - int indexChangeStart = 0; - while (indexChangeStart < oldMessage.length() - && indexChangeStart < newMesssage.length() - && oldMessage.charAt(indexChangeStart) == newMesssage.charAt(indexChangeStart)) { - indexChangeStart++; - } - for (int i = indexChangeStart; i < oldMessage.length(); i++) { - modify.append('\b'); - } - for (int i = indexChangeStart; i < newMesssage.length(); i++) { - modify.append(newMesssage.charAt(i)); - } - return modify.toString(); - } - - /** Update list of {@code RttChatMessage} based on given remote text. */ - static void updateRemoteRttChatMessage(List messageList, @NonNull String text) { - Assert.isNotNull(messageList); - Iterator splitText = SPLITTER.split(text).iterator(); - - while (splitText.hasNext()) { - String singleMessageContent = splitText.next(); - RttChatMessage message; - int index = getLastIndexUnfinishedRemoteMessage(messageList); - if (index < 0) { - message = new RttChatMessage(); - message.append(singleMessageContent); - message.isRemote = true; - if (splitText.hasNext()) { - message.finish(); - } - if (message.content.length() != 0) { - messageList.add(message); - } - } else { - message = messageList.get(index); - message.append(singleMessageContent); - if (splitText.hasNext()) { - message.finish(); - } - if (message.content.length() == 0) { - messageList.remove(index); - } - } - StringBuilder content = message.content; - // Delete previous messages. - while (content.length() > 0 && content.charAt(0) == '\b') { - messageList.remove(message); - content.delete(0, 1); - int previous = getLastIndexRemoteMessage(messageList); - // There are more backspaces than existing characters. - if (previous < 0) { - while (content.length() > 0 && content.charAt(0) == '\b') { - content.deleteCharAt(0); - } - // Add message if there are still characters after backspaces. - if (content.length() > 0) { - message = new RttChatMessage(); - message.append(content.toString()); - message.isRemote = true; - if (splitText.hasNext()) { - message.finish(); - } - messageList.add(message); - } - break; - } - message = messageList.get(previous); - message.unfinish(); - message.append(content.toString()); - content = message.content; - } - } - if (text.endsWith(Constants.BUBBLE_BREAKER)) { - int lastIndexRemoteMessage = getLastIndexRemoteMessage(messageList); - messageList.get(lastIndexRemoteMessage).finish(); - } - } - - private static int getLastIndexUnfinishedRemoteMessage(List messageList) { - int i = messageList.size() - 1; - while (i >= 0 && (!messageList.get(i).isRemote || messageList.get(i).isFinished)) { - i--; - } - return i; - } - - static int getLastIndexRemoteMessage(List messageList) { - int i = messageList.size() - 1; - while (i >= 0 && !messageList.get(i).isRemote) { - i--; - } - return i; - } - - static int getLastIndexLocalMessage(List messageList) { - int i = messageList.size() - 1; - while (i >= 0 && messageList.get(i).isRemote) { - i--; - } - return i; - } - - static List toTranscriptMessageList(List messageList) { - List transcriptMessageList = new ArrayList<>(); - for (RttChatMessage message : messageList) { - transcriptMessageList.add( - RttTranscriptMessage.newBuilder() - .setContent(message.getContent()) - .setTimestamp(message.timstamp) - .setIsRemote(message.isRemote) - .setIsFinished(message.isFinished) - .build()); - } - return transcriptMessageList; - } - - static List fromTranscript(RttTranscript rttTranscript) { - List messageList = new ArrayList<>(); - if (rttTranscript == null) { - return messageList; - } - for (RttTranscriptMessage message : rttTranscript.getMessagesList()) { - RttChatMessage chatMessage = new RttChatMessage(); - chatMessage.append(message.getContent()); - chatMessage.timstamp = message.getTimestamp(); - chatMessage.isRemote = message.getIsRemote(); - if (message.getIsFinished()) { - chatMessage.finish(); - } - messageList.add(chatMessage); - } - return messageList; - } - - RttChatMessage() { - timstamp = System.currentTimeMillis(); - } -} diff --git a/java/com/android/incallui/rtt/impl/RttChatMessageViewHolder.java b/java/com/android/incallui/rtt/impl/RttChatMessageViewHolder.java index 2beea9530..56161eccc 100644 --- a/java/com/android/incallui/rtt/impl/RttChatMessageViewHolder.java +++ b/java/com/android/incallui/rtt/impl/RttChatMessageViewHolder.java @@ -25,6 +25,7 @@ import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.LinearLayout.LayoutParams; import android.widget.TextView; +import com.android.incallui.rtt.protocol.RttChatMessage; /** ViewHolder class for RTT chat message bubble. */ public class RttChatMessageViewHolder extends ViewHolder { diff --git a/java/com/android/incallui/rtt/protocol/RttChatMessage.java b/java/com/android/incallui/rtt/protocol/RttChatMessage.java new file mode 100644 index 000000000..5680529ee --- /dev/null +++ b/java/com/android/incallui/rtt/protocol/RttChatMessage.java @@ -0,0 +1,230 @@ +/* + * Copyright (C) 2018 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License + */ + +package com.android.incallui.rtt.protocol; + +import android.support.annotation.NonNull; +import com.android.dialer.common.Assert; +import com.android.dialer.rtt.RttTranscript; +import com.android.dialer.rtt.RttTranscriptMessage; +import com.google.common.base.Splitter; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; + +/** Message class that holds one RTT chat content. */ +public final class RttChatMessage { + + private static final Splitter SPLITTER = Splitter.on(Constants.BUBBLE_BREAKER); + + public boolean isRemote; + private long timstamp; + private final StringBuilder content = new StringBuilder(); + private boolean isFinished; + + public boolean isFinished() { + return isFinished; + } + + public void finish() { + isFinished = true; + } + + public void unfinish() { + isFinished = false; + } + + public void append(String text) { + for (int i = 0; i < text.length(); i++) { + char c = text.charAt(i); + if (c == '\b' && content.length() > 0 && content.charAt(content.length() - 1) != '\b') { + content.deleteCharAt(content.length() - 1); + } else { + content.append(c); + } + } + } + + public String getContent() { + return content.toString(); + } + + /** + * Computes delta change of two string. + * + *

e.g. "hello world" -> "hello" : "\b\b\b\b\b\b" + * + *

"hello world" -> "hello mom!" : "\b\b\b\b\bmom!" + * + *

"hello world" -> "hello d" : "\b\b\b\b\bd" + * + *

"hello world" -> "hello new world" : "\b\b\b\b\bnew world" + */ + public static String computeChangedString(String oldMessage, String newMesssage) { + StringBuilder modify = new StringBuilder(); + int indexChangeStart = 0; + while (indexChangeStart < oldMessage.length() + && indexChangeStart < newMesssage.length() + && oldMessage.charAt(indexChangeStart) == newMesssage.charAt(indexChangeStart)) { + indexChangeStart++; + } + for (int i = indexChangeStart; i < oldMessage.length(); i++) { + modify.append('\b'); + } + for (int i = indexChangeStart; i < newMesssage.length(); i++) { + modify.append(newMesssage.charAt(i)); + } + return modify.toString(); + } + + public static RttTranscript getRttTranscriptWithNewRemoteMessage( + RttTranscript rttTranscript, @NonNull String text) { + List messageList = fromTranscript(rttTranscript); + updateRemoteRttChatMessage(messageList, text); + return RttTranscript.newBuilder() + .setId(rttTranscript.getId()) + .setNumber(rttTranscript.getNumber()) + .setTimestamp(rttTranscript.getTimestamp()) + .addAllMessages(toTranscriptMessageList(messageList)) + .build(); + } + + /** Update list of {@code RttChatMessage} based on given remote text. */ + public static void updateRemoteRttChatMessage( + List messageList, @NonNull String text) { + Assert.isNotNull(messageList); + Iterator splitText = SPLITTER.split(text).iterator(); + + while (splitText.hasNext()) { + String singleMessageContent = splitText.next(); + RttChatMessage message; + int index = getLastIndexUnfinishedRemoteMessage(messageList); + if (index < 0) { + message = new RttChatMessage(); + message.append(singleMessageContent); + message.isRemote = true; + if (splitText.hasNext()) { + message.finish(); + } + if (message.content.length() != 0) { + messageList.add(message); + } + } else { + message = messageList.get(index); + message.append(singleMessageContent); + if (splitText.hasNext()) { + message.finish(); + } + if (message.content.length() == 0) { + messageList.remove(index); + } + } + StringBuilder content = message.content; + // Delete previous messages. + while (content.length() > 0 && content.charAt(0) == '\b') { + messageList.remove(message); + content.delete(0, 1); + int previous = getLastIndexRemoteMessage(messageList); + // There are more backspaces than existing characters. + if (previous < 0) { + while (content.length() > 0 && content.charAt(0) == '\b') { + content.deleteCharAt(0); + } + // Add message if there are still characters after backspaces. + if (content.length() > 0) { + message = new RttChatMessage(); + message.append(content.toString()); + message.isRemote = true; + if (splitText.hasNext()) { + message.finish(); + } + messageList.add(message); + } + break; + } + message = messageList.get(previous); + message.unfinish(); + message.append(content.toString()); + content = message.content; + } + } + if (text.endsWith(Constants.BUBBLE_BREAKER)) { + int lastIndexRemoteMessage = getLastIndexRemoteMessage(messageList); + messageList.get(lastIndexRemoteMessage).finish(); + } + } + + private static int getLastIndexUnfinishedRemoteMessage(List messageList) { + int i = messageList.size() - 1; + while (i >= 0 && (!messageList.get(i).isRemote || messageList.get(i).isFinished)) { + i--; + } + return i; + } + + public static int getLastIndexRemoteMessage(List messageList) { + int i = messageList.size() - 1; + while (i >= 0 && !messageList.get(i).isRemote) { + i--; + } + return i; + } + + public static int getLastIndexLocalMessage(List messageList) { + int i = messageList.size() - 1; + while (i >= 0 && messageList.get(i).isRemote) { + i--; + } + return i; + } + + public static List toTranscriptMessageList( + List messageList) { + List transcriptMessageList = new ArrayList<>(); + for (RttChatMessage message : messageList) { + transcriptMessageList.add( + RttTranscriptMessage.newBuilder() + .setContent(message.getContent()) + .setTimestamp(message.timstamp) + .setIsRemote(message.isRemote) + .setIsFinished(message.isFinished) + .build()); + } + return transcriptMessageList; + } + + public static List fromTranscript(RttTranscript rttTranscript) { + List messageList = new ArrayList<>(); + if (rttTranscript == null) { + return messageList; + } + for (RttTranscriptMessage message : rttTranscript.getMessagesList()) { + RttChatMessage chatMessage = new RttChatMessage(); + chatMessage.append(message.getContent()); + chatMessage.timstamp = message.getTimestamp(); + chatMessage.isRemote = message.getIsRemote(); + if (message.getIsFinished()) { + chatMessage.finish(); + } + messageList.add(chatMessage); + } + return messageList; + } + + public RttChatMessage() { + timstamp = System.currentTimeMillis(); + } +} -- cgit v1.2.3