fix disappearing bookmarks (issue #12)

Reviewed-on: #5
Reviewed-by: kosyak <kosyak@narayana.im>
Co-authored-by: Bohdan Horbeshko <bodqhrohro@gmail.com>
Co-committed-by: Bohdan Horbeshko <bodqhrohro@gmail.com>

.woodpecker.yml

@@ -0,0 +1,7 @@
+steps:
+    build:
+        image: codeberg.org/freeyourgadget/android-fdroid-tools:latest
+        commands:
+            - ./gradlew clean
+            - ./gradlew assembleConversationsFreeDebug
+            - ./gradlew assembleQuicksyFreeDebug

CHANGELOG.md

@@ -1,5 +1,60 @@
 # Changelog
 
+### Version 2.13.0
+
+* Easier access to 'Show QR code'
+* Support PEP Native Bookmarks
+* Add support for SDP Offer / Answer Model (Used by SIP gateways)
+* Raise target API to Android 14
+
+### Version 2.12.12
+
+* Support Private DNS (DNS over TLS)
+* Support themed launcher icon
+* Fix rare permission issue when sharing files on Android 11+
+
+### Version 2.12.11
+
+* Bump libwebrtc dependency to M117 and bump libvpx
+* Go back to AAC for voice messages
+* Support per app language settings
+
+### Version 2.12.10
+
+* support per conversation notification settings
+* use opus for voice messages on Android 10
+
+### Version 2.12.9
+
+* Introduce new backup file format
+
+### Version 2.12.8
+
+* Disable opening backup files (.ceb) from file manager
+
+### Version 2.12.7
+
+* Remove channel discovery feature from Google Play version
+
+### Version 2.12.6
+
+* Fix 'q' falsely being recognized as cyrillic
+
+### Version 2.12.5
+
+* Bump Target SDK to 33 again
+* Fix issues on servers supporting SASL2 w/o inline Stream Management
+
+### Version 2.12.4
+
+* Revert Target SDK bump (back to 32) to fix various issues on Android 13
+
+### Version 2.12.3
+
+* Improve support for new emojis
+* Add ability to remove account from server
+* Show timestamp for calls
+
 ### Version 2.12.2
 
 * Increase corner radius on profile pictures

README.md

@@ -1,17 +1,6 @@
-<h1 align="center">Conversations</h1>
+<h1 align="center">Conversations Classic</h1>
 
-<p align="center">Conversations: the very last word in instant messaging</p>
-
-<p align="center">
-  <a href="https://play.google.com/store/apps/details?id=eu.siacs.conversations&amp;referrer=utm_source%3Dcodeberg">
-    <img src="https://conversations.im/images/get-it-on-play.png" alt="Get it on Google Play" height="80">
-  </a>
-  <a href="https://f-droid.org/packages/eu.siacs.conversations">
-    <img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png" alt="Get it on F-Droid" height="80">
-  </a>
-</p>
-
-![screenshots](https://codeberg.org/iNPUTmice/Conversations/raw/branch/master/screenshots.png)
+<p align="center">Conversations Classic: the very last word in instant messaging</p>
 
 ## Design principles
 
@@ -22,9 +11,9 @@
 
 ## Features
 
-* End-to-end encryption with [OMEMO](http://conversations.im/omemo/) or [OpenPGP](http://openpgp.org/about/)
+* End-to-end encryption with [OMEMO](https://en.wikipedia.org/wiki/OMEMO) or [OpenPGP](https://openpgp.org/about/)
 * Send and receive images as well as other kind of files
-* [Encrypted audio and video calls (DTLS-SRTP)](https://help.conversations.im)
+* Encrypted audio and video calls (DTLS-SRTP) with DTMF dialer support
 * Share your location
 * Send voice messages
 * Indication when your contact has read your message
@@ -39,14 +28,15 @@
 
 ### XMPP Features
 
-Conversations works with every XMPP server out there. However XMPP is an
+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 supports a couple of these to make the overall user
+XEP's. Conversations Classic 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 you
+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. These XEP's are:
 
+* [XEP-0050: Ad-Hoc Commands](http://xmpp.org/extensions/xep-0050.html) lets to interact with gateways
 * [XEP-0065: SOCKS5 Bytestreams](http://xmpp.org/extensions/xep-0065.html) will be used to transfer
   files if both parties are behind a firewall (NAT).
 * [XEP-0163: Personal Eventing Protocol](http://xmpp.org/extensions/xep-0163.html) for avatars and OMEMO.
@@ -55,18 +45,21 @@ run your own XMPP server for you and your friends. These XEP's are:
 * [XEP-0198: Stream Management](http://xmpp.org/extensions/xep-0198.html) allows XMPP to survive small network outages and
   changes of the underlying TCP connection.
 * [XEP-0215: External Service Discovery](https://xmpp.org/extensions/xep-0215.html) will be used to discover STUN and TURN servers which facilitate P2P A/V calls.
+* [XEP-0237: Roster Versioning](http://xmpp.org/extensions/xep-0237.html) mainly to save bandwidth on poor mobile connections
 * [XEP-0280: Message Carbons](http://xmpp.org/extensions/xep-0280.html) 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-0237: Roster Versioning](http://xmpp.org/extensions/xep-0237.html) mainly to save bandwidth on poor mobile connections
+* [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 was
+  server. Catch up with messages that were sent while Conversations Classic 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
   withholding unimportant packages.
 * [XEP-0363: HTTP File Upload](http://xmpp.org/extensions/xep-0363.html) allows you to share files in conferences
   and with offline contacts.
+* [XEP-0461: Message Replies](https://xmpp.org/extensions/xep-0461.html) provides support of native replies, which also works in many transports (gateways) as well
+
 
 ## FAQ
 
@@ -74,44 +67,30 @@ run your own XMPP server for you and your friends. These XEP's are:
 
 #### How do I install Conversations?
 
-Conversations is entirely open source and licensed under GPLv3. So if you are a
+Conversations Classic 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.
 
-The more convenient way — which not only gives you automatic updates but also
-supports the further development of Conversations — is to buy the App in the
-Google [Play Store](https://play.google.com/store/apps/details?id=eu.siacs.conversations&referrer=utm_source%3Dcodeberg).
-
-Buying the App from the Play Store will also give you access to our [beta test](#beta).
-
-#### I don't have a Google Account but I would still like to make a donation
-
-I’m listing several options to support me financially on [my website](https://gultsch.de/donate.html). Among other things [Liberapay](https://liberapay.com/iNPUTmice/donate), [GitHub Sponsors](https://github.com/sponsors/inputmice) and bank transfer.
-
 #### How do I create an account?
-XMPP, like email, is a federated protocol, which means that there is not one company you can create an *official XMPP account* with. Instead there are hundreds, or even thousands, of providers out there. One of those providers is our very own [conversations.im](https://account.conversations.im). If you don’t like to use *conversations.im* use a web search engine of your choice to find another provider. Or maybe your university has one. Or you can run your own. Or ask a friend to run one. Once you've found one, you can use Conversations to create an account. Just select *register new account* on server within the create account dialog.
+XMPP, like email, is a federated protocol, which means that there is not one company you can create an *official XMPP account* with. Instead there are hundreds, or even thousands, of providers out there. One of those providers is  [conversations.im](https://account.conversations.im). If you don’t like to use *conversations.im* use a web search engine of your choice to find another provider. Or maybe your university has one. Or you can run your own. Or ask a friend to run one. Once you've found one, you can use Conversations to create an account. Just select *register new account* on server within the create account dialog.
 
 ##### Domain hosting
 Using your own domain not only gives you a more recognizable Jabber ID, it also gives you the flexibility to migrate your account between different XMPP providers. This is a good compromise between the responsibilities of having to operate your own server and the downsides of being dependent on a single provider.
 
-Learn more about [conversations.im Jabber/XMPP domain hosting](https://account.conversations.im/domain/). 
-
 ##### Running your own
 If you already have a server somewhere and are willing and able to put the necessary work in you can run your own XMPP server.
 
-As of 2019 we recommend you use [ejabberd](https://ejabberd.im). The default configuration file already enables everything you need to pass the [Conversations Compliance Suite](https://compliance.conversations.im). Make sure your Linux distribution ships a fairly recent version.
+As of 2023 XMPP has reached a level of maturity where all major XMPP servers ([ejabberd](https://ejabberd.im), [Prosody](https://prosody.im), [Openfire](https://www.igniterealtime.org/projects/openfire/), [Tigase](https://tigase.net/xmpp-server/)) should work well with Conversations.
 
-With a little bit of effort [Prosody](https://prosody.im) can be configured to support all necessary extensions as well. However you will have to rely on so called [Community Modules](https://modules.prosody.im/) of varying quality. Prosody can be interesting to people who like to modify their server and create / prototype own modules.
-
-Performance wise - for small deployments - both ejabberd and Prosody should be fine. 
+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 will automatically look up the SRV records for your domain name
+Conversations Classic 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.
+Conversations Classic.
 
 #### I get 'Incompatible Server'
 
@@ -122,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 is able to handle. Conversations supports
+a login (SASL) mechanism that Conversations Classic is able to handle. Conversations Classic 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 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 doesn’t like that.
-This can be fixed by creating a new account in Conversations 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 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`. 
 
 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.
 
@@ -140,16 +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.**
 
-#### I’m getting this annoying permanent notification
-Starting with Conversations 2.3.6 Conversations releases distributed over the Google Play Store will display a permanent notification if you are running it on Android 8 and above. This is a rule that it is essentially enforced by the Google Play Store. (You won’t have the problem  of a *forced* foreground notification if you are getting your app from F-Droid.)
-
-However you can disable the notification via settings of the operating system. (Not settings in Conversations.)
-
-**The battery consumption and the entire behavior of Conversations 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 from F-Droid (all Android versions)
-The foreground notification is still controlled over the expert settings within Conversations 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 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 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.
@@ -157,43 +130,24 @@ Long press the permanent notification and disable that particular type of notifi
 ##### Android 9.0+
 Long press the permanent notification and press the info `(i)` button to get into the App info screen. In that screen touch the 'Notification' entry. In the next screen remove the checkbox for the 'Foreground service' entry. 
 
-#### How do XEP-0357: Push Notifications work?
-You need to be running the Play Store version of Conversations and your server needs to support push notifications.¹ Because *Google’s Firebase Cloud Messaging (FCM)* are tied with an API key to a specific app your server can not initiate the push message directly. Instead your server will send the push notification to the [Conversations App server](https://github.com/iNPUTmice/p2) (operated by us) which then acts as a proxy and initiates the push message for you. The push message sent from our App server through FCM doesn’t contain any personal information. It is just an empty message which will wake up your device and tell Conversations to reconnect to your server. The information sent from your server to our App server depends on the configuration of your server but can be limited to your account name. (In any case the Conversations App server won't redirect any information through FCM even if your server sends this information.)
-
-In summary Google will never get hold of any personal information besides that *something* happened. (Which doesn’t even have to be a message but can be some automated event as well.) We - as the operator of the App server - will just get hold of your account name (without being able to tie this to your specific device).
-
-If you don’t want this simply pick a server which does not offer Push Notifications or build Conversations yourself without support for push notifications. (This is available via a gradle build flavor.) Non-play store source of Conversations like the Amazon App store will also offer a version without push notifications. Conversations will just work as before and maintain its own TCP connection in the background.
-
-You can find a detailed description of how your server, the app server and FCM are interacting with each other in the [README](https://github.com/iNPUTmice/p2/blob/master/README.md) of the Conversations App Server.
-
- ¹ If you use the Play Store version you do **not** need to run your own app server. Your server only needs to support the server side of [XEP-0357: Push Notifications](http://xmpp.org/extensions/xep-0357.html) and [XEP-0198: Stream Management](https://xmpp.org/extensions/xep-0198.html). The prosody server modules are called *mod_cloud_notify* and *mod_smacks*. The ejabberd server modules are called *mod_push* and *mod_stream_mgmt*.
-
-
-#### But why do I need a permanent notification if I use Google Push?
-FCM (Google Push) allows an app to wake up from *Doze* which is (as the name suggests) a hibernation feature of the Android operating system that cuts the network connection and also reduces the number of times the app is allowed to wake up (to ping the server for example). The app can ask to be excluded from doze. Non push variants of the app (from F-Droid or if the server doesn’t support it) will do this on first start up. So if you get exemption from *Doze*, or if you get regular push events sent to you, Doze should not pose a threat to Conversatons working properly. But even with *Doze* the app is still open in the background (kept in memory); it is just limited in the actions it can do. Conversations needs to stay in memory to hold certain session state (online status of contacts, join status of group chats, …). However with Android 8 Google changed all of this again and now an App that wants to stay in memory needs to have a foreground service which is visible to the user via the annoying notification. But why does Conversations need to hold that state? XMPP is a statefull protocol that has a lot of per-session information; packets need to be counted, presence information needs to be held, some features like Message Carbons get activated once per session, MAM catch-up happens once, service discovery happens only once; the list goes on. When Conversations was created in early 2014 none of this was a problem because apps were just allowed to stay in memory. Basically every XMPP client out there holds that information in memory because it would be a lot more complicated trying to persist it to disk. An entire rewrite of Conversations in the year 2019 would attempt to do that and would probably succeed however it would require exactly that; a complete rewrite which is not feasible right now. That’s by the way also the reason why it is difficult to write an XMPP client on iOS. Or more broadly put this is also the reason why other protocols are designed as or migrated to stateless protocols (often based on HTTP); take for example the migration of IMAP to [JMAP](https://jmap.io/).
-
 #### Conversations doesn’t work for me. Where can I get help?
 
-You can join our conference room on [`conversations@conference.siacs.eu`](https://conversations.im/j/conversations@conference.siacs.eu).
+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 or can provide you with tips on running your own XMPP server. If
+Conversations Classic 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.
 
-#### I need professional support with Conversations or setting up my server
-
-I'm available for hire. Contact information can be found on [my website](https://gultsch.de).
-
 #### How does the address book integration work?
 
-The address book integration was designed to protect your privacy. Conversations
+The address book integration was designed to protect your privacy. Conversations Classic
 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 will use the name and
+add a Jabber ID to your phones address book Conversations Classic 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. This will start an "add to address book" intent
-with the JID as the payload. This doesn't require Conversations to have write
+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
 permissions on your address book but also doesn't require you to copy/paste a
 JID from one app to another.
 
@@ -249,45 +203,23 @@ 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 should be an instant messenger for the future and
-instead of making Conversations compatible with the past we should work on
+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
 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 is trying to get rid of old behaviours and set an example for
+Conversations Classic is trying to get rid of old behaviours and set an example for
 other clients.
 
-#### Translations
-Translations are managed on [Weblate](https://translate.codeberg.org/projects/conversations/).
 
-You can log in with your Codeberg account and start translating.
+#### How do I backup / move Conversations Classic to a new device?
 
-#### How do I backup / move Conversations to a new device?
+Use the Backup button in the Settings.
 
-See the dedicated guides for 
-- [backups](docs/user/backup.md)
-- [migrations](docs/user/migrating_to_new_device.md)
+#### Conversations Classic is missing a certain feature
 
-#### Conversations is missing a certain feature
-
-I'm open for new feature suggestions. You can use the [issue tracker][https://codeberg.org/iNPUTmice/Conversations/issues]
-on Codeberg.  Please take some time to browse through the issues to see if someone
-else already suggested it. Be assured that I read each and every ticket. If I
-like it I will leave it open until it's implemented. If I don't like it I will
-close it (usually with a short comment). If I don't comment on an feature
-request that's probably a good sign because this means I agree with you.
-Commenting with +1 on either open or closed issues won't change my mind, nor
-will it accelerate the development.
-
-#### You closed my feature request but I want it really really badly
-
-Just write it yourself and send me a pull request. If I like it I will happily
-merge it if I don't at least you and like minded people get to enjoy it.
-
-#### I need a feature and I need it now!
-
-I am available for hire. Find contact information on [my website](https://gultsch.de).
+Please report it to our XMPP conference [`xmppclient-dev@conference.narayana.im`](xmpp:xmppclient-dev@conference.narayana.im)
 
 ### Security
 
@@ -299,7 +231,7 @@ I am available for hire. Find contact information on [my website](https://gultsc
 #### How do I use OpenPGP
 
 Before you continue reading you should note that the OpenPGP support in
-Conversations is experimental. This is not because it will make the app unstable
+Conversations Classic 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
@@ -337,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 to ensure that.
+Right now there is no check in Conversations Classic 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 is the only client that uses
+feature is regarded experimental. Conversations Classic is the only client that uses
 XEP-0027 with conferences. (The XEP neither specifically allows nor disallows
 this.)
 
@@ -350,89 +282,6 @@ this.)
 
 Read more about the concept on https://gultsch.de/trust.html
 
-#### What happened to OTR support?
-OTR was removed because it was highly unreliable. It didn’t work with multiple devices and was never really specified to work with XMPP. The codebase was a mess (There was an HTML parser in there for crying out loud to deal with the garbage some OTR clients would send.) Verification was implemented in a non-blocking way. It would tell you if the current session was using an unknown fingerprint but it didn’t actively stopped you from sending messages until you have confirmed the new fingerprint. (Like Conversations would do now with BTBV after verification or when BTBV is turned off.) Considering the previous points there was little to no desire from my point to fix this potential security issue or clean up the code base. Another reason for the removal was that people would use it *accidentally* even to communicate between two Conversations clients because they read somewhere that OTR is good.
-
-### What clients do I use on other platforms
-There are XMPP Clients available for all major platforms.
-#### Windows / Linux
-For your desktop computer we recommend that you use [Gajim](https://gajim.org). You need to install the `OMEMO` plugin to get the best compatibility with Conversations. Plugins can be installed from within the app, from your distribution, or from flatpak if you installed it from there.
-#### iOS
-Unfortunately we don‘t have a recommendation for iPhones right now. There are three clients available [Siskin](https://siskin.im/), [ChatSecure](https://chatsecure.org/) and [Monal](https://monal.im/). Each with their own pros and cons.
-
-
-### Development
-
-<a name="beta"></a>
-#### Beta testing
-If you bought the App on [Google Play](https://play.google.com/store/apps/details?id=eu.siacs.conversations)
-you can get access to the the latest beta version by signing up using [this link](https://play.google.com/apps/testing/eu.siacs.conversations).
-
-#### How do I build Conversations
-
-Make sure to have ANDROID_HOME point to your Android SDK. Use the Android SDK Manager to install missing dependencies.
-
-Alternatively (and to avoid thinking about environment variables), create a file called local.properties, in the root of the Conversations build tree,
-with the following contents:
-
-```
-## This file must *NOT* be checked into Version Control Systems,
-# as it contains information specific to your local configuration.
-#
-# Location of the SDK. This is only used by Gradle.
-# For customization when using a Version Control System, please read the
-# header note.
-#Wed May 20 16:21:35 CST 2020
-ndk.dir=Path-To-Ndk
-sdk.dir=Path-To-Sdk
-```
-
-Then issue the following commands in order to build the apk.
-
-    git clone https://codeberg.org/iNPUTmice/Conversations.git
-    cd Conversations
-    ./gradlew assembleConversationsFreeDebug
-
-There are two build flavors available. *free* and *playstore*. Unless you know what you are doing you only need *free*.
-
-You will find the apks in the `./build/outputs/apk/conversationsFree/debug/` directory.
-
-Be careful, the resulting apks will not install unless you delete your existing Conversations installation (which will delete all the messages from your phone, and if you have used OMEMO, you will not be able to restore them from the server).
-Do it at your own risk.
-
-You, though, can make your own build a "test build", that can be installed alongside the normal (F-Droid or Google Play) Conversations:
-
-In the file `build.gradle`, find the line `applicationId "eu.siacs.conversations"` , and replace it with `applicationId "my.conversations.fork"`, also below replace "Conversations" appName with "MyCFork".
-Then the resulting APK can be installed ALONGSIDE normal Conversations. And have a different name so it's not confusing
-
-WARNING: DO NOT REPLACE ANYTHING ELSE ANYWHERE ELSE, DO NOT REPLACE THIS PROJECT WIDE. JUST 2 strings in THAT specific file!
-
-#### How do I debug Conversations
-
-If something goes wrong Conversations usually exposes very little information in
-the UI (other than the fact that something didn't work). However with adb
-(android debug bridge) you can squeeze some more information out of Conversations.
-These information are especially useful if you are experiencing trouble with
-your connection or with file transfer.
-
-To use adb you have to connect your mobile phone to your computer with an USB cable
-and install `adb`. Most Linux systems have prebuilt packages for that tool. On
-Debian/Ubuntu for example it is called `android-tools-adb`.
-
-Furthermore you might have to enable 'USB debugging' in the Developer options of your
-phone. After that you can just execute the following on your computer:
-
-    adb -d logcat -v time -s conversations
-
-If need be there are also some Apps on the PlayStore that can be used to show the logcat
-directly on your rooted phone. (Search for logcat). However in regards to further processing
-(for example to create an issue here on Codeberg) it is more convenient to just use your PC.
-
 #### I found a bug
 
-Please report it to our [issue tracker](https://codeberg.org/iNPUTmice/Conversations/issues). If your app crashes please
-provide a stack trace. If you are experiencing misbehavior please provide
-detailed steps to reproduce. Always mention whether you are running the latest
-Play Store version or the current HEAD. If you are having problems connecting to
-your XMPP server your file transfer doesn’t work as expected please always
-include a logcat debug output with your issue (see above).
+Please report it to our XMPP conference [`xmppclient-dev@conference.narayana.im`](xmpp:xmppclient-dev@conference.narayana.im). 

annotation-processor/build.gradle

@@ -1,15 +0,0 @@
-apply plugin: "java-library"
-
-java {
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
-}
-dependencies {
-
-    implementation project(':annotation')
-
-    annotationProcessor 'com.google.auto.service:auto-service:1.0.1'
-    api 'com.google.auto.service:auto-service-annotations:1.0.1'
-    implementation 'com.google.guava:guava:31.1-jre'
-
-}

annotation-processor/src/main/java/im/conversations/android/annotation/processor/XmlElementProcessor.java

@@ -1,160 +0,0 @@
-package im.conversations.android.annotation.processor;
-
-import com.google.auto.service.AutoService;
-import com.google.common.base.CaseFormat;
-import com.google.common.base.Objects;
-import com.google.common.base.Strings;
-import com.google.common.collect.ImmutableMap;
-import im.conversations.android.annotation.XmlElement;
-import im.conversations.android.annotation.XmlPackage;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.util.Map;
-import java.util.Set;
-import javax.annotation.processing.AbstractProcessor;
-import javax.annotation.processing.Processor;
-import javax.annotation.processing.RoundEnvironment;
-import javax.annotation.processing.SupportedAnnotationTypes;
-import javax.annotation.processing.SupportedSourceVersion;
-import javax.lang.model.SourceVersion;
-import javax.lang.model.element.Element;
-import javax.lang.model.element.PackageElement;
-import javax.lang.model.element.TypeElement;
-import javax.tools.JavaFileObject;
-
-@AutoService(Processor.class)
-@SupportedSourceVersion(SourceVersion.RELEASE_17)
-@SupportedAnnotationTypes("im.conversations.android.annotation.XmlElement")
-public class XmlElementProcessor extends AbstractProcessor {
-
-    @Override
-    public boolean process(Set<? extends TypeElement> set, RoundEnvironment roundEnvironment) {
-        final Set<? extends Element> elements =
-                roundEnvironment.getElementsAnnotatedWith(XmlElement.class);
-        final ImmutableMap.Builder<Id, String> builder = ImmutableMap.builder();
-        for (final Element element : elements) {
-            if (element instanceof final TypeElement typeElement) {
-                final Id id = of(typeElement);
-                builder.put(id, typeElement.getQualifiedName().toString());
-            }
-        }
-        final ImmutableMap<Id, String> maps = builder.build();
-        if (maps.isEmpty()) {
-            return false;
-        }
-        final JavaFileObject extensionFile;
-        try {
-            extensionFile =
-                    processingEnv
-                            .getFiler()
-                            .createSourceFile("im.conversations.android.xmpp.Extensions");
-        } catch (final IOException e) {
-            throw new RuntimeException(e);
-        }
-        try (final PrintWriter out = new PrintWriter(extensionFile.openWriter())) {
-            out.println("package im.conversations.android.xmpp;");
-            out.println("import com.google.common.collect.BiMap;");
-            out.println("import com.google.common.collect.ImmutableBiMap;");
-            out.println("import im.conversations.android.xmpp.ExtensionFactory;");
-            out.println("import im.conversations.android.xmpp.model.Extension;");
-            out.print("\n");
-            out.println("public final class Extensions {");
-            out.println(
-                    "public static final BiMap<ExtensionFactory.Id, Class<? extends Extension>>"
-                            + " EXTENSION_CLASS_MAP;");
-            out.println("static {");
-            out.println(
-                    "final var builder = new ImmutableBiMap.Builder<ExtensionFactory.Id, Class<?"
-                            + " extends Extension>>();");
-            for (final Map.Entry<Id, String> entry : maps.entrySet()) {
-                Id id = entry.getKey();
-                String clazz = entry.getValue();
-                out.format(
-                        "builder.put(new ExtensionFactory.Id(\"%s\",\"%s\"),%s.class);",
-                        id.name, id.namespace, clazz);
-                out.print("\n");
-            }
-            out.println("EXTENSION_CLASS_MAP = builder.build();");
-            out.println("}");
-            out.println(" private Extensions() {}");
-            out.println("}");
-            // writing generated file to out …
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-        return true;
-    }
-
-    private static Id of(final TypeElement typeElement) {
-        final XmlElement xmlElement = typeElement.getAnnotation(XmlElement.class);
-        PackageElement packageElement = getPackageElement(typeElement);
-        XmlPackage xmlPackage =
-                packageElement == null ? null : packageElement.getAnnotation(XmlPackage.class);
-        if (xmlElement == null) {
-            throw new IllegalStateException(
-                    String.format(
-                            "%s is not annotated as @XmlElement",
-                            typeElement.getQualifiedName().toString()));
-        }
-        final String packageNamespace = xmlPackage == null ? null : xmlPackage.namespace();
-        final String elementName = xmlElement.name();
-        final String elementNamespace = xmlElement.namespace();
-        final String namespace;
-        if (!Strings.isNullOrEmpty(elementNamespace)) {
-            namespace = elementNamespace;
-        } else if (!Strings.isNullOrEmpty(packageNamespace)) {
-            namespace = packageNamespace;
-        } else {
-            throw new IllegalStateException(
-                    String.format(
-                            "%s does not declare a namespace",
-                            typeElement.getQualifiedName().toString()));
-        }
-        final String name;
-        if (Strings.isNullOrEmpty(elementName)) {
-            name =
-                    CaseFormat.UPPER_CAMEL.to(
-                            CaseFormat.LOWER_HYPHEN, typeElement.getSimpleName().toString());
-        } else {
-            name = elementName;
-        }
-        return new Id(name, namespace);
-    }
-
-    private static PackageElement getPackageElement(final TypeElement typeElement) {
-        final Element parent = typeElement.getEnclosingElement();
-        if (parent instanceof PackageElement) {
-            return (PackageElement) parent;
-        } else {
-            final Element nextParent = parent.getEnclosingElement();
-            if (nextParent instanceof PackageElement) {
-                return (PackageElement) nextParent;
-            } else {
-                return null;
-            }
-        }
-    }
-
-    public static class Id {
-        public final String name;
-        public final String namespace;
-
-        public Id(String name, String namespace) {
-            this.name = name;
-            this.namespace = namespace;
-        }
-
-        @Override
-        public boolean equals(Object o) {
-            if (this == o) return true;
-            if (o == null || getClass() != o.getClass()) return false;
-            Id id = (Id) o;
-            return Objects.equal(name, id.name) && Objects.equal(namespace, id.namespace);
-        }
-
-        @Override
-        public int hashCode() {
-            return Objects.hashCode(name, namespace);
-        }
-    }
-}

annotation/build.gradle

@@ -1,6 +0,0 @@
-apply plugin: "java-library"
-
-java {
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
-}

annotation/src/main/java/im/conversations/android/annotation/XmlElement.java

@@ -1,15 +0,0 @@
-package im.conversations.android.annotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-@Retention(RetentionPolicy.SOURCE)
-@Target({ElementType.TYPE})
-public @interface XmlElement {
-
-    String name() default "";
-
-    String namespace() default "";
-}

annotation/src/main/java/im/conversations/android/annotation/XmlPackage.java

@@ -1,12 +0,0 @@
-package im.conversations.android.annotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-@Retention(RetentionPolicy.SOURCE)
-@Target(ElementType.PACKAGE)
-public @interface XmlPackage {
-    String namespace();
-}

app/build.gradle

@@ -1,147 +0,0 @@
-apply plugin: "com.android.application"
-apply plugin: "androidx.navigation.safeargs"
-apply plugin: "com.diffplug.spotless"
-
-
-android {
-    namespace 'im.conversations.android'
-    compileSdk 33
-
-    defaultConfig {
-        minSdk 23
-        targetSdk 33
-        versionCode 1
-        versionName "3.0.0-alpha"
-
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-
-        javaCompileOptions {
-            annotationProcessorOptions {
-                arguments += ["room.schemaLocation": "$projectDir/schemas".toString()]
-            }
-        }
-    }
-
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-        }
-    }
-    compileOptions {
-        coreLibraryDesugaringEnabled true
-        sourceCompatibility JavaVersion.VERSION_17
-        targetCompatibility JavaVersion.VERSION_17
-    }
-    buildFeatures {
-        dataBinding true
-    }
-    flavorDimensions "product"
-    productFlavors {
-        quicksy {
-            dimension "product"
-            applicationId = "im.quicksy.client"
-
-            def appName = "Quicksy"
-
-            resValue "string", "applicationId", applicationId
-            resValue "string", "app_name", appName
-            buildConfigField "String", "APP_NAME", "\"$appName\""
-        }
-        conversations {
-            dimension "product"
-            applicationId "im.conversations.android"
-
-            def appName = "Conversations"
-
-            resValue "string", "applicationId", applicationId
-            resValue "string", "app_name", appName
-            buildConfigField "String", "APP_NAME", "\"$appName\""
-        }
-    }
-
-}
-
-spotless {
-    java {
-        target '**/*.java'
-        googleJavaFormat().aosp().reflowLongStrings()
-    }
-}
-
-dependencies {
-    implementation project(':annotation')
-    annotationProcessor project(':annotation-processor')
-
-    // make Java 8 API available
-    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.3'
-
-
-    // Jetpack / AndroidX libraries
-    implementation "androidx.appcompat:appcompat:$rootProject.ext.appcompatVersion"
-
-    implementation "androidx.lifecycle:lifecycle-extensions:$rootProject.ext.lifecycleVersion"
-    implementation "androidx.navigation:navigation-fragment:$rootProject.ext.navVersion"
-    implementation "androidx.navigation:navigation-ui:$rootProject.ext.navVersion"
-
-    implementation "androidx.room:room-runtime:$rootProject.ext.roomVersion"
-    implementation "androidx.room:room-guava:$rootProject.ext.roomVersion"
-    implementation "androidx.room:room-paging:$rootProject.ext.roomVersion"
-    annotationProcessor "androidx.room:room-compiler:$rootProject.ext.roomVersion"
-
-    implementation "androidx.paging:paging-runtime:$rootProject.ext.pagingVersion"
-
-    implementation "androidx.preference:preference:$rootProject.ext.preferenceVersion"
-
-
-    implementation "androidx.security:security-crypto:1.0.0"
-
-
-    // Google material design libraries
-    implementation "com.google.android.material:material:$rootProject.ext.material"
-
-    // LeakCanary to detect memory leaks in debug builds
-    debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.10'
-
-    // crypto libraries
-    implementation 'org.whispersystems:signal-protocol-java:2.6.2'
-    implementation 'org.conscrypt:conscrypt-android:2.5.2'
-    implementation 'org.bouncycastle:bcmail-jdk15on:1.64'
-
-
-    // XMPP Address library
-    implementation 'org.jxmpp:jxmpp-jid:1.0.3'
-
-    // WebRTC
-    implementation 'im.conversations.webrtc:webrtc-android:104.0.0'
-
-
-    // Consistent Color Generation
-    implementation 'org.hsluv:hsluv:0.2'
-
-
-    // DNS library (XMPP needs to resolve SRV records)
-    implementation 'de.measite.minidns:minidns-hla:0.2.4'
-
-
-    // Guava
-    implementation 'com.google.guava:guava:31.1-android'
-
-
-    // HTTP library
-    implementation "com.squareup.okhttp3:okhttp:4.10.0"
-
-
-    // JSON parser
-    implementation 'com.google.code.gson:gson:2.10.1'
-
-
-    // logging framework + logging api
-    implementation 'org.slf4j:slf4j-api:1.7.36'
-    implementation 'com.github.tony19:logback-android:2.0.1'
-
-    testImplementation 'junit:junit:4.13.2'
-    testImplementation 'org.robolectric:robolectric:4.9.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
-    androidTestImplementation "androidx.test.espresso:espresso-core:$rootProject.ext.espressoVersion"
-}

app/proguard-rules.pro

@@ -1,21 +0,0 @@
-# Add project specific ProGuard rules here.
-# You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
-
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile

app/src/androidTest/java/im/conversations/android/xmpp/ArchivePagingTest.java

@@ -1,214 +0,0 @@
-package im.conversations.android.xmpp;
-
-import static org.hamcrest.Matchers.*;
-
-import androidx.test.core.app.ApplicationProvider;
-import androidx.test.ext.junit.runners.AndroidJUnit4;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Iterables;
-import im.conversations.android.database.model.Account;
-import im.conversations.android.database.model.StanzaId;
-import im.conversations.android.transformer.MessageTransformation;
-import im.conversations.android.transformer.Transformer;
-import im.conversations.android.xmpp.manager.ArchiveManager;
-import im.conversations.android.xmpp.model.jabber.Body;
-import im.conversations.android.xmpp.model.stanza.Message;
-import java.time.Instant;
-import java.util.Collections;
-import java.util.concurrent.ExecutionException;
-import org.hamcrest.MatcherAssert;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-@RunWith(AndroidJUnit4.class)
-public class ArchivePagingTest extends BaseTransformationTest {
-
-    @Test
-    public void initialQuery() throws ExecutionException, InterruptedException {
-        final var ranges = database.archiveDao().resetLivePage(account(), ACCOUNT);
-        final Range range = Iterables.getOnlyElement(ranges);
-        Assert.assertNull(range.id);
-        Assert.assertEquals(Range.Order.REVERSE, range.order);
-    }
-
-    @Test
-    public void queryAfterSingleLiveMessage() throws ExecutionException, InterruptedException {
-        final var stub = new StubMessage(2);
-        transformer.transform(stub.messageTransformation(), stub.stanzaId());
-        final var ranges = database.archiveDao().resetLivePage(account(), ACCOUNT);
-        Assert.assertEquals(2, ranges.size());
-        MatcherAssert.assertThat(
-                ranges,
-                contains(new Range(Range.Order.REVERSE, "2"), new Range(Range.Order.NORMAL, "2")));
-    }
-
-    @Test
-    public void twoLiveMessageQueryNoSubmitAndQuery()
-            throws ExecutionException, InterruptedException {
-        final var stub2 = new StubMessage(2);
-        transformer.transform(stub2.messageTransformation(), stub2.stanzaId());
-        final var stub3 = new StubMessage(3);
-        transformer.transform(stub3.messageTransformation(), stub3.stanzaId());
-
-        final var ranges = database.archiveDao().resetLivePage(account(), ACCOUNT);
-        Assert.assertEquals(2, ranges.size());
-        MatcherAssert.assertThat(
-                ranges,
-                contains(new Range(Range.Order.REVERSE, "2"), new Range(Range.Order.NORMAL, "3")));
-
-        final var stub4 = new StubMessage(4);
-        transformer.transform(stub4.messageTransformation(), stub4.stanzaId());
-
-        final var rangesSecondAttempt = database.archiveDao().resetLivePage(account(), ACCOUNT);
-        Assert.assertEquals(2, rangesSecondAttempt.size());
-        MatcherAssert.assertThat(
-                rangesSecondAttempt,
-                contains(new Range(Range.Order.REVERSE, "2"), new Range(Range.Order.NORMAL, "3")));
-    }
-
-    @Test
-    public void liveMessageQuerySubmitAndQuery() throws ExecutionException, InterruptedException {
-        final var stub2 = new StubMessage(2);
-        transformer.transform(stub2.messageTransformation(), stub2.stanzaId());
-        final var stub3 = new StubMessage(3);
-        transformer.transform(stub3.messageTransformation(), stub3.stanzaId());
-
-        final var ranges = database.archiveDao().resetLivePage(account(), ACCOUNT);
-        Assert.assertEquals(2, ranges.size());
-        MatcherAssert.assertThat(
-                ranges,
-                contains(new Range(Range.Order.REVERSE, "2"), new Range(Range.Order.NORMAL, "3")));
-
-        final var stub4 = new StubMessage(4);
-        transformer.transform(stub4.messageTransformation(), stub4.stanzaId());
-
-        for (final Range range : ranges) {
-            database.archiveDao()
-                    .submitPage(
-                            account(),
-                            ACCOUNT,
-                            range,
-                            new ArchiveManager.QueryResult(
-                                    true, Page.emptyWithCount(range.id, null)),
-                            false);
-        }
-
-        final var rangesSecondAttempt = database.archiveDao().resetLivePage(account(), ACCOUNT);
-        // we mark the reversing range as complete in the submit above; hence it is not included in
-        // the second ranges
-        Assert.assertEquals(1, rangesSecondAttempt.size());
-        MatcherAssert.assertThat(rangesSecondAttempt, contains(new Range(Range.Order.NORMAL, "4")));
-    }
-
-    @Test
-    public void liveMessageQuerySubmitTwice() throws ExecutionException, InterruptedException {
-        final var stub2 = new StubMessage(2);
-        transformer.transform(stub2.messageTransformation(), stub2.stanzaId());
-
-        final var ranges = database.archiveDao().resetLivePage(account(), ACCOUNT);
-        Assert.assertEquals(2, ranges.size());
-        MatcherAssert.assertThat(
-                ranges,
-                contains(new Range(Range.Order.REVERSE, "2"), new Range(Range.Order.NORMAL, "2")));
-
-        final var account = account();
-
-        final var transformer =
-                new Transformer(account, ApplicationProvider.getApplicationContext(), database);
-
-        transformer.transform(
-                Collections.emptyList(),
-                ACCOUNT,
-                new Range(Range.Order.REVERSE, "2"),
-                new ArchiveManager.QueryResult(true, Page.emptyWithCount("2", null)),
-                true);
-        transformer.transform(
-                Collections.emptyList(),
-                ACCOUNT,
-                new Range(Range.Order.NORMAL, "2"),
-                new ArchiveManager.QueryResult(false, new Page("3", "4", 2)),
-                false);
-
-        transformer.transform(
-                Collections.emptyList(),
-                ACCOUNT,
-                new Range(Range.Order.NORMAL, "4"),
-                new ArchiveManager.QueryResult(true, new Page("5", "6", 2)),
-                false);
-
-        final var rangesSecondAttempt = database.archiveDao().resetLivePage(account(), ACCOUNT);
-        // we mark the reversing range as complete in the submit above; hence it is not included in
-        // the second ranges
-        Assert.assertEquals(1, rangesSecondAttempt.size());
-        MatcherAssert.assertThat(rangesSecondAttempt, contains(new Range(Range.Order.NORMAL, "6")));
-    }
-
-    @Test
-    public void liveMessageQuerySubmitTwiceWithDuplicates()
-            throws ExecutionException, InterruptedException {
-        final var stub2 = new StubMessage(2);
-        transformer.transform(stub2.messageTransformation(), stub2.stanzaId());
-
-        final var ranges = database.archiveDao().resetLivePage(account(), ACCOUNT);
-        Assert.assertEquals(2, ranges.size());
-        MatcherAssert.assertThat(
-                ranges,
-                contains(new Range(Range.Order.REVERSE, "2"), new Range(Range.Order.NORMAL, "2")));
-
-        final var account = account();
-
-        final var transformer =
-                new Transformer(account, ApplicationProvider.getApplicationContext(), database);
-
-        transformer.transform(
-                Collections.emptyList(),
-                ACCOUNT,
-                new Range(Range.Order.REVERSE, "2"),
-                new ArchiveManager.QueryResult(true, Page.emptyWithCount("2", null)),
-                true);
-        transformer.transform(
-                ImmutableList.of(stub2.messageTransformation()),
-                ACCOUNT,
-                new Range(Range.Order.NORMAL, "2"),
-                new ArchiveManager.QueryResult(false, new Page("3", "4", 2)),
-                false);
-
-        transformer.transform(
-                Collections.emptyList(),
-                ACCOUNT,
-                new Range(Range.Order.NORMAL, "4"),
-                new ArchiveManager.QueryResult(true, new Page("5", "6", 2)),
-                false);
-    }
-
-    private Account account() throws ExecutionException, InterruptedException {
-        return this.database.accountDao().getEnabledAccount(ACCOUNT).get();
-    }
-
-    private static class StubMessage {
-        public final int id;
-
-        private StubMessage(int id) {
-            this.id = id;
-        }
-
-        public StanzaId stanzaId() {
-            return new StanzaId(String.valueOf(id), ACCOUNT);
-        }
-
-        public MessageTransformation messageTransformation() {
-            final var message = new Message();
-            message.setTo(ACCOUNT);
-            message.setFrom(REMOTE);
-            message.addExtension(new Body()).setContent(String.format("%s (%d)", GREETING, id));
-            return MessageTransformation.of(
-                    message,
-                    Instant.ofEpochSecond(id * 2000L),
-                    REMOTE,
-                    String.valueOf(id),
-                    message.getFrom().asBareJid(),
-                    null);
-        }
-    }
-}

app/src/androidTest/java/im/conversations/android/xmpp/BaseTransformationTest.java

@@ -1,42 +0,0 @@
-package im.conversations.android.xmpp;
-
-import android.content.Context;
-import androidx.room.Room;
-import androidx.test.core.app.ApplicationProvider;
-import im.conversations.android.IDs;
-import im.conversations.android.database.ConversationsDatabase;
-import im.conversations.android.database.entity.AccountEntity;
-import im.conversations.android.transformer.Transformer;
-import java.util.concurrent.ExecutionException;
-import org.junit.Before;
-import org.jxmpp.jid.BareJid;
-import org.jxmpp.jid.impl.JidCreate;
-
-public abstract class BaseTransformationTest {
-
-    protected static final BareJid ACCOUNT = JidCreate.bareFromOrThrowUnchecked("user@example.com");
-    protected static final BareJid REMOTE =
-            JidCreate.bareFromOrThrowUnchecked("juliet@example.com");
-    protected static final BareJid REMOTE_2 =
-            JidCreate.bareFromOrThrowUnchecked("romeo@example.com");
-
-    protected static final String GREETING = "Hi Juliet. How are you?";
-
-    protected ConversationsDatabase database;
-    protected Transformer transformer;
-
-    @Before
-    public void setupTransformer() throws ExecutionException, InterruptedException {
-        final Context context = ApplicationProvider.getApplicationContext();
-        this.database = Room.inMemoryDatabaseBuilder(context, ConversationsDatabase.class).build();
-        final var account = new AccountEntity();
-        account.address = ACCOUNT;
-        account.enabled = true;
-        account.randomSeed = IDs.seed();
-        final long id = database.accountDao().insert(account);
-
-        this.transformer =
-                new Transformer(
-                        database.accountDao().getEnabledAccount(id).get(), context, database);
-    }
-}

app/src/androidTest/java/im/conversations/android/xmpp/MessageTransformationTest.java

@@ -1,555 +0,0 @@
-package im.conversations.android.xmpp;
-
-import androidx.test.ext.junit.runners.AndroidJUnit4;
-import com.google.common.collect.Iterables;
-import im.conversations.android.database.model.Encryption;
-import im.conversations.android.database.model.MessageEmbedded;
-import im.conversations.android.database.model.Modification;
-import im.conversations.android.database.model.PartType;
-import im.conversations.android.transformer.MessageTransformation;
-import im.conversations.android.xmpp.model.correction.Replace;
-import im.conversations.android.xmpp.model.jabber.Body;
-import im.conversations.android.xmpp.model.reactions.Reaction;
-import im.conversations.android.xmpp.model.reactions.Reactions;
-import im.conversations.android.xmpp.model.receipts.Received;
-import im.conversations.android.xmpp.model.reply.Reply;
-import im.conversations.android.xmpp.model.retract.Retract;
-import im.conversations.android.xmpp.model.stanza.Message;
-import java.time.Instant;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.jxmpp.jid.impl.JidCreate;
-import org.jxmpp.jid.parts.Resourcepart;
-import org.jxmpp.stringprep.XmppStringprepException;
-
-@RunWith(AndroidJUnit4.class)
-public class MessageTransformationTest extends BaseTransformationTest {
-
-    @Test
-    public void reactionBeforeOriginal() throws XmppStringprepException {
-        final var reactionMessage = new Message();
-        reactionMessage.setId("2");
-        reactionMessage.setTo(ACCOUNT);
-        reactionMessage.setFrom(JidCreate.fullFrom(REMOTE, Resourcepart.from("junit")));
-        final var reactions = reactionMessage.addExtension(new Reactions());
-        reactions.setId("1");
-        final var reaction = reactions.addExtension(new Reaction());
-        reaction.setContent("Y");
-        this.transformer.transform(
-                MessageTransformation.of(
-                        reactionMessage,
-                        Instant.now(),
-                        REMOTE,
-                        "stanza-b",
-                        reactionMessage.getFrom().asBareJid(),
-                        null));
-        final var originalMessage = new Message();
-        originalMessage.setId("1");
-        originalMessage.setTo(REMOTE);
-        originalMessage.setFrom(JidCreate.fullFrom(ACCOUNT, Resourcepart.from(("junit"))));
-        final var body = originalMessage.addExtension(new Body());
-        body.setContent(GREETING);
-        this.transformer.transform(
-                MessageTransformation.of(
-                        originalMessage,
-                        Instant.now(),
-                        REMOTE,
-                        "stanza-a",
-                        originalMessage.getFrom().asBareJid(),
-                        null));
-
-        final var messages = database.messageDao().getMessagesForTesting(1L);
-        Assert.assertEquals(1, messages.size());
-        final var message = Iterables.getOnlyElement(messages);
-        final var onlyContent = Iterables.getOnlyElement(message.contents);
-        Assert.assertEquals(GREETING, onlyContent.body);
-        Assert.assertEquals(Encryption.CLEARTEXT, message.encryption);
-        final var onlyReaction = Iterables.getOnlyElement(message.reactions);
-        Assert.assertEquals("Y", onlyReaction.reaction);
-        Assert.assertEquals(REMOTE, onlyReaction.reactionBy);
-    }
-
-    @Test
-    public void multipleReactions() throws XmppStringprepException {
-        final var group = JidCreate.bareFrom("a@group.example.com");
-        final var message = new Message(Message.Type.GROUPCHAT);
-        message.addExtension(new Body("Please give me a thumbs up"));
-        message.setFrom(JidCreate.fullFrom(group, Resourcepart.from("user-a")));
-        this.transformer.transform(
-                MessageTransformation.of(
-                        message, Instant.now(), REMOTE, "stanza-a", null, "id-user-a"));
-
-        final var reactionA = new Message(Message.Type.GROUPCHAT);
-        reactionA.setFrom(JidCreate.fullFrom(group, Resourcepart.from("user-b")));
-        reactionA.addExtension(Reactions.to("stanza-a")).addExtension(new Reaction("Y"));
-        this.transformer.transform(
-                MessageTransformation.of(
-                        reactionA, Instant.now(), REMOTE, "stanza-b", null, "id-user-b"));
-
-        final var reactionB = new Message(Message.Type.GROUPCHAT);
-        reactionB.setFrom(JidCreate.fullFrom(group, Resourcepart.from("user-c")));
-        reactionB.addExtension(Reactions.to("stanza-a")).addExtension(new Reaction("Y"));
-        this.transformer.transform(
-                MessageTransformation.of(
-                        reactionB, Instant.now(), REMOTE, "stanza-c", null, "id-user-c"));
-
-        final var reactionC = new Message(Message.Type.GROUPCHAT);
-        reactionC.setFrom(JidCreate.fullFrom(group, Resourcepart.from("user-d")));
-        final var reactions = reactionC.addExtension(Reactions.to("stanza-a"));
-        reactions.addExtension(new Reaction("Y"));
-        reactions.addExtension(new Reaction("Z"));
-        this.transformer.transform(
-                MessageTransformation.of(
-                        reactionC, Instant.now(), REMOTE, "stanza-d", null, "id-user-d"));
-
-        final var messages = database.messageDao().getMessagesForTesting(1L);
-        Assert.assertEquals(1, messages.size());
-        final var dbMessage = Iterables.getOnlyElement(messages);
-        Assert.assertEquals(4, dbMessage.reactions.size());
-        final var aggregated = dbMessage.getAggregatedReactions();
-        final var mostFrequentReaction = Iterables.get(aggregated, 0);
-        Assert.assertEquals("Y", mostFrequentReaction.getKey());
-        Assert.assertEquals(3L, (long) mostFrequentReaction.getValue());
-        final var secondReaction = Iterables.get(aggregated, 1);
-        Assert.assertEquals("Z", secondReaction.getKey());
-        Assert.assertEquals(1L, (long) secondReaction.getValue());
-    }
-
-    @Test
-    public void correctionBeforeOriginal() throws XmppStringprepException {
-
-        final var messageCorrection = new Message();
-        messageCorrection.setId("2");
-        messageCorrection.setTo(ACCOUNT);
-        messageCorrection.setFrom(JidCreate.fullFrom(REMOTE, Resourcepart.from("junit")));
-        messageCorrection.addExtension(new Body()).setContent("Hi example!");
-        messageCorrection.addExtension(new Replace()).setId("1");
-
-        this.transformer.transform(
-                MessageTransformation.of(
-                        messageCorrection,
-                        Instant.now(),
-                        REMOTE,
-                        "stanza-a",
-                        messageCorrection.getFrom().asBareJid(),
-                        null));
-
-        // the correction should not show up as a message
-        Assert.assertEquals(0, database.messageDao().getMessagesForTesting(1L).size());
-
-        final var messageWithTypo = new Message();
-        messageWithTypo.setId("1");
-        messageWithTypo.setTo(ACCOUNT);
-        messageWithTypo.setFrom(JidCreate.fullFrom(REMOTE, Resourcepart.from("junit")));
-        messageWithTypo.addExtension(new Body()).setContent("Hii example!");
-
-        this.transformer.transform(
-                MessageTransformation.of(
-                        messageWithTypo,
-                        Instant.now(),
-                        REMOTE,
-                        "stanza-b",
-                        messageWithTypo.getFrom().asBareJid(),
-                        null));
-
-        final var messages = database.messageDao().getMessagesForTesting(1L);
-
-        Assert.assertEquals(1, messages.size());
-
-        final var message = Iterables.getOnlyElement(messages);
-        final var onlyContent = Iterables.getOnlyElement(message.contents);
-        Assert.assertEquals(Modification.CORRECTION, message.modification);
-        Assert.assertEquals("Hi example!", onlyContent.body);
-    }
-
-    @Test
-    public void correctionAfterOriginal() throws XmppStringprepException {
-
-        final var messageWithTypo = new Message();
-        messageWithTypo.setId("1");
-        messageWithTypo.setTo(ACCOUNT);
-        messageWithTypo.setFrom(JidCreate.fullFrom(REMOTE, Resourcepart.from("junit")));
-        messageWithTypo.addExtension(new Body()).setContent("Hii example!");
-
-        this.transformer.transform(
-                MessageTransformation.of(
-                        messageWithTypo,
-                        Instant.now(),
-                        REMOTE,
-                        "stanza-a",
-                        messageWithTypo.getFrom().asBareJid(),
-                        null));
-
-        Assert.assertEquals(1, database.messageDao().getMessagesForTesting(1L).size());
-
-        final var messageCorrection = new Message();
-        messageCorrection.setId("2");
-        messageCorrection.setTo(ACCOUNT);
-        messageCorrection.setFrom(JidCreate.fullFrom(REMOTE, Resourcepart.from("junit")));
-        messageCorrection.addExtension(new Body()).setContent("Hi example!");
-        messageCorrection.addExtension(new Replace()).setId("1");
-
-        this.transformer.transform(
-                MessageTransformation.of(
-                        messageCorrection,
-                        Instant.now(),
-                        REMOTE,
-                        "stanza-b",
-                        messageCorrection.getFrom().asBareJid(),
-                        null));
-
-        final var messages = database.messageDao().getMessagesForTesting(1L);
-
-        Assert.assertEquals(1, messages.size());
-
-        final var message = Iterables.getOnlyElement(messages);
-        final var onlyContent = Iterables.getOnlyElement(message.contents);
-        Assert.assertEquals(Modification.CORRECTION, message.modification);
-        Assert.assertEquals("Hi example!", onlyContent.body);
-    }
-
-    @Test
-    public void replacingReactions() throws XmppStringprepException {
-        final var group = JidCreate.bareFrom("a@group.example.com");
-        final var message = new Message(Message.Type.GROUPCHAT);
-        message.addExtension(new Body("Please give me a thumbs up"));
-        message.setFrom(JidCreate.fullFrom(group, Resourcepart.from("user-a")));
-        this.transformer.transform(
-                MessageTransformation.of(
-                        message, Instant.now(), REMOTE, "stanza-a", null, "id-user-a"));
-
-        final var reactionA = new Message(Message.Type.GROUPCHAT);
-        reactionA.setFrom(JidCreate.fullFrom(group, Resourcepart.from("user-b")));
-        reactionA.addExtension(Reactions.to("stanza-a")).addExtension(new Reaction("N"));
-        this.transformer.transform(
-                MessageTransformation.of(
-                        reactionA, Instant.now(), REMOTE, "stanza-b", null, "id-user-b"));
-
-        final var reactionB = new Message(Message.Type.GROUPCHAT);
-        reactionB.setFrom(JidCreate.fullFrom(group, Resourcepart.from("user-b")));
-        reactionB.addExtension(Reactions.to("stanza-a")).addExtension(new Reaction("Y"));
-        this.transformer.transform(
-                MessageTransformation.of(
-                        reactionB, Instant.now(), REMOTE, "stanza-c", null, "id-user-b"));
-
-        final var messages = database.messageDao().getMessagesForTesting(1L);
-        Assert.assertEquals(1, messages.size());
-        final var dbMessage = Iterables.getOnlyElement(messages);
-        Assert.assertEquals(1, dbMessage.reactions.size());
-    }
-
-    @Test
-    public void twoCorrectionsOneReactionBeforeOriginalInGroupChat()
-            throws XmppStringprepException {
-        final var group = JidCreate.bareFrom("a@group.example.com");
-        final var ogStanzaId = "og-stanza-id";
-        final var ogMessageId = "og-message-id";
-
-        // first correction
-        final var m1 = new Message(Message.Type.GROUPCHAT);
-        // m1.setId(ogMessageId);
-        m1.addExtension(new Body("Please give me an thumbs up"));
-        m1.addExtension(new Replace()).setId(ogMessageId);
-        m1.setFrom(JidCreate.fullFrom(group, Resourcepart.from("user-a")));
-        this.transformer.transform(
-                MessageTransformation.of(
-                        m1,
-                        Instant.ofEpochMilli(2000),
-                        REMOTE,
-                        "irrelevant-stanza-id1",
-                        null,
-                        "id-user-a"));
-
-        // second correction
-        final var m2 = new Message(Message.Type.GROUPCHAT);
-        // m2.setId(ogMessageId);
-        m2.addExtension(new Body("Please give me a thumbs up"));
-        m2.addExtension(new Replace()).setId(ogMessageId);
-        m2.setFrom(JidCreate.fullFrom(group, Resourcepart.from("user-a")));
-        this.transformer.transform(
-                MessageTransformation.of(
-                        m2,
-                        Instant.ofEpochMilli(3000),
-                        REMOTE,
-                        "irrelevant-stanza-id2",
-                        null,
-                        "id-user-a"));
-
-        // a reaction
-        final var reactionB = new Message(Message.Type.GROUPCHAT);
-        reactionB.setFrom(JidCreate.fullFrom(group, Resourcepart.from("user-b")));
-        reactionB.addExtension(Reactions.to(ogStanzaId)).addExtension(new Reaction("Y"));
-        this.transformer.transform(
-                MessageTransformation.of(
-                        reactionB,
-                        Instant.now(),
-                        REMOTE,
-                        "irrelevant-stanza-id3",
-                        null,
-                        "id-user-b"));
-
-        // the original message
-        final var m4 = new Message(Message.Type.GROUPCHAT);
-        m4.setId(ogMessageId);
-        m4.addExtension(new Body("Please give me thumbs up"));
-        m4.setFrom(JidCreate.fullFrom(group, Resourcepart.from("user-a")));
-        this.transformer.transform(
-                MessageTransformation.of(
-                        m4, Instant.ofEpochMilli(1000), REMOTE, ogStanzaId, null, "id-user-a"));
-
-        final var messages = database.messageDao().getMessagesForTesting(1L);
-        Assert.assertEquals(1, messages.size());
-        final var dbMessage = Iterables.getOnlyElement(messages);
-        Assert.assertEquals(1, dbMessage.reactions.size());
-        Assert.assertEquals(Modification.CORRECTION, dbMessage.modification);
-        Assert.assertEquals(
-                "Please give me a thumbs up", Iterables.getOnlyElement(dbMessage.contents).body);
-    }
-
-    @Test
-    public void twoReactionsOneCorrectionBeforeOriginalInGroupChat()
-            throws XmppStringprepException {
-        final var group = JidCreate.bareFrom("a@group.example.com");
-        final var ogStanzaId = "og-stanza-id";
-        final var ogMessageId = "og-message-id";
-
-        // first reaction
-        final var reactionA = new Message(Message.Type.GROUPCHAT);
-        reactionA.setFrom(JidCreate.fullFrom(group, Resourcepart.from("user-b")));
-        reactionA.addExtension(Reactions.to(ogStanzaId)).addExtension(new Reaction("Y"));
-        this.transformer.transform(
-                MessageTransformation.of(
-                        reactionA,
-                        Instant.now(),
-                        REMOTE,
-                        "irrelevant-stanza-id1",
-                        null,
-                        "id-user-b"));
-
-        // second reaction
-        final var reactionB = new Message(Message.Type.GROUPCHAT);
-        reactionB.setFrom(JidCreate.fullFrom(group, Resourcepart.from("user-c")));
-        reactionB.addExtension(Reactions.to(ogStanzaId)).addExtension(new Reaction("Y"));
-        this.transformer.transform(
-                MessageTransformation.of(
-                        reactionB,
-                        Instant.now(),
-                        REMOTE,
-                        "irrelevant-stanza-id2",
-                        null,
-                        "id-user-c"));
-
-        // a correction
-        final var m1 = new Message(Message.Type.GROUPCHAT);
-        m1.addExtension(new Body("Please give me a thumbs up"));
-        m1.addExtension(new Replace()).setId(ogMessageId);
-        m1.setFrom(JidCreate.fullFrom(group, Resourcepart.from("user-a")));
-        this.transformer.transform(
-                MessageTransformation.of(
-                        m1,
-                        Instant.ofEpochMilli(2000),
-                        REMOTE,
-                        "irrelevant-stanza-id3",
-                        null,
-                        "id-user-a"));
-
-        // the original message
-        final var m4 = new Message(Message.Type.GROUPCHAT);
-        m4.setId(ogMessageId);
-        m4.addExtension(new Body("Please give me thumbs up (Typo)"));
-        m4.setFrom(JidCreate.fullFrom(group, Resourcepart.from("user-a")));
-        this.transformer.transform(
-                MessageTransformation.of(
-                        m4, Instant.ofEpochMilli(1000), REMOTE, ogStanzaId, null, "id-user-a"));
-
-        final var messages = database.messageDao().getMessagesForTesting(1L);
-        Assert.assertEquals(1, messages.size());
-        final var dbMessage = Iterables.getOnlyElement(messages);
-        Assert.assertEquals(2, dbMessage.reactions.size());
-        final var onlyReaction = Iterables.getOnlyElement(dbMessage.getAggregatedReactions());
-        Assert.assertEquals(2L, (long) onlyReaction.getValue());
-        Assert.assertEquals(Modification.CORRECTION, dbMessage.modification);
-        Assert.assertEquals(
-                "Please give me a thumbs up", Iterables.getOnlyElement(dbMessage.contents).body);
-    }
-
-    @Test
-    public void twoReactionsInGroupChat() throws XmppStringprepException {
-        final var group = JidCreate.bareFrom("a@group.example.com");
-        final var ogStanzaId = "og-stanza-id";
-        final var ogMessageId = "og-message-id";
-
-        // the original message
-        final var m4 = new Message(Message.Type.GROUPCHAT);
-        m4.setId(ogMessageId);
-        m4.addExtension(new Body("Please give me a thumbs up"));
-        m4.setFrom(JidCreate.fullFrom(group, Resourcepart.from("user-a")));
-        this.transformer.transform(
-                MessageTransformation.of(
-                        m4, Instant.ofEpochMilli(1000), REMOTE, ogStanzaId, null, "id-user-a"));
-
-        // first reaction
-        final var reactionA = new Message(Message.Type.GROUPCHAT);
-        reactionA.setFrom(JidCreate.fullFrom(group, Resourcepart.from("user-b")));
-        reactionA.addExtension(Reactions.to(ogStanzaId)).addExtension(new Reaction("Y"));
-        this.transformer.transform(
-                MessageTransformation.of(
-                        reactionA,
-                        Instant.now(),
-                        REMOTE,
-                        "irrelevant-stanza-id1",
-                        null,
-                        "id-user-b"));
-
-        // second reaction
-        final var reactionB = new Message(Message.Type.GROUPCHAT);
-        reactionB.setFrom(JidCreate.fullFrom(group, Resourcepart.from("user-c")));
-        reactionB.addExtension(Reactions.to(ogStanzaId)).addExtension(new Reaction("Y"));
-        this.transformer.transform(
-                MessageTransformation.of(
-                        reactionB,
-                        Instant.now(),
-                        REMOTE,
-                        "irrelevant-stanza-id2",
-                        null,
-                        "id-user-c"));
-
-        final var messages = database.messageDao().getMessagesForTesting(1L);
-        Assert.assertEquals(1, messages.size());
-        final var dbMessage = Iterables.getOnlyElement(messages);
-        Assert.assertEquals(2, dbMessage.reactions.size());
-        final var onlyReaction = Iterables.getOnlyElement(dbMessage.getAggregatedReactions());
-        Assert.assertEquals(2L, (long) onlyReaction.getValue());
-        Assert.assertEquals(Modification.ORIGINAL, dbMessage.modification);
-        Assert.assertEquals(
-                "Please give me a thumbs up", Iterables.getOnlyElement(dbMessage.contents).body);
-    }
-
-    @Test
-    public void inReplyTo() throws XmppStringprepException {
-        final var m1 = new Message();
-        m1.setId("1");
-        m1.setTo(ACCOUNT);
-        m1.setFrom(JidCreate.fullFrom(REMOTE, Resourcepart.from("junit")));
-        m1.addExtension(new Body("Hi. How are you?"));
-
-        this.transformer.transform(
-                MessageTransformation.of(
-                        m1, Instant.now(), REMOTE, "stanza-a", m1.getFrom().asBareJid(), null));
-
-        final var m2 = new Message();
-        m2.setId("2");
-        m2.setTo(REMOTE);
-        m2.setFrom(ACCOUNT);
-        m2.addExtension(new Body("I am fine."));
-        final var reply = m2.addExtension(new Reply());
-        reply.setId("1");
-        reply.setTo(REMOTE);
-
-        this.transformer.transform(
-                MessageTransformation.of(
-                        m2, Instant.now(), REMOTE, "stanza-b", m2.getFrom().asBareJid(), null));
-
-        final var messages = database.messageDao().getMessagesForTesting(1L);
-        Assert.assertEquals(2, messages.size());
-        final var response = Iterables.get(messages, 1);
-        Assert.assertNotNull(response.inReplyToMessageEntityId);
-        final MessageEmbedded embeddedMessage = response.inReplyTo;
-        Assert.assertNotNull(embeddedMessage);
-        Assert.assertEquals(REMOTE, embeddedMessage.fromBare);
-        Assert.assertEquals(1L, embeddedMessage.contents.size());
-        Assert.assertEquals(
-                "Hi. How are you?", Iterables.getOnlyElement(embeddedMessage.contents).body);
-        Assert.assertNull(response.identityKey);
-        Assert.assertNull(response.trust);
-    }
-
-    @Test
-    public void messageWithReceipt() throws XmppStringprepException {
-        final var m1 = new Message();
-        m1.setId("1");
-        m1.setTo(REMOTE);
-        m1.setFrom(JidCreate.fullFrom(ACCOUNT, Resourcepart.from("junit")));
-        m1.addExtension(new Body("Hi. How are you?"));
-
-        this.transformer.transform(
-                MessageTransformation.of(
-                        m1, Instant.now(), REMOTE, null, m1.getFrom().asBareJid(), null));
-
-        final var m2 = new Message();
-        m2.setTo(JidCreate.fullFrom(ACCOUNT, Resourcepart.from("junit")));
-        m2.setFrom(JidCreate.fullFrom(REMOTE, Resourcepart.from("junit")));
-        m2.addExtension(new Received()).setId("1");
-
-        this.transformer.transform(
-                MessageTransformation.of(
-                        m2, Instant.now(), REMOTE, null, m2.getFrom().asBareJid(), null));
-
-        final var messages = database.messageDao().getMessagesForTesting(1L);
-        final var message = Iterables.getOnlyElement(messages);
-
-        Assert.assertEquals(1L, message.states.size());
-    }
-
-    @Test
-    public void messageAndRetraction() throws XmppStringprepException {
-        final var m1 = new Message();
-        m1.setTo(ACCOUNT);
-        m1.setFrom(JidCreate.fullFrom(REMOTE, Resourcepart.from("junit")));
-        m1.setId("m1");
-        m1.addExtension(new Body("It is raining outside"));
-
-        this.transformer.transform(
-                MessageTransformation.of(
-                        m1, Instant.now(), REMOTE, null, m1.getFrom().asBareJid(), null));
-
-        final var m2 = new Message();
-        m2.setTo(ACCOUNT);
-        m2.setFrom(JidCreate.fullFrom(REMOTE, Resourcepart.from("junit")));
-        m2.addExtension(new Retract()).setId("m1");
-
-        this.transformer.transform(
-                MessageTransformation.of(
-                        m2, Instant.now(), REMOTE, null, m2.getFrom().asBareJid(), null));
-
-        final var messages = database.messageDao().getMessagesForTesting(1L);
-        final var message = Iterables.getOnlyElement(messages);
-        Assert.assertEquals(Modification.RETRACTION, message.modification);
-        Assert.assertEquals(
-                PartType.RETRACTION, Iterables.getOnlyElement(message.contents).partType);
-    }
-
-    @Test
-    public void twoChatThreeMessages() throws XmppStringprepException {
-        final var m1 = new Message();
-        m1.setId("1");
-        m1.setTo(REMOTE);
-        m1.setFrom(JidCreate.fullFrom(ACCOUNT, Resourcepart.from("junit")));
-        m1.addExtension(new Body("Hi. How are you?"));
-
-        this.transformer.transform(
-                MessageTransformation.of(
-                        m1, Instant.now(), REMOTE, null, m1.getFrom().asBareJid(), null));
-
-        final var m2 = new Message();
-        m2.setId("2");
-        m2.setTo(REMOTE);
-        m2.setFrom(JidCreate.fullFrom(ACCOUNT, Resourcepart.from("junit")));
-        m2.addExtension(new Body("Please answer"));
-
-        this.transformer.transform(
-                MessageTransformation.of(
-                        m2, Instant.now(), REMOTE, null, m2.getFrom().asBareJid(), null));
-
-        final var m3 = new Message();
-        m3.setId("3");
-        m3.setTo(REMOTE_2);
-        m3.setFrom(JidCreate.fullFrom(ACCOUNT, Resourcepart.from("junit")));
-        m3.addExtension(new Body("Another message"));
-
-        this.transformer.transform(
-                MessageTransformation.of(
-                        m3, Instant.now(), REMOTE, null, m3.getFrom().asBareJid(), null));
-    }
-}

app/src/conversations/res/drawable/background_message_selected.xml

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:bottom="2dp"
-        android:end="4dp"
-        android:start="4dp"
-        android:top="2dp">
-        <shape>
-            <solid android:color="?colorSurfaceVariant" />
-            <corners android:radius="12dp" />
-        </shape>
-    </item>
-</layer-list>

app/src/conversations/res/drawable/ic_launcher_foreground.xml

@@ -1,24 +0,0 @@
-<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="1146.7721"
-        android:viewportHeight="1146.7721">
-    <group android:translateX="322.69516"
-            android:translateY="317.38605">
-      <path
-          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"
-          android:fillColor="#ffffff"
-          android:strokeColor="#00000000"
-          android:fillAlpha="1"/>
-      <path
-          android:pathData="M478.641,484.856 L447.361,358.245c19.89,-31.998 26.743,-69.572 26.743,-109.762 0,-116.817 -96.799,-211.484 -216.184,-211.484 -119.384,0 -216.184,94.667 -216.184,211.484 0,116.817 96.799,211.554 216.184,211.554 39.636,0 68.588,-8.142 105.194,-21.761z"
-          android:strokeAlpha="0"
-          android:strokeLineJoin="round"
-          android:strokeWidth="23.55835724"
-          android:fillColor="#00000000"
-          android:strokeColor="#000000"
-          android:fillAlpha="0"
-          android:strokeLineCap="butt"/>
-    </group>
-</vector>

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

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@mipmap/ic_launcher_background"/>
-    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
-</adaptive-icon>

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

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@mipmap/ic_launcher_background"/>
-    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
-</adaptive-icon>

app/src/conversations/res/values-da-rDK/strings.xml

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="pick_a_server">Vælg din XMPP-udbyder</string>
-    <string name="use_conversations.im">Brug conversations.im</string>
-    <string name="create_new_account">Opret ny konto</string>
-    <string name="do_you_have_an_account">Har du allerede en XMPP-konto? Dette kan være tilfældet, hvis du allerede bruger en anden XMPP-klient eller har brugt Conversations før. Hvis ikke, kan du lige nu oprette en ny XMPP-konto.\nTip: Nogle e-mail-udbydere leverer også XMPP-konti.</string>
-    <string name="server_select_text">XMPP er et udbyderuafhængigt onlinemeddelelsesnetværk. Du kan bruge denne klient med hvilken XMPP-server du end vælger.\nMen for din nemhedsskyld har vi gjort vi det let at oprette en konto på conversations.im; en udbyder, der er specielt velegnet til brug med Conversations.</string>
-    <string name="magic_create_text_on_x">Du er blevet inviteret til %1$s. Vi guider dig gennem processen med at oprette en konto.\nNår du vælger %1$s som udbyder, kan du kommunikere med brugere fra andre udbydere ved at give dem din fulde XMPP-adresse.</string>
-    <string name="magic_create_text_fixed">Du er blevet inviteret til %1$s. Der er allerede valgt et brugernavn til dig. Vi guider dig gennem processen med at oprette en konto.\nDu vil være i stand til at kommunikere med brugere fra andre udbydere ved at give dem din fulde XMPP-adresse.</string>
-    <string name="your_server_invitation">Din server invitation</string>
-    <string name="improperly_formatted_provisioning">Forkert formateret klargøringskode</string>
-    <string name="tap_share_button_send_invite">Tryk på deleknappen for at sende din kontakt en invitation til %1$s.</string>
-    <string name="if_contact_is_nearby_use_qr">Hvis din kontakt er i nærheden, kan de også skanne koden nedenfor for at acceptere din invitation.</string>
-    <string name="easy_invite_share_text">Deltag med %1$s og chat med mig: %2$s</string>
-    <string name="share_invite_with">Del invitation med...</string>
-</resources>

app/src/conversations/res/values-el/strings.xml

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="pick_a_server">Επιλέξτε τον πάροχο XMPP σας</string>
-    <string name="use_conversations.im">Χρήση του conversations.im</string>
-    <string name="create_new_account">Δημιουργία νέου λογαριασμού</string>
-    <string name="do_you_have_an_account">Έχετε ήδη λογαριασμό XMPP; Αυτό μπορεί να συμβαίνει αν ήδη χρησιμοποιείτε ένα άλλο πρόγραμμα XMPP ή έχετε χρησιμοποιήσει το Conversations παλιότερα. Αν όχι, μπορείτε να δημιουργήσετε ένα νέο λογαριασμό XMPP τώρα.\nΧρήσιμη πληροφορία: Κάποιοι πάροχοι e-mail παρέχουν επίσης και λογαριασμούς XMPP.</string>
-    <string name="server_select_text">Το XMPP είναι ένα δίκτυο άμεσης ανταλλαγής μηνυμάτων ανεξάρτητο παρόχου. Μπορείτε να χρησιμοποιήσετε αυτό το πρόγραμμα με όποιον διακομιστή XMPP επιθυμείτε.\nΓια διευκόλυνση πάντως μπορείτε να δημιουργήσετε έναν λογαριασμό στο conversations.im, έναν πάροχο ειδικά σχεδιασμένο για χρήση με το Conversations.</string>
-    <string name="magic_create_text_on_x">Έχετε προσκληθεί στο %1$s. Θα σας καθοδηγήσουμε στη διαδικασία δημιουργίας λογαριασμού.\nΕπιλέγοντας τον %1$s ως πάροχο θα μπορείτε να επικοινωνείτε με χρήστες άλλων παρόχων δίνοντάς τους την πλήρη διεύθυνση XMPP σας.</string>
-    <string name="magic_create_text_fixed">Έχετε προσκληθεί στο %1$s. Ένα όνομα χρήστη έχει ήδη επιλεγεί για εσάς. Θα σας καθοδηγήσουμε στη διαδικασία δημιουργίας λογαριασμού.\nΘα μπορείτε να επικοινωνείτε με χρήστες άλλων παρόχων δίνοντάς τους την πλήρη διεύθυνση XMPP σας.</string>
-    <string name="your_server_invitation">Η πρόσκλησή σας στον διακομιστή</string>
-    <string name="improperly_formatted_provisioning">Λάθος μορφοποίηση κώδικα παροχής</string>
-    <string name="tap_share_button_send_invite">Πατήστε το πλήκτρο διαμοιρασμού για να στείλετε στην επαφή σας μια πρόσκληση στο %1$s.</string>
-    <string name="if_contact_is_nearby_use_qr">Αν η επαφή σας βρίσκεται κοντά σας, μπορεί επίσης να σαρώσει τον κωδικό παρακάτω για να αποδεχτεί την πρόσκλησή σας.</string>
-    <string name="easy_invite_share_text">Μπείτε στο %1$s και συνομιλήστε μαζί μου: %2$s</string>
-    <string name="share_invite_with">Διαμοιρασμός πρόσκλησης με...</string>
-</resources>

app/src/conversations/res/values-fr/strings.xml

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="pick_a_server">Choisissez votre fournisseur XMPP</string>
-    <string name="use_conversations.im">Utiliser conversations.im</string>
-    <string name="create_new_account">Créer un nouveau compte</string>
-    <string name="do_you_have_an_account">Avez-vous déjà un compte XMPP ? Cela peut être le cas si vous utilisez déjà un autre client XMPP ou si vous avez déjà utilisé Conversations auparavant. Sinon, vous pouvez créer un nouveau compte XMPP dès maintenant.\nRemarque : Certains fournisseurs de messagerie proposent également des comptes XMPP.</string>
-    <string name="server_select_text">XMPP est un réseau de messagerie instantanée indépendant du fournisseur. Vous pouvez utiliser ce client avec n’importe quel serveur XMPP de votre choix.\nToutefois, pour votre commodité, nous avons facilité la création d’un compte sur conversations.im ; un fournisseur spécialement conçu pour Conversations.</string>
-    <string name="magic_create_text_on_x">Vous avez été invité à %1$s. Nous allons vous guider à travers le processus de création d’un compte.\nEn choisissant %1$s comme fournisseur, vous pourrez communiquer avec les utilisateurs des autres fournisseurs en leur donnant votre adresse XMPP complète.</string>
-    <string name="magic_create_text_fixed">Vous avez été invité à %1$s. Un nom d’utilisateur a déjà été choisi pour vous. Nous allons vous guider à travers le processus de création d’un compte.\nVous pourrez communiquer avec les utilisateurs des autres fournisseurs en leur donnant votre adresse XMPP complète.</string>
-    <string name="your_server_invitation">Votre invitation au serveur</string>
-    <string name="improperly_formatted_provisioning">Code de provisionnement mal formaté</string>
-    <string name="tap_share_button_send_invite">Appuyez sur le bouton partager pour envoyer à votre contact une invitation pour %1$s</string>
-    <string name="if_contact_is_nearby_use_qr">Si vos contacts sont à votre côté, ils peuvent aussi scanner le code ci dessous pour accepter votre invitation</string>
-    <string name="easy_invite_share_text">Rejoignez %1$set discutez avec moi : %2$s</string>
-    <string name="share_invite_with">Partager une invitation avec ...</string>
-</resources>

app/src/conversations/res/values-sk/strings.xml

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="pick_a_server">Vyberte si svojho XMPP poskytovateľa</string>
-    <string name="use_conversations.im">Použiť conversations.im</string>
-    <string name="create_new_account">Vytvoriť nové konto</string>
-    <string name="do_you_have_an_account">Máte už svoje XMPP konto? Môže to tak byť v prípade, že už používate iného klienta XMPP alebo ste predtým používali Conversations. Ak nie, môžete si vytvoriť nové XMPP konto práve teraz.\nHint: Niektorí poskytovatelia emailu zároveň poskytujú aj XMPP kontá.</string>
-    <string name="server_select_text">XMPP je sieť pre okamžité správy nezávislá od poskytovateľa. Tohto klienta môžete používať s akýmkoľvek XMPP serverom, ktorý si vyberiete..\nAvšak pre vaše pohodlie sme zjednodušili vytvorenie konta na conversations.im; poskytovateľ špeciálne vhodný na používanie s Conversations.</string>
-    <string name="magic_create_text_on_x">Boli ste pozvaný do %1$s. Prevedieme vás procesom vytvorenia konta..\nPo výbere %1$s ako poskytovateľa, budete môcť komunikovať s užívateľmi iných poskytovateľov tak, že im dáte vašu úplnú XMPP adresu.</string>
-    <string name="magic_create_text_fixed">Boli ste pozvaný do %1$s . Užívateľské meno vám už bolo vopred vybrané. Prevedieme vás procesom vytvorenia konta..\nBudete môcť komunikovať s užívateľmi iných poskytovateľov tak, že im dáte vašu úplnú XMPP adresu.</string>
-    <string name="tap_share_button_send_invite">Ťuknite na tlačidlo zdieľať na odoslanie pozvánky do %1$s vášmu kontaktu.</string>
-    <string name="if_contact_is_nearby_use_qr">Ak je váš kontakt blízko, na prijatie vašej pozvánky si môže nasnímať kód nižšie.</string>
-    <string name="easy_invite_share_text">Pripojte sa k %1$sa rozprávajte sa so mnou: %2$s</string>
-    <string name="share_invite_with">Zdieľať pozvánku s...</string>
-</resources>

app/src/conversations/res/values-tr-rTR/strings.xml

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="pick_a_server">XMPP sağlayıcınızı seçin</string>
-    <string name="use_conversations.im">conversations.im kullan</string>
-    <string name="create_new_account">Yeni hesap oluştur</string>
-    <string name="do_you_have_an_account">Zaten bir XMPP hesabınız var mı? Bunun sebebi, zaten başka bir XMPP istemcisi kullanıyor oluşunuz veya Conversations\'ı önceden kullanmış olmanız olabilir. Eğer durum bu değilse şimdi yeni bir XMPP hesabı oluşturabilirsiniz.\nİpucu: Bağzı e-posta sağlayıcıları da XMPP hesapları kullanabilir.</string>
-    <string name="server_select_text">XMPP; anlık yazışmalar için bağımsız bir sağlayıcıdır. Bu istemciyi istediğiniz herhangi bir XMPP sunucusu ile birlikte kullanabilirsiniz.\nAncak kullanım rahatlığı adına sizin için conversations.im; Conversations için özellikle tasarlanmış bir sağlayıcıda hesap açmanızı kolaylaştırdık.</string>
-    <string name="magic_create_text_on_x">%1$s sağlayıcısına davet edildiniz. Sizi hesap oluşturulması konusunda yönlendireceğiz.\n%1$s bir sağlayıcı olark seçildiğinde, başka sağlayıcılar kullanan kullanıcılarla, onlara tam XMPP adresinizi vererek iletişim kurabileceksiniz.</string>
-    <string name="magic_create_text_fixed">%1$s sağlayıcısına davet edildiniz. Sizin için zaten bir kullanıcı adı seçildi. Sizi hesap oluşturulması konusunda yönlendireceğiz.\nBaşka sağlayıcılar kullanan kullanıcılarla, onlara tam XMPP adresinizi vererek iletişim kurabileceksiniz.</string>
-    <string name="your_server_invitation">Sunucu davetiyeniz</string>
-    <string name="improperly_formatted_provisioning">Yanlış ayarlanmış düzenleme kodu</string>
-    <string name="tap_share_button_send_invite">Kişinize, %1$s grubuna davet etmek için Paylaş düğmesine basın.</string>
-    <string name="if_contact_is_nearby_use_qr">Kişiniz yakınınızda ise, aşağıdaki kodu tarayak daveti kabul edebilirler.</string>
-    <string name="easy_invite_share_text">%1$s grubuna katıl ve benimle sohpet et: %2$s</string>
-    <string name="share_invite_with">Daveti şununla paylaş...</string>
-</resources>

app/src/conversations/res/values-uk/strings.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="pick_a_server">Виберіть постачальника послуг обміну повідомленнями XMPP</string>
-    <string name="use_conversations.im">Скористатися conversations.im</string>
-    <string name="create_new_account">Створити новий обліковий запис</string>
-    <string name="do_you_have_an_account">Вже маєте обліковий запис XMPP? Можливо, користуєтеся іншою програмою XMPP або користувалися цією програмою раніше. Якщо ні, можете створити новий обліковий запис XMPP просто зараз.\nЗверніть увагу, що деякі постачальники електронної пошти у той же час надають облікові записи XMPP.</string>
-    <string name="server_select_text">XMPP — це мережа обміну повідомленнями, незалежна від постачальників. Можете використовувати цю програму з будь-яким XMPP сервером, який оберете.\nПроте, для зручності, ми спростили створення облікового запису на conversations.im — у постачальника, який спеціально налаштований на роботу з цією програмою.</string>
-    <string name="magic_create_text_on_x">Вас запросили до %1$s. Ми проведемо вас крок за кроком, щоб створити обліковий запис.\nОбираючи %1$s в якості свого постачальника, ви зможете спілкуватися з користувачами інших постачальників, для цього повідомте їм свою повну адресу XMPP.</string>
-    <string name="magic_create_text_fixed">Вас запросили до %1$s. Для вас створено ім\'я користувача. Ми проведемо вас крок за кроком, щоб створити обліковий запис.\nВи зможете спілкуватися з користувачами інших постачальників, для цього повідомите їм свою повну адресу XMPP.</string>
-    <string name="your_server_invitation">Ваше запрошення до сервера</string>
-    <string name="improperly_formatted_provisioning">Неправильно відформатований код забезпечення</string>
-    </resources>

app/src/conversations/res/values-vi/strings.xml

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="pick_a_server">Chọn nhà cung cấp XMPP của bạn</string>
-    <string name="use_conversations.im">Sử dụng conversations.im</string>
-    <string name="create_new_account">Tạo tài khoản mới</string>
-    <string name="do_you_have_an_account">Bạn đã có tài khoản XMPP chưa? Điều này có thể đúng nếu bạn đang dùng một ứng dụng khách cho XMPP khác hoặc đã sử dụng Conversations trước đó. Nếu không, bạn có thể tạo tài khoản XMPP mới ngay bây giờ.\nGợi ý: Một số nhà cung cấp email cũng cung cấp tài khoản XMPP.</string>
-    <string name="server_select_text">XMPP là một mạng nhắn tin ngay lập tức không phụ thuộc vào nhà cung cấp. Bạn có thể sử dụng ứng dụng khách này với bất kỳ máy chủ XMPP nào mà bạn chọn.\nTuy nhiên, vì sự thuận tiện của bạn, chúng tôi đã làm cho việc tạo tài khoản trên conversations.im được dễ dàng; một nhà cung cấp đặc biệt phù hợp với việc sử dụng Conversations.</string>
-    <string name="magic_create_text_on_x">Bạn đã được mời vào %1$s. Chúng tôi sẽ hướng dẫn bạn trong quá trình tạo tài khoản.\nKhi chọn %1$s là nhà cung cấp, bạn sẽ có thể giao tiếp với những người dùng của các nhà cung cấp khác bằng cách đưa cho họ địa chỉ XMPP đầy đủ của bạn.</string>
-    <string name="magic_create_text_fixed">Bạn đã được mời vào %1$s. Một tên người dùng đã được chọn sẵn cho bạn. Chúng tôi sẽ hướng dẫn bạn trong quá trình tạo tài khoản.\nBạn sẽ có thể giao tiếp với những người dùng của các nhà cung cấp khác bằng cách đưa cho họ địa chỉ XMPP đầy đủ của bạn.</string>
-    <string name="your_server_invitation">Lời mời vào máy chủ của bạn</string>
-    <string name="improperly_formatted_provisioning">Mã cung cấp không được định dạng đúng</string>
-    <string name="tap_share_button_send_invite">Nhấn nút chia sẻ để gửi lời mời vào %1$s đến liên hệ của bạn.</string>
-    <string name="if_contact_is_nearby_use_qr">Nếu liên hệ của bạn ở gần đây, họ cũng có thể quét mã ở dưới để chấp nhận lời mời của bạn.</string>
-    <string name="easy_invite_share_text">Hãy tham gia vào %1$s và trò chuyện với tôi: %2$s</string>
-    <string name="share_invite_with">Chia sẻ lời mời với...</string>
-</resources>

app/src/conversations/res/values-zh-rCN/strings.xml

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="pick_a_server">选择您的 XMPP 提供者</string>
-    <string name="use_conversations.im">使用 conversations.im</string>
-    <string name="create_new_account">创建新账户</string>
-    <string name="do_you_have_an_account">您有 XMPP 账户吗？如果您之前使用过其他的 XMPP 客户端，那么您已经拥有这种账户了。如果没有的话，您现在可以创建一个。\n提示：有些电子邮件服务也提供XMPP账户。</string>
-    <string name="server_select_text">XMPP 是独立于提供者的即时消息网络。您可以将此客户端与任意 XMPP 服务器一同使用。\n不过，您可以很容易地在 conversations.im 上创建账户；它是特别适合与“Conversations”一起使用的提供者。</string>
-    <string name="magic_create_text_on_x">您已受邀加入 %1$s。我们将指导您完成创建帐户的过程。\n使用 %1$s 作为提供者时，您可以通过您的完整 XMPP 地址与其他提供者的用户进行交流。</string>
-    <string name="magic_create_text_fixed">您已受邀加入 %1$s。已为您选择了一个用户名。我们将指导您完成创建帐户的过程。\n您可以使用完整的 XMPP 地址来与其他提供者的用户进行交流。</string>
-    <string name="your_server_invitation">你的服务器邀请</string>
-    <string name="improperly_formatted_provisioning">格式不正确的配置代码</string>
-    <string name="tap_share_button_send_invite">点击分享按钮向您的联系人发送加入 %1$s 的邀请。</string>
-    <string name="if_contact_is_nearby_use_qr">如果你的联系人在附近，他们也可以扫描下面的代码来接受你的邀请。</string>
-    <string name="easy_invite_share_text">加入 %1$s 和我聊天：%2$s</string>
-    <string name="share_invite_with">分享邀请…</string>
-</resources>

app/src/conversations/res/values-zh-rTW/strings.xml

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="pick_a_server">挑選您的 XMPP 提供者</string>
-    <string name="use_conversations.im">使用 conversations.im</string>
-    <string name="create_new_account">建立新帳戶</string>
-    <string name="do_you_have_an_account">您已經擁有一個 XMPP 賬戶嗎？如果您之前使用過其他 XMPP 客戶端或 Conversations 的話，那麼您已經擁有 XMPP 賬戶了。如果沒有賬戶的話，您可以現在建立一個。\n提示：有些電子郵件服務供應商也會提供 XMPP 賬戶。</string>
-    <string name="server_select_text">XMPP 是提供者無關的即時訊息網絡。 任何你選擇的 XMPP 伺服器都可在此客戶端上使用。\n不過，我們令它在 Coversations.im 中建立帳戶變得更方便； Conversations.im 是特別適合 Conversations 的提供者</string>
-    <string name="magic_create_text_on_x">你已受邀參加 %1$s 。 我們將指導你完成建立帳戶的過程。選擇 %1$s 作爲提供者後，你可以將你完整的 XMPP 地址交給使用其他提供者的用戶，你便能與他們交流。</string>
-    <string name="magic_create_text_fixed">您已被邀請參加 %1$s 。 我們已經爲你選擇了一個用戶名。 我們將指導你完成建立帳戶的過程。\n將你完整的 XMPP 地址交給使用其他提供者的用戶後，你便能與他們交流。</string>
-    <string name="your_server_invitation">您的伺服器邀請</string>
-    <string name="improperly_formatted_provisioning">配置代碼格式不正確</string>
-    <string name="tap_share_button_send_invite">輕觸分享按鍵向您的聯絡人發送加入 %1$s 的邀請。</string>
-    <string name="if_contact_is_nearby_use_qr">如果你的聯絡人就在附近，他們也可以掃描下面的代碼來接受你的邀請。</string>
-    <string name="easy_invite_share_text">加入 %1$s 和我聊天：%2$s</string>
-    <string name="share_invite_with">分享邀請到...</string>
-</resources>

app/src/main/AndroidManifest.xml

@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools">
-
-    <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
-    <uses-permission android:name="android.permission.READ_CONTACTS" />
-    <uses-permission android:name="android.permission.READ_PROFILE" />
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.WAKE_LOCK" />
-    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
-    <uses-permission android:name="android.permission.VIBRATE" />
-    <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
-    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
-    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
-    <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
-    <uses-permission android:name="android.permission.CAMERA" />
-    <uses-permission android:name="android.permission.RECORD_AUDIO" />
-    <uses-permission android:name="android.permission.BLUETOOTH" />
-    <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
-    <uses-permission android:name="android.permission.USE_FULL_SCREEN_INTENT" />
-    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
-
-    <uses-feature
-        android:name="android.hardware.location"
-        android:required="false" />
-    <uses-feature
-        android:name="android.hardware.location.gps"
-        android:required="false" />
-    <uses-feature
-        android:name="android.hardware.location.network"
-        android:required="false" />
-    <uses-feature
-        android:name="android.hardware.camera"
-        android:required="false" />
-    <uses-feature
-        android:name="android.hardware.camera.autofocus"
-        android:required="false" />
-    <uses-feature
-        android:name="android.hardware.microphone"
-        android:required="false" />
-
-    <queries>
-        <package android:name="org.torproject.android" />
-
-        <intent>
-            <action android:name="eu.siacs.conversations.location.request" />
-        </intent>
-        <intent>
-            <action android:name="eu.siacs.conversations.location.show" />
-        </intent>
-        <intent>
-            <action android:name="android.intent.action.VIEW" />
-            <data android:mimeType="resource/folder" />
-        </intent>
-        <intent>
-            <action android:name="android.intent.action.VIEW" />
-        </intent>
-        <intent>
-            <action android:name="org.unifiedpush.android.connector.MESSAGE" />
-        </intent>
-    </queries>
-
-
-    <application
-        android:name="im.conversations.android.Conversations"
-        android:allowBackup="true"
-        android:appCategory="social"
-        android:dataExtractionRules="@xml/data_extraction_rules"
-        android:fullBackupContent="@xml/backup_rules"
-        android:icon="@mipmap/new_launcher"
-        android:label="@string/app_name"
-        android:roundIcon="@mipmap/new_launcher_round"
-        android:supportsRtl="true"
-        android:theme="@style/Theme.Conversations3"
-        tools:targetApi="31">
-
-        <service
-            android:name=".service.ForegroundService"
-            android:exported="false"/>
-
-        <service
-            android:name=".service.RtpSessionService"
-            android:exported="false"
-            android:foregroundServiceType="phoneCall" />
-
-        <receiver
-            android:name=".receiver.EventReceiver"
-            android:exported="true">
-            <intent-filter>
-                <action android:name="android.intent.action.BOOT_COMPLETED" />
-                <action android:name="android.intent.action.ACTION_SHUTDOWN" />
-                <action android:name="android.media.RINGER_MODE_CHANGED" />
-            </intent-filter>
-        </receiver>
-
-        <activity
-            android:name="im.conversations.android.ui.activity.MainActivity"
-            android:exported="true"
-            android:launchMode="singleTask"
-            android:windowSoftInputMode="adjustResize">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-        <activity android:name="im.conversations.android.ui.activity.SettingsActivity" />
-        <activity
-            android:name="im.conversations.android.ui.activity.SetupActivity"
-            android:windowSoftInputMode="adjustResize" />
-        <activity
-            android:name=".ui.activity.RtpSessionActivity"
-            android:autoRemoveFromRecents="true"
-            android:launchMode="singleInstance"
-            android:supportsPictureInPicture="true" />
-    </application>
-
-</manifest>

app/src/main/assets/logback.xml

@@ -1,16 +0,0 @@
-<configuration xmlns="https://tony19.github.io/logback-android/xml"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="https://tony19.github.io/logback-android/xml https://cdn.jsdelivr.net/gh/tony19/logback-android/logback.xsd">
-    <appender name="logcat" class="ch.qos.logback.classic.android.LogcatAppender">
-        <tagEncoder>
-            <pattern>conversations</pattern>
-        </tagEncoder>
-        <encoder>
-            <pattern>%logger{12}: %msg</pattern>
-        </encoder>
-    </appender>
-
-    <root level="DEBUG">
-        <appender-ref ref="logcat" />
-    </root>
-</configuration>

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

@@ -1,10 +0,0 @@
-package eu.siacs.conversations;
-
-import android.net.Uri;
-
-public class Config {
-    public static final String LOGTAG = "conversations";
-    public static final Uri HELP = Uri.parse("https://help.conversations.im");
-    public static final boolean REQUIRE_RTP_VERIFICATION =
-            false; // require a/v calls to be verified with OMEMO
-}

app/src/main/java/eu/siacs/conversations/generator/MessageGenerator.java

@@ -1,54 +0,0 @@
-package eu.siacs.conversations.generator;
-
-import eu.siacs.conversations.xmpp.jingle.JingleRtpConnection;
-import eu.siacs.conversations.xmpp.jingle.Media;
-import im.conversations.android.xml.Element;
-import im.conversations.android.xml.Namespace;
-import im.conversations.android.xmpp.manager.JingleConnectionManager;
-import im.conversations.android.xmpp.model.stanza.Message;
-import org.jxmpp.jid.Jid;
-
-public final class MessageGenerator {
-
-    private MessageGenerator() {
-        throw new IllegalStateException("Do not instantiate me");
-    }
-
-    public static Message sessionProposal(
-            final JingleConnectionManager.RtpSessionProposal proposal) {
-        final Message packet = new Message(Message.Type.CHAT); // we want to carbon copy those
-        packet.setTo(proposal.with);
-        packet.setId(JingleRtpConnection.JINGLE_MESSAGE_PROPOSE_ID_PREFIX + proposal.sessionId);
-        final Element propose = packet.addChild("propose", Namespace.JINGLE_MESSAGE);
-        propose.setAttribute("id", proposal.sessionId);
-        for (final Media media : proposal.media) {
-            propose.addChild("description", Namespace.JINGLE_APPS_RTP)
-                    .setAttribute("media", media.toString());
-        }
-
-        packet.addChild("request", "urn:xmpp:receipts");
-        packet.addChild("store", "urn:xmpp:hints");
-        return packet;
-    }
-
-    public static Message sessionRetract(
-            final JingleConnectionManager.RtpSessionProposal proposal) {
-        final Message packet = new Message(Message.Type.CHAT); // we want to carbon copy those
-        packet.setTo(proposal.with);
-        final Element propose = packet.addChild("retract", Namespace.JINGLE_MESSAGE);
-        propose.setAttribute("id", proposal.sessionId);
-        propose.addChild("description", Namespace.JINGLE_APPS_RTP);
-        packet.addChild("store", "urn:xmpp:hints");
-        return packet;
-    }
-
-    public static Message sessionReject(final Jid with, final String sessionId) {
-        final Message packet = new Message(Message.Type.CHAT); // we want to carbon copy those
-        packet.setTo(with);
-        final Element propose = packet.addChild("reject", Namespace.JINGLE_MESSAGE);
-        propose.setAttribute("id", sessionId);
-        propose.addChild("description", Namespace.JINGLE_APPS_RTP);
-        packet.addChild("store", "urn:xmpp:hints");
-        return packet;
-    }
-}

app/src/main/java/eu/siacs/conversations/services/AppRTCAudioManager.java

@@ -1,660 +0,0 @@
-/*
- *  Copyright 2014 The WebRTC Project Authors. All rights reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-package eu.siacs.conversations.services;
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.content.pm.PackageManager;
-import android.media.AudioDeviceInfo;
-import android.media.AudioFormat;
-import android.media.AudioManager;
-import android.media.AudioRecord;
-import android.media.MediaRecorder;
-import android.os.Build;
-import android.util.Log;
-import androidx.annotation.Nullable;
-import eu.siacs.conversations.Config;
-import eu.siacs.conversations.utils.AppRTCUtils;
-import eu.siacs.conversations.xmpp.jingle.Media;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.concurrent.CountDownLatch;
-import org.webrtc.ThreadUtils;
-
-/** AppRTCAudioManager manages all audio related parts of the AppRTC demo. */
-public class AppRTCAudioManager {
-
-    private static CountDownLatch microphoneLatch;
-
-    private final Context apprtcContext;
-    // Contains speakerphone setting: auto, true or false
-    @Nullable private SpeakerPhonePreference speakerPhonePreference;
-    // Handles all tasks related to Bluetooth headset devices.
-    private final AppRTCBluetoothManager bluetoothManager;
-    @Nullable private final AudioManager audioManager;
-    @Nullable private AudioManagerEvents audioManagerEvents;
-    private AudioManagerState amState;
-    private boolean savedIsSpeakerPhoneOn;
-    private boolean savedIsMicrophoneMute;
-    private boolean hasWiredHeadset;
-    // Default audio device; speaker phone for video calls or earpiece for audio
-    // only calls.
-    private AudioDevice defaultAudioDevice;
-    // Contains the currently selected audio device.
-    // This device is changed automatically using a certain scheme where e.g.
-    // a wired headset "wins" over speaker phone. It is also possible for a
-    // user to explicitly select a device (and overrid any predefined scheme).
-    // See |userSelectedAudioDevice| for details.
-    private AudioDevice selectedAudioDevice;
-    // Contains the user-selected audio device which overrides the predefined
-    // selection scheme.
-    // TODO(henrika): always set to AudioDevice.NONE today. Add support for
-    // explicit selection based on choice by userSelectedAudioDevice.
-    private AudioDevice userSelectedAudioDevice;
-    // Proximity sensor object. It measures the proximity of an object in cm
-    // relative to the view screen of a device and can therefore be used to
-    // assist device switching (close to ear <=> use headset earpiece if
-    // available, far from ear <=> use speaker phone).
-    @Nullable private AppRTCProximitySensor proximitySensor;
-    // Contains a list of available audio devices. A Set collection is used to
-    // avoid duplicate elements.
-    private Set<AudioDevice> audioDevices = new HashSet<>();
-    // Broadcast receiver for wired headset intent broadcasts.
-    private final BroadcastReceiver wiredHeadsetReceiver;
-    // Callback method for changes in audio focus.
-    @Nullable private AudioManager.OnAudioFocusChangeListener audioFocusChangeListener;
-
-    private AppRTCAudioManager(
-            Context context, final SpeakerPhonePreference speakerPhonePreference) {
-        Log.d(Config.LOGTAG, "ctor");
-        ThreadUtils.checkIsOnMainThread();
-        apprtcContext = context;
-        audioManager = ((AudioManager) context.getSystemService(Context.AUDIO_SERVICE));
-        bluetoothManager = AppRTCBluetoothManager.create(context, this);
-        wiredHeadsetReceiver = new WiredHeadsetReceiver();
-        amState = AudioManagerState.UNINITIALIZED;
-        this.speakerPhonePreference = speakerPhonePreference;
-        if (speakerPhonePreference == SpeakerPhonePreference.EARPIECE && hasEarpiece()) {
-            defaultAudioDevice = AudioDevice.EARPIECE;
-        } else {
-            defaultAudioDevice = AudioDevice.SPEAKER_PHONE;
-        }
-        // Create and initialize the proximity sensor.
-        // Tablet devices (e.g. Nexus 7) does not support proximity sensors.
-        // Note that, the sensor will not be active until start() has been called.
-        proximitySensor =
-                AppRTCProximitySensor.create(
-                        context,
-                        // This method will be called each time a state change is detected.
-                        // Example: user holds his hand over the device (closer than ~5 cm),
-                        // or removes his hand from the device.
-                        this::onProximitySensorChangedState);
-        Log.d(Config.LOGTAG, "defaultAudioDevice: " + defaultAudioDevice);
-        AppRTCUtils.logDeviceInfo(Config.LOGTAG);
-    }
-
-    public void switchSpeakerPhonePreference(final SpeakerPhonePreference speakerPhonePreference) {
-        this.speakerPhonePreference = speakerPhonePreference;
-        if (speakerPhonePreference == SpeakerPhonePreference.EARPIECE && hasEarpiece()) {
-            defaultAudioDevice = AudioDevice.EARPIECE;
-        } else {
-            defaultAudioDevice = AudioDevice.SPEAKER_PHONE;
-        }
-        updateAudioDeviceState();
-    }
-
-    /** Construction. */
-    public static AppRTCAudioManager create(
-            Context context, SpeakerPhonePreference speakerPhonePreference) {
-        return new AppRTCAudioManager(context, speakerPhonePreference);
-    }
-
-    public static boolean isMicrophoneAvailable() {
-        microphoneLatch = new CountDownLatch(1);
-        AudioRecord audioRecord = null;
-        boolean available = true;
-        try {
-            final int sampleRate = 44100;
-            final int channel = AudioFormat.CHANNEL_IN_MONO;
-            final int format = AudioFormat.ENCODING_PCM_16BIT;
-            final int bufferSize = AudioRecord.getMinBufferSize(sampleRate, channel, format);
-            audioRecord =
-                    new AudioRecord(
-                            MediaRecorder.AudioSource.MIC, sampleRate, channel, format, bufferSize);
-            audioRecord.startRecording();
-            final short[] buffer = new short[bufferSize];
-            final int audioStatus = audioRecord.read(buffer, 0, bufferSize);
-            if (audioStatus == AudioRecord.ERROR_INVALID_OPERATION
-                    || audioStatus == AudioRecord.STATE_UNINITIALIZED) available = false;
-        } catch (Exception e) {
-            available = false;
-        } finally {
-            release(audioRecord);
-        }
-        microphoneLatch.countDown();
-        return available;
-    }
-
-    private static void release(final AudioRecord audioRecord) {
-        if (audioRecord == null) {
-            return;
-        }
-        try {
-            audioRecord.release();
-        } catch (Exception e) {
-            // ignore
-        }
-    }
-
-    /**
-     * This method is called when the proximity sensor reports a state change, e.g. from "NEAR to
-     * FAR" or from "FAR to NEAR".
-     */
-    private void onProximitySensorChangedState() {
-        if (speakerPhonePreference != SpeakerPhonePreference.AUTO) {
-            return;
-        }
-        // The proximity sensor should only be activated when there are exactly two
-        // available audio devices.
-        if (audioDevices.size() == 2
-                && audioDevices.contains(AppRTCAudioManager.AudioDevice.EARPIECE)
-                && audioDevices.contains(AppRTCAudioManager.AudioDevice.SPEAKER_PHONE)) {
-            if (proximitySensor.sensorReportsNearState()) {
-                // Sensor reports that a "handset is being held up to a person's ear",
-                // or "something is covering the light sensor".
-                setAudioDeviceInternal(AppRTCAudioManager.AudioDevice.EARPIECE);
-            } else {
-                // Sensor reports that a "handset is removed from a person's ear", or
-                // "the light sensor is no longer covered".
-                setAudioDeviceInternal(AppRTCAudioManager.AudioDevice.SPEAKER_PHONE);
-            }
-        }
-    }
-
-    @SuppressWarnings("deprecation")
-    public void start(AudioManagerEvents audioManagerEvents) {
-        Log.d(Config.LOGTAG, AppRTCAudioManager.class.getName() + ".start()");
-        ThreadUtils.checkIsOnMainThread();
-        if (amState == AudioManagerState.RUNNING) {
-            Log.e(Config.LOGTAG, "AudioManager is already active");
-            return;
-        }
-        awaitMicrophoneLatch();
-        this.audioManagerEvents = audioManagerEvents;
-        amState = AudioManagerState.RUNNING;
-        // Store current audio state so we can restore it when stop() is called.
-        savedIsSpeakerPhoneOn = audioManager.isSpeakerphoneOn();
-        savedIsMicrophoneMute = audioManager.isMicrophoneMute();
-        hasWiredHeadset = hasWiredHeadset();
-        // Create an AudioManager.OnAudioFocusChangeListener instance.
-        audioFocusChangeListener =
-                new AudioManager.OnAudioFocusChangeListener() {
-                    // Called on the listener to notify if the audio focus for this listener has
-                    // been changed.
-                    // The |focusChange| value indicates whether the focus was gained, whether the
-                    // focus was lost,
-                    // and whether that loss is transient, or whether the new focus holder will hold
-                    // it for an
-                    // unknown amount of time.
-                    // TODO(henrika): possibly extend support of handling audio-focus changes. Only
-                    // contains
-                    // logging for now.
-                    @Override
-                    public void onAudioFocusChange(int focusChange) {
-                        final String typeOfChange;
-                        switch (focusChange) {
-                            case AudioManager.AUDIOFOCUS_GAIN:
-                                typeOfChange = "AUDIOFOCUS_GAIN";
-                                break;
-                            case AudioManager.AUDIOFOCUS_GAIN_TRANSIENT:
-                                typeOfChange = "AUDIOFOCUS_GAIN_TRANSIENT";
-                                break;
-                            case AudioManager.AUDIOFOCUS_GAIN_TRANSIENT_EXCLUSIVE:
-                                typeOfChange = "AUDIOFOCUS_GAIN_TRANSIENT_EXCLUSIVE";
-                                break;
-                            case AudioManager.AUDIOFOCUS_GAIN_TRANSIENT_MAY_DUCK:
-                                typeOfChange = "AUDIOFOCUS_GAIN_TRANSIENT_MAY_DUCK";
-                                break;
-                            case AudioManager.AUDIOFOCUS_LOSS:
-                                typeOfChange = "AUDIOFOCUS_LOSS";
-                                break;
-                            case AudioManager.AUDIOFOCUS_LOSS_TRANSIENT:
-                                typeOfChange = "AUDIOFOCUS_LOSS_TRANSIENT";
-                                break;
-                            case AudioManager.AUDIOFOCUS_LOSS_TRANSIENT_CAN_DUCK:
-                                typeOfChange = "AUDIOFOCUS_LOSS_TRANSIENT_CAN_DUCK";
-                                break;
-                            default:
-                                typeOfChange = "AUDIOFOCUS_INVALID";
-                                break;
-                        }
-                        Log.d(Config.LOGTAG, "onAudioFocusChange: " + typeOfChange);
-                    }
-                };
-        // Request audio playout focus (without ducking) and install listener for changes in focus.
-        int result =
-                audioManager.requestAudioFocus(
-                        audioFocusChangeListener,
-                        AudioManager.STREAM_VOICE_CALL,
-                        AudioManager.AUDIOFOCUS_GAIN_TRANSIENT);
-        if (result == AudioManager.AUDIOFOCUS_REQUEST_GRANTED) {
-            Log.d(Config.LOGTAG, "Audio focus request granted for VOICE_CALL streams");
-        } else {
-            Log.e(Config.LOGTAG, "Audio focus request failed");
-        }
-        // Start by setting MODE_IN_COMMUNICATION as default audio mode. It is
-        // required to be in this mode when playout and/or recording starts for
-        // best possible VoIP performance.
-        audioManager.setMode(AudioManager.MODE_IN_COMMUNICATION);
-        // Always disable microphone mute during a WebRTC call.
-        setMicrophoneMute(false);
-        // Set initial device states.
-        userSelectedAudioDevice = AudioDevice.NONE;
-        selectedAudioDevice = AudioDevice.NONE;
-        audioDevices.clear();
-        // Initialize and start Bluetooth if a BT device is available or initiate
-        // detection of new (enabled) BT devices.
-        bluetoothManager.start();
-        // Do initial selection of audio device. This setting can later be changed
-        // either by adding/removing a BT or wired headset or by covering/uncovering
-        // the proximity sensor.
-        updateAudioDeviceState();
-        // Register receiver for broadcast intents related to adding/removing a
-        // wired headset.
-        registerReceiver(wiredHeadsetReceiver, new IntentFilter(Intent.ACTION_HEADSET_PLUG));
-        Log.d(Config.LOGTAG, "AudioManager started");
-    }
-
-    private void awaitMicrophoneLatch() {
-        final CountDownLatch latch = microphoneLatch;
-        if (latch == null) {
-            return;
-        }
-        try {
-            latch.await();
-        } catch (InterruptedException e) {
-            // ignore
-        }
-    }
-
-    @SuppressWarnings("deprecation")
-    public void stop() {
-        Log.d(Config.LOGTAG, AppRTCAudioManager.class.getName() + ".stop()");
-        ThreadUtils.checkIsOnMainThread();
-        if (amState != AudioManagerState.RUNNING) {
-            Log.e(Config.LOGTAG, "Trying to stop AudioManager in incorrect state: " + amState);
-            return;
-        }
-        amState = AudioManagerState.UNINITIALIZED;
-        unregisterReceiver(wiredHeadsetReceiver);
-        bluetoothManager.stop();
-        // Restore previously stored audio states.
-        setSpeakerphoneOn(savedIsSpeakerPhoneOn);
-        setMicrophoneMute(savedIsMicrophoneMute);
-        audioManager.setMode(AudioManager.MODE_NORMAL);
-        // Abandon audio focus. Gives the previous focus owner, if any, focus.
-        audioManager.abandonAudioFocus(audioFocusChangeListener);
-        audioFocusChangeListener = null;
-        Log.d(Config.LOGTAG, "Abandoned audio focus for VOICE_CALL streams");
-        if (proximitySensor != null) {
-            proximitySensor.stop();
-            proximitySensor = null;
-        }
-        audioManagerEvents = null;
-    }
-
-    /** Changes selection of the currently active audio device. */
-    private void setAudioDeviceInternal(AudioDevice device) {
-        Log.d(Config.LOGTAG, "setAudioDeviceInternal(device=" + device + ")");
-        AppRTCUtils.assertIsTrue(audioDevices.contains(device));
-        switch (device) {
-            case SPEAKER_PHONE:
-                setSpeakerphoneOn(true);
-                break;
-            case EARPIECE:
-            case WIRED_HEADSET:
-            case BLUETOOTH:
-                setSpeakerphoneOn(false);
-                break;
-            default:
-                Log.e(Config.LOGTAG, "Invalid audio device selection");
-                break;
-        }
-        selectedAudioDevice = device;
-    }
-
-    /**
-     * Changes default audio device. TODO(henrika): add usage of this method in the AppRTCMobile
-     * client.
-     */
-    public void setDefaultAudioDevice(AudioDevice defaultDevice) {
-        ThreadUtils.checkIsOnMainThread();
-        switch (defaultDevice) {
-            case SPEAKER_PHONE:
-                defaultAudioDevice = defaultDevice;
-                break;
-            case EARPIECE:
-                if (hasEarpiece()) {
-                    defaultAudioDevice = defaultDevice;
-                } else {
-                    defaultAudioDevice = AudioDevice.SPEAKER_PHONE;
-                }
-                break;
-            default:
-                Log.e(Config.LOGTAG, "Invalid default audio device selection");
-                break;
-        }
-        Log.d(Config.LOGTAG, "setDefaultAudioDevice(device=" + defaultAudioDevice + ")");
-        updateAudioDeviceState();
-    }
-
-    /** Changes selection of the currently active audio device. */
-    public void selectAudioDevice(AudioDevice device) {
-        ThreadUtils.checkIsOnMainThread();
-        if (!audioDevices.contains(device)) {
-            Log.e(Config.LOGTAG, "Can not select " + device + " from available " + audioDevices);
-        }
-        userSelectedAudioDevice = device;
-        updateAudioDeviceState();
-    }
-
-    /** Returns current set of available/selectable audio devices. */
-    public Set<AudioDevice> getAudioDevices() {
-        ThreadUtils.checkIsOnMainThread();
-        return Collections.unmodifiableSet(new HashSet<>(audioDevices));
-    }
-
-    /** Returns the currently selected audio device. */
-    public AudioDevice getSelectedAudioDevice() {
-        ThreadUtils.checkIsOnMainThread();
-        return selectedAudioDevice;
-    }
-
-    /** Helper method for receiver registration. */
-    private void registerReceiver(BroadcastReceiver receiver, IntentFilter filter) {
-        apprtcContext.registerReceiver(receiver, filter);
-    }
-
-    /** Helper method for unregistration of an existing receiver. */
-    private void unregisterReceiver(BroadcastReceiver receiver) {
-        apprtcContext.unregisterReceiver(receiver);
-    }
-
-    /** Sets the speaker phone mode. */
-    private void setSpeakerphoneOn(boolean on) {
-        boolean wasOn = audioManager.isSpeakerphoneOn();
-        if (wasOn == on) {
-            return;
-        }
-        audioManager.setSpeakerphoneOn(on);
-    }
-
-    /** Sets the microphone mute state. */
-    private void setMicrophoneMute(boolean on) {
-        boolean wasMuted = audioManager.isMicrophoneMute();
-        if (wasMuted == on) {
-            return;
-        }
-        audioManager.setMicrophoneMute(on);
-    }
-
-    /** Gets the current earpiece state. */
-    private boolean hasEarpiece() {
-        return apprtcContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_TELEPHONY);
-    }
-
-    /**
-     * Checks whether a wired headset is connected or not. This is not a valid indication that audio
-     * playback is actually over the wired headset as audio routing depends on other conditions. We
-     * only use it as an early indicator (during initialization) of an attached wired headset.
-     */
-    @Deprecated
-    private boolean hasWiredHeadset() {
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
-            return audioManager.isWiredHeadsetOn();
-        } else {
-            final AudioDeviceInfo[] devices = audioManager.getDevices(AudioManager.GET_DEVICES_ALL);
-            for (AudioDeviceInfo device : devices) {
-                final int type = device.getType();
-                if (type == AudioDeviceInfo.TYPE_WIRED_HEADSET) {
-                    Log.d(Config.LOGTAG, "hasWiredHeadset: found wired headset");
-                    return true;
-                } else if (type == AudioDeviceInfo.TYPE_USB_DEVICE) {
-                    Log.d(Config.LOGTAG, "hasWiredHeadset: found USB audio device");
-                    return true;
-                }
-            }
-            return false;
-        }
-    }
-
-    /**
-     * Updates list of possible audio devices and make new device selection. TODO(henrika): add unit
-     * test to verify all state transitions.
-     */
-    public void updateAudioDeviceState() {
-        ThreadUtils.checkIsOnMainThread();
-        Log.d(
-                Config.LOGTAG,
-                "--- updateAudioDeviceState: "
-                        + "wired headset="
-                        + hasWiredHeadset
-                        + ", "
-                        + "BT state="
-                        + bluetoothManager.getState());
-        Log.d(
-                Config.LOGTAG,
-                "Device status: "
-                        + "available="
-                        + audioDevices
-                        + ", "
-                        + "selected="
-                        + selectedAudioDevice
-                        + ", "
-                        + "user selected="
-                        + userSelectedAudioDevice);
-        // Check if any Bluetooth headset is connected. The internal BT state will
-        // change accordingly.
-        // TODO(henrika): perhaps wrap required state into BT manager.
-        if (bluetoothManager.getState() == AppRTCBluetoothManager.State.HEADSET_AVAILABLE
-                || bluetoothManager.getState() == AppRTCBluetoothManager.State.HEADSET_UNAVAILABLE
-                || bluetoothManager.getState() == AppRTCBluetoothManager.State.SCO_DISCONNECTING) {
-            bluetoothManager.updateDevice();
-        }
-        // Update the set of available audio devices.
-        Set<AudioDevice> newAudioDevices = new HashSet<>();
-        if (bluetoothManager.getState() == AppRTCBluetoothManager.State.SCO_CONNECTED
-                || bluetoothManager.getState() == AppRTCBluetoothManager.State.SCO_CONNECTING
-                || bluetoothManager.getState() == AppRTCBluetoothManager.State.HEADSET_AVAILABLE) {
-            newAudioDevices.add(AudioDevice.BLUETOOTH);
-        }
-        if (hasWiredHeadset) {
-            // If a wired headset is connected, then it is the only possible option.
-            newAudioDevices.add(AudioDevice.WIRED_HEADSET);
-        } else {
-            // No wired headset, hence the audio-device list can contain speaker
-            // phone (on a tablet), or speaker phone and earpiece (on mobile phone).
-            newAudioDevices.add(AudioDevice.SPEAKER_PHONE);
-            if (hasEarpiece()) {
-                newAudioDevices.add(AudioDevice.EARPIECE);
-            }
-        }
-        // Store state which is set to true if the device list has changed.
-        boolean audioDeviceSetUpdated = !audioDevices.equals(newAudioDevices);
-        // Update the existing audio device set.
-        audioDevices = newAudioDevices;
-        // Correct user selected audio devices if needed.
-        if (bluetoothManager.getState() == AppRTCBluetoothManager.State.HEADSET_UNAVAILABLE
-                && userSelectedAudioDevice == AudioDevice.BLUETOOTH) {
-            // If BT is not available, it can't be the user selection.
-            userSelectedAudioDevice = AudioDevice.NONE;
-        }
-        if (hasWiredHeadset && userSelectedAudioDevice == AudioDevice.SPEAKER_PHONE) {
-            // If user selected speaker phone, but then plugged wired headset then make
-            // wired headset as user selected device.
-            userSelectedAudioDevice = AudioDevice.WIRED_HEADSET;
-        }
-        if (!hasWiredHeadset && userSelectedAudioDevice == AudioDevice.WIRED_HEADSET) {
-            // If user selected wired headset, but then unplugged wired headset then make
-            // speaker phone as user selected device.
-            userSelectedAudioDevice = AudioDevice.SPEAKER_PHONE;
-        }
-        // Need to start Bluetooth if it is available and user either selected it explicitly or
-        // user did not select any output device.
-        boolean needBluetoothAudioStart =
-                bluetoothManager.getState() == AppRTCBluetoothManager.State.HEADSET_AVAILABLE
-                        && (userSelectedAudioDevice == AudioDevice.NONE
-                                || userSelectedAudioDevice == AudioDevice.BLUETOOTH);
-        // Need to stop Bluetooth audio if user selected different device and
-        // Bluetooth SCO connection is established or in the process.
-        boolean needBluetoothAudioStop =
-                (bluetoothManager.getState() == AppRTCBluetoothManager.State.SCO_CONNECTED
-                                || bluetoothManager.getState()
-                                        == AppRTCBluetoothManager.State.SCO_CONNECTING)
-                        && (userSelectedAudioDevice != AudioDevice.NONE
-                                && userSelectedAudioDevice != AudioDevice.BLUETOOTH);
-        if (bluetoothManager.getState() == AppRTCBluetoothManager.State.HEADSET_AVAILABLE
-                || bluetoothManager.getState() == AppRTCBluetoothManager.State.SCO_CONNECTING
-                || bluetoothManager.getState() == AppRTCBluetoothManager.State.SCO_CONNECTED) {
-            Log.d(
-                    Config.LOGTAG,
-                    "Need BT audio: start="
-                            + needBluetoothAudioStart
-                            + ", "
-                            + "stop="
-                            + needBluetoothAudioStop
-                            + ", "
-                            + "BT state="
-                            + bluetoothManager.getState());
-        }
-        // Start or stop Bluetooth SCO connection given states set earlier.
-        if (needBluetoothAudioStop) {
-            bluetoothManager.stopScoAudio();
-            bluetoothManager.updateDevice();
-        }
-        if (needBluetoothAudioStart && !needBluetoothAudioStop) {
-            // Attempt to start Bluetooth SCO audio (takes a few second to start).
-            if (!bluetoothManager.startScoAudio()) {
-                // Remove BLUETOOTH from list of available devices since SCO failed.
-                audioDevices.remove(AudioDevice.BLUETOOTH);
-                audioDeviceSetUpdated = true;
-            }
-        }
-        // Update selected audio device.
-        final AudioDevice newAudioDevice;
-        if (bluetoothManager.getState() == AppRTCBluetoothManager.State.SCO_CONNECTED) {
-            // If a Bluetooth is connected, then it should be used as output audio
-            // device. Note that it is not sufficient that a headset is available;
-            // an active SCO channel must also be up and running.
-            newAudioDevice = AudioDevice.BLUETOOTH;
-        } else if (hasWiredHeadset) {
-            // If a wired headset is connected, but Bluetooth is not, then wired headset is used as
-            // audio device.
-            newAudioDevice = AudioDevice.WIRED_HEADSET;
-        } else {
-            // No wired headset and no Bluetooth, hence the audio-device list can contain speaker
-            // phone (on a tablet), or speaker phone and earpiece (on mobile phone).
-            // |defaultAudioDevice| contains either AudioDevice.SPEAKER_PHONE or
-            // AudioDevice.EARPIECE
-            // depending on the user's selection.
-            newAudioDevice = defaultAudioDevice;
-        }
-        // Switch to new device but only if there has been any changes.
-        if (newAudioDevice != selectedAudioDevice || audioDeviceSetUpdated) {
-            // Do the required device switch.
-            setAudioDeviceInternal(newAudioDevice);
-            Log.d(
-                    Config.LOGTAG,
-                    "New device status: "
-                            + "available="
-                            + audioDevices
-                            + ", "
-                            + "selected="
-                            + newAudioDevice);
-            if (audioManagerEvents != null) {
-                // Notify a listening client that audio device has been changed.
-                audioManagerEvents.onAudioDeviceChanged(selectedAudioDevice, audioDevices);
-            }
-        }
-        Log.d(Config.LOGTAG, "--- updateAudioDeviceState done");
-    }
-
-    /** AudioDevice is the names of possible audio devices that we currently support. */
-    public enum AudioDevice {
-        SPEAKER_PHONE,
-        WIRED_HEADSET,
-        EARPIECE,
-        BLUETOOTH,
-        NONE
-    }
-
-    /** AudioManager state. */
-    public enum AudioManagerState {
-        UNINITIALIZED,
-        PREINITIALIZED,
-        RUNNING,
-    }
-
-    public enum SpeakerPhonePreference {
-        AUTO,
-        EARPIECE,
-        SPEAKER;
-
-        public static SpeakerPhonePreference of(final Set<Media> media) {
-            if (media.contains(Media.VIDEO)) {
-                return SPEAKER;
-            } else {
-                return EARPIECE;
-            }
-        }
-    }
-
-    /** Selected audio device change event. */
-    public interface AudioManagerEvents {
-        // Callback fired once audio device is changed or list of available audio devices changed.
-        void onAudioDeviceChanged(
-                AudioDevice selectedAudioDevice, Set<AudioDevice> availableAudioDevices);
-    }
-
-    /* Receiver which handles changes in wired headset availability. */
-    private class WiredHeadsetReceiver extends BroadcastReceiver {
-        private static final int STATE_UNPLUGGED = 0;
-        private static final int STATE_PLUGGED = 1;
-        private static final int HAS_NO_MIC = 0;
-        private static final int HAS_MIC = 1;
-
-        @Override
-        public void onReceive(Context context, Intent intent) {
-            int state = intent.getIntExtra("state", STATE_UNPLUGGED);
-            int microphone = intent.getIntExtra("microphone", HAS_NO_MIC);
-            String name = intent.getStringExtra("name");
-            Log.d(
-                    Config.LOGTAG,
-                    "WiredHeadsetReceiver.onReceive"
-                            + AppRTCUtils.getThreadInfo()
-                            + ": "
-                            + "a="
-                            + intent.getAction()
-                            + ", s="
-                            + (state == STATE_UNPLUGGED ? "unplugged" : "plugged")
-                            + ", m="
-                            + (microphone == HAS_MIC ? "mic" : "no mic")
-                            + ", n="
-                            + name
-                            + ", sb="
-                            + isInitialStickyBroadcast());
-            hasWiredHeadset = (state == STATE_PLUGGED);
-            updateAudioDeviceState();
-        }
-    }
-}

app/src/main/java/eu/siacs/conversations/utils/AppRTCUtils.java

@@ -1,66 +0,0 @@
-/*
- *  Copyright 2014 The WebRTC Project Authors. All rights reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-package eu.siacs.conversations.utils;
-
-import android.os.Build;
-import android.util.Log;
-
-/** AppRTCUtils provides helper functions for managing thread safety. */
-public final class AppRTCUtils {
-    private AppRTCUtils() {}
-
-    /** Helper method which throws an exception when an assertion has failed. */
-    public static void assertIsTrue(boolean condition) {
-        if (!condition) {
-            throw new AssertionError("Expected condition to be true");
-        }
-    }
-
-    /** Helper method for building a string of thread information. */
-    public static String getThreadInfo() {
-        return "@[name="
-                + Thread.currentThread().getName()
-                + ", id="
-                + Thread.currentThread().getId()
-                + "]";
-    }
-
-    /** Information about the current build, taken from system properties. */
-    public static void logDeviceInfo(String tag) {
-        Log.d(
-                tag,
-                "Android SDK: "
-                        + Build.VERSION.SDK_INT
-                        + ", "
-                        + "Release: "
-                        + Build.VERSION.RELEASE
-                        + ", "
-                        + "Brand: "
-                        + Build.BRAND
-                        + ", "
-                        + "Device: "
-                        + Build.DEVICE
-                        + ", "
-                        + "Id: "
-                        + Build.ID
-                        + ", "
-                        + "Hardware: "
-                        + Build.HARDWARE
-                        + ", "
-                        + "Manufacturer: "
-                        + Build.MANUFACTURER
-                        + ", "
-                        + "Model: "
-                        + Build.MODEL
-                        + ", "
-                        + "Product: "
-                        + Build.PRODUCT);
-    }
-}

app/src/main/java/eu/siacs/conversations/xmpp/jingle/AbstractJingleConnection.java

@@ -1,119 +0,0 @@
-package eu.siacs.conversations.xmpp.jingle;
-
-import android.content.Context;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.Objects;
-import com.google.common.base.Preconditions;
-import eu.siacs.conversations.xmpp.jingle.stanzas.JinglePacket;
-import im.conversations.android.IDs;
-import im.conversations.android.xmpp.XmppConnection;
-import im.conversations.android.xmpp.model.stanza.Iq;
-import org.jxmpp.jid.Jid;
-
-public abstract class AbstractJingleConnection extends XmppConnection.Delegate {
-
-    public static final String JINGLE_MESSAGE_PROPOSE_ID_PREFIX = "jm-propose-";
-    public static final String JINGLE_MESSAGE_PROCEED_ID_PREFIX = "jm-proceed-";
-
-    protected final Id id;
-    private final Jid initiator;
-
-    AbstractJingleConnection(
-            final Context context,
-            final XmppConnection connection,
-            final Id id,
-            final Jid initiator) {
-        super(context, connection);
-        this.id = id;
-        this.initiator = initiator;
-    }
-
-    boolean isInitiator() {
-        return initiator.equals(connection.getBoundAddress());
-    }
-
-    public abstract void deliverPacket(Iq jinglePacket);
-
-    public Id getId() {
-        return id;
-    }
-
-    public abstract void notifyRebound();
-
-    public static class Id implements OngoingRtpSession {
-        public final Jid with;
-        public final String sessionId;
-
-        private Id(final Jid with, final String sessionId) {
-            Preconditions.checkNotNull(with);
-            Preconditions.checkNotNull(sessionId);
-            this.with = with;
-            this.sessionId = sessionId;
-        }
-
-        public static Id of(final JinglePacket jinglePacket) {
-            return new Id(jinglePacket.getFrom(), jinglePacket.getSessionId());
-        }
-
-        public static Id of(Jid with, final String sessionId) {
-            return new Id(with, sessionId);
-        }
-
-        public static Id of(Jid with) {
-            return new Id(with, IDs.medium());
-        }
-
-        @Override
-        public Jid getWith() {
-            return with;
-        }
-
-        @Override
-        public String getSessionId() {
-            return sessionId;
-        }
-
-        @Override
-        public boolean equals(Object o) {
-            if (this == o) return true;
-            if (o == null || getClass() != o.getClass()) return false;
-            Id id = (Id) o;
-            return Objects.equal(with, id.with) && Objects.equal(sessionId, id.sessionId);
-        }
-
-        @Override
-        public int hashCode() {
-            return Objects.hashCode(with, sessionId);
-        }
-
-        @Override
-        public String toString() {
-            return MoreObjects.toStringHelper(this)
-                    .add("with", with)
-                    .add("sessionId", sessionId)
-                    .toString();
-        }
-    }
-
-    public enum State {
-        NULL, // default value; nothing has been sent or received yet
-        PROPOSED,
-        ACCEPTED,
-        PROCEED,
-        REJECTED,
-        REJECTED_RACED, // used when we want to reject but haven’t received session init yet
-        RETRACTED,
-        RETRACTED_RACED, // used when receiving a retract after we already asked to proceed
-        SESSION_INITIALIZED, // equal to 'PENDING'
-        SESSION_INITIALIZED_PRE_APPROVED,
-        SESSION_ACCEPTED, // equal to 'ACTIVE'
-        TERMINATED_SUCCESS, // equal to 'ENDED' (after successful call) ui will just close
-        TERMINATED_DECLINED_OR_BUSY, // equal to 'ENDED' (after other party declined the call)
-        TERMINATED_CONNECTIVITY_ERROR, // equal to 'ENDED' (but after network failures; ui will
-        // display retry button)
-        TERMINATED_CANCEL_OR_TIMEOUT, // more or less the same as retracted; caller pressed end call
-        // before session was accepted
-        TERMINATED_APPLICATION_FAILURE,
-        TERMINATED_SECURITY_ERROR
-    }
-}

app/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleCandidate.java

@@ -1,153 +0,0 @@
-package eu.siacs.conversations.xmpp.jingle;
-
-import im.conversations.android.xml.Element;
-import java.util.ArrayList;
-import java.util.List;
-import org.jxmpp.jid.Jid;
-
-public class JingleCandidate {
-
-    public static int TYPE_UNKNOWN;
-    public static int TYPE_DIRECT = 0;
-    public static int TYPE_PROXY = 1;
-
-    private final boolean ours;
-    private boolean usedByCounterpart = false;
-    private final String cid;
-    private String host;
-    private int port;
-    private int type;
-    private Jid jid;
-    private int priority;
-
-    public JingleCandidate(String cid, boolean ours) {
-        this.ours = ours;
-        this.cid = cid;
-    }
-
-    public String getCid() {
-        return cid;
-    }
-
-    public void setHost(String host) {
-        this.host = host;
-    }
-
-    public String getHost() {
-        return this.host;
-    }
-
-    public void setJid(final Jid jid) {
-        this.jid = jid;
-    }
-
-    public Jid getJid() {
-        return this.jid;
-    }
-
-    public void setPort(int port) {
-        this.port = port;
-    }
-
-    public int getPort() {
-        return this.port;
-    }
-
-    public void setType(int type) {
-        this.type = type;
-    }
-
-    public void setType(String type) {
-        if (type == null) {
-            this.type = TYPE_UNKNOWN;
-            return;
-        }
-        switch (type) {
-            case "proxy":
-                this.type = TYPE_PROXY;
-                break;
-            case "direct":
-                this.type = TYPE_DIRECT;
-                break;
-            default:
-                this.type = TYPE_UNKNOWN;
-                break;
-        }
-    }
-
-    public void setPriority(int i) {
-        this.priority = i;
-    }
-
-    public int getPriority() {
-        return this.priority;
-    }
-
-    public boolean equals(JingleCandidate other) {
-        return this.getCid().equals(other.getCid());
-    }
-
-    public boolean equalValues(JingleCandidate other) {
-        return other != null
-                && other.getHost().equals(this.getHost())
-                && (other.getPort() == this.getPort());
-    }
-
-    public boolean isOurs() {
-        return ours;
-    }
-
-    public int getType() {
-        return this.type;
-    }
-
-    public static List<JingleCandidate> parse(final List<Element> elements) {
-        final List<JingleCandidate> candidates = new ArrayList<>();
-        for (final Element element : elements) {
-            if ("candidate".equals(element.getName())) {
-                candidates.add(JingleCandidate.parse(element));
-            }
-        }
-        return candidates;
-    }
-
-    public static JingleCandidate parse(Element element) {
-        final JingleCandidate candidate = new JingleCandidate(element.getAttribute("cid"), false);
-        candidate.setHost(element.getAttribute("host"));
-        candidate.setJid(element.getAttributeAsJid("jid"));
-        candidate.setType(element.getAttribute("type"));
-        candidate.setPriority(Integer.parseInt(element.getAttribute("priority")));
-        candidate.setPort(Integer.parseInt(element.getAttribute("port")));
-        return candidate;
-    }
-
-    public Element toElement() {
-        Element element = new Element("candidate");
-        element.setAttribute("cid", this.getCid());
-        element.setAttribute("host", this.getHost());
-        element.setAttribute("port", Integer.toString(this.getPort()));
-        if (jid != null) {
-            element.setAttribute("jid", jid);
-        }
-        element.setAttribute("priority", Integer.toString(this.getPriority()));
-        if (this.getType() == TYPE_DIRECT) {
-            element.setAttribute("type", "direct");
-        } else if (this.getType() == TYPE_PROXY) {
-            element.setAttribute("type", "proxy");
-        }
-        return element;
-    }
-
-    public void flagAsUsedByCounterpart() {
-        this.usedByCounterpart = true;
-    }
-
-    public boolean isUsedByCounterpart() {
-        return this.usedByCounterpart;
-    }
-
-    public String toString() {
-        return String.format(
-                "%s:%s (priority=%s,ours=%s)", getHost(), getPort(), getPriority(), isOurs());
-    }
-}

app/src/main/java/eu/siacs/conversations/xmpp/jingle/OmemoVerification.java

@@ -1,83 +0,0 @@
-package eu.siacs.conversations.xmpp.jingle;
-
-import com.google.common.base.MoreObjects;
-import com.google.common.base.Preconditions;
-import im.conversations.android.axolotl.AxolotlService;
-import java.util.concurrent.atomic.AtomicBoolean;
-import org.whispersystems.libsignal.IdentityKey;
-
-public class OmemoVerification {
-
-    private final AtomicBoolean deviceIdWritten = new AtomicBoolean(false);
-    private final AtomicBoolean identityKeyWritten = new AtomicBoolean(false);
-    private Integer deviceId;
-    private IdentityKey identityKey;
-
-    public void setDeviceId(final Integer id) {
-        if (deviceIdWritten.compareAndSet(false, true)) {
-            this.deviceId = id;
-            return;
-        }
-        throw new IllegalStateException("Device Id has already been set");
-    }
-
-    public int getDeviceId() {
-        Preconditions.checkNotNull(this.deviceId, "Device ID is null");
-        return this.deviceId;
-    }
-
-    public boolean hasDeviceId() {
-        return this.deviceId != null;
-    }
-
-    public void setSessionFingerprint(final IdentityKey identityKey) {
-        Preconditions.checkNotNull(identityKey, "IdentityKey must not be null");
-        if (identityKeyWritten.compareAndSet(false, true)) {
-            this.identityKey = identityKey;
-            return;
-        }
-        throw new IllegalStateException("Identity Key has already been set");
-    }
-
-    public IdentityKey getFingerprint() {
-        return this.identityKey;
-    }
-
-    public void setOrEnsureEqual(AxolotlService.OmemoVerifiedPayload<?> omemoVerifiedPayload) {
-        setOrEnsureEqual(omemoVerifiedPayload.getDeviceId(), omemoVerifiedPayload.getFingerprint());
-    }
-
-    public void setOrEnsureEqual(final int deviceId, final IdentityKey identityKey) {
-        Preconditions.checkNotNull(identityKey, "IdentityKey must not be null");
-        if (this.deviceIdWritten.get() || this.identityKeyWritten.get()) {
-            if (this.identityKey == null) {
-                throw new IllegalStateException(
-                        "No session fingerprint has been previously provided");
-            }
-            if (!identityKey.equals(this.identityKey)) {
-                throw new SecurityException("IdentityKeys did not match");
-            }
-            if (this.deviceId == null) {
-                throw new IllegalStateException("No Device Id has been previously provided");
-            }
-            if (this.deviceId != deviceId) {
-                throw new IllegalStateException("Device Ids did not match");
-            }
-        } else {
-            this.setSessionFingerprint(identityKey);
-            this.setDeviceId(deviceId);
-        }
-    }
-
-    public boolean hasFingerprint() {
-        return this.identityKey != null;
-    }
-
-    @Override
-    public String toString() {
-        return MoreObjects.toStringHelper(this)
-                .add("deviceId", deviceId)
-                .add("fingerprint", identityKey)
-                .toString();
-    }
-}

app/src/main/java/eu/siacs/conversations/xmpp/jingle/OmemoVerifiedRtpContentMap.java

@@ -1,20 +0,0 @@
-package eu.siacs.conversations.xmpp.jingle;
-
-import eu.siacs.conversations.xmpp.jingle.stanzas.Group;
-import eu.siacs.conversations.xmpp.jingle.stanzas.OmemoVerifiedIceUdpTransportInfo;
-import java.util.Map;
-
-public class OmemoVerifiedRtpContentMap extends RtpContentMap {
-    public OmemoVerifiedRtpContentMap(Group group, Map<String, DescriptionTransport> contents) {
-        super(group, contents);
-        for (final DescriptionTransport descriptionTransport : contents.values()) {
-            if (descriptionTransport.transport instanceof OmemoVerifiedIceUdpTransportInfo) {
-                ((OmemoVerifiedIceUdpTransportInfo) descriptionTransport.transport)
-                        .ensureNoPlaintextFingerprint();
-                continue;
-            }
-            throw new IllegalStateException(
-                    "OmemoVerifiedRtpContentMap contains non-verified transport info");
-        }
-    }
-}

app/src/main/java/eu/siacs/conversations/xmpp/jingle/OnPrimaryCandidateFound.java

@@ -1,5 +0,0 @@
-package eu.siacs.conversations.xmpp.jingle;
-
-public interface OnPrimaryCandidateFound {
-    void onPrimaryCandidateFound(boolean success, JingleCandidate canditate);
-}

app/src/main/java/eu/siacs/conversations/xmpp/jingle/OnTransportConnected.java

@@ -1,7 +0,0 @@
-package eu.siacs.conversations.xmpp.jingle;
-
-public interface OnTransportConnected {
-    void failed();
-
-    void established();
-}

app/src/main/java/eu/siacs/conversations/xmpp/jingle/OngoingRtpSession.java

@@ -1,9 +0,0 @@
-package eu.siacs.conversations.xmpp.jingle;
-
-import org.jxmpp.jid.Jid;
-
-public interface OngoingRtpSession {
-    Jid getWith();
-
-    String getSessionId();
-}

app/src/main/java/eu/siacs/conversations/xmpp/jingle/RtpEndUserState.java

@@ -1,21 +0,0 @@
-package eu.siacs.conversations.xmpp.jingle;
-
-public enum RtpEndUserState {
-    INCOMING_CALL, // received a 'propose' message
-    CONNECTING, // session-initiate or session-accepted but no webrtc peer connection yet
-    CONNECTED, // session-accepted and webrtc peer connection is connected
-    RECONNECTING, // session-accepted and webrtc peer connection was connected once but is currently
-    // disconnected or failed
-    INCOMING_CONTENT_ADD, // session-accepted with a pending, incoming content-add
-    FINDING_DEVICE, // 'propose' has been sent out; no 184 ack yet
-    RINGING, // 'propose' has been sent out and it has been 184 acked
-    ACCEPTING_CALL, // 'proceed' message has been sent; but no session-initiate has been received
-    ENDING_CALL, // libwebrt says 'closed' but session-terminate hasnt gone through
-    ENDED, // close UI
-    DECLINED_OR_BUSY, // other party declined; no retry button
-    CONNECTIVITY_ERROR, // network error; retry button
-    CONNECTIVITY_LOST_ERROR, // network error but for call duration > 0
-    RETRACTED, // user pressed home or power button during 'ringing' - shows retry button
-    APPLICATION_ERROR, // something rather bad happened; libwebrtc failed or we got in IQ-error
-    SECURITY_ERROR // problem with DTLS (missing) or verification
-}

app/src/main/java/eu/siacs/conversations/xmpp/jingle/ToneManager.java

@@ -1,274 +0,0 @@
-package eu.siacs.conversations.xmpp.jingle;
-
-import static java.util.Arrays.asList;
-
-import android.content.Context;
-import android.media.AudioManager;
-import android.media.ToneGenerator;
-import android.util.Log;
-import eu.siacs.conversations.Config;
-import im.conversations.android.xmpp.manager.JingleConnectionManager;
-import java.util.Arrays;
-import java.util.Set;
-import java.util.concurrent.ScheduledFuture;
-import java.util.concurrent.TimeUnit;
-
-public class ToneManager {
-
-    private final ToneGenerator toneGenerator;
-    private final Context context;
-
-    private ToneState state = null;
-    private RtpEndUserState endUserState = null;
-    private ScheduledFuture<?> currentTone;
-    private ScheduledFuture<?> currentResetFuture;
-    private boolean appRtcAudioManagerHasControl = false;
-
-    private static volatile ToneManager INSTANCE;
-
-    private ToneManager(final Context context) {
-        ToneGenerator toneGenerator;
-        try {
-            toneGenerator = new ToneGenerator(AudioManager.STREAM_VOICE_CALL, 60);
-        } catch (final RuntimeException e) {
-            Log.e(Config.LOGTAG, "unable to instantiate ToneGenerator", e);
-            toneGenerator = null;
-        }
-        this.toneGenerator = toneGenerator;
-        this.context = context.getApplicationContext();
-    }
-
-    private static ToneState of(
-            final boolean isInitiator, final RtpEndUserState state, final Set<Media> media) {
-        if (isInitiator) {
-            if (asList(
-                            RtpEndUserState.FINDING_DEVICE,
-                            RtpEndUserState.RINGING,
-                            RtpEndUserState.CONNECTING)
-                    .contains(state)) {
-                return ToneState.RINGING;
-            }
-            if (state == RtpEndUserState.DECLINED_OR_BUSY) {
-                return ToneState.BUSY;
-            }
-        }
-        if (state == RtpEndUserState.ENDING_CALL) {
-            if (media.contains(Media.VIDEO)) {
-                return ToneState.NULL;
-            } else {
-                return ToneState.ENDING_CALL;
-            }
-        }
-        if (Arrays.asList(
-                        RtpEndUserState.CONNECTED,
-                        RtpEndUserState.RECONNECTING,
-                        RtpEndUserState.INCOMING_CONTENT_ADD)
-                .contains(state)) {
-            if (media.contains(Media.VIDEO)) {
-                return ToneState.NULL;
-            } else {
-                return ToneState.CONNECTED;
-            }
-        }
-        return ToneState.NULL;
-    }
-
-    public void transition(final RtpEndUserState state, final Set<Media> media) {
-        transition(state, of(true, state, media), media);
-    }
-
-    void transition(
-            final boolean isInitiator, final RtpEndUserState state, final Set<Media> media) {
-        transition(state, of(isInitiator, state, media), media);
-    }
-
-    private synchronized void transition(
-            final RtpEndUserState endUserState, final ToneState state, final Set<Media> media) {
-        final RtpEndUserState normalizeEndUserState = normalize(endUserState);
-        if (this.endUserState == normalizeEndUserState) {
-            return;
-        }
-        this.endUserState = normalizeEndUserState;
-        if (this.state == state) {
-            return;
-        }
-        if (state == ToneState.NULL && this.state == ToneState.ENDING_CALL) {
-            return;
-        }
-        cancelCurrentTone();
-        Log.d(Config.LOGTAG, getClass().getName() + ".transition(" + state + ")");
-        if (state != ToneState.NULL) {
-            configureAudioManagerForCall(media);
-        }
-        switch (state) {
-            case RINGING:
-                scheduleWaitingTone();
-                break;
-            case CONNECTED:
-                scheduleConnected();
-                break;
-            case BUSY:
-                scheduleBusy();
-                break;
-            case ENDING_CALL:
-                scheduleEnding();
-                break;
-            case NULL:
-                if (noResetScheduled()) {
-                    resetAudioManager();
-                }
-                break;
-            default:
-                throw new IllegalStateException("Unable to handle transition to " + state);
-        }
-        this.state = state;
-    }
-
-    private static RtpEndUserState normalize(final RtpEndUserState endUserState) {
-        if (Arrays.asList(
-                        RtpEndUserState.CONNECTED,
-                        RtpEndUserState.RECONNECTING,
-                        RtpEndUserState.INCOMING_CONTENT_ADD)
-                .contains(endUserState)) {
-            return RtpEndUserState.CONNECTED;
-        } else {
-            return endUserState;
-        }
-    }
-
-    void setAppRtcAudioManagerHasControl(final boolean appRtcAudioManagerHasControl) {
-        this.appRtcAudioManagerHasControl = appRtcAudioManagerHasControl;
-    }
-
-    private void scheduleConnected() {
-        this.currentTone =
-                JingleConnectionManager.SCHEDULED_EXECUTOR_SERVICE.schedule(
-                        () -> {
-                            startTone(ToneGenerator.TONE_PROP_PROMPT, 200);
-                        },
-                        0,
-                        TimeUnit.SECONDS);
-    }
-
-    private void scheduleEnding() {
-        this.currentTone =
-                JingleConnectionManager.SCHEDULED_EXECUTOR_SERVICE.schedule(
-                        () -> {
-                            startTone(ToneGenerator.TONE_CDMA_CALLDROP_LITE, 375);
-                        },
-                        0,
-                        TimeUnit.SECONDS);
-        this.currentResetFuture =
-                JingleConnectionManager.SCHEDULED_EXECUTOR_SERVICE.schedule(
-                        this::resetAudioManager, 375, TimeUnit.MILLISECONDS);
-    }
-
-    private void scheduleBusy() {
-        this.currentTone =
-                JingleConnectionManager.SCHEDULED_EXECUTOR_SERVICE.schedule(
-                        () -> {
-                            startTone(ToneGenerator.TONE_CDMA_NETWORK_BUSY, 2500);
-                        },
-                        0,
-                        TimeUnit.SECONDS);
-        this.currentResetFuture =
-                JingleConnectionManager.SCHEDULED_EXECUTOR_SERVICE.schedule(
-                        this::resetAudioManager, 2500, TimeUnit.MILLISECONDS);
-    }
-
-    private void scheduleWaitingTone() {
-        this.currentTone =
-                JingleConnectionManager.SCHEDULED_EXECUTOR_SERVICE.scheduleAtFixedRate(
-                        () -> {
-                            startTone(ToneGenerator.TONE_CDMA_DIAL_TONE_LITE, 750);
-                        },
-                        0,
-                        3,
-                        TimeUnit.SECONDS);
-    }
-
-    private boolean noResetScheduled() {
-        return this.currentResetFuture == null || this.currentResetFuture.isDone();
-    }
-
-    private void cancelCurrentTone() {
-        if (currentTone != null) {
-            currentTone.cancel(true);
-        }
-        if (toneGenerator != null) {
-            toneGenerator.stopTone();
-        }
-    }
-
-    private void startTone(final int toneType, final int durationMs) {
-        if (toneGenerator != null) {
-            this.toneGenerator.startTone(toneType, durationMs);
-        } else {
-            Log.e(Config.LOGTAG, "failed to start tone. ToneGenerator doesn't exist");
-        }
-    }
-
-    private void configureAudioManagerForCall(final Set<Media> media) {
-        if (appRtcAudioManagerHasControl) {
-            Log.d(
-                    Config.LOGTAG,
-                    ToneManager.class.getName()
-                            + ": do not configure audio manager because RTC has control");
-            return;
-        }
-        final AudioManager audioManager =
-                (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
-        if (audioManager == null) {
-            return;
-        }
-        final boolean isSpeakerPhone = media.contains(Media.VIDEO);
-        Log.d(
-                Config.LOGTAG,
-                ToneManager.class.getName()
-                        + ": putting AudioManager into communication mode. speaker="
-                        + isSpeakerPhone);
-        audioManager.setMode(AudioManager.MODE_IN_COMMUNICATION);
-        audioManager.setSpeakerphoneOn(isSpeakerPhone);
-    }
-
-    private void resetAudioManager() {
-        if (appRtcAudioManagerHasControl) {
-            Log.d(
-                    Config.LOGTAG,
-                    ToneManager.class.getName()
-                            + ": do not reset audio manager because RTC has control");
-            return;
-        }
-        final AudioManager audioManager =
-                (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
-        if (audioManager == null) {
-            return;
-        }
-        Log.d(
-                Config.LOGTAG,
-                ToneManager.class.getName() + ": putting AudioManager back into normal mode");
-        audioManager.setMode(AudioManager.MODE_NORMAL);
-        audioManager.setSpeakerphoneOn(false);
-    }
-
-    public static ToneManager getInstance(final Context context) {
-        if (INSTANCE != null) {
-            return INSTANCE;
-        }
-        synchronized (ToneManager.class) {
-            if (INSTANCE != null) {
-                return INSTANCE;
-            }
-            INSTANCE = new ToneManager(context);
-            return INSTANCE;
-        }
-    }
-
-    private enum ToneState {
-        NULL,
-        RINGING,
-        CONNECTED,
-        BUSY,
-        ENDING_CALL
-    }
-}

app/src/main/java/eu/siacs/conversations/xmpp/jingle/stanzas/FileTransferDescription.java

@@ -1,69 +0,0 @@
-package eu.siacs.conversations.xmpp.jingle.stanzas;
-
-import com.google.common.base.Preconditions;
-import im.conversations.android.xml.Element;
-import java.util.Arrays;
-import java.util.List;
-
-public class FileTransferDescription extends GenericDescription {
-
-    public static List<String> NAMESPACES =
-            Arrays.asList(Version.FT_3.namespace, Version.FT_4.namespace, Version.FT_5.namespace);
-
-    private FileTransferDescription(String name, String namespace) {
-        super(name, namespace);
-    }
-
-    public Version getVersion() {
-        final String namespace = getNamespace();
-        if (namespace.equals(Version.FT_3.namespace)) {
-            return Version.FT_3;
-        } else if (namespace.equals(Version.FT_4.namespace)) {
-            return Version.FT_4;
-        } else if (namespace.equals(Version.FT_5.namespace)) {
-            return Version.FT_5;
-        } else {
-            throw new IllegalStateException("Unknown namespace");
-        }
-    }
-
-    public Element getFileOffer() {
-        final Version version = getVersion();
-        if (version == Version.FT_3) {
-            final Element offer = this.findChild("offer");
-            return offer == null ? null : offer.findChild("file");
-        } else {
-            return this.findChild("file");
-        }
-    }
-
-    public static FileTransferDescription upgrade(final Element element) {
-        Preconditions.checkArgument(
-                "description".equals(element.getName()),
-                "Name of provided element is not description");
-        Preconditions.checkArgument(
-                NAMESPACES.contains(element.getNamespace()),
-                "Element does not match a file transfer namespace");
-        final FileTransferDescription description =
-                new FileTransferDescription("description", element.getNamespace());
-        description.setAttributes(element.getAttributes());
-        description.setChildren(element.getChildren());
-        return description;
-    }
-
-    public enum Version {
-        FT_3("urn:xmpp:jingle:apps:file-transfer:3"),
-        FT_4("urn:xmpp:jingle:apps:file-transfer:4"),
-        FT_5("urn:xmpp:jingle:apps:file-transfer:5");
-
-        private final String namespace;
-
-        Version(String namespace) {
-            this.namespace = namespace;
-        }
-
-        public String getNamespace() {
-            return namespace;
-        }
-    }
-}

app/src/main/java/eu/siacs/conversations/xmpp/jingle/stanzas/Group.java

@@ -1,62 +0,0 @@
-package eu.siacs.conversations.xmpp.jingle.stanzas;
-
-import com.google.common.base.Preconditions;
-import com.google.common.collect.ImmutableList;
-import im.conversations.android.xml.Element;
-import im.conversations.android.xml.Namespace;
-import java.util.Collection;
-import java.util.List;
-
-public class Group extends Element {
-
-    private Group() {
-        super("group", Namespace.JINGLE_APPS_GROUPING);
-    }
-
-    public Group(final String semantics, final Collection<String> identificationTags) {
-        super("group", Namespace.JINGLE_APPS_GROUPING);
-        this.setAttribute("semantics", semantics);
-        for (String tag : identificationTags) {
-            this.addChild(new Element("content").setAttribute("name", tag));
-        }
-    }
-
-    public String getSemantics() {
-        return this.getAttribute("semantics");
-    }
-
-    public List<String> getIdentificationTags() {
-        final ImmutableList.Builder<String> builder = new ImmutableList.Builder<>();
-        for (final Element child : this.children) {
-            if ("content".equals(child.getName())) {
-                final String name = child.getAttribute("name");
-                if (name != null) {
-                    builder.add(name);
-                }
-            }
-        }
-        return builder.build();
-    }
-
-    public static Group ofSdpString(final String input) {
-        ImmutableList.Builder<String> tagBuilder = new ImmutableList.Builder<>();
-        final String[] parts = input.split(" ");
-        if (parts.length >= 2) {
-            final String semantics = parts[0];
-            for (int i = 1; i < parts.length; ++i) {
-                tagBuilder.add(parts[i]);
-            }
-            return new Group(semantics, tagBuilder.build());
-        }
-        return null;
-    }
-
-    public static Group upgrade(final Element element) {
-        Preconditions.checkArgument("group".equals(element.getName()));
-        Preconditions.checkArgument(Namespace.JINGLE_APPS_GROUPING.equals(element.getNamespace()));
-        final Group group = new Group();
-        group.setAttributes(element.getAttributes());
-        group.setChildren(element.getChildren());
-        return group;
-    }
-}

app/src/main/java/eu/siacs/conversations/xmpp/jingle/stanzas/IbbTransportInfo.java

@@ -1,49 +0,0 @@
-package eu.siacs.conversations.xmpp.jingle.stanzas;
-
-import com.google.common.base.Preconditions;
-import im.conversations.android.xml.Element;
-import im.conversations.android.xml.Namespace;
-
-public class IbbTransportInfo extends GenericTransportInfo {
-
-    private IbbTransportInfo(final String name, final String xmlns) {
-        super(name, xmlns);
-    }
-
-    public IbbTransportInfo(final String transportId, final int blockSize) {
-        super("transport", Namespace.JINGLE_TRANSPORTS_IBB);
-        Preconditions.checkNotNull(transportId, "Transport ID can not be null");
-        Preconditions.checkArgument(blockSize > 0, "Block size must be larger than 0");
-        this.setAttribute("block-size", blockSize);
-        this.setAttribute("sid", transportId);
-    }
-
-    public String getTransportId() {
-        return this.getAttribute("sid");
-    }
-
-    public int getBlockSize() {
-        final String blockSize = this.getAttribute("block-size");
-        if (blockSize == null) {
-            return 0;
-        }
-        try {
-            return Integer.parseInt(blockSize);
-        } catch (NumberFormatException e) {
-            return 0;
-        }
-    }
-
-    public static IbbTransportInfo upgrade(final Element element) {
-        Preconditions.checkArgument(
-                "transport".equals(element.getName()), "Name of provided element is not transport");
-        Preconditions.checkArgument(
-                Namespace.JINGLE_TRANSPORTS_IBB.equals(element.getNamespace()),
-                "Element does not match ibb transport namespace");
-        final IbbTransportInfo transportInfo =
-                new IbbTransportInfo("transport", Namespace.JINGLE_TRANSPORTS_IBB);
-        transportInfo.setAttributes(element.getAttributes());
-        transportInfo.setChildren(element.getChildren());
-        return transportInfo;
-    }
-}

app/src/main/java/eu/siacs/conversations/xmpp/jingle/stanzas/S5BTransportInfo.java

@@ -1,53 +0,0 @@
-package eu.siacs.conversations.xmpp.jingle.stanzas;
-
-import com.google.common.base.Preconditions;
-import eu.siacs.conversations.xmpp.jingle.JingleCandidate;
-import im.conversations.android.xml.Element;
-import im.conversations.android.xml.Namespace;
-import java.util.Collection;
-import java.util.List;
-
-public class S5BTransportInfo extends GenericTransportInfo {
-
-    private S5BTransportInfo(final String name, final String xmlns) {
-        super(name, xmlns);
-    }
-
-    public String getTransportId() {
-        return this.getAttribute("sid");
-    }
-
-    public S5BTransportInfo(
-            final String transportId, final Collection<JingleCandidate> candidates) {
-        super("transport", Namespace.JINGLE_TRANSPORTS_S5B);
-        Preconditions.checkNotNull(transportId, "transport id must not be null");
-        for (JingleCandidate candidate : candidates) {
-            this.addChild(candidate.toElement());
-        }
-        this.setAttribute("sid", transportId);
-    }
-
-    public S5BTransportInfo(final String transportId, final Element child) {
-        super("transport", Namespace.JINGLE_TRANSPORTS_S5B);
-        Preconditions.checkNotNull(transportId, "transport id must not be null");
-        this.addChild(child);
-        this.setAttribute("sid", transportId);
-    }
-
-    public List<JingleCandidate> getCandidates() {
-        return JingleCandidate.parse(this.getChildren());
-    }
-
-    public static S5BTransportInfo upgrade(final Element element) {
-        Preconditions.checkArgument(
-                "transport".equals(element.getName()), "Name of provided element is not transport");
-        Preconditions.checkArgument(
-                Namespace.JINGLE_TRANSPORTS_S5B.equals(element.getNamespace()),
-                "Element does not match s5b transport namespace");
-        final S5BTransportInfo transportInfo =
-                new S5BTransportInfo("transport", Namespace.JINGLE_TRANSPORTS_S5B);
-        transportInfo.setAttributes(element.getAttributes());
-        transportInfo.setChildren(element.getChildren());
-        return transportInfo;
-    }
-}

app/src/main/java/im/conversations/android/AbstractAccountService.java

@@ -1,15 +0,0 @@
-package im.conversations.android;
-
-import im.conversations.android.database.ConversationsDatabase;
-import im.conversations.android.database.model.Account;
-
-public abstract class AbstractAccountService {
-
-    protected Account account;
-    protected ConversationsDatabase database;
-
-    protected AbstractAccountService(final Account account, final ConversationsDatabase database) {
-        this.account = account;
-        this.database = database;
-    }
-}

app/src/main/java/im/conversations/android/AppSettings.java

@@ -1,55 +0,0 @@
-package im.conversations.android;
-
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.net.Uri;
-import androidx.preference.PreferenceManager;
-import com.google.common.base.Strings;
-
-public class AppSettings {
-
-    public static final String PREFERENCE_KEY_RINGTONE = "call_ringtone";
-    public static final String PREFERENCE_KEY_BTBV = "btbv";
-
-    public static final String PREFERENCE_KEY_TRUST_SYSTEM_CA_STORE = "trust_system_ca_store";
-
-    private final Context context;
-
-    public AppSettings(final Context context) {
-        this.context = context;
-    }
-
-    public Uri getRingtone() {
-        final SharedPreferences sharedPreferences =
-                PreferenceManager.getDefaultSharedPreferences(context);
-        final String incomingCallRingtone =
-                sharedPreferences.getString(
-                        PREFERENCE_KEY_RINGTONE,
-                        context.getString(R.string.incoming_call_ringtone));
-        return Strings.isNullOrEmpty(incomingCallRingtone) ? null : Uri.parse(incomingCallRingtone);
-    }
-
-    public void setRingtone(final Uri uri) {
-        final SharedPreferences sharedPreferences =
-                PreferenceManager.getDefaultSharedPreferences(context);
-        sharedPreferences
-                .edit()
-                .putString(PREFERENCE_KEY_RINGTONE, uri == null ? null : uri.toString())
-                .apply();
-    }
-
-    public boolean isBTBVEnabled() {
-        final SharedPreferences sharedPreferences =
-                PreferenceManager.getDefaultSharedPreferences(context);
-        return sharedPreferences.getBoolean(
-                PREFERENCE_KEY_BTBV, context.getResources().getBoolean(R.bool.btbv));
-    }
-
-    public boolean isTrustSystemCAStore() {
-        final SharedPreferences sharedPreferences =
-                PreferenceManager.getDefaultSharedPreferences(context);
-        return sharedPreferences.getBoolean(
-                PREFERENCE_KEY_TRUST_SYSTEM_CA_STORE,
-                context.getResources().getBoolean(R.bool.btbv));
-    }
-}

app/src/main/java/im/conversations/android/Conversations.java

@@ -1,86 +0,0 @@
-package im.conversations.android;
-
-import android.app.Application;
-import android.content.Context;
-import android.content.SharedPreferences;
-import androidx.appcompat.app.AppCompatDelegate;
-import androidx.preference.PreferenceManager;
-import com.google.android.material.color.DynamicColors;
-import com.google.android.material.color.DynamicColorsOptions;
-import im.conversations.android.dns.Resolver;
-import im.conversations.android.notification.Channels;
-import im.conversations.android.xmpp.ConnectionPool;
-import java.security.SecureRandom;
-import java.security.Security;
-import org.conscrypt.Conscrypt;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class Conversations extends Application {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(Conversations.class);
-
-    public static final SecureRandom SECURE_RANDOM = new SecureRandom();
-
-    @Override
-    public void onCreate() {
-        super.onCreate();
-        try {
-            Security.insertProviderAt(Conscrypt.newProvider(), 1);
-        } catch (final Throwable throwable) {
-            LOGGER.warn("Could not initialize security provider", throwable);
-        }
-        final var channels = new Channels(this);
-        channels.initialize();
-        Resolver.init(this);
-        ConnectionPool.getInstance(this).reconfigure();
-        applyThemeSettings();
-    }
-
-    public void applyThemeSettings() {
-        final var sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this);
-        if (sharedPreferences == null) {
-            return;
-        }
-        applyThemeSettings(sharedPreferences);
-    }
-
-    private void applyThemeSettings(final SharedPreferences sharedPreferences) {
-        AppCompatDelegate.setDefaultNightMode(getDesiredNightMode(this, sharedPreferences));
-        var dynamicColorsOptions =
-                new DynamicColorsOptions.Builder()
-                        .setPrecondition((activity, t) -> isDynamicColorsDesired(activity))
-                        .build();
-        DynamicColors.applyToActivitiesIfAvailable(this, dynamicColorsOptions);
-    }
-
-    public static int getDesiredNightMode(final Context context) {
-        final var sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context);
-        if (sharedPreferences == null) {
-            return AppCompatDelegate.getDefaultNightMode();
-        }
-        return getDesiredNightMode(context, sharedPreferences);
-    }
-
-    public static boolean isDynamicColorsDesired(final Context context) {
-        final var preferences = PreferenceManager.getDefaultSharedPreferences(context);
-        return preferences.getBoolean("dynamic_colors", false);
-    }
-
-    private static int getDesiredNightMode(
-            final Context context, final SharedPreferences sharedPreferences) {
-        final String theme =
-                sharedPreferences.getString("theme", context.getString(R.string.default_theme));
-        return getDesiredNightMode(theme);
-    }
-
-    public static int getDesiredNightMode(final String theme) {
-        if ("automatic".equals(theme)) {
-            return AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM;
-        } else if ("light".equals(theme)) {
-            return AppCompatDelegate.MODE_NIGHT_NO;
-        } else {
-            return AppCompatDelegate.MODE_NIGHT_YES;
-        }
-    }
-}

app/src/main/java/im/conversations/android/IDs.java

@@ -1,87 +0,0 @@
-package im.conversations.android;
-
-import com.google.common.base.Preconditions;
-import com.google.common.io.BaseEncoding;
-import com.google.common.io.ByteSource;
-import java.io.IOException;
-import java.util.Random;
-import java.util.UUID;
-
-public class IDs {
-
-    private static final Random RANDOM = new Random();
-
-    private static final long UUID_VERSION_MASK = 4 << 12;
-
-    public static int quickInt() {
-        return RANDOM.nextInt();
-    }
-
-    public static String huge() {
-        final var random = new byte[96];
-        Conversations.SECURE_RANDOM.nextBytes(random);
-        return BaseEncoding.base64Url().encode(random);
-    }
-
-    public static String medium() {
-        final var random = new byte[9];
-        Conversations.SECURE_RANDOM.nextBytes(random);
-        return BaseEncoding.base64Url().encode(random);
-    }
-
-    public static String tiny() {
-        final var random = new byte[3];
-        Conversations.SECURE_RANDOM.nextBytes(random);
-        return BaseEncoding.base64Url().encode(random);
-    }
-
-    public static String tiny(final byte[] seed) {
-        return BaseEncoding.base64Url().encode(slice(seed));
-    }
-
-    private static byte[] slice(final byte[] input) {
-        if (input == null || input.length < 3) {
-            return new byte[3];
-        }
-        try {
-            return ByteSource.wrap(input).slice(0, 3).read();
-        } catch (final IOException e) {
-            return new byte[3];
-        }
-    }
-
-    public static UUID uuid(final byte[] bytes) {
-        Preconditions.checkArgument(bytes != null && bytes.length == 32);
-
-        long msb = 0;
-        long lsb = 0;
-
-        msb |= (bytes[0x0] & 0xffL) << 56;
-        msb |= (bytes[0x1] & 0xffL) << 48;
-        msb |= (bytes[0x2] & 0xffL) << 40;
-        msb |= (bytes[0x3] & 0xffL) << 32;
-        msb |= (bytes[0x4] & 0xffL) << 24;
-        msb |= (bytes[0x5] & 0xffL) << 16;
-        msb |= (bytes[0x6] & 0xffL) << 8;
-        msb |= (bytes[0x7] & 0xffL);
-
-        lsb |= (bytes[0x8] & 0xffL) << 56;
-        lsb |= (bytes[0x9] & 0xffL) << 48;
-        lsb |= (bytes[0xa] & 0xffL) << 40;
-        lsb |= (bytes[0xb] & 0xffL) << 32;
-        lsb |= (bytes[0xc] & 0xffL) << 24;
-        lsb |= (bytes[0xd] & 0xffL) << 16;
-        lsb |= (bytes[0xe] & 0xffL) << 8;
-        lsb |= (bytes[0xf] & 0xffL);
-
-        msb = (msb & 0xffffffffffff0fffL) | UUID_VERSION_MASK; // set version
-        lsb = (lsb & 0x3fffffffffffffffL) | 0x8000000000000000L; // set variant
-        return new UUID(msb, lsb);
-    }
-
-    public static byte[] seed() {
-        final var random = new byte[32];
-        Conversations.SECURE_RANDOM.nextBytes(random);
-        return random;
-    }
-}

app/src/main/java/im/conversations/android/axolotl/AxolotlAddress.java

@@ -1,44 +0,0 @@
-package im.conversations.android.axolotl;
-
-import com.google.common.base.Objects;
-import org.jxmpp.jid.BareJid;
-import org.whispersystems.libsignal.SignalProtocolAddress;
-
-public class AxolotlAddress extends SignalProtocolAddress {
-
-    private final BareJid jid;
-
-    public AxolotlAddress(final BareJid jid, int deviceId) {
-        super(jid.toString(), deviceId);
-        this.jid = jid;
-    }
-
-    public BareJid getJid() {
-        return this.jid;
-    }
-
-    public static AxolotlAddress cast(final SignalProtocolAddress signalProtocolAddress) {
-        if (signalProtocolAddress instanceof AxolotlAddress) {
-            return (AxolotlAddress) signalProtocolAddress;
-        }
-        throw new IllegalArgumentException(
-                String.format(
-                        "This %s is not a %s",
-                        SignalProtocolAddress.class.getSimpleName(),
-                        AxolotlAddress.class.getSimpleName()));
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-        if (!super.equals(o)) return false;
-        AxolotlAddress that = (AxolotlAddress) o;
-        return Objects.equal(jid, that.jid);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hashCode(super.hashCode(), jid);
-    }
-}

app/src/main/java/im/conversations/android/axolotl/AxolotlDecryptionException.java

@@ -1,12 +0,0 @@
-package im.conversations.android.axolotl;
-
-public class AxolotlDecryptionException extends Exception {
-
-    public AxolotlDecryptionException(final String message) {
-        super(message);
-    }
-
-    public AxolotlDecryptionException(final Throwable throwable) {
-        super(throwable);
-    }
-}

app/src/main/java/im/conversations/android/axolotl/AxolotlEncryptionException.java

@@ -1,16 +0,0 @@
-package im.conversations.android.axolotl;
-
-public class AxolotlEncryptionException extends Exception {
-
-    public AxolotlEncryptionException(String msg) {
-        super(msg);
-    }
-
-    public AxolotlEncryptionException(String msg, Exception e) {
-        super(msg, e);
-    }
-
-    public AxolotlEncryptionException(Exception e) {
-        super(e);
-    }
-}

app/src/main/java/im/conversations/android/axolotl/AxolotlPayload.java

@@ -1,34 +0,0 @@
-package im.conversations.android.axolotl;
-
-import java.nio.charset.StandardCharsets;
-import org.whispersystems.libsignal.IdentityKey;
-
-public class AxolotlPayload {
-
-    public final AxolotlAddress axolotlAddress;
-    public final IdentityKey identityKey;
-    public final boolean preKeyMessage;
-    public final boolean inDeviceList;
-    public final byte[] payload;
-
-    public AxolotlPayload(
-            AxolotlAddress axolotlAddress,
-            final IdentityKey identityKey,
-            final boolean preKeyMessage,
-            final boolean inDeviceList,
-            byte[] payload) {
-        this.axolotlAddress = axolotlAddress;
-        this.identityKey = identityKey;
-        this.preKeyMessage = preKeyMessage;
-        this.inDeviceList = inDeviceList;
-        this.payload = payload;
-    }
-
-    public String payloadAsString() {
-        return new String(payload, StandardCharsets.UTF_8);
-    }
-
-    public boolean hasPayload() {
-        return payload != null;
-    }
-}

app/src/main/java/im/conversations/android/axolotl/AxolotlService.java

@@ -1,304 +0,0 @@
-package im.conversations.android.axolotl;
-
-import android.content.Context;
-import android.os.Build;
-import com.google.common.base.Optional;
-import com.google.common.base.Preconditions;
-import com.google.common.collect.ArrayListMultimap;
-import com.google.common.collect.ImmutableMultimap;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Multimap;
-import eu.siacs.conversations.xmpp.jingle.OmemoVerification;
-import im.conversations.android.AbstractAccountService;
-import im.conversations.android.database.AxolotlDatabaseStore;
-import im.conversations.android.database.ConversationsDatabase;
-import im.conversations.android.database.model.Account;
-import im.conversations.android.transformer.MessageContentWrapper;
-import im.conversations.android.xmpp.model.axolotl.Encrypted;
-import im.conversations.android.xmpp.model.axolotl.Header;
-import im.conversations.android.xmpp.model.axolotl.Key;
-import im.conversations.android.xmpp.model.axolotl.Payload;
-import java.security.InvalidAlgorithmParameterException;
-import java.security.NoSuchAlgorithmException;
-import java.security.NoSuchProviderException;
-import java.util.HashSet;
-import java.util.Set;
-import javax.crypto.BadPaddingException;
-import javax.crypto.Cipher;
-import javax.crypto.IllegalBlockSizeException;
-import javax.crypto.NoSuchPaddingException;
-import javax.crypto.SecretKey;
-import javax.crypto.spec.IvParameterSpec;
-import javax.crypto.spec.SecretKeySpec;
-import org.jxmpp.jid.BareJid;
-import org.jxmpp.jid.Jid;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.whispersystems.libsignal.DuplicateMessageException;
-import org.whispersystems.libsignal.IdentityKey;
-import org.whispersystems.libsignal.InvalidKeyException;
-import org.whispersystems.libsignal.InvalidKeyIdException;
-import org.whispersystems.libsignal.InvalidMessageException;
-import org.whispersystems.libsignal.InvalidVersionException;
-import org.whispersystems.libsignal.LegacyMessageException;
-import org.whispersystems.libsignal.NoSessionException;
-import org.whispersystems.libsignal.UntrustedIdentityException;
-import org.whispersystems.libsignal.protocol.PreKeySignalMessage;
-import org.whispersystems.libsignal.protocol.SignalMessage;
-import org.whispersystems.libsignal.state.SessionRecord;
-import org.whispersystems.libsignal.state.SignalProtocolStore;
-
-public class AxolotlService extends AbstractAccountService {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(AxolotlService.class);
-
-    public static final String KEY_TYPE = "AES";
-    public static final String CIPHER_MODE = "AES/GCM/NoPadding";
-
-    public static final String BOUNCY_CASTLE_PROVIDER = "BC";
-
-    private final SignalProtocolStore signalProtocolStore;
-
-    private PostDecryptionHook postDecryptionHook;
-
-    private final Set<AxolotlAddress> freshSessions = new HashSet<>();
-    private final Multimap<BareJid, Integer> devicesNotInPep = ArrayListMultimap.create();
-
-    public AxolotlService(
-            final Account account,
-            final Context context,
-            final ConversationsDatabase conversationsDatabase) {
-        super(account, conversationsDatabase);
-        this.signalProtocolStore =
-                new AxolotlDatabaseStore(account, context, conversationsDatabase);
-    }
-
-    public void setPostDecryptionHook(final PostDecryptionHook postDecryptionHook) {
-        this.postDecryptionHook = postDecryptionHook;
-    }
-
-    private AxolotlSession buildReceivingSession(
-            final Jid from, final IdentityKey identityKey, final Header header) {
-        final Optional<Integer> sid = header.getSourceDevice();
-        if (sid.isPresent()) {
-            return AxolotlSession.of(
-                    signalProtocolStore,
-                    identityKey,
-                    new AxolotlAddress(from.asBareJid(), sid.get()));
-        }
-        throw new IllegalArgumentException("Header did not contain a source device id");
-    }
-
-    public AxolotlSession getExistingSession(final AxolotlAddress axolotlAddress) {
-        final SessionRecord sessionState = signalProtocolStore.loadSession(axolotlAddress);
-        if (sessionState == null) {
-            return null;
-        }
-        final IdentityKey identityKey = sessionState.getSessionState().getRemoteIdentityKey();
-        return AxolotlSession.of(signalProtocolStore, identityKey, axolotlAddress);
-    }
-
-    private AxolotlSession getExistingSessionOrThrow(final AxolotlAddress axolotlAddress)
-            throws NoSessionException {
-        final var session = getExistingSession(axolotlAddress);
-        if (session == null) {
-            // TODO When receiving a message that is not an OMEMOKeyExchange from a device there is
-            // no session with, clients SHOULD create a session with that device and notify it about
-            // the new session by responding with an empty OMEMO message as per Sending a message.
-            throw new NoSessionException(
-                    String.format("No session for %s", axolotlAddress.toString()));
-        }
-        return session;
-    }
-
-    public boolean decryptEmptyMessage(final BareJid from, final Encrypted encrypted) {
-        Preconditions.checkArgument(
-                !encrypted.hasPayload(), "Use decryptToMessageContent to decrypt payload messages");
-        try {
-            final var payload = decrypt(from, encrypted);
-            return !payload.hasPayload();
-        } catch (final AxolotlDecryptionException e) {
-            return false;
-        }
-    }
-
-    public MessageContentWrapper decryptToMessageContent(
-            final BareJid from, final Encrypted encrypted) {
-        Preconditions.checkArgument(encrypted.hasPayload());
-        try {
-            return MessageContentWrapper.ofAxolotl(decrypt(from, encrypted));
-        } catch (final AxolotlDecryptionException e) {
-            return MessageContentWrapper.ofAxolotlException(e);
-        }
-    }
-
-    public AxolotlPayload decrypt(final Jid from, final Encrypted encrypted)
-            throws AxolotlDecryptionException {
-        final AxolotlPayload axolotlPayload;
-        try {
-            axolotlPayload = decryptOrThrow(from, encrypted);
-        } catch (final IllegalArgumentException
-                | NotEncryptedForThisDeviceException
-                | InvalidMessageException
-                | InvalidVersionException
-                | UntrustedIdentityException
-                | DuplicateMessageException
-                | InvalidKeyIdException
-                | LegacyMessageException
-                | InvalidKeyException
-                | NoSessionException
-                | OutdatedSenderException
-                | NoSuchPaddingException
-                | NoSuchAlgorithmException
-                | NoSuchProviderException
-                | InvalidAlgorithmParameterException
-                | java.security.InvalidKeyException
-                | IllegalBlockSizeException
-                | BadPaddingException e) {
-            throw new AxolotlDecryptionException(e);
-        }
-        registerForHook(axolotlPayload);
-        return axolotlPayload;
-    }
-
-    private AxolotlPayload decryptOrThrow(final Jid from, final Encrypted encrypted)
-            throws NotEncryptedForThisDeviceException, InvalidMessageException,
-                    InvalidVersionException, UntrustedIdentityException, DuplicateMessageException,
-                    InvalidKeyIdException, LegacyMessageException, InvalidKeyException,
-                    NoSessionException, OutdatedSenderException, NoSuchPaddingException,
-                    NoSuchAlgorithmException, NoSuchProviderException,
-                    InvalidAlgorithmParameterException, java.security.InvalidKeyException,
-                    IllegalBlockSizeException, BadPaddingException {
-        final Payload payload = encrypted.getPayload();
-        final Header header = encrypted.getHeader();
-        final Key ourKey = header.getKey(signalProtocolStore.getLocalRegistrationId());
-        if (ourKey == null) {
-            throw new NotEncryptedForThisDeviceException();
-        }
-        final byte[] keyWithAuthTag;
-        final AxolotlSession session;
-        final boolean preKeyMessage;
-        if (ourKey.isPreKey()) {
-            final PreKeySignalMessage preKeySignalMessage =
-                    new PreKeySignalMessage(ourKey.asBytes());
-            preKeyMessage = true;
-            session = buildReceivingSession(from, preKeySignalMessage.getIdentityKey(), header);
-            keyWithAuthTag = session.sessionCipher.decrypt(preKeySignalMessage);
-        } else {
-            final SignalMessage signalMessage = new SignalMessage(ourKey.asBytes());
-            preKeyMessage = false;
-            session =
-                    getExistingSessionOrThrow(
-                            new AxolotlAddress(from.asBareJid(), header.getSourceDevice().get()));
-            keyWithAuthTag = session.sessionCipher.decrypt(signalMessage);
-        }
-        final var inDeviceList = database.axolotlDao().hasDeviceId(account, session.axolotlAddress);
-        if (payload == null) {
-            return new AxolotlPayload(
-                    session.axolotlAddress, session.identityKey, preKeyMessage, inDeviceList, null);
-        }
-        if (keyWithAuthTag.length < 32) {
-            throw new OutdatedSenderException(
-                    "Key did not contain auth tag. Sender needs to update their OMEMO client");
-        }
-        final byte[] key = new byte[16];
-        final byte[] authTag = new byte[16];
-        final byte[] iv = header.getIv();
-        System.arraycopy(keyWithAuthTag, 0, key, 0, key.length);
-        System.arraycopy(keyWithAuthTag, key.length, authTag, 0, authTag.length);
-        final Cipher cipher;
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
-            cipher = Cipher.getInstance(CIPHER_MODE);
-        } else {
-            cipher = Cipher.getInstance(CIPHER_MODE, BOUNCY_CASTLE_PROVIDER);
-        }
-        final SecretKey secretKey = new SecretKeySpec(key, KEY_TYPE);
-        final IvParameterSpec ivSpec = new IvParameterSpec(iv);
-        cipher.init(Cipher.DECRYPT_MODE, secretKey, ivSpec);
-        final byte[] payloadAsBytes = payload.asBytes();
-        final byte[] payloadWithAuthTag = new byte[payloadAsBytes.length + 16];
-        System.arraycopy(payloadAsBytes, 0, payloadWithAuthTag, 0, payloadAsBytes.length);
-        System.arraycopy(authTag, 0, payloadWithAuthTag, payloadAsBytes.length, authTag.length);
-        final byte[] decryptedPayload = cipher.doFinal(payloadWithAuthTag);
-        return new AxolotlPayload(
-                session.axolotlAddress,
-                session.identityKey,
-                preKeyMessage,
-                inDeviceList,
-                decryptedPayload);
-    }
-
-    private void registerForHook(final AxolotlPayload axolotlPayload) {
-        synchronized (this.freshSessions) {
-            if (axolotlPayload.preKeyMessage) {
-                this.freshSessions.add(axolotlPayload.axolotlAddress);
-            }
-        }
-        synchronized (this.devicesNotInPep) {
-            if (!axolotlPayload.inDeviceList) {
-                this.devicesNotInPep.put(
-                        axolotlPayload.axolotlAddress.getJid(),
-                        axolotlPayload.axolotlAddress.getDeviceId());
-            }
-        }
-    }
-
-    public void executePostDecryptionHook() {
-        final var hook = this.postDecryptionHook;
-        if (hook == null) {
-            return;
-        }
-        final Set<AxolotlAddress> freshSessions;
-        synchronized (this.freshSessions) {
-            freshSessions = ImmutableSet.copyOf(this.freshSessions);
-            this.freshSessions.clear();
-        }
-        final Multimap<BareJid, Integer> devicesNotInPep;
-        synchronized (this.devicesNotInPep) {
-            devicesNotInPep = ImmutableMultimap.copyOf(this.devicesNotInPep);
-        }
-        hook.executeHook(freshSessions);
-        hook.executeHook(devicesNotInPep);
-    }
-
-    public SignalProtocolStore getSignalProtocolStore() {
-        return this.signalProtocolStore;
-    }
-
-    public static class OmemoVerifiedPayload<T> {
-        private final int deviceId;
-        private final IdentityKey identityKey;
-        private final T payload;
-
-        public OmemoVerifiedPayload(OmemoVerification omemoVerification, T payload) {
-            this.deviceId = omemoVerification.getDeviceId();
-            this.identityKey = omemoVerification.getFingerprint();
-            this.payload = payload;
-        }
-
-        public int getDeviceId() {
-            return deviceId;
-        }
-
-        public IdentityKey getFingerprint() {
-            return identityKey;
-        }
-
-        public T getPayload() {
-            return payload;
-        }
-    }
-
-    public static class NotVerifiedException extends SecurityException {
-
-        public NotVerifiedException(String message) {
-            super(message);
-        }
-    }
-
-    public interface PostDecryptionHook {
-        void executeHook(final Set<AxolotlAddress> freshSessions);
-
-        void executeHook(final Multimap<BareJid, Integer> devicesNotInPep);
-    }
-}

app/src/main/java/im/conversations/android/axolotl/AxolotlSession.java

@@ -1,29 +0,0 @@
-package im.conversations.android.axolotl;
-
-import org.whispersystems.libsignal.IdentityKey;
-import org.whispersystems.libsignal.SessionCipher;
-import org.whispersystems.libsignal.state.SignalProtocolStore;
-
-public class AxolotlSession {
-
-    public final AxolotlAddress axolotlAddress;
-    public final IdentityKey identityKey;
-    public final SessionCipher sessionCipher;
-
-    private AxolotlSession(
-            AxolotlAddress axolotlAddress,
-            final IdentityKey identityKey,
-            SessionCipher sessionCipher) {
-        this.axolotlAddress = axolotlAddress;
-        this.identityKey = identityKey;
-        this.sessionCipher = sessionCipher;
-    }
-
-    public static AxolotlSession of(
-            final SignalProtocolStore signalProtocolStore,
-            final IdentityKey identityKey,
-            final AxolotlAddress axolotlAddress) {
-        final var sessionCipher = new SessionCipher(signalProtocolStore, axolotlAddress);
-        return new AxolotlSession(axolotlAddress, identityKey, sessionCipher);
-    }
-}

app/src/main/java/im/conversations/android/axolotl/EncryptionBuilder.java

@@ -1,231 +0,0 @@
-package im.conversations.android.axolotl;
-
-import android.annotation.SuppressLint;
-import android.os.Build;
-import com.google.common.base.Preconditions;
-import com.google.common.collect.ImmutableList;
-import im.conversations.android.Conversations;
-import im.conversations.android.xmpp.model.axolotl.Encrypted;
-import im.conversations.android.xmpp.model.axolotl.Header;
-import im.conversations.android.xmpp.model.axolotl.Key;
-import im.conversations.android.xmpp.model.axolotl.Payload;
-import java.nio.charset.StandardCharsets;
-import java.security.InvalidAlgorithmParameterException;
-import java.security.InvalidKeyException;
-import java.security.NoSuchAlgorithmException;
-import java.security.NoSuchProviderException;
-import java.util.ArrayList;
-import java.util.List;
-import javax.crypto.BadPaddingException;
-import javax.crypto.Cipher;
-import javax.crypto.IllegalBlockSizeException;
-import javax.crypto.KeyGenerator;
-import javax.crypto.NoSuchPaddingException;
-import javax.crypto.SecretKey;
-import javax.crypto.spec.IvParameterSpec;
-import javax.crypto.spec.SecretKeySpec;
-import org.whispersystems.libsignal.UntrustedIdentityException;
-import org.whispersystems.libsignal.protocol.CiphertextMessage;
-
-public class EncryptionBuilder {
-
-    private Long sourceDeviceId;
-
-    private final ArrayList<AxolotlSession> sessions = new ArrayList<>();
-
-    private byte[] payload;
-
-    private KeyTransport keyTransport;
-
-    public Encrypted build() throws AxolotlEncryptionException {
-        try {
-            return buildOrThrow();
-        } catch (final InvalidAlgorithmParameterException
-                | NoSuchPaddingException
-                | IllegalBlockSizeException
-                | NoSuchAlgorithmException
-                | BadPaddingException
-                | NoSuchProviderException
-                | InvalidKeyException
-                | UntrustedIdentityException e) {
-            throw new AxolotlEncryptionException(e);
-        }
-    }
-
-    private Encrypted buildOrThrow()
-            throws InvalidAlgorithmParameterException, NoSuchPaddingException,
-                    IllegalBlockSizeException, NoSuchAlgorithmException, BadPaddingException,
-                    NoSuchProviderException, InvalidKeyException, UntrustedIdentityException {
-        final long sourceDeviceId =
-                Preconditions.checkNotNull(this.sourceDeviceId, "Specify a source device id");
-        final var payloadCleartext = Preconditions.checkNotNull(this.payload, "Specify a payload");
-        Preconditions.checkState(
-                this.keyTransport == null, "A payload message should not have a keyTransport");
-        Preconditions.checkState(sessions.size() > 0, "Add at least on session");
-        final var sessions = ImmutableList.copyOf(this.sessions);
-        final var key = generateKey();
-        final var iv = generateIv();
-        final var encryptedPayload = encrypt(payloadCleartext, key, iv);
-        final var keyWithAuthTag = new byte[32];
-        System.arraycopy(key, 0, keyWithAuthTag, 0, key.length);
-        System.arraycopy(
-                encryptedPayload.authTag, 0, keyWithAuthTag, 16, encryptedPayload.authTag.length);
-        final var header = buildHeader(sessions, keyWithAuthTag);
-        header.addIv(iv);
-        header.setSourceDevice(sourceDeviceId);
-        final var encrypted = new Encrypted();
-        encrypted.addExtension(header);
-        final var payload = encrypted.addExtension(new Payload());
-        payload.setContent(encryptedPayload.encrypted);
-        return encrypted;
-    }
-
-    public Encrypted buildKeyTransport() throws AxolotlEncryptionException {
-        try {
-            return buildKeyTransportOrThrow();
-        } catch (final UntrustedIdentityException e) {
-            throw new AxolotlEncryptionException(e);
-        }
-    }
-
-    private Encrypted buildKeyTransportOrThrow() throws UntrustedIdentityException {
-        final long sourceDeviceId =
-                Preconditions.checkNotNull(this.sourceDeviceId, "Specify a source device id");
-        Preconditions.checkState(
-                this.payload == null, "A key transport message should not have a payload");
-        final var keyTransport =
-                Preconditions.checkNotNull(this.keyTransport, "Specify a keyTransport");
-        // TODO key transport messages in twomemo (omemo:1) use 32 bytes of zeros instead of a key
-        // TODO if we are not using this using this for actual key transport we can do this in siacs
-        // omemo too (and get rid of the IV)
-        final var sessions = ImmutableList.copyOf(this.sessions);
-        final var header = buildHeader(sessions, keyTransport.key);
-        header.addIv(keyTransport.iv);
-        header.setSourceDevice(sourceDeviceId);
-        final var encrypted = new Encrypted();
-        encrypted.addExtension(header);
-        return encrypted;
-    }
-
-    public Encrypted buildEmpty() throws AxolotlEncryptionException {
-        try {
-            return buildEmptyOrThrow();
-        } catch (final UntrustedIdentityException e) {
-            throw new AxolotlEncryptionException(e);
-        }
-    }
-
-    private Encrypted buildEmptyOrThrow() throws UntrustedIdentityException {
-        final long sourceDeviceId =
-                Preconditions.checkNotNull(this.sourceDeviceId, "Specify a source device id");
-        Preconditions.checkState(
-                this.payload == null, "An empty message should not have a payload");
-        Preconditions.checkState(
-                this.keyTransport == null, "An empty message should not have a keyTransport");
-        final var sessions = ImmutableList.copyOf(this.sessions);
-        final var header = buildHeader(sessions, new byte[32]);
-        header.setSourceDevice(sourceDeviceId);
-        final var encrypted = new Encrypted();
-        encrypted.addExtension(header);
-        return encrypted;
-    }
-
-    public EncryptionBuilder payload(final String payload) {
-        this.payload = payload.getBytes(StandardCharsets.UTF_8);
-        return this;
-    }
-
-    public EncryptionBuilder keyTransport(final KeyTransport keyTransport) {
-        this.keyTransport = keyTransport;
-        return this;
-    }
-
-    public EncryptionBuilder session(final AxolotlSession session) {
-        this.sessions.add(session);
-        return this;
-    }
-
-    public EncryptionBuilder sourceDeviceId(final long sourceDeviceId) {
-        this.sourceDeviceId = sourceDeviceId;
-        return this;
-    }
-
-    private Header buildHeader(List<AxolotlSession> sessions, final byte[] keyWithAuthTag)
-            throws UntrustedIdentityException {
-        final var header = new Header();
-        for (final AxolotlSession session : sessions) {
-            final var cipherMessage = session.sessionCipher.encrypt(keyWithAuthTag);
-            final var key = header.addExtension(new Key());
-            key.setRemoteDeviceId(session.axolotlAddress.getDeviceId());
-            key.setContent(cipherMessage.serialize());
-            key.setIsPreKey(cipherMessage.getType() == CiphertextMessage.PREKEY_TYPE);
-        }
-        return header;
-    }
-
-    @SuppressLint("DeprecatedProvider")
-    private static EncryptedPayload encrypt(
-            final byte[] payloadCleartext, final byte[] key, final byte[] iv)
-            throws NoSuchPaddingException, NoSuchAlgorithmException, NoSuchProviderException,
-                    IllegalBlockSizeException, BadPaddingException,
-                    InvalidAlgorithmParameterException, InvalidKeyException {
-        final Cipher cipher;
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
-            cipher = Cipher.getInstance(AxolotlService.CIPHER_MODE);
-        } else {
-            cipher =
-                    Cipher.getInstance(
-                            AxolotlService.CIPHER_MODE, AxolotlService.BOUNCY_CASTLE_PROVIDER);
-        }
-        final SecretKey secretKey = new SecretKeySpec(key, AxolotlService.KEY_TYPE);
-        final IvParameterSpec ivSpec = new IvParameterSpec(iv);
-        cipher.init(Cipher.ENCRYPT_MODE, secretKey, ivSpec);
-        final var encryptedWithAuthTag = cipher.doFinal(payloadCleartext);
-        final var authTag = new byte[16];
-        final var encrypted = new byte[encryptedWithAuthTag.length - authTag.length];
-
-        System.arraycopy(encryptedWithAuthTag, 0, encrypted, 0, encrypted.length);
-        System.arraycopy(encryptedWithAuthTag, encrypted.length, authTag, 0, authTag.length);
-        return new EncryptedPayload(encrypted, authTag);
-    }
-
-    private static byte[] generateKey() {
-        try {
-            KeyGenerator generator = KeyGenerator.getInstance(AxolotlService.KEY_TYPE);
-            generator.init(128);
-            return generator.generateKey().getEncoded();
-        } catch (final NoSuchAlgorithmException e) {
-            throw new AssertionError(e);
-        }
-    }
-
-    private static final class EncryptedPayload {
-        public final byte[] encrypted;
-        public final byte[] authTag;
-
-        private EncryptedPayload(byte[] encrypted, byte[] authTag) {
-            this.encrypted = encrypted;
-            this.authTag = authTag;
-        }
-    }
-
-    private static byte[] generateIv() {
-        final byte[] iv = new byte[12];
-        Conversations.SECURE_RANDOM.nextBytes(iv);
-        return iv;
-    }
-
-    public static KeyTransport createKeyTransport() {
-        return new KeyTransport(generateKey(), generateIv());
-    }
-
-    public static class KeyTransport {
-        public final byte[] key;
-        public final byte[] iv;
-
-        private KeyTransport(byte[] key, byte[] iv) {
-            this.key = key;
-            this.iv = iv;
-        }
-    }
-}

app/src/main/java/im/conversations/android/axolotl/OutdatedSenderException.java

@@ -1,8 +0,0 @@
-package im.conversations.android.axolotl;
-
-public class OutdatedSenderException extends AxolotlDecryptionException {
-
-    public OutdatedSenderException(final String message) {
-        super(message);
-    }
-}

app/src/main/java/im/conversations/android/database/AxolotlDatabaseStore.java

@@ -1,160 +0,0 @@
-package im.conversations.android.database;
-
-import android.content.Context;
-import im.conversations.android.AbstractAccountService;
-import im.conversations.android.AppSettings;
-import im.conversations.android.axolotl.AxolotlAddress;
-import im.conversations.android.database.dao.AxolotlDao;
-import im.conversations.android.database.model.Account;
-import im.conversations.android.database.model.Trust;
-import java.util.List;
-import org.whispersystems.libsignal.IdentityKey;
-import org.whispersystems.libsignal.IdentityKeyPair;
-import org.whispersystems.libsignal.InvalidKeyIdException;
-import org.whispersystems.libsignal.SignalProtocolAddress;
-import org.whispersystems.libsignal.state.PreKeyRecord;
-import org.whispersystems.libsignal.state.SessionRecord;
-import org.whispersystems.libsignal.state.SignalProtocolStore;
-import org.whispersystems.libsignal.state.SignedPreKeyRecord;
-
-public class AxolotlDatabaseStore extends AbstractAccountService implements SignalProtocolStore {
-
-    private AppSettings appSettings;
-
-    public AxolotlDatabaseStore(
-            final Account account,
-            final Context context,
-            final ConversationsDatabase conversationsDatabase) {
-        super(account, conversationsDatabase);
-        this.appSettings = new AppSettings(context);
-    }
-
-    private AxolotlDao axolotlDao() {
-        return database.axolotlDao();
-    }
-
-    @Override
-    public IdentityKeyPair getIdentityKeyPair() {
-        return axolotlDao().getOrCreateIdentityKeyPair(account);
-    }
-
-    @Override
-    public int getLocalRegistrationId() {
-        return account.getPublicDeviceIdInt();
-    }
-
-    @Override
-    public boolean saveIdentity(
-            final SignalProtocolAddress signalProtocolAddress, final IdentityKey identityKey) {
-        final var address = AxolotlAddress.cast(signalProtocolAddress);
-        final boolean isBTBVEnabled = appSettings.isBTBVEnabled();
-        return database.runInTransaction(
-                () -> {
-                    final Trust trust;
-                    if (!isBTBVEnabled
-                            || axolotlDao().isAnyIdentityVerified(account, address.getJid())) {
-                        trust = Trust.UNDECIDED;
-                    } else {
-                        trust = Trust.TRUSTED;
-                    }
-                    return axolotlDao().setIdentity(account, address.getJid(), identityKey, trust);
-                });
-    }
-
-    @Override
-    public boolean isTrustedIdentity(
-            SignalProtocolAddress address, IdentityKey identityKey, Direction direction) {
-        // TODO return false for Direction==Sending and Trust == untrusted
-        return true;
-    }
-
-    @Override
-    public PreKeyRecord loadPreKey(int preKeyId) throws InvalidKeyIdException {
-        final var preKey = axolotlDao().getPreKey(account.id, preKeyId);
-        if (preKey == null) {
-            throw new InvalidKeyIdException(String.format("PreKey %d does not exist", preKeyId));
-        }
-        return preKey;
-    }
-
-    @Override
-    public void storePreKey(int preKeyId, PreKeyRecord preKeyRecord) {
-        axolotlDao().setPreKey(account, preKeyId, preKeyRecord);
-    }
-
-    @Override
-    public boolean containsPreKey(int preKeyId) {
-        return axolotlDao().hasPreKey(account.id, preKeyId);
-    }
-
-    @Override
-    public void removePreKey(int preKeyId) {
-        axolotlDao().markPreKeyAsRemoved(account.id, preKeyId);
-    }
-
-    @Override
-    public SessionRecord loadSession(final SignalProtocolAddress signalProtocolAddress) {
-        final var address = AxolotlAddress.cast(signalProtocolAddress);
-        final var sessionRecord =
-                axolotlDao().getSessionRecord(account.id, address.getJid(), address.getDeviceId());
-        return sessionRecord == null ? new SessionRecord() : sessionRecord;
-    }
-
-    @Override
-    public List<Integer> getSubDeviceSessions(String name) {
-        return axolotlDao().getSessionDeviceIds(account.id, name);
-    }
-
-    @Override
-    public void storeSession(SignalProtocolAddress signalProtocolAddress, SessionRecord record) {
-        final var address = AxolotlAddress.cast(signalProtocolAddress);
-        axolotlDao().setSessionRecord(account, address.getJid(), address.getDeviceId(), record);
-    }
-
-    @Override
-    public boolean containsSession(SignalProtocolAddress signalProtocolAddress) {
-        final var address = AxolotlAddress.cast(signalProtocolAddress);
-        return axolotlDao().hasSession(account.id, address.getJid(), address.getDeviceId());
-    }
-
-    @Override
-    public void deleteSession(SignalProtocolAddress signalProtocolAddress) {
-        final var address = AxolotlAddress.cast(signalProtocolAddress);
-        axolotlDao().deleteSession(account.id, address.getJid(), address.getDeviceId());
-    }
-
-    @Override
-    public void deleteAllSessions(String name) {
-        axolotlDao().deleteSessions(account.id, name);
-    }
-
-    @Override
-    public SignedPreKeyRecord loadSignedPreKey(int signedPreKeyId) throws InvalidKeyIdException {
-        final var signedPreKeyRecord = axolotlDao().getSignedPreKey(account.id, signedPreKeyId);
-        if (signedPreKeyRecord == null) {
-            throw new InvalidKeyIdException(
-                    String.format("signedPreKey %d not found", signedPreKeyId));
-        }
-        return signedPreKeyRecord;
-    }
-
-    @Override
-    public List<SignedPreKeyRecord> loadSignedPreKeys() {
-        return axolotlDao().getSignedPreKeys(account.id);
-    }
-
-    @Override
-    public void storeSignedPreKey(int signedPreKeyId, SignedPreKeyRecord record) {
-        axolotlDao().setSignedPreKey(account, signedPreKeyId, record);
-    }
-
-    @Override
-    public boolean containsSignedPreKey(int signedPreKeyId) {
-        return axolotlDao().hasSignedPreKey(account.id, signedPreKeyId);
-    }
-
-    @Override
-    public void removeSignedPreKey(int signedPreKeyId) {
-        axolotlDao().markSignedPreKeyAsRemoved(account.id, signedPreKeyId);
-    }
-}

app/src/main/java/im/conversations/android/database/ConversationsDatabase.java

@@ -1,145 +0,0 @@
-package im.conversations.android.database;
-
-import android.content.Context;
-import androidx.room.Database;
-import androidx.room.Room;
-import androidx.room.RoomDatabase;
-import androidx.room.TypeConverters;
-import im.conversations.android.database.dao.AccountDao;
-import im.conversations.android.database.dao.ArchiveDao;
-import im.conversations.android.database.dao.AvatarDao;
-import im.conversations.android.database.dao.AxolotlDao;
-import im.conversations.android.database.dao.BlockingDao;
-import im.conversations.android.database.dao.BookmarkDao;
-import im.conversations.android.database.dao.CertificateTrustDao;
-import im.conversations.android.database.dao.ChatDao;
-import im.conversations.android.database.dao.DiscoDao;
-import im.conversations.android.database.dao.MessageDao;
-import im.conversations.android.database.dao.NickDao;
-import im.conversations.android.database.dao.PresenceDao;
-import im.conversations.android.database.dao.RosterDao;
-import im.conversations.android.database.dao.ServiceRecordDao;
-import im.conversations.android.database.entity.AccountEntity;
-import im.conversations.android.database.entity.ArchivePageEntity;
-import im.conversations.android.database.entity.AvatarAdditionalEntity;
-import im.conversations.android.database.entity.AvatarEntity;
-import im.conversations.android.database.entity.AxolotlDeviceListEntity;
-import im.conversations.android.database.entity.AxolotlDeviceListItemEntity;
-import im.conversations.android.database.entity.AxolotlIdentityEntity;
-import im.conversations.android.database.entity.AxolotlIdentityKeyPairEntity;
-import im.conversations.android.database.entity.AxolotlPreKeyEntity;
-import im.conversations.android.database.entity.AxolotlSessionEntity;
-import im.conversations.android.database.entity.AxolotlSignedPreKeyEntity;
-import im.conversations.android.database.entity.BlockedItemEntity;
-import im.conversations.android.database.entity.BookmarkEntity;
-import im.conversations.android.database.entity.BookmarkGroupEntity;
-import im.conversations.android.database.entity.CertificateTrustEntity;
-import im.conversations.android.database.entity.ChatEntity;
-import im.conversations.android.database.entity.DiscoEntity;
-import im.conversations.android.database.entity.DiscoExtensionEntity;
-import im.conversations.android.database.entity.DiscoExtensionFieldEntity;
-import im.conversations.android.database.entity.DiscoExtensionFieldValueEntity;
-import im.conversations.android.database.entity.DiscoFeatureEntity;
-import im.conversations.android.database.entity.DiscoIdentityEntity;
-import im.conversations.android.database.entity.DiscoItemEntity;
-import im.conversations.android.database.entity.GroupEntity;
-import im.conversations.android.database.entity.MessageContentEntity;
-import im.conversations.android.database.entity.MessageEntity;
-import im.conversations.android.database.entity.MessageReactionEntity;
-import im.conversations.android.database.entity.MessageStateEntity;
-import im.conversations.android.database.entity.MessageVersionEntity;
-import im.conversations.android.database.entity.MucStatusCodeEntity;
-import im.conversations.android.database.entity.NickEntity;
-import im.conversations.android.database.entity.PresenceEntity;
-import im.conversations.android.database.entity.RosterItemEntity;
-import im.conversations.android.database.entity.RosterItemGroupEntity;
-import im.conversations.android.database.entity.ServiceRecordCacheEntity;
-
-@Database(
-        entities = {
-            AccountEntity.class,
-            ArchivePageEntity.class,
-            AvatarAdditionalEntity.class,
-            AvatarEntity.class,
-            AxolotlDeviceListEntity.class,
-            AxolotlDeviceListItemEntity.class,
-            AxolotlIdentityEntity.class,
-            AxolotlIdentityKeyPairEntity.class,
-            AxolotlPreKeyEntity.class,
-            AxolotlSessionEntity.class,
-            AxolotlSignedPreKeyEntity.class,
-            BlockedItemEntity.class,
-            BookmarkEntity.class,
-            BookmarkGroupEntity.class,
-            CertificateTrustEntity.class,
-            ChatEntity.class,
-            DiscoEntity.class,
-            DiscoExtensionEntity.class,
-            DiscoExtensionFieldEntity.class,
-            DiscoExtensionFieldValueEntity.class,
-            DiscoFeatureEntity.class,
-            DiscoIdentityEntity.class,
-            DiscoItemEntity.class,
-            GroupEntity.class,
-            MessageEntity.class,
-            MessageStateEntity.class,
-            MessageContentEntity.class,
-            MessageVersionEntity.class,
-            MucStatusCodeEntity.class,
-            NickEntity.class,
-            PresenceEntity.class,
-            MessageReactionEntity.class,
-            RosterItemEntity.class,
-            RosterItemGroupEntity.class,
-            ServiceRecordCacheEntity.class
-        },
-        version = 1)
-@TypeConverters(Converters.class)
-public abstract class ConversationsDatabase extends RoomDatabase {
-
-    private static volatile ConversationsDatabase INSTANCE = null;
-
-    public static ConversationsDatabase getInstance(final Context context) {
-        if (INSTANCE != null) {
-            return INSTANCE;
-        }
-        synchronized (ConversationsDatabase.class) {
-            if (INSTANCE != null) {
-                return INSTANCE;
-            }
-            final Context application = context.getApplicationContext();
-            INSTANCE =
-                    Room.databaseBuilder(application, ConversationsDatabase.class, "conversations")
-                            .build();
-            return INSTANCE;
-        }
-    }
-
-    public abstract AccountDao accountDao();
-
-    public abstract ArchiveDao archiveDao();
-
-    public abstract AvatarDao avatarDao();
-
-    public abstract AxolotlDao axolotlDao();
-
-    public abstract BlockingDao blockingDao();
-
-    public abstract BookmarkDao bookmarkDao();
-
-    public abstract CertificateTrustDao certificateTrustDao();
-
-    public abstract ChatDao chatDao();
-
-    public abstract DiscoDao discoDao();
-
-    public abstract MessageDao messageDao();
-
-    public abstract NickDao nickDao();
-
-    public abstract PresenceDao presenceDao();
-
-    public abstract RosterDao rosterDao();
-
-    public abstract ServiceRecordDao serviceRecordDao();
-}

app/src/main/java/im/conversations/android/database/Converters.java

@@ -1,190 +0,0 @@
-package im.conversations.android.database;
-
-import androidx.room.TypeConverter;
-import com.google.common.base.Strings;
-import com.google.common.net.MediaType;
-import de.measite.minidns.DNSName;
-import java.io.IOException;
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-import java.time.Instant;
-import org.jxmpp.jid.BareJid;
-import org.jxmpp.jid.Jid;
-import org.jxmpp.jid.impl.JidCreate;
-import org.jxmpp.jid.parts.Resourcepart;
-import org.whispersystems.libsignal.IdentityKey;
-import org.whispersystems.libsignal.IdentityKeyPair;
-import org.whispersystems.libsignal.InvalidKeyException;
-import org.whispersystems.libsignal.state.PreKeyRecord;
-import org.whispersystems.libsignal.state.SessionRecord;
-import org.whispersystems.libsignal.state.SignedPreKeyRecord;
-
-public final class Converters {
-
-    private Converters() {}
-
-    @TypeConverter
-    public static Instant toInstant(final Long timestamp) {
-        return timestamp == null ? null : Instant.ofEpochMilli(timestamp);
-    }
-
-    @TypeConverter
-    public static Long fromInstant(final Instant instant) {
-        return instant == null ? null : instant.getEpochSecond() * 1000;
-    }
-
-    @TypeConverter
-    public static BareJid toBareJid(final String input) {
-        return input == null ? null : JidCreate.bareFromOrThrowUnchecked(input);
-    }
-
-    @TypeConverter
-    public static String fromBareJid(final BareJid jid) {
-        return jid == null ? null : jid.toString();
-    }
-
-    @TypeConverter
-    public static String fromJid(final Jid jid) {
-        return jid == null ? null : jid.toString();
-    }
-
-    @TypeConverter
-    public static Jid toJid(final String input) {
-        return input == null ? null : JidCreate.fromOrThrowUnchecked(input);
-    }
-
-    // TODO do we want to return null on null input?
-    @TypeConverter
-    public static Resourcepart toResourcePart(final String input) {
-        return Strings.isNullOrEmpty(input)
-                ? Resourcepart.EMPTY
-                : Resourcepart.fromOrThrowUnchecked(input);
-    }
-
-    @TypeConverter
-    public static String fromResourcePart(final Resourcepart resourcepart) {
-        return resourcepart == null ? null : resourcepart.toString();
-    }
-
-    @TypeConverter
-    public static byte[] fromIdentityKey(final IdentityKey identityKey) {
-        return identityKey == null ? null : identityKey.serialize();
-    }
-
-    @TypeConverter
-    public static IdentityKey toIdentityKey(final byte[] serialized) {
-        if (serialized == null || serialized.length == 0) {
-            return null;
-        }
-        try {
-            return new IdentityKey(serialized, 0);
-        } catch (final InvalidKeyException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    @TypeConverter
-    public static byte[] fromSessionRecord(final SessionRecord sessionRecord) {
-        return sessionRecord == null ? null : sessionRecord.serialize();
-    }
-
-    @TypeConverter
-    public static SessionRecord toSessionRecord(final byte[] serialized) {
-        if (serialized == null || serialized.length == 0) {
-            return null;
-        }
-        try {
-            return new SessionRecord(serialized);
-        } catch (final IOException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    @TypeConverter
-    public static byte[] fromSignedPreKey(final SignedPreKeyRecord signedPreKeyRecord) {
-        return signedPreKeyRecord == null ? null : signedPreKeyRecord.serialize();
-    }
-
-    @TypeConverter
-    public static SignedPreKeyRecord toSignedPreKey(final byte[] serialized) {
-        if (serialized == null || serialized.length == 0) {
-            return null;
-        }
-        try {
-            return new SignedPreKeyRecord(serialized);
-        } catch (final IOException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    @TypeConverter
-    public static byte[] fromPreKey(final PreKeyRecord preKeyRecord) {
-        return preKeyRecord == null ? null : preKeyRecord.serialize();
-    }
-
-    @TypeConverter
-    public static PreKeyRecord toPreKey(final byte[] serialized) {
-        if (serialized == null || serialized.length == 0) {
-            return null;
-        }
-        try {
-            return new PreKeyRecord(serialized);
-        } catch (final IOException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    @TypeConverter
-    public static byte[] fromIdentityKeyPair(final IdentityKeyPair identityKeyPair) {
-        return identityKeyPair == null ? null : identityKeyPair.serialize();
-    }
-
-    @TypeConverter
-    public static IdentityKeyPair toIdentityKeyPair(final byte[] serialized) {
-        if (serialized == null || serialized.length == 0) {
-            return null;
-        }
-        try {
-            return new IdentityKeyPair(serialized);
-        } catch (final InvalidKeyException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    @TypeConverter
-    public static String fromDNSName(final DNSName dnsName) {
-        return dnsName == null ? null : dnsName.toString();
-    }
-
-    @TypeConverter
-    public static DNSName toDNSName(final String dnsName) {
-        return dnsName == null ? null : DNSName.from(dnsName);
-    }
-
-    @TypeConverter
-    public static byte[] fromInetAddress(final InetAddress inetAddress) {
-        return inetAddress == null ? null : inetAddress.getAddress();
-    }
-
-    @TypeConverter
-    public static InetAddress toInetAddress(final byte[] address) {
-        if (address == null || address.length == 0) {
-            return null;
-        }
-        try {
-            return InetAddress.getByAddress(address);
-        } catch (final UnknownHostException e) {
-            return null;
-        }
-    }
-
-    @TypeConverter
-    public static String fromMediaType(final MediaType mediaType) {
-        return mediaType == null ? null : mediaType.toString();
-    }
-
-    @TypeConverter
-    public static MediaType toMediaType(final String mediaType) {
-        return mediaType == null ? null : MediaType.parse(mediaType);
-    }
-}

app/src/main/java/im/conversations/android/database/CredentialStore.java

@@ -1,224 +0,0 @@
-package im.conversations.android.database;
-
-import android.content.Context;
-import android.security.keystore.KeyGenParameterSpec;
-import androidx.annotation.NonNull;
-import androidx.security.crypto.EncryptedFile;
-import androidx.security.crypto.MasterKeys;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.reflect.TypeToken;
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import im.conversations.android.database.model.Account;
-import im.conversations.android.database.model.Credential;
-import im.conversations.android.xmpp.sasl.ChannelBindingMechanism;
-import im.conversations.android.xmpp.sasl.HashedToken;
-import im.conversations.android.xmpp.sasl.SaslMechanism;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.OutputStreamWriter;
-import java.lang.reflect.Type;
-import java.security.GeneralSecurityException;
-import java.util.HashMap;
-import java.util.Map;
-
-// TODO cache credentials?!
-public class CredentialStore {
-
-    private static final String FILENAME = "credential.store";
-
-    private static final Gson GSON = new GsonBuilder().create();
-
-    private static volatile CredentialStore INSTANCE;
-
-    private final Context context;
-
-    private CredentialStore(final Context context) {
-        this.context = context.getApplicationContext();
-    }
-
-    public static CredentialStore getInstance(final Context context) {
-        if (INSTANCE != null) {
-            return INSTANCE;
-        }
-        synchronized (CredentialStore.class) {
-            if (INSTANCE != null) {
-                return INSTANCE;
-            }
-            INSTANCE = new CredentialStore(context);
-            return INSTANCE;
-        }
-    }
-
-    public synchronized Credential get(final Account account) {
-        return getOrEmpty(account);
-    }
-
-    public void setPassword(final Account account, final String password)
-            throws GeneralSecurityException, IOException {
-        setPassword(account, password, false);
-    }
-
-    public synchronized void setPassword(
-            final Account account, final String password, final boolean autogeneratedPassword)
-            throws GeneralSecurityException, IOException {
-        final Credential credential = getOrEmpty(account);
-        final Credential modifiedCredential =
-                new Credential(
-                        password,
-                        autogeneratedPassword,
-                        credential.pinnedMechanism,
-                        credential.pinnedChannelBinding,
-                        credential.fastMechanism,
-                        credential.fastToken,
-                        credential.preAuthRegistrationToken,
-                        credential.privateKeyAlias);
-        // TODO ignore if unchanged
-        this.set(account, modifiedCredential);
-    }
-
-    public synchronized void setFastToken(
-            final Account account, final HashedToken.Mechanism mechanism, final String token)
-            throws GeneralSecurityException, IOException {
-        final Credential credential = getOrEmpty(account);
-        final Credential modifiedCredential =
-                new Credential(
-                        credential.password,
-                        credential.autogeneratedPassword,
-                        credential.pinnedMechanism,
-                        credential.pinnedChannelBinding,
-                        mechanism.name(),
-                        token,
-                        credential.preAuthRegistrationToken,
-                        credential.privateKeyAlias);
-        // TODO ignore if unchanged
-        this.set(account, modifiedCredential);
-    }
-
-    public synchronized void resetFastToken(final Account account)
-            throws GeneralSecurityException, IOException {
-        final Credential credential = getOrEmpty(account);
-        final Credential modifiedCredential =
-                new Credential(
-                        credential.password,
-                        credential.autogeneratedPassword,
-                        credential.pinnedMechanism,
-                        credential.pinnedChannelBinding,
-                        null,
-                        null,
-                        credential.preAuthRegistrationToken,
-                        credential.privateKeyAlias);
-        // TODO ignore if unchanged
-        this.set(account, modifiedCredential);
-    }
-
-    public synchronized void setPinnedMechanism(
-            final Account account, final SaslMechanism mechanism)
-            throws GeneralSecurityException, IOException {
-        final String pinnedMechanism = mechanism.getMechanism();
-        final String pinnedChannelBinding;
-        if (mechanism instanceof ChannelBindingMechanism) {
-            pinnedChannelBinding =
-                    ((ChannelBindingMechanism) mechanism).getChannelBinding().toString();
-        } else {
-            pinnedChannelBinding = null;
-        }
-        final Credential credential = getOrEmpty(account);
-        final Credential modifiedCredential =
-                new Credential(
-                        credential.password,
-                        credential.autogeneratedPassword,
-                        pinnedMechanism,
-                        pinnedChannelBinding,
-                        credential.fastMechanism,
-                        credential.fastToken,
-                        credential.preAuthRegistrationToken,
-                        credential.privateKeyAlias);
-        // TODO ignore if unchanged
-        this.set(account, modifiedCredential);
-    }
-
-    public synchronized void resetPinnedMechanism(final Account account)
-            throws GeneralSecurityException, IOException {
-        final Credential credential = getOrEmpty(account);
-        final Credential modifiedCredential =
-                new Credential(
-                        credential.password,
-                        credential.autogeneratedPassword,
-                        null,
-                        null,
-                        credential.fastMechanism,
-                        credential.fastToken,
-                        credential.preAuthRegistrationToken,
-                        credential.privateKeyAlias);
-        // TODO ignore if unchanged
-        this.set(account, modifiedCredential);
-    }
-
-    private Credential getOrEmpty(final Account account) {
-        final Map<String, Credential> store = loadOrEmpty();
-        final Credential credential = store.get(account.address.toString());
-        return credential == null ? Credential.empty() : credential;
-    }
-
-    private void set(@NonNull final Account account, @NonNull final Credential credential)
-            throws GeneralSecurityException, IOException {
-        final HashMap<String, Credential> credentialStore = new HashMap<>(loadOrEmpty());
-        credentialStore.put(account.address.toString(), credential);
-        store(credentialStore);
-    }
-
-    private Map<String, Credential> loadOrEmpty() {
-        final Map<String, Credential> store;
-        try {
-            store = load();
-        } catch (final Exception e) {
-            return ImmutableMap.of();
-        }
-        return store == null ? ImmutableMap.of() : store;
-    }
-
-    private Map<String, Credential> load() throws GeneralSecurityException, IOException {
-        final EncryptedFile encryptedFile = getEncryptedFile();
-        try (final FileInputStream inputStream = encryptedFile.openFileInput()) {
-            final Type type = new TypeToken<Map<String, Credential>>() {}.getType();
-            return GSON.fromJson(new InputStreamReader(inputStream), type);
-        }
-    }
-
-    private void store(final Map<String, Credential> store)
-            throws GeneralSecurityException, IOException {
-        final File file = getCredentialStoreFile();
-        if (file.delete()) {
-            // Log.d(Config.LOGTAG,"delete old credential file: "+file.getAbsolutePath());
-        }
-        final EncryptedFile encryptedFile = getEncryptedFile(file);
-        try (final OutputStreamWriter writer =
-                new OutputStreamWriter(encryptedFile.openFileOutput())) {
-            GSON.toJson(store, writer);
-            writer.flush();
-        }
-    }
-
-    private EncryptedFile getEncryptedFile() throws GeneralSecurityException, IOException {
-        return getEncryptedFile(getCredentialStoreFile());
-    }
-
-    private EncryptedFile getEncryptedFile(final File file)
-            throws GeneralSecurityException, IOException {
-        final KeyGenParameterSpec keyGenParameterSpec = MasterKeys.AES256_GCM_SPEC;
-        final String mainKeyAlias = MasterKeys.getOrCreate(keyGenParameterSpec);
-        return new EncryptedFile.Builder(
-                        file,
-                        context,
-                        mainKeyAlias,
-                        EncryptedFile.FileEncryptionScheme.AES256_GCM_HKDF_4KB)
-                .build();
-    }
-
-    private File getCredentialStoreFile() {
-        return new File(context.getFilesDir(), FILENAME);
-    }
-}

app/src/main/java/im/conversations/android/database/KnownSender.java

@@ -1,24 +0,0 @@
-package im.conversations.android.database;
-
-import im.conversations.android.database.model.ChatType;
-import java.util.Arrays;
-import org.jxmpp.jid.BareJid;
-
-public interface KnownSender {
-
-    default boolean isKnownSender() {
-        final var chatType = getChatType();
-        final var membersOnlyNonAnonymous = isMembersOnlyNonAnonymous();
-        final var sender = getSender();
-        return chatType == ChatType.INDIVIDUAL
-                || (Arrays.asList(ChatType.MUC, ChatType.MUC_PM).contains(chatType)
-                        && membersOnlyNonAnonymous
-                        && sender != null);
-    }
-
-    ChatType getChatType();
-
-    boolean isMembersOnlyNonAnonymous();
-
-    BareJid getSender();
-}

app/src/main/java/im/conversations/android/database/dao/AccountDao.java

@@ -1,93 +0,0 @@
-package im.conversations.android.database.dao;
-
-import androidx.lifecycle.LiveData;
-import androidx.room.Dao;
-import androidx.room.Insert;
-import androidx.room.Query;
-import androidx.room.Transaction;
-import com.google.common.util.concurrent.ListenableFuture;
-import im.conversations.android.database.entity.AccountEntity;
-import im.conversations.android.database.model.Account;
-import im.conversations.android.database.model.AccountIdentifier;
-import im.conversations.android.database.model.Connection;
-import java.util.List;
-import org.jxmpp.jid.BareJid;
-
-@Dao
-public abstract class AccountDao {
-
-    @Query("SELECT EXISTS (SELECT id FROM account WHERE address=:address)")
-    public abstract boolean hasAccount(BareJid address);
-
-    @Query("SELECT NOT EXISTS (SELECT id FROM account)")
-    public abstract LiveData<Boolean> hasNoAccounts();
-
-    @Insert
-    public abstract long insert(final AccountEntity account);
-
-    @Query("SELECT id,address,randomSeed FROM account WHERE enabled = 1")
-    public abstract ListenableFuture<List<Account>> getEnabledAccounts();
-
-    @Query("SELECT id,address,randomSeed FROM account WHERE address=:address AND enabled=1")
-    public abstract ListenableFuture<Account> getEnabledAccount(BareJid address);
-
-    @Query("SELECT id,address,randomSeed FROM account WHERE id=:id AND enabled=1")
-    public abstract ListenableFuture<Account> getEnabledAccount(long id);
-
-    @Query("SELECT id,address FROM account")
-    public abstract LiveData<List<AccountIdentifier>> getAccounts();
-
-    @Query("SELECT hostname,port,directTls FROM account WHERE id=:id AND hostname IS NOT null")
-    public abstract Connection getConnectionSettings(long id);
-
-    @Query("SELECT resource FROM account WHERE id=:id")
-    public abstract String getResource(long id);
-
-    @Query("SELECT rosterVersion FROM account WHERE id=:id")
-    public abstract String getRosterVersion(long id);
-
-    @Query("SELECT quickStartAvailable FROM account where id=:id")
-    public abstract boolean quickStartAvailable(long id);
-
-    @Query("SELECT loginAndBind FROM account where id=:id")
-    public abstract boolean loginAndBind(long id);
-
-    @Query(
-            "UPDATE account set quickStartAvailable=:available WHERE id=:id AND"
-                    + " quickStartAvailable != :available")
-    public abstract void setQuickStartAvailable(long id, boolean available);
-
-    @Query(
-            "UPDATE account set loginAndBind=:loginAndBind WHERE id=:id AND"
-                    + " loginAndBind != :loginAndBind")
-    public abstract void setLoginAndBind(long id, boolean loginAndBind);
-
-    @Query(
-            "UPDATE account set showErrorNotification=:showErrorNotification WHERE id=:id AND"
-                    + " showErrorNotification != :showErrorNotification")
-    public abstract int setShowErrorNotification(long id, boolean showErrorNotification);
-
-    @Query("UPDATE account set resource=:resource WHERE id=:id")
-    public abstract void setResource(long id, String resource);
-
-    @Query("DELETE FROM account WHERE id=:id")
-    public abstract int delete(long id);
-
-    @Query(
-            "UPDATE account SET hostname=:hostname, port=:port, directTls=:directTls WHERE"
-                    + " id=:account")
-    protected abstract int setConnection(
-            long account, String hostname, int port, boolean directTls);
-
-    @Transaction
-    public void setConnection(final Account account, final Connection connection) {
-        final var count =
-                setConnection(
-                        account.id, connection.hostname, connection.port, connection.directTls);
-        if (count != 1) {
-            throw new IllegalStateException("Could not update account");
-        }
-    }
-
-    // TODO on disable set resource to null
-}

app/src/main/java/im/conversations/android/database/dao/ArchiveDao.java

@@ -1,183 +0,0 @@
-package im.conversations.android.database.dao;
-
-import androidx.room.Dao;
-import androidx.room.Delete;
-import androidx.room.Query;
-import androidx.room.Transaction;
-import androidx.room.Upsert;
-import com.google.common.base.Preconditions;
-import com.google.common.collect.ImmutableList;
-import im.conversations.android.database.entity.ArchivePageEntity;
-import im.conversations.android.database.model.Account;
-import im.conversations.android.database.model.StanzaId;
-import im.conversations.android.xml.Namespace;
-import im.conversations.android.xmpp.Range;
-import im.conversations.android.xmpp.manager.ArchiveManager;
-import java.util.List;
-import java.util.Objects;
-import org.jxmpp.jid.Jid;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@Dao
-public abstract class ArchiveDao extends BaseDao {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(ArchiveDao.class);
-
-    @Transaction
-    public List<Range> resetLivePage(final Account account, final Jid archive) {
-        // if the server support extended MAM or catch-up query from (live)page.end to now can use
-        // after-id reverse towards that (this means newer messages will be fetched earlier); if and
-        // when we support this we also need a new page type called END that will eventually be
-        // deleted once we need page.end
-        final boolean emitRangeAfter =
-                hasDiscoItemFeature(
-                        account.id, archive, Namespace.MESSAGE_ARCHIVE_MANAGEMENT_EXTENDED);
-        final var page =
-                getPage(
-                        account.id,
-                        archive,
-                        ArchivePageEntity.Type.START,
-                        ArchivePageEntity.Type.MIDDLE);
-        final var livePage = getPage(account.id, archive, ArchivePageEntity.Type.LIVE);
-        if (page == null && livePage == null) {
-            LOGGER.info("Emitting initial query for {}", archive);
-            return ImmutableList.of(new Range(Range.Order.REVERSE, null));
-        }
-        final ImmutableList.Builder<Range> queryRangeBuilder = new ImmutableList.Builder<>();
-        final boolean gapLess = page != null && livePage != null && page.end.equals(livePage.start);
-        if (gapLess) {
-            LOGGER.info("Page and live page for {} were gap-less", archive);
-            page.end = livePage.end;
-            insert(page);
-            if (page.type != ArchivePageEntity.Type.START && !page.reachedMaxPages) {
-                queryRangeBuilder.add(new Range(Range.Order.REVERSE, page.start));
-            }
-            queryRangeBuilder.add(new Range(Range.Order.NORMAL, livePage.end));
-        } else if (page != null) {
-            LOGGER.info("Ignoring live page for {}", archive);
-            // this will simply ignore the last live page and overwrite it
-            if (page.type != ArchivePageEntity.Type.START && !page.reachedMaxPages) {
-                queryRangeBuilder.add(new Range(Range.Order.REVERSE, page.start));
-            }
-            queryRangeBuilder.add(new Range(Range.Order.NORMAL, page.end));
-        } else {
-            LOGGER.info("Converting live page into regular page for {}", archive);
-            insert(
-                    ArchivePageEntity.of(
-                            account,
-                            archive,
-                            ArchivePageEntity.Type.MIDDLE,
-                            livePage.start,
-                            livePage.end,
-                            false));
-            queryRangeBuilder.add(new Range(Range.Order.REVERSE, livePage.start));
-            queryRangeBuilder.add(new Range(Range.Order.NORMAL, livePage.end));
-        }
-        if (livePage != null) {
-            delete(livePage);
-        }
-        return queryRangeBuilder.build();
-    }
-
-    public void submitPage(
-            final Account account,
-            final Jid archive,
-            final Range range,
-            final ArchiveManager.QueryResult queryResult,
-            final boolean reachedMaxPagesReversing) {
-        if (reachedMaxPagesReversing) {
-            Preconditions.checkState(
-                    range.order == Range.Order.REVERSE,
-                    "reachedMaxPagesReversing can only be true when reversing");
-        }
-        final var isComplete = queryResult.isComplete;
-        final var page = queryResult.page;
-
-        final var existingPage =
-                getPage(
-                        account.id,
-                        archive,
-                        ArchivePageEntity.Type.START,
-                        ArchivePageEntity.Type.MIDDLE);
-        final boolean isStart = range.order == Range.Order.REVERSE && isComplete;
-        if (existingPage == null) {
-            insert(
-                    ArchivePageEntity.of(
-                            account,
-                            archive,
-                            isStart ? ArchivePageEntity.Type.START : ArchivePageEntity.Type.MIDDLE,
-                            page.first,
-                            page.last,
-                            reachedMaxPagesReversing));
-        } else {
-            if (range.order == Range.Order.REVERSE) {
-                Preconditions.checkState(
-                        Objects.equals(range.id, existingPage.start),
-                        "Reversing range did not match start of existing page");
-                existingPage.start = page.first;
-                existingPage.type =
-                        isStart ? ArchivePageEntity.Type.START : ArchivePageEntity.Type.MIDDLE;
-            } else if (range.order == Range.Order.NORMAL) {
-                Preconditions.checkState(
-                        Objects.equals(range.id, existingPage.end),
-                        "Normal range did not match end of existing page");
-                existingPage.end = page.last;
-            } else {
-                throw new IllegalStateException(String.format("Unknown order %s", range.order));
-            }
-            existingPage.reachedMaxPages = existingPage.reachedMaxPages || reachedMaxPagesReversing;
-            insert(existingPage);
-        }
-
-        final boolean lastIsLive =
-                (range.order == Range.Order.REVERSE && range.id == null)
-                        || (range.order == Range.Order.NORMAL && queryResult.isComplete);
-        if (lastIsLive) {
-            final var existingLivePage = getPage(account.id, archive, ArchivePageEntity.Type.LIVE);
-            if (existingLivePage != null) {
-                existingLivePage.start = page.last;
-                insert(existingLivePage);
-            } else {
-                insert(
-                        ArchivePageEntity.of(
-                                account,
-                                archive,
-                                ArchivePageEntity.Type.LIVE,
-                                page.last,
-                                page.last,
-                                false));
-            }
-        }
-    }
-
-    public void setLivePageStanzaId(final Account account, final StanzaId stanzaId) {
-        LOGGER.info("set live page stanza id {}", stanzaId);
-        final var currentLivePage = getPage(account.id, stanzaId.by, ArchivePageEntity.Type.LIVE);
-        if (currentLivePage != null) {
-            currentLivePage.end = stanzaId.id;
-            insert(currentLivePage);
-        } else {
-            insert(
-                    ArchivePageEntity.of(
-                            account,
-                            stanzaId.by,
-                            ArchivePageEntity.Type.LIVE,
-                            stanzaId.id,
-                            stanzaId.id,
-                            false));
-        }
-    }
-
-    @Delete
-    protected abstract void delete(final ArchivePageEntity entity);
-
-    @Upsert
-    protected abstract void insert(final ArchivePageEntity entity);
-
-    @Query(
-            "SELECT * FROM archive_page WHERE accountId=:account AND archive=:archive AND type"
-                    + " IN(:type)")
-    protected abstract ArchivePageEntity getPage(
-            long account, Jid archive, ArchivePageEntity.Type... type);
-}

app/src/main/java/im/conversations/android/database/dao/AvatarDao.java

@@ -1,31 +0,0 @@
-package im.conversations.android.database.dao;
-
-import androidx.room.Dao;
-import androidx.room.Insert;
-import androidx.room.OnConflictStrategy;
-import com.google.common.collect.Collections2;
-import im.conversations.android.database.entity.AvatarAdditionalEntity;
-import im.conversations.android.database.entity.AvatarEntity;
-import im.conversations.android.database.model.Account;
-import im.conversations.android.xmpp.model.avatar.Info;
-import java.util.Collection;
-import org.jxmpp.jid.BareJid;
-
-@Dao
-public abstract class AvatarDao {
-
-    @Insert(onConflict = OnConflictStrategy.REPLACE)
-    protected abstract long insert(AvatarEntity avatar);
-
-    @Insert
-    protected abstract void insert(Collection<AvatarAdditionalEntity> entities);
-
-    public void set(
-            final Account account,
-            final BareJid address,
-            final Info thumbnail,
-            final Collection<Info> additional) {
-        final long id = insert(AvatarEntity.of(account, address, thumbnail));
-        insert(Collections2.transform(additional, a -> AvatarAdditionalEntity.of(id, a)));
-    }
-}

app/src/main/java/im/conversations/android/database/dao/AxolotlDao.java

@@ -1,249 +0,0 @@
-package im.conversations.android.database.dao;
-
-import androidx.room.Dao;
-import androidx.room.Insert;
-import androidx.room.OnConflictStrategy;
-import androidx.room.Query;
-import androidx.room.Transaction;
-import com.google.common.collect.Collections2;
-import im.conversations.android.axolotl.AxolotlAddress;
-import im.conversations.android.database.entity.AxolotlDeviceListEntity;
-import im.conversations.android.database.entity.AxolotlDeviceListItemEntity;
-import im.conversations.android.database.entity.AxolotlIdentityEntity;
-import im.conversations.android.database.entity.AxolotlIdentityKeyPairEntity;
-import im.conversations.android.database.entity.AxolotlPreKeyEntity;
-import im.conversations.android.database.entity.AxolotlSessionEntity;
-import im.conversations.android.database.entity.AxolotlSignedPreKeyEntity;
-import im.conversations.android.database.model.Account;
-import im.conversations.android.database.model.Trust;
-import im.conversations.android.xmpp.model.error.Condition;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-import java.util.Set;
-import org.jxmpp.jid.BareJid;
-import org.whispersystems.libsignal.IdentityKey;
-import org.whispersystems.libsignal.IdentityKeyPair;
-import org.whispersystems.libsignal.ecc.Curve;
-import org.whispersystems.libsignal.state.PreKeyRecord;
-import org.whispersystems.libsignal.state.SessionRecord;
-import org.whispersystems.libsignal.state.SignedPreKeyRecord;
-
-@Dao
-public abstract class AxolotlDao {
-
-    @Insert(onConflict = OnConflictStrategy.REPLACE)
-    protected abstract long insert(AxolotlDeviceListEntity entity);
-
-    @Insert
-    protected abstract void insert(Collection<AxolotlDeviceListItemEntity> entities);
-
-    @Insert(onConflict = OnConflictStrategy.IGNORE)
-    protected abstract void insertUnconfirmed(Collection<AxolotlDeviceListItemEntity> entities);
-
-    @Transaction
-    public void setDeviceList(Account account, BareJid from, Set<Integer> deviceIds) {
-        final var listId = insert(AxolotlDeviceListEntity.of(account.id, from));
-        insert(
-                Collections2.transform(
-                        deviceIds,
-                        deviceId -> AxolotlDeviceListItemEntity.of(listId, deviceId, true)));
-    }
-
-    @Transaction
-    public void setUnconfirmedDevices(
-            final Account account, final BareJid address, Set<Integer> unconfirmedDeviceIds) {
-        final Long listId = getDeviceListId(account.id, address);
-        if (listId == null) {
-            return;
-        }
-        insertUnconfirmed(
-                Collections2.transform(
-                        unconfirmedDeviceIds,
-                        deviceId -> AxolotlDeviceListItemEntity.of(listId, deviceId, false)));
-    }
-
-    @Query("SELECT id FROM axolotl_device_list WHERE accountId=:account AND address=:address")
-    abstract Long getDeviceListId(long account, final BareJid address);
-
-    @Query(
-            "SELECT EXISTS(SELECT deviceId FROM axolotl_device_list JOIN axolotl_device_list_item"
-                    + " ON axolotl_device_list.id=axolotl_device_list_item.deviceListId WHERE"
-                    + " accountId=:account AND address=:address AND deviceId=:deviceId)")
-    public abstract boolean hasDeviceId(
-            final long account, final BareJid address, final int deviceId);
-
-    public boolean hasDeviceId(final Account account, final AxolotlAddress axolotlAddress) {
-        return hasDeviceId(account.id, axolotlAddress.getJid(), axolotlAddress.getDeviceId());
-    }
-
-    @Transaction
-    public void setDeviceListError(
-            final Account account, final BareJid address, Condition condition) {
-        insert(AxolotlDeviceListEntity.of(account.id, address, condition.getName()));
-    }
-
-    @Transaction
-    public void setDeviceListParsingError(final Account account, final BareJid address) {
-        insert(AxolotlDeviceListEntity.ofParsingIssue(account.id, address));
-    }
-
-    @Transaction
-    public IdentityKeyPair getOrCreateIdentityKeyPair(final Account account) {
-        final var existing = getIdentityKeyPair(account.id);
-        if (existing != null) {
-            return existing;
-        }
-        final var ecKeyPair = Curve.generateKeyPair();
-        final var identityKeyPair =
-                new IdentityKeyPair(
-                        new IdentityKey(ecKeyPair.getPublicKey()), ecKeyPair.getPrivateKey());
-        insert(AxolotlIdentityKeyPairEntity.of(account, identityKeyPair));
-        return identityKeyPair;
-    }
-
-    @Insert
-    protected abstract void insert(AxolotlIdentityKeyPairEntity entity);
-
-    @Query("SELECT identityKeyPair FROM axolotl_identity_key_pair WHERE accountId=:account")
-    protected abstract IdentityKeyPair getIdentityKeyPair(long account);
-
-    @Query(
-            "SELECT signedPreKeyRecord FROM axolotl_signed_pre_key WHERE accountId=:account AND"
-                    + " signedPreKeyId=:signedPreKeyId")
-    public abstract SignedPreKeyRecord getSignedPreKey(long account, int signedPreKeyId);
-
-    @Query(
-            "SELECT NOT EXISTS(SELECT signedPreKeyRecord FROM axolotl_signed_pre_key WHERE"
-                    + " accountId=:account AND signedPreKeyId=:signedPreKeyId)")
-    public abstract boolean hasNotSignedPreKey(long account, int signedPreKeyId);
-
-    @Query(
-            "SELECT signedPreKeyRecord FROM axolotl_signed_pre_key WHERE accountId=:account ORDER"
-                    + " BY signedPreKeyId DESC LIMIT 1")
-    public abstract SignedPreKeyRecord getLatestSignedPreKey(long account);
-
-    @Transaction
-    public boolean setIdentity(
-            final Account account,
-            final BareJid address,
-            final IdentityKey identityKey,
-            final Trust trust) {
-        final var existing = getIdentityKey(account.id, address, identityKey);
-        if (existing == null || !existing.equals(identityKey)) {
-            insert(AxolotlIdentityEntity.of(account, address, identityKey, trust));
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-    public boolean isAnyIdentityVerified(final Account account, final BareJid address) {
-        return isAnyIdentityTrustStatus(
-                account.id, address, Arrays.asList(Trust.VERIFIED, Trust.VERIFIED_X509));
-    }
-
-    @Query(
-            "SELECT EXISTS (SELECT id FROM axolotl_identity WHERE accountId=:account AND"
-                    + " address=:address AND trust IN(:trusts))")
-    abstract boolean isAnyIdentityTrustStatus(
-            long account, BareJid address, Collection<Trust> trusts);
-
-    @Insert(onConflict = OnConflictStrategy.REPLACE)
-    protected abstract void insert(AxolotlIdentityEntity axolotlIdentityEntity);
-
-    @Query(
-            "SELECT identityKey FROM AXOLOTL_IDENTITY WHERE accountId=:account AND"
-                    + " address=:address AND identityKey=:identityKey")
-    protected abstract IdentityKey getIdentityKey(
-            long account, BareJid address, IdentityKey identityKey);
-
-    @Query(
-            "SELECT preKeyRecord FROM axolotl_pre_key WHERE accountId=:account AND"
-                    + " preKeyid=:preKeyId")
-    public abstract PreKeyRecord getPreKey(long account, int preKeyId);
-
-    @Query("SELECT MAX(preKeyId) FROM axolotl_pre_key WHERE accountId=:account")
-    public abstract Integer getMaxPreKeyId(final long account);
-
-    @Query("SELECT COUNT(id) FROM axolotl_pre_key WHERE accountId=:account AND removed=0")
-    public abstract int getExistingPreKeyCount(final long account);
-
-    public void setPreKey(final Account account, int preKeyId, PreKeyRecord preKeyRecord) {
-        insert(AxolotlPreKeyEntity.of(account, preKeyId, preKeyRecord));
-    }
-
-    @Insert(onConflict = OnConflictStrategy.REPLACE)
-    protected abstract void insert(AxolotlPreKeyEntity axolotlPreKeyEntity);
-
-    public void setPreKeys(final Account account, final Collection<PreKeyRecord> preKeyRecords) {
-        insertPreKeys(
-                Collections2.transform(
-                        preKeyRecords, r -> AxolotlPreKeyEntity.of(account, r.getId(), r)));
-    }
-
-    @Insert(onConflict = OnConflictStrategy.REPLACE)
-    protected abstract void insertPreKeys(Collection<AxolotlPreKeyEntity> entities);
-
-    @Insert(onConflict = OnConflictStrategy.REPLACE)
-    protected abstract void insert(AxolotlSessionEntity axolotlSessionEntity);
-
-    @Query(
-            "SELECT EXISTS(SELECT id FROM axolotl_pre_key WHERE accountId=:account AND"
-                    + " preKeyId=:preKeyId)")
-    public abstract boolean hasPreKey(long account, int preKeyId);
-
-    @Query(
-            "SELECT EXISTS(SELECT id FROM axolotl_signed_pre_key WHERE accountId=:account AND"
-                    + " signedPreKeyId=:signedPreKeyId)")
-    public abstract boolean hasSignedPreKey(long account, int signedPreKeyId);
-
-    @Query("UPDATE axolotl_pre_key SET removed=1 WHERE accountId=:account AND preKeyId=:preKeyId")
-    public abstract void markPreKeyAsRemoved(long account, int preKeyId);
-
-    @Query(
-            "UPDATE axolotl_signed_pre_key SET removed=1 WHERE accountId=:account AND"
-                    + " signedPreKeyId=:signedPreKeyId")
-    public abstract void markSignedPreKeyAsRemoved(long account, int signedPreKeyId);
-
-    @Query(
-            "SELECT sessionRecord FROM axolotl_session WHERE accountId=:account AND"
-                    + " address=:address AND deviceId=:deviceId")
-    public abstract SessionRecord getSessionRecord(long account, BareJid address, int deviceId);
-
-    @Query("SELECT deviceId FROM axolotl_session WHERE accountId=:account AND address=:address")
-    public abstract List<Integer> getSessionDeviceIds(long account, String address);
-
-    public void setSessionRecord(
-            Account account, BareJid address, int deviceId, SessionRecord record) {
-        insert(AxolotlSessionEntity.of(account, address, deviceId, record));
-    }
-
-    @Query(
-            "SELECT EXISTS(SELECT id FROM axolotl_session WHERE accountId=:account AND"
-                    + " address=:address AND deviceId=:deviceId)")
-    public abstract boolean hasSession(long account, BareJid address, int deviceId);
-
-    @Query(
-            "DELETE FROM axolotl_session WHERE accountId=:account AND address=:address AND"
-                    + " deviceId=:deviceId")
-    public abstract void deleteSession(long account, BareJid address, int deviceId);
-
-    @Query("DELETE FROM axolotl_session WHERE accountId=:account AND address=:address")
-    public abstract void deleteSessions(long account, String address);
-
-    @Query(
-            "SELECT signedPreKeyRecord FROM axolotl_signed_pre_key WHERE accountId=:account AND"
-                    + " removed=0")
-    public abstract List<SignedPreKeyRecord> getSignedPreKeys(long account);
-
-    @Query("SELECT preKeyRecord FROM axolotl_pre_key WHERE accountId=:account AND removed=0")
-    public abstract List<PreKeyRecord> getPreKeys(long account);
-
-    public void setSignedPreKey(Account account, int signedPreKeyId, SignedPreKeyRecord record) {
-        insert(AxolotlSignedPreKeyEntity.of(account, signedPreKeyId, record));
-    }
-
-    @Insert(onConflict = OnConflictStrategy.REPLACE)
-    protected abstract void insert(AxolotlSignedPreKeyEntity signedPreKeyEntity);
-}

app/src/main/java/im/conversations/android/database/dao/BaseDao.java

@@ -1,14 +0,0 @@
-package im.conversations.android.database.dao;
-
-import androidx.room.Query;
-import org.jxmpp.jid.Jid;
-
-public abstract class BaseDao {
-
-    @Query(
-            "SELECT EXISTS (SELECT disco_item.id FROM disco_item JOIN disco_feature on"
-                    + " disco_item.discoId=disco_feature.discoId WHERE accountId=:account AND"
-                    + " address=:entity AND feature=:feature)")
-    protected abstract boolean hasDiscoItemFeature(
-            final long account, final Jid entity, final String feature);
-}

app/src/main/java/im/conversations/android/database/dao/BlockingDao.java

@@ -1,39 +0,0 @@
-package im.conversations.android.database.dao;
-
-import androidx.room.Dao;
-import androidx.room.Insert;
-import androidx.room.OnConflictStrategy;
-import androidx.room.Query;
-import androidx.room.Transaction;
-import com.google.common.collect.Collections2;
-import im.conversations.android.database.entity.BlockedItemEntity;
-import im.conversations.android.database.model.Account;
-import im.conversations.android.xmpp.model.blocking.Item;
-import java.util.Collection;
-import org.jxmpp.jid.Jid;
-
-@Dao
-public abstract class BlockingDao {
-
-    @Insert(onConflict = OnConflictStrategy.REPLACE)
-    abstract void insert(Collection<BlockedItemEntity> entities);
-
-    @Query("DELETE FROM blocked WHERE accountId=:account")
-    public abstract void clear(final long account);
-
-    @Transaction
-    public void set(final Account account, final Collection<Item> blockedItems) {
-        final var entities =
-                Collections2.transform(
-                        blockedItems, i -> BlockedItemEntity.of(account.id, i.getJid()));
-        clear(account.id);
-        insert(entities);
-    }
-
-    public void add(Account account, Collection<Jid> addresses) {
-        insert(Collections2.transform(addresses, a -> BlockedItemEntity.of(account.id, a)));
-    }
-
-    @Query("DELETE from blocked WHERE accountId=:account AND address IN(:addresses)")
-    public abstract void remove(final long account, Collection<Jid> addresses);
-}

app/src/main/java/im/conversations/android/database/dao/BookmarkDao.java

@@ -1,50 +0,0 @@
-package im.conversations.android.database.dao;
-
-import androidx.room.Dao;
-import androidx.room.Insert;
-import androidx.room.Query;
-import androidx.room.Transaction;
-import com.google.common.collect.Collections2;
-import im.conversations.android.database.entity.BookmarkEntity;
-import im.conversations.android.database.model.Account;
-import im.conversations.android.xmpp.model.bookmark.Conference;
-import java.util.Collection;
-import java.util.Map;
-import java.util.Objects;
-import org.jxmpp.jid.Jid;
-import org.jxmpp.jid.impl.JidCreate;
-
-@Dao
-public abstract class BookmarkDao {
-
-    @Query("DELETE FROM bookmark WHERE accountId=:account")
-    public abstract void deleteAll(final long account);
-
-    @Query("DELETE FROM bookmark WHERE accountId=:account and address IN(:addresses)")
-    public abstract void delete(final long account, Collection<Jid> addresses);
-
-    @Insert
-    protected abstract void insert(Collection<BookmarkEntity> bookmarks);
-
-    @Transaction
-    public void updateItems(final Account account, Map<String, Conference> items) {
-        final Collection<Jid> addresses =
-                Collections2.transform(items.keySet(), JidCreate::fromOrNull);
-        delete(account.id, addresses);
-        final var entities =
-                Collections2.transform(
-                        items.entrySet(), entry -> BookmarkEntity.of(account.id, entry));
-        // non null filtering is required because BookmarkEntity.of() can return null values if the
-        insert(Collections2.filter(entities, Objects::nonNull));
-    }
-
-    @Transaction
-    public void setItems(Account account, Map<String, Conference> items) {
-        deleteAll(account.id);
-        final var entities =
-                Collections2.transform(
-                        items.entrySet(), entry -> BookmarkEntity.of(account.id, entry));
-        // non null filtering is required because BookmarkEntity.of() can return null values if the
-        insert(Collections2.filter(entities, Objects::nonNull));
-    }
-}

app/src/main/java/im/conversations/android/database/dao/CertificateTrustDao.java

@@ -1,26 +0,0 @@
-package im.conversations.android.database.dao;
-
-import androidx.room.Dao;
-import androidx.room.Insert;
-import androidx.room.OnConflictStrategy;
-import androidx.room.Query;
-import im.conversations.android.database.entity.CertificateTrustEntity;
-import im.conversations.android.database.model.Account;
-import im.conversations.android.tls.ScopeFingerprint;
-
-@Dao
-public abstract class CertificateTrustDao {
-
-    @Insert(onConflict = OnConflictStrategy.REPLACE)
-    public abstract void insert(final CertificateTrustEntity certificateTrustEntity);
-
-    @Query(
-            "SELECT EXISTS (SELECT id FROM certificate_trust WHERE accountId=:account AND"
-                    + " scope=:scope AND fingerprint=:fingerprint)")
-    protected abstract boolean isTrusted(
-            final long account, final String scope, final byte[] fingerprint);
-
-    public boolean isTrusted(final Account account, final ScopeFingerprint scopeFingerprint) {
-        return isTrusted(account.id, scopeFingerprint.scope, scopeFingerprint.fingerprint.array());
-    }
-}

app/src/main/java/im/conversations/android/database/dao/ChatDao.java

@@ -1,263 +0,0 @@
-package im.conversations.android.database.dao;
-
-import androidx.lifecycle.LiveData;
-import androidx.paging.PagingSource;
-import androidx.room.Dao;
-import androidx.room.Insert;
-import androidx.room.Query;
-import androidx.room.Transaction;
-import com.google.common.util.concurrent.ListenableFuture;
-import im.conversations.android.database.entity.ChatEntity;
-import im.conversations.android.database.entity.MucStatusCodeEntity;
-import im.conversations.android.database.model.Account;
-import im.conversations.android.database.model.AccountIdentifier;
-import im.conversations.android.database.model.ChatFilter;
-import im.conversations.android.database.model.ChatIdentifier;
-import im.conversations.android.database.model.ChatInfo;
-import im.conversations.android.database.model.ChatOverviewItem;
-import im.conversations.android.database.model.ChatType;
-import im.conversations.android.database.model.GroupIdentifier;
-import im.conversations.android.database.model.MucState;
-import im.conversations.android.database.model.MucWithNick;
-import im.conversations.android.xmpp.model.stanza.Message;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-import org.jxmpp.jid.Jid;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@Dao
-public abstract class ChatDao {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(ChatDao.class);
-
-    @Transaction
-    public ChatIdentifier getOrCreateChat(
-            final Account account,
-            final Jid remote,
-            final Message.Type messageType,
-            final boolean multiUserChat) {
-        final ChatType chatType;
-        if (multiUserChat
-                && Arrays.asList(Message.Type.CHAT, Message.Type.NORMAL).contains(messageType)) {
-            chatType = ChatType.MUC_PM;
-        } else if (messageType == Message.Type.GROUPCHAT) {
-            chatType = ChatType.MUC;
-        } else {
-            chatType = ChatType.INDIVIDUAL;
-        }
-        final Jid address = chatType == ChatType.MUC_PM ? remote : remote.asBareJid();
-        final ChatIdentifier existing = get(account.id, address);
-        if (existing != null) {
-            return existing;
-        }
-        // TODO do not create entity for 'error'
-        final var entity = new ChatEntity();
-        entity.accountId = account.id;
-        entity.address = address.toString();
-        entity.type = chatType;
-        entity.archived = true;
-        final long id = insert(entity);
-        return new ChatIdentifier(id, address, chatType, true);
-    }
-
-    @Query(
-            "SELECT id,address,type,archived FROM chat WHERE accountId=:accountId AND"
-                    + " address=:address")
-    protected abstract ChatIdentifier get(final long accountId, final Jid address);
-
-    @Query(
-            "SELECT id,address,type,archived FROM chat WHERE accountId=:accountId AND"
-                    + " address=:address AND type=:chatType")
-    public abstract ChatIdentifier get(
-            final long accountId, final Jid address, final ChatType chatType);
-
-    @Insert
-    protected abstract long insert(ChatEntity chatEntity);
-
-    @Query("UPDATE chat SET archived=:archived WHERE chat.id=:chatId")
-    public abstract void setArchived(final long chatId, final boolean archived);
-
-    @Query(
-            "UPDATE chat SET archived=:archived WHERE chat.accountId=:account AND"
-                    + " chat.address=:address")
-    protected abstract void setArchived(
-            final long account, final String address, final boolean archived);
-
-    @Query("SELECT id,name FROM `group` ORDER BY name")
-    public abstract LiveData<List<GroupIdentifier>> getGroups();
-
-    @Transaction
-    public void syncWithBookmarks(final Account account) {
-        final var chatsNotInBookmarks = getChatsNotInBookmarks(account.id, ChatType.MUC);
-        final var bookmarksNotInChat = getBookmarksNotInChats(account.id, ChatType.MUC);
-        LOGGER.info("chatsNotInBookmark {}", chatsNotInBookmarks);
-        LOGGER.info("bookmarkNotInChat {}", bookmarksNotInChat);
-        archive(account.id, chatsNotInBookmarks);
-        createOrUnarchiveMuc(account.id, bookmarksNotInChat);
-    }
-
-    private void archive(final long account, final List<String> addresses) {
-        for (final String address : addresses) {
-            setArchived(account, address, true);
-        }
-    }
-
-    private void createOrUnarchiveMuc(final long account, final List<Jid> addresses) {
-        for (final Jid address : addresses) {
-            createOrUnarchiveMuc(account, address);
-        }
-    }
-
-    private void createOrUnarchiveMuc(final long account, final Jid address) {
-        final var bareJid = address.asBareJid();
-        final var existing = get(account, bareJid);
-        if (existing != null) {
-            if (existing.archived) {
-                setArchived(existing.id, false);
-            }
-            return;
-        }
-        final var entity = new ChatEntity();
-        entity.accountId = account;
-        entity.address = bareJid.toString();
-        entity.type = ChatType.MUC;
-        entity.archived = false;
-        insert(entity);
-    }
-
-    @Query(
-            "SELECT chat.address FROM chat WHERE chat.accountId=:account AND chat.type=:chatType"
-                    + " AND archived=0 EXCEPT SELECT bookmark.address FROM bookmark WHERE"
-                    + " bookmark.accountId=:account AND bookmark.autoJoin=1")
-    protected abstract List<String> getChatsNotInBookmarks(long account, ChatType chatType);
-
-    @Query(
-            "SELECT bookmark.address FROM bookmark WHERE bookmark.accountId=:account AND"
-                    + " bookmark.autoJoin=1 EXCEPT SELECT chat.address FROM chat WHERE"
-                    + " chat.accountId=:account AND chat.type=:chatType AND archived=0")
-    protected abstract List<Jid> getBookmarksNotInChats(long account, ChatType chatType);
-
-    @Query(
-            "SELECT chat.id as chatId,chat.address,bookmark.nick as nickBookmark,nick.nick as"
-                + " nickAccount FROM chat LEFT JOIN bookmark ON chat.accountId=bookmark.accountId"
-                + " AND chat.address=bookmark.address JOIN account ON account.id=chat.accountId"
-                + " LEFT JOIN nick ON nick.accountId=chat.accountId AND"
-                + " nick.address=account.address WHERE chat.accountId=:account AND"
-                + " chat.type=:chatType AND chat.archived=0 AND chat.mucState IS NULL")
-    public abstract ListenableFuture<List<MucWithNick>> getMultiUserChats(
-            final long account, final ChatType chatType);
-
-    @Query("UPDATE chat SET mucState=:mucState, errorCondition=:errorCondition WHERE id=:chatId")
-    protected abstract void setMucStateInternal(
-            final long chatId, final MucState mucState, final String errorCondition);
-
-    @Transaction
-    public void setMucState(
-            final long chatId, final MucState mucState, final String errorCondition) {
-        setMucStateInternal(chatId, mucState, errorCondition);
-        deleteStatusCodes(chatId);
-    }
-
-    @Transaction
-    public void setMucState(
-            final long chatId, final MucState mucState, final Collection<Integer> statusCodes) {
-        setMucStateInternal(chatId, mucState, null);
-        deleteStatusCodes(chatId);
-        insertStatusCode(MucStatusCodeEntity.of(chatId, statusCodes));
-    }
-
-    @Transaction
-    public void setMucState(final long chatId, final MucState mucState) {
-        setMucStateInternal(chatId, mucState, null);
-        deleteStatusCodes(chatId);
-    }
-
-    @Transaction
-    public void resetMucStates() {
-        this.nullMucStates();
-        this.deleteStatusCodes();
-    }
-
-    @Insert
-    protected abstract void insertStatusCode(final Collection<MucStatusCodeEntity> entities);
-
-    @Query("UPDATE chat SET mucState=null,errorCondition=null")
-    protected abstract void nullMucStates();
-
-    @Query("DELETE FROM muc_status_code")
-    protected abstract void deleteStatusCodes();
-
-    @Query("DELETE FROM muc_status_code WHERE chatId=:chatId")
-    protected abstract void deleteStatusCodes(final long chatId);
-
-    // TODO select vCardPhoto for c.type='MUC_PM'
-    @Transaction
-    @Query(
-            "SELECT c.id,c.accountId,c.address,c.type,m.sentAt,m.senderIdentity as"
-                + " sender,m.outgoing,m.latestVersion as"
-                + " version,m.toBare,m.toResource,m.fromBare,m.fromResource,(SELECT count(id) FROM"
-                + " message WHERE chatId=c.id) as unread,(CASE WHEN c.type = 'INDIVIDUAL' THEN"
-                + " (SELECT name FROM roster WHERE roster.accountId=c.accountId AND"
-                + " roster.address=c.address) ELSE NULL END) as rosterName,(CASE WHEN c.type ="
-                + " 'INDIVIDUAL' THEN (SELECT nick FROM nick WHERE nick.accountId=c.accountId AND"
-                + " nick.address=c.address) ELSE NULL END) as nick,(CASE WHEN c.type IN('MUC') THEN"
-                + " (SELECT name FROM roster WHERE roster.accountId=c.accountId AND"
-                + " roster.address=m.senderIdentity) ELSE NULL END) as senderRosterName,(CASE WHEN"
-                + " c.type IN ('MUC') THEN (SELECT nick FROM nick WHERE nick.accountId=c.accountId"
-                + " AND nick.address=m.senderIdentity) ELSE NULL END) as senderNick,(SELECT"
-                + " identity.name FROM disco_item JOIN disco_identity identity ON"
-                + " disco_item.discoId=identity.discoId WHERE disco_item.accountId=c.accountId AND"
-                + " disco_item.address=c.address LIMIT 1) as discoIdentityName,(SELECT name FROM"
-                + " bookmark WHERE bookmark.accountId=c.accountId AND bookmark.address=c.address)"
-                + " as bookmarkName,(CASE WHEN c.type='MUC' THEN (SELECT vCardPhoto FROM presence"
-                + " WHERE presence.accountId=c.accountId AND address=c.address AND resource='')"
-                + " WHEN c.type='INDIVIDUAL' THEN (SELECT vCardPhoto FROM presence WHERE"
-                + " accountId=c.accountId AND address=c.address AND vCardPhoto NOT NULL LIMIT 1)"
-                + " ELSE NULL END) as vCardPhoto,(SELECT thumb_id FROM avatar WHERE"
-                + " avatar.accountId=c.accountId AND avatar.address=c.address) as avatar,(CASE WHEN"
-                + " c.type IN ('MUC','MUC_PM') THEN (SELECT count(distinct(df.feature)) == 2 FROM"
-                + " disco_item di JOIN disco_feature df ON di.discoId = df.discoId WHERE"
-                + " di.address=c.address AND df.feature IN('muc_membersonly','muc_nonanonymous'))"
-                + " ELSE 0 END) as membersOnlyNonAnonymous,(CASE WHEN  m.occupantId IS NOT NULL AND"
-                + " c.type IN ('MUC','MUC_PM') THEN (SELECT resource FROM presence WHERE"
-                + " accountId=c.accountId AND address=c.address AND occupantId=m.occupantId LIMIT"
-                + " 1) ELSE NULL END) as occupantResource FROM CHAT c LEFT JOIN message m ON (m.id"
-                + " = (SELECT id FROM message WHERE chatId=c.id ORDER by receivedAt DESC LIMIT 1))"
-                + " WHERE (:accountId IS NULL OR c.accountId=:accountId) AND (:groupId IS NULL OR"
-                + " (c.address IN(SELECT roster.address FROM roster JOIN roster_group ON"
-                + " roster.id=roster_group.rosterItemId WHERE roster.accountId=c.accountId AND"
-                + " roster_group.groupId=:groupId) OR c.address IN(SELECT address FROM bookmark"
-                + " JOIN bookmark_group ON bookmark.id=bookmark_group.bookmarkId WHERE"
-                + " bookmark.accountId=c.accountId AND bookmark_group.groupId=:groupId))) AND"
-                + " c.archived=0 ORDER by m.receivedAt DESC")
-    public abstract PagingSource<Integer, ChatOverviewItem> getChatOverview(
-            final Long accountId, final Long groupId);
-
-    @Query(
-            "SELECT c.accountId,c.address,c.type,(SELECT name FROM roster WHERE"
-                + " roster.accountId=c.accountId AND roster.address=c.address) as"
-                + " rosterName,(SELECT nick FROM nick WHERE nick.accountId=c.accountId AND"
-                + " nick.address=c.address) as nick,(SELECT identity.name FROM disco_item JOIN"
-                + " disco_identity identity ON disco_item.discoId=identity.discoId WHERE"
-                + " disco_item.accountId=c.accountId AND disco_item.address=c.address LIMIT 1) as"
-                + " discoIdentityName,(SELECT name FROM bookmark WHERE"
-                + " bookmark.accountId=c.accountId AND bookmark.address=c.address) as"
-                + " bookmarkName,(CASE WHEN c.type IN ('MUC','MUC_PM') THEN (SELECT"
-                + " count(distinct(df.feature)) == 2 FROM disco_item di JOIN disco_feature df ON"
-                + " di.discoId = df.discoId WHERE di.address=c.address AND df.feature"
-                + " IN('muc_membersonly','muc_nonanonymous')) ELSE 0 END) as"
-                + " membersOnlyNonAnonymous FROM chat c WHERE c.id=:chatId")
-    public abstract LiveData<ChatInfo> getChatInfo(final long chatId);
-
-    public PagingSource<Integer, ChatOverviewItem> getChatOverview(final ChatFilter chatFilter) {
-        if (chatFilter instanceof AccountIdentifier account) {
-            return getChatOverview(account.id, null);
-        } else if (chatFilter instanceof GroupIdentifier group) {
-            return getChatOverview(null, group.id);
-        } else {
-            return getChatOverview(null, null);
-        }
-    }
-}

app/src/main/java/im/conversations/android/database/dao/DiscoDao.java

@@ -1,238 +0,0 @@
-package im.conversations.android.database.dao;
-
-import androidx.annotation.Nullable;
-import androidx.room.Dao;
-import androidx.room.Insert;
-import androidx.room.OnConflictStrategy;
-import androidx.room.Query;
-import androidx.room.Transaction;
-import com.google.common.base.Strings;
-import com.google.common.collect.Collections2;
-import com.google.common.util.concurrent.ListenableFuture;
-import im.conversations.android.database.entity.DiscoEntity;
-import im.conversations.android.database.entity.DiscoExtensionEntity;
-import im.conversations.android.database.entity.DiscoExtensionFieldEntity;
-import im.conversations.android.database.entity.DiscoExtensionFieldValueEntity;
-import im.conversations.android.database.entity.DiscoFeatureEntity;
-import im.conversations.android.database.entity.DiscoIdentityEntity;
-import im.conversations.android.database.entity.DiscoItemEntity;
-import im.conversations.android.database.model.Account;
-import im.conversations.android.database.model.DiscoItemWithExtension;
-import im.conversations.android.xmpp.Entity;
-import im.conversations.android.xmpp.EntityCapabilities;
-import im.conversations.android.xmpp.EntityCapabilities2;
-import im.conversations.android.xmpp.model.data.Data;
-import im.conversations.android.xmpp.model.data.Value;
-import im.conversations.android.xmpp.model.disco.info.InfoQuery;
-import im.conversations.android.xmpp.model.disco.items.Item;
-import java.util.Collection;
-import java.util.List;
-import org.jxmpp.jid.BareJid;
-import org.jxmpp.jid.DomainBareJid;
-import org.jxmpp.jid.Jid;
-import org.jxmpp.jid.parts.Resourcepart;
-
-@Dao
-public abstract class DiscoDao extends BaseDao {
-
-    @Insert(onConflict = OnConflictStrategy.IGNORE)
-    protected abstract void insertDiscoItems(Collection<DiscoItemEntity> items);
-
-    @Insert
-    protected abstract void insert(DiscoItemEntity item);
-
-    @Insert
-    protected abstract void insertDiscoIdentities(Collection<DiscoIdentityEntity> identities);
-
-    @Insert
-    protected abstract void insertDiscoFeatures(Collection<DiscoFeatureEntity> features);
-
-    @Query(
-            "DELETE FROM disco_item WHERE accountId=:account AND parentAddress=:parent AND"
-                    + " parentNode=:parentNode AND address NOT IN(:existent)")
-    protected abstract void deleteNonExistentDiscoItems(
-            final long account,
-            final Jid parent,
-            final String parentNode,
-            final Collection<Jid> existent);
-
-    @Query(
-            "UPDATE presence SET discoId=:discoId WHERE accountId=:account AND address=:address"
-                    + " AND resource=:resource")
-    protected abstract void updateDiscoIdInPresence(
-            long account, Jid address, Resourcepart resource, long discoId);
-
-    @Query(
-            "UPDATE disco_item SET discoId=:discoId WHERE accountId=:account AND address=:address"
-                    + " AND node=:node")
-    protected abstract int updateDiscoIdInDiscoItem(
-            long account, Jid address, String node, long discoId);
-
-    @Insert
-    protected abstract void insertDiscoFieldValues(
-            Collection<DiscoExtensionFieldValueEntity> value);
-
-    @Insert
-    protected abstract long insert(DiscoEntity entity);
-
-    @Insert
-    protected abstract long insert(DiscoExtensionEntity entity);
-
-    @Insert
-    protected abstract long insert(DiscoExtensionFieldEntity entity);
-
-    @Transaction
-    public void set(
-            final Account account,
-            final Entity.DiscoItem parent,
-            final String parentNode,
-            final Collection<Item> items) {
-        final var entities =
-                Collections2.transform(
-                        items, i -> DiscoItemEntity.of(account.id, parent.address, parentNode, i));
-        insertDiscoItems(entities);
-        deleteNonExistentDiscoItems(
-                account.id,
-                parent.address,
-                Strings.nullToEmpty(parentNode),
-                Collections2.transform(items, Item::getJid));
-    }
-
-    @Transaction
-    public boolean set(
-            final Account account,
-            final Entity entity,
-            @Nullable final String node,
-            final EntityCapabilities.Hash capsHash) {
-        final Long existingDiscoId;
-        if (capsHash instanceof EntityCapabilities2.EntityCaps2Hash) {
-            existingDiscoId = getDiscoId(account.id, capsHash.hash);
-        } else if (capsHash instanceof EntityCapabilities.EntityCapsHash) {
-            existingDiscoId = getDiscoIdByCapsHash(account.id, capsHash.hash);
-        } else {
-            existingDiscoId = null;
-        }
-        if (existingDiscoId == null) {
-            return false;
-        }
-        updateDiscoId(account.id, entity, node, existingDiscoId);
-        return true;
-    }
-
-    protected void updateDiscoId(
-            final long account,
-            final Entity entity,
-            @Nullable final String node,
-            final long discoId) {
-        if (entity instanceof Entity.DiscoItem) {
-            if (updateDiscoIdInDiscoItem(
-                            account, entity.address, Strings.nullToEmpty(node), discoId)
-                    > 0) {
-                return;
-            }
-            insert(DiscoItemEntity.of(account, entity.address, node, discoId));
-        } else if (entity instanceof Entity.Presence) {
-            updateDiscoIdInPresence(
-                    account,
-                    entity.address.asBareJid(),
-                    entity.address.getResourceOrEmpty(),
-                    discoId);
-        }
-    }
-
-    @Transaction
-    public void set(
-            final Account account,
-            final Entity entity,
-            final String node,
-            final byte[] capsHash,
-            final byte[] caps2HashSha256,
-            final InfoQuery infoQuery,
-            final boolean cache) {
-
-        final Long existingDiscoId = getDiscoId(account.id, caps2HashSha256);
-        if (existingDiscoId != null) {
-            updateDiscoId(account.id, entity, node, existingDiscoId);
-            return;
-        }
-        final long discoId = insert(DiscoEntity.of(account.id, capsHash, caps2HashSha256, cache));
-
-        insertDiscoIdentities(
-                Collections2.transform(
-                        infoQuery.getIdentities(), i -> DiscoIdentityEntity.of(discoId, i)));
-
-        insertDiscoFeatures(
-                Collections2.transform(
-                        infoQuery.getFeatures(), f -> DiscoFeatureEntity.of(discoId, f.getVar())));
-        for (final Data data : infoQuery.getExtensions(Data.class)) {
-            final var extensionId = insert(DiscoExtensionEntity.of(discoId, data.getFormType()));
-            for (final var field : data.getFields()) {
-                final var fieldId =
-                        insert(DiscoExtensionFieldEntity.of(extensionId, field.getFieldName()));
-                insertDiscoFieldValues(
-                        Collections2.transform(
-                                field.getExtensions(Value.class),
-                                v -> DiscoExtensionFieldValueEntity.of(fieldId, v.getContent())));
-            }
-        }
-        updateDiscoId(account.id, entity, node, discoId);
-    }
-
-    @Query(
-            "DELETE FROM disco WHERE accountId=:account AND cache=0 AND id NOT IN(SELECT discoId"
-                    + " FROM presence WHERE discoId IS NOT NULL) AND id NOT IN(SELECT discoId FROM"
-                    + " disco_item WHERE discoId IS NOT NULL)")
-    public abstract void deleteUnused(long account);
-
-    @Query("SELECT id FROM disco WHERE accountId=:accountId AND caps2HashSha256=:caps2HashSha256")
-    protected abstract Long getDiscoId(final long accountId, final byte[] caps2HashSha256);
-
-    @Query("SELECT id FROM disco WHERE accountId=:accountId AND capsHash=:capsHash")
-    protected abstract Long getDiscoIdByCapsHash(final long accountId, final byte[] capsHash);
-
-    @Query(
-            "SELECT EXISTS (SELECT presence.id FROM presence JOIN disco_feature on"
-                    + " presence.discoId=disco_feature.discoId WHERE accountId=:account AND"
-                    + " address=:address AND resource=:resource AND feature=:feature)")
-    protected abstract boolean hasPresenceFeature(
-            final long account,
-            final BareJid address,
-            final Resourcepart resource,
-            final String feature);
-
-    @Query(
-            "SELECT count(presence.id) FROM presence JOIN disco_feature on"
-                    + " presence.discoId=disco_feature.discoId WHERE accountId=:account AND"
-                    + " address=:address AND feature=:feature")
-    public abstract int countPresencesWithFeature(
-            final long account, final BareJid address, final String feature);
-
-    public int countPresencesWithFeature(final Account account, final String feature) {
-        return countPresencesWithFeature(account.id, account.address, feature);
-    }
-
-    public boolean hasFeature(final long account, final Entity entity, final String feature) {
-        if (entity instanceof Entity.DiscoItem) {
-            return hasDiscoItemFeature(account, entity.address, feature);
-        }
-        if (entity instanceof Entity.Presence) {
-            return hasPresenceFeature(
-                    account,
-                    entity.address.asBareJid(),
-                    entity.address.getResourceOrEmpty(),
-                    feature);
-        }
-        throw new IllegalStateException(
-                String.format(
-                        "Discovering features for %s is not implemented",
-                        entity.getClass().getName()));
-    }
-
-    @Transaction
-    @Query(
-            "SELECT disco_item.discoId,address FROM disco_item JOIN disco_feature ON"
-                    + " disco_item.discoId=disco_feature.discoId WHERE feature=:feature AND"
-                    + " (address=:address OR parentAddress=:address)")
-    public abstract ListenableFuture<List<DiscoItemWithExtension>> getItemByFeature(
-            DomainBareJid address, final String feature);
-}

app/src/main/java/im/conversations/android/database/dao/GroupDao.java

@@ -1,27 +0,0 @@
-package im.conversations.android.database.dao;
-
-import androidx.room.Insert;
-import androidx.room.Query;
-import im.conversations.android.database.entity.GroupEntity;
-
-public abstract class GroupDao {
-
-    public long getOrCreateId(final String name) {
-        final Long existing = getGroupId(name);
-        if (existing != null) {
-            return existing;
-        }
-        return insert(GroupEntity.of(name));
-    }
-
-    @Query("SELECT id FROM `group` WHERE name=:name")
-    abstract Long getGroupId(final String name);
-
-    @Insert
-    abstract Long insert(GroupEntity groupEntity);
-
-    @Query(
-            "DELETE from `group` WHERE id NOT IN(SELECT groupId FROM roster_group) AND id NOT"
-                    + " IN(SELECT groupId FROM bookmark_group)")
-    abstract void deleteEmptyGroups();
-}

app/src/main/java/im/conversations/android/database/dao/MessageDao.java

@@ -1,546 +0,0 @@
-package im.conversations.android.database.dao;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.VisibleForTesting;
-import androidx.paging.PagingSource;
-import androidx.room.Dao;
-import androidx.room.Insert;
-import androidx.room.Query;
-import androidx.room.Transaction;
-import androidx.room.Update;
-import com.google.common.base.Preconditions;
-import com.google.common.collect.Collections2;
-import com.google.common.collect.Lists;
-import com.google.common.util.concurrent.ListenableFuture;
-import im.conversations.android.database.entity.MessageContentEntity;
-import im.conversations.android.database.entity.MessageEntity;
-import im.conversations.android.database.entity.MessageReactionEntity;
-import im.conversations.android.database.entity.MessageStateEntity;
-import im.conversations.android.database.entity.MessageVersionEntity;
-import im.conversations.android.database.model.Account;
-import im.conversations.android.database.model.ChatIdentifier;
-import im.conversations.android.database.model.Encryption;
-import im.conversations.android.database.model.MessageIdentifier;
-import im.conversations.android.database.model.MessageState;
-import im.conversations.android.database.model.MessageWithContentReactions;
-import im.conversations.android.database.model.Modification;
-import im.conversations.android.transformer.MessageContentWrapper;
-import im.conversations.android.transformer.MessageTransformation;
-import im.conversations.android.xmpp.model.fallback.Body;
-import im.conversations.android.xmpp.model.reactions.Reactions;
-import im.conversations.android.xmpp.model.stanza.Message;
-import java.util.Collection;
-import java.util.List;
-import org.jxmpp.jid.BareJid;
-import org.jxmpp.jid.Jid;
-import org.jxmpp.jid.parts.Resourcepart;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.whispersystems.libsignal.IdentityKey;
-
-@Dao
-public abstract class MessageDao {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(MessageDao.class);
-
-    @Query(
-            "UPDATE message SET acknowledged=1 WHERE messageId=:messageId AND toBare=:toBare AND"
-                + " toResource=NULL AND chatId IN (SELECT id FROM chat WHERE accountId=:account)")
-    abstract int acknowledge(long account, String messageId, final BareJid toBare);
-
-    @Query(
-            "UPDATE message SET acknowledged=1 WHERE messageId=:messageId AND toBare=:toBare AND"
-                    + " toResource=:toResource AND chatId IN (SELECT id FROM chat WHERE"
-                    + " accountId=:account)")
-    abstract int acknowledge(
-            long account,
-            final String messageId,
-            final BareJid toBare,
-            final Resourcepart toResource);
-
-    public boolean acknowledge(
-            final Account account, @NonNull final String messageId, @NonNull final Jid to) {
-        return acknowledge(account.id, messageId, to);
-    }
-
-    public boolean acknowledge(
-            final long account, @NonNull final String messageId, @NonNull final Jid to) {
-        if (to.hasResource()) {
-            return acknowledge(account, messageId, to.asBareJid(), to.getResourceOrThrow()) > 0;
-        } else {
-            return acknowledge(account, messageId, to.asBareJid()) > 0;
-        }
-    }
-
-    // this method returns a MessageIdentifier (message + version) used to create ORIGINAL messages
-    // it might return something that was previously a stub (message that only has reactions or
-    // corrections but no original content). but in the process of invoking this method the stub
-    // will be upgraded to an original message (missing information filled in)
-    public MessageIdentifier getOrCreateMessage(
-            ChatIdentifier chatIdentifier, final MessageTransformation transformation) {
-        final MessageIdentifier messageIdentifier =
-                get(
-                        chatIdentifier.id,
-                        transformation.fromBare(),
-                        transformation.occupantId,
-                        transformation.stanzaId,
-                        transformation.messageId);
-        if (messageIdentifier != null) {
-            if (messageIdentifier.isStub()) {
-                if (transformation.type == Message.Type.GROUPCHAT) {
-                    mergeMessageStubs(chatIdentifier, messageIdentifier, transformation);
-                }
-                LOGGER.info(
-                        "Found stub for stanzaId '{}' and messageId '{}'",
-                        transformation.stanzaId,
-                        transformation.messageId);
-                final long originalVersionId =
-                        insert(
-                                MessageVersionEntity.of(
-                                        messageIdentifier.id,
-                                        Modification.ORIGINAL,
-                                        transformation));
-                final MessageEntity updatedEntity =
-                        MessageEntity.of(chatIdentifier.id, transformation);
-                updatedEntity.id = messageIdentifier.id;
-                updatedEntity.latestVersion = getLatestVersion(messageIdentifier.id);
-                LOGGER.info(
-                        "Created original version {} and updated latest version to {} for"
-                                + " messageEntityId {}",
-                        originalVersionId,
-                        updatedEntity.latestVersion,
-                        messageIdentifier.id);
-                update(updatedEntity);
-                return new MessageIdentifier(
-                        updatedEntity.id,
-                        transformation.stanzaId,
-                        transformation.messageId,
-                        transformation.fromBare(),
-                        originalVersionId);
-            } else {
-                throw new IllegalStateException(
-                        String.format(
-                                "A message with stanzaId '%s' and messageId '%s' from %s already"
-                                        + " exists",
-                                transformation.stanzaId,
-                                transformation.messageId,
-                                transformation.from));
-            }
-        }
-        final MessageEntity entity = MessageEntity.of(chatIdentifier.id, transformation);
-        final long messageEntityId = insert(entity);
-        final long messageVersionId =
-                insert(
-                        MessageVersionEntity.of(
-                                messageEntityId, Modification.ORIGINAL, transformation));
-        setLatestMessageId(messageEntityId, messageVersionId);
-        return new MessageIdentifier(
-                messageEntityId,
-                transformation.stanzaId,
-                transformation.messageId,
-                transformation.fromBare(),
-                messageVersionId);
-    }
-
-    private void mergeMessageStubs(
-            ChatIdentifier chatIdentifier,
-            MessageIdentifier messageIdentifier,
-            final MessageTransformation transformation) {
-        final Long stub;
-        if (messageIdentifier.messageId == null && transformation.messageId != null) {
-            stub = getMessageStubByMessageId(chatIdentifier.id, transformation.messageId);
-        } else if (messageIdentifier.stanzaId == null && transformation.stanzaId != null) {
-            stub = getMessageStubByStanzaId(chatIdentifier.id, transformation.stanzaId);
-        } else {
-            return;
-        }
-        if (stub == null) {
-            return;
-        }
-        LOGGER.info("Updating message.id in dangling stub {} => {}", stub, messageIdentifier.id);
-        updateMessageEntityIdInReactions(stub, messageIdentifier.id);
-        updateMessageEntityIdInVersions(stub, messageIdentifier.id);
-        deleteMessageEntity(stub);
-    }
-
-    @Query(
-            "UPDATE message_reaction SET messageEntityId=:newMessageEntityId WHERE"
-                    + " messageEntityId=:oldMessageEntityId")
-    protected abstract void updateMessageEntityIdInReactions(
-            long oldMessageEntityId, Long newMessageEntityId);
-
-    @Query(
-            "UPDATE message_version SET messageEntityId=:newMessageEntityId WHERE"
-                    + " messageEntityId=:oldMessageEntityId")
-    protected abstract void updateMessageEntityIdInVersions(
-            long oldMessageEntityId, Long newMessageEntityId);
-
-    @Query("DELETE FROM message WHERE id=:messageEntityId")
-    protected abstract void deleteMessageEntity(final long messageEntityId);
-
-    @Query(
-            "SELECT id FROM message WHERE chatId=:chatId AND messageId=:messageId AND stanzaId IS"
-                    + " NULL AND latestVersion IS NULL")
-    protected abstract Long getMessageStubByMessageId(long chatId, String messageId);
-
-    @Query(
-            "SELECT id FROM message WHERE chatId=:chatId AND stanzaId=:stanzaId AND messageId IS"
-                    + " NULL AND latestVersion IS NULL")
-    protected abstract Long getMessageStubByStanzaId(long chatId, String stanzaId);
-
-    // this gets either a message or a stub.
-    // stubs are recognized by latestVersion=NULL
-    // when found by stanzaId the stanzaId must either by verified or belonging to a stub
-    // when found by messageId the from must either match (for corrections) or not be set (null) and
-    // we only look up stubs
-    // TODO `senderIdentity` should probably match too
-    @Query(
-            "SELECT id,stanzaId,messageId,fromBare,latestVersion as version FROM message WHERE"
-                + " chatId=:chatId AND (fromBare=:fromBare OR fromBare IS NULL) AND"
-                + " (occupantId=:occupantId OR occupantId IS NULL) AND ((stanzaId IS NOT NULL AND"
-                + " stanzaId=:stanzaId AND (stanzaIdVerified=1 OR latestVersion IS NULL)) OR"
-                + " (stanzaId IS NULL AND messageId=:messageId AND latestVersion IS NULL))")
-    abstract MessageIdentifier get(
-            long chatId, BareJid fromBare, String occupantId, String stanzaId, String messageId);
-
-    public MessageIdentifier getOrCreateVersion(
-            ChatIdentifier chat,
-            MessageTransformation transformation,
-            final String messageId,
-            final Modification modification) {
-        Preconditions.checkArgument(
-                messageId != null, "A modification must reference a message id");
-        final MessageIdentifier messageIdentifier;
-        if (transformation.type == Message.Type.GROUPCHAT) {
-            // TODO if modification == moderation do not take occupant Id into account
-            Preconditions.checkNotNull(
-                    transformation.occupantId,
-                    "To create a version of a group chat message occupant id must be set");
-            messageIdentifier =
-                    getByOccupantIdAndMessageId(
-                            chat.id,
-                            transformation.fromBare(),
-                            transformation.occupantId,
-                            messageId);
-        } else {
-            messageIdentifier = getByMessageId(chat.id, transformation.fromBare(), messageId);
-        }
-        if (messageIdentifier == null) {
-            LOGGER.info(
-                    "Create stub for {} because we could not find anything with id {} from {}",
-                    modification,
-                    messageId,
-                    transformation.fromBare());
-            // TODO when creating a stub for 'moderation' we should not include occupant id and
-            // senderId in there since we don’t know who those are
-            final var messageEntity = MessageEntity.stub(chat.id, messageId, transformation);
-            final long messageEntityId = insert(messageEntity);
-            final long messageVersionId =
-                    insert(MessageVersionEntity.of(messageEntityId, modification, transformation));
-            // we do not point latestVersion to this newly created versions. We've only created a
-            // stub and are waiting for the original message to arrive
-            return new MessageIdentifier(
-                    messageEntityId, null, null, transformation.fromBare(), messageVersionId);
-        }
-        if (hasVersionWithMessageId(messageIdentifier.id, transformation.messageId)) {
-            throw new IllegalStateException(
-                    String.format(
-                            "A modification with messageId %s has already been applied",
-                            messageId));
-        }
-        final long messageVersionId =
-                insert(MessageVersionEntity.of(messageIdentifier.id, modification, transformation));
-        if (messageIdentifier.version != null) {
-            // if the existing message was not a stub we retarget the version
-            final long latestVersion = getLatestVersion(messageIdentifier.id);
-            setLatestMessageId(messageIdentifier.id, latestVersion);
-        }
-        return new MessageIdentifier(
-                messageIdentifier.id,
-                messageIdentifier.stanzaId,
-                messageIdentifier.messageId,
-                messageIdentifier.fromBare,
-                messageVersionId);
-    }
-
-    @Query(
-            "SELECT id,stanzaId,messageId,fromBare,latestVersion as version FROM message WHERE"
-                    + " chatId=:chatId AND (fromBare=:fromBare OR fromBare IS NULL) AND"
-                    + " (occupantId=:occupantId OR occupantId IS NULL) AND messageId=:messageId")
-    abstract MessageIdentifier getByOccupantIdAndMessageId(
-            long chatId, BareJid fromBare, String occupantId, String messageId);
-
-    @Query(
-            "SELECT id,stanzaId,messageId,fromBare,latestVersion as version FROM message WHERE"
-                    + " chatId=:chatId AND (fromBare=:fromBare OR fromBare IS NULL) AND"
-                    + " messageId=:messageId")
-    abstract MessageIdentifier getByMessageId(long chatId, BareJid fromBare, String messageId);
-
-    @Query(
-            "SELECT id FROM message_version WHERE messageEntityId=:messageEntityId ORDER BY (CASE"
-                    + " modification WHEN 'ORIGINAL' THEN 1 ELSE 0 END),receivedAt DESC LIMIT 1")
-    abstract Long getLatestVersion(long messageEntityId);
-
-    @Query(
-            "SELECT EXISTS (SELECT id FROM message_version WHERE messageEntityId=:messageEntityId"
-                    + " AND messageId=:messageId)")
-    abstract boolean hasVersionWithMessageId(long messageEntityId, String messageId);
-
-    @Insert
-    protected abstract long insert(MessageEntity messageEntity);
-
-    @Update
-    protected abstract void update(final MessageEntity messageEntity);
-
-    @Insert
-    protected abstract long insert(MessageVersionEntity messageVersionEntity);
-
-    @Query("UPDATE message SET latestVersion=:messageVersionId WHERE id=:messageEntityId")
-    protected abstract void setLatestMessageId(
-            final long messageEntityId, final long messageVersionId);
-
-    public MessageIdentifier getOrCreateStub(
-            final ChatIdentifier chat, final Message.Type messageType, final String parentId) {
-        final MessageIdentifier existing;
-        if (messageType == Message.Type.GROUPCHAT) {
-            existing = getByStanzaId(chat.id, parentId);
-        } else {
-            existing = getByMessageId(chat.id, parentId);
-        }
-        if (existing != null) {
-            return existing;
-        }
-        final MessageEntity messageEntity;
-        if (messageType == Message.Type.GROUPCHAT) {
-            LOGGER.info("Create stub for stanza id {}", parentId);
-            messageEntity = MessageEntity.stubOfStanzaId(chat.id, parentId);
-        } else {
-            LOGGER.info("Create stub for message id {}", parentId);
-            messageEntity = MessageEntity.stubOfMessageId(chat.id, parentId);
-        }
-        final long messageEntityId = insert(messageEntity);
-        return new MessageIdentifier(messageEntityId, null, null, null, null);
-    }
-
-    @Query(
-            "SELECT id,stanzaId,messageId,fromBare,latestVersion as version FROM message WHERE"
-                    + " chatId=:chatId AND messageId=:messageId")
-    protected abstract MessageIdentifier getByMessageId(final long chatId, final String messageId);
-
-    @Query(
-            "SELECT id,stanzaId,messageId,fromBare,latestVersion as version FROM message WHERE"
-                    + " chatId=:chatId AND stanzaId=:stanzaId")
-    protected abstract MessageIdentifier getByStanzaId(final long chatId, final String stanzaId);
-
-    public void insertMessageContent(
-            final Long latestVersion, final MessageContentWrapper messageContentWrapper) {
-        Preconditions.checkNotNull(
-                latestVersion, "Contents can only be inserted for a specific version");
-        Preconditions.checkArgument(
-                messageContentWrapper.contents.size() > 0,
-                "If you are trying to insert empty contents something went wrong");
-        insertMessageContent(
-                Lists.transform(
-                        messageContentWrapper.contents,
-                        c -> MessageContentEntity.of(latestVersion, c)));
-        final int rows =
-                updateMessageVersionEncryption(
-                        latestVersion,
-                        messageContentWrapper.encryption,
-                        messageContentWrapper.identityKey);
-        if (rows != 1) {
-            throw new IllegalStateException(
-                    "We expected to update encryption information on exactly 1 row");
-        }
-    }
-
-    @Insert
-    protected abstract void insertMessageContent(Collection<MessageContentEntity> contentEntities);
-
-    @Query(
-            "UPDATE message_version SET encryption=:encryption,identityKey=:identityKey WHERE"
-                    + " id=:messageVersionId")
-    protected abstract int updateMessageVersionEncryption(
-            long messageVersionId, Encryption encryption, IdentityKey identityKey);
-
-    public void insertMessageState(
-            ChatIdentifier chatIdentifier,
-            final String messageId,
-            final MessageState messageState) {
-        final Long versionId = getVersionIdForOutgoingMessage(chatIdentifier.id, messageId);
-        if (versionId == null) {
-            LOGGER.warn(
-                    "Can not find message {} in chat {} ({})",
-                    messageId,
-                    chatIdentifier.id,
-                    chatIdentifier.address);
-            return;
-        }
-        insert(MessageStateEntity.of(versionId, messageState));
-    }
-
-    @Query(
-            "SELECT message_version.id FROM message_version JOIN message ON"
-                    + " message.id=message_version.messageEntityId WHERE message.chatId=:chatId AND"
-                    + " message_version.messageId=:messageId AND message.outgoing=1")
-    protected abstract Long getVersionIdForOutgoingMessage(long chatId, final String messageId);
-
-    @Insert
-    protected abstract void insert(MessageStateEntity messageStateEntity);
-
-    @Insert
-    protected abstract void insertReactions(Collection<MessageReactionEntity> reactionEntities);
-
-    public void insertReactions(
-            ChatIdentifier chat, Reactions reactions, MessageTransformation transformation) {
-        final Message.Type messageType = transformation.type;
-        final MessageIdentifier messageIdentifier =
-                getOrCreateStub(chat, messageType, reactions.getId());
-        if (messageType == Message.Type.GROUPCHAT) {
-            Preconditions.checkNotNull(
-                    transformation.occupantId,
-                    "OccupantId must not be null when processing reactions in group chats");
-            deleteReactionsByOccupantId(messageIdentifier.id, transformation.occupantId);
-        } else {
-            deleteReactionsByFromBare(messageIdentifier.id, transformation.fromBare());
-        }
-        LOGGER.info(
-                "Inserting reaction from {} to messageEntityId {}",
-                transformation.from,
-                messageIdentifier.id);
-        insertReactions(
-                Collections2.transform(
-                        reactions.getReactions(),
-                        r -> MessageReactionEntity.of(messageIdentifier.id, r, transformation)));
-    }
-
-    @Query(
-            "DELETE FROM message_reaction WHERE messageEntityId=:messageEntityId AND"
-                    + " occupantId=:occupantId")
-    protected abstract void deleteReactionsByOccupantId(long messageEntityId, String occupantId);
-
-    @Query(
-            "DELETE FROM message_reaction WHERE messageEntityId=:messageEntityId AND"
-                    + " reactionBy=:fromBare")
-    protected abstract void deleteReactionsByFromBare(long messageEntityId, BareJid fromBare);
-
-    @VisibleForTesting
-    @Transaction
-    @Query(
-            "SELECT c.accountId,m.id as id,type as"
-                + " chatType,sentAt,outgoing,toBare,toResource,fromBare,fromResource,acknowledged,senderIdentity"
-                + " as sender,(SELECT name FROM roster WHERE roster.accountId=c.accountId AND"
-                + " roster.address=m.senderIdentity) as senderRosterName,(SELECT nick FROM nick"
-                + " WHERE nick.accountId=c.accountId AND nick.address=m.senderIdentity) as"
-                + " senderNick,(SELECT vCardPhoto FROM presence WHERE accountId=c.accountId AND"
-                + " address=m.senderIdentity AND vCardPhoto NOT NULL LIMIT 1) as"
-                + " senderVcardPhoto,(SELECT thumb_id FROM avatar WHERE"
-                + " avatar.accountId=c.accountId AND avatar.address=m.senderIdentity) as"
-                + " senderAvatar,(CASE WHEN m.occupantId IS NOT NULL AND c.type IN ('MUC','MUC_PM')"
-                + " THEN (SELECT vCardPhoto FROM presence WHERE accountId=c.accountId AND"
-                + " address=c.address AND occupantId=m.occupantId AND vCardPhoto NOT NULL LIMIT 1)"
-                + " ELSE NULL END) as occupantVcardPhoto,(CASE WHEN  m.occupantId IS NOT NULL AND"
-                + " c.type IN ('MUC','MUC_PM') THEN (SELECT resource FROM presence WHERE"
-                + " accountId=c.accountId AND address=c.address AND occupantId=m.occupantId LIMIT"
-                + " 1) ELSE NULL END) as occupantResource,modification,latestVersion as"
-                + " version,inReplyToMessageEntityId,inReplyToFallbackStart,inReplyToFallbackEnd,encryption,message_version.identityKey,trust,(CASE"
-                + " WHEN c.type IN ('MUC','MUC_PM') THEN (SELECT count(distinct(df.feature)) == 2"
-                + " FROM disco_item di JOIN disco_feature df ON di.discoId = df.discoId WHERE"
-                + " di.address=c.address AND df.feature IN('muc_membersonly','muc_nonanonymous'))"
-                + " ELSE 0 END) as membersOnlyNonAnonymous FROM chat c JOIN message m on"
-                + " m.chatId=c.id JOIN message_version ON m.latestVersion=message_version.id LEFT"
-                + " JOIN axolotl_identity ON c.accountId=axolotl_identity.accountId AND"
-                + " m.senderIdentity=axolotl_identity.address AND"
-                + " message_version.identityKey=axolotl_identity.identityKey WHERE c.id=:chatId AND"
-                + " latestVersion IS NOT NULL ORDER BY m.receivedAt")
-    public abstract List<MessageWithContentReactions> getMessagesForTesting(long chatId);
-
-    @Transaction
-    @Query(
-            "SELECT c.accountId,m.id as id,type as"
-                + " chatType,sentAt,outgoing,toBare,toResource,fromBare,fromResource,acknowledged,senderIdentity"
-                + " as sender,(SELECT name FROM roster WHERE roster.accountId=c.accountId AND"
-                + " roster.address=m.senderIdentity) as senderRosterName,(SELECT nick FROM nick"
-                + " WHERE nick.accountId=c.accountId AND nick.address=m.senderIdentity) as"
-                + " senderNick,(SELECT vCardPhoto FROM presence WHERE accountId=c.accountId AND"
-                + " address=m.senderIdentity AND vCardPhoto NOT NULL LIMIT 1) as"
-                + " senderVcardPhoto,(SELECT thumb_id FROM avatar WHERE"
-                + " avatar.accountId=c.accountId AND avatar.address=m.senderIdentity) as"
-                + " senderAvatar,(CASE WHEN m.occupantId IS NOT NULL AND c.type IN ('MUC','MUC_PM')"
-                + " THEN (SELECT vCardPhoto FROM presence WHERE accountId=c.accountId AND"
-                + " address=c.address AND occupantId=m.occupantId AND vCardPhoto NOT NULL LIMIT 1)"
-                + " ELSE NULL END) as occupantVcardPhoto,(CASE WHEN  m.occupantId IS NOT NULL AND"
-                + " c.type IN ('MUC','MUC_PM') THEN (SELECT resource FROM presence WHERE"
-                + " accountId=c.accountId AND address=c.address AND occupantId=m.occupantId LIMIT"
-                + " 1) ELSE NULL END) as occupantResource,modification,latestVersion as"
-                + " version,inReplyToMessageEntityId,inReplyToFallbackStart,inReplyToFallbackEnd,encryption,message_version.identityKey,trust,(CASE"
-                + " WHEN c.type IN ('MUC','MUC_PM') THEN (SELECT count(distinct(df.feature)) == 2"
-                + " FROM disco_item di JOIN disco_feature df ON di.discoId = df.discoId WHERE"
-                + " di.address=c.address AND df.feature IN('muc_membersonly','muc_nonanonymous'))"
-                + " ELSE 0 END) as membersOnlyNonAnonymous FROM chat c JOIN message m on"
-                + " m.chatId=c.id JOIN message_version ON m.latestVersion=message_version.id LEFT"
-                + " JOIN axolotl_identity ON c.accountId=axolotl_identity.accountId AND"
-                + " m.senderIdentity=axolotl_identity.address AND"
-                + " message_version.identityKey=axolotl_identity.identityKey WHERE c.id=:chatId AND"
-                + " latestVersion IS NOT NULL ORDER BY m.receivedAt DESC,m.id DESC")
-    public abstract PagingSource<Integer, MessageWithContentReactions> getMessages(long chatId);
-
-    @Query(
-            "SELECT CASE WHEN (SELECT EXISTS(SELECT id FROM message WHERE chatId=:chatId AND"
-                + " id=:messageId)) THEN (SELECT count(id) FROM message WHERE chatId=:chatId AND"
-                + " (receivedAt > (SELECT receivedAt FROM message WHERE id=:messageId) OR"
-                + " (receivedAt=(SELECT receivedAt FROM message WHERE id=:messageId) AND id >"
-                + " :messageId))) ELSE NULL END")
-    public abstract ListenableFuture<Integer> getPosition(final long chatId, final long messageId);
-
-    public void setInReplyTo(
-            final ChatIdentifier chat,
-            final MessageIdentifier messageIdentifier,
-            final Message.Type messageType,
-            final Jid to,
-            final String inReplyTo,
-            final Body fallbackBody) {
-        if (messageType == Message.Type.GROUPCHAT) {
-            final Long messageEntityId = getMessageByStanzaId(chat.id, inReplyTo);
-            setInReplyToStanzaId(messageIdentifier.id, inReplyTo, messageEntityId);
-        } else {
-            final Long messageEntityId = getMessageByMessageId(chat.id, to.asBareJid(), inReplyTo);
-            setInReplyToMessageId(messageIdentifier.id, inReplyTo, messageEntityId);
-        }
-        final int inReplyToFallbackStart = fallbackBody == null ? 0 : fallbackBody.getStart();
-        final int inReplyToFallbackEnd = fallbackBody == null ? 0 : fallbackBody.getEnd();
-        if (inReplyToFallbackStart != 0 || inReplyToFallbackEnd != 0) {
-            setInReplyToFallback(
-                    messageIdentifier.id, inReplyToFallbackStart, inReplyToFallbackEnd);
-        }
-    }
-
-    @Query(
-            "UPDATE message SET"
-                + " inReplyToMessageId=null,inReplyToStanzaId=:stanzaId,inReplyToMessageEntityId=:inReplyToMessageEntityId"
-                + " WHERE id=:id")
-    protected abstract void setInReplyToStanzaId(
-            final long id, String stanzaId, Long inReplyToMessageEntityId);
-
-    @Query(
-            "UPDATE message SET"
-                + " inReplyToMessageId=:messageId,inReplyToStanzaId=null,inReplyToMessageEntityId=:inReplyToMessageEntityId"
-                + " WHERE id=:id")
-    protected abstract void setInReplyToMessageId(
-            final long id, String messageId, Long inReplyToMessageEntityId);
-
-    @Query(
-            "UPDATE message SET"
-                + " inReplyToFallbackStart=:inReplyToFallbackStart,inReplyToFallbackEnd=:inReplyToFallbackEnd"
-                + " WHERE id=:id")
-    protected abstract void setInReplyToFallback(
-            final long id, final int inReplyToFallbackStart, final int inReplyToFallbackEnd);
-
-    @Query(
-            "SELECT id FROM message WHERE chatId=:chatId AND fromBare=:fromBare AND"
-                    + " messageId=:messageId")
-    protected abstract Long getMessageByMessageId(long chatId, BareJid fromBare, String messageId);
-
-    @Query("SELECT id FROM message WHERE chatId=:chatId AND stanzaId=:stanzaId")
-    protected abstract Long getMessageByStanzaId(long chatId, String stanzaId);
-}

app/src/main/java/im/conversations/android/database/dao/NickDao.java

@@ -1,19 +0,0 @@
-package im.conversations.android.database.dao;
-
-import androidx.room.Dao;
-import androidx.room.Insert;
-import androidx.room.OnConflictStrategy;
-import im.conversations.android.database.entity.NickEntity;
-import im.conversations.android.database.model.Account;
-import org.jxmpp.jid.Jid;
-
-@Dao
-public abstract class NickDao {
-
-    @Insert(onConflict = OnConflictStrategy.REPLACE)
-    protected abstract long insert(NickEntity nickEntity);
-
-    public long set(final Account account, final Jid address, final String nick) {
-        return insert(NickEntity.of(account.id, address, nick));
-    }
-}

app/src/main/java/im/conversations/android/database/dao/PresenceDao.java

@@ -1,93 +0,0 @@
-package im.conversations.android.database.dao;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.room.Dao;
-import androidx.room.Insert;
-import androidx.room.OnConflictStrategy;
-import androidx.room.Query;
-import im.conversations.android.database.entity.PresenceEntity;
-import im.conversations.android.database.model.Account;
-import im.conversations.android.database.model.PresenceShow;
-import im.conversations.android.database.model.PresenceType;
-import im.conversations.android.xmpp.model.muc.user.MucUser;
-import java.util.Arrays;
-import org.jxmpp.jid.BareJid;
-import org.jxmpp.jid.Jid;
-import org.jxmpp.jid.parts.Resourcepart;
-
-@Dao
-public abstract class PresenceDao {
-
-    @Query("DELETE FROM presence WHERE accountId=:account")
-    public abstract void deletePresences(long account);
-
-    @Query("DELETE FROM presence WHERE accountId=:account AND address=:address")
-    abstract void deletePresences(long account, BareJid address);
-
-    @Query(
-            "DELETE FROM presence WHERE accountId=:account AND address=:address AND"
-                    + " resource=:resource")
-    abstract void deletePresence(long account, BareJid address, Resourcepart resource);
-
-    @Insert(onConflict = OnConflictStrategy.REPLACE)
-    abstract void insert(PresenceEntity entity);
-
-    public void set(
-            @NonNull final Account account,
-            @NonNull final BareJid address,
-            @NonNull final Resourcepart resource,
-            @Nullable final PresenceType type,
-            @Nullable final PresenceShow show,
-            @Nullable final String status,
-            @Nullable final String vCardPhoto,
-            @Nullable final String occupantId,
-            @Nullable final MucUser mucUser) {
-        if (resource.equals(Resourcepart.EMPTY)
-                && Arrays.asList(PresenceType.ERROR, PresenceType.UNAVAILABLE).contains(type)) {
-            deletePresences(account.id, address);
-        }
-        if (type == PresenceType.UNAVAILABLE) {
-            if (!resource.equals(Resourcepart.EMPTY)) {
-                deletePresence(account.id, address, resource);
-            }
-            // unavailable presence only delete previous nothing left to do
-            return;
-        }
-        final var entity =
-                PresenceEntity.of(
-                        account.id,
-                        address,
-                        resource,
-                        type,
-                        show,
-                        status,
-                        vCardPhoto,
-                        occupantId,
-                        mucUser);
-        insert(entity);
-    }
-
-    @Query(
-            "SELECT mucUserJid FROM presence WHERE accountId=:account AND address=:address AND"
-                    + " occupantId=:occupantId")
-    protected abstract Jid getMucUserJidByOccupantId(
-            long account, BareJid address, String occupantId);
-
-    @Query(
-            "SELECT mucUserJid FROM presence WHERE accountId=:account AND address=:address AND"
-                    + " resource=:resource")
-    protected abstract Jid getMucUserJidByResource(
-            long account, BareJid address, Resourcepart resource);
-
-    public BareJid getMucUserJidByOccupantId(Account account, BareJid address, String occupantId) {
-        final var jid = getMucUserJidByOccupantId(account.id, address, occupantId);
-        return jid == null ? null : jid.asBareJid();
-    }
-
-    public BareJid getMucUserJidByResource(
-            final Account account, final BareJid address, final Resourcepart resource) {
-        final var jid = getMucUserJidByResource(account.id, address, resource);
-        return jid == null ? null : jid.asBareJid();
-    }
-}

app/src/main/java/im/conversations/android/database/dao/RosterDao.java

@@ -1,83 +0,0 @@
-package im.conversations.android.database.dao;
-
-import static androidx.room.OnConflictStrategy.REPLACE;
-
-import androidx.room.Dao;
-import androidx.room.Insert;
-import androidx.room.Query;
-import androidx.room.Transaction;
-import com.google.common.base.Strings;
-import im.conversations.android.database.entity.RosterItemEntity;
-import im.conversations.android.database.entity.RosterItemGroupEntity;
-import im.conversations.android.database.model.Account;
-import im.conversations.android.xmpp.model.roster.Item;
-import java.util.Collection;
-import org.jxmpp.jid.BareJid;
-import org.jxmpp.jid.Jid;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@Dao
-public abstract class RosterDao extends GroupDao {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(RosterDao.class);
-
-    @Insert(onConflict = REPLACE)
-    protected abstract long insert(RosterItemEntity rosterItem);
-
-    @Query("DELETE FROM roster WHERE accountId=:account")
-    protected abstract void clear(final long account);
-
-    @Query("DELETE FROM roster WHERE accountId=:account AND address=:address")
-    protected abstract void delete(final long account, final Jid address);
-
-    @Query("UPDATE account SET rosterVersion=:version WHERE id=:account")
-    protected abstract void setRosterVersion(final long account, final String version);
-
-    @Query("SELECT EXISTS (SELECT id FROM roster WHERE accountId=:account AND address=:address)")
-    public abstract boolean isInRoster(final long account, final BareJid address);
-
-    @Transaction
-    public void set(
-            final Account account, final String version, final Collection<Item> rosterItems) {
-        LOGGER.info("items: " + rosterItems);
-        clear(account.id);
-        for (final Item item : rosterItems) {
-            final long id = insert(RosterItemEntity.of(account.id, item));
-            insertRosterGroups(id, item.getGroups());
-        }
-        setRosterVersion(account.id, version);
-        deleteEmptyGroups();
-    }
-
-    @Transaction
-    public void update(
-            final Account account, final String version, final Collection<Item> updates) {
-        for (final Item item : updates) {
-            final Item.Subscription subscription = item.getSubscription();
-            if (subscription == null) {
-                continue;
-            }
-            if (subscription == Item.Subscription.REMOVE) {
-                delete(account.id, item.getJid());
-            }
-            final RosterItemEntity entity = RosterItemEntity.of(account.id, item);
-            final long id = insert(entity);
-            insertRosterGroups(id, item.getGroups());
-        }
-        setRosterVersion(account.id, version);
-        deleteEmptyGroups();
-    }
-
-    protected void insertRosterGroups(final long rosterItemId, Collection<String> groups) {
-        for (final String group : groups) {
-            if (Strings.isNullOrEmpty(group)) {
-                continue;
-            }
-            insertRosterGroup(RosterItemGroupEntity.of(rosterItemId, getOrCreateId(group)));
-        }
-    }
-
-    @Insert
-    protected abstract void insertRosterGroup(RosterItemGroupEntity entity);
-}

app/src/main/java/im/conversations/android/database/dao/ServiceRecordDao.java

@@ -1,32 +0,0 @@
-package im.conversations.android.database.dao;
-
-import androidx.room.Dao;
-import androidx.room.Insert;
-import androidx.room.OnConflictStrategy;
-import androidx.room.Query;
-import im.conversations.android.database.entity.ServiceRecordCacheEntity;
-import im.conversations.android.database.model.Account;
-import im.conversations.android.dns.ServiceRecord;
-
-@Dao
-public abstract class ServiceRecordDao {
-
-    @Insert(onConflict = OnConflictStrategy.REPLACE)
-    protected abstract void insert(ServiceRecordCacheEntity entity);
-
-    public void insert(final Account account, final ServiceRecord serviceRecord) {
-        insert(
-                ServiceRecordCacheEntity.of(
-                        account, account.address.getDomain().toString(), serviceRecord));
-    }
-
-    @Query(
-            "SELECT ip,hostname,port,directTls,priority,authenticated FROM service_record_cache"
-                    + " WHERE accountId=:account AND domain=:domain LIMIT 1")
-    protected abstract ServiceRecord getCachedServiceRecord(
-            final long account, final String domain);
-
-    public ServiceRecord getCachedServiceRecord(final Account account) {
-        return getCachedServiceRecord(account.id, account.address.getDomain().toString());
-    }
-}

app/src/main/java/im/conversations/android/database/entity/AccountEntity.java

@@ -1,42 +0,0 @@
-package im.conversations.android.database.entity;
-
-import androidx.annotation.NonNull;
-import androidx.room.Embedded;
-import androidx.room.Entity;
-import androidx.room.Index;
-import androidx.room.PrimaryKey;
-import im.conversations.android.database.model.Connection;
-import im.conversations.android.database.model.Proxy;
-import org.jxmpp.jid.BareJid;
-import org.jxmpp.jid.parts.Resourcepart;
-
-@Entity(
-        tableName = "account",
-        indices = {
-            @Index(
-                    value = {"address"},
-                    unique = true)
-        })
-public class AccountEntity {
-
-    @PrimaryKey(autoGenerate = true)
-    public Long id;
-
-    @NonNull public BareJid address;
-    public Resourcepart resource;
-    public byte[] randomSeed;
-
-    public boolean enabled;
-
-    public boolean quickStartAvailable = false;
-    public boolean loginAndBind = true;
-
-    public boolean showErrorNotification = true;
-
-    public String rosterVersion;
-
-    @Embedded public Connection connection;
-
-    @Embedded(prefix = "proxy")
-    public Proxy proxy;
-}

app/src/main/java/im/conversations/android/database/entity/ArchivePageEntity.java

@@ -1,63 +0,0 @@
-package im.conversations.android.database.entity;
-
-import androidx.annotation.NonNull;
-import androidx.room.Entity;
-import androidx.room.ForeignKey;
-import androidx.room.Index;
-import androidx.room.PrimaryKey;
-import im.conversations.android.database.model.Account;
-import org.jxmpp.jid.Jid;
-
-@Entity(
-        tableName = "archive_page",
-        foreignKeys =
-                @ForeignKey(
-                        entity = AccountEntity.class,
-                        parentColumns = {"id"},
-                        childColumns = {"accountId"},
-                        onDelete = ForeignKey.CASCADE),
-        indices = {
-            @Index(
-                    value = {"accountId", "archive", "type"},
-                    unique = true)
-        })
-public class ArchivePageEntity {
-
-    @PrimaryKey(autoGenerate = true)
-    public Long id;
-
-    @NonNull public Long accountId;
-
-    @NonNull public Jid archive;
-
-    @NonNull public Type type;
-
-    @NonNull public String start;
-
-    @NonNull public String end;
-
-    public boolean reachedMaxPages;
-
-    public static ArchivePageEntity of(
-            final Account account,
-            final Jid archive,
-            final Type type,
-            final String start,
-            final String end,
-            final boolean reachedMaxPages) {
-        final var entity = new ArchivePageEntity();
-        entity.accountId = account.id;
-        entity.archive = archive;
-        entity.type = type;
-        entity.start = start;
-        entity.end = end;
-        entity.reachedMaxPages = reachedMaxPages;
-        return entity;
-    }
-
-    public enum Type {
-        START,
-        MIDDLE,
-        LIVE
-    }
-}

app/src/main/java/im/conversations/android/database/entity/AvatarAdditionalEntity.java

@@ -1,38 +0,0 @@
-package im.conversations.android.database.entity;
-
-import androidx.annotation.NonNull;
-import androidx.room.Embedded;
-import androidx.room.Entity;
-import androidx.room.ForeignKey;
-import androidx.room.Index;
-import androidx.room.PrimaryKey;
-import im.conversations.android.database.model.AvatarExternal;
-import im.conversations.android.xmpp.model.avatar.Info;
-
-@Entity(
-        tableName = "avatar_additional",
-        foreignKeys =
-                @ForeignKey(
-                        entity = AvatarEntity.class,
-                        parentColumns = {"id"},
-                        childColumns = {"avatarId"},
-                        onDelete = ForeignKey.CASCADE),
-        indices = {@Index(value = {"avatarId"})})
-public class AvatarAdditionalEntity {
-
-    @PrimaryKey(autoGenerate = true)
-    public Long id;
-
-    @NonNull public Long avatarId;
-
-    @NonNull
-    @Embedded(prefix = "avatar_external_")
-    public AvatarExternal external;
-
-    public static AvatarAdditionalEntity of(final long avatarId, Info info) {
-        final var entity = new AvatarAdditionalEntity();
-        entity.avatarId = avatarId;
-        entity.external = AvatarExternal.of(info);
-        return entity;
-    }
-}

app/src/main/java/im/conversations/android/database/entity/AvatarEntity.java

@@ -1,47 +0,0 @@
-package im.conversations.android.database.entity;
-
-import androidx.annotation.NonNull;
-import androidx.room.Embedded;
-import androidx.room.Entity;
-import androidx.room.ForeignKey;
-import androidx.room.Index;
-import androidx.room.PrimaryKey;
-import im.conversations.android.database.model.Account;
-import im.conversations.android.database.model.AvatarThumbnail;
-import im.conversations.android.xmpp.model.avatar.Info;
-import org.jxmpp.jid.BareJid;
-
-@Entity(
-        tableName = "avatar",
-        foreignKeys =
-                @ForeignKey(
-                        entity = AccountEntity.class,
-                        parentColumns = {"id"},
-                        childColumns = {"accountId"},
-                        onDelete = ForeignKey.CASCADE),
-        indices = {
-            @Index(
-                    value = {"accountId", "address"},
-                    unique = true)
-        })
-public class AvatarEntity {
-
-    @PrimaryKey(autoGenerate = true)
-    public Long id;
-
-    @NonNull public Long accountId;
-
-    @NonNull public BareJid address;
-
-    @Embedded(prefix = "thumb_")
-    @NonNull
-    public AvatarThumbnail thumbnail;
-
-    public static AvatarEntity of(final Account account, final BareJid address, final Info info) {
-        final var entity = new AvatarEntity();
-        entity.accountId = account.id;
-        entity.address = address;
-        entity.thumbnail = AvatarThumbnail.of(info);
-        return entity;
-    }
-}

app/src/main/java/im/conversations/android/database/entity/AxolotlDeviceListEntity.java

@@ -1,66 +0,0 @@
-package im.conversations.android.database.entity;
-
-import androidx.annotation.NonNull;
-import androidx.room.Entity;
-import androidx.room.ForeignKey;
-import androidx.room.Index;
-import androidx.room.PrimaryKey;
-import java.time.Instant;
-import org.jxmpp.jid.BareJid;
-
-@Entity(
-        tableName = "axolotl_device_list",
-        foreignKeys =
-                @ForeignKey(
-                        entity = AccountEntity.class,
-                        parentColumns = {"id"},
-                        childColumns = {"accountId"},
-                        onDelete = ForeignKey.CASCADE),
-        indices = {
-            @Index(
-                    value = {"accountId", "address"},
-                    unique = true)
-        })
-public class AxolotlDeviceListEntity {
-
-    @PrimaryKey(autoGenerate = true)
-    public Long id;
-
-    @NonNull public Long accountId;
-
-    @NonNull public BareJid address;
-
-    @NonNull public Instant receivedAt;
-
-    public String errorCondition;
-
-    public boolean isParsingIssue;
-
-    public static AxolotlDeviceListEntity of(long accountId, final BareJid address) {
-        final var entity = new AxolotlDeviceListEntity();
-        entity.accountId = accountId;
-        entity.address = address;
-        entity.receivedAt = Instant.now();
-        entity.isParsingIssue = false;
-        return entity;
-    }
-
-    public static AxolotlDeviceListEntity of(
-            final long accountId, final BareJid address, final String errorCondition) {
-        final var entity = new AxolotlDeviceListEntity();
-        entity.accountId = accountId;
-        entity.address = address;
-        entity.receivedAt = Instant.now();
-        entity.errorCondition = errorCondition;
-        return entity;
-    }
-
-    public static AxolotlDeviceListEntity ofParsingIssue(final long account, BareJid address) {
-        final var entity = new AxolotlDeviceListEntity();
-        entity.accountId = account;
-        entity.address = address;
-        entity.receivedAt = Instant.now();
-        entity.isParsingIssue = true;
-        return entity;
-    }
-}

app/src/main/java/im/conversations/android/database/entity/AxolotlDeviceListItemEntity.java

@@ -1,42 +0,0 @@
-package im.conversations.android.database.entity;
-
-import androidx.annotation.NonNull;
-import androidx.room.Entity;
-import androidx.room.ForeignKey;
-import androidx.room.Index;
-import androidx.room.PrimaryKey;
-
-@Entity(
-        tableName = "axolotl_device_list_item",
-        foreignKeys =
-                @ForeignKey(
-                        entity = AxolotlDeviceListEntity.class,
-                        parentColumns = {"id"},
-                        childColumns = {"deviceListId"},
-                        onDelete = ForeignKey.CASCADE),
-        indices = {
-            @Index(value = {"deviceListId"}),
-            @Index(
-                    value = {"deviceListId", "deviceId"},
-                    unique = true)
-        })
-public class AxolotlDeviceListItemEntity {
-
-    @PrimaryKey(autoGenerate = true)
-    public Long id;
-
-    @NonNull public Long deviceListId;
-
-    public Integer deviceId;
-
-    public boolean confirmedInPep;
-
-    public static AxolotlDeviceListItemEntity of(
-            final long deviceListId, final int deviceId, final boolean confirmedInPep) {
-        final var entity = new AxolotlDeviceListItemEntity();
-        entity.deviceListId = deviceListId;
-        entity.deviceId = deviceId;
-        entity.confirmedInPep = confirmedInPep;
-        return entity;
-    }
-}

app/src/main/java/im/conversations/android/database/entity/AxolotlIdentityEntity.java

@@ -1,51 +0,0 @@
-package im.conversations.android.database.entity;
-
-import androidx.annotation.NonNull;
-import androidx.room.Entity;
-import androidx.room.ForeignKey;
-import androidx.room.Index;
-import androidx.room.PrimaryKey;
-import im.conversations.android.database.model.Account;
-import im.conversations.android.database.model.Trust;
-import org.jxmpp.jid.BareJid;
-import org.whispersystems.libsignal.IdentityKey;
-
-@Entity(
-        tableName = "axolotl_identity",
-        foreignKeys =
-                @ForeignKey(
-                        entity = AccountEntity.class,
-                        parentColumns = {"id"},
-                        childColumns = {"accountId"},
-                        onDelete = ForeignKey.CASCADE),
-        indices = {
-            @Index(
-                    value = {"accountId", "address", "identityKey"},
-                    unique = true)
-        })
-public class AxolotlIdentityEntity {
-
-    @PrimaryKey(autoGenerate = true)
-    public Long id;
-
-    @NonNull public Long accountId;
-
-    @NonNull public BareJid address;
-
-    @NonNull public IdentityKey identityKey;
-
-    @NonNull public Trust trust;
-
-    public static AxolotlIdentityEntity of(
-            final Account account,
-            final BareJid address,
-            final IdentityKey identityKey,
-            final Trust trust) {
-        final var entity = new AxolotlIdentityEntity();
-        entity.accountId = account.id;
-        entity.address = address;
-        entity.identityKey = identityKey;
-        entity.trust = trust;
-        return entity;
-    }
-}

app/src/main/java/im/conversations/android/database/entity/AxolotlIdentityKeyPairEntity.java

@@ -1,40 +0,0 @@
-package im.conversations.android.database.entity;
-
-import androidx.annotation.NonNull;
-import androidx.room.Entity;
-import androidx.room.ForeignKey;
-import androidx.room.Index;
-import androidx.room.PrimaryKey;
-import im.conversations.android.database.model.Account;
-import org.whispersystems.libsignal.IdentityKeyPair;
-
-@Entity(
-        tableName = "axolotl_identity_key_pair",
-        foreignKeys =
-                @ForeignKey(
-                        entity = AccountEntity.class,
-                        parentColumns = {"id"},
-                        childColumns = {"accountId"},
-                        onDelete = ForeignKey.CASCADE),
-        indices = {
-            @Index(
-                    value = {"accountId"},
-                    unique = true)
-        })
-public class AxolotlIdentityKeyPairEntity {
-
-    @PrimaryKey(autoGenerate = true)
-    public Long id;
-
-    @NonNull public Long accountId;
-
-    @NonNull public IdentityKeyPair identityKeyPair;
-
-    public static AxolotlIdentityKeyPairEntity of(
-            final Account account, final IdentityKeyPair identityKeyPair) {
-        final var entity = new AxolotlIdentityKeyPairEntity();
-        entity.accountId = account.id;
-        entity.identityKeyPair = identityKeyPair;
-        return entity;
-    }
-}

app/src/main/java/im/conversations/android/database/entity/AxolotlPreKeyEntity.java

@@ -1,45 +0,0 @@
-package im.conversations.android.database.entity;
-
-import androidx.annotation.NonNull;
-import androidx.room.Entity;
-import androidx.room.ForeignKey;
-import androidx.room.Index;
-import androidx.room.PrimaryKey;
-import im.conversations.android.database.model.Account;
-import org.whispersystems.libsignal.state.PreKeyRecord;
-
-@Entity(
-        tableName = "axolotl_pre_key",
-        foreignKeys =
-                @ForeignKey(
-                        entity = AccountEntity.class,
-                        parentColumns = {"id"},
-                        childColumns = {"accountId"},
-                        onDelete = ForeignKey.CASCADE),
-        indices = {
-            @Index(
-                    value = {"accountId"},
-                    unique = false)
-        })
-public class AxolotlPreKeyEntity {
-
-    @PrimaryKey(autoGenerate = true)
-    public Long id;
-
-    @NonNull public Long accountId;
-
-    @NonNull public Integer preKeyId;
-
-    @NonNull public PreKeyRecord preKeyRecord;
-
-    public boolean removed = false;
-
-    public static AxolotlPreKeyEntity of(Account account, int preKeyId, PreKeyRecord preKeyRecord) {
-        final var entity = new AxolotlPreKeyEntity();
-        entity.accountId = account.id;
-        entity.preKeyId = preKeyId;
-        entity.preKeyRecord = preKeyRecord;
-        entity.removed = false;
-        return entity;
-    }
-}

app/src/main/java/im/conversations/android/database/entity/AxolotlSessionEntity.java

@@ -1,47 +0,0 @@
-package im.conversations.android.database.entity;
-
-import androidx.annotation.NonNull;
-import androidx.room.Entity;
-import androidx.room.ForeignKey;
-import androidx.room.Index;
-import androidx.room.PrimaryKey;
-import im.conversations.android.database.model.Account;
-import org.jxmpp.jid.BareJid;
-import org.whispersystems.libsignal.state.SessionRecord;
-
-@Entity(
-        tableName = "axolotl_session",
-        foreignKeys =
-                @ForeignKey(
-                        entity = AccountEntity.class,
-                        parentColumns = {"id"},
-                        childColumns = {"accountId"},
-                        onDelete = ForeignKey.CASCADE),
-        indices = {
-            @Index(
-                    value = {"accountId", "address", "deviceId"},
-                    unique = true)
-        })
-public class AxolotlSessionEntity {
-
-    @PrimaryKey(autoGenerate = true)
-    public Long id;
-
-    @NonNull public Long accountId;
-
-    @NonNull public BareJid address;
-
-    @NonNull public Integer deviceId;
-
-    @NonNull public SessionRecord sessionRecord;
-
-    public static AxolotlSessionEntity of(
-            Account account, BareJid address, int deviceId, SessionRecord record) {
-        final var entity = new AxolotlSessionEntity();
-        entity.accountId = account.id;
-        entity.address = address;
-        entity.deviceId = deviceId;
-        entity.sessionRecord = record;
-        return entity;
-    }
-}

app/src/main/java/im/conversations/android/database/entity/AxolotlSignedPreKeyEntity.java

@@ -1,46 +0,0 @@
-package im.conversations.android.database.entity;
-
-import androidx.annotation.NonNull;
-import androidx.room.Entity;
-import androidx.room.ForeignKey;
-import androidx.room.Index;
-import androidx.room.PrimaryKey;
-import im.conversations.android.database.model.Account;
-import org.whispersystems.libsignal.state.SignedPreKeyRecord;
-
-@Entity(
-        tableName = "axolotl_signed_pre_key",
-        foreignKeys =
-                @ForeignKey(
-                        entity = AccountEntity.class,
-                        parentColumns = {"id"},
-                        childColumns = {"accountId"},
-                        onDelete = ForeignKey.CASCADE),
-        indices = {
-            @Index(
-                    value = {"accountId"},
-                    unique = false)
-        })
-public class AxolotlSignedPreKeyEntity {
-
-    @PrimaryKey(autoGenerate = true)
-    public Long id;
-
-    @NonNull public Long accountId;
-
-    @NonNull public Integer signedPreKeyId;
-
-    @NonNull public SignedPreKeyRecord signedPreKeyRecord;
-
-    public boolean removed = false;
-
-    public static AxolotlSignedPreKeyEntity of(
-            Account account, int signedPreKeyId, SignedPreKeyRecord record) {
-        final var entity = new AxolotlSignedPreKeyEntity();
-        entity.accountId = account.id;
-        entity.signedPreKeyId = signedPreKeyId;
-        entity.signedPreKeyRecord = record;
-        entity.removed = false;
-        return entity;
-    }
-}

app/src/main/java/im/conversations/android/database/entity/BlockedItemEntity.java

@@ -1,38 +0,0 @@
-package im.conversations.android.database.entity;
-
-import androidx.annotation.NonNull;
-import androidx.room.Entity;
-import androidx.room.ForeignKey;
-import androidx.room.Index;
-import androidx.room.PrimaryKey;
-import org.jxmpp.jid.Jid;
-
-@Entity(
-        tableName = "blocked",
-        foreignKeys =
-                @ForeignKey(
-                        entity = AccountEntity.class,
-                        parentColumns = {"id"},
-                        childColumns = {"accountId"},
-                        onDelete = ForeignKey.CASCADE),
-        indices = {
-            @Index(
-                    value = {"accountId", "address"},
-                    unique = true)
-        })
-public class BlockedItemEntity {
-
-    @PrimaryKey(autoGenerate = true)
-    public Long id;
-
-    @NonNull public Long accountId;
-
-    @NonNull public Jid address;
-
-    public static BlockedItemEntity of(final long accountId, final Jid address) {
-        final var entity = new BlockedItemEntity();
-        entity.accountId = accountId;
-        entity.address = address;
-        return entity;
-    }
-}

app/src/main/java/im/conversations/android/database/entity/BookmarkEntity.java

@@ -1,61 +0,0 @@
-package im.conversations.android.database.entity;
-
-import androidx.annotation.NonNull;
-import androidx.room.Entity;
-import androidx.room.ForeignKey;
-import androidx.room.Index;
-import androidx.room.PrimaryKey;
-import com.google.common.base.Strings;
-import im.conversations.android.xmpp.model.bookmark.Conference;
-import im.conversations.android.xmpp.model.bookmark.Nick;
-import java.util.Map;
-import org.jxmpp.jid.Jid;
-import org.jxmpp.jid.impl.JidCreate;
-
-@Entity(
-        tableName = "bookmark",
-        foreignKeys =
-                @ForeignKey(
-                        entity = AccountEntity.class,
-                        parentColumns = {"id"},
-                        childColumns = {"accountId"},
-                        onDelete = ForeignKey.CASCADE),
-        indices = {
-            @Index(
-                    value = {"accountId", "address"},
-                    unique = true)
-        })
-public class BookmarkEntity {
-
-    @PrimaryKey(autoGenerate = true)
-    public Long id;
-
-    @NonNull public Long accountId;
-
-    @NonNull public Jid address;
-
-    public String name;
-
-    public String nick;
-
-    public boolean autoJoin;
-
-    public String password;
-
-    public static BookmarkEntity of(
-            final long accountId, final Map.Entry<String, Conference> entry) {
-        final var address = JidCreate.fromOrNull(entry.getKey());
-        final var conference = entry.getValue();
-        if (address == null) {
-            return null;
-        }
-        final Nick nick = conference.getNick();
-        final var entity = new BookmarkEntity();
-        entity.accountId = accountId;
-        entity.address = address;
-        entity.autoJoin = conference.isAutoJoin();
-        entity.name = conference.getConferenceName();
-        entity.nick = Strings.emptyToNull(nick == null ? null : nick.getContent());
-        return entity;
-    }
-}

app/src/main/java/im/conversations/android/database/entity/BookmarkGroupEntity.java

@@ -1,36 +0,0 @@
-package im.conversations.android.database.entity;
-
-import androidx.annotation.NonNull;
-import androidx.room.Entity;
-import androidx.room.ForeignKey;
-import androidx.room.Index;
-
-@Entity(
-        tableName = "bookmark_group",
-        primaryKeys = {"bookmarkId", "groupId"},
-        foreignKeys = {
-            @ForeignKey(
-                    entity = BookmarkEntity.class,
-                    parentColumns = {"id"},
-                    childColumns = {"bookmarkId"},
-                    onDelete = ForeignKey.CASCADE),
-            @ForeignKey(
-                    entity = GroupEntity.class,
-                    parentColumns = {"id"},
-                    childColumns = {"groupId"},
-                    onDelete = ForeignKey.RESTRICT),
-        },
-        indices = {@Index(value = "groupId")})
-public class BookmarkGroupEntity {
-
-    @NonNull public Long bookmarkId;
-
-    @NonNull public Long groupId;
-
-    public static BookmarkGroupEntity of(long bookmarkId, final long groupId) {
-        final var entity = new BookmarkGroupEntity();
-        entity.bookmarkId = bookmarkId;
-        entity.groupId = groupId;
-        return entity;
-    }
-}

app/src/main/java/im/conversations/android/database/entity/CertificateTrustEntity.java

@@ -1,41 +0,0 @@
-package im.conversations.android.database.entity;
-
-import androidx.annotation.NonNull;
-import androidx.room.Entity;
-import androidx.room.ForeignKey;
-import androidx.room.Index;
-import androidx.room.PrimaryKey;
-import im.conversations.android.tls.ScopeFingerprint;
-
-@Entity(
-        tableName = "certificate_trust",
-        foreignKeys =
-                @ForeignKey(
-                        entity = AccountEntity.class,
-                        parentColumns = {"id"},
-                        childColumns = {"accountId"},
-                        onDelete = ForeignKey.CASCADE),
-        indices = {
-            @Index(
-                    value = {"accountId", "scope"},
-                    unique = true)
-        })
-public class CertificateTrustEntity {
-    @PrimaryKey(autoGenerate = true)
-    public Long id;
-
-    @NonNull public Long accountId;
-
-    @NonNull public String scope;
-
-    @NonNull public byte[] fingerprint;
-
-    public static CertificateTrustEntity of(
-            final long accountId, final ScopeFingerprint scopeFingerprint) {
-        final var entity = new CertificateTrustEntity();
-        entity.accountId = accountId;
-        entity.scope = scopeFingerprint.scope;
-        entity.fingerprint = scopeFingerprint.fingerprint.array();
-        return entity;
-    }
-}