From ccba6d4779911ede16eef6a17d6e98d5b89d0753 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Wed, 14 Nov 2018 17:53:14 +0100
Subject: [PATCH] Yet another improvements for zrtp dialog

---
 res/layout/dialog.xml                         | 20 +++++++++++--------
 .../linphone/fragments/StatusFragment.java    |  5 +++--
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/res/layout/dialog.xml b/res/layout/dialog.xml
index 14c4cf5d0..aaff27ea1 100644
--- a/res/layout/dialog.xml
+++ b/res/layout/dialog.xml
@@ -8,8 +8,9 @@
     <ImageView
         android:id="@+id/dialog_icon"
         android:visibility="gone"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="60dp"
+        android:layout_height="60dp"
+        android:adjustViewBounds="true"
         android:src="@drawable/security_alert_indicator"
         android:layout_margin="15dp"/>
 
@@ -140,8 +141,9 @@
             android:text="@string/cancel"
             android:background="@drawable/resizable_assistant_button"
             style="@style/font8"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:ellipsize="end"
+            android:layout_width="137dp"
+            android:layout_height="40dp"
             android:layout_margin="10dp"
             android:padding="10dp"/>
 
@@ -151,8 +153,9 @@
             android:background="@drawable/resizable_assistant_button"
             android:backgroundTint="@color/colorI"
             style="@style/font15"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:ellipsize="end"
+            android:layout_width="137dp"
+            android:layout_height="40dp"
             android:layout_margin="10dp"
             android:padding="10dp"/>
 
@@ -163,8 +166,9 @@
             android:background="@drawable/resizable_assistant_button"
             android:backgroundTint="@color/colorL"
             style="@style/font15"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:ellipsize="end"
+            android:layout_width="137dp"
+            android:layout_height="40dp"
             android:layout_margin="10dp"
             android:padding="10dp"/>
 
diff --git a/src/android/org/linphone/fragments/StatusFragment.java b/src/android/org/linphone/fragments/StatusFragment.java
index 7bb96239e..98ddc95db 100644
--- a/src/android/org/linphone/fragments/StatusFragment.java
+++ b/src/android/org/linphone/fragments/StatusFragment.java
@@ -436,15 +436,16 @@ public class StatusFragment extends Fragment {
             }
 
             TextView localSas = ZRTPdialog.findViewById(R.id.zrtp_sas_local);
-            localSas.setText(zrtpToRead);
+            localSas.setText(zrtpToRead.toUpperCase());
             TextView remoteSas = ZRTPdialog.findViewById(R.id.zrtp_sas_remote);
-            remoteSas.setText(zrtpToListen);
+            remoteSas.setText(zrtpToListen.toUpperCase());
             TextView message = ZRTPdialog.findViewById(R.id.dialog_message);
             message.setVisibility(View.GONE);
             ZRTPdialog.findViewById(R.id.dialog_zrtp_layout).setVisibility(View.VISIBLE);
 
             TextView title = ZRTPdialog.findViewById(R.id.dialog_title);
             title.setText(getString(R.string.zrtp_dialog_title));
+            title.setVisibility(View.VISIBLE);
 
             Button delete = ZRTPdialog.findViewById(R.id.dialog_delete_button);
             delete.setText(R.string.deny);