From 693955b51f5cdaae65c6510ce57c5ec9d559f0e1 Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian.schneppe@pix-art.de>
Date: Thu, 7 May 2020 21:42:03 +0200
Subject: [PATCH] fix conflicts and missing things after rebase

---
 .../eu/siacs/conversations/ui/adapter/MessageAdapter.java     | 4 +---
 src/main/res/layout/activity_rtp_session.xml                  | 2 +-
 src/main/res/values/strings.xml                               | 1 +
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
index 0cf08b938..3accbda53 100644
--- a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
+++ b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
@@ -1148,10 +1148,8 @@ public class MessageAdapter extends ArrayAdapter<Message> implements CopyTextVie
             if (received) {
                 if (duration > 0) {
                     viewHolder.status_message.setText(activity.getString(R.string.incoming_call_duration, formattedTime, TimeframeUtils.resolve(activity, duration)));
-                } else if (rtpSessionStatus.successful) {
-                    viewHolder.status_message.setText(R.string.incoming_call);
                 } else {
-                    viewHolder.status_message.setText(activity.getString(R.string.incoming_call_duration, formattedTime));
+                    viewHolder.status_message.setText(activity.getString(R.string.incoming_call_time, formattedTime));
                 }
             } else {
                 if (duration > 0) {
diff --git a/src/main/res/layout/activity_rtp_session.xml b/src/main/res/layout/activity_rtp_session.xml
index f42c7cc74..091c9769c 100644
--- a/src/main/res/layout/activity_rtp_session.xml
+++ b/src/main/res/layout/activity_rtp_session.xml
@@ -161,7 +161,7 @@
 
             </RelativeLayout>
 
-            <android.support.design.widget.FloatingActionButton
+            <com.google.android.material.floatingactionbutton.FloatingActionButton
                 android:id="@+id/in_call_action_left"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 99e432745..7da207556 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -1047,4 +1047,5 @@
     <string name="disable_tor_to_make_call">Disable Tor to make calls</string>
     <string name="only_one_call_at_a_time">You can only have one call at a time.</string>
     <string name="missed_call">Missed call</string>
+    <string name="could_not_switch_camera">Could not switch camera</string>
 </resources>