Merge remote-tracking branch 'upstream/master'

* upstream/master: (27 commits)
  show 'using account …' in incoming call screen
  show contact jid in call screen
  bump copyright year
  Add handling of status code 333
  increase default pw length
  do not build emoji flavors
  pulled translations from transifex
  add changelog
  fix ice candidate sending when different credentials are used
  remove security check that ensures rtp connection was properly finished
  code clean up
  bump agp
  store encrypted pgp files in private cache dir
  do not restart wakelock if activity is finishing
  delete pre lolipop weOwnFile()
  use try with resources. remove unused methods
  rename version suffix to playstore/free
  bump appcompat, migrate to emoji2 and get rid of emoji flavor
  fix rare npe
  store recordings and documents in their respective folders
  ...

.builds/debian-stable.yml

@@ -28,6 +28,6 @@ tasks:
     sed -ie 's/\/\/ INSERT/implementation "io.sentry:sentry-android:5.6.1"/' build.gradle
 - build: |
     cd cheogram-android
-    ./gradlew assembleCheogramFreeCompatDebug
+    ./gradlew assembleCheogramFreeDebug
 - assets: |
-    mv cheogram-android/build/outputs/apk/cheogramFreeCompat/debug/*.apk cheogram.apk
+    mv cheogram-android/build/outputs/apk/cheogramFree/debug/*.apk cheogram.apk

.github/workflows/android.yml

@@ -22,14 +22,10 @@ jobs:
       run: mkdir libs && wget -O libs/libwebrtc-m92.aar https://gultsch.de/files/libwebrtc-m92.aar
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew
-    - name: Build Quicksy (Compat)
+    - name: Build Quicksy
-      run: ./gradlew assembleQuicksyFreeCompatDebug
+      run: ./gradlew assembleQuicksyFreeDebug
-    - name: Build Quicksy (System)
+    - name: Build Conversations
-      run: ./gradlew assembleQuicksyFreeSystemDebug
+      run: ./gradlew assembleConversationsFreeDebug
-    - name: Build Conversations (Compat)
-      run: ./gradlew assembleConversationsFreeCompatDebug
-    - name: Build Conversations (System)
-      run: ./gradlew assembleConversationsFreeSystemDebug
     - uses: actions/upload-artifact@v2
       with:
         name: Conversations all-flavors (debug)

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+### Version 2.10.3
+
+* Store files in location appropriate for Android 11
+* Attempt to reconnect call after network switch
+
 ### Version 2.10.2
 
 * Fix crash when rendering some quotes

build.gradle

@@ -6,7 +6,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.1.1'
+        classpath 'com.android.tools.build:gradle:7.1.2'
     }
 }
 
@@ -38,14 +38,13 @@ def urlFile = { url, name ->
 
 configurations {
     playstoreImplementation
-    compatImplementation
+    freeImplementation
-    conversationsFreeCompatImplementation
+    conversationsFreeImplementation
-    cheogramFreeCompatImplementation
+    conversationsPlaystorImplementation
-    conversationsPlaystoreCompatImplementation
+    conversationsPlaystoreImplementation
-    conversationsPlaystoreSystemImplementation
+    quicksyPlaystoreImplementation
-    quicksyPlaystoreCompatImplementation
+    quicksyPlaystoreImplementation
-    quicksyPlaystoreSystemImplementation
+    quicksyFreeImplementation
-    quicksyFreeCompatImplementation
     quicksyImplementation
 }
 
@@ -57,22 +56,19 @@ dependencies {
         exclude group: 'com.google.firebase', module: 'firebase-analytics'
         exclude group: 'com.google.firebase', module: 'firebase-measurement-connector'
     }
-    conversationsPlaystoreCompatImplementation("com.android.installreferrer:installreferrer:2.2")
+    conversationsPlaystoreImplementation("com.android.installreferrer:installreferrer:2.2")
-    conversationsPlaystoreSystemImplementation("com.android.installreferrer:installreferrer:2.2")
+    quicksyPlaystoreImplementation 'com.google.android.gms:play-services-auth-api-phone:18.0.1'
-    quicksyPlaystoreCompatImplementation 'com.google.android.gms:play-services-auth-api-phone:18.0.1'
-    quicksyPlaystoreSystemImplementation 'com.google.android.gms:play-services-auth-api-phone:18.0.1'
     implementation 'org.sufficientlysecure:openpgp-api:10.0'
     implementation 'com.theartofdev.edmodo:android-image-cropper:2.8.0'
-    implementation 'androidx.appcompat:appcompat:1.3.1'
+    implementation 'androidx.appcompat:appcompat:1.4.1'
     implementation 'androidx.exifinterface:exifinterface:1.3.3'
     implementation 'androidx.cardview:cardview:1.0.0'
     implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
-    implementation 'androidx.emoji:emoji:1.1.0'
     implementation 'com.google.android.material:material:1.4.0'
-    compatImplementation 'androidx.emoji:emoji-appcompat:1.1.0'
+
-    conversationsFreeCompatImplementation 'androidx.emoji:emoji-bundled:1.1.0'
+    implementation "androidx.emoji2:emoji2:1.1.0-rc01"
-    cheogramFreeCompatImplementation 'androidx.emoji:emoji-bundled:1.1.0'
+    freeImplementation "androidx.emoji2:emoji2-bundled:1.1.0-rc01"
-    quicksyFreeCompatImplementation 'androidx.emoji:emoji-bundled:1.1.0'
+
     implementation 'org.bouncycastle:bcmail-jdk15on:1.64'
     //zxing stopped supporting Java 7 so we have to stick with 3.3.3
     //https://github.com/zxing/zxing/issues/1170
@@ -138,7 +134,7 @@ android {
         targetCompatibility JavaVersion.VERSION_1_8
     }
 
-    flavorDimensions("mode", "distribution", "emoji")
+    flavorDimensions("mode", "distribution")
 
     productFlavors {
 
@@ -169,45 +165,21 @@ android {
 
         playstore {
             dimension "distribution"
-            versionNameSuffix "+p"
+            versionNameSuffix "+playstore"
         }
         free {
             dimension "distribution"
-            versionNameSuffix "+f"
+            versionNameSuffix "+free"
-        }
-        system {
-            dimension "emoji"
-            versionNameSuffix "s"
-        }
-        compat {
-            dimension "emoji"
-            versionNameSuffix "c"
         }
     }
 
     sourceSets {
-        quicksyFreeSystem {
+        quicksyFree {
             java {
                 srcDir 'src/quicksyFree/java'
             }
         }
-        quicksyFreeCompat {
+        quicksyPlaystore {
-            java {
-                srcDir 'src/freeCompat/java'
-                srcDir 'src/quicksyFree/java'
-            }
-        }
-        quicksyPlaystoreCompat {
-            java {
-                srcDir 'src/playstoreCompat/java'
-                srcDir 'src/quicksyPlaystore/java'
-            }
-            res {
-                srcDir 'src/playstoreCompat/res'
-                srcDir 'src/quicksyPlaystore/res'
-            }
-        }
-        quicksyPlaystoreSystem {
             java {
                 srcDir 'src/quicksyPlaystore/java'
             }
@@ -215,39 +187,17 @@ android {
                 srcDir 'src/quicksyPlaystore/res'
             }
         }
-        conversationsFreeCompat {
+        conversationsFree {
-            java {
-                srcDir 'src/freeCompat/java'
-                srcDir 'src/conversationsFree/java'
-            }
-        }
-        conversationsFreeSystem {
             java {
                 srcDir 'src/conversationsFree/java'
             }
         }
-        cheogramFreeCompat {
+        cheogramFree {
-            java {
-                srcDir 'src/freeCompat/java'
-                srcDir 'src/conversationsFree/java'
-            }
-        }
-        cheogramFreeSystem {
             java {
                 srcDir 'src/conversationsFree/java'
             }
         }
-        conversationsPlaystoreCompat {
+        conversationsPlaystore {
-            java {
-                srcDir 'src/playstoreCompat/java'
-                srcDir 'src/conversationsPlaystore/java'
-            }
-            res {
-                srcDir 'src/playstoreCompat/res'
-                srcDir 'src/conversationsPlaystore/res'
-            }
-        }
-        conversationsPlaystoreSystem {
             java {
                 srcDir 'src/conversationsPlaystore/java'
             }
@@ -262,13 +212,11 @@ android {
             shrinkResources true
             minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-            versionNameSuffix "r"
         }
         debug {
             shrinkResources true
             minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-            versionNameSuffix "d"
         }
     }
 

src/cheogram/java/eu/siacs/conversations/services/ImportBackupService.java

@@ -128,16 +128,19 @@ public class ImportBackupService extends Service {
             final List<Jid> accounts = mDatabaseBackend.getAccountJids(false);
             final ArrayList<BackupFile> backupFiles = new ArrayList<>();
             final Set<String> apps = new HashSet<>(Arrays.asList("Conversations", "Quicksy", getString(R.string.app_name)));
-            for (String app : apps) {
+            final List<File> directories = new ArrayList<>();
-                final File directory = new File(FileBackend.getBackupDirectory(app));
+            for (final String app : apps) {
+                directories.add(FileBackend.getLegacyBackupDirectory(app));
+            }
+            directories.add(FileBackend.getBackupDirectory(this));
+            for (final File directory : directories) {
                 if (!directory.exists() || !directory.isDirectory()) {
                     Log.d(Config.LOGTAG, "directory not found: " + directory.getAbsolutePath());
                     continue;
                 }
                 final File[] files = directory.listFiles();
                 if (files == null) {
-                    onBackupFilesLoaded.onBackupFilesLoaded(backupFiles);
+                    continue;
-                    return;
                 }
                 for (final File file : files) {
                     if (file.isFile() && file.getName().endsWith(".ceb")) {

src/compat/java/eu/siacs/conversations/ui/widget/EmojiWrapperEditText.java

@@ -1,18 +0,0 @@
-package eu.siacs.conversations.ui.widget;
-
-import android.content.Context;
-import android.util.AttributeSet;
-
-import androidx.emoji.widget.EmojiAppCompatEditText;
-
-public class EmojiWrapperEditText extends EmojiAppCompatEditText {
-
-    public EmojiWrapperEditText(Context context) {
-        super(context);
-    }
-
-    public EmojiWrapperEditText(Context context, AttributeSet attrs) {
-        super(context, attrs);
-    }
-
-}

src/compat/java/eu/siacs/conversations/utils/EmojiWrapper.java

@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 2017, Daniel Gultsch All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation and/or
- * other materials provided with the distribution.
- *
- * 3. Neither the name of the copyright holder nor the names of its contributors
- * may be used to endorse or promote products derived from this software without
- * specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package eu.siacs.conversations.utils;
-
-import androidx.emoji.text.EmojiCompat;
-
-public class EmojiWrapper {
-
-	public static CharSequence transform(CharSequence input) {
-		try {
-			if (EmojiCompat.get().getLoadState() == EmojiCompat.LOAD_STATE_SUCCEEDED) {
-				return EmojiCompat.get().process(input);
-			} else {
-				return input;
-			}
-		} catch (IllegalStateException e) {
-			return input;
-		}
-	}
-}

src/conversations/java/eu/siacs/conversations/services/ImportBackupService.java

@@ -128,16 +128,19 @@ public class ImportBackupService extends Service {
             final List<Jid> accounts = mDatabaseBackend.getAccountJids(false);
             final ArrayList<BackupFile> backupFiles = new ArrayList<>();
             final Set<String> apps = new HashSet<>(Arrays.asList("Conversations", "Quicksy", getString(R.string.app_name)));
-            for (String app : apps) {
+            final List<File> directories = new ArrayList<>();
-                final File directory = new File(FileBackend.getBackupDirectory(app));
+            for (final String app : apps) {
+                directories.add(FileBackend.getLegacyBackupDirectory(app));
+            }
+            directories.add(FileBackend.getBackupDirectory(this));
+            for (final File directory : directories) {
                 if (!directory.exists() || !directory.isDirectory()) {
                     Log.d(Config.LOGTAG, "directory not found: " + directory.getAbsolutePath());
                     continue;
                 }
                 final File[] files = directory.listFiles();
                 if (files == null) {
-                    onBackupFilesLoaded.onBackupFilesLoaded(backupFiles);
+                    continue;
-                    return;
                 }
                 for (final File file : files) {
                     if (file.isFile() && file.getName().endsWith(".ceb")) {

src/conversations/res/values-gl/strings.xml

@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="pick_a_server">Escolle o teu provedor XMPP</string>
+    <string name="pick_a_server">Elixe o teu provedor XMPP</string>
     <string name="use_conversations.im">Utilizar conversations.im</string>
     <string name="create_new_account">Crear nova conta</string>
     <string name="do_you_have_an_account">Xa posúes unha conta XMPP? Este pode ser o caso se xa estás a utilizar outro cliente XMPP ou utilizaches Conversations previamente. Se non é así podes crear unha nova conta agora mesmo.\nTruco: Algúns provedores de correo tamén proporcionan contas XMPP.</string>
     <string name="server_select_text">XMPP é unha rede de mensaxería independente do provedor. Podes utilizar este cliente con calquera provedor XMPP da túa elección.\nMais para a tua conveniencia fixemos que fose doado crear unha conta en conversations.im¹; un provedor especialmente axeitado para utilizar con Conversations.</string>
-    <string name="magic_create_text_on_x">Convidáronte a %1$s. Guiarémoste no proceso para crear unha conta.\nAo escoller %1$s como provedor poderás comunicarte con usuarias de outros provedores cando lles deas o teu enderezo XMPP completo.</string>
+    <string name="magic_create_text_on_x">Convidáronte a %1$s. Guiarémoste no proceso para crear unha conta.\nAo elexir %1$s como provedor poderás comunicarte con usuarias doutros provedores cando lles deas o teu enderezo XMPP completo.</string>
-    <string name="magic_create_text_fixed">Convidáronte a %1$s. Escollemos un nome de usuaria por ti. Guiarémoste no proceso de crear unha conta.\nPoderás comunicarte con usuarias de outros provedores cando lles digas o teu enderezo XMPP completo.</string>
+    <string name="magic_create_text_fixed">Convidáronte a %1$s. Xa eleximos un nome de usuaria para ti. Guiarémoste no proceso de crear unha conta.\nPoderás comunicarte con usuarias doutros provedores cando lles digas o teu enderezo XMPP completo.</string>
     <string name="your_server_invitation">O convite do teu servidor</string>
     <string name="improperly_formatted_provisioning">Código de aprovisionamento con formato non válido</string>
-    <string name="tap_share_button_send_invite">Toca no botón compartir para convidar ó teu contacto a %1$s.</string>
+    <string name="tap_share_button_send_invite">Toca no botón compartir para convidar ao teu contacto a %1$s.</string>
     <string name="if_contact_is_nearby_use_qr">Se o contacto está preto de ti, pode escanear o código inferior para aceptar o teu convite.</string>
     <string name="easy_invite_share_text">Únete a %1$s e conversa conmigo: %2$s</string>
     <string name="share_invite_with">Enviar convite a...</string>

src/free/java/eu/siacs/conversations/services/EmojiInitializationService.java

@@ -0,0 +1,14 @@
+package eu.siacs.conversations.services;
+
+import android.content.Context;
+
+import androidx.emoji2.bundled.BundledEmojiCompatConfig;
+import androidx.emoji2.text.EmojiCompat;
+
+public class EmojiInitializationService {
+
+    public static void execute(final Context context) {
+        EmojiCompat.init(new BundledEmojiCompatConfig(context).setReplaceAll(true));
+    }
+
+}

src/freeCompat/java/eu/siacs/conversations/ui/service/EmojiService.java

@@ -1,27 +0,0 @@
-package eu.siacs.conversations.ui.service;
-
-import android.content.Context;
-import android.os.Build;
-import androidx.emoji.text.EmojiCompat;
-import androidx.emoji.text.FontRequestEmojiCompatConfig;
-import androidx.emoji.bundled.BundledEmojiCompatConfig;
-
-public class EmojiService {
-
-    private final Context context;
-
-    public EmojiService(Context context) {
-        this.context = context;
-    }
-
-    public void init() {
-        BundledEmojiCompatConfig config = new BundledEmojiCompatConfig(context);
-        //On recent Androids we assume to have the latest emojis
-        //there are some annoying bugs with emoji compat that make it a safer choice not to use it when possible
-        // a) the text preview has annoying glitches when the cut of text contains emojis (the emoji will be half visible)
-        // b) can trigger a hardware rendering bug https://issuetracker.google.com/issues/67102093
-        config.setReplaceAll(Build.VERSION.SDK_INT < Build.VERSION_CODES.O);
-        EmojiCompat.init(config);
-    }
-
-}

src/main/AndroidManifest.xml

@@ -50,6 +50,10 @@
         android:name="android.hardware.microphone"
         android:required="false" />
 
+    <queries>
+        <package android:name="org.sufficientlysecure.keychain"/>
+    </queries>
+
 
     <application
         android:allowBackup="true"
@@ -61,6 +65,7 @@
         android:largeHeap="true"
         android:networkSecurityConfig="@xml/network_security_configuration"
         android:requestLegacyExternalStorage="true"
+        android:preserveLegacyExternalStorage="true"
         android:theme="@style/ConversationsTheme"
         tools:replace="android:label"
         tools:targetApi="q">

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

@@ -9,6 +9,7 @@ import org.openintents.openpgp.util.OpenPgpApi;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
+import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
@@ -147,9 +148,6 @@ public class PgpDecryptionService {
 						try {
 							os.flush();
 							final String body = os.toString();
-							if (body == null) {
-								throw new IOException("body was null");
-							}
 							message.setBody(body);
 							message.setEncryption(Message.ENCRYPTION_DECRYPTED);
 							final HttpConnectionManager manager = mXmppConnectionService.getHttpConnectionManager();
@@ -194,9 +192,9 @@ public class PgpDecryptionService {
 							String originalExtension = originalFilename == null ? null : MimeUtils.extractRelevantExtension(originalFilename);
 							if (originalExtension != null && MimeUtils.extractRelevantExtension(outputFile.getName()) == null) {
 								Log.d(Config.LOGTAG,"detected original filename during pgp decryption");
-								String mime = MimeUtils.guessMimeTypeFromExtension(originalExtension);
+								final String mime = MimeUtils.guessMimeTypeFromExtension(originalExtension);
-								String path = outputFile.getName()+"."+originalExtension;
+								final String filename = outputFile.getName()+"."+originalExtension;
-								DownloadableFile fixedFile = mXmppConnectionService.getFileBackend().getFileForPath(path,mime);
+								final File fixedFile = mXmppConnectionService.getFileBackend().getStorageLocation(filename,mime);
 								if (fixedFile.getParentFile().mkdirs()) {
 									Log.d(Config.LOGTAG,"created parent directories for "+fixedFile.getAbsolutePath());
 								}
@@ -205,7 +203,7 @@ public class PgpDecryptionService {
 								}
 								if (outputFile.renameTo(fixedFile)) {
 									Log.d(Config.LOGTAG, "renamed " + outputFile.getAbsolutePath() + " to " + fixedFile.getAbsolutePath());
-									message.setRelativeFilePath(path);
+									message.setRelativeFilePath(fixedFile.getAbsolutePath());
 								}
 							}
 							final String url = message.getFileParams().url;

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

@@ -16,6 +16,10 @@ public class DownloadableFile extends File {
 	private byte[] aeskey;
 	private byte[] iv;
 
+	public DownloadableFile(final File parent, final String file) {
+		super(parent, file);
+	}
+
 	public DownloadableFile(String path) {
 		super(path);
 	}

src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java

@@ -96,11 +96,8 @@ public class HttpDownloadConnection implements Transferable {
                 this.message.setEncryption(Message.ENCRYPTION_NONE);
             }
             final String ext = extension.getExtension();
-            if (ext != null) {
+            final String filename = Strings.isNullOrEmpty(ext) ? message.getUuid() : String.format("%s.%s", message.getUuid(), ext);
-                message.setRelativeFilePath(String.format("%s.%s", message.getUuid(), ext));
+            mXmppConnectionService.getFileBackend().setupRelativeFilePath(message, filename);
-            } else if (Strings.isNullOrEmpty(message.getRelativeFilePath())) {
-                message.setRelativeFilePath(message.getUuid());
-            }
             setupFile();
             if (this.message.getEncryption() == Message.ENCRYPTION_AXOLOTL && this.file.getKey() == null) {
                 this.message.setEncryption(Message.ENCRYPTION_NONE);
@@ -122,7 +119,7 @@ public class HttpDownloadConnection implements Transferable {
     private void setupFile() {
         final String reference = mUrl.fragment();
         if (reference != null && AesGcmURL.IV_KEY.matcher(reference).matches()) {
-            this.file = new DownloadableFile(mXmppConnectionService.getCacheDir().getAbsolutePath() + "/" + message.getUuid());
+            this.file = new DownloadableFile(mXmppConnectionService.getCacheDir(), message.getUuid());
             this.file.setKeyAndIv(CryptoHelper.hexToBytes(reference));
             Log.d(Config.LOGTAG, "create temporary OMEMO encrypted file: " + this.file.getAbsolutePath() + "(" + message.getMimeType() + ")");
         } else {
@@ -326,7 +323,7 @@ public class HttpDownloadConnection implements Transferable {
                 if (Strings.isNullOrEmpty(extension.getExtension()) && contentType != null) {
                     final String fileExtension = MimeUtils.guessExtensionFromMimeType(contentType);
                     if (fileExtension != null) {
-                        message.setRelativeFilePath(String.format("%s.%s", message.getUuid(), fileExtension));
+                        mXmppConnectionService.getFileBackend().setupRelativeFilePath(message, String.format("%s.%s", message.getUuid(), fileExtension), contentType);
                         Log.d(Config.LOGTAG, "rewriting name after not finding extension in url but in content type");
                         setupFile();
                     }
@@ -419,8 +416,9 @@ public class HttpDownloadConnection implements Transferable {
                     Log.d(Config.LOGTAG, "content-length reported on GET (" + size + ") did not match Content-Length reported on HEAD (" + expected + ")");
                 }
                 file.getParentFile().mkdirs();
+                Log.d(Config.LOGTAG,"creating file: "+file.getAbsolutePath());
                 if (!file.exists() && !file.createNewFile()) {
-                    throw new FileWriterException();
+                    throw new FileWriterException(file);
                 }
                 outputStream = AbstractConnectionManager.createOutputStream(file, false, false);
             }
@@ -431,7 +429,7 @@ public class HttpDownloadConnection implements Transferable {
                 try {
                     outputStream.write(buffer, 0, count);
                 } catch (IOException e) {
-                    throw new FileWriterException();
+                    throw new FileWriterException(file);
                 }
                 updateProgress(Math.round(((double) transmitted / expected) * 100));
             }

src/main/java/eu/siacs/conversations/services/AttachFileToConversationRunnable.java

@@ -91,7 +91,7 @@ public class AttachFileToConversationRunnable implements Runnable, TranscoderLis
     private void processAsVideo() throws FileNotFoundException {
         Log.d(Config.LOGTAG, "processing file as video");
         mXmppConnectionService.startForcingForegroundNotification();
-        message.setRelativeFilePath(message.getUuid() + ".mp4");
+        mXmppConnectionService.getFileBackend().setupRelativeFilePath(message, String.format("%s.%s", message.getUuid(), "mp4"));
         final DownloadableFile file = mXmppConnectionService.getFileBackend().getFile(message);
         if (Objects.requireNonNull(file.getParentFile()).mkdirs()) {
             Log.d(Config.LOGTAG, "created parent directory for video file");

src/main/java/eu/siacs/conversations/services/ExportBackupService.java

@@ -291,7 +291,7 @@ public class ExportBackupService extends Service {
             secureRandom.nextBytes(salt);
             final BackupFileHeader backupFileHeader = new BackupFileHeader(getString(R.string.app_name), account.getJid(), System.currentTimeMillis(), IV, salt);
             final Progress progress = new Progress(mBuilder, max, count);
-            final File file = new File(FileBackend.getBackupDirectory(this) + account.getJid().asBareJid().toEscapedString() + ".ceb");
+            final File file = new File(FileBackend.getBackupDirectory(this), account.getJid().asBareJid().toEscapedString() + ".ceb");
             files.add(file);
             final File directory = file.getParentFile();
             if (directory != null && directory.mkdirs()) {
@@ -335,7 +335,7 @@ public class ExportBackupService extends Service {
     }
 
     private void notifySuccess(final List<File> files) {
-        final String path = FileBackend.getBackupDirectory(this);
+        final String path = FileBackend.getBackupDirectory(this).getAbsolutePath();
 
         PendingIntent openFolderIntent = null;
 
@@ -363,7 +363,7 @@ public class ExportBackupService extends Service {
         NotificationCompat.Builder mBuilder = new NotificationCompat.Builder(getBaseContext(), "backup");
         mBuilder.setContentTitle(getString(R.string.notification_backup_created_title))
                 .setContentText(getString(R.string.notification_backup_created_subtitle, path))
-                .setStyle(new NotificationCompat.BigTextStyle().bigText(getString(R.string.notification_backup_created_subtitle, FileBackend.getBackupDirectory(this))))
+                .setStyle(new NotificationCompat.BigTextStyle().bigText(getString(R.string.notification_backup_created_subtitle, FileBackend.getBackupDirectory(this).getAbsolutePath())))
                 .setAutoCancel(true)
                 .setContentIntent(openFolderIntent)
                 .setSmallIcon(R.drawable.ic_archive_white_24dp);

src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java

@@ -46,7 +46,6 @@ import eu.siacs.conversations.ui.util.MyLinkify;
 import eu.siacs.conversations.ui.util.SoftKeyboardUtils;
 import eu.siacs.conversations.utils.AccountUtils;
 import eu.siacs.conversations.utils.Compatibility;
-import eu.siacs.conversations.utils.EmojiWrapper;
 import eu.siacs.conversations.utils.StringUtils;
 import eu.siacs.conversations.utils.StylingHelper;
 import eu.siacs.conversations.utils.XmppUri;
@@ -471,11 +470,11 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
         String subject = mucOptions.getSubject();
         final boolean hasTitle;
         if (printableValue(roomName)) {
-            this.binding.mucTitle.setText(EmojiWrapper.transform(roomName));
+            this.binding.mucTitle.setText(roomName);
             this.binding.mucTitle.setVisibility(View.VISIBLE);
             hasTitle = true;
         } else if (!printableValue(subject)) {
-            this.binding.mucTitle.setText(EmojiWrapper.transform(mConversation.getName()));
+            this.binding.mucTitle.setText(mConversation.getName());
             hasTitle = true;
             this.binding.mucTitle.setVisibility(View.VISIBLE);
         } else {
@@ -486,7 +485,7 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
             SpannableStringBuilder spannable = new SpannableStringBuilder(subject);
             StylingHelper.format(spannable, this.binding.mucSubject.getCurrentTextColor());
             MyLinkify.addLinks(spannable, false);
-            this.binding.mucSubject.setText(EmojiWrapper.transform(spannable));
+            this.binding.mucSubject.setText(spannable);
             this.binding.mucSubject.setTextAppearance(this, subject.length() > (hasTitle ? 128 : 196) ? R.style.TextAppearance_Conversations_Body1_Linkified : R.style.TextAppearance_Conversations_Subhead);
             this.binding.mucSubject.setAutoLinkMask(0);
             this.binding.mucSubject.setVisibility(View.VISIBLE);

src/main/java/eu/siacs/conversations/ui/ConversationFragment.java

@@ -6,6 +6,7 @@ import android.app.Activity;
 import android.app.Fragment;
 import android.app.FragmentManager;
 import android.app.PendingIntent;
+import android.content.ActivityNotFoundException;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
@@ -1183,8 +1184,8 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke
                 cancelTransmission.setVisible(true);
             }
             if (m.isFileOrImage() && !deleted && !cancelable) {
-                String path = m.getRelativeFilePath();
+                final String path = m.getRelativeFilePath();
-                if (path == null || !path.startsWith("/") || FileBackend.isInDirectoryThatShouldNotBeScanned(getActivity(), path)) {
+                if (path == null || !path.startsWith("/")) {
                     deleteFile.setVisible(true);
                     deleteFile.setTitle(activity.getString(R.string.delete_x_file, UIHelper.getFileDescriptionString(activity, m)));
                 }
@@ -1744,7 +1745,7 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke
         if (context == null) {
             return;
         }
-        if (intent.resolveActivity(context.getPackageManager()) != null) {
+        try {
             if (chooser) {
                 startActivityForResult(
                         Intent.createChooser(intent, getString(R.string.perform_action_with)),
@@ -1752,7 +1753,7 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke
             } else {
                 startActivityForResult(intent, attachmentChoice);
             }
-        } else {
+        } catch (final ActivityNotFoundException e) {
             Toast.makeText(context, R.string.no_application_found, Toast.LENGTH_LONG).show();
         }
     }
@@ -2254,10 +2255,10 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke
     }
 
     private List<Uri> cleanUris(final List<Uri> uris) {
-        Iterator<Uri> iterator = uris.iterator();
+        final Iterator<Uri> iterator = uris.iterator();
         while (iterator.hasNext()) {
             final Uri uri = iterator.next();
-            if (FileBackend.weOwnFile(getActivity(), uri)) {
+            if (FileBackend.weOwnFile(uri)) {
                 iterator.remove();
                 Toast.makeText(getActivity(), R.string.security_violation_not_attaching_file, Toast.LENGTH_SHORT).show();
             }

src/main/java/eu/siacs/conversations/ui/ConversationsActivity.java

@@ -81,7 +81,6 @@ import eu.siacs.conversations.ui.util.ActivityResult;
 import eu.siacs.conversations.ui.util.ConversationMenuConfigurator;
 import eu.siacs.conversations.ui.util.MenuDoubleTabUtil;
 import eu.siacs.conversations.ui.util.PendingItem;
-import eu.siacs.conversations.utils.EmojiWrapper;
 import eu.siacs.conversations.utils.ExceptionHelper;
 import eu.siacs.conversations.utils.SignupUtils;
 import eu.siacs.conversations.utils.XmppUri;
@@ -615,7 +614,7 @@ public class ConversationsActivity extends XmppActivity implements OnConversatio
         if (mainFragment instanceof ConversationFragment) {
             final Conversation conversation = ((ConversationFragment) mainFragment).getConversation();
             if (conversation != null) {
-                actionBar.setTitle(EmojiWrapper.transform(conversation.getName()));
+                actionBar.setTitle(conversation.getName());
                 actionBar.setDisplayHomeAsUpEnabled(true);
                 ActionBarUtil.setActionBarOnClickListener(
                         binding.toolbar,

src/main/java/eu/siacs/conversations/ui/EnterJidDialog.java

@@ -22,6 +22,7 @@ import java.util.List;
 import eu.siacs.conversations.Config;
 import eu.siacs.conversations.R;
 import eu.siacs.conversations.databinding.EnterJidDialogBinding;
+import eu.siacs.conversations.services.XmppConnectionService;
 import eu.siacs.conversations.ui.adapter.KnownHostsAdapter;
 import eu.siacs.conversations.ui.interfaces.OnBackendConnected;
 import eu.siacs.conversations.ui.util.DelayedHintHelper;
@@ -29,234 +30,250 @@ import eu.siacs.conversations.xmpp.Jid;
 
 public class EnterJidDialog extends DialogFragment implements OnBackendConnected, TextWatcher {
 
+    private static final List<String> SUSPICIOUS_DOMAINS =
+            Arrays.asList("conference", "muc", "room", "rooms", "chat");
 
-	private static final List<String> SUSPICIOUS_DOMAINS = Arrays.asList("conference","muc","room","rooms","chat");
+    private OnEnterJidDialogPositiveListener mListener = null;
 
-	private OnEnterJidDialogPositiveListener mListener = null;
+    private static final String TITLE_KEY = "title";
+    private static final String POSITIVE_BUTTON_KEY = "positive_button";
+    private static final String PREFILLED_JID_KEY = "prefilled_jid";
+    private static final String ACCOUNT_KEY = "account";
+    private static final String ALLOW_EDIT_JID_KEY = "allow_edit_jid";
+    private static final String ACCOUNTS_LIST_KEY = "activated_accounts_list";
+    private static final String SANITY_CHECK_JID = "sanity_check_jid";
 
-	private static final String TITLE_KEY = "title";
+    private KnownHostsAdapter knownHostsAdapter;
-	private static final String POSITIVE_BUTTON_KEY = "positive_button";
+    private Collection<String> whitelistedDomains = Collections.emptyList();
-	private static final String PREFILLED_JID_KEY = "prefilled_jid";
-	private static final String ACCOUNT_KEY = "account";
-	private static final String ALLOW_EDIT_JID_KEY = "allow_edit_jid";
-	private static final String ACCOUNTS_LIST_KEY = "activated_accounts_list";
-	private static final String SANITY_CHECK_JID = "sanity_check_jid";
 
-	private KnownHostsAdapter knownHostsAdapter;
+    private EnterJidDialogBinding binding;
-	private Collection<String> whitelistedDomains = Collections.emptyList();
+    private AlertDialog dialog;
+    private boolean sanityCheckJid = false;
 
-	private EnterJidDialogBinding binding;
+    private boolean issuedWarning = false;
-	private AlertDialog dialog;
-	private boolean sanityCheckJid = false;
 
+    public static EnterJidDialog newInstance(
+            final List<String> activatedAccounts,
+            final String title,
+            final String positiveButton,
+            final String prefilledJid,
+            final String account,
+            boolean allowEditJid,
+            final boolean sanity_check_jid) {
+        EnterJidDialog dialog = new EnterJidDialog();
+        Bundle bundle = new Bundle();
+        bundle.putString(TITLE_KEY, title);
+        bundle.putString(POSITIVE_BUTTON_KEY, positiveButton);
+        bundle.putString(PREFILLED_JID_KEY, prefilledJid);
+        bundle.putString(ACCOUNT_KEY, account);
+        bundle.putBoolean(ALLOW_EDIT_JID_KEY, allowEditJid);
+        bundle.putStringArrayList(ACCOUNTS_LIST_KEY, (ArrayList<String>) activatedAccounts);
+        bundle.putBoolean(SANITY_CHECK_JID, sanity_check_jid);
+        dialog.setArguments(bundle);
+        return dialog;
+    }
 
-	private boolean issuedWarning = false;
+    @Override
+    public void onActivityCreated(Bundle savedInstanceState) {
+        super.onActivityCreated(savedInstanceState);
+        setRetainInstance(true);
+    }
 
-	public static EnterJidDialog newInstance(final List<String> activatedAccounts,
+    @Override
-	                                         final String title, final String positiveButton,
+    public void onStart() {
-	                                         final String prefilledJid, final String account,
+        super.onStart();
-											 boolean allowEditJid, final boolean sanity_check_jid) {
+        final Activity activity = getActivity();
-		EnterJidDialog dialog = new EnterJidDialog();
+        if (activity instanceof XmppActivity
-		Bundle bundle = new Bundle();
+                && ((XmppActivity) activity).xmppConnectionService != null) {
-		bundle.putString(TITLE_KEY, title);
+            refreshKnownHosts();
-		bundle.putString(POSITIVE_BUTTON_KEY, positiveButton);
+        }
-		bundle.putString(PREFILLED_JID_KEY, prefilledJid);
+    }
-		bundle.putString(ACCOUNT_KEY, account);
-		bundle.putBoolean(ALLOW_EDIT_JID_KEY, allowEditJid);
-		bundle.putStringArrayList(ACCOUNTS_LIST_KEY, (ArrayList<String>) activatedAccounts);
-		bundle.putBoolean(SANITY_CHECK_JID, sanity_check_jid);
-		dialog.setArguments(bundle);
-		return dialog;
-	}
 
-	@Override
+    @NonNull
-	public void onActivityCreated(Bundle savedInstanceState) {
+    @Override
-		super.onActivityCreated(savedInstanceState);
+    public Dialog onCreateDialog(Bundle savedInstanceState) {
-		setRetainInstance(true);
+        final AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
-	}
+        builder.setTitle(getArguments().getString(TITLE_KEY));
+        binding =
+                DataBindingUtil.inflate(
+                        getActivity().getLayoutInflater(), R.layout.enter_jid_dialog, null, false);
+        this.knownHostsAdapter = new KnownHostsAdapter(getActivity(), R.layout.simple_list_item);
+        binding.jid.setAdapter(this.knownHostsAdapter);
+        binding.jid.addTextChangedListener(this);
+        String prefilledJid = getArguments().getString(PREFILLED_JID_KEY);
+        if (prefilledJid != null) {
+            binding.jid.append(prefilledJid);
+            if (!getArguments().getBoolean(ALLOW_EDIT_JID_KEY)) {
+                binding.jid.setFocusable(false);
+                binding.jid.setFocusableInTouchMode(false);
+                binding.jid.setClickable(false);
+                binding.jid.setCursorVisible(false);
+            }
+        }
+        sanityCheckJid = getArguments().getBoolean(SANITY_CHECK_JID, false);
 
-	@Override
+        DelayedHintHelper.setHint(R.string.account_settings_example_jabber_id, binding.jid);
-	public void onStart() {
-		super.onStart();
-		final Activity activity = getActivity();
-		if (activity instanceof XmppActivity && ((XmppActivity) activity).xmppConnectionService != null) {
-			refreshKnownHosts();
-		}
-	}
 
-	@NonNull
+        String account = getArguments().getString(ACCOUNT_KEY);
-	@Override
+        if (account == null) {
-	public Dialog onCreateDialog(Bundle savedInstanceState) {
+            StartConversationActivity.populateAccountSpinner(
-		final AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
+                    getActivity(),
-		builder.setTitle(getArguments().getString(TITLE_KEY));
+                    getArguments().getStringArrayList(ACCOUNTS_LIST_KEY),
-		binding = DataBindingUtil.inflate(getActivity().getLayoutInflater(), R.layout.enter_jid_dialog, null, false);
+                    binding.account);
-		this.knownHostsAdapter = new KnownHostsAdapter(getActivity(), R.layout.simple_list_item);
+        } else {
-		binding.jid.setAdapter(this.knownHostsAdapter);
+            ArrayAdapter<String> adapter =
-		binding.jid.addTextChangedListener(this);
+                    new ArrayAdapter<>(
-		String prefilledJid = getArguments().getString(PREFILLED_JID_KEY);
+                            getActivity(), R.layout.simple_list_item, new String[] {account});
-		if (prefilledJid != null) {
+            binding.account.setEnabled(false);
-			binding.jid.append(prefilledJid);
+            adapter.setDropDownViewResource(R.layout.simple_list_item);
-			if (!getArguments().getBoolean(ALLOW_EDIT_JID_KEY)) {
+            binding.account.setAdapter(adapter);
-				binding.jid.setFocusable(false);
+        }
-				binding.jid.setFocusableInTouchMode(false);
-				binding.jid.setClickable(false);
-				binding.jid.setCursorVisible(false);
-			}
-		}
-		sanityCheckJid = getArguments().getBoolean(SANITY_CHECK_JID, false);
 
-		DelayedHintHelper.setHint(R.string.account_settings_example_jabber_id, binding.jid);
+        builder.setView(binding.getRoot());
+        builder.setNegativeButton(R.string.cancel, null);
+        builder.setPositiveButton(getArguments().getString(POSITIVE_BUTTON_KEY), null);
+        this.dialog = builder.create();
 
-		String account = getArguments().getString(ACCOUNT_KEY);
+        View.OnClickListener dialogOnClick =
-		if (account == null) {
+                v -> {
-			StartConversationActivity.populateAccountSpinner(getActivity(), getArguments().getStringArrayList(ACCOUNTS_LIST_KEY), binding.account);
+                    handleEnter(binding, account);
-		} else {
+                };
-			ArrayAdapter<String> adapter = new ArrayAdapter<>(getActivity(),
-					R.layout.simple_list_item,
-					new String[]{account});
-			binding.account.setEnabled(false);
-			adapter.setDropDownViewResource(R.layout.simple_list_item);
-			binding.account.setAdapter(adapter);
-		}
 
+        binding.jid.setOnEditorActionListener(
+                (v, actionId, event) -> {
+                    handleEnter(binding, account);
+                    return true;
+                });
 
+        dialog.show();
+        dialog.getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener(dialogOnClick);
+        return dialog;
+    }
 
-		builder.setView(binding.getRoot());
+    private void handleEnter(EnterJidDialogBinding binding, String account) {
-		builder.setNegativeButton(R.string.cancel, null);
+        final Jid accountJid;
-		builder.setPositiveButton(getArguments().getString(POSITIVE_BUTTON_KEY), null);
+        if (!binding.account.isEnabled() && account == null) {
-		this.dialog = builder.create();
+            return;
+        }
+        try {
+            if (Config.DOMAIN_LOCK != null) {
+                accountJid =
+                        Jid.ofEscaped(
+                                (String) binding.account.getSelectedItem(),
+                                Config.DOMAIN_LOCK,
+                                null);
+            } else {
+                accountJid = Jid.ofEscaped((String) binding.account.getSelectedItem());
+            }
+        } catch (final IllegalArgumentException e) {
+            return;
+        }
+        final Jid contactJid;
+        try {
+            contactJid = Jid.ofEscaped(binding.jid.getText().toString());
+        } catch (final IllegalArgumentException e) {
+            binding.jidLayout.setError(getActivity().getString(R.string.invalid_jid));
+            return;
+        }
 
-		View.OnClickListener dialogOnClick = v -> {
+        if (!issuedWarning && sanityCheckJid) {
-			handleEnter(binding, account);
+            if (contactJid.isDomainJid()) {
-		};
+                binding.jidLayout.setError(
+                        getActivity().getString(R.string.this_looks_like_a_domain));
+                dialog.getButton(AlertDialog.BUTTON_POSITIVE).setText(R.string.add_anway);
+                issuedWarning = true;
+                return;
+            }
+            if (suspiciousSubDomain(contactJid.getDomain().toEscapedString())) {
+                binding.jidLayout.setError(
+                        getActivity().getString(R.string.this_looks_like_channel));
+                dialog.getButton(AlertDialog.BUTTON_POSITIVE).setText(R.string.add_anway);
+                issuedWarning = true;
+                return;
+            }
+        }
 
-		binding.jid.setOnEditorActionListener((v, actionId, event) -> {
+        if (mListener != null) {
-			handleEnter(binding, account);
+            try {
-			return true;
+                if (mListener.onEnterJidDialogPositive(accountJid, contactJid)) {
-		});
+                    dialog.dismiss();
+                }
+            } catch (JidError error) {
+                binding.jidLayout.setError(error.toString());
+                dialog.getButton(AlertDialog.BUTTON_POSITIVE).setText(R.string.add);
+                issuedWarning = false;
+            }
+        }
+    }
 
-		dialog.show();
+    public void setOnEnterJidDialogPositiveListener(OnEnterJidDialogPositiveListener listener) {
-		dialog.getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener(dialogOnClick);
+        this.mListener = listener;
-		return dialog;
+    }
-	}
 
-	private void handleEnter(EnterJidDialogBinding binding, String account) {
+    @Override
-		final Jid accountJid;
+    public void onBackendConnected() {
-		if (!binding.account.isEnabled() && account == null) {
+        refreshKnownHosts();
-			return;
+    }
-		}
-		try {
-			if (Config.DOMAIN_LOCK != null) {
-				accountJid = Jid.ofEscaped((String) binding.account.getSelectedItem(), Config.DOMAIN_LOCK, null);
-			} else {
-				accountJid = Jid.ofEscaped((String) binding.account.getSelectedItem());
-			}
-		} catch (final IllegalArgumentException e) {
-			return;
-		}
-		final Jid contactJid;
-		try {
-			contactJid = Jid.ofEscaped(binding.jid.getText().toString());
-		} catch (final IllegalArgumentException e) {
-			binding.jidLayout.setError(getActivity().getString(R.string.invalid_jid));
-			return;
-		}
 
-		if (!issuedWarning && sanityCheckJid) {
+    private void refreshKnownHosts() {
-			if (contactJid.isDomainJid()) {
+        final Activity activity = getActivity();
-				binding.jidLayout.setError(getActivity().getString(R.string.this_looks_like_a_domain));
+        if (activity instanceof XmppActivity) {
-				dialog.getButton(AlertDialog.BUTTON_POSITIVE).setText(R.string.add_anway);
+            final XmppConnectionService service = ((XmppActivity) activity).xmppConnectionService;
-				issuedWarning = true;
+            if (service == null) {
-				return;
+                return;
-			}
+            }
-			if (suspiciousSubDomain(contactJid.getDomain().toEscapedString())) {
+            final Collection<String> hosts = service.getKnownHosts();
-				binding.jidLayout.setError(getActivity().getString(R.string.this_looks_like_channel));
+            this.knownHostsAdapter.refresh(hosts);
-				dialog.getButton(AlertDialog.BUTTON_POSITIVE).setText(R.string.add_anway);
+            this.whitelistedDomains = hosts;
-				issuedWarning = true;
+        }
-				return;
+    }
-			}
-		}
 
-		if (mListener != null) {
+    @Override
-			try {
+    public void beforeTextChanged(CharSequence s, int start, int count, int after) {}
-				if (mListener.onEnterJidDialogPositive(accountJid, contactJid)) {
-					dialog.dismiss();
-				}
-			} catch (JidError error) {
-				binding.jidLayout.setError(error.toString());
-				dialog.getButton(AlertDialog.BUTTON_POSITIVE).setText(R.string.add);
-				issuedWarning = false;
-			}
-		}
-	}
 
-	public void setOnEnterJidDialogPositiveListener(OnEnterJidDialogPositiveListener listener) {
+    @Override
-		this.mListener = listener;
+    public void onTextChanged(CharSequence s, int start, int before, int count) {}
-	}
 
-	@Override
+    @Override
-	public void onBackendConnected() {
+    public void afterTextChanged(Editable s) {
-		refreshKnownHosts();
+        if (issuedWarning) {
-	}
+            dialog.getButton(AlertDialog.BUTTON_POSITIVE).setText(R.string.add);
+            binding.jidLayout.setError(null);
+            issuedWarning = false;
+        }
+    }
 
-	private void refreshKnownHosts() {
+    public interface OnEnterJidDialogPositiveListener {
-		Activity activity = getActivity();
+        boolean onEnterJidDialogPositive(Jid account, Jid contact) throws EnterJidDialog.JidError;
-		if (activity instanceof XmppActivity) {
+    }
-			Collection<String> hosts = ((XmppActivity) activity).xmppConnectionService.getKnownHosts();
-			this.knownHostsAdapter.refresh(hosts);
-			this.whitelistedDomains = hosts;
-		}
-	}
 
-	@Override
+    public static class JidError extends Exception {
-	public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+        final String msg;
 
-	}
+        public JidError(final String msg) {
+            this.msg = msg;
+        }
 
-	@Override
+        @NonNull
-	public void onTextChanged(CharSequence s, int start, int before, int count) {
+        public String toString() {
+            return msg;
+        }
+    }
 
-	}
+    @Override
+    public void onDestroyView() {
+        Dialog dialog = getDialog();
+        if (dialog != null && getRetainInstance()) {
+            dialog.setDismissMessage(null);
+        }
+        super.onDestroyView();
+    }
 
-	@Override
+    private boolean suspiciousSubDomain(String domain) {
-	public void afterTextChanged(Editable s) {
+        if (this.whitelistedDomains.contains(domain)) {
-		if (issuedWarning) {
+            return false;
-			dialog.getButton(AlertDialog.BUTTON_POSITIVE).setText(R.string.add);
+        }
-			binding.jidLayout.setError(null);
+        final String[] parts = domain.split("\\.");
-			issuedWarning = false;
+        return parts.length >= 3 && SUSPICIOUS_DOMAINS.contains(parts[0]);
-		}
+    }
-	}
-
-	public interface OnEnterJidDialogPositiveListener {
-		boolean onEnterJidDialogPositive(Jid account, Jid contact) throws EnterJidDialog.JidError;
-	}
-
-	public static class JidError extends Exception {
-		final String msg;
-
-		public JidError(final String msg) {
-			this.msg = msg;
-		}
-
-		public String toString() {
-			return msg;
-		}
-	}
-
-	@Override
-	public void onDestroyView() {
-		Dialog dialog = getDialog();
-		if (dialog != null && getRetainInstance()) {
-			dialog.setDismissMessage(null);
-		}
-		super.onDestroyView();
-	}
-
-	private boolean suspiciousSubDomain(String domain) {
-		if (this.whitelistedDomains.contains(domain)) {
-			return false;
-		}
-		final String[] parts = domain.split("\\.");
-		return parts.length >= 3 && SUSPICIOUS_DOMAINS.contains(parts[0]);
-	}
 }

src/main/java/eu/siacs/conversations/ui/RecordingActivity.java

@@ -1,11 +1,12 @@
 package eu.siacs.conversations.ui;
 
 import android.app.Activity;
-import android.content.Context;
 import android.content.Intent;
 import android.media.MediaRecorder;
 import android.net.Uri;
+import android.os.Build;
 import android.os.Bundle;
+import android.os.Environment;
 import android.os.FileObserver;
 import android.os.Handler;
 import android.os.SystemClock;
@@ -17,25 +18,22 @@ import android.widget.Toast;
 import androidx.databinding.DataBindingUtil;
 
 import java.io.File;
-import java.io.IOException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.Locale;
+import java.util.Objects;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
 import eu.siacs.conversations.Config;
 import eu.siacs.conversations.R;
 import eu.siacs.conversations.databinding.ActivityRecordingBinding;
-import eu.siacs.conversations.persistance.FileBackend;
 import eu.siacs.conversations.ui.util.SettingsUtils;
 import eu.siacs.conversations.utils.ThemeHelper;
 import eu.siacs.conversations.utils.TimeFrameUtils;
 
 public class RecordingActivity extends Activity implements View.OnClickListener {
 
-    public static String STORAGE_DIRECTORY_TYPE_NAME = "Recordings";
-
     private ActivityRecordingBinding binding;
 
     private MediaRecorder mRecorder;
@@ -44,13 +42,14 @@ public class RecordingActivity extends Activity implements View.OnClickListener
     private final CountDownLatch outputFileWrittenLatch = new CountDownLatch(1);
 
     private final Handler mHandler = new Handler();
-    private final Runnable mTickExecutor = new Runnable() {
+    private final Runnable mTickExecutor =
-        @Override
+            new Runnable() {
-        public void run() {
+                @Override
-            tick();
+                public void run() {
-            mHandler.postDelayed(mTickExecutor, 100);
+                    tick();
-        }
+                    mHandler.postDelayed(mTickExecutor, 100);
-    };
+                }
+            };
 
     private File mOutputFile;
 
@@ -68,7 +67,7 @@ public class RecordingActivity extends Activity implements View.OnClickListener
     }
 
     @Override
-    protected void onResume(){
+    protected void onResume() {
         super.onResume();
         SettingsUtils.applyScreenshotPreventionSetting(this);
     }
@@ -137,56 +136,69 @@ public class RecordingActivity extends Activity implements View.OnClickListener
             }
         }
         if (saveFile) {
-            new Thread(() -> {
+            new Thread(
-                try {
+                            () -> {
-                    if (!outputFileWrittenLatch.await(2, TimeUnit.SECONDS)) {
+                                try {
-                        Log.d(Config.LOGTAG, "time out waiting for output file to be written");
+                                    if (!outputFileWrittenLatch.await(2, TimeUnit.SECONDS)) {
-                    }
+                                        Log.d(
-                } catch (InterruptedException e) {
+                                                Config.LOGTAG,
-                    Log.d(Config.LOGTAG, "interrupted while waiting for output file to be written", e);
+                                                "time out waiting for output file to be written");
-                }
+                                    }
-                runOnUiThread(() -> {
+                                } catch (InterruptedException e) {
-                    setResult(Activity.RESULT_OK, new Intent().setData(Uri.fromFile(mOutputFile)));
+                                    Log.d(
-                    finish();
+                                            Config.LOGTAG,
-                });
+                                            "interrupted while waiting for output file to be written",
-            }).start();
+                                            e);
+                                }
+                                runOnUiThread(
+                                        () -> {
+                                            setResult(
+                                                    Activity.RESULT_OK,
+                                                    new Intent()
+                                                            .setData(Uri.fromFile(mOutputFile)));
+                                            finish();
+                                        });
+                            })
+                    .start();
         }
     }
 
-    private static File generateOutputFilename(Context context) {
+    private File generateOutputFilename() {
-        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd_HHmmssSSS", Locale.US);
+        final SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd_HHmmssSSS", Locale.US);
-        String filename = "RECORDING_" + dateFormat.format(new Date()) + ".m4a";
+        final String filename = "RECORDING_" + dateFormat.format(new Date()) + ".m4a";
-        return new File(FileBackend.getConversationsDirectory(context, STORAGE_DIRECTORY_TYPE_NAME) + "/" + filename);
+        final File parentDirectory;
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+            parentDirectory =
+                    Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_RECORDINGS);
+        } else {
+            parentDirectory =
+                    Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS);
+        }
+        final File conversationsDirectory = new File(parentDirectory, getString(R.string.app_name));
+        return new File(conversationsDirectory, filename);
     }
 
     private void setupOutputFile() {
-        mOutputFile = generateOutputFilename(this);
+        mOutputFile = generateOutputFilename();
-        File parentDirectory = mOutputFile.getParentFile();
+        final File parentDirectory = mOutputFile.getParentFile();
-        if (parentDirectory.mkdirs()) {
+        if (Objects.requireNonNull(parentDirectory).mkdirs()) {
             Log.d(Config.LOGTAG, "created " + parentDirectory.getAbsolutePath());
         }
-        File noMedia = new File(parentDirectory, ".nomedia");
-        if (!noMedia.exists()) {
-            try {
-                if (noMedia.createNewFile()) {
-                    Log.d(Config.LOGTAG, "created nomedia file in " + parentDirectory.getAbsolutePath());
-                }
-            } catch (IOException e) {
-                Log.d(Config.LOGTAG, "unable to create nomedia file in " + parentDirectory.getAbsolutePath(), e);
-            }
-        }
         setupFileObserver(parentDirectory);
     }
 
     private void setupFileObserver(File directory) {
-        mFileObserver = new FileObserver(directory.getAbsolutePath()) {
+        mFileObserver =
-            @Override
+                new FileObserver(directory.getAbsolutePath()) {
-            public void onEvent(int event, String s) {
+                    @Override
-                if (s != null && s.equals(mOutputFile.getName()) && event == FileObserver.CLOSE_WRITE) {
+                    public void onEvent(int event, String s) {
-                    outputFileWrittenLatch.countDown();
+                        if (s != null
-                }
+                                && s.equals(mOutputFile.getName())
-            }
+                                && event == FileObserver.CLOSE_WRITE) {
-        };
+                            outputFileWrittenLatch.countDown();
+                        }
+                    }
+                };
         mFileObserver.startWatching();
     }
 

src/main/java/eu/siacs/conversations/ui/SettingsActivity.java

@@ -224,7 +224,7 @@ public class SettingsActivity extends XmppActivity implements
 
 		final Preference createBackupPreference = mSettingsFragment.findPreference("create_backup");
 		if (createBackupPreference != null) {
-			createBackupPreference.setSummary(getString(R.string.pref_create_backup_summary, FileBackend.getBackupDirectory(this)));
+			createBackupPreference.setSummary(getString(R.string.pref_create_backup_summary, FileBackend.getBackupDirectory(this).getAbsolutePath()));
 			createBackupPreference.setOnPreferenceClickListener(preference -> {
 				if (hasStoragePermission(REQUEST_CREATE_BACKUP)) {
 					createBackup();

src/main/java/eu/siacs/conversations/ui/XmppActivity.java

@@ -71,10 +71,10 @@ import eu.siacs.conversations.entities.Message;
 import eu.siacs.conversations.entities.Presences;
 import eu.siacs.conversations.services.AvatarService;
 import eu.siacs.conversations.services.BarcodeProvider;
+import eu.siacs.conversations.services.EmojiInitializationService;
 import eu.siacs.conversations.services.QuickConversationsService;
 import eu.siacs.conversations.services.XmppConnectionService;
 import eu.siacs.conversations.services.XmppConnectionService.XmppConnectionBinder;
-import eu.siacs.conversations.ui.service.EmojiService;
 import eu.siacs.conversations.ui.util.MenuDoubleTabUtil;
 import eu.siacs.conversations.ui.util.PresenceSelector;
 import eu.siacs.conversations.ui.util.SoftKeyboardUtils;
@@ -408,7 +408,7 @@ public abstract class XmppActivity extends ActionBarActivity {
         super.onCreate(savedInstanceState);
         metrics = getResources().getDisplayMetrics();
         ExceptionHelper.init(getApplicationContext());
-        new EmojiService(this).init();
+        EmojiInitializationService.execute(this);
         this.isCameraFeatureAvailable = getPackageManager().hasSystemFeature(PackageManager.FEATURE_CAMERA_ANY);
         this.mTheme = findTheme();
         setTheme(this.mTheme);

src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java

@@ -23,7 +23,6 @@ import eu.siacs.conversations.ui.ConversationFragment;
 import eu.siacs.conversations.ui.XmppActivity;
 import eu.siacs.conversations.ui.util.AvatarWorkerTask;
 import eu.siacs.conversations.ui.util.StyledAttributes;
-import eu.siacs.conversations.utils.EmojiWrapper;
 import eu.siacs.conversations.utils.IrregularUnicodeDetector;
 import eu.siacs.conversations.utils.UIHelper;
 import eu.siacs.conversations.xmpp.Jid;
@@ -57,7 +56,7 @@ public class ConversationAdapter extends RecyclerView.Adapter<ConversationAdapte
         if (name instanceof Jid) {
             viewHolder.binding.conversationName.setText(IrregularUnicodeDetector.style(activity, (Jid) name));
         } else {
-            viewHolder.binding.conversationName.setText(EmojiWrapper.transform(name));
+            viewHolder.binding.conversationName.setText(name);
         }
 
         if (conversation == ConversationFragment.getConversation(activity)) {
@@ -85,7 +84,7 @@ public class ConversationAdapter extends RecyclerView.Adapter<ConversationAdapte
 
         if (draft != null) {
             viewHolder.binding.conversationLastmsgImg.setVisibility(View.GONE);
-            viewHolder.binding.conversationLastmsg.setText(EmojiWrapper.transform(draft.getMessage()));
+            viewHolder.binding.conversationLastmsg.setText(draft.getMessage());
             viewHolder.binding.senderName.setText(R.string.draft);
             viewHolder.binding.senderName.setVisibility(View.VISIBLE);
             viewHolder.binding.conversationLastmsg.setTypeface(null, Typeface.NORMAL);
@@ -128,7 +127,7 @@ public class ConversationAdapter extends RecyclerView.Adapter<ConversationAdapte
             }
             final Pair<CharSequence, Boolean> preview = UIHelper.getMessagePreview(activity, message, viewHolder.binding.conversationLastmsg.getCurrentTextColor());
             if (showPreviewText) {
-                viewHolder.binding.conversationLastmsg.setText(EmojiWrapper.transform(UIHelper.shorten(preview.first)));
+                viewHolder.binding.conversationLastmsg.setText(UIHelper.shorten(preview.first));
             } else {
                 viewHolder.binding.conversationLastmsgImg.setContentDescription(preview.first);
             }

src/main/java/eu/siacs/conversations/ui/adapter/ListItemAdapter.java

@@ -22,7 +22,6 @@ import eu.siacs.conversations.ui.SettingsActivity;
 import eu.siacs.conversations.ui.XmppActivity;
 import eu.siacs.conversations.ui.util.AvatarWorkerTask;
 import eu.siacs.conversations.ui.util.StyledAttributes;
-import eu.siacs.conversations.utils.EmojiWrapper;
 import eu.siacs.conversations.utils.IrregularUnicodeDetector;
 import eu.siacs.conversations.xmpp.Jid;
 
@@ -85,7 +84,7 @@ public class ListItemAdapter extends ArrayAdapter<ListItem> {
 		} else {
 			viewHolder.jid.setVisibility(View.GONE);
 		}
-		viewHolder.name.setText(EmojiWrapper.transform(item.getDisplayName()));
+		viewHolder.name.setText(item.getDisplayName());
 		AvatarWorkerTask.loadAvatar(item, viewHolder.avatar, R.dimen.avatar);
 		return view;
 	}

src/main/java/eu/siacs/conversations/ui/adapter/MediaAdapter.java

@@ -34,7 +34,7 @@ import eu.siacs.conversations.ui.util.ViewUtil;
 
 public class MediaAdapter extends RecyclerView.Adapter<MediaAdapter.MediaViewHolder> {
 
-    private static final List<String> DOCUMENT_MIMES = Arrays.asList(
+    public static final List<String> DOCUMENT_MIMES = Arrays.asList(
             "application/pdf",
             "application/vnd.oasis.opendocument.text",
             "application/msword",

src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java

@@ -67,7 +67,6 @@ import eu.siacs.conversations.ui.util.QuoteHelper;
 import eu.siacs.conversations.ui.util.ViewUtil;
 import eu.siacs.conversations.ui.widget.ClickableMovementMethod;
 import eu.siacs.conversations.utils.CryptoHelper;
-import eu.siacs.conversations.utils.EmojiWrapper;
 import eu.siacs.conversations.utils.Emoticons;
 import eu.siacs.conversations.utils.GeoHelper;
 import eu.siacs.conversations.utils.MessageUtils;
@@ -339,7 +338,7 @@ public class MessageAdapter extends ArrayAdapter<Message> {
         Spannable span = new SpannableString(body);
         float size = Emoticons.isEmoji(body) ? 3.0f : 2.0f;
         span.setSpan(new RelativeSizeSpan(size), 0, body.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
-        viewHolder.messageBody.setText(EmojiWrapper.transform(span));
+        viewHolder.messageBody.setText(span);
     }
 
     private void applyQuoteSpan(SpannableStringBuilder body, int start, int end, boolean darkBackground) {
@@ -510,7 +509,7 @@ public class MessageAdapter extends ArrayAdapter<Message> {
                 }
             }
             viewHolder.messageBody.setAutoLinkMask(0);
-            viewHolder.messageBody.setText(EmojiWrapper.transform(body));
+            viewHolder.messageBody.setText(body);
             viewHolder.messageBody.setMovementMethod(ClickableMovementMethod.getInstance());
         } else {
             viewHolder.messageBody.setText("");

src/main/java/eu/siacs/conversations/ui/util/ViewUtil.java

@@ -37,9 +37,10 @@ public class ViewUtil {
         view(context, file, mime);
     }
 
-    public static void view(Context context, File file, String mime) {
+    private static void view(Context context, File file, String mime) {
-        Intent openIntent = new Intent(Intent.ACTION_VIEW);
+        Log.d(Config.LOGTAG,"viewing "+file.getAbsolutePath()+" "+mime);
-        Uri uri;
+        final Intent openIntent = new Intent(Intent.ACTION_VIEW);
+        final Uri uri;
         try {
             uri = FileBackend.getUriForFile(context, file);
         } catch (SecurityException e) {
@@ -49,14 +50,9 @@ public class ViewUtil {
         }
         openIntent.setDataAndType(uri, mime);
         openIntent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
-        PackageManager manager = context.getPackageManager();
-        List<ResolveInfo> info = manager.queryIntentActivities(openIntent, 0);
-        if (info.size() == 0) {
-            openIntent.setDataAndType(uri, "*/*");
-        }
         try {
             context.startActivity(openIntent);
-        } catch (ActivityNotFoundException e) {
+        } catch (final ActivityNotFoundException e) {
             Toast.makeText(context, R.string.no_application_found_to_open_file, Toast.LENGTH_SHORT).show();
         }
     }

src/main/java/eu/siacs/conversations/ui/widget/EditMessage.java

@@ -15,6 +15,7 @@ import android.view.KeyEvent;
 import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputConnection;
 
+import androidx.appcompat.widget.AppCompatEditText;
 import androidx.core.view.inputmethod.EditorInfoCompat;
 import androidx.core.view.inputmethod.InputConnectionCompat;
 import androidx.core.view.inputmethod.InputContentInfoCompat;
@@ -26,7 +27,7 @@ import eu.siacs.conversations.Config;
 import eu.siacs.conversations.R;
 import eu.siacs.conversations.ui.util.QuoteHelper;
 
-public class EditMessage extends EmojiWrapperEditText {
+public class EditMessage extends AppCompatEditText {
 
     private static final InputFilter SPAN_FILTER = (source, start, end, dest, dstart, dend) -> source instanceof Spanned ? source.toString() : source;
     private final ExecutorService executor = Executors.newSingleThreadExecutor();

src/main/java/eu/siacs/conversations/utils/CryptoHelper.java

@@ -36,7 +36,7 @@ public final class CryptoHelper {
     public static final Pattern UUID_PATTERN = Pattern.compile("[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}");
     final public static byte[] ONE = new byte[]{0, 0, 0, 1};
     private static final char[] CHARS = "ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz123456789+-/#$!?".toCharArray();
-    private static final int PW_LENGTH = 10;
+    private static final int PW_LENGTH = 12;
     private static final char[] VOWELS = "aeiou".toCharArray();
     private static final char[] CONSONANTS = "bcfghjklmnpqrstvwxyz".toCharArray();
     private final static char[] hexArray = "0123456789abcdef".toCharArray();

src/main/java/eu/siacs/conversations/utils/FileWriterException.java

@@ -1,4 +1,14 @@
 package eu.siacs.conversations.utils;
 
+import java.io.File;
+
 public class FileWriterException extends Exception {
+
+    public FileWriterException(File file) {
+        super(String.format("Could not write to %s", file.getAbsolutePath()));
+    }
+
+    FileWriterException() {
+
+    }
 }

src/main/java/eu/siacs/conversations/utils/MimeUtils.java

@@ -568,11 +568,15 @@ public final class MimeUtils {
     }
 
     private static String getDisplayName(final Context context, final Uri uri) {
-        try (Cursor cursor = context.getContentResolver().query(uri, null, null, null, null)) {
+        try (final Cursor cursor = context.getContentResolver().query(uri, null, null, null, null)) {
             if (cursor != null && cursor.moveToFirst()) {
-                return cursor.getString(cursor.getColumnIndex(OpenableColumns.DISPLAY_NAME));
+                final int index = cursor.getColumnIndex(OpenableColumns.DISPLAY_NAME);
+                if (index == -1) {
+                    return null;
+                }
+                return cursor.getString(index);
             }
-        } catch (Exception e) {
+        } catch (final Exception e) {
             return null;
         }
         return null;

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

@@ -1,5 +1,7 @@
 package eu.siacs.conversations.xmpp.jingle;
 
+import androidx.annotation.NonNull;
+
 import com.google.common.base.MoreObjects;
 import com.google.common.base.Objects;
 import com.google.common.base.Preconditions;
@@ -110,6 +112,7 @@ public abstract class AbstractJingleConnection {
         }
 
         @Override
+        @NonNull
         public String toString() {
             return MoreObjects.toStringHelper(this)
                     .add("account", account.getJid())

src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnectionManager.java

@@ -52,14 +52,16 @@ import eu.siacs.conversations.xmpp.stanzas.IqPacket;
 import eu.siacs.conversations.xmpp.stanzas.MessagePacket;
 
 public class JingleConnectionManager extends AbstractConnectionManager {
-    static final ScheduledExecutorService SCHEDULED_EXECUTOR_SERVICE = Executors.newSingleThreadScheduledExecutor();
+    static final ScheduledExecutorService SCHEDULED_EXECUTOR_SERVICE =
+            Executors.newSingleThreadScheduledExecutor();
     final ToneManager toneManager;
-    private final HashMap<RtpSessionProposal, DeviceDiscoveryState> rtpSessionProposals = new HashMap<>();
+    private final HashMap<RtpSessionProposal, DeviceDiscoveryState> rtpSessionProposals =
-    private final ConcurrentHashMap<AbstractJingleConnection.Id, AbstractJingleConnection> connections = new ConcurrentHashMap<>();
+            new HashMap<>();
+    private final ConcurrentHashMap<AbstractJingleConnection.Id, AbstractJingleConnection>
+            connections = new ConcurrentHashMap<>();
 
-    private final Cache<PersistableSessionId, TerminatedRtpSession> terminatedSessions = CacheBuilder.newBuilder()
+    private final Cache<PersistableSessionId, TerminatedRtpSession> terminatedSessions =
-            .expireAfterWrite(24, TimeUnit.HOURS)
+            CacheBuilder.newBuilder().expireAfterWrite(24, TimeUnit.HOURS).build();
-            .build();
 
     private final HashMap<Jid, JingleCandidate> primaryCandidates = new HashMap<>();
 
@@ -87,17 +89,31 @@ public class JingleConnectionManager extends AbstractConnectionManager {
         } else if (packet.getAction() == JinglePacket.Action.SESSION_INITIATE) {
             final Jid from = packet.getFrom();
             final Content content = packet.getJingleContent();
-            final String descriptionNamespace = content == null ? null : content.getDescriptionNamespace();
+            final String descriptionNamespace =
+                    content == null ? null : content.getDescriptionNamespace();
             final AbstractJingleConnection connection;
             if (FileTransferDescription.NAMESPACES.contains(descriptionNamespace)) {
                 connection = new JingleFileTransferConnection(this, id, from);
-            } else if (Namespace.JINGLE_APPS_RTP.equals(descriptionNamespace) && isUsingClearNet(account)) {
+            } else if (Namespace.JINGLE_APPS_RTP.equals(descriptionNamespace)
-                final boolean sessionEnded = this.terminatedSessions.asMap().containsKey(PersistableSessionId.of(id));
+                    && isUsingClearNet(account)) {
-                final boolean stranger = isWithStrangerAndStrangerNotificationsAreOff(account, id.with);
+                final boolean sessionEnded =
+                        this.terminatedSessions.asMap().containsKey(PersistableSessionId.of(id));
+                final boolean stranger =
+                        isWithStrangerAndStrangerNotificationsAreOff(account, id.with);
                 if (isBusy() != null || sessionEnded || stranger) {
-                    Log.d(Config.LOGTAG, id.account.getJid().asBareJid() + ": rejected session with " + id.with + " because busy. sessionEnded=" + sessionEnded + ", stranger=" + stranger);
+                    Log.d(
-                    mXmppConnectionService.sendIqPacket(account, packet.generateResponse(IqPacket.TYPE.RESULT), null);
+                            Config.LOGTAG,
-                    final JinglePacket sessionTermination = new JinglePacket(JinglePacket.Action.SESSION_TERMINATE, id.sessionId);
+                            id.account.getJid().asBareJid()
+                                    + ": rejected session with "
+                                    + id.with
+                                    + " because busy. sessionEnded="
+                                    + sessionEnded
+                                    + ", stranger="
+                                    + stranger);
+                    mXmppConnectionService.sendIqPacket(
+                            account, packet.generateResponse(IqPacket.TYPE.RESULT), null);
+                    final JinglePacket sessionTermination =
+                            new JinglePacket(JinglePacket.Action.SESSION_TERMINATE, id.sessionId);
                     sessionTermination.setTo(id.with);
                     sessionTermination.setReason(Reason.BUSY, null);
                     mXmppConnectionService.sendIqPacket(account, sessionTermination, null);
@@ -105,7 +121,8 @@ public class JingleConnectionManager extends AbstractConnectionManager {
                 }
                 connection = new JingleRtpConnection(this, id, from);
             } else {
-                respondWithJingleError(account, packet, "unsupported-info", "feature-not-implemented", "cancel");
+                respondWithJingleError(
+                        account, packet, "unsupported-info", "feature-not-implemented", "cancel");
                 return;
             }
             connections.put(id, connection);
@@ -153,14 +170,17 @@ public class JingleConnectionManager extends AbstractConnectionManager {
         }
     }
 
-    private Optional<RtpSessionProposal> findMatchingSessionProposal(final Account account, final Jid with, final Set<Media> media) {
+    private Optional<RtpSessionProposal> findMatchingSessionProposal(
+            final Account account, final Jid with, final Set<Media> media) {
         synchronized (this.rtpSessionProposals) {
-            for (Map.Entry<RtpSessionProposal, DeviceDiscoveryState> entry : this.rtpSessionProposals.entrySet()) {
+            for (Map.Entry<RtpSessionProposal, DeviceDiscoveryState> entry :
+                    this.rtpSessionProposals.entrySet()) {
                 final RtpSessionProposal proposal = entry.getKey();
                 final DeviceDiscoveryState state = entry.getValue();
-                final boolean openProposal = state == DeviceDiscoveryState.DISCOVERED
+                final boolean openProposal =
-                        || state == DeviceDiscoveryState.SEARCHING
+                        state == DeviceDiscoveryState.DISCOVERED
-                        || state == DeviceDiscoveryState.SEARCHING_ACKNOWLEDGED;
+                                || state == DeviceDiscoveryState.SEARCHING
+                                || state == DeviceDiscoveryState.SEARCHING_ACKNOWLEDGED;
                 if (openProposal
                         && proposal.account == account
                         && proposal.with.equals(with.asBareJid())
@@ -190,7 +210,8 @@ public class JingleConnectionManager extends AbstractConnectionManager {
     }
 
     private boolean isWithStrangerAndStrangerNotificationsAreOff(final Account account, Jid with) {
-        final boolean notifyForStrangers = mXmppConnectionService.getNotificationService().notificationsFromStrangers();
+        final boolean notifyForStrangers =
+                mXmppConnectionService.getNotificationService().notificationsFromStrangers();
         if (notifyForStrangers) {
             return false;
         }
@@ -198,11 +219,17 @@ public class JingleConnectionManager extends AbstractConnectionManager {
         return !contact.showInContactList();
     }
 
-    ScheduledFuture<?> schedule(final Runnable runnable, final long delay, final TimeUnit timeUnit) {
+    ScheduledFuture<?> schedule(
+            final Runnable runnable, final long delay, final TimeUnit timeUnit) {
         return SCHEDULED_EXECUTOR_SERVICE.schedule(runnable, delay, timeUnit);
     }
 
-    void respondWithJingleError(final Account account, final IqPacket original, String jingleCondition, String condition, String conditionType) {
+    void respondWithJingleError(
+            final Account account,
+            final IqPacket original,
+            String jingleCondition,
+            String condition,
+            String conditionType) {
         final IqPacket response = original.generateResponse(IqPacket.TYPE.ERROR);
         final Element error = response.addChild("error");
         error.setAttribute("type", conditionType);
@@ -211,7 +238,14 @@ public class JingleConnectionManager extends AbstractConnectionManager {
         account.getXmppConnection().sendIqPacket(response, null);
     }
 
-    public void deliverMessage(final Account account, final Jid to, final Jid from, final Element message, String remoteMsgId, String serverMsgId, long timestamp) {
+    public void deliverMessage(
+            final Account account,
+            final Jid to,
+            final Jid from,
+            final Element message,
+            String remoteMsgId,
+            String serverMsgId,
+            long timestamp) {
         Preconditions.checkArgument(Namespace.JINGLE_MESSAGE.equals(message.getNamespace()));
         final String sessionId = message.getAttribute("id");
         if (sessionId == null) {
@@ -245,16 +279,24 @@ public class JingleConnectionManager extends AbstractConnectionManager {
         final AbstractJingleConnection existingJingleConnection = connections.get(id);
         if (existingJingleConnection != null) {
             if (existingJingleConnection instanceof JingleRtpConnection) {
-                ((JingleRtpConnection) existingJingleConnection).deliveryMessage(from, message, serverMsgId, timestamp);
+                ((JingleRtpConnection) existingJingleConnection)
+                        .deliveryMessage(from, message, serverMsgId, timestamp);
             } else {
-                Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": " + existingJingleConnection.getClass().getName() + " does not support jingle messages");
+                Log.d(
+                        Config.LOGTAG,
+                        account.getJid().asBareJid()
+                                + ": "
+                                + existingJingleConnection.getClass().getName()
+                                + " does not support jingle messages");
             }
             return;
         }
 
         if (fromSelf) {
             if ("proceed".equals(message.getName())) {
-                final Conversation c = mXmppConnectionService.findOrCreateConversation(account, id.with, false, false);
+                final Conversation c =
+                        mXmppConnectionService.findOrCreateConversation(
+                                account, id.with, false, false);
                 final Message previousBusy = c.findRtpSession(sessionId, Message.STATUS_RECEIVED);
                 if (previousBusy != null) {
                     previousBusy.setBody(new RtpSessionStatus(true, 0).toString());
@@ -263,45 +305,72 @@ public class JingleConnectionManager extends AbstractConnectionManager {
                     }
                     previousBusy.setTime(timestamp);
                     mXmppConnectionService.updateMessage(previousBusy, true);
-                    Log.d(Config.LOGTAG, id.account.getJid().asBareJid() + ": updated previous busy because call got picked up by another device");
+                    Log.d(
+                            Config.LOGTAG,
+                            id.account.getJid().asBareJid()
+                                    + ": updated previous busy because call got picked up by another device");
                     return;
                 }
             }
-            //TODO handle reject for cases where we don’t have carbon copies (normally reject is to be sent to own bare jid as well)
+            // TODO handle reject for cases where we don’t have carbon copies (normally reject is to
-            Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": ignore jingle message from self");
+            // be sent to own bare jid as well)
+            Log.d(
+                    Config.LOGTAG,
+                    account.getJid().asBareJid() + ": ignore jingle message from self");
             return;
         }
 
         if ("propose".equals(message.getName())) {
             final Propose propose = Propose.upgrade(message);
             final List<GenericDescription> descriptions = propose.getDescriptions();
-            final Collection<RtpDescription> rtpDescriptions = Collections2.transform(
+            final Collection<RtpDescription> rtpDescriptions =
-                    Collections2.filter(descriptions, d -> d instanceof RtpDescription),
+                    Collections2.transform(
-                    input -> (RtpDescription) input
+                            Collections2.filter(descriptions, d -> d instanceof RtpDescription),
-            );
+                            input -> (RtpDescription) input);
-            if (rtpDescriptions.size() > 0 && rtpDescriptions.size() == descriptions.size() && isUsingClearNet(account)) {
+            if (rtpDescriptions.size() > 0
-                final Collection<Media> media = Collections2.transform(rtpDescriptions, RtpDescription::getMedia);
+                    && rtpDescriptions.size() == descriptions.size()
+                    && isUsingClearNet(account)) {
+                final Collection<Media> media =
+                        Collections2.transform(rtpDescriptions, RtpDescription::getMedia);
                 if (media.contains(Media.UNKNOWN)) {
-                    Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": encountered unknown media in session proposal. " + propose);
+                    Log.d(
+                            Config.LOGTAG,
+                            account.getJid().asBareJid()
+                                    + ": encountered unknown media in session proposal. "
+                                    + propose);
                     return;
                 }
-                final Optional<RtpSessionProposal> matchingSessionProposal = findMatchingSessionProposal(account, id.with, ImmutableSet.copyOf(media));
+                final Optional<RtpSessionProposal> matchingSessionProposal =
+                        findMatchingSessionProposal(account, id.with, ImmutableSet.copyOf(media));
                 if (matchingSessionProposal.isPresent()) {
                     final String ourSessionId = matchingSessionProposal.get().sessionId;
                     final String theirSessionId = id.sessionId;
                     if (ComparisonChain.start()
-                            .compare(ourSessionId, theirSessionId)
+                                    .compare(ourSessionId, theirSessionId)
-                            .compare(account.getJid().toEscapedString(), id.with.toEscapedString())
+                                    .compare(
-                            .result() > 0) {
+                                            account.getJid().toEscapedString(),
-                        Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": our session lost tie break. automatically accepting their session. winning Session=" + theirSessionId);
+                                            id.with.toEscapedString())
-                        //TODO a retract for this reason should probably include some indication of tie break
+                                    .result()
+                            > 0) {
+                        Log.d(
+                                Config.LOGTAG,
+                                account.getJid().asBareJid()
+                                        + ": our session lost tie break. automatically accepting their session. winning Session="
+                                        + theirSessionId);
+                        // TODO a retract for this reason should probably include some indication of
+                        // tie break
                         retractSessionProposal(matchingSessionProposal.get());
-                        final JingleRtpConnection rtpConnection = new JingleRtpConnection(this, id, from);
+                        final JingleRtpConnection rtpConnection =
+                                new JingleRtpConnection(this, id, from);
                         this.connections.put(id, rtpConnection);
                         rtpConnection.setProposedMedia(ImmutableSet.copyOf(media));
                         rtpConnection.deliveryMessage(from, message, serverMsgId, timestamp);
                     } else {
-                        Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": our session won tie break. waiting for other party to accept. winningSession=" + ourSessionId);
+                        Log.d(
+                                Config.LOGTAG,
+                                account.getJid().asBareJid()
+                                        + ": our session won tie break. waiting for other party to accept. winningSession="
+                                        + ourSessionId);
                     }
                     return;
                 }
@@ -309,38 +378,63 @@ public class JingleConnectionManager extends AbstractConnectionManager {
                 if (isBusy() != null || stranger) {
                     writeLogMissedIncoming(account, id.with.asBareJid(), id.sessionId, serverMsgId, timestamp);
                     if (stranger) {
-                        Log.d(Config.LOGTAG, id.account.getJid().asBareJid() + ": ignoring call proposal from stranger " + id.with);
+                        Log.d(
+                                Config.LOGTAG,
+                                id.account.getJid().asBareJid()
+                                        + ": ignoring call proposal from stranger "
+                                        + id.with);
                         return;
                     }
                     final int activeDevices = account.activeDevicesWithRtpCapability();
                     Log.d(Config.LOGTAG, "active devices with rtp capability: " + activeDevices);
                     if (activeDevices == 0) {
-                        final MessagePacket reject = mXmppConnectionService.getMessageGenerator().sessionReject(from, sessionId);
+                        final MessagePacket reject =
+                                mXmppConnectionService
+                                        .getMessageGenerator()
+                                        .sessionReject(from, sessionId);
                         mXmppConnectionService.sendMessagePacket(account, reject);
                     } else {
-                        Log.d(Config.LOGTAG, id.account.getJid().asBareJid() + ": ignoring proposal because busy on this device but there are other devices");
+                        Log.d(
+                                Config.LOGTAG,
+                                id.account.getJid().asBareJid()
+                                        + ": ignoring proposal because busy on this device but there are other devices");
                     }
                 } else {
-                    final JingleRtpConnection rtpConnection = new JingleRtpConnection(this, id, from);
+                    final JingleRtpConnection rtpConnection =
+                            new JingleRtpConnection(this, id, from);
                     this.connections.put(id, rtpConnection);
                     rtpConnection.setProposedMedia(ImmutableSet.copyOf(media));
                     rtpConnection.deliveryMessage(from, message, serverMsgId, timestamp);
                 }
             } else {
-                Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": unable to react to proposed session with " + rtpDescriptions.size() + " rtp descriptions of " + descriptions.size() + " total descriptions");
+                Log.d(
+                        Config.LOGTAG,
+                        account.getJid().asBareJid()
+                                + ": unable to react to proposed session with "
+                                + rtpDescriptions.size()
+                                + " rtp descriptions of "
+                                + descriptions.size()
+                                + " total descriptions");
             }
         } else if (addressedDirectly && "proceed".equals(message.getName())) {
             synchronized (rtpSessionProposals) {
-                final RtpSessionProposal proposal = getRtpSessionProposal(account, from.asBareJid(), sessionId);
+                final RtpSessionProposal proposal =
+                        getRtpSessionProposal(account, from.asBareJid(), sessionId);
                 if (proposal != null) {
                     rtpSessionProposals.remove(proposal);
-                    final JingleRtpConnection rtpConnection = new JingleRtpConnection(this, id, account.getJid());
+                    final JingleRtpConnection rtpConnection =
+                            new JingleRtpConnection(this, id, account.getJid());
                     rtpConnection.setProposedMedia(proposal.media);
                     this.connections.put(id, rtpConnection);
                     rtpConnection.transitionOrThrow(AbstractJingleConnection.State.PROPOSED);
                     rtpConnection.deliveryMessage(from, message, serverMsgId, timestamp);
                 } else {
-                    Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": no rtp session proposal found for " + from + " to deliver proceed");
+                    Log.d(
+                            Config.LOGTAG,
+                            account.getJid().asBareJid()
+                                    + ": no rtp session proposal found for "
+                                    + from
+                                    + " to deliver proceed");
                     if (remoteMsgId == null) {
                         return;
                     }
@@ -356,63 +450,77 @@ public class JingleConnectionManager extends AbstractConnectionManager {
                 }
             }
         } else if (addressedDirectly && "reject".equals(message.getName())) {
-            final RtpSessionProposal proposal = getRtpSessionProposal(account, from.asBareJid(), sessionId);
+            final RtpSessionProposal proposal =
+                    getRtpSessionProposal(account, from.asBareJid(), sessionId);
             synchronized (rtpSessionProposals) {
                 if (proposal != null && rtpSessionProposals.remove(proposal) != null) {
-                    writeLogMissedOutgoing(account, proposal.with, proposal.sessionId, serverMsgId, timestamp);
+                    writeLogMissedOutgoing(
+                            account, proposal.with, proposal.sessionId, serverMsgId, timestamp);
                     toneManager.transition(RtpEndUserState.DECLINED_OR_BUSY, proposal.media);
-                    mXmppConnectionService.notifyJingleRtpConnectionUpdate(account, proposal.with, proposal.sessionId, RtpEndUserState.DECLINED_OR_BUSY);
+                    mXmppConnectionService.notifyJingleRtpConnectionUpdate(
+                            account,
+                            proposal.with,
+                            proposal.sessionId,
+                            RtpEndUserState.DECLINED_OR_BUSY);
                 } else {
-                    Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": no rtp session proposal found for " + from + " to deliver reject");
+                    Log.d(
+                            Config.LOGTAG,
+                            account.getJid().asBareJid()
+                                    + ": no rtp session proposal found for "
+                                    + from
+                                    + " to deliver reject");
                 }
             }
         } else {
-            Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": retrieved out of order jingle message" + message);
+            Log.d(
+                    Config.LOGTAG,
+                    account.getJid().asBareJid()
+                            + ": retrieved out of order jingle message"
+                            + message);
         }
-
     }
 
-    private RtpSessionProposal getRtpSessionProposal(final Account account, Jid from, String sessionId) {
+    private RtpSessionProposal getRtpSessionProposal(
+            final Account account, Jid from, String sessionId) {
         for (RtpSessionProposal rtpSessionProposal : rtpSessionProposals.keySet()) {
-            if (rtpSessionProposal.sessionId.equals(sessionId) && rtpSessionProposal.with.equals(from) && rtpSessionProposal.account.getJid().equals(account.getJid())) {
+            if (rtpSessionProposal.sessionId.equals(sessionId)
+                    && rtpSessionProposal.with.equals(from)
+                    && rtpSessionProposal.account.getJid().equals(account.getJid())) {
                 return rtpSessionProposal;
             }
         }
         return null;
     }
 
-    private void writeLogMissedOutgoing(final Account account, Jid with, final String sessionId, String serverMsgId, long timestamp) {
+    private void writeLogMissedOutgoing(
-        final Conversation conversation = mXmppConnectionService.findOrCreateConversation(
+            final Account account,
-                account,
+            Jid with,
-                with.asBareJid(),
+            final String sessionId,
-                false,
+            String serverMsgId,
-                false
+            long timestamp) {
-        );
+        final Conversation conversation =
-        final Message message = new Message(
+                mXmppConnectionService.findOrCreateConversation(
-                conversation,
+                        account, with.asBareJid(), false, false);
-                Message.STATUS_SEND,
+        final Message message =
-                Message.TYPE_RTP_SESSION,
+                new Message(conversation, Message.STATUS_SEND, Message.TYPE_RTP_SESSION, sessionId);
-                sessionId
-        );
         message.setBody(new RtpSessionStatus(false, 0).toString());
         message.setServerMsgId(serverMsgId);
         message.setTime(timestamp);
         writeMessage(message);
     }
 
-    private void writeLogMissedIncoming(final Account account, Jid with, final String sessionId, String serverMsgId, long timestamp) {
+    private void writeLogMissedIncoming(
-        final Conversation conversation = mXmppConnectionService.findOrCreateConversation(
+            final Account account,
-                account,
+            Jid with,
-                with.asBareJid(),
+            final String sessionId,
-                false,
+            String serverMsgId,
-                false
+            long timestamp) {
-        );
+        final Conversation conversation =
-        final Message message = new Message(
+                mXmppConnectionService.findOrCreateConversation(
-                conversation,
+                        account, with.asBareJid(), false, false);
-                Message.STATUS_RECEIVED,
+        final Message message =
-                Message.TYPE_RTP_SESSION,
+                new Message(
-                sessionId
+                        conversation, Message.STATUS_RECEIVED, Message.TYPE_RTP_SESSION, sessionId);
-        );
         message.setBody(new RtpSessionStatus(false, 0).toString());
         message.setServerMsgId(serverMsgId);
         message.setTime(timestamp);
@@ -431,34 +539,41 @@ public class JingleConnectionManager extends AbstractConnectionManager {
     }
 
     public void startJingleFileTransfer(final Message message) {
-        Preconditions.checkArgument(message.isFileOrImage(), "Message is not of type file or image");
+        Preconditions.checkArgument(
+                message.isFileOrImage(), "Message is not of type file or image");
         final Transferable old = message.getTransferable();
         if (old != null) {
             old.cancel();
         }
         final Account account = message.getConversation().getAccount();
         final AbstractJingleConnection.Id id = AbstractJingleConnection.Id.of(message);
-        final JingleFileTransferConnection connection = new JingleFileTransferConnection(this, id, account.getJid());
+        final JingleFileTransferConnection connection =
+                new JingleFileTransferConnection(this, id, account.getJid());
         mXmppConnectionService.markMessage(message, Message.STATUS_WAITING);
         this.connections.put(id, connection);
         connection.init(message);
     }
 
     public Optional<OngoingRtpSession> getOngoingRtpConnection(final Contact contact) {
-        for (final Map.Entry<AbstractJingleConnection.Id, AbstractJingleConnection> entry : this.connections.entrySet()) {
+        for (final Map.Entry<AbstractJingleConnection.Id, AbstractJingleConnection> entry :
+                this.connections.entrySet()) {
             if (entry.getValue() instanceof JingleRtpConnection) {
                 final AbstractJingleConnection.Id id = entry.getKey();
-                if (id.account == contact.getAccount() && id.with.asBareJid().equals(contact.getJid().asBareJid())) {
+                if (id.account == contact.getAccount()
+                        && id.with.asBareJid().equals(contact.getJid().asBareJid())) {
                     return Optional.of(id);
                 }
             }
         }
         synchronized (this.rtpSessionProposals) {
-            for (Map.Entry<RtpSessionProposal, DeviceDiscoveryState> entry : this.rtpSessionProposals.entrySet()) {
+            for (Map.Entry<RtpSessionProposal, DeviceDiscoveryState> entry :
+                    this.rtpSessionProposals.entrySet()) {
                 RtpSessionProposal proposal = entry.getKey();
-                if (proposal.account == contact.getAccount() && contact.getJid().asBareJid().equals(proposal.with)) {
+                if (proposal.account == contact.getAccount()
+                        && contact.getJid().asBareJid().equals(proposal.with)) {
                     final DeviceDiscoveryState preexistingState = entry.getValue();
-                    if (preexistingState != null && preexistingState != DeviceDiscoveryState.FAILED) {
+                    if (preexistingState != null
+                            && preexistingState != DeviceDiscoveryState.FAILED) {
                         return Optional.of(proposal);
                     }
                 }
@@ -474,7 +589,8 @@ public class JingleConnectionManager extends AbstractConnectionManager {
     void finishConnectionOrThrow(final AbstractJingleConnection connection) {
         final AbstractJingleConnection.Id id = connection.getId();
         if (this.connections.remove(id) == null) {
-            throw new IllegalStateException(String.format("Unable to finish connection with id=%s", id.toString()));
+            throw new IllegalStateException(
+                    String.format("Unable to finish connection with id=%s", id.toString()));
         }
     }
 
@@ -493,49 +609,70 @@ public class JingleConnectionManager extends AbstractConnectionManager {
         return firedUpdates;
     }
 
-    void getPrimaryCandidate(final Account account, final boolean initiator, final OnPrimaryCandidateFound listener) {
+    void getPrimaryCandidate(
+            final Account account,
+            final boolean initiator,
+            final OnPrimaryCandidateFound listener) {
         if (Config.DISABLE_PROXY_LOOKUP) {
             listener.onPrimaryCandidateFound(false, null);
             return;
         }
         if (!this.primaryCandidates.containsKey(account.getJid().asBareJid())) {
-            final Jid proxy = account.getXmppConnection().findDiscoItemByFeature(Namespace.BYTE_STREAMS);
+            final Jid proxy =
+                    account.getXmppConnection().findDiscoItemByFeature(Namespace.BYTE_STREAMS);
             if (proxy != null) {
                 IqPacket iq = new IqPacket(IqPacket.TYPE.GET);
                 iq.setTo(proxy);
                 iq.query(Namespace.BYTE_STREAMS);
-                account.getXmppConnection().sendIqPacket(iq, new OnIqPacketReceived() {
+                account.getXmppConnection()
+                        .sendIqPacket(
+                                iq,
+                                new OnIqPacketReceived() {
 
-                    @Override
+                                    @Override
-                    public void onIqPacketReceived(Account account, IqPacket packet) {
+                                    public void onIqPacketReceived(
-                        final Element streamhost = packet.query().findChild("streamhost", Namespace.BYTE_STREAMS);
+                                            Account account, IqPacket packet) {
-                        final String host = streamhost == null ? null : streamhost.getAttribute("host");
+                                        final Element streamhost =
-                        final String port = streamhost == null ? null : streamhost.getAttribute("port");
+                                                packet.query()
-                        if (host != null && port != null) {
+                                                        .findChild(
-                            try {
+                                                                "streamhost",
-                                JingleCandidate candidate = new JingleCandidate(nextRandomId(), true);
+                                                                Namespace.BYTE_STREAMS);
-                                candidate.setHost(host);
+                                        final String host =
-                                candidate.setPort(Integer.parseInt(port));
+                                                streamhost == null
-                                candidate.setType(JingleCandidate.TYPE_PROXY);
+                                                        ? null
-                                candidate.setJid(proxy);
+                                                        : streamhost.getAttribute("host");
-                                candidate.setPriority(655360 + (initiator ? 30 : 0));
+                                        final String port =
-                                primaryCandidates.put(account.getJid().asBareJid(), candidate);
+                                                streamhost == null
-                                listener.onPrimaryCandidateFound(true, candidate);
+                                                        ? null
-                            } catch (final NumberFormatException e) {
+                                                        : streamhost.getAttribute("port");
-                                listener.onPrimaryCandidateFound(false, null);
+                                        if (host != null && port != null) {
-                            }
+                                            try {
-                        } else {
+                                                JingleCandidate candidate =
-                            listener.onPrimaryCandidateFound(false, null);
+                                                        new JingleCandidate(nextRandomId(), true);
-                        }
+                                                candidate.setHost(host);
-                    }
+                                                candidate.setPort(Integer.parseInt(port));
-                });
+                                                candidate.setType(JingleCandidate.TYPE_PROXY);
+                                                candidate.setJid(proxy);
+                                                candidate.setPriority(
+                                                        655360 + (initiator ? 30 : 0));
+                                                primaryCandidates.put(
+                                                        account.getJid().asBareJid(), candidate);
+                                                listener.onPrimaryCandidateFound(true, candidate);
+                                            } catch (final NumberFormatException e) {
+                                                listener.onPrimaryCandidateFound(false, null);
+                                            }
+                                        } else {
+                                            listener.onPrimaryCandidateFound(false, null);
+                                        }
+                                    }
+                                });
             } else {
                 listener.onPrimaryCandidateFound(false, null);
             }
 
         } else {
-            listener.onPrimaryCandidateFound(true,
+            listener.onPrimaryCandidateFound(
-                    this.primaryCandidates.get(account.getJid().asBareJid()));
+                    true, this.primaryCandidates.get(account.getJid().asBareJid()));
         }
     }
 
@@ -557,16 +694,28 @@ public class JingleConnectionManager extends AbstractConnectionManager {
     private void retractSessionProposal(RtpSessionProposal rtpSessionProposal) {
         final Account account = rtpSessionProposal.account;
         toneManager.transition(RtpEndUserState.ENDED, rtpSessionProposal.media);
-        Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": retracting rtp session proposal with " + rtpSessionProposal.with);
+        Log.d(
+                Config.LOGTAG,
+                account.getJid().asBareJid()
+                        + ": retracting rtp session proposal with "
+                        + rtpSessionProposal.with);
         this.rtpSessionProposals.remove(rtpSessionProposal);
-        final MessagePacket messagePacket = mXmppConnectionService.getMessageGenerator().sessionRetract(rtpSessionProposal);
+        final MessagePacket messagePacket =
-        writeLogMissedOutgoing(account, rtpSessionProposal.with, rtpSessionProposal.sessionId, null, System.currentTimeMillis());
+                mXmppConnectionService.getMessageGenerator().sessionRetract(rtpSessionProposal);
+        writeLogMissedOutgoing(
+                account,
+                rtpSessionProposal.with,
+                rtpSessionProposal.sessionId,
+                null,
+                System.currentTimeMillis());
         mXmppConnectionService.sendMessagePacket(account, messagePacket);
     }
 
-    public String initializeRtpSession(final Account account, final Jid with, final Set<Media> media) {
+    public String initializeRtpSession(
+            final Account account, final Jid with, final Set<Media> media) {
         final AbstractJingleConnection.Id id = AbstractJingleConnection.Id.of(account, with);
-        final JingleRtpConnection rtpConnection = new JingleRtpConnection(this, id, account.getJid());
+        final JingleRtpConnection rtpConnection =
+                new JingleRtpConnection(this, id, account.getJid());
         rtpConnection.setProposedMedia(media);
         this.connections.put(id, rtpConnection);
         rtpConnection.sendSessionInitiate();
@@ -575,11 +724,13 @@ public class JingleConnectionManager extends AbstractConnectionManager {
 
     public String proposeJingleRtpSession(final Account account, final Jid with, final Set<Media> media) {
         synchronized (this.rtpSessionProposals) {
-            for (Map.Entry<RtpSessionProposal, DeviceDiscoveryState> entry : this.rtpSessionProposals.entrySet()) {
+            for (Map.Entry<RtpSessionProposal, DeviceDiscoveryState> entry :
+                    this.rtpSessionProposals.entrySet()) {
                 RtpSessionProposal proposal = entry.getKey();
                 if (proposal.account == account && with.asBareJid().equals(proposal.with)) {
                     final DeviceDiscoveryState preexistingState = entry.getValue();
-                    if (preexistingState != null && preexistingState != DeviceDiscoveryState.FAILED) {
+                    if (preexistingState != null
+                            && preexistingState != DeviceDiscoveryState.FAILED) {
                         final RtpEndUserState endUserState = preexistingState.toEndUserState();
                         toneManager.transition(endUserState, media);
                         mXmppConnectionService.notifyJingleRtpConnectionUpdate(
@@ -601,15 +752,13 @@ public class JingleConnectionManager extends AbstractConnectionManager {
                 }
                 throw new IllegalStateException("There is already a running RTP session: " + busyCode);
             }
-            final RtpSessionProposal proposal = RtpSessionProposal.of(account, with.asBareJid(), media);
+            final RtpSessionProposal proposal =
+                    RtpSessionProposal.of(account, with.asBareJid(), media);
             this.rtpSessionProposals.put(proposal, DeviceDiscoveryState.SEARCHING);
             mXmppConnectionService.notifyJingleRtpConnectionUpdate(
-                    account,
+                    account, proposal.with, proposal.sessionId, RtpEndUserState.FINDING_DEVICE);
-                    proposal.with,
+            final MessagePacket messagePacket =
-                    proposal.sessionId,
+                    mXmppConnectionService.getMessageGenerator().sessionProposal(proposal);
-                    RtpEndUserState.FINDING_DEVICE
-            );
-            final MessagePacket messagePacket = mXmppConnectionService.getMessageGenerator().sessionProposal(proposal);
             mXmppConnectionService.sendMessagePacket(account, messagePacket);
             return proposal.sessionId;
         }
@@ -617,7 +766,8 @@ public class JingleConnectionManager extends AbstractConnectionManager {
 
     public boolean hasMatchingProposal(final Account account, final Jid with) {
         synchronized (this.rtpSessionProposals) {
-            for (Map.Entry<RtpSessionProposal, DeviceDiscoveryState> entry : this.rtpSessionProposals.entrySet()) {
+            for (Map.Entry<RtpSessionProposal, DeviceDiscoveryState> entry :
+                    this.rtpSessionProposals.entrySet()) {
                 final RtpSessionProposal proposal = entry.getKey();
                 if (proposal.account == account && with.asBareJid().equals(proposal.with)) {
                     return true;
@@ -646,10 +796,12 @@ public class JingleConnectionManager extends AbstractConnectionManager {
         if (sid != null) {
             for (final AbstractJingleConnection connection : this.connections.values()) {
                 if (connection instanceof JingleFileTransferConnection) {
-                    final JingleFileTransferConnection fileTransfer = (JingleFileTransferConnection) connection;
+                    final JingleFileTransferConnection fileTransfer =
+                            (JingleFileTransferConnection) connection;
                     final JingleTransport transport = fileTransfer.getTransport();
                     if (transport instanceof JingleInBandTransport) {
-                        final JingleInBandTransport inBandTransport = (JingleInBandTransport) transport;
+                        final JingleInBandTransport inBandTransport =
+                                (JingleInBandTransport) transport;
                         if (inBandTransport.matches(account, sid)) {
                             inBandTransport.deliverPayload(packet, payload);
                         }
@@ -659,7 +811,8 @@ public class JingleConnectionManager extends AbstractConnectionManager {
             }
         }
         Log.d(Config.LOGTAG, "unable to deliver ibb packet: " + packet.toString());
-        account.getXmppConnection().sendIqPacket(packet.generateResponse(IqPacket.TYPE.ERROR), null);
+        account.getXmppConnection()
+                .sendIqPacket(packet.generateResponse(IqPacket.TYPE.ERROR), null);
     }
 
     public void notifyRebound(final Account account) {
@@ -672,8 +825,10 @@ public class JingleConnectionManager extends AbstractConnectionManager {
         }
     }
 
-    public WeakReference<JingleRtpConnection> findJingleRtpConnection(Account account, Jid with, String sessionId) {
+    public WeakReference<JingleRtpConnection> findJingleRtpConnection(
-        final AbstractJingleConnection.Id id = AbstractJingleConnection.Id.of(account, with, sessionId);
+            Account account, Jid with, String sessionId) {
+        final AbstractJingleConnection.Id id =
+                AbstractJingleConnection.Id.of(account, with, sessionId);
         final AbstractJingleConnection connection = connections.get(id);
         if (connection instanceof JingleRtpConnection) {
             return new WeakReference<>((JingleRtpConnection) connection);
@@ -683,34 +838,53 @@ public class JingleConnectionManager extends AbstractConnectionManager {
 
     private void resendSessionProposals(final Account account) {
         synchronized (this.rtpSessionProposals) {
-            for (final Map.Entry<RtpSessionProposal, DeviceDiscoveryState> entry : this.rtpSessionProposals.entrySet()) {
+            for (final Map.Entry<RtpSessionProposal, DeviceDiscoveryState> entry :
+                    this.rtpSessionProposals.entrySet()) {
                 final RtpSessionProposal proposal = entry.getKey();
-                if (entry.getValue() == DeviceDiscoveryState.SEARCHING && proposal.account == account) {
+                if (entry.getValue() == DeviceDiscoveryState.SEARCHING
-                    Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": resending session proposal to " + proposal.with);
+                        && proposal.account == account) {
-                    final MessagePacket messagePacket = mXmppConnectionService.getMessageGenerator().sessionProposal(proposal);
+                    Log.d(
+                            Config.LOGTAG,
+                            account.getJid().asBareJid()
+                                    + ": resending session proposal to "
+                                    + proposal.with);
+                    final MessagePacket messagePacket =
+                            mXmppConnectionService.getMessageGenerator().sessionProposal(proposal);
                     mXmppConnectionService.sendMessagePacket(account, messagePacket);
                 }
             }
         }
     }
 
-    public void updateProposedSessionDiscovered(Account account, Jid from, String sessionId, final DeviceDiscoveryState target) {
+    public void updateProposedSessionDiscovered(
+            Account account, Jid from, String sessionId, final DeviceDiscoveryState target) {
         synchronized (this.rtpSessionProposals) {
-            final RtpSessionProposal sessionProposal = getRtpSessionProposal(account, from.asBareJid(), sessionId);
+            final RtpSessionProposal sessionProposal =
-            final DeviceDiscoveryState currentState = sessionProposal == null ? null : rtpSessionProposals.get(sessionProposal);
+                    getRtpSessionProposal(account, from.asBareJid(), sessionId);
+            final DeviceDiscoveryState currentState =
+                    sessionProposal == null ? null : rtpSessionProposals.get(sessionProposal);
             if (currentState == null) {
                 Log.d(Config.LOGTAG, "unable to find session proposal for session id " + sessionId);
                 return;
             }
             if (currentState == DeviceDiscoveryState.DISCOVERED) {
-                Log.d(Config.LOGTAG, "session proposal already at discovered. not going to fall back");
+                Log.d(
+                        Config.LOGTAG,
+                        "session proposal already at discovered. not going to fall back");
                 return;
             }
             this.rtpSessionProposals.put(sessionProposal, target);
             final RtpEndUserState endUserState = target.toEndUserState();
             toneManager.transition(endUserState, sessionProposal.media);
-            mXmppConnectionService.notifyJingleRtpConnectionUpdate(account, sessionProposal.with, sessionProposal.sessionId, endUserState);
+            mXmppConnectionService.notifyJingleRtpConnectionUpdate(
-            Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": flagging session " + sessionId + " as " + target);
+                    account, sessionProposal.with, sessionProposal.sessionId, endUserState);
+            Log.d(
+                    Config.LOGTAG,
+                    account.getJid().asBareJid()
+                            + ": flagging session "
+                            + sessionId
+                            + " as "
+                            + target);
         }
     }
 
@@ -735,7 +909,8 @@ public class JingleConnectionManager extends AbstractConnectionManager {
     }
 
     public void failProceed(Account account, final Jid with, String sessionId) {
-        final AbstractJingleConnection.Id id = AbstractJingleConnection.Id.of(account, with, sessionId);
+        final AbstractJingleConnection.Id id =
+                AbstractJingleConnection.Id.of(account, with, sessionId);
         final AbstractJingleConnection existingJingleConnection = connections.get(id);
         if (existingJingleConnection instanceof JingleRtpConnection) {
             ((JingleRtpConnection) existingJingleConnection).deliverFailedProceed();
@@ -746,13 +921,17 @@ public class JingleConnectionManager extends AbstractConnectionManager {
         if (connections.containsValue(connection)) {
             return;
         }
-        final IllegalStateException e = new IllegalStateException("JingleConnection has not been registered with connection manager");
+        final IllegalStateException e =
+                new IllegalStateException(
+                        "JingleConnection has not been registered with connection manager");
         Log.e(Config.LOGTAG, "ensureConnectionIsRegistered() failed. Going to throw", e);
         throw e;
     }
 
-    void setTerminalSessionState(AbstractJingleConnection.Id id, final RtpEndUserState state, final Set<Media> media) {
+    void setTerminalSessionState(
-        this.terminatedSessions.put(PersistableSessionId.of(id), new TerminatedRtpSession(state, media));
+            AbstractJingleConnection.Id id, final RtpEndUserState state, final Set<Media> media) {
+        this.terminatedSessions.put(
+                PersistableSessionId.of(id), new TerminatedRtpSession(state, media));
     }
 
     public TerminatedRtpSession getTerminalSessionState(final Jid with, final String sessionId) {
@@ -777,8 +956,7 @@ public class JingleConnectionManager extends AbstractConnectionManager {
             if (this == o) return true;
             if (o == null || getClass() != o.getClass()) return false;
             PersistableSessionId that = (PersistableSessionId) o;
-            return Objects.equal(with, that.with) &&
+            return Objects.equal(with, that.with) && Objects.equal(sessionId, that.sessionId);
-                    Objects.equal(sessionId, that.sessionId);
         }
 
         @Override
@@ -798,7 +976,10 @@ public class JingleConnectionManager extends AbstractConnectionManager {
     }
 
     public enum DeviceDiscoveryState {
-        SEARCHING, SEARCHING_ACKNOWLEDGED, DISCOVERED, FAILED;
+        SEARCHING,
+        SEARCHING_ACKNOWLEDGED,
+        DISCOVERED,
+        FAILED;
 
         public RtpEndUserState toEndUserState() {
             switch (this) {
@@ -839,9 +1020,9 @@ public class JingleConnectionManager extends AbstractConnectionManager {
             if (this == o) return true;
             if (o == null || getClass() != o.getClass()) return false;
             RtpSessionProposal proposal = (RtpSessionProposal) o;
-            return Objects.equal(account.getJid(), proposal.account.getJid()) &&
+            return Objects.equal(account.getJid(), proposal.account.getJid())
-                    Objects.equal(with, proposal.with) &&
+                    && Objects.equal(with, proposal.with)
-                    Objects.equal(sessionId, proposal.sessionId);
+                    && Objects.equal(sessionId, proposal.sessionId);
         }
 
         @Override

src/main/java/eu/siacs/conversations/xmpp/jingle/JingleFileTransferConnection.java

@@ -492,19 +492,19 @@ public class JingleFileTransferConnection extends AbstractJingleConnection imple
                 AbstractConnectionManager.Extension extension = AbstractConnectionManager.Extension.of(path);
                 if (VALID_IMAGE_EXTENSIONS.contains(extension.main)) {
                     message.setType(Message.TYPE_IMAGE);
-                    message.setRelativeFilePath(message.getUuid() + "." + extension.main);
+                    xmppConnectionService.getFileBackend().setupRelativeFilePath(message, message.getUuid() + "." + extension.main);
                 } else if (VALID_CRYPTO_EXTENSIONS.contains(extension.main)) {
                     if (VALID_IMAGE_EXTENSIONS.contains(extension.secondary)) {
                         message.setType(Message.TYPE_IMAGE);
-                        message.setRelativeFilePath(message.getUuid() + "." + extension.secondary);
+                        xmppConnectionService.getFileBackend().setupRelativeFilePath(message,message.getUuid() + "." + extension.secondary);
                     } else {
                         message.setType(Message.TYPE_FILE);
-                        message.setRelativeFilePath(message.getUuid() + (extension.secondary != null ? ("." + extension.secondary) : ""));
+                        xmppConnectionService.getFileBackend().setupRelativeFilePath(message,message.getUuid() + (extension.secondary != null ? ("." + extension.secondary) : ""));
                     }
                     message.setEncryption(Message.ENCRYPTION_PGP);
                 } else {
                     message.setType(Message.TYPE_FILE);
-                    message.setRelativeFilePath(message.getUuid() + (extension.main != null ? ("." + extension.main) : ""));
+                    xmppConnectionService.getFileBackend().setupRelativeFilePath(message,message.getUuid() + (extension.main != null ? ("." + extension.main) : ""));
                 }
                 long size = parseLong(fileSize, 0);
                 message.setBody(Long.toString(size));

src/main/java/eu/siacs/conversations/xmpp/jingle/RtpContentMap.java

@@ -16,7 +16,6 @@ import org.checkerframework.checker.nullness.compatqual.NullableDecl;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 import java.util.Set;
 
 import eu.siacs.conversations.xmpp.jingle.stanzas.Content;
@@ -39,7 +38,8 @@ public class RtpContentMap {
     }
 
     public static RtpContentMap of(final JinglePacket jinglePacket) {
-        final Map<String, DescriptionTransport> contents = DescriptionTransport.of(jinglePacket.getJingleContents());
+        final Map<String, DescriptionTransport> contents =
+                DescriptionTransport.of(jinglePacket.getJingleContents());
         if (isOmemoVerified(contents)) {
             return new OmemoVerifiedRtpContentMap(jinglePacket.getGroup(), contents);
         } else {
@@ -62,22 +62,30 @@ public class RtpContentMap {
     }
 
     public static RtpContentMap of(final SessionDescription sessionDescription) {
-        final ImmutableMap.Builder<String, DescriptionTransport> contentMapBuilder = new ImmutableMap.Builder<>();
+        final ImmutableMap.Builder<String, DescriptionTransport> contentMapBuilder =
+                new ImmutableMap.Builder<>();
         for (SessionDescription.Media media : sessionDescription.media) {
             final String id = Iterables.getFirst(media.attributes.get("mid"), null);
             Preconditions.checkNotNull(id, "media has no mid");
             contentMapBuilder.put(id, DescriptionTransport.of(sessionDescription, media));
         }
-        final String groupAttribute = Iterables.getFirst(sessionDescription.attributes.get("group"), null);
+        final String groupAttribute =
+                Iterables.getFirst(sessionDescription.attributes.get("group"), null);
         final Group group = groupAttribute == null ? null : Group.ofSdpString(groupAttribute);
         return new RtpContentMap(group, contentMapBuilder.build());
     }
 
     public Set<Media> getMedia() {
-        return Sets.newHashSet(Collections2.transform(contents.values(), input -> {
+        return Sets.newHashSet(
-            final RtpDescription rtpDescription = input == null ? null : input.description;
+                Collections2.transform(
-            return rtpDescription == null ? Media.UNKNOWN : input.description.getMedia();
+                        contents.values(),
-        }));
+                        input -> {
+                            final RtpDescription rtpDescription =
+                                    input == null ? null : input.description;
+                            return rtpDescription == null
+                                    ? Media.UNKNOWN
+                                    : input.description.getMedia();
+                        }));
     }
 
     public List<String> getNames() {
@@ -90,7 +98,8 @@ public class RtpContentMap {
         }
         for (Map.Entry<String, DescriptionTransport> entry : this.contents.entrySet()) {
             if (entry.getValue().description == null) {
-                throw new IllegalStateException(String.format("%s is lacking content description", entry.getKey()));
+                throw new IllegalStateException(
+                        String.format("%s is lacking content description", entry.getKey()));
             }
         }
     }
@@ -106,15 +115,24 @@ public class RtpContentMap {
         for (Map.Entry<String, DescriptionTransport> entry : this.contents.entrySet()) {
             final IceUdpTransportInfo transport = entry.getValue().transport;
             final IceUdpTransportInfo.Fingerprint fingerprint = transport.getFingerprint();
-            if (fingerprint == null || Strings.isNullOrEmpty(fingerprint.getContent()) || Strings.isNullOrEmpty(fingerprint.getHash())) {
+            if (fingerprint == null
-                throw new SecurityException(String.format("Use of DTLS-SRTP (XEP-0320) is required for content %s", entry.getKey()));
+                    || Strings.isNullOrEmpty(fingerprint.getContent())
+                    || Strings.isNullOrEmpty(fingerprint.getHash())) {
+                throw new SecurityException(
+                        String.format(
+                                "Use of DTLS-SRTP (XEP-0320) is required for content %s",
+                                entry.getKey()));
             }
             final IceUdpTransportInfo.Setup setup = fingerprint.getSetup();
             if (setup == null) {
-                throw new SecurityException(String.format("Use of DTLS-SRTP (XEP-0320) is required for content %s but missing setup attribute", entry.getKey()));
+                throw new SecurityException(
+                        String.format(
+                                "Use of DTLS-SRTP (XEP-0320) is required for content %s but missing setup attribute",
+                                entry.getKey()));
             }
             if (requireActPass && setup != IceUdpTransportInfo.Setup.ACTPASS) {
-                 throw new SecurityException("Initiator needs to offer ACTPASS as setup for DTLS-SRTP (XEP-0320)");
+                throw new SecurityException(
+                        "Initiator needs to offer ACTPASS as setup for DTLS-SRTP (XEP-0320)");
             }
         }
     }
@@ -135,41 +153,66 @@ public class RtpContentMap {
         return jinglePacket;
     }
 
-    RtpContentMap transportInfo(final String contentName, final IceUdpTransportInfo.Candidate candidate) {
+    RtpContentMap transportInfo(
+            final String contentName, final IceUdpTransportInfo.Candidate candidate) {
         final RtpContentMap.DescriptionTransport descriptionTransport = contents.get(contentName);
-        final IceUdpTransportInfo transportInfo = descriptionTransport == null ? null : descriptionTransport.transport;
+        final IceUdpTransportInfo transportInfo =
+                descriptionTransport == null ? null : descriptionTransport.transport;
         if (transportInfo == null) {
-            throw new IllegalArgumentException("Unable to find transport info for content name " + contentName);
+            throw new IllegalArgumentException(
+                    "Unable to find transport info for content name " + contentName);
         }
         final IceUdpTransportInfo newTransportInfo = transportInfo.cloneWrapper();
         newTransportInfo.addChild(candidate);
-        return new RtpContentMap(null, ImmutableMap.of(contentName, new DescriptionTransport(null, newTransportInfo)));
+        return new RtpContentMap(
+                null,
+                ImmutableMap.of(contentName, new DescriptionTransport(null, newTransportInfo)));
     }
 
     RtpContentMap transportInfo() {
         return new RtpContentMap(
                 null,
-                Maps.transformValues(contents, dt -> new DescriptionTransport(null, dt.transport.cloneWrapper()))
+                Maps.transformValues(
-        );
+                        contents,
+                        dt -> new DescriptionTransport(null, dt.transport.cloneWrapper())));
     }
 
-    public IceUdpTransportInfo.Credentials getCredentials() {
+    public IceUdpTransportInfo.Credentials getDistinctCredentials() {
-        final Set<IceUdpTransportInfo.Credentials> allCredentials = ImmutableSet.copyOf(Collections2.transform(
+        final Set<IceUdpTransportInfo.Credentials> allCredentials = getCredentials();
-                contents.values(),
+        final IceUdpTransportInfo.Credentials credentials =
-                dt -> dt.transport.getCredentials()
+                Iterables.getFirst(allCredentials, null);
-        ));
-        final IceUdpTransportInfo.Credentials credentials = Iterables.getFirst(allCredentials, null);
         if (allCredentials.size() == 1 && credentials != null) {
             return credentials;
         }
         throw new IllegalStateException("Content map does not have distinct credentials");
     }
 
+    public Set<IceUdpTransportInfo.Credentials> getCredentials() {
+        final Set<IceUdpTransportInfo.Credentials> credentials =
+                ImmutableSet.copyOf(
+                        Collections2.transform(
+                                contents.values(), dt -> dt.transport.getCredentials()));
+        if (credentials.isEmpty()) {
+            throw new IllegalStateException("Content map does not have any credentials");
+        }
+        return credentials;
+    }
+
+    public IceUdpTransportInfo.Credentials getCredentials(final String contentName) {
+        final DescriptionTransport descriptionTransport = this.contents.get(contentName);
+        if (descriptionTransport == null) {
+            throw new IllegalArgumentException(
+                    String.format(
+                            "Unable to find transport info for content name %s", contentName));
+        }
+        return descriptionTransport.transport.getCredentials();
+    }
+
     public IceUdpTransportInfo.Setup getDtlsSetup() {
-        final Set<IceUdpTransportInfo.Setup> setups = ImmutableSet.copyOf(Collections2.transform(
+        final Set<IceUdpTransportInfo.Setup> setups =
-                contents.values(),
+                ImmutableSet.copyOf(
-                dt -> dt.transport.getFingerprint().getSetup()
+                        Collections2.transform(
-        ));
+                                contents.values(), dt -> dt.transport.getFingerprint().getSetup()));
         final IceUdpTransportInfo.Setup setup = Iterables.getFirst(setups, null);
         if (setups.size() == 1 && setup != null) {
             return setup;
@@ -185,13 +228,18 @@ public class RtpContentMap {
         return count == 0;
     }
 
-    public RtpContentMap modifiedCredentials(IceUdpTransportInfo.Credentials credentials, final IceUdpTransportInfo.Setup setup) {
+    public RtpContentMap modifiedCredentials(
-        final ImmutableMap.Builder<String, DescriptionTransport> contentMapBuilder = new ImmutableMap.Builder<>();
+            IceUdpTransportInfo.Credentials credentials, final IceUdpTransportInfo.Setup setup) {
+        final ImmutableMap.Builder<String, DescriptionTransport> contentMapBuilder =
+                new ImmutableMap.Builder<>();
         for (final Map.Entry<String, DescriptionTransport> content : contents.entrySet()) {
             final RtpDescription rtpDescription = content.getValue().description;
             IceUdpTransportInfo transportInfo = content.getValue().transport;
-            final IceUdpTransportInfo modifiedTransportInfo = transportInfo.modifyCredentials(credentials, setup);
+            final IceUdpTransportInfo modifiedTransportInfo =
-            contentMapBuilder.put(content.getKey(), new DescriptionTransport(rtpDescription, modifiedTransportInfo));
+                    transportInfo.modifyCredentials(credentials, setup);
+            contentMapBuilder.put(
+                    content.getKey(),
+                    new DescriptionTransport(rtpDescription, modifiedTransportInfo));
         }
         return new RtpContentMap(this.group, contentMapBuilder.build());
     }
@@ -200,7 +248,8 @@ public class RtpContentMap {
         public final RtpDescription description;
         public final IceUdpTransportInfo transport;
 
-        public DescriptionTransport(final RtpDescription description, final IceUdpTransportInfo transport) {
+        public DescriptionTransport(
+                final RtpDescription description, final IceUdpTransportInfo transport) {
             this.description = description;
             this.transport = transport;
         }
@@ -215,33 +264,38 @@ public class RtpContentMap {
             } else if (description instanceof RtpDescription) {
                 rtpDescription = (RtpDescription) description;
             } else {
-                throw new UnsupportedApplicationException("Content does not contain rtp description");
+                throw new UnsupportedApplicationException(
+                        "Content does not contain rtp description");
             }
             if (transportInfo instanceof IceUdpTransportInfo) {
                 iceUdpTransportInfo = (IceUdpTransportInfo) transportInfo;
             } else {
-                throw new UnsupportedTransportException("Content does not contain ICE-UDP transport");
+                throw new UnsupportedTransportException(
+                        "Content does not contain ICE-UDP transport");
             }
             return new DescriptionTransport(
-                    rtpDescription,
+                    rtpDescription, OmemoVerifiedIceUdpTransportInfo.upgrade(iceUdpTransportInfo));
-                    OmemoVerifiedIceUdpTransportInfo.upgrade(iceUdpTransportInfo)
-            );
         }
 
-        public static DescriptionTransport of(final SessionDescription sessionDescription, final SessionDescription.Media media) {
+        public static DescriptionTransport of(
+                final SessionDescription sessionDescription, final SessionDescription.Media media) {
             final RtpDescription rtpDescription = RtpDescription.of(sessionDescription, media);
-            final IceUdpTransportInfo transportInfo = IceUdpTransportInfo.of(sessionDescription, media);
+            final IceUdpTransportInfo transportInfo =
+                    IceUdpTransportInfo.of(sessionDescription, media);
             return new DescriptionTransport(rtpDescription, transportInfo);
         }
 
         public static Map<String, DescriptionTransport> of(final Map<String, Content> contents) {
-            return ImmutableMap.copyOf(Maps.transformValues(contents, new Function<Content, DescriptionTransport>() {
+            return ImmutableMap.copyOf(
-                @NullableDecl
+                    Maps.transformValues(
-                @Override
+                            contents,
-                public DescriptionTransport apply(@NullableDecl Content content) {
+                            new Function<Content, DescriptionTransport>() {
-                    return content == null ? null : of(content);
+                                @NullableDecl
-                }
+                                @Override
-            }));
+                                public DescriptionTransport apply(@NullableDecl Content content) {
+                                    return content == null ? null : of(content);
+                                }
+                            }));
         }
     }
 

src/main/java/eu/siacs/conversations/xmpp/jingle/stanzas/IceUdpTransportInfo.java

@@ -1,5 +1,7 @@
 package eu.siacs.conversations.xmpp.jingle.stanzas;
 
+import androidx.annotation.NonNull;
+
 import com.google.common.base.Joiner;
 import com.google.common.base.MoreObjects;
 import com.google.common.base.Objects;
@@ -123,6 +125,7 @@ public class IceUdpTransportInfo extends GenericTransportInfo {
         }
 
         @Override
+        @NonNull
         public String toString() {
             return MoreObjects.toStringHelper(this)
                     .add("ufrag", ufrag)

src/main/res/layout/activity_muc_details.xml

@@ -106,7 +106,7 @@
                                             app:errorTextAppearance="@style/TextAppearance.Conversations.Design.Error"
                                             app:hintTextAppearance="@style/TextAppearance.Conversations.Design.Hint">
 
-                                            <eu.siacs.conversations.ui.widget.EmojiWrapperEditText
+                                            <EditText
                                                 android:id="@+id/muc_edit_title"
                                                 android:layout_width="match_parent"
                                                 android:layout_height="wrap_content"
@@ -120,7 +120,7 @@
                                             app:errorTextAppearance="@style/TextAppearance.Conversations.Design.Error"
                                             app:hintTextAppearance="@style/TextAppearance.Conversations.Design.Hint">
 
-                                            <eu.siacs.conversations.ui.widget.EmojiWrapperEditText
+                                            <EditText
                                                 android:id="@+id/muc_edit_subject"
                                                 android:layout_width="match_parent"
                                                 android:layout_height="wrap_content"

src/main/res/layout/activity_rtp_session.xml

@@ -55,23 +55,21 @@
                 android:layout_marginLeft="16dp"
                 android:layout_marginTop="0dp"
                 android:layout_marginRight="16dp"
-                android:layout_marginBottom="16dp"
+                android:layout_marginBottom="8dp"
                 android:textAppearance="@style/TextAppearance.Conversations.Display2"
                 android:textColor="@color/white"
                 tools:text="Juliet Capulet" />
-
             <TextView
                 android:id="@+id/with_jid"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_below="@id/with"
+                android:layout_below="@id/status"
                 android:layout_marginLeft="16dp"
-                android:layout_marginTop="0dp"
                 android:layout_marginRight="16dp"
                 android:layout_marginBottom="32dp"
-                android:textAppearance="@style/TextAppearance.Conversations.Title"
+                android:textAppearance="@style/TextAppearance.Conversations.Body1"
                 android:textColor="@color/white"
-                tools:text="juliet@capulet.lit" />
+                tools:text="jcapulet@example.com" />
 
         </com.google.android.material.appbar.AppBarLayout>
 
@@ -256,5 +254,15 @@
                 app:tint="?attr/icon_tint" />
         </RelativeLayout>
 
+        <TextView
+            android:id="@+id/using_account"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentBottom="true"
+            android:layout_alignParentEnd="true"
+            android:layout_margin="8dp"
+            android:text="@string/using_account"
+            android:textAppearance="@style/TextAppearance.Conversations.Caption"/>
+
     </RelativeLayout>
 </layout>

src/main/res/layout/create_conference_dialog.xml

@@ -28,7 +28,7 @@
             app:errorTextAppearance="@style/TextAppearance.Conversations.Design.Error"
             app:hintTextAppearance="@style/TextAppearance.Conversations.Design.Hint">
 
-            <eu.siacs.conversations.ui.widget.EmojiWrapperEditText
+            <EditText
                 android:id="@+id/group_chat_name"
                 style="@style/Widget.Conversations.EditText"
                 android:layout_width="match_parent"

src/main/res/layout/create_public_channel_dialog.xml

@@ -26,7 +26,7 @@
             app:errorTextAppearance="@style/TextAppearance.Conversations.Design.Error"
             app:hintTextAppearance="@style/TextAppearance.Conversations.Design.Hint">
 
-            <eu.siacs.conversations.ui.widget.EmojiWrapperEditText
+            <EditText
                 android:id="@+id/group_chat_name"
                 style="@style/Widget.Conversations.EditText"
                 android:layout_width="match_parent"

src/main/res/layout/dialog_quickedit.xml

@@ -16,7 +16,7 @@
             app:errorTextAppearance="@style/TextAppearance.Conversations.Design.Error"
             app:hintTextAppearance="@style/TextAppearance.Conversations.Design.Hint">
 
-            <eu.siacs.conversations.ui.widget.EmojiWrapperEditText
+            <EditText
                 android:id="@+id/input_edit_text"
                 style="@style/Widget.Conversations.EditText"
                 android:layout_width="match_parent"
@@ -25,7 +25,7 @@
                 android:inputType="textPersonName">
 
                 <requestFocus/>
-            </eu.siacs.conversations.ui.widget.EmojiWrapperEditText>
+            </EditText>
 
         </com.google.android.material.textfield.TextInputLayout>
     </LinearLayout>

src/main/res/values-bg/strings.xml

@@ -965,5 +965,4 @@
     <string name="backup_started_message">Създаването на резервно копие е стартирано. Ще получите известие, когато приключи.</string>
     <string name="unable_to_enable_video">Видеото не може да бъде включено.</string>
     <string name="plain_text_document">Обикновен текстов документ</string>
-
+    </resources>
-</resources>

src/main/res/values-da-rDK/strings.xml

@@ -968,5 +968,4 @@
     <string name="backup_started_message">Sikkerhedskopieringen er startet. Du får en notifikation, når den er afsluttet.</string>
     <string name="unable_to_enable_video">Kunne ikke aktivere video.</string>
     <string name="plain_text_document">Ren tekstdokument</string>
-
+    </resources>
-</resources>

src/main/res/values-de/strings.xml

@@ -968,5 +968,4 @@
     <string name="backup_started_message">Die Sicherung wurde gestartet. Du bekommst eine Benachrichtigung, sobald sie fertig ist.</string>
     <string name="unable_to_enable_video">Video kann nicht aktiviert werden.</string>
     <string name="plain_text_document">Textdokument</string>
-
+    </resources>
-</resources>

src/main/res/values-es/strings.xml

@@ -968,5 +968,4 @@
     <string name="backup_started_message">La copia de seguridad ha empezado. Recibirás una notificación cuando se haya completado.</string>
     <string name="unable_to_enable_video">No se ha podido habilitar el vídeo.</string>
     <string name="plain_text_document">Documento de texto plano</string>
-
+    </resources>
-</resources>

src/main/res/values-fi/strings.xml

@@ -914,5 +914,4 @@
     <string name="backup_started_message">Varmuuskopion teko aloitettu. Saat ilmoituksen kun se on valmis.</string>
     <string name="unable_to_enable_video">Videon käyttöönotto epäonnistui</string>
     <string name="plain_text_document">Perustekstiasiakirja</string>
-
+    </resources>
-</resources>

src/main/res/values-gl/strings.xml

@@ -479,7 +479,7 @@
     <string name="pref_show_connection_options">Axustes ampliados de conexión</string>
     <string name="pref_show_connection_options_summary">Mostar axustes de servidor e porto cando se configura unha conta</string>
     <string name="hostname_example">xmpp.exemplo.com</string>
-    <string name="action_add_account_with_certificate">Conéctate con certificado</string>
+    <string name="action_add_account_with_certificate">Accede con certificado</string>
     <string name="unable_to_parse_certificate">Non se puido procesar o certificado</string>
     <string name="mam_prefs">Gardando axustes</string>
     <string name="server_side_mam_prefs">Axustes de gardado no servidor</string>
@@ -968,5 +968,4 @@
     <string name="backup_started_message">Comezou a creación da copia de apoio. Recibirás unha notificación cando remate.</string>
     <string name="unable_to_enable_video">Non se puido activar o vídeo.</string>
     <string name="plain_text_document">Documento de texto plano</string>
-
+    </resources>
-</resources>

src/main/res/values-it/strings.xml

@@ -968,5 +968,4 @@
     <string name="backup_started_message">Il backup è iniziato. Riceverai una notifica una volta completato.</string>
     <string name="unable_to_enable_video">Impossibile attivare il video.</string>
     <string name="plain_text_document">Documento di testo</string>
-
+    </resources>
-</resources>

src/main/res/values-ja/strings.xml

@@ -950,5 +950,4 @@
     <string name="backup_started_message">バックアップを開始しました。 バックアップが完了すると通知が届きます。</string>
     <string name="unable_to_enable_video">映像を有効化できません。</string>
     <string name="plain_text_document">プレーンテキスト文書</string>
-
+    </resources>
-</resources>

src/main/res/values-pl/strings.xml

@@ -431,7 +431,7 @@
     <string name="offering_x_file">Oferowanie %s</string>
     <string name="hide_offline">Ukryj niedostępnych</string>
     <string name="contact_is_typing">%s pisze...</string>
-    <string name="contact_has_stopped_typing">%s przestał(a) pisać</string>
+    <string name="contact_has_stopped_typing">%s już nie pisze </string>
     <string name="contacts_are_typing">%s piszą...</string>
     <string name="contacts_have_stopped_typing">%s przestali pisać</string>
     <string name="pref_chat_states">Powiadomienia pisania</string>
@@ -995,5 +995,4 @@ Administrator twojego serwera będzie mógł czytać twoje wiadomości, ale moż
     <string name="backup_started_message">Tworzenie kopii zapasowej się rozpoczęło. Dostaniesz powiadomienie kiedy się zakończy. </string>
     <string name="unable_to_enable_video">Nie można włączyć wideo. </string>
     <string name="plain_text_document">Dokument zwykłego tekstu</string>
-
+    </resources>
-</resources>

src/main/res/values-pt-rBR/strings.xml

@@ -968,5 +968,4 @@
     <string name="backup_started_message">O backup foi iniciado. Você receberá uma notificação assim que ele for concluído.</string>
     <string name="unable_to_enable_video">Não foi possível habilitar o vídeo.</string>
     <string name="plain_text_document">Documento em texto puro</string>
-
+    </resources>
-</resources>

src/main/res/values-ro-rRO/strings.xml

@@ -981,5 +981,4 @@
     <string name="backup_started_message">Se creează copia de siguranță. Veți primi o notificare când acesta este completă.</string>
     <string name="unable_to_enable_video">Nu s-a putut activa camera video.</string>
     <string name="plain_text_document">Document text</string>
-
+    </resources>
-</resources>

src/main/res/values-ru/strings.xml

@@ -993,5 +993,4 @@
     <string name="backup_started_message">Резервное копирование было начато. Вы получите уведомление, как только оно будет завершено. </string>
     <string name="unable_to_enable_video">Невозможно включить видео.</string>
     <string name="plain_text_document">Текстовые данные</string>
-
+    </resources>
-</resources>

src/main/res/values-sv/strings.xml

@@ -537,6 +537,7 @@
     <string name="security_error_invalid_file_access">Säkerhetsfel: Ogiltig filåtkomst!</string>
     <string name="no_application_to_share_uri">Ingen applikation hittades för att dela URI</string>
     <string name="share_uri_with">Dela URI med...</string>
+    <string name="agree_and_continue">Acceptera och gå vidare</string>
     <string name="your_full_jid_will_be">Din fullständiga XMPP-adress kommer att vara: %s</string>
     <string name="create_account">Skapa konto</string>
     <string name="use_own_provider">Använd min egen leverantör</string>
@@ -662,7 +663,9 @@
     <string name="yesterday">Igår</string>
     <string name="pref_validate_hostname">Bekräfta värdnamn med DNSSEC</string>
     <string name="certificate_does_not_contain_jid">Certifikatet innehåller ej en XMPP-adress</string>
+    <string name="server_info_partial">delvis</string>
     <string name="attach_record_video">Spela in video</string>
+    <string name="copy_to_clipboard">Kopiera till urklipp</string>
     <string name="message_copied_to_clipboard">Meddelande kopierat till urklipp</string>
     <string name="message">Meddelande</string>
     <string name="mtm_accept_cert">Godkänn okänt certifikat?</string>

src/main/res/values-tr-rTR/strings.xml

@@ -968,5 +968,4 @@
     <string name="backup_started_message">Yedekleme başlatıldı. Tamamlandığı zaman bir bildirim alacaksınız.</string>
     <string name="unable_to_enable_video">Video etkinleştirilemedi</string>
     <string name="plain_text_document">Düz metin dosyası</string>
-
+    </resources>
-</resources>

src/main/res/values-vi/strings.xml

@@ -955,5 +955,4 @@
     <string name="backup_started_message">Việc sao lưu đã được bắt đầu. Bạn sẽ nhận một thông báo khi việc đó đã hoàn tất.</string>
     <string name="unable_to_enable_video">Không thể bật video.</string>
     <string name="plain_text_document">Tài liệu văn bản thuần</string>
-
+    </resources>
-</resources>

src/main/res/values-zh-rCN/strings.xml

@@ -955,5 +955,4 @@
     <string name="backup_started_message">已启动备份。一旦完成，你会收到通知。</string>
     <string name="unable_to_enable_video">无法启用视频</string>
     <string name="plain_text_document">纯文本文档</string>
-
+    </resources>
-</resources>

src/main/res/values/about.xml

@@ -31,7 +31,7 @@
 <resources>
     <string name="pref_about_message" translatable="false">
 			Conversations • the very last word in instant messaging.
-			\n\nCopyright © 2014-2021 Daniel Gultsch
+			\n\nCopyright © 2014-2022 Daniel Gultsch
 			\n\nThis program is free software: you can redistribute it and/or modify
 			it under the terms of the GNU General Public License as published by
 			the Free Software Foundation, either version 3 of the License, or

src/playstore/java/eu/siacs/conversations/services/EmojiInitializationService.java

@@ -0,0 +1,10 @@
+package eu.siacs.conversations.services;
+
+import android.content.Context;
+
+public class EmojiInitializationService {
+
+    public static void execute(final Context context) {
+
+    }
+}

src/playstoreCompat/java/eu/siacs/conversations/ui/service/EmojiService.java

@@ -1,55 +0,0 @@
-package eu.siacs.conversations.ui.service;
-
-import android.content.Context;
-import android.os.Build;
-import android.util.Log;
-
-import androidx.core.provider.FontRequest;
-import androidx.emoji.text.EmojiCompat;
-import androidx.emoji.text.FontRequestEmojiCompatConfig;
-
-import eu.siacs.conversations.Config;
-import eu.siacs.conversations.R;
-
-public class EmojiService {
-
-
-    private final EmojiCompat.InitCallback initCallback = new EmojiCompat.InitCallback() {
-        @Override
-        public void onInitialized() {
-            super.onInitialized();
-            Log.d(Config.LOGTAG, "EmojiService succeeded in loading fonts");
-
-        }
-
-        @Override
-        public void onFailed(Throwable throwable) {
-            super.onFailed(throwable);
-            Log.d(Config.LOGTAG, "EmojiService failed to load fonts", throwable);
-        }
-    };
-
-    private final Context context;
-
-    public EmojiService(Context context) {
-        this.context = context;
-    }
-
-    public void init() {
-        final FontRequest fontRequest = new FontRequest(
-                "com.google.android.gms.fonts",
-                "com.google.android.gms",
-                "Noto Color Emoji Compat",
-                R.array.font_certs);
-        FontRequestEmojiCompatConfig fontRequestEmojiCompatConfig = new FontRequestEmojiCompatConfig(context, fontRequest);
-        fontRequestEmojiCompatConfig.registerInitCallback(initCallback);
-        //On recent Androids we assume to have the latest emojis
-        //there are some annoying bugs with emoji compat that make it a safer choice not to use it when possible
-        // a) when using the ondemand emoji font (play store) flags don’t work
-        // b) the text preview has annoying glitches when the cut of text contains emojis (the emoji will be half visible)
-        // c) can trigger a hardware rendering bug https://issuetracker.google.com/issues/67102093
-        fontRequestEmojiCompatConfig.setReplaceAll(Build.VERSION.SDK_INT < Build.VERSION_CODES.O);
-        EmojiCompat.init(fontRequestEmojiCompatConfig);
-    }
-
-}

src/playstoreCompat/res/values/font_certs.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string-array name="font_certs">
-        <item>MIIEQzCCAyugAwIBAgIJAMLgh0ZkSjCNMA0GCSqGSIb3DQEBBAUAMHQxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1Nb3VudGFpbiBWaWV3MRQwEgYDVQQKEwtHb29nbGUgSW5jLjEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDAeFw0wODA4MjEyMzEzMzRaFw0zNjAxMDcyMzEzMzRaMHQxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1Nb3VudGFpbiBWaWV3MRQwEgYDVQQKEwtHb29nbGUgSW5jLjEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDCCASAwDQYJKoZIhvcNAQEBBQADggENADCCAQgCggEBAKtWLgDYO6IIrgqWbxJOKdoR8qtW0I9Y4sypEwPpt1TTcvZApxsdyxMJZ2JORland2qSGT2y5b+3JKkedxiLDmpHpDsz2WCbdxgxRczfey5YZnTJ4VZbH0xqWVW/8lGmPav5xVwnIiJS6HXk+BVKZF+JcWjAsb/GEuq/eFdpuzSqeYTcfi6idkyugwfYwXFU1+5fZKUaRKYCwkkFQVfcAs1fXA5V+++FGfvjJ/CxURaSxaBvGdGDhfXE28LWuT9ozCl5xw4Yq5OGazvV24mZVSoOO0yZ31j7kYvtwYK6NeADwbSxDdJEqO4k//0zOHKrUiGYXtqw/A0LFFtqoZKFjnkCAQOjgdkwgdYwHQYDVR0OBBYEFMd9jMIhF1Ylmn/Tgt9r45jk14alMIGmBgNVHSMEgZ4wgZuAFMd9jMIhF1Ylmn/Tgt9r45jk14aloXikdjB0MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEUMBIGA1UEChMLR29vZ2xlIEluYy4xEDAOBgNVBAsTB0FuZHJvaWQxEDAOBgNVBAMTB0FuZHJvaWSCCQDC4IdGZEowjTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBAUAA4IBAQBt0lLO74UwLDYKqs6Tm8/yzKkEu116FmH4rkaymUIE0P9KaMftGlMexFlaYjzmB2OxZyl6euNXEsQH8gjwyxCUKRJNexBiGcCEyj6z+a1fuHHvkiaai+KL8W1EyNmgjmyy8AW7P+LLlkR+ho5zEHatRbM/YAnqGcFh5iZBqpknHf1SKMXFh4dd239FJ1jWYfbMDMy3NS5CTMQ2XFI1MvcyUTdZPErjQfTbQe3aDQsQcafEQPD+nqActifKZ0Np0IS9L9kR/wbNvyz6ENwPiTrjV2KRkEjH78ZMcUQXg0L3BYHJ3lc69Vs5Ddf9uUGGMYldX3WfMBEmh/9iFBDAaTCK</item>
-    </string-array>
-</resources>

src/system/java/eu/siacs/conversations/ui/service/EmojiService.java

@@ -1,14 +0,0 @@
-package eu.siacs.conversations.ui.service;
-
-import android.content.Context;
-
-public class EmojiService {
-
-    public EmojiService(Context context) {
-        //nop
-    }
-
-    public void init() {
-        //nop
-    }
-}

src/system/java/eu/siacs/conversations/ui/widget/EmojiWrapperEditText.java

@@ -1,16 +0,0 @@
-package eu.siacs.conversations.ui.widget;
-
-import android.content.Context;
-import androidx.appcompat.widget.AppCompatEditText;
-import android.util.AttributeSet;
-
-public class EmojiWrapperEditText extends AppCompatEditText {
-
-    public EmojiWrapperEditText(Context context) {
-        super(context);
-    }
-
-    public EmojiWrapperEditText(Context context, AttributeSet attrs) {
-        super(context, attrs);
-    }
-}

src/system/java/eu/siacs/conversations/utils/EmojiWrapper.java

@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 2017, Daniel Gultsch All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation and/or
- * other materials provided with the distribution.
- *
- * 3. Neither the name of the copyright holder nor the names of its contributors
- * may be used to endorse or promote products derived from this software without
- * specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package eu.siacs.conversations.utils;
-
-import androidx.emoji.text.EmojiCompat;
-
-public class EmojiWrapper {
-
-	public static CharSequence transform(CharSequence input) {
-		try {
-			if (EmojiCompat.get().getLoadState() == EmojiCompat.LOAD_STATE_SUCCEEDED) {
-				return EmojiCompat.get().process(input);
-			} else {
-				return input;
-			}
-		} catch (IllegalStateException e) {
-			return input;
-		}
-	}
-}