mirror of
https://code.briarproject.org/briar/briar.git
synced 2026-02-12 18:59:06 +01:00
90d984ee52
When devices' clocks are out of sync, it is possible that a response is shown before the request. This commit makes sure that the timestamp of responses is always later than the last message in the conversation. Some wording could be misunderstood to thing introductions were successful even though they were not. That has been clarified. A new database transaction was created when getting contacts and local transport properties. This has been changed to re-use the existing transaction. Also addresses minor issues found in review.
56 lines
1.9 KiB
XML
56 lines
1.9 KiB
XML
<?xml version="1.0" encoding="utf-8"?>
|
|
<LinearLayout
|
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
|
xmlns:tools="http://schemas.android.com/tools"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:orientation="vertical">
|
|
|
|
<include
|
|
android:id="@+id/messageLayout"
|
|
layout="@layout/list_item_msg_out"/>
|
|
|
|
<RelativeLayout
|
|
android:id="@+id/introductionLayout"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:layout_gravity="right|end"
|
|
android:background="@drawable/notice_out"
|
|
android:layout_marginLeft="@dimen/message_bubble_margin_non_tail"
|
|
android:layout_marginRight="@dimen/message_bubble_margin_tail">
|
|
|
|
<TextView
|
|
android:id="@+id/introductionText"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:textIsSelectable="true"
|
|
android:textSize="@dimen/text_size_medium"
|
|
android:textStyle="italic"
|
|
tools:text="@string/introduction_request_received"/>
|
|
|
|
<TextView
|
|
android:id="@+id/introductionTime"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:layout_marginTop="@dimen/message_bubble_timestamp_margin"
|
|
android:layout_alignParentLeft="true"
|
|
android:layout_alignParentStart="true"
|
|
android:layout_below="@+id/introductionText"
|
|
android:textColor="@color/private_message_date"
|
|
android:textSize="@dimen/text_size_tiny"
|
|
tools:text="Dec 24, 13:37"/>
|
|
|
|
<ImageView
|
|
android:id="@+id/introductionStatus"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:layout_toEndOf="@+id/introductionTime"
|
|
android:layout_toRightOf="@+id/introductionTime"
|
|
android:layout_alignBottom="@+id/introductionTime"
|
|
android:layout_marginLeft="@dimen/margin_medium"
|
|
tools:ignore="ContentDescription"
|
|
tools:src="@drawable/message_delivered"/>
|
|
|
|
</RelativeLayout>
|
|
|
|
</LinearLayout> |