From 077932eb558853e4c3c3046c54db18c530495d8c Mon Sep 17 00:00:00 2001
From: Andreas Straub <andy@strb.org>
Date: Fri, 29 May 2015 11:18:25 +0200
Subject: CryptoNext Menu entries added

---
 src/main/res/menu/encryption_choices.xml | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src/main/res/menu/encryption_choices.xml')

diff --git a/src/main/res/menu/encryption_choices.xml b/src/main/res/menu/encryption_choices.xml
index adf0ad8d..1b3fe76e 100644
--- a/src/main/res/menu/encryption_choices.xml
+++ b/src/main/res/menu/encryption_choices.xml
@@ -11,6 +11,9 @@
         <item
             android:id="@+id/encryption_choice_pgp"
             android:title="@string/encryption_choice_pgp"/>
+        <item
+            android:id="@+id/encryption_choice_axolotl"
+            android:title="@string/encryption_choice_axolotl"/>
     </group>
 
 </menu>
\ No newline at end of file
-- 
cgit v1.2.3


From 8b9b74ff7ee863160e0cf2827e2a5a431d4fb90f Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Sat, 8 Aug 2015 13:29:21 +0200
Subject: renamed multi-end / axolotl to OMEMO

---
 src/main/res/menu/encryption_choices.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/main/res/menu/encryption_choices.xml')

diff --git a/src/main/res/menu/encryption_choices.xml b/src/main/res/menu/encryption_choices.xml
index 1b3fe76e..9af2cd34 100644
--- a/src/main/res/menu/encryption_choices.xml
+++ b/src/main/res/menu/encryption_choices.xml
@@ -5,15 +5,15 @@
         <item
             android:id="@+id/encryption_choice_none"
             android:title="@string/encryption_choice_none"/>
+        <item
+            android:id="@+id/encryption_choice_axolotl"
+            android:title="@string/encryption_choice_omemo"/>
         <item
             android:id="@+id/encryption_choice_otr"
             android:title="@string/encryption_choice_otr"/>
         <item
             android:id="@+id/encryption_choice_pgp"
             android:title="@string/encryption_choice_pgp"/>
-        <item
-            android:id="@+id/encryption_choice_axolotl"
-            android:title="@string/encryption_choice_axolotl"/>
     </group>
 
 </menu>
\ No newline at end of file
-- 
cgit v1.2.3


From 730a5c644bbacea3189479ef067b3ebbd7dcffd6 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Mon, 24 Aug 2015 21:15:47 +0200
Subject: renamed plain text to unencrypted. fixes #1331

---
 src/main/res/menu/encryption_choices.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/main/res/menu/encryption_choices.xml')

diff --git a/src/main/res/menu/encryption_choices.xml b/src/main/res/menu/encryption_choices.xml
index 9af2cd34..ab42a206 100644
--- a/src/main/res/menu/encryption_choices.xml
+++ b/src/main/res/menu/encryption_choices.xml
@@ -4,7 +4,7 @@
     <group android:checkableBehavior="single" >
         <item
             android:id="@+id/encryption_choice_none"
-            android:title="@string/encryption_choice_none"/>
+            android:title="@string/encryption_choice_unencrypted"/>
         <item
             android:id="@+id/encryption_choice_axolotl"
             android:title="@string/encryption_choice_omemo"/>
-- 
cgit v1.2.3


From 5d21abac1dd2fed7a5e87f8fb23bc15ee0912322 Mon Sep 17 00:00:00 2001
From: steckbrief <steckbrief@chefmail.de>
Date: Wed, 2 Mar 2016 16:54:18 +0100
Subject: Fixes FS#147: Disable OMEMO

---
 src/main/res/menu/encryption_choices.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/main/res/menu/encryption_choices.xml')

diff --git a/src/main/res/menu/encryption_choices.xml b/src/main/res/menu/encryption_choices.xml
index ab42a206..445c4114 100644
--- a/src/main/res/menu/encryption_choices.xml
+++ b/src/main/res/menu/encryption_choices.xml
@@ -7,7 +7,8 @@
             android:title="@string/encryption_choice_unencrypted"/>
         <item
             android:id="@+id/encryption_choice_axolotl"
-            android:title="@string/encryption_choice_omemo"/>
+            android:title="@string/encryption_choice_omemo"
+            android:visible="@bool/omemo_enabled"/>
         <item
             android:id="@+id/encryption_choice_otr"
             android:title="@string/encryption_choice_otr"/>
-- 
cgit v1.2.3