mirror/monocles_chat_clean
1
0
Fork 1
Code Activity

fix conflicts and missing things after rebase

Browse source
This commit is contained in:
Christian Schneppe 2020-05-07 21:42:03 +02:00
parent e6b91d4fc1
commit 693955b51f
3 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
View file

@ -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) {

2
src/main/res/layout/activity_rtp_session.xml
View file

@ -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"

1
src/main/res/values/strings.xml
View file

@ -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>