another screenshots

This reverts commit 635e5675d1.

README.md

@@ -1,6 +1,6 @@
-<h1 align="center">Conversations Classic</h1>
+<h1 align="center">another.im</h1>
 
-<p align="center">Conversations Classic: the very last word in instant messaging</p>
+<p align="center">another.im: the very last word in instant messaging</p>
 
 ## Design principles
 
@@ -28,11 +28,11 @@
 
 ### XMPP Features
 
-Conversations Classic works with every XMPP server out there. However XMPP is an
+another.im works with every XMPP server out there. However XMPP is an
 extensible protocol. These extensions are standardized as well in so called
-XEP's. Conversations Classic supports a couple of these to make the overall user
+XEP's. another.im supports a couple of these to make the overall user
 experience better. There is a chance that your current XMPP server does not
-support these extensions; therefore to get the most out of Conversations Classic you
+support these extensions; therefore to get the most out of another.im you
 should consider either switching to an XMPP server that does or — even better —
 run your own XMPP server for you and your friends. These XEP's are:
 
@@ -51,7 +51,7 @@ run your own XMPP server for you and your friends. These XEP's are:
   client to your desktop client and back within one conversation.
 * [XEP-0308: Last Message Correction](https://xmpp.org/extensions/xep-0308.html) allows you to edit last message as well as retract it
 * [XEP-0313: Message Archive Management](http://xmpp.org/extensions/xep-0313.html) synchronize message history with the
-  server. Catch up with messages that were sent while Conversations Classic was
+  server. Catch up with messages that were sent while another.im was
   offline.
 * [XEP-0352: Client State Indication](http://xmpp.org/extensions/xep-0352.html) lets the server know whether or not
   Conversations is in the background. Allows the server to save bandwidth by
@@ -67,7 +67,7 @@ run your own XMPP server for you and your friends. These XEP's are:
 
 #### How do I install Conversations?
 
-Conversations Classic is entirely open source and licensed under GPLv3. So if you are a
+another.im is entirely open source and licensed under GPLv3. So if you are a
 software developer you can check out the sources from GitHub and use Gradle to
 build your apk file.
 
@@ -85,12 +85,12 @@ As of 2023 XMPP has reached a level of maturity where all major XMPP servers ([e
 Interoperability with Prosody and ejabberd is tested fairly regularly just because of their market share but we occasionally test with other servers too and fix issues as soon as we are being made aware of them.
 
 #### Where can I set up a custom hostname / port
-Conversations Classic will automatically look up the SRV records for your domain name
+another.im will automatically look up the SRV records for your domain name
 which can point to any hostname port combination. If your server doesn’t provide
 those please contact your admin and have them read
 [this](http://prosody.im/doc/dns#srv_records). If your server operator is unwilling
 to fix this you can enable advanced server settings in the expert settings of
-Conversations Classic.
+another.im.
 
 #### I get 'Incompatible Server'
 
@@ -101,15 +101,15 @@ If you are a server administrator you should make sure that your server provides
 either STARTTLS or [XEP-0368: SRV records for XMPP over TLS](https://xmpp.org/extensions/xep-0368.html).
 
 On rare occasions this error message might also be caused by a server not providing
-a login (SASL) mechanism that Conversations Classic is able to handle. Conversations Classic supports
+a login (SASL) mechanism that another.im is able to handle. another.im supports
 SCRAM-SHA1, PLAIN, EXTERNAL (client certs) and DIGEST-MD5.
 
 #### I get 'Bind failure'. What does that mean?
 
 Some Bind failures are transient and resolve themselves after a reconnect.
 
-When trying to connect to OpenFire the bind failure can be a permanent problem when the domain part of the Jabber ID entered in Conversations Classic doesn’t match the domain the OpenFire server feels responsible for. For example OpenFire is configured to use the domain `a.tld` but the Jabber ID entered is `user@b.tld` where `b.tld` also points to the same host. During bind OpenFire tries to reassign the Jabber to `user@a.tld`. Conversations Classic doesn’t like that.
-This can be fixed by creating a new account in Conversations Classic that uses the Jabber ID `user@a.tld`. 
+When trying to connect to OpenFire the bind failure can be a permanent problem when the domain part of the Jabber ID entered in another.im doesn’t match the domain the OpenFire server feels responsible for. For example OpenFire is configured to use the domain `a.tld` but the Jabber ID entered is `user@b.tld` where `b.tld` also points to the same host. During bind OpenFire tries to reassign the Jabber to `user@a.tld`. another.im doesn’t like that.
+This can be fixed by creating a new account in another.im that uses the Jabber ID `user@a.tld`. 
 
 Note: This is kind of a weird quirk in OpenFire. Most other servers would just throw a 'Server not responsible for domain' error instead of attempting to reassign the Jabber ID.
 
@@ -119,10 +119,10 @@ Maybe you attempted to use the Jabber ID `test@b.tld` because `a.tld` doesn’t
 
 In most cases this error is caused by ejabberd advertising support for TLSv1.3 but not properly supporting it. This can happen if the OpenSSL version on the server already supports TLSv1.3 but the fast\_tls wrapper library used by ejabberd not (properly) support it. Upgrading fast\_tls and ejabberd or - theoretically - downgrading OpenSSL should fix the issue. A work around is to explicitly disable TLSv1.3 support in the ejabberd configuration. More information can be found on [this issue on the ejabberd issue tracker](https://github.com/processone/ejabberd/issues/2614).
 
-**The battery consumption and the entire behavior of Conversations Classic will remain the same (as good or as bad as it was before). Why is Google doing this to you? We have no idea.**
+**The battery consumption and the entire behavior of another.im will remain the same (as good or as bad as it was before). Why is Google doing this to you? We have no idea.**
 
-##### Android &lt;= 7.1 or Conversations Classic from F-Droid (all Android versions)
-The foreground notification is still controlled over the expert settings within Conversations Classic as it always has been. Whether or not you need to enable it depends on how aggressive the non-standard 'power saving' features are that your phone vendor has built into the operating system.
+##### Android &lt;= 7.1 or another.im from F-Droid (all Android versions)
+The foreground notification is still controlled over the expert settings within another.im as it always has been. Whether or not you need to enable it depends on how aggressive the non-standard 'power saving' features are that your phone vendor has built into the operating system.
 
 ##### Android 8.x
 Long press the permanent notification and disable that particular type of notification by moving the slider to the left. This will make the notification disappear but create another notification (this time created by the operating system itself.) that will complain about Conversations (and other apps) using battery. Starting with Android 8.1 you can disable that notification again with the same method described above.
@@ -134,20 +134,20 @@ Long press the permanent notification and press the info `(i)` button to get int
 
 You can join our conference room on [`xmppclient-dev@conference.narayana.im`](xmpp:xmppclient-dev@conference.narayana.im).
 A lot of people in there are able to answer basic questions about the usage of
-Conversations Classic or can provide you with tips on running your own XMPP server. If
+another.im or can provide you with tips on running your own XMPP server. If
 you found a bug or your app crashes please read the Developer / Report Bugs
 section of this document.
 
 #### How does the address book integration work?
 
-The address book integration was designed to protect your privacy. Conversations Classic
+The address book integration was designed to protect your privacy. another.im
 neither uploads contacts from your address book to your server nor fills your
 address book with unnecessary contacts from your online roster. If you manually
-add a Jabber ID to your phones address book Conversations Classic will use the name and
+add a Jabber ID to your phones address book another.im will use the name and
 the profile picture of this contact. To make the process of adding Jabber IDs to
 your address book easier you can click on the profile picture in the contact
-details within Conversations Classic. This will start an "add to address book" intent
-with the JID as the payload. This doesn't require Conversations Classic to have write
+details within another.im. This will start an "add to address book" intent
+with the JID as the payload. This doesn't require another.im to have write
 permissions on your address book but also doesn't require you to copy/paste a
 JID from one app to another.
 
@@ -203,21 +203,21 @@ changeable on the fly. Metrics like last active client (the client which sent
 the last message) are much better.
 
 Unfortunately these modern replacements for legacy XMPP features are not widely
-adopted. However Conversations Classic should be an instant messenger for the future and
-instead of making Conversations Classic compatible with the past we should work on
+adopted. However another.im should be an instant messenger for the future and
+instead of making another.im compatible with the past we should work on
 implementing new, improved technologies and getting them into other XMPP clients
 as well.
 
 Making these status and priority optional isn't a solution either because
-Conversations Classic is trying to get rid of old behaviours and set an example for
+another.im is trying to get rid of old behaviours and set an example for
 other clients.
 
 
-#### How do I backup / move Conversations Classic to a new device?
+#### How do I backup / move another.im to a new device?
 
 Use the Backup button in the Settings.
 
-#### Conversations Classic is missing a certain feature
+#### another.im is missing a certain feature
 
 Please report it to our XMPP conference [`xmppclient-dev@conference.narayana.im`](xmpp:xmppclient-dev@conference.narayana.im)
 
@@ -231,7 +231,7 @@ Please report it to our XMPP conference [`xmppclient-dev@conference.narayana.im`
 #### How do I use OpenPGP
 
 Before you continue reading you should note that the OpenPGP support in
-Conversations Classic is experimental. This is not because it will make the app unstable
+another.im is experimental. This is not because it will make the app unstable
 but because the fundamental concepts of PGP aren't ready for widespread use.
 The way PGP works is that you trust Key IDs instead of JID's or email addresses.
 So in theory your contact list should consist of Public-Key-IDs instead of
@@ -269,12 +269,12 @@ details and hit the settings button (the one with the gears) and select both *pr
 Every participant has to announce their OpenPGP key (see answer above).
 If you would like to send encrypted messages to a conference you have to make
 sure that you have every participant's public key in your OpenKeychain.
-Right now there is no check in Conversations Classic to ensure that.
+Right now there is no check in another.im to ensure that.
 You have to take care of that yourself. Go to the conference details and
 touch every key id (The hexadecimal number below a contact). This will send you
 to OpenKeychain which will assist you on adding the key.  This works best in
 very small conferences with contacts you are already using OpenPGP with. This
-feature is regarded experimental. Conversations Classic is the only client that uses
+feature is regarded experimental. another.im is the only client that uses
 XEP-0027 with conferences. (The XEP neither specifically allows nor disallows
 this.)
 

build.gradle

@@ -71,6 +71,7 @@ dependencies {
     implementation 'com.google.guava:guava:32.1.3-android'
     implementation 'io.michaelrocks:libphonenumber-android:8.13.17'
     implementation 'im.conversations.webrtc:webrtc-android:119.0.0'
+    implementation 'org.jitsi:org.otr4j:0.23'
 
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     implementation "androidx.recyclerview:recyclerview:1.2.1"
@@ -83,6 +84,7 @@ dependencies {
 
     implementation 'com.github.singpolyma:TokenAutoComplete:bfa93780e0'
 
+    implementation 'com.github.kizitonwose.colorpreference:core:1.1.0'
     implementation 'com.github.kizitonwose.colorpreference:support:1.1.0'
     implementation 'com.caverock:androidsvg-aar:1.4'
     implementation 'com.github.singpolyma:Better-Link-Movement-Method:4df081e1e4'
@@ -102,12 +104,12 @@ android {
     defaultConfig {
         minSdkVersion 24
         targetSdkVersion 34
-        versionCode 42115
-        versionName "2.3.1"
+        versionCode 42116
+        versionName "2.3.2"
         archivesBaseName += "-$versionName"
-        applicationId "eu.siacs.conversations.classic"
+        applicationId "im.narayana.another"
         resValue "string", "applicationId", applicationId
-        def appName = "Conversations Classic"
+        def appName = "another.im"
         resValue "string", "app_name", appName
         buildConfigField "String", "APP_NAME", "\"$appName\""
     }

fastlane/metadata/android/en-US/changelogs/4211004.txt

@@ -1,4 +1,4 @@
-The app is renamed to Conversations Classic.
+The app is renamed to another.im.
 
 * Numerous small fixes
 * Info about PM on MUC details screen

fastlane/metadata/android/en-US/full_description.txt

@@ -23,7 +23,7 @@ Features:
 
 XMPP Features:
 
-Conversations Classic works with every XMPP server out there. However XMPP is an extensible protocol. These extensions are standardized as well in so called XEP’s. Conversations Classic supports a couple of those to make the overall user experience better. There is a chance that your current XMPP server does not support these extensions. Therefore to get the most out of Conversations Classic you should consider either switching to an XMPP server that does or - even better - run your own XMPP server for you and your friends.
+another.im works with every XMPP server out there. However XMPP is an extensible protocol. These extensions are standardized as well in so called XEP’s. another.im supports a couple of those to make the overall user experience better. There is a chance that your current XMPP server does not support these extensions. Therefore to get the most out of another.im you should consider either switching to an XMPP server that does or - even better - run your own XMPP server for you and your friends.
 
 These XEPs are - as of now:
 
@@ -36,7 +36,7 @@ These XEPs are - as of now:
 * XEP-0237: Roster Versioning mainly to save bandwidth on poor mobile connections.
 * XEP-0280: Message Carbons which automatically syncs the messages you send to your desktop client and thus allows you to switch seamlessly from your mobile client to your desktop client and back within one conversation.
 * XEP-0308: Last Message Correction allows you to edit last message as well as retract it.
-* XEP-0313: Message Archive Management synchronize message history with the server. Catch up with messages that were sent while Conversations Classic was offline.
-* XEP-0352: Client State Indication lets the server know whether or not Conversations Classic is in the background. Allows the server to save bandwidth by withholding unimportant packages.
+* XEP-0313: Message Archive Management synchronize message history with the server. Catch up with messages that were sent while another.im was offline.
+* XEP-0352: Client State Indication lets the server know whether or not another.im is in the background. Allows the server to save bandwidth by withholding unimportant packages.
 * XEP-0363: HTTP File Upload allows you to share files in conferences and with offline contacts. Requires an additional component on your server.
 * XEP-0461: Message Replies provides support of native replies, which also works in many transports (gateways) as well.

fastlane/metadata/android/ru/changelogs/4211004.txt

@@ -1,4 +1,4 @@
-Приложение переименовано в Conversations Classic.
+Приложение переименовано в another.im.
 
 * Многочисленные мелкие исправления
 * Информация о личных сообщениях в групповом чате на экране сведений

fastlane/metadata/android/ru/full_description.txt

@@ -23,7 +23,7 @@
 
 Функции XMPP:
 
-Conversations Classic работает с любым сервером XMPP. Однако, XMPP — расширяемый протокол. Расширения также стандартизированы в так называемых XEP. Conversations Classic поддерживает некоторые из них, дабы улучшить общий опыт использования. Может оказаться, что Ваш текущий сервер XMPP не поддерживает эти расширения. Поэтому, чтобы получить максимум от Conversations Classic, рассмотрите переход на XMPP-сервер с поддержкой этих расширений, или — ещё лучше — запускайте собственный сервер XMPP для себя и своих друзей.
+another.im работает с любым сервером XMPP. Однако, XMPP — расширяемый протокол. Расширения также стандартизированы в так называемых XEP. another.im поддерживает некоторые из них, дабы улучшить общий опыт использования. Может оказаться, что Ваш текущий сервер XMPP не поддерживает эти расширения. Поэтому, чтобы получить максимум от another.im, рассмотрите переход на XMPP-сервер с поддержкой этих расширений, или — ещё лучше — запускайте собственный сервер XMPP для себя и своих друзей.
 
 В настоящее время поддерживаются такие XEP:
 
@@ -36,7 +36,7 @@ Conversations Classic работает с любым сервером XMPP. Од
 * XEP-0237: Версионирование Списка Контактов, прежде всего для сберегания мобильного трафика.
 * XEP-0280: Сообщения под Копирку, автоматически синхронизирует отправленные сообщений на настольный клиент, чем позволяет плавно переключаться между мобильным и настольным клиентами в рамках одного разговора.
 * XEP-0308: Исправление Последнего Сообщения, позволяет отредактировать или отозвать сообщение.
-* XEP-0313: Управление Архивом Сообщений, синхронизирует историю сообщений с сервером. Узнавайте о сообщениях, отправленных, пока Conversations Classic находился оффлайн.
-* XEP-0352: Индикация Состояния Клиента, сообщает серверу, работает ли Conversations Classic в фоновом режиме. Позволяет серверу сберегать пропускную способность, удерживая неважные пакеты.
+* XEP-0313: Управление Архивом Сообщений, синхронизирует историю сообщений с сервером. Узнавайте о сообщениях, отправленных, пока another.im находился оффлайн.
+* XEP-0352: Индикация Состояния Клиента, сообщает серверу, работает ли another.im в фоновом режиме. Позволяет серверу сберегать пропускную способность, удерживая неважные пакеты.
 * XEP-0363: Загрузка Файлов по HTTP, позволяет обмениваться файлами в конференциях и с оффлайн-контактами. Требует дополнительного компонента на Вашем сервере.
 * XEP-0461: Ответы на Сообщения, предоставляет поддержку привязанных к сообщению ответов, которые также работают со многими транспортами (мостами).

fastlane/metadata/android/uk/changelogs/4211004.txt

@@ -1,4 +1,4 @@
-Застосунок перейменовано на Conversations Classic.
+Застосунок перейменовано на another.im.
 
 * Численні дрібні виправлення
 * Інформація про особисті повідомлення в груповому чаті на екрані деталей

fastlane/metadata/android/uk/full_description.txt

@@ -23,7 +23,7 @@
 
 Функції XMPP:
 
-Conversations Classic працює з будь-яким сервером XMPP. Проте XMPP — розширюваний протокол. Розширення також стандартизовані в так званих XEP. Conversations Classic підтримує кілька з них, щоб покращити загальний досвід користування. Може виявитися, що Ваш поточний сервер XMPP не підтримує цих розширень. Тому, щоб отримати максимум від Conversations Classic, розгляньте перехід на XMPP-сервер з підтримкою цих розширень або — ще краще — запускайте власний сервер XMPP для себе і своїх друзів.
+another.im працює з будь-яким сервером XMPP. Проте XMPP — розширюваний протокол. Розширення також стандартизовані в так званих XEP. another.im підтримує кілька з них, щоб покращити загальний досвід користування. Може виявитися, що Ваш поточний сервер XMPP не підтримує цих розширень. Тому, щоб отримати максимум від another.im, розгляньте перехід на XMPP-сервер з підтримкою цих розширень або — ще краще — запускайте власний сервер XMPP для себе і своїх друзів.
 
 На даний час підтримуються такі XEP:
 
@@ -36,7 +36,7 @@ Conversations Classic працює з будь-яким сервером XMPP.
 * XEP-0237: Версіонування Списку Контактів, передусім для заощадження мобільного трафіку.
 * XEP-0280: Повідомлення під Копірку, автоматично синхронізує надіслані повідомлення на настільний клієнт, чим дозволяє плавно перемикатися між мобільним і настільним клієнтами в рамках однієї розмови.
 * XEP-0308: Виправлення Останнього Повідомлення, дозволяє відредагувати чи відкликати повідомлення.
-* XEP-0313: Керування Архівом Повідомлень, синхронізує історію повідомлень із сервером. Дізнавайтеся про повідомлення, надіслані, поки Conversations Classic був офлайн.
-* XEP-0352: Індикація Стану Клієнта, повідомляє серверу, чи працює Conversations Classic у фоновому режимі. Дозволяє серверу заощаджувати пропускну здатність, утримуючи неважливі пакети.
+* XEP-0313: Керування Архівом Повідомлень, синхронізує історію повідомлень із сервером. Дізнавайтеся про повідомлення, надіслані, поки another.im був офлайн.
+* XEP-0352: Індикація Стану Клієнта, повідомляє серверу, чи працює another.im у фоновому режимі. Дозволяє серверу заощаджувати пропускну здатність, утримуючи неважливі пакети.
 * XEP-0363: Завантаження Файлів за HTTP, дозволяє обмінюватися файлами в конференціях і з офлайн-контактами. Потребує додаткового компонента на Вашому сервері.
 * XEP-0461: Відповіді на Повідомлення, надає підтримку привʼязаних до повідомлення відповідей, які також працюють із багатьма транспортами (мостами).

src/conversations/java/eu/siacs/conversations/ui/ManageAccountActivity.java

@@ -36,6 +36,7 @@ import eu.siacs.conversations.services.XmppConnectionService;
 import eu.siacs.conversations.services.XmppConnectionService.OnAccountUpdate;
 import eu.siacs.conversations.ui.adapter.AccountAdapter;
 import eu.siacs.conversations.ui.util.MenuDoubleTabUtil;
+import eu.siacs.conversations.utils.UIHelper;
 import eu.siacs.conversations.xmpp.Jid;
 import eu.siacs.conversations.xmpp.XmppConnection;
 
@@ -44,8 +45,14 @@ import static eu.siacs.conversations.utils.PermissionUtils.writeGranted;
 
 import com.google.android.material.bottomnavigation.BottomNavigationView;
 import com.google.android.material.navigation.NavigationBarView;
+import com.kizitonwose.colorpreference.ColorDialog;
+import com.kizitonwose.colorpreference.ColorShape;
 
-public class ManageAccountActivity extends XmppActivity implements OnAccountUpdate, KeyChainAliasCallback, XmppConnectionService.OnAccountCreated, AccountAdapter.OnTglAccountState {
+public class ManageAccountActivity extends XmppActivity implements OnAccountUpdate,
+        KeyChainAliasCallback,
+        XmppConnectionService.OnAccountCreated,
+        AccountAdapter.OnTglAccountState,
+        ColorDialog.OnColorSelectedListener {
 
     private final String STATE_SELECTED_ACCOUNT = "selected_account";
 
@@ -61,6 +68,18 @@ public class ManageAccountActivity extends XmppActivity implements OnAccountUpda
 
     protected Pair<Integer, Intent> mPostponedActivityResult = null;
 
+    private AccountAdapter.ColorSelectorListener colorSelectorListener = new AccountAdapter.ColorSelectorListener() {
+        @Override
+        public void onColorPickerRequested(Jid accountJid, int currentColor) {
+            new ColorDialog.Builder(ManageAccountActivity.this)
+                    .setColorShape(ColorShape.CIRCLE)
+                    .setColorChoices(R.array.themeColorsOverride)
+                    .setSelectedColor(currentColor)
+                    .setTag(accountJid.asBareJid().toEscapedString())
+                    .show();
+        }
+    };
+
     @Override
     public void onAccountUpdate() {
         refreshUi();
@@ -102,7 +121,7 @@ public class ManageAccountActivity extends XmppActivity implements OnAccountUpda
         }
 
         accountListView = findViewById(R.id.account_list);
-        this.mAccountAdapter = new AccountAdapter(this, accountList);
+        this.mAccountAdapter = new AccountAdapter(this, accountList, colorSelectorListener);
         accountListView.setAdapter(this.mAccountAdapter);
         accountListView.setOnItemClickListener((arg0, view, position, arg3) -> switchToAccount(accountList.get(position)));
         registerForContextMenu(accountListView);
@@ -158,6 +177,13 @@ public class ManageAccountActivity extends XmppActivity implements OnAccountUpda
         super.onSaveInstanceState(savedInstanceState);
     }
 
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        colorSelectorListener = null;
+        mAccountAdapter.colorSelectorListener = null;
+    }
+
     @Override
     public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuInfo) {
         super.onCreateContextMenu(menu, v, menuInfo);
@@ -349,6 +375,12 @@ public class ManageAccountActivity extends XmppActivity implements OnAccountUpda
         }
     }
 
+    @Override
+    public void onColorSelected(int newColor, String tag) {
+        UIHelper.overrideAccountColor(this, tag, newColor);
+        refreshUiReal();
+    }
+
     private void addAccountFromKey() {
         try {
             KeyChain.choosePrivateKeyAlias(this, this, null, null, null, -1, null);

src/conversations/res/drawable-anydpi/ic_notification.xml

@@ -0,0 +1,22 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="1080"
+    android:viewportHeight="1080"
+    android:tint="#FFFFFF">
+  <group android:scaleX="0.92"
+      android:scaleY="0.92"
+      android:translateX="43.2"
+      android:translateY="43.2">>
+      <group
+          android:scaleX="0.95"
+          android:scaleY="0.95"
+          android:pivotX="540"
+          android:pivotY="540">
+          <path android:fillColor="#FFFFFF" android:fillType="nonZero" android:pathData="M1.3,248C10.3,235.5 24.5,249.6 35.6,252C61.5,261.8 87.3,271.8 113.1,281.7C181.5,310.4 252.6,330.3 323.7,350.2C331.2,352.4 342,355.7 342.7,364.9C342.3,387.8 342.6,410.9 344.9,433.5C349.4,473 358.4,511.3 369.3,549.6C395.9,631.7 434.7,710.2 486,779.8C502.5,803.8 522.2,825.1 541.4,846.9C545,851.9 551,840 553.8,838.5C652.8,730.3 725.2,592.7 745.2,447.1C750.6,422 749.3,394.7 751,368.9C750.4,363.9 748.5,357.6 753,353.4C763.8,344 780,342.7 793.2,337.9C814.8,331.7 835.9,324.8 857.5,318.8C910.2,303.2 961.8,284.6 1012.8,264.1C1030.3,257.9 1047.4,250.9 1064.6,244C1068.4,242.5 1073.6,241.3 1076.4,245.4C1076.9,246.1 1077.6,247 1078.7,247L1078.7,265.9C1055.3,535 852.4,763.9 630.7,902C626.7,905.8 609.7,910.5 616.2,914.4C649.6,941.6 686.4,964.5 725.5,983C748.9,993.9 773,1003.5 798,1010.2C811.8,1012 826,1028 805.7,1033L803.1,1033C741.8,1027.2 680.5,1011.4 623.1,988.3C602.3,980 582,970.4 561.6,961.4C547.7,955.8 540.7,946.2 526.3,957.1C452.7,990.7 373.8,1013.1 294.4,1025.8C293.1,1025.8 291.9,1025.8 290.7,1026.2C284.2,1028.8 274.6,1019.7 280.3,1014.4C287.4,1004.6 300.7,1004.6 311.1,1000.3C326.7,994.8 342.1,988.9 357.3,982.5C397.1,964.2 435.1,941.5 469.7,914.7C473.9,913 458.7,906.2 457.1,904.8C423.7,884.5 391.4,862.5 360.3,838.9C179.2,698.7 20.2,495.8 1.3,261.2Z" android:strokeColor="#00000000" android:strokeLineCap="butt" android:strokeLineJoin="miter" android:strokeWidth="0.5"/>
+
+          <path android:fillColor="#FFFFFF" android:fillType="nonZero" android:pathData="M553.7,47C677.9,53 759.1,187.4 698.7,299.1C637.6,418.1 460.9,420.1 395.5,304.1C332.4,190.8 408.6,55.6 536.9,47Z" android:strokeColor="#00000000" android:strokeLineCap="butt" android:strokeLineJoin="miter" android:strokeWidth="0.5"/>
+
+      </group>
+  </group>
+</vector>

src/conversations/res/drawable/ic_launcher_foreground.xml

@@ -1,13 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="1146.7721"
-    android:viewportHeight="1146.7721">
-    <group
-        android:translateX="322.69516"
-        android:translateY="317.38605">
-        <path
-            android:fillColor="#ffffff"
-            android:pathData="M253.219,17.719C126.144,17.719 22.469,118.884 22.469,243.75C22.469,368.616 126.138,469.844 253.219,469.844C292.739,469.844 323.216,461.736 358,449.094L468.469,493.625A14.556,14.562 0,0 0,488.063 476.625L458.125,355.656C477.356,321.886 483.938,283.416 483.938,243.75C483.938,118.887 380.293,17.719 253.219,17.719zM143.844,222C157.651,222 168.844,233.193 168.844,247C168.844,260.807 157.651,272 143.844,272C130.037,272 118.844,260.807 118.844,247C118.844,233.193 130.037,222 143.844,222zM253.563,222C267.37,222 278.563,233.193 278.563,247C278.563,260.807 267.37,272 253.563,272C239.755,272 228.563,260.807 228.563,247C228.563,233.193 239.755,222 253.563,222zM363.563,222C377.37,222 388.563,233.193 388.563,247C388.563,260.807 377.37,272 363.563,272C349.755,272 338.563,260.807 338.563,247C338.563,233.193 349.755,222 363.563,222z" />
-    </group>
-</vector>

src/conversations/res/drawable/ic_launcher_monochrome.xml

@@ -1,13 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="1146.7721"
-    android:viewportHeight="1146.7721">
-    <group
-        android:translateX="322.69516"
-        android:translateY="317.38605">
-        <path
-            android:fillColor="#000000"
-            android:pathData="M253.219,17.719C126.144,17.719 22.469,118.884 22.469,243.75C22.469,368.616 126.138,469.844 253.219,469.844C292.739,469.844 323.216,461.736 358,449.094L468.469,493.625A14.556,14.562 0,0 0,488.063 476.625L458.125,355.656C477.356,321.886 483.938,283.416 483.938,243.75C483.938,118.887 380.293,17.719 253.219,17.719zM143.844,222C157.651,222 168.844,233.193 168.844,247C168.844,260.807 157.651,272 143.844,272C130.037,272 118.844,260.807 118.844,247C118.844,233.193 130.037,222 143.844,222zM253.563,222C267.37,222 278.563,233.193 278.563,247C278.563,260.807 267.37,272 253.563,272C239.755,272 228.563,260.807 228.563,247C228.563,233.193 239.755,222 253.563,222zM363.563,222C377.37,222 388.563,233.193 388.563,247C388.563,260.807 377.37,272 363.563,272C349.755,272 338.563,260.807 338.563,247C338.563,233.193 349.755,222 363.563,222z" />
-    </group>
-</vector>

src/conversations/res/drawable/ic_main_logo.xml

@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="108dp" android:viewportHeight="1080" android:viewportWidth="1080" android:width="108dp">
+    <group
+        android:scaleX="0.8"
+        android:scaleY="0.8"
+        android:pivotX="540"
+        android:pivotY="540">
+        <path android:fillColor="#FCFDD1" android:fillType="nonZero" android:pathData="M1.3,248C10.3,235.5 24.5,249.6 35.6,252C61.5,261.8 87.3,271.8 113.1,281.7C181.5,310.4 252.6,330.3 323.7,350.2C331.2,352.4 342,355.7 342.7,364.9C342.3,387.8 342.6,410.9 344.9,433.5C349.4,473 358.4,511.3 369.3,549.6C395.9,631.7 434.7,710.2 486,779.8C502.5,803.8 522.2,825.1 541.4,846.9C545,851.9 551,840 553.8,838.5C652.8,730.3 725.2,592.7 745.2,447.1C750.6,422 749.3,394.7 751,368.9C750.4,363.9 748.5,357.6 753,353.4C763.8,344 780,342.7 793.2,337.9C814.8,331.7 835.9,324.8 857.5,318.8C910.2,303.2 961.8,284.6 1012.8,264.1C1030.3,257.9 1047.4,250.9 1064.6,244C1068.4,242.5 1073.6,241.3 1076.4,245.4C1076.9,246.1 1077.6,247 1078.7,247L1078.7,265.9C1055.3,535 852.4,763.9 630.7,902C626.7,905.8 609.7,910.5 616.2,914.4C649.6,941.6 686.4,964.5 725.5,983C748.9,993.9 773,1003.5 798,1010.2C811.8,1012 826,1028 805.7,1033L803.1,1033C741.8,1027.2 680.5,1011.4 623.1,988.3C602.3,980 582,970.4 561.6,961.4C547.7,955.8 540.7,946.2 526.3,957.1C452.7,990.7 373.8,1013.1 294.4,1025.8C293.1,1025.8 291.9,1025.8 290.7,1026.2C284.2,1028.8 274.6,1019.7 280.3,1014.4C287.4,1004.6 300.7,1004.6 311.1,1000.3C326.7,994.8 342.1,988.9 357.3,982.5C397.1,964.2 435.1,941.5 469.7,914.7C473.9,913 458.7,906.2 457.1,904.8C423.7,884.5 391.4,862.5 360.3,838.9C179.2,698.7 20.2,495.8 1.3,261.2Z" android:strokeColor="#00000000" android:strokeLineCap="butt" android:strokeLineJoin="miter" android:strokeWidth="0.5"/>
+
+        <path android:fillColor="#FCFDD1" android:fillType="nonZero" android:pathData="M553.7,47C677.9,53 759.1,187.4 698.7,299.1C637.6,418.1 460.9,420.1 395.5,304.1C332.4,190.8 408.6,55.6 536.9,47Z" android:strokeColor="#00000000" android:strokeLineCap="butt" android:strokeLineJoin="miter" android:strokeWidth="0.5"/>
+
+    </group>
+    
+</vector>

src/conversations/res/drawable/ic_main_logo_bg.xml

@@ -0,0 +1,4 @@
+<shape android:shape="oval"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="#52617a"/>
+</shape>

src/conversations/res/drawable/main_logo.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:drawable="@drawable/ic_main_logo_bg"/>
+
+    <item
+        android:gravity="center"
+        android:width="108dp"
+        android:height="108dp"
+        android:drawable="@drawable/ic_main_logo">
+    </item>
+</layer-list>

src/conversations/res/drawable/new_launcher_background.xml

@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+  <group android:scaleX="0.68"
+      android:scaleY="0.68"
+      android:translateX="17.28"
+      android:translateY="17.28">
+    <path
+        android:pathData="M0,0h108v108h-108z"
+        android:fillColor="#52617a"/>
+  </group>
+</vector>

src/conversations/res/drawable/new_launcher_foreground.xml

@@ -0,0 +1,21 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="1080"
+    android:viewportHeight="1080">
+  <group android:scaleX="0.59"
+      android:scaleY="0.59"
+      android:translateX="221.4"
+      android:translateY="221.4">
+      <group
+          android:scaleX="0.8"
+          android:scaleY="0.8"
+          android:pivotX="540"
+          android:pivotY="540">
+          <path android:fillColor="#FCFDD1" android:fillType="nonZero" android:pathData="M1.3,248C10.3,235.5 24.5,249.6 35.6,252C61.5,261.8 87.3,271.8 113.1,281.7C181.5,310.4 252.6,330.3 323.7,350.2C331.2,352.4 342,355.7 342.7,364.9C342.3,387.8 342.6,410.9 344.9,433.5C349.4,473 358.4,511.3 369.3,549.6C395.9,631.7 434.7,710.2 486,779.8C502.5,803.8 522.2,825.1 541.4,846.9C545,851.9 551,840 553.8,838.5C652.8,730.3 725.2,592.7 745.2,447.1C750.6,422 749.3,394.7 751,368.9C750.4,363.9 748.5,357.6 753,353.4C763.8,344 780,342.7 793.2,337.9C814.8,331.7 835.9,324.8 857.5,318.8C910.2,303.2 961.8,284.6 1012.8,264.1C1030.3,257.9 1047.4,250.9 1064.6,244C1068.4,242.5 1073.6,241.3 1076.4,245.4C1076.9,246.1 1077.6,247 1078.7,247L1078.7,265.9C1055.3,535 852.4,763.9 630.7,902C626.7,905.8 609.7,910.5 616.2,914.4C649.6,941.6 686.4,964.5 725.5,983C748.9,993.9 773,1003.5 798,1010.2C811.8,1012 826,1028 805.7,1033L803.1,1033C741.8,1027.2 680.5,1011.4 623.1,988.3C602.3,980 582,970.4 561.6,961.4C547.7,955.8 540.7,946.2 526.3,957.1C452.7,990.7 373.8,1013.1 294.4,1025.8C293.1,1025.8 291.9,1025.8 290.7,1026.2C284.2,1028.8 274.6,1019.7 280.3,1014.4C287.4,1004.6 300.7,1004.6 311.1,1000.3C326.7,994.8 342.1,988.9 357.3,982.5C397.1,964.2 435.1,941.5 469.7,914.7C473.9,913 458.7,906.2 457.1,904.8C423.7,884.5 391.4,862.5 360.3,838.9C179.2,698.7 20.2,495.8 1.3,261.2Z" android:strokeColor="#00000000" android:strokeLineCap="butt" android:strokeLineJoin="miter" android:strokeWidth="0.5"/>
+
+          <path android:fillColor="#FCFDD1" android:fillType="nonZero" android:pathData="M553.7,47C677.9,53 759.1,187.4 698.7,299.1C637.6,418.1 460.9,420.1 395.5,304.1C332.4,190.8 408.6,55.6 536.9,47Z" android:strokeColor="#00000000" android:strokeLineCap="butt" android:strokeLineJoin="miter" android:strokeWidth="0.5"/>
+
+      </group>
+  </group>
+</vector>

src/conversations/res/drawable/new_launcher_monochrome.xml

@@ -0,0 +1,21 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="1080"
+    android:viewportHeight="1080">
+  <group android:scaleX="0.59"
+      android:scaleY="0.59"
+      android:translateX="221.4"
+      android:translateY="221.4">
+      <group
+          android:scaleX="0.8"
+          android:scaleY="0.8"
+          android:pivotX="540"
+          android:pivotY="540">
+          <path android:fillColor="#000000" android:fillType="nonZero" android:pathData="M1.3,248C10.3,235.5 24.5,249.6 35.6,252C61.5,261.8 87.3,271.8 113.1,281.7C181.5,310.4 252.6,330.3 323.7,350.2C331.2,352.4 342,355.7 342.7,364.9C342.3,387.8 342.6,410.9 344.9,433.5C349.4,473 358.4,511.3 369.3,549.6C395.9,631.7 434.7,710.2 486,779.8C502.5,803.8 522.2,825.1 541.4,846.9C545,851.9 551,840 553.8,838.5C652.8,730.3 725.2,592.7 745.2,447.1C750.6,422 749.3,394.7 751,368.9C750.4,363.9 748.5,357.6 753,353.4C763.8,344 780,342.7 793.2,337.9C814.8,331.7 835.9,324.8 857.5,318.8C910.2,303.2 961.8,284.6 1012.8,264.1C1030.3,257.9 1047.4,250.9 1064.6,244C1068.4,242.5 1073.6,241.3 1076.4,245.4C1076.9,246.1 1077.6,247 1078.7,247L1078.7,265.9C1055.3,535 852.4,763.9 630.7,902C626.7,905.8 609.7,910.5 616.2,914.4C649.6,941.6 686.4,964.5 725.5,983C748.9,993.9 773,1003.5 798,1010.2C811.8,1012 826,1028 805.7,1033L803.1,1033C741.8,1027.2 680.5,1011.4 623.1,988.3C602.3,980 582,970.4 561.6,961.4C547.7,955.8 540.7,946.2 526.3,957.1C452.7,990.7 373.8,1013.1 294.4,1025.8C293.1,1025.8 291.9,1025.8 290.7,1026.2C284.2,1028.8 274.6,1019.7 280.3,1014.4C287.4,1004.6 300.7,1004.6 311.1,1000.3C326.7,994.8 342.1,988.9 357.3,982.5C397.1,964.2 435.1,941.5 469.7,914.7C473.9,913 458.7,906.2 457.1,904.8C423.7,884.5 391.4,862.5 360.3,838.9C179.2,698.7 20.2,495.8 1.3,261.2Z" android:strokeColor="#00000000" android:strokeLineCap="butt" android:strokeLineJoin="miter" android:strokeWidth="0.5"/>
+
+          <path android:fillColor="#000000" android:fillType="nonZero" android:pathData="M553.7,47C677.9,53 759.1,187.4 698.7,299.1C637.6,418.1 460.9,420.1 395.5,304.1C332.4,190.8 408.6,55.6 536.9,47Z" android:strokeColor="#00000000" android:strokeLineCap="butt" android:strokeLineJoin="miter" android:strokeWidth="0.5"/>
+
+      </group>
+  </group>
+</vector>

src/conversations/res/drawable/splash_logo.xml

@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="216dp" android:viewportHeight="1080" android:viewportWidth="1080" android:width="216dp">
+    <group
+        android:scaleX="0.8"
+        android:scaleY="0.8"
+        android:pivotX="540"
+        android:pivotY="540">
+        <path android:fillColor="#FCFDD1" android:fillType="nonZero" android:pathData="M1.3,248C10.3,235.5 24.5,249.6 35.6,252C61.5,261.8 87.3,271.8 113.1,281.7C181.5,310.4 252.6,330.3 323.7,350.2C331.2,352.4 342,355.7 342.7,364.9C342.3,387.8 342.6,410.9 344.9,433.5C349.4,473 358.4,511.3 369.3,549.6C395.9,631.7 434.7,710.2 486,779.8C502.5,803.8 522.2,825.1 541.4,846.9C545,851.9 551,840 553.8,838.5C652.8,730.3 725.2,592.7 745.2,447.1C750.6,422 749.3,394.7 751,368.9C750.4,363.9 748.5,357.6 753,353.4C763.8,344 780,342.7 793.2,337.9C814.8,331.7 835.9,324.8 857.5,318.8C910.2,303.2 961.8,284.6 1012.8,264.1C1030.3,257.9 1047.4,250.9 1064.6,244C1068.4,242.5 1073.6,241.3 1076.4,245.4C1076.9,246.1 1077.6,247 1078.7,247L1078.7,265.9C1055.3,535 852.4,763.9 630.7,902C626.7,905.8 609.7,910.5 616.2,914.4C649.6,941.6 686.4,964.5 725.5,983C748.9,993.9 773,1003.5 798,1010.2C811.8,1012 826,1028 805.7,1033L803.1,1033C741.8,1027.2 680.5,1011.4 623.1,988.3C602.3,980 582,970.4 561.6,961.4C547.7,955.8 540.7,946.2 526.3,957.1C452.7,990.7 373.8,1013.1 294.4,1025.8C293.1,1025.8 291.9,1025.8 290.7,1026.2C284.2,1028.8 274.6,1019.7 280.3,1014.4C287.4,1004.6 300.7,1004.6 311.1,1000.3C326.7,994.8 342.1,988.9 357.3,982.5C397.1,964.2 435.1,941.5 469.7,914.7C473.9,913 458.7,906.2 457.1,904.8C423.7,884.5 391.4,862.5 360.3,838.9C179.2,698.7 20.2,495.8 1.3,261.2Z" android:strokeColor="#00000000" android:strokeLineCap="butt" android:strokeLineJoin="miter" android:strokeWidth="0.5"/>
+
+        <path android:fillColor="#FCFDD1" android:fillType="nonZero" android:pathData="M553.7,47C677.9,53 759.1,187.4 698.7,299.1C637.6,418.1 460.9,420.1 395.5,304.1C332.4,190.8 408.6,55.6 536.9,47Z" android:strokeColor="#00000000" android:strokeLineCap="butt" android:strokeLineJoin="miter" android:strokeWidth="0.5"/>
+
+    </group>
+</vector>

src/conversations/res/mipmap-anydpi-v26/new_launcher.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@drawable/new_launcher_background"/>
+    <foreground android:drawable="@drawable/new_launcher_foreground"/>
+    <monochrome android:drawable="@drawable/new_launcher_monochrome"/>
+</adaptive-icon>

src/conversations/res/mipmap-anydpi-v26/new_launcher_round.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@drawable/new_launcher_background"/>
+    <foreground android:drawable="@drawable/new_launcher_foreground"/>
+    <monochrome android:drawable="@drawable/new_launcher_monochrome"/>
+</adaptive-icon>

src/main/AndroidManifest.xml

@@ -299,6 +299,11 @@
         <activity
             android:name=".ui.PublishGroupChatProfilePictureActivity"
             android:label="@string/group_chat_avatar" />
+        <activity
+            android:name=".ui.VerifyOTRActivity"
+            android:label="@string/verify_otr"
+            android:exported="false"
+            android:windowSoftInputMode="stateHidden" />
         <activity
             android:name=".ui.ShareWithActivity"
             android:exported="true"

src/main/java/eu/siacs/conversations/Config.java

@@ -15,9 +15,10 @@ import eu.siacs.conversations.xmpp.chatstate.ChatState;
 public final class Config {
     private static final int UNENCRYPTED = 1;
     private static final int OPENPGP = 2;
+    private static final int OTR = 4;
     private static final int OMEMO = 8;
 
-    private static final int ENCRYPTION_MASK = UNENCRYPTED | OPENPGP | OMEMO;
+    private static final int ENCRYPTION_MASK = UNENCRYPTED | OPENPGP | OTR | OMEMO;
 
     public static boolean supportUnencrypted() {
         return (ENCRYPTION_MASK & UNENCRYPTED) != 0;
@@ -31,6 +32,10 @@ public final class Config {
         return (ENCRYPTION_MASK & OMEMO) != 0;
     }
 
+    public static boolean supportOtr() {
+        return (ENCRYPTION_MASK & OTR) != 0;
+    }
+
     public static boolean omemoOnly() {
         return !multipleEncryptionChoices() && supportOmemo();
     }

src/main/java/eu/siacs/conversations/crypto/OtrService.java

@@ -0,0 +1,312 @@
+package eu.siacs.conversations.crypto;
+
+import android.util.Log;
+
+import net.java.otr4j.OtrEngineHost;
+import net.java.otr4j.OtrException;
+import net.java.otr4j.OtrPolicy;
+import net.java.otr4j.OtrPolicyImpl;
+import net.java.otr4j.crypto.OtrCryptoEngineImpl;
+import net.java.otr4j.crypto.OtrCryptoException;
+import net.java.otr4j.session.FragmenterInstructions;
+import net.java.otr4j.session.InstanceTag;
+import net.java.otr4j.session.SessionID;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.math.BigInteger;
+import java.security.KeyFactory;
+import java.security.KeyPair;
+import java.security.KeyPairGenerator;
+import java.security.NoSuchAlgorithmException;
+import java.security.PrivateKey;
+import java.security.PublicKey;
+import java.security.spec.DSAPrivateKeySpec;
+import java.security.spec.DSAPublicKeySpec;
+import java.security.spec.InvalidKeySpecException;
+
+import eu.siacs.conversations.Config;
+import eu.siacs.conversations.entities.Account;
+import eu.siacs.conversations.entities.Conversation;
+import eu.siacs.conversations.generator.MessageGenerator;
+import eu.siacs.conversations.services.XmppConnectionService;
+import eu.siacs.conversations.xmpp.Jid;
+import eu.siacs.conversations.xmpp.chatstate.ChatState;
+import eu.siacs.conversations.xmpp.jid.OtrJidHelper;
+import eu.siacs.conversations.xmpp.stanzas.MessagePacket;
+
+public class OtrService extends OtrCryptoEngineImpl implements OtrEngineHost {
+
+    private Account account;
+    private OtrPolicy otrPolicy;
+    private KeyPair keyPair;
+    private XmppConnectionService mXmppConnectionService;
+
+    public OtrService(XmppConnectionService service, Account account) {
+        this.account = account;
+        this.otrPolicy = new OtrPolicyImpl();
+        this.otrPolicy.setAllowV1(false);
+        this.otrPolicy.setAllowV2(true);
+        this.otrPolicy.setAllowV3(true);
+        this.keyPair = loadKey(account.getKeys());
+        this.mXmppConnectionService = service;
+    }
+
+    private KeyPair loadKey(final JSONObject keys) {
+        if (keys == null) {
+            return null;
+        }
+        synchronized (keys) {
+            try {
+                BigInteger x = new BigInteger(keys.getString("otr_x"), 16);
+                BigInteger y = new BigInteger(keys.getString("otr_y"), 16);
+                BigInteger p = new BigInteger(keys.getString("otr_p"), 16);
+                BigInteger q = new BigInteger(keys.getString("otr_q"), 16);
+                BigInteger g = new BigInteger(keys.getString("otr_g"), 16);
+                KeyFactory keyFactory = KeyFactory.getInstance("DSA");
+                DSAPublicKeySpec pubKeySpec = new DSAPublicKeySpec(y, p, q, g);
+                DSAPrivateKeySpec privateKeySpec = new DSAPrivateKeySpec(x, p, q, g);
+                PublicKey publicKey = keyFactory.generatePublic(pubKeySpec);
+                PrivateKey privateKey = keyFactory.generatePrivate(privateKeySpec);
+                return new KeyPair(publicKey, privateKey);
+            } catch (JSONException e) {
+                return null;
+            } catch (NoSuchAlgorithmException e) {
+                return null;
+            } catch (InvalidKeySpecException e) {
+                return null;
+            }
+        }
+    }
+
+    private void saveKey() {
+        PublicKey publicKey = keyPair.getPublic();
+        PrivateKey privateKey = keyPair.getPrivate();
+        KeyFactory keyFactory;
+        try {
+            keyFactory = KeyFactory.getInstance("DSA");
+            DSAPrivateKeySpec privateKeySpec = keyFactory.getKeySpec(
+                    privateKey, DSAPrivateKeySpec.class);
+            DSAPublicKeySpec publicKeySpec = keyFactory.getKeySpec(publicKey,
+                    DSAPublicKeySpec.class);
+            this.account.setKey("otr_x", privateKeySpec.getX().toString(16));
+            this.account.setKey("otr_g", privateKeySpec.getG().toString(16));
+            this.account.setKey("otr_p", privateKeySpec.getP().toString(16));
+            this.account.setKey("otr_q", privateKeySpec.getQ().toString(16));
+            this.account.setKey("otr_y", publicKeySpec.getY().toString(16));
+        } catch (final NoSuchAlgorithmException e) {
+            e.printStackTrace();
+        } catch (final InvalidKeySpecException e) {
+            e.printStackTrace();
+        }
+
+    }
+
+    @Override
+    public void askForSecret(SessionID id, InstanceTag instanceTag, String question) {
+        try {
+            final Jid jid = OtrJidHelper.fromSessionID(id);
+            Conversation conversation = this.mXmppConnectionService.find(this.account, jid, jid);
+            if (conversation != null) {
+                conversation.smp().hint = question;
+                conversation.smp().status = Conversation.Smp.STATUS_CONTACT_REQUESTED;
+                mXmppConnectionService.updateConversationUi();
+            }
+        } catch (IllegalArgumentException e) {
+            Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": smp in invalid session " + id.toString());
+        }
+    }
+
+    @Override
+    public void finishedSessionMessage(SessionID arg0, String arg1)
+            throws OtrException {
+
+    }
+
+    @Override
+    public String getFallbackMessage(SessionID arg0) {
+        return MessageGenerator.OTR_FALLBACK_MESSAGE;
+    }
+
+    @Override
+    public byte[] getLocalFingerprintRaw(SessionID arg0) {
+        try {
+            return getFingerprintRaw(getPublicKey());
+        } catch (OtrCryptoException e) {
+            return null;
+        }
+    }
+
+    public PublicKey getPublicKey() {
+        if (this.keyPair == null) {
+            return null;
+        }
+        return this.keyPair.getPublic();
+    }
+
+    @Override
+    public KeyPair getLocalKeyPair(SessionID arg0) throws OtrException {
+        if (this.keyPair == null) {
+            KeyPairGenerator kg;
+            try {
+                kg = KeyPairGenerator.getInstance("DSA");
+                this.keyPair = kg.genKeyPair();
+                this.saveKey();
+                mXmppConnectionService.databaseBackend.updateAccount(account);
+            } catch (NoSuchAlgorithmException e) {
+                Log.d(Config.LOGTAG,
+                        "error generating key pair " + e.getMessage());
+            }
+        }
+        return this.keyPair;
+    }
+
+    @Override
+    public String getReplyForUnreadableMessage(SessionID arg0) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public OtrPolicy getSessionPolicy(SessionID arg0) {
+        return otrPolicy;
+    }
+
+    @Override
+    public void injectMessage(SessionID session, String body)
+            throws OtrException {
+        MessagePacket packet = new MessagePacket();
+        packet.setFrom(account.getJid());
+        if (session.getUserID().isEmpty()) {
+            packet.setAttribute("to", session.getAccountID());
+        } else {
+            packet.setAttribute("to", session.getAccountID() + "/" + session.getUserID());
+        }
+        packet.setBody(body);
+        MessageGenerator.addMessageHints(packet);
+        try {
+            Jid jid = OtrJidHelper.fromSessionID(session);
+            Conversation conversation = mXmppConnectionService.find(account, jid, jid);
+            if (conversation != null && conversation.setOutgoingChatState(Config.DEFAULT_CHAT_STATE)) {
+                if (mXmppConnectionService.sendChatStates()) {
+                    packet.addChild(ChatState.toElement(conversation.getOutgoingChatState()));
+                }
+            }
+        } catch (final IllegalArgumentException ignored) {
+
+        }
+
+        packet.setType(MessagePacket.TYPE_CHAT);
+        packet.addChild("encryption", "urn:xmpp:eme:0").setAttribute("namespace", "urn:xmpp:otr:0");
+        account.getXmppConnection().sendMessagePacket(packet);
+    }
+
+    @Override
+    public void messageFromAnotherInstanceReceived(SessionID session) {
+        sendOtrErrorMessage(session, "Message from another OTR-instance received");
+    }
+
+    @Override
+    public void multipleInstancesDetected(SessionID arg0) {
+        // TODO Auto-generated method stub
+
+    }
+
+    @Override
+    public void requireEncryptedMessage(SessionID arg0, String arg1)
+            throws OtrException {
+        // TODO Auto-generated method stub
+
+    }
+
+    @Override
+    public void showError(SessionID arg0, String arg1) throws OtrException {
+        Log.d(Config.LOGTAG, "show error");
+    }
+
+    @Override
+    public void smpAborted(SessionID id) throws OtrException {
+        setSmpStatus(id, Conversation.Smp.STATUS_NONE);
+    }
+
+    private void setSmpStatus(SessionID id, int status) {
+        try {
+            final Jid jid = OtrJidHelper.fromSessionID(id);
+            Conversation conversation = this.mXmppConnectionService.find(this.account, jid, jid);
+            if (conversation != null) {
+                conversation.smp().status = status;
+                mXmppConnectionService.updateConversationUi();
+            }
+        } catch (final IllegalArgumentException ignored) {
+
+        }
+    }
+
+    @Override
+    public void smpError(SessionID id, int arg1, boolean arg2)
+            throws OtrException {
+        setSmpStatus(id, Conversation.Smp.STATUS_NONE);
+    }
+
+    @Override
+    public void unencryptedMessageReceived(SessionID arg0, String arg1)
+            throws OtrException {
+        throw new OtrException(new Exception("unencrypted message received"));
+    }
+
+    @Override
+    public void unreadableMessageReceived(SessionID session) throws OtrException {
+        Log.d(Config.LOGTAG, "unreadable message received");
+        sendOtrErrorMessage(session, "You sent me an unreadable OTR-encrypted message");
+    }
+
+    public void sendOtrErrorMessage(SessionID session, String errorText) {
+        try {
+            Jid jid = OtrJidHelper.fromSessionID(session);
+            Conversation conversation = mXmppConnectionService.find(account, jid, jid);
+            String id = conversation == null ? null : conversation.getLastReceivedOtrMessageId();
+            if (id != null) {
+                MessagePacket packet = mXmppConnectionService.getMessageGenerator()
+                        .generateOtrError(jid, id, errorText);
+                packet.setFrom(account.getJid());
+                mXmppConnectionService.sendMessagePacket(account, packet);
+                Log.d(Config.LOGTAG, packet.toString());
+                Log.d(Config.LOGTAG, account.getJid().asBareJid().toString()
+                        + ": unreadable OTR message in " + conversation.getName());
+            }
+        } catch (IllegalArgumentException e) {
+            return;
+        }
+    }
+
+    @Override
+    public void unverify(SessionID id, String arg1) {
+        setSmpStatus(id, Conversation.Smp.STATUS_FAILED);
+    }
+
+    @Override
+    public void verify(SessionID id, String fingerprint, boolean approved) {
+        Log.d(Config.LOGTAG, "OtrService.verify(" + id.toString() + "," + fingerprint + "," + String.valueOf(approved) + ")");
+        try {
+            final Jid jid = OtrJidHelper.fromSessionID(id);
+            Conversation conversation = this.mXmppConnectionService.find(this.account, jid, jid);
+            if (conversation != null) {
+                if (approved) {
+                    conversation.getContact().addOtrFingerprint(fingerprint);
+                }
+                conversation.smp().hint = null;
+                conversation.smp().status = Conversation.Smp.STATUS_VERIFIED;
+                mXmppConnectionService.updateConversationUi();
+                mXmppConnectionService.syncRosterToDisk(conversation.getAccount());
+            }
+        } catch (final IllegalArgumentException ignored) {
+        }
+    }
+
+    @Override
+    public FragmenterInstructions getFragmenterInstructions(SessionID sessionID) {
+        return null;
+    }
+
+}

src/main/java/eu/siacs/conversations/entities/Account.java

@@ -8,20 +8,27 @@ import android.util.Log;
 import com.google.common.base.Strings;
 import com.google.common.collect.ImmutableList;
 
+import net.java.otr4j.crypto.OtrCryptoEngineImpl;
+import net.java.otr4j.crypto.OtrCryptoException;
+
 import org.json.JSONException;
 import org.json.JSONObject;
 
+import java.security.PublicKey;
+import java.security.interfaces.DSAPublicKey;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.CopyOnWriteArraySet;
 
 import eu.siacs.conversations.Config;
 import eu.siacs.conversations.R;
+import eu.siacs.conversations.crypto.OtrService;
 import eu.siacs.conversations.crypto.PgpDecryptionService;
 import eu.siacs.conversations.crypto.axolotl.AxolotlService;
 import eu.siacs.conversations.crypto.axolotl.XmppAxolotlSession;
@@ -93,6 +100,7 @@ public class Account extends AbstractEntity implements AvatarService.Avatarable
     protected String avatar;
     protected String hostname = null;
     protected int port = 5222;
+    private OtrService mOtrService = null;
     protected boolean online = false;
     private String rosterVersion;
     private String displayName = null;
@@ -100,6 +108,7 @@ public class Account extends AbstractEntity implements AvatarService.Avatarable
     private PgpDecryptionService pgpDecryptionService = null;
     private XmppConnection xmppConnection = null;
     private long mEndGracePeriod = 0L;
+    private String otrFingerprint;
     private final Map<Jid, Bookmark> bookmarks = new HashMap<>();
     private Presence.Status presenceStatus;
     private String presenceStatusMessage;
@@ -535,6 +544,7 @@ public class Account extends AbstractEntity implements AvatarService.Avatarable
     }
 
     public void initAccountServices(final XmppConnectionService context) {
+        this.mOtrService = new OtrService(context, this);
         this.axolotlService = new AxolotlService(this, context);
         this.pgpDecryptionService = new PgpDecryptionService(context);
         if (xmppConnection != null) {
@@ -542,6 +552,10 @@ public class Account extends AbstractEntity implements AvatarService.Avatarable
         }
     }
 
+    public OtrService getOtrService() {
+        return this.mOtrService;
+    }
+
     public PgpDecryptionService getPgpDecryptionService() {
         return this.pgpDecryptionService;
     }
@@ -554,6 +568,27 @@ public class Account extends AbstractEntity implements AvatarService.Avatarable
         this.xmppConnection = connection;
     }
 
+    public String getOtrFingerprint() {
+        if (this.otrFingerprint == null) {
+            try {
+                if (this.mOtrService == null) {
+                    return null;
+                }
+                final PublicKey publicKey = this.mOtrService.getPublicKey();
+                if (publicKey == null || !(publicKey instanceof DSAPublicKey)) {
+                    return null;
+                }
+                this.otrFingerprint = new OtrCryptoEngineImpl().getFingerprint(publicKey).toLowerCase(Locale.US);
+                return this.otrFingerprint;
+            } catch (final OtrCryptoException ignored) {
+                return null;
+            }
+        } else {
+            return this.otrFingerprint;
+        }
+    }
+
+
     public String getRosterVersion() {
         if (this.rosterVersion == null) {
             return "";
@@ -721,6 +756,10 @@ public class Account extends AbstractEntity implements AvatarService.Avatarable
 
     private List<XmppUri.Fingerprint> getFingerprints() {
         ArrayList<XmppUri.Fingerprint> fingerprints = new ArrayList<>();
+        final String otr = this.getOtrFingerprint();
+        if (otr != null) {
+            fingerprints.add(new XmppUri.Fingerprint(XmppUri.FingerprintType.OTR, otr));
+        }
         if (axolotlService == null) {
             return fingerprints;
         }