From 28b7a6c92a48ba80c3c0d8830b28da11c46b0e2c Mon Sep 17 00:00:00 2001
From: iNPUTmice <daniel@gultsch.de>
Date: Mon, 9 Jun 2014 21:25:01 +0200
Subject: don't display 'enter password' message if OpenKeychain is not
 installed. made status messages in chat not selectable

---
 res/layout/message_recieved.xml | 2 +-
 res/layout/message_sent.xml     | 1 +
 res/values/strings.xml          | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'res')

diff --git a/res/layout/message_recieved.xml b/res/layout/message_recieved.xml
index 9f0c41e5..6e4577fb 100644
--- a/res/layout/message_recieved.xml
+++ b/res/layout/message_recieved.xml
@@ -6,7 +6,7 @@
     android:padding="8dp" >
 
     <LinearLayout
-        android:id="@+id/linearLayout1"
+        android:id="@+id/message_box"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
diff --git a/res/layout/message_sent.xml b/res/layout/message_sent.xml
index 990df59b..ebba6ac5 100644
--- a/res/layout/message_sent.xml
+++ b/res/layout/message_sent.xml
@@ -6,6 +6,7 @@
     android:padding="8dp" >
 
     <LinearLayout
+        android:id="@+id/message_box"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index e960bee3..52e14199 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -241,4 +241,5 @@
     <string name="last_seen_hours">last seen %d hours ago</string>
     <string name="last_seen_days">last seen %d days ago</string>
     <string name="never_seen">never seen</string>
+    <string name="install_openkeychain">Encrypted message. Please install OpenKeychain to decrypt.</string>
 </resources>
\ No newline at end of file
-- 
cgit v1.2.3