1 files changed, 47 insertions, 37 deletions
diff --git a/gen/de/gultsch/chat/R.java b/gen/de/gultsch/chat/R.java
index 6f1b50de..85731117 100644
--- a/gen/de/gultsch/chat/R.java
+++ b/gen/de/gultsch/chat/R.java
@@ -42,24 +42,24 @@ public final class R {
         public static final int section_header=0x7f02000d;
     }
     public static final class id {
-        public static final int account_confirm_password_desc=0x7f0a0019;
-        public static final int account_delete=0x7f0a002d;
-        public static final int account_disable=0x7f0a002e;
-        public static final int account_enable=0x7f0a002f;
+        public static final int account_confirm_password_desc=0x7f0a001c;
+        public static final int account_delete=0x7f0a0035;
+        public static final int account_disable=0x7f0a0036;
+        public static final int account_enable=0x7f0a0037;
         public static final int account_jid=0x7f0a0000;
-        public static final int account_list=0x7f0a0022;
-        public static final int account_password=0x7f0a0016;
-        public static final int account_password_confirm2=0x7f0a001a;
+        public static final int account_list=0x7f0a0027;
+        public static final int account_password=0x7f0a0019;
+        public static final int account_password_confirm2=0x7f0a001d;
         public static final int account_status=0x7f0a0002;
-        public static final int account_usetls=0x7f0a0017;
-        public static final int action_accounts=0x7f0a002a;
-        public static final int action_add=0x7f0a0026;
-        public static final int action_add_account=0x7f0a002c;
-        public static final int action_archive=0x7f0a0029;
-        public static final int action_details=0x7f0a0028;
-        public static final int action_refresh_contacts=0x7f0a0030;
-        public static final int action_security=0x7f0a0027;
-        public static final int action_settings=0x7f0a002b;
+        public static final int account_usetls=0x7f0a001a;
+        public static final int action_accounts=0x7f0a002f;
+        public static final int action_add=0x7f0a002b;
+        public static final int action_add_account=0x7f0a0034;
+        public static final int action_archive=0x7f0a002e;
+        public static final int action_details=0x7f0a002d;
+        public static final int action_refresh_contacts=0x7f0a0038;
+        public static final int action_security=0x7f0a002c;
+        public static final int action_settings=0x7f0a0030;
         public static final int contactList=0x7f0a0006;
         public static final int contact_display_name=0x7f0a0008;
         public static final int contact_jid=0x7f0a0009;
@@ -76,21 +76,29 @@ public final class R {
         public static final int details_jidbox=0x7f0a000f;
         public static final int details_receive_presence=0x7f0a0014;
         public static final int details_send_presence=0x7f0a0013;
-        public static final int edit_account_register_new=0x7f0a0018;
-        public static final int list=0x7f0a0020;
-        public static final int message_body=0x7f0a0024;
-        public static final int message_photo=0x7f0a0023;
-        public static final int message_time=0x7f0a0025;
-        public static final int messages_view=0x7f0a001e;
+        public static final int edit_account_register_new=0x7f0a001b;
+        public static final int encryption_choice_none=0x7f0a0031;
+        public static final int encryption_choice_otr=0x7f0a0032;
+        public static final int encryption_choice_pgp=0x7f0a0033;
+        public static final int list=0x7f0a0025;
+        public static final int message_body=0x7f0a0029;
+        public static final int message_photo=0x7f0a0028;
+        public static final int message_time=0x7f0a002a;
+        public static final int messages_view=0x7f0a0021;
         public static final int new_conversation_search=0x7f0a0004;
+        public static final int new_fingerprint=0x7f0a0022;
+        public static final int otr_fingerprint=0x7f0a0023;
         public static final int progressBar1=0x7f0a0003;
-        public static final int selected_conversation=0x7f0a0021;
-        public static final int slidingpanelayout=0x7f0a001f;
-        public static final int textSendButton=0x7f0a001d;
-        public static final int textView1=0x7f0a0015;
+        public static final int selected_conversation=0x7f0a0026;
+        public static final int slidingpanelayout=0x7f0a0024;
+        public static final int textSendButton=0x7f0a0020;
+        public static final int textView1=0x7f0a0018;
         public static final int textView2=0x7f0a0001;
-        public static final int textinput=0x7f0a001c;
-        public static final int textsend=0x7f0a001b;
+        public static final int textinput=0x7f0a001f;
+        public static final int textsend=0x7f0a001e;
+        public static final int verify_otr_fingerprint=0x7f0a0016;
+        public static final int verify_otr_jid=0x7f0a0015;
+        public static final int verify_otr_yourprint=0x7f0a0017;
     }
     public static final class layout {
         public static final int account_row=0x7f030000;
@@ -98,18 +106,20 @@ public final class R {
         public static final int contact=0x7f030002;
         public static final int conversation_list_row=0x7f030003;
         public static final int dialog_contact_details=0x7f030004;
-        public static final int edit_account_dialog=0x7f030005;
-        public static final int fragment_conversation=0x7f030006;
-        public static final int fragment_conversations_overview=0x7f030007;
-        public static final int manage_accounts=0x7f030008;
-        public static final int message_recieved=0x7f030009;
-        public static final int message_sent=0x7f03000a;
+        public static final int dialog_verify_otr=0x7f030005;
+        public static final int edit_account_dialog=0x7f030006;
+        public static final int fragment_conversation=0x7f030007;
+        public static final int fragment_conversations_overview=0x7f030008;
+        public static final int manage_accounts=0x7f030009;
+        public static final int message_recieved=0x7f03000a;
+        public static final int message_sent=0x7f03000b;
     }
     public static final class menu {
         public static final int conversations=0x7f090000;
-        public static final int manageaccounts=0x7f090001;
-        public static final int manageaccounts_context=0x7f090002;
-        public static final int newconversation=0x7f090003;
+        public static final int encryption_choices=0x7f090001;
+        public static final int manageaccounts=0x7f090002;
+        public static final int manageaccounts_context=0x7f090003;
+        public static final int newconversation=0x7f090004;
     }
     public static final class string {
         public static final int action_accounts=0x7f070003;