summaryrefslogtreecommitdiff
path: root/java/com/android/incallui/rtt/impl
diff options
context:
space:
mode:
authorwangqi <wangqi@google.com>2018-02-15 16:21:49 -0800
committerEric Erfanian <erfanian@google.com>2018-02-22 21:06:27 +0000
commit153af2febd64f989f5e67c51c0653489e3339a1a (patch)
tree08c008a84c41fabcc13c33c769643b34cbd7553d /java/com/android/incallui/rtt/impl
parent3da989d320eff8bae7491d7ab528abd5582a3594 (diff)
Implement read/write text stream to RttCall.
This change also: 1. Add simulator support of RTT request during call (always accept at this moment, will add random accept/decline in the future) 2. Fix bugs of putting RTT call in background and back to call Bug: 67596257 Test: Simulator PiperOrigin-RevId: 185920527 Change-Id: I51016fa6cf1ccc8a5a21335f9dacf286ae393706
Diffstat (limited to 'java/com/android/incallui/rtt/impl')
-rw-r--r--java/com/android/incallui/rtt/impl/RttChatAdapter.java12
-rw-r--r--java/com/android/incallui/rtt/impl/RttChatFragment.java21
2 files changed, 30 insertions, 3 deletions
diff --git a/java/com/android/incallui/rtt/impl/RttChatAdapter.java b/java/com/android/incallui/rtt/impl/RttChatAdapter.java
index 1ea7f31b1..69837188a 100644
--- a/java/com/android/incallui/rtt/impl/RttChatAdapter.java
+++ b/java/com/android/incallui/rtt/impl/RttChatAdapter.java
@@ -110,7 +110,17 @@ public class RttChatAdapter extends RecyclerView.Adapter<RttChatMessageViewHolde
notifyItemInserted(lastIndexOfLocalMessage);
} else {
rttChatMessage.append(newMessage);
- notifyItemChanged(lastIndexOfLocalMessage);
+ // Clear empty message bubble.
+ if (TextUtils.isEmpty(rttChatMessage.getContent())) {
+ rttMessages.remove(lastIndexOfLocalMessage);
+ notifyItemRemoved(lastIndexOfLocalMessage);
+ if (lastIndexOfRemoteMessage > lastIndexOfLocalMessage) {
+ lastIndexOfRemoteMessage -= 1;
+ }
+ lastIndexOfLocalMessage = -1;
+ } else {
+ notifyItemChanged(lastIndexOfLocalMessage);
+ }
}
}
diff --git a/java/com/android/incallui/rtt/impl/RttChatFragment.java b/java/com/android/incallui/rtt/impl/RttChatFragment.java
index c7ee2ff67..ba99b2bf6 100644
--- a/java/com/android/incallui/rtt/impl/RttChatFragment.java
+++ b/java/com/android/incallui/rtt/impl/RttChatFragment.java
@@ -132,7 +132,7 @@ public class RttChatFragment extends Fragment
FragmentUtils.getParentUnsafe(this, RttCallScreenDelegateFactory.class)
.newRttCallScreenDelegate(this);
- rttCallScreenDelegate.initRttCallScreenDelegate(getContext(), this);
+ rttCallScreenDelegate.initRttCallScreenDelegate(this);
inCallScreenDelegate.onInCallScreenDelegateInit(this);
inCallScreenDelegate.onInCallScreenReady();
@@ -193,7 +193,24 @@ public class RttChatFragment extends Fragment
if (isClearingInput) {
return;
}
- adapter.addLocalMessage(RttChatMessage.getChangedString(s, start, before, count));
+ String messageToAppend = RttChatMessage.getChangedString(s, start, before, count);
+ if (!TextUtils.isEmpty(messageToAppend)) {
+ adapter.addLocalMessage(messageToAppend);
+ rttCallScreenDelegate.onLocalMessage(messageToAppend);
+ }
+ }
+
+ @Override
+ public void onRemoteMessage(String message) {
+ adapter.addRemoteMessage(message);
+ }
+
+ @Override
+ public void onDestroyView() {
+ super.onDestroyView();
+ LogUtil.enterBlock("RttChatFragment.onDestroyView");
+ inCallButtonUiDelegate.onInCallButtonUiUnready();
+ inCallScreenDelegate.onInCallScreenUnready();
}
@Override