aboutsummaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel.gultsch@rwth-aachen.de>2014-02-28 00:22:56 +0100
committerDaniel Gultsch <daniel.gultsch@rwth-aachen.de>2014-02-28 00:22:56 +0100
commit37d1a5380634471b11c828cf265d4a39e818a1c1 (patch)
treebbd6d58171beb79369c9c452098286591e6a6eae /res
parentbfee69b00b2762a910f7f3f1714d18fddc99a9ad (diff)
basic pgp support.
Diffstat (limited to '')
-rw-r--r--res/layout/fragment_conversation.xml1
-rw-r--r--res/layout/message_recieved.xml1
-rw-r--r--res/layout/message_sent.xml1
-rw-r--r--res/menu/manageaccounts_context.xml6
-rw-r--r--res/values/strings.xml2
5 files changed, 10 insertions, 1 deletions
diff --git a/res/layout/fragment_conversation.xml b/res/layout/fragment_conversation.xml
index ad5f34b8..50b9ba3b 100644
--- a/res/layout/fragment_conversation.xml
+++ b/res/layout/fragment_conversation.xml
@@ -84,5 +84,4 @@
android:typeface="monospace"/>
</LinearLayout>
-
</RelativeLayout> \ No newline at end of file
diff --git a/res/layout/message_recieved.xml b/res/layout/message_recieved.xml
index bde702ae..2ae83034 100644
--- a/res/layout/message_recieved.xml
+++ b/res/layout/message_recieved.xml
@@ -24,6 +24,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Hi, how are you?"
+ android:autoLink="all"
android:textSize="16sp"
android:id="@+id/message_body"
android:textColor="#333333"/>
diff --git a/res/layout/message_sent.xml b/res/layout/message_sent.xml
index c3136a55..b553ff62 100644
--- a/res/layout/message_sent.xml
+++ b/res/layout/message_sent.xml
@@ -26,6 +26,7 @@
android:text="Hi, how are you?"
android:textSize="16sp"
android:id="@+id/message_body"
+ android:autoLink="all"
android:textColor="#333333"/>
<TextView
android:layout_width="wrap_content"
diff --git a/res/menu/manageaccounts_context.xml b/res/menu/manageaccounts_context.xml
index 2adc45df..a51a8e52 100644
--- a/res/menu/manageaccounts_context.xml
+++ b/res/menu/manageaccounts_context.xml
@@ -15,5 +15,11 @@
android:title="Enable"
android:showAsAction="always"
android:visible="false"/>
+
+ <item
+ android:id="@+id/announce_pgp"
+ android:orderInCategory="75"
+ android:showAsAction="never"
+ android:title="@string/announce_pgp" />
</menu>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index a084e890..a545676e 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -12,4 +12,6 @@
<string name="title_activity_new_conversation">New Conversation</string>
<string name="just_now">just now</string>
<string name="sending">sending&#8230;</string>
+ <string name="announce_pgp">Renew PGP announcement</string>
+ <string name="encrypted_message">This message is encrypted. Click to decrypt.</string>
</resources>