Merge remote-tracking branch 'refs/remotes/siacs/master'

5 files changed, 32 insertions, 5 deletions

diff --git a/src/main/res/layout/dialog_show_password.xml b/src/main/res/layout/dialog_show_password.xml
new file mode 100644
index 000000000..dba0690cb
--- /dev/null
+++ b/src/main/res/layout/dialog_show_password.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:padding="16dp" >
+
+    <TextView
+        android:id="@+id/password"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:typeface="monospace"
+        android:textSize="?attr/TextSizeHeadline"
+        android:fontFamily="monospace"
+        android:layout_gravity="center_horizontal"
+        android:textColor="@color/black87" >
+    </TextView>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/message_received.xml b/src/main/res/layout/message_received.xml
index 14aea096f..60a566187 100644
--- a/src/main/res/layout/message_received.xml
+++ b/src/main/res/layout/message_received.xml
@@ -59,6 +59,7 @@
                 android:autoLink="web"
                 android:textColorLink="@color/dark"
                 android:textColor="@color/dark"
+                android:maxLines="256"
                 android:textColorHighlight="@color/grey800"
                 android:textSize="?attr/TextSizeBody" />
 
diff --git a/src/main/res/layout/message_sent.xml b/src/main/res/layout/message_sent.xml
index 2617c1212..26c24509e 100644
--- a/src/main/res/layout/message_sent.xml
+++ b/src/main/res/layout/message_sent.xml
@@ -60,6 +60,7 @@
                 android:autoLink="web"
                 android:textColorLink="@color/black54"
                 android:textColor="@color/black54"
+                android:maxLines="256"
                 android:textColorHighlight="@color/grey500"
                 android:textSize="?attr/TextSizeBody" />
 
diff --git a/src/main/res/menu/editaccount.xml b/src/main/res/menu/editaccount.xml
index b28edf1ed..4ff3752f7 100644
--- a/src/main/res/menu/editaccount.xml
+++ b/src/main/res/menu/editaccount.xml
@@ -37,6 +37,11 @@
         android:title="@string/mam_prefs"/>
 
     <item
+        android:id="@+id/action_show_password"
+        android:showAsAction="never"
+        android:title="@string/show_password"/>
+
+    <item
         android:id="@+id/action_change_password_on_server"
         android:showAsAction="always"
         android:icon="@drawable/ic_vpn_key_white_24dp"
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index ce626b760..5185f37aa 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -419,7 +419,7 @@
 	<string name="password_should_not_be_empty">Password should not be empty</string>
 	<string name="perform_action_with">Perform action with</string>
 	<string name="no_affiliation">No affiliation</string>
-	<string name="no_role">No role</string>
+	<string name="no_role">Offline</string>
 	<string name="outcast">Outcast</string>
 	<string name="member">Member</string>
 	<string name="advanced_mode">Advanced mode</string>
@@ -520,7 +520,7 @@
 	<string name="download_started">Download started</string>
 	<string name="account_status_tor_unavailable">Tor network unavailable</string>
 	<string name="account_status_bind_failure">Bind failure</string>
-	<string name="account_status_host_unknown">Domain not recognized</string>
+	<string name="account_status_host_unknown">Host unknown</string>
 	<string name="server_info_broken">Broken</string>
 	<string name="pref_presence_settings">Presence</string>
 	<string name="pref_away_when_screen_off">Away when screen is off</string>
@@ -624,13 +624,14 @@
 	<string name="presence_dnd">Busy</string>
 	<string name="secure_password_generated">A secure password has been generated</string>
 	<string name="device_does_not_support_battery_op">Your device does not support opting out of battery optimization</string>
-    <string name="share">Share</string>
+  <string name="share">Share</string>
 	<string name="share_location">Share location</string>
-    <string name="location_sharing_disabled">Location sharing is disabled in settings</string>
-    <string name="locating">Locating…</string>
+  <string name="location_sharing_disabled">Location sharing is disabled in settings</string>
+  <string name="locating">Locating…</string>
 	<string name="uninstall_plugins">We have integrated the VoiceRecorder and ShareLocation plugin directly into the messenger. You should uninstall the plugins.</string>
 	<string name="uninstall">Uninstall</string>
 	<string name="action_end_conversation_muc">Leave conference</string>
 	<string name="leave_conference_warning">Do you really want to leave this conference? You will no longer be notified of new messages until joining the conference again.</string>
+	<string name="show_password">Show password</string>
 
 </resources>