Merge branch 'master' of ssh://git.fucktheforce.de/conversations

Conflicts:
	src/main/java/eu/siacs/conversations/Config.java
	src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java
	src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
	src/main/java/eu/siacs/conversations/utils/UIHelper.java

1 files changed, 146 insertions, 188 deletions

diff --git a/src/main/res/layout/activity_verify_otr.xml b/src/main/res/layout/activity_verify_otr.xml
index 73539e0e..1a4221bc 100644
--- a/src/main/res/layout/activity_verify_otr.xml
+++ b/src/main/res/layout/activity_verify_otr.xml
@@ -1,189 +1,147 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-            android:layout_width="fill_parent"
-            android:layout_height="fill_parent"
-            android:background="@color/secondarybackground">
-
-    <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical">
-        <TextView
-            android:id="@+id/error_no_session"
-            android:layout_margin="16dp"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/no_otr_session_found"
-            android:layout_gravity="center_horizontal"
-            android:textColor="@color/primarytext"
-            android:textSize="?attr/TextSizeBody"
-            />
-        <RelativeLayout
-            android:id="@+id/verification_area_one"
-            android:layout_width="fill_parent"
-            android:layout_height="fill_parent"
-            android:background="@drawable/infocard_border"
-            android:layout_margin="8dp">
-        <LinearLayout
-            android:id="@+id/fingerprint_area"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:padding="16dp"
-            android:orientation="vertical">
-            <TextView
-                android:id="@+id/remote_jid"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:textColor="@color/primarytext"
-                android:textSize="?attr/TextSizeHeadline"/>
-            <TextView
-                android:layout_marginTop="16dp"
-                android:id="@+id/your_fingerprint"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:textColor="@color/primarytext"
-                android:textSize="?attr/TextSizeBody"
-                android:typeface="monospace" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:textColor="@color/secondarytext"
-                android:textSize="?attr/TextSizeInfo"
-                android:text="@string/your_fingerprint"/>
-            <TextView
-                android:layout_marginTop="16dp"
-                android:id="@+id/remote_fingerprint"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:textColor="@color/primarytext"
-                android:textSize="?attr/TextSizeBody"
-                android:typeface="monospace" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:textColor="@color/secondarytext"
-                android:textSize="?attr/TextSizeInfo"
-                android:text="@string/remote_fingerprint"/>
-        </LinearLayout>
-            <LinearLayout
-                android:layout_below="@+id/fingerprint_area"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentBottom="true"
-                android:layout_alignParentLeft="true"
-                android:layout_alignParentRight="true" >
-
-                <Button
-                    android:id="@+id/button_show_qr_code"
-                    style="?android:attr/borderlessButtonStyle"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:text="@string/show_qr_code"/>
-
-                <View
-                    android:layout_width="1dp"
-                    android:layout_height="fill_parent"
-                    android:layout_marginBottom="7dp"
-                    android:layout_marginTop="7dp"
-                    android:background="@color/divider" />
-
-                <Button
-                    android:id="@+id/button_scan_qr_code"
-                    style="?android:attr/borderlessButtonStyle"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:text="@string/scan_qr_code"
-                    android:textColor="@color/primarytext" />
-            </LinearLayout>
-        </RelativeLayout>
-        <RelativeLayout
-            android:id="@+id/verification_area_two"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:layout_margin="8dp"
-            android:background="@drawable/infocard_border">
-            <LinearLayout
-                android:layout_width="fill_parent"
-                android:layout_height="fill_parent"
-                android:orientation="vertical"
-                android:id="@+id/shared_secret_box"
-                android:padding="16dp">
-                <TextView
-                    android:text="@string/smp"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:textColor="@color/primarytext"
-                    android:textSize="?attr/TextSizeHeadline"
-                    android:layout_marginBottom="16dp"
-                    />
-                <TextView
-                    android:id="@+id/status_message"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/verified"
-                    android:layout_gravity="center_horizontal"
-                    android:textSize="?attr/TextSizeHeadline"
-                    android:textStyle="bold"
-                    android:visibility="gone"/>
-                <EditText
-                    android:id="@+id/shared_secret_hint"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:inputType="textAutoComplete"
-                    android:hint="@string/shared_secret_hint"
-                    android:textColor="@color/primarytext"
-                    android:textColorHint="@color/secondarytext"
-                    android:textSize="?attr/TextSizeBody"
-                    android:layout_marginBottom="8dp"/>
-                <EditText
-                    android:id="@+id/shared_secret_secret"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:hint="@string/shared_secret_secret"
-                    android:inputType="textPassword"
-                    android:textColor="@color/primarytext"
-                    android:textColorHint="@color/secondarytext"
-                    android:textSize="?attr/TextSizeBody" />
-            </LinearLayout>
-            <LinearLayout
-                android:layout_below="@+id/shared_secret_box"
-                android:id="@+id/button_bar"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentBottom="true"
-                android:layout_alignParentLeft="true"
-                android:layout_alignParentRight="true" >
-
-                <Button
-                    android:id="@+id/button_shared_secret_negative"
-                    style="?android:attr/borderlessButtonStyle"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:enabled="false"
-                    android:text="@string/cancel"
-                    android:textColor="@color/secondarytext"/>
-
-                <View
-                    android:layout_width="1dp"
-                    android:layout_height="fill_parent"
-                    android:layout_marginBottom="7dp"
-                    android:layout_marginTop="7dp"
-                    android:background="@color/divider" />
-
-                <Button
-                    android:id="@+id/button_shared_secret_positive"
-                    style="?android:attr/borderlessButtonStyle"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:text="@string/create"
-                    android:textColor="@color/primarytext" />
-            </LinearLayout>
-        </RelativeLayout>
-    </LinearLayout>
-</ScrollView>
\ No newline at end of file
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:background="@color/primarybackground">
+
+	<ScrollView
+		android:layout_width="fill_parent"
+		android:layout_height="fill_parent"
+		android:layout_above="@+id/button_bar">
+
+		<LinearLayout
+			android:layout_width="match_parent"
+			android:layout_height="match_parent"
+			android:orientation="vertical"
+			android:padding="16dp">
+
+			<TextView
+				android:id="@+id/verification_explanation"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"/>
+
+			<LinearLayout
+				android:id="@+id/manual_verification_area"
+				android:layout_width="fill_parent"
+				android:layout_height="wrap_content"
+				android:layout_marginTop="16dp"
+				android:orientation="vertical">
+
+				<TextView
+					android:id="@+id/your_fingerprint"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:textColor="@color/primarytext"
+					android:textSize="?attr/TextSizeBody"
+					android:typeface="monospace"/>
+
+				<TextView
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:text="@string/your_fingerprint"
+					android:textColor="@color/secondarytext"
+					android:textSize="?attr/TextSizeInfo"/>
+
+				<TextView
+					android:id="@+id/remote_fingerprint"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:layout_marginTop="20dp"
+					android:textColor="@color/primarytext"
+					android:textSize="?attr/TextSizeBody"
+					android:typeface="monospace"/>
+
+				<TextView
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:layout_marginBottom="20dp"
+					android:text="@string/remote_fingerprint"
+					android:textColor="@color/secondarytext"
+					android:textSize="?attr/TextSizeInfo"/>
+
+			</LinearLayout>
+
+			<LinearLayout
+				android:id="@+id/smp_verification_area"
+				android:layout_width="fill_parent"
+				android:layout_height="fill_parent"
+				android:layout_marginTop="16dp"
+				android:orientation="vertical">
+
+				<TextView
+					android:id="@+id/status_message"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:layout_gravity="center_horizontal"
+					android:text="@string/verified"
+					android:textColor="@color/primarytext"
+					android:textSize="?attr/TextSizeHeadline"
+					android:textStyle="bold"
+					android:visibility="gone"/>
+
+				<TextView
+					android:id="@+id/shared_secret_hint"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:layout_marginBottom="8dp"
+					android:textColor="@color/primarytext"
+					android:textSize="?attr/TextSizeBody"
+					android:textStyle="bold"
+					android:visibility="gone"/>
+
+				<EditText
+					android:id="@+id/shared_secret_hint_editable"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:layout_marginBottom="8dp"
+					android:hint="@string/shared_secret_hint"
+					android:inputType="textAutoComplete"
+					android:textColor="@color/primarytext"
+					android:textColorHint="@color/secondarytext"
+					android:textSize="?attr/TextSizeBody"/>
+
+				<EditText
+					android:id="@+id/shared_secret_secret"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:layout_marginTop="8dp"
+					android:hint="@string/shared_secret_secret"
+					android:inputType="textPassword"
+					android:textColor="@color/primarytext"
+					android:textColorHint="@color/secondarytext"
+					android:textSize="?attr/TextSizeBody"/>
+			</LinearLayout>
+		</LinearLayout>
+	</ScrollView>
+
+	<LinearLayout
+		android:id="@+id/button_bar"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_alignParentBottom="true"
+		android:layout_alignParentLeft="true"
+		android:layout_alignParentRight="true">
+
+		<Button
+			android:id="@+id/left_button"
+			style="?android:attr/borderlessButtonStyle"
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+			android:layout_weight="1"/>
+
+		<View
+			android:layout_width="1dp"
+			android:layout_height="fill_parent"
+			android:layout_marginBottom="7dp"
+			android:layout_marginTop="7dp"
+			android:background="@color/divider"/>
+
+		<Button
+			android:id="@+id/right_button"
+			style="?android:attr/borderlessButtonStyle"
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+			android:layout_weight="1"/>
+	</LinearLayout>
+
+</RelativeLayout>
\ No newline at end of file