diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 6c785d36f..000000000
--- a/.gitignore
+++ /dev/null
@@ -1,29 +0,0 @@
-*.orig
-*.rej
-.DS_Store
-.gradle
-.idea
-.settings
-adb.pid
-bc-android.keystore
-build
-*.iml
-lint.xml
-local.properties
-res/.DS_Store
-res/raw/lpconfig.xsd
-.d
-.*clang*
-**/*.iml
-**/.classpath
-**/.project
-**/*.kdev4
-**/.vscode
-res/value-hi_IN
-linphone-sdk-android/*.aar
-app/debug
-app/release
-app/releaseAppBundle
-app/releaseWithCrashlytics
-keystore.properties
-app/src/main/res/xml/contacts.xml
diff --git a/.gitlab-ci-files/job-android.yml b/.gitlab-ci-files/job-android.yml
deleted file mode 100644
index a66ce9e9f..000000000
--- a/.gitlab-ci-files/job-android.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-job-android:
-
-  stage: build
-  tags: [ "docker-android" ]
-  image: gitlab.linphone.org:4567/bc/public/linphone-android/bc-dev-android:20230414_bullseye_jdk_17_cleaned
-
-  before_script:
-    - if ! [ -z ${SCP_PRIVATE_KEY+x} ]; then eval $(ssh-agent -s); fi
-    - if ! [ -z ${SCP_PRIVATE_KEY+x} ]; then echo "$SCP_PRIVATE_KEY" | tr -d '\r' | ssh-add - > /dev/null; fi
-    - if ! [ -z ${ANDROID_SETTINGS_GRADLE+x} ]; then echo "$ANDROID_SETTINGS_GRADLE" > settings.gradle; fi
-    - git config --global --add safe.directory /builds/BC/public/linphone-android
-
-  script:
-    - scp -oStrictHostKeyChecking=no $DEPLOY_SERVER:$ANDROID_KEYSTORE_PATH app/
-    - scp -oStrictHostKeyChecking=no $DEPLOY_SERVER:$ANDROID_GOOGLE_SERVICES_PATH app/
-    - echo storePassword=$ANDROID_KEYSTORE_PASSWORD > keystore.properties
-    - echo keyPassword=$ANDROID_KEYSTORE_KEY_PASSWORD >> keystore.properties
-    - echo keyAlias=$ANDROID_KEYSTORE_KEY_ALIAS >> keystore.properties
-    - echo storeFile=$ANDROID_KEYSTORE_FILE >> keystore.properties
-    - ./gradlew app:dependencies | grep org.linphone
-    - ./gradlew assembleDebug
-    - ./gradlew assembleRelease
-
-  artifacts:
-    paths:
-      - ./app/build/outputs/apk/debug/linphone-android-debug-*.apk
-      - ./app/build/outputs/apk/release/linphone-android-release-*.apk
-    when: always
-    expire_in: 1 week
-
-
-.scheduled-job-android:
-  extends: job-android
-  only:
-    - schedules
diff --git a/.gitlab-ci-files/job-upload.yml b/.gitlab-ci-files/job-upload.yml
deleted file mode 100644
index 31e1d1a50..000000000
--- a/.gitlab-ci-files/job-upload.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-job-android-upload:
-
-  stage: deploy
-  tags: [ "deploy" ]
-
-  only:
-    - schedules
-  dependencies:
-    - job-android
-
-  script:
-    - cd app/build/outputs/apk/ && rsync ./debug/*.apk $DEPLOY_SERVER:$ANDROID_DEPLOY_DIRECTORY
\ No newline at end of file
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
deleted file mode 100644
index 0e65baf26..000000000
--- a/.gitlab-ci.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-#################################################
-# Base configuration
-#################################################
-
-
-
-#################################################
-# Platforms to test
-#################################################
-
-
-include:
-  - '.gitlab-ci-files/job-android.yml'
-  - '.gitlab-ci-files/job-upload.yml'
-
-
-stages:
- - build
- - deploy
diff --git a/app/.gitignore b/app/.gitignore
deleted file mode 100644
index 796b96d1c..000000000
--- a/app/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build
diff --git a/app/build.gradle b/app/build.gradle
deleted file mode 100644
index 10c35e7a2..000000000
--- a/app/build.gradle
+++ /dev/null
@@ -1,285 +0,0 @@
-plugins {
-    id 'com.android.application'
-    id 'kotlin-android'
-    id 'kotlin-kapt'
-    id 'org.jlleitschuh.gradle.ktlint' version '11.3.1'
-    id 'org.jetbrains.kotlin.android'
-}
-
-def appVersionName = "5.3.0"
-def appVersionCode = 52000
-
-def packageName = "org.linphone"
-
-def firebaseAvailable = new File(projectDir.absolutePath +'/google-services.json').exists()
-
-def crashlyticsAvailable = new File(projectDir.absolutePath +'/google-services.json').exists() && new File(LinphoneSdkBuildDir + '/libs/').exists() && new File(LinphoneSdkBuildDir + '/libs-debug/').exists()
-
-def extractNativeLibs = false
-
-if (firebaseAvailable) {
-    apply plugin: 'com.google.gms.google-services'
-}
-
-def gitBranch = new ByteArrayOutputStream()
-task getGitVersion() {
-    def gitVersion = appVersionName
-    def gitVersionStream = new ByteArrayOutputStream()
-    def gitCommitsCount = new ByteArrayOutputStream()
-    def gitCommitHash = new ByteArrayOutputStream()
-
-    try {
-        exec {
-            executable "git" args "describe", "--abbrev=0"
-            standardOutput = gitVersionStream
-        }
-        exec {
-            executable "git" args "rev-list", gitVersionStream.toString().trim() + "..HEAD", "--count"
-            standardOutput = gitCommitsCount
-        }
-        exec {
-            executable "git" args "rev-parse", "--short", "HEAD"
-            standardOutput = gitCommitHash
-        }
-        exec {
-            executable "git" args "name-rev", "--name-only", "HEAD"
-            standardOutput = gitBranch
-        }
-
-        if (gitCommitsCount.toString().toInteger() == 0) {
-            gitVersion = gitVersionStream.toString().trim()
-        } else {
-            gitVersion = gitVersionStream.toString().trim() + "." + gitCommitsCount.toString().trim() + "+" + gitCommitHash.toString().trim()
-        }
-        println("Git version: " + gitVersion + " (" + appVersionCode + ")")
-    } catch (ignored) {
-        println("Git not found, using " + gitVersion + " (" + appVersionCode + ")")
-    }
-    project.version = gitVersion
-}
-
-configurations {
-    customImplementation.extendsFrom implementation
-}
-
-task linphoneSdkSource() {
-    doLast {
-        configurations.customImplementation.getIncoming().each {
-            it.getResolutionResult().allComponents.each {
-                if (it.id.getDisplayName().contains("linphone-sdk-android")) {
-                    println 'Linphone SDK used is ' + it.moduleVersion.version + ' from ' + it.properties["repositoryName"]
-                }
-            }
-        }
-    }
-}
-
-project.tasks['preBuild'].dependsOn 'getGitVersion'
-project.tasks['preBuild'].dependsOn 'linphoneSdkSource'
-
-android {
-    compileOptions {
-        sourceCompatibility = 17
-        targetCompatibility = 17
-    }
-
-    compileSdkVersion 34
-    defaultConfig {
-        minSdkVersion 23
-        targetSdkVersion 34
-        versionCode appVersionCode
-        versionName "${project.version}"
-        applicationId packageName
-    }
-
-    applicationVariants.all { variant ->
-        variant.outputs.all {
-            outputFileName = "linphone-android-${variant.buildType.name}-${project.version}.apk"
-        }
-
-        var enableFirebaseService = "false"
-        if (firebaseAvailable) {
-            enableFirebaseService = "true"
-        }
-
-        // See https://developer.android.com/studio/releases/gradle-plugin#3-6-0-behavior for why extractNativeLibs is set to true in debug flavor
-        if (variant.buildType.name == "release" || variant.buildType.name == "releaseWithCrashlytics") {
-            variant.getMergedFlavor().manifestPlaceholders = [linphone_address_mime_type: "vnd.android.cursor.item/vnd." + packageName + ".provider.sip_address",
-                                                              linphone_file_provider: packageName + ".fileprovider",
-                                                              appLabel: "@string/app_name",
-                                                              firebaseServiceEnabled: enableFirebaseService]
-        } else {
-            variant.getMergedFlavor().manifestPlaceholders = [linphone_address_mime_type: "vnd.android.cursor.item/vnd." + packageName + ".provider.sip_address",
-                                                              linphone_file_provider: packageName + ".debug.fileprovider",
-                                                              appLabel: "@string/app_name_debug",
-                                                              firebaseServiceEnabled: enableFirebaseService]
-            extractNativeLibs = true
-        }
-    }
-
-    def keystorePropertiesFile = rootProject.file("keystore.properties")
-    def keystoreProperties = new Properties()
-    keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
-
-    signingConfigs {
-        release {
-            storeFile file(keystoreProperties['storeFile'])
-            storePassword keystoreProperties['storePassword']
-            keyAlias keystoreProperties['keyAlias']
-            keyPassword keystoreProperties['keyPassword']
-        }
-    }
-
-    buildTypes {
-        release {
-            minifyEnabled true
-            signingConfig signingConfigs.release
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-
-            resValue "string", "linphone_app_branch", gitBranch.toString().trim()
-            resValue "string", "sync_account_type", packageName + ".sync"
-            resValue "string", "file_provider", packageName + ".fileprovider"
-            resValue "string", "linphone_address_mime_type", "vnd.android.cursor.item/vnd." + packageName + ".provider.sip_address"
-
-            if (!firebaseAvailable) {
-                resValue "string", "gcm_defaultSenderId", "none"
-            }
-
-            resValue "bool", "crashlytics_enabled", "false"
-        }
-
-        releaseWithCrashlytics {
-            initWith release
-
-            resValue "bool", "crashlytics_enabled", crashlyticsAvailable.toString()
-
-            if (crashlyticsAvailable) {
-                apply plugin: 'com.google.firebase.crashlytics'
-
-                firebaseCrashlytics {
-                    nativeSymbolUploadEnabled true
-                    unstrippedNativeLibsDir file(LinphoneSdkBuildDir + '/libs-debug/').toString()
-                }
-            }
-        }
-
-        debug {
-            applicationIdSuffix ".debug"
-            debuggable true
-            jniDebuggable true
-
-            resValue "string", "linphone_app_branch", gitBranch.toString().trim()
-            resValue "string", "sync_account_type", packageName + ".sync"
-            resValue "string", "file_provider", packageName + ".debug.fileprovider"
-            resValue "string", "linphone_address_mime_type", "vnd.android.cursor.item/vnd." + packageName + ".provider.sip_address"
-            resValue "bool", "crashlytics_enabled", crashlyticsAvailable.toString()
-
-            if (!firebaseAvailable) {
-                resValue "string", "gcm_defaultSenderId", "none"
-            }
-
-            if (crashlyticsAvailable) {
-                apply plugin: 'com.google.firebase.crashlytics'
-
-                firebaseCrashlytics {
-                    nativeSymbolUploadEnabled false
-                }
-            }
-        }
-    }
-
-    buildFeatures {
-        dataBinding = true
-    }
-
-    namespace 'org.linphone'
-    packagingOptions {
-        jniLibs {
-            useLegacyPackaging extractNativeLibs
-        }
-    }
-}
-
-dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'androidx.appcompat:appcompat:1.6.1'
-    implementation 'androidx.core:core-ktx:1.12.0'
-    implementation 'androidx.core:core-splashscreen:1.0.1'
-    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.2'
-    implementation 'androidx.media:media:1.6.0'
-    implementation "androidx.security:security-crypto-ktx:1.1.0-alpha06"
-    implementation "androidx.window:window:1.2.0"
-
-    def emoji_version = "1.4.0"
-    implementation "androidx.emoji2:emoji2:$emoji_version"
-    implementation "androidx.emoji2:emoji2-emojipicker:$emoji_version"
-
-    def nav_version = "2.7.5"
-    implementation "androidx.navigation:navigation-fragment-ktx:$nav_version"
-    implementation "androidx.navigation:navigation-ui-ktx:$nav_version"
-
-    implementation "androidx.slidingpanelayout:slidingpanelayout:1.2.0"
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
-    implementation "androidx.gridlayout:gridlayout:1.0.0"
-    implementation 'androidx.recyclerview:recyclerview:1.3.2'
-    implementation 'androidx.drawerlayout:drawerlayout:1.2.0'
-
-    // https://github.com/material-components/material-components-android/blob/master/LICENSE Apache v2.0
-    implementation 'com.google.android.material:material:1.10.0'
-    // https://github.com/google/flexbox-layout/blob/main/LICENSE Apache v2.0
-    implementation 'com.google.android.flexbox:flexbox:3.0.0'
-
-    // https://github.com/coil-kt/coil/blob/main/LICENSE.txt Apache v2.0
-    def coil_version = "2.4.0"
-    implementation("io.coil-kt:coil:$coil_version")
-    implementation("io.coil-kt:coil-gif:$coil_version")
-    implementation("io.coil-kt:coil-svg:$coil_version")
-    implementation("io.coil-kt:coil-video:$coil_version")
-
-    // https://github.com/Baseflow/PhotoView/blob/master/LICENSE Apache v2.0
-    implementation 'com.github.chrisbanes:PhotoView:2.3.0'
-
-    implementation platform('com.google.firebase:firebase-bom:32.5.0')
-    if (crashlyticsAvailable) {
-        debugImplementation 'com.google.firebase:firebase-crashlytics-ndk'
-        releaseWithCrashlyticsImplementation 'com.google.firebase:firebase-crashlytics-ndk'
-        releaseCompileOnly 'com.google.firebase:firebase-crashlytics-ndk'
-    } else {
-        compileOnly 'com.google.firebase:firebase-crashlytics-ndk'
-    }
-    if (firebaseAvailable) {
-        implementation 'com.google.firebase:firebase-messaging'
-    }
-
-    implementation 'org.linphone:linphone-sdk-android:5.4+'
-
-    // Only enable leak canary prior to release
-    // debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.10'
-}
-
-task generateContactsXml(type: Copy) {
-    from 'contacts.xml'
-    into "src/main/res/xml/"
-    outputs.upToDateWhen { file('src/main/res/xml/contacts.xml').exists() }
-    filter {
-        line -> line
-                .replaceAll('%%AUTO_GENERATED%%', 'This file has been automatically generated, do not edit or commit !')
-                .replaceAll('%%PACKAGE_NAME%%', packageName)
-
-    }
-}
-project.tasks['preBuild'].dependsOn 'generateContactsXml'
-
-ktlint {
-    android = true
-    ignoreFailures = true
-}
-
-project.tasks['preBuild'].dependsOn 'ktlintFormat'
-
-if (crashlyticsAvailable) {
-    afterEvaluate {
-        assembleReleaseWithCrashlytics.finalizedBy(uploadCrashlyticsSymbolFileReleaseWithCrashlytics)
-        packageReleaseWithCrashlytics.finalizedBy(uploadCrashlyticsSymbolFileReleaseWithCrashlytics)
-    }
-}
diff --git a/app/contacts.xml b/app/contacts.xml
deleted file mode 100644
index 07ea82c10..000000000
--- a/app/contacts.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ContactsSource xmlns:android="http://schemas.android.com/apk/res/android">
-    <!-- %%AUTO_GENERATED%% -->
-    <ContactsDataKind
-        android:detailColumn="data3"
-        android:detailSocialSummary="true"
-        android:icon="@drawable/linphone_logo_tinted"
-        android:mimeType="vnd.android.cursor.item/vnd.%%PACKAGE_NAME%%.provider.sip_address"
-        android:summaryColumn="data2" />
-    <!-- You can't use @string/linphone_address_mime_type above ! You have to hardcode it... -->
-</ContactsSource>
diff --git a/app/google-services.json b/app/google-services.json
deleted file mode 100644
index c26aa7702..000000000
--- a/app/google-services.json
+++ /dev/null
@@ -1,57 +0,0 @@
-{
-  "project_info": {
-    "project_number": "929724111839",
-    "firebase_url": "https://linphone-android-8a563.firebaseio.com",
-    "project_id": "linphone-android-8a563",
-    "storage_bucket": "linphone-android-8a563.appspot.com"
-  },
-  "client": [
-    {
-      "client_info": {
-        "mobilesdk_app_id": "1:929724111839:android:4662ea9a056188c4",
-        "android_client_info": {
-          "package_name": "org.linphone"
-        }
-      },
-      "oauth_client": [
-        {
-          "client_id": "929724111839-co5kffto4j7dets7oolvfv0056cvpfbl.apps.googleusercontent.com",
-          "client_type": 1,
-          "android_info": {
-            "package_name": "org.linphone",
-            "certificate_hash": "85463a95603f7b6331899b74b85d53d043dcd500"
-          }
-        },
-        {
-          "client_id": "929724111839-v5so1tcd65iil7dd7sde8jgii44h8luf.apps.googleusercontent.com",
-          "client_type": 3
-        }
-      ],
-      "api_key": [
-        {
-          "current_key": "AIzaSyCKrwWhkbA7Iy3wpEI8_ZvKOMp5jf6vV6A"
-        }
-      ]
-    },
-    {
-      "client_info": {
-        "mobilesdk_app_id": "1:929724111839:android:3cf90ee1d2f8fcb6",
-        "android_client_info": {
-          "package_name": "org.linphone.debug"
-        }
-      },
-      "oauth_client": [
-        {
-          "client_id": "929724111839-v5so1tcd65iil7dd7sde8jgii44h8luf.apps.googleusercontent.com",
-          "client_type": 3
-        }
-      ],
-      "api_key": [
-        {
-          "current_key": "AIzaSyCKrwWhkbA7Iy3wpEI8_ZvKOMp5jf6vV6A"
-        }
-      ]
-    }
-  ],
-  "configuration_version": "1"
-}
\ No newline at end of file
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
deleted file mode 100644
index e70e74af6..000000000
--- a/app/proguard-rules.pro
+++ /dev/null
@@ -1,41 +0,0 @@
-# Add project specific ProGuard rules here.
-# You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
-
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile
-
--keep public class * extends androidx.fragment.app.Fragment { *; }
--dontwarn com.google.errorprone.annotations.Immutable
-
-# To prevent following errors:
-#ERROR: Missing classes detected while running R8. Please add the missing classes or apply additional keep rules that are generated in /builds/BC/public/linphone-android/app/build/outputs/mapping/release/missing_rules.txt.
-#ERROR: R8: Missing class org.bouncycastle.jsse.BCSSLParameters (referenced from: void okhttp3.internal.platform.BouncyCastlePlatform.configureTlsExtensions(javax.net.ssl.SSLSocket, java.lang.String, java.util.List) and 1 other context)
-#Missing class org.bouncycastle.jsse.BCSSLSocket (referenced from: void okhttp3.internal.platform.BouncyCastlePlatform.configureTlsExtensions(javax.net.ssl.SSLSocket, java.lang.String, java.util.List) and 5 other contexts)
-#Missing class org.bouncycastle.jsse.provider.BouncyCastleJsseProvider (referenced from: void okhttp3.internal.platform.BouncyCastlePlatform.<init>())
-#Missing class org.conscrypt.Conscrypt$Version (referenced from: boolean okhttp3.internal.platform.ConscryptPlatform$Companion.atLeastVersion(int, int, int))
-#Missing class org.conscrypt.Conscrypt (referenced from: boolean okhttp3.internal.platform.ConscryptPlatform$Companion.atLeastVersion(int, int, int) and 4 other contexts)
-#Missing class org.conscrypt.ConscryptHostnameVerifier (referenced from: okhttp3.internal.platform.ConscryptPlatform$DisabledHostnameVerifier)
-#Missing class org.openjsse.javax.net.ssl.SSLParameters (referenced from: void okhttp3.internal.platform.OpenJSSEPlatform.configureTlsExtensions(javax.net.ssl.SSLSocket, java.lang.String, java.util.List))
-#Missing class org.openjsse.javax.net.ssl.SSLSocket (referenced from: void okhttp3.internal.platform.OpenJSSEPlatform.configureTlsExtensions(javax.net.ssl.SSLSocket, java.lang.String, java.util.List) and 1 other context)
-#Missing class org.openjsse.net.ssl.OpenJSSE (referenced from: void okhttp3.internal.platform.OpenJSSEPlatform.<init>())
-#> Task :app:lintVitalAnalyzeRelease
-#FAILURE: Build failed with an exception.
--dontwarn org.conscrypt.**
--dontwarn org.bouncycastle.**
--dontwarn org.openjsse.**
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
deleted file mode 100644
index c1b106232..000000000
--- a/app/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,256 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <!-- To be able to display contacts list & match calling/called numbers -->
-    <uses-permission android:name="android.permission.READ_CONTACTS" />
-    <!-- For in-app contact edition -->
-    <uses-permission android:name="android.permission.WRITE_CONTACTS" />
-
-    <!-- Helps filling phone number and country code in assistant -->
-    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
-
-    <!-- Needed for auto start at boot and to ensure the service won't be killed by OS while in call -->
-    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
-
-    <!-- Starting Android 13 we need to ask notification permission -->
-    <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
-
-    <!-- Needed for full screen intent in incoming call notifications -->
-    <uses-permission android:name="android.permission.USE_FULL_SCREEN_INTENT" />
-    <!-- To vibrate when pressing DTMF keys on numpad & incoming calls -->
-    <uses-permission android:name="android.permission.VIBRATE" />
-
-    <!-- Needed to attach file(s) in chat room fragment -->
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"
-        android:maxSdkVersion="32"/>
-    <!-- Starting Android 13 you need those 3 permissions instead (https://developer.android.com/about/versions/13/behavior-changes-13) -->
-    <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
-    <uses-permission android:name="android.permission.READ_MEDIA_VIDEO" />
-    <uses-permission android:name="android.permission.READ_MEDIA_AUDIO" />
-
-    <!-- Needed to shared downloaded files if setting is on -->
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"
-        android:maxSdkVersion="28" />
-
-    <!-- Both permissions below are for contacts sync account, needed to store presence in native contact if enabled -->
-    <uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" />
-    <uses-permission android:name="android.permission.GET_ACCOUNTS" />
-
-    <!-- Needed for Telecom Manager -->
-    <uses-permission android:name="android.permission.MANAGE_OWN_CALLS"/>
-    <uses-permission android:name="android.permission.READ_PHONE_NUMBERS" />
-
-    <!-- Needed for overlay -->
-    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
-
-    <!-- Needed to check current Do not disturb policy -->
-    <uses-permission android:name="android.permission.ACCESS_NOTIFICATION_POLICY" />
-
-    <!-- Needed for foreground service
-    (https://developer.android.com/guide/components/foreground-services) -->
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
-    <!-- Needed for Android 14
-    https://developer.android.com/about/versions/14/behavior-changes-14#fgs-types -->
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_CAMERA" />
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_MICROPHONE" />
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_PHONE_CALL" />
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC" />
-
-    <application
-        android:name=".LinphoneApplication"
-        android:allowBackup="false"
-        android:enableOnBackInvokedCallback="true"
-        android:icon="@mipmap/ic_launcher"
-        android:label="${appLabel}"
-        android:localeConfig="@xml/locales_config"
-        android:roundIcon="@mipmap/ic_launcher_round"
-        android:theme="@style/AppTheme"
-        android:allowNativeHeapPointerTagging="false">
-
-        <meta-data
-            android:name="com.google.android.gms.car.application"
-            android:resource="@xml/automotive_app_desc"/>
-
-        <activity android:name=".activities.main.MainActivity"
-            android:exported="true"
-            android:launchMode="singleTask"
-            android:windowSoftInputMode="adjustResize"
-            android:theme="@style/AppSplashScreenTheme">
-            <nav-graph android:value="@navigation/main_nav_graph" />
-
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-
-            <meta-data
-                android:name="android.app.shortcuts"
-                android:resource="@xml/shortcuts" />
-
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW_LOCUS" />
-            </intent-filter>
-
-            <intent-filter>
-                <action android:name="android.intent.action.SEND" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <data android:mimeType="text/*" />
-                <data android:mimeType="image/*" />
-                <data android:mimeType="audio/*" />
-                <data android:mimeType="video/*" />
-                <data android:mimeType="application/*" />
-            </intent-filter>
-
-            <intent-filter>
-                <action android:name="android.intent.action.SEND_MULTIPLE" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <data android:mimeType="image/*" />
-                <data android:mimeType="audio/*" />
-                <data android:mimeType="video/*" />
-                <data android:mimeType="application/*" />
-            </intent-filter>
-
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-                <category android:name="android.intent.category.BROWSABLE" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <data android:mimeType="${linphone_address_mime_type}" />
-            </intent-filter>
-
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-                <action android:name="android.intent.action.DIAL" />
-                <action android:name="android.intent.action.CALL" />
-                <action android:name="android.intent.action.CALL_BUTTON" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-                <data android:scheme="tel" />
-                <data android:scheme="sip" />
-                <data android:scheme="sips" />
-                <data android:scheme="linphone" />
-                <data android:scheme="sip-linphone" />
-                <data android:scheme="linphone-config" />
-            </intent-filter>
-
-            <intent-filter>
-                <action android:name="android.intent.action.SEND" />
-                <action android:name="android.intent.action.SENDTO" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <data android:scheme="sms" />
-                <data android:scheme="smsto" />
-                <data android:scheme="mms" />
-                <data android:scheme="mmsto" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name=".activities.assistant.AssistantActivity"
-            android:windowSoftInputMode="adjustResize"/>
-
-        <activity android:name=".activities.voip.CallActivity"
-            android:launchMode="singleTask"
-            android:turnScreenOn="true"
-            android:showWhenLocked="true"
-            android:resizeableActivity="true"
-            android:supportsPictureInPicture="true" />
-
-        <activity
-            android:name=".activities.chat_bubble.ChatBubbleActivity"
-            android:allowEmbedded="true"
-            android:documentLaunchMode="always"
-            android:resizeableActivity="true" />
-
-        <!-- Services -->
-
-        <service
-            android:name=".core.CoreService"
-            android:exported="false"
-            android:foregroundServiceType="phoneCall|camera|microphone|dataSync"
-            android:stopWithTask="false"
-            android:label="@string/app_name" />
-
-        <service
-            android:name="org.linphone.core.tools.service.PushService"
-            android:exported="false"
-            android:foregroundServiceType="dataSync"
-            android:stopWithTask="false"
-            android:label="@string/app_name" />
-
-        <service android:name="org.linphone.core.tools.firebase.FirebaseMessaging"
-            android:enabled="${firebaseServiceEnabled}"
-            android:exported="false">
-            <intent-filter>
-                <action android:name="com.google.firebase.MESSAGING_EVENT" />
-            </intent-filter>
-        </service>
-
-        <service
-            android:name=".contact.DummySyncService"
-            android:exported="true">
-            <intent-filter>
-                <action android:name="android.content.SyncAdapter" />
-            </intent-filter>
-
-            <meta-data
-                android:name="android.content.SyncAdapter"
-                android:resource="@xml/sync_adapter" />
-            <meta-data
-                android:name="android.provider.CONTACTS_STRUCTURE"
-                android:resource="@xml/contacts" />
-        </service>
-
-        <service android:name=".contact.DummyAuthenticationService"
-            android:exported="true">
-            <intent-filter>
-                <action android:name="android.accounts.AccountAuthenticator" />
-            </intent-filter>
-
-            <meta-data
-                android:name="android.accounts.AccountAuthenticator"
-                android:resource="@xml/authenticator" />
-        </service>
-
-        <service android:name=".telecom.TelecomConnectionService"
-            android:permission="android.permission.BIND_TELECOM_CONNECTION_SERVICE"
-            android:exported="true">
-            <intent-filter>
-                <action android:name="android.telecom.ConnectionService" />
-            </intent-filter>
-        </service>
-
-        <!-- Receivers -->
-
-        <receiver android:name=".core.CorePushReceiver"
-            android:exported="false">
-            <intent-filter>
-                <action android:name="org.linphone.core.action.PUSH_RECEIVED"/>
-            </intent-filter>
-        </receiver>
-
-        <receiver
-            android:name=".notifications.NotificationBroadcastReceiver"
-            android:enabled="true"
-            android:exported="false" />
-
-        <receiver android:name=".core.BootReceiver"
-            android:exported="true">
-            <intent-filter>
-                <action android:name="android.intent.action.BOOT_COMPLETED" />
-                <action android:name="android.intent.action.MY_PACKAGE_REPLACED" />
-            </intent-filter>
-        </receiver>
-
-        <!-- Providers -->
-
-        <provider
-            android:name="androidx.core.content.FileProvider"
-            android:authorities="${linphone_file_provider}"
-            android:exported="false"
-            android:grantUriPermissions="true">
-            <meta-data
-                android:name="android.support.FILE_PROVIDER_PATHS"
-                android:resource="@xml/provider_paths" />
-        </provider>
-
-    </application>
-
-</manifest>
\ No newline at end of file
diff --git a/app/src/main/assets/assistant_default_values b/app/src/main/assets/assistant_default_values
deleted file mode 100644
index 5800203a4..000000000
--- a/app/src/main/assets/assistant_default_values
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<config xmlns="http://www.linphone.org/xsds/lpconfig.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.linphone.org/xsds/lpconfig.xsd lpconfig.xsd">
-  <section name="proxy_default_values">
-    <entry name="avpf" overwrite="true">0</entry>
-    <entry name="dial_escape_plus" overwrite="true">0</entry>
-    <entry name="publish" overwrite="true">0</entry>
-    <entry name="publish_expires" overwrite="true">-1</entry>
-    <entry name="quality_reporting_collector" overwrite="true"></entry>
-    <entry name="quality_reporting_enabled" overwrite="true">0</entry>
-    <entry name="quality_reporting_interval" overwrite="true">0</entry>
-    <entry name="reg_expires" overwrite="true">3600</entry>
-    <entry name="reg_identity" overwrite="true"></entry>
-    <entry name="reg_proxy" overwrite="true"></entry>
-    <entry name="reg_route" overwrite="true"></entry>
-    <entry name="reg_sendregister" overwrite="true">1</entry>
-    <entry name="nat_policy_ref" overwrite="true"></entry>
-    <entry name="realm" overwrite="true"></entry>
-    <entry name="conference_factory_uri" overwrite="true"></entry>
-    <entry name="audio_video_conference_factory_uri" overwrite="true"></entry>
-    <entry name="push_notification_allowed" overwrite="true">0</entry>
-    <entry name="cpim_in_basic_chat_rooms_enabled" overwrite="true">0</entry>
-    <entry name="rtp_bundle" overwrite="true">0</entry>
-    <entry name="lime_server_url" overwrite="true"></entry>
-  </section>
-  <section name="nat_policy_default_values">
-    <entry name="stun_server" overwrite="true"></entry>
-    <entry name="protocols" overwrite="true"></entry>
-  </section>
-  <section name="net">
-    <entry name="friendlist_subscription_enabled" overwrite="true">0</entry>
-  </section>
-  <section name="assistant">
-    <entry name="domain" overwrite="true"></entry>
-    <entry name="algorithm" overwrite="true">MD5</entry>
-    <entry name="password_max_length" overwrite="true">-1</entry>
-    <entry name="password_min_length" overwrite="true">0</entry>
-    <entry name="username_length" overwrite="true">-1</entry>
-    <entry name="username_max_length" overwrite="true">128</entry>
-    <entry name="username_min_length" overwrite="true">1</entry>
-    <entry name="username_regex" overwrite="true">^[a-zA-Z0-9+_.\-]*$</entry>
-  </section>
-</config>
diff --git a/app/src/main/assets/assistant_linphone_default_values b/app/src/main/assets/assistant_linphone_default_values
deleted file mode 100644
index 7a72cd0c8..000000000
--- a/app/src/main/assets/assistant_linphone_default_values
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<config xmlns="http://www.linphone.org/xsds/lpconfig.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.linphone.org/xsds/lpconfig.xsd lpconfig.xsd">
-  <section name="proxy_default_values">
-    <entry name="avpf" overwrite="true">1</entry>
-    <entry name="dial_escape_plus" overwrite="true">0</entry>
-    <entry name="publish" overwrite="true">1</entry>
-    <entry name="publish_expires" overwrite="true">120</entry>
-    <entry name="quality_reporting_collector" overwrite="true">sip:voip-metrics@sip.linphone.org;transport=tls</entry>
-    <entry name="quality_reporting_enabled" overwrite="true">1</entry>
-    <entry name="quality_reporting_interval" overwrite="true">180</entry>
-    <entry name="reg_expires" overwrite="true">31536000</entry>
-    <entry name="reg_identity" overwrite="true">sip:?@sip.linphone.org</entry>
-    <entry name="reg_proxy" overwrite="true">&lt;sip:sip.linphone.org;transport=tls&gt;</entry>
-    <entry name="reg_route" overwrite="true">&lt;sip:sip.linphone.org;transport=tls&gt;</entry>
-    <entry name="reg_sendregister" overwrite="true">1</entry>
-    <entry name="nat_policy_ref" overwrite="true">nat_policy_default_values</entry>
-    <entry name="realm" overwrite="true">sip.linphone.org</entry>
-    <entry name="conference_factory_uri" overwrite="true">sip:conference-factory@sip.linphone.org</entry>
-    <entry name="audio_video_conference_factory_uri" overwrite="true">sip:videoconference-factory@sip.linphone.org</entry>
-    <entry name="push_notification_allowed" overwrite="true">1</entry>
-    <entry name="cpim_in_basic_chat_rooms_enabled" overwrite="true">1</entry>
-    <entry name="rtp_bundle" overwrite="true">1</entry>
-    <entry name="lime_server_url" overwrite="true">https://lime.linphone.org/lime-server/lime-server.php</entry>
-  </section>
-  <section name="nat_policy_default_values">
-    <entry name="stun_server" overwrite="true">stun.linphone.org</entry>
-    <entry name="protocols" overwrite="true">stun,ice</entry>
-  </section>
-  <section name="net">
-    <entry name="friendlist_subscription_enabled" overwrite="true">1</entry>
-  </section>
-  <section name="assistant">
-    <entry name="domain" overwrite="true">sip.linphone.org</entry>
-    <entry name="algorithm" overwrite="true">SHA-256</entry>
-    <entry name="password_max_length" overwrite="true">-1</entry>
-    <entry name="password_min_length" overwrite="true">1</entry>
-    <entry name="username_length" overwrite="true">-1</entry>
-    <entry name="username_max_length" overwrite="true">64</entry>
-    <entry name="username_min_length" overwrite="true">1</entry>
-    <entry name="username_regex" overwrite="true">^[a-z0-9+_.\-]*$</entry>
-  </section>
-</config>
diff --git a/app/src/main/assets/linphonerc_default b/app/src/main/assets/linphonerc_default
deleted file mode 100644
index bad1a1a76..000000000
--- a/app/src/main/assets/linphonerc_default
+++ /dev/null
@@ -1,44 +0,0 @@
-
-## Start of default rc
-
-[sip]
-contact="Linphone Android" <sip:linphone.android@unknown-host>
-use_info=0
-use_ipv6=1
-keepalive_period=30000
-sip_port=-1
-sip_tcp_port=-1
-sip_tls_port=-1
-media_encryption=none
-update_presence_model_timestamp_before_publish_expires_refresh=1
-
-[net]
-#Because dynamic bitrate adaption can increase bitrate, we must allow "no limit"
-download_bw=0
-upload_bw=0
-
-[video]
-size=vga
-
-[app]
-tunnel=disabled
-auto_start=1
-record_aware=1
-
-[tunnel]
-host=
-port=443
-
-[misc]
-log_collection_upload_server_url=https://www.linphone.org:444/lft.php
-file_transfer_server_url=https://www.linphone.org:444/lft.php
-version_check_url_root=https://www.linphone.org/releases
-max_calls=10
-history_max_size=100
-conference_layout=1
-
-[in-app-purchase]
-server_url=https://subscribe.linphone.org:444/inapp.php
-purchasable_items_ids=test_account_subscription
-
-## End of default rc
diff --git a/app/src/main/assets/linphonerc_factory b/app/src/main/assets/linphonerc_factory
deleted file mode 100644
index 23e6571e4..000000000
--- a/app/src/main/assets/linphonerc_factory
+++ /dev/null
@@ -1,54 +0,0 @@
-
-## Start of factory rc
-
-# This file shall not contain path referencing package name, in order to be portable when app is renamed.
-# Paths to resources must be set from LinphoneManager, after creating LinphoneCore.
-
-[net]
-mtu=1300
-force_ice_disablement=0
-
-[rtp]
-accept_any_encryption=1
-
-[sip]
-guess_hostname=1
-register_only_when_network_is_up=1
-auto_net_state_mon=1
-auto_answer_replacing_calls=1
-ping_with_options=0
-use_cpim=1
-zrtp_key_agreements_suites=MS_ZRTP_KEY_AGREEMENT_K255_KYB512
-chat_messages_aggregation_delay=1000
-chat_messages_aggregation=1
-
-[sound]
-#remove this property for any application that is not Linphone public version itself
-ec_calibrator_cool_tones=1
-
-[video]
-displaytype=MSAndroidTextureDisplay
-auto_resize_preview_to_keep_ratio=1
-max_conference_size=vga
-
-[misc]
-enable_basic_to_client_group_chat_room_migration=0
-enable_simple_group_chat_message_state=0
-aggregate_imdn=1
-notify_each_friend_individually_when_presence_received=0
-
-[app]
-activation_code_length=4
-prefer_basic_chat_room=1
-record_aware=1
-
-[account_creator]
-backend=1
-# 1 means FlexiAPI, 0 is XMLRPC
-url=https://subscribe.linphone.org/api/
-# replace above URL by https://staging-subscribe.linphone.org/api/ for testing
-
-[lime]
-lime_update_threshold=86400
-
-## End of factory rc
diff --git a/app/src/main/java/org/linphone/LinphoneApplication.kt b/app/src/main/java/org/linphone/LinphoneApplication.kt
deleted file mode 100644
index 2a08ce958..000000000
--- a/app/src/main/java/org/linphone/LinphoneApplication.kt
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone
-
-import android.annotation.SuppressLint
-import android.app.Application
-import android.content.Context
-import coil.ImageLoader
-import coil.ImageLoaderFactory
-import coil.decode.GifDecoder
-import coil.decode.ImageDecoderDecoder
-import coil.decode.SvgDecoder
-import coil.decode.VideoFrameDecoder
-import coil.disk.DiskCache
-import coil.memory.MemoryCache
-import org.linphone.core.*
-import org.linphone.core.tools.Log
-import org.linphone.mediastream.Version
-
-class LinphoneApplication : Application(), ImageLoaderFactory {
-    companion object {
-        @SuppressLint("StaticFieldLeak")
-        lateinit var corePreferences: CorePreferences
-
-        @SuppressLint("StaticFieldLeak")
-        lateinit var coreContext: CoreContext
-
-        private fun createConfig(context: Context) {
-            if (::corePreferences.isInitialized) {
-                return
-            }
-
-            Factory.instance().setLogCollectionPath(context.filesDir.absolutePath)
-            Factory.instance().enableLogCollection(LogCollectionState.Enabled)
-
-            // For VFS
-            Factory.instance().setCacheDir(context.cacheDir.absolutePath)
-
-            corePreferences = CorePreferences(context)
-            corePreferences.copyAssetsFromPackage()
-
-            if (corePreferences.vfsEnabled) {
-                CoreContext.activateVFS()
-            }
-
-            val config = Factory.instance().createConfigWithFactory(
-                corePreferences.configPath,
-                corePreferences.factoryConfigPath
-            )
-            corePreferences.config = config
-
-            val appName = context.getString(R.string.app_name)
-            Factory.instance().setLoggerDomain(appName)
-            Factory.instance().enableLogcatLogs(corePreferences.logcatLogsOutput)
-            if (corePreferences.debugLogs) {
-                Factory.instance().loggingService.setLogLevel(LogLevel.Message)
-            }
-
-            Log.i("[Application] Core config & preferences created")
-        }
-
-        fun ensureCoreExists(
-            context: Context,
-            pushReceived: Boolean = false,
-            service: CoreService? = null,
-            useAutoStartDescription: Boolean = false,
-            skipCoreStart: Boolean = false
-        ): Boolean {
-            if (::coreContext.isInitialized && !coreContext.stopped) {
-                Log.d("[Application] Skipping Core creation (push received? $pushReceived)")
-                return false
-            }
-
-            Log.i(
-                "[Application] Core context is being created ${if (pushReceived) "from push" else ""}"
-            )
-            coreContext = CoreContext(
-                context,
-                corePreferences.config,
-                service,
-                useAutoStartDescription
-            )
-            if (!skipCoreStart) {
-                coreContext.start()
-            }
-            return true
-        }
-
-        fun contextExists(): Boolean {
-            return ::coreContext.isInitialized
-        }
-    }
-
-    override fun onCreate() {
-        super.onCreate()
-        val appName = getString(R.string.app_name)
-        android.util.Log.i("[$appName]", "Application is being created")
-        createConfig(applicationContext)
-        Log.i("[Application] Created")
-    }
-
-    override fun newImageLoader(): ImageLoader {
-        return ImageLoader.Builder(this)
-            .components {
-                add(VideoFrameDecoder.Factory())
-                add(SvgDecoder.Factory())
-                if (Version.sdkAboveOrEqual(Version.API28_PIE_90)) {
-                    add(ImageDecoderDecoder.Factory())
-                } else {
-                    add(GifDecoder.Factory())
-                }
-            }
-            .memoryCache {
-                MemoryCache.Builder(this)
-                    .maxSizePercent(0.25)
-                    .build()
-            }
-            .diskCache {
-                DiskCache.Builder()
-                    .directory(cacheDir.resolve("image_cache"))
-                    .maxSizePercent(0.02)
-                    .build()
-            }
-            .build()
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/GenericActivity.kt b/app/src/main/java/org/linphone/activities/GenericActivity.kt
deleted file mode 100644
index 4498c8696..000000000
--- a/app/src/main/java/org/linphone/activities/GenericActivity.kt
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities
-
-import android.annotation.SuppressLint
-import android.content.pm.ActivityInfo
-import android.content.res.Configuration
-import android.os.Bundle
-import android.util.DisplayMetrics
-import android.view.Display
-import androidx.appcompat.app.AppCompatActivity
-import androidx.appcompat.app.AppCompatDelegate
-import androidx.lifecycle.lifecycleScope
-import androidx.navigation.ActivityNavigator
-import androidx.window.layout.FoldingFeature
-import androidx.window.layout.WindowInfoTracker
-import androidx.window.layout.WindowLayoutInfo
-import java.util.*
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import org.linphone.LinphoneApplication.Companion.coreContext
-import org.linphone.LinphoneApplication.Companion.corePreferences
-import org.linphone.LinphoneApplication.Companion.ensureCoreExists
-import org.linphone.R
-import org.linphone.core.tools.Log
-
-abstract class GenericActivity : AppCompatActivity() {
-    private var timer: Timer? = null
-    private var _isDestructionPending = false
-    val isDestructionPending: Boolean
-        get() = _isDestructionPending
-
-    open fun onLayoutChanges(foldingFeature: FoldingFeature?) { }
-
-    @SuppressLint("SourceLockedOrientationActivity")
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-
-        Log.i("[Generic Activity] Ensuring Core exists")
-        ensureCoreExists(applicationContext)
-
-        lifecycleScope.launch(Dispatchers.Main) {
-            WindowInfoTracker
-                .getOrCreate(this@GenericActivity)
-                .windowLayoutInfo(this@GenericActivity)
-                .collect { newLayoutInfo ->
-                    updateCurrentLayout(newLayoutInfo)
-                }
-        }
-
-        requestedOrientation = if (corePreferences.forcePortrait) {
-            ActivityInfo.SCREEN_ORIENTATION_PORTRAIT
-        } else {
-            ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED
-        }
-
-        _isDestructionPending = false
-        val nightMode = resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK
-        val darkModeEnabled = corePreferences.darkMode
-        when (nightMode) {
-            Configuration.UI_MODE_NIGHT_NO, Configuration.UI_MODE_NIGHT_UNDEFINED -> {
-                if (darkModeEnabled == 1) {
-                    // Force dark mode
-                    Log.w("[Generic Activity] Forcing night mode")
-                    AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES)
-                    _isDestructionPending = true
-                }
-            }
-            Configuration.UI_MODE_NIGHT_YES -> {
-                if (darkModeEnabled == 0) {
-                    // Force light mode
-                    Log.w("[Generic Activity] Forcing day mode")
-                    AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO)
-                    _isDestructionPending = true
-                }
-            }
-        }
-
-        updateScreenSize()
-    }
-
-    override fun onResume() {
-        super.onResume()
-
-        // Remove service notification if it has been started by device boot
-        coreContext.notificationsManager.stopForegroundNotificationIfPossible()
-    }
-
-    override fun finish() {
-        super.finish()
-        ActivityNavigator.applyPopAnimationsToPendingTransition(this)
-    }
-
-    fun isTablet(): Boolean {
-        return resources.getBoolean(R.bool.isTablet)
-    }
-
-    private fun updateScreenSize() {
-        val metrics = DisplayMetrics()
-        val display: Display = windowManager.defaultDisplay
-        display.getRealMetrics(metrics)
-        val screenWidth = metrics.widthPixels.toFloat()
-        val screenHeight = metrics.heightPixels.toFloat()
-        coreContext.screenWidth = screenWidth
-        coreContext.screenHeight = screenHeight
-    }
-
-    private fun updateCurrentLayout(newLayoutInfo: WindowLayoutInfo) {
-        if (newLayoutInfo.displayFeatures.isEmpty()) {
-            onLayoutChanges(null)
-        } else {
-            for (feature in newLayoutInfo.displayFeatures) {
-                val foldingFeature = feature as? FoldingFeature
-                if (foldingFeature != null) {
-                    onLayoutChanges(foldingFeature)
-                }
-            }
-        }
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/GenericFragment.kt b/app/src/main/java/org/linphone/activities/GenericFragment.kt
deleted file mode 100644
index ab8db20ef..000000000
--- a/app/src/main/java/org/linphone/activities/GenericFragment.kt
+++ /dev/null
@@ -1,185 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.ImageView
-import androidx.activity.OnBackPressedCallback
-import androidx.core.view.doOnPreDraw
-import androidx.databinding.DataBindingUtil
-import androidx.databinding.ViewDataBinding
-import androidx.fragment.app.Fragment
-import androidx.lifecycle.ViewModelProvider
-import androidx.navigation.fragment.findNavController
-import com.google.android.material.transition.MaterialSharedAxis
-import org.linphone.LinphoneApplication.Companion.corePreferences
-import org.linphone.R
-import org.linphone.activities.main.viewmodels.SharedMainViewModel
-import org.linphone.core.tools.Log
-
-abstract class GenericFragment<T : ViewDataBinding> : Fragment() {
-    companion object {
-        val emptyFragmentsIds = arrayListOf(
-            R.id.emptyChatFragment,
-            R.id.emptyContactFragment,
-            R.id.emptySettingsFragment,
-            R.id.emptyCallHistoryFragment
-        )
-    }
-
-    private var _binding: T? = null
-    protected val binding get() = _binding!!
-
-    protected var useMaterialSharedAxisXForwardAnimation = true
-
-    protected lateinit var sharedViewModel: SharedMainViewModel
-
-    protected fun isSharedViewModelInitialized(): Boolean {
-        return ::sharedViewModel.isInitialized
-    }
-
-    protected fun isBindingAvailable(): Boolean {
-        return _binding != null
-    }
-
-    private fun getFragmentRealClassName(): String {
-        return this.javaClass.name
-    }
-
-    private val onBackPressedCallback = object : OnBackPressedCallback(false) {
-        override fun handleOnBackPressed() {
-            try {
-                val navController = findNavController()
-                Log.d("[Generic Fragment] ${getFragmentRealClassName()} handleOnBackPressed")
-                if (!navController.popBackStack()) {
-                    Log.d("[Generic Fragment] ${getFragmentRealClassName()} couldn't pop")
-                    if (!navController.navigateUp()) {
-                        Log.d(
-                            "[Generic Fragment] ${getFragmentRealClassName()} couldn't navigate up"
-                        )
-                        // Disable this callback & start a new back press event
-                        isEnabled = false
-                        goBack()
-                    }
-                }
-            } catch (ise: IllegalStateException) {
-                Log.e(
-                    "[Generic Fragment] ${getFragmentRealClassName()}.handleOnBackPressed() Can't go back: $ise"
-                )
-            }
-        }
-    }
-
-    abstract fun getLayoutId(): Int
-
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View? {
-        sharedViewModel = requireActivity().run {
-            ViewModelProvider(this)[SharedMainViewModel::class.java]
-        }
-
-        sharedViewModel.isSlidingPaneSlideable.observe(viewLifecycleOwner) {
-            Log.d(
-                "[Generic Fragment] ${getFragmentRealClassName()} shared main VM sliding pane has changed"
-            )
-            onBackPressedCallback.isEnabled = backPressedCallBackEnabled()
-        }
-
-        _binding = DataBindingUtil.inflate(inflater, getLayoutId(), container, false)
-        return _binding!!.root
-    }
-
-    override fun onStart() {
-        super.onStart()
-
-        if (useMaterialSharedAxisXForwardAnimation && corePreferences.enableAnimations) {
-            enterTransition = MaterialSharedAxis(MaterialSharedAxis.X, true)
-            reenterTransition = MaterialSharedAxis(MaterialSharedAxis.X, true)
-            returnTransition = MaterialSharedAxis(MaterialSharedAxis.X, false)
-            exitTransition = MaterialSharedAxis(MaterialSharedAxis.X, false)
-
-            postponeEnterTransition()
-            binding.root.doOnPreDraw { startPostponedEnterTransition() }
-        }
-
-        setupBackPressCallback()
-    }
-
-    override fun onDestroyView() {
-        super.onDestroyView()
-
-        onBackPressedCallback.remove()
-        _binding = null
-    }
-
-    protected fun goBack() {
-        try {
-            requireActivity().onBackPressedDispatcher.onBackPressed()
-        } catch (ise: IllegalStateException) {
-            Log.w("[Generic Fragment] ${getFragmentRealClassName()}.goBack() can't go back: $ise")
-            onBackPressedCallback.handleOnBackPressed()
-        }
-    }
-
-    private fun setupBackPressCallback() {
-        Log.d("[Generic Fragment] ${getFragmentRealClassName()} setupBackPressCallback")
-
-        val backButton = binding.root.findViewById<ImageView>(R.id.back)
-        if (backButton != null) {
-            Log.d("[Generic Fragment] ${getFragmentRealClassName()} found back button")
-            // If popping navigation back stack entry would bring us to an "empty" fragment
-            // then don't do it if sliding pane layout isn't "flat"
-            onBackPressedCallback.isEnabled = backPressedCallBackEnabled()
-            backButton.setOnClickListener { goBack() }
-        } else {
-            onBackPressedCallback.isEnabled = false
-        }
-
-        requireActivity().onBackPressedDispatcher.addCallback(
-            viewLifecycleOwner,
-            onBackPressedCallback
-        )
-    }
-
-    private fun backPressedCallBackEnabled(): Boolean {
-        // This allow to navigate a SlidingPane child nav graph.
-        // This only concerns fragments for which the nav graph is inside a SlidingPane layout.
-        // In our case it's all graphs except the main one.
-        if (findNavController().graph.id == R.id.main_nav_graph_xml) return false
-
-        val isSlidingPaneFlat = sharedViewModel.isSlidingPaneSlideable.value == false
-        Log.d(
-            "[Generic Fragment] ${getFragmentRealClassName()} isSlidingPaneFlat ? $isSlidingPaneFlat"
-        )
-        val isPreviousFragmentEmpty = findNavController().previousBackStackEntry?.destination?.id in emptyFragmentsIds
-        Log.d(
-            "[Generic Fragment] ${getFragmentRealClassName()} isPreviousFragmentEmpty ? $isPreviousFragmentEmpty"
-        )
-        val popBackStack = isSlidingPaneFlat || !isPreviousFragmentEmpty
-        Log.d("[Generic Fragment] ${getFragmentRealClassName()} popBackStack ? $popBackStack")
-        return popBackStack
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/Navigation.kt b/app/src/main/java/org/linphone/activities/Navigation.kt
deleted file mode 100644
index c03d854d1..000000000
--- a/app/src/main/java/org/linphone/activities/Navigation.kt
+++ /dev/null
@@ -1,1222 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities
-
-import android.net.Uri
-import android.os.Bundle
-import androidx.core.os.bundleOf
-import androidx.fragment.app.Fragment
-import androidx.navigation.NavController
-import androidx.navigation.NavOptions
-import androidx.navigation.findNavController
-import androidx.navigation.fragment.NavHostFragment
-import androidx.navigation.fragment.findNavController
-import androidx.slidingpanelayout.widget.SlidingPaneLayout
-import org.linphone.R
-import org.linphone.activities.assistant.fragments.*
-import org.linphone.activities.main.MainActivity
-import org.linphone.activities.main.chat.fragments.ChatRoomCreationFragment
-import org.linphone.activities.main.chat.fragments.DetailChatRoomFragment
-import org.linphone.activities.main.chat.fragments.GroupInfoFragment
-import org.linphone.activities.main.chat.fragments.MasterChatRoomsFragment
-import org.linphone.activities.main.conference.fragments.*
-import org.linphone.activities.main.contact.fragments.ContactEditorFragment
-import org.linphone.activities.main.contact.fragments.DetailContactFragment
-import org.linphone.activities.main.contact.fragments.MasterContactsFragment
-import org.linphone.activities.main.dialer.fragments.DialerFragment
-import org.linphone.activities.main.fragments.TabsFragment
-import org.linphone.activities.main.history.fragments.DetailCallLogFragment
-import org.linphone.activities.main.history.fragments.MasterCallLogsFragment
-import org.linphone.activities.main.settings.fragments.*
-import org.linphone.activities.main.sidemenu.fragments.SideMenuFragment
-import org.linphone.activities.voip.CallActivity
-import org.linphone.activities.voip.fragments.*
-import org.linphone.core.tools.Log
-
-internal fun Fragment.findMasterNavController(): NavController {
-    return parentFragment?.parentFragment?.findNavController() ?: findNavController()
-}
-
-fun popupTo(
-    popUpTo: Int = -1,
-    popUpInclusive: Boolean = false,
-    singleTop: Boolean = true
-): NavOptions {
-    val builder = NavOptions.Builder()
-    builder.setPopUpTo(popUpTo, popUpInclusive).setLaunchSingleTop(singleTop)
-    return builder.build()
-}
-
-/* Main activity related */
-
-internal fun MainActivity.navigateToDialer(args: Bundle? = null) {
-    findNavController(R.id.nav_host_fragment).navigate(
-        R.id.action_global_dialerFragment,
-        args,
-        popupTo(R.id.dialerFragment, true)
-    )
-}
-
-internal fun MainActivity.navigateToChatRooms(args: Bundle? = null) {
-    findNavController(R.id.nav_host_fragment).navigate(
-        R.id.action_global_masterChatRoomsFragment,
-        args,
-        popupTo(R.id.masterChatRoomsFragment, true)
-    )
-}
-
-internal fun MainActivity.navigateToChatRoom(localAddress: String?, peerAddress: String?) {
-    val deepLink = "linphone-android://chat-room/$localAddress/$peerAddress"
-    findNavController(R.id.nav_host_fragment).navigate(
-        Uri.parse(deepLink),
-        popupTo(R.id.masterChatRoomsFragment, true)
-    )
-}
-
-internal fun MainActivity.navigateToContacts() {
-    findNavController(R.id.nav_host_fragment).navigate(
-        R.id.action_global_masterContactsFragment,
-        null,
-        popupTo(R.id.masterContactsFragment, true)
-    )
-}
-
-internal fun MainActivity.navigateToContact(contactId: String?) {
-    val deepLink = "linphone-android://contact/view/$contactId"
-    findNavController(R.id.nav_host_fragment).navigate(
-        Uri.parse(deepLink),
-        popupTo(R.id.masterContactsFragment, true)
-    )
-}
-
-/* Tabs fragment related */
-
-internal fun TabsFragment.navigateToCallHistory() {
-    val action = when (findNavController().currentDestination?.id) {
-        R.id.masterContactsFragment -> R.id.action_masterContactsFragment_to_masterCallLogsFragment
-        R.id.dialerFragment -> R.id.action_dialerFragment_to_masterCallLogsFragment
-        R.id.masterChatRoomsFragment -> R.id.action_masterChatRoomsFragment_to_masterCallLogsFragment
-        else -> R.id.action_global_masterCallLogsFragment
-    }
-    findNavController().navigate(
-        action,
-        null,
-        popupTo(R.id.masterCallLogsFragment, true)
-    )
-}
-
-internal fun TabsFragment.navigateToContacts() {
-    val action = when (findNavController().currentDestination?.id) {
-        R.id.masterCallLogsFragment -> R.id.action_masterCallLogsFragment_to_masterContactsFragment
-        R.id.dialerFragment -> R.id.action_dialerFragment_to_masterContactsFragment
-        R.id.masterChatRoomsFragment -> R.id.action_masterChatRoomsFragment_to_masterContactsFragment
-        else -> R.id.action_global_masterContactsFragment
-    }
-    findNavController().navigate(
-        action,
-        null,
-        popupTo(R.id.masterContactsFragment, true)
-    )
-}
-
-internal fun TabsFragment.navigateToDialer() {
-    val action = when (findNavController().currentDestination?.id) {
-        R.id.masterCallLogsFragment -> R.id.action_masterCallLogsFragment_to_dialerFragment
-        R.id.masterContactsFragment -> R.id.action_masterContactsFragment_to_dialerFragment
-        R.id.masterChatRoomsFragment -> R.id.action_masterChatRoomsFragment_to_dialerFragment
-        else -> R.id.action_global_dialerFragment
-    }
-    findNavController().navigate(
-        action,
-        null,
-        popupTo(R.id.dialerFragment, true)
-    )
-}
-
-internal fun TabsFragment.navigateToChatRooms() {
-    val action = when (findNavController().currentDestination?.id) {
-        R.id.masterCallLogsFragment -> R.id.action_masterCallLogsFragment_to_masterChatRoomsFragment
-        R.id.masterContactsFragment -> R.id.action_masterContactsFragment_to_masterChatRoomsFragment
-        R.id.dialerFragment -> R.id.action_dialerFragment_to_masterChatRoomsFragment
-        else -> R.id.action_global_masterChatRoomsFragment
-    }
-    findNavController().navigate(
-        action,
-        null,
-        popupTo(R.id.masterChatRoomsFragment, true)
-    )
-}
-
-/* Dialer related */
-
-internal fun DialerFragment.navigateToContacts(uriToAdd: String?) {
-    if (uriToAdd.isNullOrEmpty()) {
-        Log.e("[Navigation] SIP URI to add to contact is null or empty!")
-        return
-    }
-
-    val deepLink = "linphone-android://contact/new/$uriToAdd"
-    findNavController().navigate(
-        Uri.parse(deepLink),
-        popupTo(R.id.masterContactsFragment, true)
-    )
-}
-
-internal fun DialerFragment.navigateToConfigFileViewer() {
-    val bundle = bundleOf("Secure" to true)
-    findMasterNavController().navigate(
-        R.id.action_global_configViewerFragment,
-        bundle,
-        popupTo()
-    )
-}
-
-internal fun DialerFragment.navigateToConferenceScheduling() {
-    findMasterNavController().navigate(
-        R.id.action_global_conferenceSchedulingFragment,
-        null,
-        popupTo()
-    )
-}
-
-/* Conference scheduling related */
-
-internal fun ConferenceSchedulingFragment.navigateToParticipantsList() {
-    if (findNavController().currentDestination?.id == R.id.conferenceSchedulingFragment) {
-        findNavController().navigate(
-            R.id.action_conferenceSchedulingFragment_to_conferenceSchedulingParticipantsListFragment,
-            null,
-            popupTo(R.id.conferenceSchedulingParticipantsListFragment, true)
-        )
-    }
-}
-
-internal fun ConferenceSchedulingParticipantsListFragment.navigateToSummary() {
-    if (findNavController().currentDestination?.id == R.id.conferenceSchedulingParticipantsListFragment) {
-        findNavController().navigate(
-            R.id.action_conferenceSchedulingParticipantsListFragment_to_conferenceSchedulingSummaryFragment,
-            null,
-            popupTo(R.id.conferenceSchedulingSummaryFragment, true)
-        )
-    }
-}
-
-internal fun ConferenceSchedulingSummaryFragment.navigateToScheduledConferences() {
-    if (findNavController().currentDestination?.id == R.id.conferenceSchedulingSummaryFragment) {
-        findNavController().navigate(
-            R.id.action_global_scheduledConferencesFragment,
-            null,
-            popupTo(R.id.dialerFragment, false)
-        )
-    }
-}
-
-internal fun ConferenceSchedulingSummaryFragment.navigateToDialer() {
-    val bundle = Bundle()
-    findMasterNavController().navigate(
-        R.id.action_global_dialerFragment,
-        bundle,
-        popupTo(R.id.dialerFragment, false)
-    )
-}
-
-internal fun DetailChatRoomFragment.navigateToConferenceWaitingRoom(
-    address: String,
-    subject: String?
-) {
-    val bundle = Bundle()
-    bundle.putString("Address", address)
-    bundle.putString("Subject", subject)
-    findMasterNavController().navigate(
-        R.id.action_global_conferenceWaitingRoomFragment,
-        bundle,
-        popupTo(R.id.conferenceWaitingRoomFragment, true)
-    )
-}
-
-internal fun ScheduledConferencesFragment.navigateToConferenceWaitingRoom(
-    address: String,
-    subject: String?
-) {
-    val bundle = Bundle()
-    bundle.putString("Address", address)
-    bundle.putString("Subject", subject)
-    findMasterNavController().navigate(
-        R.id.action_global_conferenceWaitingRoomFragment,
-        bundle,
-        popupTo(R.id.conferenceWaitingRoomFragment, true)
-    )
-}
-
-internal fun ScheduledConferencesFragment.navigateToConferenceScheduling() {
-    findMasterNavController().navigate(
-        R.id.action_global_conferenceSchedulingFragment,
-        null,
-        popupTo(R.id.conferenceSchedulingFragment, true)
-    )
-}
-
-/* Chat related */
-
-internal fun MasterChatRoomsFragment.navigateToChatRoom(args: Bundle) {
-    val navHostFragment =
-        childFragmentManager.findFragmentById(R.id.chat_nav_container) as NavHostFragment
-    navHostFragment.navController.navigate(
-        R.id.action_global_detailChatRoomFragment,
-        args,
-        popupTo(R.id.emptyChatFragment, false)
-    )
-}
-
-internal fun MasterChatRoomsFragment.navigateToChatRoomCreation(
-    createGroupChatRoom: Boolean = false,
-    slidingPane: SlidingPaneLayout
-) {
-    val bundle = bundleOf("createGroup" to createGroupChatRoom)
-    val navHostFragment =
-        childFragmentManager.findFragmentById(R.id.chat_nav_container) as NavHostFragment
-    navHostFragment.navController.navigate(
-        R.id.action_global_chatRoomCreationFragment,
-        bundle,
-        popupTo(R.id.emptyChatFragment, false)
-    )
-    if (!slidingPane.isOpen) slidingPane.openPane()
-}
-
-internal fun MasterChatRoomsFragment.clearDisplayedChatRoom() {
-    if (findNavController().currentDestination?.id == R.id.masterChatRoomsFragment) {
-        val navHostFragment =
-            childFragmentManager.findFragmentById(R.id.chat_nav_container) as NavHostFragment
-        navHostFragment.navController.navigate(
-            R.id.action_global_emptyChatFragment,
-            null,
-            popupTo(R.id.emptyChatFragment, true)
-        )
-    }
-}
-
-internal fun DetailChatRoomFragment.navigateToContacts(sipUriToAdd: String) {
-    if (sipUriToAdd.isEmpty()) {
-        Log.e("[Navigation] SIP URI to add to contact is empty!")
-        return
-    }
-
-    val deepLink = "linphone-android://contact/new/$sipUriToAdd"
-    findMasterNavController().navigate(Uri.parse(deepLink))
-}
-
-internal fun DetailChatRoomFragment.navigateToNativeContact(id: String) {
-    val deepLink = "linphone-android://contact/view/$id"
-    findMasterNavController().navigate(Uri.parse(deepLink))
-}
-
-internal fun DetailChatRoomFragment.navigateToFriend(address: String) {
-    val deepLink = "linphone-android://contact/view-friend/$address"
-    findMasterNavController().navigate(Uri.parse(deepLink))
-}
-
-internal fun DetailChatRoomFragment.navigateToImdn(args: Bundle?) {
-    if (findNavController().currentDestination?.id == R.id.detailChatRoomFragment) {
-        findNavController().navigate(
-            R.id.action_detailChatRoomFragment_to_imdnFragment,
-            args,
-            popupTo()
-        )
-    }
-}
-
-internal fun DetailChatRoomFragment.navigateToDevices() {
-    if (findNavController().currentDestination?.id == R.id.detailChatRoomFragment) {
-        findNavController().navigate(
-            R.id.action_detailChatRoomFragment_to_devicesFragment,
-            null,
-            popupTo()
-        )
-    }
-}
-
-internal fun DetailChatRoomFragment.navigateToGroupInfo() {
-    if (findNavController().currentDestination?.id == R.id.detailChatRoomFragment) {
-        findNavController().navigate(
-            R.id.action_detailChatRoomFragment_to_groupInfoFragment,
-            null,
-            popupTo(R.id.groupInfoFragment, true)
-        )
-    }
-}
-
-internal fun DetailChatRoomFragment.navigateToEphemeralInfo() {
-    if (findNavController().currentDestination?.id == R.id.detailChatRoomFragment) {
-        findNavController().navigate(
-            R.id.action_detailChatRoomFragment_to_ephemeralFragment,
-            null,
-            popupTo()
-        )
-    }
-}
-
-internal fun DetailChatRoomFragment.navigateToTextFileViewer(secure: Boolean) {
-    val bundle = bundleOf("Secure" to secure)
-    findMasterNavController().navigate(
-        R.id.action_global_textViewerFragment,
-        bundle,
-        popupTo()
-    )
-}
-
-internal fun DetailChatRoomFragment.navigateToPdfFileViewer(secure: Boolean) {
-    val bundle = bundleOf("Secure" to secure)
-    findMasterNavController().navigate(
-        R.id.action_global_pdfViewerFragment,
-        bundle,
-        popupTo()
-    )
-}
-
-internal fun DetailChatRoomFragment.navigateToImageFileViewer(secure: Boolean) {
-    val bundle = bundleOf("Secure" to secure)
-    findMasterNavController().navigate(
-        R.id.action_global_imageViewerFragment,
-        bundle,
-        popupTo()
-    )
-}
-
-internal fun DetailChatRoomFragment.navigateToVideoFileViewer(secure: Boolean) {
-    val bundle = bundleOf("Secure" to secure)
-    findMasterNavController().navigate(
-        R.id.action_global_videoViewerFragment,
-        bundle,
-        popupTo()
-    )
-}
-
-internal fun DetailChatRoomFragment.navigateToAudioFileViewer(secure: Boolean) {
-    val bundle = bundleOf("Secure" to secure)
-    findMasterNavController().navigate(
-        R.id.action_global_audioViewerFragment,
-        bundle,
-        popupTo()
-    )
-}
-
-internal fun DetailChatRoomFragment.navigateToEmptyChatRoom() {
-    findNavController().navigate(
-        R.id.action_global_emptyChatFragment,
-        null,
-        popupTo(R.id.detailChatRoomFragment, true)
-    )
-}
-
-internal fun DetailChatRoomFragment.navigateToDialer(args: Bundle?) {
-    findMasterNavController().navigate(
-        R.id.action_global_dialerFragment,
-        args,
-        popupTo(R.id.dialerFragment, true)
-    )
-}
-
-internal fun DetailChatRoomFragment.navigateToConferenceScheduling() {
-    findMasterNavController().navigate(
-        R.id.action_global_conferenceSchedulingFragment,
-        null,
-        popupTo()
-    )
-}
-
-internal fun ChatRoomCreationFragment.navigateToGroupInfo() {
-    if (findNavController().currentDestination?.id == R.id.chatRoomCreationFragment) {
-        findNavController().navigate(
-            R.id.action_chatRoomCreationFragment_to_groupInfoFragment,
-            null,
-            popupTo(R.id.groupInfoFragment, true)
-        )
-    }
-}
-
-internal fun ChatRoomCreationFragment.navigateToChatRoom(args: Bundle) {
-    if (findNavController().currentDestination?.id == R.id.chatRoomCreationFragment) {
-        findNavController().navigate(
-            R.id.action_chatRoomCreationFragment_to_detailChatRoomFragment,
-            args,
-            popupTo(R.id.emptyChatFragment, false)
-        )
-    }
-}
-
-internal fun GroupInfoFragment.navigateToChatRoomCreation(args: Bundle?) {
-    if (findNavController().currentDestination?.id == R.id.groupInfoFragment) {
-        findNavController().navigate(
-            R.id.action_groupInfoFragment_to_chatRoomCreationFragment,
-            args,
-            popupTo(R.id.chatRoomCreationFragment, true)
-        )
-    }
-}
-
-internal fun GroupInfoFragment.navigateToChatRoom(args: Bundle?, created: Boolean) {
-    if (findNavController().currentDestination?.id == R.id.groupInfoFragment) {
-        val popUpToFragmentId = if (created) { // To remove all creation fragments from back stack
-            R.id.chatRoomCreationFragment
-        } else {
-            R.id.detailChatRoomFragment
-        }
-        findNavController().navigate(
-            R.id.action_groupInfoFragment_to_detailChatRoomFragment,
-            args,
-            popupTo(popUpToFragmentId, true)
-        )
-    }
-}
-
-/* Contacts related */
-
-internal fun MasterContactsFragment.navigateToContact() {
-    if (findNavController().currentDestination?.id == R.id.masterContactsFragment) {
-        val navHostFragment =
-            childFragmentManager.findFragmentById(R.id.contacts_nav_container) as NavHostFragment
-        navHostFragment.navController.navigate(
-            R.id.action_global_detailContactFragment,
-            null,
-            popupTo(R.id.emptyContactFragment, false)
-        )
-    }
-}
-
-internal fun MasterContactsFragment.navigateToContactEditor(
-    sipUriToAdd: String? = null,
-    slidingPane: SlidingPaneLayout
-) {
-    if (findNavController().currentDestination?.id == R.id.masterContactsFragment) {
-        val bundle = if (sipUriToAdd != null) bundleOf("SipUri" to sipUriToAdd) else Bundle()
-        val navHostFragment =
-            childFragmentManager.findFragmentById(R.id.contacts_nav_container) as NavHostFragment
-        navHostFragment.navController.navigate(
-            R.id.action_global_contactEditorFragment,
-            bundle,
-            popupTo(R.id.emptyContactFragment, false)
-        )
-        if (!slidingPane.isOpen) slidingPane.openPane()
-    }
-}
-
-internal fun MasterContactsFragment.clearDisplayedContact() {
-    if (findNavController().currentDestination?.id == R.id.masterContactsFragment) {
-        val navHostFragment =
-            childFragmentManager.findFragmentById(R.id.contacts_nav_container) as NavHostFragment
-        navHostFragment.navController.navigate(
-            R.id.action_global_emptyContactFragment,
-            null,
-            popupTo(R.id.emptyContactFragment, true)
-        )
-    }
-}
-
-internal fun ContactEditorFragment.navigateToContact(id: String) {
-    if (findNavController().currentDestination?.id == R.id.contactEditorFragment) {
-        val bundle = Bundle()
-        bundle.putString("id", id)
-        findNavController().navigate(
-            R.id.action_contactEditorFragment_to_detailContactFragment,
-            bundle,
-            popupTo(R.id.contactEditorFragment, true)
-        )
-    }
-}
-
-internal fun DetailContactFragment.navigateToChatRoom(args: Bundle?) {
-    findMasterNavController().navigate(
-        R.id.action_global_masterChatRoomsFragment,
-        args,
-        popupTo(R.id.masterChatRoomsFragment, true)
-    )
-}
-
-internal fun DetailContactFragment.navigateToDialer(args: Bundle?) {
-    findMasterNavController().navigate(
-        R.id.action_global_dialerFragment,
-        args,
-        popupTo(R.id.dialerFragment, true)
-    )
-}
-
-internal fun DetailContactFragment.navigateToContactEditor() {
-    if (findNavController().currentDestination?.id == R.id.detailContactFragment) {
-        findNavController().navigate(
-            R.id.action_detailContactFragment_to_contactEditorFragment,
-            null,
-            popupTo(R.id.contactEditorFragment, true)
-        )
-    }
-}
-
-/* History related */
-
-internal fun MasterCallLogsFragment.navigateToCallHistory(slidingPane: SlidingPaneLayout) {
-    if (findNavController().currentDestination?.id == R.id.masterCallLogsFragment) {
-        val navHostFragment =
-            childFragmentManager.findFragmentById(R.id.history_nav_container) as NavHostFragment
-        navHostFragment.navController.navigate(
-            R.id.action_global_detailCallLogFragment,
-            null,
-            popupTo(R.id.emptyCallHistoryFragment, false)
-        )
-        if (!slidingPane.isOpen) slidingPane.openPane()
-    }
-}
-
-internal fun MasterCallLogsFragment.navigateToConferenceCallHistory(slidingPane: SlidingPaneLayout) {
-    if (findNavController().currentDestination?.id == R.id.masterCallLogsFragment) {
-        val navHostFragment =
-            childFragmentManager.findFragmentById(R.id.history_nav_container) as NavHostFragment
-        navHostFragment.navController.navigate(
-            R.id.action_global_detailConferenceCallLogFragment,
-            null,
-            popupTo(R.id.emptyCallHistoryFragment, false)
-        )
-        if (!slidingPane.isOpen) slidingPane.openPane()
-    }
-}
-
-internal fun MasterCallLogsFragment.clearDisplayedCallHistory() {
-    if (findNavController().currentDestination?.id == R.id.masterCallLogsFragment) {
-        val navHostFragment =
-            childFragmentManager.findFragmentById(R.id.history_nav_container) as NavHostFragment
-        navHostFragment.navController.navigate(
-            R.id.action_global_emptyFragment,
-            null,
-            popupTo(R.id.emptyCallHistoryFragment, true)
-        )
-    }
-}
-
-internal fun MasterCallLogsFragment.navigateToDialer(args: Bundle?) {
-    findNavController().navigate(
-        R.id.action_global_dialerFragment,
-        args,
-        popupTo(R.id.dialerFragment, true)
-    )
-}
-
-internal fun MasterCallLogsFragment.navigateToConferenceWaitingRoom(
-    address: String,
-    subject: String?
-) {
-    val bundle = Bundle()
-    bundle.putString("Address", address)
-    bundle.putString("Subject", subject)
-    findMasterNavController().navigate(
-        R.id.action_global_conferenceWaitingRoomFragment,
-        bundle,
-        popupTo(R.id.conferenceWaitingRoomFragment, true)
-    )
-}
-
-internal fun DetailCallLogFragment.navigateToContacts(sipUriToAdd: String) {
-    if (sipUriToAdd.isEmpty()) {
-        Log.e("[Navigation] SIP URI to add to contact is empty!")
-        return
-    }
-
-    val deepLink = "linphone-android://contact/new/$sipUriToAdd"
-    findMasterNavController().navigate(Uri.parse(deepLink))
-}
-
-internal fun DetailCallLogFragment.navigateToNativeContact(id: String) {
-    val deepLink = "linphone-android://contact/view/$id"
-    findMasterNavController().navigate(Uri.parse(deepLink))
-}
-
-internal fun DetailCallLogFragment.navigateToFriend(address: String) {
-    val deepLink = "linphone-android://contact/view-friend/$address"
-    findMasterNavController().navigate(Uri.parse(deepLink))
-}
-
-internal fun DetailCallLogFragment.navigateToChatRoom(args: Bundle?) {
-    if (findNavController().currentDestination?.id == R.id.detailCallLogFragment) {
-        findMasterNavController().navigate(
-            R.id.action_global_masterChatRoomsFragment,
-            args,
-            popupTo(R.id.masterChatRoomsFragment, true)
-        )
-    }
-}
-
-internal fun DetailCallLogFragment.navigateToDialer(args: Bundle?) {
-    if (findNavController().currentDestination?.id == R.id.detailCallLogFragment) {
-        findMasterNavController().navigate(
-            R.id.action_global_dialerFragment,
-            args,
-            popupTo(R.id.dialerFragment, true)
-        )
-    }
-}
-
-/* Settings related */
-
-internal fun SettingsFragment.navigateToAccountSettings(identity: String) {
-    if (findNavController().currentDestination?.id == R.id.settingsFragment) {
-        val bundle = bundleOf("Identity" to identity)
-        val navHostFragment =
-            childFragmentManager.findFragmentById(R.id.settings_nav_container) as NavHostFragment
-        navHostFragment.navController.navigate(
-            R.id.action_global_accountSettingsFragment,
-            bundle,
-            popupTo(R.id.emptySettingsFragment, false)
-        )
-    }
-}
-
-internal fun SettingsFragment.navigateToTunnelSettings(slidingPane: SlidingPaneLayout) {
-    if (findNavController().currentDestination?.id == R.id.settingsFragment) {
-        val navHostFragment =
-            childFragmentManager.findFragmentById(R.id.settings_nav_container) as NavHostFragment
-        navHostFragment.navController.navigate(
-            R.id.action_global_tunnelSettingsFragment,
-            null,
-            popupTo(R.id.emptySettingsFragment, false)
-        )
-        if (!slidingPane.isOpen) slidingPane.openPane()
-    }
-}
-
-internal fun SettingsFragment.navigateToAudioSettings(slidingPane: SlidingPaneLayout) {
-    if (findNavController().currentDestination?.id == R.id.settingsFragment) {
-        val navHostFragment =
-            childFragmentManager.findFragmentById(R.id.settings_nav_container) as NavHostFragment
-        navHostFragment.navController.navigate(
-            R.id.action_global_audioSettingsFragment,
-            null,
-            popupTo(R.id.emptySettingsFragment, false)
-        )
-        if (!slidingPane.isOpen) slidingPane.openPane()
-    }
-}
-
-internal fun SettingsFragment.navigateToVideoSettings(slidingPane: SlidingPaneLayout) {
-    if (findNavController().currentDestination?.id == R.id.settingsFragment) {
-        val navHostFragment =
-            childFragmentManager.findFragmentById(R.id.settings_nav_container) as NavHostFragment
-        navHostFragment.navController.navigate(
-            R.id.action_global_videoSettingsFragment,
-            null,
-            popupTo(R.id.emptySettingsFragment, false)
-        )
-        if (!slidingPane.isOpen) slidingPane.openPane()
-    }
-}
-
-internal fun SettingsFragment.navigateToCallSettings(slidingPane: SlidingPaneLayout) {
-    if (findNavController().currentDestination?.id == R.id.settingsFragment) {
-        val navHostFragment =
-            childFragmentManager.findFragmentById(R.id.settings_nav_container) as NavHostFragment
-        navHostFragment.navController.navigate(
-            R.id.action_global_callSettingsFragment,
-            null,
-            popupTo(R.id.emptySettingsFragment, false)
-        )
-        if (!slidingPane.isOpen) slidingPane.openPane()
-    }
-}
-
-internal fun SettingsFragment.navigateToChatSettings(slidingPane: SlidingPaneLayout) {
-    if (findNavController().currentDestination?.id == R.id.settingsFragment) {
-        val navHostFragment =
-            childFragmentManager.findFragmentById(R.id.settings_nav_container) as NavHostFragment
-        navHostFragment.navController.navigate(
-            R.id.action_global_chatSettingsFragment,
-            null,
-            popupTo(R.id.emptySettingsFragment, false)
-        )
-        if (!slidingPane.isOpen) slidingPane.openPane()
-    }
-}
-
-internal fun SettingsFragment.navigateToNetworkSettings(slidingPane: SlidingPaneLayout) {
-    if (findNavController().currentDestination?.id == R.id.settingsFragment) {
-        val navHostFragment =
-            childFragmentManager.findFragmentById(R.id.settings_nav_container) as NavHostFragment
-        navHostFragment.navController.navigate(
-            R.id.action_global_networkSettingsFragment,
-            null,
-            popupTo(R.id.emptySettingsFragment, false)
-        )
-        if (!slidingPane.isOpen) slidingPane.openPane()
-    }
-}
-
-internal fun SettingsFragment.navigateToContactsSettings(slidingPane: SlidingPaneLayout) {
-    if (findNavController().currentDestination?.id == R.id.settingsFragment) {
-        val navHostFragment =
-            childFragmentManager.findFragmentById(R.id.settings_nav_container) as NavHostFragment
-        navHostFragment.navController.navigate(
-            R.id.action_global_contactsSettingsFragment,
-            null,
-            popupTo(R.id.emptySettingsFragment, false)
-        )
-        if (!slidingPane.isOpen) slidingPane.openPane()
-    }
-}
-
-internal fun SettingsFragment.navigateToAdvancedSettings(slidingPane: SlidingPaneLayout) {
-    if (findNavController().currentDestination?.id == R.id.settingsFragment) {
-        val navHostFragment =
-            childFragmentManager.findFragmentById(R.id.settings_nav_container) as NavHostFragment
-        navHostFragment.navController.navigate(
-            R.id.action_global_advancedSettingsFragment,
-            null,
-            popupTo(R.id.emptySettingsFragment, false)
-        )
-        if (!slidingPane.isOpen) slidingPane.openPane()
-    }
-}
-
-internal fun SettingsFragment.navigateToConferencesSettings(slidingPane: SlidingPaneLayout) {
-    if (findNavController().currentDestination?.id == R.id.settingsFragment) {
-        val navHostFragment =
-            childFragmentManager.findFragmentById(R.id.settings_nav_container) as NavHostFragment
-        navHostFragment.navController.navigate(
-            R.id.action_global_conferencesSettingsFragment,
-            null,
-            popupTo(R.id.emptySettingsFragment, false)
-        )
-        if (!slidingPane.isOpen) slidingPane.openPane()
-    }
-}
-
-internal fun AccountSettingsFragment.navigateToPhoneLinking(args: Bundle?) {
-    if (findNavController().currentDestination?.id == R.id.accountSettingsFragment) {
-        findNavController().navigate(
-            R.id.action_accountSettingsFragment_to_phoneAccountLinkingFragment,
-            args,
-            popupTo()
-        )
-    }
-}
-
-internal fun PhoneAccountLinkingFragment.navigateToPhoneAccountValidation(args: Bundle?) {
-    if (findNavController().currentDestination?.id == R.id.phoneAccountLinkingFragment) {
-        findNavController().navigate(
-            R.id.action_phoneAccountLinkingFragment_to_phoneAccountValidationFragment,
-            args,
-            popupTo()
-        )
-    }
-}
-
-internal fun navigateToEmptySetting(navController: NavController) {
-    navController.navigate(
-        R.id.action_global_emptySettingsFragment,
-        null,
-        popupTo(R.id.emptySettingsFragment, true)
-    )
-}
-
-internal fun ContactsSettingsFragment.navigateToLdapSettings(configIndex: Int) {
-    if (findNavController().currentDestination?.id == R.id.contactsSettingsFragment) {
-        val bundle = bundleOf("LdapConfigIndex" to configIndex)
-        findNavController().navigate(
-            R.id.action_contactsSettingsFragment_to_ldapSettingsFragment,
-            bundle,
-            popupTo()
-        )
-    }
-}
-
-/* Side menu related */
-
-internal fun SideMenuFragment.navigateToAccountSettings(identity: String) {
-    val deepLink = "linphone-android://settings/$identity"
-    try {
-        findNavController().navigate(Uri.parse(deepLink))
-    } catch (iae: IllegalArgumentException) {
-        Log.e("[Navigation] Failed to navigate to deeplink [$deepLink]")
-    }
-}
-
-internal fun SideMenuFragment.navigateToSettings() {
-    findNavController().navigate(
-        R.id.action_global_settingsFragment,
-        null,
-        popupTo(R.id.settingsFragment, true)
-    )
-}
-
-internal fun SideMenuFragment.navigateToAbout() {
-    findNavController().navigate(
-        R.id.action_global_aboutFragment,
-        null,
-        popupTo(R.id.aboutFragment, true)
-    )
-}
-
-internal fun SideMenuFragment.navigateToRecordings() {
-    findNavController().navigate(
-        R.id.action_global_recordingsFragment,
-        null,
-        popupTo(R.id.recordingsFragment, true)
-    )
-}
-
-internal fun SideMenuFragment.navigateToScheduledConferences() {
-    findNavController().navigate(
-        R.id.action_global_scheduledConferencesFragment,
-        null,
-        popupTo(R.id.scheduledConferencesFragment, true)
-    )
-}
-
-/* Calls related */
-
-internal fun CallActivity.navigateToActiveCall() {
-    if (findNavController(R.id.nav_host_fragment).currentDestination?.id != R.id.singleCallFragment) {
-        findNavController(R.id.nav_host_fragment).navigate(
-            R.id.action_global_singleCallFragment,
-            null,
-            popupTo(R.id.conferenceCallFragment, true)
-        )
-    }
-}
-
-internal fun CallActivity.navigateToConferenceCall() {
-    if (findNavController(R.id.nav_host_fragment).currentDestination?.id != R.id.conferenceCallFragment) {
-        findNavController(R.id.nav_host_fragment).navigate(
-            R.id.action_global_conferenceCallFragment,
-            null,
-            popupTo(R.id.singleCallFragment, true)
-        )
-    }
-}
-
-internal fun CallActivity.navigateToOutgoingCall() {
-    findNavController(R.id.nav_host_fragment).navigate(
-        R.id.action_global_outgoingCallFragment,
-        null,
-        popupTo(R.id.singleCallFragment, true)
-    )
-}
-
-internal fun CallActivity.navigateToIncomingCall(earlyMediaVideoEnabled: Boolean) {
-    val args = Bundle()
-    args.putBoolean("earlyMediaVideo", earlyMediaVideoEnabled)
-    findNavController(R.id.nav_host_fragment).navigate(
-        R.id.action_global_incomingCallFragment,
-        args,
-        popupTo(R.id.singleCallFragment, true)
-    )
-}
-
-internal fun OutgoingCallFragment.navigateToActiveCall() {
-    findNavController().navigate(
-        R.id.action_global_singleCallFragment,
-        null,
-        popupTo(R.id.outgoingCallFragment, true)
-    )
-}
-
-internal fun IncomingCallFragment.navigateToActiveCall() {
-    findNavController().navigate(
-        R.id.action_global_singleCallFragment,
-        null,
-        popupTo(R.id.incomingCallFragment, true)
-    )
-}
-
-internal fun SingleCallFragment.navigateToCallsList() {
-    if (findNavController().currentDestination?.id == R.id.singleCallFragment) {
-        findNavController().navigate(
-            R.id.action_singleCallFragment_to_callsListFragment,
-            null,
-            popupTo()
-        )
-    }
-}
-
-internal fun SingleCallFragment.navigateToConferenceParticipants() {
-    if (findNavController().currentDestination?.id == R.id.singleCallFragment) {
-        findNavController().navigate(
-            R.id.action_singleCallFragment_to_conferenceParticipantsFragment,
-            null,
-            popupTo()
-        )
-    }
-}
-
-internal fun SingleCallFragment.navigateToConferenceLayout() {
-    if (findNavController().currentDestination?.id == R.id.singleCallFragment) {
-        findNavController().navigate(
-            R.id.action_singleCallFragment_to_conferenceLayoutFragment,
-            null,
-            popupTo()
-        )
-    }
-}
-
-internal fun SingleCallFragment.navigateToIncomingCall() {
-    if (findNavController().currentDestination?.id == R.id.singleCallFragment) {
-        findNavController().navigate(
-            R.id.action_global_incomingCallFragment,
-            null,
-            popupTo(R.id.singleCallFragment, true)
-        )
-    }
-}
-
-internal fun SingleCallFragment.navigateToOutgoingCall() {
-    if (findNavController().currentDestination?.id == R.id.singleCallFragment) {
-        findNavController().navigate(
-            R.id.action_global_outgoingCallFragment,
-            null,
-            popupTo(R.id.singleCallFragment, true)
-        )
-    }
-}
-
-internal fun ConferenceCallFragment.navigateToCallsList() {
-    if (findNavController().currentDestination?.id == R.id.conferenceCallFragment) {
-        findNavController().navigate(
-            R.id.action_conferenceCallFragment_to_callsListFragment,
-            null,
-            popupTo()
-        )
-    }
-}
-
-internal fun ConferenceCallFragment.navigateToConferenceParticipants() {
-    if (findNavController().currentDestination?.id == R.id.conferenceCallFragment) {
-        findNavController().navigate(
-            R.id.action_conferenceCallFragment_to_conferenceParticipantsFragment,
-            null,
-            popupTo()
-        )
-    }
-}
-
-internal fun ConferenceCallFragment.navigateToConferenceLayout() {
-    if (findNavController().currentDestination?.id == R.id.conferenceCallFragment) {
-        findNavController().navigate(
-            R.id.action_conferenceCallFragment_to_conferenceLayoutFragment,
-            null,
-            popupTo()
-        )
-    }
-}
-
-internal fun ConferenceCallFragment.refreshConferenceFragment() {
-    if (findNavController().currentDestination?.id == R.id.conferenceCallFragment) {
-        findNavController().navigate(
-            R.id.action_global_conferenceCallFragment,
-            null,
-            popupTo(R.id.conferenceCallFragment, true)
-        )
-    }
-}
-
-internal fun ConferenceParticipantsFragment.navigateToAddParticipants() {
-    if (findNavController().currentDestination?.id == R.id.conferenceParticipantsFragment) {
-        findNavController().navigate(
-            R.id.action_conferenceParticipantsFragment_to_conferenceAddParticipantsFragment,
-            null,
-            popupTo(R.id.conferenceAddParticipantsFragment, true)
-        )
-    }
-}
-
-/* Assistant related */
-
-internal fun WelcomeFragment.navigateToEmailAccountCreation() {
-    if (findNavController().currentDestination?.id == R.id.welcomeFragment) {
-        findNavController().navigate(
-            R.id.action_welcomeFragment_to_emailAccountCreationFragment,
-            null,
-            popupTo()
-        )
-    }
-}
-
-internal fun WelcomeFragment.navigateToPhoneAccountCreation() {
-    if (findNavController().currentDestination?.id == R.id.welcomeFragment) {
-        findNavController().navigate(
-            R.id.action_welcomeFragment_to_phoneAccountCreationFragment,
-            null,
-            popupTo()
-        )
-    }
-}
-
-internal fun WelcomeFragment.navigateToNoPushWarning() {
-    if (findNavController().currentDestination?.id == R.id.welcomeFragment) {
-        findNavController().navigate(
-            R.id.action_welcomeFragment_to_noPushWarningFragment,
-            null,
-            popupTo()
-        )
-    }
-}
-
-internal fun WelcomeFragment.navigateToAccountLogin() {
-    if (findNavController().currentDestination?.id == R.id.welcomeFragment) {
-        findNavController().navigate(
-            R.id.action_welcomeFragment_to_accountLoginFragment,
-            null,
-            popupTo()
-        )
-    }
-}
-
-internal fun WelcomeFragment.navigateToGenericLoginWarning() {
-    if (findNavController().currentDestination?.id == R.id.welcomeFragment) {
-        findNavController().navigate(
-            R.id.action_welcomeFragment_to_genericAccountWarningFragment,
-            null,
-            popupTo()
-        )
-    }
-}
-
-internal fun WelcomeFragment.navigateToRemoteProvisioning() {
-    if (findNavController().currentDestination?.id == R.id.welcomeFragment) {
-        findNavController().navigate(
-            R.id.action_welcomeFragment_to_remoteProvisioningFragment,
-            null,
-            popupTo()
-        )
-    }
-}
-
-internal fun AccountLoginFragment.navigateToEchoCancellerCalibration() {
-    if (findNavController().currentDestination?.id == R.id.accountLoginFragment) {
-        findNavController().navigate(
-            R.id.action_accountLoginFragment_to_echoCancellerCalibrationFragment,
-            null,
-            popupTo()
-        )
-    }
-}
-
-internal fun AccountLoginFragment.navigateToPhoneAccountValidation(args: Bundle?) {
-    if (findNavController().currentDestination?.id == R.id.accountLoginFragment) {
-        findNavController().navigate(
-            R.id.action_accountLoginFragment_to_phoneAccountValidationFragment,
-            args,
-            popupTo()
-        )
-    }
-}
-
-internal fun GenericAccountWarningFragment.navigateToGenericLogin() {
-    if (findNavController().currentDestination?.id == R.id.genericAccountWarningFragment) {
-        findNavController().navigate(
-            R.id.action_genericAccountWarningFragment_to_genericAccountLoginFragment,
-            null,
-            popupTo(R.id.welcomeFragment, popUpInclusive = false)
-        )
-    }
-}
-
-internal fun GenericAccountLoginFragment.navigateToEchoCancellerCalibration() {
-    if (findNavController().currentDestination?.id == R.id.genericAccountLoginFragment) {
-        findNavController().navigate(
-            R.id.action_genericAccountLoginFragment_to_echoCancellerCalibrationFragment,
-            null,
-            popupTo()
-        )
-    }
-}
-
-internal fun RemoteProvisioningFragment.navigateToQrCode() {
-    if (findNavController().currentDestination?.id == R.id.remoteProvisioningFragment) {
-        findNavController().navigate(
-            R.id.action_remoteProvisioningFragment_to_qrCodeFragment,
-            null,
-            popupTo()
-        )
-    }
-}
-
-internal fun RemoteProvisioningFragment.navigateToEchoCancellerCalibration() {
-    if (findNavController().currentDestination?.id == R.id.remoteProvisioningFragment) {
-        findNavController().navigate(
-            R.id.action_remoteProvisioningFragment_to_echoCancellerCalibrationFragment,
-            null,
-            popupTo()
-        )
-    }
-}
-
-internal fun EmailAccountCreationFragment.navigateToEmailAccountValidation() {
-    if (findNavController().currentDestination?.id == R.id.emailAccountCreationFragment) {
-        findNavController().navigate(
-            R.id.action_emailAccountCreationFragment_to_emailAccountValidationFragment,
-            null,
-            popupTo()
-        )
-    }
-}
-
-internal fun EmailAccountValidationFragment.navigateToAccountLinking(args: Bundle?) {
-    if (findNavController().currentDestination?.id == R.id.emailAccountValidationFragment) {
-        findNavController().navigate(
-            R.id.action_emailAccountValidationFragment_to_phoneAccountLinkingFragment,
-            args,
-            popupTo()
-        )
-    }
-}
-
-internal fun PhoneAccountCreationFragment.navigateToPhoneAccountValidation(args: Bundle?) {
-    if (findNavController().currentDestination?.id == R.id.phoneAccountCreationFragment) {
-        findNavController().navigate(
-            R.id.action_phoneAccountCreationFragment_to_phoneAccountValidationFragment,
-            args,
-            popupTo()
-        )
-    }
-}
-
-internal fun PhoneAccountValidationFragment.navigateToAccountSettings(args: Bundle?) {
-    if (findNavController().currentDestination?.id == R.id.phoneAccountValidationFragment) {
-        findNavController().navigate(
-            R.id.action_phoneAccountValidationFragment_to_accountSettingsFragment,
-            args,
-            popupTo(R.id.accountSettingsFragment, true)
-        )
-    }
-}
-
-internal fun PhoneAccountValidationFragment.navigateToEchoCancellerCalibration() {
-    if (findNavController().currentDestination?.id == R.id.phoneAccountValidationFragment) {
-        findNavController().navigate(
-            R.id.action_phoneAccountValidationFragment_to_echoCancellerCalibrationFragment,
-            null,
-            popupTo()
-        )
-    }
-}
-
-internal fun PhoneAccountLinkingFragment.navigateToEchoCancellerCalibration() {
-    if (findNavController().currentDestination?.id == R.id.phoneAccountLinkingFragment) {
-        findNavController().navigate(
-            R.id.action_phoneAccountLinkingFragment_to_echoCancellerCalibrationFragment,
-            null,
-            popupTo()
-        )
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/ProximitySensorActivity.kt b/app/src/main/java/org/linphone/activities/ProximitySensorActivity.kt
deleted file mode 100644
index 605af6df8..000000000
--- a/app/src/main/java/org/linphone/activities/ProximitySensorActivity.kt
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities
-
-import android.content.Context
-import android.os.Bundle
-import android.os.PowerManager
-import android.os.PowerManager.RELEASE_FLAG_WAIT_FOR_NO_PROXIMITY
-import org.linphone.core.tools.Log
-
-abstract class ProximitySensorActivity : GenericActivity() {
-    private lateinit var proximityWakeLock: PowerManager.WakeLock
-    private var proximitySensorEnabled = false
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-
-        val powerManager = getSystemService(Context.POWER_SERVICE) as PowerManager
-        if (!powerManager.isWakeLockLevelSupported(PowerManager.PROXIMITY_SCREEN_OFF_WAKE_LOCK)) {
-            Log.w(
-                "[Proximity Sensor Activity] PROXIMITY_SCREEN_OFF_WAKE_LOCK isn't supported on this device!"
-            )
-        }
-
-        proximityWakeLock = powerManager.newWakeLock(
-            PowerManager.PROXIMITY_SCREEN_OFF_WAKE_LOCK,
-            "$packageName;proximity_sensor"
-        )
-    }
-
-    override fun onPause() {
-        enableProximitySensor(false)
-
-        super.onPause()
-    }
-
-    override fun onDestroy() {
-        enableProximitySensor(false)
-
-        super.onDestroy()
-    }
-
-    protected fun enableProximitySensor(enable: Boolean) {
-        if (enable) {
-            if (!proximitySensorEnabled) {
-                Log.i(
-                    "[Proximity Sensor Activity] Enabling proximity sensor (turning screen OFF when wake lock is acquired)"
-                )
-                if (!proximityWakeLock.isHeld) {
-                    Log.i("[Proximity Sensor Activity] Acquiring PROXIMITY_SCREEN_OFF_WAKE_LOCK")
-                    proximityWakeLock.acquire()
-                }
-                proximitySensorEnabled = true
-            }
-        } else {
-            if (proximitySensorEnabled) {
-                Log.i(
-                    "[Proximity Sensor Activity] Disabling proximity sensor (turning screen ON when wake lock is released)"
-                )
-                if (proximityWakeLock.isHeld) {
-                    Log.i(
-                        "[Proximity Sensor Activity] Asking to release PROXIMITY_SCREEN_OFF_WAKE_LOCK next time sensor detects no proximity"
-                    )
-                    proximityWakeLock.release(RELEASE_FLAG_WAIT_FOR_NO_PROXIMITY)
-                }
-                proximitySensorEnabled = false
-            }
-        }
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/SnackBarActivity.kt b/app/src/main/java/org/linphone/activities/SnackBarActivity.kt
deleted file mode 100644
index c9995d68c..000000000
--- a/app/src/main/java/org/linphone/activities/SnackBarActivity.kt
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities
-
-import androidx.annotation.StringRes
-
-interface SnackBarActivity {
-    fun showSnackBar(@StringRes resourceId: Int)
-    fun showSnackBar(@StringRes resourceId: Int, action: Int, listener: () -> Unit)
-    fun showSnackBar(message: String)
-}
diff --git a/app/src/main/java/org/linphone/activities/assistant/AssistantActivity.kt b/app/src/main/java/org/linphone/activities/assistant/AssistantActivity.kt
deleted file mode 100644
index 1b1b8321e..000000000
--- a/app/src/main/java/org/linphone/activities/assistant/AssistantActivity.kt
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.assistant
-
-import android.os.Bundle
-import androidx.annotation.StringRes
-import androidx.coordinatorlayout.widget.CoordinatorLayout
-import androidx.lifecycle.ViewModelProvider
-import com.google.android.material.snackbar.Snackbar
-import org.linphone.LinphoneApplication.Companion.corePreferences
-import org.linphone.R
-import org.linphone.activities.GenericActivity
-import org.linphone.activities.SnackBarActivity
-import org.linphone.activities.assistant.viewmodels.SharedAssistantViewModel
-
-class AssistantActivity : GenericActivity(), SnackBarActivity {
-    private lateinit var sharedViewModel: SharedAssistantViewModel
-    private lateinit var coordinator: CoordinatorLayout
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-
-        setContentView(R.layout.assistant_activity)
-
-        sharedViewModel = ViewModelProvider(this)[SharedAssistantViewModel::class.java]
-
-        coordinator = findViewById(R.id.coordinator)
-
-        corePreferences.firstStart = false
-    }
-
-    override fun showSnackBar(@StringRes resourceId: Int) {
-        Snackbar.make(coordinator, resourceId, Snackbar.LENGTH_LONG).show()
-    }
-
-    override fun showSnackBar(@StringRes resourceId: Int, action: Int, listener: () -> Unit) {
-        Snackbar
-            .make(findViewById(R.id.coordinator), resourceId, Snackbar.LENGTH_LONG)
-            .setAction(action) {
-                listener()
-            }
-            .show()
-    }
-
-    override fun showSnackBar(message: String) {
-        Snackbar.make(coordinator, message, Snackbar.LENGTH_LONG).show()
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/assistant/adapters/CountryPickerAdapter.kt b/app/src/main/java/org/linphone/activities/assistant/adapters/CountryPickerAdapter.kt
deleted file mode 100644
index 47220e0a7..000000000
--- a/app/src/main/java/org/linphone/activities/assistant/adapters/CountryPickerAdapter.kt
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.assistant.adapters
-
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.BaseAdapter
-import android.widget.Filter
-import android.widget.Filterable
-import android.widget.TextView
-import kotlin.collections.ArrayList
-import org.linphone.R
-import org.linphone.core.DialPlan
-import org.linphone.core.Factory
-
-class CountryPickerAdapter : BaseAdapter(), Filterable {
-    private var countries: ArrayList<DialPlan>
-
-    init {
-        val dialPlans = Factory.instance().dialPlans
-        countries = arrayListOf()
-        countries.addAll(dialPlans)
-    }
-
-    override fun getView(position: Int, convertView: View?, parent: ViewGroup): View {
-        val view: View = convertView ?: LayoutInflater.from(parent.context).inflate(
-            R.layout.assistant_country_picker_cell,
-            parent,
-            false
-        )
-        val dialPlan: DialPlan = countries[position]
-
-        val name = view.findViewById<TextView>(R.id.country_name)
-        name.text = dialPlan.country
-
-        val dialCode = view.findViewById<TextView>(R.id.country_prefix)
-        dialCode.text = String.format("(%s)", dialPlan.countryCallingCode)
-
-        view.tag = dialPlan
-        return view
-    }
-
-    override fun getItem(position: Int): DialPlan {
-        return countries[position]
-    }
-
-    override fun getItemId(position: Int): Long {
-        return position.toLong()
-    }
-
-    override fun getCount(): Int {
-        return countries.size
-    }
-
-    override fun getFilter(): Filter {
-        return object : Filter() {
-            override fun performFiltering(constraint: CharSequence): FilterResults {
-                val filteredCountries = arrayListOf<DialPlan>()
-                for (dialPlan in Factory.instance().dialPlans) {
-                    if (dialPlan.country.contains(constraint, ignoreCase = true) ||
-                        dialPlan.countryCallingCode.contains(constraint)
-                    ) {
-                        filteredCountries.add(dialPlan)
-                    }
-                }
-                val filterResults = FilterResults()
-                filterResults.values = filteredCountries
-                return filterResults
-            }
-
-            @Suppress("UNCHECKED_CAST")
-            override fun publishResults(
-                constraint: CharSequence,
-                results: FilterResults
-            ) {
-                countries = results.values as ArrayList<DialPlan>
-                notifyDataSetChanged()
-            }
-        }
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/assistant/fragments/AbstractPhoneFragment.kt b/app/src/main/java/org/linphone/activities/assistant/fragments/AbstractPhoneFragment.kt
deleted file mode 100644
index 01c33748a..000000000
--- a/app/src/main/java/org/linphone/activities/assistant/fragments/AbstractPhoneFragment.kt
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package org.linphone.activities.assistant.fragments
-
-import android.content.pm.PackageManager
-import androidx.databinding.ViewDataBinding
-import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import org.linphone.R
-import org.linphone.activities.GenericFragment
-import org.linphone.activities.assistant.viewmodels.AbstractPhoneViewModel
-import org.linphone.compatibility.Compatibility
-import org.linphone.core.tools.Log
-import org.linphone.utils.LinphoneUtils
-import org.linphone.utils.PermissionHelper
-import org.linphone.utils.PhoneNumberUtils
-
-abstract class AbstractPhoneFragment<T : ViewDataBinding> : GenericFragment<T>() {
-    companion object {
-        const val READ_PHONE_STATE_PERMISSION_REQUEST_CODE = 0
-    }
-
-    abstract val viewModel: AbstractPhoneViewModel
-
-    @Deprecated("Deprecated in Java")
-    override fun onRequestPermissionsResult(
-        requestCode: Int,
-        permissions: Array<out String>,
-        grantResults: IntArray
-    ) {
-        if (requestCode == READ_PHONE_STATE_PERMISSION_REQUEST_CODE) {
-            if (grantResults.isNotEmpty() && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
-                Log.i("[Assistant] READ_PHONE_STATE/READ_PHONE_NUMBERS permission granted")
-                updateFromDeviceInfo()
-            } else {
-                Log.w("[Assistant] READ_PHONE_STATE/READ_PHONE_NUMBERS permission denied")
-            }
-        }
-    }
-
-    protected fun checkPermissions() {
-        // Only ask for phone number related permission on devices that have TELEPHONY feature && if push notifications are available
-        if (requireContext().packageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY) && LinphoneUtils.isPushNotificationAvailable()) {
-            if (!PermissionHelper.get().hasReadPhoneStateOrPhoneNumbersPermission()) {
-                Log.i("[Assistant] Asking for READ_PHONE_STATE/READ_PHONE_NUMBERS permission")
-                Compatibility.requestReadPhoneStateOrNumbersPermission(
-                    this,
-                    READ_PHONE_STATE_PERMISSION_REQUEST_CODE
-                )
-            } else {
-                updateFromDeviceInfo()
-            }
-        }
-    }
-
-    private fun updateFromDeviceInfo() {
-        val phoneNumber = PhoneNumberUtils.getDevicePhoneNumber(requireContext())
-        val dialPlan = PhoneNumberUtils.getDialPlanForCurrentCountry(requireContext())
-        viewModel.updateFromPhoneNumberAndOrDialPlan(phoneNumber, dialPlan)
-    }
-
-    protected fun showPhoneNumberInfoDialog() {
-        MaterialAlertDialogBuilder(requireContext())
-            .setTitle(getString(R.string.assistant_phone_number_info_title))
-            .setMessage(
-                getString(R.string.assistant_phone_number_link_info_content) + "\n" +
-                    getString(
-                        R.string.assistant_phone_number_link_info_content_already_account
-                    )
-            )
-            .setNegativeButton(getString(R.string.dialog_ok), null)
-            .show()
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/assistant/fragments/AccountLoginFragment.kt b/app/src/main/java/org/linphone/activities/assistant/fragments/AccountLoginFragment.kt
deleted file mode 100644
index e9a35b94b..000000000
--- a/app/src/main/java/org/linphone/activities/assistant/fragments/AccountLoginFragment.kt
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.assistant.fragments
-
-import android.app.Dialog
-import android.content.Intent
-import android.net.Uri
-import android.os.Bundle
-import android.view.View
-import androidx.lifecycle.ViewModelProvider
-import org.linphone.LinphoneApplication.Companion.coreContext
-import org.linphone.R
-import org.linphone.activities.assistant.AssistantActivity
-import org.linphone.activities.assistant.viewmodels.AccountLoginViewModel
-import org.linphone.activities.assistant.viewmodels.AccountLoginViewModelFactory
-import org.linphone.activities.assistant.viewmodels.SharedAssistantViewModel
-import org.linphone.activities.main.viewmodels.DialogViewModel
-import org.linphone.activities.navigateToEchoCancellerCalibration
-import org.linphone.activities.navigateToPhoneAccountValidation
-import org.linphone.databinding.AssistantAccountLoginFragmentBinding
-import org.linphone.utils.DialogUtils
-
-class AccountLoginFragment : AbstractPhoneFragment<AssistantAccountLoginFragmentBinding>() {
-    override lateinit var viewModel: AccountLoginViewModel
-    private lateinit var sharedAssistantViewModel: SharedAssistantViewModel
-
-    override fun getLayoutId(): Int = R.layout.assistant_account_login_fragment
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        binding.lifecycleOwner = viewLifecycleOwner
-
-        sharedAssistantViewModel = requireActivity().run {
-            ViewModelProvider(this)[SharedAssistantViewModel::class.java]
-        }
-
-        viewModel = ViewModelProvider(
-            this,
-            AccountLoginViewModelFactory(sharedAssistantViewModel.getAccountCreator())
-        )[AccountLoginViewModel::class.java]
-        binding.viewModel = viewModel
-
-        binding.setInfoClickListener {
-            showPhoneNumberInfoDialog()
-        }
-
-        binding.setSelectCountryClickListener {
-            val countryPickerFragment = CountryPickerFragment()
-            countryPickerFragment.listener = viewModel
-            countryPickerFragment.show(childFragmentManager, "CountryPicker")
-        }
-
-        binding.setForgotPasswordClickListener {
-            val intent = Intent(Intent.ACTION_VIEW)
-            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-            intent.data = Uri.parse(getString(R.string.assistant_forgotten_password_link))
-            startActivity(intent)
-        }
-
-        viewModel.prefix.observe(viewLifecycleOwner) { internationalPrefix ->
-            viewModel.getCountryNameFromPrefix(internationalPrefix)
-        }
-
-        viewModel.goToSmsValidationEvent.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume {
-                val args = Bundle()
-                args.putBoolean("IsLogin", true)
-                args.putString("PhoneNumber", viewModel.accountCreator.phoneNumber)
-                navigateToPhoneAccountValidation(args)
-            }
-        }
-
-        viewModel.leaveAssistantEvent.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume {
-                coreContext.newAccountConfigured(true)
-
-                if (coreContext.core.isEchoCancellerCalibrationRequired) {
-                    navigateToEchoCancellerCalibration()
-                } else {
-                    requireActivity().finish()
-                }
-            }
-        }
-
-        viewModel.invalidCredentialsEvent.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume {
-                val dialogViewModel =
-                    DialogViewModel(getString(R.string.assistant_error_invalid_credentials))
-                val dialog: Dialog = DialogUtils.getDialog(requireContext(), dialogViewModel)
-
-                dialogViewModel.showCancelButton {
-                    viewModel.removeInvalidProxyConfig()
-                    dialog.dismiss()
-                }
-
-                dialogViewModel.showDeleteButton(
-                    {
-                        viewModel.continueEvenIfInvalidCredentials()
-                        dialog.dismiss()
-                    },
-                    getString(R.string.assistant_continue_even_if_credentials_invalid)
-                )
-
-                dialog.show()
-            }
-        }
-
-        viewModel.onErrorEvent.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume { message ->
-                (requireActivity() as AssistantActivity).showSnackBar(message)
-            }
-        }
-
-        checkPermissions()
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/assistant/fragments/CountryPickerFragment.kt b/app/src/main/java/org/linphone/activities/assistant/fragments/CountryPickerFragment.kt
deleted file mode 100644
index 2e3d4dc72..000000000
--- a/app/src/main/java/org/linphone/activities/assistant/fragments/CountryPickerFragment.kt
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.assistant.fragments
-
-import android.os.Bundle
-import android.text.Editable
-import android.text.TextWatcher
-import android.view.*
-import androidx.fragment.app.DialogFragment
-import org.linphone.R
-import org.linphone.activities.assistant.adapters.CountryPickerAdapter
-import org.linphone.core.DialPlan
-import org.linphone.databinding.AssistantCountryPickerFragmentBinding
-
-class CountryPickerFragment : DialogFragment() {
-    private var _binding: AssistantCountryPickerFragmentBinding? = null
-    private val binding get() = _binding!!
-    private lateinit var adapter: CountryPickerAdapter
-
-    var listener: CountryPickedListener? = null
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setStyle(STYLE_NO_TITLE, R.style.assistant_country_dialog_style)
-    }
-
-    override fun onDestroyView() {
-        super.onDestroyView()
-        _binding = null
-    }
-
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View {
-        _binding = AssistantCountryPickerFragmentBinding.inflate(inflater, container, false)
-
-        adapter = CountryPickerAdapter()
-        binding.countryList.adapter = adapter
-
-        binding.countryList.setOnItemClickListener { _, _, position, _ ->
-            if (position >= 0 && position < adapter.count) {
-                val dialPlan = adapter.getItem(position)
-                listener?.onCountryClicked(dialPlan)
-            }
-            dismiss()
-        }
-
-        binding.searchCountry.addTextChangedListener(object : TextWatcher {
-            override fun afterTextChanged(s: Editable?) {
-                adapter.filter.filter(s)
-            }
-
-            override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) { }
-
-            override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) { }
-        })
-
-        binding.setCancelClickListener {
-            dismiss()
-        }
-
-        return binding.root
-    }
-
-    interface CountryPickedListener {
-        fun onCountryClicked(dialPlan: DialPlan)
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/assistant/fragments/EchoCancellerCalibrationFragment.kt b/app/src/main/java/org/linphone/activities/assistant/fragments/EchoCancellerCalibrationFragment.kt
deleted file mode 100644
index 9c48cb0d0..000000000
--- a/app/src/main/java/org/linphone/activities/assistant/fragments/EchoCancellerCalibrationFragment.kt
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.assistant.fragments
-
-import android.content.pm.PackageManager
-import android.os.Bundle
-import android.view.View
-import androidx.lifecycle.ViewModelProvider
-import org.linphone.R
-import org.linphone.activities.GenericFragment
-import org.linphone.activities.assistant.viewmodels.EchoCancellerCalibrationViewModel
-import org.linphone.core.tools.Log
-import org.linphone.databinding.AssistantEchoCancellerCalibrationFragmentBinding
-import org.linphone.utils.PermissionHelper
-
-class EchoCancellerCalibrationFragment : GenericFragment<AssistantEchoCancellerCalibrationFragmentBinding>() {
-    companion object {
-        const val RECORD_AUDIO_PERMISSION_REQUEST_CODE = 0
-    }
-
-    private lateinit var viewModel: EchoCancellerCalibrationViewModel
-
-    override fun getLayoutId(): Int = R.layout.assistant_echo_canceller_calibration_fragment
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        binding.lifecycleOwner = viewLifecycleOwner
-
-        viewModel = ViewModelProvider(this)[EchoCancellerCalibrationViewModel::class.java]
-        binding.viewModel = viewModel
-
-        viewModel.echoCalibrationTerminated.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume {
-                requireActivity().finish()
-            }
-        }
-
-        if (!PermissionHelper.required(requireContext()).hasRecordAudioPermission()) {
-            Log.i("[Echo Canceller Calibration] Asking for RECORD_AUDIO permission")
-            requestPermissions(
-                arrayOf(android.Manifest.permission.RECORD_AUDIO),
-                RECORD_AUDIO_PERMISSION_REQUEST_CODE
-            )
-        } else {
-            viewModel.startEchoCancellerCalibration()
-        }
-    }
-
-    @Deprecated("Deprecated in Java")
-    override fun onRequestPermissionsResult(
-        requestCode: Int,
-        permissions: Array<out String>,
-        grantResults: IntArray
-    ) {
-        if (requestCode == RECORD_AUDIO_PERMISSION_REQUEST_CODE) {
-            val granted =
-                grantResults.isNotEmpty() && grantResults[0] == PackageManager.PERMISSION_GRANTED
-            if (granted) {
-                Log.i("[Echo Canceller Calibration] RECORD_AUDIO permission granted")
-                viewModel.startEchoCancellerCalibration()
-            } else {
-                Log.w("[Echo Canceller Calibration] RECORD_AUDIO permission denied")
-                requireActivity().finish()
-            }
-        }
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/assistant/fragments/EmailAccountCreationFragment.kt b/app/src/main/java/org/linphone/activities/assistant/fragments/EmailAccountCreationFragment.kt
deleted file mode 100644
index 027636460..000000000
--- a/app/src/main/java/org/linphone/activities/assistant/fragments/EmailAccountCreationFragment.kt
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.assistant.fragments
-
-import android.os.Bundle
-import android.view.View
-import androidx.lifecycle.ViewModelProvider
-import org.linphone.R
-import org.linphone.activities.GenericFragment
-import org.linphone.activities.assistant.AssistantActivity
-import org.linphone.activities.assistant.viewmodels.EmailAccountCreationViewModel
-import org.linphone.activities.assistant.viewmodels.EmailAccountCreationViewModelFactory
-import org.linphone.activities.assistant.viewmodels.SharedAssistantViewModel
-import org.linphone.activities.navigateToEmailAccountValidation
-import org.linphone.databinding.AssistantEmailAccountCreationFragmentBinding
-
-class EmailAccountCreationFragment : GenericFragment<AssistantEmailAccountCreationFragmentBinding>() {
-    private lateinit var sharedAssistantViewModel: SharedAssistantViewModel
-    private lateinit var viewModel: EmailAccountCreationViewModel
-
-    override fun getLayoutId(): Int = R.layout.assistant_email_account_creation_fragment
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        binding.lifecycleOwner = viewLifecycleOwner
-
-        sharedAssistantViewModel = requireActivity().run {
-            ViewModelProvider(this)[SharedAssistantViewModel::class.java]
-        }
-
-        viewModel = ViewModelProvider(
-            this,
-            EmailAccountCreationViewModelFactory(sharedAssistantViewModel.getAccountCreator())
-        )[EmailAccountCreationViewModel::class.java]
-        binding.viewModel = viewModel
-
-        viewModel.goToEmailValidationEvent.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume {
-                navigateToEmailAccountValidation()
-            }
-        }
-
-        viewModel.onErrorEvent.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume { message ->
-                (requireActivity() as AssistantActivity).showSnackBar(message)
-            }
-        }
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/assistant/fragments/EmailAccountValidationFragment.kt b/app/src/main/java/org/linphone/activities/assistant/fragments/EmailAccountValidationFragment.kt
deleted file mode 100644
index 98b5548bd..000000000
--- a/app/src/main/java/org/linphone/activities/assistant/fragments/EmailAccountValidationFragment.kt
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.assistant.fragments
-
-import android.os.Bundle
-import android.view.View
-import androidx.lifecycle.ViewModelProvider
-import org.linphone.LinphoneApplication.Companion.coreContext
-import org.linphone.LinphoneApplication.Companion.corePreferences
-import org.linphone.R
-import org.linphone.activities.GenericFragment
-import org.linphone.activities.assistant.AssistantActivity
-import org.linphone.activities.assistant.viewmodels.*
-import org.linphone.activities.navigateToAccountLinking
-import org.linphone.databinding.AssistantEmailAccountValidationFragmentBinding
-
-class EmailAccountValidationFragment : GenericFragment<AssistantEmailAccountValidationFragmentBinding>() {
-    private lateinit var sharedAssistantViewModel: SharedAssistantViewModel
-    private lateinit var viewModel: EmailAccountValidationViewModel
-
-    override fun getLayoutId(): Int = R.layout.assistant_email_account_validation_fragment
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        binding.lifecycleOwner = viewLifecycleOwner
-
-        sharedAssistantViewModel = requireActivity().run {
-            ViewModelProvider(this)[SharedAssistantViewModel::class.java]
-        }
-
-        viewModel = ViewModelProvider(
-            this,
-            EmailAccountValidationViewModelFactory(sharedAssistantViewModel.getAccountCreator())
-        )[EmailAccountValidationViewModel::class.java]
-        binding.viewModel = viewModel
-
-        viewModel.leaveAssistantEvent.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume {
-                coreContext.newAccountConfigured(true)
-
-                if (!corePreferences.hideLinkPhoneNumber) {
-                    val args = Bundle()
-                    args.putBoolean("AllowSkip", true)
-                    args.putString("Username", viewModel.accountCreator.username)
-                    args.putString("Password", viewModel.accountCreator.password)
-                    navigateToAccountLinking(args)
-                } else {
-                    requireActivity().finish()
-                }
-            }
-        }
-
-        viewModel.onErrorEvent.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume { message ->
-                (requireActivity() as AssistantActivity).showSnackBar(message)
-            }
-        }
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/assistant/fragments/GenericAccountLoginFragment.kt b/app/src/main/java/org/linphone/activities/assistant/fragments/GenericAccountLoginFragment.kt
deleted file mode 100644
index a93eea348..000000000
--- a/app/src/main/java/org/linphone/activities/assistant/fragments/GenericAccountLoginFragment.kt
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.assistant.fragments
-
-import android.app.Dialog
-import android.os.Bundle
-import android.view.View
-import androidx.lifecycle.ViewModelProvider
-import org.linphone.LinphoneApplication.Companion.coreContext
-import org.linphone.LinphoneApplication.Companion.corePreferences
-import org.linphone.R
-import org.linphone.activities.GenericFragment
-import org.linphone.activities.assistant.AssistantActivity
-import org.linphone.activities.assistant.viewmodels.GenericLoginViewModel
-import org.linphone.activities.assistant.viewmodels.GenericLoginViewModelFactory
-import org.linphone.activities.assistant.viewmodels.SharedAssistantViewModel
-import org.linphone.activities.main.viewmodels.DialogViewModel
-import org.linphone.activities.navigateToEchoCancellerCalibration
-import org.linphone.databinding.AssistantGenericAccountLoginFragmentBinding
-import org.linphone.utils.DialogUtils
-
-class GenericAccountLoginFragment : GenericFragment<AssistantGenericAccountLoginFragmentBinding>() {
-    private lateinit var sharedAssistantViewModel: SharedAssistantViewModel
-    private lateinit var viewModel: GenericLoginViewModel
-
-    override fun getLayoutId(): Int = R.layout.assistant_generic_account_login_fragment
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        binding.lifecycleOwner = viewLifecycleOwner
-
-        sharedAssistantViewModel = requireActivity().run {
-            ViewModelProvider(this)[SharedAssistantViewModel::class.java]
-        }
-
-        viewModel = ViewModelProvider(
-            this,
-            GenericLoginViewModelFactory(sharedAssistantViewModel.getAccountCreator(true))
-        )[GenericLoginViewModel::class.java]
-        binding.viewModel = viewModel
-
-        viewModel.leaveAssistantEvent.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume {
-                val isLinphoneAccount = viewModel.domain.value.orEmpty() == corePreferences.defaultDomain
-                coreContext.newAccountConfigured(isLinphoneAccount)
-
-                if (coreContext.core.isEchoCancellerCalibrationRequired) {
-                    navigateToEchoCancellerCalibration()
-                } else {
-                    requireActivity().finish()
-                }
-            }
-        }
-
-        viewModel.invalidCredentialsEvent.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume {
-                val dialogViewModel =
-                    DialogViewModel(getString(R.string.assistant_error_invalid_credentials))
-                val dialog: Dialog = DialogUtils.getDialog(requireContext(), dialogViewModel)
-
-                dialogViewModel.showCancelButton {
-                    viewModel.removeInvalidProxyConfig()
-                    dialog.dismiss()
-                }
-
-                dialogViewModel.showDeleteButton(
-                    {
-                        viewModel.continueEvenIfInvalidCredentials()
-                        dialog.dismiss()
-                    },
-                    getString(R.string.assistant_continue_even_if_credentials_invalid)
-                )
-
-                dialog.show()
-            }
-        }
-
-        viewModel.onErrorEvent.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume { message ->
-                (requireActivity() as AssistantActivity).showSnackBar(message)
-            }
-        }
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/assistant/fragments/GenericAccountWarningFragment.kt b/app/src/main/java/org/linphone/activities/assistant/fragments/GenericAccountWarningFragment.kt
deleted file mode 100644
index 8c41c0653..000000000
--- a/app/src/main/java/org/linphone/activities/assistant/fragments/GenericAccountWarningFragment.kt
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (c) 2010-2022 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.assistant.fragments
-
-import android.os.Bundle
-import android.view.View
-import org.linphone.R
-import org.linphone.activities.GenericFragment
-import org.linphone.activities.navigateToGenericLogin
-import org.linphone.databinding.AssistantGenericAccountWarningFragmentBinding
-
-class GenericAccountWarningFragment : GenericFragment<AssistantGenericAccountWarningFragmentBinding>() {
-    override fun getLayoutId(): Int = R.layout.assistant_generic_account_warning_fragment
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        binding.lifecycleOwner = viewLifecycleOwner
-
-        binding.setUnderstoodClickListener {
-            navigateToGenericLogin()
-        }
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/assistant/fragments/NoPushWarningFragment.kt b/app/src/main/java/org/linphone/activities/assistant/fragments/NoPushWarningFragment.kt
deleted file mode 100644
index 1671474bd..000000000
--- a/app/src/main/java/org/linphone/activities/assistant/fragments/NoPushWarningFragment.kt
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2010-2023 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.assistant.fragments
-
-import android.os.Bundle
-import android.view.View
-import org.linphone.R
-import org.linphone.activities.GenericFragment
-import org.linphone.databinding.AssistantNoPushWarningFragmentBinding
-
-class NoPushWarningFragment : GenericFragment<AssistantNoPushWarningFragmentBinding>() {
-    override fun getLayoutId(): Int = R.layout.assistant_no_push_warning_fragment
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        binding.lifecycleOwner = viewLifecycleOwner
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/assistant/fragments/PhoneAccountCreationFragment.kt b/app/src/main/java/org/linphone/activities/assistant/fragments/PhoneAccountCreationFragment.kt
deleted file mode 100644
index 4f285e8b5..000000000
--- a/app/src/main/java/org/linphone/activities/assistant/fragments/PhoneAccountCreationFragment.kt
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.assistant.fragments
-
-import android.os.Bundle
-import android.view.View
-import androidx.lifecycle.ViewModelProvider
-import org.linphone.R
-import org.linphone.activities.assistant.AssistantActivity
-import org.linphone.activities.assistant.viewmodels.PhoneAccountCreationViewModel
-import org.linphone.activities.assistant.viewmodels.PhoneAccountCreationViewModelFactory
-import org.linphone.activities.assistant.viewmodels.SharedAssistantViewModel
-import org.linphone.activities.navigateToPhoneAccountValidation
-import org.linphone.databinding.AssistantPhoneAccountCreationFragmentBinding
-
-class PhoneAccountCreationFragment :
-    AbstractPhoneFragment<AssistantPhoneAccountCreationFragmentBinding>() {
-    private lateinit var sharedAssistantViewModel: SharedAssistantViewModel
-    override lateinit var viewModel: PhoneAccountCreationViewModel
-
-    override fun getLayoutId(): Int = R.layout.assistant_phone_account_creation_fragment
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        binding.lifecycleOwner = viewLifecycleOwner
-
-        sharedAssistantViewModel = requireActivity().run {
-            ViewModelProvider(this)[SharedAssistantViewModel::class.java]
-        }
-
-        viewModel = ViewModelProvider(
-            this,
-            PhoneAccountCreationViewModelFactory(sharedAssistantViewModel.getAccountCreator())
-        )[PhoneAccountCreationViewModel::class.java]
-        binding.viewModel = viewModel
-
-        binding.setInfoClickListener {
-            showPhoneNumberInfoDialog()
-        }
-
-        binding.setSelectCountryClickListener {
-            val countryPickerFragment = CountryPickerFragment()
-            countryPickerFragment.listener = viewModel
-            countryPickerFragment.show(childFragmentManager, "CountryPicker")
-        }
-
-        viewModel.prefix.observe(viewLifecycleOwner) { internationalPrefix ->
-            viewModel.getCountryNameFromPrefix(internationalPrefix)
-        }
-
-        viewModel.goToSmsValidationEvent.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume {
-                val args = Bundle()
-                args.putBoolean("IsCreation", true)
-                args.putString("PhoneNumber", viewModel.accountCreator.phoneNumber)
-                navigateToPhoneAccountValidation(args)
-            }
-        }
-
-        viewModel.onErrorEvent.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume { message ->
-                (requireActivity() as AssistantActivity).showSnackBar(message)
-            }
-        }
-
-        checkPermissions()
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/assistant/fragments/PhoneAccountLinkingFragment.kt b/app/src/main/java/org/linphone/activities/assistant/fragments/PhoneAccountLinkingFragment.kt
deleted file mode 100644
index d8fd87e22..000000000
--- a/app/src/main/java/org/linphone/activities/assistant/fragments/PhoneAccountLinkingFragment.kt
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.assistant.fragments
-
-import android.os.Bundle
-import android.view.View
-import androidx.lifecycle.ViewModelProvider
-import org.linphone.LinphoneApplication.Companion.coreContext
-import org.linphone.R
-import org.linphone.activities.SnackBarActivity
-import org.linphone.activities.assistant.viewmodels.*
-import org.linphone.activities.navigateToEchoCancellerCalibration
-import org.linphone.activities.navigateToPhoneAccountValidation
-import org.linphone.core.tools.Log
-import org.linphone.databinding.AssistantPhoneAccountLinkingFragmentBinding
-
-class PhoneAccountLinkingFragment : AbstractPhoneFragment<AssistantPhoneAccountLinkingFragmentBinding>() {
-    private lateinit var sharedAssistantViewModel: SharedAssistantViewModel
-    override lateinit var viewModel: PhoneAccountLinkingViewModel
-
-    override fun getLayoutId(): Int = R.layout.assistant_phone_account_linking_fragment
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        binding.lifecycleOwner = viewLifecycleOwner
-
-        sharedAssistantViewModel = requireActivity().run {
-            ViewModelProvider(this)[SharedAssistantViewModel::class.java]
-        }
-
-        val accountCreator = sharedAssistantViewModel.getAccountCreator()
-        viewModel = ViewModelProvider(this, PhoneAccountLinkingViewModelFactory(accountCreator))[PhoneAccountLinkingViewModel::class.java]
-        binding.viewModel = viewModel
-
-        val username = arguments?.getString("Username")
-        Log.i("[Phone Account Linking] username to link is $username")
-        viewModel.username.value = username
-
-        val password = arguments?.getString("Password")
-        accountCreator.password = password
-
-        val ha1 = arguments?.getString("HA1")
-        accountCreator.ha1 = ha1
-
-        val allowSkip = arguments?.getBoolean("AllowSkip", false)
-        viewModel.allowSkip.value = allowSkip
-
-        binding.setInfoClickListener {
-            showPhoneNumberInfoDialog()
-        }
-
-        binding.setSelectCountryClickListener {
-            val countryPickerFragment = CountryPickerFragment()
-            countryPickerFragment.listener = viewModel
-            countryPickerFragment.show(childFragmentManager, "CountryPicker")
-        }
-
-        viewModel.prefix.observe(viewLifecycleOwner) { internationalPrefix ->
-            viewModel.getCountryNameFromPrefix(internationalPrefix)
-        }
-
-        viewModel.goToSmsValidationEvent.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume {
-                val args = Bundle()
-                args.putBoolean("IsLinking", true)
-                args.putString("PhoneNumber", viewModel.accountCreator.phoneNumber)
-                navigateToPhoneAccountValidation(args)
-            }
-        }
-
-        viewModel.leaveAssistantEvent.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume {
-                if (coreContext.core.isEchoCancellerCalibrationRequired) {
-                    navigateToEchoCancellerCalibration()
-                } else {
-                    requireActivity().finish()
-                }
-            }
-        }
-
-        viewModel.onErrorEvent.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume { message ->
-                (requireActivity() as SnackBarActivity).showSnackBar(message)
-            }
-        }
-
-        checkPermissions()
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/assistant/fragments/PhoneAccountValidationFragment.kt b/app/src/main/java/org/linphone/activities/assistant/fragments/PhoneAccountValidationFragment.kt
deleted file mode 100644
index edcf18210..000000000
--- a/app/src/main/java/org/linphone/activities/assistant/fragments/PhoneAccountValidationFragment.kt
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.assistant.fragments
-
-import android.content.ClipboardManager
-import android.content.Context.CLIPBOARD_SERVICE
-import android.os.Bundle
-import android.view.View
-import androidx.lifecycle.ViewModelProvider
-import androidx.navigation.fragment.findNavController
-import org.linphone.LinphoneApplication.Companion.coreContext
-import org.linphone.R
-import org.linphone.activities.GenericFragment
-import org.linphone.activities.SnackBarActivity
-import org.linphone.activities.assistant.viewmodels.PhoneAccountValidationViewModel
-import org.linphone.activities.assistant.viewmodels.PhoneAccountValidationViewModelFactory
-import org.linphone.activities.assistant.viewmodels.SharedAssistantViewModel
-import org.linphone.activities.navigateToAccountSettings
-import org.linphone.activities.navigateToEchoCancellerCalibration
-import org.linphone.compatibility.Compatibility
-import org.linphone.core.tools.Log
-import org.linphone.databinding.AssistantPhoneAccountValidationFragmentBinding
-
-class PhoneAccountValidationFragment : GenericFragment<AssistantPhoneAccountValidationFragmentBinding>() {
-    private lateinit var sharedAssistantViewModel: SharedAssistantViewModel
-    private lateinit var viewModel: PhoneAccountValidationViewModel
-
-    override fun getLayoutId(): Int = R.layout.assistant_phone_account_validation_fragment
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        binding.lifecycleOwner = viewLifecycleOwner
-
-        sharedAssistantViewModel = requireActivity().run {
-            ViewModelProvider(this)[SharedAssistantViewModel::class.java]
-        }
-
-        viewModel = ViewModelProvider(
-            this,
-            PhoneAccountValidationViewModelFactory(sharedAssistantViewModel.getAccountCreator())
-        )[PhoneAccountValidationViewModel::class.java]
-        binding.viewModel = viewModel
-
-        viewModel.phoneNumber.value = arguments?.getString("PhoneNumber")
-        viewModel.isLogin.value = arguments?.getBoolean("IsLogin", false)
-        viewModel.isCreation.value = arguments?.getBoolean("IsCreation", false)
-        viewModel.isLinking.value = arguments?.getBoolean("IsLinking", false)
-
-        viewModel.leaveAssistantEvent.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume {
-                when {
-                    viewModel.isLogin.value == true || viewModel.isCreation.value == true -> {
-                        coreContext.newAccountConfigured(true)
-
-                        if (coreContext.core.isEchoCancellerCalibrationRequired) {
-                            navigateToEchoCancellerCalibration()
-                        } else {
-                            requireActivity().finish()
-                        }
-                    }
-                    viewModel.isLinking.value == true -> {
-                        if (findNavController().graph.id == R.id.settings_nav_graph_xml) {
-                            val args = Bundle()
-                            args.putString(
-                                "Identity",
-                                "sip:${viewModel.accountCreator.username}@${viewModel.accountCreator.domain}"
-                            )
-                            navigateToAccountSettings(args)
-                        } else {
-                            requireActivity().finish()
-                        }
-                    }
-                }
-            }
-        }
-
-        viewModel.onErrorEvent.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume { message ->
-                (requireActivity() as SnackBarActivity).showSnackBar(message)
-            }
-        }
-
-        // This won't work starting Android 10 as clipboard access is denied unless app has focus,
-        // which won't be the case when the SMS arrives unless it is added into clipboard from a notification
-        val clipboard = requireContext().getSystemService(CLIPBOARD_SERVICE) as ClipboardManager
-        clipboard.addPrimaryClipChangedListener {
-            val data = clipboard.primaryClip
-            if (data != null && data.itemCount > 0) {
-                val clip = data.getItemAt(0).text.toString()
-                if (clip.length == 4) {
-                    Log.i(
-                        "[Assistant] [Phone Account Validation] Found 4 digits as primary clip in clipboard, using it and clear it"
-                    )
-                    viewModel.code.value = clip
-                    Compatibility.clearClipboard(clipboard)
-                }
-            }
-        }
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/assistant/fragments/QrCodeFragment.kt b/app/src/main/java/org/linphone/activities/assistant/fragments/QrCodeFragment.kt
deleted file mode 100644
index 0fe20d93e..000000000
--- a/app/src/main/java/org/linphone/activities/assistant/fragments/QrCodeFragment.kt
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.assistant.fragments
-
-import android.content.pm.PackageManager
-import android.os.Bundle
-import android.view.View
-import androidx.lifecycle.ViewModelProvider
-import androidx.navigation.fragment.findNavController
-import org.linphone.LinphoneApplication.Companion.coreContext
-import org.linphone.R
-import org.linphone.activities.GenericFragment
-import org.linphone.activities.assistant.viewmodels.QrCodeViewModel
-import org.linphone.activities.assistant.viewmodels.SharedAssistantViewModel
-import org.linphone.core.tools.Log
-import org.linphone.databinding.AssistantQrCodeFragmentBinding
-import org.linphone.utils.PermissionHelper
-
-class QrCodeFragment : GenericFragment<AssistantQrCodeFragmentBinding>() {
-    companion object {
-        const val CAMERA_PERMISSION_REQUEST_CODE = 0
-    }
-
-    private lateinit var sharedAssistantViewModel: SharedAssistantViewModel
-    private lateinit var viewModel: QrCodeViewModel
-
-    override fun getLayoutId(): Int = R.layout.assistant_qr_code_fragment
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        binding.lifecycleOwner = viewLifecycleOwner
-
-        sharedAssistantViewModel = requireActivity().run {
-            ViewModelProvider(this)[SharedAssistantViewModel::class.java]
-        }
-
-        viewModel = ViewModelProvider(this)[QrCodeViewModel::class.java]
-        binding.viewModel = viewModel
-
-        viewModel.qrCodeFoundEvent.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume { url ->
-                sharedAssistantViewModel.remoteProvisioningUrl.value = url
-                findNavController().navigateUp()
-            }
-        }
-        viewModel.setBackCamera()
-
-        if (!PermissionHelper.required(requireContext()).hasCameraPermission()) {
-            Log.i("[QR Code] Asking for CAMERA permission")
-            requestPermissions(
-                arrayOf(android.Manifest.permission.CAMERA),
-                CAMERA_PERMISSION_REQUEST_CODE
-            )
-        }
-    }
-
-    override fun onResume() {
-        super.onResume()
-
-        coreContext.core.nativePreviewWindowId = binding.qrCodeCaptureTexture
-        coreContext.core.isQrcodeVideoPreviewEnabled = true
-        coreContext.core.isVideoPreviewEnabled = true
-    }
-
-    override fun onPause() {
-        coreContext.core.nativePreviewWindowId = null
-        coreContext.core.isQrcodeVideoPreviewEnabled = false
-        coreContext.core.isVideoPreviewEnabled = false
-
-        super.onPause()
-    }
-
-    @Deprecated("Deprecated in Java")
-    override fun onRequestPermissionsResult(
-        requestCode: Int,
-        permissions: Array<out String>,
-        grantResults: IntArray
-    ) {
-        if (requestCode == CAMERA_PERMISSION_REQUEST_CODE) {
-            val granted =
-                grantResults.isNotEmpty() && grantResults[0] == PackageManager.PERMISSION_GRANTED
-            if (granted) {
-                Log.i("[QR Code] CAMERA permission granted")
-                coreContext.core.reloadVideoDevices()
-                viewModel.setBackCamera()
-            } else {
-                Log.w("[QR Code] CAMERA permission denied")
-                findNavController().navigateUp()
-            }
-        }
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/assistant/fragments/RemoteProvisioningFragment.kt b/app/src/main/java/org/linphone/activities/assistant/fragments/RemoteProvisioningFragment.kt
deleted file mode 100644
index 5889ba271..000000000
--- a/app/src/main/java/org/linphone/activities/assistant/fragments/RemoteProvisioningFragment.kt
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.assistant.fragments
-
-import android.os.Bundle
-import android.view.View
-import androidx.lifecycle.ViewModelProvider
-import org.linphone.LinphoneApplication.Companion.coreContext
-import org.linphone.R
-import org.linphone.activities.GenericFragment
-import org.linphone.activities.assistant.AssistantActivity
-import org.linphone.activities.assistant.viewmodels.RemoteProvisioningViewModel
-import org.linphone.activities.assistant.viewmodels.SharedAssistantViewModel
-import org.linphone.activities.navigateToEchoCancellerCalibration
-import org.linphone.activities.navigateToQrCode
-import org.linphone.databinding.AssistantRemoteProvisioningFragmentBinding
-
-class RemoteProvisioningFragment : GenericFragment<AssistantRemoteProvisioningFragmentBinding>() {
-    private lateinit var sharedAssistantViewModel: SharedAssistantViewModel
-    private lateinit var viewModel: RemoteProvisioningViewModel
-
-    override fun getLayoutId(): Int = R.layout.assistant_remote_provisioning_fragment
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        binding.lifecycleOwner = viewLifecycleOwner
-
-        sharedAssistantViewModel = requireActivity().run {
-            ViewModelProvider(this)[SharedAssistantViewModel::class.java]
-        }
-
-        viewModel = ViewModelProvider(this)[RemoteProvisioningViewModel::class.java]
-        binding.viewModel = viewModel
-
-        binding.setQrCodeClickListener {
-            navigateToQrCode()
-        }
-
-        viewModel.fetchSuccessfulEvent.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume { success ->
-                if (success) {
-                    if (coreContext.core.isEchoCancellerCalibrationRequired) {
-                        navigateToEchoCancellerCalibration()
-                    } else {
-                        requireActivity().finish()
-                    }
-                } else {
-                    val activity = requireActivity() as AssistantActivity
-                    activity.showSnackBar(R.string.assistant_remote_provisioning_failure)
-                }
-            }
-        }
-
-        viewModel.urlToFetch.value = sharedAssistantViewModel.remoteProvisioningUrl.value ?: coreContext.core.provisioningUri
-    }
-
-    override fun onDestroy() {
-        super.onDestroy()
-
-        if (::sharedAssistantViewModel.isInitialized) {
-            sharedAssistantViewModel.remoteProvisioningUrl.value = null
-        }
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/assistant/fragments/TopBarFragment.kt b/app/src/main/java/org/linphone/activities/assistant/fragments/TopBarFragment.kt
deleted file mode 100644
index e1e8ef074..000000000
--- a/app/src/main/java/org/linphone/activities/assistant/fragments/TopBarFragment.kt
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.assistant.fragments
-
-import android.os.Bundle
-import android.view.View
-import org.linphone.R
-import org.linphone.activities.GenericFragment
-import org.linphone.databinding.AssistantTopBarFragmentBinding
-
-class TopBarFragment : GenericFragment<AssistantTopBarFragmentBinding>() {
-    override fun getLayoutId(): Int = R.layout.assistant_top_bar_fragment
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        binding.lifecycleOwner = viewLifecycleOwner
-        useMaterialSharedAxisXForwardAnimation = false
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/assistant/fragments/WelcomeFragment.kt b/app/src/main/java/org/linphone/activities/assistant/fragments/WelcomeFragment.kt
deleted file mode 100644
index 79c54f64d..000000000
--- a/app/src/main/java/org/linphone/activities/assistant/fragments/WelcomeFragment.kt
+++ /dev/null
@@ -1,170 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.assistant.fragments
-
-import android.content.Intent
-import android.content.pm.PackageManager
-import android.net.Uri
-import android.os.Bundle
-import android.text.SpannableString
-import android.text.Spanned
-import android.text.method.LinkMovementMethod
-import android.text.style.ClickableSpan
-import android.view.View
-import androidx.lifecycle.ViewModelProvider
-import java.util.UnknownFormatConversionException
-import java.util.regex.Pattern
-import org.linphone.LinphoneApplication.Companion.coreContext
-import org.linphone.LinphoneApplication.Companion.corePreferences
-import org.linphone.R
-import org.linphone.activities.*
-import org.linphone.activities.assistant.viewmodels.WelcomeViewModel
-import org.linphone.activities.navigateToAccountLogin
-import org.linphone.activities.navigateToEmailAccountCreation
-import org.linphone.activities.navigateToRemoteProvisioning
-import org.linphone.core.tools.Log
-import org.linphone.databinding.AssistantWelcomeFragmentBinding
-import org.linphone.utils.LinphoneUtils
-
-class WelcomeFragment : GenericFragment<AssistantWelcomeFragmentBinding>() {
-    private lateinit var viewModel: WelcomeViewModel
-
-    override fun getLayoutId(): Int = R.layout.assistant_welcome_fragment
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        binding.lifecycleOwner = viewLifecycleOwner
-
-        viewModel = ViewModelProvider(this)[WelcomeViewModel::class.java]
-        binding.viewModel = viewModel
-
-        binding.setCreateAccountClickListener {
-            if (LinphoneUtils.isPushNotificationAvailable()) {
-                Log.i("[Assistant] Core says push notifications are available")
-                val deviceHasTelephonyFeature = coreContext.context.packageManager.hasSystemFeature(
-                    PackageManager.FEATURE_TELEPHONY
-                )
-                if (!deviceHasTelephonyFeature) {
-                    Log.i(
-                        "[Assistant] Device doesn't have TELEPHONY feature, showing email based account creation"
-                    )
-                    navigateToEmailAccountCreation()
-                } else {
-                    Log.i(
-                        "[Assistant] Device has TELEPHONY feature, showing phone based account creation"
-                    )
-                    navigateToPhoneAccountCreation()
-                }
-            } else {
-                Log.w(
-                    "[Assistant] Failed to get push notification info, showing warning instead of phone based account creation"
-                )
-                navigateToNoPushWarning()
-            }
-        }
-
-        binding.setAccountLoginClickListener {
-            navigateToAccountLogin()
-        }
-
-        binding.setGenericAccountLoginClickListener {
-            navigateToGenericLoginWarning()
-        }
-
-        binding.setRemoteProvisioningClickListener {
-            navigateToRemoteProvisioning()
-        }
-
-        viewModel.termsAndPrivacyAccepted.observe(
-            viewLifecycleOwner
-        ) {
-            if (it) corePreferences.readAndAgreeTermsAndPrivacy = true
-        }
-
-        setUpTermsAndPrivacyLinks()
-    }
-
-    private fun setUpTermsAndPrivacyLinks() {
-        val terms = getString(R.string.assistant_general_terms)
-        val privacy = getString(R.string.assistant_privacy_policy)
-
-        val label = try {
-            getString(
-                R.string.assistant_read_and_agree_terms,
-                terms,
-                privacy
-            )
-        } catch (e: UnknownFormatConversionException) {
-            Log.e("[Welcome] Wrong R.string.assistant_read_and_agree_terms format!")
-            "I accept Belledonne Communications' terms of use and privacy policy"
-        }
-        val spannable = SpannableString(label)
-
-        val termsMatcher = Pattern.compile(terms).matcher(label)
-        if (termsMatcher.find()) {
-            val clickableSpan: ClickableSpan = object : ClickableSpan() {
-                override fun onClick(widget: View) {
-                    val browserIntent = Intent(
-                        Intent.ACTION_VIEW,
-                        Uri.parse(getString(R.string.assistant_general_terms_link))
-                    )
-                    try {
-                        startActivity(browserIntent)
-                    } catch (e: Exception) {
-                        Log.e("[Welcome] Can't start activity: $e")
-                    }
-                }
-            }
-            spannable.setSpan(
-                clickableSpan,
-                termsMatcher.start(0),
-                termsMatcher.end(),
-                Spanned.SPAN_EXCLUSIVE_EXCLUSIVE
-            )
-        }
-
-        val policyMatcher = Pattern.compile(privacy).matcher(label)
-        if (policyMatcher.find()) {
-            val clickableSpan: ClickableSpan = object : ClickableSpan() {
-                override fun onClick(widget: View) {
-                    val browserIntent = Intent(
-                        Intent.ACTION_VIEW,
-                        Uri.parse(getString(R.string.assistant_privacy_policy_link))
-                    )
-                    try {
-                        startActivity(browserIntent)
-                    } catch (e: Exception) {
-                        Log.e("[Welcome] Can't start activity: $e")
-                    }
-                }
-            }
-            spannable.setSpan(
-                clickableSpan,
-                policyMatcher.start(0),
-                policyMatcher.end(),
-                Spanned.SPAN_EXCLUSIVE_EXCLUSIVE
-            )
-        }
-
-        binding.termsAndPrivacy.text = spannable
-        binding.termsAndPrivacy.movementMethod = LinkMovementMethod.getInstance()
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/assistant/viewmodels/AbstractPhoneViewModel.kt b/app/src/main/java/org/linphone/activities/assistant/viewmodels/AbstractPhoneViewModel.kt
deleted file mode 100644
index 605b0c5ce..000000000
--- a/app/src/main/java/org/linphone/activities/assistant/viewmodels/AbstractPhoneViewModel.kt
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package org.linphone.activities.assistant.viewmodels
-
-import androidx.lifecycle.MutableLiveData
-import org.linphone.activities.assistant.fragments.CountryPickerFragment
-import org.linphone.core.AccountCreator
-import org.linphone.core.DialPlan
-import org.linphone.core.tools.Log
-import org.linphone.utils.PhoneNumberUtils
-
-abstract class AbstractPhoneViewModel(accountCreator: AccountCreator) :
-    AbstractPushTokenViewModel(accountCreator),
-    CountryPickerFragment.CountryPickedListener {
-
-    val prefix = MutableLiveData<String>()
-    val prefixError = MutableLiveData<String>()
-
-    val phoneNumber = MutableLiveData<String>()
-    val phoneNumberError = MutableLiveData<String>()
-
-    val countryName = MutableLiveData<String>()
-
-    init {
-        prefix.value = "+"
-    }
-
-    override fun onCountryClicked(dialPlan: DialPlan) {
-        prefix.value = "+${dialPlan.countryCallingCode}"
-        countryName.value = dialPlan.country
-    }
-
-    fun isPhoneNumberOk(): Boolean {
-        return prefix.value.orEmpty().length > 1 && // Not just '+' character
-            prefixError.value.orEmpty().isEmpty() &&
-            phoneNumber.value.orEmpty().isNotEmpty() &&
-            phoneNumberError.value.orEmpty().isEmpty()
-    }
-
-    fun updateFromPhoneNumberAndOrDialPlan(number: String?, dialPlan: DialPlan?) {
-        val internationalPrefix = "+${dialPlan?.countryCallingCode}"
-        if (dialPlan != null) {
-            Log.i("[Assistant] Found prefix from dial plan: ${dialPlan.countryCallingCode}")
-            prefix.value = internationalPrefix
-            getCountryNameFromPrefix(internationalPrefix)
-        }
-
-        if (number != null) {
-            Log.i("[Assistant] Found phone number: $number")
-            phoneNumber.value = if (number.startsWith(internationalPrefix)) {
-                number.substring(internationalPrefix.length)
-            } else {
-                number
-            }
-        }
-    }
-
-    fun getCountryNameFromPrefix(prefix: String?) {
-        if (!prefix.isNullOrEmpty()) {
-            val countryCode = if (prefix.first() == '+') prefix.substring(1) else prefix
-            val dialPlan = PhoneNumberUtils.getDialPlanFromCountryCallingPrefix(countryCode)
-            Log.i("[Assistant] Found dial plan $dialPlan from country code: $countryCode")
-            countryName.value = dialPlan?.country
-        }
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/assistant/viewmodels/AbstractPushTokenViewModel.kt b/app/src/main/java/org/linphone/activities/assistant/viewmodels/AbstractPushTokenViewModel.kt
deleted file mode 100644
index 363475e63..000000000
--- a/app/src/main/java/org/linphone/activities/assistant/viewmodels/AbstractPushTokenViewModel.kt
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- * Copyright (c) 2010-2023 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.assistant.viewmodels
-
-import androidx.lifecycle.ViewModel
-import androidx.lifecycle.viewModelScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
-import org.json.JSONException
-import org.json.JSONObject
-import org.linphone.LinphoneApplication.Companion.coreContext
-import org.linphone.core.AccountCreator
-import org.linphone.core.Core
-import org.linphone.core.CoreListenerStub
-import org.linphone.core.tools.Log
-
-abstract class AbstractPushTokenViewModel(val accountCreator: AccountCreator) : ViewModel() {
-    private var waitingForPushToken = false
-    private var waitForPushJob: Job? = null
-
-    private val coreListener = object : CoreListenerStub() {
-        override fun onPushNotificationReceived(core: Core, payload: String?) {
-            Log.i("[Assistant] Push received: [$payload]")
-
-            val data = payload.orEmpty()
-            if (data.isNotEmpty()) {
-                try {
-                    // This is because JSONObject.toString() done by the SDK will result in payload looking like {"custom-payload":"{\"token\":\"value\"}"}
-                    val cleanPayload = data.replace("\\\"", "\"").replace("\"{", "{").replace(
-                        "}\"",
-                        "}"
-                    )
-                    Log.i("[Assistant] Cleaned payload is: [$cleanPayload]")
-                    val json = JSONObject(cleanPayload)
-                    val customPayload = json.getJSONObject("custom-payload")
-                    if (customPayload.has("token")) {
-                        waitForPushJob?.cancel()
-                        waitingForPushToken = false
-
-                        val token = customPayload.getString("token")
-                        if (token.isNotEmpty()) {
-                            Log.i("[Assistant] Extracted token [$token] from push payload")
-                            accountCreator.token = token
-                            onFlexiApiTokenReceived()
-                        } else {
-                            Log.e("[Assistant] Push payload JSON object has an empty 'token'!")
-                            onFlexiApiTokenRequestError()
-                        }
-                    } else {
-                        Log.e("[Assistant] Push payload JSON object has no 'token' key!")
-                        onFlexiApiTokenRequestError()
-                    }
-                } catch (e: JSONException) {
-                    Log.e("[Assistant] Exception trying to parse push payload as JSON: [$e]")
-                    onFlexiApiTokenRequestError()
-                }
-            } else {
-                Log.e("[Assistant] Push payload is null or empty, can't extract auth token!")
-                onFlexiApiTokenRequestError()
-            }
-        }
-    }
-
-    init {
-        coreContext.core.addListener(coreListener)
-    }
-
-    override fun onCleared() {
-        coreContext.core.removeListener(coreListener)
-        waitForPushJob?.cancel()
-    }
-
-    abstract fun onFlexiApiTokenReceived()
-    abstract fun onFlexiApiTokenRequestError()
-
-    protected fun requestFlexiApiToken() {
-        if (!coreContext.core.isPushNotificationAvailable) {
-            Log.e(
-                "[Assistant] Core says push notification aren't available, can't request a token from FlexiAPI"
-            )
-            onFlexiApiTokenRequestError()
-            return
-        }
-
-        val pushConfig = coreContext.core.pushNotificationConfig
-        if (pushConfig != null) {
-            Log.i(
-                "[Assistant] Found push notification info: provider [${pushConfig.provider}], param [${pushConfig.param}] and prid [${pushConfig.prid}]"
-            )
-            accountCreator.pnProvider = pushConfig.provider
-            accountCreator.pnParam = pushConfig.param
-            accountCreator.pnPrid = pushConfig.prid
-
-            // Request an auth token, will be sent by push
-            val result = accountCreator.requestAuthToken()
-            if (result == AccountCreator.Status.RequestOk) {
-                val waitFor = 5000
-                waitingForPushToken = true
-                waitForPushJob?.cancel()
-
-                Log.i("[Assistant] Waiting push with auth token for $waitFor ms")
-                waitForPushJob = viewModelScope.launch {
-                    withContext(Dispatchers.IO) {
-                        delay(waitFor.toLong())
-                    }
-                    withContext(Dispatchers.Main) {
-                        if (waitingForPushToken) {
-                            waitingForPushToken = false
-                            Log.e("[Assistant] Auth token wasn't received by push in $waitFor ms")
-                            onFlexiApiTokenRequestError()
-                        }
-                    }
-                }
-            } else {
-                Log.e("[Assistant] Failed to require a push with an auth token: [$result]")
-                onFlexiApiTokenRequestError()
-            }
-        } else {
-            Log.e("[Assistant] No push configuration object in Core, shouldn't happen!")
-            onFlexiApiTokenRequestError()
-        }
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/assistant/viewmodels/AccountLoginViewModel.kt b/app/src/main/java/org/linphone/activities/assistant/viewmodels/AccountLoginViewModel.kt
deleted file mode 100644
index 579a76eb7..000000000
--- a/app/src/main/java/org/linphone/activities/assistant/viewmodels/AccountLoginViewModel.kt
+++ /dev/null
@@ -1,303 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.assistant.viewmodels
-
-import android.content.pm.PackageManager
-import androidx.lifecycle.*
-import org.linphone.LinphoneApplication.Companion.coreContext
-import org.linphone.core.*
-import org.linphone.core.tools.Log
-import org.linphone.utils.Event
-import org.linphone.utils.LinphoneUtils
-import org.linphone.utils.PhoneNumberUtils
-
-class AccountLoginViewModelFactory(private val accountCreator: AccountCreator) :
-    ViewModelProvider.NewInstanceFactory() {
-
-    @Suppress("UNCHECKED_CAST")
-    override fun <T : ViewModel> create(modelClass: Class<T>): T {
-        return AccountLoginViewModel(accountCreator) as T
-    }
-}
-
-class AccountLoginViewModel(accountCreator: AccountCreator) : AbstractPhoneViewModel(accountCreator) {
-    val loginWithUsernamePassword = MutableLiveData<Boolean>()
-
-    val username = MutableLiveData<String>()
-    val usernameError = MutableLiveData<String>()
-
-    val password = MutableLiveData<String>()
-    val passwordError = MutableLiveData<String>()
-
-    val loginEnabled = MediatorLiveData<Boolean>()
-
-    val waitForServerAnswer = MutableLiveData<Boolean>()
-
-    val displayName = MutableLiveData<String>()
-
-    val forceLoginUsingUsernameAndPassword = MutableLiveData<Boolean>()
-
-    val leaveAssistantEvent: MutableLiveData<Event<Boolean>> by lazy {
-        MutableLiveData<Event<Boolean>>()
-    }
-
-    val invalidCredentialsEvent: MutableLiveData<Event<Boolean>> by lazy {
-        MutableLiveData<Event<Boolean>>()
-    }
-
-    val goToSmsValidationEvent: MutableLiveData<Event<Boolean>> by lazy {
-        MutableLiveData<Event<Boolean>>()
-    }
-
-    val onErrorEvent: MutableLiveData<Event<String>> by lazy {
-        MutableLiveData<Event<String>>()
-    }
-
-    private val listener = object : AccountCreatorListenerStub() {
-        override fun onRecoverAccount(
-            creator: AccountCreator,
-            status: AccountCreator.Status,
-            response: String?
-        ) {
-            Log.i("[Assistant] [Account Login] Recover account status is $status")
-            waitForServerAnswer.value = false
-
-            if (status == AccountCreator.Status.RequestOk) {
-                goToSmsValidationEvent.value = Event(true)
-            } else {
-                onErrorEvent.value = Event("Error: ${status.name}")
-            }
-        }
-    }
-
-    private var accountToCheck: Account? = null
-
-    private val coreListener = object : CoreListenerStub() {
-        override fun onAccountRegistrationStateChanged(
-            core: Core,
-            account: Account,
-            state: RegistrationState?,
-            message: String
-        ) {
-            if (account == accountToCheck) {
-                Log.i("[Assistant] [Account Login] Registration state is $state: $message")
-                if (state == RegistrationState.Ok) {
-                    waitForServerAnswer.value = false
-                    leaveAssistantEvent.value = Event(true)
-                    core.removeListener(this)
-                } else if (state == RegistrationState.Failed) {
-                    waitForServerAnswer.value = false
-                    invalidCredentialsEvent.value = Event(true)
-                    core.removeListener(this)
-                }
-            }
-        }
-    }
-
-    init {
-        accountCreator.addListener(listener)
-
-        val pushAvailable = LinphoneUtils.isPushNotificationAvailable()
-        val deviceHasTelephonyFeature = coreContext.context.packageManager.hasSystemFeature(
-            PackageManager.FEATURE_TELEPHONY
-        )
-        loginWithUsernamePassword.value = !deviceHasTelephonyFeature || !pushAvailable
-        forceLoginUsingUsernameAndPassword.value = !pushAvailable
-
-        loginEnabled.value = false
-        loginEnabled.addSource(prefix) {
-            loginEnabled.value = isLoginButtonEnabled()
-        }
-        loginEnabled.addSource(phoneNumber) {
-            loginEnabled.value = isLoginButtonEnabled()
-        }
-        loginEnabled.addSource(username) {
-            loginEnabled.value = isLoginButtonEnabled()
-        }
-        loginEnabled.addSource(password) {
-            loginEnabled.value = isLoginButtonEnabled()
-        }
-        loginEnabled.addSource(loginWithUsernamePassword) {
-            loginEnabled.value = isLoginButtonEnabled()
-        }
-        loginEnabled.addSource(phoneNumberError) {
-            loginEnabled.value = isLoginButtonEnabled()
-        }
-        loginEnabled.addSource(prefixError) {
-            loginEnabled.value = isLoginButtonEnabled()
-        }
-    }
-
-    override fun onCleared() {
-        accountCreator.removeListener(listener)
-        super.onCleared()
-    }
-
-    override fun onFlexiApiTokenReceived() {
-        Log.i("[Assistant] [Account Login] Using FlexiAPI auth token [${accountCreator.token}]")
-        waitForServerAnswer.value = false
-        loginWithPhoneNumber()
-    }
-
-    override fun onFlexiApiTokenRequestError() {
-        Log.e("[Assistant] [Account Login] Failed to get an auth token from FlexiAPI")
-        waitForServerAnswer.value = false
-        onErrorEvent.value = Event("Error: Failed to get an auth token from account manager server")
-    }
-
-    fun removeInvalidProxyConfig() {
-        val account = accountToCheck
-        account ?: return
-
-        val core = coreContext.core
-        val authInfo = account.findAuthInfo()
-        if (authInfo != null) core.removeAuthInfo(authInfo)
-        core.removeAccount(account)
-        accountToCheck = null
-
-        // Make sure there is a valid default account
-        val accounts = core.accountList
-        if (accounts.isNotEmpty() && core.defaultAccount == null) {
-            core.defaultAccount = accounts.first()
-            core.refreshRegisters()
-        }
-    }
-
-    fun continueEvenIfInvalidCredentials() {
-        leaveAssistantEvent.value = Event(true)
-    }
-
-    private fun loginWithUsername() {
-        val result = accountCreator.setUsername(username.value)
-        if (result != AccountCreator.UsernameStatus.Ok) {
-            Log.e(
-                "[Assistant] [Account Login] Error [${result.name}] setting the username: ${username.value}"
-            )
-            usernameError.value = result.name
-            return
-        }
-        Log.i("[Assistant] [Account Login] Username is ${accountCreator.username}")
-
-        val result2 = accountCreator.setPassword(password.value)
-        if (result2 != AccountCreator.PasswordStatus.Ok) {
-            Log.e("[Assistant] [Account Login] Error [${result2.name}] setting the password")
-            passwordError.value = result2.name
-            return
-        }
-
-        waitForServerAnswer.value = true
-        coreContext.core.addListener(coreListener)
-        if (!createAccountAndAuthInfo()) {
-            waitForServerAnswer.value = false
-            coreContext.core.removeListener(coreListener)
-            onErrorEvent.value = Event("Error: Failed to create account object")
-        }
-    }
-
-    private fun loginWithPhoneNumber() {
-        val result = AccountCreator.PhoneNumberStatus.fromInt(
-            accountCreator.setPhoneNumber(phoneNumber.value, prefix.value)
-        )
-        if (result != AccountCreator.PhoneNumberStatus.Ok) {
-            Log.e(
-                "[Assistant] [Account Login] Error [$result] setting the phone number: ${phoneNumber.value} with prefix: ${prefix.value}"
-            )
-            phoneNumberError.value = result.name
-            return
-        }
-        Log.i("[Assistant] [Account Login] Phone number is ${accountCreator.phoneNumber}")
-
-        val result2 = accountCreator.setUsername(accountCreator.phoneNumber)
-        if (result2 != AccountCreator.UsernameStatus.Ok) {
-            Log.e(
-                "[Assistant] [Account Login] Error [${result2.name}] setting the username: ${accountCreator.phoneNumber}"
-            )
-            usernameError.value = result2.name
-            return
-        }
-        Log.i("[Assistant] [Account Login] Username is ${accountCreator.username}")
-
-        waitForServerAnswer.value = true
-        val status = accountCreator.recoverAccount()
-        Log.i("[Assistant] [Account Login] Recover account returned $status")
-        if (status != AccountCreator.Status.RequestOk) {
-            waitForServerAnswer.value = false
-            onErrorEvent.value = Event("Error: ${status.name}")
-        }
-    }
-
-    fun login() {
-        accountCreator.displayName = displayName.value
-
-        if (loginWithUsernamePassword.value == true) {
-            loginWithUsername()
-        } else {
-            val token = accountCreator.token.orEmpty()
-            if (token.isNotEmpty()) {
-                Log.i(
-                    "[Assistant] [Account Login] We already have an auth token from FlexiAPI [$token], continue"
-                )
-                onFlexiApiTokenReceived()
-            } else {
-                Log.i("[Assistant] [Account Login] Requesting an auth token from FlexiAPI")
-                waitForServerAnswer.value = true
-                requestFlexiApiToken()
-            }
-        }
-    }
-
-    private fun isLoginButtonEnabled(): Boolean {
-        return if (loginWithUsernamePassword.value == true) {
-            username.value.orEmpty().isNotEmpty() && password.value.orEmpty().isNotEmpty()
-        } else {
-            isPhoneNumberOk()
-        }
-    }
-
-    private fun createAccountAndAuthInfo(): Boolean {
-        val account = accountCreator.createAccountInCore()
-        accountToCheck = account
-
-        if (account == null) {
-            Log.e("[Assistant] [Account Login] Account creator couldn't create account")
-            onErrorEvent.value = Event("Error: Failed to create account object")
-            return false
-        }
-
-        val params = account.params.clone()
-        params.pushNotificationAllowed = true
-
-        if (params.internationalPrefix.isNullOrEmpty()) {
-            val dialPlan = PhoneNumberUtils.getDialPlanForCurrentCountry(coreContext.context)
-            if (dialPlan != null) {
-                Log.i(
-                    "[Assistant] [Account Login] Found dial plan country ${dialPlan.country} with international prefix ${dialPlan.countryCallingCode}"
-                )
-                params.internationalPrefix = dialPlan.countryCallingCode
-            } else {
-                Log.w("[Assistant] [Account Login] Failed to find dial plan")
-            }
-        }
-
-        account.params = params
-        Log.i("[Assistant] [Account Login] Account created")
-        return true
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/assistant/viewmodels/EchoCancellerCalibrationViewModel.kt b/app/src/main/java/org/linphone/activities/assistant/viewmodels/EchoCancellerCalibrationViewModel.kt
deleted file mode 100644
index 09d01c069..000000000
--- a/app/src/main/java/org/linphone/activities/assistant/viewmodels/EchoCancellerCalibrationViewModel.kt
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package org.linphone.activities.assistant.viewmodels
-
-import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.ViewModel
-import org.linphone.LinphoneApplication.Companion.coreContext
-import org.linphone.core.Core
-import org.linphone.core.CoreListenerStub
-import org.linphone.core.EcCalibratorStatus
-import org.linphone.core.tools.Log
-import org.linphone.utils.Event
-
-class EchoCancellerCalibrationViewModel : ViewModel() {
-    val echoCalibrationTerminated = MutableLiveData<Event<Boolean>>()
-
-    private val listener = object : CoreListenerStub() {
-        override fun onEcCalibrationResult(core: Core, status: EcCalibratorStatus, delayMs: Int) {
-            if (status == EcCalibratorStatus.InProgress) return
-            echoCancellerCalibrationFinished(status, delayMs)
-        }
-    }
-
-    init {
-        coreContext.core.addListener(listener)
-    }
-
-    fun startEchoCancellerCalibration() {
-        coreContext.core.startEchoCancellerCalibration()
-    }
-
-    fun echoCancellerCalibrationFinished(status: EcCalibratorStatus, delay: Int) {
-        coreContext.core.removeListener(listener)
-        when (status) {
-            EcCalibratorStatus.DoneNoEcho -> {
-                Log.i("[Assistant] [Echo Canceller Calibration] Done, no echo")
-            }
-            EcCalibratorStatus.Done -> {
-                Log.i("[Assistant] [Echo Canceller Calibration] Done, delay is ${delay}ms")
-            }
-            EcCalibratorStatus.Failed -> {
-                Log.w("[Assistant] [Echo Canceller Calibration] Failed")
-            }
-            EcCalibratorStatus.InProgress -> {
-                Log.i("[Assistant] [Echo Canceller Calibration] In progress")
-            }
-        }
-        echoCalibrationTerminated.value = Event(true)
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/assistant/viewmodels/EmailAccountCreationViewModel.kt b/app/src/main/java/org/linphone/activities/assistant/viewmodels/EmailAccountCreationViewModel.kt
deleted file mode 100644
index dea25074d..000000000
--- a/app/src/main/java/org/linphone/activities/assistant/viewmodels/EmailAccountCreationViewModel.kt
+++ /dev/null
@@ -1,199 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.assistant.viewmodels
-
-import androidx.lifecycle.MediatorLiveData
-import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.ViewModel
-import androidx.lifecycle.ViewModelProvider
-import org.linphone.R
-import org.linphone.core.AccountCreator
-import org.linphone.core.AccountCreatorListenerStub
-import org.linphone.core.tools.Log
-import org.linphone.utils.AppUtils
-import org.linphone.utils.Event
-
-class EmailAccountCreationViewModelFactory(private val accountCreator: AccountCreator) :
-    ViewModelProvider.NewInstanceFactory() {
-
-    @Suppress("UNCHECKED_CAST")
-    override fun <T : ViewModel> create(modelClass: Class<T>): T {
-        return EmailAccountCreationViewModel(accountCreator) as T
-    }
-}
-
-class EmailAccountCreationViewModel(accountCreator: AccountCreator) : AbstractPushTokenViewModel(
-    accountCreator
-) {
-    val username = MutableLiveData<String>()
-    val usernameError = MutableLiveData<String>()
-
-    val email = MutableLiveData<String>()
-    val emailError = MutableLiveData<String>()
-
-    val password = MutableLiveData<String>()
-    val passwordError = MutableLiveData<String>()
-
-    val passwordConfirmation = MutableLiveData<String>()
-    val passwordConfirmationError = MutableLiveData<String>()
-
-    val displayName = MutableLiveData<String>()
-
-    val createEnabled: MediatorLiveData<Boolean> = MediatorLiveData()
-
-    val waitForServerAnswer = MutableLiveData<Boolean>()
-
-    val goToEmailValidationEvent = MutableLiveData<Event<Boolean>>()
-
-    val onErrorEvent: MutableLiveData<Event<String>> by lazy {
-        MutableLiveData<Event<String>>()
-    }
-
-    private val listener = object : AccountCreatorListenerStub() {
-        override fun onIsAccountExist(
-            creator: AccountCreator,
-            status: AccountCreator.Status,
-            response: String?
-        ) {
-            Log.i("[Assistant] [Account Creation] onIsAccountExist status is $status")
-            when (status) {
-                AccountCreator.Status.AccountExist, AccountCreator.Status.AccountExistWithAlias -> {
-                    waitForServerAnswer.value = false
-                    usernameError.value = AppUtils.getString(
-                        R.string.assistant_error_username_already_exists
-                    )
-                }
-                AccountCreator.Status.AccountNotExist -> {
-                    val createAccountStatus = creator.createAccount()
-                    if (createAccountStatus != AccountCreator.Status.RequestOk) {
-                        waitForServerAnswer.value = false
-                        onErrorEvent.value = Event("Error: ${status.name}")
-                    }
-                }
-                else -> {
-                    waitForServerAnswer.value = false
-                    onErrorEvent.value = Event("Error: ${status.name}")
-                }
-            }
-        }
-
-        override fun onCreateAccount(
-            creator: AccountCreator,
-            status: AccountCreator.Status,
-            response: String?
-        ) {
-            Log.i("[Assistant] [Account Creation] onCreateAccount status is $status")
-            waitForServerAnswer.value = false
-
-            when (status) {
-                AccountCreator.Status.AccountCreated -> {
-                    goToEmailValidationEvent.value = Event(true)
-                }
-                else -> {
-                    onErrorEvent.value = Event("Error: ${status.name}")
-                }
-            }
-        }
-    }
-
-    init {
-        accountCreator.addListener(listener)
-
-        createEnabled.value = false
-        createEnabled.addSource(username) {
-            createEnabled.value = isCreateButtonEnabled()
-        }
-        createEnabled.addSource(usernameError) {
-            createEnabled.value = isCreateButtonEnabled()
-        }
-        createEnabled.addSource(email) {
-            createEnabled.value = isCreateButtonEnabled()
-        }
-        createEnabled.addSource(emailError) {
-            createEnabled.value = isCreateButtonEnabled()
-        }
-        createEnabled.addSource(password) {
-            createEnabled.value = isCreateButtonEnabled()
-        }
-        createEnabled.addSource(passwordError) {
-            createEnabled.value = isCreateButtonEnabled()
-        }
-        createEnabled.addSource(passwordConfirmation) {
-            createEnabled.value = isCreateButtonEnabled()
-        }
-        createEnabled.addSource(passwordConfirmationError) {
-            createEnabled.value = isCreateButtonEnabled()
-        }
-    }
-
-    override fun onCleared() {
-        accountCreator.removeListener(listener)
-        super.onCleared()
-    }
-
-    override fun onFlexiApiTokenReceived() {
-        Log.i("[Assistant] [Account Creation] Using FlexiAPI auth token [${accountCreator.token}]")
-
-        waitForServerAnswer.value = true
-        val status = accountCreator.isAccountExist
-        Log.i("[Assistant] [Account Creation] Account exists returned $status")
-        if (status != AccountCreator.Status.RequestOk) {
-            waitForServerAnswer.value = false
-            onErrorEvent.value = Event("Error: ${status.name}")
-        }
-    }
-
-    override fun onFlexiApiTokenRequestError() {
-        Log.e("[Assistant] [Account Creation] Failed to get an auth token from FlexiAPI")
-        waitForServerAnswer.value = false
-        onErrorEvent.value = Event("Error: Failed to get an auth token from account manager server")
-    }
-
-    fun create() {
-        accountCreator.username = username.value
-        accountCreator.password = password.value
-        accountCreator.email = email.value
-        accountCreator.displayName = displayName.value
-
-        val token = accountCreator.token.orEmpty()
-        if (token.isNotEmpty()) {
-            Log.i(
-                "[Assistant] [Account Creation] We already have an auth token from FlexiAPI [$token], continue"
-            )
-            onFlexiApiTokenReceived()
-        } else {
-            Log.i("[Assistant] [Account Creation] Requesting an auth token from FlexiAPI")
-            waitForServerAnswer.value = true
-            requestFlexiApiToken()
-        }
-    }
-
-    private fun isCreateButtonEnabled(): Boolean {
-        return username.value.orEmpty().isNotEmpty() &&
-            email.value.orEmpty().isNotEmpty() &&
-            password.value.orEmpty().isNotEmpty() &&
-            passwordConfirmation.value.orEmpty().isNotEmpty() &&
-            password.value == passwordConfirmation.value &&
-            usernameError.value.orEmpty().isEmpty() &&
-            emailError.value.orEmpty().isEmpty() &&
-            passwordError.value.orEmpty().isEmpty() &&
-            passwordConfirmationError.value.orEmpty().isEmpty()
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/assistant/viewmodels/EmailAccountValidationViewModel.kt b/app/src/main/java/org/linphone/activities/assistant/viewmodels/EmailAccountValidationViewModel.kt
deleted file mode 100644
index bc72fbc90..000000000
--- a/app/src/main/java/org/linphone/activities/assistant/viewmodels/EmailAccountValidationViewModel.kt
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.assistant.viewmodels
-
-import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.ViewModel
-import androidx.lifecycle.ViewModelProvider
-import org.linphone.LinphoneApplication.Companion.coreContext
-import org.linphone.R
-import org.linphone.core.AccountCreator
-import org.linphone.core.AccountCreatorListenerStub
-import org.linphone.core.tools.Log
-import org.linphone.utils.AppUtils
-import org.linphone.utils.Event
-import org.linphone.utils.PhoneNumberUtils
-
-class EmailAccountValidationViewModelFactory(private val accountCreator: AccountCreator) :
-    ViewModelProvider.NewInstanceFactory() {
-
-    @Suppress("UNCHECKED_CAST")
-    override fun <T : ViewModel> create(modelClass: Class<T>): T {
-        return EmailAccountValidationViewModel(accountCreator) as T
-    }
-}
-
-class EmailAccountValidationViewModel(val accountCreator: AccountCreator) : ViewModel() {
-    val email = MutableLiveData<String>()
-
-    val waitForServerAnswer = MutableLiveData<Boolean>()
-
-    val leaveAssistantEvent = MutableLiveData<Event<Boolean>>()
-
-    val onErrorEvent: MutableLiveData<Event<String>> by lazy {
-        MutableLiveData<Event<String>>()
-    }
-
-    private val listener = object : AccountCreatorListenerStub() {
-        override fun onIsAccountActivated(
-            creator: AccountCreator,
-            status: AccountCreator.Status,
-            response: String?
-        ) {
-            Log.i("[Assistant] [Account Validation] onIsAccountActivated status is $status")
-            waitForServerAnswer.value = false
-
-            when (status) {
-                AccountCreator.Status.AccountActivated -> {
-                    if (createAccountAndAuthInfo()) {
-                        leaveAssistantEvent.value = Event(true)
-                    } else {
-                        onErrorEvent.value = Event("Error: ${status.name}")
-                    }
-                }
-                AccountCreator.Status.AccountNotActivated -> {
-                    onErrorEvent.value = Event(
-                        AppUtils.getString(R.string.assistant_create_email_account_not_validated)
-                    )
-                }
-                else -> {
-                    onErrorEvent.value = Event("Error: ${status.name}")
-                }
-            }
-        }
-    }
-
-    init {
-        accountCreator.addListener(listener)
-        email.value = accountCreator.email
-    }
-
-    override fun onCleared() {
-        accountCreator.removeListener(listener)
-        super.onCleared()
-    }
-
-    fun finish() {
-        waitForServerAnswer.value = true
-        val status = accountCreator.isAccountActivated
-        Log.i("[Assistant] [Account Validation] Account exists returned $status")
-        if (status != AccountCreator.Status.RequestOk) {
-            waitForServerAnswer.value = false
-            onErrorEvent.value = Event("Error: ${status.name}")
-        }
-    }
-
-    private fun createAccountAndAuthInfo(): Boolean {
-        val account = accountCreator.createAccountInCore()
-
-        if (account == null) {
-            Log.e("[Assistant] [Account Validation] Account creator couldn't create account")
-            onErrorEvent.value = Event("Error: Failed to create account object")
-            return false
-        }
-
-        val params = account.params.clone()
-        params.pushNotificationAllowed = true
-
-        if (params.internationalPrefix.isNullOrEmpty()) {
-            val dialPlan = PhoneNumberUtils.getDialPlanForCurrentCountry(coreContext.context)
-            if (dialPlan != null) {
-                Log.i(
-                    "[Assistant] [Account Validation] Found dial plan country ${dialPlan.country} with international prefix ${dialPlan.countryCallingCode}"
-                )
-                params.internationalPrefix = dialPlan.countryCallingCode
-            } else {
-                Log.w("[Assistant] [Account Validation] Failed to find dial plan")
-            }
-        }
-
-        account.params = params
-
-        Log.i("[Assistant] [Account Validation] Account created")
-        return true
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/assistant/viewmodels/GenericLoginViewModel.kt b/app/src/main/java/org/linphone/activities/assistant/viewmodels/GenericLoginViewModel.kt
deleted file mode 100644
index 5e0e50dfe..000000000
--- a/app/src/main/java/org/linphone/activities/assistant/viewmodels/GenericLoginViewModel.kt
+++ /dev/null
@@ -1,159 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.assistant.viewmodels
-
-import androidx.lifecycle.MediatorLiveData
-import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.ViewModel
-import androidx.lifecycle.ViewModelProvider
-import org.linphone.LinphoneApplication.Companion.coreContext
-import org.linphone.core.*
-import org.linphone.core.tools.Log
-import org.linphone.utils.Event
-
-class GenericLoginViewModelFactory(private val accountCreator: AccountCreator) :
-    ViewModelProvider.NewInstanceFactory() {
-
-    @Suppress("UNCHECKED_CAST")
-    override fun <T : ViewModel> create(modelClass: Class<T>): T {
-        return GenericLoginViewModel(accountCreator) as T
-    }
-}
-
-class GenericLoginViewModel(private val accountCreator: AccountCreator) : ViewModel() {
-    val username = MutableLiveData<String>()
-
-    val password = MutableLiveData<String>()
-
-    val domain = MutableLiveData<String>()
-
-    val displayName = MutableLiveData<String>()
-
-    val transport = MutableLiveData<TransportType>()
-
-    val loginEnabled: MediatorLiveData<Boolean> = MediatorLiveData()
-
-    val waitForServerAnswer = MutableLiveData<Boolean>()
-
-    val leaveAssistantEvent = MutableLiveData<Event<Boolean>>()
-
-    val invalidCredentialsEvent: MutableLiveData<Event<Boolean>> by lazy {
-        MutableLiveData<Event<Boolean>>()
-    }
-
-    val onErrorEvent: MutableLiveData<Event<String>> by lazy {
-        MutableLiveData<Event<String>>()
-    }
-
-    private var accountToCheck: Account? = null
-
-    private val coreListener = object : CoreListenerStub() {
-        override fun onAccountRegistrationStateChanged(
-            core: Core,
-            account: Account,
-            state: RegistrationState?,
-            message: String
-        ) {
-            if (account == accountToCheck) {
-                Log.i("[Assistant] [Generic Login] Registration state is $state: $message")
-                if (state == RegistrationState.Ok) {
-                    waitForServerAnswer.value = false
-                    leaveAssistantEvent.value = Event(true)
-                    core.removeListener(this)
-                } else if (state == RegistrationState.Failed) {
-                    waitForServerAnswer.value = false
-                    invalidCredentialsEvent.value = Event(true)
-                    core.removeListener(this)
-                }
-            }
-        }
-    }
-
-    init {
-        transport.value = TransportType.Tls
-
-        loginEnabled.value = false
-        loginEnabled.addSource(username) {
-            loginEnabled.value = isLoginButtonEnabled()
-        }
-        loginEnabled.addSource(password) {
-            loginEnabled.value = isLoginButtonEnabled()
-        }
-        loginEnabled.addSource(domain) {
-            loginEnabled.value = isLoginButtonEnabled()
-        }
-    }
-
-    fun setTransport(transportType: TransportType) {
-        transport.value = transportType
-    }
-
-    fun removeInvalidProxyConfig() {
-        val account = accountToCheck
-        account ?: return
-
-        val core = coreContext.core
-        val authInfo = account.findAuthInfo()
-        if (authInfo != null) core.removeAuthInfo(authInfo)
-        core.removeAccount(account)
-        accountToCheck = null
-
-        // Make sure there is a valid default account
-        val accounts = core.accountList
-        if (accounts.isNotEmpty() && core.defaultAccount == null) {
-            core.defaultAccount = accounts.first()
-            core.refreshRegisters()
-        }
-    }
-
-    fun continueEvenIfInvalidCredentials() {
-        leaveAssistantEvent.value = Event(true)
-    }
-
-    fun createAccountAndAuthInfo() {
-        waitForServerAnswer.value = true
-        coreContext.core.addListener(coreListener)
-
-        accountCreator.username = username.value
-        accountCreator.password = password.value
-        accountCreator.domain = domain.value
-        accountCreator.displayName = displayName.value
-        accountCreator.transport = transport.value
-
-        val account = accountCreator.createAccountInCore()
-        accountToCheck = account
-
-        if (account == null) {
-            Log.e("[Assistant] [Generic Login] Account creator couldn't create account")
-            coreContext.core.removeListener(coreListener)
-            onErrorEvent.value = Event("Error: Failed to create account object")
-            waitForServerAnswer.value = false
-            return
-        }
-
-        Log.i("[Assistant] [Generic Login] Account created")
-    }
-
-    private fun isLoginButtonEnabled(): Boolean {
-        return username.value.orEmpty().isNotEmpty() &&
-            domain.value.orEmpty().isNotEmpty() &&
-            password.value.orEmpty().isNotEmpty()
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/assistant/viewmodels/PhoneAccountCreationViewModel.kt b/app/src/main/java/org/linphone/activities/assistant/viewmodels/PhoneAccountCreationViewModel.kt
deleted file mode 100644
index 03b6face3..000000000
--- a/app/src/main/java/org/linphone/activities/assistant/viewmodels/PhoneAccountCreationViewModel.kt
+++ /dev/null
@@ -1,271 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package org.linphone.activities.assistant.viewmodels
-
-import androidx.lifecycle.MediatorLiveData
-import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.ViewModel
-import androidx.lifecycle.ViewModelProvider
-import org.linphone.LinphoneApplication.Companion.corePreferences
-import org.linphone.R
-import org.linphone.core.AccountCreator
-import org.linphone.core.AccountCreatorListenerStub
-import org.linphone.core.tools.Log
-import org.linphone.utils.AppUtils
-import org.linphone.utils.Event
-
-class PhoneAccountCreationViewModelFactory(private val accountCreator: AccountCreator) :
-    ViewModelProvider.NewInstanceFactory() {
-
-    @Suppress("UNCHECKED_CAST")
-    override fun <T : ViewModel> create(modelClass: Class<T>): T {
-        return PhoneAccountCreationViewModel(accountCreator) as T
-    }
-}
-
-class PhoneAccountCreationViewModel(accountCreator: AccountCreator) : AbstractPhoneViewModel(
-    accountCreator
-) {
-    val username = MutableLiveData<String>()
-    val useUsername = MutableLiveData<Boolean>()
-    val usernameError = MutableLiveData<String>()
-
-    val displayName = MutableLiveData<String>()
-
-    val createEnabled: MediatorLiveData<Boolean> = MediatorLiveData()
-
-    val waitForServerAnswer = MutableLiveData<Boolean>()
-
-    val goToSmsValidationEvent: MutableLiveData<Event<Boolean>> by lazy {
-        MutableLiveData<Event<Boolean>>()
-    }
-
-    val onErrorEvent: MutableLiveData<Event<String>> by lazy {
-        MutableLiveData<Event<String>>()
-    }
-
-    private val listener = object : AccountCreatorListenerStub() {
-        override fun onIsAccountExist(
-            creator: AccountCreator,
-            status: AccountCreator.Status,
-            response: String?
-        ) {
-            Log.i("[Assistant] [Phone Account Creation] onIsAccountExist status is $status")
-            when (status) {
-                AccountCreator.Status.AccountExist, AccountCreator.Status.AccountExistWithAlias -> {
-                    waitForServerAnswer.value = false
-                    usernameError.value = AppUtils.getString(
-                        R.string.assistant_error_username_already_exists
-                    )
-                }
-                AccountCreator.Status.AccountNotExist -> {
-                    waitForServerAnswer.value = false
-                    checkPhoneNumber()
-                }
-                else -> {
-                    waitForServerAnswer.value = false
-                    onErrorEvent.value = Event("Error: ${status.name}")
-                }
-            }
-        }
-
-        override fun onIsAliasUsed(
-            creator: AccountCreator,
-            status: AccountCreator.Status,
-            response: String?
-        ) {
-            Log.i("[Assistant] [Phone Account Creation] onIsAliasUsed status is $status")
-            when (status) {
-                AccountCreator.Status.AliasExist -> {
-                    waitForServerAnswer.value = false
-                    phoneNumberError.value = AppUtils.getString(
-                        R.string.assistant_error_phone_number_already_exists
-                    )
-                }
-                AccountCreator.Status.AliasIsAccount -> {
-                    waitForServerAnswer.value = false
-                    if (useUsername.value == true) {
-                        usernameError.value = AppUtils.getString(
-                            R.string.assistant_error_username_already_exists
-                        )
-                    } else {
-                        phoneNumberError.value = AppUtils.getString(
-                            R.string.assistant_error_phone_number_already_exists
-                        )
-                    }
-                }
-                AccountCreator.Status.AliasNotExist -> {
-                    val createAccountStatus = creator.createAccount()
-                    Log.i(
-                        "[Assistant] [Phone Account Creation] createAccount returned $createAccountStatus"
-                    )
-                    if (createAccountStatus != AccountCreator.Status.RequestOk) {
-                        waitForServerAnswer.value = false
-                        onErrorEvent.value = Event("Error: ${status.name}")
-                    }
-                }
-                else -> {
-                    waitForServerAnswer.value = false
-                    onErrorEvent.value = Event("Error: ${status.name}")
-                }
-            }
-        }
-
-        override fun onCreateAccount(
-            creator: AccountCreator,
-            status: AccountCreator.Status,
-            response: String?
-        ) {
-            Log.i("[Assistant] [Phone Account Creation] onCreateAccount status is $status")
-            waitForServerAnswer.value = false
-            when (status) {
-                AccountCreator.Status.AccountCreated -> {
-                    goToSmsValidationEvent.value = Event(true)
-                }
-                AccountCreator.Status.AccountExistWithAlias -> {
-                    phoneNumberError.value = AppUtils.getString(
-                        R.string.assistant_error_phone_number_already_exists
-                    )
-                }
-                else -> {
-                    onErrorEvent.value = Event("Error: ${status.name}")
-                }
-            }
-        }
-    }
-
-    init {
-        useUsername.value = false
-        accountCreator.addListener(listener)
-
-        createEnabled.value = false
-        createEnabled.addSource(prefix) {
-            createEnabled.value = isCreateButtonEnabled()
-        }
-        createEnabled.addSource(phoneNumber) {
-            createEnabled.value = isCreateButtonEnabled()
-        }
-        createEnabled.addSource(useUsername) {
-            createEnabled.value = isCreateButtonEnabled()
-        }
-        createEnabled.addSource(username) {
-            createEnabled.value = isCreateButtonEnabled()
-        }
-        createEnabled.addSource(usernameError) {
-            createEnabled.value = isCreateButtonEnabled()
-        }
-        createEnabled.addSource(phoneNumberError) {
-            createEnabled.value = isCreateButtonEnabled()
-        }
-        createEnabled.addSource(prefixError) {
-            createEnabled.value = isCreateButtonEnabled()
-        }
-    }
-
-    override fun onCleared() {
-        accountCreator.removeListener(listener)
-        super.onCleared()
-    }
-
-    override fun onFlexiApiTokenReceived() {
-        Log.i(
-            "[Assistant] [Phone Account Creation] Using FlexiAPI auth token [${accountCreator.token}]"
-        )
-        accountCreator.displayName = displayName.value
-
-        val result = AccountCreator.PhoneNumberStatus.fromInt(
-            accountCreator.setPhoneNumber(phoneNumber.value, prefix.value)
-        )
-        if (result != AccountCreator.PhoneNumberStatus.Ok) {
-            Log.e(
-                "[Assistant] [Phone Account Creation] Error [$result] setting the phone number: ${phoneNumber.value} with prefix: ${prefix.value}"
-            )
-            phoneNumberError.value = result.name
-            return
-        }
-        Log.i("[Assistant] [Phone Account Creation] Phone number is ${accountCreator.phoneNumber}")
-
-        if (useUsername.value == true) {
-            accountCreator.username = username.value
-        } else {
-            accountCreator.username = accountCreator.phoneNumber
-        }
-
-        if (useUsername.value == true) {
-            checkUsername()
-        } else {
-            checkPhoneNumber()
-        }
-    }
-
-    override fun onFlexiApiTokenRequestError() {
-        Log.e("[Assistant] [Phone Account Creation] Failed to get an auth token from FlexiAPI")
-        waitForServerAnswer.value = false
-        onErrorEvent.value = Event("Error: Failed to get an auth token from account manager server")
-    }
-
-    private fun checkUsername() {
-        val status = accountCreator.isAccountExist
-        Log.i("[Assistant] [Phone Account Creation] isAccountExist returned $status")
-        if (status != AccountCreator.Status.RequestOk) {
-            waitForServerAnswer.value = false
-            onErrorEvent.value = Event("Error: ${status.name}")
-        }
-    }
-
-    private fun checkPhoneNumber() {
-        val status = accountCreator.isAliasUsed
-        Log.i("[Assistant] [Phone Account Creation] isAliasUsed returned $status")
-        if (status != AccountCreator.Status.RequestOk) {
-            waitForServerAnswer.value = false
-            onErrorEvent.value = Event("Error: ${status.name}")
-        }
-    }
-
-    fun create() {
-        val token = accountCreator.token.orEmpty()
-        if (token.isNotEmpty()) {
-            Log.i(
-                "[Assistant] [Phone Account Creation] We already have an auth token from FlexiAPI [$token], continue"
-            )
-            onFlexiApiTokenReceived()
-        } else {
-            Log.i("[Assistant] [Phone Account Creation] Requesting an auth token from FlexiAPI")
-            waitForServerAnswer.value = true
-            requestFlexiApiToken()
-        }
-    }
-
-    private fun isCreateButtonEnabled(): Boolean {
-        val usernameRegexp = corePreferences.config.getString(
-            "assistant",
-            "username_regex",
-            "^[a-z0-9+_.\\-]*\$"
-        )
-        return isPhoneNumberOk() && usernameRegexp != null &&
-            (
-                useUsername.value == false ||
-                    username.value.orEmpty().matches(Regex(usernameRegexp)) &&
-                    username.value.orEmpty().isNotEmpty() &&
-                    usernameError.value.orEmpty().isEmpty()
-                )
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/assistant/viewmodels/PhoneAccountLinkingViewModel.kt b/app/src/main/java/org/linphone/activities/assistant/viewmodels/PhoneAccountLinkingViewModel.kt
deleted file mode 100644
index 78c11c04e..000000000
--- a/app/src/main/java/org/linphone/activities/assistant/viewmodels/PhoneAccountLinkingViewModel.kt
+++ /dev/null
@@ -1,157 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package org.linphone.activities.assistant.viewmodels
-
-import androidx.lifecycle.*
-import org.linphone.core.AccountCreator
-import org.linphone.core.AccountCreatorListenerStub
-import org.linphone.core.tools.Log
-import org.linphone.utils.Event
-
-class PhoneAccountLinkingViewModelFactory(private val accountCreator: AccountCreator) :
-    ViewModelProvider.NewInstanceFactory() {
-
-    @Suppress("UNCHECKED_CAST")
-    override fun <T : ViewModel> create(modelClass: Class<T>): T {
-        return PhoneAccountLinkingViewModel(accountCreator) as T
-    }
-}
-
-class PhoneAccountLinkingViewModel(accountCreator: AccountCreator) : AbstractPhoneViewModel(
-    accountCreator
-) {
-    val username = MutableLiveData<String>()
-
-    val allowSkip = MutableLiveData<Boolean>()
-
-    val linkEnabled: MediatorLiveData<Boolean> = MediatorLiveData()
-
-    val waitForServerAnswer = MutableLiveData<Boolean>()
-
-    val leaveAssistantEvent = MutableLiveData<Event<Boolean>>()
-
-    val goToSmsValidationEvent = MutableLiveData<Event<Boolean>>()
-
-    val onErrorEvent: MutableLiveData<Event<String>> by lazy {
-        MutableLiveData<Event<String>>()
-    }
-
-    private val listener = object : AccountCreatorListenerStub() {
-        override fun onIsAliasUsed(
-            creator: AccountCreator,
-            status: AccountCreator.Status,
-            response: String?
-        ) {
-            Log.i("[Assistant] [Phone Account Linking] onIsAliasUsed status is $status")
-
-            when (status) {
-                AccountCreator.Status.AliasNotExist -> {
-                    if (creator.linkAccount() != AccountCreator.Status.RequestOk) {
-                        Log.e("[Assistant] [Phone Account Linking] linkAccount status is $status")
-                        waitForServerAnswer.value = false
-                        onErrorEvent.value = Event("Error: ${status.name}")
-                    }
-                }
-                AccountCreator.Status.AliasExist, AccountCreator.Status.AliasIsAccount -> {
-                    waitForServerAnswer.value = false
-                    onErrorEvent.value = Event("Error: ${status.name}")
-                }
-                else -> {
-                    waitForServerAnswer.value = false
-                    onErrorEvent.value = Event("Error: ${status.name}")
-                }
-            }
-        }
-
-        override fun onLinkAccount(
-            creator: AccountCreator,
-            status: AccountCreator.Status,
-            response: String?
-        ) {
-            Log.i("[Assistant] [Phone Account Linking] onLinkAccount status is $status")
-            waitForServerAnswer.value = false
-
-            when (status) {
-                AccountCreator.Status.RequestOk -> {
-                    goToSmsValidationEvent.value = Event(true)
-                }
-                else -> {
-                    onErrorEvent.value = Event("Error: ${status.name}")
-                }
-            }
-        }
-    }
-
-    init {
-        accountCreator.addListener(listener)
-
-        linkEnabled.value = false
-        linkEnabled.addSource(prefix) {
-            linkEnabled.value = isLinkButtonEnabled()
-        }
-        linkEnabled.addSource(phoneNumber) {
-            linkEnabled.value = isLinkButtonEnabled()
-        }
-        linkEnabled.addSource(phoneNumberError) {
-            linkEnabled.value = isLinkButtonEnabled()
-        }
-        linkEnabled.addSource(prefixError) {
-            linkEnabled.value = isLinkButtonEnabled()
-        }
-    }
-
-    override fun onCleared() {
-        accountCreator.removeListener(listener)
-        super.onCleared()
-    }
-
-    override fun onFlexiApiTokenReceived() {
-        accountCreator.setPhoneNumber(phoneNumber.value, prefix.value)
-        accountCreator.username = username.value
-        Log.i("[Assistant] [Phone Account Linking] Phone number is ${accountCreator.phoneNumber}")
-
-        val status: AccountCreator.Status = accountCreator.isAliasUsed
-        Log.i("[Assistant] [Phone Account Linking] isAliasUsed returned $status")
-        if (status != AccountCreator.Status.RequestOk) {
-            waitForServerAnswer.value = false
-            onErrorEvent.value = Event("Error: ${status.name}")
-        }
-    }
-
-    override fun onFlexiApiTokenRequestError() {
-        Log.e("[Assistant] [Phone Account Linking] Failed to get an auth token from FlexiAPI")
-        waitForServerAnswer.value = false
-    }
-
-    fun link() {
-        Log.i("[Assistant] [Phone Account Linking] Requesting an auth token from FlexiAPI")
-        waitForServerAnswer.value = true
-        requestFlexiApiToken()
-    }
-
-    fun skip() {
-        leaveAssistantEvent.value = Event(true)
-    }
-
-    private fun isLinkButtonEnabled(): Boolean {
-        return isPhoneNumberOk()
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/assistant/viewmodels/PhoneAccountValidationViewModel.kt b/app/src/main/java/org/linphone/activities/assistant/viewmodels/PhoneAccountValidationViewModel.kt
deleted file mode 100644
index cf1f3f787..000000000
--- a/app/src/main/java/org/linphone/activities/assistant/viewmodels/PhoneAccountValidationViewModel.kt
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.assistant.viewmodels
-
-import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.ViewModel
-import androidx.lifecycle.ViewModelProvider
-import org.linphone.core.AccountCreator
-import org.linphone.core.AccountCreatorListenerStub
-import org.linphone.core.tools.Log
-import org.linphone.utils.Event
-
-class PhoneAccountValidationViewModelFactory(private val accountCreator: AccountCreator) :
-    ViewModelProvider.NewInstanceFactory() {
-
-    @Suppress("UNCHECKED_CAST")
-    override fun <T : ViewModel> create(modelClass: Class<T>): T {
-        return PhoneAccountValidationViewModel(accountCreator) as T
-    }
-}
-
-class PhoneAccountValidationViewModel(val accountCreator: AccountCreator) : ViewModel() {
-    val phoneNumber = MutableLiveData<String>()
-
-    val code = MutableLiveData<String>()
-
-    val isLogin = MutableLiveData<Boolean>()
-
-    val isCreation = MutableLiveData<Boolean>()
-
-    val isLinking = MutableLiveData<Boolean>()
-
-    val waitForServerAnswer = MutableLiveData<Boolean>()
-
-    val leaveAssistantEvent = MutableLiveData<Event<Boolean>>()
-
-    val onErrorEvent: MutableLiveData<Event<String>> by lazy {
-        MutableLiveData<Event<String>>()
-    }
-
-    val listener = object : AccountCreatorListenerStub() {
-        override fun onLoginLinphoneAccount(
-            creator: AccountCreator,
-            status: AccountCreator.Status,
-            response: String?
-        ) {
-            Log.i("[Assistant] [Phone Account Validation] onLoginLinphoneAccount status is $status")
-            waitForServerAnswer.value = false
-
-            if (status == AccountCreator.Status.RequestOk) {
-                if (createAccountAndAuthInfo()) {
-                    leaveAssistantEvent.value = Event(true)
-                } else {
-                    onErrorEvent.value = Event("Error: Failed to create account object")
-                }
-            } else {
-                onErrorEvent.value = Event("Error: ${status.name}")
-            }
-        }
-
-        override fun onActivateAlias(
-            creator: AccountCreator,
-            status: AccountCreator.Status,
-            response: String?
-        ) {
-            Log.i("[Assistant] [Phone Account Validation] onActivateAlias status is $status")
-            waitForServerAnswer.value = false
-
-            when (status) {
-                AccountCreator.Status.AccountActivated -> {
-                    leaveAssistantEvent.value = Event(true)
-                }
-                else -> {
-                    onErrorEvent.value = Event("Error: ${status.name}")
-                }
-            }
-        }
-
-        override fun onActivateAccount(
-            creator: AccountCreator,
-            status: AccountCreator.Status,
-            response: String?
-        ) {
-            Log.i("[Assistant] [Phone Account Validation] onActivateAccount status is $status")
-            waitForServerAnswer.value = false
-
-            if (status == AccountCreator.Status.AccountActivated) {
-                if (createAccountAndAuthInfo()) {
-                    leaveAssistantEvent.value = Event(true)
-                } else {
-                    onErrorEvent.value = Event("Error: Failed to create account object")
-                }
-            } else {
-                onErrorEvent.value = Event("Error: ${status.name}")
-            }
-        }
-    }
-
-    init {
-        accountCreator.addListener(listener)
-    }
-
-    override fun onCleared() {
-        accountCreator.removeListener(listener)
-        super.onCleared()
-    }
-
-    fun finish() {
-        accountCreator.activationCode = code.value.orEmpty()
-        Log.i(
-            "[Assistant] [Phone Account Validation] Phone number is ${accountCreator.phoneNumber} and activation code is ${accountCreator.activationCode}"
-        )
-        waitForServerAnswer.value = true
-
-        val status = when {
-            isLogin.value == true -> accountCreator.loginLinphoneAccount()
-            isCreation.value == true -> accountCreator.activateAccount()
-            isLinking.value == true -> accountCreator.activateAlias()
-            else -> AccountCreator.Status.UnexpectedError
-        }
-        Log.i("[Assistant] [Phone Account Validation] Code validation result is $status")
-        if (status != AccountCreator.Status.RequestOk) {
-            waitForServerAnswer.value = false
-            onErrorEvent.value = Event("Error: ${status.name}")
-        }
-    }
-
-    private fun createAccountAndAuthInfo(): Boolean {
-        val account = accountCreator.createAccountInCore()
-
-        if (account == null) {
-            Log.e(
-                "[Assistant] [Phone Account Validation] Account creator couldn't create account"
-            )
-            return false
-        }
-
-        val params = account.params.clone()
-        params.pushNotificationAllowed = true
-        account.params = params
-
-        Log.i("[Assistant] [Phone Account Validation] Account created")
-        return true
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/assistant/viewmodels/QrCodeViewModel.kt b/app/src/main/java/org/linphone/activities/assistant/viewmodels/QrCodeViewModel.kt
deleted file mode 100644
index c0f988d0f..000000000
--- a/app/src/main/java/org/linphone/activities/assistant/viewmodels/QrCodeViewModel.kt
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.assistant.viewmodels
-
-import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.ViewModel
-import org.linphone.LinphoneApplication.Companion.coreContext
-import org.linphone.core.Core
-import org.linphone.core.CoreListenerStub
-import org.linphone.core.tools.Log
-import org.linphone.utils.Event
-
-class QrCodeViewModel : ViewModel() {
-    val qrCodeFoundEvent = MutableLiveData<Event<String>>()
-
-    val showSwitchCamera = MutableLiveData<Boolean>()
-
-    private val listener = object : CoreListenerStub() {
-        override fun onQrcodeFound(core: Core, result: String?) {
-            Log.i("[Assistant] [QR Code] Found [$result]")
-            if (result != null) qrCodeFoundEvent.postValue(Event(result))
-        }
-    }
-
-    init {
-        coreContext.core.addListener(listener)
-        showSwitchCamera.value = coreContext.showSwitchCameraButton()
-    }
-
-    override fun onCleared() {
-        coreContext.core.removeListener(listener)
-        super.onCleared()
-    }
-
-    fun setBackCamera() {
-        showSwitchCamera.value = coreContext.showSwitchCameraButton()
-
-        for (camera in coreContext.core.videoDevicesList) {
-            if (camera.contains("Back")) {
-                Log.i("[Assistant] [QR Code] Found back facing camera: $camera")
-                coreContext.core.videoDevice = camera
-                return
-            }
-        }
-
-        val first = coreContext.core.videoDevicesList.firstOrNull()
-        if (first != null) {
-            Log.i("[Assistant] [QR Code] Using first camera found: $first")
-            coreContext.core.videoDevice = first
-        }
-    }
-
-    fun switchCamera() {
-        coreContext.switchCamera()
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/assistant/viewmodels/RemoteProvisioningViewModel.kt b/app/src/main/java/org/linphone/activities/assistant/viewmodels/RemoteProvisioningViewModel.kt
deleted file mode 100644
index 2f8d75b90..000000000
--- a/app/src/main/java/org/linphone/activities/assistant/viewmodels/RemoteProvisioningViewModel.kt
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.assistant.viewmodels
-
-import androidx.lifecycle.MediatorLiveData
-import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.ViewModel
-import org.linphone.LinphoneApplication.Companion.coreContext
-import org.linphone.core.ConfiguringState
-import org.linphone.core.Core
-import org.linphone.core.CoreListenerStub
-import org.linphone.core.tools.Log
-import org.linphone.utils.Event
-
-class RemoteProvisioningViewModel : ViewModel() {
-    val urlToFetch = MutableLiveData<String>()
-    val urlError = MutableLiveData<String>()
-
-    val fetchEnabled: MediatorLiveData<Boolean> = MediatorLiveData()
-    val fetchInProgress = MutableLiveData<Boolean>()
-    val fetchSuccessfulEvent = MutableLiveData<Event<Boolean>>()
-
-    private val listener = object : CoreListenerStub() {
-        override fun onConfiguringStatus(
-            core: Core,
-            status: ConfiguringState,
-            message: String?
-        ) {
-            fetchInProgress.value = false
-            when (status) {
-                ConfiguringState.Successful -> {
-                    fetchSuccessfulEvent.value = Event(true)
-                }
-                ConfiguringState.Failed -> {
-                    fetchSuccessfulEvent.value = Event(false)
-                }
-                else -> {}
-            }
-        }
-    }
-
-    init {
-        fetchInProgress.value = false
-        coreContext.core.addListener(listener)
-
-        fetchEnabled.value = false
-        fetchEnabled.addSource(urlToFetch) {
-            fetchEnabled.value = isFetchEnabled()
-        }
-        fetchEnabled.addSource(urlError) {
-            fetchEnabled.value = isFetchEnabled()
-        }
-    }
-
-    override fun onCleared() {
-        coreContext.core.removeListener(listener)
-        super.onCleared()
-    }
-
-    fun fetchAndApply() {
-        val url = urlToFetch.value.orEmpty()
-        coreContext.core.provisioningUri = url
-        Log.w("[Assistant] [Remote Provisioning] Url set to [$url], restarting Core")
-        fetchInProgress.value = true
-        coreContext.core.stop()
-        coreContext.core.start()
-    }
-
-    private fun isFetchEnabled(): Boolean {
-        return urlToFetch.value.orEmpty().isNotEmpty() && urlError.value.orEmpty().isEmpty()
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/assistant/viewmodels/SharedAssistantViewModel.kt b/app/src/main/java/org/linphone/activities/assistant/viewmodels/SharedAssistantViewModel.kt
deleted file mode 100644
index d97bdf1b7..000000000
--- a/app/src/main/java/org/linphone/activities/assistant/viewmodels/SharedAssistantViewModel.kt
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.assistant.viewmodels
-
-import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.ViewModel
-import java.util.*
-import org.linphone.LinphoneApplication.Companion.coreContext
-import org.linphone.LinphoneApplication.Companion.corePreferences
-import org.linphone.core.*
-import org.linphone.core.tools.Log
-
-class SharedAssistantViewModel : ViewModel() {
-    val remoteProvisioningUrl = MutableLiveData<String>()
-
-    private var accountCreator: AccountCreator
-    private var useGenericSipAccount: Boolean = false
-
-    init {
-        Log.i("[Assistant] Loading linphone default values")
-        coreContext.core.loadConfigFromXml(corePreferences.linphoneDefaultValuesPath)
-        accountCreator = coreContext.core.createAccountCreator(corePreferences.xmlRpcServerUrl)
-        accountCreator.language = Locale.getDefault().language
-    }
-
-    fun getAccountCreator(genericAccountCreator: Boolean = false): AccountCreator {
-        if (genericAccountCreator != useGenericSipAccount) {
-            accountCreator.reset()
-            accountCreator.language = Locale.getDefault().language
-
-            if (genericAccountCreator) {
-                Log.i("[Assistant] Loading default values")
-                coreContext.core.loadConfigFromXml(corePreferences.defaultValuesPath)
-            } else {
-                Log.i("[Assistant] Loading linphone default values")
-                coreContext.core.loadConfigFromXml(corePreferences.linphoneDefaultValuesPath)
-            }
-            useGenericSipAccount = genericAccountCreator
-        }
-        return accountCreator
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/assistant/viewmodels/WelcomeViewModel.kt b/app/src/main/java/org/linphone/activities/assistant/viewmodels/WelcomeViewModel.kt
deleted file mode 100644
index d31a2ba89..000000000
--- a/app/src/main/java/org/linphone/activities/assistant/viewmodels/WelcomeViewModel.kt
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.assistant.viewmodels
-
-import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.ViewModel
-import org.linphone.LinphoneApplication.Companion.corePreferences
-
-class WelcomeViewModel : ViewModel() {
-    val showCreateAccount: Boolean = corePreferences.showCreateAccount
-    val showLinphoneLogin: Boolean = corePreferences.showLinphoneLogin
-    val showGenericLogin: Boolean = corePreferences.showGenericLogin
-    val showRemoteProvisioning: Boolean = corePreferences.showRemoteProvisioning
-
-    val termsAndPrivacyAccepted = MutableLiveData<Boolean>()
-
-    init {
-        termsAndPrivacyAccepted.value = corePreferences.readAndAgreeTermsAndPrivacy
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/chat_bubble/ChatBubbleActivity.kt b/app/src/main/java/org/linphone/activities/chat_bubble/ChatBubbleActivity.kt
deleted file mode 100644
index ddcdefa5b..000000000
--- a/app/src/main/java/org/linphone/activities/chat_bubble/ChatBubbleActivity.kt
+++ /dev/null
@@ -1,225 +0,0 @@
-/*
- * Copyright (c) 2010-2021 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.chat_bubble
-
-import android.content.Intent
-import android.os.Bundle
-import android.widget.Toast
-import androidx.databinding.DataBindingUtil
-import androidx.lifecycle.ViewModelProvider
-import androidx.lifecycle.lifecycleScope
-import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.RecyclerView
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.launch
-import org.linphone.LinphoneApplication.Companion.coreContext
-import org.linphone.R
-import org.linphone.activities.GenericActivity
-import org.linphone.activities.main.MainActivity
-import org.linphone.activities.main.chat.adapters.ChatMessagesListAdapter
-import org.linphone.activities.main.chat.viewmodels.*
-import org.linphone.activities.main.viewmodels.ListTopBarViewModel
-import org.linphone.core.ChatRoom
-import org.linphone.core.ChatRoomListenerStub
-import org.linphone.core.EventLog
-import org.linphone.core.Factory
-import org.linphone.core.tools.Log
-import org.linphone.databinding.ChatBubbleActivityBinding
-import org.linphone.utils.FileUtils
-
-class ChatBubbleActivity : GenericActivity() {
-    private lateinit var binding: ChatBubbleActivityBinding
-    private lateinit var viewModel: ChatRoomViewModel
-    private lateinit var listViewModel: ChatMessagesListViewModel
-    private lateinit var chatSendingViewModel: ChatMessageSendingViewModel
-    private lateinit var adapter: ChatMessagesListAdapter
-
-    private val observer = object : RecyclerView.AdapterDataObserver() {
-        override fun onItemRangeInserted(positionStart: Int, itemCount: Int) {
-            if (positionStart == adapter.itemCount - itemCount) {
-                adapter.notifyItemChanged(positionStart - 1) // For grouping purposes
-                scrollToBottom()
-            }
-        }
-    }
-
-    private val listener = object : ChatRoomListenerStub() {
-        override fun onChatMessagesReceived(chatRoom: ChatRoom, eventLogs: Array<out EventLog>) {
-            chatRoom.markAsRead()
-        }
-    }
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-
-        binding = DataBindingUtil.setContentView(this, R.layout.chat_bubble_activity)
-        binding.lifecycleOwner = this
-
-        val localSipUri = intent.getStringExtra("LocalSipUri")
-        val remoteSipUri = intent.getStringExtra("RemoteSipUri")
-        var chatRoom: ChatRoom? = null
-
-        if (localSipUri != null && remoteSipUri != null) {
-            Log.i(
-                "[Chat Bubble] Found local [$localSipUri] & remote [$remoteSipUri] addresses in arguments"
-            )
-            val localAddress = Factory.instance().createAddress(localSipUri)
-            val remoteSipAddress = Factory.instance().createAddress(remoteSipUri)
-            chatRoom = coreContext.core.searchChatRoom(
-                null,
-                localAddress,
-                remoteSipAddress,
-                arrayOfNulls(
-                    0
-                )
-            )
-        }
-
-        if (chatRoom == null) {
-            Log.e("[Chat Bubble] Chat room is null, aborting!")
-            finish()
-            return
-        }
-
-        viewModel = ViewModelProvider(
-            this,
-            ChatRoomViewModelFactory(chatRoom)
-        )[ChatRoomViewModel::class.java]
-        binding.viewModel = viewModel
-
-        listViewModel = ViewModelProvider(
-            this,
-            ChatMessagesListViewModelFactory(chatRoom)
-        )[ChatMessagesListViewModel::class.java]
-
-        chatSendingViewModel = ViewModelProvider(
-            this,
-            ChatMessageSendingViewModelFactory(chatRoom)
-        )[ChatMessageSendingViewModel::class.java]
-        binding.chatSendingViewModel = chatSendingViewModel
-
-        val listSelectionViewModel = ViewModelProvider(this)[ListTopBarViewModel::class.java]
-        adapter = ChatMessagesListAdapter(listSelectionViewModel, this)
-        // SubmitList is done on a background thread
-        // We need this adapter data observer to know when to scroll
-        binding.chatMessagesList.adapter = adapter
-        adapter.registerAdapterDataObserver(observer)
-
-        // Disable context menu on each message
-        adapter.disableAdvancedContextMenuOptions()
-
-        adapter.openContentEvent.observe(
-            this
-        ) {
-            it.consume { content ->
-                if (content.isFileEncrypted) {
-                    Toast.makeText(
-                        this,
-                        R.string.chat_bubble_cant_open_enrypted_file,
-                        Toast.LENGTH_LONG
-                    ).show()
-                } else {
-                    FileUtils.openFileInThirdPartyApp(this, content.filePath.orEmpty(), true)
-                }
-            }
-        }
-
-        val layoutManager = LinearLayoutManager(this)
-        layoutManager.stackFromEnd = true
-        binding.chatMessagesList.layoutManager = layoutManager
-
-        listViewModel.events.observe(
-            this
-        ) { events ->
-            adapter.submitList(events)
-        }
-
-        chatSendingViewModel.textToSend.observe(
-            this
-        ) {
-            chatSendingViewModel.onTextToSendChanged(it)
-        }
-
-        binding.setOpenAppClickListener {
-            coreContext.notificationsManager.currentlyDisplayedChatRoomAddress = null
-            coreContext.notificationsManager.changeDismissNotificationUponReadForChatRoom(
-                viewModel.chatRoom,
-                false
-            )
-
-            val intent = Intent(this, MainActivity::class.java)
-            intent.putExtra("RemoteSipUri", remoteSipUri)
-            intent.putExtra("LocalSipUri", localSipUri)
-            intent.putExtra("Chat", true)
-            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK and Intent.FLAG_ACTIVITY_CLEAR_TASK)
-            startActivity(intent)
-        }
-
-        binding.setCloseBubbleClickListener {
-            coreContext.notificationsManager.dismissChatNotification(viewModel.chatRoom)
-        }
-
-        binding.setSendMessageClickListener {
-            chatSendingViewModel.sendMessage()
-            binding.message.text?.clear()
-        }
-    }
-
-    override fun onResume() {
-        super.onResume()
-
-        viewModel.chatRoom.addListener(listener)
-
-        // Workaround for the removed notification when a chat room is marked as read
-        coreContext.notificationsManager.changeDismissNotificationUponReadForChatRoom(
-            viewModel.chatRoom,
-            true
-        )
-        viewModel.chatRoom.markAsRead()
-
-        val peerAddress = viewModel.chatRoom.peerAddress.asStringUriOnly()
-        coreContext.notificationsManager.currentlyDisplayedChatRoomAddress = peerAddress
-        coreContext.notificationsManager.resetChatNotificationCounterForSipUri(peerAddress)
-
-        lifecycleScope.launch {
-            // Without the delay the scroll to bottom doesn't happen...
-            delay(100)
-            scrollToBottom()
-        }
-    }
-
-    override fun onPause() {
-        viewModel.chatRoom.removeListener(listener)
-
-        coreContext.notificationsManager.currentlyDisplayedChatRoomAddress = null
-        coreContext.notificationsManager.changeDismissNotificationUponReadForChatRoom(
-            viewModel.chatRoom,
-            false
-        )
-
-        super.onPause()
-    }
-
-    private fun scrollToBottom() {
-        if (adapter.itemCount > 0) {
-            binding.chatMessagesList.scrollToPosition(adapter.itemCount - 1)
-        }
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/main/MainActivity.kt b/app/src/main/java/org/linphone/activities/main/MainActivity.kt
deleted file mode 100644
index 78798c4c0..000000000
--- a/app/src/main/java/org/linphone/activities/main/MainActivity.kt
+++ /dev/null
@@ -1,740 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.main
-
-import android.app.Dialog
-import android.content.ComponentCallbacks2
-import android.content.Context
-import android.content.Intent
-import android.content.res.Configuration
-import android.net.Uri
-import android.os.Bundle
-import android.os.Parcelable
-import android.view.Gravity
-import android.view.MotionEvent
-import android.view.View
-import android.view.inputmethod.InputMethodManager
-import androidx.annotation.StringRes
-import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
-import androidx.core.view.doOnAttach
-import androidx.databinding.DataBindingUtil
-import androidx.fragment.app.FragmentContainerView
-import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.ViewModelProvider
-import androidx.lifecycle.lifecycleScope
-import androidx.navigation.NavController
-import androidx.navigation.NavDestination
-import androidx.navigation.findNavController
-import androidx.window.layout.FoldingFeature
-import coil.imageLoader
-import com.google.android.material.snackbar.Snackbar
-import java.io.UnsupportedEncodingException
-import java.net.URLDecoder
-import kotlin.math.abs
-import kotlinx.coroutines.*
-import org.linphone.LinphoneApplication.Companion.coreContext
-import org.linphone.LinphoneApplication.Companion.corePreferences
-import org.linphone.R
-import org.linphone.activities.*
-import org.linphone.activities.assistant.AssistantActivity
-import org.linphone.activities.main.viewmodels.CallOverlayViewModel
-import org.linphone.activities.main.viewmodels.DialogViewModel
-import org.linphone.activities.main.viewmodels.SharedMainViewModel
-import org.linphone.activities.navigateToDialer
-import org.linphone.compatibility.Compatibility
-import org.linphone.contact.ContactsUpdatedListenerStub
-import org.linphone.core.AuthInfo
-import org.linphone.core.AuthMethod
-import org.linphone.core.Core
-import org.linphone.core.CoreListenerStub
-import org.linphone.core.CorePreferences
-import org.linphone.core.tools.Log
-import org.linphone.databinding.MainActivityBinding
-import org.linphone.utils.*
-
-class MainActivity : GenericActivity(), SnackBarActivity, NavController.OnDestinationChangedListener {
-    private lateinit var binding: MainActivityBinding
-    private lateinit var sharedViewModel: SharedMainViewModel
-    private lateinit var callOverlayViewModel: CallOverlayViewModel
-
-    private val listener = object : ContactsUpdatedListenerStub() {
-        override fun onContactsUpdated() {
-            Log.i("[Main Activity] Contact(s) updated, update shortcuts")
-            if (corePreferences.contactsShortcuts) {
-                ShortcutsHelper.createShortcutsToContacts(this@MainActivity)
-            } else if (corePreferences.chatRoomShortcuts) {
-                ShortcutsHelper.createShortcutsToChatRooms(this@MainActivity)
-            }
-        }
-    }
-
-    private lateinit var tabsFragment: FragmentContainerView
-    private lateinit var statusFragment: FragmentContainerView
-
-    private var overlayX = 0f
-    private var overlayY = 0f
-    private var initPosX = 0f
-    private var initPosY = 0f
-    private var overlay: View? = null
-
-    private val componentCallbacks = object : ComponentCallbacks2 {
-        override fun onConfigurationChanged(newConfig: Configuration) { }
-
-        override fun onLowMemory() {
-            Log.w("[Main Activity] onLowMemory !")
-        }
-
-        override fun onTrimMemory(level: Int) {
-            Log.w("[Main Activity] onTrimMemory called with level $level !")
-            applicationContext.imageLoader.memoryCache?.clear()
-        }
-    }
-
-    override fun onLayoutChanges(foldingFeature: FoldingFeature?) {
-        sharedViewModel.layoutChangedEvent.value = Event(true)
-    }
-
-    private var shouldTabsBeVisibleDependingOnDestination = true
-    private var shouldTabsBeVisibleDueToOrientationAndKeyboard = true
-
-    private val authenticationRequestedEvent: MutableLiveData<Event<AuthInfo>> by lazy {
-        MutableLiveData<Event<AuthInfo>>()
-    }
-    private var authenticationRequiredDialog: Dialog? = null
-
-    private val coreListener: CoreListenerStub = object : CoreListenerStub() {
-        override fun onAuthenticationRequested(core: Core, authInfo: AuthInfo, method: AuthMethod) {
-            if (authInfo.username == null || authInfo.domain == null || authInfo.realm == null) {
-                return
-            }
-
-            Log.w(
-                "[Main Activity] Authentication requested for account [${authInfo.username}@${authInfo.domain}] with realm [${authInfo.realm}] using method [$method]"
-            )
-            authenticationRequestedEvent.value = Event(authInfo)
-        }
-    }
-
-    private val keyboardVisibilityListeners = arrayListOf<AppUtils.KeyboardVisibilityListener>()
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-
-        // Must be done before the setContentView
-        installSplashScreen()
-
-        binding = DataBindingUtil.setContentView(this, R.layout.main_activity)
-        binding.lifecycleOwner = this
-
-        sharedViewModel = ViewModelProvider(this)[SharedMainViewModel::class.java]
-        binding.viewModel = sharedViewModel
-
-        callOverlayViewModel = ViewModelProvider(this)[CallOverlayViewModel::class.java]
-        binding.callOverlayViewModel = callOverlayViewModel
-
-        sharedViewModel.toggleDrawerEvent.observe(
-            this
-        ) {
-            it.consume {
-                if (binding.sideMenu.isDrawerOpen(Gravity.LEFT)) {
-                    binding.sideMenu.closeDrawer(binding.sideMenuContent, true)
-                } else {
-                    binding.sideMenu.openDrawer(binding.sideMenuContent, true)
-                }
-            }
-        }
-
-        coreContext.callErrorMessageResourceId.observe(
-            this
-        ) {
-            it.consume { message ->
-                showSnackBar(message)
-            }
-        }
-
-        authenticationRequestedEvent.observe(
-            this
-        ) {
-            it.consume { authInfo ->
-                showAuthenticationRequestedDialog(authInfo)
-            }
-        }
-
-        if (coreContext.core.accountList.isEmpty()) {
-            if (corePreferences.firstStart) {
-                startActivity(Intent(this, AssistantActivity::class.java))
-            }
-        }
-
-        tabsFragment = findViewById(R.id.tabs_fragment)
-        statusFragment = findViewById(R.id.status_fragment)
-
-        binding.root.doOnAttach {
-            Log.i("[Main Activity] Report UI has been fully drawn (TTFD)")
-            try {
-                reportFullyDrawn()
-            } catch (se: SecurityException) {
-                Log.e("[Main Activity] Security exception when doing reportFullyDrawn(): $se")
-            }
-        }
-    }
-
-    override fun onNewIntent(intent: Intent?) {
-        super.onNewIntent(intent)
-
-        if (intent != null) {
-            Log.d("[Main Activity] Found new intent")
-            handleIntentParams(intent)
-        }
-    }
-
-    override fun onResume() {
-        super.onResume()
-        coreContext.contactsManager.addListener(listener)
-        coreContext.core.addListener(coreListener)
-    }
-
-    override fun onPause() {
-        coreContext.core.removeListener(coreListener)
-        coreContext.contactsManager.removeListener(listener)
-        super.onPause()
-    }
-
-    override fun showSnackBar(@StringRes resourceId: Int) {
-        Snackbar.make(findViewById(R.id.coordinator), resourceId, Snackbar.LENGTH_LONG).show()
-    }
-
-    override fun showSnackBar(@StringRes resourceId: Int, action: Int, listener: () -> Unit) {
-        Snackbar
-            .make(findViewById(R.id.coordinator), resourceId, Snackbar.LENGTH_LONG)
-            .setAction(action) {
-                Log.i("[Snack Bar] Action listener triggered")
-                listener()
-            }
-            .show()
-    }
-
-    override fun showSnackBar(message: String) {
-        Snackbar.make(findViewById(R.id.coordinator), message, Snackbar.LENGTH_LONG).show()
-    }
-
-    override fun onPostCreate(savedInstanceState: Bundle?) {
-        super.onPostCreate(savedInstanceState)
-
-        registerComponentCallbacks(componentCallbacks)
-        findNavController(R.id.nav_host_fragment).addOnDestinationChangedListener(this)
-
-        binding.rootCoordinatorLayout.setKeyboardInsetListener { keyboardVisible ->
-            val portraitOrientation = resources.configuration.orientation != Configuration.ORIENTATION_LANDSCAPE
-            Log.i(
-                "[Main Activity] Keyboard is ${if (keyboardVisible) "visible" else "invisible"}, orientation is ${if (portraitOrientation) "portrait" else "landscape"}"
-            )
-            shouldTabsBeVisibleDueToOrientationAndKeyboard = !portraitOrientation || !keyboardVisible
-            updateTabsFragmentVisibility()
-
-            for (listener in keyboardVisibilityListeners) {
-                listener.onKeyboardVisibilityChanged(keyboardVisible)
-            }
-        }
-
-        initOverlay()
-
-        if (intent != null) {
-            Log.d("[Main Activity] Found post create intent")
-            handleIntentParams(intent)
-        }
-    }
-
-    override fun onDestroy() {
-        findNavController(R.id.nav_host_fragment).removeOnDestinationChangedListener(this)
-        unregisterComponentCallbacks(componentCallbacks)
-        super.onDestroy()
-    }
-
-    override fun onDestinationChanged(
-        controller: NavController,
-        destination: NavDestination,
-        arguments: Bundle?
-    ) {
-        hideKeyboard()
-        if (statusFragment.visibility == View.GONE) {
-            statusFragment.visibility = View.VISIBLE
-        }
-
-        shouldTabsBeVisibleDependingOnDestination = when (destination.id) {
-            R.id.masterCallLogsFragment, R.id.masterContactsFragment, R.id.dialerFragment, R.id.masterChatRoomsFragment ->
-                true
-            else -> false
-        }
-        updateTabsFragmentVisibility()
-    }
-
-    fun addKeyboardVisibilityListener(listener: AppUtils.KeyboardVisibilityListener) {
-        keyboardVisibilityListeners.add(listener)
-    }
-
-    fun removeKeyboardVisibilityListener(listener: AppUtils.KeyboardVisibilityListener) {
-        keyboardVisibilityListeners.remove(listener)
-    }
-
-    fun hideKeyboard() {
-        currentFocus?.hideKeyboard()
-    }
-
-    fun showKeyboard() {
-        // Requires a text field to have the focus
-        if (currentFocus != null) {
-            (getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager)
-                .showSoftInput(currentFocus, 0)
-        } else {
-            Log.w("[Main Activity] Can't show the keyboard, no focused view")
-        }
-    }
-
-    fun hideStatusFragment(hide: Boolean) {
-        statusFragment.visibility = if (hide) View.GONE else View.VISIBLE
-    }
-
-    private fun updateTabsFragmentVisibility() {
-        tabsFragment.visibility = if (shouldTabsBeVisibleDependingOnDestination && shouldTabsBeVisibleDueToOrientationAndKeyboard) View.VISIBLE else View.GONE
-    }
-
-    private fun handleIntentParams(intent: Intent) {
-        Log.i(
-            "[Main Activity] Handling intent with action [${intent.action}], type [${intent.type}] and data [${intent.data}]"
-        )
-
-        when (intent.action) {
-            Intent.ACTION_MAIN -> handleMainIntent(intent)
-            Intent.ACTION_SEND, Intent.ACTION_SENDTO -> {
-                if (intent.type == "text/plain") {
-                    handleSendText(intent)
-                } else {
-                    lifecycleScope.launch {
-                        handleSendFile(intent)
-                    }
-                }
-            }
-            Intent.ACTION_SEND_MULTIPLE -> {
-                lifecycleScope.launch {
-                    handleSendMultipleFiles(intent)
-                }
-            }
-            Intent.ACTION_VIEW -> {
-                val uri = intent.data
-                if (uri != null) {
-                    if (
-                        intent.type == AppUtils.getString(R.string.linphone_address_mime_type) &&
-                        PermissionHelper.get().hasReadContactsPermission()
-                    ) {
-                        val contactId =
-                            coreContext.contactsManager.getAndroidContactIdFromUri(uri)
-                        if (contactId != null) {
-                            Log.i("[Main Activity] Found contact URI parameter in intent: $uri")
-                            navigateToContact(contactId)
-                        }
-                    } else {
-                        val stringUri = uri.toString()
-                        if (stringUri.startsWith("linphone-config:")) {
-                            val remoteConfigUri = stringUri.substring("linphone-config:".length)
-                            if (corePreferences.autoRemoteProvisioningOnConfigUriHandler) {
-                                Log.w(
-                                    "[Main Activity] Remote provisioning URL set to [$remoteConfigUri], restarting Core now"
-                                )
-                                applyRemoteProvisioning(remoteConfigUri)
-                            } else {
-                                Log.i(
-                                    "[Main Activity] Remote provisioning URL found [$remoteConfigUri], asking for user validation"
-                                )
-                                showAcceptRemoteConfigurationDialog(remoteConfigUri)
-                            }
-                        } else {
-                            handleTelOrSipUri(uri)
-                        }
-                    }
-                }
-            }
-            Intent.ACTION_DIAL, Intent.ACTION_CALL -> {
-                val uri = intent.data
-                if (uri != null) {
-                    handleTelOrSipUri(uri)
-                }
-            }
-            Intent.ACTION_VIEW_LOCUS -> {
-                if (corePreferences.disableChat) return
-                val locus = Compatibility.extractLocusIdFromIntent(intent)
-                if (locus != null) {
-                    Log.i("[Main Activity] Found chat room locus intent extra: $locus")
-                    handleLocusOrShortcut(locus)
-                }
-            }
-            else -> handleMainIntent(intent)
-        }
-
-        // Prevent this intent to be processed again
-        intent.action = null
-        intent.data = null
-        val extras = intent.extras
-        if (extras != null) {
-            for (key in extras.keySet()) {
-                intent.removeExtra(key)
-            }
-        }
-    }
-
-    private fun handleMainIntent(intent: Intent) {
-        when {
-            intent.hasExtra("ContactId") -> {
-                val id = intent.getStringExtra("ContactId")
-                Log.i("[Main Activity] Found contact ID in extras: $id")
-                navigateToContact(id)
-            }
-            intent.hasExtra("Chat") -> {
-                if (corePreferences.disableChat) return
-
-                if (intent.hasExtra("RemoteSipUri") && intent.hasExtra("LocalSipUri")) {
-                    val peerAddress = intent.getStringExtra("RemoteSipUri")
-                    val localAddress = intent.getStringExtra("LocalSipUri")
-                    Log.i(
-                        "[Main Activity] Found chat room intent extra: local SIP URI=[$localAddress], peer SIP URI=[$peerAddress]"
-                    )
-                    navigateToChatRoom(localAddress, peerAddress)
-                } else {
-                    Log.i("[Main Activity] Found chat intent extra, go to chat rooms list")
-                    navigateToChatRooms()
-                }
-            }
-            intent.hasExtra("Dialer") -> {
-                Log.i("[Main Activity] Found dialer intent extra, go to dialer")
-                val isTransfer = intent.getBooleanExtra("Transfer", false)
-                sharedViewModel.pendingCallTransfer = isTransfer
-                navigateToDialer()
-            }
-            intent.hasExtra("Contacts") -> {
-                Log.i("[Main Activity] Found contacts intent extra, go to contacts list")
-                val isTransfer = intent.getBooleanExtra("Transfer", false)
-                sharedViewModel.pendingCallTransfer = isTransfer
-                navigateToContacts()
-            }
-            else -> {
-                val core = coreContext.core
-                val call = core.currentCall ?: core.calls.firstOrNull()
-                if (call != null) {
-                    Log.i(
-                        "[Main Activity] Launcher clicked while there is at least one active call, go to CallActivity"
-                    )
-                    val callIntent = Intent(
-                        this,
-                        org.linphone.activities.voip.CallActivity::class.java
-                    )
-                    callIntent.addFlags(
-                        Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_REORDER_TO_FRONT
-                    )
-                    startActivity(callIntent)
-                }
-            }
-        }
-    }
-
-    private fun handleTelOrSipUri(uri: Uri) {
-        Log.i("[Main Activity] Found uri: $uri to call")
-        val stringUri = uri.toString()
-        var addressToCall: String = stringUri
-
-        when {
-            addressToCall.startsWith("tel:") -> {
-                Log.i("[Main Activity] Removing tel: prefix")
-                addressToCall = addressToCall.substring("tel:".length)
-            }
-            addressToCall.startsWith("linphone:") -> {
-                Log.i("[Main Activity] Removing linphone: prefix")
-                addressToCall = addressToCall.substring("linphone:".length)
-            }
-            addressToCall.startsWith("sip-linphone:") -> {
-                Log.i("[Main Activity] Removing linphone: sip-linphone")
-                addressToCall = addressToCall.substring("sip-linphone:".length)
-            }
-        }
-
-        addressToCall = addressToCall.replace("%40", "@")
-
-        val address = coreContext.core.interpretUrl(
-            addressToCall,
-            LinphoneUtils.applyInternationalPrefix()
-        )
-        if (address != null) {
-            addressToCall = address.asStringUriOnly()
-        }
-
-        Log.i("[Main Activity] Starting dialer with pre-filled URI $addressToCall")
-        val args = Bundle()
-        args.putString("URI", addressToCall)
-        navigateToDialer(args)
-    }
-
-    private fun handleSendText(intent: Intent) {
-        if (corePreferences.disableChat) return
-
-        intent.getStringExtra(Intent.EXTRA_TEXT)?.let {
-            sharedViewModel.textToShare.value = it
-        }
-
-        handleSendChatRoom(intent)
-    }
-
-    private suspend fun handleSendFile(intent: Intent) {
-        if (corePreferences.disableChat) return
-
-        Log.i("[Main Activity] Found single file to share with type ${intent.type}")
-
-        (intent.getParcelableExtra<Parcelable>(Intent.EXTRA_STREAM) as? Uri)?.let {
-            val list = arrayListOf<String>()
-            coroutineScope {
-                val deferred = async {
-                    FileUtils.getFilePath(this@MainActivity, it)
-                }
-                val path = deferred.await()
-                if (path != null) {
-                    list.add(path)
-                    Log.i("[Main Activity] Found single file to share: $path")
-                }
-            }
-            sharedViewModel.filesToShare.value = list
-        }
-
-        // Check that the current fragment hasn't already handled the event on filesToShare
-        // If it has, don't go further.
-        // For example this may happen when picking a GIF from the keyboard while inside a chat room
-        if (!sharedViewModel.filesToShare.value.isNullOrEmpty()) {
-            handleSendChatRoom(intent)
-        }
-    }
-
-    private suspend fun handleSendMultipleFiles(intent: Intent) {
-        if (corePreferences.disableChat) return
-
-        intent.getParcelableArrayListExtra<Parcelable>(Intent.EXTRA_STREAM)?.let {
-            val list = arrayListOf<String>()
-            coroutineScope {
-                val deferred = arrayListOf<Deferred<String?>>()
-                for (parcelable in it) {
-                    val uri = parcelable as Uri
-                    deferred.add(async { FileUtils.getFilePath(this@MainActivity, uri) })
-                }
-                val paths = deferred.awaitAll()
-                for (path in paths) {
-                    Log.i("[Main Activity] Found file to share: $path")
-                    if (path != null) list.add(path)
-                }
-            }
-            sharedViewModel.filesToShare.value = list
-        }
-
-        handleSendChatRoom(intent)
-    }
-
-    private fun handleSendChatRoom(intent: Intent) {
-        if (corePreferences.disableChat) return
-
-        val uri = intent.data
-        if (uri != null) {
-            Log.i("[Main Activity] Found uri: $uri to send a message to")
-            val stringUri = uri.toString()
-            var addressToIM: String = stringUri
-            try {
-                addressToIM = URLDecoder.decode(stringUri, "UTF-8")
-            } catch (e: UnsupportedEncodingException) {
-                Log.e("[Main Activity] UnsupportedEncodingException: $e")
-            }
-
-            when {
-                addressToIM.startsWith("sms:") ->
-                    addressToIM = addressToIM.substring("sms:".length)
-                addressToIM.startsWith("smsto:") ->
-                    addressToIM = addressToIM.substring("smsto:".length)
-                addressToIM.startsWith("mms:") ->
-                    addressToIM = addressToIM.substring("mms:".length)
-                addressToIM.startsWith("mmsto:") ->
-                    addressToIM = addressToIM.substring("mmsto:".length)
-            }
-
-            val localAddress =
-                coreContext.core.defaultAccount?.params?.identityAddress?.asStringUriOnly()
-            val peerAddress = coreContext.core.interpretUrl(
-                addressToIM,
-                LinphoneUtils.applyInternationalPrefix()
-            )?.asStringUriOnly()
-            Log.i(
-                "[Main Activity] Navigating to chat room with local [$localAddress] and peer [$peerAddress] addresses"
-            )
-            navigateToChatRoom(localAddress, peerAddress)
-        } else {
-            val shortcutId = intent.getStringExtra("android.intent.extra.shortcut.ID") // Intent.EXTRA_SHORTCUT_ID
-            if (shortcutId != null) {
-                Log.i("[Main Activity] Found shortcut ID: $shortcutId")
-                handleLocusOrShortcut(shortcutId)
-            } else {
-                Log.i("[Main Activity] Going into chat rooms list")
-                navigateToChatRooms()
-            }
-        }
-    }
-
-    private fun handleLocusOrShortcut(id: String) {
-        val split = id.split("~")
-        if (split.size == 2) {
-            val localAddress = split[0]
-            val peerAddress = split[1]
-            Log.i(
-                "[Main Activity] Navigating to chat room with local [$localAddress] and peer [$peerAddress] addresses, computed from shortcut/locus id"
-            )
-            navigateToChatRoom(localAddress, peerAddress)
-        } else {
-            Log.e(
-                "[Main Activity] Failed to parse shortcut/locus id: $id, going to chat rooms list"
-            )
-            navigateToChatRooms()
-        }
-    }
-
-    private fun initOverlay() {
-        overlay = binding.root.findViewById(R.id.call_overlay)
-        val callOverlay = overlay
-        callOverlay ?: return
-
-        callOverlay.setOnTouchListener { view, event ->
-            when (event.action) {
-                MotionEvent.ACTION_DOWN -> {
-                    overlayX = view.x - event.rawX
-                    overlayY = view.y - event.rawY
-                    initPosX = view.x
-                    initPosY = view.y
-                }
-                MotionEvent.ACTION_MOVE -> {
-                    view.animate()
-                        .x(event.rawX + overlayX)
-                        .y(event.rawY + overlayY)
-                        .setDuration(0)
-                        .start()
-                }
-                MotionEvent.ACTION_UP -> {
-                    if (abs(initPosX - view.x) < CorePreferences.OVERLAY_CLICK_SENSITIVITY &&
-                        abs(initPosY - view.y) < CorePreferences.OVERLAY_CLICK_SENSITIVITY
-                    ) {
-                        view.performClick()
-                    }
-                }
-                else -> return@setOnTouchListener false
-            }
-            true
-        }
-
-        callOverlay.setOnClickListener {
-            coreContext.onCallOverlayClick()
-        }
-    }
-
-    private fun applyRemoteProvisioning(remoteConfigUri: String) {
-        coreContext.core.provisioningUri = remoteConfigUri
-        coreContext.core.stop()
-        coreContext.core.start()
-    }
-
-    private fun showAcceptRemoteConfigurationDialog(remoteConfigUri: String) {
-        val dialogViewModel = DialogViewModel(
-            remoteConfigUri,
-            getString(R.string.dialog_apply_remote_provisioning_title)
-        )
-        val dialog = DialogUtils.getDialog(this, dialogViewModel)
-
-        dialogViewModel.showCancelButton {
-            Log.i("[Main Activity] User cancelled remote provisioning config")
-            dialog.dismiss()
-        }
-
-        val okLabel = getString(
-            R.string.dialog_apply_remote_provisioning_button
-        )
-        dialogViewModel.showOkButton(
-            {
-                Log.w(
-                    "[Main Activity] Remote provisioning URL set to [$remoteConfigUri], restarting Core now"
-                )
-                applyRemoteProvisioning(remoteConfigUri)
-                dialog.dismiss()
-            },
-            okLabel
-        )
-
-        dialog.show()
-    }
-
-    private fun showAuthenticationRequestedDialog(
-        authInfo: AuthInfo
-    ) {
-        authenticationRequiredDialog?.dismiss()
-
-        val accountFound = coreContext.core.accountList.find {
-            it.params.identityAddress?.username == authInfo.username && it.params.identityAddress?.domain == authInfo.domain
-        }
-        if (accountFound == null) {
-            Log.w("[Main Activity] Failed to find account matching auth info, aborting auth dialog")
-            return
-        }
-
-        val identity = "${authInfo.username}@${authInfo.domain}"
-        Log.i("[Main Activity] Showing authentication required dialog for account [$identity]")
-
-        val dialogViewModel = DialogViewModel(
-            getString(R.string.dialog_authentication_required_message, identity),
-            getString(R.string.dialog_authentication_required_title)
-        )
-        dialogViewModel.showPassword = true
-        dialogViewModel.passwordTitle = getString(
-            R.string.settings_password_protection_dialog_input_hint
-        )
-        val dialog = DialogUtils.getDialog(this, dialogViewModel)
-
-        dialogViewModel.showCancelButton {
-            dialog.dismiss()
-            authenticationRequiredDialog = null
-        }
-
-        dialogViewModel.showOkButton(
-            {
-                Log.i(
-                    "[Main Activity] Updating password for account [$identity] using auth info [$authInfo]"
-                )
-                val newPassword = dialogViewModel.password
-                authInfo.password = newPassword
-                coreContext.core.addAuthInfo(authInfo)
-
-                coreContext.core.refreshRegisters()
-
-                dialog.dismiss()
-                authenticationRequiredDialog = null
-            },
-            getString(R.string.dialog_authentication_required_change_password_label)
-        )
-
-        dialog.show()
-        authenticationRequiredDialog = dialog
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/main/about/AboutFragment.kt b/app/src/main/java/org/linphone/activities/main/about/AboutFragment.kt
deleted file mode 100644
index e81703192..000000000
--- a/app/src/main/java/org/linphone/activities/main/about/AboutFragment.kt
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.main.about
-
-import android.content.*
-import android.net.Uri
-import android.os.Bundle
-import android.view.View
-import androidx.lifecycle.ViewModelProvider
-import org.linphone.R
-import org.linphone.activities.main.fragments.SecureFragment
-import org.linphone.core.tools.Log
-import org.linphone.databinding.AboutFragmentBinding
-
-class AboutFragment : SecureFragment<AboutFragmentBinding>() {
-    private lateinit var viewModel: AboutViewModel
-
-    override fun getLayoutId(): Int = R.layout.about_fragment
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        binding.lifecycleOwner = viewLifecycleOwner
-
-        viewModel = ViewModelProvider(this)[AboutViewModel::class.java]
-        binding.viewModel = viewModel
-
-        binding.setPrivacyPolicyClickListener {
-            val browserIntent = Intent(
-                Intent.ACTION_VIEW,
-                Uri.parse(getString(R.string.about_privacy_policy_link))
-            )
-            try {
-                startActivity(browserIntent)
-            } catch (se: SecurityException) {
-                Log.e("[About] Failed to start browser intent, $se")
-            }
-        }
-
-        binding.setLicenseClickListener {
-            val browserIntent = Intent(
-                Intent.ACTION_VIEW,
-                Uri.parse(getString(R.string.about_license_link))
-            )
-            try {
-                startActivity(browserIntent)
-            } catch (se: SecurityException) {
-                Log.e("[About] Failed to start browser intent, $se")
-            }
-        }
-
-        binding.setWeblateClickListener {
-            val browserIntent = Intent(
-                Intent.ACTION_VIEW,
-                Uri.parse(getString(R.string.about_weblate_link))
-            )
-            try {
-                startActivity(browserIntent)
-            } catch (se: SecurityException) {
-                Log.e("[About] Failed to start browser intent, $se")
-            }
-        }
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/main/about/AboutViewModel.kt b/app/src/main/java/org/linphone/activities/main/about/AboutViewModel.kt
deleted file mode 100644
index 2961af522..000000000
--- a/app/src/main/java/org/linphone/activities/main/about/AboutViewModel.kt
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.main.about
-
-import androidx.lifecycle.ViewModel
-import org.linphone.LinphoneApplication.Companion.coreContext
-
-class AboutViewModel : ViewModel() {
-    val appVersion: String = coreContext.appVersion
-
-    val sdkVersion: String = coreContext.sdkVersion
-}
diff --git a/app/src/main/java/org/linphone/activities/main/adapters/SelectionListAdapter.kt b/app/src/main/java/org/linphone/activities/main/adapters/SelectionListAdapter.kt
deleted file mode 100644
index e02070b29..000000000
--- a/app/src/main/java/org/linphone/activities/main/adapters/SelectionListAdapter.kt
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.main.adapters
-
-import androidx.recyclerview.widget.DiffUtil
-import androidx.recyclerview.widget.ListAdapter
-import androidx.recyclerview.widget.RecyclerView
-import org.linphone.activities.main.viewmodels.ListTopBarViewModel
-
-abstract class SelectionListAdapter<T, VH : RecyclerView.ViewHolder>(
-    selectionVM: ListTopBarViewModel,
-    diff: DiffUtil.ItemCallback<T>
-) :
-    ListAdapter<T, VH>(diff) {
-
-    private var _selectionViewModel: ListTopBarViewModel? = selectionVM
-    protected val selectionViewModel get() = _selectionViewModel!!
-
-    override fun onDetachedFromRecyclerView(recyclerView: RecyclerView) {
-        super.onDetachedFromRecyclerView(recyclerView)
-        _selectionViewModel = null
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/main/chat/ChatScrollListener.kt b/app/src/main/java/org/linphone/activities/main/chat/ChatScrollListener.kt
deleted file mode 100644
index 795be99ed..000000000
--- a/app/src/main/java/org/linphone/activities/main/chat/ChatScrollListener.kt
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.main.chat
-
-import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.RecyclerView
-
-internal abstract class ChatScrollListener(private val mLayoutManager: LinearLayoutManager) :
-    RecyclerView.OnScrollListener() {
-    // The total number of items in the data set after the last load
-    private var previousTotalItemCount = 0
-
-    // True if we are still waiting for the last set of data to load.
-    private var loading = true
-
-    private var userHasScrolledUp: Boolean = false
-
-    // This happens many times a second during a scroll, so be wary of the code you place here.
-    // We are given a few useful parameters to help us work out if we need to load some more data,
-    // but first we check if we are waiting for the previous load to finish.
-    override fun onScrolled(view: RecyclerView, dx: Int, dy: Int) {
-        val totalItemCount = mLayoutManager.itemCount
-        val firstVisibleItemPosition: Int = mLayoutManager.findFirstVisibleItemPosition()
-        val lastVisibleItemPosition: Int = mLayoutManager.findLastVisibleItemPosition()
-
-        // If the total item count is zero and the previous isn't, assume the
-        // list is invalidated and should be reset back to initial state
-        if (totalItemCount < previousTotalItemCount) {
-            previousTotalItemCount = totalItemCount
-            if (totalItemCount == 0) {
-                loading = true
-            }
-        }
-
-        // If it’s still loading, we check to see if the data set count has
-        // changed, if so we conclude it has finished loading and update the current page
-        // number and total item count.
-        if (loading && totalItemCount > previousTotalItemCount) {
-            loading = false
-            previousTotalItemCount = totalItemCount
-        }
-
-        userHasScrolledUp = lastVisibleItemPosition != totalItemCount - 1
-        if (userHasScrolledUp) {
-            onScrolledUp()
-        } else {
-            onScrolledToEnd()
-        }
-
-        // If it isn’t currently loading, we check to see if we have breached
-        // the mVisibleThreshold and need to reload more data.
-        // If we do need to reload some more data, we execute onLoadMore to fetch the data.
-        // threshold should reflect how many total columns there are too
-        if (!loading &&
-            firstVisibleItemPosition < mVisibleThreshold &&
-            firstVisibleItemPosition >= 0 &&
-            lastVisibleItemPosition < totalItemCount - mVisibleThreshold
-        ) {
-            onLoadMore(totalItemCount)
-            loading = true
-        }
-    }
-
-    // Defines the process for actually loading more data based on page
-    protected abstract fun onLoadMore(totalItemsCount: Int)
-
-    // Called when user has started to scroll up, opposed to onScrolledToEnd()
-    protected abstract fun onScrolledUp()
-
-    // Called when user has scrolled and reached the end of the items
-    protected abstract fun onScrolledToEnd()
-
-    companion object {
-        // The minimum amount of items to have below your current scroll position
-        // before loading more.
-        private const val mVisibleThreshold = 5
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/main/chat/GroupChatRoomMember.kt b/app/src/main/java/org/linphone/activities/main/chat/GroupChatRoomMember.kt
deleted file mode 100644
index 537b8017c..000000000
--- a/app/src/main/java/org/linphone/activities/main/chat/GroupChatRoomMember.kt
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.main.chat
-
-import org.linphone.core.Address
-import org.linphone.core.ChatRoom
-
-data class GroupChatRoomMember(
-    val address: Address,
-    var isAdmin: Boolean = false,
-    val securityLevel: ChatRoom.SecurityLevel = ChatRoom.SecurityLevel.ClearText,
-    val hasLimeX3DHCapability: Boolean = false,
-    // A participant not yet added to a group can't be set admin at the same time it's added
-    val canBeSetAdmin: Boolean = false
-)
diff --git a/app/src/main/java/org/linphone/activities/main/chat/adapters/ChatMessagesListAdapter.kt b/app/src/main/java/org/linphone/activities/main/chat/adapters/ChatMessagesListAdapter.kt
deleted file mode 100644
index d922ccd93..000000000
--- a/app/src/main/java/org/linphone/activities/main/chat/adapters/ChatMessagesListAdapter.kt
+++ /dev/null
@@ -1,656 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.main.chat.adapters
-
-import android.content.ClipData
-import android.content.ClipboardManager
-import android.content.Context
-import android.view.Gravity
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.PopupWindow
-import android.widget.TextView
-import androidx.databinding.DataBindingUtil
-import androidx.lifecycle.LifecycleOwner
-import androidx.lifecycle.MutableLiveData
-import androidx.recyclerview.widget.DiffUtil
-import androidx.recyclerview.widget.RecyclerView
-import kotlin.math.abs
-import org.linphone.LinphoneApplication.Companion.coreContext
-import org.linphone.LinphoneApplication.Companion.corePreferences
-import org.linphone.R
-import org.linphone.activities.main.adapters.SelectionListAdapter
-import org.linphone.activities.main.chat.data.ChatMessageData
-import org.linphone.activities.main.chat.data.EventData
-import org.linphone.activities.main.chat.data.EventLogData
-import org.linphone.activities.main.chat.data.OnContentClickedListener
-import org.linphone.activities.main.viewmodels.ListTopBarViewModel
-import org.linphone.core.*
-import org.linphone.core.tools.Log
-import org.linphone.databinding.ChatEventListCellBinding
-import org.linphone.databinding.ChatMessageListCellBinding
-import org.linphone.databinding.ChatMessageLongPressMenuBindingImpl
-import org.linphone.databinding.ChatUnreadMessagesListHeaderBinding
-import org.linphone.utils.AppUtils
-import org.linphone.utils.Event
-import org.linphone.utils.HeaderAdapter
-
-class ChatMessagesListAdapter(
-    selectionVM: ListTopBarViewModel,
-    private val viewLifecycleOwner: LifecycleOwner
-) : SelectionListAdapter<EventLogData, RecyclerView.ViewHolder>(
-    selectionVM,
-    ChatMessageDiffCallback()
-),
-    HeaderAdapter {
-    companion object {
-        const val MAX_TIME_TO_GROUP_MESSAGES = 60 // 1 minute
-    }
-
-    val resendMessageEvent: MutableLiveData<Event<ChatMessage>> by lazy {
-        MutableLiveData<Event<ChatMessage>>()
-    }
-
-    val deleteMessageEvent: MutableLiveData<Event<ChatMessage>> by lazy {
-        MutableLiveData<Event<ChatMessage>>()
-    }
-
-    val forwardMessageEvent: MutableLiveData<Event<ChatMessage>> by lazy {
-        MutableLiveData<Event<ChatMessage>>()
-    }
-
-    val replyMessageEvent: MutableLiveData<Event<ChatMessage>> by lazy {
-        MutableLiveData<Event<ChatMessage>>()
-    }
-
-    val showImdnForMessageEvent: MutableLiveData<Event<ChatMessage>> by lazy {
-        MutableLiveData<Event<ChatMessage>>()
-    }
-
-    val addSipUriToContactEvent: MutableLiveData<Event<String>> by lazy {
-        MutableLiveData<Event<String>>()
-    }
-
-    val openContentEvent: MutableLiveData<Event<Content>> by lazy {
-        MutableLiveData<Event<Content>>()
-    }
-
-    val urlClickEvent: MutableLiveData<Event<String>> by lazy {
-        MutableLiveData<Event<String>>()
-    }
-
-    val sipUriClickedEvent: MutableLiveData<Event<String>> by lazy {
-        MutableLiveData<Event<String>>()
-    }
-
-    val callConferenceEvent: MutableLiveData<Event<Pair<String, String?>>> by lazy {
-        MutableLiveData<Event<Pair<String, String?>>>()
-    }
-
-    val scrollToChatMessageEvent: MutableLiveData<Event<ChatMessage>> by lazy {
-        MutableLiveData<Event<ChatMessage>>()
-    }
-
-    val showReactionsListEvent: MutableLiveData<Event<ChatMessage>> by lazy {
-        MutableLiveData<Event<ChatMessage>>()
-    }
-
-    val errorEvent: MutableLiveData<Event<Int>> by lazy {
-        MutableLiveData<Event<Int>>()
-    }
-
-    private val contentClickedListener = object : OnContentClickedListener {
-        override fun onContentClicked(content: Content) {
-            openContentEvent.value = Event(content)
-        }
-
-        override fun onWebUrlClicked(url: String) {
-            if (popup?.isShowing == true) {
-                Log.w(
-                    "[Chat Message Data] Long press that displayed context menu detected, aborting click on URL [$url]"
-                )
-                return
-            }
-            val urlWithScheme = if (!url.startsWith("http")) "http://$url" else url
-            urlClickEvent.value = Event(urlWithScheme)
-        }
-
-        override fun onSipAddressClicked(sipUri: String) {
-            if (popup?.isShowing == true) {
-                Log.w(
-                    "[Chat Message Data] Long press that displayed context menu detected, aborting click on SIP URI [$sipUri]"
-                )
-                return
-            }
-            sipUriClickedEvent.value = Event(sipUri)
-        }
-
-        override fun onEmailAddressClicked(email: String) {
-            if (popup?.isShowing == true) {
-                Log.w(
-                    "[Chat Message Data] Long press that displayed context menu detected, aborting click on email address [$email]"
-                )
-                return
-            }
-            val urlWithScheme = if (!email.startsWith("mailto:")) "mailto:$email" else email
-            urlClickEvent.value = Event(urlWithScheme)
-        }
-
-        override fun onCallConference(address: String, subject: String?) {
-            callConferenceEvent.value = Event(Pair(address, subject))
-        }
-
-        override fun onShowReactionsList(chatMessage: ChatMessage) {
-            showReactionsListEvent.value = Event(chatMessage)
-        }
-
-        override fun onError(messageId: Int) {
-            errorEvent.value = Event(messageId)
-        }
-    }
-
-    private var advancedContextMenuOptionsDisabled: Boolean = false
-    private var popup: PopupWindow? = null
-
-    private var unreadMessagesCount: Int = 0
-    private var firstUnreadMessagePosition: Int = -1
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
-        return when (viewType) {
-            EventLog.Type.ConferenceChatMessage.toInt() -> createChatMessageViewHolder(parent)
-            else -> createEventViewHolder(parent)
-        }
-    }
-
-    private fun createChatMessageViewHolder(parent: ViewGroup): ChatMessageViewHolder {
-        val binding: ChatMessageListCellBinding = DataBindingUtil.inflate(
-            LayoutInflater.from(parent.context),
-            R.layout.chat_message_list_cell,
-            parent,
-            false
-        )
-        return ChatMessageViewHolder(binding)
-    }
-
-    private fun createEventViewHolder(parent: ViewGroup): EventViewHolder {
-        val binding: ChatEventListCellBinding = DataBindingUtil.inflate(
-            LayoutInflater.from(parent.context),
-            R.layout.chat_event_list_cell,
-            parent,
-            false
-        )
-        return EventViewHolder(binding)
-    }
-
-    override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
-        val eventLog = getItem(position)
-        when (holder) {
-            is ChatMessageViewHolder -> holder.bind(eventLog)
-            is EventViewHolder -> holder.bind(eventLog)
-        }
-    }
-
-    override fun getItemViewType(position: Int): Int {
-        val eventLog = getItem(position)
-        return eventLog.eventLog.type.toInt()
-    }
-
-    override fun onCurrentListChanged(
-        previousList: MutableList<EventLogData>,
-        currentList: MutableList<EventLogData>
-    ) {
-        Log.i(
-            "[Chat Messages Adapter] List has changed, clearing previous first unread message position"
-        )
-        // Need to wait for messages to be added before computing new first unread message position
-        firstUnreadMessagePosition = -1
-    }
-
-    override fun displayHeaderForPosition(position: Int): Boolean {
-        Log.i(
-            "[Chat Messages Adapter] Unread message count is [$unreadMessagesCount], first unread message position is [$firstUnreadMessagePosition]"
-        )
-        if (unreadMessagesCount > 0 && firstUnreadMessagePosition == -1) {
-            computeFirstUnreadMessagePosition()
-        }
-        return position == firstUnreadMessagePosition
-    }
-
-    override fun getHeaderViewForPosition(context: Context, position: Int): View {
-        val binding: ChatUnreadMessagesListHeaderBinding = DataBindingUtil.inflate(
-            LayoutInflater.from(context),
-            R.layout.chat_unread_messages_list_header,
-            null,
-            false
-        )
-        binding.title = AppUtils.getStringWithPlural(
-            R.plurals.chat_room_unread_messages_event,
-            unreadMessagesCount
-        )
-        binding.executePendingBindings()
-        return binding.root
-    }
-
-    fun disableAdvancedContextMenuOptions() {
-        advancedContextMenuOptionsDisabled = true
-    }
-
-    fun setUnreadMessageCount(count: Int, forceUpdate: Boolean) {
-        Log.i("[Chat Messages Adapter] [$count] unread message in chat room")
-        // Once list has been filled once, don't show the unread message header
-        // when new messages are added to the history whilst it is visible
-        unreadMessagesCount = if (itemCount == 0 || forceUpdate) count else 0
-        firstUnreadMessagePosition = -1
-        Log.i(
-            "[Chat Messages Adapter] Set [$unreadMessagesCount] unread message(s) for current chat room"
-        )
-    }
-
-    fun getFirstUnreadMessagePosition(): Int {
-        Log.i(
-            "[Chat Messages Adapter] First unread message position is [$firstUnreadMessagePosition]"
-        )
-        return firstUnreadMessagePosition
-    }
-
-    private fun computeFirstUnreadMessagePosition() {
-        Log.i(
-            "[Chat Messages Adapter] [$unreadMessagesCount] unread message(s) for current chat room"
-        )
-        if (unreadMessagesCount > 0) {
-            Log.i("[Chat Messages Adapter] Computing first unread message position")
-            var messageCount = 0
-            for (position in itemCount - 1 downTo 0) {
-                val eventLog = getItem(position)
-                val data = eventLog.data
-                if (data is ChatMessageData) {
-                    messageCount += 1
-                    if (messageCount == unreadMessagesCount) {
-                        firstUnreadMessagePosition = position
-                        Log.i(
-                            "[Chat Messages Adapter] First unread message position found [$firstUnreadMessagePosition]"
-                        )
-                        break
-                    }
-                }
-            }
-        }
-    }
-
-    inner class ChatMessageViewHolder(
-        val binding: ChatMessageListCellBinding
-    ) : RecyclerView.ViewHolder(binding.root) {
-        fun bind(eventLog: EventLogData) {
-            with(binding) {
-                if (eventLog.eventLog.type == EventLog.Type.ConferenceChatMessage) {
-                    val chatMessageData = eventLog.data as ChatMessageData
-                    chatMessageData.setContentClickListener(contentClickedListener)
-
-                    val chatMessage = chatMessageData.chatMessage
-                    data = chatMessageData
-
-                    chatMessageData.contactNewlyFoundEvent.observe(viewLifecycleOwner) {
-                        it.consume {
-                            // Post to prevent IllegalStateException: Cannot call this method while RecyclerView is computing a layout or scrolling
-                            binding.root.post {
-                                try {
-                                    notifyItemChanged(bindingAdapterPosition)
-                                } catch (e: Exception) {
-                                    Log.e(
-                                        "[Chat Messages Adapter] Can't notify item [$bindingAdapterPosition] has changed: $e"
-                                    )
-                                }
-                            }
-                        }
-                    }
-
-                    lifecycleOwner = viewLifecycleOwner
-
-                    // This is for item selection through ListTopBarFragment
-                    selectionListViewModel = selectionViewModel
-                    selectionViewModel.isEditionEnabled.observe(
-                        viewLifecycleOwner
-                    ) {
-                        position = bindingAdapterPosition
-                    }
-
-                    setClickListener {
-                        if (selectionViewModel.isEditionEnabled.value == true) {
-                            selectionViewModel.onToggleSelect(bindingAdapterPosition)
-                        }
-                    }
-
-                    setReplyClickListener {
-                        val reply = chatMessageData.replyData.value?.chatMessage
-                        if (reply != null) {
-                            scrollToChatMessageEvent.value = Event(reply)
-                        }
-                    }
-
-                    // Grouping
-                    var hasPrevious = false
-                    var hasNext = false
-
-                    if (bindingAdapterPosition > 0) {
-                        val previousItem = getItem(bindingAdapterPosition - 1)
-                        if (previousItem.eventLog.type == EventLog.Type.ConferenceChatMessage) {
-                            val previousMessage = previousItem.eventLog.chatMessage
-                            if (previousMessage != null && previousMessage.fromAddress.weakEqual(
-                                    chatMessage.fromAddress
-                                )
-                            ) {
-                                if (abs(chatMessage.time - previousMessage.time) < MAX_TIME_TO_GROUP_MESSAGES) {
-                                    hasPrevious = true
-                                }
-                            }
-                        }
-                    }
-
-                    if (bindingAdapterPosition >= 0 && bindingAdapterPosition < itemCount - 1) {
-                        val nextItem = getItem(bindingAdapterPosition + 1)
-                        if (nextItem.eventLog.type == EventLog.Type.ConferenceChatMessage) {
-                            val nextMessage = nextItem.eventLog.chatMessage
-                            if (nextMessage != null && nextMessage.fromAddress.weakEqual(
-                                    chatMessage.fromAddress
-                                )
-                            ) {
-                                if (abs(nextMessage.time - chatMessage.time) < MAX_TIME_TO_GROUP_MESSAGES) {
-                                    hasNext = true
-                                }
-                            }
-                        }
-                    }
-
-                    chatMessageData.updateBubbleBackground(hasPrevious, hasNext)
-
-                    executePendingBindings()
-
-                    setContextMenuClickListener {
-                        val popupView: ChatMessageLongPressMenuBindingImpl = DataBindingUtil.inflate(
-                            LayoutInflater.from(root.context),
-                            R.layout.chat_message_long_press_menu,
-                            null,
-                            false
-                        )
-
-                        val itemSize = AppUtils.getDimension(R.dimen.chat_message_popup_item_height).toInt()
-                        var totalSize = itemSize * 8
-                        if (chatMessage.chatRoom.hasCapability(
-                                ChatRoom.Capabilities.OneToOne.toInt()
-                            )
-                        ) {
-                            // No message id
-                            popupView.imdnHidden = true
-                            totalSize -= itemSize
-                        }
-                        if (chatMessage.state != ChatMessage.State.NotDelivered) {
-                            popupView.resendHidden = true
-                            totalSize -= itemSize
-                        }
-                        if (chatMessage.contents.find { content -> content.isText } == null) {
-                            popupView.copyTextHidden = true
-                            totalSize -= itemSize
-                        }
-                        if (chatMessage.isOutgoing ||
-                            chatMessageData.contact.value != null ||
-                            advancedContextMenuOptionsDisabled ||
-                            corePreferences.readOnlyNativeContacts
-                        ) {
-                            popupView.addToContactsHidden = true
-                            totalSize -= itemSize
-                        }
-                        if (chatMessage.chatRoom.isReadOnly) {
-                            popupView.replyHidden = true
-                            totalSize -= itemSize
-                        }
-                        if (advancedContextMenuOptionsDisabled) {
-                            popupView.forwardHidden = true
-                            totalSize -= itemSize
-                        }
-
-                        val reaction = chatMessage.ownReaction
-                        if (reaction != null) {
-                            when (reaction.body) {
-                                AppUtils.getString(R.string.emoji_love) -> {
-                                    popupView.heartSelected = true
-                                }
-                                AppUtils.getString(R.string.emoji_laughing) -> {
-                                    popupView.laughingSelected = true
-                                }
-                                AppUtils.getString(R.string.emoji_surprised) -> {
-                                    popupView.surprisedSelected = true
-                                }
-                                AppUtils.getString(R.string.emoji_thumbs_up) -> {
-                                    popupView.thumbsUpSelected = true
-                                }
-                                AppUtils.getString(R.string.emoji_tear) -> {
-                                    popupView.cryingSelected = true
-                                }
-                            }
-                        }
-
-                        // When using WRAP_CONTENT instead of real size, fails to place the
-                        // popup window above if not enough space is available below
-                        val popupWindow = PopupWindow(
-                            popupView.root,
-                            AppUtils.getDimension(R.dimen.chat_message_popup_width).toInt(),
-                            totalSize,
-                            true
-                        )
-                        popup = popupWindow
-
-                        // Elevation is for showing a shadow around the popup
-                        popupWindow.elevation = 20f
-
-                        popupView.setEmojiClickListener {
-                            val emoji = it as? TextView
-                            if (emoji != null) {
-                                reactToMessage(emoji.text.toString())
-                                popupWindow.dismiss()
-                            }
-                        }
-                        popupView.setResendClickListener {
-                            resendMessage()
-                            popupWindow.dismiss()
-                        }
-                        popupView.setCopyTextClickListener {
-                            copyTextToClipboard()
-                            popupWindow.dismiss()
-                        }
-                        popupView.setForwardClickListener {
-                            forwardMessage()
-                            popupWindow.dismiss()
-                        }
-                        popupView.setReplyClickListener {
-                            replyMessage()
-                            popupWindow.dismiss()
-                        }
-                        popupView.setImdnClickListener {
-                            showImdnDeliveryFragment()
-                            popupWindow.dismiss()
-                        }
-                        popupView.setAddToContactsClickListener {
-                            addSenderToContacts()
-                            popupWindow.dismiss()
-                        }
-                        popupView.setDeleteClickListener {
-                            deleteMessage()
-                            popupWindow.dismiss()
-                        }
-
-                        val gravity = if (chatMessage.isOutgoing) Gravity.END else Gravity.START
-                        popupWindow.showAsDropDown(background, 0, 0, gravity or Gravity.TOP)
-
-                        true
-                    }
-                }
-            }
-        }
-
-        private fun reactToMessage(reaction: String) {
-            val chatMessage = binding.data?.chatMessage
-            if (chatMessage != null) {
-                val ownReaction = chatMessage.ownReaction
-                if (ownReaction != null && ownReaction.body == reaction) {
-                    Log.i(
-                        "[Chat Message Data] Removing our reaction to message [$chatMessage] (previously [$reaction])"
-                    )
-                    // Empty string means remove existing reaction
-                    val reactionMessage = chatMessage.createReaction("")
-                    reactionMessage.send()
-                } else {
-                    Log.i(
-                        "[Chat Message Data] Reacting to message [$chatMessage] with [$reaction] emoji"
-                    )
-                    val reactionMessage = chatMessage.createReaction(reaction)
-                    reactionMessage.send()
-                }
-            }
-        }
-
-        private fun resendMessage() {
-            val chatMessage = binding.data?.chatMessage
-            if (chatMessage != null) {
-                chatMessage.userData = bindingAdapterPosition
-                resendMessageEvent.value = Event(chatMessage)
-            }
-        }
-
-        private fun copyTextToClipboard() {
-            val chatMessage = binding.data?.chatMessage
-            if (chatMessage != null) {
-                val content = chatMessage.contents.find { content -> content.isText }
-                if (content != null) {
-                    val clipboard: ClipboardManager =
-                        coreContext.context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
-                    val clip = ClipData.newPlainText("Message", content.utf8Text)
-                    clipboard.setPrimaryClip(clip)
-                }
-            }
-        }
-
-        private fun forwardMessage() {
-            val chatMessage = binding.data?.chatMessage
-            if (chatMessage != null) {
-                forwardMessageEvent.value = Event(chatMessage)
-            }
-        }
-
-        private fun replyMessage() {
-            val chatMessage = binding.data?.chatMessage
-            if (chatMessage != null) {
-                replyMessageEvent.value = Event(chatMessage)
-            }
-        }
-
-        private fun showImdnDeliveryFragment() {
-            val chatMessage = binding.data?.chatMessage
-            if (chatMessage != null) {
-                showImdnForMessageEvent.value = Event(chatMessage)
-            }
-        }
-
-        private fun deleteMessage() {
-            val chatMessage = binding.data?.chatMessage
-            if (chatMessage != null) {
-                chatMessage.userData = bindingAdapterPosition
-                deleteMessageEvent.value = Event(chatMessage)
-            }
-        }
-
-        private fun addSenderToContacts() {
-            val chatMessage = binding.data?.chatMessage
-            if (chatMessage != null) {
-                val copy = chatMessage.fromAddress.clone()
-                copy.clean() // To remove gruu if any
-                addSipUriToContactEvent.value = Event(copy.asStringUriOnly())
-            }
-        }
-    }
-
-    inner class EventViewHolder(
-        private val binding: ChatEventListCellBinding
-    ) : RecyclerView.ViewHolder(binding.root) {
-        fun bind(eventLog: EventLogData) {
-            with(binding) {
-                val eventViewModel = eventLog.data as EventData
-                data = eventViewModel
-
-                binding.lifecycleOwner = viewLifecycleOwner
-
-                // This is for item selection through ListTopBarFragment
-                selectionListViewModel = selectionViewModel
-                selectionViewModel.isEditionEnabled.observe(
-                    viewLifecycleOwner
-                ) {
-                    position = bindingAdapterPosition
-                }
-
-                binding.setClickListener {
-                    if (selectionViewModel.isEditionEnabled.value == true) {
-                        selectionViewModel.onToggleSelect(bindingAdapterPosition)
-                    }
-                }
-
-                executePendingBindings()
-            }
-        }
-    }
-}
-
-private class ChatMessageDiffCallback : DiffUtil.ItemCallback<EventLogData>() {
-    override fun areItemsTheSame(
-        oldItem: EventLogData,
-        newItem: EventLogData
-    ): Boolean {
-        return if (oldItem.type == EventLog.Type.ConferenceChatMessage &&
-            newItem.type == EventLog.Type.ConferenceChatMessage
-        ) {
-            val oldData = (oldItem.data as ChatMessageData)
-            val newData = (newItem.data as ChatMessageData)
-
-            oldData.time.value == newData.time.value &&
-                oldData.isOutgoing == newData.isOutgoing
-        } else {
-            oldItem.notifyId == newItem.notifyId
-        }
-    }
-
-    override fun areContentsTheSame(
-        oldItem: EventLogData,
-        newItem: EventLogData
-    ): Boolean {
-        return if (oldItem.type == EventLog.Type.ConferenceChatMessage &&
-            newItem.type == EventLog.Type.ConferenceChatMessage
-        ) {
-            val oldData = (oldItem.data as ChatMessageData)
-            val newData = (newItem.data as ChatMessageData)
-
-            val previous = oldData.hasPreviousMessage == newData.hasPreviousMessage
-            val next = oldData.hasNextMessage == newData.hasNextMessage
-            val isDisplayed = newData.isDisplayed.value == true
-            isDisplayed && previous && next
-        } else {
-            oldItem.type != EventLog.Type.ConferenceChatMessage &&
-                newItem.type != EventLog.Type.ConferenceChatMessage
-        }
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/main/chat/adapters/ChatRoomsListAdapter.kt b/app/src/main/java/org/linphone/activities/main/chat/adapters/ChatRoomsListAdapter.kt
deleted file mode 100644
index 12e6c7157..000000000
--- a/app/src/main/java/org/linphone/activities/main/chat/adapters/ChatRoomsListAdapter.kt
+++ /dev/null
@@ -1,139 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.main.chat.adapters
-
-import android.view.LayoutInflater
-import android.view.ViewGroup
-import androidx.databinding.DataBindingUtil
-import androidx.lifecycle.LifecycleOwner
-import androidx.lifecycle.MutableLiveData
-import androidx.recyclerview.widget.DiffUtil
-import androidx.recyclerview.widget.RecyclerView
-import org.linphone.R
-import org.linphone.activities.main.adapters.SelectionListAdapter
-import org.linphone.activities.main.chat.data.ChatRoomData
-import org.linphone.activities.main.viewmodels.ListTopBarViewModel
-import org.linphone.core.ChatRoom
-import org.linphone.core.tools.Log
-import org.linphone.databinding.ChatRoomListCellBinding
-import org.linphone.utils.Event
-
-class ChatRoomsListAdapter(
-    selectionVM: ListTopBarViewModel,
-    private val viewLifecycleOwner: LifecycleOwner
-) : SelectionListAdapter<ChatRoomData, RecyclerView.ViewHolder>(selectionVM, ChatRoomDiffCallback()) {
-    val selectedChatRoomEvent: MutableLiveData<Event<ChatRoom>> by lazy {
-        MutableLiveData<Event<ChatRoom>>()
-    }
-
-    private var isForwardPending = false
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
-        val binding: ChatRoomListCellBinding = DataBindingUtil.inflate(
-            LayoutInflater.from(parent.context),
-            R.layout.chat_room_list_cell,
-            parent,
-            false
-        )
-        return ViewHolder(binding)
-    }
-
-    override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
-        (holder as ViewHolder).bind(getItem(position))
-    }
-
-    fun forwardPending(pending: Boolean) {
-        isForwardPending = pending
-        notifyItemRangeChanged(0, itemCount)
-    }
-
-    inner class ViewHolder(
-        private val binding: ChatRoomListCellBinding
-    ) : RecyclerView.ViewHolder(binding.root) {
-        fun bind(chatRoomData: ChatRoomData) {
-            with(binding) {
-                chatRoomData.update()
-                data = chatRoomData
-
-                chatRoomData.contactNewlyFoundEvent.observe(viewLifecycleOwner) {
-                    it.consume {
-                        // Post to prevent IllegalStateException: Cannot call this method while RecyclerView is computing a layout or scrolling
-                        binding.root.post {
-                            try {
-                                notifyItemChanged(bindingAdapterPosition)
-                            } catch (e: Exception) {
-                                Log.e(
-                                    "[Chat Rooms Adapter] Can't notify item [$bindingAdapterPosition] has changed: $e"
-                                )
-                            }
-                        }
-                    }
-                }
-
-                lifecycleOwner = viewLifecycleOwner
-
-                // This is for item selection through ListTopBarFragment
-                selectionListViewModel = selectionViewModel
-                selectionViewModel.isEditionEnabled.observe(
-                    viewLifecycleOwner
-                ) {
-                    position = bindingAdapterPosition
-                }
-
-                forwardPending = isForwardPending
-
-                setClickListener {
-                    if (selectionViewModel.isEditionEnabled.value == true) {
-                        selectionViewModel.onToggleSelect(bindingAdapterPosition)
-                    } else {
-                        selectedChatRoomEvent.value = Event(chatRoomData.chatRoom)
-                    }
-                }
-
-                setLongClickListener {
-                    if (selectionViewModel.isEditionEnabled.value == false) {
-                        selectionViewModel.isEditionEnabled.value = true
-                        // Selection will be handled by click listener
-                        true
-                    }
-                    false
-                }
-
-                executePendingBindings()
-            }
-        }
-    }
-}
-
-private class ChatRoomDiffCallback : DiffUtil.ItemCallback<ChatRoomData>() {
-    override fun areItemsTheSame(
-        oldItem: ChatRoomData,
-        newItem: ChatRoomData
-    ): Boolean {
-        return oldItem.id == newItem.id
-    }
-
-    override fun areContentsTheSame(
-        oldItem: ChatRoomData,
-        newItem: ChatRoomData
-    ): Boolean {
-        return false // To force redraw
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/main/chat/adapters/GroupInfoParticipantsAdapter.kt b/app/src/main/java/org/linphone/activities/main/chat/adapters/GroupInfoParticipantsAdapter.kt
deleted file mode 100644
index b9d13bc60..000000000
--- a/app/src/main/java/org/linphone/activities/main/chat/adapters/GroupInfoParticipantsAdapter.kt
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.main.chat.adapters
-
-import android.view.LayoutInflater
-import android.view.ViewGroup
-import androidx.databinding.DataBindingUtil
-import androidx.lifecycle.LifecycleOwner
-import androidx.lifecycle.MutableLiveData
-import androidx.recyclerview.widget.DiffUtil
-import androidx.recyclerview.widget.ListAdapter
-import androidx.recyclerview.widget.RecyclerView
-import org.linphone.R
-import org.linphone.activities.main.chat.GroupChatRoomMember
-import org.linphone.activities.main.chat.data.GroupInfoParticipantData
-import org.linphone.databinding.ChatRoomGroupInfoParticipantCellBinding
-import org.linphone.utils.Event
-
-class GroupInfoParticipantsAdapter(
-    private val viewLifecycleOwner: LifecycleOwner,
-    private val isEncryptionEnabled: Boolean
-) : ListAdapter<GroupInfoParticipantData, RecyclerView.ViewHolder>(ParticipantDiffCallback()) {
-    private var showAdmin: Boolean = false
-
-    val participantRemovedEvent: MutableLiveData<Event<GroupChatRoomMember>> by lazy {
-        MutableLiveData<Event<GroupChatRoomMember>>()
-    }
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
-        val binding: ChatRoomGroupInfoParticipantCellBinding = DataBindingUtil.inflate(
-            LayoutInflater.from(parent.context),
-            R.layout.chat_room_group_info_participant_cell,
-            parent,
-            false
-        )
-        return ViewHolder(binding)
-    }
-
-    override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
-        (holder as ViewHolder).bind(getItem(position))
-    }
-
-    fun showAdminControls(show: Boolean) {
-        showAdmin = show
-        notifyItemRangeChanged(0, itemCount)
-    }
-
-    inner class ViewHolder(
-        val binding: ChatRoomGroupInfoParticipantCellBinding
-    ) : RecyclerView.ViewHolder(binding.root) {
-        fun bind(participantViewModel: GroupInfoParticipantData) {
-            with(binding) {
-                participantViewModel.showAdminControls.value = showAdmin
-                data = participantViewModel
-
-                lifecycleOwner = viewLifecycleOwner
-
-                setRemoveClickListener {
-                    participantRemovedEvent.value = Event(participantViewModel.participant)
-                }
-                isEncrypted = isEncryptionEnabled
-
-                executePendingBindings()
-            }
-        }
-    }
-}
-
-private class ParticipantDiffCallback : DiffUtil.ItemCallback<GroupInfoParticipantData>() {
-    override fun areItemsTheSame(
-        oldItem: GroupInfoParticipantData,
-        newItem: GroupInfoParticipantData
-    ): Boolean {
-        return oldItem.sipUri == newItem.sipUri
-    }
-
-    override fun areContentsTheSame(
-        oldItem: GroupInfoParticipantData,
-        newItem: GroupInfoParticipantData
-    ): Boolean {
-        return false
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/main/chat/adapters/ImdnAdapter.kt b/app/src/main/java/org/linphone/activities/main/chat/adapters/ImdnAdapter.kt
deleted file mode 100644
index 3226780ea..000000000
--- a/app/src/main/java/org/linphone/activities/main/chat/adapters/ImdnAdapter.kt
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.main.chat.adapters
-
-import android.content.Context
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.databinding.DataBindingUtil
-import androidx.lifecycle.LifecycleOwner
-import androidx.recyclerview.widget.DiffUtil
-import androidx.recyclerview.widget.ListAdapter
-import androidx.recyclerview.widget.RecyclerView
-import org.linphone.R
-import org.linphone.activities.main.chat.data.ImdnParticipantData
-import org.linphone.core.ChatMessage
-import org.linphone.databinding.ChatRoomImdnParticipantCellBinding
-import org.linphone.databinding.ImdnListHeaderBinding
-import org.linphone.utils.HeaderAdapter
-
-class ImdnAdapter(
-    private val viewLifecycleOwner: LifecycleOwner
-) : ListAdapter<ImdnParticipantData, RecyclerView.ViewHolder>(ParticipantImdnStateDiffCallback()), HeaderAdapter {
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
-        val binding: ChatRoomImdnParticipantCellBinding = DataBindingUtil.inflate(
-            LayoutInflater.from(parent.context),
-            R.layout.chat_room_imdn_participant_cell,
-            parent,
-            false
-        )
-        return ViewHolder(binding)
-    }
-
-    override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
-        (holder as ViewHolder).bind(getItem(position))
-    }
-
-    inner class ViewHolder(
-        val binding: ChatRoomImdnParticipantCellBinding
-    ) : RecyclerView.ViewHolder(binding.root) {
-        fun bind(participantImdnData: ImdnParticipantData) {
-            with(binding) {
-                data = participantImdnData
-
-                lifecycleOwner = viewLifecycleOwner
-
-                executePendingBindings()
-            }
-        }
-    }
-
-    override fun displayHeaderForPosition(position: Int): Boolean {
-        if (position >= itemCount) return false
-        val participantImdnState = getItem(position)
-        val previousPosition = position - 1
-        return if (previousPosition >= 0) {
-            getItem(previousPosition).imdnState.state != participantImdnState.imdnState.state
-        } else {
-            true
-        }
-    }
-
-    override fun getHeaderViewForPosition(context: Context, position: Int): View {
-        val participantImdnState = getItem(position).imdnState
-        val binding: ImdnListHeaderBinding = DataBindingUtil.inflate(
-            LayoutInflater.from(context),
-            R.layout.imdn_list_header,
-            null,
-            false
-        )
-        when (participantImdnState.state) {
-            ChatMessage.State.Displayed -> {
-                binding.title = R.string.chat_message_imdn_displayed
-                binding.textColor = R.color.imdn_read_color
-                binding.icon = R.drawable.chat_read
-            }
-            ChatMessage.State.DeliveredToUser -> {
-                binding.title = R.string.chat_message_imdn_delivered
-                binding.textColor = R.color.grey_color
-                binding.icon = R.drawable.chat_delivered
-            }
-            ChatMessage.State.Delivered -> {
-                binding.title = R.string.chat_message_imdn_sent
-                binding.textColor = R.color.grey_color
-                binding.icon = R.drawable.chat_delivered
-            }
-            ChatMessage.State.NotDelivered -> {
-                binding.title = R.string.chat_message_imdn_undelivered
-                binding.textColor = R.color.red_color
-                binding.icon = R.drawable.chat_error
-            }
-            else -> {}
-        }
-        binding.executePendingBindings()
-        return binding.root
-    }
-}
-
-private class ParticipantImdnStateDiffCallback : DiffUtil.ItemCallback<ImdnParticipantData>() {
-    override fun areItemsTheSame(
-        oldItem: ImdnParticipantData,
-        newItem: ImdnParticipantData
-    ): Boolean {
-        return oldItem.sipUri == newItem.sipUri
-    }
-
-    override fun areContentsTheSame(
-        oldItem: ImdnParticipantData,
-        newItem: ImdnParticipantData
-    ): Boolean {
-        return false
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/main/chat/data/ChatMessageAttachmentData.kt b/app/src/main/java/org/linphone/activities/main/chat/data/ChatMessageAttachmentData.kt
deleted file mode 100644
index fc66b68a5..000000000
--- a/app/src/main/java/org/linphone/activities/main/chat/data/ChatMessageAttachmentData.kt
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.main.chat.data
-
-import android.webkit.MimeTypeMap
-import org.linphone.utils.FileUtils
-
-class ChatMessageAttachmentData(
-    val path: String,
-    private val deleteCallback: (attachment: ChatMessageAttachmentData) -> Unit
-) {
-    val fileName: String = FileUtils.getNameFromFilePath(path)
-    val isImage: Boolean
-    val isVideo: Boolean
-    val isAudio: Boolean
-    val isPdf: Boolean
-
-    init {
-        val extension = FileUtils.getExtensionFromFileName(path)
-        val mime = MimeTypeMap.getSingleton().getMimeTypeFromExtension(extension)
-        val mimeType = FileUtils.getMimeType(mime)
-        isImage = mimeType == FileUtils.MimeType.Image
-        isVideo = mimeType == FileUtils.MimeType.Video
-        isAudio = mimeType == FileUtils.MimeType.Audio
-        isPdf = mimeType == FileUtils.MimeType.Pdf
-    }
-
-    fun delete() {
-        deleteCallback(this)
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/main/chat/data/ChatMessageContentData.kt b/app/src/main/java/org/linphone/activities/main/chat/data/ChatMessageContentData.kt
deleted file mode 100644
index 451a89eb7..000000000
--- a/app/src/main/java/org/linphone/activities/main/chat/data/ChatMessageContentData.kt
+++ /dev/null
@@ -1,560 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.main.chat.data
-
-import android.text.Spannable
-import android.text.SpannableString
-import android.text.Spanned
-import android.text.style.UnderlineSpan
-import android.webkit.MimeTypeMap
-import android.widget.Toast
-import androidx.lifecycle.MutableLiveData
-import androidx.media.AudioFocusRequestCompat
-import java.io.BufferedReader
-import java.io.FileReader
-import java.lang.StringBuilder
-import java.text.SimpleDateFormat
-import java.util.*
-import java.util.concurrent.TimeUnit
-import kotlinx.coroutines.*
-import kotlinx.coroutines.flow.flow
-import kotlinx.coroutines.flow.launchIn
-import kotlinx.coroutines.flow.onEach
-import org.linphone.LinphoneApplication.Companion.coreContext
-import org.linphone.R
-import org.linphone.core.*
-import org.linphone.core.tools.Log
-import org.linphone.utils.AppUtils
-import org.linphone.utils.AudioRouteUtils
-import org.linphone.utils.FileUtils
-import org.linphone.utils.TimestampUtils
-
-class ChatMessageContentData(
-    private val chatMessage: ChatMessage,
-    private val contentIndex: Int
-) {
-    var listener: OnContentClickedListener? = null
-
-    val isOutgoing = chatMessage.isOutgoing
-
-    val isImage = MutableLiveData<Boolean>()
-    val isVideo = MutableLiveData<Boolean>()
-    val isAudio = MutableLiveData<Boolean>()
-    val isPdf = MutableLiveData<Boolean>()
-    val isGenericFile = MutableLiveData<Boolean>()
-    val isVoiceRecording = MutableLiveData<Boolean>()
-    val isConferenceSchedule = MutableLiveData<Boolean>()
-    val isConferenceUpdated = MutableLiveData<Boolean>()
-    val isConferenceCancelled = MutableLiveData<Boolean>()
-    val isBroadcast = MutableLiveData<Boolean>()
-    val isSpeaker = MutableLiveData<Boolean>()
-
-    val fileName = MutableLiveData<String>()
-    val filePath = MutableLiveData<String>()
-
-    val downloadable = MutableLiveData<Boolean>()
-    val fileTransferProgress = MutableLiveData<Boolean>()
-    val fileTransferProgressInt = MutableLiveData<Int>()
-    val downloadLabel = MutableLiveData<Spannable>()
-
-    val voiceRecordDuration = MutableLiveData<Int>()
-    val formattedDuration = MutableLiveData<String>()
-    val voiceRecordPlayingPosition = MutableLiveData<Int>()
-    val isVoiceRecordPlaying = MutableLiveData<Boolean>()
-
-    val conferenceSubject = MutableLiveData<String>()
-    val conferenceDescription = MutableLiveData<String>()
-    val conferenceParticipantCount = MutableLiveData<String>()
-    val conferenceDate = MutableLiveData<String>()
-    val conferenceTime = MutableLiveData<String>()
-    val conferenceDuration = MutableLiveData<String>()
-    val showDuration = MutableLiveData<Boolean>()
-
-    val isAlone: Boolean
-        get() {
-            var count = 0
-            for (content in chatMessage.contents) {
-                if (content.isFileTransfer || content.isFile) {
-                    count += 1
-                }
-            }
-            return count == 1
-        }
-
-    private var isFileEncrypted: Boolean = false
-
-    private var voiceRecordAudioFocusRequest: AudioFocusRequestCompat? = null
-
-    private lateinit var voiceRecordingPlayer: Player
-    private val playerListener = PlayerListener {
-        Log.i("[Voice Recording] End of file reached")
-        stopVoiceRecording()
-    }
-
-    private var conferenceAddress: String? = null
-
-    private fun getContent(): Content {
-        return chatMessage.contents[contentIndex]
-    }
-
-    private val chatMessageListener: ChatMessageListenerStub = object : ChatMessageListenerStub() {
-        override fun onFileTransferProgressIndication(
-            message: ChatMessage,
-            c: Content,
-            offset: Int,
-            total: Int
-        ) {
-            if (c.filePath == getContent().filePath) {
-                if (fileTransferProgress.value == false) {
-                    fileTransferProgress.value = true
-                }
-                val percent = ((offset * 100.0) / total).toInt() // Conversion from int to double and back to int is required
-                Log.d("[Content] Transfer progress is: $offset / $total -> $percent%")
-                fileTransferProgressInt.value = percent
-            }
-        }
-
-        override fun onMsgStateChanged(message: ChatMessage, state: ChatMessage.State) {
-            if (state == ChatMessage.State.FileTransferDone || state == ChatMessage.State.FileTransferError) {
-                fileTransferProgress.value = false
-                updateContent()
-
-                if (state == ChatMessage.State.FileTransferDone) {
-                    Log.i("[Chat Message] File transfer done")
-                    if (!message.isOutgoing && !message.isEphemeral) {
-                        Log.i("[Chat Message] Adding content to media store")
-                        coreContext.addContentToMediaStore(getContent())
-                    }
-                }
-            }
-        }
-    }
-
-    private val scope = CoroutineScope(Dispatchers.IO + SupervisorJob())
-
-    init {
-        isVoiceRecordPlaying.value = false
-        voiceRecordDuration.value = 0
-        voiceRecordPlayingPosition.value = 0
-        fileTransferProgress.value = false
-        fileTransferProgressInt.value = 0
-
-        updateContent()
-        chatMessage.addListener(chatMessageListener)
-    }
-
-    fun destroy() {
-        scope.cancel()
-
-        deletePlainFilePath()
-        chatMessage.removeListener(chatMessageListener)
-
-        if (this::voiceRecordingPlayer.isInitialized) {
-            Log.i("[Voice Recording] Destroying voice record")
-            stopVoiceRecording()
-            voiceRecordingPlayer.removeListener(playerListener)
-        }
-    }
-
-    fun download() {
-        if (chatMessage.isFileTransferInProgress) {
-            Log.w(
-                "[Content] Another FileTransfer content for this message is currently being downloaded, can't start another one for now"
-            )
-            listener?.onError(R.string.chat_message_download_already_in_progress)
-            return
-        }
-
-        val content = getContent()
-        val filePath = content.filePath
-        if (content.isFileTransfer) {
-            if (filePath.isNullOrEmpty()) {
-                val contentName = content.name
-                if (contentName != null) {
-                    val file = FileUtils.getFileStoragePath(contentName)
-                    content.filePath = file.path
-                    Log.i("[Content] Started downloading $contentName into ${content.filePath}")
-                } else {
-                    Log.e("[Content] Content name is null, can't download it!")
-                    return
-                }
-            } else {
-                Log.w(
-                    "[Content] File path already set [$filePath] using it (auto download that failed probably)"
-                )
-            }
-
-            if (!chatMessage.downloadContent(content)) {
-                Log.e("[Content] Failed to start content download!")
-            }
-        } else {
-            Log.e("[Content] Content is not a FileTransfer, can't download it!")
-        }
-    }
-
-    fun openFile() {
-        listener?.onContentClicked(getContent())
-    }
-
-    private fun deletePlainFilePath() {
-        val path = filePath.value.orEmpty()
-        if (path.isNotEmpty() && isFileEncrypted) {
-            Log.i("[Content] [VFS] Deleting file used for preview: $path")
-            FileUtils.deleteFile(path)
-            filePath.value = ""
-        }
-    }
-
-    private fun updateContent() {
-        Log.i("[Content] Updating content")
-        deletePlainFilePath()
-
-        val content = getContent()
-        isFileEncrypted = content.isFileEncrypted
-        Log.i(
-            "[Content] Is ${if (content.isFile) "file" else "file transfer"} content encrypted ? $isFileEncrypted"
-        )
-
-        val contentName = content.name
-        val contentFilePath = content.filePath
-        val name = if (contentName.isNullOrEmpty()) {
-            if (!contentFilePath.isNullOrEmpty()) {
-                FileUtils.getNameFromFilePath(contentFilePath)
-            } else {
-                "<unknown>"
-            }
-        } else {
-            contentName
-        }
-        fileName.value = name
-        filePath.value = ""
-
-        // Display download size and underline text
-        val fileSize = AppUtils.bytesToDisplayableSize(content.fileSize.toLong())
-        val spannable = SpannableString(
-            "${AppUtils.getString(R.string.chat_message_download_file)} ($fileSize)"
-        )
-        spannable.setSpan(UnderlineSpan(), 0, spannable.length, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
-        downloadLabel.value = spannable
-
-        isImage.value = false
-        isVideo.value = false
-        isAudio.value = false
-        isPdf.value = false
-        isVoiceRecording.value = false
-        isConferenceSchedule.value = false
-        isConferenceUpdated.value = false
-        isConferenceCancelled.value = false
-
-        if (content.isFile || (content.isFileTransfer && chatMessage.isOutgoing)) {
-            val path = if (isFileEncrypted) {
-                Log.i(
-                    "[Content] [VFS] Content is encrypted, requesting plain file path for file [${content.filePath}]"
-                )
-                content.exportPlainFile()
-            } else {
-                content.filePath ?: ""
-            }
-            downloadable.value = content.filePath.orEmpty().isEmpty()
-
-            val isVoiceRecord = content.isVoiceRecording
-            isVoiceRecording.value = isVoiceRecord
-
-            val isConferenceIcs = content.isIcalendar
-            isConferenceSchedule.value = isConferenceIcs
-
-            if (path.isNotEmpty()) {
-                filePath.value = path
-                val extension = FileUtils.getExtensionFromFileName(path)
-                val mime = MimeTypeMap.getSingleton().getMimeTypeFromExtension(extension)
-                val type = when (FileUtils.getMimeType(mime)) {
-                    FileUtils.MimeType.Image -> {
-                        isImage.value = true
-                        "image"
-                    }
-                    FileUtils.MimeType.Video -> {
-                        isVideo.value = !isVoiceRecord
-                        if (isVoiceRecord) "voice recording" else "video"
-                    }
-                    FileUtils.MimeType.Audio -> {
-                        isAudio.value = !isVoiceRecord
-                        if (isVoiceRecord) "voice recording" else "audio"
-                    }
-                    FileUtils.MimeType.Pdf -> {
-                        isPdf.value = true
-                        "pdf"
-                    }
-                    else -> {
-                        if (isConferenceIcs) "conference invitation" else "unknown"
-                    }
-                }
-                Log.i(
-                    "[Content] Extension for file [$path] is [$extension], deduced type from MIME is [$type]"
-                )
-
-                if (isVoiceRecord) {
-                    val duration = content.fileDuration // duration is in ms
-                    voiceRecordDuration.value = duration
-                    formattedDuration.value = SimpleDateFormat("mm:ss", Locale.getDefault()).format(
-                        duration
-                    )
-                    Log.i(
-                        "[Content] Voice recording duration is ${voiceRecordDuration.value} ($duration)"
-                    )
-                } else if (isConferenceIcs) {
-                    parseConferenceInvite(content)
-                }
-            } else if (isConferenceIcs) {
-                Log.i("[Content] Found content with icalendar file")
-                parseConferenceInvite(content)
-            } else {
-                Log.w(
-                    "[Content] Found ${if (content.isFile) "file" else "file transfer"} content with empty path..."
-                )
-            }
-        } else if (content.isFileTransfer) {
-            downloadable.value = true
-            val extension = FileUtils.getExtensionFromFileName(name)
-            val mime = MimeTypeMap.getSingleton().getMimeTypeFromExtension(extension)
-            when (FileUtils.getMimeType(mime)) {
-                FileUtils.MimeType.Image -> {
-                    isImage.value = true
-                }
-                FileUtils.MimeType.Video -> {
-                    isVideo.value = true
-                }
-                FileUtils.MimeType.Audio -> {
-                    isAudio.value = true
-                }
-                FileUtils.MimeType.Pdf -> {
-                    isPdf.value = true
-                }
-                else -> {}
-            }
-        } else if (content.isIcalendar) {
-            Log.i("[Content] Found content with icalendar body")
-            isConferenceSchedule.value = true
-            parseConferenceInvite(content)
-        } else {
-            Log.w("[Content] Found content that's neither a file or a file transfer")
-        }
-
-        isGenericFile.value = !isPdf.value!! && !isAudio.value!! && !isVideo.value!! && !isImage.value!! && !isVoiceRecording.value!! && !isConferenceSchedule.value!!
-    }
-
-    private fun parseConferenceInvite(content: Content) {
-        val conferenceInfo = Factory.instance().createConferenceInfoFromIcalendarContent(content)
-        val conferenceUri = conferenceInfo?.uri?.asStringUriOnly() ?: ""
-        if (conferenceInfo != null && conferenceUri.isNotEmpty()) {
-            conferenceAddress = conferenceUri
-            Log.i(
-                "[Content] Created conference info from ICS with address $conferenceAddress"
-            )
-            conferenceSubject.value = conferenceInfo.subject
-            conferenceDescription.value = conferenceInfo.description
-
-            val state = conferenceInfo.state
-            isConferenceUpdated.value = state == ConferenceInfo.State.Updated
-            isConferenceCancelled.value = state == ConferenceInfo.State.Cancelled
-
-            conferenceDate.value = TimestampUtils.dateToString(conferenceInfo.dateTime)
-            conferenceTime.value = TimestampUtils.timeToString(conferenceInfo.dateTime)
-
-            val minutes = conferenceInfo.duration
-            val hours = TimeUnit.MINUTES.toHours(minutes.toLong())
-            val remainMinutes = minutes - TimeUnit.HOURS.toMinutes(hours).toInt()
-            conferenceDuration.value = TimestampUtils.durationToString(hours.toInt(), remainMinutes)
-            showDuration.value = minutes > 0
-
-            // Check if organizer is part of participants list
-            var participantsCount = conferenceInfo.participants.size
-            val organizer = conferenceInfo.organizer
-            var organizerFound = false
-            var allSpeaker = true
-            isSpeaker.value = true
-            for (info in conferenceInfo.participantInfos) {
-                val participant = info.address
-                if (participant.weakEqual(chatMessage.chatRoom.localAddress)) {
-                    isSpeaker.value = info.role == Participant.Role.Speaker
-                }
-
-                if (info.role == Participant.Role.Listener) {
-                    allSpeaker = false
-                }
-
-                if (organizer != null) {
-                    if (participant.weakEqual(organizer)) {
-                        organizerFound = true
-                    }
-                }
-            }
-            isBroadcast.value = allSpeaker == false
-
-            if (!organizerFound) participantsCount += 1 // +1 for organizer
-            conferenceParticipantCount.value = String.format(
-                AppUtils.getString(R.string.conference_invite_participants_count),
-                participantsCount
-            )
-        } else if (conferenceInfo == null) {
-            if (content.filePath != null) {
-                try {
-                    val br = BufferedReader(FileReader(content.filePath))
-                    var line: String?
-                    val textBuilder = StringBuilder()
-                    while (br.readLine().also { line = it } != null) {
-                        textBuilder.append(line)
-                        textBuilder.append('\n')
-                    }
-                    br.close()
-                    Log.e(
-                        "[Content] Failed to create conference info from ICS file [${content.filePath}]: $textBuilder"
-                    )
-                } catch (e: Exception) {
-                    Log.e("[Content] Failed to read content of ICS file [${content.filePath}]: $e")
-                }
-            } else {
-                Log.e("[Content] Failed to create conference info from ICS: ${content.utf8Text}")
-            }
-        } else if (conferenceInfo.uri == null) {
-            Log.e(
-                "[Content] Failed to find the conference URI in conference info [$conferenceInfo]"
-            )
-        }
-    }
-
-    fun callConferenceAddress() {
-        val address = conferenceAddress
-        if (address == null) {
-            Log.e("[Content] Can't call null conference address!")
-            return
-        }
-        listener?.onCallConference(address, conferenceSubject.value)
-    }
-
-    /** Voice recording specifics */
-
-    fun playVoiceRecording() {
-        Log.i("[Voice Recording] Playing voice record")
-        if (isPlayerClosed()) {
-            Log.w("[Voice Recording] Player closed, let's open it first")
-            initVoiceRecordPlayer()
-        }
-
-        if (AppUtils.isMediaVolumeLow(coreContext.context)) {
-            Toast.makeText(
-                coreContext.context,
-                R.string.chat_message_voice_recording_playback_low_volume,
-                Toast.LENGTH_LONG
-            ).show()
-        }
-
-        if (voiceRecordAudioFocusRequest == null) {
-            voiceRecordAudioFocusRequest = AppUtils.acquireAudioFocusForVoiceRecordingOrPlayback(
-                coreContext.context
-            )
-        }
-        voiceRecordingPlayer.start()
-        isVoiceRecordPlaying.value = true
-        tickerFlow().onEach {
-            withContext(Dispatchers.Main) {
-                voiceRecordPlayingPosition.value = voiceRecordingPlayer.currentPosition
-            }
-        }.launchIn(scope)
-    }
-
-    fun pauseVoiceRecording() {
-        Log.i("[Voice Recording] Pausing voice record")
-        if (!isPlayerClosed()) {
-            voiceRecordingPlayer.pause()
-        }
-
-        val request = voiceRecordAudioFocusRequest
-        if (request != null) {
-            AppUtils.releaseAudioFocusForVoiceRecordingOrPlayback(coreContext.context, request)
-            voiceRecordAudioFocusRequest = null
-        }
-
-        isVoiceRecordPlaying.value = false
-    }
-
-    private fun tickerFlow() = flow {
-        while (isVoiceRecordPlaying.value == true) {
-            emit(Unit)
-            delay(100)
-        }
-    }
-
-    private fun initVoiceRecordPlayer() {
-        Log.i("[Voice Recording] Creating player for voice record")
-        val playbackSoundCard = AudioRouteUtils.getAudioPlaybackDeviceIdForCallRecordingOrVoiceMessage()
-        Log.i(
-            "[Voice Recording] Using device $playbackSoundCard to make the voice message playback"
-        )
-
-        val localPlayer = coreContext.core.createLocalPlayer(playbackSoundCard, null, null)
-        if (localPlayer != null) {
-            voiceRecordingPlayer = localPlayer
-        } else {
-            Log.e("[Voice Recording] Couldn't create local player!")
-            return
-        }
-        voiceRecordingPlayer.addListener(playerListener)
-
-        val path = filePath.value
-        voiceRecordingPlayer.open(path.orEmpty())
-        voiceRecordDuration.value = voiceRecordingPlayer.duration
-        formattedDuration.value = SimpleDateFormat("mm:ss", Locale.getDefault()).format(
-            voiceRecordingPlayer.duration
-        ) // is already in milliseconds
-        Log.i(
-            "[Voice Recording] Duration is ${voiceRecordDuration.value} (${voiceRecordingPlayer.duration})"
-        )
-    }
-
-    private fun stopVoiceRecording() {
-        if (!isPlayerClosed()) {
-            Log.i("[Voice Recording] Stopping voice record")
-            pauseVoiceRecording()
-            voiceRecordingPlayer.seek(0)
-            voiceRecordPlayingPosition.value = 0
-            voiceRecordingPlayer.close()
-        }
-    }
-
-    private fun isPlayerClosed(): Boolean {
-        return !this::voiceRecordingPlayer.isInitialized || voiceRecordingPlayer.state == Player.State.Closed
-    }
-}
-
-interface OnContentClickedListener {
-    fun onContentClicked(content: Content)
-
-    fun onSipAddressClicked(sipUri: String)
-
-    fun onEmailAddressClicked(email: String)
-
-    fun onWebUrlClicked(url: String)
-
-    fun onCallConference(address: String, subject: String?)
-
-    fun onShowReactionsList(chatMessage: ChatMessage)
-
-    fun onError(messageId: Int)
-}
diff --git a/app/src/main/java/org/linphone/activities/main/chat/data/ChatMessageData.kt b/app/src/main/java/org/linphone/activities/main/chat/data/ChatMessageData.kt
deleted file mode 100644
index f4d27b5dc..000000000
--- a/app/src/main/java/org/linphone/activities/main/chat/data/ChatMessageData.kt
+++ /dev/null
@@ -1,351 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.main.chat.data
-
-import android.os.CountDownTimer
-import android.text.Spannable
-import android.util.Patterns
-import androidx.lifecycle.MutableLiveData
-import java.util.regex.Pattern
-import org.linphone.LinphoneApplication.Companion.coreContext
-import org.linphone.R
-import org.linphone.contact.ContactsUpdatedListenerStub
-import org.linphone.contact.GenericContactData
-import org.linphone.core.Address
-import org.linphone.core.ChatMessage
-import org.linphone.core.ChatMessageListenerStub
-import org.linphone.core.ChatMessageReaction
-import org.linphone.core.tools.Log
-import org.linphone.utils.AppUtils
-import org.linphone.utils.Event
-import org.linphone.utils.PatternClickableSpan
-import org.linphone.utils.TimestampUtils
-
-class ChatMessageData(val chatMessage: ChatMessage) : GenericContactData(chatMessage.fromAddress) {
-    private var contentListener: OnContentClickedListener? = null
-
-    val sendInProgress = MutableLiveData<Boolean>()
-
-    val showImdn = MutableLiveData<Boolean>()
-
-    val imdnIcon = MutableLiveData<Int>()
-
-    val backgroundRes = MutableLiveData<Int>()
-
-    val hideAvatar = MutableLiveData<Boolean>()
-
-    val hideTime = MutableLiveData<Boolean>()
-
-    val contents = MutableLiveData<ArrayList<ChatMessageContentData>>()
-
-    val time = MutableLiveData<String>()
-
-    val ephemeralLifetime = MutableLiveData<String>()
-
-    val text = MutableLiveData<Spannable>()
-
-    val isTextEmoji = MutableLiveData<Boolean>()
-
-    val replyData = MutableLiveData<ChatMessageData>()
-
-    val isDisplayed = MutableLiveData<Boolean>()
-
-    val isOutgoing = chatMessage.isOutgoing
-
-    val contactNewlyFoundEvent: MutableLiveData<Event<Boolean>> by lazy {
-        MutableLiveData<Event<Boolean>>()
-    }
-
-    val reactions = MutableLiveData<ArrayList<String>>()
-
-    var hasPreviousMessage = false
-    var hasNextMessage = false
-
-    private var countDownTimer: CountDownTimer? = null
-
-    private val listener = object : ChatMessageListenerStub() {
-        override fun onMsgStateChanged(message: ChatMessage, state: ChatMessage.State) {
-            time.value = TimestampUtils.toString(chatMessage.time)
-            updateChatMessageState(state)
-        }
-
-        override fun onEphemeralMessageTimerStarted(message: ChatMessage) {
-            updateEphemeralTimer()
-        }
-
-        override fun onNewMessageReaction(message: ChatMessage, reaction: ChatMessageReaction) {
-            Log.i(
-                "[Chat Message Data] New reaction to display [${reaction.body}] from [${reaction.fromAddress.asStringUriOnly()}]"
-            )
-            updateReactionsList()
-        }
-
-        override fun onReactionRemoved(message: ChatMessage, address: Address) {
-            Log.i(
-                "[Chat Message Data] [${address.asStringUriOnly()}] removed it's previous reaction"
-            )
-            updateReactionsList()
-        }
-    }
-
-    private val contactsListener = object : ContactsUpdatedListenerStub() {
-        override fun onContactsUpdated() {
-            contactLookup()
-            if (contact.value != null) {
-                coreContext.contactsManager.removeListener(this)
-                contactNewlyFoundEvent.value = Event(true)
-            }
-        }
-    }
-
-    init {
-        chatMessage.addListener(listener)
-
-        backgroundRes.value = if (chatMessage.isOutgoing) R.drawable.chat_bubble_outgoing_full else R.drawable.chat_bubble_incoming_full
-        hideAvatar.value = false
-
-        if (chatMessage.isReply) {
-            val reply = chatMessage.replyMessage
-            if (reply != null) {
-                Log.i(
-                    "[Chat Message Data] Message is a reply of message id [${chatMessage.replyMessageId}] sent by [${chatMessage.replyMessageSenderAddress?.asStringUriOnly()}]"
-                )
-                replyData.value = ChatMessageData(reply)
-            }
-        }
-
-        time.value = TimestampUtils.toString(chatMessage.time)
-        updateEphemeralTimer()
-
-        updateChatMessageState(chatMessage.state)
-        updateContentsList()
-
-        if (contact.value == null) {
-            coreContext.contactsManager.addListener(contactsListener)
-        }
-
-        updateReactionsList()
-    }
-
-    override fun destroy() {
-        super.destroy()
-
-        if (chatMessage.isReply) {
-            replyData.value?.destroy()
-        }
-
-        contents.value.orEmpty().forEach(ChatMessageContentData::destroy)
-        chatMessage.removeListener(listener)
-        contentListener = null
-    }
-
-    fun updateBubbleBackground(hasPrevious: Boolean, hasNext: Boolean) {
-        hasPreviousMessage = hasPrevious
-        hasNextMessage = hasNext
-        hideTime.value = false
-        hideAvatar.value = false
-
-        if (hasPrevious) {
-            hideTime.value = true
-        }
-
-        if (chatMessage.isOutgoing) {
-            if (hasNext && hasPrevious) {
-                backgroundRes.value = R.drawable.chat_bubble_outgoing_split_2
-            } else if (hasNext) {
-                backgroundRes.value = R.drawable.chat_bubble_outgoing_split_1
-            } else if (hasPrevious) {
-                backgroundRes.value = R.drawable.chat_bubble_outgoing_split_3
-            } else {
-                backgroundRes.value = R.drawable.chat_bubble_outgoing_full
-            }
-        } else {
-            if (hasNext && hasPrevious) {
-                hideAvatar.value = true
-                backgroundRes.value = R.drawable.chat_bubble_incoming_split_2
-            } else if (hasNext) {
-                backgroundRes.value = R.drawable.chat_bubble_incoming_split_1
-            } else if (hasPrevious) {
-                hideAvatar.value = true
-                backgroundRes.value = R.drawable.chat_bubble_incoming_split_3
-            } else {
-                backgroundRes.value = R.drawable.chat_bubble_incoming_full
-            }
-        }
-    }
-
-    fun setContentClickListener(listener: OnContentClickedListener) {
-        contentListener = listener
-
-        for (data in contents.value.orEmpty()) {
-            data.listener = listener
-        }
-    }
-
-    fun showReactionsList() {
-        contentListener?.onShowReactionsList(chatMessage)
-    }
-
-    private fun updateChatMessageState(state: ChatMessage.State) {
-        sendInProgress.value = when (state) {
-            ChatMessage.State.InProgress, ChatMessage.State.FileTransferInProgress, ChatMessage.State.FileTransferDone -> true
-            else -> false
-        }
-
-        showImdn.value = when (state) {
-            ChatMessage.State.DeliveredToUser, ChatMessage.State.Displayed,
-            ChatMessage.State.NotDelivered, ChatMessage.State.FileTransferError -> true
-            else -> false
-        }
-
-        imdnIcon.value = when (state) {
-            ChatMessage.State.DeliveredToUser -> R.drawable.chat_delivered
-            ChatMessage.State.Displayed -> R.drawable.chat_read
-            ChatMessage.State.FileTransferError, ChatMessage.State.NotDelivered -> R.drawable.chat_error
-            else -> R.drawable.chat_error
-        }
-
-        isDisplayed.value = state == ChatMessage.State.Displayed
-    }
-
-    private fun updateContentsList() {
-        contents.value.orEmpty().forEach(ChatMessageContentData::destroy)
-        val list = arrayListOf<ChatMessageContentData>()
-
-        val contentsList = chatMessage.contents
-        for (index in contentsList.indices) {
-            val content = contentsList[index]
-            if (content.isFileTransfer || content.isFile || content.isIcalendar) {
-                val data = ChatMessageContentData(chatMessage, index)
-                data.listener = contentListener
-                list.add(data)
-            } else if (content.isText) {
-                val textContent = content.utf8Text.orEmpty().trim()
-                val spannable = Spannable.Factory.getInstance().newSpannable(textContent)
-                text.value = PatternClickableSpan()
-                    .add(
-                        Pattern.compile(
-                            "(?:<?sips?:)[a-zA-Z0-9+_.\\-]+(?:@([a-zA-Z0-9+_.\\-;=~]+))+(>)?"
-                        ),
-                        object : PatternClickableSpan.SpannableClickedListener {
-                            override fun onSpanClicked(text: String) {
-                                Log.i("[Chat Message Data] Clicked on SIP URI: $text")
-                                contentListener?.onSipAddressClicked(text)
-                            }
-                        }
-                    )
-                    .add(
-                        Patterns.EMAIL_ADDRESS,
-                        object : PatternClickableSpan.SpannableClickedListener {
-                            override fun onSpanClicked(text: String) {
-                                Log.i("[Chat Message Data] Clicked on email address: $text")
-                                contentListener?.onEmailAddressClicked(text)
-                            }
-                        }
-                    )
-                    .add(
-                        Patterns.PHONE,
-                        object : PatternClickableSpan.SpannableClickedListener {
-                            override fun onSpanClicked(text: String) {
-                                Log.i("[Chat Message Data] Clicked on phone number: $text")
-                                contentListener?.onSipAddressClicked(text)
-                            }
-                        }
-                    )
-                    .add(
-                        Patterns.WEB_URL,
-                        object : PatternClickableSpan.SpannableClickedListener {
-                            override fun onSpanClicked(text: String) {
-                                Log.i("[Chat Message Data] Clicked on web URL: $text")
-                                contentListener?.onWebUrlClicked(text)
-                            }
-                        }
-                    ).build(spannable)
-                isTextEmoji.value = AppUtils.isTextOnlyContainingEmoji(textContent)
-            } else {
-                Log.e(
-                    "[Chat Message Data] Unexpected content with type: ${content.type}/${content.subtype}"
-                )
-            }
-        }
-
-        contents.value = list
-    }
-
-    fun updateReactionsList() {
-        val reactionsList = arrayListOf<String>()
-        val allReactions = chatMessage.reactions
-
-        var sameReactionTwiceOrMore = false
-        if (allReactions.isNotEmpty()) {
-            for (reaction in allReactions) {
-                val body = reaction.body
-                if (!reactionsList.contains(body)) {
-                    reactionsList.add(body)
-                } else {
-                    sameReactionTwiceOrMore = true
-                }
-            }
-
-            if (sameReactionTwiceOrMore) {
-                reactionsList.add(allReactions.size.toString())
-            }
-        }
-
-        reactions.value = reactionsList
-    }
-
-    private fun updateEphemeralTimer() {
-        if (chatMessage.isEphemeral) {
-            if (chatMessage.ephemeralExpireTime == 0L) {
-                // This means the message hasn't been read by all participants yet, so the countdown hasn't started
-                // In this case we simply display the configured value for lifetime
-                ephemeralLifetime.value = formatLifetime(chatMessage.ephemeralLifetime)
-            } else {
-                // Countdown has started, display remaining time
-                val remaining = chatMessage.ephemeralExpireTime - (System.currentTimeMillis() / 1000)
-                ephemeralLifetime.value = formatLifetime(remaining)
-                if (countDownTimer == null) {
-                    countDownTimer = object : CountDownTimer(remaining * 1000, 1000) {
-                        override fun onFinish() {}
-
-                        override fun onTick(millisUntilFinished: Long) {
-                            ephemeralLifetime.postValue(formatLifetime(millisUntilFinished / 1000))
-                        }
-                    }
-                    countDownTimer?.start()
-                }
-            }
-        }
-    }
-
-    private fun formatLifetime(seconds: Long): String {
-        val days = seconds / 86400
-        return when {
-            days >= 1L -> AppUtils.getStringWithPlural(R.plurals.days, days.toInt())
-            else -> String.format(
-                "%02d:%02d:%02d",
-                seconds / 3600,
-                (seconds % 3600) / 60,
-                (seconds % 60)
-            )
-        }
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/main/chat/data/ChatMessageReactionData.kt b/app/src/main/java/org/linphone/activities/main/chat/data/ChatMessageReactionData.kt
deleted file mode 100644
index c73b423d8..000000000
--- a/app/src/main/java/org/linphone/activities/main/chat/data/ChatMessageReactionData.kt
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (c) 2010-2022 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.main.chat.data
-
-import androidx.lifecycle.MutableLiveData
-import org.linphone.contact.GenericContactData
-import org.linphone.core.ChatMessageReaction
-
-class ChatMessageReactionData(
-    chatMessageReaction: ChatMessageReaction
-) : GenericContactData(chatMessageReaction.fromAddress) {
-
-    val reaction = MutableLiveData<String>()
-
-    init {
-        reaction.value = chatMessageReaction.body
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/main/chat/data/ChatMessageReactionsListData.kt b/app/src/main/java/org/linphone/activities/main/chat/data/ChatMessageReactionsListData.kt
deleted file mode 100644
index 820195087..000000000
--- a/app/src/main/java/org/linphone/activities/main/chat/data/ChatMessageReactionsListData.kt
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Copyright (c) 2010-2022 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.main.chat.data
-
-import androidx.lifecycle.MutableLiveData
-import org.linphone.core.Address
-import org.linphone.core.ChatMessage
-import org.linphone.core.ChatMessageListenerStub
-import org.linphone.core.ChatMessageReaction
-import org.linphone.core.tools.Log
-
-class ChatMessageReactionsListData(private val chatMessage: ChatMessage) {
-    val reactions = MutableLiveData<ArrayList<ChatMessageReaction>>()
-
-    val filteredReactions = MutableLiveData<ArrayList<ChatMessageReactionData>>()
-
-    val reactionsMap = HashMap<String, Int>()
-
-    val listener = object : ChatMessageListenerStub() {
-        override fun onNewMessageReaction(message: ChatMessage, reaction: ChatMessageReaction) {
-            val address = reaction.fromAddress
-            Log.i(
-                "[Chat Message Reactions List] Reaction received [${reaction.body}] from [${address.asStringUriOnly()}]"
-            )
-            updateReactionsList(message)
-        }
-
-        override fun onReactionRemoved(message: ChatMessage, address: Address) {
-            Log.i(
-                "[Chat Message Reactions List] Reaction removed by [${address.asStringUriOnly()}]"
-            )
-            updateReactionsList(message)
-        }
-    }
-
-    private var filter = ""
-
-    init {
-        chatMessage.addListener(listener)
-
-        updateReactionsList(chatMessage)
-    }
-
-    fun onDestroy() {
-        chatMessage.removeListener(listener)
-    }
-
-    fun updateFilteredReactions(newFilter: String) {
-        filter = newFilter
-        filteredReactions.value.orEmpty().forEach(ChatMessageReactionData::destroy)
-
-        val reactionsList = arrayListOf<ChatMessageReactionData>()
-        for (reaction in reactions.value.orEmpty()) {
-            if (filter.isEmpty() || filter == reaction.body) {
-                val data = ChatMessageReactionData(reaction)
-                reactionsList.add(data)
-            }
-        }
-        filteredReactions.value = reactionsList
-    }
-
-    private fun updateReactionsList(chatMessage: ChatMessage) {
-        reactionsMap.clear()
-
-        val reactionsList = arrayListOf<ChatMessageReaction>()
-        for (reaction in chatMessage.reactions) {
-            val body = reaction.body
-            val count = if (reactionsMap.containsKey(body)) {
-                reactionsMap[body] ?: 0
-            } else {
-                0
-            }
-            // getOrDefault isn't available for API 23 :'(
-            reactionsMap[body] = count + 1
-            reactionsList.add(reaction)
-        }
-        reactions.value = reactionsList
-
-        updateFilteredReactions(filter)
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/main/chat/data/ChatRoomData.kt b/app/src/main/java/org/linphone/activities/main/chat/data/ChatRoomData.kt
deleted file mode 100644
index 233ae0985..000000000
--- a/app/src/main/java/org/linphone/activities/main/chat/data/ChatRoomData.kt
+++ /dev/null
@@ -1,277 +0,0 @@
-/*
- * Copyright (c) 2010-2022 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.main.chat.data
-
-import android.graphics.Typeface
-import android.text.SpannableStringBuilder
-import android.text.style.StyleSpan
-import androidx.lifecycle.MutableLiveData
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
-import org.linphone.LinphoneApplication.Companion.coreContext
-import org.linphone.R
-import org.linphone.contact.ContactDataInterface
-import org.linphone.contact.ContactsUpdatedListenerStub
-import org.linphone.core.*
-import org.linphone.core.tools.Log
-import org.linphone.utils.AppUtils
-import org.linphone.utils.Event
-import org.linphone.utils.LinphoneUtils
-import org.linphone.utils.TimestampUtils
-
-class ChatRoomData(val chatRoom: ChatRoom) : ContactDataInterface {
-    override val contact: MutableLiveData<Friend> = MutableLiveData<Friend>()
-    override val displayName: MutableLiveData<String> = MutableLiveData<String>()
-    override val securityLevel: MutableLiveData<ChatRoom.SecurityLevel> = MutableLiveData<ChatRoom.SecurityLevel>()
-    override val showGroupChatAvatar: Boolean
-        get() = !oneToOneChatRoom
-    override val presenceStatus: MutableLiveData<ConsolidatedPresence> = MutableLiveData<ConsolidatedPresence>()
-    override val coroutineScope: CoroutineScope = coreContext.coroutineScope
-
-    val id = LinphoneUtils.getChatRoomId(chatRoom)
-
-    val unreadMessagesCount = MutableLiveData<Int>()
-
-    val subject = MutableLiveData<String>()
-
-    val securityLevelIcon = MutableLiveData<Int>()
-
-    val securityLevelContentDescription = MutableLiveData<Int>()
-
-    val ephemeralEnabled = MutableLiveData<Boolean>()
-
-    val lastUpdate = MutableLiveData<String>()
-
-    val lastMessageText = MutableLiveData<SpannableStringBuilder>()
-
-    val showLastMessageImdnIcon = MutableLiveData<Boolean>()
-
-    val lastMessageImdnIcon = MutableLiveData<Int>()
-
-    val notificationsMuted = MutableLiveData<Boolean>()
-
-    private val basicChatRoom: Boolean by lazy {
-        chatRoom.hasCapability(ChatRoom.Capabilities.Basic.toInt())
-    }
-
-    val oneToOneChatRoom: Boolean by lazy {
-        chatRoom.hasCapability(ChatRoom.Capabilities.OneToOne.toInt())
-    }
-
-    val encryptedChatRoom: Boolean by lazy {
-        chatRoom.hasCapability(ChatRoom.Capabilities.Encrypted.toInt())
-    }
-
-    val contactNewlyFoundEvent: MutableLiveData<Event<Boolean>> by lazy {
-        MutableLiveData<Event<Boolean>>()
-    }
-
-    private val contactsListener = object : ContactsUpdatedListenerStub() {
-        override fun onContactsUpdated() {
-            if (contact.value == null && oneToOneChatRoom) {
-                searchMatchingContact()
-            }
-            if (!oneToOneChatRoom) {
-                formatLastMessage(chatRoom.lastMessageInHistory)
-            }
-        }
-    }
-
-    init {
-        coreContext.contactsManager.addListener(contactsListener)
-
-        lastUpdate.value = "00:00"
-        presenceStatus.value = ConsolidatedPresence.Offline
-    }
-
-    fun destroy() {
-        coreContext.contactsManager.removeListener(contactsListener)
-    }
-
-    fun update() {
-        unreadMessagesCount.value = chatRoom.unreadMessagesCount
-
-        subject.value = chatRoom.subject
-        updateSecurityIcon()
-        ephemeralEnabled.value = chatRoom.isEphemeralEnabled
-
-        contactLookup()
-        formatLastMessage(chatRoom.lastMessageInHistory)
-
-        notificationsMuted.value = areNotificationsMuted()
-    }
-
-    fun markAsRead() {
-        chatRoom.markAsRead()
-        unreadMessagesCount.value = 0
-    }
-
-    private fun updateSecurityIcon() {
-        val level = chatRoom.securityLevel
-        securityLevel.value = level
-
-        securityLevelIcon.value = when (level) {
-            ChatRoom.SecurityLevel.Safe -> R.drawable.security_2_indicator
-            ChatRoom.SecurityLevel.Encrypted -> R.drawable.security_1_indicator
-            else -> R.drawable.security_alert_indicator
-        }
-        securityLevelContentDescription.value = when (level) {
-            ChatRoom.SecurityLevel.Safe -> R.string.content_description_security_level_safe
-            ChatRoom.SecurityLevel.Encrypted -> R.string.content_description_security_level_encrypted
-            else -> R.string.content_description_security_level_unsafe
-        }
-    }
-
-    private fun contactLookup() {
-        if (oneToOneChatRoom) {
-            searchMatchingContact()
-        } else {
-            displayName.value = chatRoom.subject ?: chatRoom.peerAddress.asStringUriOnly()
-        }
-    }
-
-    private fun searchMatchingContact() {
-        val remoteAddress = if (basicChatRoom) {
-            chatRoom.peerAddress
-        } else {
-            val participants = chatRoom.participants
-            if (participants.isNotEmpty()) {
-                participants.first().address
-            } else {
-                Log.e(
-                    "[Chat Room] ${chatRoom.peerAddress} doesn't have any participant (state ${chatRoom.state})!"
-                )
-                null
-            }
-        }
-
-        if (remoteAddress != null) {
-            val friend = coreContext.contactsManager.findContactByAddress(remoteAddress)
-            if (friend != null) {
-                val newlyFound = contact.value == null
-
-                contact.value = friend!!
-                presenceStatus.value = friend.consolidatedPresence
-                friend.addListener {
-                    presenceStatus.value = it.consolidatedPresence
-                }
-
-                if (newlyFound) {
-                    contactNewlyFoundEvent.value = Event(true)
-                }
-            } else {
-                displayName.value = LinphoneUtils.getDisplayName(remoteAddress)
-            }
-        } else {
-            displayName.value = chatRoom.peerAddress.asStringUriOnly()
-        }
-    }
-
-    private fun formatLastMessage(msg: ChatMessage?) {
-        val lastUpdateTime = chatRoom.lastUpdateTime
-        coroutineScope.launch {
-            withContext(Dispatchers.IO) {
-                lastUpdate.postValue(TimestampUtils.toString(lastUpdateTime, true))
-            }
-        }
-
-        val builder = SpannableStringBuilder()
-        if (msg == null) {
-            lastMessageText.value = builder
-            showLastMessageImdnIcon.value = false
-            return
-        }
-
-        if (msg.isOutgoing && msg.state != ChatMessage.State.Displayed) {
-            msg.addListener(object : ChatMessageListenerStub() {
-                override fun onMsgStateChanged(message: ChatMessage, state: ChatMessage.State) {
-                    computeLastMessageImdnIcon(message)
-                }
-            })
-        }
-        computeLastMessageImdnIcon(msg)
-
-        if (!oneToOneChatRoom) {
-            val sender: String =
-                coreContext.contactsManager.findContactByAddress(msg.fromAddress)?.name
-                    ?: LinphoneUtils.getDisplayName(msg.fromAddress)
-            builder.append(
-                coreContext.context.getString(R.string.chat_room_last_message_sender_format, sender)
-            )
-            builder.append(" ")
-        }
-
-        for (content in msg.contents) {
-            if (content.isIcalendar) {
-                val body = AppUtils.getString(R.string.conference_invitation)
-                builder.append(body)
-                builder.setSpan(
-                    StyleSpan(Typeface.ITALIC),
-                    builder.length - body.length,
-                    builder.length,
-                    0
-                )
-                break
-            } else if (content.isVoiceRecording) {
-                val body = AppUtils.getString(R.string.chat_message_voice_recording)
-                builder.append(body)
-                builder.setSpan(
-                    StyleSpan(Typeface.ITALIC),
-                    builder.length - body.length,
-                    builder.length,
-                    0
-                )
-                break
-            } else if (content.isFile || content.isFileTransfer) {
-                builder.append(content.name + " ")
-            } else if (content.isText) {
-                builder.append(content.utf8Text + " ")
-            }
-        }
-
-        builder.trim()
-        lastMessageText.value = builder
-    }
-
-    private fun computeLastMessageImdnIcon(msg: ChatMessage) {
-        val state = msg.state
-        showLastMessageImdnIcon.value = if (msg.isOutgoing) {
-            when (state) {
-                ChatMessage.State.DeliveredToUser, ChatMessage.State.Displayed,
-                ChatMessage.State.NotDelivered, ChatMessage.State.FileTransferError -> true
-                else -> false
-            }
-        } else {
-            false
-        }
-        lastMessageImdnIcon.value = when (state) {
-            ChatMessage.State.DeliveredToUser -> R.drawable.chat_delivered
-            ChatMessage.State.Displayed -> R.drawable.chat_read
-            ChatMessage.State.FileTransferError, ChatMessage.State.NotDelivered -> R.drawable.chat_error
-            else -> R.drawable.chat_error
-        }
-    }
-
-    private fun areNotificationsMuted(): Boolean {
-        return chatRoom.muted
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/main/chat/data/DevicesListChildData.kt b/app/src/main/java/org/linphone/activities/main/chat/data/DevicesListChildData.kt
deleted file mode 100644
index e7216c946..000000000
--- a/app/src/main/java/org/linphone/activities/main/chat/data/DevicesListChildData.kt
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.main.chat.data
-
-import org.linphone.LinphoneApplication.Companion.coreContext
-import org.linphone.R
-import org.linphone.core.ChatRoom
-import org.linphone.core.ParticipantDevice
-
-class DevicesListChildData(private val device: ParticipantDevice) {
-    val deviceName: String = device.name.orEmpty()
-
-    val securityLevelIcon: Int by lazy {
-        when (device.securityLevel) {
-            ChatRoom.SecurityLevel.Safe -> R.drawable.security_2_indicator
-            ChatRoom.SecurityLevel.Encrypted -> R.drawable.security_1_indicator
-            else -> R.drawable.security_alert_indicator
-        }
-    }
-
-    val securityContentDescription: Int by lazy {
-        when (device.securityLevel) {
-            ChatRoom.SecurityLevel.Safe -> R.string.content_description_security_level_safe
-            ChatRoom.SecurityLevel.Encrypted -> R.string.content_description_security_level_encrypted
-            else -> R.string.content_description_security_level_unsafe
-        }
-    }
-
-    fun onClick() {
-        coreContext.startCall(device.address, forceZRTP = true)
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/main/chat/data/DevicesListGroupData.kt b/app/src/main/java/org/linphone/activities/main/chat/data/DevicesListGroupData.kt
deleted file mode 100644
index c8620c03b..000000000
--- a/app/src/main/java/org/linphone/activities/main/chat/data/DevicesListGroupData.kt
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.main.chat.data
-
-import androidx.lifecycle.MutableLiveData
-import org.linphone.LinphoneApplication.Companion.coreContext
-import org.linphone.R
-import org.linphone.contact.GenericContactData
-import org.linphone.core.ChatRoom
-import org.linphone.core.Participant
-import org.linphone.utils.LinphoneUtils
-
-class DevicesListGroupData(private val participant: Participant) : GenericContactData(
-    participant.address
-) {
-    val securityLevelIcon: Int by lazy {
-        when (participant.securityLevel) {
-            ChatRoom.SecurityLevel.Safe -> R.drawable.security_2_indicator
-            ChatRoom.SecurityLevel.Encrypted -> R.drawable.security_1_indicator
-            else -> R.drawable.security_alert_indicator
-        }
-    }
-
-    val securityLevelContentDescription: Int by lazy {
-        when (participant.securityLevel) {
-            ChatRoom.SecurityLevel.Safe -> R.string.content_description_security_level_safe
-            ChatRoom.SecurityLevel.Encrypted -> R.string.content_description_security_level_encrypted
-            else -> R.string.content_description_security_level_unsafe
-        }
-    }
-
-    val sipUri: String get() = LinphoneUtils.getDisplayableAddress(participant.address)
-
-    val isExpanded = MutableLiveData<Boolean>()
-
-    val devices = MutableLiveData<ArrayList<DevicesListChildData>>()
-
-    init {
-        securityLevel.value = participant.securityLevel
-        isExpanded.value = false
-
-        val list = arrayListOf<DevicesListChildData>()
-        for (device in participant.devices) {
-            list.add(DevicesListChildData((device)))
-        }
-        devices.value = list
-    }
-
-    fun toggleExpanded() {
-        isExpanded.value = isExpanded.value != true
-    }
-
-    fun onClick() {
-        val device = if (participant.devices.isEmpty()) null else participant.devices.first()
-        if (device?.address != null) {
-            coreContext.startCall(device.address, forceZRTP = true)
-        } else {
-            coreContext.startCall(participant.address, forceZRTP = true)
-        }
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/main/chat/data/EphemeralDurationData.kt b/app/src/main/java/org/linphone/activities/main/chat/data/EphemeralDurationData.kt
deleted file mode 100644
index ddf6b1d68..000000000
--- a/app/src/main/java/org/linphone/activities/main/chat/data/EphemeralDurationData.kt
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.main.chat.data
-
-class EphemeralDurationData(
-    val textResource: Int,
-    selectedDuration: Long,
-    private val duration: Long,
-    private val listener: DurationItemClicked
-) {
-    val selected: Boolean = selectedDuration == duration
-
-    fun setSelected() {
-        listener.onDurationValueChanged(duration)
-    }
-}
-
-interface DurationItemClicked {
-    fun onDurationValueChanged(duration: Long)
-}
diff --git a/app/src/main/java/org/linphone/activities/main/chat/data/EventData.kt b/app/src/main/java/org/linphone/activities/main/chat/data/EventData.kt
deleted file mode 100644
index 4c9f08ec8..000000000
--- a/app/src/main/java/org/linphone/activities/main/chat/data/EventData.kt
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.main.chat.data
-
-import android.content.Context
-import androidx.lifecycle.MutableLiveData
-import org.linphone.LinphoneApplication.Companion.coreContext
-import org.linphone.R
-import org.linphone.contact.GenericContactData
-import org.linphone.core.EventLog
-
-class EventData(private val eventLog: EventLog) : GenericContactData(
-    if (eventLog.type == EventLog.Type.ConferenceSecurityEvent) {
-        eventLog.securityEventFaultyDeviceAddress!!
-    } else {
-        if (eventLog.participantAddress == null) {
-            eventLog.peerAddress!!
-        } else {
-            eventLog.participantAddress!!
-        }
-    }
-) {
-    val text = MutableLiveData<String>()
-
-    val isSecurity: Boolean by lazy {
-        when (eventLog.type) {
-            EventLog.Type.ConferenceSecurityEvent -> true
-            else -> false
-        }
-    }
-
-    val isGroupLeft: Boolean by lazy {
-        when (eventLog.type) {
-            EventLog.Type.ConferenceTerminated -> true
-            else -> false
-        }
-    }
-
-    init {
-        updateEventText()
-    }
-
-    private fun getName(): String {
-        return contact.value?.name ?: displayName.value ?: ""
-    }
-
-    private fun updateEventText() {
-        val context: Context = coreContext.context
-
-        text.value = when (eventLog.type) {
-            EventLog.Type.ConferenceCreated -> context.getString(
-                R.string.chat_event_conference_created
-            )
-            EventLog.Type.ConferenceTerminated -> context.getString(
-                R.string.chat_event_conference_destroyed
-            )
-            EventLog.Type.ConferenceParticipantAdded -> context.getString(
-                R.string.chat_event_participant_added
-            ).format(getName())
-            EventLog.Type.ConferenceParticipantRemoved -> context.getString(
-                R.string.chat_event_participant_removed
-            ).format(getName())
-            EventLog.Type.ConferenceSubjectChanged -> context.getString(
-                R.string.chat_event_subject_changed
-            ).format(eventLog.subject)
-            EventLog.Type.ConferenceParticipantSetAdmin -> context.getString(
-                R.string.chat_event_admin_set
-            ).format(getName())
-            EventLog.Type.ConferenceParticipantUnsetAdmin -> context.getString(
-                R.string.chat_event_admin_unset
-            ).format(getName())
-            EventLog.Type.ConferenceParticipantDeviceAdded -> context.getString(
-                R.string.chat_event_device_added
-            ).format(getName())
-            EventLog.Type.ConferenceParticipantDeviceRemoved -> context.getString(
-                R.string.chat_event_device_removed
-            ).format(getName())
-            EventLog.Type.ConferenceSecurityEvent -> {
-                val name = getName()
-                when (eventLog.securityEventType) {
-                    EventLog.SecurityEventType.EncryptionIdentityKeyChanged -> context.getString(
-                        R.string.chat_security_event_lime_identity_key_changed
-                    ).format(name)
-                    EventLog.SecurityEventType.ManInTheMiddleDetected -> context.getString(
-                        R.string.chat_security_event_man_in_the_middle_detected
-                    ).format(name)
-                    EventLog.SecurityEventType.SecurityLevelDowngraded -> context.getString(
-                        R.string.chat_security_event_security_level_downgraded
-                    ).format(name)
-                    EventLog.SecurityEventType.ParticipantMaxDeviceCountExceeded -> context.getString(
-                        R.string.chat_security_event_participant_max_count_exceeded
-                    ).format(name)
-                    else -> "Unexpected security event for $name: ${eventLog.securityEventType}"
-                }
-            }
-            EventLog.Type.ConferenceEphemeralMessageDisabled -> context.getString(
-                R.string.chat_event_ephemeral_disabled
-            )
-            EventLog.Type.ConferenceEphemeralMessageEnabled -> context.getString(
-                R.string.chat_event_ephemeral_enabled
-            ).format(formatEphemeralExpiration(context, eventLog.ephemeralMessageLifetime))
-            EventLog.Type.ConferenceEphemeralMessageLifetimeChanged -> context.getString(
-                R.string.chat_event_ephemeral_lifetime_changed
-            ).format(formatEphemeralExpiration(context, eventLog.ephemeralMessageLifetime))
-            else -> "Unexpected event: ${eventLog.type}"
-        }
-    }
-
-    private fun formatEphemeralExpiration(context: Context, duration: Long): String {
-        return when (duration) {
-            0L -> context.getString(R.string.chat_room_ephemeral_message_disabled)
-            60L -> context.getString(R.string.chat_room_ephemeral_message_one_minute)
-            3600L -> context.getString(R.string.chat_room_ephemeral_message_one_hour)
-            86400L -> context.getString(R.string.chat_room_ephemeral_message_one_day)
-            259200L -> context.getString(R.string.chat_room_ephemeral_message_three_days)
-            604800L -> context.getString(R.string.chat_room_ephemeral_message_one_week)
-            else -> "Unexpected duration"
-        }
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/main/chat/data/EventLogData.kt b/app/src/main/java/org/linphone/activities/main/chat/data/EventLogData.kt
deleted file mode 100644
index a20c19a94..000000000
--- a/app/src/main/java/org/linphone/activities/main/chat/data/EventLogData.kt
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2010-2021 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.main.chat.data
-
-import org.linphone.contact.GenericContactData
-import org.linphone.core.EventLog
-
-class EventLogData(val eventLog: EventLog) {
-    val type: EventLog.Type = eventLog.type
-
-    val notifyId = eventLog.notifyId
-
-    val data: GenericContactData = if (type == EventLog.Type.ConferenceChatMessage) {
-        ChatMessageData(eventLog.chatMessage!!)
-    } else {
-        EventData(eventLog)
-    }
-
-    fun destroy() {
-        data.destroy()
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/main/chat/data/GroupInfoParticipantData.kt b/app/src/main/java/org/linphone/activities/main/chat/data/GroupInfoParticipantData.kt
deleted file mode 100644
index 977fca139..000000000
--- a/app/src/main/java/org/linphone/activities/main/chat/data/GroupInfoParticipantData.kt
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.main.chat.data
-
-import androidx.lifecycle.MutableLiveData
-import org.linphone.R
-import org.linphone.activities.main.chat.GroupChatRoomMember
-import org.linphone.contact.GenericContactData
-import org.linphone.core.ChatRoom
-import org.linphone.utils.LinphoneUtils
-
-class GroupInfoParticipantData(val participant: GroupChatRoomMember) : GenericContactData(
-    participant.address
-) {
-    val sipUri: String get() = LinphoneUtils.getDisplayableAddress(participant.address)
-
-    val isAdmin = MutableLiveData<Boolean>()
-
-    val showAdminControls = MutableLiveData<Boolean>()
-
-    // A participant not yet added to a group can't be set admin at the same time it's added
-    val canBeSetAdmin = MutableLiveData<Boolean>()
-
-    val securityLevelIcon: Int by lazy {
-        when (participant.securityLevel) {
-            ChatRoom.SecurityLevel.Safe -> R.drawable.security_2_indicator
-            ChatRoom.SecurityLevel.Encrypted -> R.drawable.security_1_indicator
-            else -> R.drawable.security_alert_indicator
-        }
-    }
-
-    val securityLevelContentDescription: Int by lazy {
-        when (participant.securityLevel) {
-            ChatRoom.SecurityLevel.Safe -> R.string.content_description_security_level_safe
-            ChatRoom.SecurityLevel.Encrypted -> R.string.content_description_security_level_encrypted
-            else -> R.string.content_description_security_level_unsafe
-        }
-    }
-
-    init {
-        securityLevel.value = participant.securityLevel
-        isAdmin.value = participant.isAdmin
-        showAdminControls.value = false
-        canBeSetAdmin.value = participant.canBeSetAdmin
-    }
-
-    fun setAdmin() {
-        isAdmin.value = true
-        participant.isAdmin = true
-    }
-
-    fun unSetAdmin() {
-        isAdmin.value = false
-        participant.isAdmin = false
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/main/chat/data/ImdnParticipantData.kt b/app/src/main/java/org/linphone/activities/main/chat/data/ImdnParticipantData.kt
deleted file mode 100644
index 4d93970c3..000000000
--- a/app/src/main/java/org/linphone/activities/main/chat/data/ImdnParticipantData.kt
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.main.chat.data
-
-import org.linphone.contact.GenericContactData
-import org.linphone.core.ParticipantImdnState
-import org.linphone.utils.TimestampUtils
-
-class ImdnParticipantData(val imdnState: ParticipantImdnState) : GenericContactData(
-    imdnState.participant.address
-) {
-    val sipUri: String = imdnState.participant.address.asStringUriOnly()
-
-    val time: String = TimestampUtils.toString(imdnState.stateChangeTime)
-}
diff --git a/app/src/main/java/org/linphone/activities/main/chat/fragments/ChatMessageReactionsListDialogFragment.kt b/app/src/main/java/org/linphone/activities/main/chat/fragments/ChatMessageReactionsListDialogFragment.kt
deleted file mode 100644
index 099981e84..000000000
--- a/app/src/main/java/org/linphone/activities/main/chat/fragments/ChatMessageReactionsListDialogFragment.kt
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * Copyright (c) 2010-2022 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.main.chat.fragments
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import com.google.android.material.bottomsheet.BottomSheetDialogFragment
-import com.google.android.material.tabs.TabLayout
-import org.linphone.R
-import org.linphone.activities.main.chat.data.ChatMessageReactionsListData
-import org.linphone.core.ChatMessage
-import org.linphone.core.tools.Log
-import org.linphone.databinding.ChatMessageReactionsListDialogBinding
-import org.linphone.utils.AppUtils
-
-class ChatMessageReactionsListDialogFragment() : BottomSheetDialogFragment() {
-    companion object {
-        const val TAG = "ChatMessageReactionsListDialogFragment"
-    }
-
-    private lateinit var binding: ChatMessageReactionsListDialogBinding
-
-    private lateinit var data: ChatMessageReactionsListData
-
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View {
-        binding = ChatMessageReactionsListDialogBinding.inflate(layoutInflater)
-        binding.lifecycleOwner = viewLifecycleOwner
-        if (::data.isInitialized) {
-            binding.data = data
-
-            data.reactions.observe(viewLifecycleOwner) {
-                binding.tabs.removeAllTabs()
-                binding.tabs.addTab(
-                    binding.tabs.newTab().setText(
-                        AppUtils.getStringWithPlural(
-                            R.plurals.chat_message_reactions_count,
-                            it.orEmpty().size
-                        )
-                    ).setId(0)
-                )
-
-                var index = 1
-                data.reactionsMap.forEach { (key, value) ->
-                    binding.tabs.addTab(
-                        binding.tabs.newTab().setText("$key $value").setId(index).setTag(key)
-                    )
-                    index += 1
-                }
-            }
-        } else {
-            Log.w("$TAG View created but no message has been set, dismissing...")
-            dismiss()
-        }
-
-        binding.tabs.addOnTabSelectedListener(object : TabLayout.OnTabSelectedListener {
-            override fun onTabSelected(tab: TabLayout.Tab) {
-                if (::data.isInitialized) {
-                    if (tab.id == 0) {
-                        data.updateFilteredReactions("")
-                    } else {
-                        data.updateFilteredReactions(tab.tag.toString())
-                    }
-                }
-            }
-
-            override fun onTabUnselected(tab: TabLayout.Tab) {
-            }
-
-            override fun onTabReselected(tab: TabLayout.Tab) {
-            }
-        })
-
-        return binding.root
-    }
-
-    fun setMessage(chatMessage: ChatMessage) {
-        data = ChatMessageReactionsListData(chatMessage)
-    }
-
-    override fun onDestroy() {
-        if (::data.isInitialized) {
-            data.onDestroy()
-        }
-        super.onDestroy()
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/main/chat/fragments/ChatRoomCreationFragment.kt b/app/src/main/java/org/linphone/activities/main/chat/fragments/ChatRoomCreationFragment.kt
deleted file mode 100644
index 59c45515b..000000000
--- a/app/src/main/java/org/linphone/activities/main/chat/fragments/ChatRoomCreationFragment.kt
+++ /dev/null
@@ -1,193 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.main.chat.fragments
-
-import android.content.pm.PackageManager
-import android.os.Bundle
-import android.view.View
-import androidx.lifecycle.ViewModelProvider
-import androidx.recyclerview.widget.LinearLayoutManager
-import org.linphone.LinphoneApplication.Companion.coreContext
-import org.linphone.LinphoneApplication.Companion.corePreferences
-import org.linphone.R
-import org.linphone.activities.GenericActivity
-import org.linphone.activities.main.MainActivity
-import org.linphone.activities.main.chat.viewmodels.ChatRoomCreationViewModel
-import org.linphone.activities.main.fragments.SecureFragment
-import org.linphone.activities.navigateToChatRoom
-import org.linphone.activities.navigateToGroupInfo
-import org.linphone.contact.ContactsSelectionAdapter
-import org.linphone.core.tools.Log
-import org.linphone.databinding.ChatRoomCreationFragmentBinding
-import org.linphone.utils.AppUtils
-import org.linphone.utils.LinphoneUtils
-import org.linphone.utils.PermissionHelper
-
-class ChatRoomCreationFragment : SecureFragment<ChatRoomCreationFragmentBinding>() {
-    private lateinit var viewModel: ChatRoomCreationViewModel
-    private lateinit var adapter: ContactsSelectionAdapter
-
-    override fun getLayoutId(): Int = R.layout.chat_room_creation_fragment
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        binding.lifecycleOwner = viewLifecycleOwner
-
-        useMaterialSharedAxisXForwardAnimation = sharedViewModel.isSlidingPaneSlideable.value == false
-
-        val createGroup = arguments?.getBoolean("createGroup") ?: false
-
-        viewModel = ViewModelProvider(this)[ChatRoomCreationViewModel::class.java]
-        viewModel.createGroupChat.value = createGroup
-
-        viewModel.isEncrypted.value = sharedViewModel.createEncryptedChatRoom
-
-        binding.viewModel = viewModel
-
-        adapter = ContactsSelectionAdapter(viewLifecycleOwner)
-        adapter.setGroupChatCapabilityRequired(viewModel.createGroupChat.value == true)
-        adapter.setLimeCapabilityRequired(viewModel.isEncrypted.value == true)
-        binding.contactsList.adapter = adapter
-
-        val layoutManager = LinearLayoutManager(requireContext())
-        binding.contactsList.layoutManager = layoutManager
-
-        // Divider between items
-        binding.contactsList.addItemDecoration(
-            AppUtils.getDividerDecoration(requireContext(), layoutManager)
-        )
-
-        binding.back.visibility = if ((requireActivity() as GenericActivity).isTablet()) View.INVISIBLE else View.VISIBLE
-
-        binding.setAllContactsToggleClickListener {
-            viewModel.sipContactsSelected.value = false
-        }
-
-        binding.setSipContactsToggleClickListener {
-            viewModel.sipContactsSelected.value = true
-        }
-
-        viewModel.contactsList.observe(
-            viewLifecycleOwner
-        ) {
-            adapter.submitList(it)
-        }
-
-        viewModel.isEncrypted.observe(
-            viewLifecycleOwner
-        ) {
-            adapter.setLimeCapabilityRequired(it)
-        }
-
-        viewModel.sipContactsSelected.observe(
-            viewLifecycleOwner
-        ) {
-            viewModel.applyFilter()
-        }
-
-        viewModel.selectedAddresses.observe(
-            viewLifecycleOwner
-        ) {
-            adapter.updateSelectedAddresses(it)
-        }
-
-        viewModel.chatRoomCreatedEvent.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume { chatRoom ->
-                sharedViewModel.selectedChatRoom.value = chatRoom
-                navigateToChatRoom(AppUtils.createBundleWithSharedTextAndFiles(sharedViewModel))
-            }
-        }
-
-        viewModel.filter.observe(
-            viewLifecycleOwner
-        ) {
-            viewModel.applyFilter()
-        }
-
-        adapter.selectedContact.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume { searchResult ->
-                if (createGroup) {
-                    viewModel.toggleSelectionForSearchResult(searchResult)
-                } else {
-                    viewModel.createOneToOneChat(searchResult)
-                }
-            }
-        }
-
-        addParticipantsFromSharedViewModel()
-
-        // Next button is only used to go to group chat info fragment
-        binding.setNextClickListener {
-            sharedViewModel.createEncryptedChatRoom = viewModel.isEncrypted.value == true
-            sharedViewModel.chatRoomParticipants.value = viewModel.selectedAddresses.value
-            navigateToGroupInfo()
-        }
-
-        viewModel.onMessageToNotifyEvent.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume { messageResourceId ->
-                (activity as MainActivity).showSnackBar(messageResourceId)
-            }
-        }
-
-        if (corePreferences.enableNativeAddressBookIntegration) {
-            if (!PermissionHelper.get().hasReadContactsPermission()) {
-                Log.i("[Chat Room Creation] Asking for READ_CONTACTS permission")
-                requestPermissions(arrayOf(android.Manifest.permission.READ_CONTACTS), 0)
-            }
-        }
-    }
-
-    @Deprecated("Deprecated in Java")
-    override fun onRequestPermissionsResult(
-        requestCode: Int,
-        permissions: Array<out String>,
-        grantResults: IntArray
-    ) {
-        if (requestCode == 0) {
-            val granted = grantResults.isNotEmpty() && grantResults[0] == PackageManager.PERMISSION_GRANTED
-            if (granted) {
-                Log.i("[Chat Room Creation] READ_CONTACTS permission granted")
-                coreContext.fetchContacts()
-            } else {
-                Log.w("[Chat Room Creation] READ_CONTACTS permission denied")
-            }
-        }
-    }
-
-    override fun onResume() {
-        super.onResume()
-
-        viewModel.secureChatAvailable.value = LinphoneUtils.isEndToEndEncryptedChatAvailable()
-    }
-
-    private fun addParticipantsFromSharedViewModel() {
-        val participants = sharedViewModel.chatRoomParticipants.value
-        if (participants != null && participants.size > 0) {
-            viewModel.selectedAddresses.value = participants
-        }
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/main/chat/fragments/DetailChatRoomFragment.kt b/app/src/main/java/org/linphone/activities/main/chat/fragments/DetailChatRoomFragment.kt
deleted file mode 100644
index 8b105a700..000000000
--- a/app/src/main/java/org/linphone/activities/main/chat/fragments/DetailChatRoomFragment.kt
+++ /dev/null
@@ -1,1369 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.main.chat.fragments
-
-import android.app.Activity
-import android.app.Dialog
-import android.content.*
-import android.content.pm.PackageManager
-import android.net.Uri
-import android.os.Bundle
-import android.os.Parcelable
-import android.provider.MediaStore
-import android.view.*
-import android.view.ViewTreeObserver.OnGlobalLayoutListener
-import android.webkit.MimeTypeMap
-import android.widget.PopupWindow
-import androidx.core.content.ContextCompat
-import androidx.core.content.FileProvider
-import androidx.databinding.DataBindingUtil
-import androidx.lifecycle.ViewModelProvider
-import androidx.lifecycle.lifecycleScope
-import androidx.recyclerview.widget.ItemTouchHelper
-import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.RecyclerView
-import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import java.io.File
-import kotlinx.coroutines.*
-import org.linphone.LinphoneApplication.Companion.coreContext
-import org.linphone.LinphoneApplication.Companion.corePreferences
-import org.linphone.R
-import org.linphone.activities.*
-import org.linphone.activities.main.MainActivity
-import org.linphone.activities.main.chat.ChatScrollListener
-import org.linphone.activities.main.chat.adapters.ChatMessagesListAdapter
-import org.linphone.activities.main.chat.data.ChatMessageData
-import org.linphone.activities.main.chat.data.EventLogData
-import org.linphone.activities.main.chat.viewmodels.*
-import org.linphone.activities.main.chat.views.RichEditTextSendListener
-import org.linphone.activities.main.fragments.MasterFragment
-import org.linphone.activities.main.viewmodels.DialogViewModel
-import org.linphone.compatibility.Compatibility
-import org.linphone.core.*
-import org.linphone.core.tools.Log
-import org.linphone.databinding.ChatRoomDetailFragmentBinding
-import org.linphone.databinding.ChatRoomMenuBindingImpl
-import org.linphone.utils.*
-import org.linphone.utils.Event
-
-class DetailChatRoomFragment : MasterFragment<ChatRoomDetailFragmentBinding, ChatMessagesListAdapter>() {
-    private lateinit var viewModel: ChatRoomViewModel
-    private lateinit var chatSendingViewModel: ChatMessageSendingViewModel
-    private lateinit var listViewModel: ChatMessagesListViewModel
-
-    private val observer = object : RecyclerView.AdapterDataObserver() {
-        override fun onItemRangeInserted(positionStart: Int, itemCount: Int) {
-            adapter.notifyItemChanged(positionStart - 1) // For grouping purposes
-
-            if (positionStart == 0 && adapter.itemCount == itemCount) {
-                // First time we fill the list with messages
-                Log.i("[Chat Room] History first $itemCount messages loaded")
-            } else {
-                // Scroll to newly added messages automatically only if user hasn't initiated a scroll up in the messages history
-                if (viewModel.isUserScrollingUp.value == false) {
-                    scrollToFirstUnreadMessageOrBottom(false)
-                } else {
-                    Log.d(
-                        "[Chat Room] User has scrolled up manually in the messages history, don't scroll to the newly added message at the bottom & don't mark the chat room as read"
-                    )
-                }
-            }
-        }
-    }
-
-    private val globalLayoutLayout = object : OnGlobalLayoutListener {
-        override fun onGlobalLayout() {
-            if (isBindingAvailable()) {
-                binding.chatMessagesList
-                    .viewTreeObserver
-                    .removeOnGlobalLayoutListener(this)
-
-                if (::chatScrollListener.isInitialized) {
-                    binding.chatMessagesList.addOnScrollListener(chatScrollListener)
-                }
-
-                if (viewModel.chatRoom.unreadMessagesCount > 0) {
-                    Log.i("[Chat Room] Messages have been displayed, scrolling to first unread")
-                    val notAllMessagesDisplayed = scrollToFirstUnreadMessageOrBottom(false)
-                    if (notAllMessagesDisplayed) {
-                        Log.w(
-                            "[Chat Room] More unread messages than the screen can display, do not mark chat room as read now, wait for user to scroll to bottom"
-                        )
-                    } else {
-                        // Consider user as scrolled to the end when marking chat room as read
-                        viewModel.isUserScrollingUp.value = false
-                        Log.i("[Chat Room] Marking chat room as read")
-                        viewModel.chatRoom.markAsRead()
-                    }
-                }
-            } else {
-                Log.e("[Chat Room] Binding not available in onGlobalLayout callback!")
-            }
-        }
-    }
-
-    private val keyboardVisibilityListener = object : AppUtils.KeyboardVisibilityListener {
-        override fun onKeyboardVisibilityChanged(visible: Boolean) {
-            if (visible && chatSendingViewModel.isEmojiPickerOpen.value == true) {
-                Log.d(
-                    "[Chat Room] Emoji picker is opened, closing it because keyboard is now visible"
-                )
-                chatSendingViewModel.isEmojiPickerOpen.value = false
-            }
-        }
-    }
-
-    private lateinit var chatScrollListener: ChatScrollListener
-
-    override fun getLayoutId(): Int {
-        return R.layout.chat_room_detail_fragment
-    }
-
-    override fun onDestroyView() {
-        binding.chatMessagesList.adapter = null
-
-        super.onDestroyView()
-    }
-
-    override fun onSaveInstanceState(outState: Bundle) {
-        if (isSharedViewModelInitialized()) {
-            val chatRoom = sharedViewModel.selectedChatRoom.value
-            if (chatRoom != null) {
-                outState.putString("LocalSipUri", chatRoom.localAddress.asStringUriOnly())
-                outState.putString("RemoteSipUri", chatRoom.peerAddress.asStringUriOnly())
-                Log.i(
-                    "[Chat Room] Saving current chat room local & remote addresses in save instance state"
-                )
-            }
-        } else {
-            Log.w(
-                "[Chat Room] Can't save instance state, sharedViewModel hasn't been initialized yet"
-            )
-        }
-        super.onSaveInstanceState(outState)
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        postponeEnterTransition()
-
-        binding.lifecycleOwner = viewLifecycleOwner
-
-        binding.sharedMainViewModel = sharedViewModel
-
-        useMaterialSharedAxisXForwardAnimation = sharedViewModel.isSlidingPaneSlideable.value == false
-
-        val localSipUri = arguments?.getString("LocalSipUri") ?: savedInstanceState?.getString(
-            "LocalSipUri"
-        )
-        val remoteSipUri = arguments?.getString("RemoteSipUri") ?: savedInstanceState?.getString(
-            "RemoteSipUri"
-        )
-
-        val textToShare = arguments?.getString("TextToShare")
-        val filesToShare = arguments?.getStringArrayList("FilesToShare")
-
-        if (remoteSipUri != null && arguments?.getString("RemoteSipUri") == null) {
-            Log.w("[Chat Room] Chat room will be restored from saved instance state")
-        }
-        arguments?.clear()
-        if (localSipUri != null && remoteSipUri != null) {
-            Log.i(
-                "[Chat Room] Found local [$localSipUri] & remote [$remoteSipUri] addresses in arguments or saved instance state"
-            )
-
-            val localAddress = Factory.instance().createAddress(localSipUri)
-            val remoteSipAddress = Factory.instance().createAddress(remoteSipUri)
-            sharedViewModel.selectedChatRoom.value = coreContext.core.searchChatRoom(
-                null,
-                localAddress,
-                remoteSipAddress,
-                arrayOfNulls(
-                    0
-                )
-            )
-        }
-
-        val chatRoom = sharedViewModel.selectedChatRoom.value
-        if (chatRoom == null) {
-            Log.e("[Chat Room] Chat room is null, aborting!")
-            goBack()
-            return
-        }
-
-        Compatibility.setLocusIdInContentCaptureSession(binding.root, chatRoom)
-
-        isSecure = chatRoom.currentParams.isEncryptionEnabled
-
-        viewModel = ViewModelProvider(
-            this,
-            ChatRoomViewModelFactory(chatRoom)
-        )[ChatRoomViewModel::class.java]
-
-        binding.viewModel = viewModel
-
-        chatSendingViewModel = ViewModelProvider(
-            this,
-            ChatMessageSendingViewModelFactory(chatRoom)
-        )[ChatMessageSendingViewModel::class.java]
-        binding.chatSendingViewModel = chatSendingViewModel
-
-        listViewModel = ViewModelProvider(
-            this,
-            ChatMessagesListViewModelFactory(chatRoom)
-        )[ChatMessagesListViewModel::class.java]
-
-        _adapter = ChatMessagesListAdapter(listSelectionViewModel, viewLifecycleOwner)
-        // SubmitList is done on a background thread
-        // We need this adapter data observer to know when to scroll
-        binding.chatMessagesList.adapter = adapter
-
-        val layoutManager = LinearLayoutManager(requireContext())
-        layoutManager.stackFromEnd = true
-        binding.chatMessagesList.layoutManager = layoutManager
-
-        // Displays unread messages header
-        val headerItemDecoration = RecyclerViewHeaderDecoration(requireContext(), adapter)
-        binding.chatMessagesList.addItemDecoration(headerItemDecoration)
-
-        // Swipe action
-        val swipeConfiguration = RecyclerViewSwipeConfiguration()
-        // Reply action can only be done on a ChatMessageEventLog
-        swipeConfiguration.leftToRightAction = RecyclerViewSwipeConfiguration.Action(
-            text = requireContext().getString(R.string.chat_message_context_menu_reply),
-            backgroundColor = ContextCompat.getColor(requireContext(), R.color.light_grey_color),
-            preventFor = ChatMessagesListAdapter.EventViewHolder::class.java
-        )
-        // Delete action can be done on any EventLog
-        swipeConfiguration.rightToLeftAction = RecyclerViewSwipeConfiguration.Action(
-            text = requireContext().getString(R.string.chat_message_context_menu_delete),
-            backgroundColor = ContextCompat.getColor(requireContext(), R.color.red_color)
-        )
-        val swipeListener = object : RecyclerViewSwipeListener {
-            override fun onLeftToRightSwipe(viewHolder: RecyclerView.ViewHolder) {
-                val index = viewHolder.bindingAdapterPosition
-                if (index < 0 || index >= adapter.currentList.size) {
-                    Log.e("[Chat Room] Index is out of bound, can't reply to chat message")
-                } else {
-                    adapter.notifyItemChanged(index)
-
-                    val chatMessageEventLog = adapter.currentList[index]
-                    val chatMessage = chatMessageEventLog.eventLog.chatMessage
-                    if (chatMessage != null) {
-                        replyToChatMessage(chatMessage)
-                    }
-                }
-            }
-
-            override fun onRightToLeftSwipe(viewHolder: RecyclerView.ViewHolder) {
-                val index = viewHolder.bindingAdapterPosition
-                if (index < 0 || index >= adapter.currentList.size) {
-                    Log.e("[Chat Room] Index is out of bound, can't delete chat message")
-                } else {
-                    // adapter.notifyItemRemoved(index)
-                    val eventLog = adapter.currentList[index]
-                    addDeleteMessageTaskToQueue(eventLog, index)
-                }
-            }
-        }
-        RecyclerViewSwipeUtils(
-            ItemTouchHelper.RIGHT or ItemTouchHelper.LEFT,
-            swipeConfiguration,
-            swipeListener
-        )
-            .attachToRecyclerView(binding.chatMessagesList)
-
-        chatScrollListener = object : ChatScrollListener(layoutManager) {
-            override fun onLoadMore(totalItemsCount: Int) {
-                Log.i(
-                    "[Chat Room] User has scrolled up far enough, load more items from history (currently there are $totalItemsCount messages displayed)"
-                )
-                listViewModel.loadMoreData(totalItemsCount)
-            }
-
-            override fun onScrolledUp() {
-                viewModel.isUserScrollingUp.value = true
-            }
-
-            override fun onScrolledToEnd() {
-                viewModel.isUserScrollingUp.value = false
-
-                val peerAddress = viewModel.chatRoom.peerAddress.asStringUriOnly()
-                if (viewModel.unreadMessagesCount.value != 0 &&
-                    coreContext.notificationsManager.currentlyDisplayedChatRoomAddress == peerAddress
-                ) {
-                    Log.i(
-                        "[Chat Room] User has scrolled to the latest message, mark chat room as read"
-                    )
-                    viewModel.chatRoom.markAsRead()
-                }
-            }
-        }
-
-        chatSendingViewModel.textToSend.observe(
-            viewLifecycleOwner
-        ) {
-            chatSendingViewModel.onTextToSendChanged(it)
-        }
-
-        chatSendingViewModel.isVoiceRecording.observe(
-            viewLifecycleOwner
-        ) { voiceRecording ->
-            // Keep screen on while recording voice message
-            if (voiceRecording) {
-                requireActivity().window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
-            } else {
-                requireActivity().window.clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
-            }
-        }
-
-        chatSendingViewModel.requestRecordAudioPermissionEvent.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume {
-                Log.i("[Chat Room] Asking for RECORD_AUDIO permission")
-                requestPermissions(arrayOf(android.Manifest.permission.RECORD_AUDIO), 2)
-            }
-        }
-
-        chatSendingViewModel.messageSentEvent.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume {
-                Log.i("[Chat Room] Message sent")
-                // Reset this to ensure sent message will be visible
-                viewModel.isUserScrollingUp.value = false
-            }
-        }
-
-        chatSendingViewModel.requestKeyboardHidingEvent.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume {
-                (requireActivity() as MainActivity).hideKeyboard()
-            }
-        }
-
-        listViewModel.events.observe(
-            viewLifecycleOwner
-        ) { events ->
-            adapter.setUnreadMessageCount(
-                viewModel.chatRoom.unreadMessagesCount,
-                viewModel.isUserScrollingUp.value == true
-            )
-            adapter.submitList(events)
-        }
-
-        listViewModel.messageUpdatedEvent.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume { position ->
-                adapter.notifyItemChanged(position)
-            }
-        }
-
-        listViewModel.requestWriteExternalStoragePermissionEvent.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume {
-                requestPermissions(arrayOf(android.Manifest.permission.WRITE_EXTERNAL_STORAGE), 1)
-            }
-        }
-
-        adapter.deleteMessageEvent.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume { chatMessage ->
-                listViewModel.deleteMessage(chatMessage)
-                sharedViewModel.refreshChatRoomInListEvent.value = Event(true)
-            }
-        }
-
-        adapter.resendMessageEvent.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume { chatMessage ->
-                listViewModel.resendMessage(chatMessage)
-            }
-        }
-
-        adapter.forwardMessageEvent.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume { chatMessage ->
-                // Remove observer before setting the message to forward
-                // as we don't want to forward it in this chat room
-                sharedViewModel.messageToForwardEvent.removeObservers(viewLifecycleOwner)
-                sharedViewModel.messageToForwardEvent.value = Event(chatMessage)
-                sharedViewModel.isPendingMessageForward.value = true
-
-                if (sharedViewModel.isSlidingPaneSlideable.value == true) {
-                    Log.i("[Chat Room] Forwarding message, going to chat rooms list")
-                    goBack()
-                } else {
-                    navigateToEmptyChatRoom()
-                }
-            }
-        }
-
-        adapter.replyMessageEvent.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume { chatMessage ->
-                replyToChatMessage(chatMessage)
-            }
-        }
-
-        adapter.showImdnForMessageEvent.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume { chatMessage ->
-                val args = Bundle()
-                args.putString("MessageId", chatMessage.messageId)
-                navigateToImdn(args)
-            }
-        }
-
-        adapter.addSipUriToContactEvent.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume { sipUri ->
-                Log.i("[Chat Room] Going to contacts list with SIP URI to add: $sipUri")
-                sharedViewModel.updateContactsAnimationsBasedOnDestination.value =
-                    Event(R.id.masterChatRoomsFragment)
-                navigateToContacts(sipUri)
-            }
-        }
-
-        adapter.openContentEvent.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume { content ->
-                var path = content.filePath.orEmpty()
-
-                if (path.isNotEmpty() && !File(path).exists()) {
-                    Log.e("[Chat Room] File not found: $path")
-                    (requireActivity() as MainActivity).showSnackBar(
-                        R.string.chat_room_file_not_found
-                    )
-                } else {
-                    if (path.isEmpty()) {
-                        val name = content.name
-                        if (!name.isNullOrEmpty()) {
-                            val file = FileUtils.getFileStoragePath(name)
-                            FileUtils.writeIntoFile(content.buffer, file)
-                            path = file.absolutePath
-                            content.filePath = path
-                            Log.i(
-                                "[Chat Room] Content file path was empty, created file from buffer at $path"
-                            )
-                        } else if (content.isIcalendar) {
-                            val filename = "conference.ics"
-                            val file = FileUtils.getFileStoragePath(filename)
-                            FileUtils.writeIntoFile(content.buffer, file)
-                            path = file.absolutePath
-                            content.filePath = path
-                            Log.i(
-                                "[Chat Room] Content file path was empty, created conference.ics from buffer at $path"
-                            )
-                        }
-                    }
-
-                    Log.i("[Chat Room] Opening file: $path")
-                    sharedViewModel.contentToOpen.value = content
-
-                    if (corePreferences.useInAppFileViewerForNonEncryptedFiles || content.isFileEncrypted) {
-                        val preventScreenshots =
-                            viewModel.chatRoom.currentParams.isEncryptionEnabled
-
-                        val extension = FileUtils.getExtensionFromFileName(path)
-                        val mime = MimeTypeMap.getSingleton().getMimeTypeFromExtension(extension)
-                        when (FileUtils.getMimeType(mime)) {
-                            FileUtils.MimeType.Image -> navigateToImageFileViewer(
-                                preventScreenshots
-                            )
-                            FileUtils.MimeType.Video -> navigateToVideoFileViewer(
-                                preventScreenshots
-                            )
-                            FileUtils.MimeType.Audio -> navigateToAudioFileViewer(
-                                preventScreenshots
-                            )
-                            FileUtils.MimeType.Pdf -> navigateToPdfFileViewer(
-                                preventScreenshots
-                            )
-                            FileUtils.MimeType.PlainText -> navigateToTextFileViewer(
-                                preventScreenshots
-                            )
-                            else -> {
-                                if (content.isFileEncrypted) {
-                                    Log.w(
-                                        "[Chat Room] File is encrypted and can't be opened in one of our viewers..."
-                                    )
-                                    showDialogForUserConsentBeforeExportingFileInThirdPartyApp(
-                                        content
-                                    )
-                                } else if (!FileUtils.openFileInThirdPartyApp(
-                                        requireActivity(),
-                                        path
-                                    )
-                                ) {
-                                    showDialogToSuggestOpeningFileAsText()
-                                }
-                            }
-                        }
-                    } else {
-                        if (!FileUtils.openFileInThirdPartyApp(requireActivity(), path)) {
-                            showDialogToSuggestOpeningFileAsText()
-                        }
-                    }
-                }
-            }
-        }
-
-        adapter.urlClickEvent.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume { url ->
-                val uri = Uri.parse(url)
-                val browserIntent = Intent(
-                    Intent.ACTION_VIEW,
-                    uri
-                )
-                try {
-                    startActivity(browserIntent)
-                } catch (se: SecurityException) {
-                    Log.e("[Chat Room] Failed to start browser intent from uri [$uri]: $se")
-                } catch (anfe: ActivityNotFoundException) {
-                    Log.e("[Chat Room] Failed to find app matching intent from uri [$uri]: $anfe")
-                }
-            }
-        }
-
-        adapter.sipUriClickedEvent.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume { sipUri ->
-                val args = Bundle()
-                args.putString("URI", sipUri)
-                args.putBoolean("Transfer", false)
-                // If auto start call setting is enabled, ignore it
-                args.putBoolean("SkipAutoCallStart", true)
-                navigateToDialer(args)
-            }
-        }
-
-        adapter.callConferenceEvent.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume { pair ->
-                navigateToConferenceWaitingRoom(pair.first, pair.second)
-            }
-        }
-
-        adapter.scrollToChatMessageEvent.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume { chatMessage ->
-                var index: Int
-                var loadSteps = 0
-                var expectedChildCount: Int
-                do {
-                    val events = listViewModel.events.value.orEmpty()
-                    expectedChildCount = events.size
-                    Log.e("[Chat Room] expectedChildCount : $expectedChildCount")
-                    val eventLog = events.find { eventLog ->
-                        if (eventLog.eventLog.type == EventLog.Type.ConferenceChatMessage) {
-                            (eventLog.data as ChatMessageData).chatMessage.messageId == chatMessage.messageId
-                        } else {
-                            false
-                        }
-                    }
-                    index = events.indexOf(eventLog)
-                    if (index == -1) {
-                        loadSteps += 1
-                        listViewModel.loadMoreData(events.size)
-                    }
-                } while (index == -1 && loadSteps < 5)
-
-                if (index != -1) {
-                    if (loadSteps == 0) {
-                        scrollTo(index, true)
-                    } else {
-                        lifecycleScope.launch {
-                            withContext(Dispatchers.Default) {
-                                var retryCount = 0
-                                do {
-                                    // We have to wait for newly loaded items to be added to list before being able to scroll
-                                    delay(500)
-                                    retryCount += 1
-                                } while (layoutManager.itemCount != expectedChildCount && retryCount < 5)
-
-                                withContext(Dispatchers.Main) {
-                                    scrollTo(index, true)
-                                }
-                            }
-                        }
-                    }
-                } else {
-                    Log.w("[Chat Room] Failed to find matching event!")
-                }
-            }
-        }
-
-        adapter.showReactionsListEvent.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume { message ->
-                val modalBottomSheet = ChatMessageReactionsListDialogFragment()
-                modalBottomSheet.setMessage(message)
-                modalBottomSheet.show(
-                    parentFragmentManager,
-                    ChatMessageReactionsListDialogFragment.TAG
-                )
-            }
-        }
-
-        adapter.errorEvent.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume { message ->
-                (requireActivity() as MainActivity).showSnackBar(message)
-            }
-        }
-
-        binding.setMenuClickListener {
-            showPopupMenu(chatRoom)
-        }
-
-        binding.setMenuLongClickListener {
-            // Only show debug infos if debug mode is enabled
-            if (corePreferences.debugLogs) {
-                val alertDialog = MaterialAlertDialogBuilder(requireContext())
-
-                val messageBuilder = StringBuilder()
-                messageBuilder.append("Chat room id:\n")
-                messageBuilder.append(viewModel.chatRoom.peerAddress.asString())
-                messageBuilder.append("\n")
-                messageBuilder.append("Local account:\n")
-                messageBuilder.append(viewModel.chatRoom.localAddress.asString())
-                val message = messageBuilder.toString()
-                alertDialog.setMessage(message)
-
-                alertDialog.setNeutralButton(R.string.chat_message_context_menu_copy_text) {
-                        _, _ ->
-                    val clipboard: ClipboardManager =
-                        coreContext.context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
-                    val clip = ClipData.newPlainText("Chat room info", message)
-                    clipboard.setPrimaryClip(clip)
-                }
-
-                alertDialog.show()
-                true
-            }
-            false
-        }
-
-        binding.setSecurityIconClickListener {
-            showParticipantsDevices()
-        }
-
-        binding.setAttachFileClickListener {
-            if (PermissionHelper.get().hasReadExternalStoragePermission() || PermissionHelper.get().hasCameraPermission()) {
-                pickFile()
-            } else {
-                Log.i("[Chat Room] Asking for READ_EXTERNAL_STORAGE and CAMERA permissions")
-                Compatibility.requestReadExternalStorageAndCameraPermissions(this, 0)
-            }
-        }
-
-        binding.setVoiceRecordingTouchListener { _, event ->
-            if (corePreferences.holdToRecordVoiceMessage) {
-                when (event.action) {
-                    MotionEvent.ACTION_DOWN -> {
-                        Log.i(
-                            "[Chat Room] Start recording voice message as long as recording button is held"
-                        )
-                        chatSendingViewModel.startVoiceRecording()
-                    }
-                    MotionEvent.ACTION_UP -> {
-                        val voiceRecordingDuration = chatSendingViewModel.voiceRecordingDuration.value ?: 0
-                        if (voiceRecordingDuration < 1000) {
-                            Log.w(
-                                "[Chat Room] Voice recording button has been held for less than a second, considering miss click"
-                            )
-                            chatSendingViewModel.cancelVoiceRecording()
-                            (activity as MainActivity).showSnackBar(
-                                R.string.chat_message_voice_recording_hold_to_record
-                            )
-                        } else {
-                            Log.i(
-                                "[Chat Room] Voice recording button has been released, stop recording"
-                            )
-                            chatSendingViewModel.stopVoiceRecording()
-                        }
-                        view.performClick()
-                    }
-                }
-            }
-            false
-        }
-
-        binding.footer.message.setControlEnterListener(object : RichEditTextSendListener {
-            override fun onControlEnterPressedAndReleased() {
-                Log.i("[Chat Room] Detected left control + enter key presses, sending message")
-                chatSendingViewModel.sendMessage()
-            }
-        })
-
-        binding.setCancelReplyToClickListener {
-            chatSendingViewModel.cancelReply()
-        }
-
-        binding.setScrollToBottomClickListener {
-            scrollToFirstUnreadMessageOrBottom(true)
-            viewModel.isUserScrollingUp.value = false
-        }
-
-        binding.setGroupCallListener {
-            showGroupCallDialog()
-        }
-
-        if (textToShare?.isNotEmpty() == true) {
-            Log.i("[Chat Room] Found text to share")
-            chatSendingViewModel.textToSend.value = textToShare
-        }
-        if (filesToShare?.isNotEmpty() == true) {
-            lifecycleScope.launch {
-                withContext(Dispatchers.Main) {
-                    chatSendingViewModel.attachingFileInProgress.value = true
-                    for (filePath in filesToShare) {
-                        val path = FileUtils.copyToLocalStorage(filePath)
-                        Log.i(
-                            "[Chat Room] Found [$filePath] file to share, matching path is [$path]"
-                        )
-                        if (path != null) {
-                            chatSendingViewModel.addAttachment(path)
-                        }
-                    }
-                    chatSendingViewModel.attachingFileInProgress.value = false
-                }
-            }
-        }
-
-        sharedViewModel.richContentUri.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume { uri ->
-                Log.i("[Chat Room] Found rich content URI: $uri")
-                lifecycleScope.launch {
-                    withContext(Dispatchers.Main) {
-                        chatSendingViewModel.attachingFileInProgress.value = true
-                        val path = FileUtils.getFilePath(requireContext(), uri)
-                        Log.i("[Chat Room] Rich content URI [$uri] matching path is [$path]")
-                        if (path != null) {
-                            chatSendingViewModel.addAttachment(path)
-                        }
-                        chatSendingViewModel.attachingFileInProgress.value = false
-                    }
-                }
-            }
-        }
-
-        sharedViewModel.messageToForwardEvent.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume { chatMessage ->
-                Log.i("[Chat Room] Found message to transfer")
-                showForwardConfirmationDialog(chatMessage)
-                sharedViewModel.isPendingMessageForward.value = false
-            }
-        }
-
-        startPostponedEnterTransition()
-    }
-
-    override fun deleteItems(indexesOfItemToDelete: ArrayList<Int>) {
-        val list = ArrayList<EventLogData>()
-        for (index in indexesOfItemToDelete) {
-            val eventLog = adapter.currentList[index]
-            list.add(eventLog)
-        }
-        listViewModel.deleteEventLogs(list)
-        sharedViewModel.refreshChatRoomInListEvent.value = Event(true)
-    }
-
-    @Deprecated("Deprecated in Java")
-    override fun onRequestPermissionsResult(
-        requestCode: Int,
-        permissions: Array<out String>,
-        grantResults: IntArray
-    ) {
-        var atLeastOneGranted = false
-        for (result in grantResults) {
-            atLeastOneGranted = atLeastOneGranted || result == PackageManager.PERMISSION_GRANTED
-        }
-
-        when (requestCode) {
-            0 -> {
-                if (atLeastOneGranted) {
-                    pickFile()
-                }
-            }
-            2 -> {
-                if (atLeastOneGranted) {
-                    chatSendingViewModel.startVoiceRecording()
-                }
-            }
-        }
-    }
-
-    override fun onResume() {
-        super.onResume()
-
-        if (this::viewModel.isInitialized) {
-            // Prevent notifications for this chat room to be displayed
-            val peerAddress = viewModel.chatRoom.peerAddress.asStringUriOnly()
-            coreContext.notificationsManager.currentlyDisplayedChatRoomAddress = peerAddress
-
-            if (_adapter != null) {
-                try {
-                    adapter.registerAdapterDataObserver(observer)
-                } catch (_: IllegalStateException) {}
-            }
-
-            // Wait for items to be displayed
-            binding.chatMessagesList
-                .viewTreeObserver
-                .addOnGlobalLayoutListener(globalLayoutLayout)
-        } else {
-            Log.e(
-                "[Chat Room] Fragment resuming but viewModel lateinit property isn't initialized!"
-            )
-        }
-
-        (requireActivity() as MainActivity).addKeyboardVisibilityListener(
-            keyboardVisibilityListener
-        )
-    }
-
-    override fun onPause() {
-        if (::chatScrollListener.isInitialized) {
-            binding.chatMessagesList.removeOnScrollListener(chatScrollListener)
-        }
-
-        binding.chatMessagesList
-            .viewTreeObserver.removeOnGlobalLayoutListener(globalLayoutLayout)
-
-        if (_adapter != null) {
-            try {
-                adapter.unregisterAdapterDataObserver(observer)
-            } catch (_: IllegalStateException) {}
-        }
-
-        // Conversation isn't visible anymore, any new message received in it will trigger a notification
-        coreContext.notificationsManager.currentlyDisplayedChatRoomAddress = null
-
-        (requireActivity() as MainActivity).removeKeyboardVisibilityListener(
-            keyboardVisibilityListener
-        )
-
-        super.onPause()
-    }
-
-    @Deprecated("Deprecated in Java")
-    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
-        chatSendingViewModel.attachFilePending.value = false
-        if (resultCode == Activity.RESULT_OK) {
-            lifecycleScope.launch {
-                withContext(Dispatchers.Main) {
-                    chatSendingViewModel.attachingFileInProgress.value = true
-                    for (
-                    fileToUploadPath in FileUtils.getFilesPathFromPickerIntent(
-                        data,
-                        chatSendingViewModel.temporaryFileUploadPath
-                    )
-                    ) {
-                        Log.i("[Chat Room] Found [$fileToUploadPath] file from intent")
-                        chatSendingViewModel.addAttachment(fileToUploadPath)
-                    }
-                    chatSendingViewModel.attachingFileInProgress.value = false
-                }
-            }
-        }
-    }
-
-    private fun enterEditionMode() {
-        listSelectionViewModel.isEditionEnabled.value = true
-    }
-
-    private fun showParticipantsDevices() {
-        if (corePreferences.limeSecurityPopupEnabled) {
-            val dialogViewModel = DialogViewModel(getString(R.string.dialog_lime_security_message))
-            dialogViewModel.showDoNotAskAgain = true
-            val dialog = DialogUtils.getDialog(requireContext(), dialogViewModel)
-
-            dialogViewModel.showCancelButton { doNotAskAgain ->
-                if (doNotAskAgain) corePreferences.limeSecurityPopupEnabled = false
-                dialog.dismiss()
-            }
-
-            val okLabel = if (viewModel.oneParticipantOneDevice) {
-                getString(R.string.dialog_call)
-            } else {
-                getString(
-                    R.string.dialog_ok
-                )
-            }
-            dialogViewModel.showOkButton(
-                { doNotAskAgain ->
-                    if (doNotAskAgain) corePreferences.limeSecurityPopupEnabled = false
-
-                    val address = viewModel.onlyParticipantOnlyDeviceAddress
-                    if (viewModel.oneParticipantOneDevice) {
-                        if (address != null) {
-                            coreContext.startCall(address, forceZRTP = true)
-                        }
-                    } else {
-                        navigateToDevices()
-                    }
-
-                    dialog.dismiss()
-                },
-                okLabel
-            )
-
-            dialog.show()
-        } else {
-            val address = viewModel.onlyParticipantOnlyDeviceAddress
-            if (viewModel.oneParticipantOneDevice) {
-                if (address != null) {
-                    coreContext.startCall(address, forceZRTP = true)
-                }
-            } else {
-                navigateToDevices()
-            }
-        }
-    }
-
-    private fun showGroupInfo(chatRoom: ChatRoom) {
-        sharedViewModel.selectedGroupChatRoom.value = chatRoom
-        sharedViewModel.chatRoomParticipants.value = arrayListOf()
-        navigateToGroupInfo()
-    }
-
-    private fun showEphemeralMessages() {
-        navigateToEphemeralInfo()
-    }
-
-    private fun scheduleMeeting(chatRoom: ChatRoom) {
-        val participants = arrayListOf<Address>()
-        for (participant in chatRoom.participants) {
-            participants.add(participant.address)
-        }
-        sharedViewModel.participantsListForNextScheduledMeeting.value = Event(participants)
-        navigateToConferenceScheduling()
-    }
-
-    private fun showForwardConfirmationDialog(chatMessage: ChatMessage) {
-        val viewModel = DialogViewModel(
-            getString(R.string.chat_message_forward_confirmation_dialog)
-        )
-        viewModel.iconResource = R.drawable.forward_message_default
-        viewModel.showIcon = true
-        val dialog: Dialog = DialogUtils.getDialog(requireContext(), viewModel)
-
-        viewModel.showCancelButton {
-            Log.i("[Chat Room] Transfer cancelled")
-            dialog.dismiss()
-        }
-
-        viewModel.showOkButton(
-            {
-                Log.i("[Chat Room] Transfer confirmed")
-                chatSendingViewModel.transferMessage(chatMessage)
-                dialog.dismiss()
-            },
-            getString(R.string.chat_message_context_menu_forward)
-        )
-
-        dialog.show()
-    }
-
-    private fun showPopupMenu(chatRoom: ChatRoom) {
-        val popupView: ChatRoomMenuBindingImpl = DataBindingUtil.inflate(
-            LayoutInflater.from(context),
-            R.layout.chat_room_menu,
-            null,
-            false
-        )
-        val readOnly = chatRoom.isReadOnly
-        popupView.ephemeralEnabled = !readOnly
-        popupView.devicesEnabled = !readOnly
-        popupView.meetingEnabled = !readOnly
-
-        val itemSize = AppUtils.getDimension(R.dimen.chat_room_popup_item_height).toInt()
-        var totalSize = itemSize * 8
-
-        val notificationsTurnedOff = viewModel.areNotificationsMuted()
-        if (notificationsTurnedOff) {
-            popupView.muteHidden = true
-            totalSize -= itemSize
-        } else {
-            popupView.unmuteHidden = true
-            totalSize -= itemSize
-        }
-
-        if (viewModel.basicChatRoom || viewModel.oneToOneChatRoom) {
-            if (viewModel.contact.value != null) {
-                popupView.addToContactsHidden = true
-            } else {
-                popupView.goToContactHidden = true
-
-                if (corePreferences.readOnlyNativeContacts) {
-                    popupView.addToContactsHidden = true
-                    totalSize -= itemSize
-                }
-            }
-
-            popupView.meetingHidden = true
-            totalSize -= itemSize
-        } else {
-            popupView.addToContactsHidden = true
-            popupView.goToContactHidden = true
-            totalSize -= itemSize
-        }
-
-        if (viewModel.basicChatRoom) {
-            popupView.groupInfoHidden = true
-            totalSize -= itemSize
-            popupView.devicesHidden = true
-            totalSize -= itemSize
-            popupView.ephemeralHidden = true
-            totalSize -= itemSize
-        } else {
-            if (!viewModel.encryptedChatRoom) {
-                popupView.devicesHidden = true
-                totalSize -= itemSize
-                popupView.ephemeralHidden = true
-                totalSize -= itemSize
-            } else {
-                if (viewModel.oneToOneChatRoom) {
-                    popupView.groupInfoHidden = true
-                    totalSize -= itemSize
-                }
-
-                // If one participant one device, a click on security badge
-                // will directly start a call or show the dialog, so don't show this menu
-                if (viewModel.oneParticipantOneDevice) {
-                    popupView.devicesHidden = true
-                    totalSize -= itemSize
-                }
-
-                if (viewModel.ephemeralChatRoom) {
-                    if (chatRoom.currentParams.ephemeralMode == ChatRoom.EphemeralMode.AdminManaged) {
-                        if (chatRoom.me?.isAdmin == false) {
-                            Log.w(
-                                "[Chat Room] Hiding ephemeral menu as mode is admin managed and we aren't admin"
-                            )
-                            popupView.ephemeralHidden = true
-                            totalSize -= itemSize
-                        }
-                    }
-                }
-            }
-        }
-
-        // When using WRAP_CONTENT instead of real size, fails to place the
-        // popup window above if not enough space is available below
-        val popupWindow = PopupWindow(
-            popupView.root,
-            AppUtils.getDimension(R.dimen.chat_room_popup_width).toInt(),
-            totalSize,
-            true
-        )
-        // Elevation is for showing a shadow around the popup
-        popupWindow.elevation = 20f
-
-        popupView.setGroupInfoListener {
-            showGroupInfo(chatRoom)
-            popupWindow.dismiss()
-        }
-        popupView.setDevicesListener {
-            showParticipantsDevices()
-            popupWindow.dismiss()
-        }
-        popupView.setEphemeralListener {
-            showEphemeralMessages()
-            popupWindow.dismiss()
-        }
-        popupView.setMeetingListener {
-            scheduleMeeting(chatRoom)
-            popupWindow.dismiss()
-        }
-        popupView.setEditionModeListener {
-            enterEditionMode()
-            popupWindow.dismiss()
-        }
-        popupView.setMuteListener {
-            viewModel.muteNotifications(true)
-            sharedViewModel.refreshChatRoomInListEvent.value = Event(true)
-            popupWindow.dismiss()
-        }
-        popupView.setUnmuteListener {
-            viewModel.muteNotifications(false)
-            sharedViewModel.refreshChatRoomInListEvent.value = Event(true)
-            popupWindow.dismiss()
-        }
-        popupView.setAddToContactsListener {
-            popupWindow.dismiss()
-            val copy = viewModel.getRemoteAddress()?.clone()
-            if (copy != null) {
-                copy.clean()
-                val address = copy.asStringUriOnly()
-                Log.i("[Chat Room] Creating contact with SIP URI: $address")
-                navigateToContacts(address)
-            }
-        }
-        popupView.setGoToContactListener {
-            popupWindow.dismiss()
-            val contactId = viewModel.contact.value?.refKey
-            if (contactId != null) {
-                Log.i("[Chat Room] Displaying native contact [$contactId]")
-                navigateToNativeContact(contactId)
-            } else {
-                val copy = viewModel.getRemoteAddress()?.clone()
-                if (copy != null) {
-                    copy.clean()
-                    val address = copy.asStringUriOnly()
-                    Log.i("[Chat Room] Displaying friend with address [$address]")
-                    navigateToFriend(address)
-                }
-            }
-        }
-
-        popupWindow.showAsDropDown(binding.menu, 0, 0, Gravity.BOTTOM)
-    }
-
-    private fun addDeleteMessageTaskToQueue(eventLog: EventLogData, position: Int) {
-        val task = lifecycleScope.launch {
-            delay(2800) // Duration of Snackbar.LENGTH_LONG
-            withContext(Dispatchers.Main) {
-                if (isActive) {
-                    Log.i("[Chat Room] Message/event deletion task is still active, proceed")
-                    val chatMessage = eventLog.eventLog.chatMessage
-                    if (chatMessage != null) {
-                        Log.i("[Chat Room] Deleting message $chatMessage at position $position")
-                        listViewModel.deleteMessage(chatMessage)
-                    } else {
-                        Log.i("[Chat Room] Deleting event $eventLog at position $position")
-                        listViewModel.deleteEventLogs(arrayListOf(eventLog))
-                    }
-                    sharedViewModel.refreshChatRoomInListEvent.value = Event(true)
-                }
-            }
-        }
-
-        (requireActivity() as MainActivity).showSnackBar(
-            R.string.chat_message_removal_info,
-            R.string.chat_message_abort_removal
-        ) {
-            Log.i(
-                "[Chat Room] Canceled message/event deletion task: $task for message/event at position $position"
-            )
-            adapter.notifyItemRangeChanged(position, adapter.itemCount - position)
-            task.cancel()
-        }
-    }
-
-    private fun scrollToFirstUnreadMessageOrBottom(smooth: Boolean): Boolean {
-        if (_adapter != null && adapter.itemCount > 0) {
-            val recyclerView = binding.chatMessagesList
-
-            // Scroll to first unread message if any, unless we are already on it
-            val firstUnreadMessagePosition = adapter.getFirstUnreadMessagePosition()
-            val currentPosition = (recyclerView.layoutManager as LinearLayoutManager).findFirstCompletelyVisibleItemPosition()
-            val indexToScrollTo = if (firstUnreadMessagePosition != -1 && firstUnreadMessagePosition != currentPosition) {
-                firstUnreadMessagePosition
-            } else {
-                adapter.itemCount - 1
-            }
-
-            Log.i(
-                "[Chat Room] Scrolling to position $indexToScrollTo, first unread message is at $firstUnreadMessagePosition"
-            )
-            scrollTo(indexToScrollTo, smooth)
-
-            if (firstUnreadMessagePosition == 0) {
-                // Return true only if all unread messages don't fit in the recyclerview height
-                return recyclerView.computeVerticalScrollRange() > recyclerView.height
-            }
-        }
-        return false
-    }
-
-    private fun pickFile() {
-        chatSendingViewModel.attachFilePending.value = true
-        val intentsList = ArrayList<Intent>()
-
-        val pickerIntent = Intent(Intent.ACTION_GET_CONTENT)
-        pickerIntent.type = "*/*"
-        pickerIntent.putExtra(Intent.EXTRA_ALLOW_MULTIPLE, true)
-
-        if (PermissionHelper.get().hasCameraPermission()) {
-            // Allows to capture directly from the camera
-            val capturePictureIntent = Intent(MediaStore.ACTION_IMAGE_CAPTURE)
-            val tempFileName = System.currentTimeMillis().toString() + ".jpeg"
-            val file = FileUtils.getFileStoragePath(tempFileName)
-            chatSendingViewModel.temporaryFileUploadPath = file
-            try {
-                val publicUri = FileProvider.getUriForFile(
-                    requireContext(),
-                    requireContext().getString(R.string.file_provider),
-                    file
-                )
-                capturePictureIntent.putExtra(MediaStore.EXTRA_OUTPUT, publicUri)
-                capturePictureIntent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
-                capturePictureIntent.addFlags(Intent.FLAG_GRANT_WRITE_URI_PERMISSION)
-                intentsList.add(capturePictureIntent)
-
-                val captureVideoIntent = Intent(MediaStore.ACTION_VIDEO_CAPTURE)
-                intentsList.add(captureVideoIntent)
-            } catch (e: Exception) {
-                Log.e("[Chat Room] Failed to pick file: $e")
-            }
-        }
-
-        val chooserIntent =
-            Intent.createChooser(pickerIntent, getString(R.string.chat_message_pick_file_dialog))
-        chooserIntent.putExtra(
-            Intent.EXTRA_INITIAL_INTENTS,
-            intentsList.toArray(arrayOf<Parcelable>())
-        )
-
-        startActivityForResult(chooserIntent, 0)
-    }
-
-    private fun showDialogToSuggestOpeningFileAsText() {
-        val dialogViewModel = DialogViewModel(
-            getString(R.string.dialog_try_open_file_as_text_body),
-            getString(R.string.dialog_try_open_file_as_text_title)
-        )
-        val dialog = DialogUtils.getDialog(requireContext(), dialogViewModel)
-
-        dialogViewModel.showCancelButton {
-            dialog.dismiss()
-        }
-
-        dialogViewModel.showOkButton({
-            dialog.dismiss()
-            navigateToTextFileViewer(true)
-        })
-
-        dialog.show()
-    }
-
-    private fun showDialogForUserConsentBeforeExportingFileInThirdPartyApp(content: Content) {
-        val dialogViewModel = DialogViewModel(
-            getString(R.string.chat_message_cant_open_file_in_app_dialog_message),
-            getString(R.string.chat_message_cant_open_file_in_app_dialog_title)
-        )
-        val dialog = DialogUtils.getDialog(requireContext(), dialogViewModel)
-
-        dialogViewModel.showDeleteButton(
-            {
-                dialog.dismiss()
-                lifecycleScope.launch {
-                    Log.i(
-                        "[Chat Room] [VFS] Content is encrypted, requesting plain file path for file [${content.filePath}]"
-                    )
-                    val plainFilePath = content.exportPlainFile()
-                    if (!FileUtils.openFileInThirdPartyApp(requireActivity(), plainFilePath)) {
-                        showDialogToSuggestOpeningFileAsText()
-                    }
-                }
-            },
-            getString(R.string.chat_message_cant_open_file_in_app_dialog_export_button)
-        )
-
-        dialogViewModel.showOkButton(
-            {
-                dialog.dismiss()
-                navigateToTextFileViewer(true)
-            },
-            getString(R.string.chat_message_cant_open_file_in_app_dialog_open_as_text_button)
-        )
-
-        dialogViewModel.showCancelButton {
-            dialog.dismiss()
-        }
-
-        dialog.show()
-    }
-
-    private fun showGroupCallDialog() {
-        val dialogViewModel = DialogViewModel(
-            getString(R.string.conference_start_group_call_dialog_message),
-            getString(R.string.conference_start_group_call_dialog_title)
-        )
-        val dialog: Dialog = DialogUtils.getDialog(requireContext(), dialogViewModel)
-
-        dialogViewModel.iconResource = R.drawable.icon_video_conf_incoming
-        dialogViewModel.showIcon = true
-
-        dialogViewModel.showCancelButton {
-            dialog.dismiss()
-        }
-
-        dialogViewModel.showOkButton(
-            {
-                dialog.dismiss()
-                viewModel.startGroupCall()
-            },
-            getString(R.string.conference_start_group_call_dialog_ok_button)
-        )
-
-        dialog.show()
-    }
-
-    private fun scrollTo(position: Int, smooth: Boolean = true) {
-        try {
-            if (smooth && corePreferences.enableAnimations) {
-                binding.chatMessagesList.smoothScrollToPosition(position)
-            } else {
-                binding.chatMessagesList.scrollToPosition(position)
-            }
-        } catch (iae: IllegalArgumentException) {
-            Log.e("[Chat Room] Can't scroll to position $position")
-        }
-    }
-
-    private fun replyToChatMessage(chatMessage: ChatMessage) {
-        chatSendingViewModel.pendingChatMessageToReplyTo.value?.destroy()
-        chatSendingViewModel.pendingChatMessageToReplyTo.value =
-            ChatMessageData(chatMessage)
-        chatSendingViewModel.isPendingAnswer.value = true
-
-        if (chatSendingViewModel.sendMessageEnabled.value == false) {
-            // Open keyboard
-            binding.footer.message.requestFocus()
-            (requireActivity() as MainActivity).showKeyboard()
-        }
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/main/chat/fragments/DevicesFragment.kt b/app/src/main/java/org/linphone/activities/main/chat/fragments/DevicesFragment.kt
deleted file mode 100644
index a9f847813..000000000
--- a/app/src/main/java/org/linphone/activities/main/chat/fragments/DevicesFragment.kt
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.main.chat.fragments
-
-import android.os.Bundle
-import android.view.View
-import androidx.lifecycle.ViewModelProvider
-import androidx.navigation.fragment.findNavController
-import org.linphone.R
-import org.linphone.activities.main.chat.viewmodels.DevicesListViewModel
-import org.linphone.activities.main.chat.viewmodels.DevicesListViewModelFactory
-import org.linphone.activities.main.fragments.SecureFragment
-import org.linphone.core.tools.Log
-import org.linphone.databinding.ChatRoomDevicesFragmentBinding
-
-class DevicesFragment : SecureFragment<ChatRoomDevicesFragmentBinding>() {
-    private lateinit var listViewModel: DevicesListViewModel
-
-    override fun getLayoutId(): Int = R.layout.chat_room_devices_fragment
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        binding.lifecycleOwner = viewLifecycleOwner
-
-        val chatRoom = sharedViewModel.selectedChatRoom.value
-        if (chatRoom == null) {
-            Log.e("[Devices] Chat room is null, aborting!")
-            findNavController().navigateUp()
-            return
-        }
-
-        isSecure = chatRoom.currentParams.isEncryptionEnabled
-
-        listViewModel = ViewModelProvider(
-            this,
-            DevicesListViewModelFactory(chatRoom)
-        )[DevicesListViewModel::class.java]
-        binding.viewModel = listViewModel
-    }
-
-    override fun onResume() {
-        super.onResume()
-
-        listViewModel.updateParticipants()
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/main/chat/fragments/EphemeralFragment.kt b/app/src/main/java/org/linphone/activities/main/chat/fragments/EphemeralFragment.kt
deleted file mode 100644
index ba4a3382e..000000000
--- a/app/src/main/java/org/linphone/activities/main/chat/fragments/EphemeralFragment.kt
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.main.chat.fragments
-
-import android.os.Bundle
-import android.view.View
-import androidx.lifecycle.ViewModelProvider
-import androidx.navigation.fragment.findNavController
-import org.linphone.R
-import org.linphone.activities.main.chat.viewmodels.EphemeralViewModel
-import org.linphone.activities.main.chat.viewmodels.EphemeralViewModelFactory
-import org.linphone.activities.main.fragments.SecureFragment
-import org.linphone.core.tools.Log
-import org.linphone.databinding.ChatRoomEphemeralFragmentBinding
-import org.linphone.utils.Event
-
-class EphemeralFragment : SecureFragment<ChatRoomEphemeralFragmentBinding>() {
-    private lateinit var viewModel: EphemeralViewModel
-
-    override fun getLayoutId(): Int {
-        return R.layout.chat_room_ephemeral_fragment
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        isSecure = true
-        binding.lifecycleOwner = viewLifecycleOwner
-
-        val chatRoom = sharedViewModel.selectedChatRoom.value
-        if (chatRoom == null) {
-            Log.e("[Ephemeral] Chat room is null, aborting!")
-            findNavController().navigateUp()
-            return
-        }
-
-        viewModel = ViewModelProvider(
-            this,
-            EphemeralViewModelFactory(chatRoom)
-        )[EphemeralViewModel::class.java]
-        binding.viewModel = viewModel
-
-        binding.setValidClickListener {
-            viewModel.updateChatRoomEphemeralDuration()
-            sharedViewModel.refreshChatRoomInListEvent.value = Event(true)
-            goBack()
-        }
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/main/chat/fragments/GroupInfoFragment.kt b/app/src/main/java/org/linphone/activities/main/chat/fragments/GroupInfoFragment.kt
deleted file mode 100644
index 3450a6ead..000000000
--- a/app/src/main/java/org/linphone/activities/main/chat/fragments/GroupInfoFragment.kt
+++ /dev/null
@@ -1,238 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.main.chat.fragments
-
-import android.app.Dialog
-import android.os.Bundle
-import android.view.View
-import androidx.lifecycle.ViewModelProvider
-import androidx.recyclerview.widget.LinearLayoutManager
-import org.linphone.LinphoneApplication.Companion.corePreferences
-import org.linphone.R
-import org.linphone.activities.main.MainActivity
-import org.linphone.activities.main.chat.GroupChatRoomMember
-import org.linphone.activities.main.chat.adapters.GroupInfoParticipantsAdapter
-import org.linphone.activities.main.chat.data.GroupInfoParticipantData
-import org.linphone.activities.main.chat.viewmodels.GroupInfoViewModel
-import org.linphone.activities.main.chat.viewmodels.GroupInfoViewModelFactory
-import org.linphone.activities.main.fragments.SecureFragment
-import org.linphone.activities.main.viewmodels.DialogViewModel
-import org.linphone.activities.navigateToChatRoom
-import org.linphone.activities.navigateToChatRoomCreation
-import org.linphone.core.Address
-import org.linphone.core.ChatRoom
-import org.linphone.databinding.ChatRoomGroupInfoFragmentBinding
-import org.linphone.utils.AppUtils
-import org.linphone.utils.DialogUtils
-
-class GroupInfoFragment : SecureFragment<ChatRoomGroupInfoFragmentBinding>() {
-    private lateinit var viewModel: GroupInfoViewModel
-    private lateinit var adapter: GroupInfoParticipantsAdapter
-    private var meAdminStatusChangedDialog: Dialog? = null
-
-    override fun getLayoutId(): Int = R.layout.chat_room_group_info_fragment
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        binding.lifecycleOwner = viewLifecycleOwner
-
-        val chatRoom: ChatRoom? = sharedViewModel.selectedGroupChatRoom.value
-        isSecure = chatRoom?.currentParams?.isEncryptionEnabled ?: false
-
-        viewModel = ViewModelProvider(
-            this,
-            GroupInfoViewModelFactory(chatRoom)
-        )[GroupInfoViewModel::class.java]
-        binding.viewModel = viewModel
-
-        viewModel.isEncrypted.value = sharedViewModel.createEncryptedChatRoom
-
-        adapter = GroupInfoParticipantsAdapter(
-            viewLifecycleOwner,
-            chatRoom?.hasCapability(ChatRoom.Capabilities.Encrypted.toInt()) ?: (viewModel.isEncrypted.value == true)
-        )
-        binding.participants.adapter = adapter
-
-        val layoutManager = LinearLayoutManager(requireContext())
-        binding.participants.layoutManager = layoutManager
-
-        // Divider between items
-        binding.participants.addItemDecoration(
-            AppUtils.getDividerDecoration(requireContext(), layoutManager)
-        )
-
-        viewModel.participants.observe(
-            viewLifecycleOwner
-        ) {
-            adapter.submitList(it)
-        }
-
-        viewModel.isMeAdmin.observe(
-            viewLifecycleOwner
-        ) { isMeAdmin ->
-            adapter.showAdminControls(isMeAdmin && chatRoom != null)
-        }
-
-        viewModel.meAdminChangedEvent.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume { isMeAdmin ->
-                showMeAdminStateChanged(isMeAdmin)
-            }
-        }
-
-        adapter.participantRemovedEvent.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume { participant ->
-                viewModel.removeParticipant(participant)
-            }
-        }
-
-        addParticipantsFromSharedViewModel()
-
-        viewModel.createdChatRoomEvent.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume { chatRoom ->
-                goToChatRoom(chatRoom, true)
-            }
-        }
-
-        viewModel.updatedChatRoomEvent.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume { chatRoom ->
-                goToChatRoom(chatRoom, false)
-            }
-        }
-
-        binding.setNextClickListener {
-            if (viewModel.chatRoom != null) {
-                viewModel.updateRoom()
-            } else {
-                viewModel.createChatRoom()
-            }
-        }
-
-        binding.setParticipantsClickListener {
-            sharedViewModel.createEncryptedChatRoom = corePreferences.forceEndToEndEncryptedChat || viewModel.isEncrypted.value == true
-
-            val list = arrayListOf<Address>()
-            for (participant in viewModel.participants.value.orEmpty()) {
-                list.add(participant.participant.address)
-            }
-            sharedViewModel.chatRoomParticipants.value = list
-            sharedViewModel.chatRoomSubject = viewModel.subject.value.orEmpty()
-
-            val args = Bundle()
-            args.putBoolean("createGroup", true)
-            navigateToChatRoomCreation(args)
-        }
-
-        binding.setLeaveClickListener {
-            val dialogViewModel = DialogViewModel(
-                getString(R.string.chat_room_group_info_leave_dialog_message)
-            )
-            val dialog: Dialog = DialogUtils.getDialog(requireContext(), dialogViewModel)
-
-            dialogViewModel.showDeleteButton(
-                {
-                    viewModel.leaveGroup()
-                    dialog.dismiss()
-                },
-                getString(R.string.chat_room_group_info_leave_dialog_button)
-            )
-
-            dialogViewModel.showCancelButton {
-                dialog.dismiss()
-            }
-
-            dialog.show()
-        }
-
-        viewModel.onMessageToNotifyEvent.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume { messageResourceId ->
-                (activity as MainActivity).showSnackBar(messageResourceId)
-            }
-        }
-    }
-
-    private fun addParticipantsFromSharedViewModel() {
-        val participants = sharedViewModel.chatRoomParticipants.value
-        if (participants != null && participants.size > 0) {
-            val list = arrayListOf<GroupInfoParticipantData>()
-
-            for (address in participants) {
-                val exists = viewModel.participants.value?.find {
-                    it.participant.address.weakEqual(address)
-                }
-
-                if (exists != null) {
-                    list.add(exists)
-                } else {
-                    list.add(
-                        GroupInfoParticipantData(
-                            GroupChatRoomMember(
-                                address,
-                                false,
-                                hasLimeX3DHCapability = viewModel.isEncrypted.value == true
-                            )
-                        )
-                    )
-                }
-            }
-
-            viewModel.participants.value = list
-        }
-
-        if (sharedViewModel.chatRoomSubject.isNotEmpty()) {
-            viewModel.subject.value = sharedViewModel.chatRoomSubject
-            sharedViewModel.chatRoomSubject = ""
-        }
-    }
-
-    private fun showMeAdminStateChanged(isMeAdmin: Boolean) {
-        meAdminStatusChangedDialog?.dismiss()
-
-        val message = if (isMeAdmin) {
-            getString(R.string.chat_room_group_info_you_are_now_admin)
-        } else {
-            getString(R.string.chat_room_group_info_you_are_no_longer_admin)
-        }
-        val dialogViewModel = DialogViewModel(message)
-        val dialog = DialogUtils.getDialog(requireContext(), dialogViewModel)
-
-        dialogViewModel.showOkButton({
-            dialog.dismiss()
-        })
-
-        dialog.show()
-        meAdminStatusChangedDialog = dialog
-    }
-
-    private fun goToChatRoom(chatRoom: ChatRoom, created: Boolean) {
-        sharedViewModel.selectedChatRoom.value = chatRoom
-        navigateToChatRoom(AppUtils.createBundleWithSharedTextAndFiles(sharedViewModel), created)
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/main/chat/fragments/ImdnFragment.kt b/app/src/main/java/org/linphone/activities/main/chat/fragments/ImdnFragment.kt
deleted file mode 100644
index adadf75f5..000000000
--- a/app/src/main/java/org/linphone/activities/main/chat/fragments/ImdnFragment.kt
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.main.chat.fragments
-
-import android.os.Bundle
-import android.view.View
-import androidx.lifecycle.ViewModelProvider
-import androidx.navigation.fragment.findNavController
-import androidx.recyclerview.widget.LinearLayoutManager
-import org.linphone.R
-import org.linphone.activities.main.chat.adapters.ImdnAdapter
-import org.linphone.activities.main.chat.viewmodels.ImdnViewModel
-import org.linphone.activities.main.chat.viewmodels.ImdnViewModelFactory
-import org.linphone.activities.main.fragments.SecureFragment
-import org.linphone.core.tools.Log
-import org.linphone.databinding.ChatRoomImdnFragmentBinding
-import org.linphone.utils.AppUtils
-import org.linphone.utils.RecyclerViewHeaderDecoration
-
-class ImdnFragment : SecureFragment<ChatRoomImdnFragmentBinding>() {
-    private lateinit var viewModel: ImdnViewModel
-    private lateinit var adapter: ImdnAdapter
-
-    override fun getLayoutId(): Int {
-        return R.layout.chat_room_imdn_fragment
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        binding.lifecycleOwner = viewLifecycleOwner
-
-        val chatRoom = sharedViewModel.selectedChatRoom.value
-        if (chatRoom == null) {
-            Log.e("[IMDN] Chat room is null, aborting!")
-            findNavController().navigateUp()
-            return
-        }
-
-        isSecure = chatRoom.currentParams.isEncryptionEnabled
-
-        if (arguments != null) {
-            val messageId = arguments?.getString("MessageId")
-            val message = if (messageId != null) chatRoom.findMessage(messageId) else null
-            if (message != null) {
-                Log.i("[IMDN] Found message $message with id $messageId")
-                viewModel = ViewModelProvider(
-                    this,
-                    ImdnViewModelFactory(message)
-                )[ImdnViewModel::class.java]
-                binding.viewModel = viewModel
-            } else {
-                Log.e("[IMDN] Couldn't find message with id $messageId in chat room $chatRoom")
-                findNavController().popBackStack()
-                return
-            }
-        } else {
-            Log.e("[IMDN] Couldn't find message id in intent arguments")
-            findNavController().popBackStack()
-            return
-        }
-
-        adapter = ImdnAdapter(viewLifecycleOwner)
-        binding.participantsList.adapter = adapter
-
-        val layoutManager = LinearLayoutManager(requireContext())
-        binding.participantsList.layoutManager = layoutManager
-
-        // Divider between items
-        binding.participantsList.addItemDecoration(
-            AppUtils.getDividerDecoration(requireContext(), layoutManager)
-        )
-
-        // Displays state header
-        val headerItemDecoration = RecyclerViewHeaderDecoration(requireContext(), adapter)
-        binding.participantsList.addItemDecoration(headerItemDecoration)
-
-        viewModel.participants.observe(
-            viewLifecycleOwner
-        ) {
-            adapter.submitList(it)
-        }
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/main/chat/fragments/MasterChatRoomsFragment.kt b/app/src/main/java/org/linphone/activities/main/chat/fragments/MasterChatRoomsFragment.kt
deleted file mode 100644
index e41ff59db..000000000
--- a/app/src/main/java/org/linphone/activities/main/chat/fragments/MasterChatRoomsFragment.kt
+++ /dev/null
@@ -1,412 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.main.chat.fragments
-
-import android.app.Dialog
-import android.content.res.Configuration
-import android.os.Bundle
-import android.view.View
-import androidx.core.content.ContextCompat
-import androidx.lifecycle.ViewModelProvider
-import androidx.navigation.fragment.NavHostFragment
-import androidx.recyclerview.widget.ItemTouchHelper
-import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.RecyclerView
-import androidx.slidingpanelayout.widget.SlidingPaneLayout
-import com.google.android.material.transition.MaterialSharedAxis
-import org.linphone.LinphoneApplication.Companion.coreContext
-import org.linphone.LinphoneApplication.Companion.corePreferences
-import org.linphone.R
-import org.linphone.activities.GenericActivity
-import org.linphone.activities.clearDisplayedChatRoom
-import org.linphone.activities.main.MainActivity
-import org.linphone.activities.main.chat.adapters.ChatRoomsListAdapter
-import org.linphone.activities.main.chat.viewmodels.ChatRoomsListViewModel
-import org.linphone.activities.main.fragments.MasterFragment
-import org.linphone.activities.main.viewmodels.DialogViewModel
-import org.linphone.activities.navigateToChatRoom
-import org.linphone.activities.navigateToChatRoomCreation
-import org.linphone.core.ChatRoom
-import org.linphone.core.Factory
-import org.linphone.core.tools.Log
-import org.linphone.databinding.ChatRoomMasterFragmentBinding
-import org.linphone.utils.*
-
-class MasterChatRoomsFragment : MasterFragment<ChatRoomMasterFragmentBinding, ChatRoomsListAdapter>() {
-    override val dialogConfirmationMessageBeforeRemoval = R.plurals.chat_room_delete_dialog
-    private lateinit var listViewModel: ChatRoomsListViewModel
-
-    private val observer = object : RecyclerView.AdapterDataObserver() {
-        override fun onChanged() {
-            scrollToTop()
-        }
-        override fun onItemRangeInserted(positionStart: Int, itemCount: Int) {
-            if (positionStart == 0 && itemCount == 1) {
-                scrollToTop()
-            }
-        }
-        override fun onItemRangeMoved(fromPosition: Int, toPosition: Int, itemCount: Int) {
-            scrollToTop()
-        }
-    }
-
-    override fun getLayoutId(): Int = R.layout.chat_room_master_fragment
-
-    override fun onDestroyView() {
-        binding.chatList.adapter = null
-        adapter.unregisterAdapterDataObserver(observer)
-        super.onDestroyView()
-    }
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-
-        useMaterialSharedAxisXForwardAnimation = false
-        if (corePreferences.enableAnimations) {
-            val portraitOrientation = resources.configuration.orientation != Configuration.ORIENTATION_LANDSCAPE
-            val axis = if (portraitOrientation) MaterialSharedAxis.X else MaterialSharedAxis.Y
-            enterTransition = MaterialSharedAxis(axis, true)
-            reenterTransition = MaterialSharedAxis(axis, true)
-            returnTransition = MaterialSharedAxis(axis, false)
-            exitTransition = MaterialSharedAxis(axis, false)
-        }
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        isSecure = true
-        binding.lifecycleOwner = viewLifecycleOwner
-
-        listViewModel = requireActivity().run {
-            ViewModelProvider(this)[ChatRoomsListViewModel::class.java]
-        }
-        binding.viewModel = listViewModel
-
-        /* Shared view model & sliding pane related */
-
-        setUpSlidingPane(binding.slidingPane)
-
-        binding.slidingPane.addPanelSlideListener(object : SlidingPaneLayout.PanelSlideListener {
-            override fun onPanelSlide(panel: View, slideOffset: Float) { }
-
-            override fun onPanelOpened(panel: View) { }
-
-            override fun onPanelClosed(panel: View) {
-                // Conversation isn't visible anymore, any new message received in it will trigger a notification
-                coreContext.notificationsManager.currentlyDisplayedChatRoomAddress = null
-            }
-        })
-
-        sharedViewModel.layoutChangedEvent.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume {
-                sharedViewModel.isSlidingPaneSlideable.value = binding.slidingPane.isSlideable
-                if (binding.slidingPane.isSlideable) {
-                    val navHostFragment =
-                        childFragmentManager.findFragmentById(R.id.chat_nav_container) as NavHostFragment
-                    if (navHostFragment.navController.currentDestination?.id == R.id.emptyChatFragment) {
-                        Log.i(
-                            "[Chat] Foldable device has been folded, closing side pane with empty fragment"
-                        )
-                        binding.slidingPane.closePane()
-                    }
-                }
-            }
-        }
-
-        sharedViewModel.refreshChatRoomInListEvent.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume {
-                val chatRoom = sharedViewModel.selectedChatRoom.value
-                if (chatRoom != null) {
-                    listViewModel.notifyChatRoomUpdate(chatRoom)
-                }
-            }
-        }
-
-        /* End of shared view model & sliding pane related */
-
-        _adapter = ChatRoomsListAdapter(listSelectionViewModel, viewLifecycleOwner)
-        // SubmitList is done on a background thread
-        // We need this adapter data observer to know when to scroll
-        adapter.registerAdapterDataObserver(observer)
-
-        binding.chatList.setHasFixedSize(true)
-        binding.chatList.adapter = adapter
-
-        val layoutManager = LinearLayoutManager(requireContext())
-        binding.chatList.layoutManager = layoutManager
-
-        // Swipe action
-        val swipeConfiguration = RecyclerViewSwipeConfiguration()
-        val white = ContextCompat.getColor(requireContext(), R.color.white_color)
-
-        swipeConfiguration.rightToLeftAction = RecyclerViewSwipeConfiguration.Action(
-            requireContext().getString(R.string.dialog_delete),
-            white,
-            ContextCompat.getColor(requireContext(), R.color.red_color)
-        )
-        swipeConfiguration.leftToRightAction = RecyclerViewSwipeConfiguration.Action(
-            requireContext().getString(R.string.received_chat_notification_mark_as_read_label),
-            white,
-            ContextCompat.getColor(requireContext(), R.color.imdn_read_color)
-        )
-        val swipeListener = object : RecyclerViewSwipeListener {
-            override fun onLeftToRightSwipe(viewHolder: RecyclerView.ViewHolder) {
-                val index = viewHolder.bindingAdapterPosition
-                if (index < 0 || index >= adapter.currentList.size) {
-                    Log.e("[Chat] Index is out of bound, can't mark chat room as read")
-                } else {
-                    val data = adapter.currentList[viewHolder.bindingAdapterPosition]
-                    data.markAsRead()
-                }
-            }
-
-            override fun onRightToLeftSwipe(viewHolder: RecyclerView.ViewHolder) {
-                val viewModel = DialogViewModel(getString(R.string.chat_room_delete_one_dialog))
-                viewModel.showIcon = true
-                viewModel.iconResource = R.drawable.dialog_delete_icon
-                val dialog: Dialog = DialogUtils.getDialog(requireContext(), viewModel)
-
-                val index = viewHolder.bindingAdapterPosition
-                if (index < 0 || index >= adapter.currentList.size) {
-                    Log.e("[Chat] Index is out of bound, can't delete chat room")
-                } else {
-                    viewModel.showCancelButton {
-                        adapter.notifyItemChanged(viewHolder.bindingAdapterPosition)
-                        dialog.dismiss()
-                    }
-
-                    viewModel.showDeleteButton(
-                        {
-                            val deletedChatRoom =
-                                adapter.currentList[index].chatRoom
-                            listViewModel.deleteChatRoom(deletedChatRoom)
-                            if (!binding.slidingPane.isSlideable &&
-                                deletedChatRoom == sharedViewModel.selectedChatRoom.value
-                            ) {
-                                Log.i(
-                                    "[Chat] Currently displayed chat room has been deleted, removing detail fragment"
-                                )
-                                clearDisplayedChatRoom()
-                            }
-                            dialog.dismiss()
-                        },
-                        getString(R.string.dialog_delete)
-                    )
-
-                    dialog.show()
-                }
-            }
-        }
-        RecyclerViewSwipeUtils(
-            ItemTouchHelper.LEFT or ItemTouchHelper.RIGHT,
-            swipeConfiguration,
-            swipeListener
-        )
-            .attachToRecyclerView(binding.chatList)
-
-        // Divider between items
-        binding.chatList.addItemDecoration(
-            AppUtils.getDividerDecoration(requireContext(), layoutManager)
-        )
-
-        listViewModel.chatRooms.observe(
-            viewLifecycleOwner
-        ) { chatRooms ->
-            adapter.submitList(chatRooms)
-        }
-
-        listViewModel.chatRoomIndexUpdatedEvent.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume { index ->
-                adapter.notifyItemChanged(index)
-            }
-        }
-
-        adapter.selectedChatRoomEvent.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume { chatRoom ->
-                if ((requireActivity() as GenericActivity).isDestructionPending) {
-                    Log.w("[Chat] Activity is pending destruction, don't start navigating now!")
-                    sharedViewModel.destructionPendingChatRoom = chatRoom
-                } else {
-                    if (chatRoom.peerAddress.asStringUriOnly() == coreContext.notificationsManager.currentlyDisplayedChatRoomAddress) {
-                        if (!binding.slidingPane.isOpen) {
-                            Log.w("[Chat] Chat room is displayed but sliding pane is closed...")
-                            if (!binding.slidingPane.openPane()) {
-                                Log.e(
-                                    "[Chat] Tried to open pane to workaround already displayed chat room issue, failed!"
-                                )
-                            }
-                        } else {
-                            Log.w("[Chat] This chat room is already displayed!")
-                        }
-                    } else {
-                        sharedViewModel.selectedChatRoom.value = chatRoom
-                        navigateToChatRoom(
-                            AppUtils.createBundleWithSharedTextAndFiles(
-                                sharedViewModel
-                            )
-                        )
-                        binding.slidingPane.openPane()
-                    }
-                }
-            }
-        }
-
-        binding.setEditClickListener {
-            listSelectionViewModel.isEditionEnabled.value = true
-        }
-
-        binding.setCancelForwardClickListener {
-            sharedViewModel.messageToForwardEvent.value?.consume {
-                Log.i("[Chat] Cancelling message forward")
-            }
-            sharedViewModel.isPendingMessageForward.value = false
-        }
-
-        binding.setCancelSharingClickListener {
-            Log.i("[Chat] Cancelling text/files sharing")
-            sharedViewModel.textToShare.value = ""
-            sharedViewModel.filesToShare.value = arrayListOf()
-            listViewModel.fileSharingPending.value = false
-            listViewModel.textSharingPending.value = false
-        }
-
-        binding.setNewOneToOneChatRoomClickListener {
-            sharedViewModel.chatRoomParticipants.value = arrayListOf()
-            navigateToChatRoomCreation(false, binding.slidingPane)
-        }
-
-        binding.setNewGroupChatRoomClickListener {
-            sharedViewModel.selectedGroupChatRoom.value = null
-            sharedViewModel.chatRoomParticipants.value = arrayListOf()
-            navigateToChatRoomCreation(true, binding.slidingPane)
-        }
-
-        val pendingDestructionChatRoom = sharedViewModel.destructionPendingChatRoom
-        if (pendingDestructionChatRoom != null) {
-            Log.w("[Chat] Found pending chat room from before activity was recreated")
-            sharedViewModel.destructionPendingChatRoom = null
-            sharedViewModel.selectedChatRoom.value = pendingDestructionChatRoom
-            navigateToChatRoom(AppUtils.createBundleWithSharedTextAndFiles(sharedViewModel))
-        }
-
-        val localSipUri = arguments?.getString("LocalSipUri")
-        val remoteSipUri = arguments?.getString("RemoteSipUri")
-        if (localSipUri != null && remoteSipUri != null) {
-            Log.i(
-                "[Chat] Found local [$localSipUri] & remote [$remoteSipUri] addresses in arguments"
-            )
-            arguments?.clear()
-            val localAddress = Factory.instance().createAddress(localSipUri)
-            val remoteSipAddress = Factory.instance().createAddress(remoteSipUri)
-            val chatRoom = coreContext.core.searchChatRoom(
-                null,
-                localAddress,
-                remoteSipAddress,
-                arrayOfNulls(0)
-            )
-            if (chatRoom != null) {
-                Log.i("[Chat] Found matching chat room $chatRoom")
-                adapter.selectedChatRoomEvent.value = Event(chatRoom)
-            }
-        } else {
-            sharedViewModel.textToShare.observe(
-                viewLifecycleOwner
-            ) {
-                if (it.isNotEmpty()) {
-                    Log.i("[Chat] Found text to share")
-                    listViewModel.textSharingPending.value = true
-                    clearDisplayedChatRoom()
-                } else {
-                    if (sharedViewModel.filesToShare.value.isNullOrEmpty()) {
-                        listViewModel.textSharingPending.value = false
-                    }
-                }
-            }
-            sharedViewModel.filesToShare.observe(
-                viewLifecycleOwner
-            ) {
-                if (it.isNotEmpty()) {
-                    Log.i("[Chat] Found ${it.size} files to share")
-                    listViewModel.fileSharingPending.value = true
-                    clearDisplayedChatRoom()
-                } else {
-                    if (sharedViewModel.textToShare.value.isNullOrEmpty()) {
-                        listViewModel.fileSharingPending.value = false
-                    }
-                }
-            }
-            sharedViewModel.isPendingMessageForward.observe(
-                viewLifecycleOwner
-            ) {
-                listViewModel.forwardPending.value = it
-                adapter.forwardPending(it)
-                if (it) {
-                    Log.i("[Chat] Found chat message to transfer")
-                }
-            }
-
-            listViewModel.onMessageToNotifyEvent.observe(
-                viewLifecycleOwner
-            ) {
-                it.consume { messageResourceId ->
-                    (activity as MainActivity).showSnackBar(messageResourceId)
-                }
-            }
-        }
-    }
-
-    override fun onResume() {
-        super.onResume()
-
-        listViewModel.groupChatAvailable.value = LinphoneUtils.isGroupChatAvailable()
-    }
-
-    override fun deleteItems(indexesOfItemToDelete: ArrayList<Int>) {
-        val list = ArrayList<ChatRoom>()
-        var closeSlidingPane = false
-        for (index in indexesOfItemToDelete) {
-            val chatRoom = adapter.currentList[index].chatRoom
-            list.add(chatRoom)
-
-            if (chatRoom == sharedViewModel.selectedChatRoom.value) {
-                closeSlidingPane = true
-            }
-        }
-        listViewModel.deleteChatRooms(list)
-
-        if (!binding.slidingPane.isSlideable && closeSlidingPane) {
-            Log.i("[Chat] Currently displayed chat room has been deleted, removing detail fragment")
-            clearDisplayedChatRoom()
-        }
-    }
-
-    private fun scrollToTop() {
-        binding.chatList.scrollToPosition(0)
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/main/chat/receivers/RichContentReceiver.kt b/app/src/main/java/org/linphone/activities/main/chat/receivers/RichContentReceiver.kt
deleted file mode 100644
index e8dfeaee0..000000000
--- a/app/src/main/java/org/linphone/activities/main/chat/receivers/RichContentReceiver.kt
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (c) 2010-2021 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.main.chat.receivers
-
-import android.content.ClipData
-import android.net.Uri
-import android.view.View
-import androidx.core.util.component1
-import androidx.core.util.component2
-import androidx.core.view.ContentInfoCompat
-import androidx.core.view.OnReceiveContentListener
-import org.linphone.core.tools.Log
-
-class RichContentReceiver(private val contentReceived: (uri: Uri) -> Unit) : OnReceiveContentListener {
-    companion object {
-        val MIME_TYPES = arrayOf("image/png", "image/gif", "image/jpeg")
-    }
-
-    override fun onReceiveContent(view: View, payload: ContentInfoCompat): ContentInfoCompat? {
-        val (uriContent, remaining) = payload.partition { item -> item.uri != null }
-        if (uriContent != null) {
-            val clip: ClipData = uriContent.clip
-            for (i in 0 until clip.itemCount) {
-                val uri: Uri = clip.getItemAt(i).uri
-                Log.i("[Content Receiver] Found URI: $uri")
-                contentReceived(uri)
-            }
-        }
-        // Return anything that your app didn't handle. This preserves the default platform
-        // behavior for text and anything else that you aren't implementing custom handling for.
-        return remaining
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatMessageSendingViewModel.kt b/app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatMessageSendingViewModel.kt
deleted file mode 100644
index 9649aafc0..000000000
--- a/app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatMessageSendingViewModel.kt
+++ /dev/null
@@ -1,596 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.main.chat.viewmodels
-
-import android.view.inputmethod.EditorInfo
-import android.widget.Toast
-import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.ViewModel
-import androidx.lifecycle.ViewModelProvider
-import androidx.media.AudioFocusRequestCompat
-import java.io.File
-import java.text.SimpleDateFormat
-import java.util.*
-import kotlin.collections.ArrayList
-import kotlinx.coroutines.*
-import kotlinx.coroutines.flow.flow
-import kotlinx.coroutines.flow.launchIn
-import kotlinx.coroutines.flow.onEach
-import org.linphone.LinphoneApplication.Companion.coreContext
-import org.linphone.LinphoneApplication.Companion.corePreferences
-import org.linphone.R
-import org.linphone.activities.main.chat.data.ChatMessageAttachmentData
-import org.linphone.activities.main.chat.data.ChatMessageData
-import org.linphone.compatibility.Compatibility
-import org.linphone.core.*
-import org.linphone.core.tools.Log
-import org.linphone.utils.*
-import org.linphone.utils.Event
-
-class ChatMessageSendingViewModelFactory(private val chatRoom: ChatRoom) :
-    ViewModelProvider.NewInstanceFactory() {
-
-    @Suppress("UNCHECKED_CAST")
-    override fun <T : ViewModel> create(modelClass: Class<T>): T {
-        return ChatMessageSendingViewModel(chatRoom) as T
-    }
-}
-
-class ChatMessageSendingViewModel(private val chatRoom: ChatRoom) : ViewModel() {
-    var temporaryFileUploadPath: File? = null
-
-    val attachments = MutableLiveData<ArrayList<ChatMessageAttachmentData>>()
-
-    val attachFileEnabled = MutableLiveData<Boolean>()
-
-    val attachFilePending = MutableLiveData<Boolean>()
-
-    val sendMessageEnabled = MutableLiveData<Boolean>()
-
-    val attachingFileInProgress = MutableLiveData<Boolean>()
-
-    val isReadOnly = MutableLiveData<Boolean>()
-
-    var textToSend = MutableLiveData<String>()
-
-    val isPendingAnswer = MutableLiveData<Boolean>()
-
-    var pendingChatMessageToReplyTo = MutableLiveData<ChatMessageData>()
-
-    val requestRecordAudioPermissionEvent: MutableLiveData<Event<Boolean>> by lazy {
-        MutableLiveData<Event<Boolean>>()
-    }
-
-    val messageSentEvent: MutableLiveData<Event<Boolean>> by lazy {
-        MutableLiveData<Event<Boolean>>()
-    }
-
-    val voiceRecordingProgressBarMax = 10000
-
-    val isPendingVoiceRecord = MutableLiveData<Boolean>()
-
-    val isVoiceRecording = MutableLiveData<Boolean>()
-
-    val voiceRecordingDuration = MutableLiveData<Int>()
-
-    val formattedDuration = MutableLiveData<String>()
-
-    val isPlayingVoiceRecording = MutableLiveData<Boolean>()
-
-    val voiceRecordPlayingPosition = MutableLiveData<Int>()
-
-    val imeFlags: Int = if (chatRoom.hasCapability(ChatRoom.Capabilities.Encrypted.toInt())) {
-        // IME_FLAG_NO_PERSONALIZED_LEARNING is only available on Android 8 and newer
-        Compatibility.getImeFlagsForSecureChatRoom()
-    } else {
-        EditorInfo.IME_NULL
-    }
-
-    val isEmojiPickerOpen = MutableLiveData<Boolean>()
-
-    val isEmojiPickerVisible = MutableLiveData<Boolean>()
-
-    val isFileTransferAvailable = MutableLiveData<Boolean>()
-
-    val requestKeyboardHidingEvent: MutableLiveData<Event<Boolean>> by lazy {
-        MutableLiveData<Event<Boolean>>()
-    }
-
-    private lateinit var recorder: Recorder
-
-    private var voiceRecordAudioFocusRequest: AudioFocusRequestCompat? = null
-
-    private lateinit var voiceRecordingPlayer: Player
-    private val playerListener = PlayerListener {
-        Log.i("[Chat Message Sending] End of file reached")
-        stopVoiceRecordPlayer()
-    }
-
-    private val chatRoomListener: ChatRoomListenerStub = object : ChatRoomListenerStub() {
-        override fun onStateChanged(chatRoom: ChatRoom, state: ChatRoom.State) {
-            updateChatRoomReadOnlyState()
-        }
-
-        override fun onConferenceJoined(chatRoom: ChatRoom, eventLog: EventLog) {
-            updateChatRoomReadOnlyState()
-        }
-
-        override fun onConferenceLeft(chatRoom: ChatRoom, eventLog: EventLog) {
-            updateChatRoomReadOnlyState()
-        }
-    }
-
-    private val scope = CoroutineScope(Dispatchers.IO + SupervisorJob())
-
-    init {
-        chatRoom.addListener(chatRoomListener)
-
-        attachments.value = arrayListOf()
-
-        attachFileEnabled.value = true
-        sendMessageEnabled.value = false
-        isEmojiPickerOpen.value = false
-        isEmojiPickerVisible.value = corePreferences.showEmojiPickerButton
-        isFileTransferAvailable.value = LinphoneUtils.isFileTransferAvailable()
-        updateChatRoomReadOnlyState()
-    }
-
-    override fun onCleared() {
-        pendingChatMessageToReplyTo.value?.destroy()
-
-        for (pendingAttachment in attachments.value.orEmpty()) {
-            removeAttachment(pendingAttachment)
-        }
-
-        if (this::recorder.isInitialized) {
-            if (recorder.state != Recorder.State.Closed) {
-                recorder.close()
-            }
-        }
-
-        if (this::voiceRecordingPlayer.isInitialized) {
-            stopVoiceRecordPlayer()
-            voiceRecordingPlayer.removeListener(playerListener)
-        }
-
-        chatRoom.removeListener(chatRoomListener)
-        scope.cancel()
-        super.onCleared()
-    }
-
-    fun onTextToSendChanged(value: String) {
-        sendMessageEnabled.value = value.trim().isNotEmpty() || attachments.value?.isNotEmpty() == true || isPendingVoiceRecord.value == true
-
-        val showEmojiPicker = value.isEmpty() || AppUtils.isTextOnlyContainingEmoji(value)
-        isEmojiPickerVisible.value = corePreferences.showEmojiPickerButton && showEmojiPicker
-
-        if (value.isNotEmpty()) {
-            if (attachFileEnabled.value == true && !corePreferences.allowMultipleFilesAndTextInSameMessage) {
-                attachFileEnabled.value = false
-            }
-            chatRoom.compose()
-        } else {
-            if (!corePreferences.allowMultipleFilesAndTextInSameMessage) {
-                attachFileEnabled.value = attachments.value?.isEmpty() ?: true
-            }
-        }
-    }
-
-    fun addAttachment(path: String) {
-        val list = arrayListOf<ChatMessageAttachmentData>()
-        list.addAll(attachments.value.orEmpty())
-        list.add(
-            ChatMessageAttachmentData(path) {
-                removeAttachment(it)
-            }
-        )
-        attachments.value = list
-
-        sendMessageEnabled.value = textToSend.value.orEmpty().trim().isNotEmpty() || list.isNotEmpty() || isPendingVoiceRecord.value == true
-        if (!corePreferences.allowMultipleFilesAndTextInSameMessage) {
-            attachFileEnabled.value = false
-        }
-    }
-
-    private fun removeAttachment(attachment: ChatMessageAttachmentData) {
-        val list = arrayListOf<ChatMessageAttachmentData>()
-        list.addAll(attachments.value.orEmpty())
-        list.remove(attachment)
-        attachments.value = list
-
-        val pathToDelete = attachment.path
-        Log.i(
-            "[Chat Message Sending] Attachment is being removed, delete local copy [$pathToDelete]"
-        )
-        FileUtils.deleteFile(pathToDelete)
-
-        sendMessageEnabled.value = textToSend.value.orEmpty().trim().isNotEmpty() || list.isNotEmpty() || isPendingVoiceRecord.value == true
-        if (!corePreferences.allowMultipleFilesAndTextInSameMessage) {
-            attachFileEnabled.value = list.isEmpty()
-        }
-    }
-
-    fun toggleEmojiPicker() {
-        isEmojiPickerOpen.value = isEmojiPickerOpen.value == false
-        if (isEmojiPickerOpen.value == true) {
-            requestKeyboardHidingEvent.value = Event(true)
-        }
-    }
-
-    private fun createChatMessage(): ChatMessage {
-        val pendingMessageToReplyTo = pendingChatMessageToReplyTo.value
-        return if (isPendingAnswer.value == true && pendingMessageToReplyTo != null) {
-            chatRoom.createReplyMessage(pendingMessageToReplyTo.chatMessage)
-        } else {
-            chatRoom.createEmptyMessage()
-        }
-    }
-
-    fun sendMessage() {
-        if (!isPlayerClosed()) {
-            stopVoiceRecordPlayer()
-        }
-
-        if (isVoiceRecording.value == true) {
-            stopVoiceRecorder()
-        }
-
-        val message = createChatMessage()
-        val isBasicChatRoom: Boolean = chatRoom.hasCapability(ChatRoom.Capabilities.Basic.toInt())
-
-        var voiceRecord = false
-        if (isPendingVoiceRecord.value == true && recorder.file != null) {
-            val content = recorder.createContent()
-            if (content != null) {
-                Log.i(
-                    "[Chat Message Sending] Voice recording content created, file name is ${content.name} and duration is ${content.fileDuration}"
-                )
-                message.addContent(content)
-                voiceRecord = true
-            } else {
-                Log.e("[Chat Message Sending] Voice recording content couldn't be created!")
-            }
-
-            isPendingVoiceRecord.value = false
-            isVoiceRecording.value = false
-        }
-
-        val toSend = textToSend.value.orEmpty().trim()
-        if (toSend.isNotEmpty()) {
-            if (voiceRecord && isBasicChatRoom) {
-                val textMessage = createChatMessage()
-                textMessage.addUtf8TextContent(toSend)
-                textMessage.send()
-            } else {
-                message.addUtf8TextContent(toSend)
-            }
-        }
-
-        var fileContent = false
-        for (attachment in attachments.value.orEmpty()) {
-            val content = Factory.instance().createContent()
-
-            content.type = when {
-                attachment.isImage -> "image"
-                attachment.isAudio -> "audio"
-                attachment.isVideo -> "video"
-                attachment.isPdf -> "application"
-                else -> "file"
-            }
-            content.subtype = FileUtils.getExtensionFromFileName(attachment.fileName)
-            content.name = attachment.fileName
-            content.filePath = attachment.path // Let the file body handler take care of the upload
-
-            // Do not send file in the same message as the text in a BasicChatRoom
-            // and don't send multiple files in the same message if setting says so
-            if (isBasicChatRoom or (corePreferences.preventMoreThanOneFilePerMessage and (fileContent or voiceRecord))) {
-                val fileMessage = createChatMessage()
-                fileMessage.addFileContent(content)
-                fileMessage.send()
-            } else {
-                message.addFileContent(content)
-                fileContent = true
-            }
-        }
-
-        if (message.contents.isNotEmpty()) {
-            message.send()
-        }
-
-        cancelReply()
-        attachments.value = arrayListOf()
-        textToSend.value = ""
-
-        messageSentEvent.value = Event(true)
-    }
-
-    fun transferMessage(chatMessage: ChatMessage) {
-        val message = chatRoom.createForwardMessage(chatMessage)
-        message.send()
-    }
-
-    fun cancelReply() {
-        pendingChatMessageToReplyTo.value?.destroy()
-        isPendingAnswer.value = false
-    }
-
-    private fun tickerFlowRecording() = flow {
-        while (isVoiceRecording.value == true) {
-            emit(Unit)
-            delay(100)
-        }
-    }
-
-    private fun tickerFlowPlaying() = flow {
-        while (isPlayingVoiceRecording.value == true) {
-            emit(Unit)
-            delay(100)
-        }
-    }
-
-    fun toggleVoiceRecording() {
-        if (corePreferences.holdToRecordVoiceMessage) {
-            // Disables click listener just in case, touch listener will be used instead
-            return
-        }
-
-        if (!this::recorder.isInitialized) {
-            initVoiceMessageRecorder()
-        }
-
-        if (isVoiceRecording.value == true) {
-            stopVoiceRecording()
-        } else {
-            startVoiceRecording()
-        }
-    }
-
-    fun startVoiceRecording() {
-        if (!PermissionHelper.get().hasRecordAudioPermission()) {
-            requestRecordAudioPermissionEvent.value = Event(true)
-            return
-        }
-
-        if (voiceRecordAudioFocusRequest == null) {
-            voiceRecordAudioFocusRequest = AppUtils.acquireAudioFocusForVoiceRecordingOrPlayback(
-                coreContext.context
-            )
-        }
-
-        when (recorder.state) {
-            Recorder.State.Running -> Log.w("[Chat Message Sending] Recorder is already recording")
-            Recorder.State.Paused -> {
-                Log.w("[Chat Message Sending] Recorder isn't closed, resuming recording")
-                recorder.start()
-            }
-            Recorder.State.Closed -> {
-                val extension = when (recorder.params.fileFormat) {
-                    Recorder.FileFormat.Mkv -> "mkv"
-                    else -> "wav"
-                }
-                val tempFileName = "voice-recording-${System.currentTimeMillis()}.$extension"
-                val file = FileUtils.getFileStoragePath(tempFileName)
-                Log.w(
-                    "[Chat Message Sending] Recorder is closed, starting recording in ${file.absoluteFile}"
-                )
-                recorder.open(file.absolutePath)
-                recorder.start()
-            }
-            else -> {}
-        }
-
-        val duration = recorder.duration
-        voiceRecordingDuration.value = duration
-        formattedDuration.value = SimpleDateFormat("mm:ss", Locale.getDefault()).format(duration) // duration is in ms
-
-        isPendingVoiceRecord.value = true
-        isVoiceRecording.value = true
-        sendMessageEnabled.value = true
-
-        val maxVoiceRecordDuration = corePreferences.voiceRecordingMaxDuration
-        tickerFlowRecording().onEach {
-            withContext(Dispatchers.Main) {
-                val duration = recorder.duration
-                voiceRecordingDuration.value = recorder.duration % voiceRecordingProgressBarMax
-                formattedDuration.value = SimpleDateFormat("mm:ss", Locale.getDefault()).format(
-                    duration
-                ) // duration is in ms
-
-                if (duration >= maxVoiceRecordDuration) {
-                    Log.w(
-                        "[Chat Message Sending] Max duration for voice recording exceeded (${maxVoiceRecordDuration}ms), stopping."
-                    )
-                    stopVoiceRecording()
-                }
-            }
-        }.launchIn(scope)
-    }
-
-    fun cancelVoiceRecording() {
-        if (recorder.state != Recorder.State.Closed) {
-            Log.i("[Chat Message Sending] Closing voice recorder")
-            recorder.close()
-
-            val path = recorder.file
-            if (path != null) {
-                Log.i("[Chat Message Sending] Deleting voice recording file: $path")
-                FileUtils.deleteFile(path)
-            }
-        }
-
-        val request = voiceRecordAudioFocusRequest
-        if (request != null) {
-            AppUtils.releaseAudioFocusForVoiceRecordingOrPlayback(coreContext.context, request)
-            voiceRecordAudioFocusRequest = null
-        }
-
-        isPendingVoiceRecord.value = false
-        isVoiceRecording.value = false
-        sendMessageEnabled.value = textToSend.value.orEmpty().trim().isNotEmpty() == true || attachments.value?.isNotEmpty() == true
-
-        if (!isPlayerClosed()) {
-            stopVoiceRecordPlayer()
-        }
-    }
-
-    private fun stopVoiceRecorder() {
-        if (recorder.state == Recorder.State.Running) {
-            Log.i("[Chat Message Sending] Pausing / closing voice recorder")
-            recorder.pause()
-            recorder.close()
-            voiceRecordingDuration.value = recorder.duration
-        }
-
-        val request = voiceRecordAudioFocusRequest
-        if (request != null) {
-            AppUtils.releaseAudioFocusForVoiceRecordingOrPlayback(coreContext.context, request)
-            voiceRecordAudioFocusRequest = null
-        }
-
-        isVoiceRecording.value = false
-    }
-
-    fun stopVoiceRecording() {
-        stopVoiceRecorder()
-
-        if (corePreferences.sendVoiceRecordingRightAway) {
-            Log.i("[Chat Message Sending] Sending voice recording right away")
-            sendMessage()
-        }
-    }
-
-    fun playRecordedMessage() {
-        if (isPlayerClosed()) {
-            Log.w("[Chat Message Sending] Player closed, let's open it first")
-            initVoiceRecordPlayer()
-        }
-
-        if (AppUtils.isMediaVolumeLow(coreContext.context)) {
-            Toast.makeText(
-                coreContext.context,
-                R.string.chat_message_voice_recording_playback_low_volume,
-                Toast.LENGTH_LONG
-            ).show()
-        }
-
-        if (voiceRecordAudioFocusRequest == null) {
-            voiceRecordAudioFocusRequest = AppUtils.acquireAudioFocusForVoiceRecordingOrPlayback(
-                coreContext.context
-            )
-        }
-
-        voiceRecordingPlayer.start()
-        isPlayingVoiceRecording.value = true
-
-        tickerFlowPlaying().onEach {
-            withContext(Dispatchers.Main) {
-                voiceRecordPlayingPosition.value = voiceRecordingPlayer.currentPosition
-            }
-        }.launchIn(scope)
-    }
-
-    fun pauseRecordedMessage() {
-        Log.i("[Chat Message Sending] Pausing voice record")
-        if (!isPlayerClosed()) {
-            voiceRecordingPlayer.pause()
-        }
-
-        val request = voiceRecordAudioFocusRequest
-        if (request != null) {
-            AppUtils.releaseAudioFocusForVoiceRecordingOrPlayback(coreContext.context, request)
-            voiceRecordAudioFocusRequest = null
-        }
-
-        isPlayingVoiceRecording.value = false
-    }
-
-    private fun initVoiceMessageRecorder() {
-        Log.i("[Chat Message Sending] Creating recorder for voice message")
-        val recorderParams = coreContext.core.createRecorderParams()
-        if (corePreferences.voiceMessagesFormatMkv) {
-            recorderParams.fileFormat = Recorder.FileFormat.Mkv
-        } else {
-            recorderParams.fileFormat = Recorder.FileFormat.Wav
-        }
-
-        val recordingAudioDevice = AudioRouteUtils.getAudioRecordingDeviceForVoiceMessage()
-        recorderParams.audioDevice = recordingAudioDevice
-        Log.i(
-            "[Chat Message Sending] Using device ${recorderParams.audioDevice?.id} to make the voice message recording"
-        )
-
-        recorder = coreContext.core.createRecorder(recorderParams)
-    }
-
-    private fun initVoiceRecordPlayer() {
-        Log.i("[Chat Message Sending] Creating player for voice record")
-
-        val playbackSoundCard = AudioRouteUtils.getAudioPlaybackDeviceIdForCallRecordingOrVoiceMessage()
-        Log.i(
-            "[Chat Message Sending] Using device $playbackSoundCard to make the voice message playback"
-        )
-
-        val localPlayer = coreContext.core.createLocalPlayer(playbackSoundCard, null, null)
-        if (localPlayer != null) {
-            voiceRecordingPlayer = localPlayer
-        } else {
-            Log.e("[Chat Message Sending] Couldn't create local player!")
-            return
-        }
-        voiceRecordingPlayer.addListener(playerListener)
-
-        val path = recorder.file
-        if (path != null) {
-            voiceRecordingPlayer.open(path)
-            // Update recording duration using player value to ensure proper progress bar animation
-            voiceRecordingDuration.value = voiceRecordingPlayer.duration
-        }
-    }
-
-    private fun stopVoiceRecordPlayer() {
-        if (!isPlayerClosed()) {
-            Log.i("[Chat Message Sending] Stopping voice record")
-            voiceRecordingPlayer.pause()
-            voiceRecordingPlayer.seek(0)
-            voiceRecordPlayingPosition.value = 0
-            voiceRecordingPlayer.close()
-        }
-
-        val request = voiceRecordAudioFocusRequest
-        if (request != null) {
-            AppUtils.releaseAudioFocusForVoiceRecordingOrPlayback(coreContext.context, request)
-            voiceRecordAudioFocusRequest = null
-        }
-
-        isPlayingVoiceRecording.value = false
-    }
-
-    private fun isPlayerClosed(): Boolean {
-        return !this::voiceRecordingPlayer.isInitialized || voiceRecordingPlayer.state == Player.State.Closed
-    }
-
-    private fun updateChatRoomReadOnlyState() {
-        isReadOnly.value = chatRoom.isReadOnly || (
-            chatRoom.hasCapability(
-                ChatRoom.Capabilities.Conference.toInt()
-            ) && chatRoom.participants.isEmpty()
-            )
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatMessagesListViewModel.kt b/app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatMessagesListViewModel.kt
deleted file mode 100644
index cc3cdad16..000000000
--- a/app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatMessagesListViewModel.kt
+++ /dev/null
@@ -1,270 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.main.chat.viewmodels
-
-import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.ViewModel
-import androidx.lifecycle.ViewModelProvider
-import java.util.*
-import kotlin.math.max
-import org.linphone.activities.main.chat.data.EventLogData
-import org.linphone.core.*
-import org.linphone.core.tools.Log
-import org.linphone.utils.Event
-import org.linphone.utils.LinphoneUtils
-import org.linphone.utils.PermissionHelper
-
-class ChatMessagesListViewModelFactory(private val chatRoom: ChatRoom) :
-    ViewModelProvider.NewInstanceFactory() {
-
-    @Suppress("UNCHECKED_CAST")
-    override fun <T : ViewModel> create(modelClass: Class<T>): T {
-        return ChatMessagesListViewModel(chatRoom) as T
-    }
-}
-
-class ChatMessagesListViewModel(private val chatRoom: ChatRoom) : ViewModel() {
-    companion object {
-        private const val MESSAGES_PER_PAGE = 20
-    }
-
-    val events = MutableLiveData<ArrayList<EventLogData>>()
-
-    val messageUpdatedEvent: MutableLiveData<Event<Int>> by lazy {
-        MutableLiveData<Event<Int>>()
-    }
-
-    val requestWriteExternalStoragePermissionEvent: MutableLiveData<Event<Boolean>> by lazy {
-        MutableLiveData<Event<Boolean>>()
-    }
-
-    private val chatRoomListener: ChatRoomListenerStub = object : ChatRoomListenerStub() {
-        override fun onChatMessagesReceived(chatRoom: ChatRoom, eventLogs: Array<out EventLog>) {
-            for (eventLog in eventLogs) {
-                addChatMessageEventLog(eventLog)
-            }
-        }
-
-        override fun onChatMessageSending(chatRoom: ChatRoom, eventLog: EventLog) {
-            val position = events.value.orEmpty().size
-
-            if (eventLog.type == EventLog.Type.ConferenceChatMessage) {
-                val chatMessage = eventLog.chatMessage
-                chatMessage ?: return
-                chatMessage.userData = position
-            }
-
-            addEvent(eventLog)
-        }
-
-        override fun onSecurityEvent(chatRoom: ChatRoom, eventLog: EventLog) {
-            addEvent(eventLog)
-        }
-
-        override fun onParticipantAdded(chatRoom: ChatRoom, eventLog: EventLog) {
-            addEvent(eventLog)
-        }
-
-        override fun onParticipantRemoved(chatRoom: ChatRoom, eventLog: EventLog) {
-            addEvent(eventLog)
-        }
-
-        override fun onParticipantAdminStatusChanged(chatRoom: ChatRoom, eventLog: EventLog) {
-            addEvent(eventLog)
-        }
-
-        override fun onSubjectChanged(chatRoom: ChatRoom, eventLog: EventLog) {
-            addEvent(eventLog)
-        }
-
-        override fun onConferenceJoined(chatRoom: ChatRoom, eventLog: EventLog) {
-            if (!chatRoom.hasCapability(ChatRoom.Capabilities.OneToOne.toInt())) {
-                addEvent(eventLog)
-            }
-        }
-
-        override fun onConferenceLeft(chatRoom: ChatRoom, eventLog: EventLog) {
-            if (!chatRoom.hasCapability(ChatRoom.Capabilities.OneToOne.toInt())) {
-                addEvent(eventLog)
-            }
-        }
-
-        override fun onEphemeralMessageDeleted(chatRoom: ChatRoom, eventLog: EventLog) {
-            Log.i(
-                "[Chat Messages] An ephemeral chat message has expired, removing it from event list"
-            )
-            deleteEvent(eventLog)
-        }
-
-        override fun onEphemeralEvent(chatRoom: ChatRoom, eventLog: EventLog) {
-            addEvent(eventLog)
-        }
-    }
-
-    init {
-        chatRoom.addListener(chatRoomListener)
-
-        events.value = getEvents()
-    }
-
-    override fun onCleared() {
-        events.value.orEmpty().forEach(EventLogData::destroy)
-        chatRoom.removeListener(chatRoomListener)
-
-        super.onCleared()
-    }
-
-    fun resendMessage(chatMessage: ChatMessage) {
-        val position: Int = chatMessage.userData as Int
-        chatMessage.send()
-        messageUpdatedEvent.value = Event(position)
-    }
-
-    fun deleteMessage(chatMessage: ChatMessage) {
-        LinphoneUtils.deleteFilesAttachedToChatMessage(chatMessage)
-        chatRoom.deleteMessage(chatMessage)
-
-        events.value.orEmpty().forEach(EventLogData::destroy)
-        events.value = getEvents()
-    }
-
-    fun deleteEventLogs(listToDelete: ArrayList<EventLogData>) {
-        for (eventLog in listToDelete) {
-            LinphoneUtils.deleteFilesAttachedToEventLog(eventLog.eventLog)
-            eventLog.eventLog.deleteFromDatabase()
-        }
-
-        events.value.orEmpty().forEach(EventLogData::destroy)
-        events.value = getEvents()
-    }
-
-    fun loadMoreData(totalItemsCount: Int) {
-        Log.i("[Chat Messages] Load more data, current total is $totalItemsCount")
-        val maxSize: Int = chatRoom.historyEventsSize
-
-        if (totalItemsCount < maxSize) {
-            var upperBound: Int = totalItemsCount + MESSAGES_PER_PAGE
-            if (upperBound > maxSize) {
-                upperBound = maxSize
-            }
-
-            val history: Array<EventLog> = chatRoom.getHistoryRangeEvents(
-                totalItemsCount,
-                upperBound
-            )
-            val list = arrayListOf<EventLogData>()
-            for (eventLog in history) {
-                list.add(EventLogData(eventLog))
-            }
-            list.addAll(events.value.orEmpty())
-            events.value = list
-        }
-    }
-
-    private fun addEvent(eventLog: EventLog) {
-        val list = arrayListOf<EventLogData>()
-        list.addAll(events.value.orEmpty())
-        val found = list.find { data -> data.eventLog == eventLog }
-        if (found == null) {
-            list.add(EventLogData(eventLog))
-        }
-        events.value = list
-    }
-
-    private fun getEvents(): ArrayList<EventLogData> {
-        val list = arrayListOf<EventLogData>()
-        val unreadCount = chatRoom.unreadMessagesCount
-        var loadCount = max(MESSAGES_PER_PAGE, unreadCount)
-        Log.i(
-            "[Chat Messages] $unreadCount unread messages in this chat room, loading $loadCount from history"
-        )
-
-        val history = chatRoom.getHistoryEvents(loadCount)
-        var messageCount = 0
-        for (eventLog in history) {
-            list.add(EventLogData(eventLog))
-            if (eventLog.type == EventLog.Type.ConferenceChatMessage) {
-                messageCount += 1
-            }
-        }
-
-        // Load enough events to have at least all unread messages
-        while (unreadCount > 0 && messageCount < unreadCount) {
-            Log.w(
-                "[Chat Messages] There is only $messageCount messages in the last $loadCount events, loading $MESSAGES_PER_PAGE more"
-            )
-            val moreHistory = chatRoom.getHistoryRangeEvents(
-                loadCount,
-                loadCount + MESSAGES_PER_PAGE
-            )
-            loadCount += MESSAGES_PER_PAGE
-            for (eventLog in moreHistory) {
-                list.add(EventLogData(eventLog))
-                if (eventLog.type == EventLog.Type.ConferenceChatMessage) {
-                    messageCount += 1
-                }
-            }
-        }
-
-        return list
-    }
-
-    private fun deleteEvent(eventLog: EventLog) {
-        val chatMessage = eventLog.chatMessage
-        if (chatMessage != null) {
-            LinphoneUtils.deleteFilesAttachedToChatMessage(chatMessage)
-            chatRoom.deleteMessage(chatMessage)
-        }
-
-        events.value.orEmpty().forEach(EventLogData::destroy)
-        events.value = getEvents()
-    }
-
-    private fun addChatMessageEventLog(eventLog: EventLog) {
-        if (eventLog.type == EventLog.Type.ConferenceChatMessage) {
-            val chatMessage = eventLog.chatMessage
-            chatMessage ?: return
-            chatMessage.userData = events.value.orEmpty().size
-
-            val existingEvent = events.value.orEmpty().find { data ->
-                data.eventLog.type == EventLog.Type.ConferenceChatMessage && data.eventLog.chatMessage?.messageId == chatMessage.messageId
-            }
-            if (existingEvent != null) {
-                Log.w(
-                    "[Chat Messages] Found already present chat message, don't add it it's probably the result of an auto download or an aggregated message received before but notified after the conversation was displayed"
-                )
-                return
-            }
-
-            if (!PermissionHelper.get().hasWriteExternalStoragePermission()) {
-                for (content in chatMessage.contents) {
-                    if (content.isFileTransfer) {
-                        Log.i(
-                            "[Chat Messages] Android < 10 detected and WRITE_EXTERNAL_STORAGE permission isn't granted yet"
-                        )
-                        requestWriteExternalStoragePermissionEvent.value = Event(true)
-                    }
-                }
-            }
-        }
-
-        addEvent(eventLog)
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatRoomCreationViewModel.kt b/app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatRoomCreationViewModel.kt
deleted file mode 100644
index 56d6ab24e..000000000
--- a/app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatRoomCreationViewModel.kt
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.main.chat.viewmodels
-
-import androidx.lifecycle.MutableLiveData
-import org.linphone.LinphoneApplication.Companion.coreContext
-import org.linphone.LinphoneApplication.Companion.corePreferences
-import org.linphone.R
-import org.linphone.contact.ContactsSelectionViewModel
-import org.linphone.core.*
-import org.linphone.core.tools.Log
-import org.linphone.utils.AppUtils
-import org.linphone.utils.Event
-import org.linphone.utils.LinphoneUtils
-
-class ChatRoomCreationViewModel : ContactsSelectionViewModel() {
-    val chatRoomCreatedEvent: MutableLiveData<Event<ChatRoom>> by lazy {
-        MutableLiveData<Event<ChatRoom>>()
-    }
-
-    val createGroupChat = MutableLiveData<Boolean>()
-
-    val isEncrypted = MutableLiveData<Boolean>()
-
-    val waitForChatRoomCreation = MutableLiveData<Boolean>()
-
-    val secureChatAvailable = MutableLiveData<Boolean>()
-
-    val secureChatMandatory: Boolean = corePreferences.forceEndToEndEncryptedChat
-
-    private val listener = object : ChatRoomListenerStub() {
-        override fun onStateChanged(room: ChatRoom, state: ChatRoom.State) {
-            if (state == ChatRoom.State.Created) {
-                waitForChatRoomCreation.value = false
-                Log.i("[Chat Room Creation] Chat room created")
-                chatRoomCreatedEvent.value = Event(room)
-            } else if (state == ChatRoom.State.CreationFailed) {
-                Log.e("[Chat Room Creation] Group chat room creation has failed !")
-                waitForChatRoomCreation.value = false
-                onMessageToNotifyEvent.value = Event(R.string.chat_room_creation_failed_snack)
-            }
-        }
-    }
-
-    init {
-        createGroupChat.value = false
-        isEncrypted.value = secureChatMandatory
-        waitForChatRoomCreation.value = false
-        secureChatAvailable.value = LinphoneUtils.isEndToEndEncryptedChatAvailable()
-    }
-
-    fun updateEncryption(encrypted: Boolean) {
-        if (!encrypted && secureChatMandatory) {
-            Log.w(
-                "[Chat Room Creation] Something tries to force plain text chat room even if secureChatMandatory is enabled!"
-            )
-            return
-        }
-        isEncrypted.value = encrypted
-    }
-
-    fun createOneToOneChat(searchResult: SearchResult) {
-        waitForChatRoomCreation.value = true
-        val defaultAccount = coreContext.core.defaultAccount
-        var room: ChatRoom?
-
-        val address = searchResult.address ?: coreContext.core.interpretUrl(
-            searchResult.phoneNumber ?: "",
-            LinphoneUtils.applyInternationalPrefix()
-        )
-        if (address == null) {
-            Log.e("[Chat Room Creation] Can't get a valid address from search result $searchResult")
-            onMessageToNotifyEvent.value = Event(R.string.chat_room_creation_failed_snack)
-            waitForChatRoomCreation.value = false
-            return
-        }
-
-        val encrypted = secureChatMandatory || isEncrypted.value == true
-        val params: ChatRoomParams = coreContext.core.createDefaultChatRoomParams()
-        params.backend = ChatRoom.Backend.Basic
-        params.isGroupEnabled = false
-        if (encrypted) {
-            params.isEncryptionEnabled = true
-            params.backend = ChatRoom.Backend.FlexisipChat
-            params.ephemeralMode = if (corePreferences.useEphemeralPerDeviceMode) {
-                ChatRoom.EphemeralMode.DeviceManaged
-            } else {
-                ChatRoom.EphemeralMode.AdminManaged
-            }
-            params.ephemeralLifetime = 0 // Make sure ephemeral is disabled by default
-            Log.i(
-                "[Chat Room Creation] Ephemeral mode is ${params.ephemeralMode}, lifetime is ${params.ephemeralLifetime}"
-            )
-            params.subject = AppUtils.getString(R.string.chat_room_dummy_subject)
-        }
-
-        val participants = arrayOf(address)
-        val localAddress: Address? = defaultAccount?.params?.identityAddress
-
-        room = coreContext.core.searchChatRoom(params, localAddress, null, participants)
-        if (room == null) {
-            Log.w(
-                "[Chat Room Creation] Couldn't find existing 1-1 chat room with remote ${address.asStringUriOnly()}, encryption=$encrypted and local identity ${localAddress?.asStringUriOnly()}"
-            )
-            room = coreContext.core.createChatRoom(params, localAddress, participants)
-
-            if (room != null) {
-                if (encrypted) {
-                    val state = room.state
-                    if (state == ChatRoom.State.Created) {
-                        Log.i("[Chat Room Creation] Found already created chat room, using it")
-                        chatRoomCreatedEvent.value = Event(room)
-                        waitForChatRoomCreation.value = false
-                    } else {
-                        Log.i(
-                            "[Chat Room Creation] Chat room creation is pending [$state], waiting for Created state"
-                        )
-                        room.addListener(listener)
-                    }
-                } else {
-                    chatRoomCreatedEvent.value = Event(room)
-                    waitForChatRoomCreation.value = false
-                }
-            } else {
-                Log.e(
-                    "[Chat Room Creation] Couldn't create chat room with remote ${address.asStringUriOnly()} and local identity ${localAddress?.asStringUriOnly()}"
-                )
-                waitForChatRoomCreation.value = false
-            }
-        } else {
-            Log.i(
-                "[Chat Room Creation] Found existing 1-1 chat room with remote ${address.asStringUriOnly()}, encryption=$encrypted and local identity ${localAddress?.asStringUriOnly()}"
-            )
-            chatRoomCreatedEvent.value = Event(room)
-            waitForChatRoomCreation.value = false
-        }
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatRoomViewModel.kt b/app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatRoomViewModel.kt
deleted file mode 100644
index 24bab68c1..000000000
--- a/app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatRoomViewModel.kt
+++ /dev/null
@@ -1,447 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.main.chat.viewmodels
-
-import android.animation.ValueAnimator
-import android.view.animation.LinearInterpolator
-import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.ViewModel
-import androidx.lifecycle.ViewModelProvider
-import androidx.lifecycle.viewModelScope
-import kotlinx.coroutines.*
-import org.linphone.LinphoneApplication.Companion.coreContext
-import org.linphone.LinphoneApplication.Companion.corePreferences
-import org.linphone.R
-import org.linphone.contact.ContactDataInterface
-import org.linphone.contact.ContactsUpdatedListenerStub
-import org.linphone.core.*
-import org.linphone.core.tools.Log
-import org.linphone.utils.AppUtils
-import org.linphone.utils.LinphoneUtils
-import org.linphone.utils.TimestampUtils
-
-class ChatRoomViewModelFactory(private val chatRoom: ChatRoom) :
-    ViewModelProvider.NewInstanceFactory() {
-
-    @Suppress("UNCHECKED_CAST")
-    override fun <T : ViewModel> create(modelClass: Class<T>): T {
-        return ChatRoomViewModel(chatRoom) as T
-    }
-}
-
-class ChatRoomViewModel(val chatRoom: ChatRoom) : ViewModel(), ContactDataInterface {
-    override val contact: MutableLiveData<Friend> = MutableLiveData<Friend>()
-    override val displayName: MutableLiveData<String> = MutableLiveData<String>()
-    override val securityLevel: MutableLiveData<ChatRoom.SecurityLevel> = MutableLiveData<ChatRoom.SecurityLevel>()
-    override val showGroupChatAvatar: Boolean
-        get() = conferenceChatRoom && !oneToOneChatRoom
-    override val presenceStatus: MutableLiveData<ConsolidatedPresence> = MutableLiveData<ConsolidatedPresence>()
-    override val coroutineScope: CoroutineScope = viewModelScope
-
-    val subject = MutableLiveData<String>()
-
-    val participants = MutableLiveData<String>()
-
-    val unreadMessagesCount = MutableLiveData<Int>()
-
-    val remoteIsComposing = MutableLiveData<Boolean>()
-
-    val composingList = MutableLiveData<String>()
-
-    val securityLevelIcon = MutableLiveData<Int>()
-
-    val securityLevelContentDescription = MutableLiveData<Int>()
-
-    val lastPresenceInfo = MutableLiveData<String>()
-
-    val ephemeralEnabled = MutableLiveData<Boolean>()
-
-    val basicChatRoom: Boolean by lazy {
-        chatRoom.hasCapability(ChatRoom.Capabilities.Basic.toInt())
-    }
-
-    val oneToOneChatRoom: Boolean by lazy {
-        chatRoom.hasCapability(ChatRoom.Capabilities.OneToOne.toInt())
-    }
-
-    private val conferenceChatRoom: Boolean by lazy {
-        chatRoom.hasCapability(ChatRoom.Capabilities.Conference.toInt())
-    }
-
-    val encryptedChatRoom: Boolean by lazy {
-        chatRoom.hasCapability(ChatRoom.Capabilities.Encrypted.toInt())
-    }
-
-    val ephemeralChatRoom: Boolean by lazy {
-        chatRoom.hasCapability(ChatRoom.Capabilities.Ephemeral.toInt())
-    }
-
-    val meAdmin: MutableLiveData<Boolean> by lazy {
-        MutableLiveData<Boolean>()
-    }
-
-    val isUserScrollingUp = MutableLiveData<Boolean>()
-
-    var oneParticipantOneDevice: Boolean = false
-
-    var onlyParticipantOnlyDeviceAddress: Address? = null
-
-    val chatUnreadCountTranslateY = MutableLiveData<Float>()
-
-    val groupCallAvailable: Boolean
-        get() = LinphoneUtils.isRemoteConferencingAvailable()
-
-    private var addressToCall: Address? = null
-
-    private val bounceAnimator: ValueAnimator by lazy {
-        ValueAnimator.ofFloat(
-            AppUtils.getDimension(R.dimen.tabs_fragment_unread_count_bounce_offset),
-            0f
-        ).apply {
-            addUpdateListener {
-                val value = it.animatedValue as Float
-                chatUnreadCountTranslateY.value = value
-            }
-            interpolator = LinearInterpolator()
-            duration = 250
-            repeatMode = ValueAnimator.REVERSE
-            repeatCount = ValueAnimator.INFINITE
-        }
-    }
-
-    private val contactsUpdatedListener = object : ContactsUpdatedListenerStub() {
-        override fun onContactsUpdated() {
-            Log.d("[Chat Room] Contacts have changed")
-            contactLookup()
-        }
-    }
-
-    private val coreListener: CoreListenerStub = object : CoreListenerStub() {
-        override fun onChatRoomRead(core: Core, room: ChatRoom) {
-            if (room == chatRoom) {
-                updateUnreadMessageCount()
-            }
-        }
-    }
-
-    private val chatRoomListener: ChatRoomListenerStub = object : ChatRoomListenerStub() {
-        override fun onStateChanged(chatRoom: ChatRoom, state: ChatRoom.State) {
-            Log.i("[Chat Room] $chatRoom state changed: $state")
-            if (state == ChatRoom.State.Created) {
-                contactLookup()
-                updateSecurityIcon()
-                updateParticipants()
-                subject.value = chatRoom.subject
-            }
-        }
-
-        override fun onSubjectChanged(chatRoom: ChatRoom, eventLog: EventLog) {
-            subject.value = chatRoom.subject
-        }
-
-        override fun onChatMessagesReceived(chatRoom: ChatRoom, eventLogs: Array<out EventLog>) {
-            updateUnreadMessageCount()
-        }
-
-        override fun onParticipantAdded(chatRoom: ChatRoom, eventLog: EventLog) {
-            contactLookup()
-            updateSecurityIcon()
-            updateParticipants()
-        }
-
-        override fun onParticipantRemoved(chatRoom: ChatRoom, eventLog: EventLog) {
-            contactLookup()
-            updateSecurityIcon()
-            updateParticipants()
-        }
-
-        override fun onIsComposingReceived(
-            chatRoom: ChatRoom,
-            remoteAddr: Address,
-            isComposing: Boolean
-        ) {
-            updateRemotesComposing()
-        }
-
-        override fun onConferenceJoined(chatRoom: ChatRoom, eventLog: EventLog) {
-            contactLookup()
-            updateSecurityIcon()
-            subject.value = chatRoom.subject
-        }
-
-        override fun onSecurityEvent(chatRoom: ChatRoom, eventLog: EventLog) {
-            updateSecurityIcon()
-        }
-
-        override fun onParticipantDeviceAdded(chatRoom: ChatRoom, eventLog: EventLog) {
-            updateSecurityIcon()
-            updateParticipants()
-        }
-
-        override fun onParticipantDeviceRemoved(chatRoom: ChatRoom, eventLog: EventLog) {
-            updateSecurityIcon()
-            updateParticipants()
-        }
-
-        override fun onEphemeralEvent(chatRoom: ChatRoom, eventLog: EventLog) {
-            ephemeralEnabled.value = chatRoom.isEphemeralEnabled
-        }
-
-        override fun onParticipantAdminStatusChanged(chatRoom: ChatRoom, eventLog: EventLog) {
-            meAdmin.value = chatRoom.me?.isAdmin ?: false
-        }
-    }
-
-    init {
-        chatRoom.core.addListener(coreListener)
-        chatRoom.addListener(chatRoomListener)
-        coreContext.contactsManager.addListener(contactsUpdatedListener)
-
-        updateUnreadMessageCount()
-
-        subject.value = chatRoom.subject
-        updateSecurityIcon()
-        meAdmin.value = chatRoom.me?.isAdmin ?: false
-        ephemeralEnabled.value = chatRoom.isEphemeralEnabled
-
-        contactLookup()
-        updateParticipants()
-
-        updateRemotesComposing()
-    }
-
-    override fun onCleared() {
-        coreContext.contactsManager.removeListener(contactsUpdatedListener)
-        chatRoom.removeListener(chatRoomListener)
-        chatRoom.core.removeListener(coreListener)
-        if (corePreferences.enableAnimations) bounceAnimator.end()
-        super.onCleared()
-    }
-
-    fun contactLookup() {
-        presenceStatus.value = ConsolidatedPresence.Offline
-        displayName.value = when {
-            basicChatRoom -> LinphoneUtils.getDisplayName(
-                chatRoom.peerAddress
-            )
-            oneToOneChatRoom -> LinphoneUtils.getDisplayName(
-                chatRoom.participants.firstOrNull()?.address ?: chatRoom.peerAddress
-            )
-            conferenceChatRoom -> chatRoom.subject.orEmpty()
-            else -> chatRoom.peerAddress.asStringUriOnly()
-        }
-
-        if (oneToOneChatRoom) {
-            searchMatchingContact()
-        } else {
-            getParticipantsNames()
-        }
-    }
-
-    fun startCall() {
-        val address = addressToCall ?: if (basicChatRoom) {
-            chatRoom.peerAddress
-        } else {
-            chatRoom.participants.firstOrNull()?.address
-        }
-        if (address != null) {
-            coreContext.startCall(address)
-        } else {
-            Log.e("[Chat Room] Failed to find a SIP address to call!")
-        }
-    }
-
-    fun startGroupCall() {
-        val conferenceScheduler = coreContext.core.createConferenceScheduler()
-        val conferenceInfo = Factory.instance().createConferenceInfo()
-
-        val localAddress = chatRoom.localAddress.clone()
-        localAddress.clean() // Remove GRUU
-        val addresses = Array(chatRoom.participants.size) {
-                index ->
-            chatRoom.participants[index].address
-        }
-        val localAccount = coreContext.core.accountList.find {
-                account ->
-            account.params.identityAddress?.weakEqual(localAddress) ?: false
-        }
-
-        conferenceInfo.organizer = localAddress
-        conferenceInfo.subject = subject.value
-        conferenceInfo.setParticipants(addresses)
-        conferenceScheduler.account = localAccount
-        // Will trigger the conference creation/update automatically
-        conferenceScheduler.info = conferenceInfo
-    }
-
-    fun areNotificationsMuted(): Boolean {
-        return chatRoom.muted
-    }
-
-    fun muteNotifications(mute: Boolean) {
-        chatRoom.muted = mute
-    }
-
-    fun getRemoteAddress(): Address? {
-        return if (basicChatRoom) {
-            chatRoom.peerAddress
-        } else {
-            if (chatRoom.participants.isNotEmpty()) {
-                chatRoom.participants[0].address
-            } else {
-                Log.e(
-                    "[Chat Room] ${chatRoom.peerAddress} doesn't have any participant (state ${chatRoom.state})!"
-                )
-                null
-            }
-        }
-    }
-
-    private fun searchMatchingContact() {
-        val remoteAddress = getRemoteAddress()
-        if (remoteAddress != null) {
-            val friend = coreContext.contactsManager.findContactByAddress(remoteAddress)
-            if (friend != null) {
-                contact.value = friend!!
-                presenceStatus.value = friend.consolidatedPresence
-                computeLastSeenLabel(friend)
-                friend.addListener {
-                    presenceStatus.value = it.consolidatedPresence
-                    computeLastSeenLabel(friend)
-                }
-            }
-        }
-    }
-
-    private fun computeLastSeenLabel(friend: Friend) {
-        if (friend.consolidatedPresence == ConsolidatedPresence.Online) {
-            lastPresenceInfo.value = AppUtils.getString(R.string.chat_room_presence_online)
-            return
-        } else if (friend.consolidatedPresence == ConsolidatedPresence.DoNotDisturb) {
-            lastPresenceInfo.value = AppUtils.getString(R.string.chat_room_presence_do_not_disturb)
-            return
-        }
-
-        val timestamp = friend.presenceModel?.latestActivityTimestamp ?: -1L
-        lastPresenceInfo.value = if (timestamp != -1L) {
-            when {
-                TimestampUtils.isToday(timestamp) -> {
-                    val time = TimestampUtils.timeToString(timestamp, timestampInSecs = true)
-                    val text =
-                        AppUtils.getString(R.string.chat_room_presence_last_seen_online_today)
-                    "$text $time"
-                }
-
-                TimestampUtils.isYesterday(timestamp) -> {
-                    val time = TimestampUtils.timeToString(timestamp, timestampInSecs = true)
-                    val text = AppUtils.getString(
-                        R.string.chat_room_presence_last_seen_online_yesterday
-                    )
-                    "$text $time"
-                }
-
-                else -> {
-                    val date = TimestampUtils.toString(
-                        timestamp,
-                        onlyDate = true,
-                        shortDate = false,
-                        hideYear = true
-                    )
-                    val text = AppUtils.getString(R.string.chat_room_presence_last_seen_online)
-                    "$text $date"
-                }
-            }
-        } else {
-            AppUtils.getString(R.string.chat_room_presence_away)
-        }
-    }
-
-    private fun getParticipantsNames() {
-        if (oneToOneChatRoom) return
-
-        var participantsList = ""
-        var index = 0
-        for (participant in chatRoom.participants) {
-            val contact = coreContext.contactsManager.findContactByAddress(participant.address)
-            participantsList += contact?.name ?: LinphoneUtils.getDisplayName(participant.address)
-            index++
-            if (index != chatRoom.nbParticipants) participantsList += ", "
-        }
-        participants.value = participantsList
-    }
-
-    private fun updateSecurityIcon() {
-        val level = chatRoom.securityLevel
-        securityLevel.value = level
-
-        securityLevelIcon.value = when (level) {
-            ChatRoom.SecurityLevel.Safe -> R.drawable.security_2_indicator
-            ChatRoom.SecurityLevel.Encrypted -> R.drawable.security_1_indicator
-            else -> R.drawable.security_alert_indicator
-        }
-        securityLevelContentDescription.value = when (level) {
-            ChatRoom.SecurityLevel.Safe -> R.string.content_description_security_level_safe
-            ChatRoom.SecurityLevel.Encrypted -> R.string.content_description_security_level_encrypted
-            else -> R.string.content_description_security_level_unsafe
-        }
-    }
-
-    private fun updateRemotesComposing() {
-        val isComposing = chatRoom.isRemoteComposing
-        remoteIsComposing.value = isComposing
-        if (!isComposing) return
-
-        var composing = ""
-        for (address in chatRoom.composingAddresses) {
-            val contact = coreContext.contactsManager.findContactByAddress(address)
-            composing += if (composing.isNotEmpty()) ", " else ""
-            composing += contact?.name ?: LinphoneUtils.getDisplayName(address)
-        }
-        composingList.value = AppUtils.getStringWithPlural(
-            R.plurals.chat_room_remote_composing,
-            chatRoom.composingAddresses.size,
-            composing
-        )
-    }
-
-    private fun updateParticipants() {
-        val participants = chatRoom.participants
-
-        oneParticipantOneDevice = oneToOneChatRoom &&
-            chatRoom.me?.devices?.size == 1 &&
-            participants.firstOrNull()?.devices?.size == 1
-
-        addressToCall = if (basicChatRoom) {
-            chatRoom.peerAddress
-        } else {
-            participants.firstOrNull()?.address
-        }
-
-        onlyParticipantOnlyDeviceAddress = participants.firstOrNull()?.devices?.firstOrNull()?.address
-    }
-
-    private fun updateUnreadMessageCount() {
-        val count = chatRoom.unreadMessagesCount
-        unreadMessagesCount.value = count
-        if (count > 0 && corePreferences.enableAnimations) {
-            bounceAnimator.start()
-        } else if (count == 0 && bounceAnimator.isStarted) bounceAnimator.end()
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatRoomsListViewModel.kt b/app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatRoomsListViewModel.kt
deleted file mode 100644
index 7f3915a7a..000000000
--- a/app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatRoomsListViewModel.kt
+++ /dev/null
@@ -1,195 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.main.chat.viewmodels
-
-import androidx.lifecycle.MutableLiveData
-import org.linphone.LinphoneApplication.Companion.coreContext
-import org.linphone.R
-import org.linphone.activities.main.chat.data.ChatRoomData
-import org.linphone.activities.main.viewmodels.MessageNotifierViewModel
-import org.linphone.compatibility.Compatibility
-import org.linphone.core.*
-import org.linphone.core.tools.Log
-import org.linphone.utils.Event
-import org.linphone.utils.LinphoneUtils
-
-class ChatRoomsListViewModel : MessageNotifierViewModel() {
-    val chatRooms = MutableLiveData<ArrayList<ChatRoomData>>()
-
-    val fileSharingPending = MutableLiveData<Boolean>()
-
-    val textSharingPending = MutableLiveData<Boolean>()
-
-    val forwardPending = MutableLiveData<Boolean>()
-
-    val groupChatAvailable = MutableLiveData<Boolean>()
-
-    val chatRoomIndexUpdatedEvent: MutableLiveData<Event<Int>> by lazy {
-        MutableLiveData<Event<Int>>()
-    }
-
-    private val chatRoomListener = object : ChatRoomListenerStub() {
-        override fun onStateChanged(chatRoom: ChatRoom, newState: ChatRoom.State) {
-            if (newState == ChatRoom.State.Deleted) {
-                Log.i(
-                    "[Chat Rooms] Chat room [${LinphoneUtils.getChatRoomId(chatRoom)}] is in Deleted state, removing it from list"
-                )
-                val list = arrayListOf<ChatRoomData>()
-                val id = LinphoneUtils.getChatRoomId(chatRoom)
-                for (data in chatRooms.value.orEmpty()) {
-                    if (data.id != id) {
-                        list.add(data)
-                    }
-                }
-                chatRooms.value = list
-            }
-        }
-    }
-
-    private val listener: CoreListenerStub = object : CoreListenerStub() {
-        override fun onChatRoomStateChanged(core: Core, chatRoom: ChatRoom, state: ChatRoom.State) {
-            if (state == ChatRoom.State.Created) {
-                Log.i(
-                    "[Chat Rooms] Chat room [${LinphoneUtils.getChatRoomId(chatRoom)}] is in Created state, adding it to list"
-                )
-                val data = ChatRoomData(chatRoom)
-                val list = arrayListOf<ChatRoomData>()
-                list.add(data)
-                list.addAll(chatRooms.value.orEmpty())
-                chatRooms.value = list
-            } else if (state == ChatRoom.State.TerminationFailed) {
-                Log.e(
-                    "[Chat Rooms] Group chat room removal for address ${chatRoom.peerAddress.asStringUriOnly()} has failed !"
-                )
-                onMessageToNotifyEvent.value = Event(R.string.chat_room_removal_failed_snack)
-            }
-        }
-
-        override fun onMessageSent(core: Core, chatRoom: ChatRoom, message: ChatMessage) {
-            onChatRoomMessageEvent(chatRoom)
-        }
-
-        override fun onMessagesReceived(
-            core: Core,
-            chatRoom: ChatRoom,
-            messages: Array<out ChatMessage>
-        ) {
-            onChatRoomMessageEvent(chatRoom)
-        }
-
-        override fun onChatRoomRead(core: Core, chatRoom: ChatRoom) {
-            notifyChatRoomUpdate(chatRoom)
-        }
-
-        override fun onChatRoomEphemeralMessageDeleted(core: Core, chatRoom: ChatRoom) {
-            notifyChatRoomUpdate(chatRoom)
-        }
-
-        override fun onChatRoomSubjectChanged(core: Core, chatRoom: ChatRoom) {
-            notifyChatRoomUpdate(chatRoom)
-        }
-    }
-
-    private var chatRoomsToDeleteCount = 0
-
-    init {
-        groupChatAvailable.value = LinphoneUtils.isGroupChatAvailable()
-        updateChatRooms()
-        coreContext.core.addListener(listener)
-    }
-
-    override fun onCleared() {
-        coreContext.core.removeListener(listener)
-
-        super.onCleared()
-    }
-
-    fun deleteChatRoom(chatRoom: ChatRoom?) {
-        for (eventLog in chatRoom?.getHistoryMessageEvents(0).orEmpty()) {
-            LinphoneUtils.deleteFilesAttachedToEventLog(eventLog)
-        }
-
-        chatRoomsToDeleteCount = 1
-        if (chatRoom != null) {
-            coreContext.notificationsManager.dismissChatNotification(chatRoom)
-            Compatibility.removeChatRoomShortcut(coreContext.context, chatRoom)
-            chatRoom.addListener(chatRoomListener)
-            coreContext.core.deleteChatRoom(chatRoom)
-        }
-    }
-
-    fun deleteChatRooms(chatRooms: ArrayList<ChatRoom>) {
-        chatRoomsToDeleteCount = chatRooms.size
-        for (chatRoom in chatRooms) {
-            for (eventLog in chatRoom.getHistoryMessageEvents(0)) {
-                LinphoneUtils.deleteFilesAttachedToEventLog(eventLog)
-            }
-
-            coreContext.notificationsManager.dismissChatNotification(chatRoom)
-            Compatibility.removeChatRoomShortcut(coreContext.context, chatRoom)
-            chatRoom.addListener(chatRoomListener)
-            chatRoom.core.deleteChatRoom(chatRoom)
-        }
-    }
-
-    fun updateChatRooms() {
-        chatRooms.value.orEmpty().forEach(ChatRoomData::destroy)
-
-        val list = arrayListOf<ChatRoomData>()
-        for (chatRoom in coreContext.core.chatRooms) {
-            list.add(ChatRoomData(chatRoom))
-        }
-        chatRooms.value = list
-    }
-
-    fun notifyChatRoomUpdate(chatRoom: ChatRoom) {
-        val index = findChatRoomIndex(chatRoom)
-        if (index == -1) {
-            updateChatRooms()
-        } else {
-            chatRoomIndexUpdatedEvent.value = Event(index)
-        }
-    }
-
-    private fun reorderChatRooms() {
-        val list = arrayListOf<ChatRoomData>()
-        list.addAll(chatRooms.value.orEmpty())
-        list.sortByDescending { data -> data.chatRoom.lastUpdateTime }
-        chatRooms.value = list
-    }
-
-    private fun findChatRoomIndex(chatRoom: ChatRoom): Int {
-        val id = LinphoneUtils.getChatRoomId(chatRoom)
-        for ((index, data) in chatRooms.value.orEmpty().withIndex()) {
-            if (id == data.id) {
-                return index
-            }
-        }
-        return -1
-    }
-
-    private fun onChatRoomMessageEvent(chatRoom: ChatRoom) {
-        when (findChatRoomIndex(chatRoom)) {
-            -1 -> updateChatRooms()
-            0 -> chatRoomIndexUpdatedEvent.value = Event(0)
-            else -> reorderChatRooms()
-        }
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/main/chat/viewmodels/DevicesListViewModel.kt b/app/src/main/java/org/linphone/activities/main/chat/viewmodels/DevicesListViewModel.kt
deleted file mode 100644
index 625ed9419..000000000
--- a/app/src/main/java/org/linphone/activities/main/chat/viewmodels/DevicesListViewModel.kt
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.main.chat.viewmodels
-
-import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.ViewModel
-import androidx.lifecycle.ViewModelProvider
-import org.linphone.activities.main.chat.data.DevicesListGroupData
-import org.linphone.core.ChatRoom
-import org.linphone.core.ChatRoomListenerStub
-import org.linphone.core.EventLog
-
-class DevicesListViewModelFactory(private val chatRoom: ChatRoom) :
-    ViewModelProvider.NewInstanceFactory() {
-
-    @Suppress("UNCHECKED_CAST")
-    override fun <T : ViewModel> create(modelClass: Class<T>): T {
-        return DevicesListViewModel(chatRoom) as T
-    }
-}
-
-class DevicesListViewModel(private val chatRoom: ChatRoom) : ViewModel() {
-    val participants = MutableLiveData<ArrayList<DevicesListGroupData>>()
-
-    private val listener = object : ChatRoomListenerStub() {
-        override fun onParticipantDeviceAdded(chatRoom: ChatRoom, eventLog: EventLog) {
-            updateParticipants()
-        }
-
-        override fun onParticipantDeviceRemoved(chatRoom: ChatRoom, eventLog: EventLog) {
-            updateParticipants()
-        }
-
-        override fun onParticipantAdded(chatRoom: ChatRoom, eventLog: EventLog) {
-            updateParticipants()
-        }
-
-        override fun onParticipantRemoved(chatRoom: ChatRoom, eventLog: EventLog) {
-            updateParticipants()
-        }
-    }
-
-    init {
-        chatRoom.addListener(listener)
-    }
-
-    override fun onCleared() {
-        participants.value.orEmpty().forEach(DevicesListGroupData::destroy)
-        chatRoom.removeListener(listener)
-
-        super.onCleared()
-    }
-
-    fun updateParticipants() {
-        participants.value.orEmpty().forEach(DevicesListGroupData::destroy)
-
-        val list = arrayListOf<DevicesListGroupData>()
-        val me = chatRoom.me
-        if (me != null) list.add(DevicesListGroupData(me))
-        for (participant in chatRoom.participants) {
-            list.add(DevicesListGroupData(participant))
-        }
-
-        participants.value = list
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/main/chat/viewmodels/EphemeralViewModel.kt b/app/src/main/java/org/linphone/activities/main/chat/viewmodels/EphemeralViewModel.kt
deleted file mode 100644
index 22da304cf..000000000
--- a/app/src/main/java/org/linphone/activities/main/chat/viewmodels/EphemeralViewModel.kt
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.main.chat.viewmodels
-
-import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.ViewModel
-import androidx.lifecycle.ViewModelProvider
-import org.linphone.R
-import org.linphone.activities.main.chat.data.DurationItemClicked
-import org.linphone.activities.main.chat.data.EphemeralDurationData
-import org.linphone.core.ChatRoom
-import org.linphone.core.tools.Log
-
-class EphemeralViewModelFactory(private val chatRoom: ChatRoom) :
-    ViewModelProvider.NewInstanceFactory() {
-
-    @Suppress("UNCHECKED_CAST")
-    override fun <T : ViewModel> create(modelClass: Class<T>): T {
-        return EphemeralViewModel(chatRoom) as T
-    }
-}
-
-class EphemeralViewModel(private val chatRoom: ChatRoom) : ViewModel() {
-    val durationsList = MutableLiveData<ArrayList<EphemeralDurationData>>()
-
-    var currentSelectedDuration: Long = 0
-
-    private val listener = object : DurationItemClicked {
-        override fun onDurationValueChanged(duration: Long) {
-            currentSelectedDuration = duration
-            computeEphemeralDurationValues()
-        }
-    }
-
-    init {
-        Log.i(
-            "[Ephemeral Messages] Current lifetime is ${chatRoom.ephemeralLifetime}, ephemeral enabled? ${chatRoom.isEphemeralEnabled}"
-        )
-        currentSelectedDuration = if (chatRoom.isEphemeralEnabled) chatRoom.ephemeralLifetime else 0
-        computeEphemeralDurationValues()
-    }
-
-    fun updateChatRoomEphemeralDuration() {
-        Log.i("[Ephemeral Messages] Selected value is $currentSelectedDuration")
-        if (currentSelectedDuration > 0) {
-            if (chatRoom.ephemeralLifetime != currentSelectedDuration) {
-                Log.i(
-                    "[Ephemeral Messages] Setting new lifetime for ephemeral messages to $currentSelectedDuration"
-                )
-                chatRoom.ephemeralLifetime = currentSelectedDuration
-            } else {
-                Log.i(
-                    "[Ephemeral Messages] Configured lifetime for ephemeral messages was already $currentSelectedDuration"
-                )
-            }
-
-            if (!chatRoom.isEphemeralEnabled) {
-                Log.i("[Ephemeral Messages] Ephemeral messages were disabled, enable them")
-                chatRoom.isEphemeralEnabled = true
-            }
-        } else if (chatRoom.isEphemeralEnabled) {
-            Log.i("[Ephemeral Messages] Ephemeral messages were enabled, disable them")
-            chatRoom.isEphemeralEnabled = false
-        }
-    }
-
-    private fun computeEphemeralDurationValues() {
-        val list = arrayListOf<EphemeralDurationData>()
-        list.add(
-            EphemeralDurationData(
-                R.string.chat_room_ephemeral_message_disabled,
-                currentSelectedDuration,
-                0,
-                listener
-            )
-        )
-        list.add(
-            EphemeralDurationData(
-                R.string.chat_room_ephemeral_message_one_minute,
-                currentSelectedDuration,
-                60,
-                listener
-            )
-        )
-        list.add(
-            EphemeralDurationData(
-                R.string.chat_room_ephemeral_message_one_hour,
-                currentSelectedDuration,
-                3600,
-                listener
-            )
-        )
-        list.add(
-            EphemeralDurationData(
-                R.string.chat_room_ephemeral_message_one_day,
-                currentSelectedDuration,
-                86400,
-                listener
-            )
-        )
-        list.add(
-            EphemeralDurationData(
-                R.string.chat_room_ephemeral_message_three_days,
-                currentSelectedDuration,
-                259200,
-                listener
-            )
-        )
-        list.add(
-            EphemeralDurationData(
-                R.string.chat_room_ephemeral_message_one_week,
-                currentSelectedDuration,
-                604800,
-                listener
-            )
-        )
-        durationsList.value = list
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/main/chat/viewmodels/GroupInfoViewModel.kt b/app/src/main/java/org/linphone/activities/main/chat/viewmodels/GroupInfoViewModel.kt
deleted file mode 100644
index ffeef03c8..000000000
--- a/app/src/main/java/org/linphone/activities/main/chat/viewmodels/GroupInfoViewModel.kt
+++ /dev/null
@@ -1,257 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.main.chat.viewmodels
-
-import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.ViewModel
-import androidx.lifecycle.ViewModelProvider
-import org.linphone.LinphoneApplication.Companion.coreContext
-import org.linphone.LinphoneApplication.Companion.corePreferences
-import org.linphone.R
-import org.linphone.activities.main.chat.GroupChatRoomMember
-import org.linphone.activities.main.chat.data.GroupInfoParticipantData
-import org.linphone.activities.main.viewmodels.MessageNotifierViewModel
-import org.linphone.core.*
-import org.linphone.core.tools.Log
-import org.linphone.utils.Event
-
-class GroupInfoViewModelFactory(private val chatRoom: ChatRoom?) :
-    ViewModelProvider.NewInstanceFactory() {
-
-    @Suppress("UNCHECKED_CAST")
-    override fun <T : ViewModel> create(modelClass: Class<T>): T {
-        return GroupInfoViewModel(chatRoom) as T
-    }
-}
-
-class GroupInfoViewModel(val chatRoom: ChatRoom?) : MessageNotifierViewModel() {
-    val createdChatRoomEvent = MutableLiveData<Event<ChatRoom>>()
-    val updatedChatRoomEvent = MutableLiveData<Event<ChatRoom>>()
-
-    val subject = MutableLiveData<String>()
-
-    val participants = MutableLiveData<ArrayList<GroupInfoParticipantData>>()
-
-    val isEncrypted = MutableLiveData<Boolean>()
-
-    val isMeAdmin = MutableLiveData<Boolean>()
-
-    val canLeaveGroup = MutableLiveData<Boolean>()
-
-    val waitForChatRoomCreation = MutableLiveData<Boolean>()
-
-    val meAdminChangedEvent: MutableLiveData<Event<Boolean>> by lazy {
-        MutableLiveData<Event<Boolean>>()
-    }
-
-    private val listener = object : ChatRoomListenerStub() {
-        override fun onStateChanged(chatRoom: ChatRoom, state: ChatRoom.State) {
-            if (state == ChatRoom.State.Created) {
-                waitForChatRoomCreation.value = false
-                createdChatRoomEvent.value = Event(chatRoom) // To trigger going to the chat room
-            } else if (state == ChatRoom.State.CreationFailed) {
-                Log.e("[Chat Room Group Info] Group chat room creation has failed !")
-                waitForChatRoomCreation.value = false
-                onMessageToNotifyEvent.value = Event(R.string.chat_room_creation_failed_snack)
-            }
-        }
-
-        override fun onSubjectChanged(chatRoom: ChatRoom, eventLog: EventLog) {
-            subject.value = chatRoom.subject
-        }
-
-        override fun onParticipantAdded(chatRoom: ChatRoom, eventLog: EventLog) {
-            updateParticipants()
-        }
-
-        override fun onParticipantRemoved(chatRoom: ChatRoom, eventLog: EventLog) {
-            updateParticipants()
-        }
-
-        override fun onParticipantAdminStatusChanged(chatRoom: ChatRoom, eventLog: EventLog) {
-            val admin = chatRoom.me?.isAdmin ?: false
-            if (admin != isMeAdmin.value) {
-                isMeAdmin.value = admin
-                meAdminChangedEvent.value = Event(admin)
-            }
-            updateParticipants()
-        }
-    }
-
-    init {
-        subject.value = chatRoom?.subject
-        isMeAdmin.value = chatRoom == null || (chatRoom.me?.isAdmin == true && !chatRoom.isReadOnly)
-        canLeaveGroup.value = chatRoom != null && !chatRoom.isReadOnly
-        isEncrypted.value = corePreferences.forceEndToEndEncryptedChat || chatRoom?.hasCapability(
-            ChatRoom.Capabilities.Encrypted.toInt()
-        ) == true
-
-        if (chatRoom != null) updateParticipants()
-
-        chatRoom?.addListener(listener)
-        waitForChatRoomCreation.value = false
-    }
-
-    override fun onCleared() {
-        participants.value.orEmpty().forEach(GroupInfoParticipantData::destroy)
-        chatRoom?.removeListener(listener)
-
-        super.onCleared()
-    }
-
-    fun createChatRoom() {
-        waitForChatRoomCreation.value = true
-        val params: ChatRoomParams = coreContext.core.createDefaultChatRoomParams()
-        params.isEncryptionEnabled = corePreferences.forceEndToEndEncryptedChat || isEncrypted.value == true
-        params.isGroupEnabled = true
-        if (params.isEncryptionEnabled) {
-            params.ephemeralMode = if (corePreferences.useEphemeralPerDeviceMode) {
-                ChatRoom.EphemeralMode.DeviceManaged
-            } else {
-                ChatRoom.EphemeralMode.AdminManaged
-            }
-        }
-        params.ephemeralLifetime = 0 // Make sure ephemeral is disabled by default
-        Log.i(
-            "[Chat Room Group Info] Ephemeral mode is ${params.ephemeralMode}, lifetime is ${params.ephemeralLifetime}"
-        )
-        params.subject = subject.value
-
-        val addresses = arrayOfNulls<Address>(participants.value.orEmpty().size)
-        var index = 0
-        for (participant in participants.value.orEmpty()) {
-            addresses[index] = participant.participant.address
-            Log.i("[Chat Room Group Info] Participant ${participant.sipUri} will be added to group")
-            index += 1
-        }
-
-        val chatRoom: ChatRoom? = coreContext.core.createChatRoom(
-            params,
-            coreContext.core.defaultAccount?.params?.identityAddress,
-            addresses
-        )
-        chatRoom?.addListener(listener)
-        if (chatRoom == null) {
-            Log.e("[Chat Room Group Info] Couldn't create chat room!")
-            waitForChatRoomCreation.value = false
-            onMessageToNotifyEvent.value = Event(R.string.chat_room_creation_failed_snack)
-        }
-    }
-
-    fun updateRoom() {
-        if (chatRoom != null) {
-            // Subject
-            val newSubject = subject.value.orEmpty()
-            if (newSubject.isNotEmpty() && newSubject != chatRoom.subject) {
-                Log.i("[Chat Room Group Info] Subject changed to $newSubject")
-                chatRoom.subject = newSubject
-            }
-
-            // Removed participants
-            val participantsToRemove = arrayListOf<Participant>()
-            for (participant in chatRoom.participants) {
-                val member = participants.value.orEmpty().find { member ->
-                    participant.address.weakEqual(member.participant.address)
-                }
-                if (member == null) {
-                    Log.w(
-                        "[Chat Room Group Info] Participant ${participant.address.asStringUriOnly()} will be removed from group"
-                    )
-                    participantsToRemove.add(participant)
-                }
-            }
-            val toRemove = arrayOfNulls<Participant>(participantsToRemove.size)
-            participantsToRemove.toArray(toRemove)
-            chatRoom.removeParticipants(toRemove)
-
-            // Added participants & new admins
-            val participantsToAdd = arrayListOf<Address>()
-            for (member in participants.value.orEmpty()) {
-                val participant = chatRoom.participants.find { participant ->
-                    participant.address.weakEqual(member.participant.address)
-                }
-                if (participant != null) {
-                    // Participant found, check if admin status needs to be updated
-                    if (member.participant.isAdmin != participant.isAdmin) {
-                        if (chatRoom.me?.isAdmin == true) {
-                            Log.i(
-                                "[Chat Room Group Info] Participant ${member.sipUri} will be admin? ${member.isAdmin}"
-                            )
-                            chatRoom.setParticipantAdminStatus(
-                                participant,
-                                member.participant.isAdmin
-                            )
-                        }
-                    }
-                } else {
-                    Log.i(
-                        "[Chat Room Group Info] Participant ${member.sipUri} will be added to group"
-                    )
-                    participantsToAdd.add(member.participant.address)
-                }
-            }
-            val toAdd = arrayOfNulls<Address>(participantsToAdd.size)
-            participantsToAdd.toArray(toAdd)
-            chatRoom.addParticipants(toAdd)
-
-            // Go back to chat room
-            updatedChatRoomEvent.value = Event(chatRoom)
-        }
-    }
-
-    fun leaveGroup() {
-        if (chatRoom != null) {
-            Log.w("[Chat Room Group Info] Leaving group")
-            chatRoom.leave()
-            updatedChatRoomEvent.value = Event(chatRoom)
-        }
-    }
-
-    fun removeParticipant(participant: GroupChatRoomMember) {
-        val list = arrayListOf<GroupInfoParticipantData>()
-        for (data in participants.value.orEmpty()) {
-            if (!data.participant.address.weakEqual(participant.address)) {
-                list.add(data)
-            }
-        }
-        participants.value = list
-    }
-
-    private fun updateParticipants() {
-        val list = arrayListOf<GroupInfoParticipantData>()
-
-        if (chatRoom != null) {
-            for (participant in chatRoom.participants) {
-                list.add(
-                    GroupInfoParticipantData(
-                        GroupChatRoomMember(
-                            participant.address,
-                            participant.isAdmin,
-                            participant.securityLevel,
-                            canBeSetAdmin = true
-                        )
-                    )
-                )
-            }
-        }
-
-        participants.value = list
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/main/chat/viewmodels/ImdnViewModel.kt b/app/src/main/java/org/linphone/activities/main/chat/viewmodels/ImdnViewModel.kt
deleted file mode 100644
index 2b9c72593..000000000
--- a/app/src/main/java/org/linphone/activities/main/chat/viewmodels/ImdnViewModel.kt
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.main.chat.viewmodels
-
-import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.ViewModel
-import androidx.lifecycle.ViewModelProvider
-import org.linphone.activities.main.chat.data.ChatMessageData
-import org.linphone.activities.main.chat.data.ImdnParticipantData
-import org.linphone.core.ChatMessage
-import org.linphone.core.ChatMessageListenerStub
-import org.linphone.core.ParticipantImdnState
-
-class ImdnViewModelFactory(private val chatMessage: ChatMessage) :
-    ViewModelProvider.NewInstanceFactory() {
-
-    @Suppress("UNCHECKED_CAST")
-    override fun <T : ViewModel> create(modelClass: Class<T>): T {
-        return ImdnViewModel(chatMessage) as T
-    }
-}
-
-class ImdnViewModel(private val chatMessage: ChatMessage) : ViewModel() {
-    val participants = MutableLiveData<ArrayList<ImdnParticipantData>>()
-
-    val chatMessageViewModel = ChatMessageData(chatMessage)
-
-    private val listener = object : ChatMessageListenerStub() {
-        override fun onParticipantImdnStateChanged(
-            message: ChatMessage,
-            state: ParticipantImdnState
-        ) {
-            updateParticipantsLists()
-        }
-    }
-
-    init {
-        chatMessage.addListener(listener)
-        updateParticipantsLists()
-    }
-
-    override fun onCleared() {
-        participants.value.orEmpty().forEach(ImdnParticipantData::destroy)
-        chatMessage.removeListener(listener)
-        super.onCleared()
-    }
-
-    private fun updateParticipantsLists() {
-        val list = arrayListOf<ImdnParticipantData>()
-
-        for (participant in chatMessage.getParticipantsByImdnState(ChatMessage.State.Displayed)) {
-            list.add(ImdnParticipantData(participant))
-        }
-        for (participant in chatMessage.getParticipantsByImdnState(
-            ChatMessage.State.DeliveredToUser
-        )) {
-            list.add(ImdnParticipantData(participant))
-        }
-        for (participant in chatMessage.getParticipantsByImdnState(ChatMessage.State.Delivered)) {
-            list.add(ImdnParticipantData(participant))
-        }
-        for (participant in chatMessage.getParticipantsByImdnState(ChatMessage.State.NotDelivered)) {
-            list.add(ImdnParticipantData(participant))
-        }
-
-        participants.value = list
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/main/chat/views/MultiLineWrapContentWidthTextView.kt b/app/src/main/java/org/linphone/activities/main/chat/views/MultiLineWrapContentWidthTextView.kt
deleted file mode 100644
index fe08e43a0..000000000
--- a/app/src/main/java/org/linphone/activities/main/chat/views/MultiLineWrapContentWidthTextView.kt
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.main.chat.views
-
-import android.content.Context
-import android.text.Layout
-import android.text.method.LinkMovementMethod
-import android.util.AttributeSet
-import androidx.appcompat.widget.AppCompatTextView
-import kotlin.math.ceil
-import kotlin.math.max
-import kotlin.math.round
-
-/**
- * The purpose of this class is to have a TextView declared with wrap_content as width that won't
- * fill it's parent if it is multi line.
- */
-class MultiLineWrapContentWidthTextView : AppCompatTextView {
-    constructor(context: Context) : super(context)
-
-    constructor(context: Context, attrs: AttributeSet?) : super(context, attrs)
-
-    constructor(
-        context: Context,
-        attrs: AttributeSet?,
-        defStyleAttr: Int
-    ) : super(context, attrs, defStyleAttr)
-
-    override fun setText(text: CharSequence?, type: BufferType?) {
-        super.setText(text, type)
-        // Required for PatternClickableSpan
-        movementMethod = LinkMovementMethod.getInstance()
-    }
-
-    override fun onMeasure(widthSpec: Int, heightSpec: Int) {
-        super.onMeasure(widthSpec, heightSpec)
-
-        if (layout != null && layout.lineCount >= 2) {
-            val maxLineWidth = ceil(getMaxLineWidth(layout)).toInt()
-            if (maxLineWidth < measuredWidth) {
-                super.onMeasure(
-                    MeasureSpec.makeMeasureSpec(maxLineWidth, MeasureSpec.getMode(widthSpec)),
-                    heightSpec
-                )
-            }
-        }
-    }
-
-    private fun getMaxLineWidth(layout: Layout): Float {
-        var maxWidth = 0.0f
-        val lines = layout.lineCount
-        for (i in 0 until lines) {
-            maxWidth = max(maxWidth, layout.getLineWidth(i))
-        }
-        return round(maxWidth)
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/main/chat/views/RichEditText.kt b/app/src/main/java/org/linphone/activities/main/chat/views/RichEditText.kt
deleted file mode 100644
index 48662b95b..000000000
--- a/app/src/main/java/org/linphone/activities/main/chat/views/RichEditText.kt
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.main.chat.views
-
-import android.app.Activity
-import android.content.Context
-import android.util.AttributeSet
-import android.view.KeyEvent
-import androidx.appcompat.widget.AppCompatEditText
-import androidx.core.view.ViewCompat
-import androidx.lifecycle.ViewModelProvider
-import androidx.lifecycle.ViewModelStoreOwner
-import org.linphone.activities.main.chat.receivers.RichContentReceiver
-import org.linphone.activities.main.viewmodels.SharedMainViewModel
-import org.linphone.core.tools.Log
-import org.linphone.utils.Event
-
-/**
- * Allows for image input inside an EditText, usefull for keyboards with gif support for example.
- */
-class RichEditText : AppCompatEditText {
-    private var controlPressed = false
-
-    private var sendListener: RichEditTextSendListener? = null
-
-    constructor(context: Context) : super(context) {
-        initReceiveContentListener()
-    }
-
-    constructor(context: Context, attrs: AttributeSet) : super(context, attrs) {
-        initReceiveContentListener()
-    }
-
-    constructor(context: Context, attrs: AttributeSet, defStyleAttr: Int) : super(
-        context,
-        attrs,
-        defStyleAttr
-    ) {
-        initReceiveContentListener()
-    }
-
-    fun setControlEnterListener(listener: RichEditTextSendListener) {
-        sendListener = listener
-    }
-
-    private fun initReceiveContentListener() {
-        ViewCompat.setOnReceiveContentListener(
-            this,
-            RichContentReceiver.MIME_TYPES,
-            RichContentReceiver { uri ->
-                Log.i("[Rich Edit Text] Received URI: $uri")
-                val activity = context as Activity
-                val sharedViewModel = activity.run {
-                    ViewModelProvider(activity as ViewModelStoreOwner)[SharedMainViewModel::class.java]
-                }
-                sharedViewModel.richContentUri.value = Event(uri)
-            }
-        )
-
-        setOnKeyListener { _, keyCode, event ->
-            if (keyCode == KeyEvent.KEYCODE_CTRL_LEFT) {
-                if (event.action == KeyEvent.ACTION_DOWN) {
-                    controlPressed = true
-                } else if (event.action == KeyEvent.ACTION_UP) {
-                    controlPressed = false
-                }
-                false
-            } else if (keyCode == KeyEvent.KEYCODE_ENTER && event.action == KeyEvent.ACTION_UP && controlPressed) {
-                sendListener?.onControlEnterPressedAndReleased()
-                true
-            } else {
-                false
-            }
-        }
-    }
-}
-
-interface RichEditTextSendListener {
-    fun onControlEnterPressedAndReleased()
-}
diff --git a/app/src/main/java/org/linphone/activities/main/conference/adapters/ScheduledConferencesAdapter.kt b/app/src/main/java/org/linphone/activities/main/conference/adapters/ScheduledConferencesAdapter.kt
deleted file mode 100644
index 2d02ed599..000000000
--- a/app/src/main/java/org/linphone/activities/main/conference/adapters/ScheduledConferencesAdapter.kt
+++ /dev/null
@@ -1,195 +0,0 @@
-/*
- * Copyright (c) 2010-2021 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.main.conference.adapters
-
-import android.content.Context
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.databinding.DataBindingUtil
-import androidx.lifecycle.LifecycleOwner
-import androidx.lifecycle.MutableLiveData
-import androidx.recyclerview.widget.DiffUtil
-import androidx.recyclerview.widget.RecyclerView
-import org.linphone.R
-import org.linphone.activities.main.adapters.SelectionListAdapter
-import org.linphone.activities.main.conference.data.ScheduledConferenceData
-import org.linphone.activities.main.viewmodels.ListTopBarViewModel
-import org.linphone.databinding.ConferenceScheduleCellBinding
-import org.linphone.databinding.ConferenceScheduleListHeaderBinding
-import org.linphone.utils.Event
-import org.linphone.utils.HeaderAdapter
-import org.linphone.utils.TimestampUtils
-
-class ScheduledConferencesAdapter(
-    selectionVM: ListTopBarViewModel,
-    private val viewLifecycleOwner: LifecycleOwner
-) : SelectionListAdapter<ScheduledConferenceData, RecyclerView.ViewHolder>(
-    selectionVM,
-    ConferenceInfoDiffCallback()
-),
-    HeaderAdapter {
-    val copyAddressToClipboardEvent: MutableLiveData<Event<String>> by lazy {
-        MutableLiveData<Event<String>>()
-    }
-
-    val joinConferenceEvent: MutableLiveData<Event<Pair<String, String?>>> by lazy {
-        MutableLiveData<Event<Pair<String, String?>>>()
-    }
-
-    val editConferenceEvent: MutableLiveData<Event<String>> by lazy {
-        MutableLiveData<Event<String>>()
-    }
-
-    val deleteConferenceInfoEvent: MutableLiveData<Event<ScheduledConferenceData>> by lazy {
-        MutableLiveData<Event<ScheduledConferenceData>>()
-    }
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ScheduledConferencesAdapter.ViewHolder {
-        val binding: ConferenceScheduleCellBinding = DataBindingUtil.inflate(
-            LayoutInflater.from(parent.context),
-            R.layout.conference_schedule_cell,
-            parent,
-            false
-        )
-        return ViewHolder(binding)
-    }
-
-    override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
-        (holder as ScheduledConferencesAdapter.ViewHolder).bind(getItem(position))
-    }
-
-    override fun displayHeaderForPosition(position: Int): Boolean {
-        if (position >= itemCount) return false
-        val conferenceInfo = getItem(position)
-        val previousPosition = position - 1
-        return if (previousPosition >= 0) {
-            val previousItem = getItem(previousPosition)
-            !TimestampUtils.isSameDay(
-                previousItem.conferenceInfo.dateTime,
-                conferenceInfo.conferenceInfo.dateTime
-            )
-        } else {
-            true
-        }
-    }
-
-    override fun getHeaderViewForPosition(context: Context, position: Int): View {
-        val data = getItem(position)
-        val binding: ConferenceScheduleListHeaderBinding = DataBindingUtil.inflate(
-            LayoutInflater.from(context),
-            R.layout.conference_schedule_list_header,
-            null,
-            false
-        )
-        binding.title = formatDate(context, data.conferenceInfo.dateTime)
-        binding.executePendingBindings()
-        return binding.root
-    }
-
-    private fun formatDate(context: Context, date: Long): String {
-        if (TimestampUtils.isToday(date)) {
-            return context.getString(R.string.today)
-        }
-        return TimestampUtils.toString(date, onlyDate = true, shortDate = false, hideYear = false)
-    }
-
-    inner class ViewHolder(
-        val binding: ConferenceScheduleCellBinding
-    ) : RecyclerView.ViewHolder(binding.root) {
-        fun bind(conferenceData: ScheduledConferenceData) {
-            with(binding) {
-                data = conferenceData
-
-                lifecycleOwner = viewLifecycleOwner
-
-                // This is for item selection through ListTopBarFragment
-                selectionListViewModel = selectionViewModel
-                selectionViewModel.isEditionEnabled.observe(
-                    viewLifecycleOwner
-                ) {
-                    position = bindingAdapterPosition
-                }
-
-                setClickListener {
-                    if (selectionViewModel.isEditionEnabled.value == true) {
-                        selectionViewModel.onToggleSelect(bindingAdapterPosition)
-                    } else {
-                        conferenceData.toggleExpand()
-                    }
-                }
-
-                setLongClickListener {
-                    if (selectionViewModel.isEditionEnabled.value == false) {
-                        selectionViewModel.isEditionEnabled.value = true
-                        // Selection will be handled by click listener
-                        true
-                    }
-                    false
-                }
-
-                setCopyAddressClickListener {
-                    val address = conferenceData.getAddressAsString()
-                    if (address.isNotEmpty()) {
-                        copyAddressToClipboardEvent.value = Event(address)
-                    }
-                }
-
-                setJoinConferenceClickListener {
-                    val address = conferenceData.conferenceInfo.uri
-                    if (address != null) {
-                        joinConferenceEvent.value = Event(
-                            Pair(address.asStringUriOnly(), conferenceData.conferenceInfo.subject)
-                        )
-                    }
-                }
-
-                setEditConferenceClickListener {
-                    val address = conferenceData.conferenceInfo.uri
-                    if (address != null) {
-                        editConferenceEvent.value = Event(address.asStringUriOnly())
-                    }
-                }
-
-                setDeleteConferenceClickListener {
-                    deleteConferenceInfoEvent.value = Event(conferenceData)
-                }
-
-                executePendingBindings()
-            }
-        }
-    }
-}
-
-private class ConferenceInfoDiffCallback : DiffUtil.ItemCallback<ScheduledConferenceData>() {
-    override fun areItemsTheSame(
-        oldItem: ScheduledConferenceData,
-        newItem: ScheduledConferenceData
-    ): Boolean {
-        return oldItem.conferenceInfo == newItem.conferenceInfo
-    }
-
-    override fun areContentsTheSame(
-        oldItem: ScheduledConferenceData,
-        newItem: ScheduledConferenceData
-    ): Boolean {
-        return false
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/main/conference/data/ConferenceSchedulingParticipantData.kt b/app/src/main/java/org/linphone/activities/main/conference/data/ConferenceSchedulingParticipantData.kt
deleted file mode 100644
index dd8828aab..000000000
--- a/app/src/main/java/org/linphone/activities/main/conference/data/ConferenceSchedulingParticipantData.kt
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (c) 2010-2021 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.main.conference.data
-
-import androidx.lifecycle.MutableLiveData
-import org.linphone.contact.GenericContactData
-import org.linphone.core.Address
-import org.linphone.utils.LinphoneUtils
-
-class ConferenceSchedulingParticipantData(
-    val sipAddress: Address,
-    val showLimeBadge: Boolean = false,
-    val showDivider: Boolean = true,
-    val showBroadcastControls: Boolean = false,
-    val speaker: Boolean = false,
-    private val onAddedToSpeakers: ((data: ConferenceSchedulingParticipantData) -> Unit)? = null,
-    private val onRemovedFromSpeakers: ((data: ConferenceSchedulingParticipantData) -> Unit)? = null
-) :
-    GenericContactData(sipAddress) {
-    val isSpeaker = MutableLiveData<Boolean>()
-
-    val sipUri: String get() = LinphoneUtils.getDisplayableAddress(sipAddress)
-
-    init {
-        isSpeaker.value = speaker
-    }
-
-    fun changeIsSpeaker() {
-        isSpeaker.value = isSpeaker.value == false
-        if (isSpeaker.value == true) {
-            onAddedToSpeakers?.invoke(this)
-        } else {
-            onRemovedFromSpeakers?.invoke(this)
-        }
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/main/conference/data/Duration.kt b/app/src/main/java/org/linphone/activities/main/conference/data/Duration.kt
deleted file mode 100644
index 61a6ee696..000000000
--- a/app/src/main/java/org/linphone/activities/main/conference/data/Duration.kt
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (c) 2010-2021 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.main.conference.data
-
-class Duration(val value: Int, val display: String) : Comparable<Duration> {
-    override fun toString(): String {
-        return display
-    }
-
-    override fun compareTo(other: Duration): Int {
-        return value.compareTo(other.value)
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/main/conference/data/ScheduledConferenceData.kt b/app/src/main/java/org/linphone/activities/main/conference/data/ScheduledConferenceData.kt
deleted file mode 100644
index 13d7aaa51..000000000
--- a/app/src/main/java/org/linphone/activities/main/conference/data/ScheduledConferenceData.kt
+++ /dev/null
@@ -1,193 +0,0 @@
-/*
- * Copyright (c) 2010-2021 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.main.conference.data
-
-import androidx.lifecycle.MutableLiveData
-import java.util.concurrent.TimeUnit
-import org.linphone.LinphoneApplication.Companion.coreContext
-import org.linphone.R
-import org.linphone.core.ConferenceInfo
-import org.linphone.core.ConferenceInfo.State
-import org.linphone.core.Participant
-import org.linphone.core.tools.Log
-import org.linphone.utils.LinphoneUtils
-import org.linphone.utils.TimestampUtils
-
-class ScheduledConferenceData(val conferenceInfo: ConferenceInfo, private val isFinished: Boolean) {
-    val expanded = MutableLiveData<Boolean>()
-    val backgroundResId = MutableLiveData<Int>()
-
-    val address = MutableLiveData<String>()
-    val subject = MutableLiveData<String>()
-    val description = MutableLiveData<String>()
-    val time = MutableLiveData<String>()
-    val date = MutableLiveData<String>()
-    val duration = MutableLiveData<String>()
-    val organizer = MutableLiveData<String>()
-    val canEdit = MutableLiveData<Boolean>()
-    val participantsShort = MutableLiveData<String>()
-    val participantsExpanded = MutableLiveData<String>()
-    val showDuration = MutableLiveData<Boolean>()
-    val isConferenceCancelled = MutableLiveData<Boolean>()
-    val isBroadcast = MutableLiveData<Boolean>()
-    val speakersExpanded = MutableLiveData<String>()
-
-    init {
-        expanded.value = false
-        isBroadcast.value = false
-
-        address.value = conferenceInfo.uri?.asStringUriOnly()
-        subject.value = conferenceInfo.subject
-        description.value = conferenceInfo.description
-
-        time.value = TimestampUtils.timeToString(conferenceInfo.dateTime)
-        date.value = TimestampUtils.toString(
-            conferenceInfo.dateTime,
-            onlyDate = true,
-            shortDate = false,
-            hideYear = false
-        )
-        isConferenceCancelled.value = conferenceInfo.state == State.Cancelled
-
-        val minutes = conferenceInfo.duration
-        val hours = TimeUnit.MINUTES.toHours(minutes.toLong())
-        val remainMinutes = minutes - TimeUnit.HOURS.toMinutes(hours).toInt()
-        duration.value = TimestampUtils.durationToString(hours.toInt(), remainMinutes)
-        showDuration.value = minutes > 0
-
-        val organizerAddress = conferenceInfo.organizer
-        if (organizerAddress != null) {
-            val localAccount = coreContext.core.accountList.find { account ->
-                val address = account.params.identityAddress
-                address != null && organizerAddress.weakEqual(address)
-            }
-            canEdit.value = localAccount != null
-
-            val contact = coreContext.contactsManager.findContactByAddress(organizerAddress)
-            organizer.value = if (contact != null) {
-                contact.name
-            } else {
-                LinphoneUtils.getDisplayName(conferenceInfo.organizer)
-            }
-        } else {
-            canEdit.value = false
-            Log.e(
-                "[Scheduled Conference] No organizer SIP URI found for: ${conferenceInfo.uri?.asStringUriOnly()}"
-            )
-        }
-
-        computeBackgroundResId()
-        computeParticipantsLists()
-    }
-
-    fun destroy() {}
-
-    fun delete() {
-        Log.w(
-            "[Scheduled Conference] Deleting conference info with URI: ${conferenceInfo.uri?.asStringUriOnly()}"
-        )
-        coreContext.core.deleteConferenceInformation(conferenceInfo)
-    }
-
-    fun toggleExpand() {
-        expanded.value = expanded.value == false
-        computeBackgroundResId()
-    }
-
-    fun getAddressAsString(): String {
-        val address = conferenceInfo.uri?.clone()
-        if (address != null) {
-            address.displayName = conferenceInfo.subject
-            return address.asString()
-        }
-        return ""
-    }
-
-    private fun computeBackgroundResId() {
-        backgroundResId.value = if (conferenceInfo.state == State.Cancelled) {
-            if (expanded.value == true) {
-                R.drawable.shape_round_red_background_with_orange_border
-            } else {
-                R.drawable.shape_round_red_background
-            }
-        } else if (isFinished) {
-            if (expanded.value == true) {
-                R.drawable.shape_round_dark_gray_background_with_orange_border
-            } else {
-                R.drawable.shape_round_dark_gray_background
-            }
-        } else {
-            if (expanded.value == true) {
-                R.drawable.shape_round_gray_background_with_orange_border
-            } else {
-                R.drawable.shape_round_gray_background
-            }
-        }
-    }
-
-    private fun computeParticipantsLists() {
-        var participantsListShort = ""
-        var participantsListExpanded = ""
-        var speakersListExpanded = ""
-
-        var allSpeaker = true
-        for (info in conferenceInfo.participantInfos) {
-            val participant = info.address
-            Log.i(
-                "[Scheduled Conference] Conference [${subject.value}] participant [${participant.asStringUriOnly()}] is a [${info.role}]"
-            )
-
-            val contact = coreContext.contactsManager.findContactByAddress(participant)
-            val name = if (contact != null) {
-                contact.name
-            } else {
-                LinphoneUtils.getDisplayName(participant)
-            }
-            val address = participant.asStringUriOnly()
-            participantsListShort += "$name, "
-            when (info.role) {
-                Participant.Role.Listener -> {
-                    participantsListExpanded += "$name ($address)\n"
-                    allSpeaker = false
-                }
-                else -> { // For meetings created before 5.3 SDK, a speaker might be Unknown
-                    speakersListExpanded += "$name ($address)\n"
-                }
-            }
-        }
-        participantsListShort = participantsListShort.dropLast(2)
-        participantsListExpanded = participantsListExpanded.dropLast(1)
-        speakersListExpanded = speakersListExpanded.dropLast(1)
-
-        participantsShort.value = participantsListShort
-        // If all participants have Speaker role then it is a meeting, else it is a broadcast
-        if (!allSpeaker) {
-            participantsExpanded.value = participantsListExpanded
-            speakersExpanded.value = speakersListExpanded
-            isBroadcast.value = true
-        } else {
-            participantsExpanded.value = speakersListExpanded
-            isBroadcast.value = false
-        }
-        Log.i(
-            "[Scheduled Conference] Conference [${subject.value}] is a ${if (allSpeaker) "meeting" else "broadcast"}"
-        )
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/main/conference/data/TimeZoneData.kt b/app/src/main/java/org/linphone/activities/main/conference/data/TimeZoneData.kt
deleted file mode 100644
index de9007e53..000000000
--- a/app/src/main/java/org/linphone/activities/main/conference/data/TimeZoneData.kt
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (c) 2010-2021 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.main.conference.data
-
-import java.util.*
-import java.util.concurrent.TimeUnit
-import kotlin.math.abs
-
-class TimeZoneData(timeZone: TimeZone) : Comparable<TimeZoneData> {
-    val id: String = timeZone.id
-    private val hours: Long
-    private val minutes: Long
-    private val gmt: String
-
-    init {
-        hours = TimeUnit.MILLISECONDS.toHours(timeZone.rawOffset.toLong())
-        minutes = abs(
-            TimeUnit.MILLISECONDS.toMinutes(timeZone.rawOffset.toLong()) -
-                TimeUnit.HOURS.toMinutes(hours)
-        )
-
-        gmt = if (hours > 0) {
-            String.format("%s - GMT+%d:%02d", timeZone.id, hours, minutes)
-        } else {
-            String.format("%s - GMT%d:%02d", timeZone.id, hours, minutes)
-        }
-    }
-
-    override fun toString(): String {
-        return gmt
-    }
-
-    override fun compareTo(other: TimeZoneData): Int {
-        if (hours == other.hours) {
-            if (minutes == other.minutes) {
-                return id.compareTo(other.id)
-            }
-            return minutes.compareTo(other.minutes)
-        }
-        return hours.compareTo(other.hours)
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/main/conference/fragments/ConferenceSchedulingFragment.kt b/app/src/main/java/org/linphone/activities/main/conference/fragments/ConferenceSchedulingFragment.kt
deleted file mode 100644
index c16a42c4f..000000000
--- a/app/src/main/java/org/linphone/activities/main/conference/fragments/ConferenceSchedulingFragment.kt
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * Copyright (c) 2010-2021 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.main.conference.fragments
-
-import android.os.Bundle
-import android.text.format.DateFormat.is24HourFormat
-import android.view.View
-import androidx.navigation.navGraphViewModels
-import com.google.android.material.datepicker.CalendarConstraints
-import com.google.android.material.datepicker.DateValidatorPointForward
-import com.google.android.material.datepicker.MaterialDatePicker
-import com.google.android.material.timepicker.MaterialTimePicker
-import com.google.android.material.timepicker.TimeFormat
-import org.linphone.LinphoneApplication.Companion.coreContext
-import org.linphone.R
-import org.linphone.activities.GenericFragment
-import org.linphone.activities.main.conference.viewmodels.ConferenceSchedulingViewModel
-import org.linphone.activities.navigateToParticipantsList
-import org.linphone.core.Factory
-import org.linphone.core.tools.Log
-import org.linphone.databinding.ConferenceSchedulingFragmentBinding
-
-class ConferenceSchedulingFragment : GenericFragment<ConferenceSchedulingFragmentBinding>() {
-    private val viewModel: ConferenceSchedulingViewModel by navGraphViewModels(
-        R.id.conference_scheduling_nav_graph
-    )
-
-    override fun getLayoutId(): Int = R.layout.conference_scheduling_fragment
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        binding.lifecycleOwner = viewLifecycleOwner
-
-        binding.viewModel = viewModel
-
-        sharedViewModel.participantsListForNextScheduledMeeting.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume { participants ->
-                Log.i(
-                    "[Conference Scheduling] Found participants (${participants.size}) to pre-populate for meeting schedule"
-                )
-                viewModel.prePopulateParticipantsList(participants, true)
-            }
-        }
-
-        sharedViewModel.addressOfConferenceInfoToEdit.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume { address ->
-                val conferenceAddress = Factory.instance().createAddress(address)
-                if (conferenceAddress != null) {
-                    Log.i(
-                        "[Conference Scheduling] Trying to edit conference info using address: $address"
-                    )
-                    val conferenceInfo = coreContext.core.findConferenceInformationFromUri(
-                        conferenceAddress
-                    )
-                    if (conferenceInfo != null) {
-                        viewModel.populateFromConferenceInfo(conferenceInfo)
-                    } else {
-                        Log.e(
-                            "[Conference Scheduling] Failed to find ConferenceInfo matching address: $address"
-                        )
-                    }
-                } else {
-                    Log.e("[Conference Scheduling] Failed to parse conference address: $address")
-                }
-            }
-        }
-
-        binding.setNextClickListener {
-            navigateToParticipantsList()
-        }
-
-        binding.setDatePickerClickListener {
-            val constraintsBuilder =
-                CalendarConstraints.Builder()
-                    .setValidator(DateValidatorPointForward.now())
-            val picker =
-                MaterialDatePicker.Builder.datePicker()
-                    .setCalendarConstraints(constraintsBuilder.build())
-                    .setTitleText(R.string.conference_schedule_date)
-                    .setSelection(viewModel.dateTimestamp)
-                    .build()
-            picker.addOnPositiveButtonClickListener {
-                val selection = picker.selection
-                if (selection != null) {
-                    viewModel.setDate(selection)
-                }
-            }
-            picker.show(requireFragmentManager(), "Date picker")
-        }
-
-        binding.setTimePickerClickListener {
-            val isSystem24Hour = is24HourFormat(requireContext())
-            val clockFormat = if (isSystem24Hour) TimeFormat.CLOCK_24H else TimeFormat.CLOCK_12H
-            val picker =
-                MaterialTimePicker.Builder()
-                    .setTimeFormat(clockFormat)
-                    .setTitleText(R.string.conference_schedule_time)
-                    .setHour(viewModel.hour)
-                    .setMinute(viewModel.minutes)
-                    .build()
-            picker.addOnPositiveButtonClickListener {
-                viewModel.setTime(picker.hour, picker.minute)
-            }
-            picker.show(requireFragmentManager(), "Time picker")
-        }
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/main/conference/fragments/ConferenceSchedulingParticipantsListFragment.kt b/app/src/main/java/org/linphone/activities/main/conference/fragments/ConferenceSchedulingParticipantsListFragment.kt
deleted file mode 100644
index b59247d44..000000000
--- a/app/src/main/java/org/linphone/activities/main/conference/fragments/ConferenceSchedulingParticipantsListFragment.kt
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * Copyright (c) 2010-2021 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.main.conference.fragments
-
-import android.content.pm.PackageManager
-import android.os.Bundle
-import android.view.View
-import androidx.navigation.navGraphViewModels
-import androidx.recyclerview.widget.LinearLayoutManager
-import org.linphone.LinphoneApplication.Companion.coreContext
-import org.linphone.LinphoneApplication.Companion.corePreferences
-import org.linphone.R
-import org.linphone.activities.GenericFragment
-import org.linphone.activities.main.conference.viewmodels.ConferenceSchedulingViewModel
-import org.linphone.activities.navigateToSummary
-import org.linphone.contact.ContactsSelectionAdapter
-import org.linphone.core.tools.Log
-import org.linphone.databinding.ConferenceSchedulingParticipantsListFragmentBinding
-import org.linphone.utils.AppUtils
-import org.linphone.utils.PermissionHelper
-
-class ConferenceSchedulingParticipantsListFragment : GenericFragment<ConferenceSchedulingParticipantsListFragmentBinding>() {
-    private val viewModel: ConferenceSchedulingViewModel by navGraphViewModels(
-        R.id.conference_scheduling_nav_graph
-    )
-    private lateinit var adapter: ContactsSelectionAdapter
-
-    override fun getLayoutId(): Int = R.layout.conference_scheduling_participants_list_fragment
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        binding.lifecycleOwner = viewLifecycleOwner
-
-        binding.viewModel = viewModel
-
-        adapter = ContactsSelectionAdapter(viewLifecycleOwner)
-        adapter.setLimeCapabilityRequired(viewModel.isEncrypted.value == true)
-        binding.contactsList.adapter = adapter
-
-        val layoutManager = LinearLayoutManager(requireContext())
-        binding.contactsList.layoutManager = layoutManager
-
-        // Divider between items
-        binding.contactsList.addItemDecoration(
-            AppUtils.getDividerDecoration(requireContext(), layoutManager)
-        )
-
-        binding.setNextClickListener {
-            navigateToSummary()
-        }
-
-        viewModel.contactsList.observe(
-            viewLifecycleOwner
-        ) {
-            adapter.submitList(it)
-        }
-        viewModel.sipContactsSelected.observe(
-            viewLifecycleOwner
-        ) {
-            viewModel.applyFilter()
-        }
-
-        viewModel.selectedAddresses.observe(
-            viewLifecycleOwner
-        ) {
-            adapter.updateSelectedAddresses(it)
-        }
-        viewModel.filter.observe(
-            viewLifecycleOwner
-        ) {
-            viewModel.applyFilter()
-        }
-
-        adapter.selectedContact.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume { searchResult ->
-                viewModel.toggleSelectionForSearchResult(searchResult)
-            }
-        }
-
-        if (corePreferences.enableNativeAddressBookIntegration) {
-            if (!PermissionHelper.get().hasReadContactsPermission()) {
-                Log.i("[Conference Creation] Asking for READ_CONTACTS permission")
-                requestPermissions(arrayOf(android.Manifest.permission.READ_CONTACTS), 0)
-            }
-        }
-    }
-
-    @Deprecated("Deprecated in Java")
-    override fun onRequestPermissionsResult(
-        requestCode: Int,
-        permissions: Array<out String>,
-        grantResults: IntArray
-    ) {
-        if (requestCode == 0) {
-            val granted = grantResults.isNotEmpty() && grantResults[0] == PackageManager.PERMISSION_GRANTED
-            if (granted) {
-                Log.i("[Conference Creation] READ_CONTACTS permission granted")
-                coreContext.fetchContacts()
-            } else {
-                Log.w("[Conference Creation] READ_CONTACTS permission denied")
-            }
-        }
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/main/conference/fragments/ConferenceSchedulingSummaryFragment.kt b/app/src/main/java/org/linphone/activities/main/conference/fragments/ConferenceSchedulingSummaryFragment.kt
deleted file mode 100644
index 2358616ed..000000000
--- a/app/src/main/java/org/linphone/activities/main/conference/fragments/ConferenceSchedulingSummaryFragment.kt
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright (c) 2010-2021 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.main.conference.fragments
-
-import android.os.Bundle
-import android.view.View
-import androidx.navigation.navGraphViewModels
-import org.linphone.R
-import org.linphone.activities.GenericFragment
-import org.linphone.activities.main.MainActivity
-import org.linphone.activities.main.conference.viewmodels.ConferenceSchedulingViewModel
-import org.linphone.activities.navigateToDialer
-import org.linphone.activities.navigateToScheduledConferences
-import org.linphone.databinding.ConferenceSchedulingSummaryFragmentBinding
-
-class ConferenceSchedulingSummaryFragment : GenericFragment<ConferenceSchedulingSummaryFragmentBinding>() {
-    private val viewModel: ConferenceSchedulingViewModel by navGraphViewModels(
-        R.id.conference_scheduling_nav_graph
-    )
-
-    override fun getLayoutId(): Int = R.layout.conference_scheduling_summary_fragment
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        binding.lifecycleOwner = viewLifecycleOwner
-
-        binding.viewModel = viewModel
-
-        viewModel.conferenceCreationCompletedEvent.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume {
-                if (viewModel.scheduleForLater.value == true) {
-                    (requireActivity() as MainActivity).showSnackBar(
-                        R.string.conference_schedule_info_created
-                    )
-                    navigateToScheduledConferences()
-                } else {
-                    navigateToDialer()
-                }
-            }
-        }
-
-        viewModel.onMessageToNotifyEvent.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume { messageId ->
-                (activity as MainActivity).showSnackBar(messageId)
-            }
-        }
-
-        viewModel.computeParticipantsData()
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/main/conference/fragments/ConferenceWaitingRoomFragment.kt b/app/src/main/java/org/linphone/activities/main/conference/fragments/ConferenceWaitingRoomFragment.kt
deleted file mode 100644
index 1e7c25d7a..000000000
--- a/app/src/main/java/org/linphone/activities/main/conference/fragments/ConferenceWaitingRoomFragment.kt
+++ /dev/null
@@ -1,204 +0,0 @@
-/*
- * Copyright (c) 2010-2021 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.main.conference.fragments
-
-import android.Manifest
-import android.content.pm.PackageManager
-import android.os.Bundle
-import android.view.View
-import androidx.lifecycle.ViewModelProvider
-import org.linphone.LinphoneApplication.Companion.coreContext
-import org.linphone.R
-import org.linphone.activities.GenericFragment
-import org.linphone.activities.main.MainActivity
-import org.linphone.activities.main.conference.viewmodels.ConferenceWaitingRoomViewModel
-import org.linphone.core.tools.Log
-import org.linphone.databinding.ConferenceWaitingRoomFragmentBinding
-import org.linphone.utils.PermissionHelper
-
-class ConferenceWaitingRoomFragment : GenericFragment<ConferenceWaitingRoomFragmentBinding>() {
-    private lateinit var viewModel: ConferenceWaitingRoomViewModel
-
-    override fun getLayoutId(): Int = R.layout.conference_waiting_room_fragment
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        binding.lifecycleOwner = viewLifecycleOwner
-
-        viewModel = ViewModelProvider(
-            this
-        )[ConferenceWaitingRoomViewModel::class.java]
-        binding.viewModel = viewModel
-
-        val conferenceSubject = arguments?.getString("Subject")
-        viewModel.subject.value = conferenceSubject
-
-        val address = arguments?.getString("Address")
-        viewModel.findConferenceInfoByAddress(address)
-
-        viewModel.cancelConferenceJoiningEvent.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume {
-                if (viewModel.joinInProgress.value == true) {
-                    val conferenceUri = arguments?.getString("Address")
-                    val callToCancel = coreContext.core.calls.find { call ->
-                        call.remoteAddress.asStringUriOnly() == conferenceUri
-                    }
-                    if (callToCancel != null) {
-                        Log.i(
-                            "[Conference Waiting Room] Call to conference server with URI [$conferenceUri] was started, terminate it"
-                        )
-                        callToCancel.terminate()
-                    } else {
-                        Log.w(
-                            "[Conference Waiting Room] Call to conference server with URI [$conferenceUri] wasn't found!"
-                        )
-                    }
-                }
-                goBack()
-            }
-        }
-
-        viewModel.joinConferenceEvent.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume { callParams ->
-                val conferenceUri = arguments?.getString("Address")
-                if (conferenceUri != null) {
-                    val conferenceAddress = coreContext.core.interpretUrl(conferenceUri, false)
-                    if (conferenceAddress != null) {
-                        Log.i(
-                            "[Conference Waiting Room] Calling conference SIP URI: ${conferenceAddress.asStringUriOnly()}"
-                        )
-                        coreContext.startCall(conferenceAddress, callParams)
-                    } else {
-                        Log.e(
-                            "[Conference Waiting Room] Failed to parse conference SIP URI: $conferenceUri"
-                        )
-                    }
-                } else {
-                    Log.e(
-                        "[Conference Waiting Room] Failed to find conference SIP URI in arguments"
-                    )
-                }
-            }
-        }
-
-        viewModel.askPermissionEvent.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume { permission ->
-                Log.i("[Conference Waiting Room] Asking for $permission permission")
-                requestPermissions(arrayOf(permission), 0)
-            }
-        }
-
-        viewModel.leaveWaitingRoomEvent.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume {
-                goBack()
-            }
-        }
-
-        viewModel.onMessageToNotifyEvent.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume { message ->
-                (activity as MainActivity).showSnackBar(message)
-            }
-        }
-
-        viewModel.networkNotReachableEvent.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume {
-                (activity as MainActivity).showSnackBar(R.string.call_error_network_unreachable)
-            }
-        }
-
-        checkPermissions()
-    }
-
-    override fun onResume() {
-        super.onResume()
-
-        coreContext.core.nativePreviewWindowId = binding.localPreviewVideoSurface
-        val enablePreview = viewModel.isVideoEnabled.value == true
-        if (enablePreview) {
-            Log.i("[Conference Waiting Room] Fragment is being resumed, enabling video preview")
-        }
-        coreContext.core.isVideoPreviewEnabled = enablePreview
-    }
-
-    override fun onPause() {
-        Log.i("[Conference Waiting Room] Fragment is being paused, disabling video preview")
-        coreContext.core.isVideoPreviewEnabled = false
-        coreContext.core.nativePreviewWindowId = null
-
-        super.onPause()
-    }
-
-    private fun checkPermissions() {
-        val permissionsRequiredList = arrayListOf<String>()
-
-        if (!PermissionHelper.get().hasRecordAudioPermission()) {
-            Log.i("[Conference Waiting Room] Asking for RECORD_AUDIO permission")
-            permissionsRequiredList.add(Manifest.permission.RECORD_AUDIO)
-        }
-
-        if (!PermissionHelper.get().hasCameraPermission()) {
-            Log.i("[Conference Waiting Room] Asking for CAMERA permission")
-            permissionsRequiredList.add(Manifest.permission.CAMERA)
-        }
-
-        if (permissionsRequiredList.isNotEmpty()) {
-            val permissionsRequired = arrayOfNulls<String>(permissionsRequiredList.size)
-            permissionsRequiredList.toArray(permissionsRequired)
-            requestPermissions(permissionsRequired, 0)
-        }
-    }
-
-    @Deprecated("Deprecated in Java")
-    override fun onRequestPermissionsResult(
-        requestCode: Int,
-        permissions: Array<out String>,
-        grantResults: IntArray
-    ) {
-        if (requestCode == 0) {
-            for (i in permissions.indices) {
-                when (permissions[i]) {
-                    Manifest.permission.RECORD_AUDIO -> if (grantResults[i] == PackageManager.PERMISSION_GRANTED) {
-                        Log.i("[Conference Waiting Room] RECORD_AUDIO permission has been granted")
-                        viewModel.enableMic()
-                    }
-                    Manifest.permission.CAMERA -> if (grantResults[i] == PackageManager.PERMISSION_GRANTED) {
-                        Log.i("[Conference Waiting Room] CAMERA permission has been granted")
-                        coreContext.core.reloadVideoDevices()
-                        viewModel.enableVideo()
-                    }
-                }
-            }
-        }
-        super.onRequestPermissionsResult(requestCode, permissions, grantResults)
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/main/conference/fragments/ScheduledConferencesFragment.kt b/app/src/main/java/org/linphone/activities/main/conference/fragments/ScheduledConferencesFragment.kt
deleted file mode 100644
index a570af0c4..000000000
--- a/app/src/main/java/org/linphone/activities/main/conference/fragments/ScheduledConferencesFragment.kt
+++ /dev/null
@@ -1,188 +0,0 @@
-/*
- * Copyright (c) 2010-2021 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.main.conference.fragments
-
-import android.app.Dialog
-import android.content.ClipData
-import android.content.ClipboardManager
-import android.content.Context
-import android.os.Bundle
-import android.view.View
-import androidx.core.content.ContextCompat
-import androidx.lifecycle.ViewModelProvider
-import androidx.recyclerview.widget.ItemTouchHelper
-import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.RecyclerView
-import org.linphone.R
-import org.linphone.activities.main.MainActivity
-import org.linphone.activities.main.conference.adapters.ScheduledConferencesAdapter
-import org.linphone.activities.main.conference.data.ScheduledConferenceData
-import org.linphone.activities.main.conference.viewmodels.ScheduledConferencesViewModel
-import org.linphone.activities.main.fragments.MasterFragment
-import org.linphone.activities.main.viewmodels.DialogViewModel
-import org.linphone.activities.navigateToConferenceScheduling
-import org.linphone.activities.navigateToConferenceWaitingRoom
-import org.linphone.core.tools.Log
-import org.linphone.databinding.ConferencesScheduledFragmentBinding
-import org.linphone.utils.*
-
-class ScheduledConferencesFragment : MasterFragment<ConferencesScheduledFragmentBinding, ScheduledConferencesAdapter>() {
-    override val dialogConfirmationMessageBeforeRemoval = R.plurals.conference_scheduled_delete_dialog
-    private lateinit var listViewModel: ScheduledConferencesViewModel
-
-    override fun getLayoutId(): Int = R.layout.conferences_scheduled_fragment
-
-    private var deleteConferenceInfoDialog: Dialog? = null
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        binding.lifecycleOwner = viewLifecycleOwner
-
-        listViewModel = ViewModelProvider(
-            this
-        )[ScheduledConferencesViewModel::class.java]
-        binding.viewModel = listViewModel
-
-        _adapter = ScheduledConferencesAdapter(listSelectionViewModel, viewLifecycleOwner)
-        binding.conferenceInfoList.adapter = adapter
-
-        val layoutManager = LinearLayoutManager(requireContext())
-        binding.conferenceInfoList.layoutManager = layoutManager
-
-        // Swipe action
-        val swipeConfiguration = RecyclerViewSwipeConfiguration()
-        val white = ContextCompat.getColor(requireContext(), R.color.white_color)
-
-        swipeConfiguration.rightToLeftAction = RecyclerViewSwipeConfiguration.Action(
-            requireContext().getString(R.string.dialog_delete),
-            white,
-            ContextCompat.getColor(requireContext(), R.color.red_color)
-        )
-        val swipeListener = object : RecyclerViewSwipeListener {
-            override fun onLeftToRightSwipe(viewHolder: RecyclerView.ViewHolder) {}
-
-            override fun onRightToLeftSwipe(viewHolder: RecyclerView.ViewHolder) {
-                val index = viewHolder.bindingAdapterPosition
-                if (index < 0 || index >= adapter.currentList.size) {
-                    Log.e(
-                        "[Scheduled Conferences] Index is out of bound, can't delete conference info"
-                    )
-                } else {
-                    val deletedConfInfo = adapter.currentList[index]
-                    showConfInfoDeleteConfirmationDialog(deletedConfInfo, index)
-                }
-            }
-        }
-        RecyclerViewSwipeUtils(ItemTouchHelper.LEFT, swipeConfiguration, swipeListener)
-            .attachToRecyclerView(binding.conferenceInfoList)
-
-        // Displays date header
-        val headerItemDecoration = RecyclerViewHeaderDecoration(requireContext(), adapter)
-        binding.conferenceInfoList.addItemDecoration(headerItemDecoration)
-
-        listViewModel.conferences.observe(
-            viewLifecycleOwner
-        ) {
-            adapter.submitList(it)
-        }
-
-        adapter.copyAddressToClipboardEvent.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume { address ->
-                val clipboard =
-                    requireContext().getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
-                val clip = ClipData.newPlainText("Conference address", address)
-                clipboard.setPrimaryClip(clip)
-
-                (activity as MainActivity).showSnackBar(
-                    R.string.conference_schedule_address_copied_to_clipboard
-                )
-            }
-        }
-
-        adapter.joinConferenceEvent.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume { pair ->
-                navigateToConferenceWaitingRoom(pair.first, pair.second)
-            }
-        }
-
-        adapter.editConferenceEvent.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume { address ->
-                sharedViewModel.addressOfConferenceInfoToEdit.value = Event(address)
-                navigateToConferenceScheduling()
-            }
-        }
-
-        adapter.deleteConferenceInfoEvent.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume { data ->
-                showConfInfoDeleteConfirmationDialog(data, -1)
-            }
-        }
-
-        binding.setNewConferenceClickListener {
-            navigateToConferenceScheduling()
-        }
-    }
-
-    override fun deleteItems(indexesOfItemToDelete: ArrayList<Int>) {
-        val list = ArrayList<ScheduledConferenceData>()
-        for (index in indexesOfItemToDelete) {
-            val conferenceData = adapter.currentList[index]
-            list.add(conferenceData)
-        }
-        listViewModel.deleteConferencesInfo(list)
-    }
-
-    private fun showConfInfoDeleteConfirmationDialog(data: ScheduledConferenceData, index: Int) {
-        val dialogViewModel =
-            DialogViewModel(AppUtils.getString(R.string.conference_scheduled_delete_one_dialog))
-        deleteConferenceInfoDialog =
-            DialogUtils.getVoipDialog(requireContext(), dialogViewModel)
-
-        dialogViewModel.showCancelButton(
-            {
-                if (index != -1) {
-                    adapter.notifyItemChanged(index)
-                }
-                deleteConferenceInfoDialog?.dismiss()
-            },
-            getString(R.string.dialog_cancel)
-        )
-
-        dialogViewModel.showDeleteButton(
-            {
-                listViewModel.deleteConferenceInfo(data)
-                deleteConferenceInfoDialog?.dismiss()
-                (requireActivity() as MainActivity).showSnackBar(R.string.conference_info_removed)
-            },
-            getString(R.string.dialog_delete)
-        )
-
-        deleteConferenceInfoDialog?.show()
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/main/conference/viewmodels/ConferenceSchedulingViewModel.kt b/app/src/main/java/org/linphone/activities/main/conference/viewmodels/ConferenceSchedulingViewModel.kt
deleted file mode 100644
index edbee3312..000000000
--- a/app/src/main/java/org/linphone/activities/main/conference/viewmodels/ConferenceSchedulingViewModel.kt
+++ /dev/null
@@ -1,416 +0,0 @@
-/*
- * Copyright (c) 2010-2021 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.main.conference.viewmodels
-
-import androidx.lifecycle.MediatorLiveData
-import androidx.lifecycle.MutableLiveData
-import java.util.*
-import org.linphone.LinphoneApplication.Companion.coreContext
-import org.linphone.LinphoneApplication.Companion.corePreferences
-import org.linphone.R
-import org.linphone.activities.main.conference.data.ConferenceSchedulingParticipantData
-import org.linphone.activities.main.conference.data.Duration
-import org.linphone.activities.main.conference.data.TimeZoneData
-import org.linphone.contact.ContactsSelectionViewModel
-import org.linphone.core.*
-import org.linphone.core.tools.Log
-import org.linphone.utils.AppUtils
-import org.linphone.utils.Event
-import org.linphone.utils.LinphoneUtils
-import org.linphone.utils.TimestampUtils
-
-class ConferenceSchedulingViewModel : ContactsSelectionViewModel() {
-    val subject = MutableLiveData<String>()
-    val description = MutableLiveData<String>()
-
-    val scheduleForLater = MutableLiveData<Boolean>()
-    val isUpdate = MutableLiveData<Boolean>()
-
-    val isBroadcastAllowed = MutableLiveData<Boolean>()
-    val mode = MutableLiveData<String>()
-    val modesList: List<String>
-
-    val formattedDate = MutableLiveData<String>()
-    val formattedTime = MutableLiveData<String>()
-
-    val isEncrypted = MutableLiveData<Boolean>()
-
-    val sendInviteViaChat = MutableLiveData<Boolean>()
-    val sendInviteViaEmail = MutableLiveData<Boolean>()
-
-    val participantsData = MutableLiveData<List<ConferenceSchedulingParticipantData>>()
-    val speakersData = MutableLiveData<List<ConferenceSchedulingParticipantData>>()
-
-    val address = MutableLiveData<Address>()
-
-    val conferenceCreationInProgress = MutableLiveData<Boolean>()
-
-    val conferenceCreationCompletedEvent: MutableLiveData<Event<Boolean>> by lazy {
-        MutableLiveData<Event<Boolean>>()
-    }
-
-    val continueEnabled: MediatorLiveData<Boolean> = MediatorLiveData()
-
-    var timeZone = MutableLiveData<TimeZoneData>()
-    val timeZones: List<TimeZoneData> = computeTimeZonesList()
-
-    var duration = MutableLiveData<Duration>()
-    val durationList: List<Duration> = computeDurationList()
-
-    var dateTimestamp: Long = System.currentTimeMillis()
-    var hour: Int = 0
-    var minutes: Int = 0
-
-    private var confInfo: ConferenceInfo? = null
-    private val conferenceScheduler = coreContext.core.createConferenceScheduler()
-
-    private val selectedSpeakersAddresses = MutableLiveData<ArrayList<Address>>()
-
-    private val listener = object : ConferenceSchedulerListenerStub() {
-        override fun onStateChanged(
-            conferenceScheduler: ConferenceScheduler,
-            state: ConferenceScheduler.State
-        ) {
-            Log.i("[Conference Creation] Conference scheduler state is $state")
-            if (state == ConferenceScheduler.State.Ready) {
-                val conferenceAddress = conferenceScheduler.info?.uri
-                Log.i(
-                    "[Conference Creation] Conference info created, address will be ${conferenceAddress?.asStringUriOnly()}"
-                )
-                conferenceAddress ?: return
-
-                address.value = conferenceAddress!!
-
-                if (scheduleForLater.value == true) {
-                    if (sendInviteViaChat.value == true) {
-                        // Send conference info even when conf is not scheduled for later
-                        // as the conference server doesn't invite participants automatically
-                        Log.i(
-                            "[Conference Creation] Scheduled conference is ready, sending invitations by chat"
-                        )
-                        val chatRoomParams = LinphoneUtils.getConferenceInvitationsChatRoomParams()
-                        conferenceScheduler.sendInvitations(chatRoomParams)
-                    } else {
-                        Log.i(
-                            "[Conference Creation] Scheduled conference is ready, we were asked not to send invitations by chat so leaving fragment"
-                        )
-                        conferenceCreationInProgress.value = false
-                        conferenceCreationCompletedEvent.value = Event(true)
-                    }
-                } else {
-                    Log.i("[Conference Creation] Group call is ready, leaving fragment")
-                    conferenceCreationInProgress.value = false
-                    conferenceCreationCompletedEvent.value = Event(true)
-                }
-            } else if (state == ConferenceScheduler.State.Error) {
-                Log.e("[Conference Creation] Failed to create conference!")
-                conferenceCreationInProgress.value = false
-                onMessageToNotifyEvent.value = Event(R.string.conference_creation_failed)
-            }
-        }
-
-        override fun onInvitationsSent(
-            conferenceScheduler: ConferenceScheduler,
-            failedInvitations: Array<out Address>?
-        ) {
-            conferenceCreationInProgress.value = false
-
-            if (failedInvitations?.isNotEmpty() == true) {
-                for (address in failedInvitations) {
-                    Log.e(
-                        "[Conference Creation] Conference information wasn't sent to participant ${address.asStringUriOnly()}"
-                    )
-                }
-                onMessageToNotifyEvent.value = Event(
-                    R.string.conference_schedule_info_not_sent_to_participant
-                )
-            } else {
-                Log.i(
-                    "[Conference Creation] Conference information successfully sent to all participants"
-                )
-            }
-
-            val conferenceAddress = conferenceScheduler.info?.uri
-            if (conferenceAddress == null) {
-                Log.e("[Conference Creation] Conference address is null!")
-            } else {
-                conferenceCreationCompletedEvent.value = Event(true)
-            }
-        }
-    }
-
-    init {
-        sipContactsSelected.value = true
-
-        subject.value = ""
-        scheduleForLater.value = false
-        isUpdate.value = false
-
-        isBroadcastAllowed.value = !corePreferences.disableBroadcastConference
-        modesList = arrayListOf(
-            AppUtils.getString(R.string.conference_schedule_mode_meeting),
-            AppUtils.getString(R.string.conference_schedule_mode_broadcast)
-        )
-        mode.value = modesList.first() // Meeting by default
-
-        isEncrypted.value = false
-        sendInviteViaChat.value = true
-        sendInviteViaEmail.value = false
-
-        timeZone.value = timeZones.find {
-            it.id == TimeZone.getDefault().id
-        }
-        duration.value = durationList.find {
-            it.value == 60
-        }
-
-        continueEnabled.value = false
-        continueEnabled.addSource(subject) {
-            continueEnabled.value = allMandatoryFieldsFilled()
-        }
-        continueEnabled.addSource(scheduleForLater) {
-            continueEnabled.value = allMandatoryFieldsFilled()
-        }
-        continueEnabled.addSource(formattedDate) {
-            continueEnabled.value = allMandatoryFieldsFilled()
-        }
-        continueEnabled.addSource(formattedTime) {
-            continueEnabled.value = allMandatoryFieldsFilled()
-        }
-
-        conferenceScheduler.addListener(listener)
-    }
-
-    override fun onCleared() {
-        conferenceScheduler.removeListener(listener)
-        participantsData.value.orEmpty().forEach(ConferenceSchedulingParticipantData::destroy)
-        speakersData.value.orEmpty().forEach(ConferenceSchedulingParticipantData::destroy)
-
-        super.onCleared()
-    }
-
-    fun prePopulateParticipantsList(participants: ArrayList<Address>, isSchedule: Boolean) {
-        selectedAddresses.value = participants
-        scheduleForLater.value = isSchedule
-    }
-
-    fun populateFromConferenceInfo(conferenceInfo: ConferenceInfo) {
-        // Pre-set data from existing conference info, used when editing an already scheduled broadcast or meeting
-        confInfo = conferenceInfo
-
-        address.value = conferenceInfo.uri
-        subject.value = conferenceInfo.subject
-        description.value = conferenceInfo.description
-        isUpdate.value = true
-
-        val dateTime = conferenceInfo.dateTime
-        val calendar = Calendar.getInstance()
-        calendar.timeInMillis = dateTime * 1000
-        setDate(calendar.timeInMillis)
-        setTime(calendar.get(Calendar.HOUR_OF_DAY), calendar.get(Calendar.MINUTE))
-
-        val conferenceDuration = conferenceInfo.duration
-        duration.value = durationList.find { it.value == conferenceDuration }
-        scheduleForLater.value = conferenceDuration > 0
-
-        val participantsList = arrayListOf<Address>()
-        val speakersList = arrayListOf<Address>()
-        for (info in conferenceInfo.participantInfos) {
-            val participant = info.address
-            participantsList.add(participant)
-            if (info.role == Participant.Role.Speaker) {
-                speakersList.add(participant)
-            }
-        }
-        if (participantsList.count() == speakersList.count()) {
-            // All participants are speaker, this is a meeting, clear speakers
-            Log.i("[Conference Creation] Conference info is a meeting")
-            speakersList.clear()
-            mode.value = modesList.first()
-        } else {
-            Log.i("[Conference Creation] Conference info is a broadcast")
-            mode.value = modesList.last()
-        }
-        selectedAddresses.value = participantsList
-        selectedSpeakersAddresses.value = speakersList
-
-        computeParticipantsData()
-    }
-
-    fun toggleSchedule() {
-        scheduleForLater.value = scheduleForLater.value == false
-    }
-
-    fun setDate(d: Long) {
-        dateTimestamp = d
-        formattedDate.value = TimestampUtils.dateToString(dateTimestamp, false)
-    }
-
-    fun setTime(h: Int, m: Int) {
-        hour = h
-        minutes = m
-        formattedTime.value = TimestampUtils.timeToString(hour, minutes)
-    }
-
-    fun updateEncryption(enable: Boolean) {
-        isEncrypted.value = enable
-    }
-
-    fun computeParticipantsData() {
-        participantsData.value.orEmpty().forEach(ConferenceSchedulingParticipantData::destroy)
-        speakersData.value.orEmpty().forEach(ConferenceSchedulingParticipantData::destroy)
-
-        val participantsList = arrayListOf<ConferenceSchedulingParticipantData>()
-        val speakersList = arrayListOf<ConferenceSchedulingParticipantData>()
-
-        for (address in selectedAddresses.value.orEmpty()) {
-            val isSpeaker = address in selectedSpeakersAddresses.value.orEmpty()
-            val data = ConferenceSchedulingParticipantData(
-                address,
-                showLimeBadge = isEncrypted.value == true,
-                showBroadcastControls = isModeBroadcastCurrentlySelected(),
-                speaker = isSpeaker,
-                onAddedToSpeakers = { data ->
-                    Log.i(
-                        "[Conference Creation] Participant [${address.asStringUriOnly()}] added to speakers"
-                    )
-                    val participants = arrayListOf<ConferenceSchedulingParticipantData>()
-                    participants.addAll(participantsData.value.orEmpty())
-                    participants.remove(data)
-                    participantsData.value = participants
-
-                    val speakers = arrayListOf<ConferenceSchedulingParticipantData>()
-                    speakers.addAll(speakersData.value.orEmpty())
-                    speakers.add(data)
-                    speakersData.value = speakers
-                },
-                onRemovedFromSpeakers = { data ->
-                    Log.i(
-                        "[Conference Creation] Participant [${address.asStringUriOnly()}] removed from speakers"
-                    )
-                    val speakers = arrayListOf<ConferenceSchedulingParticipantData>()
-                    speakers.addAll(speakersData.value.orEmpty())
-                    speakers.remove(data)
-                    speakersData.value = speakers
-
-                    val participants = arrayListOf<ConferenceSchedulingParticipantData>()
-                    participants.addAll(participantsData.value.orEmpty())
-                    participants.add(data)
-                    participantsData.value = participants
-                }
-            )
-
-            if (isSpeaker) {
-                speakersList.add(data)
-            } else {
-                participantsList.add(data)
-            }
-        }
-
-        participantsData.value = participantsList
-        speakersData.value = speakersList
-    }
-
-    fun createConference() {
-        val participantsCount = selectedAddresses.value.orEmpty().size
-        if (participantsCount == 0) {
-            Log.e("[Conference Creation] Couldn't create conference without any participant!")
-            return
-        }
-
-        conferenceCreationInProgress.value = true
-        val core = coreContext.core
-        val localAccount = core.defaultAccount
-        val localAddress = localAccount?.params?.identityAddress
-
-        val conferenceInfo = if (isUpdate.value == true) {
-            confInfo?.clone() ?: Factory.instance().createConferenceInfo()
-        } else {
-            Factory.instance().createConferenceInfo()
-        }
-        conferenceInfo.organizer = localAddress
-        conferenceInfo.subject = subject.value
-        conferenceInfo.description = description.value
-
-        val participants = arrayOfNulls<ParticipantInfo>(selectedAddresses.value.orEmpty().size)
-        var index = 0
-        val isBroadcast = isModeBroadcastCurrentlySelected()
-        for (participant in participantsData.value.orEmpty()) {
-            val info = Factory.instance().createParticipantInfo(participant.sipAddress)
-            // For meetings, all participants must have Speaker role
-            info?.role = if (isBroadcast) Participant.Role.Listener else Participant.Role.Speaker
-            participants[index] = info
-            index += 1
-        }
-        for (speaker in speakersData.value.orEmpty()) {
-            val info = Factory.instance().createParticipantInfo(speaker.sipAddress)
-            info?.role = Participant.Role.Speaker
-            participants[index] = info
-            index += 1
-        }
-        conferenceInfo.setParticipantInfos(participants)
-
-        if (scheduleForLater.value == true) {
-            val startTime = getConferenceStartTimestamp()
-            conferenceInfo.dateTime = startTime
-            val duration = duration.value?.value ?: 0
-            conferenceInfo.duration = duration
-        }
-
-        confInfo = conferenceInfo
-        conferenceScheduler.account = localAccount
-        // Will trigger the conference creation/update automatically
-        conferenceScheduler.info = conferenceInfo
-    }
-
-    fun isModeBroadcastCurrentlySelected(): Boolean {
-        return mode.value == AppUtils.getString(R.string.conference_schedule_mode_broadcast)
-    }
-
-    private fun computeTimeZonesList(): List<TimeZoneData> {
-        return TimeZone.getAvailableIDs().map { id -> TimeZoneData(TimeZone.getTimeZone(id)) }.toList().sorted()
-    }
-
-    private fun computeDurationList(): List<Duration> {
-        // Duration value is in minutes as according to conferenceInfo.setDuration() doc
-        return arrayListOf(Duration(30, "30min"), Duration(60, "1h"), Duration(120, "2h"))
-    }
-
-    private fun allMandatoryFieldsFilled(): Boolean {
-        return !subject.value.isNullOrEmpty() &&
-            (
-                scheduleForLater.value == false ||
-                    (
-                        !formattedDate.value.isNullOrEmpty() &&
-                            !formattedTime.value.isNullOrEmpty()
-                        )
-                )
-    }
-
-    private fun getConferenceStartTimestamp(): Long {
-        val calendar = Calendar.getInstance(
-            TimeZone.getTimeZone(timeZone.value?.id ?: TimeZone.getDefault().id)
-        )
-        calendar.timeInMillis = dateTimestamp
-        calendar.set(Calendar.HOUR_OF_DAY, hour)
-        calendar.set(Calendar.MINUTE, minutes)
-        return calendar.timeInMillis / 1000 // Linphone expects a time_t (so in seconds)
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/main/conference/viewmodels/ConferenceWaitingRoomViewModel.kt b/app/src/main/java/org/linphone/activities/main/conference/viewmodels/ConferenceWaitingRoomViewModel.kt
deleted file mode 100644
index ba194278d..000000000
--- a/app/src/main/java/org/linphone/activities/main/conference/viewmodels/ConferenceWaitingRoomViewModel.kt
+++ /dev/null
@@ -1,499 +0,0 @@
-/*
- * Copyright (c) 2010-2021 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.main.conference.viewmodels
-
-import android.Manifest
-import android.animation.ValueAnimator
-import androidx.lifecycle.MutableLiveData
-import org.linphone.LinphoneApplication.Companion.coreContext
-import org.linphone.LinphoneApplication.Companion.corePreferences
-import org.linphone.R
-import org.linphone.activities.main.viewmodels.MessageNotifierViewModel
-import org.linphone.activities.voip.ConferenceDisplayMode
-import org.linphone.core.*
-import org.linphone.core.tools.Log
-import org.linphone.utils.*
-import org.linphone.utils.Event
-
-class ConferenceWaitingRoomViewModel : MessageNotifierViewModel() {
-    val subject = MutableLiveData<String>()
-
-    val isMicrophoneMuted = MutableLiveData<Boolean>()
-
-    val audioRoutesEnabled = MutableLiveData<Boolean>()
-
-    val audioRoutesSelected = MutableLiveData<Boolean>()
-
-    val isSpeakerSelected = MutableLiveData<Boolean>()
-
-    val isBluetoothHeadsetSelected = MutableLiveData<Boolean>()
-
-    val layoutMenuSelected = MutableLiveData<Boolean>()
-
-    val selectedLayout = MutableLiveData<ConferenceDisplayMode>()
-
-    val isVideoAvailable = MutableLiveData<Boolean>()
-
-    val isVideoEnabled = MutableLiveData<Boolean>()
-
-    val isSwitchCameraAvailable = MutableLiveData<Boolean>()
-
-    val isLowBandwidth = MutableLiveData<Boolean>()
-
-    val joinInProgress = MutableLiveData<Boolean>()
-
-    val networkReachable = MutableLiveData<Boolean>()
-
-    val isConferenceBroadcastWithListenerRole = MutableLiveData<Boolean>()
-
-    val askPermissionEvent: MutableLiveData<Event<String>> by lazy {
-        MutableLiveData<Event<String>>()
-    }
-
-    val cancelConferenceJoiningEvent: MutableLiveData<Event<Boolean>> by lazy {
-        MutableLiveData<Event<Boolean>>()
-    }
-
-    val joinConferenceEvent: MutableLiveData<Event<CallParams>> by lazy {
-        MutableLiveData<Event<CallParams>>()
-    }
-
-    val leaveWaitingRoomEvent: MutableLiveData<Event<Boolean>> by lazy {
-        MutableLiveData<Event<Boolean>>()
-    }
-
-    val networkNotReachableEvent: MutableLiveData<Event<Boolean>> by lazy {
-        MutableLiveData<Event<Boolean>>()
-    }
-
-    val audioRoutesMenuTranslateY = MutableLiveData<Float>()
-    private val audioRoutesMenuAnimator: ValueAnimator by lazy {
-        ValueAnimator.ofFloat(AppUtils.getDimension(R.dimen.voip_audio_routes_menu_translate_y), 0f).apply {
-            addUpdateListener {
-                val value = it.animatedValue as Float
-                audioRoutesMenuTranslateY.value = value
-            }
-            duration = if (corePreferences.enableAnimations) 500 else 0
-        }
-    }
-
-    val conferenceLayoutMenuTranslateY = MutableLiveData<Float>()
-    private val conferenceLayoutMenuAnimator: ValueAnimator by lazy {
-        ValueAnimator.ofFloat(AppUtils.getDimension(R.dimen.voip_audio_routes_menu_translate_y), 0f).apply {
-            addUpdateListener {
-                val value = it.animatedValue as Float
-                conferenceLayoutMenuTranslateY.value = value
-            }
-            duration = if (corePreferences.enableAnimations) 500 else 0
-        }
-    }
-
-    val hideVideo = corePreferences.disableVideo
-
-    private val callParams: CallParams = coreContext.core.createCallParams(null)!!
-
-    private val listener: CoreListenerStub = object : CoreListenerStub() {
-        override fun onAudioDevicesListUpdated(core: Core) {
-            Log.i("[Conference Waiting Room] Audio devices list updated")
-            onAudioDevicesListUpdated()
-        }
-
-        override fun onCallStateChanged(
-            core: Core,
-            call: Call,
-            state: Call.State?,
-            message: String
-        ) {
-            when (state) {
-                Call.State.End -> {
-                    Log.i("[Conference Waiting Room] Call has ended, leaving waiting room fragment")
-                    leaveWaitingRoomEvent.value = Event(true)
-                }
-                Call.State.Error -> {
-                    Log.w(
-                        "[Conference Waiting Room] Call has failed, leaving waiting room fragment"
-                    )
-                    leaveWaitingRoomEvent.value = Event(true)
-                }
-                else -> {}
-            }
-        }
-
-        override fun onConferenceStateChanged(
-            core: Core,
-            conference: Conference,
-            state: Conference.State?
-        ) {
-            if (state == Conference.State.Created) {
-                Log.i(
-                    "[Conference Waiting Room] Conference has been created, leaving waiting room fragment"
-                )
-                leaveWaitingRoomEvent.value = Event(true)
-            }
-        }
-
-        override fun onNetworkReachable(core: Core, reachable: Boolean) {
-            Log.i("[Conference Waiting Room] Network reachability changed: [$reachable]")
-            networkReachable.value = reachable
-            if (!reachable) {
-                networkNotReachableEvent.value = Event(true)
-            }
-        }
-    }
-
-    init {
-        val core = coreContext.core
-        core.addListener(listener)
-
-        audioRoutesMenuTranslateY.value = AppUtils.getDimension(
-            R.dimen.voip_audio_routes_menu_translate_y
-        )
-        conferenceLayoutMenuTranslateY.value = AppUtils.getDimension(
-            R.dimen.voip_audio_routes_menu_translate_y
-        )
-
-        val reachable = core.isNetworkReachable
-        networkReachable.value = reachable
-        if (!reachable) {
-            networkNotReachableEvent.value = Event(true)
-        }
-
-        callParams.isMicEnabled = PermissionHelper.get().hasRecordAudioPermission() && coreContext.core.isMicEnabled
-        Log.i(
-            "[Conference Waiting Room] Microphone will be ${if (callParams.isMicEnabled) "enabled" else "muted"}"
-        )
-        updateMicState()
-
-        callParams.isVideoEnabled = isVideoAvailableInCore()
-        callParams.videoDirection = if (core.videoActivationPolicy.automaticallyInitiate) MediaDirection.SendRecv else MediaDirection.RecvOnly
-        updateVideoState()
-
-        isLowBandwidth.value = false
-        if (LinphoneUtils.checkIfNetworkHasLowBandwidth(coreContext.context)) {
-            Log.w(
-                "[Conference Waiting Room] Enabling low bandwidth mode, forcing audio only layout!"
-            )
-            callParams.isLowBandwidthEnabled = true
-            callParams.isVideoEnabled = false
-            callParams.videoDirection = MediaDirection.Inactive
-            isLowBandwidth.value = true
-
-            updateVideoState()
-            onMessageToNotifyEvent.value = Event(R.string.conference_low_bandwidth)
-        }
-
-        layoutMenuSelected.value = false
-        when (core.defaultConferenceLayout) {
-            Conference.Layout.Grid -> setMosaicLayout()
-            else -> setActiveSpeakerLayout()
-        }
-
-        if (AudioRouteUtils.isBluetoothAudioRouteAvailable()) {
-            setBluetoothAudioRoute()
-        } else if (isVideoAvailableInCore() && isVideoEnabled.value == true) {
-            setSpeakerAudioRoute()
-        } else {
-            setEarpieceAudioRoute()
-        }
-        onAudioDevicesListUpdated()
-    }
-
-    override fun onCleared() {
-        coreContext.core.removeListener(listener)
-
-        super.onCleared()
-    }
-
-    fun findConferenceInfoByAddress(stringAddress: String?) {
-        if (stringAddress != null) {
-            val address = Factory.instance().createAddress(stringAddress)
-            if (address != null) {
-                val conferenceInfo = coreContext.core.findConferenceInformationFromUri(address)
-                if (conferenceInfo != null) {
-                    val myself = conferenceInfo.participantInfos.find {
-                        it.address.asStringUriOnly() == coreContext.core.defaultAccount?.params?.identityAddress?.asStringUriOnly()
-                    }
-                    if (myself != null) {
-                        Log.i(
-                            "[Conference Waiting Room] Found our participant, it's role is [${myself.role}]"
-                        )
-                        val areWeListener = myself.role == Participant.Role.Listener
-                        isConferenceBroadcastWithListenerRole.value = areWeListener
-                    } else {
-                        Log.e(
-                            "[Conference Waiting Room] Failed to find ourselves in participants info"
-                        )
-                    }
-                } else {
-                    Log.e(
-                        "[Conference Waiting Room] Failed to find conference info using address [$stringAddress]"
-                    )
-                }
-            }
-        } else {
-            Log.e("[Conference Waiting Room] Can't find conference info using null address!")
-        }
-    }
-
-    fun cancel() {
-        cancelConferenceJoiningEvent.value = Event(true)
-    }
-
-    fun start() {
-        // Hide menus
-        audioRoutesSelected.value = false
-        layoutMenuSelected.value = false
-
-        joinInProgress.value = true
-        joinConferenceEvent.value = Event(callParams)
-    }
-
-    fun toggleMuteMicrophone() {
-        if (!PermissionHelper.get().hasRecordAudioPermission()) {
-            askPermissionEvent.value = Event(Manifest.permission.RECORD_AUDIO)
-            return
-        }
-
-        callParams.isMicEnabled = !callParams.isMicEnabled
-        Log.i(
-            "[Conference Waiting Room] Microphone will be ${if (callParams.isMicEnabled) "enabled" else "muted"}"
-        )
-        updateMicState()
-    }
-
-    fun enableMic() {
-        Log.i("[Conference Waiting Room] Microphone will be enabled")
-        callParams.isMicEnabled = true
-        updateMicState()
-    }
-
-    fun toggleSpeaker() {
-        if (isSpeakerSelected.value == true) {
-            setEarpieceAudioRoute()
-        } else {
-            setSpeakerAudioRoute()
-        }
-    }
-
-    fun toggleAudioRoutesMenu() {
-        audioRoutesSelected.value = audioRoutesSelected.value != true
-        if (audioRoutesSelected.value == true) {
-            audioRoutesMenuAnimator.start()
-        } else {
-            audioRoutesMenuAnimator.reverse()
-        }
-    }
-
-    fun setBluetoothAudioRoute() {
-        Log.i("[Conference Waiting Room] Set default output audio device to Bluetooth")
-        callParams.outputAudioDevice = coreContext.core.audioDevices.find {
-            it.type == AudioDevice.Type.Bluetooth && it.hasCapability(
-                AudioDevice.Capabilities.CapabilityPlay
-            )
-        }
-        callParams.inputAudioDevice = coreContext.core.audioDevices.find {
-            it.type == AudioDevice.Type.Bluetooth && it.hasCapability(
-                AudioDevice.Capabilities.CapabilityRecord
-            )
-        }
-        updateAudioRouteState()
-
-        if (audioRoutesSelected.value == true) {
-            audioRoutesSelected.value = false
-            audioRoutesMenuAnimator.reverse()
-        }
-    }
-
-    fun setSpeakerAudioRoute() {
-        Log.i("[Conference Waiting Room] Set default output audio device to Speaker")
-        callParams.outputAudioDevice = coreContext.core.audioDevices.find {
-            it.type == AudioDevice.Type.Speaker && it.hasCapability(
-                AudioDevice.Capabilities.CapabilityPlay
-            )
-        }
-        callParams.inputAudioDevice = coreContext.core.audioDevices.find {
-            it.type == AudioDevice.Type.Microphone && it.hasCapability(
-                AudioDevice.Capabilities.CapabilityRecord
-            )
-        }
-        updateAudioRouteState()
-
-        if (audioRoutesSelected.value == true) {
-            audioRoutesSelected.value = false
-            audioRoutesMenuAnimator.reverse()
-        }
-    }
-
-    fun setEarpieceAudioRoute() {
-        Log.i("[Conference Waiting Room] Set default output audio device to Earpiece")
-        callParams.outputAudioDevice = coreContext.core.audioDevices.find {
-            it.type == AudioDevice.Type.Earpiece && it.hasCapability(
-                AudioDevice.Capabilities.CapabilityPlay
-            )
-        }
-        callParams.inputAudioDevice = coreContext.core.audioDevices.find {
-            it.type == AudioDevice.Type.Microphone && it.hasCapability(
-                AudioDevice.Capabilities.CapabilityRecord
-            )
-        }
-        updateAudioRouteState()
-
-        if (audioRoutesSelected.value == true) {
-            audioRoutesSelected.value = false
-            audioRoutesMenuAnimator.reverse()
-        }
-    }
-
-    fun toggleLayoutMenu() {
-        layoutMenuSelected.value = layoutMenuSelected.value != true
-        if (layoutMenuSelected.value == true) {
-            conferenceLayoutMenuAnimator.start()
-        } else {
-            conferenceLayoutMenuAnimator.reverse()
-        }
-    }
-
-    fun setMosaicLayout() {
-        Log.i("[Conference Waiting Room] Set default layout to Mosaic")
-
-        callParams.conferenceVideoLayout = Conference.Layout.Grid
-        callParams.isVideoEnabled = isVideoAvailableInCore()
-
-        updateLayout()
-        updateVideoState()
-
-        layoutMenuSelected.value = false
-        conferenceLayoutMenuAnimator.reverse()
-    }
-
-    fun setActiveSpeakerLayout() {
-        Log.i("[Conference Waiting Room] Set default layout to ActiveSpeaker")
-
-        callParams.conferenceVideoLayout = Conference.Layout.ActiveSpeaker
-        callParams.isVideoEnabled = isVideoAvailableInCore()
-
-        updateLayout()
-        updateVideoState()
-
-        layoutMenuSelected.value = false
-        conferenceLayoutMenuAnimator.reverse()
-    }
-
-    fun setAudioOnlyLayout() {
-        Log.i("[Conference Waiting Room] Set default layout to AudioOnly, disabling video in call")
-        callParams.isVideoEnabled = false
-
-        updateLayout()
-        updateVideoState()
-
-        layoutMenuSelected.value = false
-        conferenceLayoutMenuAnimator.reverse()
-    }
-
-    fun toggleVideo() {
-        if (!PermissionHelper.get().hasCameraPermission()) {
-            askPermissionEvent.value = Event(Manifest.permission.CAMERA)
-            return
-        }
-        callParams.isVideoEnabled = isVideoAvailableInCore()
-        callParams.videoDirection = if (callParams.videoDirection == MediaDirection.SendRecv) MediaDirection.RecvOnly else MediaDirection.SendRecv
-        updateVideoState()
-    }
-
-    fun enableVideo() {
-        callParams.isVideoEnabled = isVideoAvailableInCore()
-        callParams.videoDirection = MediaDirection.SendRecv
-        updateVideoState()
-    }
-
-    fun switchCamera() {
-        Log.i("[Conference Waiting Room] Switching camera")
-        coreContext.switchCamera()
-    }
-
-    private fun updateMicState() {
-        isMicrophoneMuted.value = !callParams.isMicEnabled
-    }
-
-    private fun onAudioDevicesListUpdated() {
-        val bluetoothDeviceAvailable = AudioRouteUtils.isBluetoothAudioRouteAvailable()
-        if (!bluetoothDeviceAvailable && audioRoutesEnabled.value == true) {
-            Log.w(
-                "[Conference Waiting Room] Bluetooth device no longer available, switching back to default microphone & earpiece/speaker"
-            )
-        }
-        audioRoutesEnabled.value = bluetoothDeviceAvailable
-
-        if (!bluetoothDeviceAvailable) {
-            audioRoutesSelected.value = false
-            if (isBluetoothHeadsetSelected.value == true) {
-                for (audioDevice in coreContext.core.audioDevices) {
-                    if (isVideoEnabled.value == true) {
-                        if (audioDevice.type == AudioDevice.Type.Speaker) {
-                            callParams.outputAudioDevice = audioDevice
-                        }
-                    } else {
-                        if (audioDevice.type == AudioDevice.Type.Earpiece) {
-                            callParams.outputAudioDevice = audioDevice
-                        }
-                    }
-                    if (audioDevice.type == AudioDevice.Type.Microphone) {
-                        callParams.inputAudioDevice = audioDevice
-                    }
-                }
-            }
-        }
-
-        updateAudioRouteState()
-    }
-
-    private fun updateAudioRouteState() {
-        val outputDeviceType = callParams.outputAudioDevice?.type
-        isSpeakerSelected.value = outputDeviceType == AudioDevice.Type.Speaker
-        isBluetoothHeadsetSelected.value = outputDeviceType == AudioDevice.Type.Bluetooth
-    }
-
-    private fun updateLayout() {
-        if (!callParams.isVideoEnabled) {
-            selectedLayout.value = ConferenceDisplayMode.AUDIO_ONLY
-        } else {
-            selectedLayout.value = when (callParams.conferenceVideoLayout) {
-                Conference.Layout.Grid -> ConferenceDisplayMode.GRID
-                else -> ConferenceDisplayMode.ACTIVE_SPEAKER
-            }
-        }
-    }
-
-    private fun updateVideoState() {
-        isVideoAvailable.value = callParams.isVideoEnabled
-        isVideoEnabled.value = callParams.isVideoEnabled && callParams.videoDirection == MediaDirection.SendRecv
-        Log.i(
-            "[Conference Waiting Room] Video will be ${if (callParams.isVideoEnabled) "enabled" else "disabled"} with direction ${callParams.videoDirection}"
-        )
-
-        isSwitchCameraAvailable.value = callParams.isVideoEnabled && coreContext.showSwitchCameraButton()
-        coreContext.core.isVideoPreviewEnabled = isVideoEnabled.value == true
-    }
-
-    private fun isVideoAvailableInCore(): Boolean {
-        val core = coreContext.core
-        return core.isVideoCaptureEnabled || core.isVideoPreviewEnabled
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/main/conference/viewmodels/ScheduledConferencesViewModel.kt b/app/src/main/java/org/linphone/activities/main/conference/viewmodels/ScheduledConferencesViewModel.kt
deleted file mode 100644
index c8acab844..000000000
--- a/app/src/main/java/org/linphone/activities/main/conference/viewmodels/ScheduledConferencesViewModel.kt
+++ /dev/null
@@ -1,160 +0,0 @@
-/*
- * Copyright (c) 2010-2021 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.main.conference.viewmodels
-
-import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.ViewModel
-import org.linphone.LinphoneApplication.Companion.coreContext
-import org.linphone.activities.main.conference.data.ScheduledConferenceData
-import org.linphone.core.*
-import org.linphone.core.tools.Log
-import org.linphone.utils.LinphoneUtils
-
-class ScheduledConferencesViewModel : ViewModel() {
-    val conferences = MutableLiveData<ArrayList<ScheduledConferenceData>>()
-
-    val showTerminated = MutableLiveData<Boolean>()
-
-    private val conferenceScheduler: ConferenceScheduler by lazy {
-        val scheduler = coreContext.core.createConferenceScheduler()
-        scheduler.addListener(conferenceListener)
-        scheduler
-    }
-
-    private val listener = object : CoreListenerStub() {
-        override fun onConferenceInfoReceived(core: Core, conferenceInfo: ConferenceInfo) {
-            Log.i("[Scheduled Conferences] New conference info received")
-            computeConferenceInfoList()
-        }
-    }
-
-    private val conferenceListener = object : ConferenceSchedulerListenerStub() {
-        override fun onStateChanged(
-            conferenceScheduler: ConferenceScheduler,
-            state: ConferenceScheduler.State
-        ) {
-            Log.i("[Scheduled Conferences] Conference scheduler state is $state")
-            if (state == ConferenceScheduler.State.Ready) {
-                Log.i(
-                    "[Scheduled Conferences] Conference ${conferenceScheduler.info?.subject} cancelled"
-                )
-                val chatRoomParams = LinphoneUtils.getConferenceInvitationsChatRoomParams()
-                conferenceScheduler.sendInvitations(chatRoomParams) // Send cancel ICS
-            }
-        }
-
-        override fun onInvitationsSent(
-            conferenceScheduler: ConferenceScheduler,
-            failedInvitations: Array<out Address>?
-        ) {
-            if (failedInvitations?.isNotEmpty() == true) {
-                for (address in failedInvitations) {
-                    Log.e(
-                        "[Scheduled Conferences] Conference cancelled ICS wasn't sent to participant ${address.asStringUriOnly()}"
-                    )
-                }
-            } else {
-                Log.i(
-                    "[Scheduled Conferences] Conference cancelled ICS successfully sent to all participants"
-                )
-            }
-        }
-    }
-
-    init {
-        coreContext.core.addListener(listener)
-
-        showTerminated.value = false
-
-        computeConferenceInfoList()
-    }
-
-    override fun onCleared() {
-        coreContext.core.removeListener(listener)
-        conferences.value.orEmpty().forEach(ScheduledConferenceData::destroy)
-
-        super.onCleared()
-    }
-
-    fun applyFilter() {
-        computeConferenceInfoList()
-    }
-
-    fun deleteConferenceInfo(data: ScheduledConferenceData) {
-        val conferenceInfoList = arrayListOf<ScheduledConferenceData>()
-
-        conferenceInfoList.addAll(conferences.value.orEmpty())
-        conferenceInfoList.remove(data)
-
-        if (data.conferenceInfo.state != ConferenceInfo.State.Cancelled && data.canEdit.value == true) {
-            Log.i("[Scheduled Conferences] Cancelling conference ${data.conferenceInfo.subject}")
-            conferenceScheduler.cancelConference(data.conferenceInfo)
-        }
-
-        data.delete()
-        data.destroy()
-        conferences.value = conferenceInfoList
-    }
-
-    fun deleteConferencesInfo(toRemoveList: List<ScheduledConferenceData>) {
-        val conferenceInfoList = arrayListOf<ScheduledConferenceData>()
-
-        for (confInfo in conferences.value.orEmpty()) {
-            if (confInfo in toRemoveList) {
-                confInfo.delete()
-                confInfo.destroy()
-            } else {
-                conferenceInfoList.add(confInfo)
-            }
-        }
-
-        conferences.value = conferenceInfoList
-    }
-
-    private fun computeConferenceInfoList() {
-        conferences.value.orEmpty().forEach(ScheduledConferenceData::destroy)
-
-        val conferencesList = arrayListOf<ScheduledConferenceData>()
-
-        val now = System.currentTimeMillis() / 1000 // Linphone uses time_t in seconds
-
-        if (showTerminated.value == true) {
-            for (conferenceInfo in coreContext.core.conferenceInformationList) {
-                if (conferenceInfo.duration == 0) continue // This isn't a scheduled conference, don't display it
-                val limit = conferenceInfo.dateTime + conferenceInfo.duration
-                if (limit >= now) continue // This isn't a terminated conference, don't display it
-                val data = ScheduledConferenceData(conferenceInfo, true)
-                conferencesList.add(0, data) // Keep terminated meetings list in reverse order to always display most recent on top
-            }
-        } else {
-            val oneHourAgo = now - 7200 // Show all conferences from 2 hours ago and forward
-            for (conferenceInfo in coreContext.core.getConferenceInformationListAfterTime(
-                oneHourAgo
-            )) {
-                if (conferenceInfo.duration == 0) continue // This isn't a scheduled conference, don't display it
-                val data = ScheduledConferenceData(conferenceInfo, false)
-                conferencesList.add(data)
-            }
-        }
-
-        conferences.value = conferencesList
-        Log.i("[Scheduled Conferences] Found ${conferencesList.size} future conferences")
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/main/contact/adapters/ContactsListAdapter.kt b/app/src/main/java/org/linphone/activities/main/contact/adapters/ContactsListAdapter.kt
deleted file mode 100644
index 5d503f94f..000000000
--- a/app/src/main/java/org/linphone/activities/main/contact/adapters/ContactsListAdapter.kt
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.main.contact.adapters
-
-import android.content.Context
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.databinding.DataBindingUtil
-import androidx.lifecycle.LifecycleOwner
-import androidx.lifecycle.MutableLiveData
-import androidx.recyclerview.widget.DiffUtil
-import androidx.recyclerview.widget.RecyclerView
-import org.linphone.R
-import org.linphone.activities.main.adapters.SelectionListAdapter
-import org.linphone.activities.main.contact.viewmodels.ContactViewModel
-import org.linphone.activities.main.viewmodels.ListTopBarViewModel
-import org.linphone.core.Friend
-import org.linphone.databinding.ContactListCellBinding
-import org.linphone.databinding.GenericListHeaderBinding
-import org.linphone.utils.AppUtils
-import org.linphone.utils.Event
-import org.linphone.utils.HeaderAdapter
-
-class ContactsListAdapter(
-    selectionVM: ListTopBarViewModel,
-    private val viewLifecycleOwner: LifecycleOwner
-) : SelectionListAdapter<ContactViewModel, RecyclerView.ViewHolder>(
-    selectionVM,
-    ContactDiffCallback()
-),
-    HeaderAdapter {
-    val selectedContactEvent: MutableLiveData<Event<Friend>> by lazy {
-        MutableLiveData<Event<Friend>>()
-    }
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
-        val binding: ContactListCellBinding = DataBindingUtil.inflate(
-            LayoutInflater.from(parent.context),
-            R.layout.contact_list_cell,
-            parent,
-            false
-        )
-        return ViewHolder(binding)
-    }
-
-    override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
-        (holder as ViewHolder).bind(getItem(position))
-    }
-
-    inner class ViewHolder(
-        val binding: ContactListCellBinding
-    ) : RecyclerView.ViewHolder(binding.root) {
-        fun bind(contactViewModel: ContactViewModel) {
-            with(binding) {
-                viewModel = contactViewModel
-
-                lifecycleOwner = viewLifecycleOwner
-
-                // This is for item selection through ListTopBarFragment
-                selectionListViewModel = selectionViewModel
-                selectionViewModel.isEditionEnabled.observe(
-                    viewLifecycleOwner
-                ) {
-                    position = bindingAdapterPosition
-                }
-
-                setClickListener {
-                    if (selectionViewModel.isEditionEnabled.value == true) {
-                        selectionViewModel.onToggleSelect(bindingAdapterPosition)
-                    } else {
-                        val friend = contactViewModel.contact.value
-                        // TODO FIXME !!!
-                        if (friend != null) selectedContactEvent.value = Event(friend)
-                    }
-                }
-
-                setLongClickListener {
-                    if (selectionViewModel.isEditionEnabled.value == false) {
-                        selectionViewModel.isEditionEnabled.value = true
-                        // Selection will be handled by click listener
-                        true
-                    }
-                    false
-                }
-
-                executePendingBindings()
-            }
-        }
-    }
-
-    override fun displayHeaderForPosition(position: Int): Boolean {
-        if (position >= itemCount) return false
-        val contact = getItem(position)
-        val firstLetter = contact.fullName.firstOrNull().toString()
-        val previousPosition = position - 1
-        return if (previousPosition >= 0) {
-            val previousItemFirstLetter = getItem(previousPosition).fullName.firstOrNull().toString()
-            !firstLetter.equals(previousItemFirstLetter, ignoreCase = true)
-        } else {
-            true
-        }
-    }
-
-    override fun getHeaderViewForPosition(context: Context, position: Int): View {
-        val contact = getItem(position)
-        val firstLetter = AppUtils.getInitials(contact.fullName, 1)
-        val binding: GenericListHeaderBinding = DataBindingUtil.inflate(
-            LayoutInflater.from(context),
-            R.layout.generic_list_header,
-            null,
-            false
-        )
-        binding.title = firstLetter
-        binding.executePendingBindings()
-        return binding.root
-    }
-}
-
-private class ContactDiffCallback : DiffUtil.ItemCallback<ContactViewModel>() {
-    override fun areItemsTheSame(
-        oldItem: ContactViewModel,
-        newItem: ContactViewModel
-    ): Boolean {
-        return oldItem.fullName.compareTo(newItem.fullName) == 0
-    }
-
-    override fun areContentsTheSame(
-        oldItem: ContactViewModel,
-        newItem: ContactViewModel
-    ): Boolean {
-        return true
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/main/contact/adapters/SyncAccountAdapter.kt b/app/src/main/java/org/linphone/activities/main/contact/adapters/SyncAccountAdapter.kt
deleted file mode 100644
index f8303bcb7..000000000
--- a/app/src/main/java/org/linphone/activities/main/contact/adapters/SyncAccountAdapter.kt
+++ /dev/null
@@ -1,49 +0,0 @@
-package org.linphone.activities.main.contact.adapters
-
-import android.graphics.drawable.Drawable
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.BaseAdapter
-import android.widget.ImageView
-import android.widget.TextView
-import kotlin.collections.ArrayList
-import org.linphone.LinphoneApplication.Companion.coreContext
-import org.linphone.R
-
-class SyncAccountAdapter : BaseAdapter() {
-    private var accounts: ArrayList<Triple<String, String, Drawable?>> = arrayListOf()
-
-    init {
-        accounts.addAll(coreContext.contactsManager.getAvailableSyncAccounts())
-    }
-
-    override fun getView(position: Int, convertView: View?, parent: ViewGroup): View {
-        val view: View = convertView ?: LayoutInflater.from(parent.context).inflate(
-            R.layout.contact_sync_account_picker_cell,
-            parent,
-            false
-        )
-        val account = getItem(position)
-
-        val icon = view.findViewById<ImageView>(R.id.account_icon)
-        icon.setImageDrawable(account.third)
-        icon.contentDescription = account.second
-        val name = view.findViewById<TextView>(R.id.account_name)
-        name.text = account.first
-
-        return view
-    }
-
-    override fun getItem(position: Int): Triple<String, String, Drawable?> {
-        return accounts[position]
-    }
-
-    override fun getItemId(position: Int): Long {
-        return position.toLong()
-    }
-
-    override fun getCount(): Int {
-        return accounts.size
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/main/contact/data/ContactEditorData.kt b/app/src/main/java/org/linphone/activities/main/contact/data/ContactEditorData.kt
deleted file mode 100644
index 2b545fd57..000000000
--- a/app/src/main/java/org/linphone/activities/main/contact/data/ContactEditorData.kt
+++ /dev/null
@@ -1,360 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.main.contact.data
-
-import android.graphics.Bitmap
-import android.graphics.BitmapFactory
-import android.media.ExifInterface
-import android.provider.ContactsContract
-import androidx.lifecycle.MutableLiveData
-import java.io.ByteArrayOutputStream
-import java.io.IOException
-import kotlinx.coroutines.CoroutineScope
-import org.linphone.LinphoneApplication.Companion.coreContext
-import org.linphone.LinphoneApplication.Companion.corePreferences
-import org.linphone.R
-import org.linphone.contact.*
-import org.linphone.core.ChatRoom.SecurityLevel
-import org.linphone.core.ConsolidatedPresence
-import org.linphone.core.Friend
-import org.linphone.core.tools.Log
-import org.linphone.utils.AppUtils
-import org.linphone.utils.ImageUtils
-import org.linphone.utils.PermissionHelper
-
-class ContactEditorData(val friend: Friend?) : ContactDataInterface {
-    override val contact: MutableLiveData<Friend> = MutableLiveData<Friend>()
-    override val displayName: MutableLiveData<String> = MutableLiveData<String>()
-    override val securityLevel: MutableLiveData<SecurityLevel> = MutableLiveData<SecurityLevel>()
-    override val presenceStatus: MutableLiveData<ConsolidatedPresence> = MutableLiveData<ConsolidatedPresence>()
-    override val coroutineScope: CoroutineScope = coreContext.coroutineScope
-
-    val firstName = MutableLiveData<String>()
-
-    val lastName = MutableLiveData<String>()
-
-    val organization = MutableLiveData<String>()
-
-    val displayOrganization = corePreferences.contactOrganizationVisible
-
-    val tempPicturePath = MutableLiveData<String>()
-    private var picture: ByteArray? = null
-
-    val numbers = MutableLiveData<ArrayList<NumberOrAddressEditorData>>()
-
-    val addresses = MutableLiveData<ArrayList<NumberOrAddressEditorData>>()
-
-    var syncAccountName: String? = null
-    var syncAccountType: String? = null
-
-    init {
-        if (friend != null) {
-            contact.value = friend!!
-            displayName.value = friend.name ?: ""
-            presenceStatus.value = friend.consolidatedPresence
-            friend.addListener {
-                presenceStatus.value = it.consolidatedPresence
-            }
-        } else {
-            displayName.value = ""
-            presenceStatus.value = ConsolidatedPresence.Offline
-        }
-
-        organization.value = friend?.organization ?: ""
-
-        firstName.value = ""
-        lastName.value = ""
-        val refKey = friend?.refKey
-        val vCard = friend?.vcard
-        if (vCard?.familyName.isNullOrEmpty() && vCard?.givenName.isNullOrEmpty()) {
-            if (refKey != null) {
-                Log.w("[Contact Editor] vCard first & last name not filled-in yet, doing it now")
-                fetchFirstAndLastNames(refKey)
-            } else {
-                Log.e(
-                    "[Contact Editor] vCard first & last name not available as contact doesn't have a native ID"
-                )
-            }
-        } else {
-            firstName.value = vCard?.givenName
-            lastName.value = vCard?.familyName
-        }
-
-        updateNumbersAndAddresses(refKey)
-    }
-
-    fun save(): Friend {
-        var contact = friend
-        var created = false
-
-        if (contact == null) {
-            created = true
-            // From Crashlytics it seems both permissions are required...
-            val nativeId = if (PermissionHelper.get().hasReadContactsPermission() &&
-                PermissionHelper.get().hasWriteContactsPermission()
-            ) {
-                Log.i("[Contact Editor] Creating native contact")
-                NativeContactEditor.createAndroidContact(syncAccountName, syncAccountType)
-                    .toString()
-            } else {
-                Log.e("[Contact Editor] Can't create native contact, permission denied")
-                null
-            }
-            contact = coreContext.core.createFriend()
-            contact.refKey = nativeId
-        }
-
-        if (contact.refKey != null) {
-            Log.i("[Contact Editor] Committing changes in native contact id ${contact.refKey}")
-            NativeContactEditor(contact)
-                .setFirstAndLastNames(firstName.value.orEmpty(), lastName.value.orEmpty())
-                .setOrganization(organization.value.orEmpty())
-                .setPhoneNumbers(numbers.value.orEmpty())
-                .setSipAddresses(addresses.value.orEmpty())
-                .setPicture(picture)
-                .commit()
-        }
-
-        if (!created) contact.edit()
-
-        contact.name = "${firstName.value.orEmpty()} ${lastName.value.orEmpty()}"
-        contact.organization = organization.value
-
-        for (address in contact.addresses) {
-            contact.removeAddress(address)
-        }
-        for (address in addresses.value.orEmpty()) {
-            val sipAddress = address.newValue.value.orEmpty()
-            if (sipAddress.isEmpty() || address.toRemove.value == true) continue
-
-            val parsed = coreContext.core.interpretUrl(sipAddress, false)
-            if (parsed != null) contact.addAddress(parsed)
-        }
-
-        for (phone in contact.phoneNumbers) {
-            contact.removePhoneNumber(phone)
-        }
-        for (phone in numbers.value.orEmpty()) {
-            val phoneNumber = phone.newValue.value.orEmpty()
-            if (phoneNumber.isEmpty() || phone.toRemove.value == true) continue
-
-            contact.addPhoneNumber(phoneNumber)
-        }
-
-        val vCard = contact.vcard
-        if (vCard != null) {
-            vCard.familyName = lastName.value
-            vCard.givenName = firstName.value
-        }
-
-        if (created) {
-            coreContext.core.defaultFriendList?.addLocalFriend(contact)
-        } else {
-            contact.done()
-        }
-        return contact
-    }
-
-    fun setPictureFromPath(picturePath: String) {
-        var orientation = ExifInterface.ORIENTATION_NORMAL
-        var image = BitmapFactory.decodeFile(picturePath)
-
-        try {
-            val ei = ExifInterface(picturePath)
-            orientation = ei.getAttributeInt(
-                ExifInterface.TAG_ORIENTATION,
-                ExifInterface.ORIENTATION_UNDEFINED
-            )
-            Log.i("[Contact Editor] Exif rotation is $orientation")
-        } catch (e: IOException) {
-            Log.e("[Contact Editor] Failed to get Exif rotation, exception raised: $e")
-        }
-
-        if (image == null) {
-            Log.e("[Contact Editor] Couldn't get bitmap from filePath: $picturePath")
-            return
-        }
-
-        when (orientation) {
-            ExifInterface.ORIENTATION_ROTATE_90 ->
-                image =
-                    ImageUtils.rotateImage(image, 90f)
-            ExifInterface.ORIENTATION_ROTATE_180 ->
-                image =
-                    ImageUtils.rotateImage(image, 180f)
-            ExifInterface.ORIENTATION_ROTATE_270 ->
-                image =
-                    ImageUtils.rotateImage(image, 270f)
-        }
-
-        val stream = ByteArrayOutputStream()
-        image.compress(Bitmap.CompressFormat.JPEG, 100, stream)
-        picture = stream.toByteArray()
-        tempPicturePath.value = picturePath
-        image.recycle()
-        stream.close()
-    }
-
-    fun addEmptySipAddress() {
-        val list = arrayListOf<NumberOrAddressEditorData>()
-        list.addAll(addresses.value.orEmpty())
-        list.add(NumberOrAddressEditorData("", true))
-        addresses.value = list
-    }
-
-    fun addEmptyPhoneNumber() {
-        val list = arrayListOf<NumberOrAddressEditorData>()
-        list.addAll(numbers.value.orEmpty())
-        list.add(NumberOrAddressEditorData("", false))
-        numbers.value = list
-    }
-
-    private fun updateNumbersAndAddresses(contactId: String?) {
-        val phoneNumbers = arrayListOf<NumberOrAddressEditorData>()
-        val sipAddresses = arrayListOf<NumberOrAddressEditorData>()
-        var fetched = false
-
-        if (contactId != null) {
-            try {
-                // Try to get real values from contact to ensure edition/removal in native address book will go well
-                val cursor = coreContext.context.contentResolver.query(
-                    ContactsContract.Data.CONTENT_URI,
-                    arrayOf(
-                        ContactsContract.Data.MIMETYPE,
-                        ContactsContract.CommonDataKinds.Phone.NUMBER
-                    ),
-                    ContactsContract.CommonDataKinds.StructuredName.CONTACT_ID + " = ?",
-                    arrayOf(contactId),
-                    null
-                )
-
-                while (cursor != null && cursor.moveToNext()) {
-                    val linphoneMime = AppUtils.getString(R.string.linphone_address_mime_type)
-                    val mime: String? =
-                        cursor.getString(
-                            cursor.getColumnIndexOrThrow(ContactsContract.Data.MIMETYPE)
-                        )
-                    if (mime == ContactsContract.CommonDataKinds.Phone.CONTENT_ITEM_TYPE) {
-                        val data1: String? =
-                            cursor.getString(
-                                cursor.getColumnIndexOrThrow(
-                                    ContactsContract.CommonDataKinds.Phone.NUMBER
-                                )
-                            )
-                        if (data1 != null) {
-                            phoneNumbers.add(NumberOrAddressEditorData(data1, false))
-                        }
-                    } else if (
-                        mime == ContactsContract.CommonDataKinds.SipAddress.CONTENT_ITEM_TYPE ||
-                        mime == linphoneMime
-                    ) {
-                        val data1: String? =
-                            cursor.getString(
-                                cursor.getColumnIndexOrThrow(
-                                    ContactsContract.CommonDataKinds.SipAddress.SIP_ADDRESS
-                                )
-                            )
-                        if (data1 != null) {
-                            sipAddresses.add(NumberOrAddressEditorData(data1, true))
-                        }
-                    }
-                }
-
-                cursor?.close()
-                fetched = true
-            } catch (e: Exception) {
-                Log.e("[Contact Editor] Failed to sip addresses & phone number: $e")
-                fetched = false
-            }
-        }
-
-        if (!fetched) {
-            Log.w(
-                "[Contact Editor] Fall-backing to friend info (might be inaccurate and thus edition/removal might fail)"
-            )
-            for (number in friend?.phoneNumbers.orEmpty()) {
-                phoneNumbers.add(NumberOrAddressEditorData(number, false))
-            }
-
-            for (address in friend?.addresses.orEmpty()) {
-                sipAddresses.add(NumberOrAddressEditorData(address.asStringUriOnly(), true))
-            }
-        }
-
-        if (phoneNumbers.isEmpty()) {
-            phoneNumbers.add(NumberOrAddressEditorData("", false))
-        }
-        numbers.value = phoneNumbers
-
-        if (sipAddresses.isEmpty()) {
-            sipAddresses.add(NumberOrAddressEditorData("", true))
-        }
-        addresses.value = sipAddresses
-    }
-
-    private fun fetchFirstAndLastNames(contactId: String) {
-        try {
-            val cursor = coreContext.context.contentResolver.query(
-                ContactsContract.Data.CONTENT_URI,
-                arrayOf(
-                    ContactsContract.Data.MIMETYPE,
-                    ContactsContract.CommonDataKinds.StructuredName.GIVEN_NAME,
-                    ContactsContract.CommonDataKinds.StructuredName.FAMILY_NAME
-                ),
-                ContactsContract.CommonDataKinds.StructuredName.CONTACT_ID + " = ?",
-                arrayOf(contactId),
-                null
-            )
-
-            while (cursor != null && cursor.moveToNext()) {
-                val mime: String? = cursor.getString(
-                    cursor.getColumnIndexOrThrow(ContactsContract.Data.MIMETYPE)
-                )
-                if (mime == ContactsContract.CommonDataKinds.StructuredName.CONTENT_ITEM_TYPE) {
-                    val givenName: String? =
-                        cursor.getString(
-                            cursor.getColumnIndexOrThrow(
-                                ContactsContract.CommonDataKinds.StructuredName.GIVEN_NAME
-                            )
-                        )
-                    if (!givenName.isNullOrEmpty()) {
-                        friend?.vcard?.givenName = givenName
-                        firstName.value = givenName!!
-                    }
-
-                    val familyName: String? =
-                        cursor.getString(
-                            cursor.getColumnIndexOrThrow(
-                                ContactsContract.CommonDataKinds.StructuredName.FAMILY_NAME
-                            )
-                        )
-                    if (!familyName.isNullOrEmpty()) {
-                        friend?.vcard?.familyName = familyName
-                        lastName.value = familyName!!
-                    }
-                }
-            }
-
-            cursor?.close()
-        } catch (e: Exception) {
-            Log.e("[Contact Editor] Failed to fetch first & last name: $e")
-        }
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/main/contact/data/ContactNumberOrAddressData.kt b/app/src/main/java/org/linphone/activities/main/contact/data/ContactNumberOrAddressData.kt
deleted file mode 100644
index 93f709d5e..000000000
--- a/app/src/main/java/org/linphone/activities/main/contact/data/ContactNumberOrAddressData.kt
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.main.contact.data
-
-import org.linphone.LinphoneApplication.Companion.corePreferences
-import org.linphone.core.Address
-
-class ContactNumberOrAddressData(
-    val address: Address?,
-    val hasPresence: Boolean,
-    val displayedValue: String,
-    val isSip: Boolean = true,
-    val showSecureChat: Boolean = false,
-    val typeLabel: String = "",
-    private val listener: ContactNumberOrAddressClickListener
-) {
-    val showInvite = !hasPresence && !isSip && corePreferences.showContactInviteBySms
-
-    val chatAllowed = !corePreferences.disableChat
-
-    val hidePlainChat = corePreferences.forceEndToEndEncryptedChat
-
-    fun startCall() {
-        address ?: return
-        listener.onCall(address)
-    }
-
-    fun startChat(secured: Boolean) {
-        address ?: return
-        listener.onChat(address, secured)
-    }
-
-    fun smsInvite() {
-        listener.onSmsInvite(displayedValue)
-    }
-}
-
-interface ContactNumberOrAddressClickListener {
-    fun onCall(address: Address)
-
-    fun onChat(address: Address, isSecured: Boolean)
-
-    fun onSmsInvite(number: String)
-}
diff --git a/app/src/main/java/org/linphone/activities/main/contact/data/NumberOrAddressEditorData.kt b/app/src/main/java/org/linphone/activities/main/contact/data/NumberOrAddressEditorData.kt
deleted file mode 100644
index 44c22cb39..000000000
--- a/app/src/main/java/org/linphone/activities/main/contact/data/NumberOrAddressEditorData.kt
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.main.contact.data
-
-import androidx.lifecycle.MutableLiveData
-
-class NumberOrAddressEditorData(val currentValue: String, val isSipAddress: Boolean) {
-    val newValue = MutableLiveData<String>()
-
-    val toRemove = MutableLiveData<Boolean>()
-
-    init {
-        newValue.value = currentValue
-        toRemove.value = false
-    }
-
-    fun remove() {
-        toRemove.value = true
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/main/contact/fragments/ContactEditorFragment.kt b/app/src/main/java/org/linphone/activities/main/contact/fragments/ContactEditorFragment.kt
deleted file mode 100644
index 31c5497ac..000000000
--- a/app/src/main/java/org/linphone/activities/main/contact/fragments/ContactEditorFragment.kt
+++ /dev/null
@@ -1,251 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.main.contact.fragments
-
-import android.app.Activity
-import android.app.Dialog
-import android.content.Intent
-import android.content.pm.PackageManager
-import android.os.Bundle
-import android.os.Parcelable
-import android.provider.MediaStore
-import android.view.View
-import androidx.core.content.FileProvider
-import androidx.lifecycle.lifecycleScope
-import java.io.File
-import kotlinx.coroutines.launch
-import org.linphone.LinphoneApplication.Companion.coreContext
-import org.linphone.LinphoneApplication.Companion.corePreferences
-import org.linphone.R
-import org.linphone.activities.GenericFragment
-import org.linphone.activities.main.MainActivity
-import org.linphone.activities.main.contact.data.ContactEditorData
-import org.linphone.activities.main.contact.data.NumberOrAddressEditorData
-import org.linphone.activities.main.contact.viewmodels.*
-import org.linphone.activities.main.viewmodels.DialogViewModel
-import org.linphone.activities.navigateToContact
-import org.linphone.core.tools.Log
-import org.linphone.databinding.ContactEditorFragmentBinding
-import org.linphone.utils.DialogUtils
-import org.linphone.utils.FileUtils
-import org.linphone.utils.PermissionHelper
-
-class ContactEditorFragment : GenericFragment<ContactEditorFragmentBinding>(), SyncAccountPickerFragment.SyncAccountPickedListener {
-    private lateinit var data: ContactEditorData
-    private var temporaryPicturePath: File? = null
-
-    override fun getLayoutId(): Int = R.layout.contact_editor_fragment
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        binding.lifecycleOwner = viewLifecycleOwner
-
-        val contact = sharedViewModel.selectedContact.value
-        val contactRefKey = contact?.refKey
-        val friend = if (contactRefKey != null) coreContext.core.getFriendByRefKey(contactRefKey) else null
-        data = ContactEditorData(friend ?: contact)
-        binding.viewModel = data
-
-        useMaterialSharedAxisXForwardAnimation = sharedViewModel.isSlidingPaneSlideable.value == false
-
-        binding.setAvatarClickListener {
-            pickFile()
-        }
-
-        binding.setSaveChangesClickListener {
-            data.syncAccountName = null
-            data.syncAccountType = null
-
-            if (data.friend == null) {
-                var atLeastASipAddressOrPhoneNumber = false
-                for (addr in data.addresses.value.orEmpty()) {
-                    if (addr.newValue.value.orEmpty().isNotEmpty()) {
-                        atLeastASipAddressOrPhoneNumber = true
-                        break
-                    }
-                }
-                if (!atLeastASipAddressOrPhoneNumber) {
-                    for (number in data.numbers.value.orEmpty()) {
-                        if (number.newValue.value.orEmpty().isNotEmpty()) {
-                            atLeastASipAddressOrPhoneNumber = true
-                            break
-                        }
-                    }
-                }
-                if (!atLeastASipAddressOrPhoneNumber) {
-                    // Contact will be created without phone and SIP address
-                    // Let's warn the user it won't be visible in Linphone app
-                    Log.w(
-                        "[Contact Editor] New contact without SIP address nor phone number, showing warning dialog"
-                    )
-                    showInvisibleContactWarningDialog()
-                } else if (corePreferences.showNewContactAccountDialog) {
-                    Log.i("[Contact Editor] New contact, ask user where to store it")
-                    SyncAccountPickerFragment(this).show(childFragmentManager, "SyncAccountPicker")
-                } else {
-                    Log.i("[Contact Editor] Saving new contact")
-                    saveContact()
-                }
-            } else {
-                Log.i("[Contact Editor] Saving contact changes")
-                saveContact()
-            }
-        }
-
-        val sipUri = arguments?.getString("SipUri")
-        if (sipUri != null) {
-            Log.i("[Contact Editor] Found SIP URI in arguments: $sipUri")
-            val newSipUri = NumberOrAddressEditorData("", true)
-            newSipUri.newValue.value = sipUri
-
-            val list = arrayListOf<NumberOrAddressEditorData>()
-            list.addAll(data.addresses.value.orEmpty())
-            list.add(newSipUri)
-            data.addresses.value = list
-        }
-
-        if (!PermissionHelper.required(requireContext()).hasWriteContactsPermission()) {
-            Log.i("[Contact Editor] Asking for WRITE_CONTACTS permission")
-            requestPermissions(arrayOf(android.Manifest.permission.WRITE_CONTACTS), 0)
-        }
-    }
-
-    override fun onSyncAccountClicked(name: String?, type: String?) {
-        Log.i("[Contact Editor] Saving new contact using account $name / $type")
-        data.syncAccountName = name
-        data.syncAccountType = type
-        saveContact()
-    }
-
-    @Deprecated("Deprecated in Java")
-    override fun onRequestPermissionsResult(
-        requestCode: Int,
-        permissions: Array<out String>,
-        grantResults: IntArray
-    ) {
-        if (requestCode == 0) {
-            val granted = grantResults.isNotEmpty() && grantResults[0] == PackageManager.PERMISSION_GRANTED
-            if (granted) {
-                Log.i("[Contact Editor] WRITE_CONTACTS permission granted")
-            } else {
-                Log.w("[Contact Editor] WRITE_CONTACTS permission denied")
-                (activity as MainActivity).showSnackBar(
-                    R.string.contact_editor_write_permission_denied
-                )
-                goBack()
-            }
-        }
-    }
-
-    @Deprecated("Deprecated in Java")
-    override fun onActivityResult(requestCode: Int, resultCode: Int, intent: Intent?) {
-        if (resultCode == Activity.RESULT_OK) {
-            lifecycleScope.launch {
-                val contactImageFilePath = FileUtils.getFilePathFromPickerIntent(
-                    intent,
-                    temporaryPicturePath
-                )
-                if (contactImageFilePath != null) {
-                    data.setPictureFromPath(contactImageFilePath)
-                }
-            }
-        }
-    }
-
-    private fun saveContact() {
-        val savedContact = data.save()
-        val id = savedContact.refKey
-        if (id != null) {
-            Log.i("[Contact Editor] Displaying contact $savedContact")
-            navigateToContact(id)
-        } else {
-            Log.w(
-                "[Contact Editor] Can't display $savedContact because it doesn't have a refKey, going back"
-            )
-            goBack()
-        }
-    }
-
-    private fun pickFile() {
-        val cameraIntents = ArrayList<Intent>()
-
-        // Handles image picking
-        val galleryIntent = Intent(Intent.ACTION_PICK)
-        galleryIntent.type = "image/*"
-
-        if (PermissionHelper.get().hasCameraPermission()) {
-            // Allows to capture directly from the camera
-            val captureIntent = Intent(MediaStore.ACTION_IMAGE_CAPTURE)
-            val tempFileName = System.currentTimeMillis().toString() + ".jpeg"
-            val file = FileUtils.getFileStoragePath(tempFileName)
-            temporaryPicturePath = file
-            val publicUri = FileProvider.getUriForFile(
-                requireContext(),
-                requireContext().getString(R.string.file_provider),
-                file
-            )
-            captureIntent.putExtra(MediaStore.EXTRA_OUTPUT, publicUri)
-            captureIntent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
-            captureIntent.addFlags(Intent.FLAG_GRANT_WRITE_URI_PERMISSION)
-            cameraIntents.add(captureIntent)
-        }
-
-        val chooserIntent =
-            Intent.createChooser(galleryIntent, getString(R.string.chat_message_pick_file_dialog))
-        chooserIntent.putExtra(
-            Intent.EXTRA_INITIAL_INTENTS,
-            cameraIntents.toArray(arrayOf<Parcelable>())
-        )
-
-        startActivityForResult(chooserIntent, 0)
-    }
-
-    private fun showInvisibleContactWarningDialog() {
-        val dialogViewModel =
-            DialogViewModel(getString(R.string.contacts_new_contact_wont_be_visible_warning_dialog))
-        val dialog: Dialog = DialogUtils.getDialog(requireContext(), dialogViewModel)
-
-        dialogViewModel.showCancelButton(
-            {
-                Log.i("[Contact Editor] Aborting new contact saving")
-                dialog.dismiss()
-            },
-            getString(R.string.no)
-        )
-
-        dialogViewModel.showOkButton(
-            {
-                dialog.dismiss()
-
-                if (corePreferences.showNewContactAccountDialog) {
-                    Log.i("[Contact Editor] New contact, ask user where to store it")
-                    SyncAccountPickerFragment(this).show(childFragmentManager, "SyncAccountPicker")
-                } else {
-                    Log.i("[Contact Editor] Saving new contact")
-                    saveContact()
-                }
-            },
-            getString(R.string.yes)
-        )
-
-        dialog.show()
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/main/contact/fragments/DetailContactFragment.kt b/app/src/main/java/org/linphone/activities/main/contact/fragments/DetailContactFragment.kt
deleted file mode 100644
index ab01a9b23..000000000
--- a/app/src/main/java/org/linphone/activities/main/contact/fragments/DetailContactFragment.kt
+++ /dev/null
@@ -1,194 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.main.contact.fragments
-
-import android.app.Dialog
-import android.content.Intent
-import android.net.Uri
-import android.os.Bundle
-import android.view.View
-import androidx.lifecycle.ViewModelProvider
-import org.linphone.LinphoneApplication.Companion.coreContext
-import org.linphone.R
-import org.linphone.activities.*
-import org.linphone.activities.main.*
-import org.linphone.activities.main.contact.viewmodels.ContactViewModel
-import org.linphone.activities.main.contact.viewmodels.ContactViewModelFactory
-import org.linphone.activities.main.viewmodels.DialogViewModel
-import org.linphone.activities.navigateToChatRoom
-import org.linphone.activities.navigateToContactEditor
-import org.linphone.activities.navigateToDialer
-import org.linphone.core.tools.Log
-import org.linphone.databinding.ContactDetailFragmentBinding
-import org.linphone.utils.DialogUtils
-import org.linphone.utils.Event
-
-class DetailContactFragment : GenericFragment<ContactDetailFragmentBinding>() {
-    private lateinit var viewModel: ContactViewModel
-
-    override fun getLayoutId(): Int = R.layout.contact_detail_fragment
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        postponeEnterTransition()
-
-        binding.lifecycleOwner = viewLifecycleOwner
-
-        binding.sharedMainViewModel = sharedViewModel
-
-        useMaterialSharedAxisXForwardAnimation = sharedViewModel.isSlidingPaneSlideable.value == false
-
-        val id = arguments?.getString("id")
-        arguments?.clear()
-        if (id != null) {
-            Log.i("[Contact] Found contact id parameter in arguments: $id")
-            sharedViewModel.selectedContact.value = coreContext.contactsManager.findContactById(id)
-        }
-
-        val contact = sharedViewModel.selectedContact.value
-        if (contact == null) {
-            Log.e("[Contact] Friend is null, aborting!")
-            goBack()
-            return
-        }
-
-        viewModel = ViewModelProvider(
-            this,
-            ContactViewModelFactory(contact)
-        )[ContactViewModel::class.java]
-        binding.viewModel = viewModel
-
-        viewModel.sendSmsToEvent.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume { number ->
-                sendSms(number)
-            }
-        }
-
-        viewModel.startCallToEvent.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume { address ->
-                if (coreContext.core.callsNb > 0) {
-                    Log.i(
-                        "[Contact] Starting dialer with pre-filled URI ${address.asStringUriOnly()}, is transfer? ${sharedViewModel.pendingCallTransfer}"
-                    )
-                    sharedViewModel.updateContactsAnimationsBasedOnDestination.value =
-                        Event(R.id.dialerFragment)
-                    sharedViewModel.updateDialerAnimationsBasedOnDestination.value =
-                        Event(R.id.masterContactsFragment)
-
-                    val args = Bundle()
-                    args.putString("URI", address.asStringUriOnly())
-                    args.putBoolean("Transfer", sharedViewModel.pendingCallTransfer)
-                    args.putBoolean(
-                        "SkipAutoCallStart",
-                        true
-                    ) // If auto start call setting is enabled, ignore it
-                    navigateToDialer(args)
-                } else {
-                    coreContext.startCall(address)
-                }
-            }
-        }
-
-        viewModel.chatRoomCreatedEvent.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume { chatRoom ->
-                sharedViewModel.updateContactsAnimationsBasedOnDestination.value =
-                    Event(R.id.masterChatRoomsFragment)
-                val args = Bundle()
-                args.putString("LocalSipUri", chatRoom.localAddress.asStringUriOnly())
-                args.putString("RemoteSipUri", chatRoom.peerAddress.asStringUriOnly())
-                navigateToChatRoom(args)
-            }
-        }
-
-        binding.setEditClickListener {
-            navigateToContactEditor()
-        }
-
-        binding.setDeleteClickListener {
-            confirmContactRemoval()
-        }
-
-        viewModel.onMessageToNotifyEvent.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume { messageResourceId ->
-                (activity as MainActivity).showSnackBar(messageResourceId)
-            }
-        }
-        viewModel.updateNumbersAndAddresses()
-
-        startPostponedEnterTransition()
-    }
-
-    override fun onResume() {
-        super.onResume()
-        if (this::viewModel.isInitialized) {
-            viewModel.registerContactListener()
-            coreContext.contactsManager.contactIdToWatchFor = viewModel.contact.value?.refKey ?: ""
-        }
-    }
-
-    override fun onPause() {
-        super.onPause()
-        coreContext.contactsManager.contactIdToWatchFor = ""
-        if (this::viewModel.isInitialized) {
-            viewModel.unregisterContactListener()
-        }
-    }
-
-    private fun confirmContactRemoval() {
-        val dialogViewModel = DialogViewModel(getString(R.string.contact_delete_one_dialog))
-        dialogViewModel.showIcon = true
-        dialogViewModel.iconResource = R.drawable.dialog_delete_icon
-        val dialog: Dialog = DialogUtils.getDialog(requireContext(), dialogViewModel)
-
-        dialogViewModel.showCancelButton {
-            dialog.dismiss()
-        }
-
-        dialogViewModel.showDeleteButton(
-            {
-                viewModel.deleteContact()
-                dialog.dismiss()
-                goBack()
-            },
-            getString(R.string.dialog_delete)
-        )
-
-        dialog.show()
-    }
-
-    private fun sendSms(number: String) {
-        val smsIntent = Intent(Intent.ACTION_SENDTO)
-        smsIntent.putExtra("address", number)
-        smsIntent.data = Uri.parse("smsto:$number")
-        val text = getString(R.string.contact_send_sms_invite_text).format(
-            getString(R.string.contact_send_sms_invite_download_link)
-        )
-        smsIntent.putExtra("sms_body", text)
-        startActivity(smsIntent)
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/main/contact/fragments/MasterContactsFragment.kt b/app/src/main/java/org/linphone/activities/main/contact/fragments/MasterContactsFragment.kt
deleted file mode 100644
index d388c9e78..000000000
--- a/app/src/main/java/org/linphone/activities/main/contact/fragments/MasterContactsFragment.kt
+++ /dev/null
@@ -1,392 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.main.contact.fragments
-
-import android.app.Dialog
-import android.content.pm.PackageManager
-import android.content.res.Configuration
-import android.os.Bundle
-import android.view.View
-import androidx.core.content.ContextCompat
-import androidx.lifecycle.ViewModelProvider
-import androidx.navigation.fragment.NavHostFragment
-import androidx.recyclerview.widget.ItemTouchHelper
-import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.RecyclerView
-import com.google.android.material.transition.MaterialSharedAxis
-import org.linphone.LinphoneApplication.Companion.coreContext
-import org.linphone.LinphoneApplication.Companion.corePreferences
-import org.linphone.R
-import org.linphone.activities.SnackBarActivity
-import org.linphone.activities.clearDisplayedContact
-import org.linphone.activities.main.MainActivity
-import org.linphone.activities.main.contact.adapters.ContactsListAdapter
-import org.linphone.activities.main.contact.viewmodels.ContactsListViewModel
-import org.linphone.activities.main.fragments.MasterFragment
-import org.linphone.activities.main.viewmodels.DialogViewModel
-import org.linphone.activities.navigateToContact
-import org.linphone.activities.navigateToContactEditor
-import org.linphone.core.Factory
-import org.linphone.core.Friend
-import org.linphone.core.tools.Log
-import org.linphone.databinding.ContactMasterFragmentBinding
-import org.linphone.utils.*
-
-class MasterContactsFragment : MasterFragment<ContactMasterFragmentBinding, ContactsListAdapter>() {
-    override val dialogConfirmationMessageBeforeRemoval = R.plurals.contact_delete_dialog
-    private lateinit var listViewModel: ContactsListViewModel
-
-    private var sipUriToAdd: String? = null
-    private var editOnClick: Boolean = false
-    private var contactIdToDisplay: String? = null
-
-    override fun getLayoutId(): Int = R.layout.contact_master_fragment
-
-    override fun onDestroyView() {
-        binding.contactsList.adapter = null
-        super.onDestroyView()
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        binding.lifecycleOwner = viewLifecycleOwner
-
-        listViewModel = ViewModelProvider(this)[ContactsListViewModel::class.java]
-        binding.viewModel = listViewModel
-
-        /* Shared view model & sliding pane related */
-
-        setUpSlidingPane(binding.slidingPane)
-
-        useMaterialSharedAxisXForwardAnimation = false
-        sharedViewModel.updateContactsAnimationsBasedOnDestination.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume { id ->
-                val forward = when (id) {
-                    R.id.dialerFragment, R.id.masterChatRoomsFragment -> false
-                    else -> true
-                }
-                if (corePreferences.enableAnimations) {
-                    val portraitOrientation =
-                        resources.configuration.orientation != Configuration.ORIENTATION_LANDSCAPE
-                    val axis =
-                        if (portraitOrientation) MaterialSharedAxis.X else MaterialSharedAxis.Y
-                    enterTransition = MaterialSharedAxis(axis, forward)
-                    reenterTransition = MaterialSharedAxis(axis, forward)
-                    returnTransition = MaterialSharedAxis(axis, !forward)
-                    exitTransition = MaterialSharedAxis(axis, !forward)
-                }
-            }
-        }
-
-        sharedViewModel.layoutChangedEvent.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume {
-                sharedViewModel.isSlidingPaneSlideable.value = binding.slidingPane.isSlideable
-                if (binding.slidingPane.isSlideable) {
-                    val navHostFragment =
-                        childFragmentManager.findFragmentById(R.id.contacts_nav_container) as NavHostFragment
-                    if (navHostFragment.navController.currentDestination?.id == R.id.emptyContactFragment) {
-                        Log.i(
-                            "[Contacts] Foldable device has been folded, closing side pane with empty fragment"
-                        )
-                        binding.slidingPane.closePane()
-                    }
-                }
-            }
-        }
-
-        /* End of shared view model & sliding pane related */
-
-        _adapter = ContactsListAdapter(listSelectionViewModel, viewLifecycleOwner)
-        binding.contactsList.setHasFixedSize(true)
-        binding.contactsList.adapter = adapter
-
-        binding.setEditClickListener {
-            if (PermissionHelper.get().hasWriteContactsPermission()) {
-                listSelectionViewModel.isEditionEnabled.value = true
-            } else {
-                Log.i("[Contacts] Asking for WRITE_CONTACTS permission")
-                requestPermissions(arrayOf(android.Manifest.permission.WRITE_CONTACTS), 1)
-            }
-        }
-
-        val layoutManager = LinearLayoutManager(requireContext())
-        binding.contactsList.layoutManager = layoutManager
-
-        // Swipe action
-        val swipeConfiguration = RecyclerViewSwipeConfiguration()
-        val white = ContextCompat.getColor(requireContext(), R.color.white_color)
-
-        swipeConfiguration.rightToLeftAction = RecyclerViewSwipeConfiguration.Action(
-            requireContext().getString(R.string.dialog_delete),
-            white,
-            ContextCompat.getColor(requireContext(), R.color.red_color)
-        )
-        val swipeListener = object : RecyclerViewSwipeListener {
-            override fun onLeftToRightSwipe(viewHolder: RecyclerView.ViewHolder) {}
-
-            override fun onRightToLeftSwipe(viewHolder: RecyclerView.ViewHolder) {
-                val viewModel = DialogViewModel(getString(R.string.contact_delete_one_dialog))
-                viewModel.showIcon = true
-                viewModel.iconResource = R.drawable.dialog_delete_icon
-                val dialog: Dialog = DialogUtils.getDialog(requireContext(), viewModel)
-
-                val index = viewHolder.bindingAdapterPosition
-                if (index < 0 || index >= adapter.currentList.size) {
-                    Log.e("[Contacts] Index is out of bound, can't delete contact")
-                } else {
-                    val contactViewModel = adapter.currentList[index]
-                    if (contactViewModel.isNativeContact.value == false) {
-                        adapter.notifyItemChanged(index)
-                        val activity = requireActivity() as MainActivity
-                        activity.showSnackBar(R.string.contact_cant_be_deleted)
-                        return
-                    }
-
-                    viewModel.showCancelButton {
-                        adapter.notifyItemChanged(index)
-                        dialog.dismiss()
-                    }
-
-                    viewModel.showDeleteButton(
-                        {
-                            val deletedContact =
-                                adapter.currentList[index].contact.value
-                            if (deletedContact != null) {
-                                listViewModel.deleteContact(deletedContact)
-                                if (!binding.slidingPane.isSlideable &&
-                                    deletedContact == sharedViewModel.selectedContact.value
-                                ) {
-                                    Log.i(
-                                        "[Contacts] Currently displayed contact has been deleted, removing detail fragment"
-                                    )
-                                    clearDisplayedContact()
-                                }
-                            }
-                            dialog.dismiss()
-                        },
-                        getString(R.string.dialog_delete)
-                    )
-                }
-
-                dialog.show()
-            }
-        }
-
-        if (!corePreferences.readOnlyNativeContacts) {
-            RecyclerViewSwipeUtils(ItemTouchHelper.LEFT, swipeConfiguration, swipeListener)
-                .attachToRecyclerView(binding.contactsList)
-        }
-
-        // Divider between items
-        binding.contactsList.addItemDecoration(
-            AppUtils.getDividerDecoration(requireContext(), layoutManager)
-        )
-
-        // Displays the first letter header
-        val headerItemDecoration = RecyclerViewHeaderDecoration(requireContext(), adapter)
-        binding.contactsList.addItemDecoration(headerItemDecoration)
-
-        adapter.selectedContactEvent.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume { contact ->
-                Log.d("[Contacts] Selected item in list changed: $contact")
-                sharedViewModel.selectedContact.value = contact
-                (requireActivity() as MainActivity).hideKeyboard()
-
-                if (editOnClick) {
-                    navigateToContactEditor(sipUriToAdd, binding.slidingPane)
-                    editOnClick = false
-                    sipUriToAdd = null
-                } else {
-                    navigateToContact()
-                    binding.slidingPane.openPane()
-                }
-            }
-        }
-
-        coreContext.contactsManager.fetchInProgress.observe(
-            viewLifecycleOwner
-        ) {
-            listViewModel.fetchInProgress.value = it
-        }
-
-        listViewModel.contactsList.observe(
-            viewLifecycleOwner
-        ) {
-            val id = contactIdToDisplay
-            if (id != null) {
-                val contact = coreContext.contactsManager.findContactById(id)
-                if (contact != null) {
-                    contactIdToDisplay = null
-                    Log.i("[Contacts] Found matching contact [$contact] after callback")
-                    adapter.selectedContactEvent.value = Event(contact)
-                } else {
-                    Log.w("[Contacts] No contact found matching id [$id] after callback")
-                }
-            }
-            adapter.submitList(it)
-        }
-
-        listViewModel.moreResultsAvailableEvent.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume {
-                (requireActivity() as SnackBarActivity).showSnackBar(
-                    R.string.contacts_ldap_query_more_results_available
-                )
-            }
-        }
-
-        binding.setAllContactsToggleClickListener {
-            listViewModel.sipContactsSelected.value = false
-        }
-        binding.setSipContactsToggleClickListener {
-            listViewModel.sipContactsSelected.value = true
-        }
-
-        listViewModel.sipContactsSelected.observe(
-            viewLifecycleOwner
-        ) {
-            listViewModel.updateContactsList(true)
-        }
-
-        listViewModel.filter.observe(
-            viewLifecycleOwner
-        ) {
-            listViewModel.updateContactsList(false)
-        }
-
-        binding.setNewContactClickListener {
-            // Remove any previously selected contact
-            sharedViewModel.selectedContact.value = null
-            editOnClick = false
-            navigateToContactEditor(sipUriToAdd, binding.slidingPane)
-            sipUriToAdd = null
-        }
-
-        val id = arguments?.getString("id")
-        val sipUri = arguments?.getString("sipUri")
-        val addressString = arguments?.getString("address")
-        arguments?.clear()
-
-        if (id != null) {
-            Log.i("[Contacts] Found contact id parameter in arguments [$id]")
-            val contact = coreContext.contactsManager.findContactById(id)
-            if (contact != null) {
-                Log.i("[Contacts] Found matching contact [${contact.name}]")
-                adapter.selectedContactEvent.value = Event(contact)
-            } else {
-                Log.w(
-                    "[Contacts] Matching contact not found yet, waiting for contacts updated callback"
-                )
-                contactIdToDisplay = id
-            }
-        } else if (sipUri != null) {
-            Log.i("[Contacts] Found sipUri parameter in arguments [$sipUri]")
-            sipUriToAdd = sipUri
-            (activity as MainActivity).showSnackBar(
-                R.string.contact_choose_existing_or_new_to_add_number
-            )
-            editOnClick = true
-        } else if (addressString != null) {
-            val address = Factory.instance().createAddress(addressString)
-            if (address != null) {
-                Log.i(
-                    "[Contacts] Found friend SIP address parameter in arguments [${address.asStringUriOnly()}]"
-                )
-                val contact = coreContext.contactsManager.findContactByAddress(address)
-                if (contact != null) {
-                    Log.i("[Contacts] Found matching contact $contact")
-                    adapter.selectedContactEvent.value = Event(contact)
-                } else {
-                    Log.w(
-                        "[Contacts] No matching contact found for SIP address [${address.asStringUriOnly()}]"
-                    )
-                }
-            }
-        }
-
-        if (corePreferences.enableNativeAddressBookIntegration) {
-            if (!PermissionHelper.get().hasReadContactsPermission()) {
-                Log.i("[Contacts] Asking for READ_CONTACTS permission")
-                requestPermissions(arrayOf(android.Manifest.permission.READ_CONTACTS), 0)
-            }
-        }
-    }
-
-    override fun deleteItems(indexesOfItemToDelete: ArrayList<Int>) {
-        val list = ArrayList<Friend>()
-        var closeSlidingPane = false
-        for (index in indexesOfItemToDelete) {
-            val contact = adapter.currentList[index].contact.value
-            if (contact != null) {
-                list.add(contact)
-            }
-
-            if (contact == sharedViewModel.selectedContact.value) {
-                closeSlidingPane = true
-            }
-        }
-        listViewModel.deleteContacts(list)
-
-        if (!binding.slidingPane.isSlideable && closeSlidingPane) {
-            Log.i(
-                "[Contacts] Currently displayed contact has been deleted, removing detail fragment"
-            )
-            clearDisplayedContact()
-        }
-    }
-
-    override fun onResume() {
-        super.onResume()
-        listViewModel.updateContactsList(true)
-    }
-
-    @Deprecated("Deprecated in Java")
-    override fun onRequestPermissionsResult(
-        requestCode: Int,
-        permissions: Array<out String>,
-        grantResults: IntArray
-    ) {
-        if (requestCode == 0) {
-            val granted = grantResults.isNotEmpty() && grantResults[0] == PackageManager.PERMISSION_GRANTED
-            if (granted) {
-                Log.i("[Contacts] READ_CONTACTS permission granted")
-                coreContext.fetchContacts()
-            } else {
-                Log.w("[Contacts] READ_CONTACTS permission denied")
-            }
-        } else if (requestCode == 1) {
-            val granted = grantResults.isNotEmpty() && grantResults[0] == PackageManager.PERMISSION_GRANTED
-            if (granted) {
-                Log.i("[Contacts] WRITE_CONTACTS permission granted")
-                listSelectionViewModel.isEditionEnabled.value = true
-            } else {
-                Log.w("[Contacts] WRITE_CONTACTS permission denied")
-            }
-        }
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/main/contact/fragments/SyncAccountPickerFragment.kt b/app/src/main/java/org/linphone/activities/main/contact/fragments/SyncAccountPickerFragment.kt
deleted file mode 100644
index 64e31bb05..000000000
--- a/app/src/main/java/org/linphone/activities/main/contact/fragments/SyncAccountPickerFragment.kt
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.main.contact.fragments
-
-import android.os.Bundle
-import android.view.*
-import androidx.fragment.app.DialogFragment
-import org.linphone.R
-import org.linphone.activities.main.contact.adapters.SyncAccountAdapter
-import org.linphone.core.tools.Log
-import org.linphone.databinding.ContactSyncAccountPickerFragmentBinding
-
-class SyncAccountPickerFragment(private val listener: SyncAccountPickedListener) : DialogFragment() {
-    private var _binding: ContactSyncAccountPickerFragmentBinding? = null
-    private val binding get() = _binding!!
-    private lateinit var adapter: SyncAccountAdapter
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setStyle(STYLE_NO_TITLE, R.style.assistant_country_dialog_style)
-    }
-
-    override fun onDestroyView() {
-        super.onDestroyView()
-        _binding = null
-    }
-
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View {
-        _binding = ContactSyncAccountPickerFragmentBinding.inflate(inflater, container, false)
-
-        adapter = SyncAccountAdapter()
-        binding.accountsList.adapter = adapter
-
-        binding.accountsList.setOnItemClickListener { _, _, position, _ ->
-            if (position >= 0 && position < adapter.count) {
-                val account = adapter.getItem(position)
-                Log.i("[Sync Account Picker] Picked ${account.first} / ${account.second}")
-                listener.onSyncAccountClicked(account.first, account.second)
-            }
-            dismiss()
-        }
-
-        binding.setLocalSyncAccountClickListener {
-            Log.i("[Sync Account Picker] Picked local account")
-            listener.onSyncAccountClicked(null, null)
-            dismiss()
-        }
-
-        return binding.root
-    }
-
-    interface SyncAccountPickedListener {
-        fun onSyncAccountClicked(name: String?, type: String?)
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/main/contact/viewmodels/ContactViewModel.kt b/app/src/main/java/org/linphone/activities/main/contact/viewmodels/ContactViewModel.kt
deleted file mode 100644
index 68ac85ace..000000000
--- a/app/src/main/java/org/linphone/activities/main/contact/viewmodels/ContactViewModel.kt
+++ /dev/null
@@ -1,271 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.main.contact.viewmodels
-
-import android.content.ContentProviderOperation
-import android.provider.ContactsContract
-import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.ViewModel
-import androidx.lifecycle.ViewModelProvider
-import androidx.lifecycle.viewModelScope
-import kotlinx.coroutines.CoroutineScope
-import org.linphone.LinphoneApplication.Companion.coreContext
-import org.linphone.LinphoneApplication.Companion.corePreferences
-import org.linphone.R
-import org.linphone.activities.main.contact.data.ContactNumberOrAddressClickListener
-import org.linphone.activities.main.contact.data.ContactNumberOrAddressData
-import org.linphone.activities.main.viewmodels.MessageNotifierViewModel
-import org.linphone.contact.ContactDataInterface
-import org.linphone.contact.ContactsUpdatedListenerStub
-import org.linphone.contact.hasLongTermPresence
-import org.linphone.core.*
-import org.linphone.core.tools.Log
-import org.linphone.utils.Event
-import org.linphone.utils.LinphoneUtils
-import org.linphone.utils.PhoneNumberUtils
-
-class ContactViewModelFactory(private val friend: Friend) :
-    ViewModelProvider.NewInstanceFactory() {
-
-    @Suppress("UNCHECKED_CAST")
-    override fun <T : ViewModel> create(modelClass: Class<T>): T {
-        return ContactViewModel(friend) as T
-    }
-}
-
-class ContactViewModel(friend: Friend) : MessageNotifierViewModel(), ContactDataInterface {
-    override val contact: MutableLiveData<Friend> = MutableLiveData<Friend>()
-    override val displayName: MutableLiveData<String> = MutableLiveData<String>()
-    override val securityLevel: MutableLiveData<ChatRoom.SecurityLevel> = MutableLiveData<ChatRoom.SecurityLevel>()
-    override val presenceStatus: MutableLiveData<ConsolidatedPresence> = MutableLiveData<ConsolidatedPresence>()
-    override val coroutineScope: CoroutineScope = viewModelScope
-
-    var fullName = ""
-
-    val displayOrganization = corePreferences.displayOrganization
-
-    val numbersAndAddresses = MutableLiveData<ArrayList<ContactNumberOrAddressData>>()
-
-    val sendSmsToEvent: MutableLiveData<Event<String>> by lazy {
-        MutableLiveData<Event<String>>()
-    }
-
-    val startCallToEvent: MutableLiveData<Event<Address>> by lazy {
-        MutableLiveData<Event<Address>>()
-    }
-
-    val chatRoomCreatedEvent: MutableLiveData<Event<ChatRoom>> by lazy {
-        MutableLiveData<Event<ChatRoom>>()
-    }
-
-    val waitForChatRoomCreation = MutableLiveData<Boolean>()
-
-    val isNativeContact = MutableLiveData<Boolean>()
-
-    val readOnlyNativeAddressBook = MutableLiveData<Boolean>()
-
-    val hasLongTermPresence = MutableLiveData<Boolean>()
-
-    private val chatRoomListener = object : ChatRoomListenerStub() {
-        override fun onStateChanged(chatRoom: ChatRoom, state: ChatRoom.State) {
-            if (state == ChatRoom.State.Created) {
-                chatRoom.removeListener(this)
-                waitForChatRoomCreation.value = false
-                chatRoomCreatedEvent.value = Event(chatRoom)
-            } else if (state == ChatRoom.State.CreationFailed) {
-                Log.e("[Contact Detail] Group chat room creation has failed !")
-                chatRoom.removeListener(this)
-                waitForChatRoomCreation.value = false
-                onMessageToNotifyEvent.value = Event(R.string.chat_room_creation_failed_snack)
-            }
-        }
-    }
-
-    private val contactsListener = object : ContactsUpdatedListenerStub() {
-        override fun onContactUpdated(friend: Friend) {
-            if (friend.refKey == contact.value?.refKey) {
-                Log.i("[Contact Detail] Friend has been updated!")
-                contact.value = friend
-                displayName.value = friend.name
-                isNativeContact.value = friend.refKey != null
-                updateNumbersAndAddresses()
-            }
-        }
-    }
-
-    private val listener = object : ContactNumberOrAddressClickListener {
-        override fun onCall(address: Address) {
-            startCallToEvent.value = Event(address)
-        }
-
-        override fun onChat(address: Address, isSecured: Boolean) {
-            waitForChatRoomCreation.value = true
-            val chatRoom = LinphoneUtils.createOneToOneChatRoom(address, isSecured)
-
-            if (chatRoom != null) {
-                val state = chatRoom.state
-                Log.i("[Contact Detail] Found existing chat room in state $state")
-                if (state == ChatRoom.State.Created || state == ChatRoom.State.Terminated) {
-                    waitForChatRoomCreation.value = false
-                    chatRoomCreatedEvent.value = Event(chatRoom)
-                } else {
-                    chatRoom.addListener(chatRoomListener)
-                }
-            } else {
-                waitForChatRoomCreation.value = false
-                Log.e("[Contact Detail] Couldn't create chat room with address $address")
-                onMessageToNotifyEvent.value = Event(R.string.chat_room_creation_failed_snack)
-            }
-        }
-
-        override fun onSmsInvite(number: String) {
-            sendSmsToEvent.value = Event(number)
-        }
-    }
-
-    init {
-        fullName = friend.name ?: ""
-
-        contact.value = friend
-        displayName.value = friend.name
-        isNativeContact.value = friend.refKey != null
-        presenceStatus.value = friend.consolidatedPresence
-        readOnlyNativeAddressBook.value = corePreferences.readOnlyNativeContacts
-        hasLongTermPresence.value = friend.hasLongTermPresence()
-
-        friend.addListener {
-            presenceStatus.value = it.consolidatedPresence
-            hasLongTermPresence.value = it.hasLongTermPresence()
-        }
-    }
-
-    override fun onCleared() {
-        destroy()
-        super.onCleared()
-    }
-
-    fun destroy() {
-    }
-
-    fun registerContactListener() {
-        coreContext.contactsManager.addListener(contactsListener)
-    }
-
-    fun unregisterContactListener() {
-        coreContext.contactsManager.removeListener(contactsListener)
-    }
-
-    fun deleteContact() {
-        val select = ContactsContract.Data.CONTACT_ID + " = ?"
-        val ops = java.util.ArrayList<ContentProviderOperation>()
-
-        val id = contact.value?.refKey
-        if (id != null) {
-            Log.i("[Contact] Setting Android contact id $id to batch removal")
-            val args = arrayOf(id)
-            ops.add(
-                ContentProviderOperation.newDelete(ContactsContract.RawContacts.CONTENT_URI)
-                    .withSelection(select, args)
-                    .build()
-            )
-        }
-
-        contact.value?.remove()
-
-        if (ops.isNotEmpty()) {
-            try {
-                Log.i("[Contact] Removing ${ops.size} contacts")
-                coreContext.context.contentResolver.applyBatch(ContactsContract.AUTHORITY, ops)
-            } catch (e: Exception) {
-                Log.e("[Contact] $e")
-            }
-        }
-    }
-
-    fun updateNumbersAndAddresses() {
-        val list = arrayListOf<ContactNumberOrAddressData>()
-        val friend = contact.value ?: return
-
-        for (address in friend.addresses) {
-            val username = address.username
-            if (username in friend.phoneNumbers) continue
-
-            val value = address.asStringUriOnly()
-            val presenceModel = friend.getPresenceModelForUriOrTel(value)
-            val hasPresence = presenceModel?.basicStatus == PresenceBasicStatus.Open
-            val isMe = coreContext.core.defaultAccount?.params?.identityAddress?.weakEqual(address) ?: false
-            val hasLimeCapability = corePreferences.allowEndToEndEncryptedChatWithoutPresence || (
-                friend.getPresenceModelForUriOrTel(
-                    value
-                )?.hasCapability(Friend.Capability.LimeX3Dh) ?: false
-                )
-            val secureChatAllowed = LinphoneUtils.isEndToEndEncryptedChatAvailable() && !isMe && hasLimeCapability
-            val displayValue = if (coreContext.core.defaultAccount?.params?.domain == address.domain) (address.username ?: value) else value
-            val noa = ContactNumberOrAddressData(
-                address,
-                hasPresence,
-                displayValue,
-                showSecureChat = secureChatAllowed,
-                listener = listener
-            )
-            list.add(noa)
-        }
-
-        for (phoneNumber in friend.phoneNumbersWithLabel) {
-            val number = phoneNumber.phoneNumber
-            val presenceModel = friend.getPresenceModelForUriOrTel(number)
-            val hasPresence = presenceModel != null && presenceModel.basicStatus == PresenceBasicStatus.Open
-            val contactAddress = presenceModel?.contact ?: number
-            val address = coreContext.core.interpretUrl(
-                contactAddress,
-                LinphoneUtils.applyInternationalPrefix()
-            )
-            address?.displayName = displayName.value.orEmpty()
-            val isMe = if (address != null) {
-                coreContext.core.defaultAccount?.params?.identityAddress?.weakEqual(
-                    address
-                ) ?: false
-            } else {
-                false
-            }
-            val hasLimeCapability = corePreferences.allowEndToEndEncryptedChatWithoutPresence || (
-                friend.getPresenceModelForUriOrTel(
-                    number
-                )?.hasCapability(Friend.Capability.LimeX3Dh) ?: false
-                )
-            val secureChatAllowed = LinphoneUtils.isEndToEndEncryptedChatAvailable() && !isMe && hasLimeCapability
-            val label = PhoneNumberUtils.vcardParamStringToAddressBookLabel(
-                coreContext.context.resources,
-                phoneNumber.label ?: ""
-            )
-            val noa = ContactNumberOrAddressData(
-                address,
-                hasPresence,
-                number,
-                isSip = false,
-                showSecureChat = secureChatAllowed,
-                typeLabel = label,
-                listener = listener
-            )
-            list.add(noa)
-        }
-        numbersAndAddresses.postValue(list)
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/main/contact/viewmodels/ContactsListViewModel.kt b/app/src/main/java/org/linphone/activities/main/contact/viewmodels/ContactsListViewModel.kt
deleted file mode 100644
index 7ab26ee8e..000000000
--- a/app/src/main/java/org/linphone/activities/main/contact/viewmodels/ContactsListViewModel.kt
+++ /dev/null
@@ -1,232 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.main.contact.viewmodels
-
-import android.content.ContentProviderOperation
-import android.provider.ContactsContract
-import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.ViewModel
-import androidx.lifecycle.viewModelScope
-import java.util.*
-import kotlinx.coroutines.*
-import org.linphone.LinphoneApplication.Companion.coreContext
-import org.linphone.LinphoneApplication.Companion.corePreferences
-import org.linphone.contact.ContactsUpdatedListenerStub
-import org.linphone.core.*
-import org.linphone.core.tools.Log
-import org.linphone.utils.Event
-
-class ContactsListViewModel : ViewModel() {
-    val sipContactsSelected = MutableLiveData<Boolean>()
-
-    val contactsList = MutableLiveData<ArrayList<ContactViewModel>>()
-
-    val nativeAddressBookEnabled = MutableLiveData<Boolean>()
-
-    val readOnlyNativeAddressBook = MutableLiveData<Boolean>()
-
-    val hideSipContactsList = MutableLiveData<Boolean>()
-
-    val onlyShowSipContactsList = MutableLiveData<Boolean>()
-
-    val fetchInProgress = MutableLiveData<Boolean>()
-    private var searchResultsPending: Boolean = false
-    private var fastFetchJob: Job? = null
-
-    val filter = MutableLiveData<String>()
-    private var previousFilter = "NotSet"
-
-    val moreResultsAvailableEvent: MutableLiveData<Event<Boolean>> by lazy {
-        MutableLiveData<Event<Boolean>>()
-    }
-
-    private val contactsUpdatedListener = object : ContactsUpdatedListenerStub() {
-        override fun onContactsUpdated() {
-            Log.i("[Contacts] Contacts have changed")
-            updateContactsList(true)
-        }
-    }
-
-    private val magicSearchListener = object : MagicSearchListenerStub() {
-        override fun onSearchResultsReceived(magicSearch: MagicSearch) {
-            Log.i("[Contacts] Magic search contacts available")
-            searchResultsPending = false
-            processMagicSearchResults(magicSearch.lastSearch)
-            // Use coreContext.contactsManager.fetchInProgress instead of false in case contacts are still being loaded
-            fetchInProgress.value = coreContext.contactsManager.fetchInProgress.value
-        }
-
-        override fun onLdapHaveMoreResults(magicSearch: MagicSearch, ldap: Ldap) {
-            moreResultsAvailableEvent.value = Event(true)
-        }
-    }
-
-    init {
-        sipContactsSelected.value = coreContext.contactsManager.shouldDisplaySipContactsList()
-        nativeAddressBookEnabled.value = corePreferences.enableNativeAddressBookIntegration
-        readOnlyNativeAddressBook.value = corePreferences.readOnlyNativeContacts
-
-        onlyShowSipContactsList.value = corePreferences.onlyShowSipContactsList
-        hideSipContactsList.value = corePreferences.hideSipContactsList
-        if (onlyShowSipContactsList.value == true) {
-            sipContactsSelected.value = true
-        }
-        if (hideSipContactsList.value == true) {
-            sipContactsSelected.value = false
-        }
-
-        coreContext.contactsManager.addListener(contactsUpdatedListener)
-        coreContext.contactsManager.magicSearch.addListener(magicSearchListener)
-    }
-
-    override fun onCleared() {
-        contactsList.value.orEmpty().forEach(ContactViewModel::destroy)
-        coreContext.contactsManager.magicSearch.removeListener(magicSearchListener)
-        coreContext.contactsManager.removeListener(contactsUpdatedListener)
-
-        super.onCleared()
-    }
-
-    fun updateContactsList(clearCache: Boolean) {
-        val filterValue = filter.value.orEmpty()
-
-        if (clearCache || (
-            previousFilter.isNotEmpty() && (
-                previousFilter.length > filterValue.length ||
-                    (previousFilter.length == filterValue.length && previousFilter != filterValue)
-                )
-            )
-        ) {
-            coreContext.contactsManager.magicSearch.resetSearchCache()
-        }
-        previousFilter = filterValue
-
-        val domain = if (sipContactsSelected.value == true) coreContext.core.defaultAccount?.params?.domain ?: "" else ""
-        val sources = MagicSearch.Source.Friends.toInt() or MagicSearch.Source.LdapServers.toInt()
-        val aggregation = MagicSearch.Aggregation.Friend
-        searchResultsPending = true
-        fastFetchJob?.cancel()
-        Log.i(
-            "[Contacts] Asking Magic search for contacts matching filter [$filterValue], domain [$domain] and in sources [$sources]"
-        )
-        coreContext.contactsManager.magicSearch.getContactsListAsync(
-            filterValue,
-            domain,
-            sources,
-            aggregation
-        )
-
-        val spinnerDelay = corePreferences.delayBeforeShowingContactsSearchSpinner.toLong()
-        fastFetchJob = viewModelScope.launch {
-            withContext(Dispatchers.IO) {
-                delay(spinnerDelay)
-            }
-            withContext(Dispatchers.Main) {
-                if (searchResultsPending) {
-                    fetchInProgress.value = true
-                }
-            }
-        }
-    }
-
-    private fun processMagicSearchResults(results: Array<SearchResult>) {
-        Log.i("[Contacts] Processing ${results.size} results")
-        contactsList.value.orEmpty().forEach(ContactViewModel::destroy)
-
-        val list = arrayListOf<ContactViewModel>()
-
-        for (result in results) {
-            val friend = result.friend
-
-            val viewModel = if (friend != null) {
-                ContactViewModel(friend)
-            } else {
-                Log.w("[Contacts] SearchResult [$result] has no Friend!")
-                val fakeFriend = coreContext.contactsManager.createFriendFromSearchResult(
-                    result
-                )
-                ContactViewModel(fakeFriend)
-            }
-
-            list.add(viewModel)
-        }
-
-        contactsList.value = list
-        Log.i("[Contacts] Processed ${results.size} results")
-    }
-
-    fun deleteContact(friend: Friend) {
-        friend.remove() // TODO: FIXME: friend is const here!
-
-        val id = friend.refKey
-        if (id == null) {
-            Log.w("[Contacts] Friend has no refkey, can't delete it from native address book")
-            return
-        }
-
-        val select = ContactsContract.Data.CONTACT_ID + " = ?"
-        val ops = ArrayList<ContentProviderOperation>()
-
-        Log.i("[Contacts] Adding Android contact id $id to batch removal")
-        val args = arrayOf(id)
-        ops.add(
-            ContentProviderOperation.newDelete(ContactsContract.RawContacts.CONTENT_URI)
-                .withSelection(select, args)
-                .build()
-        )
-
-        if (ops.isNotEmpty()) {
-            try {
-                Log.i("[Contacts] Removing ${ops.size} contacts")
-                coreContext.context.contentResolver.applyBatch(ContactsContract.AUTHORITY, ops)
-            } catch (e: Exception) {
-                Log.e("[Contacts] $e")
-            }
-        }
-    }
-
-    fun deleteContacts(list: ArrayList<Friend>) {
-        val select = ContactsContract.Data.CONTACT_ID + " = ?"
-        val ops = ArrayList<ContentProviderOperation>()
-
-        for (friend in list) {
-            val id = friend.refKey
-            if (id != null) {
-                Log.i("[Contacts] Adding Android contact id $id to batch removal")
-                val args = arrayOf(id)
-                ops.add(
-                    ContentProviderOperation.newDelete(ContactsContract.RawContacts.CONTENT_URI)
-                        .withSelection(select, args)
-                        .build()
-                )
-            }
-            friend.remove()
-        }
-
-        if (ops.isNotEmpty()) {
-            try {
-                Log.i("[Contacts] Removing ${ops.size} contacts")
-                coreContext.context.contentResolver.applyBatch(ContactsContract.AUTHORITY, ops)
-            } catch (e: Exception) {
-                Log.e("[Contacts] $e")
-            }
-        }
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/main/dialer/NumpadDigitListener.kt b/app/src/main/java/org/linphone/activities/main/dialer/NumpadDigitListener.kt
deleted file mode 100644
index 49cfa6437..000000000
--- a/app/src/main/java/org/linphone/activities/main/dialer/NumpadDigitListener.kt
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.main.dialer
-
-interface NumpadDigitListener {
-    fun handleClick(key: Char)
-    fun handleLongClick(key: Char): Boolean
-}
diff --git a/app/src/main/java/org/linphone/activities/main/dialer/fragments/ConfigViewerFragment.kt b/app/src/main/java/org/linphone/activities/main/dialer/fragments/ConfigViewerFragment.kt
deleted file mode 100644
index 9ec0e6d47..000000000
--- a/app/src/main/java/org/linphone/activities/main/dialer/fragments/ConfigViewerFragment.kt
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright (c) 2010-2021 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.main.dialer.fragments
-
-import android.content.ActivityNotFoundException
-import android.content.Intent
-import android.os.Bundle
-import android.view.View
-import androidx.lifecycle.ViewModelProvider
-import org.linphone.R
-import org.linphone.activities.main.dialer.viewmodels.ConfigFileViewModel
-import org.linphone.activities.main.fragments.SecureFragment
-import org.linphone.core.tools.Log
-import org.linphone.databinding.FileConfigViewerFragmentBinding
-
-class ConfigViewerFragment : SecureFragment<FileConfigViewerFragmentBinding>() {
-    private lateinit var viewModel: ConfigFileViewModel
-
-    override fun getLayoutId(): Int = R.layout.file_config_viewer_fragment
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        binding.lifecycleOwner = viewLifecycleOwner
-
-        viewModel = ViewModelProvider(this)[ConfigFileViewModel::class.java]
-        binding.viewModel = viewModel
-
-        isSecure = arguments?.getBoolean("Secure") ?: false
-
-        binding.setExportClickListener {
-            shareConfig()
-        }
-    }
-
-    private fun shareConfig() {
-        val intent = Intent(Intent.ACTION_SEND)
-        intent.putExtra(Intent.EXTRA_TEXT, viewModel.text.value.orEmpty())
-        intent.type = "text/plain"
-
-        try {
-            startActivity(Intent.createChooser(intent, getString(R.string.app_name)))
-        } catch (ex: ActivityNotFoundException) {
-            Log.e(ex)
-        }
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/main/dialer/fragments/DialerFragment.kt b/app/src/main/java/org/linphone/activities/main/dialer/fragments/DialerFragment.kt
deleted file mode 100644
index 926442817..000000000
--- a/app/src/main/java/org/linphone/activities/main/dialer/fragments/DialerFragment.kt
+++ /dev/null
@@ -1,401 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.main.dialer.fragments
-
-import android.Manifest
-import android.annotation.TargetApi
-import android.app.Dialog
-import android.content.ClipData
-import android.content.ClipboardManager
-import android.content.Context
-import android.content.Intent
-import android.content.pm.PackageManager
-import android.content.res.Configuration
-import android.net.Uri
-import android.os.Bundle
-import android.view.View
-import androidx.lifecycle.ViewModelProvider
-import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import com.google.android.material.transition.MaterialSharedAxis
-import org.linphone.BuildConfig
-import org.linphone.LinphoneApplication.Companion.coreContext
-import org.linphone.LinphoneApplication.Companion.corePreferences
-import org.linphone.R
-import org.linphone.activities.GenericActivity
-import org.linphone.activities.main.MainActivity
-import org.linphone.activities.main.dialer.viewmodels.DialerViewModel
-import org.linphone.activities.main.fragments.SecureFragment
-import org.linphone.activities.main.viewmodels.DialogViewModel
-import org.linphone.activities.navigateToConferenceScheduling
-import org.linphone.activities.navigateToConfigFileViewer
-import org.linphone.activities.navigateToContacts
-import org.linphone.compatibility.Compatibility
-import org.linphone.core.tools.Log
-import org.linphone.databinding.DialerFragmentBinding
-import org.linphone.mediastream.Version
-import org.linphone.telecom.TelecomHelper
-import org.linphone.utils.AppUtils
-import org.linphone.utils.DialogUtils
-import org.linphone.utils.Event
-import org.linphone.utils.PermissionHelper
-
-class DialerFragment : SecureFragment<DialerFragmentBinding>() {
-    private lateinit var viewModel: DialerViewModel
-
-    private var uploadLogsInitiatedByUs = false
-
-    override fun getLayoutId(): Int = R.layout.dialer_fragment
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        binding.lifecycleOwner = viewLifecycleOwner
-
-        viewModel = ViewModelProvider(this)[DialerViewModel::class.java]
-        binding.viewModel = viewModel
-
-        useMaterialSharedAxisXForwardAnimation = false
-        sharedViewModel.updateDialerAnimationsBasedOnDestination.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume { id ->
-                val forward = when (id) {
-                    R.id.masterChatRoomsFragment -> false
-                    else -> true
-                }
-                if (corePreferences.enableAnimations) {
-                    val portraitOrientation =
-                        resources.configuration.orientation != Configuration.ORIENTATION_LANDSCAPE
-                    val axis =
-                        if (portraitOrientation) MaterialSharedAxis.X else MaterialSharedAxis.Y
-                    enterTransition = MaterialSharedAxis(axis, forward)
-                    reenterTransition = MaterialSharedAxis(axis, forward)
-                    returnTransition = MaterialSharedAxis(axis, !forward)
-                    exitTransition = MaterialSharedAxis(axis, !forward)
-                }
-            }
-        }
-
-        binding.setNewContactClickListener {
-            sharedViewModel.updateDialerAnimationsBasedOnDestination.value = Event(
-                R.id.masterContactsFragment
-            )
-            sharedViewModel.updateContactsAnimationsBasedOnDestination.value = Event(
-                R.id.dialerFragment
-            )
-            navigateToContacts(viewModel.enteredUri.value)
-        }
-
-        binding.setNewConferenceClickListener {
-            sharedViewModel.updateDialerAnimationsBasedOnDestination.value = Event(
-                R.id.conferenceSchedulingFragment
-            )
-            navigateToConferenceScheduling()
-        }
-
-        binding.setTransferCallClickListener {
-            if (viewModel.transferCall()) {
-                // Transfer has been consumed, otherwise it might have been a "bis" use
-                sharedViewModel.pendingCallTransfer = false
-                viewModel.transferVisibility.value = false
-                coreContext.onCallStarted()
-            }
-        }
-
-        viewModel.enteredUri.observe(
-            viewLifecycleOwner
-        ) {
-            if (it == corePreferences.debugPopupCode) {
-                displayDebugPopup()
-                viewModel.enteredUri.value = ""
-            }
-        }
-
-        viewModel.uploadFinishedEvent.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume { url ->
-                // To prevent being trigger when using the Send Logs button in About page
-                if (uploadLogsInitiatedByUs) {
-                    val clipboard =
-                        requireContext().getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
-                    val clip = ClipData.newPlainText("Logs url", url)
-                    clipboard.setPrimaryClip(clip)
-
-                    val activity = requireActivity() as MainActivity
-                    activity.showSnackBar(R.string.logs_url_copied_to_clipboard)
-
-                    AppUtils.shareUploadedLogsUrl(activity, url)
-                }
-            }
-        }
-
-        viewModel.updateAvailableEvent.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume { url ->
-                displayNewVersionAvailableDialog(url)
-            }
-        }
-
-        viewModel.onMessageToNotifyEvent.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume { resourceId ->
-                (requireActivity() as MainActivity).showSnackBar(resourceId)
-            }
-        }
-
-        if (corePreferences.firstStart) {
-            Log.w(
-                "[Dialer] First start detected, wait for assistant to be finished to check for update & request permissions"
-            )
-            return
-        }
-
-        if (arguments?.containsKey("URI") == true) {
-            val address = arguments?.getString("URI") ?: ""
-            Log.i("[Dialer] Found URI to call: $address")
-            val skipAutoCall = arguments?.getBoolean("SkipAutoCallStart") ?: false
-
-            if (corePreferences.skipDialerForNewCallAndTransfer) {
-                if (sharedViewModel.pendingCallTransfer) {
-                    Log.i(
-                        "[Dialer] We were asked to skip dialer so starting new call to [$address] now"
-                    )
-                    viewModel.transferCallTo(address)
-                } else {
-                    Log.i(
-                        "[Dialer] We were asked to skip dialer so starting transfer to [$address] now"
-                    )
-                    viewModel.directCall(address)
-                }
-            } else if (corePreferences.callRightAway && !skipAutoCall) {
-                Log.i("[Dialer] Call right away setting is enabled, start the call to [$address]")
-                viewModel.directCall(address)
-            } else {
-                sharedViewModel.dialerUri = address
-            }
-        }
-        arguments?.clear()
-
-        Log.i("[Dialer] Pending call transfer mode = ${sharedViewModel.pendingCallTransfer}")
-        viewModel.transferVisibility.value = sharedViewModel.pendingCallTransfer
-
-        viewModel.autoInitiateVideoCalls.value = coreContext.core.videoActivationPolicy.automaticallyInitiate
-
-        checkForUpdate()
-
-        checkPermissions()
-    }
-
-    override fun onPause() {
-        sharedViewModel.dialerUri = viewModel.enteredUri.value ?: ""
-        super.onPause()
-    }
-
-    override fun onResume() {
-        super.onResume()
-
-        if ((requireActivity() as GenericActivity).isTablet()) {
-            coreContext.core.nativePreviewWindowId = binding.videoPreviewWindow
-        }
-
-        viewModel.updateShowVideoPreview()
-        viewModel.autoInitiateVideoCalls.value = coreContext.core.videoActivationPolicy.automaticallyInitiate
-        uploadLogsInitiatedByUs = false
-
-        viewModel.enteredUri.value = sharedViewModel.dialerUri
-    }
-
-    @Deprecated("Deprecated in Java")
-    override fun onRequestPermissionsResult(
-        requestCode: Int,
-        permissions: Array<out String>,
-        grantResults: IntArray
-    ) {
-        if (requestCode == 0) {
-            if (grantResults.isNotEmpty() && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
-                Log.i("[Dialer] READ_PHONE_STATE permission has been granted")
-                coreContext.initPhoneStateListener()
-                // If first permission has been granted, continue to ask for permissions,
-                // otherwise don't do it or it will loop indefinitely
-                checkPermissions()
-            }
-        } else if (requestCode == 1) {
-            var allGranted = true
-            for (result in grantResults) {
-                if (result != PackageManager.PERMISSION_GRANTED) {
-                    allGranted = false
-                }
-            }
-            if (allGranted) {
-                Log.i("[Dialer] Telecom Manager permission have been granted")
-                enableTelecomManager()
-            } else {
-                Log.w("[Dialer] Telecom Manager permission have been denied (at least one of them)")
-            }
-        } else if (requestCode == 2) {
-            if (grantResults.isNotEmpty() && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
-                Log.i("[Dialer] POST_NOTIFICATIONS permission has been granted")
-            }
-            checkTelecomManagerPermissions()
-        }
-        super.onRequestPermissionsResult(requestCode, permissions, grantResults)
-    }
-
-    private fun checkPermissions() {
-        if (!PermissionHelper.get().hasReadPhoneStatePermission()) {
-            Log.i("[Dialer] Asking for READ_PHONE_STATE permission")
-            requestPermissions(arrayOf(Manifest.permission.READ_PHONE_STATE), 0)
-        } else if (!PermissionHelper.get().hasPostNotificationsPermission()) {
-            // Don't check the following the previous permission is being asked
-            Log.i("[Dialer] Asking for POST_NOTIFICATIONS permission")
-            Compatibility.requestPostNotificationsPermission(this, 2)
-        } else if (Version.sdkAboveOrEqual(Version.API26_O_80)) {
-            // Don't check the following the previous permissions are being asked
-            checkTelecomManagerPermissions()
-        }
-
-        // See https://developer.android.com/about/versions/14/behavior-changes-14#fgs-types
-        if (Version.sdkAboveOrEqual(Version.API34_ANDROID_14_UPSIDE_DOWN_CAKE)) {
-            val fullScreenIntentPermission = Compatibility.hasFullScreenIntentPermission(
-                requireContext()
-            )
-            Log.i(
-                "[Dialer] Android 14 or above detected: full-screen intent permission is ${if (fullScreenIntentPermission) "granted" else "not granted"}"
-            )
-            if (!fullScreenIntentPermission) {
-                (requireActivity() as MainActivity).showSnackBar(
-                    R.string.android_14_full_screen_intent_permission_not_granted,
-                    R.string.android_14_go_to_full_screen_intent_permission_setting
-                ) {
-                    Compatibility.requestFullScreenIntentPermission(requireContext())
-                }
-            }
-        }
-    }
-
-    @TargetApi(Version.API26_O_80)
-    private fun checkTelecomManagerPermissions() {
-        if (!corePreferences.useTelecomManager) {
-            Log.i("[Dialer] Telecom Manager feature is disabled")
-            if (corePreferences.manuallyDisabledTelecomManager) {
-                Log.w("[Dialer] User has manually disabled Telecom Manager feature")
-            } else {
-                if (Compatibility.hasTelecomManagerPermissions(requireContext())) {
-                    enableTelecomManager()
-                } else {
-                    Log.i("[Dialer] Asking for Telecom Manager permissions")
-                    Compatibility.requestTelecomManagerPermissions(requireActivity(), 1)
-                }
-            }
-        } else {
-            Log.i("[Dialer] Telecom Manager feature is already enabled")
-        }
-    }
-
-    @TargetApi(Version.API26_O_80)
-    private fun enableTelecomManager() {
-        Log.i("[Dialer] Telecom Manager permissions granted")
-        if (!TelecomHelper.exists()) {
-            Log.i("[Dialer] Creating Telecom Helper")
-            if (Compatibility.hasTelecomManagerFeature(requireContext())) {
-                TelecomHelper.create(requireContext())
-            } else {
-                Log.e(
-                    "[Dialer] Telecom Helper can't be created, device doesn't support connection service!"
-                )
-                return
-            }
-        } else {
-            Log.e("[Dialer] Telecom Manager was already created ?!")
-        }
-        corePreferences.useTelecomManager = true
-    }
-
-    private fun displayDebugPopup() {
-        val alertDialog = MaterialAlertDialogBuilder(requireContext())
-        alertDialog.setTitle(getString(R.string.debug_popup_title))
-
-        val items = if (corePreferences.debugLogs) {
-            resources.getStringArray(R.array.popup_send_log)
-        } else {
-            resources.getStringArray(R.array.popup_enable_log)
-        }
-
-        alertDialog.setItems(items) { _, which ->
-            when (items[which]) {
-                getString(R.string.debug_popup_disable_logs) -> {
-                    corePreferences.debugLogs = false
-                }
-                getString(R.string.debug_popup_enable_logs) -> {
-                    corePreferences.debugLogs = true
-                }
-                getString(R.string.debug_popup_send_logs) -> {
-                    uploadLogsInitiatedByUs = true
-                    viewModel.uploadLogs()
-                }
-                getString(R.string.debug_popup_show_config_file) -> {
-                    navigateToConfigFileViewer()
-                }
-            }
-        }
-
-        alertDialog.show()
-    }
-
-    private fun checkForUpdate() {
-        val lastTimestamp: Int = corePreferences.lastUpdateAvailableCheckTimestamp
-        val currentTimeStamp = System.currentTimeMillis().toInt()
-        val interval: Int = corePreferences.checkUpdateAvailableInterval
-        if (lastTimestamp == 0 || currentTimeStamp - lastTimestamp >= interval) {
-            val currentVersion = BuildConfig.VERSION_NAME
-            Log.i("[Dialer] Checking for update using current version [$currentVersion]")
-            coreContext.core.checkForUpdate(currentVersion)
-            corePreferences.lastUpdateAvailableCheckTimestamp = currentTimeStamp
-        }
-    }
-
-    private fun displayNewVersionAvailableDialog(url: String) {
-        val viewModel = DialogViewModel(getString(R.string.dialog_update_available))
-        val dialog: Dialog = DialogUtils.getDialog(requireContext(), viewModel)
-
-        viewModel.showCancelButton {
-            dialog.dismiss()
-        }
-
-        viewModel.showOkButton(
-            {
-                try {
-                    val browserIntent = Intent(Intent.ACTION_VIEW, Uri.parse(url))
-                    startActivity(browserIntent)
-                } catch (ise: IllegalStateException) {
-                    Log.e("[Dialer] Can't start ACTION_VIEW intent, IllegalStateException: $ise")
-                } finally {
-                    dialog.dismiss()
-                }
-            },
-            getString(R.string.dialog_ok)
-        )
-
-        dialog.show()
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/main/dialer/viewmodels/ConfigFileViewModel.kt b/app/src/main/java/org/linphone/activities/main/dialer/viewmodels/ConfigFileViewModel.kt
deleted file mode 100644
index 103511b81..000000000
--- a/app/src/main/java/org/linphone/activities/main/dialer/viewmodels/ConfigFileViewModel.kt
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (c) 2010-2021 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.main.dialer.viewmodels
-
-import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.ViewModel
-import org.linphone.LinphoneApplication.Companion.coreContext
-
-class ConfigFileViewModel : ViewModel() {
-    val text = MutableLiveData<String>()
-
-    init {
-        text.value = coreContext.core.config.dump()
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/main/dialer/viewmodels/DialerViewModel.kt b/app/src/main/java/org/linphone/activities/main/dialer/viewmodels/DialerViewModel.kt
deleted file mode 100644
index b931023d3..000000000
--- a/app/src/main/java/org/linphone/activities/main/dialer/viewmodels/DialerViewModel.kt
+++ /dev/null
@@ -1,249 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.main.dialer.viewmodels
-
-import android.content.Context
-import android.os.Vibrator
-import android.text.Editable
-import android.widget.EditText
-import androidx.lifecycle.MutableLiveData
-import org.linphone.LinphoneApplication.Companion.coreContext
-import org.linphone.LinphoneApplication.Companion.corePreferences
-import org.linphone.activities.main.dialer.NumpadDigitListener
-import org.linphone.activities.main.viewmodels.LogsUploadViewModel
-import org.linphone.compatibility.Compatibility
-import org.linphone.core.*
-import org.linphone.core.tools.Log
-import org.linphone.utils.Event
-import org.linphone.utils.LinphoneUtils
-
-class DialerViewModel : LogsUploadViewModel() {
-    val enteredUri = MutableLiveData<String>()
-
-    val atLeastOneCall = MutableLiveData<Boolean>()
-
-    val transferVisibility = MutableLiveData<Boolean>()
-
-    val showPreview = MutableLiveData<Boolean>()
-
-    val showSwitchCamera = MutableLiveData<Boolean>()
-
-    val autoInitiateVideoCalls = MutableLiveData<Boolean>()
-
-    val scheduleConferenceAvailable = MutableLiveData<Boolean>()
-
-    val hideAddContactButton = MutableLiveData<Boolean>()
-
-    val updateAvailableEvent: MutableLiveData<Event<String>> by lazy {
-        MutableLiveData<Event<String>>()
-    }
-
-    private val vibrator = coreContext.context.getSystemService(Context.VIBRATOR_SERVICE) as Vibrator
-
-    private var addressWaitingNetworkToBeCalled: String? = null
-    private var timeAtWitchWeTriedToCall: Long = 0
-
-    private var enteredUriCursorPosition: Int = 0
-
-    val onKeyClick: NumpadDigitListener = object : NumpadDigitListener {
-        override fun handleClick(key: Char) {
-            val sb: StringBuilder = StringBuilder(enteredUri.value)
-            try {
-                sb.insert(enteredUriCursorPosition, key.toString())
-            } catch (ioobe: IndexOutOfBoundsException) {
-                sb.insert(sb.length, key.toString())
-            }
-            enteredUri.value = sb.toString()
-
-            if (vibrator.hasVibrator() && corePreferences.dtmfKeypadVibration) {
-                Compatibility.eventVibration(vibrator)
-            }
-        }
-
-        override fun handleLongClick(key: Char): Boolean {
-            if (key == '1') {
-                val voiceMailUri = corePreferences.voiceMailUri
-                if (voiceMailUri != null) {
-                    coreContext.startCall(voiceMailUri)
-                }
-            } else {
-                enteredUri.value += key.toString()
-            }
-            return true
-        }
-    }
-
-    private val listener = object : CoreListenerStub() {
-        override fun onCallStateChanged(
-            core: Core,
-            call: Call,
-            state: Call.State,
-            message: String
-        ) {
-            atLeastOneCall.value = core.callsNb > 0
-        }
-
-        override fun onTransferStateChanged(core: Core, transfered: Call, callState: Call.State) {
-            if (callState == Call.State.OutgoingProgress) {
-                // Will work for both blind & attended transfer
-                onMessageToNotifyEvent.value = Event(org.linphone.R.string.dialer_transfer_succeded)
-            }
-        }
-
-        override fun onNetworkReachable(core: Core, reachable: Boolean) {
-            val address = addressWaitingNetworkToBeCalled.orEmpty()
-            if (reachable && address.isNotEmpty()) {
-                val now = System.currentTimeMillis()
-                if (now - timeAtWitchWeTriedToCall > 1000) {
-                    Log.e(
-                        "[Dialer] More than 1 second has passed waiting for network, abort auto call to $address"
-                    )
-                    enteredUri.value = address
-                } else {
-                    Log.i("[Dialer] Network is available, continue auto call to $address")
-                    coreContext.startCall(address)
-                }
-
-                addressWaitingNetworkToBeCalled = null
-                timeAtWitchWeTriedToCall = 0
-            }
-        }
-
-        override fun onVersionUpdateCheckResultReceived(
-            core: Core,
-            result: VersionUpdateCheckResult,
-            version: String?,
-            url: String?
-        ) {
-            if (result == VersionUpdateCheckResult.NewVersionAvailable) {
-                Log.i("[Dialer] Update available, version [$version], url [$url]")
-                if (!url.isNullOrEmpty()) {
-                    updateAvailableEvent.value = Event(url)
-                }
-            }
-        }
-
-        override fun onAccountRegistrationStateChanged(
-            core: Core,
-            account: Account,
-            state: RegistrationState?,
-            message: String
-        ) {
-            scheduleConferenceAvailable.value = LinphoneUtils.isRemoteConferencingAvailable()
-        }
-    }
-
-    init {
-        coreContext.core.addListener(listener)
-
-        enteredUri.value = ""
-        atLeastOneCall.value = coreContext.core.callsNb > 0
-        transferVisibility.value = false
-        hideAddContactButton.value = corePreferences.readOnlyNativeContacts
-
-        showSwitchCamera.value = coreContext.showSwitchCameraButton()
-        scheduleConferenceAvailable.value = LinphoneUtils.isRemoteConferencingAvailable()
-    }
-
-    override fun onCleared() {
-        coreContext.core.removeListener(listener)
-
-        super.onCleared()
-    }
-
-    // This is to workaround the cursor being set to the start when pressing a digit
-    fun onBeforeUriChanged(editText: EditText, count: Int, after: Int) {
-        enteredUriCursorPosition = editText.selectionEnd
-        enteredUriCursorPosition += after - count
-    }
-
-    fun onAfterUriChanged(editText: EditText, editable: Editable?) {
-        val newLength = editable?.length ?: 0
-        if (newLength <= enteredUriCursorPosition) enteredUriCursorPosition = newLength
-        if (enteredUriCursorPosition < 0) enteredUriCursorPosition = 0
-        editText.setSelection(enteredUriCursorPosition)
-    }
-
-    fun updateShowVideoPreview() {
-        val videoPreview = corePreferences.videoPreview
-        showPreview.value = videoPreview
-        coreContext.core.isVideoPreviewEnabled = videoPreview
-    }
-
-    fun eraseLastChar() {
-        enteredUri.value = enteredUri.value?.dropLast(1)
-    }
-
-    fun eraseAll(): Boolean {
-        enteredUri.value = ""
-        return true
-    }
-
-    fun directCall(to: String) {
-        if (coreContext.core.isNetworkReachable) {
-            coreContext.startCall(to)
-        } else {
-            Log.w(
-                "[Dialer] Network isnt't reachable at the time, wait for network to start call (happens mainly when app is cold started)"
-            )
-            timeAtWitchWeTriedToCall = System.currentTimeMillis()
-            addressWaitingNetworkToBeCalled = to
-        }
-    }
-
-    fun startCall() {
-        val addressToCall = enteredUri.value.orEmpty()
-        if (addressToCall.isNotEmpty()) {
-            coreContext.startCall(addressToCall)
-            eraseAll()
-        } else {
-            setLastOutgoingCallAddress()
-        }
-    }
-
-    fun transferCall(): Boolean {
-        val addressToCall = enteredUri.value.orEmpty()
-        return if (addressToCall.isNotEmpty()) {
-            transferCallTo(addressToCall)
-            eraseAll()
-            true
-        } else {
-            setLastOutgoingCallAddress()
-            false
-        }
-    }
-
-    fun transferCallTo(addressToCall: String) {
-        if (!coreContext.transferCallTo(addressToCall)) {
-            onMessageToNotifyEvent.value = Event(org.linphone.R.string.dialer_transfer_failed)
-        }
-    }
-
-    fun switchCamera() {
-        coreContext.switchCamera()
-    }
-
-    private fun setLastOutgoingCallAddress() {
-        val callLog = coreContext.core.lastOutgoingCallLog
-        if (callLog != null) {
-            enteredUri.value = LinphoneUtils.getDisplayableAddress(callLog.remoteAddress)
-        }
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/main/files/adapters/PdfPagesListAdapter.kt b/app/src/main/java/org/linphone/activities/main/files/adapters/PdfPagesListAdapter.kt
deleted file mode 100644
index cfb4b48a2..000000000
--- a/app/src/main/java/org/linphone/activities/main/files/adapters/PdfPagesListAdapter.kt
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 2010-2021 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.main.files.adapters
-
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.recyclerview.widget.RecyclerView
-import org.linphone.R
-import org.linphone.activities.main.files.viewmodels.PdfFileViewModel
-
-class PdfPagesListAdapter(private val pdfViewModel: PdfFileViewModel) : RecyclerView.Adapter<PdfPagesListAdapter.PdfPageViewHolder>() {
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): PdfPageViewHolder {
-        val view = LayoutInflater.from(parent.context).inflate(
-            R.layout.file_pdf_viewer_cell,
-            parent,
-            false
-        )
-        return PdfPageViewHolder(view)
-    }
-
-    override fun getItemCount(): Int {
-        return pdfViewModel.getPagesCount()
-    }
-
-    override fun onBindViewHolder(holder: PdfPageViewHolder, position: Int) {
-        holder.bind(position)
-    }
-
-    inner class PdfPageViewHolder(private val view: View) : RecyclerView.ViewHolder(view) {
-        fun bind(index: Int) {
-            pdfViewModel.loadPdfPageInto(index, view.findViewById(R.id.pdf_image))
-        }
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/main/files/fragments/AudioViewerFragment.kt b/app/src/main/java/org/linphone/activities/main/files/fragments/AudioViewerFragment.kt
deleted file mode 100644
index 8dd25f62d..000000000
--- a/app/src/main/java/org/linphone/activities/main/files/fragments/AudioViewerFragment.kt
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Copyright (c) 2010-2021 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.main.files.fragments
-
-import android.annotation.SuppressLint
-import android.os.Bundle
-import android.view.KeyEvent
-import android.view.View
-import android.widget.MediaController
-import androidx.lifecycle.ViewModelProvider
-import androidx.navigation.fragment.findNavController
-import org.linphone.R
-import org.linphone.activities.main.files.viewmodels.AudioFileViewModel
-import org.linphone.activities.main.files.viewmodels.AudioFileViewModelFactory
-import org.linphone.core.tools.Log
-import org.linphone.databinding.FileAudioViewerFragmentBinding
-
-class AudioViewerFragment : GenericViewerFragment<FileAudioViewerFragmentBinding>() {
-    private lateinit var viewModel: AudioFileViewModel
-
-    private lateinit var mediaController: MediaController
-
-    override fun getLayoutId(): Int = R.layout.file_audio_viewer_fragment
-
-    @SuppressLint("ClickableViewAccessibility")
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        binding.lifecycleOwner = viewLifecycleOwner
-
-        val content = sharedViewModel.contentToOpen.value
-        if (content == null) {
-            Log.e("[Audio Viewer] Content is null, aborting!")
-            findNavController().navigateUp()
-            return
-        }
-
-        viewModel = ViewModelProvider(
-            this,
-            AudioFileViewModelFactory(content)
-        )[AudioFileViewModel::class.java]
-        binding.viewModel = viewModel
-
-        mediaController = object : MediaController(requireContext()) {
-            // This hack is even if media controller is showed with timeout=0
-            // Once a control is touched, it will disappear 3 seconds later anyway
-            override fun show(timeout: Int) {
-                super.show(0)
-            }
-
-            // This is to prevent the first back key press to only hide to media controls
-            override fun dispatchKeyEvent(event: KeyEvent?): Boolean {
-                if (event?.keyCode == KeyEvent.KEYCODE_BACK) {
-                    goBack()
-                    return true
-                }
-                return super.dispatchKeyEvent(event)
-            }
-        }
-        mediaController.setMediaPlayer(viewModel)
-
-        viewModel.mediaPlayer.setOnPreparedListener {
-            mediaController.setAnchorView(binding.anchor)
-            // This will make the controls visible forever
-            mediaController.show(0)
-        }
-    }
-
-    override fun onPause() {
-        mediaController.hide()
-        viewModel.mediaPlayer.pause()
-
-        super.onPause()
-    }
-
-    override fun onResume() {
-        super.onResume()
-
-        mediaController.show(0)
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/main/files/fragments/GenericViewerFragment.kt b/app/src/main/java/org/linphone/activities/main/files/fragments/GenericViewerFragment.kt
deleted file mode 100644
index 63ef1b4f5..000000000
--- a/app/src/main/java/org/linphone/activities/main/files/fragments/GenericViewerFragment.kt
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 2010-2021 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.main.files.fragments
-
-import android.os.Bundle
-import android.view.View
-import androidx.databinding.ViewDataBinding
-import androidx.navigation.fragment.findNavController
-import org.linphone.R
-import org.linphone.activities.main.fragments.SecureFragment
-import org.linphone.core.tools.Log
-
-abstract class GenericViewerFragment<T : ViewDataBinding> : SecureFragment<T>() {
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        isSecure = arguments?.getBoolean("Secure") ?: false
-    }
-
-    override fun onStart() {
-        super.onStart()
-
-        val content = sharedViewModel.contentToOpen.value
-        if (content == null) {
-            Log.e("[Generic Viewer] Content is null, aborting!")
-            findNavController().navigateUp()
-            return
-        }
-
-        (childFragmentManager.findFragmentById(R.id.top_bar_fragment) as? TopBarFragment)
-            ?.setContent(content)
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/main/files/fragments/ImageViewerFragment.kt b/app/src/main/java/org/linphone/activities/main/files/fragments/ImageViewerFragment.kt
deleted file mode 100644
index 4cf1dad5e..000000000
--- a/app/src/main/java/org/linphone/activities/main/files/fragments/ImageViewerFragment.kt
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright (c) 2010-2021 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.main.files.fragments
-
-import android.annotation.SuppressLint
-import android.os.Bundle
-import android.view.View
-import androidx.lifecycle.ViewModelProvider
-import androidx.navigation.fragment.findNavController
-import org.linphone.R
-import org.linphone.activities.main.MainActivity
-import org.linphone.activities.main.files.viewmodels.ImageFileViewModel
-import org.linphone.activities.main.files.viewmodels.ImageFileViewModelFactory
-import org.linphone.compatibility.Compatibility
-import org.linphone.core.tools.Log
-import org.linphone.databinding.FileImageViewerFragmentBinding
-
-class ImageViewerFragment : GenericViewerFragment<FileImageViewerFragmentBinding>() {
-    private lateinit var viewModel: ImageFileViewModel
-
-    override fun getLayoutId(): Int = R.layout.file_image_viewer_fragment
-
-    @SuppressLint("ClickableViewAccessibility")
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        binding.lifecycleOwner = viewLifecycleOwner
-
-        val content = sharedViewModel.contentToOpen.value
-        if (content == null) {
-            Log.e("[Image Viewer] Content is null, aborting!")
-            findNavController().navigateUp()
-            return
-        }
-
-        viewModel = ViewModelProvider(
-            this,
-            ImageFileViewModelFactory(content)
-        )[ImageFileViewModel::class.java]
-        binding.viewModel = viewModel
-
-        viewModel.fullScreenMode.observe(
-            viewLifecycleOwner
-        ) { hide ->
-            Compatibility.hideAndroidSystemUI(hide, requireActivity().window)
-            (requireActivity() as MainActivity).hideStatusFragment(hide)
-        }
-    }
-
-    override fun onPause() {
-        super.onPause()
-
-        viewModel.fullScreenMode.value = false
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/main/files/fragments/PdfViewerFragment.kt b/app/src/main/java/org/linphone/activities/main/files/fragments/PdfViewerFragment.kt
deleted file mode 100644
index 2e123d104..000000000
--- a/app/src/main/java/org/linphone/activities/main/files/fragments/PdfViewerFragment.kt
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright (c) 2010-2021 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.main.files.fragments
-
-import android.os.Bundle
-import android.view.View
-import androidx.lifecycle.ViewModelProvider
-import androidx.navigation.fragment.findNavController
-import org.linphone.R
-import org.linphone.activities.main.files.adapters.PdfPagesListAdapter
-import org.linphone.activities.main.files.viewmodels.PdfFileViewModel
-import org.linphone.activities.main.files.viewmodels.PdfFileViewModelFactory
-import org.linphone.core.tools.Log
-import org.linphone.databinding.FilePdfViewerFragmentBinding
-
-class PdfViewerFragment : GenericViewerFragment<FilePdfViewerFragmentBinding>() {
-    private lateinit var viewModel: PdfFileViewModel
-    private lateinit var adapter: PdfPagesListAdapter
-
-    override fun getLayoutId(): Int = R.layout.file_pdf_viewer_fragment
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        binding.lifecycleOwner = viewLifecycleOwner
-
-        val content = sharedViewModel.contentToOpen.value
-        if (content == null) {
-            Log.e("[PDF Viewer] Content is null, aborting!")
-            findNavController().navigateUp()
-            return
-        }
-
-        viewModel = ViewModelProvider(
-            this,
-            PdfFileViewModelFactory(content)
-        )[PdfFileViewModel::class.java]
-        binding.viewModel = viewModel
-
-        viewModel.rendererReady.observe(viewLifecycleOwner) {
-            it.consume {
-                adapter = PdfPagesListAdapter(viewModel)
-                binding.pdfViewPager.adapter = adapter
-            }
-        }
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/main/files/fragments/TextViewerFragment.kt b/app/src/main/java/org/linphone/activities/main/files/fragments/TextViewerFragment.kt
deleted file mode 100644
index 470ce50c1..000000000
--- a/app/src/main/java/org/linphone/activities/main/files/fragments/TextViewerFragment.kt
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (c) 2010-2021 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.main.files.fragments
-
-import android.os.Bundle
-import android.view.View
-import androidx.lifecycle.ViewModelProvider
-import androidx.navigation.fragment.findNavController
-import org.linphone.R
-import org.linphone.activities.main.files.viewmodels.TextFileViewModel
-import org.linphone.activities.main.files.viewmodels.TextFileViewModelFactory
-import org.linphone.core.tools.Log
-import org.linphone.databinding.FileTextViewerFragmentBinding
-
-class TextViewerFragment : GenericViewerFragment<FileTextViewerFragmentBinding>() {
-    private lateinit var viewModel: TextFileViewModel
-
-    override fun getLayoutId(): Int = R.layout.file_text_viewer_fragment
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        binding.lifecycleOwner = viewLifecycleOwner
-
-        val content = sharedViewModel.contentToOpen.value
-        if (content == null) {
-            Log.e("[Text Viewer] Content is null, aborting!")
-            findNavController().navigateUp()
-            return
-        }
-
-        viewModel = ViewModelProvider(
-            this,
-            TextFileViewModelFactory(content)
-        )[TextFileViewModel::class.java]
-        binding.viewModel = viewModel
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/main/files/fragments/TopBarFragment.kt b/app/src/main/java/org/linphone/activities/main/files/fragments/TopBarFragment.kt
deleted file mode 100644
index e956f4654..000000000
--- a/app/src/main/java/org/linphone/activities/main/files/fragments/TopBarFragment.kt
+++ /dev/null
@@ -1,184 +0,0 @@
-/*
- * Copyright (c) 2010-2021 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.main.files.fragments
-
-import android.os.Bundle
-import android.view.View
-import android.webkit.MimeTypeMap
-import androidx.lifecycle.lifecycleScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.async
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
-import org.linphone.R
-import org.linphone.activities.GenericFragment
-import org.linphone.activities.SnackBarActivity
-import org.linphone.compatibility.Compatibility
-import org.linphone.core.Content
-import org.linphone.core.tools.Log
-import org.linphone.databinding.FileViewerTopBarFragmentBinding
-import org.linphone.utils.FileUtils
-import org.linphone.utils.PermissionHelper
-
-class TopBarFragment : GenericFragment<FileViewerTopBarFragmentBinding>() {
-    private var content: Content? = null
-    private var plainFilePath: String = ""
-
-    override fun getLayoutId(): Int = R.layout.file_viewer_top_bar_fragment
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        binding.lifecycleOwner = viewLifecycleOwner
-        useMaterialSharedAxisXForwardAnimation = false
-
-        binding.setExportClickListener {
-            val contentToExport = content
-            if (contentToExport != null) {
-                exportContent(contentToExport)
-            } else {
-                Log.e("[File Viewer] No Content set!")
-            }
-        }
-    }
-
-    override fun onSaveInstanceState(outState: Bundle) {
-        outState.putString("FilePath", plainFilePath)
-        super.onSaveInstanceState(outState)
-    }
-
-    override fun onViewStateRestored(savedInstanceState: Bundle?) {
-        super.onViewStateRestored(savedInstanceState)
-        plainFilePath = savedInstanceState?.getString("FilePath") ?: plainFilePath
-    }
-
-    override fun onDestroyView() {
-        if (plainFilePath.isNotEmpty() && plainFilePath != content?.filePath.orEmpty()) {
-            Log.i("[File Viewer] Destroying plain file path: $plainFilePath")
-            FileUtils.deleteFile(plainFilePath)
-        }
-        super.onDestroyView()
-    }
-
-    fun setContent(c: Content) {
-        Log.i("[File Viewer] Content file path is: ${c.filePath}")
-        content = c
-        binding.fileName.text = c.name
-    }
-
-    private fun exportContent(content: Content) {
-        lifecycleScope.launch {
-            var mediaStoreFilePath = ""
-            if (PermissionHelper.get().hasWriteExternalStoragePermission()) {
-                val filePath = content.filePath.orEmpty()
-                Log.i("[File Viewer] Trying to export file [$filePath] through Media Store API")
-
-                val extension = FileUtils.getExtensionFromFileName(filePath)
-                val mime = MimeTypeMap.getSingleton().getMimeTypeFromExtension(extension)
-                when (FileUtils.getMimeType(mime)) {
-                    FileUtils.MimeType.Image -> {
-                        val export = lifecycleScope.async {
-                            Compatibility.addImageToMediaStore(requireContext(), content)
-                        }
-                        if (export.await()) {
-                            Log.i(
-                                "[File Viewer] Successfully exported image [${content.name}] to Media Store: ${content.userData}"
-                            )
-                            mediaStoreFilePath = content.userData.toString()
-                        } else {
-                            Log.e(
-                                "[File Viewer] Something went wrong while copying file to Media Store..."
-                            )
-                        }
-                    }
-                    FileUtils.MimeType.Video -> {
-                        val export = lifecycleScope.async {
-                            Compatibility.addVideoToMediaStore(requireContext(), content)
-                        }
-                        if (export.await()) {
-                            Log.i(
-                                "[File Viewer] Successfully exported video [${content.name}] to Media Store: ${content.userData}"
-                            )
-                            mediaStoreFilePath = content.userData.toString()
-                        } else {
-                            Log.e(
-                                "[File Viewer] Something went wrong while copying file to Media Store..."
-                            )
-                        }
-                    }
-                    FileUtils.MimeType.Audio -> {
-                        val export = lifecycleScope.async {
-                            Compatibility.addAudioToMediaStore(requireContext(), content)
-                        }
-                        if (export.await()) {
-                            Log.i(
-                                "[File Viewer] Successfully exported audio [${content.name}] to Media Store: ${content.userData}"
-                            )
-                            mediaStoreFilePath = content.userData.toString()
-                        } else {
-                            Log.e(
-                                "[File Viewer] Something went wrong while copying file to Media Store..."
-                            )
-                        }
-                    }
-                    else -> {
-                        Log.w(
-                            "[File Viewer] File [${content.name}] isn't either an image, an audio file or a video, can't add it to the Media Store"
-                        )
-                    }
-                }
-            } else {
-                Log.w(
-                    "[File Viewer] Can't export image through Media Store API (requires Android 10 or WRITE_EXTERNAL permission, using fallback method..."
-                )
-            }
-
-            withContext(Dispatchers.Main) {
-                if (mediaStoreFilePath.isEmpty()) {
-                    Log.w(
-                        "[File Viewer] Media store file path is empty, media store export failed?"
-                    )
-
-                    val filePath = content.exportPlainFile().orEmpty()
-                    plainFilePath = filePath.ifEmpty { content.filePath.orEmpty() }
-                    Log.i("[File Viewer] Plain file path is: $plainFilePath")
-                    if (plainFilePath.isNotEmpty()) {
-                        if (!FileUtils.openFileInThirdPartyApp(requireActivity(), plainFilePath)) {
-                            (requireActivity() as SnackBarActivity).showSnackBar(
-                                R.string.chat_message_no_app_found_to_handle_file_mime_type
-                            )
-                            if (plainFilePath != content.filePath.orEmpty()) {
-                                Log.i(
-                                    "[File Viewer] No app to open plain file path [$plainFilePath], destroying it"
-                                )
-                                FileUtils.deleteFile(plainFilePath)
-                            }
-                            plainFilePath = ""
-                        }
-                    }
-                } else {
-                    plainFilePath = ""
-                    Log.i("[File Viewer] Media store file path is: $mediaStoreFilePath")
-                    FileUtils.openMediaStoreFile(requireActivity(), mediaStoreFilePath)
-                }
-            }
-        }
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/main/files/fragments/VideoViewerFragment.kt b/app/src/main/java/org/linphone/activities/main/files/fragments/VideoViewerFragment.kt
deleted file mode 100644
index 1840b0f12..000000000
--- a/app/src/main/java/org/linphone/activities/main/files/fragments/VideoViewerFragment.kt
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * Copyright (c) 2010-2021 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.main.files.fragments
-
-import android.os.Bundle
-import android.view.KeyEvent
-import android.view.View
-import android.widget.MediaController
-import androidx.lifecycle.ViewModelProvider
-import androidx.navigation.fragment.findNavController
-import org.linphone.R
-import org.linphone.activities.main.MainActivity
-import org.linphone.activities.main.files.viewmodels.VideoFileViewModel
-import org.linphone.activities.main.files.viewmodels.VideoFileViewModelFactory
-import org.linphone.compatibility.Compatibility
-import org.linphone.core.tools.Log
-import org.linphone.databinding.FileVideoViewerFragmentBinding
-
-class VideoViewerFragment : GenericViewerFragment<FileVideoViewerFragmentBinding>() {
-    private lateinit var viewModel: VideoFileViewModel
-
-    private lateinit var mediaController: MediaController
-
-    override fun getLayoutId(): Int = R.layout.file_video_viewer_fragment
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        binding.lifecycleOwner = viewLifecycleOwner
-
-        val content = sharedViewModel.contentToOpen.value
-        if (content == null) {
-            Log.e("[Video Viewer] Content is null, aborting!")
-            findNavController().navigateUp()
-            return
-        }
-
-        viewModel = ViewModelProvider(
-            this,
-            VideoFileViewModelFactory(content)
-        )[VideoFileViewModel::class.java]
-        binding.viewModel = viewModel
-
-        mediaController = object : MediaController(requireContext()) {
-            // This is to prevent the first back key press to only hide to media controls
-            override fun dispatchKeyEvent(event: KeyEvent?): Boolean {
-                if (event?.keyCode == KeyEvent.KEYCODE_BACK) {
-                    goBack()
-                    return true
-                }
-                return super.dispatchKeyEvent(event)
-            }
-        }
-        initMediaController()
-
-        viewModel.fullScreenMode.observe(
-            viewLifecycleOwner
-        ) { hide ->
-            Compatibility.hideAndroidSystemUI(hide, requireActivity().window)
-            (requireActivity() as MainActivity).hideStatusFragment(hide)
-        }
-    }
-
-    override fun onResume() {
-        super.onResume()
-
-        binding.videoView.start()
-    }
-
-    override fun onPause() {
-        if (mediaController.isShowing) {
-            mediaController.hide()
-        }
-
-        if (binding.videoView.isPlaying) {
-            binding.videoView.pause()
-        }
-
-        viewModel.fullScreenMode.value = false
-        super.onPause()
-    }
-
-    override fun onDestroyView() {
-        binding.videoView.stopPlayback()
-
-        super.onDestroyView()
-    }
-
-    private fun initMediaController() {
-        val videoView = binding.videoView
-
-        videoView.setOnPreparedListener { mediaPlayer ->
-            mediaPlayer.setOnVideoSizeChangedListener { _, _, _ ->
-                videoView.setMediaController(mediaController)
-                // The following will make the video controls above the video
-                // mediaController.setAnchorView(videoView)
-
-                // This will make the controls visible right away for 3 seconds
-                // If 0 as timeout, they will stay visible mediaController.hide() is called
-                mediaController.show()
-            }
-        }
-
-        videoView.setOnErrorListener { _, what, extra ->
-            Log.e("[Video Viewer] Error: $what ($extra)")
-            false
-        }
-
-        videoView.setVideoPath(viewModel.filePath)
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/main/files/viewmodels/AudioFileViewModel.kt b/app/src/main/java/org/linphone/activities/main/files/viewmodels/AudioFileViewModel.kt
deleted file mode 100644
index 33e83b7d9..000000000
--- a/app/src/main/java/org/linphone/activities/main/files/viewmodels/AudioFileViewModel.kt
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * Copyright (c) 2010-2021 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.main.files.viewmodels
-
-import android.media.AudioAttributes
-import android.media.MediaPlayer
-import android.widget.MediaController
-import androidx.lifecycle.ViewModel
-import androidx.lifecycle.ViewModelProvider
-import java.lang.IllegalStateException
-import org.linphone.core.Content
-
-class AudioFileViewModelFactory(private val content: Content) :
-    ViewModelProvider.NewInstanceFactory() {
-
-    @Suppress("UNCHECKED_CAST")
-    override fun <T : ViewModel> create(modelClass: Class<T>): T {
-        return AudioFileViewModel(content) as T
-    }
-}
-
-class AudioFileViewModel(content: Content) : FileViewerViewModel(content), MediaController.MediaPlayerControl {
-    val mediaPlayer = MediaPlayer()
-
-    init {
-        mediaPlayer.apply {
-            setAudioAttributes(
-                AudioAttributes.Builder().setContentType(AudioAttributes.CONTENT_TYPE_MUSIC).setUsage(
-                    AudioAttributes.USAGE_MEDIA
-                ).build()
-            )
-            setDataSource(filePath)
-            prepare()
-            start()
-        }
-    }
-
-    override fun onCleared() {
-        mediaPlayer.release()
-        super.onCleared()
-    }
-
-    override fun start() {
-        mediaPlayer.start()
-    }
-
-    override fun pause() {
-        mediaPlayer.pause()
-    }
-
-    override fun getDuration(): Int {
-        return mediaPlayer.duration
-    }
-
-    override fun getCurrentPosition(): Int {
-        try {
-            return mediaPlayer.currentPosition
-        } catch (_: IllegalStateException) {}
-        return 0
-    }
-
-    override fun seekTo(pos: Int) {
-        mediaPlayer.seekTo(pos)
-    }
-
-    override fun isPlaying(): Boolean {
-        return mediaPlayer.isPlaying
-    }
-
-    override fun getBufferPercentage(): Int {
-        return 0
-    }
-
-    override fun canPause(): Boolean {
-        return true
-    }
-
-    override fun canSeekBackward(): Boolean {
-        return true
-    }
-
-    override fun canSeekForward(): Boolean {
-        return true
-    }
-
-    override fun getAudioSessionId(): Int {
-        return mediaPlayer.audioSessionId
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/main/files/viewmodels/FileViewerViewModel.kt b/app/src/main/java/org/linphone/activities/main/files/viewmodels/FileViewerViewModel.kt
deleted file mode 100644
index d9f46d86c..000000000
--- a/app/src/main/java/org/linphone/activities/main/files/viewmodels/FileViewerViewModel.kt
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (c) 2010-2021 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.main.files.viewmodels
-
-import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.ViewModel
-import org.linphone.core.Content
-import org.linphone.core.tools.Log
-import org.linphone.utils.FileUtils
-
-open class FileViewerViewModel(val content: Content) : ViewModel() {
-    val filePath: String
-    private val deleteAfterUse: Boolean = content.isFileEncrypted
-
-    val fullScreenMode = MutableLiveData<Boolean>()
-
-    init {
-        filePath = if (deleteAfterUse) {
-            Log.i(
-                "[File Viewer] [VFS] Content is encrypted, requesting plain file path for file [${content.filePath}]"
-            )
-            content.exportPlainFile()
-        } else {
-            content.filePath.orEmpty()
-        }
-    }
-
-    override fun onCleared() {
-        if (deleteAfterUse) {
-            Log.i("[File Viewer] [VFS] Deleting temporary plain file [$filePath]")
-            FileUtils.deleteFile(filePath)
-        }
-
-        super.onCleared()
-    }
-
-    fun toggleFullScreen() {
-        fullScreenMode.value = fullScreenMode.value != true
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/main/files/viewmodels/ImageFileViewModel.kt b/app/src/main/java/org/linphone/activities/main/files/viewmodels/ImageFileViewModel.kt
deleted file mode 100644
index bddf64d5e..000000000
--- a/app/src/main/java/org/linphone/activities/main/files/viewmodels/ImageFileViewModel.kt
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (c) 2010-2021 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.main.files.viewmodels
-
-import androidx.lifecycle.ViewModel
-import androidx.lifecycle.ViewModelProvider
-import org.linphone.core.Content
-
-class ImageFileViewModelFactory(private val content: Content) :
-    ViewModelProvider.NewInstanceFactory() {
-
-    @Suppress("UNCHECKED_CAST")
-    override fun <T : ViewModel> create(modelClass: Class<T>): T {
-        return ImageFileViewModel(content) as T
-    }
-}
-
-class ImageFileViewModel(content: Content) : FileViewerViewModel(content)
diff --git a/app/src/main/java/org/linphone/activities/main/files/viewmodels/PdfFileViewModel.kt b/app/src/main/java/org/linphone/activities/main/files/viewmodels/PdfFileViewModel.kt
deleted file mode 100644
index 259957fac..000000000
--- a/app/src/main/java/org/linphone/activities/main/files/viewmodels/PdfFileViewModel.kt
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * Copyright (c) 2010-2021 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.main.files.viewmodels
-
-import android.graphics.Bitmap
-import android.graphics.pdf.PdfRenderer
-import android.os.ParcelFileDescriptor
-import android.widget.ImageView
-import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.ViewModel
-import androidx.lifecycle.ViewModelProvider
-import androidx.lifecycle.viewModelScope
-import java.io.File
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
-import org.linphone.LinphoneApplication.Companion.coreContext
-import org.linphone.core.Content
-import org.linphone.core.tools.Log
-import org.linphone.utils.Event
-
-class PdfFileViewModelFactory(private val content: Content) :
-    ViewModelProvider.NewInstanceFactory() {
-
-    @Suppress("UNCHECKED_CAST")
-    override fun <T : ViewModel> create(modelClass: Class<T>): T {
-        return PdfFileViewModel(content) as T
-    }
-}
-
-class PdfFileViewModel(content: Content) : FileViewerViewModel(content) {
-    val operationInProgress = MutableLiveData<Boolean>()
-
-    val rendererReady = MutableLiveData<Event<Boolean>>()
-
-    private lateinit var pdfRenderer: PdfRenderer
-
-    init {
-        operationInProgress.value = false
-
-        viewModelScope.launch {
-            withContext(Dispatchers.IO) {
-                val input = ParcelFileDescriptor.open(
-                    File(filePath),
-                    ParcelFileDescriptor.MODE_READ_ONLY
-                )
-                pdfRenderer = PdfRenderer(input)
-                Log.i("[PDF Viewer] ${pdfRenderer.pageCount} pages in file $filePath")
-                rendererReady.postValue(Event(true))
-            }
-        }
-    }
-
-    override fun onCleared() {
-        if (this::pdfRenderer.isInitialized) {
-            pdfRenderer.close()
-        }
-        super.onCleared()
-    }
-
-    fun getPagesCount(): Int {
-        if (this::pdfRenderer.isInitialized) {
-            return pdfRenderer.pageCount
-        }
-        return 0
-    }
-
-    fun loadPdfPageInto(index: Int, view: ImageView) {
-        viewModelScope.launch {
-            withContext(Dispatchers.IO) {
-                try {
-                    operationInProgress.postValue(true)
-
-                    val page: PdfRenderer.Page = pdfRenderer.openPage(index)
-                    val width =
-                        if (coreContext.screenWidth <= coreContext.screenHeight) coreContext.screenWidth else coreContext.screenHeight
-                    val bm = Bitmap.createBitmap(
-                        width.toInt(),
-                        (width / page.width * page.height).toInt(),
-                        Bitmap.Config.ARGB_8888
-                    )
-                    page.render(bm, null, null, PdfRenderer.Page.RENDER_MODE_FOR_DISPLAY)
-                    page.close()
-
-                    withContext(Dispatchers.Main) {
-                        view.setImageBitmap(bm)
-                    }
-
-                    operationInProgress.postValue(false)
-                } catch (e: Exception) {
-                    Log.e("[PDF Viewer] Exception: $e")
-                    operationInProgress.postValue(false)
-                }
-            }
-        }
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/main/files/viewmodels/TextFileViewModel.kt b/app/src/main/java/org/linphone/activities/main/files/viewmodels/TextFileViewModel.kt
deleted file mode 100644
index 56aa44dbc..000000000
--- a/app/src/main/java/org/linphone/activities/main/files/viewmodels/TextFileViewModel.kt
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright (c) 2010-2021 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.main.files.viewmodels
-
-import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.ViewModel
-import androidx.lifecycle.ViewModelProvider
-import androidx.lifecycle.viewModelScope
-import java.io.BufferedReader
-import java.io.FileReader
-import java.lang.StringBuilder
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
-import org.linphone.core.Content
-import org.linphone.core.tools.Log
-
-class TextFileViewModelFactory(private val content: Content) :
-    ViewModelProvider.NewInstanceFactory() {
-
-    @Suppress("UNCHECKED_CAST")
-    override fun <T : ViewModel> create(modelClass: Class<T>): T {
-        return TextFileViewModel(content) as T
-    }
-}
-
-class TextFileViewModel(content: Content) : FileViewerViewModel(content) {
-    val operationInProgress = MutableLiveData<Boolean>()
-
-    val text = MutableLiveData<String>()
-
-    init {
-        viewModelScope.launch {
-            withContext(Dispatchers.IO) {
-                try {
-                    operationInProgress.postValue(true)
-                    val br = BufferedReader(FileReader(filePath))
-                    var line: String?
-                    val textBuilder = StringBuilder()
-                    while (br.readLine().also { line = it } != null) {
-                        textBuilder.append(line)
-                        textBuilder.append('\n')
-                    }
-                    br.close()
-
-                    text.postValue(textBuilder.toString())
-                    operationInProgress.postValue(false)
-                } catch (e: Exception) {
-                    Log.e("[Text Viewer] Exception: $e")
-                    operationInProgress.postValue(false)
-                }
-            }
-        }
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/main/files/viewmodels/VideoFileViewModel.kt b/app/src/main/java/org/linphone/activities/main/files/viewmodels/VideoFileViewModel.kt
deleted file mode 100644
index b9510c0cd..000000000
--- a/app/src/main/java/org/linphone/activities/main/files/viewmodels/VideoFileViewModel.kt
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (c) 2010-2021 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.main.files.viewmodels
-
-import androidx.lifecycle.ViewModel
-import androidx.lifecycle.ViewModelProvider
-import org.linphone.core.Content
-
-class VideoFileViewModelFactory(private val content: Content) :
-    ViewModelProvider.NewInstanceFactory() {
-
-    @Suppress("UNCHECKED_CAST")
-    override fun <T : ViewModel> create(modelClass: Class<T>): T {
-        return VideoFileViewModel(content) as T
-    }
-}
-
-class VideoFileViewModel(content: Content) : FileViewerViewModel(content)
diff --git a/app/src/main/java/org/linphone/activities/main/fragments/EmptyFragment.kt b/app/src/main/java/org/linphone/activities/main/fragments/EmptyFragment.kt
deleted file mode 100644
index b9fcfe1cb..000000000
--- a/app/src/main/java/org/linphone/activities/main/fragments/EmptyFragment.kt
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.main.fragments
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.fragment.app.Fragment
-import com.google.android.material.transition.MaterialSharedAxis
-import org.linphone.R
-
-class EmptyFragment : Fragment() {
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View? {
-        reenterTransition = MaterialSharedAxis(MaterialSharedAxis.X, true)
-        returnTransition = MaterialSharedAxis(MaterialSharedAxis.X, false)
-        return inflater.inflate(R.layout.empty_fragment, container, false)
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/main/fragments/ListTopBarFragment.kt b/app/src/main/java/org/linphone/activities/main/fragments/ListTopBarFragment.kt
deleted file mode 100644
index d18ed62a7..000000000
--- a/app/src/main/java/org/linphone/activities/main/fragments/ListTopBarFragment.kt
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.main.fragments
-
-import android.os.Bundle
-import android.view.View
-import androidx.lifecycle.ViewModelProvider
-import org.linphone.R
-import org.linphone.activities.GenericFragment
-import org.linphone.activities.main.viewmodels.ListTopBarViewModel
-import org.linphone.databinding.ListEditTopBarFragmentBinding
-import org.linphone.utils.Event
-
-class ListTopBarFragment : GenericFragment<ListEditTopBarFragmentBinding>() {
-    private lateinit var viewModel: ListTopBarViewModel
-
-    override fun getLayoutId(): Int = R.layout.list_edit_top_bar_fragment
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        binding.lifecycleOwner = viewLifecycleOwner
-        useMaterialSharedAxisXForwardAnimation = false
-
-        viewModel = ViewModelProvider(parentFragment ?: this)[ListTopBarViewModel::class.java]
-        binding.viewModel = viewModel
-
-        binding.setCancelClickListener {
-            viewModel.isEditionEnabled.value = false
-        }
-
-        binding.setSelectAllClickListener {
-            viewModel.selectAllEvent.value = Event(true)
-        }
-
-        binding.setUnSelectAllClickListener {
-            viewModel.unSelectAllEvent.value = Event(true)
-        }
-
-        binding.setDeleteClickListener {
-            viewModel.deleteSelectionEvent.value = Event(true)
-        }
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/main/fragments/MasterFragment.kt b/app/src/main/java/org/linphone/activities/main/fragments/MasterFragment.kt
deleted file mode 100644
index b38de9c08..000000000
--- a/app/src/main/java/org/linphone/activities/main/fragments/MasterFragment.kt
+++ /dev/null
@@ -1,169 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.main.fragments
-
-import android.app.Dialog
-import android.os.Bundle
-import android.view.View
-import androidx.activity.OnBackPressedCallback
-import androidx.core.view.doOnPreDraw
-import androidx.databinding.ViewDataBinding
-import androidx.lifecycle.ViewModelProvider
-import androidx.slidingpanelayout.widget.SlidingPaneLayout
-import org.linphone.R
-import org.linphone.activities.main.adapters.SelectionListAdapter
-import org.linphone.activities.main.viewmodels.DialogViewModel
-import org.linphone.activities.main.viewmodels.ListTopBarViewModel
-import org.linphone.core.tools.Log
-import org.linphone.utils.AppUtils
-import org.linphone.utils.DialogUtils
-import org.linphone.utils.hideKeyboard
-
-/**
- * This fragment can be inherited by all fragments that will display a list
- * where items can be selected for removal through the ListTopBarFragment
- */
-abstract class MasterFragment<T : ViewDataBinding, U : SelectionListAdapter<*, *>> : SecureFragment<T>() {
-    protected var _adapter: U? = null
-    protected val adapter: U
-        get() {
-            if (_adapter == null) {
-                Log.e("[Master Fragment] Attempting to get a null adapter!")
-            }
-            return _adapter!!
-        }
-
-    protected lateinit var listSelectionViewModel: ListTopBarViewModel
-    protected open val dialogConfirmationMessageBeforeRemoval: Int = R.plurals.dialog_default_delete
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        // List selection
-        listSelectionViewModel = ViewModelProvider(this)[ListTopBarViewModel::class.java]
-
-        listSelectionViewModel.isEditionEnabled.observe(
-            viewLifecycleOwner
-        ) {
-            if (!it) listSelectionViewModel.onUnSelectAll()
-        }
-
-        listSelectionViewModel.selectAllEvent.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume {
-                listSelectionViewModel.onSelectAll(getItemCount() - 1)
-            }
-        }
-
-        listSelectionViewModel.unSelectAllEvent.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume {
-                listSelectionViewModel.onUnSelectAll()
-            }
-        }
-
-        listSelectionViewModel.deleteSelectionEvent.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume {
-                val confirmationDialog = AppUtils.getStringWithPlural(
-                    dialogConfirmationMessageBeforeRemoval,
-                    listSelectionViewModel.selectedItems.value.orEmpty().size
-                )
-                val viewModel = DialogViewModel(confirmationDialog)
-                val dialog: Dialog = DialogUtils.getDialog(requireContext(), viewModel)
-
-                viewModel.showCancelButton {
-                    dialog.dismiss()
-                    listSelectionViewModel.isEditionEnabled.value = false
-                }
-
-                viewModel.showDeleteButton(
-                    {
-                        delete()
-                        dialog.dismiss()
-                        listSelectionViewModel.isEditionEnabled.value = false
-                    },
-                    getString(R.string.dialog_delete)
-                )
-
-                dialog.show()
-            }
-        }
-    }
-
-    fun setUpSlidingPane(slidingPane: SlidingPaneLayout) {
-        binding.root.doOnPreDraw {
-            sharedViewModel.isSlidingPaneSlideable.value = slidingPane.isSlideable
-
-            requireActivity().onBackPressedDispatcher.addCallback(
-                viewLifecycleOwner,
-                SlidingPaneBackPressedCallback(slidingPane)
-            )
-        }
-
-        slidingPane.lockMode = SlidingPaneLayout.LOCK_MODE_LOCKED
-    }
-
-    private fun delete() {
-        val list = listSelectionViewModel.selectedItems.value ?: arrayListOf()
-        deleteItems(list)
-    }
-
-    private fun getItemCount(): Int {
-        return adapter.itemCount
-    }
-
-    abstract fun deleteItems(indexesOfItemToDelete: ArrayList<Int>)
-
-    class SlidingPaneBackPressedCallback(private val slidingPaneLayout: SlidingPaneLayout) :
-        OnBackPressedCallback(
-            slidingPaneLayout.isSlideable && slidingPaneLayout.isOpen
-        ),
-        SlidingPaneLayout.PanelSlideListener {
-
-        init {
-            Log.d(
-                "[Master Fragment] SlidingPane isSlideable = ${slidingPaneLayout.isSlideable}, isOpen = ${slidingPaneLayout.isOpen}"
-            )
-            slidingPaneLayout.addPanelSlideListener(this)
-        }
-
-        override fun handleOnBackPressed() {
-            Log.d("[Master Fragment] handleOnBackPressed, closing sliding pane")
-            slidingPaneLayout.hideKeyboard()
-            slidingPaneLayout.closePane()
-        }
-
-        override fun onPanelOpened(panel: View) {
-            Log.d("[Master Fragment] onPanelOpened")
-            isEnabled = true
-        }
-
-        override fun onPanelClosed(panel: View) {
-            Log.d("[Master Fragment] onPanelClosed")
-            isEnabled = false
-        }
-
-        override fun onPanelSlide(panel: View, slideOffset: Float) { }
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/main/fragments/SecureFragment.kt b/app/src/main/java/org/linphone/activities/main/fragments/SecureFragment.kt
deleted file mode 100644
index 7cc660755..000000000
--- a/app/src/main/java/org/linphone/activities/main/fragments/SecureFragment.kt
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.main.fragments
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.view.WindowManager
-import androidx.core.view.ViewCompat
-import androidx.databinding.ViewDataBinding
-import androidx.lifecycle.lifecycleScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
-import org.linphone.LinphoneApplication.Companion.corePreferences
-import org.linphone.activities.GenericFragment
-import org.linphone.core.tools.Log
-
-abstract class SecureFragment<T : ViewDataBinding> : GenericFragment<T>() {
-    protected var isSecure: Boolean = false
-
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View? {
-        // Assume we might want to be secure to prevent quick visible blink while screen recording.
-        enableSecureMode(true)
-        return super.onCreateView(inflater, container, savedInstanceState)
-    }
-
-    override fun onResume() {
-        if (isSecure) {
-            enableSecureMode(true)
-        } else {
-            // This is a workaround to prevent a small blink showing the previous secured screen
-            lifecycleScope.launch {
-                withContext(Dispatchers.Main) {
-                    delay(200)
-                    enableSecureMode(isSecure)
-                }
-            }
-        }
-        super.onResume()
-    }
-
-    private fun enableSecureMode(enable: Boolean) {
-        if (corePreferences.disableSecureMode) {
-            Log.d("[Secure Fragment] Disabling secure flag on window due to setting")
-            return
-        }
-
-        Log.d("[Secure Fragment] ${if (enable) "Enabling" else "Disabling"} secure flag on window")
-        val window = requireActivity().window
-        val windowManager = requireActivity().windowManager
-
-        val flags: Int = window.attributes.flags
-        if ((enable && flags and WindowManager.LayoutParams.FLAG_SECURE != 0) ||
-            (!enable && flags and WindowManager.LayoutParams.FLAG_SECURE == 0)
-        ) {
-            Log.d(
-                "[Secure Fragment] Secure flag is already ${if (enable) "enabled" else "disabled"}, skipping..."
-            )
-            return
-        }
-
-        if (enable) {
-            window.addFlags(WindowManager.LayoutParams.FLAG_SECURE)
-        } else {
-            window.clearFlags(WindowManager.LayoutParams.FLAG_SECURE)
-        }
-
-        if (ViewCompat.isAttachedToWindow(window.decorView)) {
-            Log.d("[Secure Fragment] Redrawing window decorView to apply flag")
-            try {
-                windowManager.updateViewLayout(window.decorView, window.attributes)
-            } catch (ise: IllegalStateException) {
-                Log.e("[Secure Fragment] Failed to update view layout: $ise")
-            }
-        }
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/main/fragments/StatusFragment.kt b/app/src/main/java/org/linphone/activities/main/fragments/StatusFragment.kt
deleted file mode 100644
index 50b357198..000000000
--- a/app/src/main/java/org/linphone/activities/main/fragments/StatusFragment.kt
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.main.fragments
-
-import android.os.Bundle
-import android.view.View
-import androidx.lifecycle.ViewModelProvider
-import org.linphone.LinphoneApplication.Companion.coreContext
-import org.linphone.R
-import org.linphone.activities.GenericFragment
-import org.linphone.activities.main.viewmodels.StatusViewModel
-import org.linphone.core.tools.Log
-import org.linphone.databinding.StatusFragmentBinding
-import org.linphone.utils.Event
-
-class StatusFragment : GenericFragment<StatusFragmentBinding>() {
-    private lateinit var viewModel: StatusViewModel
-
-    override fun getLayoutId(): Int = R.layout.status_fragment
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        binding.lifecycleOwner = viewLifecycleOwner
-        useMaterialSharedAxisXForwardAnimation = false
-
-        viewModel = ViewModelProvider(this)[StatusViewModel::class.java]
-        binding.viewModel = viewModel
-
-        sharedViewModel.accountRemoved.observe(
-            viewLifecycleOwner
-        ) {
-            Log.i("[Status Fragment] An account was removed, update default account state")
-            val defaultAccount = coreContext.core.defaultAccount
-            if (defaultAccount != null) {
-                viewModel.updateDefaultAccountRegistrationStatus(defaultAccount.state)
-            }
-        }
-
-        binding.setMenuClickListener {
-            sharedViewModel.toggleDrawerEvent.value = Event(true)
-        }
-
-        binding.setRefreshClickListener {
-            viewModel.refreshRegister()
-        }
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/main/fragments/TabsFragment.kt b/app/src/main/java/org/linphone/activities/main/fragments/TabsFragment.kt
deleted file mode 100644
index b62708eb3..000000000
--- a/app/src/main/java/org/linphone/activities/main/fragments/TabsFragment.kt
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.main.fragments
-
-import android.os.Bundle
-import android.view.View
-import androidx.lifecycle.ViewModelProvider
-import androidx.navigation.NavController
-import androidx.navigation.NavDestination
-import androidx.navigation.fragment.findNavController
-import org.linphone.LinphoneApplication.Companion.corePreferences
-import org.linphone.R
-import org.linphone.activities.GenericFragment
-import org.linphone.activities.main.viewmodels.TabsViewModel
-import org.linphone.activities.navigateToCallHistory
-import org.linphone.activities.navigateToChatRooms
-import org.linphone.activities.navigateToContacts
-import org.linphone.activities.navigateToDialer
-import org.linphone.databinding.TabsFragmentBinding
-import org.linphone.utils.Event
-
-class TabsFragment : GenericFragment<TabsFragmentBinding>(), NavController.OnDestinationChangedListener {
-    private lateinit var viewModel: TabsViewModel
-
-    override fun getLayoutId(): Int = R.layout.tabs_fragment
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        binding.lifecycleOwner = viewLifecycleOwner
-        useMaterialSharedAxisXForwardAnimation = false
-
-        viewModel = requireActivity().run {
-            ViewModelProvider(this)[TabsViewModel::class.java]
-        }
-        binding.viewModel = viewModel
-
-        binding.setHistoryClickListener {
-            when (findNavController().currentDestination?.id) {
-                R.id.masterContactsFragment -> sharedViewModel.updateContactsAnimationsBasedOnDestination.value = Event(
-                    R.id.masterCallLogsFragment
-                )
-                R.id.dialerFragment -> sharedViewModel.updateDialerAnimationsBasedOnDestination.value = Event(
-                    R.id.masterCallLogsFragment
-                )
-            }
-            navigateToCallHistory()
-        }
-
-        binding.setContactsClickListener {
-            when (findNavController().currentDestination?.id) {
-                R.id.dialerFragment -> sharedViewModel.updateDialerAnimationsBasedOnDestination.value = Event(
-                    R.id.masterContactsFragment
-                )
-            }
-            sharedViewModel.updateContactsAnimationsBasedOnDestination.value = Event(
-                findNavController().currentDestination?.id ?: -1
-            )
-            navigateToContacts()
-        }
-
-        binding.setDialerClickListener {
-            when (findNavController().currentDestination?.id) {
-                R.id.masterContactsFragment -> sharedViewModel.updateContactsAnimationsBasedOnDestination.value = Event(
-                    R.id.dialerFragment
-                )
-            }
-            sharedViewModel.updateDialerAnimationsBasedOnDestination.value = Event(
-                findNavController().currentDestination?.id ?: -1
-            )
-            navigateToDialer()
-        }
-
-        binding.setChatClickListener {
-            when (findNavController().currentDestination?.id) {
-                R.id.masterContactsFragment -> sharedViewModel.updateContactsAnimationsBasedOnDestination.value = Event(
-                    R.id.masterChatRoomsFragment
-                )
-                R.id.dialerFragment -> sharedViewModel.updateDialerAnimationsBasedOnDestination.value = Event(
-                    R.id.masterChatRoomsFragment
-                )
-            }
-            navigateToChatRooms()
-        }
-    }
-
-    override fun onStart() {
-        super.onStart()
-        findNavController().addOnDestinationChangedListener(this)
-    }
-
-    override fun onStop() {
-        findNavController().removeOnDestinationChangedListener(this)
-        super.onStop()
-    }
-
-    override fun onDestinationChanged(
-        controller: NavController,
-        destination: NavDestination,
-        arguments: Bundle?
-    ) {
-        if (corePreferences.enableAnimations) {
-            when (destination.id) {
-                R.id.masterCallLogsFragment -> binding.motionLayout.transitionToState(
-                    R.id.call_history
-                )
-                R.id.masterContactsFragment -> binding.motionLayout.transitionToState(R.id.contacts)
-                R.id.dialerFragment -> binding.motionLayout.transitionToState(R.id.dialer)
-                R.id.masterChatRoomsFragment -> binding.motionLayout.transitionToState(
-                    R.id.chat_rooms
-                )
-            }
-        } else {
-            when (destination.id) {
-                R.id.masterCallLogsFragment -> binding.motionLayout.setTransition(
-                    R.id.call_history,
-                    R.id.call_history
-                )
-                R.id.masterContactsFragment -> binding.motionLayout.setTransition(
-                    R.id.contacts,
-                    R.id.contacts
-                )
-                R.id.dialerFragment -> binding.motionLayout.setTransition(R.id.dialer, R.id.dialer)
-                R.id.masterChatRoomsFragment -> binding.motionLayout.setTransition(
-                    R.id.chat_rooms,
-                    R.id.chat_rooms
-                )
-            }
-        }
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/main/history/adapters/CallLogsListAdapter.kt b/app/src/main/java/org/linphone/activities/main/history/adapters/CallLogsListAdapter.kt
deleted file mode 100644
index 4c20b767e..000000000
--- a/app/src/main/java/org/linphone/activities/main/history/adapters/CallLogsListAdapter.kt
+++ /dev/null
@@ -1,167 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.main.history.adapters
-
-import android.content.Context
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.databinding.DataBindingUtil
-import androidx.lifecycle.LifecycleOwner
-import androidx.lifecycle.MutableLiveData
-import androidx.recyclerview.widget.DiffUtil
-import androidx.recyclerview.widget.RecyclerView
-import org.linphone.R
-import org.linphone.activities.main.adapters.SelectionListAdapter
-import org.linphone.activities.main.history.data.GroupedCallLogData
-import org.linphone.activities.main.viewmodels.ListTopBarViewModel
-import org.linphone.databinding.GenericListHeaderBinding
-import org.linphone.databinding.HistoryListCellBinding
-import org.linphone.utils.*
-
-class CallLogsListAdapter(
-    selectionVM: ListTopBarViewModel,
-    private val viewLifecycleOwner: LifecycleOwner
-) : SelectionListAdapter<GroupedCallLogData, RecyclerView.ViewHolder>(
-    selectionVM,
-    CallLogDiffCallback()
-),
-    HeaderAdapter {
-    val selectedCallLogEvent: MutableLiveData<Event<GroupedCallLogData>> by lazy {
-        MutableLiveData<Event<GroupedCallLogData>>()
-    }
-
-    val startCallToEvent: MutableLiveData<Event<GroupedCallLogData>> by lazy {
-        MutableLiveData<Event<GroupedCallLogData>>()
-    }
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
-        val binding: HistoryListCellBinding = DataBindingUtil.inflate(
-            LayoutInflater.from(parent.context),
-            R.layout.history_list_cell,
-            parent,
-            false
-        )
-        return ViewHolder(binding)
-    }
-
-    override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
-        (holder as ViewHolder).bind(getItem(position))
-    }
-
-    inner class ViewHolder(
-        val binding: HistoryListCellBinding
-    ) : RecyclerView.ViewHolder(binding.root) {
-        fun bind(callLogGroup: GroupedCallLogData) {
-            with(binding) {
-                val callLogViewModel = callLogGroup.lastCallLogViewModel
-                viewModel = callLogViewModel
-
-                lifecycleOwner = viewLifecycleOwner
-
-                // This is for item selection through ListTopBarFragment
-                selectionListViewModel = selectionViewModel
-                selectionViewModel.isEditionEnabled.observe(
-                    viewLifecycleOwner
-                ) {
-                    position = bindingAdapterPosition
-                }
-
-                setClickListener {
-                    if (selectionViewModel.isEditionEnabled.value == true) {
-                        selectionViewModel.onToggleSelect(bindingAdapterPosition)
-                    } else {
-                        startCallToEvent.value = Event(callLogGroup)
-                    }
-                }
-
-                setLongClickListener {
-                    if (selectionViewModel.isEditionEnabled.value == false) {
-                        selectionViewModel.isEditionEnabled.value = true
-                        // Selection will be handled by click listener
-                        true
-                    }
-                    false
-                }
-
-                // This listener is disabled when in edition mode
-                setDetailsClickListener {
-                    selectedCallLogEvent.value = Event(callLogGroup)
-                }
-
-                groupCount = callLogGroup.callLogs.size
-
-                executePendingBindings()
-            }
-        }
-    }
-
-    override fun displayHeaderForPosition(position: Int): Boolean {
-        if (position >= itemCount) return false
-        val callLogGroup = getItem(position)
-        val date = callLogGroup.lastCallLogStartTimestamp
-        val previousPosition = position - 1
-        return if (previousPosition >= 0) {
-            val previousItemDate = getItem(previousPosition).lastCallLogStartTimestamp
-            !TimestampUtils.isSameDay(date, previousItemDate)
-        } else {
-            true
-        }
-    }
-
-    override fun getHeaderViewForPosition(context: Context, position: Int): View {
-        val callLog = getItem(position)
-        val date = formatDate(context, callLog.lastCallLogStartTimestamp)
-        val binding: GenericListHeaderBinding = DataBindingUtil.inflate(
-            LayoutInflater.from(context),
-            R.layout.generic_list_header,
-            null,
-            false
-        )
-        binding.title = date
-        binding.executePendingBindings()
-        return binding.root
-    }
-
-    private fun formatDate(context: Context, date: Long): String {
-        if (TimestampUtils.isToday(date)) {
-            return context.getString(R.string.today)
-        } else if (TimestampUtils.isYesterday(date)) {
-            return context.getString(R.string.yesterday)
-        }
-        return TimestampUtils.toString(date, onlyDate = true, shortDate = false, hideYear = false)
-    }
-}
-
-private class CallLogDiffCallback : DiffUtil.ItemCallback<GroupedCallLogData>() {
-    override fun areItemsTheSame(
-        oldItem: GroupedCallLogData,
-        newItem: GroupedCallLogData
-    ): Boolean {
-        return oldItem.lastCallLogId == newItem.lastCallLogId
-    }
-
-    override fun areContentsTheSame(
-        oldItem: GroupedCallLogData,
-        newItem: GroupedCallLogData
-    ): Boolean {
-        return oldItem.callLogs.size == newItem.callLogs.size
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/main/history/data/GroupedCallLogData.kt b/app/src/main/java/org/linphone/activities/main/history/data/GroupedCallLogData.kt
deleted file mode 100644
index 3fa709f43..000000000
--- a/app/src/main/java/org/linphone/activities/main/history/data/GroupedCallLogData.kt
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.main.history.data
-
-import org.linphone.activities.main.history.viewmodels.CallLogViewModel
-import org.linphone.core.CallLog
-
-class GroupedCallLogData(callLog: CallLog) {
-    val callLogs = arrayListOf(callLog)
-
-    var lastCallLog: CallLog = callLog
-    var lastCallLogId: String? = callLog.callId
-    var lastCallLogStartTimestamp: Long = callLog.startDate
-    val lastCallLogViewModel: CallLogViewModel
-        get() {
-            if (::_lastCallLogViewModel.isInitialized) {
-                return _lastCallLogViewModel
-            }
-            _lastCallLogViewModel = CallLogViewModel(lastCallLog)
-            return _lastCallLogViewModel
-        }
-
-    private lateinit var _lastCallLogViewModel: CallLogViewModel
-
-    fun destroy() {
-        if (::_lastCallLogViewModel.isInitialized) {
-            lastCallLogViewModel
-        }
-    }
-
-    fun updateLastCallLog(callLog: CallLog) {
-        lastCallLog = callLog
-        lastCallLogId = callLog.callId
-        lastCallLogStartTimestamp = callLog.startDate
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/main/history/fragments/DetailCallLogFragment.kt b/app/src/main/java/org/linphone/activities/main/history/fragments/DetailCallLogFragment.kt
deleted file mode 100644
index 8bb760ec9..000000000
--- a/app/src/main/java/org/linphone/activities/main/history/fragments/DetailCallLogFragment.kt
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.main.history.fragments
-
-import android.os.Bundle
-import android.view.View
-import androidx.navigation.fragment.findNavController
-import org.linphone.LinphoneApplication.Companion.coreContext
-import org.linphone.R
-import org.linphone.activities.*
-import org.linphone.activities.main.*
-import org.linphone.activities.main.history.viewmodels.CallLogViewModel
-import org.linphone.activities.navigateToContacts
-import org.linphone.core.tools.Log
-import org.linphone.databinding.HistoryDetailFragmentBinding
-import org.linphone.utils.Event
-
-class DetailCallLogFragment : GenericFragment<HistoryDetailFragmentBinding>() {
-    private lateinit var viewModel: CallLogViewModel
-
-    override fun getLayoutId(): Int = R.layout.history_detail_fragment
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        binding.lifecycleOwner = viewLifecycleOwner
-
-        binding.sharedMainViewModel = sharedViewModel
-
-        val callLogGroup = sharedViewModel.selectedCallLogGroup.value
-        if (callLogGroup == null) {
-            Log.e("[History] Call log group is null, aborting!")
-            findNavController().navigateUp()
-            return
-        }
-
-        viewModel = callLogGroup.lastCallLogViewModel
-        binding.viewModel = viewModel
-        if (viewModel.relatedCallLogs.value.orEmpty().isEmpty()) {
-            viewModel.addRelatedCallLogs(callLogGroup.callLogs)
-        }
-
-        useMaterialSharedAxisXForwardAnimation = sharedViewModel.isSlidingPaneSlideable.value == false
-
-        binding.setNewContactClickListener {
-            val copy = viewModel.callLog.remoteAddress.clone()
-            copy.clean()
-            val address = copy.asStringUriOnly()
-            Log.i("[History] Creating contact with SIP URI [$address]")
-            sharedViewModel.updateContactsAnimationsBasedOnDestination.value = Event(
-                R.id.masterCallLogsFragment
-            )
-            navigateToContacts(address)
-        }
-
-        binding.setContactClickListener {
-            sharedViewModel.updateContactsAnimationsBasedOnDestination.value = Event(
-                R.id.masterCallLogsFragment
-            )
-            val contactId = viewModel.contact.value?.refKey
-            if (contactId != null) {
-                Log.i("[History] Displaying native contact [$contactId]")
-                navigateToNativeContact(contactId)
-            } else {
-                val copy = viewModel.callLog.remoteAddress.clone()
-                copy.clean()
-                val address = copy.asStringUriOnly()
-                Log.i("[History] Displaying friend with address [$address]")
-                navigateToFriend(address)
-            }
-        }
-
-        viewModel.startCallEvent.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume { callLog ->
-                // To remove the GRUU if any
-                val address = callLog.remoteAddress.clone()
-                address.clean()
-
-                if (coreContext.core.callsNb > 0) {
-                    Log.i(
-                        "[History] Starting dialer with pre-filled URI [${address.asStringUriOnly()}], is transfer? ${sharedViewModel.pendingCallTransfer}"
-                    )
-                    sharedViewModel.updateDialerAnimationsBasedOnDestination.value =
-                        Event(R.id.masterCallLogsFragment)
-
-                    val args = Bundle()
-                    args.putString("URI", address.asStringUriOnly())
-                    args.putBoolean("Transfer", sharedViewModel.pendingCallTransfer)
-                    args.putBoolean(
-                        "SkipAutoCallStart",
-                        true
-                    ) // If auto start call setting is enabled, ignore it
-                    navigateToDialer(args)
-                } else {
-                    val localAddress = callLog.localAddress
-                    Log.i(
-                        "[History] Starting call to ${address.asStringUriOnly()} with local address ${localAddress.asStringUriOnly()}"
-                    )
-                    coreContext.startCall(address, localAddress = localAddress)
-                }
-            }
-        }
-
-        viewModel.chatRoomCreatedEvent.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume { chatRoom ->
-                val args = Bundle()
-                args.putString("LocalSipUri", chatRoom.localAddress.asStringUriOnly())
-                args.putString("RemoteSipUri", chatRoom.peerAddress.asStringUriOnly())
-                navigateToChatRoom(args)
-            }
-        }
-
-        viewModel.onMessageToNotifyEvent.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume { messageResourceId ->
-                (activity as MainActivity).showSnackBar(messageResourceId)
-            }
-        }
-    }
-
-    override fun onResume() {
-        super.onResume()
-        viewModel.enableListener(true)
-    }
-
-    override fun onPause() {
-        viewModel.enableListener(false)
-        super.onPause()
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/main/history/fragments/DetailConferenceCallLogFragment.kt b/app/src/main/java/org/linphone/activities/main/history/fragments/DetailConferenceCallLogFragment.kt
deleted file mode 100644
index 984a8eac7..000000000
--- a/app/src/main/java/org/linphone/activities/main/history/fragments/DetailConferenceCallLogFragment.kt
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.main.history.fragments
-
-import android.os.Bundle
-import android.view.View
-import androidx.navigation.fragment.findNavController
-import org.linphone.R
-import org.linphone.activities.*
-import org.linphone.activities.main.*
-import org.linphone.activities.main.history.viewmodels.CallLogViewModel
-import org.linphone.core.tools.Log
-import org.linphone.databinding.HistoryConfDetailFragmentBinding
-
-class DetailConferenceCallLogFragment : GenericFragment<HistoryConfDetailFragmentBinding>() {
-    private lateinit var viewModel: CallLogViewModel
-
-    override fun getLayoutId(): Int = R.layout.history_conf_detail_fragment
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        binding.lifecycleOwner = viewLifecycleOwner
-
-        binding.sharedMainViewModel = sharedViewModel
-
-        val callLogGroup = sharedViewModel.selectedCallLogGroup.value
-        if (callLogGroup == null) {
-            Log.e("[History] Call log group is null, aborting!")
-            findNavController().navigateUp()
-            return
-        }
-
-        viewModel = callLogGroup.lastCallLogViewModel
-        binding.viewModel = viewModel
-        viewModel.addRelatedCallLogs(callLogGroup.callLogs)
-
-        useMaterialSharedAxisXForwardAnimation = sharedViewModel.isSlidingPaneSlideable.value == false
-
-        viewModel.onMessageToNotifyEvent.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume { messageResourceId ->
-                (activity as MainActivity).showSnackBar(messageResourceId)
-            }
-        }
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/main/history/fragments/MasterCallLogsFragment.kt b/app/src/main/java/org/linphone/activities/main/history/fragments/MasterCallLogsFragment.kt
deleted file mode 100644
index c10985411..000000000
--- a/app/src/main/java/org/linphone/activities/main/history/fragments/MasterCallLogsFragment.kt
+++ /dev/null
@@ -1,314 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.main.history.fragments
-
-import android.app.Dialog
-import android.content.res.Configuration
-import android.os.Bundle
-import android.view.View
-import androidx.core.content.ContextCompat
-import androidx.lifecycle.ViewModelProvider
-import androidx.navigation.fragment.NavHostFragment
-import androidx.recyclerview.widget.ItemTouchHelper
-import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.RecyclerView
-import com.google.android.material.transition.MaterialSharedAxis
-import org.linphone.LinphoneApplication.Companion.coreContext
-import org.linphone.LinphoneApplication.Companion.corePreferences
-import org.linphone.R
-import org.linphone.activities.*
-import org.linphone.activities.clearDisplayedCallHistory
-import org.linphone.activities.main.MainActivity
-import org.linphone.activities.main.fragments.MasterFragment
-import org.linphone.activities.main.history.adapters.CallLogsListAdapter
-import org.linphone.activities.main.history.data.GroupedCallLogData
-import org.linphone.activities.main.history.viewmodels.CallLogsListViewModel
-import org.linphone.activities.main.viewmodels.DialogViewModel
-import org.linphone.activities.main.viewmodels.TabsViewModel
-import org.linphone.activities.navigateToCallHistory
-import org.linphone.activities.navigateToConferenceCallHistory
-import org.linphone.activities.navigateToDialer
-import org.linphone.core.ConferenceInfo
-import org.linphone.core.tools.Log
-import org.linphone.databinding.HistoryMasterFragmentBinding
-import org.linphone.utils.*
-
-class MasterCallLogsFragment : MasterFragment<HistoryMasterFragmentBinding, CallLogsListAdapter>() {
-    override val dialogConfirmationMessageBeforeRemoval = R.plurals.history_delete_dialog
-    private lateinit var listViewModel: CallLogsListViewModel
-
-    private val observer = object : RecyclerView.AdapterDataObserver() {
-        override fun onItemRangeInserted(positionStart: Int, itemCount: Int) {
-            if (positionStart == 0 && itemCount == 1) {
-                scrollToTop()
-            }
-        }
-    }
-
-    override fun getLayoutId(): Int = R.layout.history_master_fragment
-
-    override fun onDestroyView() {
-        binding.callLogsList.adapter = null
-        adapter.unregisterAdapterDataObserver(observer)
-        super.onDestroyView()
-    }
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        useMaterialSharedAxisXForwardAnimation = false
-
-        if (corePreferences.enableAnimations) {
-            val portraitOrientation = resources.configuration.orientation != Configuration.ORIENTATION_LANDSCAPE
-            val axis = if (portraitOrientation) MaterialSharedAxis.X else MaterialSharedAxis.Y
-            enterTransition = MaterialSharedAxis(axis, false)
-            reenterTransition = MaterialSharedAxis(axis, false)
-            returnTransition = MaterialSharedAxis(axis, true)
-            exitTransition = MaterialSharedAxis(axis, true)
-        }
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        binding.lifecycleOwner = viewLifecycleOwner
-
-        listViewModel = ViewModelProvider(this)[CallLogsListViewModel::class.java]
-        binding.viewModel = listViewModel
-
-        /* Shared view model & sliding pane related */
-
-        setUpSlidingPane(binding.slidingPane)
-
-        sharedViewModel.layoutChangedEvent.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume {
-                sharedViewModel.isSlidingPaneSlideable.value = binding.slidingPane.isSlideable
-                if (binding.slidingPane.isSlideable) {
-                    val navHostFragment =
-                        childFragmentManager.findFragmentById(R.id.history_nav_container) as NavHostFragment
-                    if (navHostFragment.navController.currentDestination?.id == R.id.emptyCallHistoryFragment) {
-                        Log.i(
-                            "[History] Foldable device has been folded, closing side pane with empty fragment"
-                        )
-                        binding.slidingPane.closePane()
-                    }
-                }
-            }
-        }
-
-        /* End of shared view model & sliding pane related */
-
-        _adapter = CallLogsListAdapter(listSelectionViewModel, viewLifecycleOwner)
-        // SubmitList is done on a background thread
-        // We need this adapter data observer to know when to scroll
-        adapter.registerAdapterDataObserver(observer)
-        binding.callLogsList.setHasFixedSize(true)
-        binding.callLogsList.adapter = adapter
-
-        binding.setEditClickListener {
-            listSelectionViewModel.isEditionEnabled.value = true
-        }
-
-        val layoutManager = LinearLayoutManager(requireContext())
-        binding.callLogsList.layoutManager = layoutManager
-
-        // Swipe action
-        val swipeConfiguration = RecyclerViewSwipeConfiguration()
-        val white = ContextCompat.getColor(requireContext(), R.color.white_color)
-
-        swipeConfiguration.rightToLeftAction = RecyclerViewSwipeConfiguration.Action(
-            requireContext().getString(R.string.dialog_delete),
-            white,
-            ContextCompat.getColor(requireContext(), R.color.red_color)
-        )
-        val swipeListener = object : RecyclerViewSwipeListener {
-            override fun onLeftToRightSwipe(viewHolder: RecyclerView.ViewHolder) {}
-
-            override fun onRightToLeftSwipe(viewHolder: RecyclerView.ViewHolder) {
-                val viewModel = DialogViewModel(getString(R.string.history_delete_one_dialog))
-                viewModel.showIcon = true
-                viewModel.iconResource = R.drawable.dialog_delete_icon
-                val dialog: Dialog = DialogUtils.getDialog(requireContext(), viewModel)
-
-                val index = viewHolder.bindingAdapterPosition
-                if (index < 0 || index >= adapter.currentList.size) {
-                    Log.e("[History] Index is out of bound, can't delete call log")
-                } else {
-                    viewModel.showCancelButton {
-                        adapter.notifyItemChanged(index)
-                        dialog.dismiss()
-                    }
-
-                    viewModel.showDeleteButton(
-                        {
-                            val deletedCallGroup = adapter.currentList[index]
-                            listViewModel.deleteCallLogGroup(deletedCallGroup)
-                            if (!binding.slidingPane.isSlideable &&
-                                deletedCallGroup.lastCallLogId == sharedViewModel.selectedCallLogGroup.value?.lastCallLogId
-                            ) {
-                                Log.i(
-                                    "[History] Currently displayed history has been deleted, removing detail fragment"
-                                )
-                                clearDisplayedCallHistory()
-                            }
-                            dialog.dismiss()
-                        },
-                        getString(R.string.dialog_delete)
-                    )
-                }
-
-                dialog.show()
-            }
-        }
-        RecyclerViewSwipeUtils(ItemTouchHelper.LEFT, swipeConfiguration, swipeListener)
-            .attachToRecyclerView(binding.callLogsList)
-
-        // Divider between items
-        binding.callLogsList.addItemDecoration(
-            AppUtils.getDividerDecoration(requireContext(), layoutManager)
-        )
-
-        // Displays formatted date header
-        val headerItemDecoration = RecyclerViewHeaderDecoration(requireContext(), adapter)
-        binding.callLogsList.addItemDecoration(headerItemDecoration)
-
-        listViewModel.callLogs.observe(
-            viewLifecycleOwner
-        ) { callLogs ->
-            adapter.submitList(callLogs)
-        }
-
-        listViewModel.contactsUpdatedEvent.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume {
-                adapter.notifyItemRangeChanged(0, adapter.itemCount)
-            }
-        }
-
-        adapter.selectedCallLogEvent.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume { callLog ->
-                sharedViewModel.selectedCallLogGroup.value = callLog
-                if (callLog.lastCallLog.wasConference()) {
-                    navigateToConferenceCallHistory(binding.slidingPane)
-                } else {
-                    navigateToCallHistory(binding.slidingPane)
-                }
-            }
-        }
-
-        adapter.startCallToEvent.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume { callLogGroup ->
-                val callLog = callLogGroup.lastCallLog
-                val conferenceInfo = callLog.conferenceInfo
-                when {
-                    conferenceInfo != null -> {
-                        if (conferenceInfo.state == ConferenceInfo.State.Cancelled) {
-                            var snackRes = R.string.conference_scheduled_cancelled_by_organizer
-
-                            val organizer = conferenceInfo.organizer
-                            if (organizer != null) {
-                                val localAccount = coreContext.core.accountList.find { account ->
-                                    val address = account.params.identityAddress
-                                    address != null && organizer.weakEqual(address)
-                                }
-                                if (localAccount != null) {
-                                    snackRes = R.string.conference_scheduled_cancelled_by_me
-                                }
-                            }
-
-                            val activity = requireActivity() as MainActivity
-                            activity.showSnackBar(snackRes)
-                        } else {
-                            navigateToConferenceWaitingRoom(
-                                conferenceInfo.uri?.asStringUriOnly().orEmpty(),
-                                conferenceInfo.subject
-                            )
-                        }
-                    }
-                    coreContext.core.callsNb > 0 -> {
-                        val cleanAddress = LinphoneUtils.getCleanedAddress(callLog.remoteAddress)
-                        Log.i(
-                            "[History] Starting dialer with pre-filled URI ${cleanAddress.asStringUriOnly()}, is transfer? ${sharedViewModel.pendingCallTransfer}"
-                        )
-                        sharedViewModel.updateDialerAnimationsBasedOnDestination.value = Event(
-                            R.id.masterCallLogsFragment
-                        )
-                        val args = Bundle()
-                        args.putString("URI", cleanAddress.asStringUriOnly())
-                        args.putBoolean("Transfer", sharedViewModel.pendingCallTransfer)
-                        args.putBoolean("SkipAutoCallStart", true) // If auto start call setting is enabled, ignore it
-                        navigateToDialer(args)
-                    }
-                    else -> {
-                        val cleanAddress = LinphoneUtils.getCleanedAddress(callLog.remoteAddress)
-                        val localAddress = callLogGroup.lastCallLog.localAddress
-                        Log.i(
-                            "[History] Starting call to ${cleanAddress.asStringUriOnly()} with local address ${localAddress.asStringUriOnly()}"
-                        )
-                        coreContext.startCall(cleanAddress, localAddress = localAddress)
-                    }
-                }
-            }
-        }
-
-        coreContext.core.resetMissedCallsCount()
-        coreContext.notificationsManager.dismissMissedCallNotification()
-    }
-
-    override fun onResume() {
-        super.onResume()
-
-        val tabsViewModel = requireActivity().run {
-            ViewModelProvider(this)[TabsViewModel::class.java]
-        }
-        tabsViewModel.updateMissedCallCount()
-    }
-
-    override fun deleteItems(indexesOfItemToDelete: ArrayList<Int>) {
-        val list = ArrayList<GroupedCallLogData>()
-        var closeSlidingPane = false
-        for (index in indexesOfItemToDelete) {
-            val callLogGroup = adapter.currentList[index]
-            list.add(callLogGroup)
-
-            if (callLogGroup.lastCallLogId == sharedViewModel.selectedCallLogGroup.value?.lastCallLogId) {
-                closeSlidingPane = true
-            }
-        }
-        listViewModel.deleteCallLogGroups(list)
-
-        if (!binding.slidingPane.isSlideable && closeSlidingPane) {
-            Log.i(
-                "[History] Currently displayed history has been deleted, removing detail fragment"
-            )
-            clearDisplayedCallHistory()
-        }
-    }
-
-    private fun scrollToTop() {
-        binding.callLogsList.scrollToPosition(0)
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/main/history/viewmodels/CallLogViewModel.kt b/app/src/main/java/org/linphone/activities/main/history/viewmodels/CallLogViewModel.kt
deleted file mode 100644
index a5d1b74cb..000000000
--- a/app/src/main/java/org/linphone/activities/main/history/viewmodels/CallLogViewModel.kt
+++ /dev/null
@@ -1,260 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.main.history.viewmodels
-
-import androidx.lifecycle.MutableLiveData
-import java.text.SimpleDateFormat
-import java.util.*
-import kotlin.collections.ArrayList
-import org.linphone.LinphoneApplication.Companion.coreContext
-import org.linphone.LinphoneApplication.Companion.corePreferences
-import org.linphone.R
-import org.linphone.activities.main.conference.data.ConferenceSchedulingParticipantData
-import org.linphone.contact.GenericContactViewModel
-import org.linphone.core.*
-import org.linphone.core.tools.Log
-import org.linphone.utils.AppUtils
-import org.linphone.utils.Event
-import org.linphone.utils.LinphoneUtils
-import org.linphone.utils.TimestampUtils
-
-class CallLogViewModel(val callLog: CallLog, private val isRelated: Boolean = false) : GenericContactViewModel(
-    callLog.remoteAddress
-) {
-    val peerSipUri: String by lazy {
-        LinphoneUtils.getDisplayableAddress(callLog.remoteAddress)
-    }
-
-    val statusIconResource: Int by lazy {
-        if (callLog.dir == Call.Dir.Incoming) {
-            if (LinphoneUtils.isCallLogMissed(callLog)) {
-                R.drawable.call_status_missed
-            } else {
-                R.drawable.call_status_incoming
-            }
-        } else {
-            R.drawable.call_status_outgoing
-        }
-    }
-
-    val iconContentDescription: Int by lazy {
-        if (callLog.dir == Call.Dir.Incoming) {
-            if (LinphoneUtils.isCallLogMissed(callLog)) {
-                R.string.content_description_missed_call
-            } else {
-                R.string.content_description_incoming_call
-            }
-        } else {
-            R.string.content_description_outgoing_call
-        }
-    }
-
-    val directionIconResource: Int by lazy {
-        if (callLog.dir == Call.Dir.Incoming) {
-            if (LinphoneUtils.isCallLogMissed(callLog)) {
-                R.drawable.call_missed
-            } else {
-                R.drawable.call_incoming
-            }
-        } else {
-            R.drawable.call_outgoing
-        }
-    }
-
-    val duration: String by lazy {
-        val dateFormat = SimpleDateFormat(
-            if (callLog.duration >= 3600) "HH:mm:ss" else "mm:ss",
-            Locale.getDefault()
-        )
-        val cal = Calendar.getInstance()
-        cal[0, 0, 0, 0, 0] = callLog.duration
-        dateFormat.format(cal.time)
-    }
-
-    val date: String by lazy {
-        TimestampUtils.toString(callLog.startDate, shortDate = false, hideYear = false)
-    }
-
-    val startCallEvent: MutableLiveData<Event<CallLog>> by lazy {
-        MutableLiveData<Event<CallLog>>()
-    }
-
-    val chatRoomCreatedEvent: MutableLiveData<Event<ChatRoom>> by lazy {
-        MutableLiveData<Event<ChatRoom>>()
-    }
-
-    val waitForChatRoomCreation = MutableLiveData<Boolean>()
-
-    val chatAllowed = !corePreferences.disableChat
-
-    val hidePlainChat = corePreferences.forceEndToEndEncryptedChat
-
-    val secureChatAllowed = LinphoneUtils.isEndToEndEncryptedChatAvailable() && (
-        corePreferences.allowEndToEndEncryptedChatWithoutPresence || (
-            contact.value?.getPresenceModelForUriOrTel(
-                peerSipUri
-            )?.hasCapability(Friend.Capability.LimeX3Dh) ?: false
-            )
-        )
-
-    val relatedCallLogs = MutableLiveData<ArrayList<CallLogViewModel>>()
-
-    private val listener = object : CoreListenerStub() {
-        override fun onCallLogUpdated(core: Core, log: CallLog) {
-            if (callLog.remoteAddress.weakEqual(log.remoteAddress) && callLog.localAddress.weakEqual(
-                    log.localAddress
-                )
-            ) {
-                Log.i(
-                    "[History Detail] New call log for ${callLog.remoteAddress.asStringUriOnly()} with local address ${callLog.localAddress.asStringUriOnly()}"
-                )
-                addRelatedCallLogs(arrayListOf(log))
-            }
-        }
-    }
-
-    val isConferenceCallLog = callLog.wasConference()
-
-    val conferenceSubject = callLog.conferenceInfo?.subject
-    val conferenceParticipantsData = MutableLiveData<ArrayList<ConferenceSchedulingParticipantData>>()
-    val organizerParticipantData = MutableLiveData<ConferenceSchedulingParticipantData>()
-    val conferenceTime = MutableLiveData<String>()
-    val conferenceDate = MutableLiveData<String>()
-
-    val readOnlyNativeAddressBook = MutableLiveData<Boolean>()
-
-    override val showGroupChatAvatar: Boolean
-        get() = isConferenceCallLog
-
-    private val chatRoomListener = object : ChatRoomListenerStub() {
-        override fun onStateChanged(chatRoom: ChatRoom, state: ChatRoom.State) {
-            if (state == ChatRoom.State.Created) {
-                waitForChatRoomCreation.value = false
-                chatRoomCreatedEvent.value = Event(chatRoom)
-            } else if (state == ChatRoom.State.CreationFailed) {
-                Log.e("[History Detail] Group chat room creation has failed !")
-                waitForChatRoomCreation.value = false
-                onMessageToNotifyEvent.value = Event(R.string.chat_room_creation_failed_snack)
-            }
-        }
-    }
-
-    init {
-        waitForChatRoomCreation.value = false
-        readOnlyNativeAddressBook.value = corePreferences.readOnlyNativeContacts
-
-        if (!isRelated) {
-            val conferenceInfo = callLog.conferenceInfo
-            if (conferenceInfo != null) {
-                conferenceTime.value = TimestampUtils.timeToString(conferenceInfo.dateTime)
-                conferenceDate.value = if (TimestampUtils.isToday(conferenceInfo.dateTime)) {
-                    AppUtils.getString(R.string.today)
-                } else {
-                    TimestampUtils.toString(
-                        conferenceInfo.dateTime,
-                        onlyDate = true,
-                        shortDate = false,
-                        hideYear = false
-                    )
-                }
-                val organizer = conferenceInfo.organizer
-                if (organizer != null) {
-                    organizerParticipantData.value =
-                        ConferenceSchedulingParticipantData(
-                            organizer,
-                            showLimeBadge = false,
-                            showDivider = false
-                        )
-                }
-                val list = arrayListOf<ConferenceSchedulingParticipantData>()
-                for (participant in conferenceInfo.participants) {
-                    list.add(
-                        ConferenceSchedulingParticipantData(
-                            participant,
-                            showLimeBadge = false,
-                            showDivider = true
-                        )
-                    )
-                }
-                conferenceParticipantsData.value = list
-            }
-        }
-    }
-
-    override fun onCleared() {
-        destroy()
-        super.onCleared()
-    }
-
-    fun destroy() {
-        if (!isRelated) {
-            relatedCallLogs.value.orEmpty().forEach(CallLogViewModel::destroy)
-            organizerParticipantData.value?.destroy()
-            conferenceParticipantsData.value.orEmpty()
-                .forEach(ConferenceSchedulingParticipantData::destroy)
-        }
-    }
-
-    fun startCall() {
-        startCallEvent.value = Event(callLog)
-    }
-
-    fun startChat(isSecured: Boolean) {
-        waitForChatRoomCreation.value = true
-        val chatRoom = LinphoneUtils.createOneToOneChatRoom(callLog.remoteAddress, isSecured)
-
-        if (chatRoom != null) {
-            val state = chatRoom.state
-            Log.i("[History Detail] Found existing chat room in state $state")
-            if (state == ChatRoom.State.Created || state == ChatRoom.State.Terminated) {
-                waitForChatRoomCreation.value = false
-                chatRoomCreatedEvent.value = Event(chatRoom)
-            } else {
-                chatRoom.addListener(chatRoomListener)
-            }
-        } else {
-            waitForChatRoomCreation.value = false
-            Log.e(
-                "[History Detail] Couldn't create chat room with address ${callLog.remoteAddress}"
-            )
-            onMessageToNotifyEvent.value = Event(R.string.chat_room_creation_failed_snack)
-        }
-    }
-
-    fun addRelatedCallLogs(callLogs: ArrayList<CallLog>) {
-        val list = arrayListOf<CallLogViewModel>()
-
-        // We assume new logs are more recent than the ones we already have, so we add them first
-        for (callLog in callLogs) {
-            list.add(CallLogViewModel(callLog, true))
-        }
-        list.addAll(relatedCallLogs.value.orEmpty())
-
-        relatedCallLogs.value = list
-    }
-
-    fun enableListener(enable: Boolean) {
-        if (enable) {
-            coreContext.core.addListener(listener)
-        } else {
-            coreContext.core.removeListener(listener)
-        }
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/main/history/viewmodels/CallLogsListViewModel.kt b/app/src/main/java/org/linphone/activities/main/history/viewmodels/CallLogsListViewModel.kt
deleted file mode 100644
index cc41770cc..000000000
--- a/app/src/main/java/org/linphone/activities/main/history/viewmodels/CallLogsListViewModel.kt
+++ /dev/null
@@ -1,170 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.main.history.viewmodels
-
-import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.ViewModel
-import org.linphone.LinphoneApplication.Companion.coreContext
-import org.linphone.activities.main.history.data.GroupedCallLogData
-import org.linphone.contact.ContactsUpdatedListenerStub
-import org.linphone.core.*
-import org.linphone.core.tools.Log
-import org.linphone.utils.Event
-import org.linphone.utils.LinphoneUtils
-import org.linphone.utils.TimestampUtils
-
-class CallLogsListViewModel : ViewModel() {
-    val callLogs = MutableLiveData<List<GroupedCallLogData>>()
-
-    val filter = MutableLiveData<CallLogsFilter>()
-
-    val showConferencesFilter = MutableLiveData<Boolean>()
-
-    val contactsUpdatedEvent: MutableLiveData<Event<Boolean>> by lazy {
-        MutableLiveData<Event<Boolean>>()
-    }
-
-    private val listener: CoreListenerStub = object : CoreListenerStub() {
-        override fun onCallLogUpdated(core: Core, log: CallLog) {
-            updateCallLogs()
-        }
-    }
-
-    private val contactsUpdatedListener = object : ContactsUpdatedListenerStub() {
-        override fun onContactsUpdated() {
-            Log.i("[Call Logs] Contacts have changed")
-            contactsUpdatedEvent.value = Event(true)
-        }
-    }
-
-    init {
-        filter.value = CallLogsFilter.ALL
-        updateCallLogs()
-
-        showConferencesFilter.value = LinphoneUtils.isRemoteConferencingAvailable()
-
-        coreContext.core.addListener(listener)
-        coreContext.contactsManager.addListener(contactsUpdatedListener)
-    }
-
-    override fun onCleared() {
-        callLogs.value.orEmpty().forEach(GroupedCallLogData::destroy)
-
-        coreContext.contactsManager.removeListener(contactsUpdatedListener)
-        coreContext.core.removeListener(listener)
-
-        super.onCleared()
-    }
-
-    fun showAllCallLogs() {
-        filter.value = CallLogsFilter.ALL
-        updateCallLogs()
-    }
-
-    fun showOnlyMissedCallLogs() {
-        filter.value = CallLogsFilter.MISSED
-        updateCallLogs()
-    }
-
-    fun showOnlyConferenceCallLogs() {
-        filter.value = CallLogsFilter.CONFERENCE
-        updateCallLogs()
-    }
-
-    fun deleteCallLogGroup(callLog: GroupedCallLogData?) {
-        if (callLog != null) {
-            for (log in callLog.callLogs) {
-                coreContext.core.removeCallLog(log)
-            }
-        }
-
-        updateCallLogs()
-    }
-
-    fun deleteCallLogGroups(listToDelete: ArrayList<GroupedCallLogData>) {
-        for (callLog in listToDelete) {
-            for (log in callLog.callLogs) {
-                coreContext.core.removeCallLog(log)
-            }
-        }
-
-        updateCallLogs()
-    }
-
-    private fun computeCallLogs(callLogs: Array<CallLog>, missed: Boolean, conference: Boolean): ArrayList<GroupedCallLogData> {
-        var previousCallLogGroup: GroupedCallLogData? = null
-        val list = arrayListOf<GroupedCallLogData>()
-
-        for (callLog in callLogs) {
-            if ((!missed && !conference) || (missed && LinphoneUtils.isCallLogMissed(callLog)) || (conference && callLog.wasConference())) {
-                if (previousCallLogGroup == null) {
-                    previousCallLogGroup = GroupedCallLogData(callLog)
-                } else if (!callLog.wasConference() && // Do not group conference call logs
-                    callLog.wasConference() == previousCallLogGroup.lastCallLog.wasConference() && // Check that both are of the same type, if one has a conf-id and not the other the equal method will return true !
-                    previousCallLogGroup.lastCallLog.localAddress.weakEqual(callLog.localAddress) &&
-                    previousCallLogGroup.lastCallLog.remoteAddress.equal(callLog.remoteAddress)
-                ) {
-                    if (TimestampUtils.isSameDay(
-                            previousCallLogGroup.lastCallLogStartTimestamp,
-                            callLog.startDate
-                        )
-                    ) {
-                        previousCallLogGroup.callLogs.add(callLog)
-                        previousCallLogGroup.updateLastCallLog(callLog)
-                    } else {
-                        list.add(previousCallLogGroup)
-                        previousCallLogGroup = GroupedCallLogData(callLog)
-                    }
-                } else {
-                    list.add(previousCallLogGroup)
-                    previousCallLogGroup = GroupedCallLogData(callLog)
-                }
-            }
-        }
-        if (previousCallLogGroup != null && !list.contains(previousCallLogGroup)) {
-            list.add(previousCallLogGroup)
-        }
-
-        return list
-    }
-
-    private fun updateCallLogs() {
-        callLogs.value.orEmpty().forEach(GroupedCallLogData::destroy)
-
-        val allCallLogs = coreContext.core.callLogs
-        Log.i("[Call Logs] ${allCallLogs.size} call logs found")
-
-        callLogs.value = when (filter.value) {
-            CallLogsFilter.MISSED -> computeCallLogs(allCallLogs, missed = true, conference = false)
-            CallLogsFilter.CONFERENCE -> computeCallLogs(
-                allCallLogs,
-                missed = false,
-                conference = true
-            )
-            else -> computeCallLogs(allCallLogs, missed = false, conference = false)
-        }
-    }
-}
-
-enum class CallLogsFilter {
-    ALL,
-    MISSED,
-    CONFERENCE
-}
diff --git a/app/src/main/java/org/linphone/activities/main/recordings/adapters/RecordingsListAdapter.kt b/app/src/main/java/org/linphone/activities/main/recordings/adapters/RecordingsListAdapter.kt
deleted file mode 100644
index 6151ba58a..000000000
--- a/app/src/main/java/org/linphone/activities/main/recordings/adapters/RecordingsListAdapter.kt
+++ /dev/null
@@ -1,163 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.main.recordings.adapters
-
-import android.content.Context
-import android.view.LayoutInflater
-import android.view.TextureView
-import android.view.View
-import android.view.ViewGroup
-import androidx.databinding.DataBindingUtil
-import androidx.lifecycle.LifecycleOwner
-import androidx.recyclerview.widget.DiffUtil
-import androidx.recyclerview.widget.RecyclerView
-import org.linphone.R
-import org.linphone.activities.main.adapters.SelectionListAdapter
-import org.linphone.activities.main.recordings.data.RecordingData
-import org.linphone.activities.main.viewmodels.ListTopBarViewModel
-import org.linphone.databinding.GenericListHeaderBinding
-import org.linphone.databinding.RecordingListCellBinding
-import org.linphone.utils.*
-
-class RecordingsListAdapter(
-    selectionVM: ListTopBarViewModel,
-    private val viewLifecycleOwner: LifecycleOwner
-) : SelectionListAdapter<RecordingData, RecyclerView.ViewHolder>(
-    selectionVM,
-    RecordingDiffCallback()
-),
-    HeaderAdapter {
-
-    private lateinit var videoSurface: TextureView
-
-    fun setVideoTextureView(textureView: TextureView) {
-        videoSurface = textureView
-    }
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
-        val binding: RecordingListCellBinding = DataBindingUtil.inflate(
-            LayoutInflater.from(parent.context),
-            R.layout.recording_list_cell,
-            parent,
-            false
-        )
-        return ViewHolder(binding)
-    }
-
-    override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
-        (holder as ViewHolder).bind(getItem(position))
-    }
-
-    inner class ViewHolder(
-        val binding: RecordingListCellBinding
-    ) : RecyclerView.ViewHolder(binding.root) {
-        fun bind(recording: RecordingData) {
-            with(binding) {
-                data = recording
-
-                lifecycleOwner = viewLifecycleOwner
-
-                // This is for item selection through ListTopBarFragment
-                position = bindingAdapterPosition
-                selectionListViewModel = selectionViewModel
-
-                setClickListener {
-                    if (selectionViewModel.isEditionEnabled.value == true) {
-                        selectionViewModel.onToggleSelect(bindingAdapterPosition)
-                    }
-                }
-
-                setPlayListener {
-                    if (recording.isPlaying.value == true) {
-                        recording.pause()
-                    } else {
-                        recording.play()
-                        if (recording.isVideoAvailable()) {
-                            recording.setTextureView(videoSurface)
-                        }
-                    }
-                }
-
-                executePendingBindings()
-            }
-        }
-    }
-
-    override fun displayHeaderForPosition(position: Int): Boolean {
-        if (position >= itemCount) return false
-
-        val recording = getItem(position)
-        val date = recording.date
-        val previousPosition = position - 1
-
-        return if (previousPosition >= 0) {
-            val previousItemDate = getItem(previousPosition).date
-            !TimestampUtils.isSameDay(date, previousItemDate)
-        } else {
-            true
-        }
-    }
-
-    override fun getHeaderViewForPosition(context: Context, position: Int): View {
-        val recording = getItem(position)
-        val date = formatDate(context, recording.date.time)
-        val binding: GenericListHeaderBinding = DataBindingUtil.inflate(
-            LayoutInflater.from(context),
-            R.layout.generic_list_header,
-            null,
-            false
-        )
-        binding.title = date
-        binding.executePendingBindings()
-        return binding.root
-    }
-
-    private fun formatDate(context: Context, date: Long): String {
-        // Recordings is one of the few items in Linphone that is already in milliseconds
-        if (TimestampUtils.isToday(date, false)) {
-            return context.getString(R.string.today)
-        } else if (TimestampUtils.isYesterday(date, false)) {
-            return context.getString(R.string.yesterday)
-        }
-        return TimestampUtils.toString(
-            date,
-            onlyDate = true,
-            timestampInSecs = false,
-            shortDate = false,
-            hideYear = false
-        )
-    }
-}
-
-private class RecordingDiffCallback : DiffUtil.ItemCallback<RecordingData>() {
-    override fun areItemsTheSame(
-        oldItem: RecordingData,
-        newItem: RecordingData
-    ): Boolean {
-        return oldItem.compareTo(newItem) == 0
-    }
-
-    override fun areContentsTheSame(
-        oldItem: RecordingData,
-        newItem: RecordingData
-    ): Boolean {
-        return false // for headers
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/main/recordings/data/RecordingData.kt b/app/src/main/java/org/linphone/activities/main/recordings/data/RecordingData.kt
deleted file mode 100644
index 022ffd171..000000000
--- a/app/src/main/java/org/linphone/activities/main/recordings/data/RecordingData.kt
+++ /dev/null
@@ -1,214 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.main.recordings.data
-
-import android.graphics.SurfaceTexture
-import android.view.TextureView
-import androidx.lifecycle.MutableLiveData
-import java.text.DateFormat
-import java.text.SimpleDateFormat
-import java.util.*
-import java.util.regex.Pattern
-import kotlinx.coroutines.*
-import kotlinx.coroutines.channels.ticker
-import org.linphone.LinphoneApplication.Companion.coreContext
-import org.linphone.core.Player
-import org.linphone.core.PlayerListener
-import org.linphone.core.tools.Log
-import org.linphone.utils.AudioRouteUtils
-import org.linphone.utils.LinphoneUtils
-
-class RecordingData(val path: String, private val recordingListener: RecordingListener) : Comparable<RecordingData> {
-    companion object {
-        val RECORD_PATTERN: Pattern =
-            Pattern.compile(".*/(.*)_(\\d{2}-\\d{2}-\\d{4}-\\d{2}-\\d{2}-\\d{2})\\..*")
-    }
-
-    lateinit var name: String
-    lateinit var date: Date
-
-    val duration = MutableLiveData<Int>()
-    val formattedDuration = MutableLiveData<String>()
-    val formattedDate = MutableLiveData<String>()
-    val position = MutableLiveData<Int>()
-    val formattedPosition = MutableLiveData<String>()
-    val isPlaying = MutableLiveData<Boolean>()
-
-    private val tickerChannel = ticker(1000, 1000)
-
-    private lateinit var player: Player
-    private val listener = PlayerListener {
-        Log.i("[Recording] End of file reached")
-        stop()
-        recordingListener.onPlayingEnded()
-    }
-
-    private val textureViewListener = object : TextureView.SurfaceTextureListener {
-        override fun onSurfaceTextureSizeChanged(
-            surface: SurfaceTexture,
-            width: Int,
-            height: Int
-        ) { }
-
-        override fun onSurfaceTextureUpdated(surface: SurfaceTexture) { }
-
-        override fun onSurfaceTextureDestroyed(surface: SurfaceTexture): Boolean {
-            player.setWindowId(null)
-            return true
-        }
-
-        override fun onSurfaceTextureAvailable(
-            surface: SurfaceTexture,
-            width: Int,
-            height: Int
-        ) {
-            Log.i("[Recording] Surface texture should be available now")
-            player.setWindowId(surface)
-        }
-    }
-
-    private val scope = CoroutineScope(Dispatchers.Main + SupervisorJob())
-
-    init {
-        val m = RECORD_PATTERN.matcher(path)
-        if (m.matches() && m.groupCount() >= 2) {
-            name = m.group(1)
-            date = LinphoneUtils.getRecordingDateFromFileName(m.group(2))
-        }
-        isPlaying.value = false
-
-        position.value = 0
-        formattedPosition.value = SimpleDateFormat("mm:ss", Locale.getDefault()).format(0)
-
-        initPlayer()
-    }
-
-    override fun compareTo(other: RecordingData): Int {
-        return -date.compareTo(other.date)
-    }
-
-    fun destroy() {
-        scope.cancel()
-        tickerChannel.cancel()
-
-        player.setWindowId(null)
-        if (!isClosed()) player.close()
-
-        player.removeListener(listener)
-    }
-
-    fun play() {
-        if (isClosed()) {
-            player.open(path)
-            player.seek(0)
-        }
-
-        player.start()
-        isPlaying.value = true
-        recordingListener.onPlayingStarted(isVideoAvailable())
-
-        scope.launch {
-            withContext(Dispatchers.IO) {
-                for (tick in tickerChannel) {
-                    withContext(Dispatchers.Main) {
-                        if (player.state == Player.State.Playing) {
-                            updatePosition()
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    fun isVideoAvailable(): Boolean {
-        return player.isVideoAvailable
-    }
-
-    fun pause() {
-        player.pause()
-        isPlaying.value = false
-    }
-
-    fun onProgressChanged(progress: Any) {
-        if (progress is Int) {
-            if (player.state == Player.State.Playing) {
-                pause()
-            }
-            player.seek(progress)
-            updatePosition()
-        }
-    }
-
-    fun setTextureView(textureView: TextureView) {
-        Log.i("[Recording] Is TextureView available? ${textureView.isAvailable}")
-        if (textureView.isAvailable) {
-            player.setWindowId(textureView.surfaceTexture)
-        } else {
-            textureView.surfaceTextureListener = textureViewListener
-        }
-    }
-
-    fun export() {
-        recordingListener.onExportClicked(path)
-    }
-
-    private fun initPlayer() {
-        val playbackSoundCard = AudioRouteUtils.getAudioPlaybackDeviceIdForCallRecordingOrVoiceMessage()
-        Log.i("[Recording] Using device $playbackSoundCard to make the call recording playback")
-
-        val localPlayer = coreContext.core.createLocalPlayer(playbackSoundCard, null, null)
-        if (localPlayer != null) {
-            player = localPlayer
-        } else {
-            Log.e("[Recording] Couldn't create local player!")
-        }
-        player.addListener(listener)
-
-        player.open(path)
-        duration.value = player.duration
-        formattedDuration.value = SimpleDateFormat("mm:ss", Locale.getDefault()).format(
-            player.duration
-        ) // is already in milliseconds
-        formattedDate.value = DateFormat.getTimeInstance(DateFormat.SHORT).format(date)
-    }
-
-    private fun updatePosition() {
-        val progress = if (isClosed()) 0 else player.currentPosition
-        position.postValue(progress)
-        formattedPosition.postValue(SimpleDateFormat("mm:ss", Locale.getDefault()).format(progress)) // is already in milliseconds
-    }
-
-    private fun stop() {
-        pause()
-        player.seek(0)
-        updatePosition()
-        player.close()
-    }
-
-    private fun isClosed(): Boolean {
-        return player.state == Player.State.Closed
-    }
-
-    interface RecordingListener {
-        fun onPlayingStarted(videoAvailable: Boolean)
-        fun onPlayingEnded()
-        fun onExportClicked(path: String)
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/main/recordings/fragments/RecordingsFragment.kt b/app/src/main/java/org/linphone/activities/main/recordings/fragments/RecordingsFragment.kt
deleted file mode 100644
index b8c48a8a0..000000000
--- a/app/src/main/java/org/linphone/activities/main/recordings/fragments/RecordingsFragment.kt
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.main.recordings.fragments
-
-import android.content.ActivityNotFoundException
-import android.content.Intent
-import android.os.Bundle
-import android.view.MotionEvent
-import android.view.View
-import androidx.lifecycle.ViewModelProvider
-import androidx.recyclerview.widget.LinearLayoutManager
-import org.linphone.R
-import org.linphone.activities.main.fragments.MasterFragment
-import org.linphone.activities.main.recordings.adapters.RecordingsListAdapter
-import org.linphone.activities.main.recordings.data.RecordingData
-import org.linphone.activities.main.recordings.viewmodels.RecordingsViewModel
-import org.linphone.core.tools.Log
-import org.linphone.databinding.RecordingsFragmentBinding
-import org.linphone.utils.AppUtils
-import org.linphone.utils.FileUtils
-import org.linphone.utils.RecyclerViewHeaderDecoration
-
-class RecordingsFragment : MasterFragment<RecordingsFragmentBinding, RecordingsListAdapter>() {
-    private lateinit var viewModel: RecordingsViewModel
-
-    private var videoX: Float = 0f
-    private var videoY: Float = 0f
-
-    override fun getLayoutId(): Int = R.layout.recordings_fragment
-
-    override fun onDestroyView() {
-        binding.recordingsList.adapter = null
-        super.onDestroyView()
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        binding.lifecycleOwner = viewLifecycleOwner
-
-        viewModel = ViewModelProvider(this)[RecordingsViewModel::class.java]
-        binding.viewModel = viewModel
-
-        _adapter = RecordingsListAdapter(listSelectionViewModel, viewLifecycleOwner)
-        binding.recordingsList.setHasFixedSize(true)
-        binding.recordingsList.adapter = adapter
-
-        val layoutManager = LinearLayoutManager(requireContext())
-        binding.recordingsList.layoutManager = layoutManager
-
-        // Divider between items
-        binding.recordingsList.addItemDecoration(
-            AppUtils.getDividerDecoration(requireContext(), layoutManager)
-        )
-
-        // Displays the first letter header
-        val headerItemDecoration = RecyclerViewHeaderDecoration(requireContext(), adapter)
-        binding.recordingsList.addItemDecoration(headerItemDecoration)
-
-        viewModel.recordingsList.observe(
-            viewLifecycleOwner
-        ) { recordings ->
-            adapter.submitList(recordings)
-        }
-
-        viewModel.exportRecordingEvent.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume { path ->
-                val publicFilePath = FileUtils.getPublicFilePath(requireContext(), "file://$path")
-                Log.i("[Recordings] Exporting file [$path] with public URI [$publicFilePath]")
-                val intent = Intent(Intent.ACTION_SEND)
-                intent.type = " video/x-matroska"
-                intent.putExtra(Intent.EXTRA_STREAM, publicFilePath)
-                intent.putExtra(Intent.EXTRA_TEXT, getString(R.string.recordings_export))
-
-                try {
-                    requireActivity().startActivity(
-                        Intent.createChooser(intent, getString(R.string.recordings_export))
-                    )
-                } catch (anfe: ActivityNotFoundException) {
-                    Log.e(anfe)
-                }
-            }
-        }
-
-        binding.setEditClickListener { listSelectionViewModel.isEditionEnabled.value = true }
-
-        binding.setVideoTouchListener { v, event ->
-            when (event.action) {
-                MotionEvent.ACTION_DOWN -> {
-                    videoX = v.x - event.rawX
-                    videoY = v.y - event.rawY
-                }
-                MotionEvent.ACTION_MOVE -> {
-                    v.animate()
-                        .x(event.rawX + videoX)
-                        .y(event.rawY + videoY)
-                        .setDuration(0)
-                        .start()
-                }
-                else -> {
-                    v.performClick()
-                    false
-                }
-            }
-            true
-        }
-
-        adapter.setVideoTextureView(binding.recordingVideoSurface)
-    }
-
-    override fun deleteItems(indexesOfItemToDelete: ArrayList<Int>) {
-        val list = ArrayList<RecordingData>()
-        for (index in indexesOfItemToDelete) {
-            val recording = adapter.currentList[index]
-            list.add(recording)
-        }
-        viewModel.deleteRecordings(list)
-    }
-
-    override fun onResume() {
-        if (this::viewModel.isInitialized) {
-            viewModel.updateRecordingsList()
-        } else {
-            Log.e(
-                "[Recordings] Fragment resuming but viewModel lateinit property isn't initialized!"
-            )
-        }
-        super.onResume()
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/main/recordings/viewmodels/RecordingsViewModel.kt b/app/src/main/java/org/linphone/activities/main/recordings/viewmodels/RecordingsViewModel.kt
deleted file mode 100644
index cc12b4442..000000000
--- a/app/src/main/java/org/linphone/activities/main/recordings/viewmodels/RecordingsViewModel.kt
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.main.recordings.viewmodels
-
-import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.ViewModel
-import androidx.media.AudioFocusRequestCompat
-import kotlin.collections.ArrayList
-import org.linphone.LinphoneApplication.Companion.coreContext
-import org.linphone.activities.main.recordings.data.RecordingData
-import org.linphone.core.tools.Log
-import org.linphone.utils.AppUtils
-import org.linphone.utils.Event
-import org.linphone.utils.FileUtils
-
-class RecordingsViewModel : ViewModel() {
-    val recordingsList = MutableLiveData<ArrayList<RecordingData>>()
-
-    val isVideoVisible = MutableLiveData<Boolean>()
-
-    val exportRecordingEvent: MutableLiveData<Event<String>> by lazy {
-        MutableLiveData<Event<String>>()
-    }
-
-    private var recordingPlayingAudioFocusRequest: AudioFocusRequestCompat? = null
-
-    private val recordingListener = object : RecordingData.RecordingListener {
-        override fun onPlayingStarted(videoAvailable: Boolean) {
-            if (recordingPlayingAudioFocusRequest == null) {
-                recordingPlayingAudioFocusRequest = AppUtils.acquireAudioFocusForVoiceRecordingOrPlayback(
-                    coreContext.context
-                )
-            }
-
-            isVideoVisible.value = videoAvailable
-        }
-
-        override fun onPlayingEnded() {
-            val request = recordingPlayingAudioFocusRequest
-            if (request != null) {
-                AppUtils.releaseAudioFocusForVoiceRecordingOrPlayback(coreContext.context, request)
-                recordingPlayingAudioFocusRequest = null
-            }
-
-            isVideoVisible.value = false
-        }
-
-        override fun onExportClicked(path: String) {
-            exportRecordingEvent.value = Event(path)
-        }
-    }
-
-    init {
-        isVideoVisible.value = false
-    }
-
-    override fun onCleared() {
-        recordingsList.value.orEmpty().forEach(RecordingData::destroy)
-
-        val request = recordingPlayingAudioFocusRequest
-        if (request != null) {
-            AppUtils.releaseAudioFocusForVoiceRecordingOrPlayback(coreContext.context, request)
-            recordingPlayingAudioFocusRequest = null
-        }
-
-        super.onCleared()
-    }
-
-    fun deleteRecordings(list: ArrayList<RecordingData>) {
-        for (recording in list) {
-            // Hide video when removing a recording being played with video.
-            if (recording.isPlaying.value == true && recording.isVideoAvailable()) {
-                isVideoVisible.value = false
-            }
-
-            Log.i("[Recordings] Deleting recording ${recording.path}")
-            FileUtils.deleteFile(recording.path)
-        }
-
-        updateRecordingsList()
-    }
-
-    fun updateRecordingsList() {
-        recordingsList.value.orEmpty().forEach(RecordingData::destroy)
-        val list = arrayListOf<RecordingData>()
-
-        for (f in FileUtils.getFileStorageDir().listFiles().orEmpty()) {
-            Log.d("[Recordings] Found file ${f.path}")
-            if (RecordingData.RECORD_PATTERN.matcher(f.path).matches()) {
-                list.add(
-                    RecordingData(
-                        f.path,
-                        recordingListener
-                    )
-                )
-                Log.i("[Recordings] Found record ${f.path}")
-            }
-        }
-
-        list.sort()
-        recordingsList.value = list
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/main/settings/SettingListener.kt b/app/src/main/java/org/linphone/activities/main/settings/SettingListener.kt
deleted file mode 100644
index 16708c9df..000000000
--- a/app/src/main/java/org/linphone/activities/main/settings/SettingListener.kt
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.main.settings
-
-interface SettingListener {
-    fun onClicked()
-
-    fun onAccountClicked(identity: String)
-
-    fun onTextValueChanged(newValue: String)
-
-    fun onBoolValueChanged(newValue: Boolean)
-
-    fun onListValueChanged(position: Int)
-}
diff --git a/app/src/main/java/org/linphone/activities/main/settings/SettingListenerStub.kt b/app/src/main/java/org/linphone/activities/main/settings/SettingListenerStub.kt
deleted file mode 100644
index 2bb5fa46c..000000000
--- a/app/src/main/java/org/linphone/activities/main/settings/SettingListenerStub.kt
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.main.settings
-
-open class SettingListenerStub : SettingListener {
-    override fun onClicked() {}
-
-    override fun onAccountClicked(identity: String) {}
-
-    override fun onTextValueChanged(newValue: String) {}
-
-    override fun onBoolValueChanged(newValue: Boolean) {}
-
-    override fun onListValueChanged(position: Int) {}
-}
diff --git a/app/src/main/java/org/linphone/activities/main/settings/fragments/AccountSettingsFragment.kt b/app/src/main/java/org/linphone/activities/main/settings/fragments/AccountSettingsFragment.kt
deleted file mode 100644
index b06648585..000000000
--- a/app/src/main/java/org/linphone/activities/main/settings/fragments/AccountSettingsFragment.kt
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.main.settings.fragments
-
-import android.app.Dialog
-import android.os.Bundle
-import android.view.View
-import androidx.core.view.doOnPreDraw
-import androidx.lifecycle.ViewModelProvider
-import org.linphone.LinphoneApplication.Companion.corePreferences
-import org.linphone.R
-import org.linphone.activities.main.settings.viewmodels.AccountSettingsViewModel
-import org.linphone.activities.main.settings.viewmodels.AccountSettingsViewModelFactory
-import org.linphone.activities.main.viewmodels.DialogViewModel
-import org.linphone.activities.navigateToPhoneLinking
-import org.linphone.core.tools.Log
-import org.linphone.databinding.SettingsAccountFragmentBinding
-import org.linphone.utils.DialogUtils
-import org.linphone.utils.Event
-
-class AccountSettingsFragment : GenericSettingFragment<SettingsAccountFragmentBinding>() {
-    private lateinit var viewModel: AccountSettingsViewModel
-
-    override fun getLayoutId(): Int = R.layout.settings_account_fragment
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        binding.lifecycleOwner = viewLifecycleOwner
-        binding.sharedMainViewModel = sharedViewModel
-
-        val identity = arguments?.getString("Identity")
-        if (identity == null) {
-            Log.e("[Account Settings] Identity is null, aborting!")
-            goBack()
-            return
-        }
-
-        try {
-            viewModel = ViewModelProvider(this, AccountSettingsViewModelFactory(identity))[AccountSettingsViewModel::class.java]
-        } catch (nsee: NoSuchElementException) {
-            Log.e("[Account Settings] Failed to find Account object, aborting!")
-            goBack()
-            return
-        }
-        binding.viewModel = viewModel
-
-        viewModel.linkPhoneNumberEvent.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume {
-                val authInfo = viewModel.account.findAuthInfo()
-                if (authInfo == null) {
-                    Log.e(
-                        "[Account Settings] Failed to find auth info for account ${viewModel.account}"
-                    )
-                } else {
-                    val args = Bundle()
-                    args.putString("Username", authInfo.username)
-                    args.putString("Password", authInfo.password)
-                    args.putString("HA1", authInfo.ha1)
-                    navigateToPhoneLinking(args)
-                }
-            }
-        }
-
-        viewModel.accountRemovedEvent.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume {
-                sharedViewModel.accountRemoved.value = true
-                goBack()
-            }
-        }
-
-        viewModel.accountDefaultEvent.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume {
-                sharedViewModel.defaultAccountChanged.value = true
-            }
-        }
-
-        viewModel.deleteAccountRequiredEvent.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume {
-                val defaultDomainAccount = viewModel.account.params.identityAddress?.domain == corePreferences.defaultDomain
-                Log.i(
-                    "[Account Settings] User clicked on delete account, showing confirmation dialog for ${if (defaultDomainAccount) "default domain account" else "third party account"}"
-                )
-                val dialogViewModel = if (defaultDomainAccount) {
-                    DialogViewModel(
-                        getString(
-                            R.string.account_setting_delete_sip_linphone_org_confirmation_dialog
-                        ),
-                        getString(R.string.account_setting_delete_dialog_title)
-                    )
-                } else {
-                    DialogViewModel(
-                        getString(R.string.account_setting_delete_generic_confirmation_dialog),
-                        getString(R.string.account_setting_delete_dialog_title)
-                    )
-                }
-                val dialog: Dialog = DialogUtils.getDialog(requireContext(), dialogViewModel)
-
-                dialogViewModel.showIcon = true
-                dialogViewModel.iconResource = R.drawable.dialog_delete_icon
-                dialogViewModel.showSubscribeLinphoneOrgLink = defaultDomainAccount
-
-                dialogViewModel.showCancelButton {
-                    Log.i("[Account Settings] User cancelled account removal")
-                    dialog.dismiss()
-                }
-
-                dialogViewModel.showDeleteButton(
-                    {
-                        viewModel.startDeleteAccount()
-                        dialog.dismiss()
-                    },
-                    getString(R.string.dialog_delete)
-                )
-
-                dialog.show()
-            }
-        }
-
-        view.doOnPreDraw {
-            // Notifies fragment is ready to be drawn
-            sharedViewModel.accountSettingsFragmentOpenedEvent.value = Event(true)
-        }
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/main/settings/fragments/AdvancedSettingsFragment.kt b/app/src/main/java/org/linphone/activities/main/settings/fragments/AdvancedSettingsFragment.kt
deleted file mode 100644
index bfe786392..000000000
--- a/app/src/main/java/org/linphone/activities/main/settings/fragments/AdvancedSettingsFragment.kt
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.main.settings.fragments
-
-import android.content.*
-import android.net.Uri
-import android.os.Bundle
-import android.provider.Settings
-import android.view.View
-import androidx.appcompat.app.AppCompatDelegate
-import androidx.core.content.ContextCompat
-import androidx.lifecycle.ViewModelProvider
-import org.linphone.R
-import org.linphone.activities.main.MainActivity
-import org.linphone.activities.main.settings.viewmodels.AdvancedSettingsViewModel
-import org.linphone.core.tools.Log
-import org.linphone.core.tools.compatibility.DeviceUtils
-import org.linphone.databinding.SettingsAdvancedFragmentBinding
-import org.linphone.utils.AppUtils
-import org.linphone.utils.PowerManagerUtils
-
-class AdvancedSettingsFragment : GenericSettingFragment<SettingsAdvancedFragmentBinding>() {
-    private lateinit var viewModel: AdvancedSettingsViewModel
-
-    override fun getLayoutId(): Int = R.layout.settings_advanced_fragment
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        binding.lifecycleOwner = viewLifecycleOwner
-        binding.sharedMainViewModel = sharedViewModel
-
-        viewModel = ViewModelProvider(this)[AdvancedSettingsViewModel::class.java]
-        binding.viewModel = viewModel
-
-        viewModel.uploadFinishedEvent.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume { url ->
-                val clipboard =
-                    requireContext().getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
-                val clip = ClipData.newPlainText("Logs url", url)
-                clipboard.setPrimaryClip(clip)
-
-                val activity = requireActivity() as MainActivity
-                activity.showSnackBar(R.string.logs_url_copied_to_clipboard)
-
-                AppUtils.shareUploadedLogsUrl(activity, url)
-            }
-        }
-
-        viewModel.uploadErrorEvent.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume {
-                val activity = requireActivity() as MainActivity
-                activity.showSnackBar(R.string.logs_upload_failure)
-            }
-        }
-
-        viewModel.resetCompleteEvent.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume {
-                val activity = requireActivity() as MainActivity
-                activity.showSnackBar(R.string.logs_reset_complete)
-            }
-        }
-
-        viewModel.setNightModeEvent.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume { value ->
-                AppCompatDelegate.setDefaultNightMode(
-                    when (value) {
-                        0 -> AppCompatDelegate.MODE_NIGHT_NO
-                        1 -> AppCompatDelegate.MODE_NIGHT_YES
-                        else -> AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM
-                    }
-                )
-            }
-        }
-
-        viewModel.backgroundModeEnabled.value = !DeviceUtils.isAppUserRestricted(requireContext())
-
-        viewModel.goToBatterySettingsEvent.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume {
-                try {
-                    val intent = Intent("android.settings.IGNORE_BATTERY_OPTIMIZATION_SETTINGS")
-                    startActivity(intent)
-                } catch (anfe: ActivityNotFoundException) {
-                    Log.e("[Advanced Settings] ActivityNotFound exception: ", anfe)
-                }
-            }
-        }
-
-        viewModel.powerManagerSettingsVisibility.value = PowerManagerUtils.getDevicePowerManagerIntent(
-            requireContext()
-        ) != null
-        viewModel.goToPowerManagerSettingsEvent.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume {
-                val intent = PowerManagerUtils.getDevicePowerManagerIntent(requireActivity())
-                if (intent != null) {
-                    try {
-                        startActivity(intent)
-                    } catch (se: SecurityException) {
-                        Log.e("[Advanced Settings] Security exception: ", se)
-                    }
-                }
-            }
-        }
-
-        viewModel.goToAndroidSettingsEvent.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume {
-                val intent = Intent()
-                intent.action = Settings.ACTION_APPLICATION_DETAILS_SETTINGS
-                intent.addCategory(Intent.CATEGORY_DEFAULT)
-                intent.data = Uri.parse("package:${requireContext().packageName}")
-                intent.addFlags(Intent.FLAG_ACTIVITY_NO_HISTORY)
-                ContextCompat.startActivity(requireContext(), intent, null)
-            }
-        }
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/main/settings/fragments/AudioSettingsFragment.kt b/app/src/main/java/org/linphone/activities/main/settings/fragments/AudioSettingsFragment.kt
deleted file mode 100644
index 78e2e2cf2..000000000
--- a/app/src/main/java/org/linphone/activities/main/settings/fragments/AudioSettingsFragment.kt
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.main.settings.fragments
-
-import android.content.pm.PackageManager
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import androidx.databinding.DataBindingUtil
-import androidx.databinding.ViewDataBinding
-import androidx.lifecycle.ViewModelProvider
-import org.linphone.BR
-import org.linphone.LinphoneApplication.Companion.coreContext
-import org.linphone.R
-import org.linphone.activities.main.settings.SettingListenerStub
-import org.linphone.activities.main.settings.viewmodels.AudioSettingsViewModel
-import org.linphone.core.tools.Log
-import org.linphone.databinding.SettingsAudioFragmentBinding
-import org.linphone.utils.PermissionHelper
-
-class AudioSettingsFragment : GenericSettingFragment<SettingsAudioFragmentBinding>() {
-    private lateinit var viewModel: AudioSettingsViewModel
-
-    override fun getLayoutId(): Int = R.layout.settings_audio_fragment
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        binding.lifecycleOwner = viewLifecycleOwner
-        binding.sharedMainViewModel = sharedViewModel
-
-        viewModel = ViewModelProvider(this)[AudioSettingsViewModel::class.java]
-        binding.viewModel = viewModel
-
-        viewModel.askAudioRecordPermissionForEchoCancellerCalibrationEvent.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume {
-                Log.i(
-                    "[Audio Settings] Asking for RECORD_AUDIO permission for echo canceller calibration"
-                )
-                requestPermissions(arrayOf(android.Manifest.permission.RECORD_AUDIO), 1)
-            }
-        }
-
-        viewModel.askAudioRecordPermissionForEchoTesterEvent.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume {
-                Log.i("[Audio Settings] Asking for RECORD_AUDIO permission for echo tester")
-                requestPermissions(arrayOf(android.Manifest.permission.RECORD_AUDIO), 2)
-            }
-        }
-
-        initAudioCodecsList()
-
-        if (!PermissionHelper.required(requireContext()).hasRecordAudioPermission()) {
-            Log.i("[Audio Settings] Asking for RECORD_AUDIO permission")
-            requestPermissions(arrayOf(android.Manifest.permission.RECORD_AUDIO), 0)
-        }
-    }
-
-    @Deprecated("Deprecated in Java")
-    override fun onRequestPermissionsResult(
-        requestCode: Int,
-        permissions: Array<out String>,
-        grantResults: IntArray
-    ) {
-        val granted = grantResults.isNotEmpty() && grantResults[0] == PackageManager.PERMISSION_GRANTED
-        if (granted) {
-            Log.i("[Audio Settings] RECORD_AUDIO permission granted")
-            if (requestCode == 1) {
-                viewModel.startEchoCancellerCalibration()
-            } else if (requestCode == 2) {
-                viewModel.startEchoTester()
-            }
-        } else {
-            Log.w("[Audio Settings] RECORD_AUDIO permission denied")
-        }
-    }
-
-    private fun initAudioCodecsList() {
-        val list = arrayListOf<ViewDataBinding>()
-        for (payload in coreContext.core.audioPayloadTypes) {
-            val binding = DataBindingUtil.inflate<ViewDataBinding>(
-                LayoutInflater.from(requireContext()),
-                R.layout.settings_widget_switch,
-                null,
-                false
-            )
-            binding.setVariable(BR.title, payload.mimeType)
-            binding.setVariable(BR.subtitle, "${payload.clockRate} Hz")
-            binding.setVariable(BR.checked, payload.enabled())
-            binding.setVariable(
-                BR.listener,
-                object : SettingListenerStub() {
-                    override fun onBoolValueChanged(newValue: Boolean) {
-                        payload.enable(newValue)
-                    }
-                }
-            )
-            binding.lifecycleOwner = viewLifecycleOwner
-            list.add(binding)
-        }
-        viewModel.audioCodecs.value = list
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/main/settings/fragments/CallSettingsFragment.kt b/app/src/main/java/org/linphone/activities/main/settings/fragments/CallSettingsFragment.kt
deleted file mode 100644
index 735febf15..000000000
--- a/app/src/main/java/org/linphone/activities/main/settings/fragments/CallSettingsFragment.kt
+++ /dev/null
@@ -1,193 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.main.settings.fragments
-
-import android.content.Intent
-import android.content.pm.PackageManager
-import android.net.Uri
-import android.os.Build
-import android.os.Bundle
-import android.provider.Settings
-import android.view.View
-import androidx.lifecycle.ViewModelProvider
-import org.linphone.LinphoneApplication.Companion.corePreferences
-import org.linphone.R
-import org.linphone.activities.main.settings.viewmodels.CallSettingsViewModel
-import org.linphone.compatibility.Compatibility
-import org.linphone.core.tools.Log
-import org.linphone.databinding.SettingsCallFragmentBinding
-import org.linphone.mediastream.Version
-import org.linphone.telecom.TelecomHelper
-
-class CallSettingsFragment : GenericSettingFragment<SettingsCallFragmentBinding>() {
-    private lateinit var viewModel: CallSettingsViewModel
-
-    override fun getLayoutId(): Int = R.layout.settings_call_fragment
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        binding.lifecycleOwner = viewLifecycleOwner
-        binding.sharedMainViewModel = sharedViewModel
-
-        viewModel = ViewModelProvider(this)[CallSettingsViewModel::class.java]
-        binding.viewModel = viewModel
-
-        viewModel.systemWideOverlayEnabledEvent.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume {
-                if (!Compatibility.canDrawOverlay(requireContext())) {
-                    val intent = Intent(
-                        "android.settings.action.MANAGE_OVERLAY_PERMISSION",
-                        Uri.parse("package:${requireContext().packageName}")
-                    )
-                    startActivityForResult(intent, 0)
-                }
-            }
-        }
-
-        viewModel.goToAndroidNotificationSettingsEvent.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume {
-                if (Build.VERSION.SDK_INT >= Version.API26_O_80) {
-                    val i = Intent()
-                    i.action = Settings.ACTION_CHANNEL_NOTIFICATION_SETTINGS
-                    i.putExtra(Settings.EXTRA_APP_PACKAGE, requireContext().packageName)
-                    i.putExtra(
-                        Settings.EXTRA_CHANNEL_ID,
-                        getString(R.string.notification_channel_service_id)
-                    )
-                    i.addCategory(Intent.CATEGORY_DEFAULT)
-                    i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-                    i.addFlags(Intent.FLAG_ACTIVITY_NO_HISTORY)
-                    i.addFlags(Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS)
-                    startActivity(i)
-                }
-            }
-        }
-
-        viewModel.enableTelecomManagerEvent.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume {
-                if (Compatibility.hasTelecomManagerFeature(requireContext())) {
-                    if (!Compatibility.hasTelecomManagerPermissions(requireContext())) {
-                        Compatibility.requestTelecomManagerPermissions(requireActivity(), 1)
-                    } else if (!TelecomHelper.exists()) {
-                        corePreferences.useTelecomManager = true
-                        Log.w("[Telecom Helper] Doesn't exists yet, creating it")
-                        TelecomHelper.create(requireContext())
-                        updateTelecomManagerAccount()
-                    }
-                } else {
-                    Log.e(
-                        "[Telecom Helper] Telecom Helper can't be created, device doesn't support connection service!"
-                    )
-                }
-            }
-        }
-
-        viewModel.goToAndroidNotificationSettingsEvent.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume {
-                if (Build.VERSION.SDK_INT >= Version.API26_O_80) {
-                    val i = Intent()
-                    i.action = Settings.ACTION_CHANNEL_NOTIFICATION_SETTINGS
-                    i.putExtra(Settings.EXTRA_APP_PACKAGE, requireContext().packageName)
-                    i.putExtra(
-                        Settings.EXTRA_CHANNEL_ID,
-                        getString(R.string.notification_channel_service_id)
-                    )
-                    i.addCategory(Intent.CATEGORY_DEFAULT)
-                    i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-                    i.addFlags(Intent.FLAG_ACTIVITY_NO_HISTORY)
-                    i.addFlags(Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS)
-                    startActivity(i)
-                }
-            }
-        }
-    }
-
-    @Deprecated("Deprecated in Java")
-    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
-        super.onActivityResult(requestCode, resultCode, data)
-
-        if (requestCode == 0 && !Compatibility.canDrawOverlay(requireContext())) {
-            viewModel.overlayListener.onBoolValueChanged(false)
-        } else if (requestCode == 1) {
-            if (!TelecomHelper.exists()) {
-                Log.w("[Telecom Helper] Doesn't exists yet, creating it")
-                if (Compatibility.hasTelecomManagerFeature(requireContext())) {
-                    TelecomHelper.create(requireContext())
-                } else {
-                    Log.e(
-                        "[Telecom Helper] Telecom Helper can't be created, device doesn't support connection service"
-                    )
-                }
-            }
-            updateTelecomManagerAccount()
-        }
-    }
-
-    private fun updateTelecomManagerAccount() {
-        if (!TelecomHelper.exists()) {
-            Log.e("[Telecom Helper] Doesn't exists, can't update account!")
-            return
-        }
-        // We have to refresh the account object otherwise isAccountEnabled will always return false...
-        val account = TelecomHelper.get().findExistingAccount(requireContext())
-        TelecomHelper.get().updateAccount(account)
-        val enabled = TelecomHelper.get().isAccountEnabled()
-        Log.i("[Call Settings] Telecom Manager is ${if (enabled) "enabled" else "disabled"}")
-        viewModel.useTelecomManager.value = enabled
-        corePreferences.useTelecomManager = enabled
-    }
-
-    @Deprecated("Deprecated in Java")
-    override fun onRequestPermissionsResult(
-        requestCode: Int,
-        permissions: Array<out String>,
-        grantResults: IntArray
-    ) {
-        for (index in grantResults.indices) {
-            val result = grantResults[index]
-            if (result != PackageManager.PERMISSION_GRANTED) {
-                Log.w(
-                    "[Call Settings] ${permissions[index]} permission denied but required for telecom manager"
-                )
-                viewModel.useTelecomManager.value = false
-                corePreferences.useTelecomManager = false
-                return
-            }
-        }
-
-        if (Compatibility.hasTelecomManagerFeature(requireContext())) {
-            TelecomHelper.create(requireContext())
-            updateTelecomManagerAccount()
-        } else {
-            Log.e(
-                "[Telecom Helper] Telecom Helper can't be created, device doesn't support connection service"
-            )
-        }
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/main/settings/fragments/ChatSettingsFragment.kt b/app/src/main/java/org/linphone/activities/main/settings/fragments/ChatSettingsFragment.kt
deleted file mode 100644
index 23c6ef87e..000000000
--- a/app/src/main/java/org/linphone/activities/main/settings/fragments/ChatSettingsFragment.kt
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.main.settings.fragments
-
-import android.content.Intent
-import android.os.Build
-import android.os.Bundle
-import android.provider.Settings
-import android.view.View
-import androidx.lifecycle.ViewModelProvider
-import org.linphone.R
-import org.linphone.activities.main.chat.viewmodels.ChatRoomsListViewModel
-import org.linphone.activities.main.settings.viewmodels.ChatSettingsViewModel
-import org.linphone.databinding.SettingsChatFragmentBinding
-import org.linphone.mediastream.Version
-import org.linphone.utils.ShortcutsHelper
-
-class ChatSettingsFragment : GenericSettingFragment<SettingsChatFragmentBinding>() {
-    private lateinit var viewModel: ChatSettingsViewModel
-
-    override fun getLayoutId(): Int = R.layout.settings_chat_fragment
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        binding.lifecycleOwner = viewLifecycleOwner
-        binding.sharedMainViewModel = sharedViewModel
-
-        viewModel = ViewModelProvider(this)[ChatSettingsViewModel::class.java]
-        binding.viewModel = viewModel
-
-        viewModel.launcherShortcutsEvent.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume { newValue ->
-                if (newValue) {
-                    ShortcutsHelper.createShortcutsToChatRooms(requireContext())
-                } else {
-                    ShortcutsHelper.removeShortcuts(requireContext())
-                }
-            }
-        }
-
-        viewModel.goToAndroidNotificationSettingsEvent.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume {
-                if (Build.VERSION.SDK_INT >= Version.API26_O_80) {
-                    val i = Intent()
-                    i.action = Settings.ACTION_CHANNEL_NOTIFICATION_SETTINGS
-                    i.putExtra(Settings.EXTRA_APP_PACKAGE, requireContext().packageName)
-                    i.putExtra(
-                        Settings.EXTRA_CHANNEL_ID,
-                        getString(R.string.notification_channel_chat_id)
-                    )
-                    i.addCategory(Intent.CATEGORY_DEFAULT)
-                    i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-                    i.addFlags(Intent.FLAG_ACTIVITY_NO_HISTORY)
-                    i.addFlags(Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS)
-                    startActivity(i)
-                }
-            }
-        }
-
-        viewModel.reloadChatRoomsEvent.observe(viewLifecycleOwner) {
-            it.consume {
-                reloadChatRooms()
-            }
-        }
-    }
-
-    private fun reloadChatRooms() {
-        val listViewModel = requireActivity().run {
-            ViewModelProvider(this)[ChatRoomsListViewModel::class.java]
-        }
-        listViewModel.updateChatRooms()
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/main/settings/fragments/ConferencesSettingsFragment.kt b/app/src/main/java/org/linphone/activities/main/settings/fragments/ConferencesSettingsFragment.kt
deleted file mode 100644
index 02bac24ab..000000000
--- a/app/src/main/java/org/linphone/activities/main/settings/fragments/ConferencesSettingsFragment.kt
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (c) 2010-2022 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.main.settings.fragments
-
-import android.os.Bundle
-import android.view.View
-import androidx.lifecycle.ViewModelProvider
-import org.linphone.R
-import org.linphone.activities.main.settings.viewmodels.ConferencesSettingsViewModel
-import org.linphone.databinding.SettingsConferencesFragmentBinding
-
-class ConferencesSettingsFragment : GenericSettingFragment<SettingsConferencesFragmentBinding>() {
-    private lateinit var viewModel: ConferencesSettingsViewModel
-
-    override fun getLayoutId(): Int = R.layout.settings_conferences_fragment
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        binding.lifecycleOwner = viewLifecycleOwner
-        binding.sharedMainViewModel = sharedViewModel
-
-        viewModel = ViewModelProvider(this)[ConferencesSettingsViewModel::class.java]
-        binding.viewModel = viewModel
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/main/settings/fragments/ContactsSettingsFragment.kt b/app/src/main/java/org/linphone/activities/main/settings/fragments/ContactsSettingsFragment.kt
deleted file mode 100644
index f949fe0d6..000000000
--- a/app/src/main/java/org/linphone/activities/main/settings/fragments/ContactsSettingsFragment.kt
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.main.settings.fragments
-
-import android.content.pm.PackageManager
-import android.os.Bundle
-import android.view.View
-import androidx.lifecycle.ViewModelProvider
-import org.linphone.LinphoneApplication.Companion.coreContext
-import org.linphone.LinphoneApplication.Companion.corePreferences
-import org.linphone.R
-import org.linphone.activities.main.settings.SettingListenerStub
-import org.linphone.activities.main.settings.viewmodels.ContactsSettingsViewModel
-import org.linphone.activities.navigateToLdapSettings
-import org.linphone.core.tools.Log
-import org.linphone.databinding.SettingsContactsFragmentBinding
-import org.linphone.utils.PermissionHelper
-import org.linphone.utils.ShortcutsHelper
-
-class ContactsSettingsFragment : GenericSettingFragment<SettingsContactsFragmentBinding>() {
-    private lateinit var viewModel: ContactsSettingsViewModel
-
-    override fun getLayoutId(): Int = R.layout.settings_contacts_fragment
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        binding.lifecycleOwner = viewLifecycleOwner
-        binding.sharedMainViewModel = sharedViewModel
-
-        viewModel = ViewModelProvider(this)[ContactsSettingsViewModel::class.java]
-        binding.viewModel = viewModel
-
-        viewModel.launcherShortcutsEvent.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume { newValue ->
-                if (newValue) {
-                    ShortcutsHelper.createShortcutsToContacts(requireContext())
-                } else {
-                    ShortcutsHelper.removeShortcuts(requireContext())
-                    if (corePreferences.chatRoomShortcuts) {
-                        ShortcutsHelper.createShortcutsToChatRooms(requireContext())
-                    }
-                }
-            }
-        }
-
-        viewModel.askWriteContactsPermissionForPresenceStorageEvent.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume {
-                Log.i(
-                    "[Contacts Settings] Asking for WRITE_CONTACTS permission to be able to store presence"
-                )
-                requestPermissions(arrayOf(android.Manifest.permission.WRITE_CONTACTS), 1)
-            }
-        }
-
-        viewModel.publishPresenceToggledEvent.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume {
-                sharedViewModel.publishPresenceToggled.value = true
-            }
-        }
-
-        viewModel.ldapNewSettingsListener = object : SettingListenerStub() {
-            override fun onClicked() {
-                Log.i("[Contacts Settings] Clicked on new LDAP config")
-                navigateToLdapSettings(-1)
-            }
-        }
-
-        viewModel.ldapSettingsClickedEvent.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume { index ->
-                Log.i("[Contacts Settings] Clicked on LDAP config with index: $index")
-                navigateToLdapSettings(index)
-            }
-        }
-
-        if (corePreferences.enableNativeAddressBookIntegration) {
-            if (!PermissionHelper.required(requireContext()).hasReadContactsPermission()) {
-                Log.i("[Contacts Settings] Asking for READ_CONTACTS permission")
-                requestPermissions(arrayOf(android.Manifest.permission.READ_CONTACTS), 0)
-            }
-        }
-    }
-
-    @Deprecated("Deprecated in Java")
-    override fun onRequestPermissionsResult(
-        requestCode: Int,
-        permissions: Array<out String>,
-        grantResults: IntArray
-    ) {
-        when (requestCode) {
-            0 -> {
-                val granted = grantResults.isNotEmpty() && grantResults[0] == PackageManager.PERMISSION_GRANTED
-                if (granted) {
-                    Log.i("[Contacts Settings] READ_CONTACTS permission granted")
-                    viewModel.readContactsPermissionGranted.value = true
-                    coreContext.fetchContacts()
-                } else {
-                    Log.w("[Contacts Settings] READ_CONTACTS permission denied")
-                }
-            }
-            1 -> {
-                val granted = grantResults.isNotEmpty() && grantResults[0] == PackageManager.PERMISSION_GRANTED
-                if (granted) {
-                    Log.i("[Contacts Settings] WRITE_CONTACTS permission granted")
-                    corePreferences.storePresenceInNativeContact = true
-                } else {
-                    Log.w("[Contacts Settings] WRITE_CONTACTS permission denied")
-                }
-            }
-        }
-    }
-
-    override fun onResume() {
-        super.onResume()
-        viewModel.updateLdapConfigurationsList()
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/main/settings/fragments/GenericSettingFragment.kt b/app/src/main/java/org/linphone/activities/main/settings/fragments/GenericSettingFragment.kt
deleted file mode 100644
index 6d2844a71..000000000
--- a/app/src/main/java/org/linphone/activities/main/settings/fragments/GenericSettingFragment.kt
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (c) 2010-2021 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.main.settings.fragments
-
-import android.os.Bundle
-import android.view.View
-import androidx.databinding.ViewDataBinding
-import org.linphone.activities.GenericFragment
-
-abstract class GenericSettingFragment<T : ViewDataBinding> : GenericFragment<T>() {
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        useMaterialSharedAxisXForwardAnimation = sharedViewModel.isSlidingPaneSlideable.value == false
-
-        super.onViewCreated(view, savedInstanceState)
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/main/settings/fragments/LdapSettingsFragment.kt b/app/src/main/java/org/linphone/activities/main/settings/fragments/LdapSettingsFragment.kt
deleted file mode 100644
index aba760799..000000000
--- a/app/src/main/java/org/linphone/activities/main/settings/fragments/LdapSettingsFragment.kt
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright (c) 2010-2022 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.main.settings.fragments
-
-import android.os.Bundle
-import android.view.View
-import androidx.lifecycle.ViewModelProvider
-import org.linphone.R
-import org.linphone.activities.main.settings.viewmodels.LdapSettingsViewModel
-import org.linphone.activities.main.settings.viewmodels.LdapSettingsViewModelFactory
-import org.linphone.core.tools.Log
-import org.linphone.databinding.SettingsLdapFragmentBinding
-
-class LdapSettingsFragment : GenericSettingFragment<SettingsLdapFragmentBinding>() {
-    private lateinit var viewModel: LdapSettingsViewModel
-
-    override fun getLayoutId(): Int = R.layout.settings_ldap_fragment
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        binding.lifecycleOwner = viewLifecycleOwner
-        binding.sharedMainViewModel = sharedViewModel
-
-        val configIndex = arguments?.getInt("LdapConfigIndex")
-        if (configIndex == null) {
-            Log.e("[LDAP Settings] Config index not specified!")
-            goBack()
-            return
-        }
-
-        try {
-            viewModel = ViewModelProvider(this, LdapSettingsViewModelFactory(configIndex))[LdapSettingsViewModel::class.java]
-        } catch (nsee: NoSuchElementException) {
-            Log.e("[LDAP Settings] Failed to find LDAP object, aborting!")
-            goBack()
-            return
-        }
-        binding.viewModel = viewModel
-
-        viewModel.ldapConfigDeletedEvent.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume {
-                goBack()
-            }
-        }
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/main/settings/fragments/NetworkSettingsFragment.kt b/app/src/main/java/org/linphone/activities/main/settings/fragments/NetworkSettingsFragment.kt
deleted file mode 100644
index f990f2ada..000000000
--- a/app/src/main/java/org/linphone/activities/main/settings/fragments/NetworkSettingsFragment.kt
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.main.settings.fragments
-
-import android.os.Bundle
-import android.view.View
-import androidx.lifecycle.ViewModelProvider
-import org.linphone.R
-import org.linphone.activities.main.settings.viewmodels.NetworkSettingsViewModel
-import org.linphone.databinding.SettingsNetworkFragmentBinding
-
-class NetworkSettingsFragment : GenericSettingFragment<SettingsNetworkFragmentBinding>() {
-    private lateinit var viewModel: NetworkSettingsViewModel
-
-    override fun getLayoutId(): Int = R.layout.settings_network_fragment
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        binding.lifecycleOwner = viewLifecycleOwner
-        binding.sharedMainViewModel = sharedViewModel
-
-        viewModel = ViewModelProvider(this)[NetworkSettingsViewModel::class.java]
-        binding.viewModel = viewModel
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/main/settings/fragments/SettingsFragment.kt b/app/src/main/java/org/linphone/activities/main/settings/fragments/SettingsFragment.kt
deleted file mode 100644
index 72cc41def..000000000
--- a/app/src/main/java/org/linphone/activities/main/settings/fragments/SettingsFragment.kt
+++ /dev/null
@@ -1,186 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.main.settings.fragments
-
-import android.os.Bundle
-import android.view.View
-import androidx.core.view.doOnPreDraw
-import androidx.lifecycle.ViewModelProvider
-import androidx.navigation.fragment.NavHostFragment
-import androidx.slidingpanelayout.widget.SlidingPaneLayout
-import com.google.android.material.transition.MaterialSharedAxis
-import org.linphone.LinphoneApplication.Companion.corePreferences
-import org.linphone.R
-import org.linphone.activities.*
-import org.linphone.activities.main.fragments.MasterFragment
-import org.linphone.activities.main.fragments.SecureFragment
-import org.linphone.activities.main.settings.SettingListenerStub
-import org.linphone.activities.main.settings.viewmodels.SettingsViewModel
-import org.linphone.activities.navigateToAccountSettings
-import org.linphone.activities.navigateToAudioSettings
-import org.linphone.activities.navigateToTunnelSettings
-import org.linphone.activities.navigateToVideoSettings
-import org.linphone.core.tools.Log
-import org.linphone.databinding.SettingsFragmentBinding
-
-class SettingsFragment : SecureFragment<SettingsFragmentBinding>() {
-    private lateinit var viewModel: SettingsViewModel
-
-    override fun getLayoutId(): Int = R.layout.settings_fragment
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        binding.lifecycleOwner = viewLifecycleOwner
-
-        useMaterialSharedAxisXForwardAnimation = false
-        if (corePreferences.enableAnimations) {
-            enterTransition = MaterialSharedAxis(MaterialSharedAxis.Z, true)
-            reenterTransition = MaterialSharedAxis(MaterialSharedAxis.Z, true)
-            returnTransition = MaterialSharedAxis(MaterialSharedAxis.Z, false)
-            exitTransition = MaterialSharedAxis(MaterialSharedAxis.Z, false)
-        }
-
-        /* Shared view model & sliding pane related */
-
-        view.doOnPreDraw { sharedViewModel.isSlidingPaneSlideable.value = binding.slidingPane.isSlideable }
-
-        // Account settings loading can take some time, so wait until it is ready before opening the pane
-        sharedViewModel.accountSettingsFragmentOpenedEvent.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume {
-                binding.slidingPane.openPane()
-            }
-        }
-
-        sharedViewModel.layoutChangedEvent.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume {
-                sharedViewModel.isSlidingPaneSlideable.value = binding.slidingPane.isSlideable
-                if (binding.slidingPane.isSlideable) {
-                    val navHostFragment =
-                        childFragmentManager.findFragmentById(R.id.settings_nav_container) as NavHostFragment
-                    if (navHostFragment.navController.currentDestination?.id == R.id.emptySettingsFragment) {
-                        Log.i(
-                            "[Settings] Foldable device has been folded, closing side pane with empty fragment"
-                        )
-                        binding.slidingPane.closePane()
-                    }
-                }
-            }
-        }
-
-        requireActivity().onBackPressedDispatcher.addCallback(
-            viewLifecycleOwner,
-            MasterFragment.SlidingPaneBackPressedCallback(binding.slidingPane)
-        )
-
-        binding.slidingPane.lockMode = SlidingPaneLayout.LOCK_MODE_LOCKED
-
-        /* End of shared view model & sliding pane related */
-
-        viewModel = ViewModelProvider(this)[SettingsViewModel::class.java]
-        binding.viewModel = viewModel
-
-        sharedViewModel.accountRemoved.observe(
-            viewLifecycleOwner
-        ) {
-            Log.i("[Settings] Account removed, update accounts list")
-            viewModel.updateAccountsList()
-        }
-
-        sharedViewModel.defaultAccountChanged.observe(
-            viewLifecycleOwner
-        ) {
-            Log.i("[Settings] Default account changed, update accounts list")
-            viewModel.updateAccountsList()
-        }
-
-        val identity = arguments?.getString("Identity")
-        if (identity != null) {
-            Log.i("[Settings] Found identity parameter in arguments: $identity")
-            arguments?.clear()
-            navigateToAccountSettings(identity)
-        }
-
-        viewModel.accountsSettingsListener = object : SettingListenerStub() {
-            override fun onAccountClicked(identity: String) {
-                Log.i("[Settings] Navigation to settings for account with identity: $identity")
-                navigateToAccountSettings(identity)
-            }
-        }
-
-        viewModel.tunnelSettingsListener = object : SettingListenerStub() {
-            override fun onClicked() {
-                navigateToTunnelSettings(binding.slidingPane)
-            }
-        }
-
-        viewModel.audioSettingsListener = object : SettingListenerStub() {
-            override fun onClicked() {
-                navigateToAudioSettings(binding.slidingPane)
-            }
-        }
-
-        viewModel.videoSettingsListener = object : SettingListenerStub() {
-            override fun onClicked() {
-                navigateToVideoSettings(binding.slidingPane)
-            }
-        }
-
-        viewModel.callSettingsListener = object : SettingListenerStub() {
-            override fun onClicked() {
-                navigateToCallSettings(binding.slidingPane)
-            }
-        }
-
-        viewModel.chatSettingsListener = object : SettingListenerStub() {
-            override fun onClicked() {
-                navigateToChatSettings(binding.slidingPane)
-            }
-        }
-
-        viewModel.networkSettingsListener = object : SettingListenerStub() {
-            override fun onClicked() {
-                navigateToNetworkSettings(binding.slidingPane)
-            }
-        }
-
-        viewModel.contactsSettingsListener = object : SettingListenerStub() {
-            override fun onClicked() {
-                navigateToContactsSettings(binding.slidingPane)
-            }
-        }
-
-        viewModel.advancedSettingsListener = object : SettingListenerStub() {
-            override fun onClicked() {
-                navigateToAdvancedSettings(binding.slidingPane)
-            }
-        }
-
-        viewModel.conferencesSettingsListener = object : SettingListenerStub() {
-            override fun onClicked() {
-                navigateToConferencesSettings(binding.slidingPane)
-            }
-        }
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/main/settings/fragments/TunnelSettingsFragment.kt b/app/src/main/java/org/linphone/activities/main/settings/fragments/TunnelSettingsFragment.kt
deleted file mode 100644
index 947f7bd6f..000000000
--- a/app/src/main/java/org/linphone/activities/main/settings/fragments/TunnelSettingsFragment.kt
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.main.settings.fragments
-
-import android.os.Bundle
-import android.view.View
-import androidx.lifecycle.ViewModelProvider
-import org.linphone.R
-import org.linphone.activities.main.settings.viewmodels.TunnelSettingsViewModel
-import org.linphone.databinding.SettingsTunnelFragmentBinding
-
-class TunnelSettingsFragment : GenericSettingFragment<SettingsTunnelFragmentBinding>() {
-    private lateinit var viewModel: TunnelSettingsViewModel
-
-    override fun getLayoutId(): Int = R.layout.settings_tunnel_fragment
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        binding.lifecycleOwner = viewLifecycleOwner
-        binding.sharedMainViewModel = sharedViewModel
-
-        viewModel = ViewModelProvider(this)[TunnelSettingsViewModel::class.java]
-        binding.viewModel = viewModel
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/main/settings/fragments/VideoSettingsFragment.kt b/app/src/main/java/org/linphone/activities/main/settings/fragments/VideoSettingsFragment.kt
deleted file mode 100644
index 6ad8561bd..000000000
--- a/app/src/main/java/org/linphone/activities/main/settings/fragments/VideoSettingsFragment.kt
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.main.settings.fragments
-
-import android.content.pm.PackageManager
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import androidx.databinding.DataBindingUtil
-import androidx.databinding.ViewDataBinding
-import androidx.lifecycle.ViewModelProvider
-import org.linphone.BR
-import org.linphone.LinphoneApplication.Companion.coreContext
-import org.linphone.R
-import org.linphone.activities.main.settings.SettingListenerStub
-import org.linphone.activities.main.settings.viewmodels.VideoSettingsViewModel
-import org.linphone.core.tools.Log
-import org.linphone.databinding.SettingsVideoFragmentBinding
-import org.linphone.utils.PermissionHelper
-
-class VideoSettingsFragment : GenericSettingFragment<SettingsVideoFragmentBinding>() {
-    private lateinit var viewModel: VideoSettingsViewModel
-
-    override fun getLayoutId(): Int = R.layout.settings_video_fragment
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        binding.lifecycleOwner = viewLifecycleOwner
-        binding.sharedMainViewModel = sharedViewModel
-
-        viewModel = ViewModelProvider(this)[VideoSettingsViewModel::class.java]
-        binding.viewModel = viewModel
-
-        initVideoCodecsList()
-
-        if (!PermissionHelper.required(requireContext()).hasCameraPermission()) {
-            Log.i("[Video Settings] Asking for CAMERA permission")
-            requestPermissions(arrayOf(android.Manifest.permission.CAMERA), 0)
-        }
-    }
-
-    @Deprecated("Deprecated in Java")
-    override fun onRequestPermissionsResult(
-        requestCode: Int,
-        permissions: Array<out String>,
-        grantResults: IntArray
-    ) {
-        val granted = grantResults.isNotEmpty() && grantResults[0] == PackageManager.PERMISSION_GRANTED
-        if (granted) {
-            Log.i("[Video Settings] CAMERA permission granted")
-            coreContext.core.reloadVideoDevices()
-            viewModel.initCameraDevicesList()
-        } else {
-            Log.w("[Video Settings] CAMERA permission denied")
-        }
-    }
-
-    private fun initVideoCodecsList() {
-        val list = arrayListOf<ViewDataBinding>()
-        for (payload in coreContext.core.videoPayloadTypes) {
-            val binding = DataBindingUtil.inflate<ViewDataBinding>(
-                LayoutInflater.from(requireContext()),
-                R.layout.settings_widget_switch_and_text,
-                null,
-                false
-            )
-            binding.setVariable(BR.switch_title, payload.mimeType)
-            binding.setVariable(BR.switch_subtitle, "")
-            binding.setVariable(BR.text_title, "recv-fmtp")
-            binding.setVariable(BR.text_subtitle, "")
-            binding.setVariable(BR.defaultValue, payload.recvFmtp)
-            binding.setVariable(BR.checked, payload.enabled())
-            binding.setVariable(
-                BR.listener,
-                object : SettingListenerStub() {
-                    override fun onBoolValueChanged(newValue: Boolean) {
-                        payload.enable(newValue)
-                    }
-
-                    override fun onTextValueChanged(newValue: String) {
-                        payload.recvFmtp = newValue
-                    }
-                }
-            )
-            binding.lifecycleOwner = viewLifecycleOwner
-            list.add(binding)
-        }
-        viewModel.videoCodecs.value = list
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/main/settings/viewmodels/AccountSettingsViewModel.kt b/app/src/main/java/org/linphone/activities/main/settings/viewmodels/AccountSettingsViewModel.kt
deleted file mode 100644
index 1b71748ec..000000000
--- a/app/src/main/java/org/linphone/activities/main/settings/viewmodels/AccountSettingsViewModel.kt
+++ /dev/null
@@ -1,561 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.main.settings.viewmodels
-
-import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.ViewModel
-import androidx.lifecycle.ViewModelProvider
-import java.lang.NumberFormatException
-import kotlin.collections.ArrayList
-import org.linphone.LinphoneApplication.Companion.coreContext
-import org.linphone.LinphoneApplication.Companion.corePreferences
-import org.linphone.R
-import org.linphone.activities.main.settings.SettingListenerStub
-import org.linphone.core.*
-import org.linphone.core.tools.Log
-import org.linphone.utils.Event
-import org.linphone.utils.LinphoneUtils
-
-class AccountSettingsViewModelFactory(private val identity: String) :
-    ViewModelProvider.NewInstanceFactory() {
-
-    @Suppress("UNCHECKED_CAST")
-    override fun <T : ViewModel> create(modelClass: Class<T>): T {
-        for (account in coreContext.core.accountList) {
-            if (account.params.identityAddress?.asStringUriOnly() == identity) {
-                return AccountSettingsViewModel(account) as T
-            }
-        }
-        val defaultAccount = coreContext.core.defaultAccount
-        if (defaultAccount != null) {
-            return AccountSettingsViewModel(defaultAccount) as T
-        }
-
-        val firstAccount = coreContext.core.accountList.first()
-        return AccountSettingsViewModel(firstAccount) as T
-    }
-}
-
-class AccountSettingsViewModel(val account: Account) : GenericSettingsViewModel() {
-    val isDefault = MutableLiveData<Boolean>()
-
-    val displayName = MutableLiveData<String>()
-
-    val identity = MutableLiveData<String>()
-
-    val iconResource = MutableLiveData<Int>()
-    val iconContentDescription = MutableLiveData<Int>()
-
-    lateinit var accountsSettingsListener: SettingListenerStub
-
-    val waitForUnregister = MutableLiveData<Boolean>()
-
-    val accountRemovedEvent: MutableLiveData<Event<Boolean>> by lazy {
-        MutableLiveData<Event<Boolean>>()
-    }
-
-    val accountDefaultEvent: MutableLiveData<Event<Boolean>> by lazy {
-        MutableLiveData<Event<Boolean>>()
-    }
-
-    val displayUsernameInsteadOfIdentity = corePreferences.replaceSipUriByUsername
-
-    private var accountToDelete: Account? = null
-
-    val listener: AccountListenerStub = object : AccountListenerStub() {
-        override fun onRegistrationStateChanged(
-            account: Account,
-            state: RegistrationState,
-            message: String
-        ) {
-            if (state == RegistrationState.Cleared && account == accountToDelete) {
-                Log.i(
-                    "[Account Settings] Account to remove ([${account.params.identityAddress?.asStringUriOnly()}]) registration is now cleared, removing it"
-                )
-                waitForUnregister.value = false
-                deleteAccount(account)
-            } else {
-                update()
-                if (state == RegistrationState.Ok) {
-                    coreContext.contactsManager.updateLocalContacts()
-                }
-            }
-        }
-    }
-
-    /* Settings part */
-
-    val userNameListener = object : SettingListenerStub() {
-        override fun onTextValueChanged(newValue: String) {
-            val params = account.params.clone()
-            val identity = params.identityAddress
-            if (identity != null) {
-                val newIdentityAddress = identity.clone()
-                newIdentityAddress.username = newValue
-                params.identityAddress = newIdentityAddress
-                account.params = params
-            } else {
-                Log.e("[Account Settings] Account doesn't have an identity yet")
-
-                val domain = params.domain
-                val newIdentityAddress = Factory.instance().createAddress("sip:$newValue@$domain")
-                if (newIdentityAddress != null) {
-                    params.identityAddress = newIdentityAddress
-                    account.params = params
-                } else {
-                    Log.e(
-                        "[Account Settings] Failed to create identity address sip:$newValue@$domain"
-                    )
-                }
-            }
-        }
-    }
-    val userName = MutableLiveData<String>()
-
-    val userIdListener = object : SettingListenerStub() {
-        override fun onTextValueChanged(newValue: String) {
-            val authInfo = account.findAuthInfo()
-            if (authInfo != null) {
-                val newAuthInfo = authInfo.clone()
-                newAuthInfo.userid = newValue
-                core.removeAuthInfo(authInfo)
-                core.addAuthInfo(newAuthInfo)
-            } else {
-                Log.e("[Account Settings] Failed to find the matching auth info")
-            }
-        }
-    }
-    val userId = MutableLiveData<String>()
-
-    val passwordListener = object : SettingListenerStub() {
-        override fun onTextValueChanged(newValue: String) {
-            val authInfo = account.findAuthInfo()
-            if (authInfo != null) {
-                val newAuthInfo = authInfo.clone()
-                newAuthInfo.password = newValue
-                core.removeAuthInfo(authInfo)
-                core.addAuthInfo(newAuthInfo)
-            } else {
-                Log.w("[Account Settings] Failed to find the matching auth info")
-                val params = account.params
-                val identity = params.identityAddress
-                if (identity != null && identity.username != null) {
-                    val newAuthInfo = Factory.instance()
-                        .createAuthInfo(
-                            identity.username!!,
-                            userId.value,
-                            newValue,
-                            null,
-                            null,
-                            identity.domain
-                        )
-                    core.addAuthInfo(newAuthInfo)
-                } else {
-                    Log.e(
-                        "[Account Settings] Failed to find the user's identity, can't create a new auth info"
-                    )
-                }
-            }
-        }
-    }
-    val password = MutableLiveData<String>()
-
-    val domainListener = object : SettingListenerStub() {
-        override fun onTextValueChanged(newValue: String) {
-            val params = account.params.clone()
-            val identity = params.identityAddress
-            if (identity != null) {
-                val authInfo = account.findAuthInfo()
-                if (authInfo != null) {
-                    val newAuthInfo = authInfo.clone()
-                    newAuthInfo.domain = newValue
-                    core.removeAuthInfo(authInfo)
-                    core.addAuthInfo(newAuthInfo)
-                } else {
-                    Log.e("[Account Settings] Failed to find the matching auth info")
-                }
-
-                identity.domain = newValue
-                params.identityAddress = identity
-                account.params = params
-            } else {
-                Log.e("[Account Settings] Account doesn't have an identity yet")
-            }
-        }
-    }
-    val domain = MutableLiveData<String>()
-
-    val displayNameListener = object : SettingListenerStub() {
-        override fun onTextValueChanged(newValue: String) {
-            val params = account.params.clone()
-            val identity = params.identityAddress
-            if (identity != null) {
-                identity.displayName = newValue
-                params.identityAddress = identity
-                account.params = params
-            } else {
-                Log.e("[Account Settings] Account doesn't have an identity yet")
-            }
-        }
-    }
-    // displayName mutable is above
-
-    val disableListener = object : SettingListenerStub() {
-        override fun onBoolValueChanged(newValue: Boolean) {
-            val params = account.params.clone()
-            params.isRegisterEnabled = !newValue
-            account.params = params
-        }
-    }
-    val disable = MutableLiveData<Boolean>()
-
-    val isDefaultListener = object : SettingListenerStub() {
-        override fun onBoolValueChanged(newValue: Boolean) {
-            if (newValue) {
-                core.defaultAccount = account
-                accountDefaultEvent.value = Event(true)
-            }
-        }
-    }
-    // isDefault mutable is above
-
-    private fun deleteAccount(account: Account) {
-        val authInfo = account.findAuthInfo()
-        if (authInfo != null) {
-            Log.i("[Account Settings] Found auth info $authInfo, removing it.")
-            core.removeAuthInfo(authInfo)
-        } else {
-            Log.w("[Account Settings] Couldn't find matching auth info...")
-        }
-
-        core.removeAccount(account)
-        accountToDelete = null
-        accountRemovedEvent.value = Event(true)
-    }
-
-    val deleteAccountRequiredEvent: MutableLiveData<Event<Boolean>> by lazy {
-        MutableLiveData<Event<Boolean>>()
-    }
-    val deleteListener = object : SettingListenerStub() {
-        override fun onClicked() {
-            deleteAccountRequiredEvent.value = Event(true)
-        }
-    }
-
-    val pushNotificationListener = object : SettingListenerStub() {
-        override fun onBoolValueChanged(newValue: Boolean) {
-            val params = account.params.clone()
-            params.pushNotificationAllowed = newValue
-            account.params = params
-        }
-    }
-    val pushNotification = MutableLiveData<Boolean>()
-    val pushNotificationsAvailable = MutableLiveData<Boolean>()
-
-    val transportListener = object : SettingListenerStub() {
-        override fun onListValueChanged(position: Int) {
-            val params = account.params.clone()
-            params.transport = TransportType.fromInt(position)
-            account.params = params
-            proxy.value = account.params.serverAddress?.asStringUriOnly()
-        }
-    }
-    val transportIndex = MutableLiveData<Int>()
-    val transportLabels = MutableLiveData<ArrayList<String>>()
-
-    val proxyListener = object : SettingListenerStub() {
-        override fun onTextValueChanged(newValue: String) {
-            val params = account.params.clone()
-            val address = Factory.instance().createAddress(newValue)
-            if (address != null) {
-                params.serverAddress = address
-                account.params = params
-                transportIndex.value = account.params.transport.toInt()
-            } else {
-                Log.e("[Account Settings] Couldn't parse address: $newValue")
-            }
-        }
-    }
-    val proxy = MutableLiveData<String>()
-
-    val outboundProxyListener = object : SettingListenerStub() {
-        override fun onBoolValueChanged(newValue: Boolean) {
-            val params = account.params.clone()
-            params.isOutboundProxyEnabled = newValue
-            account.params = params
-        }
-    }
-    val outboundProxy = MutableLiveData<Boolean>()
-
-    val stunServerListener = object : SettingListenerStub() {
-        override fun onTextValueChanged(newValue: String) {
-            val params = account.params.clone()
-            val natPolicy = params.natPolicy
-            val newNatPolicy = natPolicy?.clone() ?: core.createNatPolicy()
-            newNatPolicy.stunServer = newValue
-            newNatPolicy.isStunEnabled = newValue.isNotEmpty()
-            params.natPolicy = newNatPolicy
-            account.params = params
-            stunServer.value = newValue
-        }
-    }
-    val stunServer = MutableLiveData<String>()
-
-    val iceListener = object : SettingListenerStub() {
-        override fun onBoolValueChanged(newValue: Boolean) {
-            val params = account.params.clone()
-            val natPolicy = params.natPolicy
-            val newNatPolicy = natPolicy?.clone() ?: core.createNatPolicy()
-            newNatPolicy.isIceEnabled = newValue
-            params.natPolicy = newNatPolicy
-            account.params = params
-        }
-    }
-    val ice = MutableLiveData<Boolean>()
-
-    val avpfListener = object : SettingListenerStub() {
-        override fun onBoolValueChanged(newValue: Boolean) {
-            val params = account.params.clone()
-            params.avpfMode = if (newValue) AVPFMode.Enabled else AVPFMode.Disabled
-            account.params = params
-        }
-    }
-    val avpf = MutableLiveData<Boolean>()
-
-    val avpfRrIntervalListener = object : SettingListenerStub() {
-        override fun onTextValueChanged(newValue: String) {
-            try {
-                val params = account.params.clone()
-                params.avpfRrInterval = newValue.toInt()
-                account.params = params
-            } catch (nfe: NumberFormatException) {
-                Log.e("[Account Settings] Failed to set AVPF RR interval ($newValue): $nfe")
-            }
-        }
-    }
-    val avpfRrInterval = MutableLiveData<Int>()
-
-    val expiresListener = object : SettingListenerStub() {
-        override fun onTextValueChanged(newValue: String) {
-            try {
-                val params = account.params.clone()
-                params.expires = newValue.toInt()
-                account.params = params
-            } catch (nfe: NumberFormatException) {
-                Log.e("[Account Settings] Failed to set expires ($newValue): $nfe")
-            }
-        }
-    }
-    val expires = MutableLiveData<Int>()
-
-    val prefixListener = object : SettingListenerStub() {
-        override fun onTextValueChanged(newValue: String) {
-            val params = account.params.clone()
-            params.internationalPrefix = newValue
-            account.params = params
-        }
-    }
-    val prefix = MutableLiveData<String>()
-
-    val dialPrefixListener = object : SettingListenerStub() {
-        override fun onBoolValueChanged(newValue: Boolean) {
-            val params = account.params.clone()
-            params.useInternationalPrefixForCallsAndChats = newValue
-            account.params = params
-        }
-    }
-    val dialPrefix = MutableLiveData<Boolean>()
-
-    val escapePlusListener = object : SettingListenerStub() {
-        override fun onBoolValueChanged(newValue: Boolean) {
-            val params = account.params.clone()
-            params.isDialEscapePlusEnabled = newValue
-            account.params = params
-        }
-    }
-    val escapePlus = MutableLiveData<Boolean>()
-
-    val linkPhoneNumberListener = object : SettingListenerStub() {
-        override fun onClicked() {
-            linkPhoneNumberEvent.value = Event(true)
-        }
-    }
-    val linkPhoneNumberEvent = MutableLiveData<Event<Boolean>>()
-    val hideLinkPhoneNumber = MutableLiveData<Boolean>()
-
-    val conferenceFactoryUriListener = object : SettingListenerStub() {
-        override fun onTextValueChanged(newValue: String) {
-            val params = account.params.clone()
-            Log.i(
-                "[Account Settings] Forcing conference factory on account ${params.identityAddress?.asString()} to value: $newValue"
-            )
-            params.conferenceFactoryUri = newValue
-            account.params = params
-        }
-    }
-    val conferenceFactoryUri = MutableLiveData<String>()
-
-    val audioVideoConferenceFactoryUriListener = object : SettingListenerStub() {
-        override fun onTextValueChanged(newValue: String) {
-            val params = account.params.clone()
-            val uri = coreContext.core.interpretUrl(newValue, false)
-            Log.i(
-                "[Account Settings] Forcing audio/video conference factory on account ${params.identityAddress?.asString()} to value: $newValue"
-            )
-            params.audioVideoConferenceFactoryAddress = uri
-            account.params = params
-        }
-    }
-    val audioVideoConferenceFactoryUri = MutableLiveData<String>()
-
-    val limeServerUrlListener = object : SettingListenerStub() {
-        override fun onTextValueChanged(newValue: String) {
-            val params = account.params.clone()
-            params.limeServerUrl = newValue
-            account.params = params
-        }
-    }
-    val limeServerUrl = MutableLiveData<String>()
-
-    val disableBundleModeListener = object : SettingListenerStub() {
-        override fun onBoolValueChanged(newValue: Boolean) {
-            val params = account.params.clone()
-            params.isRtpBundleEnabled = !newValue
-            account.params = params
-        }
-    }
-    val disableBundleMode = MutableLiveData<Boolean>()
-
-    init {
-        update()
-        account.addListener(listener)
-        initTransportList()
-    }
-
-    override fun onCleared() {
-        destroy()
-        super.onCleared()
-    }
-
-    fun destroy() {
-        accountsSettingsListener = object : SettingListenerStub() {}
-        account.removeListener(listener)
-    }
-
-    private fun update() {
-        isDefault.value = core.defaultAccount == account
-        val params = account.params
-        val identityAddress = params.identityAddress
-        if (identityAddress != null) {
-            displayName.value = identityAddress.displayName ?: ""
-            identity.value = identityAddress.asStringUriOnly()
-        }
-
-        iconResource.value = when (account.state) {
-            RegistrationState.Ok -> R.drawable.led_registered
-            RegistrationState.Failed -> R.drawable.led_error
-            RegistrationState.Progress, RegistrationState.Refreshing -> R.drawable.led_registration_in_progress
-            else -> R.drawable.led_not_registered
-        }
-        iconContentDescription.value = when (account.state) {
-            RegistrationState.Ok -> R.string.status_connected
-            RegistrationState.Progress, RegistrationState.Refreshing -> R.string.status_in_progress
-            RegistrationState.Failed -> R.string.status_error
-            else -> R.string.status_not_connected
-        }
-
-        userName.value = params.identityAddress?.username
-        userId.value = account.findAuthInfo()?.userid
-        domain.value = params.identityAddress?.domain
-        disable.value = !params.isRegisterEnabled
-        pushNotification.value = params.pushNotificationAllowed
-        pushNotificationsAvailable.value = LinphoneUtils.isPushNotificationAvailable()
-        proxy.value = params.serverAddress?.asStringUriOnly()
-        outboundProxy.value = params.isOutboundProxyEnabled
-        stunServer.value = params.natPolicy?.stunServer
-        ice.value = params.natPolicy?.isIceEnabled
-        avpf.value = params.avpfMode == AVPFMode.Enabled
-        avpfRrInterval.value = params.avpfRrInterval
-        expires.value = params.expires
-        prefix.value = params.internationalPrefix
-        dialPrefix.value = params.useInternationalPrefixForCallsAndChats
-        escapePlus.value = params.isDialEscapePlusEnabled
-
-        conferenceFactoryUri.value = params.conferenceFactoryUri
-        audioVideoConferenceFactoryUri.value = params.audioVideoConferenceFactoryAddress?.asStringUriOnly()
-        limeServerUrl.value = params.limeServerUrl
-
-        hideLinkPhoneNumber.value = corePreferences.hideLinkPhoneNumber || params.identityAddress?.domain != corePreferences.defaultDomain
-        disableBundleMode.value = !params.isRtpBundleEnabled
-    }
-
-    private fun initTransportList() {
-        val labels = arrayListOf<String>()
-
-        // Keep following in the same order as TransportType enum
-        labels.add(prefs.getString(R.string.account_settings_transport_udp))
-        labels.add(prefs.getString(R.string.account_settings_transport_tcp))
-        labels.add(prefs.getString(R.string.account_settings_transport_tls))
-        if (corePreferences.allowDtlsTransport) {
-            labels.add(prefs.getString(R.string.account_settings_transport_dtls))
-        }
-
-        transportLabels.value = labels
-        transportIndex.value = account.params.transport.toInt()
-    }
-
-    fun startDeleteAccount() {
-        Log.i(
-            "[Account Settings] Starting to delete account [${account.params.identityAddress?.asStringUriOnly()}]"
-        )
-        accountToDelete = account
-
-        val registered = account.state == RegistrationState.Ok
-        waitForUnregister.value = registered
-
-        if (core.defaultAccount == account) {
-            Log.i("[Account Settings] Account was default, let's look for a replacement")
-            for (accountIterator in core.accountList) {
-                if (account != accountIterator) {
-                    core.defaultAccount = accountIterator
-                    Log.i(
-                        "[Account Settings] New default account is [${accountIterator.params.identityAddress?.asStringUriOnly()}]"
-                    )
-                    break
-                }
-            }
-        }
-
-        val params = account.params.clone()
-        params.isRegisterEnabled = false
-        account.params = params
-
-        if (!registered) {
-            Log.w(
-                "[Account Settings] Account isn't registered, don't unregister before removing it"
-            )
-            deleteAccount(account)
-        } else {
-            Log.i(
-                "[Account Settings] Waiting for account registration to be cleared before removing it"
-            )
-        }
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/main/settings/viewmodels/AdvancedSettingsViewModel.kt b/app/src/main/java/org/linphone/activities/main/settings/viewmodels/AdvancedSettingsViewModel.kt
deleted file mode 100644
index 118666070..000000000
--- a/app/src/main/java/org/linphone/activities/main/settings/viewmodels/AdvancedSettingsViewModel.kt
+++ /dev/null
@@ -1,187 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.main.settings.viewmodels
-
-import androidx.lifecycle.MutableLiveData
-import org.linphone.LinphoneApplication.Companion.coreContext
-import org.linphone.LinphoneApplication.Companion.corePreferences
-import org.linphone.R
-import org.linphone.activities.main.settings.SettingListenerStub
-import org.linphone.activities.main.viewmodels.LogsUploadViewModel
-import org.linphone.core.CoreContext
-import org.linphone.core.Factory
-import org.linphone.core.LogLevel
-import org.linphone.utils.Event
-
-class AdvancedSettingsViewModel : LogsUploadViewModel() {
-    private val prefs = corePreferences
-    private val core = coreContext.core
-
-    val debugModeListener = object : SettingListenerStub() {
-        override fun onBoolValueChanged(newValue: Boolean) {
-            prefs.debugLogs = newValue
-            val logLevel = if (newValue) LogLevel.Message else LogLevel.Error
-            Factory.instance().loggingService.setLogLevel(logLevel)
-        }
-    }
-    val debugMode = MutableLiveData<Boolean>()
-
-    val logsServerUrlListener = object : SettingListenerStub() {
-        override fun onTextValueChanged(newValue: String) {
-            core.logCollectionUploadServerUrl = newValue
-        }
-    }
-    val logsServerUrl = MutableLiveData<String>()
-
-    val sendDebugLogsListener = object : SettingListenerStub() {
-        override fun onClicked() {
-            uploadLogs()
-        }
-    }
-
-    val resetDebugLogsListener = object : SettingListenerStub() {
-        override fun onClicked() {
-            resetLogs()
-        }
-    }
-
-    val backgroundModeListener = object : SettingListenerStub() {
-        override fun onBoolValueChanged(newValue: Boolean) {
-            prefs.keepServiceAlive = newValue
-
-            if (newValue) {
-                coreContext.notificationsManager.startForeground()
-            } else {
-                coreContext.notificationsManager.stopForegroundNotificationIfPossible()
-            }
-        }
-    }
-    val backgroundMode = MutableLiveData<Boolean>()
-    val backgroundModeEnabled = MutableLiveData<Boolean>()
-
-    val autoStartListener = object : SettingListenerStub() {
-        override fun onBoolValueChanged(newValue: Boolean) {
-            prefs.autoStart = newValue
-        }
-    }
-    val autoStart = MutableLiveData<Boolean>()
-
-    val darkModeListener = object : SettingListenerStub() {
-        override fun onListValueChanged(position: Int) {
-            darkModeIndex.value = position
-            val value = darkModeValues[position]
-            prefs.darkMode = value
-            setNightModeEvent.value = Event(value)
-        }
-    }
-    val darkModeIndex = MutableLiveData<Int>()
-    val darkModeLabels = MutableLiveData<ArrayList<String>>()
-    private val darkModeValues = arrayListOf(-1, 0, 1)
-    val setNightModeEvent = MutableLiveData<Event<Int>>()
-
-    val animationsListener = object : SettingListenerStub() {
-        override fun onBoolValueChanged(newValue: Boolean) {
-            prefs.enableAnimations = newValue
-        }
-    }
-    val animations = MutableLiveData<Boolean>()
-
-    val deviceNameListener = object : SettingListenerStub() {
-        override fun onTextValueChanged(newValue: String) {
-            prefs.deviceName = newValue
-        }
-    }
-    val deviceName = MutableLiveData<String>()
-
-    val remoteProvisioningUrlListener = object : SettingListenerStub() {
-        override fun onTextValueChanged(newValue: String) {
-            if (newValue.isEmpty()) {
-                core.provisioningUri = null
-            } else {
-                core.provisioningUri = newValue
-            }
-        }
-    }
-    val remoteProvisioningUrl = MutableLiveData<String>()
-
-    val vfsListener = object : SettingListenerStub() {
-        override fun onBoolValueChanged(newValue: Boolean) {
-            prefs.vfsEnabled = newValue
-            if (newValue) {
-                CoreContext.activateVFS()
-                // Don't do that when VFS is enabled
-                prefs.makePublicMediaFilesDownloaded = false
-            }
-        }
-    }
-    val vfs = MutableLiveData<Boolean>()
-
-    val disableSecureFragmentListener = object : SettingListenerStub() {
-        override fun onBoolValueChanged(newValue: Boolean) {
-            prefs.disableSecureMode = newValue
-        }
-    }
-    val disableSecureFragment = MutableLiveData<Boolean>()
-
-    val goToBatterySettingsListener = object : SettingListenerStub() {
-        override fun onClicked() {
-            goToBatterySettingsEvent.value = Event(true)
-        }
-    }
-    val goToBatterySettingsEvent = MutableLiveData<Event<Boolean>>()
-    val batterySettingsVisibility = MutableLiveData<Boolean>()
-
-    val goToPowerManagerSettingsListener = object : SettingListenerStub() {
-        override fun onClicked() {
-            goToPowerManagerSettingsEvent.value = Event(true)
-        }
-    }
-    val goToPowerManagerSettingsEvent = MutableLiveData<Event<Boolean>>()
-    val powerManagerSettingsVisibility = MutableLiveData<Boolean>()
-
-    val goToAndroidSettingsListener = object : SettingListenerStub() {
-        override fun onClicked() {
-            goToAndroidSettingsEvent.value = Event(true)
-        }
-    }
-    val goToAndroidSettingsEvent = MutableLiveData<Event<Boolean>>()
-
-    init {
-        debugMode.value = prefs.debugLogs
-        logsServerUrl.value = core.logCollectionUploadServerUrl
-        backgroundMode.value = prefs.keepServiceAlive
-        autoStart.value = prefs.autoStart
-
-        val labels = arrayListOf<String>()
-        labels.add(prefs.getString(R.string.advanced_settings_dark_mode_label_auto))
-        labels.add(prefs.getString(R.string.advanced_settings_dark_mode_label_no))
-        labels.add(prefs.getString(R.string.advanced_settings_dark_mode_label_yes))
-        darkModeLabels.value = labels
-        darkModeIndex.value = darkModeValues.indexOf(prefs.darkMode)
-
-        animations.value = prefs.enableAnimations
-        deviceName.value = prefs.deviceName
-        remoteProvisioningUrl.value = core.provisioningUri
-        vfs.value = prefs.vfsEnabled
-        disableSecureFragment.value = prefs.disableSecureMode
-
-        batterySettingsVisibility.value = true
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/main/settings/viewmodels/AudioSettingsViewModel.kt b/app/src/main/java/org/linphone/activities/main/settings/viewmodels/AudioSettingsViewModel.kt
deleted file mode 100644
index 9e7bc11ce..000000000
--- a/app/src/main/java/org/linphone/activities/main/settings/viewmodels/AudioSettingsViewModel.kt
+++ /dev/null
@@ -1,296 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.main.settings.viewmodels
-
-import androidx.databinding.ViewDataBinding
-import androidx.lifecycle.MutableLiveData
-import java.lang.NumberFormatException
-import org.linphone.R
-import org.linphone.activities.main.settings.SettingListenerStub
-import org.linphone.core.AudioDevice
-import org.linphone.core.Core
-import org.linphone.core.CoreListenerStub
-import org.linphone.core.EcCalibratorStatus
-import org.linphone.utils.Event
-import org.linphone.utils.PermissionHelper
-
-class AudioSettingsViewModel : GenericSettingsViewModel() {
-    val askAudioRecordPermissionForEchoCancellerCalibrationEvent: MutableLiveData<Event<Boolean>> by lazy {
-        MutableLiveData<Event<Boolean>>()
-    }
-    val askAudioRecordPermissionForEchoTesterEvent: MutableLiveData<Event<Boolean>> by lazy {
-        MutableLiveData<Event<Boolean>>()
-    }
-
-    val softwareEchoCancellerListener = object : SettingListenerStub() {
-        override fun onBoolValueChanged(newValue: Boolean) {
-            core.isEchoCancellationEnabled = newValue
-            if (!newValue) {
-                core.resetEchoCancellationCalibration()
-                softwareEchoCalibration.value = prefs.getString(
-                    R.string.audio_settings_echo_canceller_calibration_summary
-                )
-            }
-        }
-    }
-    val softwareEchoCanceller = MutableLiveData<Boolean>()
-    val listener = object : CoreListenerStub() {
-        override fun onEcCalibrationResult(core: Core, status: EcCalibratorStatus, delayMs: Int) {
-            if (status == EcCalibratorStatus.InProgress) return
-            echoCancellerCalibrationFinished(status, delayMs)
-        }
-    }
-
-    val softwareEchoCancellerCalibrationListener = object : SettingListenerStub() {
-        override fun onClicked() {
-            if (PermissionHelper.get().hasRecordAudioPermission()) {
-                startEchoCancellerCalibration()
-            } else {
-                askAudioRecordPermissionForEchoCancellerCalibrationEvent.value = Event(true)
-            }
-        }
-    }
-    val softwareEchoCalibration = MutableLiveData<String>()
-
-    val echoTesterListener = object : SettingListenerStub() {
-        override fun onClicked() {
-            if (PermissionHelper.get().hasRecordAudioPermission()) {
-                if (echoTesterIsRunning) {
-                    stopEchoTester()
-                } else {
-                    startEchoTester()
-                }
-            } else {
-                askAudioRecordPermissionForEchoTesterEvent.value = Event(true)
-            }
-        }
-    }
-    private var echoTesterIsRunning = false
-    val echoTesterStatus = MutableLiveData<String>()
-    val showEchoTester = MutableLiveData<Boolean>()
-
-    val adaptiveRateControlListener = object : SettingListenerStub() {
-        override fun onBoolValueChanged(newValue: Boolean) {
-            core.isAdaptiveRateControlEnabled = newValue
-        }
-    }
-    val adaptiveRateControl = MutableLiveData<Boolean>()
-
-    val inputAudioDeviceListener = object : SettingListenerStub() {
-        override fun onListValueChanged(position: Int) {
-            val values = inputAudioDeviceValues.value.orEmpty()
-            if (values.size > position) {
-                core.defaultInputAudioDevice = values[position]
-            }
-        }
-    }
-    val inputAudioDeviceIndex = MutableLiveData<Int>()
-    val inputAudioDeviceLabels = MutableLiveData<ArrayList<String>>()
-    private val inputAudioDeviceValues = MutableLiveData<ArrayList<AudioDevice>>()
-
-    val outputAudioDeviceListener = object : SettingListenerStub() {
-        override fun onListValueChanged(position: Int) {
-            val values = outputAudioDeviceValues.value.orEmpty()
-            if (values.size > position) {
-                core.defaultOutputAudioDevice = values[position]
-            }
-        }
-    }
-    val outputAudioDeviceIndex = MutableLiveData<Int>()
-    val outputAudioDeviceLabels = MutableLiveData<ArrayList<String>>()
-    private val outputAudioDeviceValues = MutableLiveData<ArrayList<AudioDevice>>()
-
-    val preferBluetoothDevicesListener = object : SettingListenerStub() {
-        override fun onBoolValueChanged(newValue: Boolean) {
-            prefs.routeAudioToBluetoothIfAvailable = newValue
-        }
-    }
-    val preferBluetoothDevices = MutableLiveData<Boolean>()
-
-    val codecBitrateListener = object : SettingListenerStub() {
-        override fun onListValueChanged(position: Int) {
-            for (payloadType in core.audioPayloadTypes) {
-                if (payloadType.isVbr) {
-                    payloadType.normalBitrate = codecBitrateValues[position]
-                }
-            }
-        }
-    }
-    val codecBitrateIndex = MutableLiveData<Int>()
-    val codecBitrateLabels = MutableLiveData<ArrayList<String>>()
-    private val codecBitrateValues = arrayListOf(10, 15, 20, 36, 64, 128)
-
-    val microphoneGainListener = object : SettingListenerStub() {
-        override fun onTextValueChanged(newValue: String) {
-            try {
-                core.micGainDb = newValue.toFloat()
-            } catch (_: NumberFormatException) {
-            }
-        }
-    }
-    val microphoneGain = MutableLiveData<Float>()
-
-    val playbackGainListener = object : SettingListenerStub() {
-        override fun onTextValueChanged(newValue: String) {
-            try {
-                core.playbackGainDb = newValue.toFloat()
-            } catch (_: NumberFormatException) {
-            }
-        }
-    }
-    val playbackGain = MutableLiveData<Float>()
-
-    val audioCodecs = MutableLiveData<ArrayList<ViewDataBinding>>()
-
-    init {
-        softwareEchoCanceller.value = core.isEchoCancellationEnabled
-        adaptiveRateControl.value = core.isAdaptiveRateControlEnabled
-        softwareEchoCalibration.value = if (core.echoCancellationCalibration > 0) {
-            prefs.getString(R.string.audio_settings_echo_cancellation_calibration_value).format(
-                core.echoCancellationCalibration
-            )
-        } else {
-            prefs.getString(R.string.audio_settings_echo_canceller_calibration_summary)
-        }
-        echoTesterStatus.value = prefs.getString(R.string.audio_settings_echo_tester_summary)
-        showEchoTester.value = prefs.debugLogs // Don't show echo tester unless debug mode is enabled, may confuse user over what it should be used for
-
-        preferBluetoothDevices.value = prefs.routeAudioToBluetoothIfAvailable
-        initInputAudioDevicesList()
-        initOutputAudioDevicesList()
-        initCodecBitrateList()
-        microphoneGain.value = core.micGainDb
-        playbackGain.value = core.playbackGainDb
-    }
-
-    fun startEchoCancellerCalibration() {
-        if (echoTesterIsRunning) {
-            stopEchoTester()
-        }
-
-        core.addListener(listener)
-        core.startEchoCancellerCalibration()
-        softwareEchoCalibration.value = prefs.getString(
-            R.string.audio_settings_echo_cancellation_calibration_started
-        )
-    }
-
-    fun echoCancellerCalibrationFinished(status: EcCalibratorStatus, delay: Int) {
-        core.removeListener(listener)
-
-        when (status) {
-            EcCalibratorStatus.DoneNoEcho -> {
-                softwareEchoCalibration.value = prefs.getString(
-                    R.string.audio_settings_echo_cancellation_calibration_no_echo
-                )
-                softwareEchoCanceller.value = false
-            }
-            EcCalibratorStatus.Done -> {
-                softwareEchoCalibration.value = prefs.getString(
-                    R.string.audio_settings_echo_cancellation_calibration_value
-                ).format(delay)
-                softwareEchoCanceller.value = true
-            }
-            EcCalibratorStatus.Failed -> {
-                softwareEchoCalibration.value = prefs.getString(
-                    R.string.audio_settings_echo_cancellation_calibration_failed
-                )
-            }
-            EcCalibratorStatus.InProgress -> { // We should never get here but still
-                softwareEchoCalibration.value = prefs.getString(
-                    R.string.audio_settings_echo_cancellation_calibration_started
-                )
-            }
-        }
-    }
-
-    fun startEchoTester() {
-        echoTesterIsRunning = true
-        echoTesterStatus.value = prefs.getString(
-            R.string.audio_settings_echo_tester_summary_is_running
-        )
-        core.startEchoTester(0)
-    }
-
-    fun stopEchoTester() {
-        echoTesterIsRunning = false
-        echoTesterStatus.value = prefs.getString(
-            R.string.audio_settings_echo_tester_summary_is_stopped
-        )
-        core.stopEchoTester()
-    }
-
-    private fun initInputAudioDevicesList() {
-        val labels = arrayListOf<String>()
-        val values = arrayListOf<AudioDevice>()
-        var index = 0
-        val default = core.defaultInputAudioDevice
-
-        for (audioDevice in core.extendedAudioDevices) {
-            if (audioDevice.hasCapability(AudioDevice.Capabilities.CapabilityRecord)) {
-                labels.add(audioDevice.id)
-                values.add(audioDevice)
-                if (audioDevice.id == default?.id) {
-                    inputAudioDeviceIndex.value = index
-                }
-                index += 1
-            }
-        }
-        inputAudioDeviceLabels.value = labels
-        inputAudioDeviceValues.value = values
-    }
-
-    private fun initOutputAudioDevicesList() {
-        val labels = arrayListOf<String>()
-        val values = arrayListOf<AudioDevice>()
-        var index = 0
-        val default = core.defaultOutputAudioDevice
-
-        for (audioDevice in core.extendedAudioDevices) {
-            if (audioDevice.hasCapability(AudioDevice.Capabilities.CapabilityPlay)) {
-                labels.add(audioDevice.id)
-                values.add(audioDevice)
-                if (audioDevice.id == default?.id) {
-                    outputAudioDeviceIndex.value = index
-                }
-                index += 1
-            }
-        }
-        outputAudioDeviceLabels.value = labels
-        outputAudioDeviceValues.value = values
-    }
-
-    private fun initCodecBitrateList() {
-        val labels = arrayListOf<String>()
-        for (value in codecBitrateValues) {
-            labels.add("$value kbits/s")
-        }
-        codecBitrateLabels.value = labels
-
-        var currentValue = 36
-        for (payloadType in core.audioPayloadTypes) {
-            if (payloadType.isVbr && payloadType.normalBitrate in codecBitrateValues) {
-                currentValue = payloadType.normalBitrate
-                break
-            }
-        }
-        codecBitrateIndex.value = codecBitrateValues.indexOf(currentValue)
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/main/settings/viewmodels/CallSettingsViewModel.kt b/app/src/main/java/org/linphone/activities/main/settings/viewmodels/CallSettingsViewModel.kt
deleted file mode 100644
index 45fb318f1..000000000
--- a/app/src/main/java/org/linphone/activities/main/settings/viewmodels/CallSettingsViewModel.kt
+++ /dev/null
@@ -1,317 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.main.settings.viewmodels
-
-import android.os.Vibrator
-import androidx.lifecycle.MutableLiveData
-import java.io.File
-import java.util.*
-import org.linphone.LinphoneApplication.Companion.coreContext
-import org.linphone.R
-import org.linphone.activities.main.settings.SettingListenerStub
-import org.linphone.core.MediaEncryption
-import org.linphone.core.tools.Log
-import org.linphone.mediastream.Version
-import org.linphone.telecom.TelecomHelper
-import org.linphone.utils.AppUtils
-import org.linphone.utils.Event
-
-class CallSettingsViewModel : GenericSettingsViewModel() {
-    val deviceRingtoneListener = object : SettingListenerStub() {
-        override fun onBoolValueChanged(newValue: Boolean) {
-            core.ring = if (newValue) null else prefs.defaultRingtonePath
-        }
-    }
-    val deviceRingtone = MutableLiveData<Boolean>()
-
-    val ringtoneListener = object : SettingListenerStub() {
-        override fun onListValueChanged(position: Int) {
-            if (position == 0) {
-                core.ring = null
-            } else {
-                core.ring = ringtoneValues[position]
-            }
-        }
-    }
-    val ringtoneIndex = MutableLiveData<Int>()
-    val ringtoneLabels = MutableLiveData<ArrayList<String>>()
-    private val ringtoneValues = arrayListOf<String>()
-    val showRingtonesList = MutableLiveData<Boolean>()
-
-    val vibrateOnIncomingCallListener = object : SettingListenerStub() {
-        override fun onBoolValueChanged(newValue: Boolean) {
-            core.isVibrationOnIncomingCallEnabled = newValue
-        }
-    }
-    val vibrateOnIncomingCall = MutableLiveData<Boolean>()
-    val canVibrate = MutableLiveData<Boolean>()
-
-    val encryptionListener = object : SettingListenerStub() {
-        override fun onListValueChanged(position: Int) {
-            core.mediaEncryption = MediaEncryption.fromInt(encryptionValues[position])
-            encryptionIndex.value = position
-            if (position == 0) {
-                encryptionMandatory.value = false
-            }
-        }
-    }
-    val encryptionIndex = MutableLiveData<Int>()
-    val encryptionLabels = MutableLiveData<ArrayList<String>>()
-    private val encryptionValues = arrayListOf<Int>()
-
-    val encryptionMandatoryListener = object : SettingListenerStub() {
-        override fun onBoolValueChanged(newValue: Boolean) {
-            core.isMediaEncryptionMandatory = newValue
-        }
-    }
-    val encryptionMandatory = MutableLiveData<Boolean>()
-
-    val useTelecomManagerListener = object : SettingListenerStub() {
-        override fun onBoolValueChanged(newValue: Boolean) {
-            if (newValue) {
-                enableTelecomManagerEvent.value = Event(true)
-            } else {
-                if (TelecomHelper.exists()) {
-                    Log.i("[Call Settings] Removing Telecom Manager account & destroying singleton")
-                    TelecomHelper.get().removeAccount()
-                    TelecomHelper.get().destroy()
-                    TelecomHelper.destroy()
-
-                    Log.w("[Call Settings] Disabling Telecom Manager auto-enable")
-                    prefs.manuallyDisabledTelecomManager = true
-                }
-                prefs.useTelecomManager = false
-            }
-        }
-    }
-    val useTelecomManager = MutableLiveData<Boolean>()
-    val enableTelecomManagerEvent: MutableLiveData<Event<Boolean>> by lazy {
-        MutableLiveData<Event<Boolean>>()
-    }
-    val api29OrHigher = MutableLiveData<Boolean>()
-
-    val overlayListener = object : SettingListenerStub() {
-        override fun onBoolValueChanged(newValue: Boolean) {
-            prefs.showCallOverlay = newValue
-        }
-    }
-    val overlay = MutableLiveData<Boolean>()
-
-    val systemWideOverlayListener = object : SettingListenerStub() {
-        override fun onBoolValueChanged(newValue: Boolean) {
-            if (newValue) systemWideOverlayEnabledEvent.value = Event(true)
-            prefs.systemWideCallOverlay = newValue
-        }
-    }
-    val systemWideOverlay = MutableLiveData<Boolean>()
-    val systemWideOverlayEnabledEvent = MutableLiveData<Event<Boolean>>()
-
-    val sipInfoDtmfListener = object : SettingListenerStub() {
-        override fun onBoolValueChanged(newValue: Boolean) {
-            core.useInfoForDtmf = newValue
-        }
-    }
-    val sipInfoDtmf = MutableLiveData<Boolean>()
-
-    val rfc2833DtmfListener = object : SettingListenerStub() {
-        override fun onBoolValueChanged(newValue: Boolean) {
-            core.useRfc2833ForDtmf = newValue
-        }
-    }
-    val rfc2833Dtmf = MutableLiveData<Boolean>()
-
-    val autoStartCallRecordingListener = object : SettingListenerStub() {
-        override fun onBoolValueChanged(newValue: Boolean) {
-            prefs.automaticallyStartCallRecording = newValue
-        }
-    }
-    val autoStartCallRecording = MutableLiveData<Boolean>()
-
-    val remoteCallRecordingListener = object : SettingListenerStub() {
-        override fun onBoolValueChanged(newValue: Boolean) {
-            core.isRecordAwareEnabled = newValue
-        }
-    }
-    val remoteCallRecording = MutableLiveData<Boolean>()
-
-    val autoStartListener = object : SettingListenerStub() {
-        override fun onBoolValueChanged(newValue: Boolean) {
-            prefs.callRightAway = newValue
-        }
-    }
-    val autoStart = MutableLiveData<Boolean>()
-
-    val autoAnswerListener = object : SettingListenerStub() {
-        override fun onBoolValueChanged(newValue: Boolean) {
-            prefs.autoAnswerEnabled = newValue
-        }
-    }
-    val autoAnswer = MutableLiveData<Boolean>()
-
-    val autoAnswerDelayListener = object : SettingListenerStub() {
-        override fun onTextValueChanged(newValue: String) {
-            try {
-                prefs.autoAnswerDelay = newValue.toInt()
-            } catch (_: NumberFormatException) {
-            }
-        }
-    }
-    val autoAnswerDelay = MutableLiveData<Int>()
-
-    val incomingTimeoutListener = object : SettingListenerStub() {
-        override fun onTextValueChanged(newValue: String) {
-            try {
-                core.incTimeout = newValue.toInt()
-            } catch (_: NumberFormatException) {
-            }
-        }
-    }
-    val incomingTimeout = MutableLiveData<Int>()
-
-    val voiceMailUriListener = object : SettingListenerStub() {
-        override fun onTextValueChanged(newValue: String) {
-            voiceMailUri.value = newValue
-            prefs.voiceMailUri = newValue
-        }
-    }
-    val voiceMailUri = MutableLiveData<String>()
-
-    val redirectToVoiceMailIncomingDeclinedCallsListener = object : SettingListenerStub() {
-        override fun onBoolValueChanged(newValue: Boolean) {
-            prefs.redirectDeclinedCallToVoiceMail = newValue
-        }
-    }
-    val redirectToVoiceMailIncomingDeclinedCalls = MutableLiveData<Boolean>()
-
-    val acceptEarlyMediaListener = object : SettingListenerStub() {
-        override fun onBoolValueChanged(newValue: Boolean) {
-            prefs.acceptEarlyMedia = newValue
-        }
-    }
-    val acceptEarlyMedia = MutableLiveData<Boolean>()
-
-    val ringDuringEarlyMediaListener = object : SettingListenerStub() {
-        override fun onBoolValueChanged(newValue: Boolean) {
-            core.ringDuringIncomingEarlyMedia = newValue
-        }
-    }
-    val ringDuringEarlyMedia = MutableLiveData<Boolean>()
-
-    val pauseCallsWhenAudioFocusIsLostListener = object : SettingListenerStub() {
-        override fun onBoolValueChanged(newValue: Boolean) {
-            prefs.pauseCallsWhenAudioFocusIsLost = newValue
-        }
-    }
-
-    val pauseCallsWhenAudioFocusIsLost = MutableLiveData<Boolean>()
-
-    val goToAndroidNotificationSettingsListener = object : SettingListenerStub() {
-        override fun onClicked() {
-            goToAndroidNotificationSettingsEvent.value = Event(true)
-        }
-    }
-    val goToAndroidNotificationSettingsEvent = MutableLiveData<Event<Boolean>>()
-
-    init {
-        initRingtonesList()
-        deviceRingtone.value = core.ring == null
-        showRingtonesList.value = prefs.showAllRingtones
-
-        vibrateOnIncomingCall.value = core.isVibrationOnIncomingCallEnabled
-        val vibrator = coreContext.context.getSystemService(Vibrator::class.java)
-        canVibrate.value = vibrator.hasVibrator()
-        if (canVibrate.value == false) {
-            Log.w("[Call Settings] Device doesn't seem to have a vibrator, hiding related setting")
-        }
-
-        initEncryptionList()
-        encryptionMandatory.value = core.isMediaEncryptionMandatory
-
-        useTelecomManager.value = prefs.useTelecomManager
-        api29OrHigher.value = Version.sdkAboveOrEqual(Version.API29_ANDROID_10)
-
-        overlay.value = prefs.showCallOverlay
-        systemWideOverlay.value = prefs.systemWideCallOverlay
-        sipInfoDtmf.value = core.useInfoForDtmf
-        rfc2833Dtmf.value = core.useRfc2833ForDtmf
-        autoStartCallRecording.value = prefs.automaticallyStartCallRecording
-        remoteCallRecording.value = core.isRecordAwareEnabled
-        autoStart.value = prefs.callRightAway
-        autoAnswer.value = prefs.autoAnswerEnabled
-        autoAnswerDelay.value = prefs.autoAnswerDelay
-        incomingTimeout.value = core.incTimeout
-        voiceMailUri.value = prefs.voiceMailUri
-        redirectToVoiceMailIncomingDeclinedCalls.value = prefs.redirectDeclinedCallToVoiceMail
-        acceptEarlyMedia.value = prefs.acceptEarlyMedia
-        ringDuringEarlyMedia.value = core.ringDuringIncomingEarlyMedia
-        pauseCallsWhenAudioFocusIsLost.value = prefs.pauseCallsWhenAudioFocusIsLost
-    }
-
-    private fun initRingtonesList() {
-        val labels = arrayListOf<String>()
-        labels.add(AppUtils.getString(R.string.call_settings_device_ringtone_title))
-        ringtoneValues.add("")
-
-        val directory = File(prefs.ringtonesPath)
-        val files = directory.listFiles()
-        for (ringtone in files.orEmpty()) {
-            if (ringtone.absolutePath.endsWith(".mkv")) {
-                val name = ringtone.name
-                    .substringBefore(".")
-                    .replace("_", " ")
-                    .capitalize(Locale.getDefault())
-                labels.add(name)
-                ringtoneValues.add(ringtone.absolutePath)
-            }
-        }
-
-        ringtoneLabels.value = labels
-        ringtoneIndex.value = if (core.ring == null) 0 else ringtoneValues.indexOf(core.ring)
-    }
-
-    private fun initEncryptionList() {
-        val labels = arrayListOf<String>()
-
-        labels.add(prefs.getString(R.string.call_settings_media_encryption_none))
-        encryptionValues.add(MediaEncryption.None.toInt())
-
-        if (core.mediaEncryptionSupported(MediaEncryption.SRTP)) {
-            labels.add(prefs.getString(R.string.call_settings_media_encryption_srtp))
-            encryptionValues.add(MediaEncryption.SRTP.toInt())
-        }
-        if (core.mediaEncryptionSupported(MediaEncryption.ZRTP)) {
-            if (core.postQuantumAvailable) {
-                labels.add(
-                    prefs.getString(R.string.call_settings_media_encryption_zrtp_post_quantum)
-                )
-            } else {
-                labels.add(prefs.getString(R.string.call_settings_media_encryption_zrtp))
-            }
-            encryptionValues.add(MediaEncryption.ZRTP.toInt())
-        }
-        if (core.mediaEncryptionSupported(MediaEncryption.DTLS)) {
-            labels.add(prefs.getString(R.string.call_settings_media_encryption_dtls))
-            encryptionValues.add(MediaEncryption.DTLS.toInt())
-        }
-
-        encryptionLabels.value = labels
-        encryptionIndex.value = encryptionValues.indexOf(core.mediaEncryption.toInt())
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/main/settings/viewmodels/ChatSettingsViewModel.kt b/app/src/main/java/org/linphone/activities/main/settings/viewmodels/ChatSettingsViewModel.kt
deleted file mode 100644
index d926b7b45..000000000
--- a/app/src/main/java/org/linphone/activities/main/settings/viewmodels/ChatSettingsViewModel.kt
+++ /dev/null
@@ -1,173 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.main.settings.viewmodels
-
-import androidx.lifecycle.MutableLiveData
-import java.lang.NumberFormatException
-import org.linphone.R
-import org.linphone.activities.main.settings.SettingListenerStub
-import org.linphone.utils.Event
-
-class ChatSettingsViewModel : GenericSettingsViewModel() {
-    val markAsReadNotifDismissalListener = object : SettingListenerStub() {
-        override fun onBoolValueChanged(newValue: Boolean) {
-            prefs.markAsReadUponChatMessageNotificationDismissal = newValue
-        }
-    }
-    val markAsReadNotifDismissal = MutableLiveData<Boolean>()
-
-    val fileSharingUrlListener = object : SettingListenerStub() {
-        override fun onTextValueChanged(newValue: String) {
-            core.fileTransferServer = newValue
-        }
-    }
-    val fileSharingUrl = MutableLiveData<String>()
-
-    val autoDownloadListener = object : SettingListenerStub() {
-        override fun onListValueChanged(position: Int) {
-            val maxSize = when (position) {
-                0 -> -1
-                1 -> 0
-                else -> 10000000
-            }
-            core.maxSizeForAutoDownloadIncomingFiles = maxSize
-            autoDownloadMaxSize.value = maxSize
-            updateAutoDownloadIndexFromMaxSize(maxSize)
-        }
-    }
-    val autoDownloadIndex = MutableLiveData<Int>()
-    val autoDownloadLabels = MutableLiveData<ArrayList<String>>()
-
-    val autoDownloadMaxSizeListener = object : SettingListenerStub() {
-        override fun onTextValueChanged(newValue: String) {
-            try {
-                val maxSize = newValue.toInt()
-                core.maxSizeForAutoDownloadIncomingFiles = maxSize
-                updateAutoDownloadIndexFromMaxSize(maxSize)
-            } catch (_: NumberFormatException) {
-            }
-        }
-    }
-    val autoDownloadMaxSize = MutableLiveData<Int>()
-
-    val autoDownloadVoiceRecordingsListener = object : SettingListenerStub() {
-        override fun onBoolValueChanged(newValue: Boolean) {
-            core.isAutoDownloadVoiceRecordingsEnabled = newValue
-            autoDownloadVoiceRecordings.value = newValue
-        }
-    }
-    val autoDownloadVoiceRecordings = MutableLiveData<Boolean>()
-
-    val downloadedMediaPublicListener = object : SettingListenerStub() {
-        override fun onBoolValueChanged(newValue: Boolean) {
-            prefs.makePublicMediaFilesDownloaded = newValue
-            downloadedMediaPublic.value = newValue
-        }
-    }
-    val downloadedMediaPublic = MutableLiveData<Boolean>()
-
-    val hideNotificationContentListener = object : SettingListenerStub() {
-        override fun onBoolValueChanged(newValue: Boolean) {
-            prefs.hideChatMessageContentInNotification = newValue
-            hideNotificationContent.value = newValue
-        }
-    }
-    val hideNotificationContent = MutableLiveData<Boolean>()
-
-    val useInAppFileViewerListener = object : SettingListenerStub() {
-        override fun onBoolValueChanged(newValue: Boolean) {
-            prefs.useInAppFileViewerForNonEncryptedFiles = newValue
-            useInAppFileViewer.value = newValue
-        }
-    }
-    val useInAppFileViewer = MutableLiveData<Boolean>()
-
-    val launcherShortcutsListener = object : SettingListenerStub() {
-        override fun onBoolValueChanged(newValue: Boolean) {
-            prefs.chatRoomShortcuts = newValue
-            launcherShortcutsEvent.value = Event(newValue)
-        }
-    }
-    val launcherShortcuts = MutableLiveData<Boolean>()
-    val launcherShortcutsEvent = MutableLiveData<Event<Boolean>>()
-
-    val hideEmptyRoomsListener = object : SettingListenerStub() {
-        override fun onBoolValueChanged(newValue: Boolean) {
-            prefs.hideEmptyRooms = newValue
-            reloadChatRoomsEvent.value = Event(true)
-        }
-    }
-    val hideEmptyRooms = MutableLiveData<Boolean>()
-
-    val hideRoomsRemovedProxiesListener = object : SettingListenerStub() {
-        override fun onBoolValueChanged(newValue: Boolean) {
-            prefs.hideRoomsFromRemovedProxies = newValue
-            reloadChatRoomsEvent.value = Event(true)
-        }
-    }
-    val hideRoomsRemovedProxies = MutableLiveData<Boolean>()
-
-    val goToAndroidNotificationSettingsListener = object : SettingListenerStub() {
-        override fun onClicked() {
-            goToAndroidNotificationSettingsEvent.value = Event(true)
-        }
-    }
-    val goToAndroidNotificationSettingsEvent = MutableLiveData<Event<Boolean>>()
-
-    val vfs = MutableLiveData<Boolean>()
-
-    val reloadChatRoomsEvent: MutableLiveData<Event<Boolean>> by lazy {
-        MutableLiveData<Event<Boolean>>()
-    }
-
-    init {
-        markAsReadNotifDismissal.value = prefs.markAsReadUponChatMessageNotificationDismissal
-        downloadedMediaPublic.value = prefs.makePublicMediaFilesDownloaded && !prefs.vfsEnabled
-        useInAppFileViewer.value = prefs.useInAppFileViewerForNonEncryptedFiles || prefs.vfsEnabled
-        hideNotificationContent.value = prefs.hideChatMessageContentInNotification
-        initAutoDownloadList()
-        autoDownloadVoiceRecordings.value = core.isAutoDownloadVoiceRecordingsEnabled
-        launcherShortcuts.value = prefs.chatRoomShortcuts
-        hideEmptyRooms.value = prefs.hideEmptyRooms
-        hideRoomsRemovedProxies.value = prefs.hideRoomsFromRemovedProxies
-        fileSharingUrl.value = core.fileTransferServer
-        vfs.value = prefs.vfsEnabled
-    }
-
-    private fun initAutoDownloadList() {
-        val labels = arrayListOf<String>()
-        labels.add(prefs.getString(R.string.chat_settings_auto_download_never))
-        labels.add(prefs.getString(R.string.chat_settings_auto_download_always))
-        labels.add(prefs.getString(R.string.chat_settings_auto_download_under_size))
-        autoDownloadLabels.value = labels
-
-        val currentValue = core.maxSizeForAutoDownloadIncomingFiles
-        autoDownloadMaxSize.value = currentValue
-        updateAutoDownloadIndexFromMaxSize(currentValue)
-    }
-
-    private fun updateAutoDownloadIndexFromMaxSize(maxSize: Int) {
-        autoDownloadIndex.value = when (maxSize) {
-            -1 -> 0
-            0 -> 1
-            else -> 2
-        }
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/main/settings/viewmodels/ConferencesSettingsViewModel.kt b/app/src/main/java/org/linphone/activities/main/settings/viewmodels/ConferencesSettingsViewModel.kt
deleted file mode 100644
index 0fadbee7f..000000000
--- a/app/src/main/java/org/linphone/activities/main/settings/viewmodels/ConferencesSettingsViewModel.kt
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright (c) 2010-2022 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.main.settings.viewmodels
-
-import androidx.lifecycle.MutableLiveData
-import org.linphone.R
-import org.linphone.activities.main.settings.SettingListenerStub
-import org.linphone.core.Conference.Layout
-
-class ConferencesSettingsViewModel : GenericSettingsViewModel() {
-    val layoutListener = object : SettingListenerStub() {
-        override fun onListValueChanged(position: Int) {
-            core.defaultConferenceLayout = Layout.fromInt(layoutValues[position])
-            layoutIndex.value = position
-        }
-    }
-    val layoutIndex = MutableLiveData<Int>()
-    val layoutLabels = MutableLiveData<ArrayList<String>>()
-    private val layoutValues = arrayListOf<Int>()
-
-    val enableBroadcastListener = object : SettingListenerStub() {
-        override fun onBoolValueChanged(newValue: Boolean) {
-            prefs.disableBroadcastConference = !newValue
-        }
-    }
-    val enableBroadcast = MutableLiveData<Boolean>()
-
-    init {
-        initLayoutsList()
-        enableBroadcast.value = !prefs.disableBroadcastConference
-    }
-
-    private fun initLayoutsList() {
-        val labels = arrayListOf<String>()
-
-        labels.add(prefs.getString(R.string.conference_display_mode_active_speaker))
-        layoutValues.add(Layout.ActiveSpeaker.toInt())
-
-        labels.add(prefs.getString(R.string.conference_display_mode_mosaic))
-        layoutValues.add(Layout.Grid.toInt())
-
-        layoutLabels.value = labels
-        layoutIndex.value = layoutValues.indexOf(core.defaultConferenceLayout.toInt())
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/main/settings/viewmodels/ContactsSettingsViewModel.kt b/app/src/main/java/org/linphone/activities/main/settings/viewmodels/ContactsSettingsViewModel.kt
deleted file mode 100644
index 68847e3fb..000000000
--- a/app/src/main/java/org/linphone/activities/main/settings/viewmodels/ContactsSettingsViewModel.kt
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.main.settings.viewmodels
-
-import androidx.lifecycle.MutableLiveData
-import org.linphone.LinphoneApplication.Companion.coreContext
-import org.linphone.activities.main.settings.SettingListenerStub
-import org.linphone.core.ConsolidatedPresence
-import org.linphone.core.tools.Log
-import org.linphone.utils.Event
-import org.linphone.utils.PermissionHelper
-
-class ContactsSettingsViewModel : GenericSettingsViewModel() {
-    val askWriteContactsPermissionForPresenceStorageEvent: MutableLiveData<Event<Boolean>> by lazy {
-        MutableLiveData<Event<Boolean>>()
-    }
-
-    val readContactsPermissionGranted = MutableLiveData<Boolean>()
-
-    val friendListSubscribeListener = object : SettingListenerStub() {
-        override fun onBoolValueChanged(newValue: Boolean) {
-            core.isFriendListSubscriptionEnabled = newValue
-        }
-    }
-    val friendListSubscribe = MutableLiveData<Boolean>()
-    val rlsAddressAvailable = MutableLiveData<Boolean>()
-
-    val publishPresenceListener = object : SettingListenerStub() {
-        override fun onBoolValueChanged(newValue: Boolean) {
-            prefs.publishPresence = newValue
-
-            if (newValue) {
-                // Publish online presence when enabling setting
-                Log.i(
-                    "[Contacts Settings] Presence has been enabled, PUBLISHING presence as Online"
-                )
-                core.consolidatedPresence = ConsolidatedPresence.Online
-            } else {
-                // Unpublish presence when disabling setting
-                Log.i("[Contacts Settings] Presence has been disabled, un-PUBLISHING presence info")
-                core.consolidatedPresence = ConsolidatedPresence.Offline
-            }
-
-            publishPresenceToggledEvent.value = Event(true)
-        }
-    }
-    val publishPresence = MutableLiveData<Boolean>()
-    val publishPresenceToggledEvent: MutableLiveData<Event<Boolean>> by lazy {
-        MutableLiveData<Event<Boolean>>()
-    }
-
-    val showNewContactAccountDialogListener = object : SettingListenerStub() {
-        override fun onBoolValueChanged(newValue: Boolean) {
-            prefs.showNewContactAccountDialog = newValue
-        }
-    }
-    val showNewContactAccountDialog = MutableLiveData<Boolean>()
-
-    val nativePresenceListener = object : SettingListenerStub() {
-        override fun onBoolValueChanged(newValue: Boolean) {
-            if (newValue) {
-                if (PermissionHelper.get().hasWriteContactsPermission()) {
-                    prefs.storePresenceInNativeContact = true
-                } else {
-                    askWriteContactsPermissionForPresenceStorageEvent.value = Event(true)
-                }
-            } else {
-                prefs.storePresenceInNativeContact = false
-            }
-        }
-    }
-    val nativePresence = MutableLiveData<Boolean>()
-
-    val showOrganizationListener = object : SettingListenerStub() {
-        override fun onBoolValueChanged(newValue: Boolean) {
-            prefs.displayOrganization = newValue
-        }
-    }
-    val showOrganization = MutableLiveData<Boolean>()
-
-    val launcherShortcutsListener = object : SettingListenerStub() {
-        override fun onBoolValueChanged(newValue: Boolean) {
-            prefs.contactsShortcuts = newValue
-            launcherShortcutsEvent.value = Event(newValue)
-        }
-    }
-    val launcherShortcuts = MutableLiveData<Boolean>()
-    val launcherShortcutsEvent = MutableLiveData<Event<Boolean>>()
-
-    val ldapAvailable = MutableLiveData<Boolean>()
-
-    val ldapConfigurations = MutableLiveData<ArrayList<LdapSettingsViewModel>>()
-
-    lateinit var ldapNewSettingsListener: SettingListenerStub
-    val ldapSettingsClickedEvent: MutableLiveData<Event<Int>> by lazy {
-        MutableLiveData<Event<Int>>()
-    }
-    private var ldapSettingsListener = object : SettingListenerStub() {
-        override fun onAccountClicked(identity: String) {
-            ldapSettingsClickedEvent.value = Event(identity.toInt())
-        }
-    }
-
-    init {
-        readContactsPermissionGranted.value = PermissionHelper.get().hasReadContactsPermission()
-
-        friendListSubscribe.value = core.isFriendListSubscriptionEnabled
-        rlsAddressAvailable.value = !core.config.getString("sip", "rls_uri", "").isNullOrEmpty()
-        publishPresence.value = prefs.publishPresence
-
-        showNewContactAccountDialog.value = prefs.showNewContactAccountDialog
-        nativePresence.value = prefs.storePresenceInNativeContact
-        showOrganization.value = prefs.displayOrganization
-        launcherShortcuts.value = prefs.contactsShortcuts
-
-        ldapAvailable.value = core.ldapAvailable()
-        ldapConfigurations.value = arrayListOf()
-
-        updateLdapConfigurationsList()
-    }
-
-    fun updateLdapConfigurationsList() {
-        val list = arrayListOf<LdapSettingsViewModel>()
-        var index = 0
-        for (ldap in coreContext.core.ldapList) {
-            val viewModel = LdapSettingsViewModel(ldap, index.toString())
-            viewModel.ldapSettingsListener = ldapSettingsListener
-            list.add(viewModel)
-            index += 1
-        }
-
-        ldapConfigurations.value = list
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/main/settings/viewmodels/GenericSettingsViewModel.kt b/app/src/main/java/org/linphone/activities/main/settings/viewmodels/GenericSettingsViewModel.kt
deleted file mode 100644
index 1313bbd40..000000000
--- a/app/src/main/java/org/linphone/activities/main/settings/viewmodels/GenericSettingsViewModel.kt
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.main.settings.viewmodels
-
-import androidx.lifecycle.ViewModel
-import org.linphone.LinphoneApplication.Companion.coreContext
-import org.linphone.LinphoneApplication.Companion.corePreferences
-
-abstract class GenericSettingsViewModel : ViewModel() {
-    protected val prefs = corePreferences
-    protected val core = coreContext.core
-}
diff --git a/app/src/main/java/org/linphone/activities/main/settings/viewmodels/LdapSettingsViewModel.kt b/app/src/main/java/org/linphone/activities/main/settings/viewmodels/LdapSettingsViewModel.kt
deleted file mode 100644
index b2fa74fbf..000000000
--- a/app/src/main/java/org/linphone/activities/main/settings/viewmodels/LdapSettingsViewModel.kt
+++ /dev/null
@@ -1,297 +0,0 @@
-/*
- * Copyright (c) 2010-2022 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.main.settings.viewmodels
-
-import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.ViewModel
-import androidx.lifecycle.ViewModelProvider
-import java.lang.NumberFormatException
-import org.linphone.LinphoneApplication.Companion.coreContext
-import org.linphone.R
-import org.linphone.activities.main.settings.SettingListenerStub
-import org.linphone.core.Ldap
-import org.linphone.core.tools.Log
-import org.linphone.utils.Event
-
-class LdapSettingsViewModelFactory(private val index: Int) :
-    ViewModelProvider.NewInstanceFactory() {
-
-    @Suppress("UNCHECKED_CAST")
-    override fun <T : ViewModel> create(modelClass: Class<T>): T {
-        if (index >= 0 && index <= coreContext.core.ldapList.size) {
-            val ldap = coreContext.core.ldapList[index]
-            return LdapSettingsViewModel(ldap, index.toString()) as T
-        }
-
-        val ldapParams = coreContext.core.createLdapParams()
-        val ldap = coreContext.core.createLdapWithParams(ldapParams)
-        return LdapSettingsViewModel(ldap, "-1") as T
-    }
-}
-
-class LdapSettingsViewModel(private val ldap: Ldap, val index: String) : GenericSettingsViewModel() {
-    lateinit var ldapSettingsListener: SettingListenerStub
-
-    val ldapConfigDeletedEvent: MutableLiveData<Event<Boolean>> by lazy {
-        MutableLiveData<Event<Boolean>>()
-    }
-
-    val ldapEnableListener = object : SettingListenerStub() {
-        override fun onBoolValueChanged(newValue: Boolean) {
-            val params = ldap.params.clone()
-            params.enabled = newValue
-            ldap.params = params
-        }
-    }
-    val ldapEnable = MutableLiveData<Boolean>()
-
-    val deleteListener = object : SettingListenerStub() {
-        override fun onClicked() {
-            coreContext.core.removeLdap(ldap)
-            ldapConfigDeletedEvent.value = Event(true)
-        }
-    }
-
-    val ldapServerListener = object : SettingListenerStub() {
-        override fun onTextValueChanged(newValue: String) {
-            val params = ldap.params.clone()
-            params.server = newValue
-            ldap.params = params
-        }
-    }
-    val ldapServer = MutableLiveData<String>()
-
-    val ldapBindDnListener = object : SettingListenerStub() {
-        override fun onTextValueChanged(newValue: String) {
-            val params = ldap.params.clone()
-            params.bindDn = newValue
-            ldap.params = params
-        }
-    }
-    val ldapBindDn = MutableLiveData<String>()
-
-    val ldapPasswordListener = object : SettingListenerStub() {
-        override fun onTextValueChanged(newValue: String) {
-            val params = ldap.params.clone()
-            params.password = newValue
-            ldap.params = params
-        }
-    }
-    val ldapPassword = MutableLiveData<String>()
-
-    val ldapAuthMethodListener = object : SettingListenerStub() {
-        override fun onListValueChanged(position: Int) {
-            val params = ldap.params.clone()
-            params.authMethod = Ldap.AuthMethod.fromInt(ldapAuthMethodValues[position])
-            ldap.params = params
-            ldapAuthMethodIndex.value = position
-        }
-    }
-    val ldapAuthMethodIndex = MutableLiveData<Int>()
-    val ldapAuthMethodLabels = MutableLiveData<ArrayList<String>>()
-    private val ldapAuthMethodValues = arrayListOf<Int>()
-
-    val ldapTlsListener = object : SettingListenerStub() {
-        override fun onBoolValueChanged(newValue: Boolean) {
-            val params = ldap.params.clone()
-            params.isTlsEnabled = newValue
-            ldap.params = params
-        }
-    }
-    val ldapTls = MutableLiveData<Boolean>()
-
-    val ldapCertCheckListener = object : SettingListenerStub() {
-        override fun onListValueChanged(position: Int) {
-            val params = ldap.params.clone()
-            params.serverCertificatesVerificationMode = Ldap.CertVerificationMode.fromInt(
-                ldapCertCheckValues[position]
-            )
-            ldap.params = params
-            ldapCertCheckIndex.value = position
-        }
-    }
-    val ldapCertCheckIndex = MutableLiveData<Int>()
-    val ldapCertCheckLabels = MutableLiveData<ArrayList<String>>()
-    private val ldapCertCheckValues = arrayListOf<Int>()
-
-    val ldapSearchBaseListener = object : SettingListenerStub() {
-        override fun onTextValueChanged(newValue: String) {
-            val params = ldap.params.clone()
-            params.baseObject = newValue
-            ldap.params = params
-        }
-    }
-    val ldapSearchBase = MutableLiveData<String>()
-
-    val ldapSearchFilterListener = object : SettingListenerStub() {
-        override fun onTextValueChanged(newValue: String) {
-            val params = ldap.params.clone()
-            params.filter = newValue
-            ldap.params = params
-        }
-    }
-    val ldapSearchFilter = MutableLiveData<String>()
-
-    val ldapSearchMaxResultsListener = object : SettingListenerStub() {
-        override fun onTextValueChanged(newValue: String) {
-            try {
-                val intValue = newValue.toInt()
-                val params = ldap.params.clone()
-                params.maxResults = intValue
-                ldap.params = params
-            } catch (nfe: NumberFormatException) {
-                Log.e("[LDAP Settings] Failed to set max results ($newValue): $nfe")
-            }
-        }
-    }
-    val ldapSearchMaxResults = MutableLiveData<Int>()
-
-    val ldapSearchTimeoutListener = object : SettingListenerStub() {
-        override fun onTextValueChanged(newValue: String) {
-            try {
-                val intValue = newValue.toInt()
-                val params = ldap.params.clone()
-                params.timeout = intValue
-                ldap.params = params
-            } catch (nfe: NumberFormatException) {
-                Log.e("[LDAP Settings] Failed to set timeout ($newValue): $nfe")
-            }
-        }
-    }
-    val ldapSearchTimeout = MutableLiveData<Int>()
-
-    val ldapRequestDelayListener = object : SettingListenerStub() {
-        override fun onTextValueChanged(newValue: String) {
-            try {
-                val intValue = newValue.toInt()
-                val params = ldap.params.clone()
-                params.delay = intValue
-                ldap.params = params
-            } catch (nfe: NumberFormatException) {
-                Log.e("[LDAP Settings] Failed to set request delay ($newValue): $nfe")
-            }
-        }
-    }
-    val ldapRequestDelay = MutableLiveData<Int>()
-
-    val ldapMinimumCharactersListener = object : SettingListenerStub() {
-        override fun onTextValueChanged(newValue: String) {
-            try {
-                val intValue = newValue.toInt()
-                val params = ldap.params.clone()
-                params.minChars = intValue
-                ldap.params = params
-            } catch (nfe: NumberFormatException) {
-                Log.e("[LDAP Settings] Failed to set minimum characters ($newValue): $nfe")
-            }
-        }
-    }
-    val ldapMinimumCharacters = MutableLiveData<Int>()
-
-    val ldapNameAttributeListener = object : SettingListenerStub() {
-        override fun onTextValueChanged(newValue: String) {
-            val params = ldap.params.clone()
-            params.nameAttribute = newValue
-            ldap.params = params
-        }
-    }
-    val ldapNameAttribute = MutableLiveData<String>()
-
-    val ldapSipAttributeListener = object : SettingListenerStub() {
-        override fun onTextValueChanged(newValue: String) {
-            val params = ldap.params.clone()
-            params.sipAttribute = newValue
-            ldap.params = params
-        }
-    }
-    val ldapSipAttribute = MutableLiveData<String>()
-
-    val ldapSipDomainListener = object : SettingListenerStub() {
-        override fun onTextValueChanged(newValue: String) {
-            val params = ldap.params.clone()
-            params.sipDomain = newValue
-            ldap.params = params
-        }
-    }
-    val ldapSipDomain = MutableLiveData<String>()
-
-    val ldapDebugListener = object : SettingListenerStub() {
-        override fun onBoolValueChanged(newValue: Boolean) {
-            val params = ldap.params.clone()
-            params.debugLevel = if (newValue) Ldap.DebugLevel.Verbose else Ldap.DebugLevel.Off
-            ldap.params = params
-        }
-    }
-    val ldapDebug = MutableLiveData<Boolean>()
-
-    init {
-        val params = ldap.params
-
-        ldapEnable.value = params.enabled
-        ldapServer.value = params.server
-        ldapBindDn.value = params.bindDn
-        ldapPassword.value = params.password
-        ldapTls.value = params.isTlsEnabled
-        ldapSearchBase.value = params.baseObject
-        ldapSearchFilter.value = params.filter
-        ldapSearchMaxResults.value = params.maxResults
-        ldapSearchTimeout.value = params.timeout
-        ldapRequestDelay.value = params.delay
-        ldapMinimumCharacters.value = params.minChars
-        ldapNameAttribute.value = params.nameAttribute
-        ldapSipAttribute.value = params.sipAttribute
-        ldapSipDomain.value = params.sipDomain
-        ldapDebug.value = params.debugLevel == Ldap.DebugLevel.Verbose
-
-        initAuthMethodList()
-        initTlsCertCheckList()
-    }
-
-    private fun initAuthMethodList() {
-        val labels = arrayListOf<String>()
-
-        labels.add(prefs.getString(R.string.contacts_settings_ldap_auth_method_anonymous))
-        ldapAuthMethodValues.add(Ldap.AuthMethod.Anonymous.toInt())
-
-        labels.add(prefs.getString(R.string.contacts_settings_ldap_auth_method_simple))
-        ldapAuthMethodValues.add(Ldap.AuthMethod.Simple.toInt())
-
-        ldapAuthMethodLabels.value = labels
-        ldapAuthMethodIndex.value = ldapAuthMethodValues.indexOf(ldap.params.authMethod.toInt())
-    }
-
-    private fun initTlsCertCheckList() {
-        val labels = arrayListOf<String>()
-
-        labels.add(prefs.getString(R.string.contacts_settings_ldap_cert_check_auto))
-        ldapCertCheckValues.add(Ldap.CertVerificationMode.Default.toInt())
-
-        labels.add(prefs.getString(R.string.contacts_settings_ldap_cert_check_disabled))
-        ldapCertCheckValues.add(Ldap.CertVerificationMode.Disabled.toInt())
-
-        labels.add(prefs.getString(R.string.contacts_settings_ldap_cert_check_enabled))
-        ldapCertCheckValues.add(Ldap.CertVerificationMode.Enabled.toInt())
-
-        ldapCertCheckLabels.value = labels
-        ldapCertCheckIndex.value = ldapCertCheckValues.indexOf(
-            ldap.params.serverCertificatesVerificationMode.toInt()
-        )
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/main/settings/viewmodels/NetworkSettingsViewModel.kt b/app/src/main/java/org/linphone/activities/main/settings/viewmodels/NetworkSettingsViewModel.kt
deleted file mode 100644
index 057997971..000000000
--- a/app/src/main/java/org/linphone/activities/main/settings/viewmodels/NetworkSettingsViewModel.kt
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.main.settings.viewmodels
-
-import androidx.lifecycle.MutableLiveData
-import java.lang.NumberFormatException
-import org.linphone.activities.main.settings.SettingListenerStub
-
-class NetworkSettingsViewModel : GenericSettingsViewModel() {
-    val wifiOnlyListener = object : SettingListenerStub() {
-        override fun onBoolValueChanged(newValue: Boolean) {
-            core.isWifiOnlyEnabled = newValue
-        }
-    }
-    val wifiOnly = MutableLiveData<Boolean>()
-
-    val allowIpv6Listener = object : SettingListenerStub() {
-        override fun onBoolValueChanged(newValue: Boolean) {
-            core.isIpv6Enabled = newValue
-        }
-    }
-    val allowIpv6 = MutableLiveData<Boolean>()
-
-    val randomPortsListener = object : SettingListenerStub() {
-        override fun onBoolValueChanged(newValue: Boolean) {
-            val port = if (newValue) -1 else 5060
-            setTransportPort(port)
-            sipPort.value = port
-        }
-    }
-    val randomPorts = MutableLiveData<Boolean>()
-
-    val sipPortListener = object : SettingListenerStub() {
-        override fun onTextValueChanged(newValue: String) {
-            try {
-                val port = newValue.toInt()
-                setTransportPort(port)
-            } catch (_: NumberFormatException) {
-            }
-        }
-    }
-    val sipPort = MutableLiveData<Int>()
-
-    init {
-        wifiOnly.value = core.isWifiOnlyEnabled
-        allowIpv6.value = core.isIpv6Enabled
-        randomPorts.value = getTransportPort() == -1
-        sipPort.value = getTransportPort()
-    }
-
-    private fun setTransportPort(port: Int) {
-        val transports = core.transports
-        transports.udpPort = port
-        transports.tcpPort = port
-        transports.tlsPort = -1
-        core.transports = transports
-    }
-
-    private fun getTransportPort(): Int {
-        val transports = core.transports
-        if (transports.udpPort > 0) return transports.udpPort
-        return transports.tcpPort
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/main/settings/viewmodels/SettingsViewModel.kt b/app/src/main/java/org/linphone/activities/main/settings/viewmodels/SettingsViewModel.kt
deleted file mode 100644
index c2c39fda9..000000000
--- a/app/src/main/java/org/linphone/activities/main/settings/viewmodels/SettingsViewModel.kt
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.main.settings.viewmodels
-
-import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.ViewModel
-import org.linphone.LinphoneApplication.Companion.coreContext
-import org.linphone.LinphoneApplication.Companion.corePreferences
-import org.linphone.activities.main.settings.SettingListenerStub
-import org.linphone.utils.LinphoneUtils
-
-class SettingsViewModel : ViewModel() {
-    private val tunnelAvailable: Boolean = coreContext.core.tunnelAvailable()
-
-    val showAccountSettings: Boolean = corePreferences.showAccountSettings
-    val showTunnelSettings: Boolean = tunnelAvailable && corePreferences.showTunnelSettings
-    val showAudioSettings: Boolean = corePreferences.showAudioSettings
-    val showVideoSettings: Boolean = corePreferences.showVideoSettings
-    val showCallSettings: Boolean = corePreferences.showCallSettings
-    val showChatSettings: Boolean = corePreferences.showChatSettings
-    val showNetworkSettings: Boolean = corePreferences.showNetworkSettings
-    val showContactsSettings: Boolean = corePreferences.showContactsSettings
-    val showAdvancedSettings: Boolean = corePreferences.showAdvancedSettings
-    val showConferencesSettings: Boolean = corePreferences.showConferencesSettings
-
-    val accounts = MutableLiveData<ArrayList<AccountSettingsViewModel>>()
-
-    private var accountClickListener = object : SettingListenerStub() {
-        override fun onAccountClicked(identity: String) {
-            accountsSettingsListener.onAccountClicked(identity)
-        }
-    }
-
-    lateinit var accountsSettingsListener: SettingListenerStub
-
-    lateinit var tunnelSettingsListener: SettingListenerStub
-
-    lateinit var audioSettingsListener: SettingListenerStub
-
-    lateinit var videoSettingsListener: SettingListenerStub
-
-    lateinit var callSettingsListener: SettingListenerStub
-
-    lateinit var chatSettingsListener: SettingListenerStub
-
-    lateinit var networkSettingsListener: SettingListenerStub
-
-    lateinit var contactsSettingsListener: SettingListenerStub
-
-    lateinit var advancedSettingsListener: SettingListenerStub
-
-    lateinit var conferencesSettingsListener: SettingListenerStub
-
-    val primaryAccountDisplayNameListener = object : SettingListenerStub() {
-        override fun onTextValueChanged(newValue: String) {
-            val address = coreContext.core.createPrimaryContactParsed()
-            address ?: return
-            address.displayName = newValue
-            address.username = primaryAccountUsername.value
-            coreContext.core.primaryContact = address.asString()
-
-            primaryAccountDisplayName.value = newValue
-        }
-    }
-    val primaryAccountDisplayName = MutableLiveData<String>()
-
-    val primaryAccountUsernameListener = object : SettingListenerStub() {
-        override fun onTextValueChanged(newValue: String) {
-            val address = coreContext.core.createPrimaryContactParsed()
-            address ?: return
-            address.username = newValue
-            address.displayName = primaryAccountDisplayName.value
-            coreContext.core.primaryContact = address.asString()
-
-            primaryAccountUsername.value = newValue
-        }
-    }
-    val primaryAccountUsername = MutableLiveData<String>()
-
-    init {
-        updateAccountsList()
-
-        val address = coreContext.core.createPrimaryContactParsed()
-        primaryAccountDisplayName.value = address?.displayName ?: ""
-        primaryAccountUsername.value = address?.username ?: ""
-    }
-
-    override fun onCleared() {
-        accounts.value.orEmpty().forEach(AccountSettingsViewModel::destroy)
-        super.onCleared()
-    }
-
-    fun updateAccountsList() {
-        accounts.value.orEmpty().forEach(AccountSettingsViewModel::destroy)
-
-        val list = arrayListOf<AccountSettingsViewModel>()
-        for (account in LinphoneUtils.getAccountsNotHidden()) {
-            val viewModel = AccountSettingsViewModel(account)
-            viewModel.accountsSettingsListener = accountClickListener
-            list.add(viewModel)
-        }
-
-        accounts.value = list
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/main/settings/viewmodels/TunnelSettingsViewModel.kt b/app/src/main/java/org/linphone/activities/main/settings/viewmodels/TunnelSettingsViewModel.kt
deleted file mode 100644
index 8bdcf2110..000000000
--- a/app/src/main/java/org/linphone/activities/main/settings/viewmodels/TunnelSettingsViewModel.kt
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.main.settings.viewmodels
-
-import androidx.lifecycle.MutableLiveData
-import java.lang.NumberFormatException
-import org.linphone.R
-import org.linphone.activities.main.settings.SettingListenerStub
-import org.linphone.core.Factory
-import org.linphone.core.Tunnel
-import org.linphone.core.TunnelConfig
-
-class TunnelSettingsViewModel : GenericSettingsViewModel() {
-    val hostnameUrlListener = object : SettingListenerStub() {
-        override fun onTextValueChanged(newValue: String) {
-            val config = getTunnelConfig()
-            config.host = newValue
-            updateTunnelConfig(config)
-        }
-    }
-    val hostnameUrl = MutableLiveData<String>()
-
-    val portListener = object : SettingListenerStub() {
-        override fun onTextValueChanged(newValue: String) {
-            try {
-                val config = getTunnelConfig()
-                config.port = newValue.toInt()
-                updateTunnelConfig(config)
-            } catch (_: NumberFormatException) {
-            }
-        }
-    }
-    val port = MutableLiveData<Int>()
-
-    val useDualModeListener = object : SettingListenerStub() {
-        override fun onBoolValueChanged(newValue: Boolean) {
-            val tunnel = core.tunnel
-            tunnel?.isDualModeEnabled = newValue
-        }
-    }
-    val useDualMode = MutableLiveData<Boolean>()
-
-    val hostnameUrl2Listener = object : SettingListenerStub() {
-        override fun onTextValueChanged(newValue: String) {
-            val config = getTunnelConfig()
-            config.host2 = newValue
-            updateTunnelConfig(config)
-        }
-    }
-    val hostnameUrl2 = MutableLiveData<String>()
-
-    val port2Listener = object : SettingListenerStub() {
-        override fun onTextValueChanged(newValue: String) {
-            try {
-                val config = getTunnelConfig()
-                config.port2 = newValue.toInt()
-                updateTunnelConfig(config)
-            } catch (_: NumberFormatException) {
-            }
-        }
-    }
-    val port2 = MutableLiveData<Int>()
-
-    val modeListener = object : SettingListenerStub() {
-        override fun onListValueChanged(position: Int) {
-            core.tunnel?.mode = when (position) {
-                0 -> Tunnel.Mode.Disable
-                1 -> Tunnel.Mode.Enable
-                else -> Tunnel.Mode.Auto
-            }
-        }
-    }
-    val modeIndex = MutableLiveData<Int>()
-    val modeLabels = MutableLiveData<ArrayList<String>>()
-
-    init {
-        val tunnel = core.tunnel
-        val config = getTunnelConfig()
-
-        hostnameUrl.value = config.host
-        port.value = config.port
-        useDualMode.value = tunnel?.isDualModeEnabled
-        hostnameUrl2.value = config.host2
-        port2.value = config.port2
-
-        initModeList()
-    }
-
-    private fun getTunnelConfig(): TunnelConfig {
-        val tunnel = core.tunnel
-        val configs = tunnel?.servers.orEmpty()
-        return if (configs.isNotEmpty()) {
-            configs.first()
-        } else {
-            Factory.instance().createTunnelConfig()
-        }
-    }
-
-    private fun updateTunnelConfig(config: TunnelConfig) {
-        val tunnel = core.tunnel
-        tunnel?.cleanServers()
-        if (config.host?.isNotEmpty() == true) {
-            tunnel?.addServer(config)
-        }
-    }
-
-    private fun initModeList() {
-        val labels = arrayListOf<String>()
-        labels.add(prefs.getString(R.string.tunnel_settings_disabled_mode))
-        labels.add(prefs.getString(R.string.tunnel_settings_always_mode))
-        labels.add(prefs.getString(R.string.tunnel_settings_auto_mode))
-        modeLabels.value = labels
-
-        modeIndex.value = when (core.tunnel?.mode) {
-            Tunnel.Mode.Disable -> 0
-            Tunnel.Mode.Enable -> 1
-            else -> 2
-        }
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/main/settings/viewmodels/VideoSettingsViewModel.kt b/app/src/main/java/org/linphone/activities/main/settings/viewmodels/VideoSettingsViewModel.kt
deleted file mode 100644
index db1db30ed..000000000
--- a/app/src/main/java/org/linphone/activities/main/settings/viewmodels/VideoSettingsViewModel.kt
+++ /dev/null
@@ -1,195 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.main.settings.viewmodels
-
-import androidx.databinding.ViewDataBinding
-import androidx.lifecycle.MutableLiveData
-import java.lang.NumberFormatException
-import org.linphone.LinphoneApplication.Companion.coreContext
-import org.linphone.R
-import org.linphone.activities.main.settings.SettingListenerStub
-import org.linphone.core.Factory
-import org.linphone.core.tools.Log
-
-class VideoSettingsViewModel : GenericSettingsViewModel() {
-    val enableVideoListener = object : SettingListenerStub() {
-        override fun onBoolValueChanged(newValue: Boolean) {
-            core.isVideoCaptureEnabled = newValue
-            core.isVideoDisplayEnabled = newValue
-            if (!newValue) {
-                tabletPreview.value = false
-                initiateCall.value = false
-                autoAccept.value = false
-            }
-        }
-    }
-    val enableVideo = MutableLiveData<Boolean>()
-
-    val tabletPreviewListener = object : SettingListenerStub() {
-        override fun onBoolValueChanged(newValue: Boolean) {
-            prefs.videoPreview = newValue
-        }
-    }
-    val tabletPreview = MutableLiveData<Boolean>()
-    val isTablet = MutableLiveData<Boolean>()
-
-    val initiateCallListener = object : SettingListenerStub() {
-        override fun onBoolValueChanged(newValue: Boolean) {
-            val policy = core.videoActivationPolicy
-            policy.automaticallyInitiate = newValue
-            core.videoActivationPolicy = policy
-        }
-    }
-    val initiateCall = MutableLiveData<Boolean>()
-
-    val autoAcceptListener = object : SettingListenerStub() {
-        override fun onBoolValueChanged(newValue: Boolean) {
-            val policy = core.videoActivationPolicy
-            policy.automaticallyAccept = newValue
-            core.videoActivationPolicy = policy
-        }
-    }
-    val autoAccept = MutableLiveData<Boolean>()
-
-    val cameraDeviceListener = object : SettingListenerStub() {
-        override fun onListValueChanged(position: Int) {
-            core.videoDevice = cameraDeviceLabels.value.orEmpty()[position]
-        }
-    }
-    val cameraDeviceIndex = MutableLiveData<Int>()
-    val cameraDeviceLabels = MutableLiveData<ArrayList<String>>()
-
-    val videoSizeListener = object : SettingListenerStub() {
-        override fun onListValueChanged(position: Int) {
-            core.setPreferredVideoDefinitionByName(videoSizeLabels.value.orEmpty()[position])
-        }
-    }
-    val videoSizeIndex = MutableLiveData<Int>()
-    val videoSizeLabels = MutableLiveData<ArrayList<String>>()
-
-    val videoPresetListener = object : SettingListenerStub() {
-        override fun onListValueChanged(position: Int) {
-            videoPresetIndex.value = position // Needed to display/hide two below settings
-            val currentPreset = core.videoPreset
-            val newPreset = videoPresetLabels.value.orEmpty()[position]
-            if (newPreset != currentPreset) {
-                if (currentPreset == "custom") {
-                    // Not "custom" anymore, reset FPS & bandwidth
-                    core.preferredFramerate = 0f
-                    core.downloadBandwidth = 0
-                    core.uploadBandwidth = 0
-                }
-                core.videoPreset = newPreset
-            }
-        }
-    }
-    val videoPresetIndex = MutableLiveData<Int>()
-    val videoPresetLabels = MutableLiveData<ArrayList<String>>()
-
-    val preferredFpsListener = object : SettingListenerStub() {
-        override fun onListValueChanged(position: Int) {
-            core.preferredFramerate = preferredFpsLabels.value.orEmpty()[position].toFloat()
-        }
-    }
-    val preferredFpsIndex = MutableLiveData<Int>()
-    val preferredFpsLabels = MutableLiveData<ArrayList<String>>()
-
-    val bandwidthLimitListener = object : SettingListenerStub() {
-        override fun onTextValueChanged(newValue: String) {
-            try {
-                core.downloadBandwidth = newValue.toInt()
-                core.uploadBandwidth = newValue.toInt()
-            } catch (_: NumberFormatException) {
-            }
-        }
-    }
-    val bandwidthLimit = MutableLiveData<Int>()
-
-    val videoCodecs = MutableLiveData<ArrayList<ViewDataBinding>>()
-
-    init {
-        enableVideo.value = core.isVideoEnabled && core.videoSupported()
-        tabletPreview.value = prefs.videoPreview
-        isTablet.value = coreContext.context.resources.getBoolean(R.bool.isTablet)
-        initiateCall.value = core.videoActivationPolicy.automaticallyInitiate
-        autoAccept.value = core.videoActivationPolicy.automaticallyAccept
-
-        initCameraDevicesList()
-        initVideoSizeList()
-        initVideoPresetList()
-        initFpsList()
-
-        bandwidthLimit.value = core.downloadBandwidth
-    }
-
-    fun initCameraDevicesList() {
-        val labels = arrayListOf<String>()
-        for (camera in core.videoDevicesList) {
-            if (prefs.hideStaticImageCamera && camera.startsWith("StaticImage")) {
-                Log.w("[Video Settings] Do not display StaticImage camera")
-            } else {
-                labels.add(camera)
-            }
-        }
-
-        cameraDeviceLabels.value = labels
-        val index = labels.indexOf(core.videoDevice)
-        if (index == -1) {
-            val firstDevice = cameraDeviceLabels.value.orEmpty().firstOrNull()
-            Log.w(
-                "[Video Settings] Device not found in labels list: ${core.videoDevice}, replace it by $firstDevice"
-            )
-            if (firstDevice != null) {
-                cameraDeviceIndex.value = 0
-                core.videoDevice = firstDevice
-            }
-        } else {
-            cameraDeviceIndex.value = index
-        }
-    }
-
-    private fun initVideoSizeList() {
-        val labels = arrayListOf<String>()
-
-        for (size in Factory.instance().supportedVideoDefinitions) {
-            labels.add(size.name.orEmpty())
-        }
-
-        videoSizeLabels.value = labels
-        videoSizeIndex.value = labels.indexOf(core.preferredVideoDefinition.name)
-    }
-
-    private fun initVideoPresetList() {
-        val labels = arrayListOf<String>()
-
-        labels.add("default")
-        labels.add("high-fps")
-        labels.add("custom")
-
-        videoPresetLabels.value = labels
-        videoPresetIndex.value = labels.indexOf(core.videoPreset)
-    }
-
-    private fun initFpsList() {
-        val labels = arrayListOf("5", "10", "15", "20", "25", "30")
-        preferredFpsLabels.value = labels
-        preferredFpsIndex.value = labels.indexOf(core.preferredFramerate.toInt().toString())
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/main/sidemenu/fragments/SideMenuFragment.kt b/app/src/main/java/org/linphone/activities/main/sidemenu/fragments/SideMenuFragment.kt
deleted file mode 100644
index 1e73cef17..000000000
--- a/app/src/main/java/org/linphone/activities/main/sidemenu/fragments/SideMenuFragment.kt
+++ /dev/null
@@ -1,266 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.main.sidemenu.fragments
-
-import android.app.Activity
-import android.content.Intent
-import android.os.Bundle
-import android.os.Parcelable
-import android.provider.MediaStore
-import android.view.View
-import androidx.core.content.FileProvider
-import androidx.lifecycle.ViewModelProvider
-import androidx.lifecycle.lifecycleScope
-import java.io.File
-import kotlinx.coroutines.launch
-import org.linphone.LinphoneApplication.Companion.coreContext
-import org.linphone.LinphoneApplication.Companion.corePreferences
-import org.linphone.R
-import org.linphone.activities.*
-import org.linphone.activities.assistant.AssistantActivity
-import org.linphone.activities.main.MainActivity
-import org.linphone.activities.main.settings.SettingListenerStub
-import org.linphone.activities.main.sidemenu.viewmodels.SideMenuViewModel
-import org.linphone.activities.main.viewmodels.DialogViewModel
-import org.linphone.core.Factory
-import org.linphone.core.tools.Log
-import org.linphone.databinding.SideMenuFragmentBinding
-import org.linphone.utils.*
-
-class SideMenuFragment : GenericFragment<SideMenuFragmentBinding>() {
-    private lateinit var viewModel: SideMenuViewModel
-    private var temporaryPicturePath: File? = null
-
-    override fun getLayoutId(): Int = R.layout.side_menu_fragment
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        binding.lifecycleOwner = viewLifecycleOwner
-
-        viewModel = ViewModelProvider(this)[SideMenuViewModel::class.java]
-        binding.viewModel = viewModel
-
-        sharedViewModel.accountRemoved.observe(
-            viewLifecycleOwner
-        ) {
-            Log.i("[Side Menu] Account removed, update accounts list")
-            viewModel.updateAccountsList()
-        }
-
-        sharedViewModel.defaultAccountChanged.observe(
-            viewLifecycleOwner
-        ) {
-            Log.i("[Side Menu] Default account changed, update accounts list")
-            viewModel.updateAccountsList()
-        }
-
-        sharedViewModel.publishPresenceToggled.observe(
-            viewLifecycleOwner
-        ) {
-            viewModel.refreshConsolidatedPresence()
-        }
-
-        viewModel.accountsSettingsListener = object : SettingListenerStub() {
-            override fun onAccountClicked(identity: String) {
-                Log.i("[Side Menu] Navigating to settings for account with identity: $identity")
-
-                sharedViewModel.toggleDrawerEvent.value = Event(true)
-
-                if (corePreferences.askForAccountPasswordToAccessSettings) {
-                    showPasswordDialog(goToAccountSettings = true, accountIdentity = identity)
-                } else {
-                    navigateToAccountSettings(identity)
-                }
-            }
-        }
-
-        binding.setSelfPictureClickListener {
-            pickFile()
-        }
-
-        binding.setAssistantClickListener {
-            sharedViewModel.toggleDrawerEvent.value = Event(true)
-            startActivity(Intent(context, AssistantActivity::class.java))
-        }
-
-        binding.setSettingsClickListener {
-            sharedViewModel.toggleDrawerEvent.value = Event(true)
-
-            if (corePreferences.askForAccountPasswordToAccessSettings) {
-                showPasswordDialog(goToSettings = true)
-            } else {
-                navigateToSettings()
-            }
-        }
-
-        binding.setRecordingsClickListener {
-            sharedViewModel.toggleDrawerEvent.value = Event(true)
-            navigateToRecordings()
-        }
-
-        binding.setAboutClickListener {
-            sharedViewModel.toggleDrawerEvent.value = Event(true)
-            navigateToAbout()
-        }
-
-        binding.setConferencesClickListener {
-            sharedViewModel.toggleDrawerEvent.value = Event(true)
-            navigateToScheduledConferences()
-        }
-
-        binding.setQuitClickListener {
-            Log.i("[Side Menu] Quitting app")
-            requireActivity().finishAndRemoveTask()
-
-            Log.i("[Side Menu] Stopping Core Context")
-            coreContext.notificationsManager.stopForegroundNotification()
-            coreContext.stop()
-        }
-    }
-
-    @Deprecated("Deprecated in Java")
-    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
-        if (resultCode == Activity.RESULT_OK) {
-            lifecycleScope.launch {
-                val contactImageFilePath = FileUtils.getFilePathFromPickerIntent(
-                    data,
-                    temporaryPicturePath
-                )
-                if (contactImageFilePath != null) {
-                    viewModel.setPictureFromPath(contactImageFilePath)
-                }
-            }
-        }
-    }
-
-    private fun pickFile() {
-        val cameraIntents = ArrayList<Intent>()
-
-        // Handles image picking
-        val galleryIntent = Intent(Intent.ACTION_PICK)
-        galleryIntent.type = "image/*"
-
-        if (PermissionHelper.get().hasCameraPermission()) {
-            // Allows to capture directly from the camera
-            val captureIntent = Intent(MediaStore.ACTION_IMAGE_CAPTURE)
-            val tempFileName = System.currentTimeMillis().toString() + ".jpeg"
-            val file = FileUtils.getFileStoragePath(tempFileName)
-            temporaryPicturePath = file
-            val publicUri = FileProvider.getUriForFile(
-                requireContext(),
-                requireContext().getString(R.string.file_provider),
-                file
-            )
-            captureIntent.putExtra(MediaStore.EXTRA_OUTPUT, publicUri)
-            captureIntent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
-            captureIntent.addFlags(Intent.FLAG_GRANT_WRITE_URI_PERMISSION)
-            cameraIntents.add(captureIntent)
-        }
-
-        val chooserIntent =
-            Intent.createChooser(galleryIntent, getString(R.string.chat_message_pick_file_dialog))
-        chooserIntent.putExtra(
-            Intent.EXTRA_INITIAL_INTENTS,
-            cameraIntents.toArray(arrayOf<Parcelable>())
-        )
-
-        startActivityForResult(chooserIntent, 0)
-    }
-
-    private fun showPasswordDialog(
-        goToSettings: Boolean = false,
-        goToAccountSettings: Boolean = false,
-        accountIdentity: String = ""
-    ) {
-        val dialogViewModel = DialogViewModel(
-            getString(R.string.settings_password_protection_dialog_title)
-        )
-        dialogViewModel.showIcon = true
-        dialogViewModel.iconResource = R.drawable.security_toggle_icon_green
-        dialogViewModel.showPassword = true
-        dialogViewModel.passwordTitle = getString(
-            R.string.settings_password_protection_dialog_input_hint
-        )
-        val dialog = DialogUtils.getDialog(requireContext(), dialogViewModel)
-
-        dialogViewModel.showCancelButton {
-            dialog.dismiss()
-        }
-
-        dialogViewModel.showOkButton(
-            {
-                val defaultAccount = coreContext.core.defaultAccount ?: coreContext.core.accountList.firstOrNull()
-                if (defaultAccount == null) {
-                    Log.e("[Side Menu] No account found, can't check password input!")
-                    (requireActivity() as MainActivity).showSnackBar(R.string.error_unexpected)
-                } else {
-                    val authInfo = defaultAccount.findAuthInfo()
-                    if (authInfo == null) {
-                        Log.e(
-                            "[Side Menu] No auth info found for account [${defaultAccount.params.identityAddress?.asString()}], can't check password input!"
-                        )
-                        (requireActivity() as MainActivity).showSnackBar(R.string.error_unexpected)
-                    } else {
-                        val expectedHash = authInfo.ha1
-                        if (expectedHash == null) {
-                            Log.e(
-                                "[Side Menu] No ha1 found in auth info, can't check password input!"
-                            )
-                            (requireActivity() as MainActivity).showSnackBar(
-                                R.string.error_unexpected
-                            )
-                        } else {
-                            val hashAlgorithm = authInfo.algorithm ?: "MD5"
-                            val userId = (authInfo.userid ?: authInfo.username).orEmpty()
-                            val realm = authInfo.realm.orEmpty()
-                            val password = dialogViewModel.password
-                            val computedHash = Factory.instance().computeHa1ForAlgorithm(
-                                userId,
-                                password,
-                                realm,
-                                hashAlgorithm
-                            )
-                            if (computedHash != expectedHash) {
-                                Log.e(
-                                    "[Side Menu] Computed hash [$computedHash] using userId [$userId], realm [$realm] and algorithm [$hashAlgorithm] doesn't match expected hash!"
-                                )
-                                (requireActivity() as MainActivity).showSnackBar(
-                                    R.string.settings_password_protection_dialog_invalid_input
-                                )
-                            } else {
-                                if (goToSettings) {
-                                    navigateToSettings()
-                                } else if (goToAccountSettings) {
-                                    navigateToAccountSettings(accountIdentity)
-                                }
-                            }
-                        }
-                    }
-                }
-
-                dialog.dismiss()
-            },
-            getString(R.string.settings_password_protection_dialog_ok_label)
-        )
-
-        dialog.show()
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/main/sidemenu/viewmodels/SideMenuViewModel.kt b/app/src/main/java/org/linphone/activities/main/sidemenu/viewmodels/SideMenuViewModel.kt
deleted file mode 100644
index 1f07fedb6..000000000
--- a/app/src/main/java/org/linphone/activities/main/sidemenu/viewmodels/SideMenuViewModel.kt
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.main.sidemenu.viewmodels
-
-import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.ViewModel
-import org.linphone.LinphoneApplication.Companion.coreContext
-import org.linphone.LinphoneApplication.Companion.corePreferences
-import org.linphone.activities.main.settings.SettingListenerStub
-import org.linphone.activities.main.settings.viewmodels.AccountSettingsViewModel
-import org.linphone.core.*
-import org.linphone.utils.LinphoneUtils
-
-class SideMenuViewModel : ViewModel() {
-    val showAccounts: Boolean = corePreferences.showAccountsInSideMenu
-    val showAssistant: Boolean = corePreferences.showAssistantInSideMenu
-    val showSettings: Boolean = corePreferences.showSettingsInSideMenu
-    val showRecordings: Boolean = corePreferences.showRecordingsInSideMenu
-    val showScheduledConferences = MutableLiveData<Boolean>()
-    val showAbout: Boolean = corePreferences.showAboutInSideMenu
-    val showQuit: Boolean = corePreferences.showQuitInSideMenu
-
-    val defaultAccountViewModel = MutableLiveData<AccountSettingsViewModel>()
-    val defaultAccountFound = MutableLiveData<Boolean>()
-    val defaultAccountAvatar = MutableLiveData<String>()
-
-    val accounts = MutableLiveData<ArrayList<AccountSettingsViewModel>>()
-
-    val presenceStatus = MutableLiveData<ConsolidatedPresence>()
-
-    lateinit var accountsSettingsListener: SettingListenerStub
-
-    private val listener: CoreListenerStub = object : CoreListenerStub() {
-        override fun onAccountRegistrationStateChanged(
-            core: Core,
-            account: Account,
-            state: RegistrationState,
-            message: String
-        ) {
-            // +1 is for the default account, otherwise this will trigger every time
-            if (accounts.value.isNullOrEmpty() ||
-                coreContext.core.accountList.size != accounts.value.orEmpty().size + 1
-            ) {
-                // Only refresh the list if an account has been added or removed
-                updateAccountsList()
-            }
-        }
-    }
-
-    init {
-        defaultAccountFound.value = false
-        defaultAccountAvatar.value = corePreferences.defaultAccountAvatarPath
-        showScheduledConferences.value = corePreferences.showScheduledConferencesInSideMenu &&
-            LinphoneUtils.isRemoteConferencingAvailable()
-        coreContext.core.addListener(listener)
-        updateAccountsList()
-        refreshConsolidatedPresence()
-    }
-
-    override fun onCleared() {
-        defaultAccountViewModel.value?.destroy()
-        accounts.value.orEmpty().forEach(AccountSettingsViewModel::destroy)
-        coreContext.core.removeListener(listener)
-        super.onCleared()
-    }
-
-    fun refreshConsolidatedPresence() {
-        presenceStatus.value = coreContext.core.consolidatedPresence
-    }
-
-    fun updateAccountsList() {
-        defaultAccountFound.value = false // Do not assume a default account will still be found
-        defaultAccountViewModel.value?.destroy()
-        accounts.value.orEmpty().forEach(AccountSettingsViewModel::destroy)
-
-        val list = arrayListOf<AccountSettingsViewModel>()
-        val defaultAccount = coreContext.core.defaultAccount
-        if (defaultAccount != null) {
-            val defaultViewModel = AccountSettingsViewModel(defaultAccount)
-            defaultViewModel.accountsSettingsListener = object : SettingListenerStub() {
-                override fun onAccountClicked(identity: String) {
-                    accountsSettingsListener.onAccountClicked(identity)
-                }
-            }
-            defaultAccountViewModel.value = defaultViewModel
-            defaultAccountFound.value = true
-        }
-
-        for (account in LinphoneUtils.getAccountsNotHidden()) {
-            if (account != coreContext.core.defaultAccount) {
-                val viewModel = AccountSettingsViewModel(account)
-                viewModel.accountsSettingsListener = object : SettingListenerStub() {
-                    override fun onAccountClicked(identity: String) {
-                        accountsSettingsListener.onAccountClicked(identity)
-                    }
-                }
-                list.add(viewModel)
-            }
-        }
-        accounts.value = list
-
-        showScheduledConferences.value = corePreferences.showScheduledConferencesInSideMenu &&
-            LinphoneUtils.isRemoteConferencingAvailable()
-    }
-
-    fun setPictureFromPath(picturePath: String) {
-        corePreferences.defaultAccountAvatarPath = picturePath
-        defaultAccountAvatar.value = corePreferences.defaultAccountAvatarPath
-        coreContext.contactsManager.updateLocalContacts()
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/main/viewmodels/CallOverlayViewModel.kt b/app/src/main/java/org/linphone/activities/main/viewmodels/CallOverlayViewModel.kt
deleted file mode 100644
index 79863593f..000000000
--- a/app/src/main/java/org/linphone/activities/main/viewmodels/CallOverlayViewModel.kt
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright (c) 2010-2021 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.main.viewmodels
-
-import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.ViewModel
-import org.linphone.LinphoneApplication.Companion.coreContext
-import org.linphone.LinphoneApplication.Companion.corePreferences
-import org.linphone.core.Call
-import org.linphone.core.Core
-import org.linphone.core.CoreListenerStub
-import org.linphone.core.tools.Log
-
-class CallOverlayViewModel : ViewModel() {
-    val displayCallOverlay = MutableLiveData<Boolean>()
-
-    private val listener = object : CoreListenerStub() {
-        override fun onCallStateChanged(
-            core: Core,
-            call: Call,
-            state: Call.State?,
-            message: String
-        ) {
-            if (core.callsNb == 1 && call.state == Call.State.Connected) {
-                Log.i("[Call Overlay] First call connected, creating it")
-                createCallOverlay()
-            }
-        }
-
-        override fun onLastCallEnded(core: Core) {
-            Log.i("[Call Overlay] Last call ended, removing it")
-            removeCallOverlay()
-        }
-    }
-
-    init {
-        displayCallOverlay.value = corePreferences.showCallOverlay &&
-            !corePreferences.systemWideCallOverlay &&
-            coreContext.core.callsNb > 0
-
-        coreContext.core.addListener(listener)
-    }
-
-    override fun onCleared() {
-        coreContext.core.removeListener(listener)
-
-        super.onCleared()
-    }
-
-    private fun createCallOverlay() {
-        // If overlay is disabled or if system-wide call overlay is enabled, abort
-        if (!corePreferences.showCallOverlay || corePreferences.systemWideCallOverlay) {
-            return
-        }
-
-        displayCallOverlay.value = true
-    }
-
-    private fun removeCallOverlay() {
-        displayCallOverlay.value = false
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/main/viewmodels/DialogViewModel.kt b/app/src/main/java/org/linphone/activities/main/viewmodels/DialogViewModel.kt
deleted file mode 100644
index 3cc7440d5..000000000
--- a/app/src/main/java/org/linphone/activities/main/viewmodels/DialogViewModel.kt
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.main.viewmodels
-
-import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.ViewModel
-import org.linphone.R
-import org.linphone.utils.AppUtils
-import org.linphone.utils.Event
-
-class DialogViewModel(val message: String, val title: String = "") : ViewModel() {
-    var showDoNotAskAgain: Boolean = false
-
-    var showZrtp: Boolean = false
-
-    var zrtpReadSas: String = ""
-
-    var zrtpListenSas: String = ""
-
-    var showTitle: Boolean = false
-
-    var showIcon: Boolean = false
-
-    var iconResource: Int = 0
-
-    var showSubscribeLinphoneOrgLink: Boolean = false
-
-    val doNotAskAgain = MutableLiveData<Boolean>()
-
-    val dismissEvent = MutableLiveData<Event<Boolean>>()
-
-    var password: String = ""
-
-    var passwordTitle: String = ""
-
-    var passwordSubtitle: String = ""
-
-    var showPassword: Boolean = false
-
-    init {
-        doNotAskAgain.value = false
-        showTitle = title.isNotEmpty()
-    }
-
-    var showCancel: Boolean = false
-    var cancelLabel: String = AppUtils.getString(R.string.dialog_cancel)
-    private var onCancel: (Boolean) -> Unit = {}
-
-    fun showCancelButton(cancel: (Boolean) -> Unit) {
-        showCancel = true
-        onCancel = cancel
-    }
-
-    fun showCancelButton(cancel: (Boolean) -> Unit, label: String = cancelLabel) {
-        showCancel = true
-        onCancel = cancel
-        cancelLabel = label
-    }
-
-    fun onCancelClicked() {
-        onCancel(doNotAskAgain.value == true)
-    }
-
-    var showDelete: Boolean = false
-    var deleteLabel: String = AppUtils.getString(R.string.dialog_delete)
-    private var onDelete: (Boolean) -> Unit = {}
-
-    fun showDeleteButton(delete: (Boolean) -> Unit, label: String) {
-        showDelete = true
-        onDelete = delete
-        deleteLabel = label
-    }
-
-    fun onDeleteClicked() {
-        onDelete(doNotAskAgain.value == true)
-    }
-
-    var showOk: Boolean = false
-    var okLabel: String = AppUtils.getString(R.string.dialog_ok)
-    private var onOk: (Boolean) -> Unit = {}
-
-    fun showOkButton(ok: (Boolean) -> Unit, label: String = okLabel) {
-        showOk = true
-        onOk = ok
-        okLabel = label
-    }
-
-    fun onOkClicked() {
-        onOk(doNotAskAgain.value == true)
-    }
-
-    fun dismiss() {
-        dismissEvent.value = Event(true)
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/main/viewmodels/ListTopBarViewModel.kt b/app/src/main/java/org/linphone/activities/main/viewmodels/ListTopBarViewModel.kt
deleted file mode 100644
index 0c0ffc090..000000000
--- a/app/src/main/java/org/linphone/activities/main/viewmodels/ListTopBarViewModel.kt
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.main.viewmodels
-
-import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.ViewModel
-import org.linphone.utils.Event
-
-/**
- * This view model is dedicated to the top bar while in edition mode for item(s) selection in list
- */
-class ListTopBarViewModel : ViewModel() {
-    val isEditionEnabled = MutableLiveData<Boolean>()
-
-    val isSelectionNotEmpty = MutableLiveData<Boolean>()
-
-    val selectAllEvent: MutableLiveData<Event<Boolean>> by lazy {
-        MutableLiveData<Event<Boolean>>()
-    }
-
-    val unSelectAllEvent: MutableLiveData<Event<Boolean>> by lazy {
-        MutableLiveData<Event<Boolean>>()
-    }
-
-    val deleteSelectionEvent: MutableLiveData<Event<Boolean>> by lazy {
-        MutableLiveData<Event<Boolean>>()
-    }
-
-    val selectedItems = MutableLiveData<ArrayList<Int>>()
-
-    init {
-        isEditionEnabled.value = false
-        isSelectionNotEmpty.value = false
-        selectedItems.value = arrayListOf()
-    }
-
-    fun onSelectAll(lastIndex: Int) {
-        val list = arrayListOf<Int>()
-        list.addAll(0.rangeTo(lastIndex))
-
-        selectedItems.value = list
-        isSelectionNotEmpty.value = list.isNotEmpty()
-    }
-
-    fun onUnSelectAll() {
-        val list = arrayListOf<Int>()
-
-        selectedItems.value = list
-        isSelectionNotEmpty.value = false
-    }
-
-    fun onToggleSelect(position: Int) {
-        val list = arrayListOf<Int>()
-        list.addAll(selectedItems.value.orEmpty())
-
-        if (list.contains(position)) {
-            list.remove(position)
-        } else {
-            list.add(position)
-        }
-
-        isSelectionNotEmpty.value = list.isNotEmpty()
-        selectedItems.value = list
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/main/viewmodels/LogsUploadViewModel.kt b/app/src/main/java/org/linphone/activities/main/viewmodels/LogsUploadViewModel.kt
deleted file mode 100644
index ca9a083df..000000000
--- a/app/src/main/java/org/linphone/activities/main/viewmodels/LogsUploadViewModel.kt
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package org.linphone.activities.main.viewmodels
-
-import androidx.lifecycle.MutableLiveData
-import org.linphone.LinphoneApplication.Companion.coreContext
-import org.linphone.core.Core
-import org.linphone.core.CoreListenerStub
-import org.linphone.utils.Event
-
-open class LogsUploadViewModel : MessageNotifierViewModel() {
-    val uploadInProgress = MutableLiveData<Boolean>()
-
-    val resetCompleteEvent: MutableLiveData<Event<Boolean>> by lazy {
-        MutableLiveData<Event<Boolean>>()
-    }
-
-    val uploadFinishedEvent: MutableLiveData<Event<String>> by lazy {
-        MutableLiveData<Event<String>>()
-    }
-
-    val uploadErrorEvent: MutableLiveData<Event<Boolean>> by lazy {
-        MutableLiveData<Event<Boolean>>()
-    }
-
-    private val listener = object : CoreListenerStub() {
-        override fun onLogCollectionUploadStateChanged(
-            core: Core,
-            state: Core.LogCollectionUploadState,
-            info: String
-        ) {
-            if (state == Core.LogCollectionUploadState.Delivered) {
-                uploadInProgress.value = false
-                uploadFinishedEvent.value = Event(info)
-            } else if (state == Core.LogCollectionUploadState.NotDelivered) {
-                uploadInProgress.value = false
-                uploadErrorEvent.value = Event(true)
-            }
-        }
-    }
-
-    init {
-        coreContext.core.addListener(listener)
-        uploadInProgress.value = false
-    }
-
-    override fun onCleared() {
-        coreContext.core.removeListener(listener)
-
-        super.onCleared()
-    }
-
-    fun uploadLogs() {
-        uploadInProgress.value = true
-        coreContext.core.uploadLogCollection()
-    }
-
-    fun resetLogs() {
-        coreContext.core.resetLogCollection()
-        resetCompleteEvent.value = Event(true)
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/main/viewmodels/MessageNotifierViewModel.kt b/app/src/main/java/org/linphone/activities/main/viewmodels/MessageNotifierViewModel.kt
deleted file mode 100644
index 6e81ee8db..000000000
--- a/app/src/main/java/org/linphone/activities/main/viewmodels/MessageNotifierViewModel.kt
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.main.viewmodels
-
-import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.ViewModel
-import org.linphone.utils.Event
-
-/* Helper for view models to notify user of a massage through a Snackbar */
-abstract class MessageNotifierViewModel : ViewModel() {
-    val onMessageToNotifyEvent = MutableLiveData<Event<Int>>()
-}
diff --git a/app/src/main/java/org/linphone/activities/main/viewmodels/SharedMainViewModel.kt b/app/src/main/java/org/linphone/activities/main/viewmodels/SharedMainViewModel.kt
deleted file mode 100644
index 5bc6ae662..000000000
--- a/app/src/main/java/org/linphone/activities/main/viewmodels/SharedMainViewModel.kt
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.main.viewmodels
-
-import android.net.Uri
-import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.ViewModel
-import org.linphone.LinphoneApplication.Companion.corePreferences
-import org.linphone.activities.main.history.data.GroupedCallLogData
-import org.linphone.core.*
-import org.linphone.utils.Event
-
-class SharedMainViewModel : ViewModel() {
-    val toggleDrawerEvent = MutableLiveData<Event<Boolean>>()
-
-    val layoutChangedEvent = MutableLiveData<Event<Boolean>>()
-    var isSlidingPaneSlideable = MutableLiveData<Boolean>()
-
-    /* Call history */
-
-    val selectedCallLogGroup = MutableLiveData<GroupedCallLogData>()
-
-    /* Chat */
-
-    val selectedChatRoom = MutableLiveData<ChatRoom>()
-    var destructionPendingChatRoom: ChatRoom? = null
-
-    val selectedGroupChatRoom = MutableLiveData<ChatRoom>()
-
-    val filesToShare = MutableLiveData<ArrayList<String>>()
-
-    val textToShare = MutableLiveData<String>()
-
-    val messageToForwardEvent: MutableLiveData<Event<ChatMessage>> by lazy {
-        MutableLiveData<Event<ChatMessage>>()
-    }
-
-    val isPendingMessageForward = MutableLiveData<Boolean>()
-
-    val contentToOpen = MutableLiveData<Content>()
-
-    var createEncryptedChatRoom: Boolean = corePreferences.forceEndToEndEncryptedChat
-
-    val chatRoomParticipants = MutableLiveData<ArrayList<Address>>()
-
-    var chatRoomSubject: String = ""
-
-    // When using keyboard to share gif or other, see RichContentReceiver & RichEditText classes
-    val richContentUri = MutableLiveData<Event<Uri>>()
-
-    val refreshChatRoomInListEvent: MutableLiveData<Event<Boolean>> by lazy {
-        MutableLiveData<Event<Boolean>>()
-    }
-
-    /* Contacts */
-
-    val selectedContact = MutableLiveData<Friend>()
-
-    // For correct animations directions
-    val updateContactsAnimationsBasedOnDestination: MutableLiveData<Event<Int>> by lazy {
-        MutableLiveData<Event<Int>>()
-    }
-
-    /* Accounts */
-
-    val defaultAccountChanged: MutableLiveData<Boolean> by lazy {
-        MutableLiveData<Boolean>()
-    }
-
-    val accountRemoved: MutableLiveData<Boolean> by lazy {
-        MutableLiveData<Boolean>()
-    }
-
-    val publishPresenceToggled: MutableLiveData<Boolean> by lazy {
-        MutableLiveData<Boolean>()
-    }
-
-    val accountSettingsFragmentOpenedEvent: MutableLiveData<Event<Boolean>> by lazy {
-        MutableLiveData<Event<Boolean>>()
-    }
-
-    /* Call */
-
-    var pendingCallTransfer: Boolean = false
-
-    /* Conference */
-
-    val addressOfConferenceInfoToEdit: MutableLiveData<Event<String>> by lazy {
-        MutableLiveData<Event<String>>()
-    }
-
-    val participantsListForNextScheduledMeeting: MutableLiveData<Event<ArrayList<Address>>> by lazy {
-        MutableLiveData<Event<ArrayList<Address>>>()
-    }
-
-    /* Dialer */
-
-    var dialerUri: String = ""
-
-    // For correct animations directions
-    val updateDialerAnimationsBasedOnDestination: MutableLiveData<Event<Int>> by lazy {
-        MutableLiveData<Event<Int>>()
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/main/viewmodels/StatusViewModel.kt b/app/src/main/java/org/linphone/activities/main/viewmodels/StatusViewModel.kt
deleted file mode 100644
index 7b10b5210..000000000
--- a/app/src/main/java/org/linphone/activities/main/viewmodels/StatusViewModel.kt
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.main.viewmodels
-
-import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.ViewModel
-import java.util.*
-import org.linphone.LinphoneApplication.Companion.coreContext
-import org.linphone.R
-import org.linphone.core.*
-import org.linphone.core.tools.Log
-
-open class StatusViewModel : ViewModel() {
-    val registrationStatusText = MutableLiveData<Int>()
-
-    val registrationStatusDrawable = MutableLiveData<Int>()
-
-    val voiceMailCount = MutableLiveData<Int>()
-
-    private val listener: CoreListenerStub = object : CoreListenerStub() {
-        override fun onAccountRegistrationStateChanged(
-            core: Core,
-            account: Account,
-            state: RegistrationState,
-            message: String
-        ) {
-            if (account == core.defaultAccount) {
-                updateDefaultAccountRegistrationStatus(state)
-            } else if (core.accountList.isEmpty()) {
-                // Update registration status when default account is removed
-                registrationStatusText.value = getStatusIconText(state)
-                registrationStatusDrawable.value = getStatusIconResource(state)
-            }
-        }
-
-        override fun onNotifyReceived(
-            core: Core,
-            event: Event,
-            notifiedEvent: String,
-            body: Content?
-        ) {
-            if (body?.type == "application" && body.subtype == "simple-message-summary" && body.size > 0) {
-                val data = body.utf8Text?.lowercase(Locale.getDefault())
-                val voiceMail = data?.split("voice-message: ")
-                if ((voiceMail?.size ?: 0) >= 2) {
-                    val toParse = voiceMail!![1].split("/", limit = 0)
-                    try {
-                        val unreadCount: Int = toParse[0].toInt()
-                        voiceMailCount.value = unreadCount
-                    } catch (nfe: NumberFormatException) {
-                        Log.e("[Status Fragment] $nfe")
-                    }
-                }
-            }
-        }
-    }
-
-    init {
-        val core = coreContext.core
-        core.addListener(listener)
-
-        var state: RegistrationState = RegistrationState.None
-        val defaultAccount = core.defaultAccount
-        if (defaultAccount != null) {
-            state = defaultAccount.state
-        }
-        updateDefaultAccountRegistrationStatus(state)
-    }
-
-    override fun onCleared() {
-        coreContext.core.removeListener(listener)
-        super.onCleared()
-    }
-
-    fun refreshRegister() {
-        coreContext.core.refreshRegisters()
-    }
-
-    fun updateDefaultAccountRegistrationStatus(state: RegistrationState) {
-        registrationStatusText.value = getStatusIconText(state)
-        registrationStatusDrawable.value = getStatusIconResource(state)
-    }
-
-    private fun getStatusIconText(state: RegistrationState): Int {
-        return when (state) {
-            RegistrationState.Ok -> R.string.status_connected
-            RegistrationState.Progress, RegistrationState.Refreshing -> R.string.status_in_progress
-            RegistrationState.Failed -> R.string.status_error
-            else -> R.string.status_not_connected
-        }
-    }
-
-    private fun getStatusIconResource(state: RegistrationState): Int {
-        return when (state) {
-            RegistrationState.Ok -> R.drawable.led_registered
-            RegistrationState.Progress, RegistrationState.Refreshing -> R.drawable.led_registration_in_progress
-            RegistrationState.Failed -> R.drawable.led_error
-            else -> R.drawable.led_not_registered
-        }
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/main/viewmodels/TabsViewModel.kt b/app/src/main/java/org/linphone/activities/main/viewmodels/TabsViewModel.kt
deleted file mode 100644
index f637c71a3..000000000
--- a/app/src/main/java/org/linphone/activities/main/viewmodels/TabsViewModel.kt
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.main.viewmodels
-
-import android.animation.ValueAnimator
-import android.view.animation.LinearInterpolator
-import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.ViewModel
-import org.linphone.LinphoneApplication.Companion.coreContext
-import org.linphone.LinphoneApplication.Companion.corePreferences
-import org.linphone.R
-import org.linphone.core.*
-import org.linphone.utils.AppUtils
-
-class TabsViewModel : ViewModel() {
-    val unreadMessagesCount = MutableLiveData<Int>()
-    val missedCallsCount = MutableLiveData<Int>()
-
-    val leftAnchor = MutableLiveData<Float>()
-    val middleAnchor = MutableLiveData<Float>()
-    val rightAnchor = MutableLiveData<Float>()
-
-    val historyMissedCountTranslateY = MutableLiveData<Float>()
-    val chatUnreadCountTranslateY = MutableLiveData<Float>()
-
-    private val bounceAnimator: ValueAnimator by lazy {
-        ValueAnimator.ofFloat(
-            AppUtils.getDimension(R.dimen.tabs_fragment_unread_count_bounce_offset),
-            0f
-        ).apply {
-            addUpdateListener {
-                val value = it.animatedValue as Float
-                historyMissedCountTranslateY.value = -value
-                chatUnreadCountTranslateY.value = -value
-            }
-            interpolator = LinearInterpolator()
-            duration = 250
-            repeatMode = ValueAnimator.REVERSE
-            repeatCount = ValueAnimator.INFINITE
-        }
-    }
-
-    private val listener: CoreListenerStub = object : CoreListenerStub() {
-        override fun onCallStateChanged(
-            core: Core,
-            call: Call,
-            state: Call.State,
-            message: String
-        ) {
-            if (state == Call.State.End || state == Call.State.Error) {
-                updateMissedCallCount()
-            }
-        }
-
-        override fun onChatRoomRead(core: Core, chatRoom: ChatRoom) {
-            updateUnreadChatCount()
-        }
-
-        override fun onMessagesReceived(
-            core: Core,
-            chatRoom: ChatRoom,
-            messages: Array<out ChatMessage>
-        ) {
-            updateUnreadChatCount()
-        }
-
-        override fun onChatRoomStateChanged(core: Core, chatRoom: ChatRoom, state: ChatRoom.State) {
-            if (state == ChatRoom.State.Deleted) {
-                updateUnreadChatCount()
-            }
-        }
-    }
-
-    init {
-        coreContext.core.addListener(listener)
-
-        if (corePreferences.disableChat) {
-            leftAnchor.value = 1 / 3F
-            middleAnchor.value = 2 / 3F
-            rightAnchor.value = 1F
-        } else {
-            leftAnchor.value = 0.25F
-            middleAnchor.value = 0.5F
-            rightAnchor.value = 0.75F
-        }
-
-        updateUnreadChatCount()
-        updateMissedCallCount()
-
-        if (corePreferences.enableAnimations) bounceAnimator.start()
-    }
-
-    override fun onCleared() {
-        coreContext.core.removeListener(listener)
-        super.onCleared()
-    }
-
-    fun updateMissedCallCount() {
-        missedCallsCount.value = coreContext.core.missedCallsCount
-    }
-
-    fun updateUnreadChatCount() {
-        unreadMessagesCount.value = if (corePreferences.disableChat) 0 else coreContext.core.unreadChatMessageCountFromActiveLocals
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/voip/CallActivity.kt b/app/src/main/java/org/linphone/activities/voip/CallActivity.kt
deleted file mode 100644
index 089bf912f..000000000
--- a/app/src/main/java/org/linphone/activities/voip/CallActivity.kt
+++ /dev/null
@@ -1,331 +0,0 @@
-/*
- * Copyright (c) 2010-2021 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.voip
-
-import android.Manifest
-import android.content.Intent
-import android.content.pm.PackageManager
-import android.content.res.Configuration
-import android.os.Build
-import android.os.Bundle
-import androidx.annotation.RequiresApi
-import androidx.databinding.DataBindingUtil
-import androidx.lifecycle.ViewModelProvider
-import androidx.navigation.findNavController
-import androidx.window.layout.FoldingFeature
-import org.linphone.LinphoneApplication.Companion.coreContext
-import org.linphone.LinphoneApplication.Companion.corePreferences
-import org.linphone.R
-import org.linphone.activities.*
-import org.linphone.activities.main.MainActivity
-import org.linphone.activities.voip.viewmodels.CallsViewModel
-import org.linphone.activities.voip.viewmodels.ConferenceViewModel
-import org.linphone.activities.voip.viewmodels.ControlsViewModel
-import org.linphone.activities.voip.viewmodels.StatisticsListViewModel
-import org.linphone.compatibility.Compatibility
-import org.linphone.core.Call
-import org.linphone.core.GlobalState
-import org.linphone.core.tools.Log
-import org.linphone.databinding.VoipActivityBinding
-import org.linphone.mediastream.Version
-import org.linphone.utils.PermissionHelper
-
-class CallActivity : ProximitySensorActivity() {
-    private lateinit var binding: VoipActivityBinding
-    private lateinit var controlsViewModel: ControlsViewModel
-    private lateinit var callsViewModel: CallsViewModel
-    private lateinit var conferenceViewModel: ConferenceViewModel
-    private lateinit var statsViewModel: StatisticsListViewModel
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        // Flag in manifest should be enough starting Android 8.1
-        if (Version.sdkStrictlyBelow(Version.API27_OREO_81)) {
-            Compatibility.setShowWhenLocked(this, true)
-            Compatibility.setTurnScreenOn(this, true)
-            Compatibility.requestDismissKeyguard(this)
-        }
-
-        super.onCreate(savedInstanceState)
-
-        binding = DataBindingUtil.setContentView(this, R.layout.voip_activity)
-        binding.lifecycleOwner = this
-    }
-
-    override fun onPostCreate(savedInstanceState: Bundle?) {
-        super.onPostCreate(savedInstanceState)
-
-        // This can't be done in onCreate(), has to be at least in onPostCreate() !
-        val navController = binding.navHostFragment.findNavController()
-        val navControllerStoreOwner = navController.getViewModelStoreOwner(R.id.call_nav_graph)
-
-        controlsViewModel = ViewModelProvider(navControllerStoreOwner)[ControlsViewModel::class.java]
-        binding.controlsViewModel = controlsViewModel
-
-        callsViewModel = ViewModelProvider(navControllerStoreOwner)[CallsViewModel::class.java]
-
-        conferenceViewModel = ViewModelProvider(navControllerStoreOwner)[ConferenceViewModel::class.java]
-
-        statsViewModel = ViewModelProvider(navControllerStoreOwner)[StatisticsListViewModel::class.java]
-
-        val isInPipMode = Compatibility.isInPictureInPictureMode(this)
-        Log.i("[Call Activity] onPostCreate: is in PiP mode? $isInPipMode")
-        controlsViewModel.pipMode.value = isInPipMode
-
-        controlsViewModel.askPermissionEvent.observe(
-            this
-        ) {
-            it.consume { permission ->
-                Log.i("[Call Activity] Asking for $permission permission")
-                requestPermissions(arrayOf(permission), 0)
-            }
-        }
-
-        controlsViewModel.fullScreenMode.observe(
-            this
-        ) { hide ->
-            Compatibility.hideAndroidSystemUI(hide, window)
-        }
-
-        controlsViewModel.proximitySensorEnabled.observe(
-            this
-        ) { enabled ->
-            Log.i(
-                "[Call Activity] ${if (enabled) "Enabling" else "Disabling"} proximity sensor (if possible)"
-            )
-            enableProximitySensor(enabled)
-        }
-
-        controlsViewModel.isVideoEnabled.observe(
-            this
-        ) { enabled ->
-            Compatibility.enableAutoEnterPiP(
-                this,
-                enabled,
-                conferenceViewModel.conferenceExists.value == true
-            )
-        }
-
-        controlsViewModel.callStatsVisible.observe(
-            this
-        ) { visible ->
-            if (visible) statsViewModel.enable() else statsViewModel.disable()
-        }
-
-        callsViewModel.noMoreCallEvent.observe(
-            this
-        ) {
-            it.consume { noMoreCall ->
-                if (noMoreCall) {
-                    Log.i("[Call Activity] No more call event fired, finishing activity")
-                    finish()
-                }
-            }
-        }
-
-        callsViewModel.currentCallData.observe(
-            this
-        ) { callData ->
-            val call = callData.call
-            if (call.conference == null) {
-                Log.i(
-                    "[Call Activity] Current call isn't linked to a conference, switching to SingleCall fragment"
-                )
-                navigateToActiveCall()
-            } else {
-                Log.i(
-                    "[Call Activity] Current call is linked to a conference, switching to ConferenceCall fragment"
-                )
-                navigateToConferenceCall()
-            }
-        }
-
-        callsViewModel.askPermissionEvent.observe(
-            this
-        ) {
-            it.consume { permission ->
-                Log.i("[Call Activity] Asking for $permission permission")
-                requestPermissions(arrayOf(permission), 0)
-            }
-        }
-
-        conferenceViewModel.conferenceExists.observe(
-            this
-        ) { exists ->
-            if (exists) {
-                Log.i(
-                    "[Call Activity] Found active conference, changing  switching to ConferenceCall fragment"
-                )
-                navigateToConferenceCall()
-            } else if (coreContext.core.callsNb > 0) {
-                Log.i(
-                    "[Call Activity] Conference no longer exists, switching to SingleCall fragment"
-                )
-                navigateToActiveCall()
-            }
-        }
-
-        conferenceViewModel.isConferenceLocallyPaused.observe(
-            this
-        ) { paused ->
-            if (!paused) {
-                Log.i("[Call Activity] Entered conference, make sure conference fragment is active")
-                navigateToConferenceCall()
-            }
-        }
-
-        checkPermissions()
-    }
-
-    override fun onUserLeaveHint() {
-        super.onUserLeaveHint()
-
-        if (coreContext.core.currentCall?.currentParams?.isVideoEnabled == true) {
-            Log.i("[Call Activity] Entering PiP mode")
-            Compatibility.enterPipMode(this, conferenceViewModel.conferenceExists.value == true)
-        }
-    }
-
-    @RequiresApi(Build.VERSION_CODES.O)
-    override fun onPictureInPictureModeChanged(
-        isInPictureInPictureMode: Boolean,
-        newConfig: Configuration
-    ) {
-        super.onPictureInPictureModeChanged(isInPictureInPictureMode, newConfig)
-
-        Log.i(
-            "[Call Activity] onPictureInPictureModeChanged: is in PiP mode? $isInPictureInPictureMode"
-        )
-        if (::controlsViewModel.isInitialized) {
-            // To hide UI except for TextureViews
-            controlsViewModel.pipMode.value = isInPictureInPictureMode
-        }
-    }
-
-    override fun onResume() {
-        super.onResume()
-
-        if (coreContext.core.callsNb == 0) {
-            Log.w("[Call Activity] Resuming but no call found...")
-            if (isTaskRoot) {
-                // When resuming app from recent tasks make sure MainActivity will be launched if there is no call
-                val intent = Intent()
-                intent.setClass(this, MainActivity::class.java)
-                intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
-                startActivity(intent)
-            } else {
-                finish()
-            }
-            return
-        }
-        coreContext.removeCallOverlay()
-
-        val currentCall = coreContext.core.currentCall
-        when (currentCall?.state) {
-            Call.State.OutgoingInit, Call.State.OutgoingEarlyMedia, Call.State.OutgoingProgress, Call.State.OutgoingRinging -> {
-                navigateToOutgoingCall()
-            }
-            Call.State.IncomingReceived, Call.State.IncomingEarlyMedia -> {
-                val earlyMediaVideoEnabled = corePreferences.acceptEarlyMedia &&
-                    currentCall.state == Call.State.IncomingEarlyMedia &&
-                    currentCall.currentParams.isVideoEnabled
-                navigateToIncomingCall(earlyMediaVideoEnabled)
-            }
-            else -> {}
-        }
-    }
-
-    override fun onPause() {
-        val core = coreContext.core
-        if (core.callsNb > 0) {
-            coreContext.createCallOverlay()
-        }
-
-        super.onPause()
-    }
-
-    override fun onDestroy() {
-        if (coreContext.core.globalState != GlobalState.Off) {
-            coreContext.core.nativeVideoWindowId = null
-            coreContext.core.nativePreviewWindowId = null
-        }
-
-        super.onDestroy()
-    }
-
-    private fun checkPermissions() {
-        val permissionsRequiredList = arrayListOf<String>()
-
-        if (!PermissionHelper.get().hasRecordAudioPermission()) {
-            Log.i("[Call Activity] Asking for RECORD_AUDIO permission")
-            permissionsRequiredList.add(Manifest.permission.RECORD_AUDIO)
-        }
-
-        if (callsViewModel.currentCallData.value?.call?.currentParams?.isVideoEnabled == true &&
-            !PermissionHelper.get().hasCameraPermission()
-        ) {
-            Log.i("[Call Activity] Asking for CAMERA permission")
-            permissionsRequiredList.add(Manifest.permission.CAMERA)
-        }
-
-        if (permissionsRequiredList.isNotEmpty()) {
-            val permissionsRequired = arrayOfNulls<String>(permissionsRequiredList.size)
-            permissionsRequiredList.toArray(permissionsRequired)
-            requestPermissions(permissionsRequired, 0)
-        }
-    }
-
-    override fun onRequestPermissionsResult(
-        requestCode: Int,
-        permissions: Array<out String>,
-        grantResults: IntArray
-    ) {
-        if (requestCode == 0) {
-            for (i in permissions.indices) {
-                when (permissions[i]) {
-                    Manifest.permission.RECORD_AUDIO -> if (grantResults[i] == PackageManager.PERMISSION_GRANTED) {
-                        Log.i("[Call Activity] RECORD_AUDIO permission has been granted")
-                        callsViewModel.updateMicState()
-                    }
-                    Manifest.permission.CAMERA -> if (grantResults[i] == PackageManager.PERMISSION_GRANTED) {
-                        Log.i("[Call Activity] CAMERA permission has been granted")
-                        coreContext.core.reloadVideoDevices()
-                        controlsViewModel.toggleVideo()
-                    }
-                    Manifest.permission.WRITE_EXTERNAL_STORAGE -> if (grantResults[i] == PackageManager.PERMISSION_GRANTED) {
-                        Log.i(
-                            "[Call Activity] WRITE_EXTERNAL_STORAGE permission has been granted, taking snapshot"
-                        )
-                        controlsViewModel.takeSnapshot()
-                    }
-                }
-            }
-        }
-        super.onRequestPermissionsResult(requestCode, permissions, grantResults)
-    }
-
-    override fun onLayoutChanges(foldingFeature: FoldingFeature?) {
-        foldingFeature ?: return
-        Log.i(
-            "[Call Activity] Folding feature state changed: ${foldingFeature.state}, orientation is ${foldingFeature.orientation}"
-        )
-
-        controlsViewModel.foldingState.value = foldingFeature
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/voip/ConferenceDisplayMode.kt b/app/src/main/java/org/linphone/activities/voip/ConferenceDisplayMode.kt
deleted file mode 100644
index 0e529b351..000000000
--- a/app/src/main/java/org/linphone/activities/voip/ConferenceDisplayMode.kt
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2010-2022 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.voip
-
-enum class ConferenceDisplayMode {
-    GRID,
-    ACTIVE_SPEAKER,
-    AUDIO_ONLY
-}
diff --git a/app/src/main/java/org/linphone/activities/voip/data/CallData.kt b/app/src/main/java/org/linphone/activities/voip/data/CallData.kt
deleted file mode 100644
index 4c2fe15db..000000000
--- a/app/src/main/java/org/linphone/activities/voip/data/CallData.kt
+++ /dev/null
@@ -1,315 +0,0 @@
-/*
- * Copyright (c) 2010-2021 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.voip.data
-
-import android.view.View
-import android.widget.Toast
-import androidx.lifecycle.MediatorLiveData
-import androidx.lifecycle.MutableLiveData
-import java.util.*
-import kotlinx.coroutines.*
-import org.linphone.LinphoneApplication.Companion.coreContext
-import org.linphone.R
-import org.linphone.compatibility.Compatibility
-import org.linphone.contact.GenericContactData
-import org.linphone.core.*
-import org.linphone.core.tools.Log
-import org.linphone.utils.AppUtils
-import org.linphone.utils.LinphoneUtils
-
-open class CallData(val call: Call) : GenericContactData(call.remoteAddress) {
-    interface CallContextMenuClickListener {
-        fun onShowContextMenu(anchor: View, callData: CallData)
-    }
-
-    val displayableAddress = MutableLiveData<String>()
-
-    val isPaused = MutableLiveData<Boolean>()
-    val isRemotelyPaused = MutableLiveData<Boolean>()
-    val canBePaused = MutableLiveData<Boolean>()
-
-    val isRecording = MutableLiveData<Boolean>()
-    val isRemotelyRecorded = MutableLiveData<Boolean>()
-
-    val isInRemoteConference = MutableLiveData<Boolean>()
-    val remoteConferenceSubject = MutableLiveData<String>()
-    val isConferenceCall = MediatorLiveData<Boolean>()
-    val conferenceParticipants = MutableLiveData<List<ConferenceInfoParticipantData>>()
-    val conferenceParticipantsCountLabel = MutableLiveData<String>()
-
-    val isOutgoing = MutableLiveData<Boolean>()
-    val isIncoming = MutableLiveData<Boolean>()
-
-    var chatRoom: ChatRoom? = null
-
-    var contextMenuClickListener: CallContextMenuClickListener? = null
-
-    private var timer: Timer? = null
-
-    private val listener = object : CallListenerStub() {
-        override fun onStateChanged(call: Call, state: Call.State, message: String) {
-            if (call != this@CallData.call) return
-            Log.i("[Call] State changed: $state")
-
-            update()
-
-            if (call.state == Call.State.UpdatedByRemote) {
-                val remoteVideo = call.remoteParams?.isVideoEnabled ?: false
-                val localVideo = call.currentParams.isVideoEnabled
-                if (remoteVideo && !localVideo) {
-                    // User has 30 secs to accept or decline call update
-                    startVideoUpdateAcceptanceTimer()
-                }
-            } else if (state == Call.State.End || state == Call.State.Released || state == Call.State.Error) {
-                timer?.cancel()
-            } else if (state == Call.State.StreamsRunning) {
-                // Stop call update timer once user has accepted or declined call update
-                timer?.cancel()
-            }
-        }
-
-        override fun onRemoteRecording(call: Call, recording: Boolean) {
-            Log.i("[Call] Remote recording changed: $recording")
-            isRemotelyRecorded.value = recording
-        }
-
-        override fun onSnapshotTaken(call: Call, filePath: String) {
-            Log.i("[Call] Snapshot taken: $filePath")
-            val content = Factory.instance().createContent()
-            content.filePath = filePath
-            content.type = "image"
-            content.subtype = "jpeg"
-            content.name = filePath.substring(filePath.lastIndexOf("/") + 1)
-
-            scope.launch {
-                if (Compatibility.addImageToMediaStore(coreContext.context, content)) {
-                    Log.i("[Call] Added snapshot ${content.name} to Media Store")
-                    val message = String.format(
-                        AppUtils.getString(R.string.call_screenshot_taken),
-                        content.name
-                    )
-                    Toast.makeText(coreContext.context, message, Toast.LENGTH_SHORT).show()
-                } else {
-                    Log.e("[Call] Something went wrong while copying file to Media Store...")
-                }
-            }
-        }
-    }
-
-    private val scope = CoroutineScope(Dispatchers.Main + SupervisorJob())
-
-    init {
-        call.addListener(listener)
-        isRemotelyRecorded.value = call.remoteParams?.isRecording
-        displayableAddress.value = LinphoneUtils.getDisplayableAddress(call.remoteAddress)
-
-        isConferenceCall.addSource(remoteConferenceSubject) {
-            isConferenceCall.value = remoteConferenceSubject.value.orEmpty().isNotEmpty() || conferenceParticipants.value.orEmpty().isNotEmpty()
-        }
-        isConferenceCall.addSource(conferenceParticipants) {
-            isConferenceCall.value = remoteConferenceSubject.value.orEmpty().isNotEmpty() || conferenceParticipants.value.orEmpty().isNotEmpty()
-        }
-
-        update()
-    }
-
-    override fun destroy() {
-        call.removeListener(listener)
-        timer?.cancel()
-        scope.cancel()
-
-        super.destroy()
-    }
-
-    fun togglePause() {
-        if (isCallPaused()) {
-            resume()
-        } else {
-            pause()
-        }
-    }
-
-    fun pause() {
-        call.pause()
-    }
-
-    fun resume() {
-        call.resume()
-    }
-
-    fun accept() {
-        call.accept()
-    }
-
-    fun terminate() {
-        call.terminate()
-    }
-
-    fun toggleRecording() {
-        if (call.params.isRecording) {
-            call.stopRecording()
-        } else {
-            call.startRecording()
-        }
-        isRecording.value = call.params.isRecording
-    }
-
-    fun showContextMenu(anchor: View) {
-        contextMenuClickListener?.onShowContextMenu(anchor, this)
-    }
-
-    fun isActiveAndNotInConference(): Boolean {
-        return isPaused.value == false && isRemotelyPaused.value == false && call.conference?.call != null && isInRemoteConference.value == false
-    }
-
-    private fun isCallPaused(): Boolean {
-        return when (call.state) {
-            Call.State.Paused, Call.State.Pausing -> true
-            else -> false
-        }
-    }
-
-    private fun isCallRemotelyPaused(): Boolean {
-        return when (call.state) {
-            Call.State.PausedByRemote -> {
-                val conference = call.conference
-                if (conference != null && conference.me.isFocus) {
-                    Log.w(
-                        "[Call] State is paused by remote but we are the focus of the conference, so considering call as active"
-                    )
-                    false
-                } else {
-                    true
-                }
-            }
-            else -> false
-        }
-    }
-
-    private fun canCallBePaused(): Boolean {
-        return !call.mediaInProgress() && when (call.state) {
-            Call.State.StreamsRunning, Call.State.PausedByRemote -> true
-            else -> false
-        }
-    }
-
-    private fun update() {
-        isRecording.value = call.params.isRecording
-        isPaused.value = isCallPaused()
-        isRemotelyPaused.value = isCallRemotelyPaused()
-        canBePaused.value = canCallBePaused()
-
-        updateConferenceInfo()
-
-        isOutgoing.value = when (call.state) {
-            Call.State.OutgoingInit, Call.State.OutgoingEarlyMedia, Call.State.OutgoingProgress, Call.State.OutgoingRinging -> true
-            else -> false
-        }
-        isIncoming.value = when (call.state) {
-            Call.State.IncomingReceived, Call.State.IncomingEarlyMedia -> true
-            else -> false
-        }
-
-        // Check periodically until mediaInProgress is false
-        if (call.mediaInProgress()) {
-            scope.launch {
-                delay(1000)
-                update()
-            }
-        }
-    }
-
-    private fun updateConferenceInfo() {
-        val conference = call.conference
-        isInRemoteConference.value = conference != null && conference.call != null
-        if (conference != null) {
-            Log.d("[Call] Found conference attached to call")
-            remoteConferenceSubject.value = LinphoneUtils.getConferenceSubject(conference)
-            Log.d(
-                "[Call] Found conference related to this call with subject [${remoteConferenceSubject.value}]"
-            )
-
-            val participantsList = arrayListOf<ConferenceInfoParticipantData>()
-            for (participant in conference.participantList) {
-                val participantData = ConferenceInfoParticipantData(participant.address)
-                participantsList.add(participantData)
-            }
-
-            conferenceParticipants.value = participantsList
-            conferenceParticipantsCountLabel.value = coreContext.context.getString(
-                R.string.conference_participants_title,
-                participantsList.size
-            )
-        } else {
-            val conferenceAddress = LinphoneUtils.getConferenceAddress(call)
-            val conferenceInfo = if (conferenceAddress != null) {
-                coreContext.core.findConferenceInformationFromUri(
-                    conferenceAddress
-                )
-            } else {
-                null
-            }
-            if (conferenceInfo != null) {
-                Log.d(
-                    "[Call] Found matching conference info with subject: ${conferenceInfo.subject}"
-                )
-                remoteConferenceSubject.value = conferenceInfo.subject
-
-                val participantsList = arrayListOf<ConferenceInfoParticipantData>()
-                for (participant in conferenceInfo.participants) {
-                    val participantData = ConferenceInfoParticipantData(participant)
-                    participantsList.add(participantData)
-                }
-
-                // Add organizer if not in participants list
-                val organizer = conferenceInfo.organizer
-                if (organizer != null) {
-                    val found = participantsList.find { it.participant.weakEqual(organizer) }
-                    if (found == null) {
-                        val participantData = ConferenceInfoParticipantData(organizer)
-                        participantsList.add(0, participantData)
-                    }
-                }
-
-                conferenceParticipants.value = participantsList
-                conferenceParticipantsCountLabel.value = coreContext.context.getString(
-                    R.string.conference_participants_title,
-                    participantsList.size
-                )
-            }
-        }
-    }
-
-    private fun startVideoUpdateAcceptanceTimer() {
-        timer?.cancel()
-
-        timer = Timer("Call update timeout")
-        timer?.schedule(
-            object : TimerTask() {
-                override fun run() {
-                    // Decline call update
-                    coreContext.videoUpdateRequestTimedOut(call)
-                }
-            },
-            30000
-        )
-        Log.i("[Call] Starting 30 seconds timer to automatically decline video request")
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/voip/data/CallStatisticsData.kt b/app/src/main/java/org/linphone/activities/voip/data/CallStatisticsData.kt
deleted file mode 100644
index 6d4051df7..000000000
--- a/app/src/main/java/org/linphone/activities/voip/data/CallStatisticsData.kt
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
- * Copyright (c) 2010-2021 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.voip.data
-
-import androidx.lifecycle.MutableLiveData
-import org.linphone.contact.GenericContactData
-import org.linphone.core.*
-
-class CallStatisticsData(val call: Call) : GenericContactData(call.remoteAddress) {
-    val audioStats = MutableLiveData<ArrayList<StatItemData>>()
-
-    val videoStats = MutableLiveData<ArrayList<StatItemData>>()
-
-    val mediaEncryptionStats = MutableLiveData<ArrayList<StatItemData>>()
-
-    val isVideoEnabled = MutableLiveData<Boolean>()
-
-    private var enabled = false
-
-    private val listener = object : CallListenerStub() {
-        override fun onStatsUpdated(call: Call, stats: CallStats) {
-            isVideoEnabled.value = call.currentParams.isVideoEnabled
-            updateCallStats(stats)
-        }
-    }
-
-    init {
-        enabled = false
-        audioStats.value = arrayListOf()
-        videoStats.value = arrayListOf()
-
-        initCallStats()
-
-        val videoEnabled = call.currentParams.isVideoEnabled
-        isVideoEnabled.value = videoEnabled
-
-        updateMediaEncryptionStats()
-    }
-
-    fun enable() {
-        enabled = true
-        call.addListener(listener)
-
-        // Needed for media encryption stats
-        updateMediaEncryptionStats()
-    }
-
-    fun disable() {
-        enabled = false
-        call.removeListener(listener)
-    }
-
-    override fun destroy() {
-        if (enabled) disable()
-        super.destroy()
-    }
-
-    private fun updateMediaEncryptionStats() {
-        initCallStats()
-    }
-
-    private fun initCallStats() {
-        val audioList = arrayListOf<StatItemData>()
-
-        audioList.add(StatItemData(StatType.CAPTURE))
-        audioList.add(StatItemData(StatType.PLAYBACK))
-        audioList.add(StatItemData(StatType.PAYLOAD))
-        audioList.add(StatItemData(StatType.ENCODER))
-        audioList.add(StatItemData(StatType.DECODER))
-        audioList.add(StatItemData(StatType.DOWNLOAD_BW))
-        audioList.add(StatItemData(StatType.UPLOAD_BW))
-        audioList.add(StatItemData(StatType.ICE))
-        audioList.add(StatItemData(StatType.IP_FAM))
-        audioList.add(StatItemData(StatType.SENDER_LOSS))
-        audioList.add(StatItemData(StatType.RECEIVER_LOSS))
-        audioList.add(StatItemData(StatType.JITTER))
-
-        audioStats.value = audioList
-
-        val mediaEncryptionList = arrayListOf<StatItemData>()
-
-        mediaEncryptionList.add(StatItemData(StatType.MEDIA_ENCRYPTION))
-
-        // ZRTP stats are only available when authentication token isn't null !
-        if (call.currentParams.mediaEncryption == MediaEncryption.ZRTP && call.authenticationToken != null) {
-            mediaEncryptionList.add(StatItemData(StatType.ZRTP_CIPHER_ALGO))
-            mediaEncryptionList.add(StatItemData(StatType.ZRTP_KEY_AGREEMENT_ALGO))
-            mediaEncryptionList.add(StatItemData(StatType.ZRTP_HASH_ALGO))
-            mediaEncryptionList.add(StatItemData(StatType.ZRTP_AUTH_TAG_ALGO))
-            mediaEncryptionList.add(StatItemData(StatType.ZRTP_AUTH_SAS_ALGO))
-        }
-
-        mediaEncryptionStats.value = mediaEncryptionList
-
-        val videoList = arrayListOf<StatItemData>()
-
-        videoList.add(StatItemData(StatType.CAPTURE))
-        videoList.add(StatItemData(StatType.PLAYBACK))
-        videoList.add(StatItemData(StatType.PAYLOAD))
-        videoList.add(StatItemData(StatType.ENCODER))
-        videoList.add(StatItemData(StatType.DECODER))
-        videoList.add(StatItemData(StatType.DOWNLOAD_BW))
-        videoList.add(StatItemData(StatType.UPLOAD_BW))
-        videoList.add(StatItemData(StatType.ESTIMATED_AVAILABLE_DOWNLOAD_BW))
-        videoList.add(StatItemData(StatType.ICE))
-        videoList.add(StatItemData(StatType.IP_FAM))
-        videoList.add(StatItemData(StatType.SENDER_LOSS))
-        videoList.add(StatItemData(StatType.RECEIVER_LOSS))
-        videoList.add(StatItemData(StatType.SENT_RESOLUTION))
-        videoList.add(StatItemData(StatType.RECEIVED_RESOLUTION))
-        videoList.add(StatItemData(StatType.SENT_FPS))
-        videoList.add(StatItemData(StatType.RECEIVED_FPS))
-
-        videoStats.value = videoList
-    }
-
-    private fun updateCallStats(stats: CallStats) {
-        if (stats.type == StreamType.Audio) {
-            for (stat in audioStats.value.orEmpty()) {
-                stat.update(call, stats)
-            }
-            for (stat in mediaEncryptionStats.value.orEmpty()) {
-                stat.update(call, stats)
-            }
-        } else if (stats.type == StreamType.Video) {
-            for (stat in videoStats.value.orEmpty()) {
-                stat.update(call, stats)
-            }
-        }
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/voip/data/ConferenceInfoParticipantData.kt b/app/src/main/java/org/linphone/activities/voip/data/ConferenceInfoParticipantData.kt
deleted file mode 100644
index bd7fe2eb6..000000000
--- a/app/src/main/java/org/linphone/activities/voip/data/ConferenceInfoParticipantData.kt
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright (c) 2010-2022 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.voip.data
-
-import org.linphone.contact.GenericContactData
-import org.linphone.core.*
-import org.linphone.utils.LinphoneUtils
-
-class ConferenceInfoParticipantData(
-    val participant: Address
-) :
-    GenericContactData(participant) {
-    val sipUri: String get() = LinphoneUtils.getDisplayableAddress(participant)
-}
diff --git a/app/src/main/java/org/linphone/activities/voip/data/ConferenceParticipantData.kt b/app/src/main/java/org/linphone/activities/voip/data/ConferenceParticipantData.kt
deleted file mode 100644
index d0e679273..000000000
--- a/app/src/main/java/org/linphone/activities/voip/data/ConferenceParticipantData.kt
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Copyright (c) 2010-2021 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.voip.data
-
-import androidx.lifecycle.MutableLiveData
-import org.linphone.contact.GenericContactData
-import org.linphone.core.*
-import org.linphone.core.tools.Log
-import org.linphone.utils.LinphoneUtils
-
-class ConferenceParticipantData(
-    val conference: Conference,
-    val participant: Participant
-) :
-    GenericContactData(participant.address) {
-    val sipUri: String get() = LinphoneUtils.getDisplayableAddress(participant.address)
-
-    val isAdmin = MutableLiveData<Boolean>()
-    val isMeAdmin = MutableLiveData<Boolean>()
-    val isSpeaker = MutableLiveData<Boolean>()
-
-    init {
-        isAdmin.value = participant.isAdmin
-        isMeAdmin.value = conference.me.isAdmin
-        isSpeaker.value = participant.role == Participant.Role.Speaker
-
-        Log.i(
-            "[Conference Participant] Participant ${participant.address.asStringUriOnly()} is ${if (participant.isAdmin) "admin" else "not admin"}"
-        )
-    }
-
-    fun setAdmin() {
-        if (conference.me.isAdmin) {
-            Log.i(
-                "[Conference Participant] Participant ${participant.address.asStringUriOnly()} will be set as admin"
-            )
-            conference.setParticipantAdminStatus(participant, true)
-        } else {
-            Log.e(
-                "[Conference Participant] You aren't admin, you can't change participants admin rights"
-            )
-        }
-    }
-
-    fun unsetAdmin() {
-        if (conference.me.isAdmin) {
-            Log.i(
-                "[Conference Participant] Participant ${participant.address.asStringUriOnly()} will be unset as admin"
-            )
-            conference.setParticipantAdminStatus(participant, false)
-        } else {
-            Log.e(
-                "[Conference Participant] You aren't admin, you can't change participants admin rights"
-            )
-        }
-    }
-
-    fun removeParticipantFromConference() {
-        if (conference.me.isAdmin) {
-            Log.i(
-                "[Conference Participant] Removing participant ${participant.address.asStringUriOnly()} from conference"
-            )
-            conference.removeParticipant(participant)
-        } else {
-            Log.e(
-                "[Conference Participant] Can't remove participant ${participant.address.asStringUriOnly()} from conference, you aren't admin"
-            )
-        }
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/voip/data/ConferenceParticipantDeviceData.kt b/app/src/main/java/org/linphone/activities/voip/data/ConferenceParticipantDeviceData.kt
deleted file mode 100644
index 78cf5e860..000000000
--- a/app/src/main/java/org/linphone/activities/voip/data/ConferenceParticipantDeviceData.kt
+++ /dev/null
@@ -1,186 +0,0 @@
-/*
- * Copyright (c) 2010-2021 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.voip.data
-
-import android.view.TextureView
-import androidx.lifecycle.MediatorLiveData
-import androidx.lifecycle.MutableLiveData
-import org.linphone.LinphoneApplication.Companion.coreContext
-import org.linphone.contact.GenericContactData
-import org.linphone.core.*
-import org.linphone.core.tools.Log
-
-class ConferenceParticipantDeviceData(
-    val participantDevice: ParticipantDevice,
-    val isMe: Boolean
-) :
-    GenericContactData(participantDevice.address) {
-    val videoEnabled: MediatorLiveData<Boolean> = MediatorLiveData()
-
-    val videoAvailable = MutableLiveData<Boolean>()
-
-    val isSendingVideo = MutableLiveData<Boolean>()
-
-    val isSpeaking = MutableLiveData<Boolean>()
-
-    val isMuted = MutableLiveData<Boolean>()
-
-    val isInConference = MutableLiveData<Boolean>()
-
-    val isJoining = MutableLiveData<Boolean>()
-
-    val isActiveSpeaker = MutableLiveData<Boolean>()
-
-    private var textureView: TextureView? = null
-
-    private val listener = object : ParticipantDeviceListenerStub() {
-        override fun onIsSpeakingChanged(
-            participantDevice: ParticipantDevice,
-            isSpeaking: Boolean
-        ) {
-            Log.i(
-                "[Conference Participant Device] Participant [${participantDevice.address.asStringUriOnly()}] is ${if (isSpeaking) "speaking" else "not speaking"}"
-            )
-            this@ConferenceParticipantDeviceData.isSpeaking.value = isSpeaking
-        }
-
-        override fun onIsMuted(participantDevice: ParticipantDevice, isMuted: Boolean) {
-            Log.i(
-                "[Conference Participant Device] Participant [${participantDevice.address.asStringUriOnly()}] is ${if (isMuted) "muted" else "not muted"}"
-            )
-            this@ConferenceParticipantDeviceData.isMuted.value = isMuted
-        }
-
-        override fun onStateChanged(
-            participantDevice: ParticipantDevice,
-            state: ParticipantDevice.State
-        ) {
-            Log.i(
-                "[Conference Participant Device] Participant [${participantDevice.address.asStringUriOnly()}] state has changed: $state"
-            )
-            when (state) {
-                ParticipantDevice.State.Joining, ParticipantDevice.State.Alerting -> isJoining.value = true
-                ParticipantDevice.State.OnHold -> {
-                    isInConference.value = false
-                }
-                ParticipantDevice.State.Present -> {
-                    isJoining.value = false
-                    isInConference.value = true
-                    updateWindowId(textureView)
-                }
-                else -> {}
-            }
-        }
-
-        override fun onStreamCapabilityChanged(
-            participantDevice: ParticipantDevice,
-            direction: MediaDirection,
-            streamType: StreamType
-        ) {
-            if (streamType == StreamType.Video) {
-                Log.i(
-                    "[Conference Participant Device] Participant [${participantDevice.address.asStringUriOnly()}] video capability changed to $direction"
-                )
-                isSendingVideo.value = direction == MediaDirection.SendRecv || direction == MediaDirection.SendOnly
-            }
-        }
-
-        override fun onStreamAvailabilityChanged(
-            participantDevice: ParticipantDevice,
-            available: Boolean,
-            streamType: StreamType
-        ) {
-            if (streamType == StreamType.Video) {
-                Log.i(
-                    "[Conference Participant Device] Participant [${participantDevice.address.asStringUriOnly()}] video availability changed to ${if (available) "available" else "unavailable"}"
-                )
-                videoAvailable.value = available
-                if (available) {
-                    updateWindowId(textureView)
-                }
-            }
-        }
-    }
-
-    init {
-        Log.i(
-            "[Conference Participant Device] Created device width Address [${participantDevice.address.asStringUriOnly()}], is it myself? $isMe"
-        )
-        participantDevice.addListener(listener)
-
-        isSpeaking.value = false
-        isActiveSpeaker.value = false
-        isMuted.value = participantDevice.isMuted
-
-        videoAvailable.value = participantDevice.getStreamAvailability(StreamType.Video)
-        val videoCapability = participantDevice.getStreamCapability(StreamType.Video)
-        isSendingVideo.value = videoCapability == MediaDirection.SendRecv || videoCapability == MediaDirection.SendOnly
-        isInConference.value = participantDevice.isInConference
-
-        val state = participantDevice.state
-        isJoining.value = state == ParticipantDevice.State.Joining || state == ParticipantDevice.State.Alerting
-        Log.i(
-            "[Conference Participant Device] State for participant [${participantDevice.address.asStringUriOnly()}] is $state"
-        )
-
-        videoEnabled.value = isVideoAvailableAndSendReceive()
-        videoEnabled.addSource(videoAvailable) {
-            videoEnabled.value = isVideoAvailableAndSendReceive()
-        }
-        videoEnabled.addSource(isSendingVideo) {
-            videoEnabled.value = isVideoAvailableAndSendReceive()
-        }
-
-        Log.i(
-            "[Conference Participant Device] Participant [${participantDevice.address.asStringUriOnly()}], is in conf? ${isInConference.value}, is video available? ${videoAvailable.value} ($videoCapability), is mic muted? ${isMuted.value}"
-        )
-    }
-
-    override fun destroy() {
-        participantDevice.removeListener(listener)
-
-        super.destroy()
-    }
-
-    fun switchCamera() {
-        coreContext.switchCamera()
-    }
-
-    fun isSwitchCameraAvailable(): Boolean {
-        return isMe && coreContext.showSwitchCameraButton()
-    }
-
-    fun setTextureView(tv: TextureView) {
-        textureView = tv
-
-        Log.i(
-            "[Conference Participant Device] Setting textureView [$textureView] for participant [${participantDevice.address.asStringUriOnly()}]"
-        )
-        updateWindowId(textureView)
-    }
-
-    private fun updateWindowId(windowId: Any?) {
-        participantDevice.nativeVideoWindowId = windowId
-    }
-
-    private fun isVideoAvailableAndSendReceive(): Boolean {
-        return videoAvailable.value == true && isSendingVideo.value == true
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/voip/data/StatItemData.kt b/app/src/main/java/org/linphone/activities/voip/data/StatItemData.kt
deleted file mode 100644
index b69fd4edc..000000000
--- a/app/src/main/java/org/linphone/activities/voip/data/StatItemData.kt
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- * Copyright (c) 2010-2021 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.voip.data
-
-import androidx.lifecycle.MutableLiveData
-import java.text.DecimalFormat
-import org.linphone.R
-import org.linphone.core.*
-import org.linphone.utils.AppUtils
-
-enum class StatType(val nameResource: Int) {
-    CAPTURE(R.string.call_stats_capture_filter),
-    PLAYBACK(R.string.call_stats_player_filter),
-    PAYLOAD(R.string.call_stats_codec),
-    ENCODER(R.string.call_stats_encoder_name),
-    DECODER(R.string.call_stats_decoder_name),
-    DOWNLOAD_BW(R.string.call_stats_download),
-    UPLOAD_BW(R.string.call_stats_upload),
-    ICE(R.string.call_stats_ice),
-    IP_FAM(R.string.call_stats_ip),
-    SENDER_LOSS(R.string.call_stats_sender_loss_rate),
-    RECEIVER_LOSS(R.string.call_stats_receiver_loss_rate),
-    JITTER(R.string.call_stats_jitter_buffer),
-    SENT_RESOLUTION(R.string.call_stats_video_resolution_sent),
-    RECEIVED_RESOLUTION(R.string.call_stats_video_resolution_received),
-    SENT_FPS(R.string.call_stats_video_fps_sent),
-    RECEIVED_FPS(R.string.call_stats_video_fps_received),
-    ESTIMATED_AVAILABLE_DOWNLOAD_BW(R.string.call_stats_estimated_download),
-    MEDIA_ENCRYPTION(R.string.call_stats_media_encryption),
-    ZRTP_CIPHER_ALGO(R.string.call_stats_zrtp_cipher_algo),
-    ZRTP_KEY_AGREEMENT_ALGO(R.string.call_stats_zrtp_key_agreement_algo),
-    ZRTP_HASH_ALGO(R.string.call_stats_zrtp_hash_algo),
-    ZRTP_AUTH_TAG_ALGO(R.string.call_stats_zrtp_auth_tag_algo),
-    ZRTP_AUTH_SAS_ALGO(R.string.call_stats_zrtp_sas_algo)
-}
-
-class StatItemData(val type: StatType) {
-    companion object {
-        fun audioDeviceToString(device: AudioDevice?): String {
-            if (device == null) return "null"
-            return "${device.deviceName} [${device.type}] (${device.driverName})"
-        }
-    }
-
-    val value = MutableLiveData<String>()
-
-    fun update(call: Call, stats: CallStats) {
-        val payloadType = if (stats.type == StreamType.Audio) call.currentParams.usedAudioPayloadType else call.currentParams.usedVideoPayloadType
-        payloadType ?: return
-        value.value = when (type) {
-            StatType.CAPTURE -> if (stats.type == StreamType.Audio) {
-                audioDeviceToString(
-                    call.inputAudioDevice
-                )
-            } else {
-                call.core.videoDevice
-            }
-            StatType.PLAYBACK -> if (stats.type == StreamType.Audio) {
-                audioDeviceToString(
-                    call.outputAudioDevice
-                )
-            } else {
-                call.core.videoDisplayFilter
-            }
-            StatType.PAYLOAD -> "${payloadType.mimeType}/${payloadType.clockRate / 1000} kHz"
-            StatType.ENCODER -> call.core.mediastreamerFactory.getDecoderText(payloadType.mimeType)
-            StatType.DECODER -> call.core.mediastreamerFactory.getEncoderText(payloadType.mimeType)
-            StatType.DOWNLOAD_BW -> "${stats.downloadBandwidth} kbits/s"
-            StatType.UPLOAD_BW -> "${stats.uploadBandwidth} kbits/s"
-            StatType.ICE -> stats.iceState.toString()
-            StatType.IP_FAM -> if (stats.ipFamilyOfRemote == Address.Family.Inet6) "IPv6" else "IPv4"
-            StatType.SENDER_LOSS -> DecimalFormat("##.##%").format(stats.senderLossRate)
-            StatType.RECEIVER_LOSS -> DecimalFormat("##.##%").format(stats.receiverLossRate)
-            StatType.JITTER -> DecimalFormat("##.## ms").format(stats.jitterBufferSizeMs)
-            StatType.SENT_RESOLUTION -> call.currentParams.sentVideoDefinition?.name
-            StatType.RECEIVED_RESOLUTION -> call.currentParams.receivedVideoDefinition?.name
-            StatType.SENT_FPS -> "${call.currentParams.sentFramerate}"
-            StatType.RECEIVED_FPS -> "${call.currentParams.receivedFramerate}"
-            StatType.ESTIMATED_AVAILABLE_DOWNLOAD_BW -> "${stats.estimatedDownloadBandwidth} kbit/s"
-            StatType.MEDIA_ENCRYPTION -> {
-                when (call.currentParams.mediaEncryption) {
-                    MediaEncryption.ZRTP -> {
-                        if (stats.isZrtpKeyAgreementAlgoPostQuantum) {
-                            AppUtils.getString(
-                                R.string.call_settings_media_encryption_zrtp_post_quantum
-                            )
-                        } else {
-                            AppUtils.getString(R.string.call_settings_media_encryption_zrtp)
-                        }
-                    }
-                    MediaEncryption.DTLS -> AppUtils.getString(
-                        R.string.call_settings_media_encryption_dtls
-                    )
-                    MediaEncryption.SRTP -> AppUtils.getString(
-                        R.string.call_settings_media_encryption_srtp
-                    )
-                    MediaEncryption.None -> AppUtils.getString(
-                        R.string.call_settings_media_encryption_none
-                    )
-                    else -> "Unexpected!"
-                }
-            }
-            StatType.ZRTP_CIPHER_ALGO -> stats.zrtpCipherAlgo
-            StatType.ZRTP_KEY_AGREEMENT_ALGO -> stats.zrtpKeyAgreementAlgo
-            StatType.ZRTP_HASH_ALGO -> stats.zrtpHashAlgo
-            StatType.ZRTP_AUTH_TAG_ALGO -> stats.zrtpAuthTagAlgo
-            StatType.ZRTP_AUTH_SAS_ALGO -> stats.zrtpSasAlgo
-        }
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/voip/fragments/CallsListFragment.kt b/app/src/main/java/org/linphone/activities/voip/fragments/CallsListFragment.kt
deleted file mode 100644
index d48bf8e71..000000000
--- a/app/src/main/java/org/linphone/activities/voip/fragments/CallsListFragment.kt
+++ /dev/null
@@ -1,189 +0,0 @@
-/*
- * Copyright (c) 2010-2021 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.voip.fragments
-
-import android.content.Intent
-import android.os.Bundle
-import android.view.Gravity
-import android.view.LayoutInflater
-import android.view.View
-import android.widget.PopupWindow
-import androidx.databinding.DataBindingUtil
-import androidx.navigation.navGraphViewModels
-import org.linphone.R
-import org.linphone.activities.main.MainActivity
-import org.linphone.activities.voip.ConferenceDisplayMode
-import org.linphone.activities.voip.data.CallData
-import org.linphone.activities.voip.viewmodels.CallsViewModel
-import org.linphone.activities.voip.viewmodels.ConferenceViewModel
-import org.linphone.activities.voip.viewmodels.ControlsViewModel
-import org.linphone.databinding.VoipCallContextMenuBindingImpl
-import org.linphone.databinding.VoipCallsListFragmentBinding
-import org.linphone.utils.AppUtils
-
-class CallsListFragment : GenericVideoPreviewFragment<VoipCallsListFragmentBinding>() {
-    private val callsViewModel: CallsViewModel by navGraphViewModels(R.id.call_nav_graph)
-    private val conferenceViewModel: ConferenceViewModel by navGraphViewModels(R.id.call_nav_graph)
-    private val controlsViewModel: ControlsViewModel by navGraphViewModels(R.id.call_nav_graph)
-
-    override fun getLayoutId(): Int = R.layout.voip_calls_list_fragment
-
-    private val callContextMenuClickListener = object : CallData.CallContextMenuClickListener {
-        override fun onShowContextMenu(anchor: View, callData: CallData) {
-            showCallMenu(anchor, callData)
-        }
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        binding.lifecycleOwner = viewLifecycleOwner
-
-        binding.callsViewModel = callsViewModel
-
-        binding.conferenceViewModel = conferenceViewModel
-
-        binding.controlsViewModel = controlsViewModel
-
-        binding.setCancelClickListener {
-            goBack()
-        }
-
-        binding.setAddCallClickListener {
-            val intent = Intent()
-            intent.setClass(requireContext(), MainActivity::class.java)
-            intent.putExtra("Dialer", true)
-            intent.putExtra("Transfer", false)
-            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-            startActivity(intent)
-        }
-
-        callsViewModel.callsData.observe(
-            viewLifecycleOwner
-        ) {
-            for (data in it) {
-                data.contextMenuClickListener = callContextMenuClickListener
-            }
-        }
-
-        conferenceViewModel.conferenceDisplayMode.observe(
-            viewLifecycleOwner
-        ) {
-            binding.localPreviewVideoSurface.visibility = if (it == ConferenceDisplayMode.AUDIO_ONLY) {
-                View.GONE
-            } else {
-                View.VISIBLE
-            }
-        }
-    }
-
-    override fun onResume() {
-        super.onResume()
-
-        setupLocalVideoPreview(binding.localPreviewVideoSurface, binding.switchCamera)
-    }
-
-    override fun onPause() {
-        super.onPause()
-
-        cleanUpLocalVideoPreview(binding.localPreviewVideoSurface)
-    }
-
-    private fun showCallMenu(anchor: View, callData: CallData) {
-        val popupView: VoipCallContextMenuBindingImpl = DataBindingUtil.inflate(
-            LayoutInflater.from(requireContext()),
-            R.layout.voip_call_context_menu,
-            null,
-            false
-        )
-
-        val itemSize = AppUtils.getDimension(R.dimen.voip_call_context_menu_item_height).toInt()
-        var totalSize = itemSize * 5
-
-        if (callData.isPaused.value == true ||
-            callData.isIncoming.value == true ||
-            callData.isOutgoing.value == true ||
-            callData.isInRemoteConference.value == true
-        ) {
-            popupView.hidePause = true
-            totalSize -= itemSize
-        }
-
-        if (callData.isIncoming.value == true ||
-            callData.isOutgoing.value == true ||
-            callData.isInRemoteConference.value == true
-        ) {
-            popupView.hideResume = true
-            popupView.hideTransfer = true
-            totalSize -= itemSize * 2
-        } else if (callData.isPaused.value == false) {
-            popupView.hideResume = true
-            totalSize -= itemSize
-        }
-
-        if (callData.isIncoming.value == false) {
-            popupView.hideAccept = true
-            totalSize -= itemSize
-        }
-
-        // When using WRAP_CONTENT instead of real size, fails to place the
-        // popup window above if not enough space is available below
-        val popupWindow = PopupWindow(
-            popupView.root,
-            AppUtils.getDimension(R.dimen.voip_call_context_menu_width).toInt(),
-            totalSize,
-            true
-        )
-        // Elevation is for showing a shadow around the popup
-        popupWindow.elevation = 20f
-
-        popupView.setResumeClickListener {
-            callData.resume()
-            popupWindow.dismiss()
-        }
-
-        popupView.setPauseClickListener {
-            callData.pause()
-            popupWindow.dismiss()
-        }
-
-        popupView.setTransferClickListener {
-            val intent = Intent()
-            intent.setClass(requireContext(), MainActivity::class.java)
-            intent.putExtra("Dialer", true)
-            intent.putExtra("Transfer", true)
-            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-            startActivity(intent)
-            popupWindow.dismiss()
-        }
-
-        popupView.setAnswerClickListener {
-            callData.accept()
-            popupWindow.dismiss()
-        }
-
-        popupView.setHangupClickListener {
-            callData.terminate()
-            popupWindow.dismiss()
-        }
-
-        popupWindow.showAsDropDown(anchor, 0, 0, Gravity.END or Gravity.TOP)
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/voip/fragments/ChatFragment.kt b/app/src/main/java/org/linphone/activities/voip/fragments/ChatFragment.kt
deleted file mode 100644
index ab9bdf69b..000000000
--- a/app/src/main/java/org/linphone/activities/voip/fragments/ChatFragment.kt
+++ /dev/null
@@ -1,267 +0,0 @@
-/*
- * Copyright (c) 2010-2021 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.voip.fragments
-
-import android.app.Activity
-import android.content.Intent
-import android.content.pm.PackageManager
-import android.os.Bundle
-import android.os.Parcelable
-import android.provider.MediaStore
-import android.view.View
-import androidx.core.content.FileProvider
-import androidx.lifecycle.ViewModelProvider
-import androidx.lifecycle.lifecycleScope
-import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.RecyclerView
-import kotlinx.coroutines.launch
-import org.linphone.LinphoneApplication.Companion.coreContext
-import org.linphone.R
-import org.linphone.activities.GenericFragment
-import org.linphone.activities.main.MainActivity
-import org.linphone.activities.main.chat.adapters.ChatMessagesListAdapter
-import org.linphone.activities.main.chat.data.ChatMessageData
-import org.linphone.activities.main.chat.viewmodels.*
-import org.linphone.activities.main.viewmodels.ListTopBarViewModel
-import org.linphone.compatibility.Compatibility
-import org.linphone.core.ChatRoom
-import org.linphone.core.Factory
-import org.linphone.core.tools.Log
-import org.linphone.databinding.VoipChatFragmentBinding
-import org.linphone.utils.FileUtils
-import org.linphone.utils.PermissionHelper
-
-class ChatFragment : GenericFragment<VoipChatFragmentBinding>() {
-    private lateinit var adapter: ChatMessagesListAdapter
-    private lateinit var viewModel: ChatRoomViewModel
-    private lateinit var listViewModel: ChatMessagesListViewModel
-    private lateinit var chatSendingViewModel: ChatMessageSendingViewModel
-
-    override fun getLayoutId(): Int = R.layout.voip_chat_fragment
-
-    private val observer = object : RecyclerView.AdapterDataObserver() {
-        override fun onItemRangeInserted(positionStart: Int, itemCount: Int) {
-            if (positionStart == adapter.itemCount - itemCount) {
-                adapter.notifyItemChanged(positionStart - 1) // For grouping purposes
-                scrollToBottom()
-            }
-        }
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        binding.lifecycleOwner = viewLifecycleOwner
-
-        binding.setCancelClickListener {
-            goBack()
-        }
-
-        binding.setChatRoomsListClickListener {
-            val intent = Intent()
-            intent.setClass(requireContext(), MainActivity::class.java)
-            intent.putExtra("Chat", true)
-            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-            startActivity(intent)
-        }
-
-        binding.setAttachFileClickListener {
-            if (PermissionHelper.get().hasReadExternalStoragePermission() || PermissionHelper.get().hasCameraPermission()) {
-                pickFile()
-            } else {
-                Log.i("[Chat] Asking for READ_EXTERNAL_STORAGE and CAMERA permissions")
-                Compatibility.requestReadExternalStorageAndCameraPermissions(this, 0)
-            }
-        }
-
-        val localSipUri = arguments?.getString("LocalSipUri")
-        val remoteSipUri = arguments?.getString("RemoteSipUri")
-        var chatRoom: ChatRoom? = null
-        if (localSipUri != null && remoteSipUri != null) {
-            Log.i(
-                "[Chat] Found local [$localSipUri] & remote [$remoteSipUri] addresses in arguments"
-            )
-
-            val localAddress = Factory.instance().createAddress(localSipUri)
-            val remoteSipAddress = Factory.instance().createAddress(remoteSipUri)
-            chatRoom = coreContext.core.searchChatRoom(
-                null,
-                localAddress,
-                remoteSipAddress,
-                arrayOfNulls(0)
-            )
-        }
-        chatRoom ?: return
-
-        viewModel = requireActivity().run {
-            ViewModelProvider(
-                this,
-                ChatRoomViewModelFactory(chatRoom)
-            )[ChatRoomViewModel::class.java]
-        }
-        binding.viewModel = viewModel
-
-        listViewModel = ViewModelProvider(
-            this,
-            ChatMessagesListViewModelFactory(chatRoom)
-        )[ChatMessagesListViewModel::class.java]
-
-        chatSendingViewModel = ViewModelProvider(
-            this,
-            ChatMessageSendingViewModelFactory(chatRoom)
-        )[ChatMessageSendingViewModel::class.java]
-        binding.chatSendingViewModel = chatSendingViewModel
-
-        val listSelectionViewModel = ViewModelProvider(this)[ListTopBarViewModel::class.java]
-        adapter = ChatMessagesListAdapter(listSelectionViewModel, this)
-        // SubmitList is done on a background thread
-        // We need this adapter data observer to know when to scroll
-        binding.chatMessagesList.adapter = adapter
-        adapter.registerAdapterDataObserver(observer)
-
-        // Disable context menu on each message
-        adapter.disableAdvancedContextMenuOptions()
-
-        val layoutManager = LinearLayoutManager(requireContext())
-        layoutManager.stackFromEnd = true
-        binding.chatMessagesList.layoutManager = layoutManager
-
-        listViewModel.events.observe(
-            viewLifecycleOwner
-        ) { events ->
-            adapter.submitList(events)
-        }
-
-        chatSendingViewModel.textToSend.observe(
-            viewLifecycleOwner
-        ) {
-            chatSendingViewModel.onTextToSendChanged(it)
-        }
-
-        adapter.replyMessageEvent.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume { chatMessage ->
-                chatSendingViewModel.pendingChatMessageToReplyTo.value?.destroy()
-                chatSendingViewModel.pendingChatMessageToReplyTo.value =
-                    ChatMessageData(chatMessage)
-                chatSendingViewModel.isPendingAnswer.value = true
-            }
-        }
-    }
-
-    override fun onResume() {
-        super.onResume()
-
-        if (this::viewModel.isInitialized) {
-            // Prevent notifications for this chat room to be displayed
-            val peerAddress = viewModel.chatRoom.peerAddress.asStringUriOnly()
-            coreContext.notificationsManager.currentlyDisplayedChatRoomAddress = peerAddress
-            viewModel.chatRoom.markAsRead()
-        } else {
-            Log.e("[Chat] Fragment resuming but viewModel lateinit property isn't initialized!")
-        }
-    }
-
-    override fun onPause() {
-        coreContext.notificationsManager.currentlyDisplayedChatRoomAddress = null
-
-        super.onPause()
-    }
-
-    @Deprecated("Deprecated in Java")
-    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
-        if (resultCode == Activity.RESULT_OK) {
-            lifecycleScope.launch {
-                for (
-                fileToUploadPath in FileUtils.getFilesPathFromPickerIntent(
-                    data,
-                    chatSendingViewModel.temporaryFileUploadPath
-                )
-                ) {
-                    chatSendingViewModel.addAttachment(fileToUploadPath)
-                }
-            }
-        }
-    }
-
-    @Deprecated("Deprecated in Java")
-    override fun onRequestPermissionsResult(
-        requestCode: Int,
-        permissions: Array<out String>,
-        grantResults: IntArray
-    ) {
-        var atLeastOneGranted = false
-        for (result in grantResults) {
-            atLeastOneGranted = atLeastOneGranted || result == PackageManager.PERMISSION_GRANTED
-        }
-
-        when (requestCode) {
-            0 -> {
-                if (atLeastOneGranted) {
-                    pickFile()
-                }
-            }
-        }
-    }
-
-    private fun scrollToBottom() {
-        if (adapter.itemCount > 0) {
-            binding.chatMessagesList.scrollToPosition(adapter.itemCount - 1)
-        }
-    }
-
-    private fun pickFile() {
-        val intentsList = ArrayList<Intent>()
-
-        val pickerIntent = Intent(Intent.ACTION_GET_CONTENT)
-        pickerIntent.type = "*/*"
-        pickerIntent.putExtra(Intent.EXTRA_ALLOW_MULTIPLE, true)
-
-        if (PermissionHelper.get().hasCameraPermission()) {
-            // Allows to capture directly from the camera
-            val capturePictureIntent = Intent(MediaStore.ACTION_IMAGE_CAPTURE)
-            val tempFileName = System.currentTimeMillis().toString() + ".jpeg"
-            val file = FileUtils.getFileStoragePath(tempFileName)
-            chatSendingViewModel.temporaryFileUploadPath = file
-            val publicUri = FileProvider.getUriForFile(
-                requireContext(),
-                requireContext().getString(R.string.file_provider),
-                file
-            )
-            capturePictureIntent.putExtra(MediaStore.EXTRA_OUTPUT, publicUri)
-            capturePictureIntent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
-            capturePictureIntent.addFlags(Intent.FLAG_GRANT_WRITE_URI_PERMISSION)
-            intentsList.add(capturePictureIntent)
-
-            val captureVideoIntent = Intent(MediaStore.ACTION_VIDEO_CAPTURE)
-            intentsList.add(captureVideoIntent)
-        }
-
-        val chooserIntent =
-            Intent.createChooser(pickerIntent, getString(R.string.chat_message_pick_file_dialog))
-        chooserIntent.putExtra(
-            Intent.EXTRA_INITIAL_INTENTS,
-            intentsList.toArray(arrayOf<Parcelable>())
-        )
-
-        startActivityForResult(chooserIntent, 0)
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/voip/fragments/ConferenceAddParticipantsFragment.kt b/app/src/main/java/org/linphone/activities/voip/fragments/ConferenceAddParticipantsFragment.kt
deleted file mode 100644
index 4b588a2eb..000000000
--- a/app/src/main/java/org/linphone/activities/voip/fragments/ConferenceAddParticipantsFragment.kt
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- * Copyright (c) 2010-2021 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.voip.fragments
-
-import android.content.pm.PackageManager
-import android.os.Bundle
-import android.view.View
-import androidx.lifecycle.ViewModelProvider
-import androidx.navigation.navGraphViewModels
-import androidx.recyclerview.widget.LinearLayoutManager
-import org.linphone.LinphoneApplication
-import org.linphone.LinphoneApplication.Companion.corePreferences
-import org.linphone.R
-import org.linphone.activities.GenericFragment
-import org.linphone.activities.voip.viewmodels.ConferenceParticipantsViewModel
-import org.linphone.activities.voip.viewmodels.ConferenceParticipantsViewModelFactory
-import org.linphone.activities.voip.viewmodels.ConferenceViewModel
-import org.linphone.contact.ContactsSelectionAdapter
-import org.linphone.core.tools.Log
-import org.linphone.databinding.VoipConferenceParticipantsAddFragmentBinding
-import org.linphone.utils.AppUtils
-import org.linphone.utils.PermissionHelper
-
-class ConferenceAddParticipantsFragment : GenericFragment<VoipConferenceParticipantsAddFragmentBinding>() {
-    private val conferenceViewModel: ConferenceViewModel by navGraphViewModels(R.id.call_nav_graph)
-    private lateinit var viewModel: ConferenceParticipantsViewModel
-    private lateinit var adapter: ContactsSelectionAdapter
-
-    override fun getLayoutId(): Int = R.layout.voip_conference_participants_add_fragment
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        binding.lifecycleOwner = viewLifecycleOwner
-
-        val conference = conferenceViewModel.conference.value
-        conference ?: return
-
-        viewModel = ViewModelProvider(
-            this,
-            ConferenceParticipantsViewModelFactory(conference)
-        )[ConferenceParticipantsViewModel::class.java]
-
-        binding.viewModel = viewModel
-
-        adapter = ContactsSelectionAdapter(viewLifecycleOwner)
-        adapter.setLimeCapabilityRequired(false) // TODO: Use right value from conference
-        binding.contactsList.adapter = adapter
-
-        val layoutManager = LinearLayoutManager(requireContext())
-        binding.contactsList.layoutManager = layoutManager
-
-        // Divider between items
-        binding.contactsList.addItemDecoration(
-            AppUtils.getDividerDecoration(requireContext(), layoutManager)
-        )
-
-        binding.setApplyClickListener {
-            viewModel.applyChanges()
-            goBack()
-        }
-
-        viewModel.contactsList.observe(
-            viewLifecycleOwner
-        ) {
-            adapter.submitList(it)
-        }
-        viewModel.sipContactsSelected.observe(
-            viewLifecycleOwner
-        ) {
-            viewModel.applyFilter()
-        }
-
-        viewModel.selectedAddresses.observe(
-            viewLifecycleOwner
-        ) {
-            adapter.updateSelectedAddresses(it)
-        }
-        viewModel.filter.observe(
-            viewLifecycleOwner
-        ) {
-            viewModel.applyFilter()
-        }
-
-        adapter.selectedContact.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume { searchResult ->
-                viewModel.toggleSelectionForSearchResult(searchResult)
-            }
-        }
-
-        if (corePreferences.enableNativeAddressBookIntegration) {
-            if (!PermissionHelper.get().hasReadContactsPermission()) {
-                Log.i("[Conference Add Participants] Asking for READ_CONTACTS permission")
-                requestPermissions(arrayOf(android.Manifest.permission.READ_CONTACTS), 0)
-            }
-        }
-    }
-
-    @Deprecated("Deprecated in Java")
-    override fun onRequestPermissionsResult(
-        requestCode: Int,
-        permissions: Array<out String>,
-        grantResults: IntArray
-    ) {
-        if (requestCode == 0) {
-            val granted = grantResults.isNotEmpty() && grantResults[0] == PackageManager.PERMISSION_GRANTED
-            if (granted) {
-                Log.i("[Conference Add Participants] READ_CONTACTS permission granted")
-                LinphoneApplication.coreContext.fetchContacts()
-            } else {
-                Log.w("[Conference Add Participants] READ_CONTACTS permission denied")
-            }
-        }
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/voip/fragments/ConferenceCallFragment.kt b/app/src/main/java/org/linphone/activities/voip/fragments/ConferenceCallFragment.kt
deleted file mode 100644
index e8b922067..000000000
--- a/app/src/main/java/org/linphone/activities/voip/fragments/ConferenceCallFragment.kt
+++ /dev/null
@@ -1,592 +0,0 @@
-/*
- * Copyright (c) 2010-2022 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.voip.fragments
-
-import android.annotation.SuppressLint
-import android.content.Intent
-import android.content.res.Configuration
-import android.os.Bundle
-import android.os.SystemClock
-import android.view.View
-import android.view.animation.AccelerateDecelerateInterpolator
-import android.widget.Chronometer
-import android.widget.Toast
-import androidx.constraintlayout.widget.ConstraintLayout
-import androidx.constraintlayout.widget.ConstraintSet
-import androidx.navigation.navGraphViewModels
-import androidx.transition.AutoTransition
-import androidx.transition.TransitionManager
-import androidx.window.layout.FoldingFeature
-import com.google.android.material.snackbar.Snackbar
-import org.linphone.LinphoneApplication.Companion.coreContext
-import org.linphone.LinphoneApplication.Companion.corePreferences
-import org.linphone.R
-import org.linphone.activities.*
-import org.linphone.activities.main.MainActivity
-import org.linphone.activities.voip.ConferenceDisplayMode
-import org.linphone.activities.voip.viewmodels.CallsViewModel
-import org.linphone.activities.voip.viewmodels.ConferenceViewModel
-import org.linphone.activities.voip.viewmodels.ControlsViewModel
-import org.linphone.activities.voip.viewmodels.StatisticsListViewModel
-import org.linphone.activities.voip.views.RoundCornersTextureView
-import org.linphone.core.Conference
-import org.linphone.core.StreamType
-import org.linphone.core.tools.Log
-import org.linphone.databinding.VoipConferenceCallFragmentBinding
-
-class ConferenceCallFragment : GenericFragment<VoipConferenceCallFragmentBinding>() {
-    private val controlsViewModel: ControlsViewModel by navGraphViewModels(R.id.call_nav_graph)
-    private val callsViewModel: CallsViewModel by navGraphViewModels(R.id.call_nav_graph)
-    private val conferenceViewModel: ConferenceViewModel by navGraphViewModels(R.id.call_nav_graph)
-    private val statsViewModel: StatisticsListViewModel by navGraphViewModels(R.id.call_nav_graph)
-
-    override fun getLayoutId(): Int = R.layout.voip_conference_call_fragment
-
-    override fun onStart() {
-        useMaterialSharedAxisXForwardAnimation = false
-
-        super.onStart()
-    }
-
-    @SuppressLint("CutPasteId")
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        controlsViewModel.hideCallStats() // In case it was toggled on during incoming/outgoing fragment was visible
-
-        binding.lifecycleOwner = viewLifecycleOwner
-
-        binding.controlsViewModel = controlsViewModel
-
-        binding.callsViewModel = callsViewModel
-
-        binding.conferenceViewModel = conferenceViewModel
-
-        binding.statsViewModel = statsViewModel
-
-        conferenceViewModel.reloadConferenceFragmentEvent.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume {
-                Log.i(
-                    "[Conference Call] Reloading fragment after toggling video ON while in AUDIO_ONLY layout"
-                )
-                refreshConferenceFragment()
-            }
-        }
-
-        conferenceViewModel.conferenceDisplayMode.observe(
-            viewLifecycleOwner
-        ) { displayMode ->
-            startTimer(R.id.active_conference_timer)
-
-            if (displayMode == ConferenceDisplayMode.ACTIVE_SPEAKER) {
-                if (conferenceViewModel.conferenceExists.value == true) {
-                    Log.i(
-                        "[Conference Call] Local participant is in conference and current layout is active speaker, updating Core's native window id"
-                    )
-                    val window = binding.root.findViewById<RoundCornersTextureView>(
-                        R.id.conference_active_speaker_remote_video
-                    )
-                    coreContext.core.nativeVideoWindowId = window
-
-                    val preview = binding.root.findViewById<RoundCornersTextureView>(
-                        R.id.local_preview_video_surface
-                    )
-                    if (preview != null) {
-                        conferenceViewModel.meParticipant.value?.setTextureView(preview)
-                    }
-                } else {
-                    Log.i(
-                        "[Conference Call] Either not in conference or current layout isn't active speaker, updating Core's native window id"
-                    )
-                    coreContext.core.nativeVideoWindowId = null
-                }
-            }
-
-            when (displayMode) {
-                ConferenceDisplayMode.AUDIO_ONLY -> {
-                    controlsViewModel.fullScreenMode.value = false
-                }
-                else -> {
-                    val conference = conferenceViewModel.conference.value
-                    if (conference != null) switchToFullScreenIfPossible(conference)
-                }
-            }
-        }
-
-        conferenceViewModel.conferenceParticipantDevices.observe(
-            viewLifecycleOwner
-        ) {
-            if (
-                conferenceViewModel.conferenceDisplayMode.value == ConferenceDisplayMode.GRID &&
-                it.size > conferenceViewModel.maxParticipantsForMosaicLayout
-            ) {
-                Log.w(
-                    "[Conference Call] More than ${conferenceViewModel.maxParticipantsForMosaicLayout} participants (${it.size}), forcing active speaker layout"
-                )
-                conferenceViewModel.changeLayout(ConferenceDisplayMode.ACTIVE_SPEAKER, false)
-                refreshConferenceFragment()
-                // Can't use SnackBar whilst changing fragment
-                Toast.makeText(
-                    requireContext(),
-                    R.string.conference_too_many_participants_for_mosaic_layout,
-                    Toast.LENGTH_LONG
-                ).show()
-            }
-        }
-
-        conferenceViewModel.secondParticipantJoinedEvent.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume {
-                switchToActiveSpeakerLayoutForTwoParticipants()
-            }
-        }
-
-        conferenceViewModel.moreThanTwoParticipantsJoinedEvent.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume {
-                switchToActiveSpeakerLayoutForMoreThanTwoParticipants()
-            }
-        }
-
-        conferenceViewModel.conference.observe(
-            viewLifecycleOwner
-        ) { conference ->
-            if (conference != null) switchToFullScreenIfPossible(conference)
-        }
-
-        conferenceViewModel.conferenceCreationPending.observe(
-            viewLifecycleOwner
-        ) { creationPending ->
-            if (!creationPending) {
-                val conference = conferenceViewModel.conference.value
-                if (conference != null) switchToFullScreenIfPossible(conference)
-            }
-        }
-
-        conferenceViewModel.firstToJoinEvent.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume {
-                Snackbar
-                    .make(
-                        binding.coordinator,
-                        R.string.conference_first_to_join,
-                        Snackbar.LENGTH_LONG
-                    )
-                    .setAnchorView(binding.primaryButtons.hangup)
-                    .show()
-            }
-        }
-
-        conferenceViewModel.allParticipantsLeftEvent.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume {
-                Snackbar
-                    .make(binding.coordinator, R.string.conference_last_user, Snackbar.LENGTH_LONG)
-                    .setAnchorView(binding.primaryButtons.hangup)
-                    .show()
-
-                switchToActiveSpeakerLayoutWhenAlone()
-            }
-        }
-
-        controlsViewModel.goToConferenceParticipantsListEvent.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume {
-                navigateToConferenceParticipants()
-            }
-        }
-
-        controlsViewModel.goToChatEvent.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume {
-                goToChat()
-            }
-        }
-
-        controlsViewModel.goToCallsListEvent.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume {
-                navigateToCallsList()
-            }
-        }
-
-        controlsViewModel.goToConferenceLayoutSettingsEvent.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume {
-                navigateToConferenceLayout()
-            }
-        }
-
-        controlsViewModel.foldingState.observe(
-            viewLifecycleOwner
-        ) { feature ->
-            updateHingeRelatedConstraints(feature)
-        }
-
-        callsViewModel.callUpdateEvent.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume { call ->
-                val conference = call.conference
-                if (conference != null && conferenceViewModel.conference.value == null) {
-                    Log.i(
-                        "[Conference Call] Found conference attached to call and no conference in dedicated view model, init & configure it"
-                    )
-                    conferenceViewModel.initConference(conference)
-                    conferenceViewModel.configureConference(conference)
-                }
-            }
-        }
-
-        controlsViewModel.goToDialerEvent.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume { isCallTransfer ->
-                val intent = Intent()
-                intent.setClass(requireContext(), MainActivity::class.java)
-                if (corePreferences.skipDialerForNewCallAndTransfer) {
-                    intent.putExtra("Contacts", true)
-                } else {
-                    intent.putExtra("Dialer", true)
-                }
-                intent.putExtra("Transfer", isCallTransfer)
-                intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-                startActivity(intent)
-            }
-        }
-    }
-
-    override fun onPause() {
-        super.onPause()
-
-        controlsViewModel.hideExtraButtons(true)
-    }
-
-    override fun onResume() {
-        super.onResume()
-
-        if (conferenceViewModel.conferenceDisplayMode.value == ConferenceDisplayMode.ACTIVE_SPEAKER) {
-            Log.i(
-                "[Conference Call] Conference fragment is resuming, current display mode is active speaker, adjusting layout"
-            )
-            adjustActiveSpeakerLayout()
-        }
-    }
-
-    private fun switchToFullScreenIfPossible(conference: Conference) {
-        if (corePreferences.enableFullScreenWhenJoiningVideoConference) {
-            if (conference.currentParams.isVideoEnabled) {
-                when {
-                    conference.me.devices.isEmpty() -> {
-                        Log.i(
-                            "[Conference Call] Conference has video enabled but our device hasn't joined yet"
-                        )
-                    }
-                    conference.me.devices.find {
-                        it.isInConference && it.getStreamAvailability(
-                            StreamType.Video
-                        )
-                    } != null -> {
-                        Log.i(
-                            "[Conference Call] Conference has video enabled & our device has video enabled, enabling full screen mode"
-                        )
-                        controlsViewModel.fullScreenMode.value = true
-                    }
-                    else -> {
-                        Log.i(
-                            "[Conference Call] Conference has video enabled but our device video is disabled"
-                        )
-                    }
-                }
-            }
-        }
-    }
-
-    private fun goToChat() {
-        val intent = Intent()
-        intent.setClass(requireContext(), MainActivity::class.java)
-        intent.putExtra("Chat", true)
-        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-        startActivity(intent)
-    }
-
-    private fun startTimer(timerId: Int) {
-        val timer: Chronometer? = binding.root.findViewById(timerId)
-        if (timer == null) {
-            Log.w("[Conference Call] Timer not found, maybe view wasn't inflated yet?")
-            return
-        }
-
-        val conference = conferenceViewModel.conference.value
-        if (conference != null) {
-            val duration = 1000 * conference.duration // Linphone timestamps are in seconds
-            timer.base = SystemClock.elapsedRealtime() - duration
-        } else {
-            Log.e("[Conference Call] Conference not found, timer will have no base")
-        }
-
-        timer.start()
-    }
-
-    private fun updateHingeRelatedConstraints(feature: FoldingFeature) {
-        Log.i("[Conference Call] Updating constraint layout hinges: $feature")
-        val constraintLayout = binding.root.findViewById<ConstraintLayout>(
-            R.id.conference_constraint_layout
-        )
-            ?: return
-        val set = ConstraintSet()
-        set.clone(constraintLayout)
-
-        // Only modify UI in table top mode
-        if (feature.orientation == FoldingFeature.Orientation.HORIZONTAL &&
-            feature.state == FoldingFeature.State.HALF_OPENED
-        ) {
-            set.setGuidelinePercent(R.id.hinge_top, 0.5f)
-            set.setGuidelinePercent(R.id.hinge_bottom, 0.5f)
-            controlsViewModel.folded.value = true
-        } else {
-            set.setGuidelinePercent(R.id.hinge_top, 0f)
-            set.setGuidelinePercent(R.id.hinge_bottom, 1f)
-            controlsViewModel.folded.value = false
-        }
-
-        set.applyTo(constraintLayout)
-    }
-
-    private fun animateConstraintLayout(
-        constraintLayout: ConstraintLayout,
-        set: ConstraintSet
-    ) {
-        val trans = AutoTransition()
-        trans.duration = 500
-        trans.interpolator = AccelerateDecelerateInterpolator()
-        TransitionManager.beginDelayedTransition(constraintLayout, trans)
-        set.applyTo(constraintLayout)
-    }
-
-    private fun adjustActiveSpeakerLayout() {
-        if (conferenceViewModel.conference.value?.state == Conference.State.Created) {
-            val participantsCount = conferenceViewModel.conferenceParticipantDevices.value.orEmpty().size
-            Log.i(
-                "[Conference Call] Updating active speaker layout for [$participantsCount] participants"
-            )
-            when (participantsCount) {
-                1 -> switchToActiveSpeakerLayoutWhenAlone()
-                2 -> switchToActiveSpeakerLayoutForTwoParticipants()
-                else -> switchToActiveSpeakerLayoutForMoreThanTwoParticipants()
-            }
-        } else {
-            Log.w(
-                "[Conference] Active speaker layout not adjusted, conference state is: ${conferenceViewModel.conference.value?.state}"
-            )
-        }
-    }
-
-    private fun getConstraintSet(constraintLayout: ConstraintLayout): ConstraintSet {
-        val set = ConstraintSet()
-        set.clone(constraintLayout)
-
-        set.clear(R.id.local_participant_background, ConstraintSet.TOP)
-        set.clear(R.id.local_participant_background, ConstraintSet.START)
-        set.clear(R.id.local_participant_background, ConstraintSet.LEFT)
-        set.clear(R.id.local_participant_background, ConstraintSet.BOTTOM)
-        set.clear(R.id.local_participant_background, ConstraintSet.END)
-        set.clear(R.id.local_participant_background, ConstraintSet.RIGHT)
-
-        return set
-    }
-
-    private fun switchToActiveSpeakerLayoutForMoreThanTwoParticipants() {
-        if (conferenceViewModel.conferenceDisplayMode.value != ConferenceDisplayMode.ACTIVE_SPEAKER) return
-
-        val constraintLayout =
-            binding.root.findViewById<ConstraintLayout>(R.id.conference_constraint_layout)
-                ?: return
-        val set = getConstraintSet(constraintLayout)
-
-        val margin = resources.getDimension(R.dimen.voip_active_speaker_miniature_margin).toInt()
-        val portraitOrientation = resources.configuration.orientation != Configuration.ORIENTATION_LANDSCAPE
-        if (portraitOrientation) {
-            set.connect(
-                R.id.local_participant_background,
-                ConstraintSet.START,
-                R.id.conference_constraint_layout,
-                ConstraintSet.START,
-                margin
-            )
-            set.connect(
-                R.id.local_participant_background,
-                ConstraintSet.BOTTOM,
-                R.id.miniatures,
-                ConstraintSet.BOTTOM,
-                0
-            )
-            set.connect(
-                R.id.local_participant_background,
-                ConstraintSet.TOP,
-                R.id.miniatures,
-                ConstraintSet.TOP,
-                0
-            )
-        } else {
-            set.connect(
-                R.id.local_participant_background,
-                ConstraintSet.BOTTOM,
-                R.id.hinge_bottom,
-                ConstraintSet.BOTTOM,
-                0
-            )
-            set.connect(
-                R.id.local_participant_background,
-                ConstraintSet.START,
-                R.id.active_speaker_background,
-                ConstraintSet.END,
-                0
-            )
-            set.connect(
-                R.id.local_participant_background,
-                ConstraintSet.END,
-                R.id.scroll_indicator,
-                ConstraintSet.START,
-                0
-            )
-        }
-
-        val size = resources.getDimension(R.dimen.voip_active_speaker_miniature_size).toInt()
-        set.constrainWidth(R.id.local_participant_background, size)
-        set.constrainHeight(R.id.local_participant_background, size)
-
-        val avatarSize = resources.getDimension(
-            R.dimen.voip_conference_active_speaker_miniature_avatar_size
-        ).toInt()
-        set.constrainWidth(R.id.local_participant_avatar, avatarSize)
-        set.constrainHeight(R.id.local_participant_avatar, avatarSize)
-
-        Log.i("[Conference Call] Updating active speaker layout for 3 or more participants")
-        if (corePreferences.enableAnimations) {
-            animateConstraintLayout(constraintLayout, set)
-        } else {
-            set.applyTo(constraintLayout)
-        }
-    }
-
-    private fun switchToActiveSpeakerLayoutForTwoParticipants() {
-        if (conferenceViewModel.conferenceDisplayMode.value != ConferenceDisplayMode.ACTIVE_SPEAKER) return
-
-        val constraintLayout =
-            binding.root.findViewById<ConstraintLayout>(R.id.conference_constraint_layout)
-                ?: return
-        val set = getConstraintSet(constraintLayout)
-
-        val margin = resources.getDimension(R.dimen.voip_active_speaker_miniature_margin).toInt()
-        set.connect(
-            R.id.local_participant_background,
-            ConstraintSet.BOTTOM,
-            R.id.hinge_bottom,
-            ConstraintSet.BOTTOM,
-            margin
-        )
-        // Don't know why but if we use END instead of RIGHT, margin isn't applied...
-        set.connect(
-            R.id.local_participant_background,
-            ConstraintSet.RIGHT,
-            R.id.conference_constraint_layout,
-            ConstraintSet.RIGHT,
-            margin
-        )
-
-        val size = resources.getDimension(R.dimen.voip_active_speaker_miniature_size).toInt()
-        set.constrainWidth(R.id.local_participant_background, size)
-        set.constrainHeight(R.id.local_participant_background, size)
-
-        val avatarSize = resources.getDimension(
-            R.dimen.voip_conference_active_speaker_miniature_avatar_size
-        ).toInt()
-        set.constrainWidth(R.id.local_participant_avatar, avatarSize)
-        set.constrainHeight(R.id.local_participant_avatar, avatarSize)
-
-        Log.i("[Conference Call] Updating active speaker layout for 2 participants")
-        if (corePreferences.enableAnimations) {
-            animateConstraintLayout(constraintLayout, set)
-        } else {
-            set.applyTo(constraintLayout)
-        }
-    }
-
-    private fun switchToActiveSpeakerLayoutWhenAlone() {
-        if (conferenceViewModel.conferenceDisplayMode.value != ConferenceDisplayMode.ACTIVE_SPEAKER) return
-
-        val constraintLayout =
-            binding.root.findViewById<ConstraintLayout>(R.id.conference_constraint_layout)
-                ?: return
-        val set = getConstraintSet(constraintLayout)
-
-        set.connect(
-            R.id.local_participant_background,
-            ConstraintSet.BOTTOM,
-            R.id.hinge_bottom,
-            ConstraintSet.BOTTOM,
-            0
-        )
-        set.connect(
-            R.id.local_participant_background,
-            ConstraintSet.END,
-            R.id.conference_constraint_layout,
-            ConstraintSet.END,
-            0
-        )
-        set.connect(
-            R.id.local_participant_background,
-            ConstraintSet.TOP,
-            R.id.top_barrier,
-            ConstraintSet.BOTTOM,
-            0
-        )
-        set.connect(
-            R.id.local_participant_background,
-            ConstraintSet.START,
-            R.id.conference_constraint_layout,
-            ConstraintSet.START,
-            0
-        )
-
-        set.constrainWidth(R.id.local_participant_background, 0)
-        set.constrainHeight(R.id.local_participant_background, 0)
-        set.constrainWidth(R.id.local_participant_avatar, 0)
-        set.constrainHeight(R.id.local_participant_avatar, 0)
-
-        Log.i("[Conference Call] Updating active speaker layout for 1 participant (myself)")
-        if (corePreferences.enableAnimations) {
-            animateConstraintLayout(constraintLayout, set)
-        } else {
-            set.applyTo(constraintLayout)
-        }
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/voip/fragments/ConferenceLayoutFragment.kt b/app/src/main/java/org/linphone/activities/voip/fragments/ConferenceLayoutFragment.kt
deleted file mode 100644
index f840c99ac..000000000
--- a/app/src/main/java/org/linphone/activities/voip/fragments/ConferenceLayoutFragment.kt
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Copyright (c) 2010-2021 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.voip.fragments
-
-import android.os.Bundle
-import android.view.View
-import androidx.constraintlayout.widget.ConstraintLayout
-import androidx.navigation.navGraphViewModels
-import org.linphone.R
-import org.linphone.activities.voip.ConferenceDisplayMode
-import org.linphone.activities.voip.viewmodels.ConferenceViewModel
-import org.linphone.activities.voip.viewmodels.ControlsViewModel
-import org.linphone.databinding.VoipConferenceLayoutFragmentBinding
-
-class ConferenceLayoutFragment : GenericVideoPreviewFragment<VoipConferenceLayoutFragmentBinding>() {
-    private val conferenceViewModel: ConferenceViewModel by navGraphViewModels(R.id.call_nav_graph)
-    private val controlsViewModel: ControlsViewModel by navGraphViewModels(R.id.call_nav_graph)
-
-    override fun getLayoutId(): Int = R.layout.voip_conference_layout_fragment
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        binding.lifecycleOwner = viewLifecycleOwner
-
-        binding.conferenceViewModel = conferenceViewModel
-
-        binding.controlsViewModel = controlsViewModel
-
-        binding.setCancelClickListener {
-            goBack()
-        }
-
-        conferenceViewModel.conferenceParticipantDevices.observe(
-            viewLifecycleOwner
-        ) {
-            if (it.size > conferenceViewModel.maxParticipantsForMosaicLayout && conferenceViewModel.conferenceDisplayMode.value == ConferenceDisplayMode.GRID) {
-                showTooManyParticipantsForMosaicLayoutDialog()
-            }
-        }
-
-        conferenceViewModel.conferenceDisplayMode.observe(
-            viewLifecycleOwner
-        ) {
-            binding.localPreviewVideoSurface.visibility = if (it == ConferenceDisplayMode.AUDIO_ONLY) {
-                View.GONE
-            } else {
-                View.VISIBLE
-            }
-        }
-
-        binding.setDismissDialogClickListener {
-            val dialog = binding.root.findViewById<ConstraintLayout>(
-                R.id.too_many_participants_dialog
-            )
-            dialog?.visibility = View.GONE
-        }
-    }
-
-    override fun onResume() {
-        super.onResume()
-
-        if (conferenceViewModel.conferenceParticipantDevices.value.orEmpty().size > conferenceViewModel.maxParticipantsForMosaicLayout) {
-            showTooManyParticipantsForMosaicLayoutDialog()
-        }
-
-        setupLocalVideoPreview(binding.localPreviewVideoSurface, binding.switchCamera)
-    }
-
-    override fun onPause() {
-        super.onPause()
-
-        cleanUpLocalVideoPreview(binding.localPreviewVideoSurface)
-    }
-
-    private fun showTooManyParticipantsForMosaicLayoutDialog() {
-        val dialog = binding.root.findViewById<ConstraintLayout>(R.id.too_many_participants_dialog)
-        dialog?.visibility = View.VISIBLE
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/voip/fragments/ConferenceParticipantsFragment.kt b/app/src/main/java/org/linphone/activities/voip/fragments/ConferenceParticipantsFragment.kt
deleted file mode 100644
index c0acf62fa..000000000
--- a/app/src/main/java/org/linphone/activities/voip/fragments/ConferenceParticipantsFragment.kt
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Copyright (c) 2010-2021 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.voip.fragments
-
-import android.os.Bundle
-import android.view.View
-import android.widget.Toast
-import androidx.navigation.navGraphViewModels
-import org.linphone.R
-import org.linphone.activities.navigateToAddParticipants
-import org.linphone.activities.voip.viewmodels.ConferenceViewModel
-import org.linphone.activities.voip.viewmodels.ControlsViewModel
-import org.linphone.core.tools.Log
-import org.linphone.databinding.VoipConferenceParticipantsFragmentBinding
-
-class ConferenceParticipantsFragment : GenericVideoPreviewFragment<VoipConferenceParticipantsFragmentBinding>() {
-    private val conferenceViewModel: ConferenceViewModel by navGraphViewModels(R.id.call_nav_graph)
-    private val controlsViewModel: ControlsViewModel by navGraphViewModels(R.id.call_nav_graph)
-
-    // Only display events happening during while this fragment is visible
-    private var skipEvents = true
-
-    override fun getLayoutId(): Int = R.layout.voip_conference_participants_fragment
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        binding.lifecycleOwner = viewLifecycleOwner
-
-        binding.conferenceViewModel = conferenceViewModel
-
-        binding.controlsViewModel = controlsViewModel
-
-        conferenceViewModel.conferenceExists.observe(
-            viewLifecycleOwner
-        ) { exists ->
-            if (!exists) {
-                Log.w("[Conference Participants] Conference no longer exists, going back")
-                goBack()
-            }
-        }
-
-        conferenceViewModel.participantAdminStatusChangedEvent.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume { participantData ->
-                val participantName =
-                    participantData.contact.value?.name ?: participantData.displayName.value
-                val message = if (participantData.participant.isAdmin) {
-                    getString(R.string.conference_admin_set).format(participantName)
-                } else {
-                    getString(R.string.conference_admin_unset).format(participantName)
-                }
-                if (!skipEvents) {
-                    Toast.makeText(context, message, Toast.LENGTH_SHORT).show()
-                }
-            }
-        }
-
-        binding.setCancelClickListener {
-            goBack()
-        }
-
-        binding.setEditClickListener {
-            navigateToAddParticipants()
-        }
-    }
-
-    override fun onResume() {
-        super.onResume()
-
-        skipEvents = false
-        setupLocalVideoPreview(binding.localPreviewVideoSurface, binding.switchCamera)
-    }
-
-    override fun onPause() {
-        super.onPause()
-
-        skipEvents = true
-        cleanUpLocalVideoPreview(binding.localPreviewVideoSurface)
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/voip/fragments/GenericVideoPreviewFragment.kt b/app/src/main/java/org/linphone/activities/voip/fragments/GenericVideoPreviewFragment.kt
deleted file mode 100644
index 98372c58e..000000000
--- a/app/src/main/java/org/linphone/activities/voip/fragments/GenericVideoPreviewFragment.kt
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright (c) 2010-2022 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.voip.fragments
-
-import android.view.MotionEvent
-import android.view.TextureView
-import android.view.View
-import android.widget.ImageView
-import androidx.databinding.ViewDataBinding
-import org.linphone.LinphoneApplication.Companion.coreContext
-import org.linphone.activities.GenericFragment
-
-abstract class GenericVideoPreviewFragment<T : ViewDataBinding> : GenericFragment<T>() {
-    private var previewX: Float = 0f
-    private var previewY: Float = 0f
-    private var switchX: Float = 0f
-    private var switchY: Float = 0f
-
-    private var switchCameraImageView: ImageView? = null
-
-    private val previewTouchListener = View.OnTouchListener { view, event ->
-        when (event.action) {
-            MotionEvent.ACTION_DOWN -> {
-                previewX = view.x - event.rawX
-                previewY = view.y - event.rawY
-                switchX = (switchCameraImageView?.x ?: 0f) - event.rawX
-                switchY = (switchCameraImageView?.y ?: 0f) - event.rawY
-                true
-            }
-            MotionEvent.ACTION_MOVE -> {
-                view.animate()
-                    .x(event.rawX + previewX)
-                    .y(event.rawY + previewY)
-                    .setDuration(0)
-                    .start()
-                switchCameraImageView?.apply {
-                    animate()
-                        .x(event.rawX + switchX)
-                        .y(event.rawY + switchY)
-                        .setDuration(0)
-                        .start()
-                }
-                true
-            }
-            else -> {
-                view.performClick()
-                false
-            }
-        }
-    }
-
-    protected fun setupLocalVideoPreview(localVideoPreview: TextureView, switchCamera: ImageView?) {
-        switchCameraImageView = switchCamera
-        localVideoPreview.setOnTouchListener(previewTouchListener)
-        coreContext.core.nativePreviewWindowId = localVideoPreview
-    }
-
-    protected fun cleanUpLocalVideoPreview(localVideoPreview: TextureView) {
-        localVideoPreview.setOnTouchListener(null)
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/voip/fragments/IncomingCallFragment.kt b/app/src/main/java/org/linphone/activities/voip/fragments/IncomingCallFragment.kt
deleted file mode 100644
index b10a04710..000000000
--- a/app/src/main/java/org/linphone/activities/voip/fragments/IncomingCallFragment.kt
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Copyright (c) 2010-2021 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.voip.fragments
-
-import android.os.Bundle
-import android.os.SystemClock
-import android.view.View
-import android.widget.Chronometer
-import androidx.navigation.navGraphViewModels
-import org.linphone.LinphoneApplication.Companion.coreContext
-import org.linphone.R
-import org.linphone.activities.GenericFragment
-import org.linphone.activities.navigateToActiveCall
-import org.linphone.activities.voip.viewmodels.CallsViewModel
-import org.linphone.activities.voip.viewmodels.ControlsViewModel
-import org.linphone.core.tools.Log
-import org.linphone.databinding.VoipCallIncomingFragmentBinding
-
-class IncomingCallFragment : GenericFragment<VoipCallIncomingFragmentBinding>() {
-    private val controlsViewModel: ControlsViewModel by navGraphViewModels(R.id.call_nav_graph)
-    private val callsViewModel: CallsViewModel by navGraphViewModels(R.id.call_nav_graph)
-
-    override fun getLayoutId(): Int = R.layout.voip_call_incoming_fragment
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        binding.lifecycleOwner = viewLifecycleOwner
-
-        binding.controlsViewModel = controlsViewModel
-
-        binding.callsViewModel = callsViewModel
-
-        callsViewModel.callConnectedEvent.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume {
-                navigateToActiveCall()
-            }
-        }
-
-        callsViewModel.callEndedEvent.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume {
-                navigateToActiveCall()
-            }
-        }
-
-        callsViewModel.currentCallData.observe(
-            viewLifecycleOwner
-        ) {
-            if (it != null) {
-                val timer = binding.root.findViewById<Chronometer>(R.id.incoming_call_timer)
-                timer.base =
-                    SystemClock.elapsedRealtime() - (1000 * it.call.duration) // Linphone timestamps are in seconds
-                timer.start()
-            }
-        }
-
-        val earlyMediaVideo = arguments?.getBoolean("earlyMediaVideo") ?: false
-        if (earlyMediaVideo) {
-            Log.i("[Incoming Call] Video early media detected, setting native window id")
-            coreContext.core.nativeVideoWindowId = binding.remoteVideoSurface
-        }
-    }
-
-    // We don't want the proximity sensor to turn screen OFF in this fragment
-    override fun onResume() {
-        super.onResume()
-        controlsViewModel.forceDisableProximitySensor.value = true
-    }
-
-    override fun onPause() {
-        controlsViewModel.forceDisableProximitySensor.value = false
-        super.onPause()
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/voip/fragments/OutgoingCallFragment.kt b/app/src/main/java/org/linphone/activities/voip/fragments/OutgoingCallFragment.kt
deleted file mode 100644
index 8ba1baa55..000000000
--- a/app/src/main/java/org/linphone/activities/voip/fragments/OutgoingCallFragment.kt
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Copyright (c) 2010-2021 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.voip.fragments
-
-import android.os.Bundle
-import android.os.SystemClock
-import android.view.View
-import android.widget.Chronometer
-import androidx.navigation.navGraphViewModels
-import org.linphone.R
-import org.linphone.activities.navigateToActiveCall
-import org.linphone.activities.voip.viewmodels.CallsViewModel
-import org.linphone.activities.voip.viewmodels.ControlsViewModel
-import org.linphone.databinding.VoipCallOutgoingFragmentBinding
-
-class OutgoingCallFragment : GenericVideoPreviewFragment<VoipCallOutgoingFragmentBinding>() {
-    private val controlsViewModel: ControlsViewModel by navGraphViewModels(R.id.call_nav_graph)
-    private val callsViewModel: CallsViewModel by navGraphViewModels(R.id.call_nav_graph)
-
-    override fun getLayoutId(): Int = R.layout.voip_call_outgoing_fragment
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        binding.lifecycleOwner = viewLifecycleOwner
-
-        binding.controlsViewModel = controlsViewModel
-
-        binding.callsViewModel = callsViewModel
-
-        callsViewModel.callConnectedEvent.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume {
-                navigateToActiveCall()
-            }
-        }
-
-        callsViewModel.callEndedEvent.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume {
-                navigateToActiveCall()
-            }
-        }
-
-        callsViewModel.currentCallData.observe(
-            viewLifecycleOwner
-        ) {
-            if (it != null) {
-                val timer = binding.root.findViewById<Chronometer>(R.id.outgoing_call_timer)
-                timer.base =
-                    SystemClock.elapsedRealtime() - (1000 * it.call.duration) // Linphone timestamps are in seconds
-                timer.start()
-            }
-        }
-
-        controlsViewModel.isOutgoingEarlyMedia.observe(
-            viewLifecycleOwner
-        ) {
-            if (it) {
-                setupLocalVideoPreview(binding.localPreviewVideoSurface, binding.switchCamera)
-            }
-        }
-    }
-
-    // We don't want the proximity sensor to turn screen OFF in this fragment
-    override fun onResume() {
-        super.onResume()
-
-        controlsViewModel.forceDisableProximitySensor.value = true
-        if (controlsViewModel.isOutgoingEarlyMedia.value == true) {
-            setupLocalVideoPreview(binding.localPreviewVideoSurface, binding.switchCamera)
-        }
-    }
-
-    override fun onPause() {
-        super.onPause()
-
-        controlsViewModel.forceDisableProximitySensor.value = false
-        cleanUpLocalVideoPreview(binding.localPreviewVideoSurface)
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/voip/fragments/SingleCallFragment.kt b/app/src/main/java/org/linphone/activities/voip/fragments/SingleCallFragment.kt
deleted file mode 100644
index 2f90854af..000000000
--- a/app/src/main/java/org/linphone/activities/voip/fragments/SingleCallFragment.kt
+++ /dev/null
@@ -1,265 +0,0 @@
-/*
- * Copyright (c) 2010-2022 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.voip.fragments
-
-import android.app.Dialog
-import android.content.Intent
-import android.os.Bundle
-import android.os.SystemClock
-import android.view.View
-import android.widget.Chronometer
-import androidx.constraintlayout.widget.ConstraintSet
-import androidx.navigation.navGraphViewModels
-import androidx.window.layout.FoldingFeature
-import org.linphone.LinphoneApplication.Companion.coreContext
-import org.linphone.LinphoneApplication.Companion.corePreferences
-import org.linphone.R
-import org.linphone.activities.*
-import org.linphone.activities.main.MainActivity
-import org.linphone.activities.main.viewmodels.DialogViewModel
-import org.linphone.activities.voip.viewmodels.CallsViewModel
-import org.linphone.activities.voip.viewmodels.ConferenceViewModel
-import org.linphone.activities.voip.viewmodels.ControlsViewModel
-import org.linphone.activities.voip.viewmodels.StatisticsListViewModel
-import org.linphone.core.*
-import org.linphone.core.tools.Log
-import org.linphone.databinding.VoipSingleCallFragmentBinding
-import org.linphone.utils.AppUtils
-import org.linphone.utils.DialogUtils
-
-class SingleCallFragment : GenericVideoPreviewFragment<VoipSingleCallFragmentBinding>() {
-    private val controlsViewModel: ControlsViewModel by navGraphViewModels(R.id.call_nav_graph)
-    private val callsViewModel: CallsViewModel by navGraphViewModels(R.id.call_nav_graph)
-    private val conferenceViewModel: ConferenceViewModel by navGraphViewModels(R.id.call_nav_graph)
-    private val statsViewModel: StatisticsListViewModel by navGraphViewModels(R.id.call_nav_graph)
-
-    private var dialog: Dialog? = null
-
-    override fun getLayoutId(): Int = R.layout.voip_single_call_fragment
-
-    override fun onStart() {
-        useMaterialSharedAxisXForwardAnimation = false
-
-        super.onStart()
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        controlsViewModel.hideCallStats() // In case it was toggled on during incoming/outgoing fragment was visible
-
-        binding.lifecycleOwner = viewLifecycleOwner
-
-        binding.controlsViewModel = controlsViewModel
-
-        binding.callsViewModel = callsViewModel
-
-        binding.conferenceViewModel = conferenceViewModel
-
-        binding.statsViewModel = statsViewModel
-
-        callsViewModel.currentCallData.observe(
-            viewLifecycleOwner
-        ) { callData ->
-            if (callData != null) {
-                val call = callData.call
-                when (val callState = call.state) {
-                    Call.State.IncomingReceived, Call.State.IncomingEarlyMedia -> {
-                        Log.i(
-                            "[Single Call] New current call is in [$callState] state, switching to IncomingCall fragment"
-                        )
-                        navigateToIncomingCall()
-                    }
-                    Call.State.OutgoingRinging, Call.State.OutgoingEarlyMedia -> {
-                        Log.i(
-                            "[Single Call] New current call is in [$callState] state, switching to OutgoingCall fragment"
-                        )
-                        navigateToOutgoingCall()
-                    }
-                    else -> {
-                        Log.i(
-                            "[Single Call] New current call is in [$callState] state, updating call UI"
-                        )
-                        val timer = binding.root.findViewById<Chronometer>(R.id.active_call_timer)
-                        timer.base =
-                            SystemClock.elapsedRealtime() - (1000 * call.duration) // Linphone timestamps are in seconds
-                        timer.start()
-
-                        if (corePreferences.enableFullScreenWhenJoiningVideoCall) {
-                            if (call.currentParams.isVideoEnabled) {
-                                Log.i(
-                                    "[Single Call] Call params have video enabled, enabling full screen mode"
-                                )
-                                controlsViewModel.fullScreenMode.value = true
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        controlsViewModel.goToConferenceParticipantsListEvent.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume {
-                navigateToConferenceParticipants()
-            }
-        }
-
-        controlsViewModel.goToChatEvent.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume {
-                goToChat()
-            }
-        }
-
-        controlsViewModel.goToCallsListEvent.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume {
-                navigateToCallsList()
-            }
-        }
-
-        controlsViewModel.goToConferenceLayoutSettingsEvent.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume {
-                navigateToConferenceLayout()
-            }
-        }
-
-        controlsViewModel.foldingState.observe(
-            viewLifecycleOwner
-        ) { feature ->
-            updateHingeRelatedConstraints(feature)
-        }
-
-        callsViewModel.callUpdateEvent.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume { call ->
-                if (call.state == Call.State.StreamsRunning) {
-                    dialog?.dismiss()
-                } else if (call.state == Call.State.UpdatedByRemote) {
-                    if (coreContext.core.isVideoEnabled) {
-                        val remoteVideo = call.remoteParams?.isVideoEnabled ?: false
-                        val localVideo = call.currentParams.isVideoEnabled
-                        if (remoteVideo && !localVideo) {
-                            showCallVideoUpdateDialog(call)
-                        }
-                    } else {
-                        Log.w(
-                            "[Single Call] Video display & capture are disabled, don't show video dialog"
-                        )
-                    }
-                }
-            }
-        }
-
-        controlsViewModel.goToDialerEvent.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume { isCallTransfer ->
-                val intent = Intent()
-                intent.setClass(requireContext(), MainActivity::class.java)
-                if (corePreferences.skipDialerForNewCallAndTransfer) {
-                    intent.putExtra("Contacts", true)
-                } else {
-                    intent.putExtra("Dialer", true)
-                }
-                intent.putExtra("Transfer", isCallTransfer)
-                intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-                startActivity(intent)
-            }
-        }
-    }
-
-    override fun onResume() {
-        super.onResume()
-
-        coreContext.core.nativeVideoWindowId = binding.remoteVideoSurface
-        setupLocalVideoPreview(binding.localPreviewVideoSurface, binding.switchCamera)
-    }
-
-    override fun onPause() {
-        super.onPause()
-
-        controlsViewModel.hideExtraButtons(true)
-        cleanUpLocalVideoPreview(binding.localPreviewVideoSurface)
-    }
-
-    private fun showCallVideoUpdateDialog(call: Call) {
-        val viewModel = DialogViewModel(
-            AppUtils.getString(R.string.call_video_update_requested_dialog)
-        )
-        dialog = DialogUtils.getVoipDialog(requireContext(), viewModel)
-
-        viewModel.showCancelButton(
-            {
-                coreContext.answerCallVideoUpdateRequest(call, false)
-                dialog?.dismiss()
-            },
-            getString(R.string.dialog_decline)
-        )
-
-        viewModel.showOkButton(
-            {
-                coreContext.answerCallVideoUpdateRequest(call, true)
-                dialog?.dismiss()
-            },
-            getString(R.string.dialog_accept)
-        )
-
-        dialog?.show()
-    }
-
-    private fun goToChat() {
-        val intent = Intent()
-        intent.setClass(requireContext(), MainActivity::class.java)
-        intent.putExtra("Chat", true)
-        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-        startActivity(intent)
-    }
-
-    private fun updateHingeRelatedConstraints(feature: FoldingFeature) {
-        Log.i("[Single Call] Updating constraint layout hinges: $feature")
-
-        val constraintLayout = binding.constraintLayout
-        val set = ConstraintSet()
-        set.clone(constraintLayout)
-
-        // Only modify UI in table top mode
-        if (feature.orientation == FoldingFeature.Orientation.HORIZONTAL &&
-            feature.state == FoldingFeature.State.HALF_OPENED
-        ) {
-            set.setGuidelinePercent(R.id.hinge_top, 0.5f)
-            set.setGuidelinePercent(R.id.hinge_bottom, 0.5f)
-            controlsViewModel.folded.value = true
-        } else {
-            set.setGuidelinePercent(R.id.hinge_top, 0f)
-            set.setGuidelinePercent(R.id.hinge_bottom, 1f)
-            controlsViewModel.folded.value = false
-        }
-
-        set.applyTo(constraintLayout)
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/voip/fragments/StatusFragment.kt b/app/src/main/java/org/linphone/activities/voip/fragments/StatusFragment.kt
deleted file mode 100644
index 0536d1da6..000000000
--- a/app/src/main/java/org/linphone/activities/voip/fragments/StatusFragment.kt
+++ /dev/null
@@ -1,174 +0,0 @@
-/*
- * Copyright (c) 2010-2021 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.voip.fragments
-
-import android.app.Dialog
-import android.os.Bundle
-import android.view.View
-import androidx.lifecycle.ViewModelProvider
-import androidx.navigation.navGraphViewModels
-import java.util.*
-import org.linphone.R
-import org.linphone.activities.GenericFragment
-import org.linphone.activities.main.viewmodels.DialogViewModel
-import org.linphone.activities.voip.viewmodels.ControlsViewModel
-import org.linphone.activities.voip.viewmodels.StatusViewModel
-import org.linphone.core.Call
-import org.linphone.core.tools.Log
-import org.linphone.databinding.VoipStatusFragmentBinding
-import org.linphone.utils.DialogUtils
-
-class StatusFragment : GenericFragment<VoipStatusFragmentBinding>() {
-    private lateinit var viewModel: StatusViewModel
-    private val controlsViewModel: ControlsViewModel by navGraphViewModels(R.id.call_nav_graph)
-
-    private var zrtpDialog: Dialog? = null
-
-    override fun getLayoutId(): Int = R.layout.voip_status_fragment
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        binding.lifecycleOwner = viewLifecycleOwner
-        useMaterialSharedAxisXForwardAnimation = false
-
-        viewModel = ViewModelProvider(this)[StatusViewModel::class.java]
-        binding.viewModel = viewModel
-
-        binding.setRefreshClickListener {
-            viewModel.refreshRegister()
-        }
-
-        viewModel.showZrtpDialogEvent.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume { call ->
-                if (call.state == Call.State.Connected || call.state == Call.State.StreamsRunning) {
-                    showZrtpDialog(call)
-                }
-            }
-        }
-
-        viewModel.showCallStatsEvent.observe(
-            viewLifecycleOwner
-        ) {
-            it.consume {
-                controlsViewModel.showCallStats(skipAnimation = true)
-            }
-        }
-    }
-
-    override fun onDestroy() {
-        if (zrtpDialog != null) {
-            zrtpDialog?.dismiss()
-        }
-        super.onDestroy()
-    }
-
-    private fun showZrtpDialog(call: Call) {
-        if (zrtpDialog != null && zrtpDialog?.isShowing == true) {
-            Log.w(
-                "[Status Fragment] ZRTP dialog already visible, closing it and creating a new one"
-            )
-            zrtpDialog?.dismiss()
-            zrtpDialog = null
-        }
-
-        val token = call.authenticationToken
-        if (token == null || token.length < 4) {
-            Log.e("[Status Fragment] ZRTP token is invalid: $token")
-            return
-        }
-
-        val toRead: String
-        val toListen: String
-        when (call.dir) {
-            Call.Dir.Incoming -> {
-                toRead = token.substring(0, 2)
-                toListen = token.substring(2)
-            }
-            else -> {
-                toRead = token.substring(2)
-                toListen = token.substring(0, 2)
-            }
-        }
-
-        val viewModel = DialogViewModel(
-            getString(R.string.zrtp_dialog_explanation),
-            getString(R.string.zrtp_dialog_title)
-        )
-        viewModel.showZrtp = true
-        viewModel.zrtpReadSas = toRead.uppercase(Locale.getDefault())
-        viewModel.zrtpListenSas = toListen.uppercase(Locale.getDefault())
-        viewModel.showIcon = true
-        viewModel.iconResource = if (call.audioStats?.isZrtpKeyAgreementAlgoPostQuantum == true) {
-            R.drawable.security_post_quantum
-        } else {
-            R.drawable.security_2_indicator
-        }
-
-        val dialog: Dialog = DialogUtils.getVoipDialog(requireContext(), viewModel)
-
-        viewModel.showCancelButton(
-            {
-                if (call.state != Call.State.End && call.state != Call.State.Released) {
-                    if (call.authenticationTokenVerified) {
-                        Log.w(
-                            "[Status Fragment] Removing trust from previously verified ZRTP SAS auth token"
-                        )
-                        this@StatusFragment.viewModel.previouslyDeclineToken = true
-                        call.authenticationTokenVerified = false
-                    }
-                } else {
-                    Log.e(
-                        "[Status Fragment] Can't decline the ZRTP SAS token, call is in state [${call.state}]"
-                    )
-                }
-                dialog.dismiss()
-                zrtpDialog = null
-            },
-            getString(R.string.zrtp_dialog_later_button_label)
-        )
-
-        viewModel.showOkButton(
-            {
-                if (call.state != Call.State.End && call.state != Call.State.Released) {
-                    call.authenticationTokenVerified = true
-                } else {
-                    Log.e(
-                        "[Status Fragment] Can't verify the ZRTP SAS token, call is in state [${call.state}]"
-                    )
-                }
-                dialog.dismiss()
-                zrtpDialog = null
-            },
-            getString(R.string.zrtp_dialog_correct_button_label)
-        )
-
-        viewModel.dismissEvent.observe(viewLifecycleOwner) {
-            it.consume {
-                dialog.dismiss()
-            }
-        }
-
-        zrtpDialog = dialog
-        dialog.show()
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/voip/viewmodels/CallsViewModel.kt b/app/src/main/java/org/linphone/activities/voip/viewmodels/CallsViewModel.kt
deleted file mode 100644
index d12d0ce90..000000000
--- a/app/src/main/java/org/linphone/activities/voip/viewmodels/CallsViewModel.kt
+++ /dev/null
@@ -1,330 +0,0 @@
-/*
- * Copyright (c) 2010-2021 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.voip.viewmodels
-
-import android.Manifest
-import androidx.lifecycle.MediatorLiveData
-import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.ViewModel
-import org.linphone.LinphoneApplication.Companion.coreContext
-import org.linphone.R
-import org.linphone.activities.voip.data.CallData
-import org.linphone.core.*
-import org.linphone.core.tools.Log
-import org.linphone.utils.AppUtils
-import org.linphone.utils.Event
-import org.linphone.utils.PermissionHelper
-
-class CallsViewModel : ViewModel() {
-    val currentCallData = MutableLiveData<CallData>()
-
-    val callsData = MutableLiveData<List<CallData>>()
-
-    val inactiveCallsCount = MutableLiveData<Int>()
-
-    val currentCallUnreadChatMessageCount = MutableLiveData<Int>()
-
-    val chatAndCallsCount = MediatorLiveData<Int>()
-
-    val isMicrophoneMuted = MutableLiveData<Boolean>()
-
-    val isMuteMicrophoneEnabled = MutableLiveData<Boolean>()
-
-    val callConnectedEvent: MutableLiveData<Event<Call>> by lazy {
-        MutableLiveData<Event<Call>>()
-    }
-
-    val callEndedEvent: MutableLiveData<Event<Call>> by lazy {
-        MutableLiveData<Event<Call>>()
-    }
-
-    val callUpdateEvent: MutableLiveData<Event<Call>> by lazy {
-        MutableLiveData<Event<Call>>()
-    }
-
-    val noMoreCallEvent: MutableLiveData<Event<Boolean>> by lazy {
-        MutableLiveData<Event<Boolean>>()
-    }
-
-    val askPermissionEvent: MutableLiveData<Event<String>> by lazy {
-        MutableLiveData<Event<String>>()
-    }
-
-    private val listener = object : CoreListenerStub() {
-        override fun onChatRoomRead(core: Core, chatRoom: ChatRoom) {
-            updateUnreadChatCount()
-        }
-
-        override fun onMessagesReceived(
-            core: Core,
-            chatRoom: ChatRoom,
-            messages: Array<out ChatMessage>
-        ) {
-            updateUnreadChatCount()
-        }
-
-        override fun onLastCallEnded(core: Core) {
-            Log.i("[Calls] Last call ended")
-            currentCallData.value?.destroy()
-            noMoreCallEvent.value = Event(true)
-        }
-
-        override fun onCallStateChanged(core: Core, call: Call, state: Call.State, message: String) {
-            Log.i("[Calls] Call with ID [${call.callLog.callId}] state changed: $state")
-
-            if (state == Call.State.IncomingEarlyMedia || state == Call.State.IncomingReceived || state == Call.State.OutgoingInit) {
-                if (!callDataAlreadyExists(call)) {
-                    addCallToList(call)
-                }
-            }
-
-            val currentCall = core.currentCall
-            Log.i("[Calls] Current call is ${currentCall?.remoteAddress?.asStringUriOnly()}")
-            if (currentCall != null && currentCallData.value?.call != currentCall) {
-                updateCurrentCallData(currentCall)
-            } else if (currentCall == null && core.callsNb > 0) {
-                updateCurrentCallData(null)
-            } else if (currentCallData.value == null) {
-                updateCurrentCallData(currentCall)
-            }
-
-            if (state == Call.State.End || state == Call.State.Released || state == Call.State.Error) {
-                removeCallFromList(call)
-                if (core.callsNb > 0) {
-                    Log.i(
-                        "[Calls] Call has ended but there are still at least one other existing call"
-                    )
-                    callEndedEvent.value = Event(call)
-                }
-            } else if (call.state == Call.State.UpdatedByRemote) {
-                // If the correspondent asks to turn on video while audio call,
-                // defer update until user has chosen whether to accept it or not
-                val remoteVideo = call.remoteParams?.isVideoEnabled ?: false
-                val localVideo = call.currentParams.isVideoEnabled
-                val autoAccept = call.core.videoActivationPolicy.automaticallyAccept
-                if (remoteVideo && !localVideo && !autoAccept) {
-                    if (coreContext.core.isVideoCaptureEnabled || coreContext.core.isVideoDisplayEnabled) {
-                        call.deferUpdate()
-                        callUpdateEvent.value = Event(call)
-                    } else {
-                        coreContext.answerCallVideoUpdateRequest(call, false)
-                    }
-                }
-            } else if (state == Call.State.Connected) {
-                callConnectedEvent.value = Event(call)
-            } else if (state == Call.State.StreamsRunning) {
-                callUpdateEvent.value = Event(call)
-            }
-
-            updateInactiveCallsCount()
-        }
-    }
-
-    init {
-        coreContext.core.addListener(listener)
-
-        val currentCall = coreContext.core.currentCall ?: coreContext.core.calls.firstOrNull()
-        if (currentCall != null) {
-            Log.i(
-                "[Calls] Initializing ViewModel using call [${currentCall.remoteAddress.asStringUriOnly()}] as current"
-            )
-            currentCallData.value?.destroy()
-
-            val viewModel = CallData(currentCall)
-            currentCallData.value = viewModel
-        }
-
-        chatAndCallsCount.value = 0
-        chatAndCallsCount.addSource(inactiveCallsCount) {
-            chatAndCallsCount.value = updateCallsAndChatCount()
-        }
-        chatAndCallsCount.addSource(currentCallUnreadChatMessageCount) {
-            chatAndCallsCount.value = updateCallsAndChatCount()
-        }
-
-        initCallList()
-        updateInactiveCallsCount()
-        updateUnreadChatCount()
-        updateMicState()
-    }
-
-    override fun onCleared() {
-        coreContext.core.removeListener(listener)
-
-        currentCallData.value?.destroy()
-        callsData.value.orEmpty().forEach(CallData::destroy)
-
-        super.onCleared()
-    }
-
-    fun toggleMuteMicrophone() {
-        if (!PermissionHelper.get().hasRecordAudioPermission()) {
-            askPermissionEvent.value = Event(Manifest.permission.RECORD_AUDIO)
-            return
-        }
-
-        val call = currentCallData.value?.call
-        if (call != null && call.conference != null) {
-            val micMuted = call.conference?.microphoneMuted ?: false
-            call.conference?.microphoneMuted = !micMuted
-        } else {
-            val micMuted = call?.microphoneMuted ?: false
-            call?.microphoneMuted = !micMuted
-        }
-        updateMicState()
-    }
-
-    fun mergeCallsIntoConference() {
-        Log.i("[Calls] Merging all calls into new conference")
-        val core = coreContext.core
-        val params = core.createConferenceParams(null)
-        params.subject = AppUtils.getString(R.string.conference_local_title)
-        // Prevent group call to start in audio only layout
-        params.isVideoEnabled = true
-        val conference = core.createConferenceWithParams(params)
-        conference?.addParticipants(core.calls)
-    }
-
-    private fun initCallList() {
-        val calls = arrayListOf<CallData>()
-
-        for (call in coreContext.core.calls) {
-            val data: CallData = if (currentCallData.value?.call == call) {
-                currentCallData.value!!
-            } else {
-                CallData(call)
-            }
-            Log.i("[Calls] Adding call with ID ${call.callLog.callId} to calls list")
-            calls.add(data)
-        }
-
-        callsData.value = calls
-    }
-
-    private fun addCallToList(call: Call) {
-        Log.i("[Calls] Adding call with ID ${call.callLog.callId} to calls list")
-
-        val calls = arrayListOf<CallData>()
-        calls.addAll(callsData.value.orEmpty())
-
-        val data = CallData(call)
-        calls.add(data)
-
-        callsData.value = calls
-    }
-
-    private fun removeCallFromList(call: Call) {
-        Log.i("[Calls] Removing call with ID ${call.callLog.callId} from calls list")
-
-        val calls = arrayListOf<CallData>()
-        for (data in callsData.value.orEmpty()) {
-            if (data.call == call) {
-                data.destroy()
-            } else {
-                calls.add(data)
-            }
-        }
-
-        callsData.value = calls
-    }
-
-    private fun updateCurrentCallData(currentCall: Call?) {
-        var callToUse = currentCall
-        if (currentCall == null) {
-            if (coreContext.core.callsNb == 1) {
-                // Make sure the current call data is matching the only call
-                val firstData = callsData.value?.firstOrNull()
-                if (firstData != null && currentCallData.value != firstData) {
-                    Log.i(
-                        "[Calls] Only one call in Core and the current call data doesn't match it, updating it"
-                    )
-                    currentCallData.value = firstData!!
-                }
-                return
-            }
-
-            val firstCall = coreContext.core.calls.find { call ->
-                call.state != Call.State.Error && call.state != Call.State.End && call.state != Call.State.Released
-            }
-            if (firstCall != null && currentCallData.value?.call != firstCall) {
-                Log.i(
-                    "[Calls] Using [${firstCall.remoteAddress.asStringUriOnly()}] call as \"current\" call"
-                )
-                callToUse = firstCall
-            }
-        }
-
-        if (callToUse == null) {
-            Log.w("[Calls] No call found to be used as \"current\"")
-            return
-        }
-
-        var found = false
-        for (callData in callsData.value.orEmpty()) {
-            if (callData.call == callToUse) {
-                Log.i(
-                    "[Calls] Updating current call to: ${callData.call.remoteAddress.asStringUriOnly()}"
-                )
-                currentCallData.value = callData
-                found = true
-                break
-            }
-        }
-        if (!found) {
-            Log.w(
-                "[Calls] Call with ID [${callToUse.callLog.callId}] not found in calls data list, shouldn't happen!"
-            )
-            val viewModel = CallData(callToUse)
-            currentCallData.value = viewModel
-        }
-
-        updateMicState()
-        // updateUnreadChatCount()
-    }
-
-    private fun callDataAlreadyExists(call: Call): Boolean {
-        for (callData in callsData.value.orEmpty()) {
-            if (callData.call == call) {
-                return true
-            }
-        }
-        return false
-    }
-
-    fun updateMicState() {
-        isMicrophoneMuted.value = !PermissionHelper.get().hasRecordAudioPermission() || currentCallData.value?.call?.microphoneMuted == true
-        isMuteMicrophoneEnabled.value = currentCallData.value?.call != null
-    }
-
-    private fun updateCallsAndChatCount(): Int {
-        return (inactiveCallsCount.value ?: 0) + (currentCallUnreadChatMessageCount.value ?: 0)
-    }
-
-    private fun updateUnreadChatCount() {
-        // For now we don't display in-call chat, so use global unread chat messages count
-        currentCallUnreadChatMessageCount.value = coreContext.core.unreadChatMessageCountFromActiveLocals
-    }
-
-    private fun updateInactiveCallsCount() {
-        // TODO: handle local conference
-        val callsNb = coreContext.core.callsNb
-        inactiveCallsCount.value = if (callsNb > 0) callsNb - 1 else 0
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/voip/viewmodels/ConferenceParticipantsViewModel.kt b/app/src/main/java/org/linphone/activities/voip/viewmodels/ConferenceParticipantsViewModel.kt
deleted file mode 100644
index a3dc7aa9c..000000000
--- a/app/src/main/java/org/linphone/activities/voip/viewmodels/ConferenceParticipantsViewModel.kt
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright (c) 2010-2021 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.voip.viewmodels
-
-import androidx.lifecycle.ViewModel
-import androidx.lifecycle.ViewModelProvider
-import org.linphone.contact.ContactsSelectionViewModel
-import org.linphone.core.Address
-import org.linphone.core.Conference
-import org.linphone.core.tools.Log
-
-class ConferenceParticipantsViewModelFactory(private val conference: Conference) :
-    ViewModelProvider.NewInstanceFactory() {
-
-    @Suppress("UNCHECKED_CAST")
-    override fun <T : ViewModel> create(modelClass: Class<T>): T {
-        return ConferenceParticipantsViewModel(conference) as T
-    }
-}
-
-class ConferenceParticipantsViewModel(val conference: Conference) : ContactsSelectionViewModel() {
-    init {
-        selectCurrentParticipants()
-    }
-
-    fun applyChanges() {
-        // Adding new participants first, because if we remove all of them (or all of them except one)
-        // It will terminate the conference first and we won't be able to add new participants after
-        for (address in selectedAddresses.value.orEmpty()) {
-            val participant = conference.participantList.find { participant ->
-                participant.address.weakEqual(address)
-            }
-            if (participant == null) {
-                Log.i(
-                    "[Conference Participants] Participant ${address.asStringUriOnly()} will be added to group"
-                )
-                conference.addParticipant(address)
-            }
-        }
-
-        // Removing participants
-        for (participant in conference.participantList) {
-            val member = selectedAddresses.value.orEmpty().find { address ->
-                participant.address.weakEqual(address)
-            }
-            if (member == null) {
-                Log.w(
-                    "[Conference Participants] Participant ${participant.address.asStringUriOnly()} will be removed from conference"
-                )
-                conference.removeParticipant(participant)
-            }
-        }
-    }
-
-    private fun selectCurrentParticipants() {
-        val list = arrayListOf<Address>()
-
-        for (participant in conference.participantList) {
-            list.add(participant.address)
-        }
-
-        selectedAddresses.value = list
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/voip/viewmodels/ConferenceViewModel.kt b/app/src/main/java/org/linphone/activities/voip/viewmodels/ConferenceViewModel.kt
deleted file mode 100644
index 14f41f2ce..000000000
--- a/app/src/main/java/org/linphone/activities/voip/viewmodels/ConferenceViewModel.kt
+++ /dev/null
@@ -1,772 +0,0 @@
-/*
- * Copyright (c) 2010-2021 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.voip.viewmodels
-
-import androidx.lifecycle.MediatorLiveData
-import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.ViewModel
-import org.linphone.LinphoneApplication.Companion.coreContext
-import org.linphone.LinphoneApplication.Companion.corePreferences
-import org.linphone.R
-import org.linphone.activities.voip.ConferenceDisplayMode
-import org.linphone.activities.voip.data.ConferenceParticipantData
-import org.linphone.activities.voip.data.ConferenceParticipantDeviceData
-import org.linphone.core.*
-import org.linphone.core.tools.Log
-import org.linphone.utils.AppUtils
-import org.linphone.utils.Event
-import org.linphone.utils.LinphoneUtils
-
-class ConferenceViewModel : ViewModel() {
-    val conferenceExists = MutableLiveData<Boolean>()
-    val subject = MutableLiveData<String>()
-    val isConferenceLocallyPaused = MutableLiveData<Boolean>()
-    val isVideoConference = MutableLiveData<Boolean>()
-    val isMeAdmin = MutableLiveData<Boolean>()
-
-    val conference = MutableLiveData<Conference>()
-    val conferenceCreationPending = MutableLiveData<Boolean>()
-    val conferenceParticipants = MutableLiveData<List<ConferenceParticipantData>>()
-    val conferenceParticipantDevices = MutableLiveData<List<ConferenceParticipantDeviceData>>()
-    val conferenceDisplayMode = MutableLiveData<ConferenceDisplayMode>()
-    val activeSpeakerConferenceParticipantDevices = MediatorLiveData<List<ConferenceParticipantDeviceData>>()
-
-    val isRecording = MutableLiveData<Boolean>()
-    val isRemotelyRecorded = MutableLiveData<Boolean>()
-
-    val maxParticipantsForMosaicLayout = corePreferences.maxConferenceParticipantsForMosaicLayout
-
-    val twoOrMoreParticipants = MutableLiveData<Boolean>()
-    val moreThanTwoParticipants = MutableLiveData<Boolean>()
-
-    val speakingParticipantFound = MutableLiveData<Boolean>()
-    val speakingParticipant = MutableLiveData<ConferenceParticipantDeviceData>()
-    val speakingParticipantVideoEnabled = MutableLiveData<Boolean>()
-    val meParticipant = MutableLiveData<ConferenceParticipantDeviceData>()
-
-    val isBroadcast = MutableLiveData<Boolean>()
-    val isMeListenerOnly = MutableLiveData<Boolean>()
-
-    val participantAdminStatusChangedEvent: MutableLiveData<Event<ConferenceParticipantData>> by lazy {
-        MutableLiveData<Event<ConferenceParticipantData>>()
-    }
-
-    val firstToJoinEvent: MutableLiveData<Event<Boolean>> by lazy {
-        MutableLiveData<Event<Boolean>>()
-    }
-
-    val allParticipantsLeftEvent: MutableLiveData<Event<Boolean>> by lazy {
-        MutableLiveData<Event<Boolean>>()
-    }
-
-    val secondParticipantJoinedEvent: MutableLiveData<Event<Boolean>> by lazy {
-        MutableLiveData<Event<Boolean>>()
-    }
-
-    val moreThanTwoParticipantsJoinedEvent: MutableLiveData<Event<Boolean>> by lazy {
-        MutableLiveData<Event<Boolean>>()
-    }
-
-    private var waitForNextStreamsRunningToUpdateLayout = false
-
-    val reloadConferenceFragmentEvent: MutableLiveData<Event<Boolean>> by lazy {
-        MutableLiveData<Event<Boolean>>()
-    }
-
-    private val conferenceListener = object : ConferenceListenerStub() {
-        override fun onParticipantAdded(conference: Conference, participant: Participant) {
-            Log.i("[Conference] Participant added: ${participant.address.asStringUriOnly()}")
-            updateParticipantsList(conference)
-        }
-
-        override fun onParticipantRemoved(conference: Conference, participant: Participant) {
-            Log.i("[Conference] Participant removed: ${participant.address.asStringUriOnly()}")
-            updateParticipantsList(conference)
-        }
-
-        override fun onParticipantDeviceAdded(
-            conference: Conference,
-            participantDevice: ParticipantDevice
-        ) {
-            Log.i(
-                "[Conference] Participant device added: ${participantDevice.address.asStringUriOnly()}"
-            )
-            addParticipantDevice(conference, participantDevice)
-
-            if (conferenceParticipantDevices.value.orEmpty().size == 2) {
-                secondParticipantJoinedEvent.value = Event(true)
-            } else if (conferenceParticipantDevices.value.orEmpty().size > 2) {
-                moreThanTwoParticipantsJoinedEvent.value = Event(true)
-            }
-        }
-
-        override fun onParticipantDeviceRemoved(
-            conference: Conference,
-            participantDevice: ParticipantDevice
-        ) {
-            Log.i(
-                "[Conference] Participant device removed: ${participantDevice.address.asStringUriOnly()}"
-            )
-            removeParticipantDevice(participantDevice)
-
-            when (conferenceParticipantDevices.value.orEmpty().size) {
-                1 -> {
-                    speakingParticipant.value?.videoEnabled?.value = false
-                    speakingParticipantVideoEnabled.value = false
-                    allParticipantsLeftEvent.value = Event(true)
-                }
-                2 -> {
-                    secondParticipantJoinedEvent.value = Event(true)
-                }
-                else -> {}
-            }
-        }
-
-        override fun onParticipantAdminStatusChanged(
-            conference: Conference,
-            participant: Participant
-        ) {
-            Log.i(
-                "[Conference] Participant admin status changed [${participant.address.asStringUriOnly()}] is ${if (participant.isAdmin) "now admin" else "no longer admin"}"
-            )
-            isMeAdmin.value = conference.me.isAdmin
-            updateParticipantsList(conference)
-
-            if (conference.me.address.weakEqual(participant.address)) {
-                Log.i(
-                    "[Conference] Found me participant [${participant.address.asStringUriOnly()}]"
-                )
-                val participantData = ConferenceParticipantData(conference, participant)
-                participantAdminStatusChangedEvent.value = Event(participantData)
-                return
-            }
-
-            val participantData = conferenceParticipants.value.orEmpty().find { data ->
-                data.participant.address.weakEqual(
-                    participant.address
-                )
-            }
-            if (participantData != null) {
-                participantAdminStatusChangedEvent.value = Event(participantData)
-            } else {
-                Log.w(
-                    "[Conference] Failed to find participant [${participant.address.asStringUriOnly()}] in conferenceParticipants list"
-                )
-            }
-        }
-
-        override fun onSubjectChanged(conference: Conference, subject: String) {
-            Log.i("[Conference] Subject changed: $subject")
-            this@ConferenceViewModel.subject.value = subject
-        }
-
-        override fun onParticipantDeviceStateChanged(
-            conference: Conference,
-            device: ParticipantDevice,
-            state: ParticipantDevice.State
-        ) {
-            if (conference.isMe(device.address)) {
-                when (state) {
-                    ParticipantDevice.State.Present -> {
-                        Log.i("[Conference] Entered conference")
-                        isConferenceLocallyPaused.value = false
-                    }
-                    ParticipantDevice.State.OnHold -> {
-                        Log.i("[Conference] Left conference")
-                        isConferenceLocallyPaused.value = true
-                    }
-                    else -> {}
-                }
-            } else {
-                speakingParticipantVideoEnabled.value = speakingParticipant.value?.isInConference?.value == true && speakingParticipant.value?.isSendingVideo?.value == true
-            }
-        }
-
-        override fun onActiveSpeakerParticipantDevice(
-            conference: Conference,
-            participantDevice: ParticipantDevice
-        ) {
-            Log.i(
-                "[Conference] Participant [${participantDevice.address.asStringUriOnly()}] is currently being displayed as active speaker"
-            )
-            val device = conferenceParticipantDevices.value.orEmpty().find {
-                it.participantDevice.address.weakEqual(participantDevice.address)
-            }
-
-            if (device != null && device != speakingParticipant.value) {
-                Log.i("[Conference] Found actively speaking participant device")
-                speakingParticipant.value?.isActiveSpeaker?.value = false
-                device.isActiveSpeaker.value = true
-                speakingParticipant.value = device!!
-                speakingParticipantFound.value = true
-                speakingParticipantVideoEnabled.value = speakingParticipant.value?.isInConference?.value == true && speakingParticipant.value?.isSendingVideo?.value == true
-            } else if (device == null) {
-                Log.w(
-                    "[Conference] Participant device [${participantDevice.address.asStringUriOnly()}] is the active speaker but couldn't find it in devices list"
-                )
-            }
-        }
-
-        override fun onParticipantDeviceMediaAvailabilityChanged(
-            conference: Conference,
-            device: ParticipantDevice
-        ) {
-            speakingParticipantVideoEnabled.value = speakingParticipant.value?.isInConference?.value == true && speakingParticipant.value?.isSendingVideo?.value == true
-        }
-
-        override fun onParticipantDeviceMediaCapabilityChanged(
-            conference: Conference,
-            device: ParticipantDevice
-        ) {
-            speakingParticipantVideoEnabled.value = speakingParticipant.value?.isInConference?.value == true && speakingParticipant.value?.isSendingVideo?.value == true
-        }
-
-        override fun onStateChanged(conference: Conference, state: Conference.State) {
-            Log.i("[Conference] State changed: $state")
-            isVideoConference.value = conference.currentParams.isVideoEnabled && !corePreferences.disableVideo
-
-            when (state) {
-                Conference.State.Created -> {
-                    configureConference(conference)
-                }
-                Conference.State.TerminationPending -> {
-                    terminateConference(conference)
-                }
-                else -> {}
-            }
-        }
-    }
-
-    private val listener = object : CoreListenerStub() {
-        override fun onConferenceStateChanged(
-            core: Core,
-            conference: Conference,
-            state: Conference.State
-        ) {
-            Log.i("[Conference] Conference state changed: $state")
-            if (state == Conference.State.Instantiated) {
-                conferenceCreationPending.value = true
-                initConference(conference)
-            } else if (state == Conference.State.Created) {
-                if (conferenceCreationPending.value == true) {
-                    conferenceCreationPending.value = false
-                }
-            }
-        }
-
-        override fun onCallStateChanged(
-            core: Core,
-            call: Call,
-            state: Call.State?,
-            message: String
-        ) {
-            if (state == Call.State.StreamsRunning && waitForNextStreamsRunningToUpdateLayout) {
-                waitForNextStreamsRunningToUpdateLayout = false
-                reloadConferenceFragmentEvent.value = Event(true)
-            }
-            if (state == Call.State.StreamsRunning && call.conference?.isIn == true) {
-                isConferenceLocallyPaused.value = false
-                conferenceParticipantDevices.value?.forEach {
-                    if (it.isMe) {
-                        it.isInConference.value = true
-                    }
-                }
-            }
-        }
-    }
-
-    init {
-        coreContext.core.addListener(listener)
-        conferenceExists.value = false
-
-        conferenceParticipants.value = arrayListOf()
-        conferenceParticipantDevices.value = arrayListOf()
-        activeSpeakerConferenceParticipantDevices.addSource(conferenceParticipantDevices) {
-            activeSpeakerConferenceParticipantDevices.value = conferenceParticipantDevices.value.orEmpty().drop(
-                1
-            )
-        }
-
-        subject.value = AppUtils.getString(R.string.conference_default_title)
-
-        var conference = coreContext.core.conference ?: coreContext.core.currentCall?.conference
-        if (conference == null) {
-            for (call in coreContext.core.calls) {
-                if (call.conference != null) {
-                    conference = call.conference
-                    break
-                }
-            }
-        }
-        if (conference != null) {
-            val state = conference.state
-            Log.i("[Conference] Found an existing conference: $conference in state $state")
-            if (state != Conference.State.TerminationPending && state != Conference.State.Terminated) {
-                initConference(conference)
-                if (state == Conference.State.Instantiated) {
-                    conferenceCreationPending.value = true
-                } else if (state == Conference.State.Created) {
-                    if (conferenceCreationPending.value == true) {
-                        conferenceCreationPending.value = false
-                    }
-                    configureConference(conference)
-                }
-            }
-        }
-    }
-
-    override fun onCleared() {
-        coreContext.core.removeListener(listener)
-        conference.value?.removeListener(conferenceListener)
-
-        conferenceParticipants.value.orEmpty().forEach(ConferenceParticipantData::destroy)
-        conferenceParticipantDevices.value.orEmpty().forEach(
-            ConferenceParticipantDeviceData::destroy
-        )
-        activeSpeakerConferenceParticipantDevices.value.orEmpty().forEach(
-            ConferenceParticipantDeviceData::destroy
-        )
-
-        super.onCleared()
-    }
-
-    fun pauseConference() {
-        Log.i("[Conference] Leaving conference temporarily")
-        conference.value?.leave()
-    }
-
-    fun resumeConference() {
-        Log.i("[Conference] Entering conference again")
-        conference.value?.enter()
-    }
-
-    fun toggleRecording() {
-        if (conference.value?.isRecording == true) {
-            Log.i("[Conference] Stopping conference recording")
-            conference.value?.stopRecording()
-        } else {
-            val path = LinphoneUtils.getRecordingFilePathForConference(
-                conference.value?.currentParams?.subject
-            )
-            Log.i("[Conference] Starting recording in file $path")
-            conference.value?.startRecording(path)
-        }
-        isRecording.value = conference.value?.isRecording
-    }
-
-    fun initConference(conference: Conference) {
-        conferenceExists.value = true
-
-        this@ConferenceViewModel.conference.value = conference
-        conference.addListener(conferenceListener)
-
-        isRecording.value = conference.isRecording
-        subject.value = LinphoneUtils.getConferenceSubject(conference)
-
-        updateConferenceLayout(conference)
-    }
-
-    fun configureConference(conference: Conference) {
-        updateParticipantsList(conference)
-        if (conferenceParticipants.value.orEmpty().isEmpty()) {
-            firstToJoinEvent.value = Event(true)
-        }
-
-        updateParticipantsDevicesList(conference)
-        if (conferenceParticipantDevices.value.orEmpty().size == 2) {
-            secondParticipantJoinedEvent.value = Event(true)
-        } else if (conferenceParticipantDevices.value.orEmpty().size > 2) {
-            moreThanTwoParticipantsJoinedEvent.value = Event(true)
-        }
-
-        isConferenceLocallyPaused.value = if (conference.call == null) false else !conference.isIn
-        isMeAdmin.value = conference.me.isAdmin
-        isVideoConference.value = conference.currentParams.isVideoEnabled && !corePreferences.disableVideo
-        subject.value = LinphoneUtils.getConferenceSubject(conference)
-
-        updateConferenceLayout(conference)
-    }
-
-    fun addCallsToConference() {
-        Log.i("[Conference] Trying to merge all calls into existing conference")
-        val conf = conference.value
-        conf ?: return
-
-        for (call in coreContext.core.calls) {
-            if (call.conference == null) {
-                Log.i("[Conference] Adding call [$call] as participant for conference [$conf]")
-                conf.addParticipant(call)
-            }
-        }
-        if (!conf.isIn) {
-            Log.i("[Conference] Conference was paused, resuming it")
-            conf.enter()
-        }
-    }
-
-    fun switchLayoutFromAudioOnlyToActiveSpeaker() {
-        if (conferenceDisplayMode.value == ConferenceDisplayMode.AUDIO_ONLY) {
-            Log.i(
-                "[Conference] Trying to switch from AUDIO_ONLY to ACTIVE_SPEAKER and toggle video ON"
-            )
-            changeLayout(ConferenceDisplayMode.ACTIVE_SPEAKER, true)
-            waitForNextStreamsRunningToUpdateLayout = true
-        } else {
-            Log.w(
-                "[Conference] Can't switch from AUDIO_ONLY to ACTIVE_SPEAKER as current display mode isn't AUDIO_ONLY but ${conferenceDisplayMode.value}"
-            )
-        }
-    }
-
-    fun changeLayout(layout: ConferenceDisplayMode, forceSendingVideo: Boolean) {
-        Log.i("[Conference] Trying to change conference layout to $layout")
-        val conference = conference.value
-        if (conference != null) {
-            val call = conference.call
-            if (call != null) {
-                val params = call.core.createCallParams(call)
-                if (params == null) {
-                    Log.e("[Conference] Failed to create call params from conference call!")
-                    return
-                }
-
-                params.isVideoEnabled = layout != ConferenceDisplayMode.AUDIO_ONLY
-                if (forceSendingVideo) {
-                    Log.w("[Conference] Forcing video direction to SendRecv")
-                    params.videoDirection = MediaDirection.SendRecv
-                } else {
-                    if (conferenceDisplayMode.value == ConferenceDisplayMode.AUDIO_ONLY) {
-                        // Previous layout was audio only, make sure video isn't sent without user consent when switching layout
-                        params.videoDirection = MediaDirection.RecvOnly
-                    }
-                    Log.i("[Conference] Video direction is ${params.videoDirection}")
-                }
-
-                params.conferenceVideoLayout = when (layout) {
-                    ConferenceDisplayMode.GRID -> Conference.Layout.Grid
-                    else -> Conference.Layout.ActiveSpeaker
-                }
-                call.update(params)
-
-                conferenceDisplayMode.value = layout
-                val list = sortDevicesDataList(conferenceParticipantDevices.value.orEmpty())
-                conferenceParticipantDevices.value = list
-            } else {
-                Log.e("[Conference] Failed to get call from conference!")
-            }
-        } else {
-            Log.e("[Conference] Conference is null in ConferenceViewModel")
-        }
-    }
-
-    private fun updateConferenceLayout(conference: Conference) {
-        val call = conference.call
-        var videoDirection = MediaDirection.Inactive
-
-        if (call == null) {
-            conferenceDisplayMode.value = ConferenceDisplayMode.AUDIO_ONLY
-            Log.w("[Conference] Call is null, assuming audio only layout for local conference")
-        } else {
-            val params = call.params
-            videoDirection = params.videoDirection
-            conferenceDisplayMode.value = if (!params.isVideoEnabled) {
-                ConferenceDisplayMode.AUDIO_ONLY
-            } else {
-                when (params.conferenceVideoLayout) {
-                    Conference.Layout.Grid -> ConferenceDisplayMode.GRID
-                    else -> ConferenceDisplayMode.ACTIVE_SPEAKER
-                }
-            }
-        }
-
-        val list = sortDevicesDataList(conferenceParticipantDevices.value.orEmpty())
-        conferenceParticipantDevices.value = list
-
-        Log.i(
-            "[Conference] Current layout is [${conferenceDisplayMode.value}], video direction is [$videoDirection]"
-        )
-    }
-
-    private fun terminateConference(conference: Conference) {
-        conferenceExists.value = false
-        isVideoConference.value = false
-
-        conference.removeListener(conferenceListener)
-
-        conferenceParticipants.value.orEmpty().forEach(ConferenceParticipantData::destroy)
-        conferenceParticipantDevices.value.orEmpty().forEach(
-            ConferenceParticipantDeviceData::destroy
-        )
-        activeSpeakerConferenceParticipantDevices.value.orEmpty().forEach(
-            ConferenceParticipantDeviceData::destroy
-        )
-
-        conferenceParticipants.value = arrayListOf()
-        conferenceParticipantDevices.value = arrayListOf()
-    }
-
-    private fun updateParticipantsList(conference: Conference) {
-        conferenceParticipants.value.orEmpty().forEach(ConferenceParticipantData::destroy)
-        val participants = arrayListOf<ConferenceParticipantData>()
-
-        val participantsList = conference.participantList
-        Log.i("[Conference] Conference has ${participantsList.size} participants")
-        for (participant in participantsList) {
-            val participantDevices = participant.devices
-            Log.i(
-                "[Conference] Participant found: ${participant.address.asStringUriOnly()} with ${participantDevices.size} device(s)"
-            )
-
-            val participantData = ConferenceParticipantData(conference, participant)
-            participants.add(participantData)
-        }
-
-        conferenceParticipants.value = participants
-    }
-
-    private fun updateParticipantsDevicesList(conference: Conference) {
-        conferenceParticipantDevices.value.orEmpty().forEach(
-            ConferenceParticipantDeviceData::destroy
-        )
-        activeSpeakerConferenceParticipantDevices.value.orEmpty().forEach(
-            ConferenceParticipantDeviceData::destroy
-        )
-        val devices = arrayListOf<ConferenceParticipantDeviceData>()
-
-        val participantsList = conference.participantList
-        Log.i("[Conference] Conference has ${participantsList.size} participants")
-
-        val activelySpeakingParticipantDevice = conference.activeSpeakerParticipantDevice
-        var foundActivelySpeakingParticipantDevice = false
-        speakingParticipantFound.value = false
-        speakingParticipantVideoEnabled.value = false
-
-        val conferenceAddress = conference.conferenceAddress ?: return
-        val conferenceInfo = conference.core.findConferenceInformationFromUri(
-            conferenceAddress
-        )
-        var allSpeaker = true
-        for (info in conferenceInfo?.participantInfos.orEmpty()) {
-            if (info.role == Participant.Role.Listener) {
-                allSpeaker = false
-            }
-        }
-        isBroadcast.value = !allSpeaker
-        if (!allSpeaker) {
-            Log.i(
-                "[Conference] Not all participants are speaker, considering it is a broadcast"
-            )
-        }
-
-        for (participant in participantsList) {
-            val participantDevices = participant.devices
-            Log.i(
-                "[Conference] Participant found: ${participant.address.asStringUriOnly()} with ${participantDevices.size} device(s)"
-            )
-
-            for (device in participantDevices) {
-                Log.i(
-                    "[Conference] Participant device found: ${device.name} (${device.address.asStringUriOnly()})"
-                )
-
-                val info = conferenceInfo?.participantInfos?.find {
-                    it.address.weakEqual(participant.address)
-                }
-                if (info != null) {
-                    Log.i("[Conference] Participant role is [${info.role.name}]")
-                    val listener = info.role == Participant.Role.Listener || info.role == Participant.Role.Unknown
-                    if (listener) {
-                        continue
-                    }
-                }
-
-                val deviceData = ConferenceParticipantDeviceData(device, false)
-                devices.add(deviceData)
-
-                if (activelySpeakingParticipantDevice == device) {
-                    Log.i(
-                        "[Conference] Actively speaking participant device found: ${device.name} (${device.address.asStringUriOnly()})"
-                    )
-                    speakingParticipant.value = deviceData
-                    deviceData.isActiveSpeaker.value = true
-                    foundActivelySpeakingParticipantDevice = true
-                    speakingParticipantFound.value = true
-                    speakingParticipantVideoEnabled.value = speakingParticipant.value?.isInConference?.value == true && speakingParticipant.value?.isSendingVideo?.value == true
-                }
-            }
-        }
-
-        if (!foundActivelySpeakingParticipantDevice && devices.isNotEmpty()) {
-            Log.w(
-                "[Conference] Actively speaking participant device not found, using first participant device available"
-            )
-            val deviceData = devices.first()
-            speakingParticipant.value = deviceData
-            deviceData.isActiveSpeaker.value = true
-            speakingParticipantFound.value = true
-            speakingParticipantVideoEnabled.value = speakingParticipant.value?.isInConference?.value == true && speakingParticipant.value?.isSendingVideo?.value == true
-        }
-
-        for (device in conference.me.devices) {
-            Log.i(
-                "[Conference] Participant device for myself found: ${device.name} (${device.address.asStringUriOnly()})"
-            )
-
-            val info = conferenceInfo?.participantInfos?.find {
-                it.address.weakEqual(device.address)
-            }
-            if (info != null) {
-                Log.i("[Conference] Me role is [${info.role.name}]")
-                val listener = info.role == Participant.Role.Listener || info.role == Participant.Role.Unknown
-                isMeListenerOnly.value = listener
-                if (listener) {
-                    continue
-                }
-            }
-
-            val deviceData = ConferenceParticipantDeviceData(device, true)
-            devices.add(deviceData)
-            meParticipant.value = deviceData
-        }
-
-        conferenceParticipantDevices.value = devices
-        twoOrMoreParticipants.value = devices.size >= 2
-        moreThanTwoParticipants.value = devices.size > 2
-    }
-
-    private fun addParticipantDevice(conference: Conference, device: ParticipantDevice) {
-        val devices = arrayListOf<ConferenceParticipantDeviceData>()
-        devices.addAll(conferenceParticipantDevices.value.orEmpty())
-
-        val existingDevice = devices.find {
-            it.participantDevice.address.weakEqual(device.address)
-        }
-        if (existingDevice != null) {
-            Log.e(
-                "[Conference] Participant is already in devices list: ${device.name} (${device.address.asStringUriOnly()})"
-            )
-            return
-        }
-
-        Log.i(
-            "[Conference] New participant device found: ${device.name} (${device.address.asStringUriOnly()})"
-        )
-
-        val conferenceAddress = conference.conferenceAddress ?: return
-        val conferenceInfo = conference.core.findConferenceInformationFromUri(
-            conferenceAddress
-        )
-        val info = conferenceInfo?.participantInfos?.find {
-            it.address.weakEqual(device.address)
-        }
-        if (info != null) {
-            Log.i("[Conference] New participant role is [${info.role.name}]")
-            val listener =
-                info.role == Participant.Role.Listener || info.role == Participant.Role.Unknown
-            if (listener) {
-                return
-            }
-        }
-
-        val deviceData = ConferenceParticipantDeviceData(device, false)
-        devices.add(deviceData)
-
-        val sortedDevices = sortDevicesDataList(devices)
-
-        if (speakingParticipant.value == null || speakingParticipantFound.value == false) {
-            speakingParticipant.value = deviceData
-            deviceData.isActiveSpeaker.value = true
-            speakingParticipantFound.value = true
-            speakingParticipantVideoEnabled.value = speakingParticipant.value?.isInConference?.value == true && speakingParticipant.value?.isSendingVideo?.value == true
-        }
-
-        conferenceParticipantDevices.value = sortedDevices
-        twoOrMoreParticipants.value = sortedDevices.size >= 2
-        moreThanTwoParticipants.value = sortedDevices.size > 2
-    }
-
-    private fun removeParticipantDevice(device: ParticipantDevice) {
-        val devices = arrayListOf<ConferenceParticipantDeviceData>()
-        var removedDeviceWasActiveSpeaker = false
-
-        for (participantDevice in conferenceParticipantDevices.value.orEmpty()) {
-            if (participantDevice.participantDevice.address.asStringUriOnly() != device.address.asStringUriOnly()) {
-                devices.add(participantDevice)
-            } else {
-                if (speakingParticipant.value == participantDevice) {
-                    Log.w(
-                        "[Conference] Removed participant device was the actively speaking participant device"
-                    )
-                    removedDeviceWasActiveSpeaker = true
-                }
-                participantDevice.destroy()
-            }
-        }
-
-        val devicesCount = devices.size
-        if (devicesCount == conferenceParticipantDevices.value.orEmpty().size) {
-            Log.e(
-                "[Conference] Failed to remove participant device: ${device.name} (${device.address.asStringUriOnly()})"
-            )
-        }
-
-        if (removedDeviceWasActiveSpeaker && devicesCount > 1) {
-            Log.w(
-                "[Conference] Updating actively speaking participant device using first one available"
-            )
-            // Using second device as first is ourselves
-            val deviceData = devices[1]
-            speakingParticipant.value = deviceData
-            deviceData.isActiveSpeaker.value = true
-            speakingParticipantFound.value = true
-            speakingParticipantVideoEnabled.value = speakingParticipant.value?.isInConference?.value == true && speakingParticipant.value?.isSendingVideo?.value == true
-        }
-
-        conferenceParticipantDevices.value = devices
-        twoOrMoreParticipants.value = devicesCount >= 2
-        moreThanTwoParticipants.value = devicesCount > 2
-    }
-
-    private fun sortDevicesDataList(devices: List<ConferenceParticipantDeviceData>): ArrayList<ConferenceParticipantDeviceData> {
-        val sortedList = arrayListOf<ConferenceParticipantDeviceData>()
-        sortedList.addAll(devices)
-
-        val meDeviceData = sortedList.find {
-            it.isMe
-        }
-        if (meDeviceData != null) {
-            val index = sortedList.indexOf(meDeviceData)
-            val expectedIndex = if (conferenceDisplayMode.value == ConferenceDisplayMode.ACTIVE_SPEAKER) {
-                0
-            } else {
-                sortedList.size - 1
-            }
-            if (index != expectedIndex) {
-                Log.i(
-                    "[Conference] Me device data is at index $index, moving it to index $expectedIndex"
-                )
-                sortedList.removeAt(index)
-                sortedList.add(expectedIndex, meDeviceData)
-            }
-        }
-
-        return sortedList
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/voip/viewmodels/ControlsViewModel.kt b/app/src/main/java/org/linphone/activities/voip/viewmodels/ControlsViewModel.kt
deleted file mode 100644
index fc8b58bb4..000000000
--- a/app/src/main/java/org/linphone/activities/voip/viewmodels/ControlsViewModel.kt
+++ /dev/null
@@ -1,595 +0,0 @@
-/*
- * Copyright (c) 2010-2021 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.voip.viewmodels
-
-import android.Manifest
-import android.animation.ValueAnimator
-import android.view.animation.LinearInterpolator
-import androidx.lifecycle.MediatorLiveData
-import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.ViewModel
-import androidx.window.layout.FoldingFeature
-import org.linphone.LinphoneApplication.Companion.coreContext
-import org.linphone.LinphoneApplication.Companion.corePreferences
-import org.linphone.R
-import org.linphone.core.*
-import org.linphone.core.tools.Log
-import org.linphone.utils.*
-import org.linphone.utils.Event
-
-class ControlsViewModel : ViewModel() {
-    val isSpeakerSelected = MutableLiveData<Boolean>()
-
-    val isBluetoothHeadsetSelected = MutableLiveData<Boolean>()
-
-    val audioRoutesSelected = MutableLiveData<Boolean>()
-
-    val audioRoutesEnabled = MutableLiveData<Boolean>()
-
-    val isVideoAvailable = MutableLiveData<Boolean>()
-
-    val isVideoEnabled = MutableLiveData<Boolean>()
-
-    val isSendingVideo = MutableLiveData<Boolean>()
-
-    val isVideoUpdateInProgress = MutableLiveData<Boolean>()
-
-    val isSwitchCameraAvailable = MutableLiveData<Boolean>()
-
-    val isOutgoingEarlyMedia = MutableLiveData<Boolean>()
-
-    val isIncomingEarlyMediaVideo = MutableLiveData<Boolean>()
-
-    val isIncomingCallVideo = MutableLiveData<Boolean>()
-
-    val showExtras = MutableLiveData<Boolean>()
-
-    val fullScreenMode = MutableLiveData<Boolean>()
-
-    val folded = MutableLiveData<Boolean>()
-
-    val pipMode = MutableLiveData<Boolean>()
-
-    val chatRoomCreationInProgress = MutableLiveData<Boolean>()
-
-    val numpadVisible = MutableLiveData<Boolean>()
-
-    val dtmfHistory = MutableLiveData<String>()
-
-    val callStatsVisible = MutableLiveData<Boolean>()
-
-    val proximitySensorEnabled = MediatorLiveData<Boolean>()
-
-    val forceDisableProximitySensor = MutableLiveData<Boolean>()
-
-    val showTakeSnapshotButton = MutableLiveData<Boolean>()
-
-    val attendedTransfer = MutableLiveData<Boolean>()
-
-    val chatDisabled = MutableLiveData<Boolean>()
-
-    val goToConferenceParticipantsListEvent: MutableLiveData<Event<Boolean>> by lazy {
-        MutableLiveData<Event<Boolean>>()
-    }
-
-    val goToChatEvent: MutableLiveData<Event<Boolean>> by lazy {
-        MutableLiveData<Event<Boolean>>()
-    }
-
-    val goToCallsListEvent: MutableLiveData<Event<Boolean>> by lazy {
-        MutableLiveData<Event<Boolean>>()
-    }
-
-    val goToConferenceLayoutSettingsEvent: MutableLiveData<Event<Boolean>> by lazy {
-        MutableLiveData<Event<Boolean>>()
-    }
-
-    val askPermissionEvent: MutableLiveData<Event<String>> by lazy {
-        MutableLiveData<Event<String>>()
-    }
-
-    val goToDialerEvent: MutableLiveData<Event<Boolean>> by lazy {
-        MutableLiveData<Event<Boolean>>()
-    }
-
-    val foldingState = MutableLiveData<FoldingFeature>()
-
-    val hideVideo = corePreferences.disableVideo
-
-    private val nonEarpieceOutputAudioDevice = MutableLiveData<Boolean>()
-
-    private val listener: CoreListenerStub = object : CoreListenerStub() {
-        override fun onCallStateChanged(
-            core: Core,
-            call: Call,
-            state: Call.State,
-            message: String
-        ) {
-            Log.i("[Call Controls] State changed: $state")
-            isOutgoingEarlyMedia.value = state == Call.State.OutgoingEarlyMedia
-            isIncomingEarlyMediaVideo.value = state == Call.State.IncomingEarlyMedia && call.remoteParams?.isVideoEnabled == true
-            isIncomingCallVideo.value = call.remoteParams?.isVideoEnabled == true && coreContext.core.videoActivationPolicy.automaticallyAccept
-            attendedTransfer.value = core.callsNb > 1
-
-            if (state == Call.State.StreamsRunning) {
-                if (!call.currentParams.isVideoEnabled && fullScreenMode.value == true) {
-                    fullScreenMode.value = false
-                }
-                isVideoUpdateInProgress.value = false
-                proximitySensorEnabled.value = shouldProximitySensorBeEnabled()
-            } else if (state == Call.State.PausedByRemote) {
-                fullScreenMode.value = false
-            }
-
-            if (core.currentCall?.currentParams?.isVideoEnabled == true && !PermissionHelper.get().hasCameraPermission()) {
-                askPermissionEvent.value = Event(Manifest.permission.CAMERA)
-            }
-
-            updateUI()
-        }
-
-        override fun onAudioDeviceChanged(core: Core, audioDevice: AudioDevice) {
-            Log.i("[Call Controls] Audio device changed: ${audioDevice.deviceName}")
-
-            nonEarpieceOutputAudioDevice.value = audioDevice.type != AudioDevice.Type.Earpiece
-            updateSpeakerState()
-            updateBluetoothHeadsetState()
-        }
-
-        override fun onAudioDevicesListUpdated(core: Core) {
-            Log.i("[Call Controls] Audio devices list updated")
-            val wasBluetoothPreviouslyAvailable = audioRoutesEnabled.value == true
-            updateAudioRoutesState()
-
-            if (AudioRouteUtils.isHeadsetAudioRouteAvailable()) {
-                AudioRouteUtils.routeAudioToHeadset()
-            } else if (!wasBluetoothPreviouslyAvailable && corePreferences.routeAudioToBluetoothIfAvailable) {
-                // Only attempt to route audio to bluetooth automatically when bluetooth device is connected
-                if (AudioRouteUtils.isBluetoothAudioRouteAvailable()) {
-                    AudioRouteUtils.routeAudioToBluetooth()
-                }
-            }
-        }
-    }
-
-    val extraButtonsMenuTranslateY = MutableLiveData<Float>()
-    private val extraButtonsMenuAnimator: ValueAnimator by lazy {
-        ValueAnimator.ofFloat(
-            AppUtils.getDimension(R.dimen.voip_call_extra_buttons_translate_y),
-            0f
-        ).apply {
-            addUpdateListener {
-                val value = it.animatedValue as Float
-                extraButtonsMenuTranslateY.value = value
-            }
-            duration = if (corePreferences.enableAnimations) 500 else 0
-        }
-    }
-
-    val audioRoutesMenuTranslateY = MutableLiveData<Float>()
-    private val audioRoutesMenuAnimator: ValueAnimator by lazy {
-        ValueAnimator.ofFloat(AppUtils.getDimension(R.dimen.voip_audio_routes_menu_translate_y), 0f).apply {
-            addUpdateListener {
-                val value = it.animatedValue as Float
-                audioRoutesMenuTranslateY.value = value
-            }
-            duration = if (corePreferences.enableAnimations) 500 else 0
-        }
-    }
-
-    val bouncyCounterTranslateY = MutableLiveData<Float>()
-
-    private val bounceAnimator: ValueAnimator by lazy {
-        ValueAnimator.ofFloat(AppUtils.getDimension(R.dimen.voip_counter_bounce_offset), 0f).apply {
-            addUpdateListener {
-                val value = it.animatedValue as Float
-                bouncyCounterTranslateY.value = value
-            }
-            interpolator = LinearInterpolator()
-            duration = 250
-            repeatMode = ValueAnimator.REVERSE
-            repeatCount = ValueAnimator.INFINITE
-        }
-    }
-
-    init {
-        coreContext.core.addListener(listener)
-
-        chatDisabled.value = corePreferences.disableChat
-        fullScreenMode.value = false
-        extraButtonsMenuTranslateY.value = AppUtils.getDimension(
-            R.dimen.voip_call_extra_buttons_translate_y
-        )
-        audioRoutesMenuTranslateY.value = AppUtils.getDimension(
-            R.dimen.voip_audio_routes_menu_translate_y
-        )
-        audioRoutesSelected.value = false
-        forceDisableProximitySensor.value = false
-
-        nonEarpieceOutputAudioDevice.value = coreContext.core.outputAudioDevice?.type != AudioDevice.Type.Earpiece
-        proximitySensorEnabled.value = shouldProximitySensorBeEnabled()
-        proximitySensorEnabled.addSource(isVideoEnabled) {
-            proximitySensorEnabled.value = shouldProximitySensorBeEnabled()
-        }
-        proximitySensorEnabled.addSource(nonEarpieceOutputAudioDevice) {
-            proximitySensorEnabled.value = shouldProximitySensorBeEnabled()
-        }
-        proximitySensorEnabled.addSource(forceDisableProximitySensor) {
-            proximitySensorEnabled.value = shouldProximitySensorBeEnabled()
-        }
-
-        val currentCall = coreContext.core.currentCall ?: coreContext.core.calls.firstOrNull()
-        val state = currentCall?.state ?: Call.State.Idle
-        Log.i("[Call Controls] Current state is: $state")
-        isOutgoingEarlyMedia.value = state == Call.State.OutgoingEarlyMedia
-        isIncomingEarlyMediaVideo.value = state == Call.State.IncomingEarlyMedia && currentCall?.remoteParams?.isVideoEnabled == true
-        isIncomingCallVideo.value = currentCall?.remoteParams?.isVideoEnabled == true && coreContext.core.videoActivationPolicy.automaticallyAccept
-
-        updateUI()
-
-        if (corePreferences.enableAnimations) bounceAnimator.start()
-    }
-
-    override fun onCleared() {
-        coreContext.core.removeListener(listener)
-
-        super.onCleared()
-    }
-
-    fun hangUp() {
-        val core = coreContext.core
-        when {
-            core.currentCall != null -> core.currentCall?.terminate()
-            core.conference?.isIn == true -> core.terminateConference()
-            else -> core.terminateAllCalls()
-        }
-    }
-
-    fun answer() {
-        val currentCall = coreContext.core.currentCall ?: coreContext.core.calls.find {
-                call ->
-            call.state == Call.State.IncomingReceived || call.state == Call.State.IncomingEarlyMedia
-        }
-        if (currentCall != null) {
-            coreContext.answerCall(currentCall)
-        } else {
-            Log.e("[Controls] Can't find any current call to answer")
-        }
-    }
-
-    fun toggleSpeaker() {
-        if (AudioRouteUtils.isSpeakerAudioRouteCurrentlyUsed()) {
-            forceEarpieceAudioRoute()
-        } else {
-            forceSpeakerAudioRoute()
-        }
-    }
-
-    fun toggleRoutesMenu() {
-        audioRoutesSelected.value = audioRoutesSelected.value != true
-        if (audioRoutesSelected.value == true) {
-            audioRoutesMenuAnimator.start()
-        } else {
-            audioRoutesMenuAnimator.reverse()
-        }
-    }
-
-    fun forceEarpieceAudioRoute() {
-        if (AudioRouteUtils.isHeadsetAudioRouteAvailable()) {
-            Log.i("[Call Controls] Headset found, route audio to it instead of earpiece")
-            AudioRouteUtils.routeAudioToHeadset()
-        } else {
-            AudioRouteUtils.routeAudioToEarpiece()
-        }
-        updateSpeakerState()
-        updateBluetoothHeadsetState()
-    }
-
-    fun forceSpeakerAudioRoute() {
-        AudioRouteUtils.routeAudioToSpeaker()
-        updateSpeakerState()
-        updateBluetoothHeadsetState()
-    }
-
-    fun forceBluetoothAudioRoute() {
-        AudioRouteUtils.routeAudioToBluetooth()
-        updateSpeakerState()
-        updateBluetoothHeadsetState()
-    }
-
-    fun toggleVideo() {
-        if (!PermissionHelper.get().hasCameraPermission()) {
-            Log.w(
-                "[Call Controls] Camera permission isn't granted, asking it before toggling video"
-            )
-            askPermissionEvent.value = Event(Manifest.permission.CAMERA)
-            return
-        }
-
-        val core = coreContext.core
-        val currentCall = core.currentCall
-        if (currentCall != null) {
-            val state = currentCall.state
-            if (state == Call.State.End || state == Call.State.Released || state == Call.State.Error) {
-                Log.e("[Call Controls] Current call state is $state, aborting video toggle")
-                return
-            }
-
-            isVideoUpdateInProgress.value = true
-            val params = core.createCallParams(currentCall)
-            if (currentCall.conference != null) {
-                if (params?.isVideoEnabled == false) {
-                    params.isVideoEnabled = true
-                    params.videoDirection = MediaDirection.SendRecv
-                } else {
-                    if (params?.videoDirection == MediaDirection.SendRecv || params?.videoDirection == MediaDirection.SendOnly) {
-                        params.videoDirection = MediaDirection.RecvOnly
-                    } else {
-                        params?.videoDirection = MediaDirection.SendRecv
-                    }
-                }
-            } else {
-                params?.isVideoEnabled = params?.isVideoEnabled == false
-                Log.i(
-                    "[Call Controls] Updating call with video enabled set to ${params?.isVideoEnabled}"
-                )
-            }
-            currentCall.update(params)
-        } else {
-            Log.e("[Call Controls] Can't toggle video, no current call found!")
-        }
-    }
-
-    fun switchCamera() {
-        coreContext.switchCamera()
-    }
-
-    fun takeSnapshot() {
-        if (!PermissionHelper.get().hasWriteExternalStoragePermission()) {
-            askPermissionEvent.value = Event(Manifest.permission.WRITE_EXTERNAL_STORAGE)
-        } else {
-            val currentCall = coreContext.core.currentCall
-            if (currentCall != null && currentCall.currentParams.isVideoEnabled) {
-                val fileName = System.currentTimeMillis().toString() + ".jpeg"
-                val fullPath = FileUtils.getFileStoragePath(fileName).absolutePath
-                Log.i("[Call Controls] Snapshot will be save under $fullPath")
-                currentCall.takeVideoSnapshot(fullPath)
-            } else {
-                Log.e("[Call Controls] Current call doesn't have video, can't take snapshot")
-            }
-        }
-    }
-
-    fun showExtraButtons() {
-        extraButtonsMenuAnimator.start()
-        showExtras.value = true
-    }
-
-    fun hideExtraButtons(skipAnimation: Boolean) {
-        // Animation must be skipped when called from Fragment's onPause() !
-        if (skipAnimation) {
-            extraButtonsMenuTranslateY.value = AppUtils.getDimension(
-                R.dimen.voip_call_extra_buttons_translate_y
-            )
-        } else {
-            extraButtonsMenuAnimator.reverse()
-        }
-        showExtras.value = false
-        chatRoomCreationInProgress.value = false
-    }
-
-    fun toggleFullScreen() {
-        if (fullScreenMode.value == false && isVideoEnabled.value == false) return
-        fullScreenMode.value = fullScreenMode.value != true
-    }
-
-    fun goToConferenceParticipantsList() {
-        goToConferenceParticipantsListEvent.value = Event(true)
-    }
-
-    fun goToChat() {
-        chatRoomCreationInProgress.value = true
-        goToChatEvent.value = Event(true)
-    }
-
-    fun showNumpad() {
-        hideExtraButtons(false)
-        numpadVisible.value = true
-    }
-
-    fun hideNumpad() {
-        numpadVisible.value = false
-    }
-
-    fun handleDtmfClick(key: Char) {
-        dtmfHistory.value = "${dtmfHistory.value.orEmpty()}$key"
-        coreContext.core.playDtmf(key, 1)
-        coreContext.core.currentCall?.sendDtmf(key)
-    }
-
-    fun goToCallsList() {
-        goToCallsListEvent.value = Event(true)
-    }
-
-    fun showCallStats(skipAnimation: Boolean = false) {
-        hideExtraButtons(skipAnimation)
-        callStatsVisible.value = true
-    }
-
-    fun hideCallStats() {
-        callStatsVisible.value = false
-    }
-
-    fun goToConferenceLayout() {
-        goToConferenceLayoutSettingsEvent.value = Event(true)
-    }
-
-    fun transferCall() {
-        // In case there is more than 1 call, transfer will be attended instead of blind
-        if (coreContext.core.callsNb > 1) {
-            attendedTransfer()
-        } else {
-            goToDialerForCallTransfer()
-        }
-    }
-
-    private fun attendedTransfer() {
-        val core = coreContext.core
-        val currentCall = core.currentCall
-
-        if (currentCall == null) {
-            Log.e("[Call Controls] Can't do an attended transfer without a current call")
-            return
-        }
-        if (core.callsNb <= 1) {
-            Log.e("[Call Controls] Need at least two calls to do an attended transfer")
-            return
-        }
-
-        val callToTransferTo = core.calls.findLast {
-            it.state == Call.State.Paused
-        }
-        if (callToTransferTo == null) {
-            Log.e(
-                "[Call Controls] Couldn't find a call in Paused state to transfer current call to"
-            )
-            return
-        }
-
-        Log.i(
-            "[Call Controls] Doing an attended transfer between active call [${currentCall.remoteAddress.asStringUriOnly()}] and paused call [${callToTransferTo.remoteAddress.asStringUriOnly()}]"
-        )
-        val result = callToTransferTo.transferToAnother(currentCall)
-        if (result != 0) {
-            Log.e("[Call Controls] Attended transfer failed!")
-        }
-    }
-
-    private fun goToDialerForCallTransfer() {
-        goToDialerEvent.value = Event(true)
-    }
-
-    fun goToDialerForNewCall() {
-        goToDialerEvent.value = Event(false)
-    }
-
-    private fun updateUI() {
-        updateVideoAvailable()
-        updateVideoEnabled()
-        updateSpeakerState()
-        updateBluetoothHeadsetState()
-        updateAudioRoutesState()
-    }
-
-    private fun updateSpeakerState() {
-        isSpeakerSelected.value = AudioRouteUtils.isSpeakerAudioRouteCurrentlyUsed()
-    }
-
-    private fun updateBluetoothHeadsetState() {
-        isBluetoothHeadsetSelected.value = AudioRouteUtils.isBluetoothAudioRouteCurrentlyUsed()
-    }
-
-    private fun updateAudioRoutesState() {
-        val bluetoothDeviceAvailable = AudioRouteUtils.isBluetoothAudioRouteAvailable()
-        audioRoutesEnabled.value = bluetoothDeviceAvailable
-
-        if (!bluetoothDeviceAvailable) {
-            audioRoutesSelected.value = false
-        }
-    }
-
-    private fun updateVideoAvailable() {
-        val core = coreContext.core
-        val currentCall = core.currentCall
-        isVideoAvailable.value = (core.isVideoCaptureEnabled || core.isVideoPreviewEnabled) &&
-            ((currentCall != null && !currentCall.mediaInProgress()) || core.conference?.isIn == true)
-    }
-
-    private fun updateVideoEnabled() {
-        val currentCall = coreContext.core.currentCall ?: coreContext.core.calls.firstOrNull()
-        val enabled = currentCall?.currentParams?.isVideoEnabled ?: false
-        // Prevent speaker to turn on each time a participant joins a video conference
-        val isConference = currentCall?.conference != null
-        if (enabled && !isConference && isVideoEnabled.value == false) {
-            Log.i("[Call Controls] Video is being turned on")
-            if (corePreferences.routeAudioToSpeakerWhenVideoIsEnabled) {
-                // Do not turn speaker on when video is enabled if headset or bluetooth is used
-                if (!AudioRouteUtils.isHeadsetAudioRouteAvailable() &&
-                    !AudioRouteUtils.isBluetoothAudioRouteCurrentlyUsed()
-                ) {
-                    Log.i(
-                        "[Call Controls] Video enabled and no wired headset not bluetooth in use, routing audio to speaker"
-                    )
-                    AudioRouteUtils.routeAudioToSpeaker()
-                }
-            }
-        }
-
-        isVideoEnabled.value = enabled
-        showTakeSnapshotButton.value = enabled && corePreferences.showScreenshotButton
-        val videoDirection = if (coreContext.core.currentCall?.conference != null) {
-            coreContext.core.currentCall?.currentParams?.videoDirection
-        } else {
-            coreContext.core.currentCall?.params?.videoDirection
-        }
-        val isVideoBeingSent = videoDirection == MediaDirection.SendRecv || videoDirection == MediaDirection.SendOnly
-        isSendingVideo.value = isVideoBeingSent
-        isSwitchCameraAvailable.value = enabled && coreContext.showSwitchCameraButton() && isVideoBeingSent
-    }
-
-    private fun shouldProximitySensorBeEnabled(): Boolean {
-        val currentCall = coreContext.core.currentCall ?: coreContext.core.calls.firstOrNull()
-        if (currentCall != null) {
-            when (val state = currentCall.state) {
-                Call.State.OutgoingEarlyMedia, Call.State.OutgoingProgress, Call.State.OutgoingRinging, Call.State.OutgoingInit -> {
-                    Log.i(
-                        "[Call Controls] Call is in outgoing state [$state], enabling proximity sensor"
-                    )
-                    return true
-                }
-                Call.State.IncomingEarlyMedia, Call.State.IncomingReceived -> {
-                    Log.i(
-                        "[Call Controls] Call is in incoming state [$state], enabling proximity sensor"
-                    )
-                    return true
-                }
-                else -> { }
-            }
-        }
-
-        if (forceDisableProximitySensor.value == true) {
-            Log.i(
-                "[Call Controls] Forcing proximity sensor to be disabled (usually in incoming/outgoing call fragments)"
-            )
-        } else if (isVideoEnabled.value == true) {
-            Log.i(
-                "[Call Controls] Active call current params says video is enabled, proximity sensor will be disabled"
-            )
-        } else if (nonEarpieceOutputAudioDevice.value == true) {
-            Log.i(
-                "[Call Controls] Current audio route is not earpiece, proximity sensor will be disabled"
-            )
-        }
-
-        return forceDisableProximitySensor.value == false &&
-            !(isVideoEnabled.value ?: false) &&
-            !(nonEarpieceOutputAudioDevice.value ?: false)
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/voip/viewmodels/StatisticsListViewModel.kt b/app/src/main/java/org/linphone/activities/voip/viewmodels/StatisticsListViewModel.kt
deleted file mode 100644
index 2f7fbadbe..000000000
--- a/app/src/main/java/org/linphone/activities/voip/viewmodels/StatisticsListViewModel.kt
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Copyright (c) 2010-2021 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.voip.viewmodels
-
-import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.ViewModel
-import org.linphone.LinphoneApplication.Companion.coreContext
-import org.linphone.activities.voip.data.CallStatisticsData
-import org.linphone.core.Call
-import org.linphone.core.Core
-import org.linphone.core.CoreListenerStub
-
-class StatisticsListViewModel : ViewModel() {
-    val callStatsList = MutableLiveData<ArrayList<CallStatisticsData>>()
-
-    private var enabled = false
-
-    private val listener = object : CoreListenerStub() {
-        override fun onCallStateChanged(
-            core: Core,
-            call: Call,
-            state: Call.State,
-            message: String
-        ) {
-            if (state == Call.State.End || state == Call.State.Error || state == Call.State.Connected) {
-                computeCallsList()
-            }
-        }
-    }
-
-    init {
-        coreContext.core.addListener(listener)
-
-        computeCallsList()
-    }
-
-    fun enable() {
-        enabled = true
-        for (stat in callStatsList.value.orEmpty()) {
-            stat.enable()
-        }
-    }
-
-    fun disable() {
-        enabled = false
-        for (stat in callStatsList.value.orEmpty()) {
-            stat.disable()
-        }
-    }
-
-    override fun onCleared() {
-        callStatsList.value.orEmpty().forEach(CallStatisticsData::destroy)
-        coreContext.core.removeListener(listener)
-
-        super.onCleared()
-    }
-
-    private fun computeCallsList() {
-        callStatsList.value.orEmpty().forEach(CallStatisticsData::destroy)
-
-        val list = arrayListOf<CallStatisticsData>()
-        for (call in coreContext.core.calls) {
-            if (call.state != Call.State.End && call.state != Call.State.Released && call.state != Call.State.Error) {
-                val data = CallStatisticsData(call)
-                list.add(data)
-                if (enabled) {
-                    data.enable()
-                }
-            }
-        }
-
-        callStatsList.value = list
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/voip/viewmodels/StatusViewModel.kt b/app/src/main/java/org/linphone/activities/voip/viewmodels/StatusViewModel.kt
deleted file mode 100644
index ec2d25fbd..000000000
--- a/app/src/main/java/org/linphone/activities/voip/viewmodels/StatusViewModel.kt
+++ /dev/null
@@ -1,175 +0,0 @@
-/*
- * Copyright (c) 2010-2021 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.voip.viewmodels
-
-import androidx.lifecycle.MutableLiveData
-import org.linphone.LinphoneApplication.Companion.coreContext
-import org.linphone.R
-import org.linphone.activities.main.viewmodels.StatusViewModel
-import org.linphone.core.*
-import org.linphone.utils.Event
-
-class StatusViewModel : StatusViewModel() {
-    val callQualityIcon = MutableLiveData<Int>()
-    val callQualityContentDescription = MutableLiveData<Int>()
-
-    val encryptionIcon = MutableLiveData<Int>()
-    val encryptionContentDescription = MutableLiveData<Int>()
-    val encryptionIconVisible = MutableLiveData<Boolean>()
-
-    val showZrtpDialogEvent: MutableLiveData<Event<Call>> by lazy {
-        MutableLiveData<Event<Call>>()
-    }
-
-    val showCallStatsEvent: MutableLiveData<Event<Boolean>> by lazy {
-        MutableLiveData<Event<Boolean>>()
-    }
-
-    var previouslyDeclineToken = false
-
-    private val listener = object : CoreListenerStub() {
-        override fun onCallStatsUpdated(core: Core, call: Call, stats: CallStats) {
-            updateCallQualityIcon()
-        }
-
-        override fun onCallEncryptionChanged(
-            core: Core,
-            call: Call,
-            on: Boolean,
-            authenticationToken: String?
-        ) {
-            updateEncryptionInfo(call)
-            // Check if we just declined a previously validated token
-            // In that case, don't show the ZRTP dialog again
-            if (!previouslyDeclineToken) {
-                previouslyDeclineToken = false
-                showZrtpDialog(call)
-            }
-        }
-
-        override fun onCallStateChanged(
-            core: Core,
-            call: Call,
-            state: Call.State,
-            message: String
-        ) {
-            if (call == core.currentCall) {
-                updateEncryptionInfo(call)
-            }
-        }
-    }
-
-    init {
-        coreContext.core.addListener(listener)
-
-        updateCallQualityIcon()
-
-        val currentCall = coreContext.core.currentCall
-        if (currentCall != null) {
-            updateEncryptionInfo(currentCall)
-            showZrtpDialog(currentCall)
-        }
-    }
-
-    override fun onCleared() {
-        coreContext.core.removeListener(listener)
-
-        super.onCleared()
-    }
-
-    fun showZrtpDialog() {
-        val currentCall = coreContext.core.currentCall
-        if (currentCall != null) {
-            showZrtpDialog(currentCall, force = true)
-        }
-    }
-
-    fun showCallStats() {
-        showCallStatsEvent.value = Event(true)
-    }
-
-    fun updateEncryptionInfo(call: Call) {
-        if (call.dir == Call.Dir.Incoming && call.state == Call.State.IncomingReceived && call.core.isMediaEncryptionMandatory) {
-            // If the incoming call view is displayed while encryption is mandatory,
-            // we can safely show the security_ok icon
-            encryptionIcon.value = R.drawable.security_ok
-            encryptionIconVisible.value = true
-            encryptionContentDescription.value = R.string.content_description_call_secured
-            return
-        }
-        if (call.state == Call.State.End || call.state == Call.State.Released) {
-            return
-        }
-
-        when (call.currentParams.mediaEncryption ?: MediaEncryption.None) {
-            MediaEncryption.SRTP, MediaEncryption.DTLS -> {
-                encryptionIcon.value = R.drawable.security_ok
-                encryptionIconVisible.value = true
-                encryptionContentDescription.value = R.string.content_description_call_secured
-            }
-            MediaEncryption.ZRTP -> {
-                encryptionIcon.value = when (call.authenticationTokenVerified || call.authenticationToken == null) {
-                    true -> R.drawable.security_ok
-                    else -> R.drawable.security_pending
-                }
-                encryptionContentDescription.value = when (call.authenticationTokenVerified || call.authenticationToken == null) {
-                    true -> R.string.content_description_call_secured
-                    else -> R.string.content_description_call_security_pending
-                }
-                encryptionIconVisible.value = true
-            }
-            MediaEncryption.None -> {
-                encryptionIcon.value = R.drawable.security_ko
-                // Do not show unsecure icon if user doesn't want to do call encryption
-                encryptionIconVisible.value = call.core.mediaEncryption != MediaEncryption.None
-                encryptionContentDescription.value = R.string.content_description_call_not_secured
-            }
-        }
-    }
-
-    private fun showZrtpDialog(call: Call, force: Boolean = false) {
-        if (
-            call.currentParams.mediaEncryption == MediaEncryption.ZRTP &&
-            call.authenticationToken != null &&
-            (!call.authenticationTokenVerified || force)
-        ) {
-            showZrtpDialogEvent.value = Event(call)
-        }
-    }
-
-    private fun updateCallQualityIcon() {
-        val call = coreContext.core.currentCall ?: coreContext.core.calls.firstOrNull()
-        val quality = call?.currentQuality ?: 0f
-        callQualityIcon.value = when {
-            quality >= 4 -> R.drawable.call_quality_indicator_4
-            quality >= 3 -> R.drawable.call_quality_indicator_3
-            quality >= 2 -> R.drawable.call_quality_indicator_2
-            quality >= 1 -> R.drawable.call_quality_indicator_1
-            else -> R.drawable.call_quality_indicator_0
-        }
-        callQualityContentDescription.value = when {
-            quality >= 4 -> R.string.content_description_call_quality_4
-            quality >= 3 -> R.string.content_description_call_quality_3
-            quality >= 2 -> R.string.content_description_call_quality_2
-            quality >= 1 -> R.string.content_description_call_quality_1
-            else -> R.string.content_description_call_quality_0
-        }
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/voip/views/GridBoxLayout.kt b/app/src/main/java/org/linphone/activities/voip/views/GridBoxLayout.kt
deleted file mode 100644
index 37a57c1dc..000000000
--- a/app/src/main/java/org/linphone/activities/voip/views/GridBoxLayout.kt
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * Copyright (c) 2010-2022 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.voip.views
-
-import android.annotation.SuppressLint
-import android.content.Context
-import android.util.AttributeSet
-import android.widget.GridLayout
-import androidx.core.view.children
-import org.linphone.LinphoneApplication.Companion.corePreferences
-import org.linphone.core.tools.Log
-
-class GridBoxLayout : GridLayout {
-    companion object {
-        private val placementMatrix = arrayOf(
-            intArrayOf(1, 2, 3, 4, 5, 6),
-            intArrayOf(1, 1, 2, 2, 3, 3),
-            intArrayOf(1, 1, 1, 2, 2, 2),
-            intArrayOf(1, 1, 1, 1, 2, 2),
-            intArrayOf(1, 1, 1, 1, 1, 2),
-            intArrayOf(1, 1, 1, 1, 1, 1)
-        )
-    }
-
-    constructor(context: Context) : this(context, null)
-    constructor(context: Context, attrs: AttributeSet?) : this(context, attrs, 0)
-    constructor(context: Context, attrs: AttributeSet?, defStyleAttr: Int) : super(
-        context,
-        attrs,
-        defStyleAttr
-    )
-
-    var centerContent: Boolean = false
-    private var previousChildCount = 0
-    private var previousCellSize = 0
-
-    @SuppressLint("DrawAllocation")
-    override fun onLayout(changed: Boolean, left: Int, top: Int, right: Int, bottom: Int) {
-        if (childCount == 0 || (!changed && previousChildCount == childCount)) {
-            super.onLayout(changed, left, top, right, bottom)
-            // To prevent display issue the first time conference is locally paused
-            children.forEach { child ->
-                child.post {
-                    child.layoutParams.width = previousCellSize
-                    child.layoutParams.height = previousCellSize
-                    child.requestLayout()
-                }
-            }
-            return
-        }
-
-        // To prevent java.lang.IllegalArgumentException: columnCount must be greater than or equal
-        // to the maximum of all grid indices (and spans) defined in the LayoutParams of each child.
-        children.forEach { child ->
-            child.layoutParams = LayoutParams()
-        }
-
-        val maxChild = placementMatrix[0].size
-        if (childCount > maxChild) {
-            val maxMosaicParticipants = corePreferences.maxConferenceParticipantsForMosaicLayout
-            Log.e(
-                "[GridBoxLayout] $childCount children but placementMatrix only knows how to display $maxChild (max allowed participants for grid layout in settings is $maxMosaicParticipants)"
-            )
-            return
-        }
-
-        val availableSize = Pair(right - left, bottom - top)
-        var cellSize = 0
-        for (index in 1..childCount) {
-            val neededColumns = placementMatrix[index - 1][childCount - 1]
-            val candidateWidth = 1 * availableSize.first / neededColumns
-            val candidateHeight = 1 * availableSize.second / index
-            val candidateSize = if (candidateWidth < candidateHeight) candidateWidth else candidateHeight
-            if (candidateSize > cellSize) {
-                columnCount = neededColumns
-                rowCount = index
-                cellSize = candidateSize
-            }
-        }
-        previousCellSize = cellSize
-        previousChildCount = childCount
-
-        super.onLayout(changed, left, top, right, bottom)
-        children.forEach { child ->
-            child.layoutParams.width = cellSize
-            child.layoutParams.height = cellSize
-            child.post {
-                child.requestLayout()
-            }
-        }
-
-        if (centerContent) {
-            setPadding(
-                (availableSize.first - (columnCount * cellSize)) / 2,
-                (availableSize.second - (rowCount * cellSize)) / 2,
-                (availableSize.first - (columnCount * cellSize)) / 2,
-                (availableSize.second - (rowCount * cellSize)) / 2
-            )
-        }
-        Log.d(
-            "[GridBoxLayout] cellsize=$cellSize columns=$columnCount rows=$rowCount availablesize=$availableSize"
-        )
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/voip/views/RoundCornersTextureView.kt b/app/src/main/java/org/linphone/activities/voip/views/RoundCornersTextureView.kt
deleted file mode 100644
index 80a4279a6..000000000
--- a/app/src/main/java/org/linphone/activities/voip/views/RoundCornersTextureView.kt
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * Copyright (c) 2010-2021 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.voip.views
-
-import android.content.Context
-import android.graphics.Outline
-import android.graphics.Rect
-import android.util.AttributeSet
-import android.view.View
-import android.view.ViewOutlineProvider
-import org.linphone.R
-import org.linphone.mediastream.video.capture.CaptureTextureView
-
-class RoundCornersTextureView : CaptureTextureView {
-    private var mRadius: Float = 0f
-
-    constructor(context: Context) : super(context) {
-        mAlignTopRight = true
-        mDisplayMode = DisplayMode.BLACK_BARS
-        setRoundCorners()
-    }
-
-    constructor(context: Context, attrs: AttributeSet) : super(context, attrs) {
-        readAttributes(attrs)
-        setRoundCorners()
-    }
-
-    constructor(context: Context, attrs: AttributeSet, defStyleAttr: Int) : super(
-        context,
-        attrs,
-        defStyleAttr
-    ) {
-        readAttributes(attrs)
-        setRoundCorners()
-    }
-
-    private fun readAttributes(attrs: AttributeSet) {
-        context.theme.obtainStyledAttributes(
-            attrs,
-            R.styleable.RoundCornersTextureView,
-            0,
-            0
-        ).apply {
-            try {
-                mAlignTopRight = getBoolean(R.styleable.RoundCornersTextureView_alignTopRight, true)
-                val mode = getInteger(
-                    R.styleable.RoundCornersTextureView_displayMode,
-                    DisplayMode.BLACK_BARS.ordinal
-                )
-                mDisplayMode = when (mode) {
-                    1 -> DisplayMode.OCCUPY_ALL_SPACE
-                    2 -> DisplayMode.HYBRID
-                    else -> DisplayMode.BLACK_BARS
-                }
-                mRadius = getFloat(
-                    R.styleable.RoundCornersTextureView_radius,
-                    context.resources.getDimension(R.dimen.voip_round_corners_texture_view_radius)
-                )
-            } finally {
-                recycle()
-            }
-        }
-    }
-
-    private fun setRoundCorners() {
-        outlineProvider = object : ViewOutlineProvider() {
-            override fun getOutline(view: View, outline: Outline) {
-                val rect = if (previewRectF != null &&
-                    actualDisplayMode == DisplayMode.BLACK_BARS &&
-                    mAlignTopRight
-                ) {
-                    Rect(
-                        previewRectF.left.toInt(),
-                        previewRectF.top.toInt(),
-                        previewRectF.right.toInt(),
-                        previewRectF.bottom.toInt()
-                    )
-                } else {
-                    Rect(
-                        0,
-                        0,
-                        width,
-                        height
-                    )
-                }
-                outline.setRoundRect(rect, mRadius)
-            }
-        }
-        clipToOutline = true
-    }
-
-    override fun setAspectRatio(width: Int, height: Int) {
-        super.setAspectRatio(width, height)
-
-        val previewSize = previewVideoSize
-        if (previewSize.width > 0 && previewSize.height > 0) {
-            setRoundCorners()
-        }
-    }
-}
diff --git a/app/src/main/java/org/linphone/activities/voip/views/ScrollDotsView.kt b/app/src/main/java/org/linphone/activities/voip/views/ScrollDotsView.kt
deleted file mode 100644
index e0498b948..000000000
--- a/app/src/main/java/org/linphone/activities/voip/views/ScrollDotsView.kt
+++ /dev/null
@@ -1,261 +0,0 @@
-/*
- * Copyright (c) 2010-2021 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.activities.voip.views
-
-import android.content.Context
-import android.graphics.Canvas
-import android.graphics.Color
-import android.graphics.Paint
-import android.graphics.Rect
-import android.util.AttributeSet
-import android.view.View
-import android.view.View.OnScrollChangeListener
-import android.widget.FrameLayout
-import android.widget.HorizontalScrollView
-import android.widget.ScrollView
-import kotlin.math.ceil
-import kotlin.math.roundToInt
-import org.linphone.R
-import org.linphone.core.tools.Log
-import org.linphone.utils.AppUtils
-
-class ScrollDotsView : View {
-    private var count = 2
-    private var itemCount = 0
-    private var selected = 0
-
-    private var radius: Float = 5f
-    private var margin: Float = 2f
-
-    private var screenWidth: Float = 0f
-    private var itemWidth: Float = 0f
-    private var screenHeight: Float = 0f
-    private var itemHeight: Float = 0f
-
-    private lateinit var dotPaint: Paint
-    private lateinit var selectedDotPaint: Paint
-
-    private var scrollViewRef = 0
-    private lateinit var scrollView: FrameLayout
-    private var isHorizontal = false
-
-    private val scrollListener = OnScrollChangeListener { v, scrollX, scrollY, _, _ ->
-        if (isHorizontal) {
-            if (v !is HorizontalScrollView) {
-                Log.e("[Scoll Dots] ScrollView reference isn't a HorizontalScrollView!")
-                return@OnScrollChangeListener
-            }
-
-            val childWidth: Int = v.getChildAt(0).measuredWidth
-            val scrollViewWidth = v.measuredWidth
-            val scrollableX = childWidth - scrollViewWidth
-
-            if (scrollableX > 0) {
-                val percent = (scrollX.toFloat() * 100 / scrollableX).toDouble()
-                if (count > 1) {
-                    val selectedDot = percent / (100 / (count - 1))
-                    val dot = selectedDot.roundToInt()
-                    if (dot != selected) {
-                        setSelectedDot(dot)
-                    }
-                }
-            }
-        } else {
-            if (v !is ScrollView) {
-                Log.e("[Scoll Dots] ScrollView reference isn't a ScrollView!")
-                return@OnScrollChangeListener
-            }
-
-            val childHeight: Int = v.getChildAt(0).measuredHeight
-            val scrollViewHeight = v.measuredHeight
-            val scrollableY = childHeight - scrollViewHeight
-
-            if (scrollableY > 0) {
-                val percent = (scrollY.toFloat() * 100 / scrollableY).toDouble()
-                if (count > 1) {
-                    val selectedDot = percent / (100 / (count - 1))
-                    val dot = selectedDot.roundToInt()
-                    if (dot != selected) {
-                        setSelectedDot(dot)
-                    }
-                }
-            }
-        }
-    }
-
-    constructor(context: Context) : super(context) { init(context) }
-
-    constructor(context: Context, attrs: AttributeSet) : this(context, attrs, 0)
-
-    constructor(context: Context, attrs: AttributeSet, defStyleAttr: Int) : super(
-        context,
-        attrs,
-        defStyleAttr
-    ) {
-        init(context)
-
-        context.theme.obtainStyledAttributes(
-            attrs,
-            R.styleable.ScrollDot,
-            defStyleAttr,
-            0
-        ).apply {
-            try {
-                radius = getDimension(R.styleable.ScrollDot_dotRadius, 5f)
-
-                count = getInt(R.styleable.ScrollDot_dotCount, 1)
-
-                val color = getColor(
-                    R.styleable.ScrollDot_dotColor,
-                    context.resources.getColor(R.color.voip_gray_dots)
-                )
-                dotPaint.color = color
-                val selectedColor = getColor(
-                    R.styleable.ScrollDot_selectedDotColor,
-                    context.resources.getColor(R.color.voip_dark_gray)
-                )
-                selectedDotPaint.color = selectedColor
-
-                selected = getInt(R.styleable.ScrollDot_selectedDot, 1)
-
-                scrollViewRef = getResourceId(R.styleable.ScrollDot_scrollView, 0)
-
-                invalidate()
-            } catch (e: Exception) {
-                Log.e("[Scroll Dots] $e")
-            } finally {
-                recycle()
-            }
-        }
-    }
-
-    fun init(context: Context) {
-        radius = AppUtils.dpToPixels(context, 5f)
-        margin = AppUtils.dpToPixels(context, 5f)
-
-        dotPaint = Paint()
-        dotPaint.color = Color.parseColor("#D8D8D8")
-        selectedDotPaint = Paint()
-        selectedDotPaint.color = Color.parseColor("#4B5964")
-
-        val screenRect = Rect()
-        getWindowVisibleDisplayFrame(screenRect)
-        screenWidth = screenRect.width().toFloat()
-        screenHeight = screenRect.height().toFloat()
-
-        val marginBetweenItems = context.resources.getDimension(
-            R.dimen.voip_active_speaker_miniature_margin
-        )
-        itemWidth = context.resources.getDimension(R.dimen.voip_active_speaker_miniature_size) + marginBetweenItems
-        itemHeight = context.resources.getDimension(R.dimen.voip_active_speaker_miniature_size) + marginBetweenItems
-
-        Log.d(
-            "[Scroll Dots] Screen size is $screenWidth/$screenHeight and item size is $itemWidth/$itemHeight"
-        )
-    }
-
-    override fun onDraw(canvas: Canvas) {
-        super.onDraw(canvas)
-
-        for (i in 0 until count) {
-            if (i == selected) {
-                val position = (i + 1) * margin + (i * 2 + 1) * radius
-                canvas.drawCircle(
-                    if (isHorizontal) position else radius,
-                    if (isHorizontal) radius else position,
-                    radius,
-                    selectedDotPaint
-                )
-            } else {
-                val position = (i + 1) * margin + (i * 2 + 1) * radius
-                canvas.drawCircle(
-                    if (isHorizontal) position else radius,
-                    if (isHorizontal) radius else position,
-                    radius,
-                    dotPaint
-                )
-            }
-        }
-    }
-
-    override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
-        super.onMeasure(widthMeasureSpec, heightMeasureSpec)
-
-        checkOrientation()
-
-        if (isHorizontal) {
-            val width = ((radius * 2 + margin) * count + margin).toInt()
-            val height: Int = (radius * 2).toInt()
-            setMeasuredDimension(width, height)
-        } else {
-            val height = ((radius * 2 + margin) * count + margin).toInt()
-            val width: Int = (radius * 2).toInt()
-            setMeasuredDimension(width, height)
-        }
-    }
-
-    private fun checkOrientation() {
-        if (scrollViewRef > 0) {
-            try {
-                scrollView = (parent as View).findViewById(scrollViewRef)
-                scrollView.setOnScrollChangeListener(scrollListener)
-                Log.d("[Scroll Dots] ScrollView scroll listener set")
-                isHorizontal = scrollView is HorizontalScrollView
-                Log.d("[Scroll Dots] ScrollView is horizontal ? $isHorizontal")
-                requestLayout()
-                setItemCount(itemCount)
-            } catch (e: Exception) {
-                Log.e("[Scroll Dots] Failed to find ScrollView from id $scrollViewRef: $e")
-            }
-        } else {
-            Log.e("[Scroll Dots] No ScrollView reference given")
-        }
-    }
-
-    private fun setDotCount(count: Int) {
-        this.count = count
-        requestLayout()
-        invalidate()
-    }
-
-    fun setItemCount(items: Int) {
-        itemCount = items
-        if (isHorizontal) {
-            val itemsPerScreen = (screenWidth / itemWidth)
-            val dots = ceil(items.toDouble() / itemsPerScreen).toInt()
-            Log.d(
-                "[Scroll Dots] Calculated $count for $items items ($itemsPerScreen items fit in screen width), given that screen width is $screenWidth and item width is $itemWidth"
-            )
-            setDotCount(dots)
-        } else {
-            val itemsPerScreen = (screenHeight / itemHeight)
-            val dots = ceil(items.toDouble() / itemsPerScreen).toInt()
-            Log.d(
-                "[Scroll Dots] Calculated $count for $items items ($itemsPerScreen items fit in screen height), given that screen height is $screenHeight and item height is $itemHeight"
-            )
-            setDotCount(dots)
-        }
-    }
-
-    fun setSelectedDot(index: Int) {
-        selected = index
-        invalidate()
-    }
-}
diff --git a/app/src/main/java/org/linphone/compatibility/Api23Compatibility.kt b/app/src/main/java/org/linphone/compatibility/Api23Compatibility.kt
deleted file mode 100644
index 25e399413..000000000
--- a/app/src/main/java/org/linphone/compatibility/Api23Compatibility.kt
+++ /dev/null
@@ -1,286 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.compatibility
-
-import android.Manifest
-import android.annotation.SuppressLint
-import android.app.Activity
-import android.app.Notification
-import android.app.PendingIntent
-import android.app.Service
-import android.bluetooth.BluetoothAdapter
-import android.content.ContentValues
-import android.content.Context
-import android.content.Intent
-import android.content.pm.PackageManager
-import android.graphics.Bitmap
-import android.net.Uri
-import android.os.Build
-import android.os.Environment
-import android.os.Vibrator
-import android.provider.MediaStore
-import android.provider.Settings
-import android.view.View
-import android.view.Window
-import android.view.WindowManager
-import android.view.inputmethod.EditorInfo
-import androidx.fragment.app.Fragment
-import org.linphone.R
-import org.linphone.core.Content
-import org.linphone.core.tools.Log
-import org.linphone.utils.AppUtils
-import org.linphone.utils.FileUtils
-import org.linphone.utils.PermissionHelper
-
-class Api23Compatibility {
-    companion object {
-        fun hasPermission(context: Context, permission: String): Boolean {
-            return context.checkSelfPermission(permission) == PackageManager.PERMISSION_GRANTED
-        }
-
-        fun requestReadPhoneStatePermission(fragment: Fragment, code: Int) {
-            fragment.requestPermissions(arrayOf(Manifest.permission.READ_PHONE_STATE), code)
-        }
-
-        fun canDrawOverlay(context: Context): Boolean {
-            return Settings.canDrawOverlays(context)
-        }
-
-        fun getBitmapFromUri(context: Context, uri: Uri): Bitmap {
-            return MediaStore.Images.Media.getBitmap(context.contentResolver, uri)
-        }
-
-        @SuppressLint("MissingPermission")
-        fun eventVibration(vibrator: Vibrator) {
-            val pattern = longArrayOf(0, 100, 100)
-            vibrator.vibrate(pattern, -1)
-        }
-
-        @SuppressLint("MissingPermission")
-        fun getDeviceName(context: Context): String {
-            val adapter = BluetoothAdapter.getDefaultAdapter()
-            var name = adapter?.name
-            if (name == null) {
-                name = Settings.Secure.getString(
-                    context.contentResolver,
-                    "bluetooth_name"
-                )
-            }
-            if (name == null) {
-                name = Build.MANUFACTURER + " " + Build.MODEL
-            }
-            return name
-        }
-
-        fun setShowWhenLocked(activity: Activity, enable: Boolean) {
-            if (enable) {
-                activity.window.addFlags(WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED)
-            } else {
-                activity.window.clearFlags(WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED)
-            }
-        }
-
-        fun setTurnScreenOn(activity: Activity, enable: Boolean) {
-            if (enable) {
-                activity.window.addFlags(WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON)
-            } else {
-                activity.window.clearFlags(WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON)
-            }
-        }
-
-        fun requestDismissKeyguard(activity: Activity) {
-            activity.window.addFlags(WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD)
-        }
-
-        fun startForegroundService(context: Context, intent: Intent) {
-            context.startService(intent)
-        }
-
-        fun startForegroundService(service: Service, notifId: Int, notif: Notification?) {
-            service.startForeground(notifId, notif)
-        }
-
-        fun hideAndroidSystemUI(hide: Boolean, window: Window) {
-            val decorView = window.decorView
-            val uiOptions = if (hide) {
-                View.SYSTEM_UI_FLAG_FULLSCREEN or View.SYSTEM_UI_FLAG_HIDE_NAVIGATION
-            } else {
-                View.SYSTEM_UI_FLAG_VISIBLE
-            }
-            decorView.systemUiVisibility = uiOptions
-
-            if (hide) {
-                window.addFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION)
-            } else {
-                window.clearFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION)
-            }
-        }
-
-        fun getUpdateCurrentPendingIntentFlag(): Int {
-            return PendingIntent.FLAG_UPDATE_CURRENT
-        }
-
-        fun getImeFlagsForSecureChatRoom(): Int {
-            return EditorInfo.IME_NULL
-        }
-
-        suspend fun addImageToMediaStore(context: Context, content: Content): Boolean {
-            return addContentToMediaStore(context, content, isImage = true)
-        }
-
-        suspend fun addVideoToMediaStore(context: Context, content: Content): Boolean {
-            return addContentToMediaStore(context, content, isVideo = true)
-        }
-
-        suspend fun addAudioToMediaStore(context: Context, content: Content): Boolean {
-            return addContentToMediaStore(context, content, isAudio = true)
-        }
-
-        private suspend fun addContentToMediaStore(
-            context: Context,
-            content: Content,
-            isImage: Boolean = false,
-            isVideo: Boolean = false,
-            isAudio: Boolean = false
-        ): Boolean {
-            if (!PermissionHelper.get().hasWriteExternalStoragePermission()) {
-                Log.e("[Media Store] Write external storage permission denied")
-                return false
-            }
-
-            val isContentEncrypted = content.isFileEncrypted
-            val filePath = if (content.isFileEncrypted) {
-                val plainFilePath = content.exportPlainFile().orEmpty()
-                Log.i(
-                    "[Media Store] [VFS] Content is encrypted, plain file path is: $plainFilePath"
-                )
-                plainFilePath
-            } else {
-                content.filePath
-            }
-
-            if (filePath.isNullOrEmpty()) {
-                Log.e("[Media Store] Content doesn't have a file path!")
-                return false
-            }
-
-            val appName = AppUtils.getString(R.string.app_name)
-            val directory = when {
-                isImage -> Environment.DIRECTORY_PICTURES
-                isVideo -> Environment.DIRECTORY_MOVIES
-                isAudio -> Environment.DIRECTORY_MUSIC
-                else -> Environment.DIRECTORY_DOWNLOADS
-            }
-            val relativePath = "$directory/$appName"
-            val fileName = content.name
-            val mime = "${content.type}/${content.subtype}"
-            val type = when {
-                isImage -> "image"
-                isVideo -> "video"
-                isAudio -> "audio"
-                else -> "unexpected"
-            }
-            Log.i(
-                "[Media Store] Adding $type [$filePath] to Media Store with name [$fileName] and MIME [$mime], asking to be stored in: $relativePath"
-            )
-
-            val mediaStoreFilePath = when {
-                isImage -> {
-                    val values = ContentValues().apply {
-                        put(MediaStore.Images.Media.DISPLAY_NAME, fileName)
-                        put(MediaStore.Images.Media.MIME_TYPE, mime)
-                    }
-                    val collection = MediaStore.Images.Media.getContentUri("external")
-                    addContentValuesToCollection(context, filePath, collection, values)
-                }
-                isVideo -> {
-                    val values = ContentValues().apply {
-                        put(MediaStore.Video.Media.TITLE, fileName)
-                        put(MediaStore.Video.Media.DISPLAY_NAME, fileName)
-                        put(MediaStore.Video.Media.MIME_TYPE, mime)
-                    }
-                    val collection = MediaStore.Video.Media.getContentUri("external")
-                    addContentValuesToCollection(context, filePath, collection, values)
-                }
-                isAudio -> {
-                    val values = ContentValues().apply {
-                        put(MediaStore.Audio.Media.TITLE, fileName)
-                        put(MediaStore.Audio.Media.DISPLAY_NAME, fileName)
-                        put(MediaStore.Audio.Media.MIME_TYPE, mime)
-                    }
-                    val collection = MediaStore.Audio.Media.getContentUri("external")
-                    addContentValuesToCollection(context, filePath, collection, values)
-                }
-                else -> ""
-            }
-
-            if (isContentEncrypted) {
-                Log.w("[Media Store] Content was encrypted, delete plain version: $filePath")
-                FileUtils.deleteFile(filePath)
-            }
-
-            if (mediaStoreFilePath.isNotEmpty()) {
-                Log.i("[Media Store] Exported file path is: $mediaStoreFilePath")
-                content.userData = mediaStoreFilePath
-                return true
-            }
-
-            return false
-        }
-
-        private suspend fun addContentValuesToCollection(
-            context: Context,
-            filePath: String,
-            collection: Uri,
-            values: ContentValues
-        ): String {
-            try {
-                val fileUri = context.contentResolver.insert(collection, values)
-                if (fileUri == null) {
-                    Log.e("[Media Store] Failed to get a URI to where store the file, aborting")
-                    return ""
-                }
-
-                context.contentResolver.openOutputStream(fileUri).use { out ->
-                    if (FileUtils.copyFileTo(filePath, out)) {
-                        return fileUri.toString()
-                    }
-                }
-            } catch (e: Exception) {
-                Log.e("[Media Store] Exception: $e")
-            }
-            return ""
-        }
-
-        fun requestReadExternalStorageAndCameraPermissions(fragment: Fragment, code: Int) {
-            fragment.requestPermissions(
-                arrayOf(
-                    Manifest.permission.READ_EXTERNAL_STORAGE,
-                    Manifest.permission.CAMERA
-                ),
-                code
-            )
-        }
-
-        fun hasReadExternalStoragePermission(context: Context): Boolean {
-            return Compatibility.hasPermission(context, Manifest.permission.READ_EXTERNAL_STORAGE)
-        }
-    }
-}
diff --git a/app/src/main/java/org/linphone/compatibility/Api25Compatibility.kt b/app/src/main/java/org/linphone/compatibility/Api25Compatibility.kt
deleted file mode 100644
index 39111541f..000000000
--- a/app/src/main/java/org/linphone/compatibility/Api25Compatibility.kt
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.compatibility
-
-import android.annotation.SuppressLint
-import android.annotation.TargetApi
-import android.app.Activity
-import android.bluetooth.BluetoothAdapter
-import android.content.Context
-import android.os.Build
-import android.provider.Settings
-
-@TargetApi(25)
-class Api25Compatibility {
-    companion object {
-        @SuppressLint("MissingPermission")
-        fun getDeviceName(context: Context): String {
-            var name = Settings.Global.getString(
-                context.contentResolver,
-                Settings.Global.DEVICE_NAME
-            )
-            if (name == null) {
-                val adapter = BluetoothAdapter.getDefaultAdapter()
-                name = adapter?.name
-            }
-            if (name == null) {
-                name = Settings.Secure.getString(
-                    context.contentResolver,
-                    "bluetooth_name"
-                )
-            }
-            if (name == null) {
-                name = Build.MANUFACTURER + " " + Build.MODEL
-            }
-            return name
-        }
-
-        fun isInPictureInPictureMode(activity: Activity): Boolean {
-            return activity.isInPictureInPictureMode
-        }
-    }
-}
diff --git a/app/src/main/java/org/linphone/compatibility/Api26Compatibility.kt b/app/src/main/java/org/linphone/compatibility/Api26Compatibility.kt
deleted file mode 100644
index 95dcb07af..000000000
--- a/app/src/main/java/org/linphone/compatibility/Api26Compatibility.kt
+++ /dev/null
@@ -1,415 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.compatibility
-
-import android.Manifest
-import android.annotation.SuppressLint
-import android.annotation.TargetApi
-import android.app.*
-import android.content.Context
-import android.content.Intent
-import android.content.pm.PackageManager
-import android.graphics.Bitmap
-import android.media.AudioAttributes
-import android.os.VibrationEffect
-import android.os.Vibrator
-import android.telecom.CallAudioState
-import android.view.WindowManager
-import android.view.inputmethod.EditorInfo
-import android.widget.RemoteViews
-import androidx.annotation.StringRes
-import androidx.core.app.NotificationCompat
-import androidx.core.app.NotificationManagerCompat
-import androidx.core.app.Person
-import androidx.core.content.ContextCompat
-import androidx.core.graphics.drawable.IconCompat
-import org.linphone.LinphoneApplication.Companion.coreContext
-import org.linphone.LinphoneApplication.Companion.corePreferences
-import org.linphone.R
-import org.linphone.contact.getThumbnailUri
-import org.linphone.core.Call
-import org.linphone.core.Friend
-import org.linphone.core.tools.Log
-import org.linphone.notifications.Notifiable
-import org.linphone.notifications.NotificationsManager
-import org.linphone.telecom.NativeCallWrapper
-import org.linphone.utils.ImageUtils
-import org.linphone.utils.LinphoneUtils
-
-@TargetApi(26)
-class Api26Compatibility {
-    companion object {
-        fun enterPipMode(activity: Activity, conference: Boolean) {
-            val supportsPip = activity.packageManager
-                .hasSystemFeature(PackageManager.FEATURE_PICTURE_IN_PICTURE)
-            Log.i("[Call] Is PiP supported: $supportsPip")
-            if (supportsPip) {
-                // Force portrait layout if in conference, otherwise for landscape
-                // Our layouts behave better in these orientation
-                val params = PictureInPictureParams.Builder()
-                    .setAspectRatio(Compatibility.getPipRatio(activity, conference, !conference))
-                    .build()
-                try {
-                    if (!activity.enterPictureInPictureMode(params)) {
-                        Log.e("[Call] Failed to enter PiP mode")
-                    } else {
-                        Log.i(
-                            "[Call] Entering PiP mode with ${if (conference) "portrait" else "landscape"} aspect ratio"
-                        )
-                    }
-                } catch (e: Exception) {
-                    Log.e("[Call] Can't build PiP params: $e")
-                }
-            }
-        }
-
-        fun createServiceChannel(context: Context, notificationManager: NotificationManagerCompat) {
-            // Create service notification channel
-            val id = context.getString(R.string.notification_channel_service_id)
-            val name = context.getString(R.string.notification_channel_service_name)
-            val description = context.getString(R.string.notification_channel_service_name)
-            val channel = NotificationChannel(id, name, NotificationManager.IMPORTANCE_LOW)
-            channel.description = description
-            channel.enableVibration(false)
-            channel.enableLights(false)
-            channel.setShowBadge(false)
-            notificationManager.createNotificationChannel(channel)
-        }
-
-        fun createMissedCallChannel(
-            context: Context,
-            notificationManager: NotificationManagerCompat
-        ) {
-            val id = context.getString(R.string.notification_channel_missed_call_id)
-            val name = context.getString(R.string.notification_channel_missed_call_name)
-            val description = context.getString(R.string.notification_channel_missed_call_name)
-            val channel = NotificationChannel(id, name, NotificationManager.IMPORTANCE_LOW)
-            channel.description = description
-            channel.lightColor = context.getColor(R.color.notification_led_color)
-            channel.enableVibration(true)
-            channel.enableLights(true)
-            channel.setShowBadge(true)
-            notificationManager.createNotificationChannel(channel)
-        }
-
-        fun createIncomingCallChannel(
-            context: Context,
-            notificationManager: NotificationManagerCompat
-        ) {
-            // Create incoming calls notification channel
-            val id = context.getString(R.string.notification_channel_incoming_call_id)
-            val name = context.getString(R.string.notification_channel_incoming_call_name)
-            val description = context.getString(R.string.notification_channel_incoming_call_name)
-            val channel = NotificationChannel(id, name, NotificationManager.IMPORTANCE_HIGH)
-            channel.description = description
-            channel.lightColor = context.getColor(R.color.notification_led_color)
-            channel.enableVibration(true)
-            channel.enableLights(true)
-            channel.setShowBadge(true)
-            notificationManager.createNotificationChannel(channel)
-        }
-
-        fun createMessageChannel(
-            context: Context,
-            notificationManager: NotificationManagerCompat
-        ) {
-            // Create messages notification channel
-            val id = context.getString(R.string.notification_channel_chat_id)
-            val name = context.getString(R.string.notification_channel_chat_name)
-            val description = context.getString(R.string.notification_channel_chat_name)
-            val channel = NotificationChannel(id, name, NotificationManager.IMPORTANCE_HIGH)
-            channel.description = description
-            channel.lightColor = context.getColor(R.color.notification_led_color)
-            channel.enableLights(true)
-            channel.enableVibration(true)
-            channel.setShowBadge(true)
-            notificationManager.createNotificationChannel(channel)
-        }
-
-        fun getChannelImportance(
-            notificationManager: NotificationManagerCompat,
-            channelId: String
-        ): Int {
-            val channel = notificationManager.getNotificationChannel(channelId)
-            return channel?.importance ?: NotificationManagerCompat.IMPORTANCE_NONE
-        }
-
-        fun getOverlayType(): Int {
-            return WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY
-        }
-
-        fun createIncomingCallNotification(
-            context: Context,
-            call: Call,
-            notifiable: Notifiable,
-            pendingIntent: PendingIntent,
-            notificationsManager: NotificationsManager
-        ): Notification {
-            val contact: Friend?
-            val roundPicture: Bitmap?
-            val displayName: String
-            val address: String
-            val info: String
-
-            val remoteContact = call.remoteContact
-            val conferenceAddress = if (remoteContact != null) {
-                coreContext.core.interpretUrl(
-                    remoteContact,
-                    false
-                )
-            } else {
-                null
-            }
-            val conferenceInfo = if (conferenceAddress != null) {
-                coreContext.core.findConferenceInformationFromUri(
-                    conferenceAddress
-                )
-            } else {
-                null
-            }
-            if (conferenceInfo == null) {
-                Log.i(
-                    "[Notifications Manager] No conference info found for remote contact address $remoteContact"
-                )
-                contact = coreContext.contactsManager.findContactByAddress(call.remoteAddress)
-                roundPicture =
-                    ImageUtils.getRoundBitmapFromUri(context, contact?.getThumbnailUri())
-                displayName = contact?.name ?: LinphoneUtils.getDisplayName(call.remoteAddress)
-                address = LinphoneUtils.getDisplayableAddress(call.remoteAddress)
-                info = context.getString(R.string.incoming_call_notification_title)
-            } else {
-                contact = null
-                displayName = conferenceInfo.subject ?: context.getString(R.string.conference)
-                address = LinphoneUtils.getDisplayableAddress(conferenceInfo.organizer)
-                roundPicture = coreContext.contactsManager.groupBitmap
-                info = context.getString(R.string.incoming_group_call_notification_title)
-                Log.i(
-                    "[Notifications Manager] Displaying incoming group call notification with subject $displayName for remote contact address $remoteContact"
-                )
-            }
-
-            val notificationLayoutHeadsUp = RemoteViews(
-                context.packageName,
-                R.layout.call_incoming_notification_heads_up
-            )
-            notificationLayoutHeadsUp.setTextViewText(R.id.caller, displayName)
-            notificationLayoutHeadsUp.setTextViewText(R.id.sip_uri, address)
-            notificationLayoutHeadsUp.setTextViewText(R.id.incoming_call_info, info)
-
-            if (roundPicture != null) {
-                notificationLayoutHeadsUp.setImageViewBitmap(R.id.caller_picture, roundPicture)
-            }
-
-            val builder = NotificationCompat.Builder(
-                context,
-                context.getString(R.string.notification_channel_incoming_call_id)
-            )
-                .setStyle(NotificationCompat.DecoratedCustomViewStyle())
-                .addPerson(notificationsManager.getPerson(contact, displayName, roundPicture))
-                .setSmallIcon(R.drawable.topbar_call_notification)
-                .setContentTitle(displayName)
-                .setContentText(context.getString(R.string.incoming_call_notification_title))
-                .setCategory(NotificationCompat.CATEGORY_CALL)
-                .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
-                .setPriority(NotificationCompat.PRIORITY_HIGH)
-                .setWhen(System.currentTimeMillis())
-                .setAutoCancel(false)
-                .setShowWhen(true)
-                .setOngoing(true)
-                .setColor(ContextCompat.getColor(context, R.color.primary_color))
-                .setFullScreenIntent(pendingIntent, true)
-                .addAction(notificationsManager.getCallDeclineAction(notifiable))
-                .addAction(notificationsManager.getCallAnswerAction(notifiable))
-                .setCustomHeadsUpContentView(notificationLayoutHeadsUp)
-
-            if (!corePreferences.preventInterfaceFromShowingUp) {
-                builder.setContentIntent(pendingIntent)
-            }
-
-            return builder.build()
-        }
-
-        fun createCallNotification(
-            context: Context,
-            call: Call,
-            notifiable: Notifiable,
-            pendingIntent: PendingIntent,
-            channel: String,
-            notificationsManager: NotificationsManager
-        ): Notification {
-            @StringRes val stringResourceId: Int
-            val iconResourceId: Int
-            val roundPicture: Bitmap?
-            val title: String
-            val person: Person
-
-            val conferenceAddress = LinphoneUtils.getConferenceAddress(call)
-            val conferenceInfo = if (conferenceAddress != null) {
-                coreContext.core.findConferenceInformationFromUri(
-                    conferenceAddress
-                )
-            } else {
-                null
-            }
-            if (conferenceInfo != null) {
-                Log.i(
-                    "[Notifications Manager] Displaying group call notification with subject ${conferenceInfo.subject}"
-                )
-            } else {
-                Log.i(
-                    "[Notifications Manager] No conference info found for remote contact address ${call.remoteAddress} (${call.remoteContact})"
-                )
-            }
-
-            if (conferenceInfo == null) {
-                val contact: Friend? =
-                    coreContext.contactsManager.findContactByAddress(call.remoteAddress)
-                roundPicture = ImageUtils.getRoundBitmapFromUri(context, contact?.getThumbnailUri())
-                val displayName = contact?.name ?: LinphoneUtils.getDisplayName(call.remoteAddress)
-                title = contact?.name ?: displayName
-                person = notificationsManager.getPerson(contact, displayName, roundPicture)
-            } else {
-                title = conferenceInfo.subject ?: context.getString(R.string.conference)
-                roundPicture = coreContext.contactsManager.groupBitmap
-                person = Person.Builder()
-                    .setName(title)
-                    .setIcon(IconCompat.createWithBitmap(roundPicture))
-                    .build()
-            }
-
-            when (call.state) {
-                Call.State.Paused, Call.State.Pausing, Call.State.PausedByRemote -> {
-                    stringResourceId = R.string.call_notification_paused
-                    iconResourceId = R.drawable.topbar_call_paused_notification
-                }
-                Call.State.OutgoingRinging, Call.State.OutgoingProgress, Call.State.OutgoingInit, Call.State.OutgoingEarlyMedia -> {
-                    stringResourceId = R.string.call_notification_outgoing
-                    iconResourceId = if (call.params.isVideoEnabled) {
-                        R.drawable.topbar_videocall_notification
-                    } else {
-                        R.drawable.topbar_call_notification
-                    }
-                }
-                else -> {
-                    stringResourceId = R.string.call_notification_active
-                    iconResourceId = if (call.currentParams.isVideoEnabled) {
-                        R.drawable.topbar_videocall_notification
-                    } else {
-                        R.drawable.topbar_call_notification
-                    }
-                }
-            }
-
-            val builder = NotificationCompat.Builder(
-                context,
-                channel
-            )
-                .setContentTitle(title)
-                .setContentText(context.getString(stringResourceId))
-                .setSmallIcon(iconResourceId)
-                .setLargeIcon(roundPicture)
-                .addPerson(person)
-                .setAutoCancel(false)
-                .setCategory(NotificationCompat.CATEGORY_CALL)
-                .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
-                .setPriority(NotificationCompat.PRIORITY_LOW)
-                .setWhen(System.currentTimeMillis())
-                .setShowWhen(true)
-                .setOngoing(true)
-                .setColor(ContextCompat.getColor(context, R.color.notification_led_color))
-                .addAction(notificationsManager.getCallDeclineAction(notifiable))
-
-            if (!corePreferences.preventInterfaceFromShowingUp) {
-                builder.setContentIntent(pendingIntent)
-            }
-
-            return builder.build()
-        }
-
-        @SuppressLint("MissingPermission")
-        fun eventVibration(vibrator: Vibrator) {
-            val effect = VibrationEffect.createWaveform(
-                longArrayOf(0L, 100L, 100L),
-                intArrayOf(0, VibrationEffect.DEFAULT_AMPLITUDE, 0),
-                -1
-            )
-            val audioAttrs = AudioAttributes.Builder()
-                .setUsage(AudioAttributes.USAGE_NOTIFICATION_EVENT)
-                .build()
-            vibrator.vibrate(effect, audioAttrs)
-        }
-
-        fun changeAudioRouteForTelecomManager(connection: NativeCallWrapper, route: Int): Boolean {
-            Log.i(
-                "[Telecom Helper] Changing audio route [${routeToString(route)}] on connection [${connection.callId}] with state [${connection.stateAsString()}]"
-            )
-
-            val audioState = connection.callAudioState
-            if (audioState != null) {
-                Log.i("[Telecom Helper] Current audio route is ${routeToString(audioState.route)}")
-                if (audioState.route == route) {
-                    Log.w("[Telecom Helper] Connection is already using this route")
-                    return false
-                }
-            } else {
-                Log.w("[Telecom Helper] Failed to retrieve connection's call audio state!")
-                return false
-            }
-
-            connection.setAudioRoute(route)
-            return true
-        }
-
-        fun requestTelecomManagerPermission(activity: Activity, code: Int) {
-            activity.requestPermissions(
-                arrayOf(
-                    Manifest.permission.READ_PHONE_STATE,
-                    Manifest.permission.MANAGE_OWN_CALLS
-                ),
-                code
-            )
-        }
-
-        fun getImeFlagsForSecureChatRoom(): Int {
-            return EditorInfo.IME_FLAG_NO_PERSONALIZED_LEARNING
-        }
-
-        fun startForegroundService(context: Context, intent: Intent) {
-            context.startForegroundService(intent)
-        }
-
-        fun hasTelecomManagerFeature(context: Context): Boolean {
-            return context.packageManager.hasSystemFeature(
-                PackageManager.FEATURE_CONNECTION_SERVICE
-            )
-        }
-
-        private fun routeToString(route: Int): String {
-            return when (route) {
-                CallAudioState.ROUTE_BLUETOOTH -> "BLUETOOTH"
-                CallAudioState.ROUTE_EARPIECE -> "EARPIECE"
-                CallAudioState.ROUTE_SPEAKER -> "SPEAKER"
-                CallAudioState.ROUTE_WIRED_HEADSET -> "WIRED_HEADSET"
-                CallAudioState.ROUTE_WIRED_OR_EARPIECE -> "WIRED_OR_EARPIECE"
-                else -> "Unknown: $route"
-            }
-        }
-    }
-}
diff --git a/app/src/main/java/org/linphone/compatibility/Api27Compatibility.kt b/app/src/main/java/org/linphone/compatibility/Api27Compatibility.kt
deleted file mode 100644
index 55724fa6c..000000000
--- a/app/src/main/java/org/linphone/compatibility/Api27Compatibility.kt
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.compatibility
-
-import android.annotation.TargetApi
-import android.app.*
-import android.content.Context
-
-@TargetApi(27)
-class Api27Compatibility {
-    companion object {
-        fun setShowWhenLocked(activity: Activity, enable: Boolean) {
-            activity.setShowWhenLocked(enable)
-        }
-
-        fun setTurnScreenOn(activity: Activity, enable: Boolean) {
-            activity.setTurnScreenOn(enable)
-        }
-
-        fun requestDismissKeyguard(activity: Activity) {
-            val keyguardManager = activity.getSystemService(Context.KEYGUARD_SERVICE) as KeyguardManager
-            keyguardManager.requestDismissKeyguard(activity, null)
-        }
-    }
-}
diff --git a/app/src/main/java/org/linphone/compatibility/Api28Compatibility.kt b/app/src/main/java/org/linphone/compatibility/Api28Compatibility.kt
deleted file mode 100644
index cccd52d54..000000000
--- a/app/src/main/java/org/linphone/compatibility/Api28Compatibility.kt
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (c) 2010-2023 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.compatibility
-
-import android.annotation.TargetApi
-import android.content.ClipboardManager
-
-@TargetApi(28)
-class Api28Compatibility {
-    companion object {
-        fun clearClipboard(clipboard: ClipboardManager) {
-            clipboard.clearPrimaryClip()
-        }
-    }
-}
diff --git a/app/src/main/java/org/linphone/compatibility/Api29Compatibility.kt b/app/src/main/java/org/linphone/compatibility/Api29Compatibility.kt
deleted file mode 100644
index ee6ad686c..000000000
--- a/app/src/main/java/org/linphone/compatibility/Api29Compatibility.kt
+++ /dev/null
@@ -1,268 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.compatibility
-
-import android.Manifest
-import android.annotation.TargetApi
-import android.app.NotificationChannel
-import android.app.NotificationManager
-import android.content.ContentValues
-import android.content.Context
-import android.content.Intent
-import android.graphics.Bitmap
-import android.graphics.ImageDecoder
-import android.net.Uri
-import android.os.Environment
-import android.provider.MediaStore
-import android.view.View
-import android.view.contentcapture.ContentCaptureContext
-import android.view.contentcapture.ContentCaptureSession
-import androidx.core.app.NotificationManagerCompat
-import org.linphone.R
-import org.linphone.core.ChatRoom
-import org.linphone.core.Content
-import org.linphone.core.tools.Log
-import org.linphone.utils.AppUtils
-import org.linphone.utils.FileUtils
-import org.linphone.utils.LinphoneUtils
-
-@TargetApi(29)
-class Api29Compatibility {
-    companion object {
-        fun hasReadPhoneStatePermission(context: Context): Boolean {
-            val granted = Compatibility.hasPermission(context, Manifest.permission.READ_PHONE_STATE)
-            if (granted) {
-                Log.d("[Permission Helper] Permission READ_PHONE_STATE is granted")
-            } else {
-                Log.w("[Permission Helper] Permission READ_PHONE_STATE is denied")
-            }
-            return granted
-        }
-
-        fun hasTelecomManagerPermission(context: Context): Boolean {
-            return Compatibility.hasPermission(context, Manifest.permission.READ_PHONE_STATE) &&
-                Compatibility.hasPermission(context, Manifest.permission.MANAGE_OWN_CALLS)
-        }
-
-        fun createMessageChannel(
-            context: Context,
-            notificationManager: NotificationManagerCompat
-        ) {
-            // Create messages notification channel
-            val id = context.getString(R.string.notification_channel_chat_id)
-            val name = context.getString(R.string.notification_channel_chat_name)
-            val description = context.getString(R.string.notification_channel_chat_name)
-            val channel = NotificationChannel(id, name, NotificationManager.IMPORTANCE_HIGH)
-            channel.description = description
-            channel.lightColor = context.getColor(R.color.notification_led_color)
-            channel.enableLights(true)
-            channel.enableVibration(true)
-            channel.setShowBadge(true)
-            channel.setAllowBubbles(true)
-            notificationManager.createNotificationChannel(channel)
-        }
-
-        fun extractLocusIdFromIntent(intent: Intent): String? {
-            return intent.getStringExtra(Intent.EXTRA_LOCUS_ID)
-        }
-
-        fun setLocusIdInContentCaptureSession(root: View, chatRoom: ChatRoom) {
-            val session: ContentCaptureSession? = root.contentCaptureSession
-            if (session != null) {
-                val id = LinphoneUtils.getChatRoomId(chatRoom.localAddress, chatRoom.peerAddress)
-                session.contentCaptureContext = ContentCaptureContext.forLocusId(id)
-            }
-        }
-
-        fun canChatMessageChannelBubble(context: Context): Boolean {
-            val notificationManager: NotificationManager =
-                context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
-            val bubblesAllowed = notificationManager.areBubblesAllowed()
-            Log.i(
-                "[Notifications Manager] Bubbles notifications are ${if (bubblesAllowed) "allowed" else "forbidden"}"
-            )
-            return bubblesAllowed
-        }
-
-        fun getBitmapFromUri(context: Context, uri: Uri): Bitmap {
-            return ImageDecoder.decodeBitmap(
-                ImageDecoder.createSource(context.contentResolver, uri)
-            )
-        }
-
-        suspend fun addImageToMediaStore(context: Context, content: Content): Boolean {
-            return addContentToMediaStore(context, content, isImage = true)
-        }
-
-        suspend fun addVideoToMediaStore(context: Context, content: Content): Boolean {
-            return addContentToMediaStore(context, content, isVideo = true)
-        }
-
-        suspend fun addAudioToMediaStore(context: Context, content: Content): Boolean {
-            return addContentToMediaStore(context, content, isAudio = true)
-        }
-
-        private suspend fun addContentToMediaStore(
-            context: Context,
-            content: Content,
-            isImage: Boolean = false,
-            isVideo: Boolean = false,
-            isAudio: Boolean = false
-        ): Boolean {
-            val isContentEncrypted = content.isFileEncrypted
-            val filePath = if (content.isFileEncrypted) {
-                val plainFilePath = content.exportPlainFile().orEmpty()
-                Log.i(
-                    "[Media Store] [VFS] Content is encrypted, plain file path is: $plainFilePath"
-                )
-                plainFilePath
-            } else {
-                content.filePath
-            }
-
-            if (filePath.isNullOrEmpty()) {
-                Log.e("[Media Store] Content doesn't have a file path!")
-                return false
-            }
-
-            val appName = AppUtils.getString(R.string.app_name)
-            val directory = when {
-                isImage -> Environment.DIRECTORY_PICTURES
-                isVideo -> Environment.DIRECTORY_MOVIES
-                isAudio -> Environment.DIRECTORY_MUSIC
-                else -> Environment.DIRECTORY_DOWNLOADS
-            }
-            val relativePath = "$directory/$appName"
-            val fileName = content.name
-            val mime = "${content.type}/${content.subtype}"
-            val type = when {
-                isImage -> "image"
-                isVideo -> "video"
-                isAudio -> "audio"
-                else -> "unexpected"
-            }
-            Log.i(
-                "[Media Store] Adding $type [$filePath] to Media Store with name [$fileName] and MIME [$mime], asking to be stored in: $relativePath"
-            )
-
-            val mediaStoreFilePath = when {
-                isImage -> {
-                    val values = ContentValues().apply {
-                        put(MediaStore.Images.Media.DISPLAY_NAME, fileName)
-                        put(MediaStore.Images.Media.MIME_TYPE, mime)
-                        put(MediaStore.Images.Media.RELATIVE_PATH, relativePath)
-                        put(MediaStore.Images.Media.IS_PENDING, 1)
-                    }
-                    val collection = MediaStore.Images.Media.getContentUri(
-                        MediaStore.VOLUME_EXTERNAL_PRIMARY
-                    )
-                    addContentValuesToCollection(
-                        context,
-                        filePath,
-                        collection,
-                        values,
-                        MediaStore.Images.Media.IS_PENDING
-                    )
-                }
-                isVideo -> {
-                    val values = ContentValues().apply {
-                        put(MediaStore.Video.Media.TITLE, fileName)
-                        put(MediaStore.Video.Media.DISPLAY_NAME, fileName)
-                        put(MediaStore.Video.Media.MIME_TYPE, mime)
-                        put(MediaStore.Video.Media.RELATIVE_PATH, relativePath)
-                        put(MediaStore.Video.Media.IS_PENDING, 1)
-                    }
-                    val collection = MediaStore.Video.Media.getContentUri(
-                        MediaStore.VOLUME_EXTERNAL_PRIMARY
-                    )
-                    addContentValuesToCollection(
-                        context,
-                        filePath,
-                        collection,
-                        values,
-                        MediaStore.Video.Media.IS_PENDING
-                    )
-                }
-                isAudio -> {
-                    val values = ContentValues().apply {
-                        put(MediaStore.Audio.Media.TITLE, fileName)
-                        put(MediaStore.Audio.Media.DISPLAY_NAME, fileName)
-                        put(MediaStore.Audio.Media.MIME_TYPE, mime)
-                        put(MediaStore.Audio.Media.RELATIVE_PATH, relativePath)
-                        put(MediaStore.Audio.Media.IS_PENDING, 1)
-                    }
-                    val collection = MediaStore.Audio.Media.getContentUri(
-                        MediaStore.VOLUME_EXTERNAL_PRIMARY
-                    )
-                    addContentValuesToCollection(
-                        context,
-                        filePath,
-                        collection,
-                        values,
-                        MediaStore.Audio.Media.IS_PENDING
-                    )
-                }
-                else -> ""
-            }
-
-            if (isContentEncrypted) {
-                Log.w("[Media Store] Content was encrypted, delete plain version: $filePath")
-                FileUtils.deleteFile(filePath)
-            }
-
-            if (mediaStoreFilePath.isNotEmpty()) {
-                Log.i("[Media Store] Exported file path is: $mediaStoreFilePath")
-                content.userData = mediaStoreFilePath
-                return true
-            }
-
-            return false
-        }
-
-        private suspend fun addContentValuesToCollection(
-            context: Context,
-            filePath: String,
-            collection: Uri,
-            values: ContentValues,
-            pendingKey: String
-        ): String {
-            try {
-                val fileUri = context.contentResolver.insert(collection, values)
-                if (fileUri == null) {
-                    Log.e("[Media Store] Failed to get a URI to where store the file, aborting")
-                    return ""
-                }
-
-                context.contentResolver.openOutputStream(fileUri).use { out ->
-                    if (FileUtils.copyFileTo(filePath, out)) {
-                        values.clear()
-                        values.put(pendingKey, 0)
-                        context.contentResolver.update(fileUri, values, null, null)
-
-                        return fileUri.toString()
-                    }
-                }
-            } catch (e: Exception) {
-                Log.e("[Media Store] Exception: $e")
-            }
-            return ""
-        }
-    }
-}
diff --git a/app/src/main/java/org/linphone/compatibility/Api30Compatibility.kt b/app/src/main/java/org/linphone/compatibility/Api30Compatibility.kt
deleted file mode 100644
index 7d41cb093..000000000
--- a/app/src/main/java/org/linphone/compatibility/Api30Compatibility.kt
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.compatibility
-
-import android.Manifest
-import android.annotation.TargetApi
-import android.app.Activity
-import android.content.Context
-import android.content.pm.ShortcutManager
-import android.view.Window
-import androidx.core.view.WindowCompat
-import androidx.core.view.WindowInsetsCompat
-import androidx.core.view.WindowInsetsControllerCompat
-import androidx.fragment.app.Fragment
-import org.linphone.core.ChatRoom
-import org.linphone.core.tools.Log
-import org.linphone.utils.LinphoneUtils
-
-@TargetApi(30)
-class Api30Compatibility {
-    companion object {
-        fun hasReadPhoneNumbersPermission(context: Context): Boolean {
-            val granted = Compatibility.hasPermission(
-                context,
-                Manifest.permission.READ_PHONE_NUMBERS
-            )
-            if (granted) {
-                Log.d("[Permission Helper] Permission READ_PHONE_NUMBERS is granted")
-            } else {
-                Log.w("[Permission Helper] Permission READ_PHONE_NUMBERS is denied")
-            }
-            return granted
-        }
-
-        fun requestReadPhoneNumbersPermission(fragment: Fragment, code: Int) {
-            fragment.requestPermissions(arrayOf(Manifest.permission.READ_PHONE_NUMBERS), code)
-        }
-
-        fun requestTelecomManagerPermission(activity: Activity, code: Int) {
-            activity.requestPermissions(
-                arrayOf(
-                    Manifest.permission.READ_PHONE_NUMBERS,
-                    Manifest.permission.READ_PHONE_STATE,
-                    Manifest.permission.MANAGE_OWN_CALLS
-                ),
-                code
-            )
-        }
-
-        fun hasTelecomManagerPermission(context: Context): Boolean {
-            return Compatibility.hasPermission(context, Manifest.permission.READ_PHONE_NUMBERS) &&
-                Compatibility.hasPermission(context, Manifest.permission.READ_PHONE_STATE) &&
-                Compatibility.hasPermission(context, Manifest.permission.MANAGE_OWN_CALLS)
-        }
-
-        fun removeChatRoomShortcut(context: Context, chatRoom: ChatRoom) {
-            val shortcutManager = context.getSystemService(ShortcutManager::class.java)
-            val id = LinphoneUtils.getChatRoomId(chatRoom.localAddress, chatRoom.peerAddress)
-            val shortcutsToRemoveList = arrayListOf(id)
-            shortcutManager.removeLongLivedShortcuts(shortcutsToRemoveList)
-        }
-
-        fun hideAndroidSystemUI(hide: Boolean, window: Window) {
-            val windowInsetsCompat = WindowInsetsControllerCompat(window, window.decorView)
-            if (hide) {
-                WindowCompat.setDecorFitsSystemWindows(window, false)
-                windowInsetsCompat.let {
-                    it.hide(WindowInsetsCompat.Type.systemBars())
-                    it.systemBarsBehavior =
-                        WindowInsetsControllerCompat.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE
-                }
-            } else {
-                windowInsetsCompat.show(WindowInsetsCompat.Type.systemBars())
-                WindowCompat.setDecorFitsSystemWindows(window, true)
-            }
-        }
-    }
-}
diff --git a/app/src/main/java/org/linphone/compatibility/Api31Compatibility.kt b/app/src/main/java/org/linphone/compatibility/Api31Compatibility.kt
deleted file mode 100644
index e91b57f4c..000000000
--- a/app/src/main/java/org/linphone/compatibility/Api31Compatibility.kt
+++ /dev/null
@@ -1,305 +0,0 @@
-/*
- * Copyright (c) 2010-2021 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.compatibility
-
-import android.annotation.TargetApi
-import android.app.*
-import android.content.Context
-import android.content.Intent
-import android.content.pm.PackageManager
-import androidx.core.content.ContextCompat
-import org.linphone.LinphoneApplication.Companion.coreContext
-import org.linphone.LinphoneApplication.Companion.corePreferences
-import org.linphone.R
-import org.linphone.contact.getThumbnailUri
-import org.linphone.core.Call
-import org.linphone.core.tools.Log
-import org.linphone.notifications.Notifiable
-import org.linphone.notifications.NotificationsManager
-import org.linphone.utils.ImageUtils
-import org.linphone.utils.LinphoneUtils
-
-@TargetApi(31)
-class Api31Compatibility {
-    companion object {
-        fun getUpdateCurrentPendingIntentFlag(): Int {
-            return PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_MUTABLE
-        }
-
-        fun createIncomingCallNotification(
-            context: Context,
-            call: Call,
-            notifiable: Notifiable,
-            pendingIntent: PendingIntent,
-            notificationsManager: NotificationsManager
-        ): Notification {
-            val remoteContact = call.remoteContact
-            val conferenceAddress = if (remoteContact != null) {
-                coreContext.core.interpretUrl(
-                    remoteContact,
-                    false
-                )
-            } else {
-                null
-            }
-            val conferenceInfo = if (conferenceAddress != null) {
-                coreContext.core.findConferenceInformationFromUri(
-                    conferenceAddress
-                )
-            } else {
-                null
-            }
-            if (conferenceInfo != null) {
-                Log.i(
-                    "[Notifications Manager] Displaying incoming group call notification with subject ${conferenceInfo.subject} and remote contact address $remoteContact"
-                )
-            } else {
-                Log.i(
-                    "[Notifications Manager] No conference info found for remote contact address $remoteContact"
-                )
-            }
-
-            val caller = if (conferenceInfo == null) {
-                val contact =
-                    coreContext.contactsManager.findContactByAddress(call.remoteAddress)
-                val roundPicture =
-                    ImageUtils.getRoundBitmapFromUri(context, contact?.getThumbnailUri())
-                val displayName = contact?.name ?: LinphoneUtils.getDisplayName(call.remoteAddress)
-
-                val person = notificationsManager.getPerson(contact, displayName, roundPicture)
-                Person.Builder()
-                    .setName(person.name)
-                    .setIcon(person.icon?.toIcon(context))
-                    .setUri(person.uri)
-                    .setKey(person.key)
-                    .setImportant(person.isImportant)
-                    .build()
-            } else {
-                Person.Builder()
-                    .setName(
-                        if (conferenceInfo.subject.isNullOrEmpty()) {
-                            context.getString(
-                                R.string.conference_incoming_title
-                            )
-                        } else {
-                            conferenceInfo.subject
-                        }
-                    )
-                    .setIcon(coreContext.contactsManager.groupAvatar.toIcon(context))
-                    .setImportant(false)
-                    .build()
-            }
-
-            val declineIntent = notificationsManager.getCallDeclinePendingIntent(notifiable)
-            val answerIntent = notificationsManager.getCallAnswerPendingIntent(notifiable)
-
-            val isVideoEnabledInRemoteParams = call.remoteParams?.isVideoEnabled ?: false
-            val isVideoAutomaticallyAccepted = call.core.videoActivationPolicy.automaticallyAccept
-            val isVideo = isVideoEnabledInRemoteParams && isVideoAutomaticallyAccepted
-
-            val builder = Notification.Builder(
-                context,
-                context.getString(R.string.notification_channel_incoming_call_id)
-            ).apply {
-                try {
-                    style = Notification.CallStyle.forIncomingCall(
-                        caller,
-                        declineIntent,
-                        answerIntent
-                    ).setIsVideo(isVideo)
-                } catch (iae: IllegalArgumentException) {
-                    Log.e(
-                        "[Api31 Compatibility] Can't use notification call style: $iae, using API 26 notification instead"
-                    )
-                    return Api26Compatibility.createIncomingCallNotification(
-                        context,
-                        call,
-                        notifiable,
-                        pendingIntent,
-                        notificationsManager
-                    )
-                }
-                setSmallIcon(R.drawable.topbar_call_notification)
-                setCategory(Notification.CATEGORY_CALL)
-                setVisibility(Notification.VISIBILITY_PUBLIC)
-                setWhen(System.currentTimeMillis())
-                setAutoCancel(false)
-                setShowWhen(true)
-                setOngoing(true)
-                setColor(ContextCompat.getColor(context, R.color.primary_color))
-                setFullScreenIntent(pendingIntent, true)
-            }
-
-            if (!corePreferences.preventInterfaceFromShowingUp) {
-                builder.setContentIntent(pendingIntent)
-            }
-
-            return builder.build()
-        }
-
-        fun createCallNotification(
-            context: Context,
-            call: Call,
-            notifiable: Notifiable,
-            pendingIntent: PendingIntent,
-            channel: String,
-            notificationsManager: NotificationsManager
-        ): Notification {
-            val conferenceAddress = LinphoneUtils.getConferenceAddress(call)
-            val conferenceInfo = if (conferenceAddress != null) {
-                coreContext.core.findConferenceInformationFromUri(
-                    conferenceAddress
-                )
-            } else {
-                null
-            }
-            if (conferenceInfo != null) {
-                Log.i(
-                    "[Notifications Manager] Displaying group call notification with subject ${conferenceInfo.subject}"
-                )
-            } else {
-                Log.i(
-                    "[Notifications Manager] No conference info found for remote contact address ${call.remoteAddress} (${call.remoteContact})"
-                )
-            }
-
-            val caller = if (conferenceInfo == null) {
-                val contact =
-                    coreContext.contactsManager.findContactByAddress(call.remoteAddress)
-                val roundPicture =
-                    ImageUtils.getRoundBitmapFromUri(context, contact?.getThumbnailUri())
-                val displayName = contact?.name ?: LinphoneUtils.getDisplayName(call.remoteAddress)
-
-                val person = notificationsManager.getPerson(contact, displayName, roundPicture)
-                Person.Builder()
-                    .setName(person.name)
-                    .setIcon(person.icon?.toIcon(context))
-                    .setUri(person.uri)
-                    .setKey(person.key)
-                    .setImportant(person.isImportant)
-                    .build()
-            } else {
-                Person.Builder()
-                    .setName(conferenceInfo.subject)
-                    .setIcon(coreContext.contactsManager.groupAvatar.toIcon(context))
-                    .setImportant(false)
-                    .build()
-            }
-            val isVideo = call.currentParams.isVideoEnabled
-            val iconResourceId: Int = when (call.state) {
-                Call.State.Paused, Call.State.Pausing, Call.State.PausedByRemote -> {
-                    R.drawable.topbar_call_paused_notification
-                }
-                else -> {
-                    if (isVideo) {
-                        R.drawable.topbar_videocall_notification
-                    } else {
-                        R.drawable.topbar_call_notification
-                    }
-                }
-            }
-            val declineIntent = notificationsManager.getCallDeclinePendingIntent(notifiable)
-
-            val builder = Notification.Builder(
-                context,
-                channel
-            ).apply {
-                try {
-                    style = Notification.CallStyle.forOngoingCall(caller, declineIntent)
-                        .setIsVideo(isVideo)
-                } catch (iae: IllegalArgumentException) {
-                    Log.e(
-                        "[Api31 Compatibility] Can't use notification call style: $iae, using API 26 notification instead"
-                    )
-                    return Api26Compatibility.createCallNotification(
-                        context,
-                        call,
-                        notifiable,
-                        pendingIntent,
-                        channel,
-                        notificationsManager
-                    )
-                }
-                setSmallIcon(iconResourceId)
-                setAutoCancel(false)
-                setCategory(Notification.CATEGORY_CALL)
-                setVisibility(Notification.VISIBILITY_PUBLIC)
-                setWhen(System.currentTimeMillis())
-                setShowWhen(true)
-                setOngoing(true)
-                setColor(ContextCompat.getColor(context, R.color.notification_led_color))
-                // This is required for CallStyle notification
-                setFullScreenIntent(pendingIntent, true)
-            }
-
-            if (!corePreferences.preventInterfaceFromShowingUp) {
-                builder.setContentIntent(pendingIntent)
-            }
-
-            return builder.build()
-        }
-
-        fun startForegroundService(context: Context, intent: Intent) {
-            try {
-                context.startForegroundService(intent)
-            } catch (fssnae: ForegroundServiceStartNotAllowedException) {
-                Log.e("[Api31 Compatibility] Can't start service as foreground! $fssnae")
-            } catch (se: SecurityException) {
-                Log.e("[Api31 Compatibility] Can't start service as foreground! $se")
-            } catch (e: Exception) {
-                Log.e("[Api31 Compatibility] Can't start service as foreground! $e")
-            }
-        }
-
-        fun startForegroundService(service: Service, notifId: Int, notif: Notification?) {
-            try {
-                service.startForeground(notifId, notif)
-            } catch (fssnae: ForegroundServiceStartNotAllowedException) {
-                Log.e("[Api31 Compatibility] Can't start service as foreground! $fssnae")
-            } catch (se: SecurityException) {
-                Log.e("[Api31 Compatibility] Can't start service as foreground! $se")
-            } catch (e: Exception) {
-                Log.e("[Api31 Compatibility] Can't start service as foreground! $e")
-            }
-        }
-
-        fun enableAutoEnterPiP(activity: Activity, enable: Boolean, conference: Boolean) {
-            val supportsPip = activity.packageManager
-                .hasSystemFeature(PackageManager.FEATURE_PICTURE_IN_PICTURE)
-            Log.i("[Call] Is PiP supported: $supportsPip")
-            if (supportsPip) {
-                // Force portrait layout if in conference, otherwise for landscape
-                // Our layouts behave better in these orientation
-                val params = PictureInPictureParams.Builder()
-                    .setAutoEnterEnabled(enable)
-                    .setAspectRatio(Compatibility.getPipRatio(activity, conference, !conference))
-                    .build()
-                try {
-                    activity.setPictureInPictureParams(params)
-                    Log.i(
-                        "[Call] PiP auto enter enabled params set to $enable with ${if (conference) "portrait" else "landscape"} aspect ratio"
-                    )
-                } catch (e: Exception) {
-                    Log.e("[Call] Can't build PiP params: $e")
-                }
-            }
-        }
-    }
-}
diff --git a/app/src/main/java/org/linphone/compatibility/Api33Compatibility.kt b/app/src/main/java/org/linphone/compatibility/Api33Compatibility.kt
deleted file mode 100644
index 2a524fa34..000000000
--- a/app/src/main/java/org/linphone/compatibility/Api33Compatibility.kt
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright (c) 2010-2022 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.compatibility
-
-import android.Manifest
-import android.annotation.TargetApi
-import android.content.Context
-import android.content.pm.PackageManager
-import androidx.fragment.app.Fragment
-
-@TargetApi(33)
-class Api33Compatibility {
-    companion object {
-        fun requestPostNotificationsPermission(fragment: Fragment, code: Int) {
-            fragment.requestPermissions(
-                arrayOf(
-                    Manifest.permission.POST_NOTIFICATIONS
-                ),
-                code
-            )
-        }
-
-        fun hasPostNotificationsPermission(context: Context): Boolean {
-            return Compatibility.hasPermission(context, Manifest.permission.POST_NOTIFICATIONS)
-        }
-
-        fun requestReadMediaAndCameraPermissions(fragment: Fragment, code: Int) {
-            fragment.requestPermissions(
-                arrayOf(
-                    Manifest.permission.READ_MEDIA_IMAGES,
-                    Manifest.permission.READ_MEDIA_VIDEO,
-                    Manifest.permission.READ_MEDIA_AUDIO,
-                    Manifest.permission.CAMERA
-                ),
-                code
-            )
-        }
-
-        fun hasReadExternalStoragePermission(context: Context): Boolean {
-            return Compatibility.hasPermission(context, Manifest.permission.READ_MEDIA_IMAGES) ||
-                Compatibility.hasPermission(context, Manifest.permission.READ_MEDIA_VIDEO) ||
-                Compatibility.hasPermission(context, Manifest.permission.READ_MEDIA_AUDIO)
-        }
-
-        fun hasTelecomManagerFeature(context: Context): Boolean {
-            return context.packageManager.hasSystemFeature(PackageManager.FEATURE_TELECOM)
-        }
-    }
-}
diff --git a/app/src/main/java/org/linphone/compatibility/Api34Compatibility.kt b/app/src/main/java/org/linphone/compatibility/Api34Compatibility.kt
deleted file mode 100644
index 79c164dea..000000000
--- a/app/src/main/java/org/linphone/compatibility/Api34Compatibility.kt
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
- * Copyright (c) 2010-2023 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.compatibility
-
-import android.annotation.TargetApi
-import android.app.ForegroundServiceStartNotAllowedException
-import android.app.Notification
-import android.app.NotificationManager
-import android.app.Service
-import android.content.Context
-import android.content.Intent
-import android.content.pm.ServiceInfo
-import android.net.Uri
-import android.provider.Settings
-import androidx.core.content.ContextCompat
-import org.linphone.core.tools.Log
-import org.linphone.utils.PermissionHelper
-
-@TargetApi(34)
-class Api34Compatibility {
-    companion object {
-        fun hasFullScreenIntentPermission(context: Context): Boolean {
-            val notificationManager = context.getSystemService(NotificationManager::class.java) as NotificationManager
-            // See https://developer.android.com/reference/android/app/NotificationManager#canUseFullScreenIntent%28%29
-            return notificationManager.canUseFullScreenIntent()
-        }
-
-        fun requestFullScreenIntentPermission(context: Context) {
-            val intent = Intent()
-            // See https://developer.android.com/reference/android/provider/Settings#ACTION_MANAGE_APP_USE_FULL_SCREEN_INTENT
-            intent.action = Settings.ACTION_MANAGE_APP_USE_FULL_SCREEN_INTENT
-            intent.data = Uri.parse("package:${context.packageName}")
-            intent.addFlags(Intent.FLAG_ACTIVITY_NO_HISTORY)
-            ContextCompat.startActivity(context, intent, null)
-        }
-
-        fun startCallForegroundService(
-            service: Service,
-            notifId: Int,
-            notif: Notification,
-            isCallActive: Boolean
-        ) {
-            val mask = if (isCallActive) {
-                Log.i(
-                    "[Api34 Compatibility] Trying to start service as foreground using at least FOREGROUND_SERVICE_TYPE_PHONE_CALL"
-                )
-                var computeMask = ServiceInfo.FOREGROUND_SERVICE_TYPE_PHONE_CALL
-                if (PermissionHelper.get().hasCameraPermission()) {
-                    Log.i(
-                        "[Api34 Compatibility] CAMERA permission has been granted, adding FOREGROUND_SERVICE_TYPE_CAMERA"
-                    )
-                    computeMask = computeMask or ServiceInfo.FOREGROUND_SERVICE_TYPE_CAMERA
-                }
-                if (PermissionHelper.get().hasRecordAudioPermission()) {
-                    Log.i(
-                        "[Api34 Compatibility] RECORD_AUDIO permission has been granted, adding FOREGROUND_SERVICE_TYPE_MICROPHONE"
-                    )
-                    computeMask = computeMask or ServiceInfo.FOREGROUND_SERVICE_TYPE_MICROPHONE
-                }
-                computeMask
-            } else {
-                Log.i(
-                    "[Api34 Compatibility] Trying to start service as foreground using only FOREGROUND_SERVICE_TYPE_PHONE_CALL because call isn't active yet"
-                )
-                ServiceInfo.FOREGROUND_SERVICE_TYPE_PHONE_CALL
-            }
-
-            try {
-                service.startForeground(
-                    notifId,
-                    notif,
-                    mask
-                )
-            } catch (fssnae: ForegroundServiceStartNotAllowedException) {
-                Log.e("[Api34 Compatibility] Can't start service as foreground! $fssnae")
-            } catch (se: SecurityException) {
-                Log.e("[Api34 Compatibility] Can't start service as foreground! $se")
-            } catch (e: Exception) {
-                Log.e("[Api34 Compatibility] Can't start service as foreground! $e")
-            }
-        }
-
-        fun startDataSyncForegroundService(
-            service: Service,
-            notifId: Int,
-            notif: Notification,
-            isCallActive: Boolean
-        ) {
-            val mask = if (isCallActive) {
-                Log.i(
-                    "[Api34 Compatibility] Trying to start service as foreground using at least FOREGROUND_SERVICE_TYPE_PHONE_CALL or FOREGROUND_SERVICE_TYPE_DATA_SYNC"
-                )
-                var computeMask = ServiceInfo.FOREGROUND_SERVICE_TYPE_PHONE_CALL or ServiceInfo.FOREGROUND_SERVICE_TYPE_DATA_SYNC
-                if (PermissionHelper.get().hasCameraPermission()) {
-                    Log.i(
-                        "[Api34 Compatibility] CAMERA permission has been granted, adding FOREGROUND_SERVICE_TYPE_CAMERA"
-                    )
-                    computeMask = computeMask or ServiceInfo.FOREGROUND_SERVICE_TYPE_CAMERA
-                }
-                if (PermissionHelper.get().hasRecordAudioPermission()) {
-                    Log.i(
-                        "[Api34 Compatibility] RECORD_AUDIO permission has been granted, adding FOREGROUND_SERVICE_TYPE_MICROPHONE"
-                    )
-                    computeMask = computeMask or ServiceInfo.FOREGROUND_SERVICE_TYPE_MICROPHONE
-                }
-                computeMask
-            } else {
-                Log.i(
-                    "[Api34 Compatibility] Trying to start service as foreground using only FOREGROUND_SERVICE_TYPE_DATA_SYNC because no call at the time"
-                )
-                ServiceInfo.FOREGROUND_SERVICE_TYPE_DATA_SYNC
-            }
-
-            try {
-                service.startForeground(
-                    notifId,
-                    notif,
-                    mask
-                )
-            } catch (fssnae: ForegroundServiceStartNotAllowedException) {
-                Log.e("[Api34 Compatibility] Can't start service as foreground! $fssnae")
-            } catch (se: SecurityException) {
-                Log.e("[Api34 Compatibility] Can't start service as foreground! $se")
-            } catch (e: Exception) {
-                Log.e("[Api34 Compatibility] Can't start service as foreground! $e")
-            }
-        }
-    }
-}
diff --git a/app/src/main/java/org/linphone/compatibility/Compatibility.kt b/app/src/main/java/org/linphone/compatibility/Compatibility.kt
deleted file mode 100644
index c0557bbcd..000000000
--- a/app/src/main/java/org/linphone/compatibility/Compatibility.kt
+++ /dev/null
@@ -1,503 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.compatibility
-
-import android.app.Activity
-import android.app.Notification
-import android.app.PendingIntent
-import android.app.Service
-import android.content.ClipboardManager
-import android.content.Context
-import android.content.Intent
-import android.graphics.Bitmap
-import android.net.Uri
-import android.os.Build
-import android.os.Vibrator
-import android.telephony.TelephonyManager
-import android.util.DisplayMetrics
-import android.util.Rational
-import android.view.View
-import android.view.Window
-import android.view.WindowManager
-import androidx.core.app.NotificationManagerCompat
-import androidx.fragment.app.Fragment
-import java.util.*
-import org.linphone.core.Call
-import org.linphone.core.ChatRoom
-import org.linphone.core.Content
-import org.linphone.mediastream.Version
-import org.linphone.notifications.Notifiable
-import org.linphone.notifications.NotificationsManager
-import org.linphone.telecom.NativeCallWrapper
-
-@Suppress("DEPRECATION")
-class Compatibility {
-    companion object {
-        fun hasPermission(context: Context, permission: String): Boolean {
-            return Api23Compatibility.hasPermission(context, permission)
-        }
-
-        // See https://developer.android.com/about/versions/11/privacy/permissions#phone-numbers
-        fun hasReadPhoneStateOrNumbersPermission(context: Context): Boolean {
-            return if (Version.sdkAboveOrEqual(Version.API30_ANDROID_11)) {
-                Api30Compatibility.hasReadPhoneNumbersPermission(context)
-            } else {
-                Api29Compatibility.hasReadPhoneStatePermission(context)
-            }
-        }
-
-        // See https://developer.android.com/about/versions/11/privacy/permissions#phone-numbers
-        fun requestReadPhoneStateOrNumbersPermission(fragment: Fragment, code: Int) {
-            if (Version.sdkAboveOrEqual(Version.API30_ANDROID_11)) {
-                Api30Compatibility.requestReadPhoneNumbersPermission(fragment, code)
-            } else {
-                Api23Compatibility.requestReadPhoneStatePermission(fragment, code)
-            }
-        }
-
-        // See https://developer.android.com/about/versions/11/privacy/permissions#phone-numbers
-        fun hasTelecomManagerPermissions(context: Context): Boolean {
-            return if (Version.sdkAboveOrEqual(Version.API30_ANDROID_11)) {
-                Api30Compatibility.hasTelecomManagerPermission(context)
-            } else if (Version.sdkAboveOrEqual(Version.API29_ANDROID_10)) {
-                Api29Compatibility.hasTelecomManagerPermission(context)
-            } else {
-                false
-            }
-        }
-
-        fun requestTelecomManagerPermissions(activity: Activity, code: Int) {
-            if (Version.sdkAboveOrEqual(Version.API30_ANDROID_11)) {
-                Api30Compatibility.requestTelecomManagerPermission(activity, code)
-            } else {
-                Api26Compatibility.requestTelecomManagerPermission(activity, code)
-            }
-        }
-
-        fun requestPostNotificationsPermission(fragment: Fragment, code: Int) {
-            if (Version.sdkAboveOrEqual(Version.API33_ANDROID_13_TIRAMISU)) {
-                Api33Compatibility.requestPostNotificationsPermission(fragment, code)
-            }
-        }
-
-        fun hasPostNotificationsPermission(context: Context): Boolean {
-            return if (Version.sdkAboveOrEqual(Version.API33_ANDROID_13_TIRAMISU)) {
-                Api33Compatibility.hasPostNotificationsPermission(context)
-            } else {
-                true
-            }
-        }
-
-        fun requestReadExternalStorageAndCameraPermissions(fragment: Fragment, code: Int) {
-            if (Version.sdkAboveOrEqual(Version.API33_ANDROID_13_TIRAMISU)) {
-                Api33Compatibility.requestReadMediaAndCameraPermissions(fragment, code)
-            } else {
-                Api23Compatibility.requestReadExternalStorageAndCameraPermissions(fragment, code)
-            }
-        }
-
-        fun hasReadExternalStoragePermission(context: Context): Boolean {
-            return if (Version.sdkAboveOrEqual(Version.API33_ANDROID_13_TIRAMISU)) {
-                Api33Compatibility.hasReadExternalStoragePermission(context)
-            } else {
-                Api23Compatibility.hasReadExternalStoragePermission(context)
-            }
-        }
-
-        fun getDeviceName(context: Context): String {
-            return when (Version.sdkAboveOrEqual(Version.API25_NOUGAT_71)) {
-                true -> Api25Compatibility.getDeviceName(context)
-                else -> Api23Compatibility.getDeviceName(context)
-            }
-        }
-
-        fun createPhoneListener(telephonyManager: TelephonyManager): PhoneStateInterface {
-            return if (Version.sdkStrictlyBelow(Version.API31_ANDROID_12)) {
-                PhoneStateListener(telephonyManager)
-            } else {
-                TelephonyListener(telephonyManager)
-            }
-        }
-
-        /* UI */
-
-        fun setShowWhenLocked(activity: Activity, enable: Boolean) {
-            if (Version.sdkStrictlyBelow(Version.API27_OREO_81)) {
-                Api23Compatibility.setShowWhenLocked(activity, enable)
-            } else {
-                Api27Compatibility.setShowWhenLocked(activity, enable)
-            }
-        }
-
-        fun setTurnScreenOn(activity: Activity, enable: Boolean) {
-            if (Version.sdkStrictlyBelow(Version.API27_OREO_81)) {
-                Api23Compatibility.setTurnScreenOn(activity, enable)
-            } else {
-                Api27Compatibility.setTurnScreenOn(activity, enable)
-            }
-        }
-
-        fun requestDismissKeyguard(activity: Activity) {
-            if (Version.sdkStrictlyBelow(Version.API27_OREO_81)) {
-                Api23Compatibility.requestDismissKeyguard(activity)
-            } else {
-                Api27Compatibility.requestDismissKeyguard(activity)
-            }
-        }
-
-        fun getBitmapFromUri(context: Context, uri: Uri): Bitmap {
-            return if (Version.sdkStrictlyBelow(Version.API29_ANDROID_10)) {
-                Api23Compatibility.getBitmapFromUri(context, uri)
-            } else {
-                Api29Compatibility.getBitmapFromUri(context, uri)
-            }
-        }
-
-        /* Notifications */
-
-        fun createNotificationChannels(
-            context: Context,
-            notificationManager: NotificationManagerCompat
-        ) {
-            if (Version.sdkAboveOrEqual(Version.API26_O_80)) {
-                Api26Compatibility.createServiceChannel(context, notificationManager)
-                Api26Compatibility.createMissedCallChannel(context, notificationManager)
-                Api26Compatibility.createIncomingCallChannel(context, notificationManager)
-                if (Version.sdkAboveOrEqual(Version.API29_ANDROID_10)) {
-                    Api29Compatibility.createMessageChannel(context, notificationManager)
-                } else {
-                    Api26Compatibility.createMessageChannel(context, notificationManager)
-                }
-            }
-        }
-
-        fun getChannelImportance(
-            notificationManager: NotificationManagerCompat,
-            channelId: String
-        ): Int {
-            if (Version.sdkAboveOrEqual(Version.API26_O_80)) {
-                return Api26Compatibility.getChannelImportance(notificationManager, channelId)
-            }
-            return NotificationManagerCompat.IMPORTANCE_DEFAULT
-        }
-
-        fun getOverlayType(): Int {
-            if (Version.sdkAboveOrEqual(Version.API26_O_80)) {
-                return Api26Compatibility.getOverlayType()
-            }
-            return WindowManager.LayoutParams.TYPE_PHONE
-        }
-
-        fun createIncomingCallNotification(
-            context: Context,
-            call: Call,
-            notifiable: Notifiable,
-            pendingIntent: PendingIntent,
-            notificationsManager: NotificationsManager
-        ): Notification {
-            val manufacturer = Build.MANUFACTURER.lowercase(Locale.getDefault())
-            // Samsung One UI 4.0 (API 31) doesn't (currently) display CallStyle notifications well
-            // Tested on Samsung S10 and Z Fold 2
-            if (Version.sdkAboveOrEqual(Version.API31_ANDROID_12) && manufacturer != "samsung") {
-                return Api31Compatibility.createIncomingCallNotification(
-                    context,
-                    call,
-                    notifiable,
-                    pendingIntent,
-                    notificationsManager
-                )
-            } else if (manufacturer == "xiaomi") { // Xiaomi devices don't handle CustomHeadsUpContentView correctly
-                return XiaomiCompatibility.createIncomingCallNotification(
-                    context,
-                    call,
-                    notifiable,
-                    pendingIntent,
-                    notificationsManager
-                )
-            }
-            return Api26Compatibility.createIncomingCallNotification(
-                context,
-                call,
-                notifiable,
-                pendingIntent,
-                notificationsManager
-            )
-        }
-
-        fun createCallNotification(
-            context: Context,
-            call: Call,
-            notifiable: Notifiable,
-            pendingIntent: PendingIntent,
-            channel: String,
-            notificationsManager: NotificationsManager
-        ): Notification {
-            val manufacturer = Build.MANUFACTURER.lowercase(Locale.getDefault())
-            // Samsung One UI 4.0 (API 31) doesn't (currently) display CallStyle notifications well
-            // Tested on Samsung S10 and Z Fold 2
-            if (Version.sdkAboveOrEqual(Version.API31_ANDROID_12) && manufacturer != "samsung") {
-                return Api31Compatibility.createCallNotification(
-                    context,
-                    call,
-                    notifiable,
-                    pendingIntent,
-                    channel,
-                    notificationsManager
-                )
-            }
-            return Api26Compatibility.createCallNotification(
-                context,
-                call,
-                notifiable,
-                pendingIntent,
-                channel,
-                notificationsManager
-            )
-        }
-
-        fun startForegroundService(context: Context, intent: Intent) {
-            if (Version.sdkAboveOrEqual(Version.API31_ANDROID_12)) {
-                Api31Compatibility.startForegroundService(context, intent)
-            } else if (Version.sdkAboveOrEqual(Version.API26_O_80)) {
-                Api26Compatibility.startForegroundService(context, intent)
-            } else {
-                Api23Compatibility.startForegroundService(context, intent)
-            }
-        }
-
-        private fun startForegroundService(service: Service, notifId: Int, notif: Notification?) {
-            if (Version.sdkAboveOrEqual(Version.API31_ANDROID_12)) {
-                Api31Compatibility.startForegroundService(service, notifId, notif)
-            } else {
-                Api23Compatibility.startForegroundService(service, notifId, notif)
-            }
-        }
-
-        fun startCallForegroundService(
-            service: Service,
-            notifId: Int,
-            notif: Notification,
-            isCallActive: Boolean
-        ) {
-            if (Version.sdkAboveOrEqual(Version.API34_ANDROID_14_UPSIDE_DOWN_CAKE)) {
-                Api34Compatibility.startCallForegroundService(service, notifId, notif, isCallActive)
-            } else {
-                startForegroundService(service, notifId, notif)
-            }
-        }
-
-        fun startDataSyncForegroundService(
-            service: Service,
-            notifId: Int,
-            notif: Notification,
-            isCallActive: Boolean
-        ) {
-            if (Version.sdkAboveOrEqual(Version.API34_ANDROID_14_UPSIDE_DOWN_CAKE)) {
-                Api34Compatibility.startDataSyncForegroundService(
-                    service,
-                    notifId,
-                    notif,
-                    isCallActive
-                )
-            } else {
-                startForegroundService(service, notifId, notif)
-            }
-        }
-
-        /* Call */
-
-        fun canDrawOverlay(context: Context): Boolean {
-            return Api23Compatibility.canDrawOverlay(context)
-        }
-
-        fun isInPictureInPictureMode(activity: Activity): Boolean {
-            if (Version.sdkAboveOrEqual(Version.API25_NOUGAT_71)) {
-                return Api25Compatibility.isInPictureInPictureMode(activity)
-            }
-            return false
-        }
-
-        fun enterPipMode(activity: Activity, conference: Boolean) {
-            if (Version.sdkStrictlyBelow(Version.API31_ANDROID_12) && Version.sdkAboveOrEqual(
-                    Version.API26_O_80
-                )
-            ) {
-                Api26Compatibility.enterPipMode(activity, conference)
-            }
-        }
-
-        fun enableAutoEnterPiP(activity: Activity, enable: Boolean, conference: Boolean) {
-            if (Version.sdkAboveOrEqual(Version.API31_ANDROID_12)) {
-                Api31Compatibility.enableAutoEnterPiP(activity, enable, conference)
-            }
-        }
-
-        fun getPipRatio(
-            activity: Activity,
-            forcePortrait: Boolean = false,
-            forceLandscape: Boolean = false
-        ): Rational {
-            val displayMetrics = DisplayMetrics()
-            activity.windowManager.defaultDisplay.getMetrics(displayMetrics)
-            var height = displayMetrics.heightPixels
-            var width = displayMetrics.widthPixels
-
-            val aspectRatio = width / height
-            if (aspectRatio < 1 / 2.39) {
-                height = 2.39.toInt()
-                width = 1
-            } else if (aspectRatio > 2.39) {
-                width = 2.39.toInt()
-                height = 1
-            }
-
-            val ratio = if (width > height) {
-                if (forcePortrait) {
-                    Rational(height, width)
-                } else {
-                    Rational(width, height)
-                }
-            } else {
-                if (forceLandscape) {
-                    Rational(height, width)
-                } else {
-                    Rational(width, height)
-                }
-            }
-            return ratio
-        }
-
-        fun eventVibration(vibrator: Vibrator) {
-            if (Version.sdkAboveOrEqual(Version.API26_O_80)) {
-                Api26Compatibility.eventVibration(vibrator)
-            } else {
-                Api23Compatibility.eventVibration(vibrator)
-            }
-        }
-
-        fun changeAudioRouteForTelecomManager(connection: NativeCallWrapper, route: Int): Boolean {
-            if (Version.sdkAboveOrEqual(Version.API26_O_80)) {
-                return Api26Compatibility.changeAudioRouteForTelecomManager(connection, route)
-            }
-            return false
-        }
-
-        fun hideAndroidSystemUI(hide: Boolean, window: Window) {
-            if (Version.sdkAboveOrEqual(Version.API30_ANDROID_11)) {
-                Api30Compatibility.hideAndroidSystemUI(hide, window)
-            } else {
-                Api23Compatibility.hideAndroidSystemUI(hide, window)
-            }
-        }
-
-        /* Chat */
-
-        fun removeChatRoomShortcut(context: Context, chatRoom: ChatRoom) {
-            if (Version.sdkAboveOrEqual(Version.API30_ANDROID_11)) {
-                Api30Compatibility.removeChatRoomShortcut(context, chatRoom)
-            }
-        }
-
-        fun extractLocusIdFromIntent(intent: Intent): String? {
-            if (Version.sdkAboveOrEqual(Version.API29_ANDROID_10)) {
-                return Api29Compatibility.extractLocusIdFromIntent(intent)
-            }
-            return null
-        }
-
-        fun setLocusIdInContentCaptureSession(root: View, chatRoom: ChatRoom) {
-            if (Version.sdkAboveOrEqual(Version.API29_ANDROID_10)) {
-                return Api29Compatibility.setLocusIdInContentCaptureSession(root, chatRoom)
-            }
-        }
-
-        fun canChatMessageChannelBubble(context: Context): Boolean {
-            if (Version.sdkAboveOrEqual(Version.API29_ANDROID_10)) {
-                return Api29Compatibility.canChatMessageChannelBubble(context)
-            }
-            return false
-        }
-
-        suspend fun addImageToMediaStore(context: Context, content: Content): Boolean {
-            if (Version.sdkAboveOrEqual(Version.API29_ANDROID_10)) {
-                return Api29Compatibility.addImageToMediaStore(context, content)
-            }
-            return Api23Compatibility.addImageToMediaStore(context, content)
-        }
-
-        suspend fun addVideoToMediaStore(context: Context, content: Content): Boolean {
-            if (Version.sdkAboveOrEqual(Version.API29_ANDROID_10)) {
-                return Api29Compatibility.addVideoToMediaStore(context, content)
-            }
-            return Api23Compatibility.addVideoToMediaStore(context, content)
-        }
-
-        suspend fun addAudioToMediaStore(context: Context, content: Content): Boolean {
-            if (Version.sdkAboveOrEqual(Version.API29_ANDROID_10)) {
-                return Api29Compatibility.addAudioToMediaStore(context, content)
-            }
-            return Api23Compatibility.addAudioToMediaStore(context, content)
-        }
-
-        fun getUpdateCurrentPendingIntentFlag(): Int {
-            if (Version.sdkAboveOrEqual(Version.API31_ANDROID_12)) {
-                return Api31Compatibility.getUpdateCurrentPendingIntentFlag()
-            }
-            return Api23Compatibility.getUpdateCurrentPendingIntentFlag()
-        }
-
-        fun getImeFlagsForSecureChatRoom(): Int {
-            if (Version.sdkAboveOrEqual(Version.API26_O_80)) {
-                return Api26Compatibility.getImeFlagsForSecureChatRoom()
-            }
-            return Api23Compatibility.getImeFlagsForSecureChatRoom()
-        }
-
-        fun hasTelecomManagerFeature(context: Context): Boolean {
-            if (Version.sdkAboveOrEqual(Version.API33_ANDROID_13_TIRAMISU)) {
-                return Api33Compatibility.hasTelecomManagerFeature(context)
-            } else if (Version.sdkAboveOrEqual(Version.API26_O_80)) {
-                return Api26Compatibility.hasTelecomManagerFeature(context)
-            }
-            return false
-        }
-
-        fun clearClipboard(clipboard: ClipboardManager) {
-            if (Version.sdkAboveOrEqual(Version.API28_PIE_90)) {
-                Api28Compatibility.clearClipboard(clipboard)
-            }
-        }
-
-        fun hasFullScreenIntentPermission(context: Context): Boolean {
-            if (Version.sdkAboveOrEqual(Version.API34_ANDROID_14_UPSIDE_DOWN_CAKE)) {
-                return Api34Compatibility.hasFullScreenIntentPermission(context)
-            }
-            return true
-        }
-
-        fun requestFullScreenIntentPermission(context: Context): Boolean {
-            if (Version.sdkAboveOrEqual(Version.API34_ANDROID_14_UPSIDE_DOWN_CAKE)) {
-                Api34Compatibility.requestFullScreenIntentPermission(context)
-                return true
-            }
-            return false
-        }
-    }
-}
diff --git a/app/src/main/java/org/linphone/compatibility/PhoneStateInterface.kt b/app/src/main/java/org/linphone/compatibility/PhoneStateInterface.kt
deleted file mode 100644
index 4d7723081..000000000
--- a/app/src/main/java/org/linphone/compatibility/PhoneStateInterface.kt
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2010-2021 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.compatibility
-
-interface PhoneStateInterface {
-    fun destroy()
-
-    fun isInCall(): Boolean
-}
diff --git a/app/src/main/java/org/linphone/compatibility/PhoneStateListener.kt b/app/src/main/java/org/linphone/compatibility/PhoneStateListener.kt
deleted file mode 100644
index d5ca88920..000000000
--- a/app/src/main/java/org/linphone/compatibility/PhoneStateListener.kt
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (c) 2010-2021 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.compatibility
-
-import android.telephony.PhoneStateListener
-import android.telephony.TelephonyManager
-import org.linphone.core.tools.Log
-
-class PhoneStateListener(private val telephonyManager: TelephonyManager) : PhoneStateInterface {
-    private var gsmCallActive = false
-    private val phoneStateListener = object : PhoneStateListener() {
-        @Deprecated("Deprecated in Java")
-        override fun onCallStateChanged(state: Int, phoneNumber: String?) {
-            gsmCallActive = when (state) {
-                TelephonyManager.CALL_STATE_OFFHOOK -> {
-                    Log.i("[Context] Phone state is off hook")
-                    true
-                }
-                TelephonyManager.CALL_STATE_RINGING -> {
-                    Log.i("[Context] Phone state is ringing")
-                    true
-                }
-                TelephonyManager.CALL_STATE_IDLE -> {
-                    Log.i("[Context] Phone state is idle")
-                    false
-                }
-                else -> {
-                    Log.w("[Context] Phone state is unexpected: $state")
-                    false
-                }
-            }
-        }
-    }
-
-    init {
-        Log.i("[Phone State Listener] Registering phone state listener")
-        telephonyManager.listen(phoneStateListener, PhoneStateListener.LISTEN_CALL_STATE)
-    }
-
-    override fun destroy() {
-        Log.i("[Phone State Listener] Unregistering phone state listener")
-        telephonyManager.listen(phoneStateListener, PhoneStateListener.LISTEN_NONE)
-    }
-
-    override fun isInCall(): Boolean {
-        return gsmCallActive
-    }
-}
diff --git a/app/src/main/java/org/linphone/compatibility/TelephonyListener.kt b/app/src/main/java/org/linphone/compatibility/TelephonyListener.kt
deleted file mode 100644
index df96c50f6..000000000
--- a/app/src/main/java/org/linphone/compatibility/TelephonyListener.kt
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright (c) 2010-2021 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.compatibility
-
-import android.annotation.TargetApi
-import android.os.Handler
-import android.os.Looper
-import android.telephony.TelephonyCallback
-import android.telephony.TelephonyManager
-import java.util.concurrent.Executor
-import org.linphone.core.tools.Log
-
-@TargetApi(31)
-class TelephonyListener(private val telephonyManager: TelephonyManager) : PhoneStateInterface {
-    private var gsmCallActive = false
-
-    private fun runOnUiThreadExecutor(): Executor {
-        val handler = Handler(Looper.getMainLooper())
-        return Executor {
-            handler.post(it)
-        }
-    }
-
-    inner class TelephonyListener : TelephonyCallback(), TelephonyCallback.CallStateListener {
-        override fun onCallStateChanged(state: Int) {
-            gsmCallActive = when (state) {
-                TelephonyManager.CALL_STATE_OFFHOOK -> {
-                    Log.i("[Context] Phone state is off hook")
-                    true
-                }
-                TelephonyManager.CALL_STATE_RINGING -> {
-                    Log.i("[Context] Phone state is ringing")
-                    true
-                }
-                TelephonyManager.CALL_STATE_IDLE -> {
-                    Log.i("[Context] Phone state is idle")
-                    false
-                }
-                else -> {
-                    Log.w("[Context] Phone state is unexpected: $state")
-                    false
-                }
-            }
-        }
-    }
-    private val telephonyListener = TelephonyListener()
-
-    init {
-        Log.i("[Telephony Listener] Registering telephony callback")
-        telephonyManager.registerTelephonyCallback(runOnUiThreadExecutor(), telephonyListener)
-    }
-
-    override fun destroy() {
-        Log.i("[Telephony Listener] Unregistering telephony callback")
-        telephonyManager.unregisterTelephonyCallback(telephonyListener)
-    }
-
-    override fun isInCall(): Boolean {
-        return gsmCallActive
-    }
-}
diff --git a/app/src/main/java/org/linphone/compatibility/XiaomiCompatibility.kt b/app/src/main/java/org/linphone/compatibility/XiaomiCompatibility.kt
deleted file mode 100644
index a914c537d..000000000
--- a/app/src/main/java/org/linphone/compatibility/XiaomiCompatibility.kt
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * Copyright (c) 2010-2021 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.compatibility
-
-import android.annotation.TargetApi
-import android.app.*
-import android.content.Context
-import android.graphics.Bitmap
-import android.graphics.BitmapFactory
-import androidx.core.app.NotificationCompat
-import androidx.core.content.ContextCompat
-import org.linphone.LinphoneApplication.Companion.coreContext
-import org.linphone.LinphoneApplication.Companion.corePreferences
-import org.linphone.R
-import org.linphone.contact.getThumbnailUri
-import org.linphone.core.Call
-import org.linphone.core.Friend
-import org.linphone.core.tools.Log
-import org.linphone.notifications.Notifiable
-import org.linphone.notifications.NotificationsManager
-import org.linphone.utils.ImageUtils
-import org.linphone.utils.LinphoneUtils
-
-@TargetApi(26)
-class XiaomiCompatibility {
-    companion object {
-        fun createIncomingCallNotification(
-            context: Context,
-            call: Call,
-            notifiable: Notifiable,
-            pendingIntent: PendingIntent,
-            notificationsManager: NotificationsManager
-        ): Notification {
-            val contact: Friend?
-            val roundPicture: Bitmap?
-            val displayName: String
-            val address: String
-            val info: String
-
-            val remoteContact = call.remoteContact
-            val conferenceAddress = if (remoteContact != null) {
-                coreContext.core.interpretUrl(
-                    remoteContact,
-                    false
-                )
-            } else {
-                null
-            }
-            val conferenceInfo = if (conferenceAddress != null) {
-                coreContext.core.findConferenceInformationFromUri(
-                    conferenceAddress
-                )
-            } else {
-                null
-            }
-            if (conferenceInfo == null) {
-                Log.i(
-                    "[Notifications Manager] No conference info found for remote contact address $remoteContact"
-                )
-                contact = coreContext.contactsManager.findContactByAddress(call.remoteAddress)
-                roundPicture =
-                    ImageUtils.getRoundBitmapFromUri(context, contact?.getThumbnailUri())
-                displayName = contact?.name ?: LinphoneUtils.getDisplayName(call.remoteAddress)
-                address = LinphoneUtils.getDisplayableAddress(call.remoteAddress)
-                info = context.getString(R.string.incoming_call_notification_title)
-            } else {
-                contact = null
-                displayName = conferenceInfo.subject ?: context.getString(R.string.conference)
-                address = LinphoneUtils.getDisplayableAddress(conferenceInfo.organizer)
-                roundPicture = coreContext.contactsManager.groupBitmap
-                info = context.getString(R.string.incoming_group_call_notification_title)
-                Log.i(
-                    "[Notifications Manager] Displaying incoming group call notification with subject $displayName and remote contact address $remoteContact"
-                )
-            }
-
-            val builder = NotificationCompat.Builder(
-                context,
-                context.getString(R.string.notification_channel_incoming_call_id)
-            )
-                .addPerson(notificationsManager.getPerson(contact, displayName, roundPicture))
-                .setSmallIcon(R.drawable.topbar_call_notification)
-                .setLargeIcon(
-                    roundPicture ?: BitmapFactory.decodeResource(
-                        context.resources,
-                        R.drawable.voip_single_contact_avatar_alt
-                    )
-                )
-                .setContentTitle(displayName)
-                .setContentText(address)
-                .setSubText(info)
-                .setCategory(NotificationCompat.CATEGORY_CALL)
-                .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
-                .setPriority(NotificationCompat.PRIORITY_HIGH)
-                .setWhen(System.currentTimeMillis())
-                .setAutoCancel(false)
-                .setShowWhen(true)
-                .setOngoing(true)
-                .setColor(ContextCompat.getColor(context, R.color.primary_color))
-                .setFullScreenIntent(pendingIntent, true)
-                .addAction(notificationsManager.getCallDeclineAction(notifiable))
-                .addAction(notificationsManager.getCallAnswerAction(notifiable))
-
-            if (!corePreferences.preventInterfaceFromShowingUp) {
-                builder.setContentIntent(pendingIntent)
-            }
-
-            return builder.build()
-        }
-    }
-}
diff --git a/app/src/main/java/org/linphone/contact/ContactAvatarGenerator.kt b/app/src/main/java/org/linphone/contact/ContactAvatarGenerator.kt
deleted file mode 100644
index 2cb3b17b9..000000000
--- a/app/src/main/java/org/linphone/contact/ContactAvatarGenerator.kt
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * Copyright (c) 2010-2022 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.contact
-
-import android.content.Context
-import android.graphics.*
-import android.graphics.drawable.BitmapDrawable
-import android.text.TextPaint
-import android.util.TypedValue
-import androidx.core.content.ContextCompat
-import org.linphone.R
-import org.linphone.utils.AppUtils
-
-class ContactAvatarGenerator(private val context: Context) {
-    private var textSize: Float
-    private var textColor: Int
-    private var avatarSize: Int
-    private var name = " "
-    private var backgroundColor: Int
-
-    init {
-        val theme = context.theme
-
-        val backgroundColorTypedValue = TypedValue()
-        theme.resolveAttribute(R.attr.primaryTextColor, backgroundColorTypedValue, true)
-        backgroundColor = ContextCompat.getColor(context, backgroundColorTypedValue.resourceId)
-
-        val textColorTypedValue = TypedValue()
-        theme.resolveAttribute(R.attr.secondaryTextColor, textColorTypedValue, true)
-        textColor = ContextCompat.getColor(context, textColorTypedValue.resourceId)
-
-        textSize = AppUtils.getDimension(R.dimen.contact_avatar_text_size)
-
-        avatarSize = AppUtils.getDimension(R.dimen.contact_avatar_size).toInt()
-    }
-
-    fun setTextSize(size: Float) = apply {
-        textSize = size
-    }
-
-    fun setTextColorResource(resource: Int) = apply {
-        textColor = ContextCompat.getColor(context, resource)
-    }
-
-    fun setAvatarSize(size: Int) = apply {
-        avatarSize = size
-    }
-
-    fun setLabel(label: String) = apply {
-        name = label
-    }
-
-    fun setBackgroundColorAttribute(attribute: Int) = apply {
-        val theme = context.theme
-        val backgroundColorTypedValue = TypedValue()
-        theme.resolveAttribute(attribute, backgroundColorTypedValue, true)
-        backgroundColor = ContextCompat.getColor(context, backgroundColorTypedValue.resourceId)
-    }
-
-    fun build(): BitmapDrawable {
-        val label = AppUtils.getInitials(name)
-        val textPainter = getTextPainter()
-        val painter = getPainter()
-
-        val bitmap = Bitmap.createBitmap(avatarSize, avatarSize, Bitmap.Config.ARGB_8888)
-        val canvas = Canvas(bitmap)
-        val areaRect = Rect(0, 0, avatarSize, avatarSize)
-        val bounds = RectF(areaRect)
-        bounds.right = textPainter.measureText(label, 0, label.length)
-        bounds.bottom = textPainter.descent() - textPainter.ascent()
-        bounds.left += (areaRect.width() - bounds.right) / 2.0f
-        bounds.top += (areaRect.height() - bounds.bottom) / 2.0f
-
-        val halfSize = (avatarSize / 2).toFloat()
-        canvas.drawCircle(halfSize, halfSize, halfSize, painter)
-        canvas.drawText(label, bounds.left, bounds.top - textPainter.ascent(), textPainter)
-
-        return BitmapDrawable(context.resources, bitmap)
-    }
-
-    private fun getTextPainter(): TextPaint {
-        val textPainter = TextPaint()
-        textPainter.isAntiAlias = true
-        textPainter.textSize = textSize
-        textPainter.color = textColor
-        textPainter.typeface = Typeface.create(Typeface.DEFAULT, Typeface.BOLD)
-        return textPainter
-    }
-
-    private fun getPainter(): Paint {
-        val painter = Paint()
-        painter.isAntiAlias = true
-        painter.color = backgroundColor
-        return painter
-    }
-}
diff --git a/app/src/main/java/org/linphone/contact/ContactDataInterface.kt b/app/src/main/java/org/linphone/contact/ContactDataInterface.kt
deleted file mode 100644
index 2402d92bd..000000000
--- a/app/src/main/java/org/linphone/contact/ContactDataInterface.kt
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Copyright (c) 2010-2021 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.contact
-
-import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.viewModelScope
-import kotlinx.coroutines.CoroutineScope
-import org.linphone.LinphoneApplication.Companion.coreContext
-import org.linphone.activities.main.viewmodels.MessageNotifierViewModel
-import org.linphone.core.Address
-import org.linphone.core.ChatRoom.SecurityLevel
-import org.linphone.core.ConsolidatedPresence
-import org.linphone.core.Friend
-import org.linphone.utils.LinphoneUtils
-
-interface ContactDataInterface {
-    val contact: MutableLiveData<Friend>
-
-    val displayName: MutableLiveData<String>
-
-    val securityLevel: MutableLiveData<SecurityLevel>
-
-    val showGroupChatAvatar: Boolean
-        get() = false
-
-    val presenceStatus: MutableLiveData<ConsolidatedPresence>
-
-    val coroutineScope: CoroutineScope
-}
-
-open class GenericContactData(private val sipAddress: Address) : ContactDataInterface {
-    final override val contact: MutableLiveData<Friend> = MutableLiveData<Friend>()
-    final override val displayName: MutableLiveData<String> = MutableLiveData<String>()
-    final override val securityLevel: MutableLiveData<SecurityLevel> = MutableLiveData<SecurityLevel>()
-    final override val presenceStatus: MutableLiveData<ConsolidatedPresence> = MutableLiveData<ConsolidatedPresence>()
-    final override val coroutineScope: CoroutineScope = coreContext.coroutineScope
-
-    init {
-        securityLevel.value = SecurityLevel.ClearText
-        presenceStatus.value = ConsolidatedPresence.Offline
-        contactLookup()
-    }
-
-    open fun destroy() {
-    }
-
-    protected fun contactLookup() {
-        displayName.value = LinphoneUtils.getDisplayName(sipAddress)
-
-        val friend = coreContext.contactsManager.findContactByAddress(sipAddress)
-        if (friend != null) {
-            contact.value = friend!!
-            presenceStatus.value = friend.consolidatedPresence
-            friend.addListener {
-                presenceStatus.value = it.consolidatedPresence
-            }
-        }
-    }
-}
-
-abstract class GenericContactViewModel(private val sipAddress: Address) : MessageNotifierViewModel(), ContactDataInterface {
-    final override val contact: MutableLiveData<Friend> = MutableLiveData<Friend>()
-    final override val displayName: MutableLiveData<String> = MutableLiveData<String>()
-    final override val securityLevel: MutableLiveData<SecurityLevel> = MutableLiveData<SecurityLevel>()
-    final override val presenceStatus: MutableLiveData<ConsolidatedPresence> = MutableLiveData<ConsolidatedPresence>()
-    final override val coroutineScope: CoroutineScope = viewModelScope
-
-    init {
-        securityLevel.value = SecurityLevel.ClearText
-        presenceStatus.value = ConsolidatedPresence.Offline
-        contactLookup()
-    }
-
-    private fun contactLookup() {
-        displayName.value = LinphoneUtils.getDisplayName(sipAddress)
-        val friend = coreContext.contactsManager.findContactByAddress(sipAddress)
-        if (friend != null) {
-            contact.value = friend!!
-            presenceStatus.value = friend.consolidatedPresence
-            friend.addListener {
-                presenceStatus.value = it.consolidatedPresence
-            }
-        }
-    }
-}
diff --git a/app/src/main/java/org/linphone/contact/ContactLoader.kt b/app/src/main/java/org/linphone/contact/ContactLoader.kt
deleted file mode 100644
index 7e752cb02..000000000
--- a/app/src/main/java/org/linphone/contact/ContactLoader.kt
+++ /dev/null
@@ -1,344 +0,0 @@
-/*
- * Copyright (c) 2010-2021 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.contact
-
-import android.content.ContentUris
-import android.database.Cursor
-import android.database.StaleDataException
-import android.net.Uri
-import android.os.Bundle
-import android.provider.ContactsContract
-import android.util.Patterns
-import androidx.lifecycle.lifecycleScope
-import androidx.loader.app.LoaderManager
-import androidx.loader.content.CursorLoader
-import androidx.loader.content.Loader
-import java.lang.Exception
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.cancel
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
-import org.linphone.LinphoneApplication.Companion.coreContext
-import org.linphone.LinphoneApplication.Companion.corePreferences
-import org.linphone.R
-import org.linphone.core.*
-import org.linphone.core.tools.Log
-import org.linphone.utils.AppUtils
-import org.linphone.utils.PhoneNumberUtils
-
-class ContactLoader : LoaderManager.LoaderCallbacks<Cursor> {
-    companion object {
-        val projection = arrayOf(
-            ContactsContract.Data.CONTACT_ID,
-            ContactsContract.Contacts.DISPLAY_NAME_PRIMARY,
-            ContactsContract.Data.MIMETYPE,
-            ContactsContract.Contacts.STARRED,
-            ContactsContract.Contacts.LOOKUP_KEY,
-            "data1", // ContactsContract.CommonDataKinds.Phone.NUMBER, ContactsContract.CommonDataKinds.SipAddress.SIP_ADDRESS, ContactsContract.CommonDataKinds.Organization.COMPANY
-            ContactsContract.CommonDataKinds.Phone.TYPE,
-            ContactsContract.CommonDataKinds.Phone.LABEL,
-            ContactsContract.CommonDataKinds.Phone.NORMALIZED_NUMBER
-        )
-    }
-
-    override fun onCreateLoader(id: Int, args: Bundle?): Loader<Cursor> {
-        val lastFetch = coreContext.contactsManager.latestContactFetch
-        Log.i(
-            "[Contacts Loader] Loader created, ${if (lastFetch.isEmpty()) "first fetch" else "last fetch happened at [$lastFetch]"}"
-        )
-        coreContext.contactsManager.fetchInProgress.value = true
-
-        val mimeType = ContactsContract.Data.MIMETYPE
-        val mimeSelection = "$mimeType = ? OR $mimeType = ? OR $mimeType = ? OR $mimeType = ?"
-
-        val selection = if (corePreferences.fetchContactsFromDefaultDirectory) {
-            ContactsContract.Data.IN_DEFAULT_DIRECTORY + " == 1 AND ($mimeSelection)"
-        } else {
-            mimeSelection
-        }
-
-        val linphoneMime = AppUtils.getString(R.string.linphone_address_mime_type)
-        val selectionArgs = arrayOf(
-            ContactsContract.CommonDataKinds.Phone.CONTENT_ITEM_TYPE,
-            ContactsContract.CommonDataKinds.SipAddress.CONTENT_ITEM_TYPE,
-            linphoneMime,
-            ContactsContract.CommonDataKinds.Organization.CONTENT_ITEM_TYPE
-        )
-
-        return CursorLoader(
-            coreContext.context,
-            ContactsContract.Data.CONTENT_URI,
-            projection,
-            selection,
-            selectionArgs,
-            ContactsContract.Data.CONTACT_ID + " ASC"
-        )
-    }
-
-    override fun onLoadFinished(loader: Loader<Cursor>, cursor: Cursor?) {
-        if (cursor == null) {
-            Log.e("[Contacts Loader] Cursor is null!")
-            return
-        }
-        Log.i("[Contacts Loader] Load finished, found ${cursor.count} entries in cursor")
-
-        val core = coreContext.core
-        val linphoneMime = loader.context.getString(R.string.linphone_address_mime_type)
-        val preferNormalizedPhoneNumber = corePreferences.preferNormalizedPhoneNumbersFromAddressBook
-
-        if (core.globalState == GlobalState.Shutdown || core.globalState == GlobalState.Off) {
-            Log.w("[Contacts Loader] Core is being stopped or already destroyed, abort")
-            return
-        }
-
-        coreContext.lifecycleScope.launch {
-            val friends = HashMap<String, Friend>()
-
-            withContext(Dispatchers.IO) {
-                try {
-                    // Cursor can be null now that we are on a different dispatcher according to Crashlytics
-                    val friendsPhoneNumbers = arrayListOf<String>()
-                    val friendsAddresses = arrayListOf<Address>()
-                    var previousId = ""
-                    while (cursor != null && !cursor.isClosed && cursor.moveToNext()) {
-                        try {
-                            val id: String =
-                                cursor.getString(
-                                    cursor.getColumnIndexOrThrow(ContactsContract.Data.CONTACT_ID)
-                                )
-                            val mime: String? =
-                                cursor.getString(
-                                    cursor.getColumnIndexOrThrow(ContactsContract.Data.MIMETYPE)
-                                )
-
-                            if (previousId.isEmpty() || previousId != id) {
-                                friendsPhoneNumbers.clear()
-                                friendsAddresses.clear()
-                                previousId = id
-                            }
-
-                            val friend = friends[id] ?: core.createFriend()
-                            friend.refKey = id
-                            if (friend.name.isNullOrEmpty()) {
-                                val displayName: String? =
-                                    cursor.getString(
-                                        cursor.getColumnIndexOrThrow(
-                                            ContactsContract.Data.DISPLAY_NAME_PRIMARY
-                                        )
-                                    )
-                                friend.name = displayName
-
-                                friend.photo = Uri.withAppendedPath(
-                                    ContentUris.withAppendedId(
-                                        ContactsContract.Contacts.CONTENT_URI,
-                                        id.toLong()
-                                    ),
-                                    ContactsContract.Contacts.Photo.CONTENT_DIRECTORY
-                                ).toString()
-
-                                val starred =
-                                    cursor.getInt(
-                                        cursor.getColumnIndexOrThrow(
-                                            ContactsContract.Contacts.STARRED
-                                        )
-                                    ) == 1
-                                friend.starred = starred
-                                val lookupKey =
-                                    cursor.getString(
-                                        cursor.getColumnIndexOrThrow(
-                                            ContactsContract.Contacts.LOOKUP_KEY
-                                        )
-                                    )
-                                friend.nativeUri =
-                                    "${ContactsContract.Contacts.CONTENT_LOOKUP_URI}/$lookupKey"
-
-                                // Disable short term presence
-                                friend.isSubscribesEnabled = false
-                                friend.incSubscribePolicy = SubscribePolicy.SPDeny
-                            }
-
-                            when (mime) {
-                                ContactsContract.CommonDataKinds.Phone.CONTENT_ITEM_TYPE -> {
-                                    val data1: String? =
-                                        cursor.getString(
-                                            cursor.getColumnIndexOrThrow(
-                                                ContactsContract.CommonDataKinds.Phone.NUMBER
-                                            )
-                                        )
-                                    val data2: String? =
-                                        cursor.getString(
-                                            cursor.getColumnIndexOrThrow(
-                                                ContactsContract.CommonDataKinds.Phone.TYPE
-                                            )
-                                        )
-                                    val data3: String? =
-                                        cursor.getString(
-                                            cursor.getColumnIndexOrThrow(
-                                                ContactsContract.CommonDataKinds.Phone.LABEL
-                                            )
-                                        )
-                                    val data4: String? =
-                                        cursor.getString(
-                                            cursor.getColumnIndexOrThrow(
-                                                ContactsContract.CommonDataKinds.Phone.NORMALIZED_NUMBER
-                                            )
-                                        )
-
-                                    val label =
-                                        PhoneNumberUtils.addressBookLabelTypeToVcardParamString(
-                                            data2?.toInt()
-                                                ?: ContactsContract.CommonDataKinds.BaseTypes.TYPE_CUSTOM,
-                                            data3
-                                        )
-
-                                    val number =
-                                        if (preferNormalizedPhoneNumber ||
-                                            data1.isNullOrEmpty() ||
-                                            !Patterns.PHONE.matcher(data1).matches()
-                                        ) {
-                                            data4 ?: data1
-                                        } else {
-                                            data1
-                                        }
-
-                                    if (number != null) {
-                                        if (
-                                            friendsPhoneNumbers.find {
-                                                PhoneNumberUtils.arePhoneNumberWeakEqual(
-                                                    it,
-                                                    number
-                                                )
-                                            } == null
-                                        ) {
-                                            val phoneNumber = Factory.instance()
-                                                .createFriendPhoneNumber(number, label)
-                                            friend.addPhoneNumberWithLabel(phoneNumber)
-                                            friendsPhoneNumbers.add(number)
-                                        }
-                                    }
-                                }
-                                linphoneMime, ContactsContract.CommonDataKinds.SipAddress.CONTENT_ITEM_TYPE -> {
-                                    val sipAddress: String? =
-                                        cursor.getString(
-                                            cursor.getColumnIndexOrThrow(
-                                                ContactsContract.CommonDataKinds.SipAddress.SIP_ADDRESS
-                                            )
-                                        )
-                                    if (sipAddress != null) {
-                                        val address = core.interpretUrl(sipAddress, false)
-                                        if (address != null &&
-                                            friendsAddresses.find {
-                                                it.weakEqual(address)
-                                            } == null
-                                        ) {
-                                            friend.addAddress(address)
-                                            friendsAddresses.add(address)
-                                        }
-                                    }
-                                }
-                                ContactsContract.CommonDataKinds.Organization.CONTENT_ITEM_TYPE -> {
-                                    val organization: String? =
-                                        cursor.getString(
-                                            cursor.getColumnIndexOrThrow(
-                                                ContactsContract.CommonDataKinds.Organization.COMPANY
-                                            )
-                                        )
-                                    if (organization != null) {
-                                        friend.organization = organization
-                                    }
-                                }
-                                // Our API not being thread safe this causes crashes sometimes given the Play Store reports
-                                // So these values will be fetched at the only moment they are required: contact edition
-                                /*ContactsContract.CommonDataKinds.StructuredName.CONTENT_ITEM_TYPE -> {
-                                    if (data2 != null && data3 != null) {
-                                        val vCard = friend.vcard
-                                        vCard?.givenName = data2
-                                        vCard?.familyName = data3
-                                    }
-                                }*/
-                            }
-
-                            friends[id] = friend
-                        } catch (e: Exception) {
-                            Log.e("[Contacts Loader] Exception: $e")
-                        }
-                    }
-
-                    withContext(Dispatchers.Main) {
-                        if (core.globalState == GlobalState.Shutdown || core.globalState == GlobalState.Off) {
-                            Log.w(
-                                "[Contacts Loader] Core is being stopped or already destroyed, abort"
-                            )
-                        } else {
-                            Log.i("[Contacts Loader] ${friends.size} friends created")
-                            val contactId = coreContext.contactsManager.contactIdToWatchFor
-                            if (contactId.isNotEmpty()) {
-                                val friend = friends[contactId]
-                                Log.i(
-                                    "[Contacts Loader] Manager was asked to monitor contact id $contactId"
-                                )
-                                if (friend != null) {
-                                    Log.i(
-                                        "[Contacts Loader] Found new contact matching id $contactId, notifying listeners"
-                                    )
-                                    coreContext.contactsManager.notifyListeners(friend)
-                                }
-                            }
-
-                            val fl = core.defaultFriendList ?: core.createFriendList()
-                            for (friend in fl.friends) {
-                                fl.removeFriend(friend)
-                            }
-
-                            if (fl != core.defaultFriendList) core.addFriendList(fl)
-
-                            val friendsList = friends.values
-                            for (friend in friendsList) {
-                                fl.addLocalFriend(friend)
-                            }
-                            friends.clear()
-                            Log.i("[Contacts Loader] Friends added")
-
-                            // Only update subscriptions when default account is registered or anytime if it isn't the first contacts fetch
-                            if (core.defaultAccount?.state == RegistrationState.Ok || coreContext.contactsManager.latestContactFetch.isNotEmpty()) {
-                                Log.i("[Contacts Loader] Updating friend list [$fl] subscriptions")
-                                fl.updateSubscriptions()
-                            }
-
-                            coreContext.contactsManager.fetchFinished()
-                        }
-                    }
-                } catch (sde: StaleDataException) {
-                    Log.e("[Contacts Loader] State Data Exception: $sde")
-                } catch (ise: IllegalStateException) {
-                    Log.e("[Contacts Loader] Illegal State Exception: $ise")
-                } catch (e: Exception) {
-                    Log.e("[Contacts Loader] Exception: $e")
-                } finally {
-                    cancel()
-                }
-            }
-        }
-    }
-
-    override fun onLoaderReset(loader: Loader<Cursor>) {
-        Log.i("[Contacts Loader] Loader reset")
-    }
-}
diff --git a/app/src/main/java/org/linphone/contact/ContactSelectionData.kt b/app/src/main/java/org/linphone/contact/ContactSelectionData.kt
deleted file mode 100644
index 94be145f5..000000000
--- a/app/src/main/java/org/linphone/contact/ContactSelectionData.kt
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.contact
-
-import androidx.lifecycle.MutableLiveData
-import kotlinx.coroutines.CoroutineScope
-import org.linphone.LinphoneApplication.Companion.coreContext
-import org.linphone.core.*
-import org.linphone.utils.LinphoneUtils
-
-class ContactSelectionData(private val searchResult: SearchResult) : ContactDataInterface {
-    override val contact: MutableLiveData<Friend> = MutableLiveData<Friend>()
-    override val displayName: MutableLiveData<String> = MutableLiveData<String>()
-    override val securityLevel: MutableLiveData<ChatRoom.SecurityLevel> = MutableLiveData<ChatRoom.SecurityLevel>()
-    override val presenceStatus: MutableLiveData<ConsolidatedPresence> = MutableLiveData<ConsolidatedPresence>()
-    override val coroutineScope: CoroutineScope = coreContext.coroutineScope
-
-    val isDisabled: MutableLiveData<Boolean> by lazy {
-        MutableLiveData<Boolean>()
-    }
-
-    val isSelected: MutableLiveData<Boolean> by lazy {
-        MutableLiveData<Boolean>()
-    }
-
-    val isLinphoneUser: Boolean by lazy {
-        searchResult.friend?.getPresenceModelForUriOrTel(
-            searchResult.phoneNumber ?: searchResult.address?.asStringUriOnly() ?: ""
-        )?.basicStatus == PresenceBasicStatus.Open
-    }
-
-    val sipUri: String by lazy {
-        searchResult.phoneNumber ?: LinphoneUtils.getDisplayableAddress(searchResult.address)
-    }
-
-    val address: Address? by lazy {
-        searchResult.address
-    }
-
-    val hasLimeX3DHCapability: Boolean
-        get() = LinphoneUtils.isEndToEndEncryptedChatAvailable() && searchResult.hasCapability(
-            Friend.Capability.LimeX3Dh
-        )
-
-    init {
-        isDisabled.value = false
-        isSelected.value = false
-        presenceStatus.value = ConsolidatedPresence.Offline
-        searchMatchingContact()
-    }
-
-    private fun searchMatchingContact() {
-        val friend = searchResult.friend
-        if (friend != null) {
-            contact.value = friend!!
-            displayName.value = friend.name
-            presenceStatus.value = friend.consolidatedPresence
-            friend.addListener {
-                presenceStatus.value = it.consolidatedPresence
-            }
-        } else {
-            val address = searchResult.address
-            if (address != null) {
-                val found = coreContext.contactsManager.findContactByAddress(address)
-                if (found != null) {
-                    contact.value = found!!
-                    presenceStatus.value = found.consolidatedPresence
-                    found.addListener {
-                        presenceStatus.value = it.consolidatedPresence
-                    }
-                }
-                displayName.value = LinphoneUtils.getDisplayName(address)
-            } else if (searchResult.phoneNumber != null) {
-                val found = coreContext.contactsManager.findContactByPhoneNumber(
-                    searchResult.phoneNumber.orEmpty()
-                )
-                if (found != null) {
-                    contact.value = found!!
-                    presenceStatus.value = found.consolidatedPresence
-                    found.addListener {
-                        presenceStatus.value = it.consolidatedPresence
-                    }
-                }
-                displayName.value = searchResult.phoneNumber.orEmpty()
-            }
-        }
-    }
-}
diff --git a/app/src/main/java/org/linphone/contact/ContactsManager.kt b/app/src/main/java/org/linphone/contact/ContactsManager.kt
deleted file mode 100644
index 07aafe7e8..000000000
--- a/app/src/main/java/org/linphone/contact/ContactsManager.kt
+++ /dev/null
@@ -1,465 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.contact
-
-import android.accounts.Account
-import android.accounts.AccountManager
-import android.accounts.AuthenticatorDescription
-import android.content.ContentResolver
-import android.content.ContentUris
-import android.content.Context
-import android.graphics.Bitmap
-import android.graphics.BitmapFactory
-import android.graphics.drawable.Drawable
-import android.net.Uri
-import android.provider.ContactsContract
-import android.util.Patterns
-import androidx.core.app.Person
-import androidx.core.graphics.drawable.IconCompat
-import androidx.lifecycle.MutableLiveData
-import java.io.IOException
-import org.linphone.LinphoneApplication.Companion.coreContext
-import org.linphone.LinphoneApplication.Companion.corePreferences
-import org.linphone.R
-import org.linphone.core.*
-import org.linphone.core.tools.Log
-import org.linphone.utils.ImageUtils
-import org.linphone.utils.LinphoneUtils
-import org.linphone.utils.PermissionHelper
-import org.linphone.utils.TimestampUtils
-
-interface ContactsUpdatedListener {
-    fun onContactsUpdated()
-
-    fun onContactUpdated(friend: Friend)
-}
-
-open class ContactsUpdatedListenerStub : ContactsUpdatedListener {
-    override fun onContactsUpdated() {}
-
-    override fun onContactUpdated(friend: Friend) {}
-}
-
-class ContactsManager(private val context: Context) {
-    val magicSearch: MagicSearch by lazy {
-        val magicSearch = coreContext.core.createMagicSearch()
-        magicSearch.limitedSearch = false
-        magicSearch
-    }
-
-    var latestContactFetch: String = ""
-
-    val fetchInProgress = MutableLiveData<Boolean>()
-
-    var contactIdToWatchFor: String = ""
-
-    val contactAvatar: IconCompat
-    val groupAvatar: IconCompat
-    val groupBitmap: Bitmap
-
-    private val localFriends = arrayListOf<Friend>()
-
-    private val contactsUpdatedListeners = ArrayList<ContactsUpdatedListener>()
-
-    private val friendListListener: FriendListListenerStub = object : FriendListListenerStub() {
-        @Synchronized
-        override fun onPresenceReceived(list: FriendList, friends: Array<Friend>) {
-            Log.i("[Contacts Manager] Presence received")
-            for (friend in friends) {
-                refreshContactOnPresenceReceived(friend)
-            }
-            Log.i("[Contacts Manager] Contacts refreshed due to presence received")
-            notifyListeners()
-            Log.i("[Contacts Manager] Presence notified to all listeners")
-        }
-    }
-
-    private val coreListener: CoreListenerStub = object : CoreListenerStub() {
-        override fun onFriendListCreated(core: Core, friendList: FriendList) {
-            friendList.addListener(friendListListener)
-        }
-
-        override fun onFriendListRemoved(core: Core, friendList: FriendList) {
-            friendList.removeListener(friendListListener)
-        }
-    }
-
-    init {
-        initSyncAccount()
-
-        contactAvatar = IconCompat.createWithResource(
-            context,
-            R.drawable.voip_single_contact_avatar_alt
-        )
-        groupAvatar = IconCompat.createWithResource(
-            context,
-            R.drawable.voip_multiple_contacts_avatar_alt
-        )
-        groupBitmap = BitmapFactory.decodeResource(
-            context.resources,
-            R.drawable.voip_multiple_contacts_avatar_alt
-        )
-
-        val core = coreContext.core
-        core.addListener(coreListener)
-        for (list in core.friendsLists) {
-            list.addListener(friendListListener)
-        }
-        Log.i("[Contacts Manager] Created")
-    }
-
-    fun shouldDisplaySipContactsList(): Boolean {
-        return coreContext.core.defaultAccount?.params?.identityAddress?.domain == corePreferences.defaultDomain
-    }
-
-    fun fetchFinished() {
-        Log.i("[Contacts Manager] Contacts loader have finished")
-        latestContactFetch = TimestampUtils.timeToString(System.currentTimeMillis(), false)
-        updateLocalContacts()
-        fetchInProgress.value = false
-        notifyListeners()
-    }
-
-    @Synchronized
-    fun updateLocalContacts() {
-        Log.i("[Contacts Manager] Updating local contact(s)")
-        localFriends.clear()
-
-        for (account in coreContext.core.accountList) {
-            val friend = coreContext.core.createFriend()
-            friend.name = LinphoneUtils.getDisplayName(account.params.identityAddress)
-
-            val address = account.params.identityAddress ?: continue
-            friend.address = address
-
-            val pictureUri = corePreferences.defaultAccountAvatarPath
-            if (pictureUri != null) {
-                val parsedUri = if (pictureUri.startsWith("/")) "file:$pictureUri" else pictureUri
-                Log.i("[Contacts Manager] Found local picture URI: $parsedUri")
-                friend.photo = parsedUri
-            }
-
-            Log.i(
-                "[Contacts Manager] Local contact created for account [${address.asString()}] and picture [${friend.photo}]"
-            )
-            localFriends.add(friend)
-        }
-    }
-
-    @Synchronized
-    fun getMePerson(localAddress: Address): Person {
-        val friend = localFriends.find { localFriend ->
-            localFriend.addresses.find { address ->
-                address.weakEqual(localAddress)
-            } != null
-        }
-        return friend?.getPerson()
-            ?: Person.Builder().setName(LinphoneUtils.getDisplayName(localAddress)).build()
-    }
-
-    @Synchronized
-    fun getAndroidContactIdFromUri(uri: Uri): String? {
-        val projection = arrayOf(ContactsContract.Data.CONTACT_ID)
-        val cursor = context.contentResolver.query(uri, projection, null, null, null)
-        if (cursor?.moveToFirst() == true) {
-            val nameColumnIndex = cursor.getColumnIndex(ContactsContract.Data.CONTACT_ID)
-            val id = cursor.getString(nameColumnIndex)
-            cursor.close()
-            return id
-        }
-        return null
-    }
-
-    @Synchronized
-    fun findContactById(id: String): Friend? {
-        return coreContext.core.defaultFriendList?.findFriendByRefKey(id)
-    }
-
-    @Synchronized
-    fun findContactByPhoneNumber(number: String): Friend? {
-        return coreContext.core.findFriendByPhoneNumber(number)
-    }
-
-    @Synchronized
-    fun findContactByAddress(address: Address): Friend? {
-        for (friend in localFriends) {
-            if (friend.address?.weakEqual(address) == true) {
-                return friend
-            }
-        }
-
-        val friend = coreContext.core.findFriend(address)
-        if (friend != null) return friend
-
-        val username = address.username
-        if (username != null && Patterns.PHONE.matcher(username).matches()) {
-            return findContactByPhoneNumber(username)
-        }
-
-        return null
-    }
-
-    @Synchronized
-    fun isAddressMyself(address: Address): Boolean {
-        for (friend in localFriends) {
-            if (friend.address?.weakEqual(address) == true) {
-                return true
-            }
-        }
-        return false
-    }
-
-    @Synchronized
-    fun addListener(listener: ContactsUpdatedListener) {
-        contactsUpdatedListeners.add(listener)
-    }
-
-    @Synchronized
-    fun removeListener(listener: ContactsUpdatedListener) {
-        contactsUpdatedListeners.remove(listener)
-    }
-
-    @Synchronized
-    fun notifyListeners() {
-        val list = contactsUpdatedListeners.toMutableList()
-        for (listener in list) {
-            listener.onContactsUpdated()
-        }
-    }
-
-    @Synchronized
-    fun notifyListeners(friend: Friend) {
-        val list = contactsUpdatedListeners.toMutableList()
-        for (listener in list) {
-            listener.onContactUpdated(friend)
-        }
-    }
-
-    @Synchronized
-    fun destroy() {
-        val core = coreContext.core
-        for (list in core.friendsLists) list.removeListener(friendListListener)
-        core.removeListener(coreListener)
-    }
-
-    private fun initSyncAccount() {
-        val accountManager = context.getSystemService(Context.ACCOUNT_SERVICE) as AccountManager
-        val accounts = accountManager.getAccountsByType(
-            context.getString(R.string.sync_account_type)
-        )
-        if (accounts.isEmpty()) {
-            val newAccount = Account(
-                context.getString(R.string.sync_account_name),
-                context.getString(
-                    R.string.sync_account_type
-                )
-            )
-            try {
-                accountManager.addAccountExplicitly(newAccount, null, null)
-                Log.i("[Contacts Manager] Contact account added")
-            } catch (e: Exception) {
-                Log.e("[Contacts Manager] Couldn't initialize sync account: $e")
-            }
-        } else {
-            for (account in accounts) {
-                Log.i(
-                    "[Contacts Manager] Found account with name [${account.name}] and type [${account.type}]"
-                )
-            }
-        }
-    }
-
-    fun getAvailableSyncAccounts(): List<Triple<String, String, Drawable?>> {
-        val accountManager = context.getSystemService(Context.ACCOUNT_SERVICE) as AccountManager
-        val packageManager = context.packageManager
-        val syncAdapters = ContentResolver.getSyncAdapterTypes()
-        val authenticators: Array<AuthenticatorDescription> = accountManager.authenticatorTypes
-        val available = arrayListOf<Triple<String, String, Drawable?>>()
-
-        for (syncAdapter in syncAdapters) {
-            if (syncAdapter.authority == "com.android.contacts" && syncAdapter.isUserVisible) {
-                if (syncAdapter.supportsUploading() || syncAdapter.accountType == context.getString(
-                        R.string.sync_account_type
-                    )
-                ) {
-                    Log.i(
-                        "[Contacts Manager] Found sync adapter for com.android.contacts authority: ${syncAdapter.accountType}"
-                    )
-                    val accounts = accountManager.getAccountsByType(syncAdapter.accountType)
-                    for (account in accounts) {
-                        Log.i(
-                            "[Contacts Manager] Found account for account type ${syncAdapter.accountType}: ${account.name}"
-                        )
-                        for (authenticator in authenticators) {
-                            if (authenticator.type == account.type) {
-                                val drawable = packageManager.getDrawable(
-                                    authenticator.packageName,
-                                    authenticator.smallIconId,
-                                    null
-                                )
-                                val triple = Triple(account.name, account.type, drawable)
-                                available.add(triple)
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        return available
-    }
-
-    @Synchronized
-    private fun refreshContactOnPresenceReceived(friend: Friend) {
-        Log.d(
-            "[Contacts Manager] Received presence information for contact [${friend.name}]: [${friend.consolidatedPresence}]"
-        )
-        if (corePreferences.storePresenceInNativeContact && PermissionHelper.get().hasWriteContactsPermission()) {
-            if (friend.refKey != null) {
-                Log.i("[Contacts Manager] Storing presence in native contact ${friend.refKey}")
-                storePresenceInNativeContact(friend)
-            }
-        }
-        notifyListeners(friend)
-    }
-
-    private fun storePresenceInNativeContact(friend: Friend) {
-        val contactEditor = NativeContactEditor(friend)
-        for (phoneNumber in friend.phoneNumbers) {
-            val sipAddress = friend.getContactForPhoneNumberOrAddress(phoneNumber)
-            if (sipAddress != null) {
-                Log.d(
-                    "[Contacts Manager] Found presence information to store in native contact $friend under Linphone sync account"
-                )
-                contactEditor.setPresenceInformation(
-                    phoneNumber,
-                    sipAddress
-                )
-            }
-        }
-        contactEditor.commit()
-    }
-
-    fun createFriendFromSearchResult(searchResult: SearchResult): Friend {
-        val searchResultFriend = searchResult.friend
-        if (searchResultFriend != null) return searchResultFriend
-
-        val friend = coreContext.core.createFriend()
-
-        val address = searchResult.address
-        if (address != null) {
-            friend.address = address
-        }
-
-        val number = searchResult.phoneNumber
-        if (number != null) {
-            friend.addPhoneNumber(number)
-
-            if (address != null && address.username == number) {
-                friend.removeAddress(address)
-            }
-        }
-
-        return friend
-    }
-}
-
-fun Friend.getContactForPhoneNumberOrAddress(value: String): String? {
-    val presenceModel = getPresenceModelForUriOrTel(value)
-    if (presenceModel != null && presenceModel.basicStatus == PresenceBasicStatus.Open) return presenceModel.contact
-    return null
-}
-
-fun Friend.hasLongTermPresence(): Boolean {
-    for (address in addresses) {
-        val presenceModel = getPresenceModelForUriOrTel(address.asStringUriOnly())
-        if (presenceModel != null && presenceModel.basicStatus == PresenceBasicStatus.Open) return true
-    }
-    for (number in phoneNumbers) {
-        val presenceModel = getPresenceModelForUriOrTel(number)
-        if (presenceModel != null && presenceModel.basicStatus == PresenceBasicStatus.Open) return true
-    }
-    return false
-}
-
-fun Friend.getThumbnailUri(): Uri? {
-    return getPictureUri(true)
-}
-
-fun Friend.getPictureUri(thumbnailPreferred: Boolean = false): Uri? {
-    val refKey = refKey
-    if (refKey != null) {
-        try {
-            val lookupUri = ContentUris.withAppendedId(
-                ContactsContract.Contacts.CONTENT_URI,
-                refKey.toLong()
-            )
-
-            if (!thumbnailPreferred) {
-                val pictureUri = Uri.withAppendedPath(
-                    lookupUri,
-                    ContactsContract.Contacts.Photo.DISPLAY_PHOTO
-                )
-                // Check that the URI points to a real file
-                val contentResolver = coreContext.context.contentResolver
-                try {
-                    val fd = contentResolver.openAssetFileDescriptor(pictureUri, "r")
-                    if (fd != null) {
-                        fd.close()
-                        return pictureUri
-                    }
-                } catch (_: IOException) { }
-            }
-
-            // Fallback to thumbnail if high res picture isn't available
-            return Uri.withAppendedPath(
-                lookupUri,
-                ContactsContract.Contacts.Photo.CONTENT_DIRECTORY
-            )
-        } catch (_: Exception) { }
-    } else if (photo != null) {
-        try {
-            return Uri.parse(photo)
-        } catch (_: Exception) { }
-    }
-    return null
-}
-
-fun Friend.getPerson(): Person {
-    val personBuilder = Person.Builder().setName(name)
-
-    val bm: Bitmap? =
-        ImageUtils.getRoundBitmapFromUri(
-            coreContext.context,
-            getThumbnailUri()
-        )
-    personBuilder.setIcon(
-        if (bm == null) {
-            coreContext.contactsManager.contactAvatar
-        } else {
-            IconCompat.createWithAdaptiveBitmap(bm)
-        }
-    )
-
-    personBuilder.setKey(refKey)
-    personBuilder.setUri(nativeUri)
-    personBuilder.setImportant(starred)
-    return personBuilder.build()
-}
diff --git a/app/src/main/java/org/linphone/contact/ContactsSelectionAdapter.kt b/app/src/main/java/org/linphone/contact/ContactsSelectionAdapter.kt
deleted file mode 100644
index 76cffca9d..000000000
--- a/app/src/main/java/org/linphone/contact/ContactsSelectionAdapter.kt
+++ /dev/null
@@ -1,160 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.contact
-
-import android.view.LayoutInflater
-import android.view.ViewGroup
-import androidx.databinding.DataBindingUtil
-import androidx.lifecycle.LifecycleOwner
-import androidx.lifecycle.MutableLiveData
-import androidx.recyclerview.widget.DiffUtil
-import androidx.recyclerview.widget.ListAdapter
-import androidx.recyclerview.widget.RecyclerView
-import org.linphone.LinphoneApplication.Companion.coreContext
-import org.linphone.R
-import org.linphone.core.Address
-import org.linphone.core.Friend.Capability
-import org.linphone.core.SearchResult
-import org.linphone.databinding.ContactSelectionCellBinding
-import org.linphone.utils.Event
-
-class ContactsSelectionAdapter(
-    private val viewLifecycleOwner: LifecycleOwner
-) : ListAdapter<SearchResult, RecyclerView.ViewHolder>(SearchResultDiffCallback()) {
-    val selectedContact = MutableLiveData<Event<SearchResult>>()
-
-    private val selection = MutableLiveData<List<Address>>()
-
-    private val requireGroupChatCapability = MutableLiveData<Boolean>()
-    private var requireLimeCapability = MutableLiveData<Boolean>()
-
-    init {
-        requireGroupChatCapability.value = false
-        requireLimeCapability.value = false
-    }
-
-    fun updateSelectedAddresses(selectedAddresses: List<Address>) {
-        selection.value = selectedAddresses
-    }
-
-    fun setLimeCapabilityRequired(enabled: Boolean) {
-        requireLimeCapability.value = enabled
-    }
-
-    fun setGroupChatCapabilityRequired(enabled: Boolean) {
-        requireGroupChatCapability.value = enabled
-    }
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
-        val binding: ContactSelectionCellBinding = DataBindingUtil.inflate(
-            LayoutInflater.from(parent.context),
-            R.layout.contact_selection_cell,
-            parent,
-            false
-        )
-        return ViewHolder(binding)
-    }
-
-    override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
-        (holder as ViewHolder).bind(getItem(position))
-    }
-
-    inner class ViewHolder(
-        private val binding: ContactSelectionCellBinding
-    ) : RecyclerView.ViewHolder(binding.root) {
-        fun bind(searchResult: SearchResult) {
-            with(binding) {
-                val searchResultViewModel = ContactSelectionData(searchResult)
-                data = searchResultViewModel
-
-                lifecycleOwner = viewLifecycleOwner
-
-                requireLimeCapability.observe(viewLifecycleOwner) {
-                    updateSecurity(searchResult, searchResultViewModel)
-                }
-                requireGroupChatCapability.observe(viewLifecycleOwner) {
-                    updateSecurity(searchResult, searchResultViewModel)
-                }
-
-                selection.observe(viewLifecycleOwner) { selectedAddresses ->
-                    val selected = selectedAddresses.find { address ->
-                        val searchAddress = searchResult.address
-                        if (searchAddress != null) address.weakEqual(searchAddress) else false
-                    }
-                    searchResultViewModel.isSelected.value = selected != null
-                }
-
-                setClickListener {
-                    selectedContact.value = Event(searchResult)
-                }
-
-                executePendingBindings()
-            }
-        }
-
-        private fun updateSecurity(
-            searchResult: SearchResult,
-            viewModel: ContactSelectionData
-        ) {
-            val securityEnabled = requireLimeCapability.value ?: false
-            val groupCapabilityRequired = requireGroupChatCapability.value ?: false
-            val searchAddress = searchResult.address
-            val isMyself = securityEnabled && searchAddress != null && coreContext.core.defaultAccount?.params?.identityAddress?.weakEqual(
-                searchAddress
-            ) ?: false
-            val limeCheck = !securityEnabled || (
-                securityEnabled && searchResult.hasCapability(
-                    Capability.LimeX3Dh
-                )
-                )
-            val groupCheck = !groupCapabilityRequired || (
-                groupCapabilityRequired && searchResult.hasCapability(
-                    Capability.GroupChat
-                )
-                )
-            val disabled = if (searchResult.friend != null) !limeCheck || !groupCheck || isMyself else false // Generated entry from search filter
-
-            viewModel.isDisabled.value = disabled
-
-            if (disabled && viewModel.isSelected.value == true) {
-                // Remove item from selection if both selected and disabled
-                selectedContact.postValue(Event(searchResult))
-            }
-        }
-    }
-}
-
-private class SearchResultDiffCallback : DiffUtil.ItemCallback<SearchResult>() {
-    override fun areItemsTheSame(
-        oldItem: SearchResult,
-        newItem: SearchResult
-    ): Boolean {
-        val oldAddress = oldItem.address
-        val newAddress = newItem.address
-        return if (oldAddress != null && newAddress != null) oldAddress.weakEqual(newAddress) else false
-    }
-
-    override fun areContentsTheSame(
-        oldItem: SearchResult,
-        newItem: SearchResult
-    ): Boolean {
-        return newItem.friend != null
-    }
-}
diff --git a/app/src/main/java/org/linphone/contact/ContactsSelectionViewModel.kt b/app/src/main/java/org/linphone/contact/ContactsSelectionViewModel.kt
deleted file mode 100644
index 46f47dbc6..000000000
--- a/app/src/main/java/org/linphone/contact/ContactsSelectionViewModel.kt
+++ /dev/null
@@ -1,177 +0,0 @@
-/*
- * Copyright (c) 2010-2021 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.contact
-
-import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.viewModelScope
-import kotlinx.coroutines.*
-import org.linphone.LinphoneApplication.Companion.coreContext
-import org.linphone.LinphoneApplication.Companion.corePreferences
-import org.linphone.activities.main.viewmodels.MessageNotifierViewModel
-import org.linphone.core.*
-import org.linphone.core.tools.Log
-import org.linphone.utils.Event
-
-open class ContactsSelectionViewModel : MessageNotifierViewModel() {
-    val contactsList = MutableLiveData<ArrayList<SearchResult>>()
-
-    val sipContactsSelected = MutableLiveData<Boolean>()
-
-    val selectedAddresses = MutableLiveData<ArrayList<Address>>()
-
-    val filter = MutableLiveData<String>()
-    private var previousFilter = "NotSet"
-
-    val fetchInProgress = MutableLiveData<Boolean>()
-    private var searchResultsPending: Boolean = false
-    private var fastFetchJob: Job? = null
-
-    val moreResultsAvailableEvent: MutableLiveData<Event<Boolean>> by lazy {
-        MutableLiveData<Event<Boolean>>()
-    }
-
-    private val contactsUpdatedListener = object : ContactsUpdatedListenerStub() {
-        override fun onContactsUpdated() {
-            Log.i("[Contacts Selection] Contacts have changed")
-            applyFilter()
-        }
-    }
-
-    private val magicSearchListener = object : MagicSearchListenerStub() {
-        override fun onSearchResultsReceived(magicSearch: MagicSearch) {
-            searchResultsPending = false
-            processMagicSearchResults(magicSearch.lastSearch)
-            fetchInProgress.value = false
-        }
-
-        override fun onLdapHaveMoreResults(magicSearch: MagicSearch, ldap: Ldap) {
-            moreResultsAvailableEvent.value = Event(true)
-        }
-    }
-
-    init {
-        sipContactsSelected.value = coreContext.contactsManager.shouldDisplaySipContactsList()
-
-        selectedAddresses.value = arrayListOf()
-
-        coreContext.contactsManager.addListener(contactsUpdatedListener)
-        coreContext.contactsManager.magicSearch.addListener(magicSearchListener)
-    }
-
-    override fun onCleared() {
-        coreContext.contactsManager.magicSearch.removeListener(magicSearchListener)
-        coreContext.contactsManager.removeListener(contactsUpdatedListener)
-
-        super.onCleared()
-    }
-
-    fun applyFilter() {
-        val filterValue = filter.value.orEmpty().trim()
-
-        if (previousFilter.isNotEmpty() && (
-            previousFilter.length > filterValue.length ||
-                (previousFilter.length == filterValue.length && previousFilter != filterValue)
-            )
-        ) {
-            coreContext.contactsManager.magicSearch.resetSearchCache()
-        }
-        previousFilter = filterValue
-
-        val domain = if (sipContactsSelected.value == true) coreContext.core.defaultAccount?.params?.domain ?: "" else ""
-        searchResultsPending = true
-        fastFetchJob?.cancel()
-        coreContext.contactsManager.magicSearch.getContactsListAsync(
-            filterValue,
-            domain,
-            MagicSearch.Source.All.toInt(),
-            MagicSearch.Aggregation.None
-        )
-
-        val spinnerDelay = corePreferences.delayBeforeShowingContactsSearchSpinner.toLong()
-        fastFetchJob = viewModelScope.launch {
-            withContext(Dispatchers.IO) {
-                delay(spinnerDelay)
-                withContext(Dispatchers.Main) {
-                    if (searchResultsPending) {
-                        fetchInProgress.value = true
-                    }
-                }
-            }
-        }
-    }
-
-    fun clearFilter() {
-        filter.value = ""
-    }
-
-    fun toggleSelectionForSearchResult(searchResult: SearchResult) {
-        val address = searchResult.address
-        if (address != null) {
-            toggleSelectionForAddress(address)
-        }
-    }
-
-    fun toggleSelectionForAddress(address: Address) {
-        val list = arrayListOf<Address>()
-        list.addAll(selectedAddresses.value.orEmpty())
-
-        val found = list.find {
-            it.weakEqual(address)
-        }
-
-        if (found != null) {
-            list.remove(found)
-        } else {
-            val contact = coreContext.contactsManager.findContactByAddress(address)
-            if (contact != null) {
-                val clone = address.clone()
-                clone.displayName = contact.name
-                list.add(clone)
-            } else {
-                list.add(address)
-            }
-        }
-
-        selectedAddresses.value = list
-    }
-
-    private fun processMagicSearchResults(results: Array<SearchResult>) {
-        Log.i("[Contacts Selection] Processing ${results.size} results")
-        val list = arrayListOf<SearchResult>()
-        for (result in results) {
-            if (result.sourceFlags == MagicSearch.Source.Request.toInt()) {
-                val address = result.address
-                if (address != null) {
-                    val found = list.find {
-                        it.address?.weakEqual(address) ?: false
-                    }
-                    if (found != null) {
-                        Log.i(
-                            "[Contacts Selection] User-input is already present in search results, skipping request"
-                        )
-                        continue
-                    }
-                }
-            }
-            list.add(result)
-        }
-        contactsList.postValue(list)
-    }
-}
diff --git a/app/src/main/java/org/linphone/contact/DummyAuthenticationService.kt b/app/src/main/java/org/linphone/contact/DummyAuthenticationService.kt
deleted file mode 100644
index 3cc3cf4b0..000000000
--- a/app/src/main/java/org/linphone/contact/DummyAuthenticationService.kt
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package org.linphone.contact
-
-import android.accounts.AbstractAccountAuthenticator
-import android.accounts.Account
-import android.accounts.AccountAuthenticatorResponse
-import android.app.Service
-import android.content.Context
-import android.content.Intent
-import android.os.Bundle
-import android.os.IBinder
-
-// Below classes are required to be able to create our DummySyncService...
-internal class DummyAuthenticator(context: Context) : AbstractAccountAuthenticator(context) {
-    override fun getAuthTokenLabel(authTokenType: String?): String {
-        throw UnsupportedOperationException()
-    }
-
-    override fun confirmCredentials(
-        response: AccountAuthenticatorResponse?,
-        account: Account?,
-        options: Bundle?
-    ): Bundle? = null
-
-    override fun updateCredentials(
-        response: AccountAuthenticatorResponse?,
-        account: Account?,
-        authTokenType: String?,
-        options: Bundle?
-    ): Bundle {
-        throw UnsupportedOperationException()
-    }
-
-    override fun getAuthToken(
-        response: AccountAuthenticatorResponse?,
-        account: Account?,
-        authTokenType: String?,
-        options: Bundle?
-    ): Bundle {
-        throw UnsupportedOperationException()
-    }
-
-    override fun hasFeatures(
-        response: AccountAuthenticatorResponse?,
-        account: Account?,
-        features: Array<out String>?
-    ): Bundle {
-        throw UnsupportedOperationException()
-    }
-
-    override fun editProperties(
-        response: AccountAuthenticatorResponse?,
-        accountType: String?
-    ): Bundle {
-        throw UnsupportedOperationException()
-    }
-
-    override fun addAccount(
-        response: AccountAuthenticatorResponse?,
-        accountType: String?,
-        authTokenType: String?,
-        requiredFeatures: Array<out String>?,
-        options: Bundle?
-    ): Bundle? = null
-}
-
-class DummyAuthenticationService : Service() {
-    private lateinit var authenticator: DummyAuthenticator
-
-    override fun onCreate() {
-        authenticator = DummyAuthenticator(this)
-    }
-
-    override fun onBind(intent: Intent): IBinder {
-        return authenticator.iBinder
-    }
-}
diff --git a/app/src/main/java/org/linphone/contact/DummySyncService.kt b/app/src/main/java/org/linphone/contact/DummySyncService.kt
deleted file mode 100644
index 3aca7e36a..000000000
--- a/app/src/main/java/org/linphone/contact/DummySyncService.kt
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.contact
-
-import android.accounts.Account
-import android.app.Service
-import android.content.*
-import android.os.Bundle
-import android.os.IBinder
-
-// Below classes are required to be able to use our own contact MIME type entry...
-class DummySyncAdapter(context: Context, autoInit: Boolean) : AbstractThreadedSyncAdapter(
-    context,
-    autoInit
-) {
-    override fun onPerformSync(
-        account: Account?,
-        extras: Bundle?,
-        authority: String?,
-        provider: ContentProviderClient?,
-        syncResult: SyncResult?
-    ) { }
-}
-
-class DummySyncService : Service() {
-    companion object {
-        private val syncAdapterLock = Any()
-        private var syncAdapter: DummySyncAdapter? = null
-    }
-
-    override fun onCreate() {
-        synchronized(syncAdapterLock) {
-            if (syncAdapter == null) {
-                syncAdapter = DummySyncAdapter(applicationContext, true)
-            }
-        }
-    }
-
-    override fun onBind(intent: Intent?): IBinder? {
-        return syncAdapter?.syncAdapterBinder
-    }
-}
diff --git a/app/src/main/java/org/linphone/contact/NativeContactEditor.kt b/app/src/main/java/org/linphone/contact/NativeContactEditor.kt
deleted file mode 100644
index 1e96818fb..000000000
--- a/app/src/main/java/org/linphone/contact/NativeContactEditor.kt
+++ /dev/null
@@ -1,594 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.contact
-
-import android.content.ContentProviderOperation
-import android.content.ContentUris
-import android.net.Uri
-import android.provider.ContactsContract
-import android.provider.ContactsContract.CommonDataKinds
-import android.provider.ContactsContract.RawContacts
-import org.linphone.LinphoneApplication.Companion.coreContext
-import org.linphone.R
-import org.linphone.activities.main.contact.data.NumberOrAddressEditorData
-import org.linphone.core.Friend
-import org.linphone.core.tools.Log
-import org.linphone.utils.AppUtils
-import org.linphone.utils.PermissionHelper
-
-class NativeContactEditor(val friend: Friend) {
-    companion object {
-        fun createAndroidContact(accountName: String?, accountType: String?): Long {
-            Log.i("[Native Contact Editor] Using sync account $accountName with type $accountType")
-
-            val changes = arrayListOf<ContentProviderOperation>()
-            changes.add(
-                ContentProviderOperation.newInsert(RawContacts.CONTENT_URI)
-                    .withValue(RawContacts.ACCOUNT_NAME, accountName)
-                    .withValue(RawContacts.ACCOUNT_TYPE, accountType)
-                    .build()
-            )
-            val contentResolver = coreContext.context.contentResolver
-            val results = contentResolver.applyBatch(ContactsContract.AUTHORITY, changes)
-            for (result in results) {
-                val uri = result.uri
-                Log.i("[Native Contact Editor] Contact creation result is $uri")
-                if (uri != null) {
-                    try {
-                        val cursor = contentResolver.query(
-                            uri,
-                            arrayOf(RawContacts.CONTACT_ID),
-                            null,
-                            null,
-                            null
-                        )
-                        if (cursor != null) {
-                            cursor.moveToNext()
-                            val contactId: Long = cursor.getLong(0)
-                            Log.i("[Native Contact Editor] New contact id is $contactId")
-                            cursor.close()
-                            return contactId
-                        }
-                    } catch (e: Exception) {
-                        Log.e("[Native Contact Editor] Failed to get cursor: $e")
-                    }
-                }
-            }
-
-            return 0
-        }
-    }
-
-    private val changes = arrayListOf<ContentProviderOperation>()
-    private val selection =
-        "${ContactsContract.Data.CONTACT_ID} =? AND ${ContactsContract.Data.MIMETYPE} =?"
-    private val phoneNumberSelection =
-        "$selection AND (${CommonDataKinds.Phone.NUMBER}=? OR ${CommonDataKinds.Phone.NORMALIZED_NUMBER}=?)"
-    private val presenceUpdateSelection =
-        "${ContactsContract.Data.CONTACT_ID} =? AND ${ContactsContract.Data.MIMETYPE} =? AND data3=?"
-    private val contactUri = ContactsContract.Data.CONTENT_URI
-
-    private var rawId: String? = null
-    private var syncAccountRawId: String? = null
-    private var pictureByteArray: ByteArray? = null
-
-    init {
-        val contentResolver = coreContext.context.contentResolver
-        val cursor = contentResolver.query(
-            RawContacts.CONTENT_URI,
-            arrayOf(RawContacts._ID),
-            "${RawContacts.CONTACT_ID} =?",
-            arrayOf(friend.refKey),
-            null
-        )
-        if (cursor?.moveToFirst() == true) {
-            do {
-                if (rawId == null) {
-                    try {
-                        rawId = cursor.getString(cursor.getColumnIndexOrThrow(RawContacts._ID))
-                        Log.d(
-                            "[Native Contact Editor] Found raw id $rawId for native contact with id ${friend.refKey}"
-                        )
-                    } catch (iae: IllegalArgumentException) {
-                        Log.e("[Native Contact Editor] Exception: $iae")
-                    }
-                }
-            } while (cursor.moveToNext() && rawId == null)
-        }
-        cursor?.close()
-    }
-
-    fun setFirstAndLastNames(firstName: String, lastName: String): NativeContactEditor {
-        if (firstName == friend.vcard?.givenName && lastName == friend.vcard?.familyName) {
-            Log.w("[Native Contact Editor] First & last names haven't changed")
-            return this
-        }
-
-        val builder = if (friend.vcard?.givenName == null && friend.vcard?.familyName == null) {
-            // Probably a contact creation
-            ContentProviderOperation.newInsert(contactUri)
-                .withValue(ContactsContract.Data.RAW_CONTACT_ID, rawId)
-        } else {
-            ContentProviderOperation.newUpdate(contactUri)
-                .withSelection(
-                    selection,
-                    arrayOf(friend.refKey, CommonDataKinds.StructuredName.CONTENT_ITEM_TYPE)
-                )
-        }
-
-        builder.withValue(
-            ContactsContract.Data.MIMETYPE,
-            CommonDataKinds.StructuredName.CONTENT_ITEM_TYPE
-        )
-            .withValue(
-                CommonDataKinds.StructuredName.GIVEN_NAME,
-                firstName
-            )
-            .withValue(
-                CommonDataKinds.StructuredName.FAMILY_NAME,
-                lastName
-            )
-        addChanges(builder.build())
-        return this
-    }
-
-    fun setOrganization(value: String): NativeContactEditor {
-        val previousValue = friend.organization.orEmpty()
-        if (value == previousValue) {
-            Log.d("[Native Contact Editor] Organization hasn't changed")
-            return this
-        }
-
-        val builder = if (previousValue.isNotEmpty()) {
-            ContentProviderOperation.newUpdate(contactUri)
-                .withSelection(
-                    "$selection AND ${CommonDataKinds.Organization.COMPANY} =?",
-                    arrayOf(
-                        friend.refKey,
-                        CommonDataKinds.Organization.CONTENT_ITEM_TYPE,
-                        previousValue
-                    )
-                )
-        } else {
-            ContentProviderOperation.newInsert(contactUri)
-                .withValue(ContactsContract.Data.RAW_CONTACT_ID, rawId)
-        }
-
-        builder.withValue(
-            ContactsContract.Data.MIMETYPE,
-            CommonDataKinds.Organization.CONTENT_ITEM_TYPE
-        )
-            .withValue(
-                CommonDataKinds.Organization.COMPANY,
-                value
-            )
-
-        addChanges(builder.build())
-        return this
-    }
-
-    fun setPhoneNumbers(value: List<NumberOrAddressEditorData>): NativeContactEditor {
-        var addCount = 0
-        var removeCount = 0
-        var editCount = 0
-
-        for (phoneNumber in value) {
-            when {
-                phoneNumber.currentValue.isEmpty() -> {
-                    // New phone number to add
-                    val number = phoneNumber.newValue.value.orEmpty()
-                    if (number.isNotEmpty()) {
-                        addCount++
-                        addPhoneNumber(number)
-                    }
-                }
-                phoneNumber.toRemove.value == true -> {
-                    // Existing number to remove
-                    removeCount++
-                    removePhoneNumber(phoneNumber.currentValue)
-                }
-                phoneNumber.currentValue != phoneNumber.newValue.value -> {
-                    // Existing number to update
-                    val number = phoneNumber.newValue.value.orEmpty()
-                    if (number.isNotEmpty()) {
-                        editCount++
-                        updatePhoneNumber(phoneNumber.currentValue, number)
-                    }
-                }
-            }
-        }
-
-        Log.i(
-            "[Native Contact Editor] $addCount numbers added, $removeCount numbers removed and $editCount numbers updated"
-        )
-        return this
-    }
-
-    fun setSipAddresses(value: List<NumberOrAddressEditorData>): NativeContactEditor {
-        var addCount = 0
-        var removeCount = 0
-        var editCount = 0
-
-        for (sipAddress in value) {
-            when {
-                sipAddress.currentValue.isEmpty() -> {
-                    // New address to add
-                    val address = sipAddress.newValue.value.orEmpty()
-                    if (address.isNotEmpty()) {
-                        addCount++
-                        addSipAddress(address)
-                    }
-                }
-                sipAddress.toRemove.value == true -> {
-                    // Existing address to remove
-                    removeCount++
-                    removeLinphoneOrSipAddress(sipAddress.currentValue)
-                }
-                sipAddress.currentValue != sipAddress.newValue.value -> {
-                    // Existing address to update
-                    val address = sipAddress.newValue.value.orEmpty()
-                    if (address.isNotEmpty()) {
-                        editCount++
-                        updateLinphoneOrSipAddress(sipAddress.currentValue, address)
-                    }
-                }
-            }
-        }
-
-        Log.i(
-            "[Native Contact Editor] $addCount addresses added, $removeCount addresses removed and $editCount addresses updated"
-        )
-        return this
-    }
-
-    fun setPicture(value: ByteArray?): NativeContactEditor {
-        pictureByteArray = value
-        if (value != null) Log.i("[Native Contact Editor] Adding operation: picture set/update")
-        return this
-    }
-
-    fun setPresenceInformation(phoneNumber: String, sipAddress: String): NativeContactEditor {
-        if (syncAccountRawId == null) {
-            val contentResolver = coreContext.context.contentResolver
-            val cursor = contentResolver.query(
-                RawContacts.CONTENT_URI,
-                arrayOf(RawContacts._ID, RawContacts.ACCOUNT_TYPE),
-                "${RawContacts.CONTACT_ID} =?",
-                arrayOf(friend.refKey),
-                null
-            )
-            if (cursor?.moveToFirst() == true) {
-                do {
-                    try {
-                        val accountType =
-                            cursor.getString(cursor.getColumnIndexOrThrow(RawContacts.ACCOUNT_TYPE))
-                        if (accountType == AppUtils.getString(R.string.sync_account_type) && syncAccountRawId == null) {
-                            syncAccountRawId =
-                                cursor.getString(cursor.getColumnIndexOrThrow(RawContacts._ID))
-                            Log.d(
-                                "[Native Contact Editor] Found linphone raw id $syncAccountRawId for native contact with id ${friend.refKey}"
-                            )
-                        }
-                    } catch (iae: IllegalArgumentException) {
-                        Log.e("[Native Contact Editor] Exception: $iae")
-                    }
-                } while (cursor.moveToNext() && syncAccountRawId == null)
-            }
-            cursor?.close()
-        }
-
-        if (syncAccountRawId == null) {
-            Log.w("[Native Contact Editor] Linphone raw id not found")
-            val insert = ContentProviderOperation.newInsert(RawContacts.CONTENT_URI)
-                .withValue(RawContacts.ACCOUNT_NAME, AppUtils.getString(R.string.sync_account_name))
-                .withValue(RawContacts.ACCOUNT_TYPE, AppUtils.getString(R.string.sync_account_type))
-                .withValue(RawContacts.AGGREGATION_MODE, RawContacts.AGGREGATION_MODE_DEFAULT)
-                .build()
-            addChanges(insert)
-            val update =
-                ContentProviderOperation.newUpdate(
-                    ContactsContract.AggregationExceptions.CONTENT_URI
-                )
-                    .withValue(
-                        ContactsContract.AggregationExceptions.TYPE,
-                        ContactsContract.AggregationExceptions.TYPE_KEEP_TOGETHER
-                    )
-                    .withValue(ContactsContract.AggregationExceptions.RAW_CONTACT_ID1, rawId)
-                    .withValueBackReference(
-                        ContactsContract.AggregationExceptions.RAW_CONTACT_ID2,
-                        0
-                    )
-                    .build()
-            addChanges(update)
-            commit(true)
-        }
-
-        if (syncAccountRawId == null) {
-            Log.e(
-                "[Native Contact Editor] Can't add presence to contact in Linphone sync account, no raw id"
-            )
-            return this
-        }
-
-        Log.d("[Native Contact Editor] Trying to add presence information to contact")
-        setPresenceLinphoneSipAddressForPhoneNumber(sipAddress, phoneNumber)
-        return this
-    }
-
-    fun commit(updateSyncAccountRawId: Boolean = false) {
-        if (PermissionHelper.get().hasWriteContactsPermission()) {
-            try {
-                if (changes.isNotEmpty()) {
-                    val contentResolver = coreContext.context.contentResolver
-                    val results = contentResolver.applyBatch(ContactsContract.AUTHORITY, changes)
-                    for (result in results) {
-                        val uri = result.uri
-                        Log.i("[Native Contact Editor] Result is $uri")
-                        if (uri != null && updateSyncAccountRawId && syncAccountRawId == null) {
-                            syncAccountRawId = ContentUris.parseId(uri).toString()
-                            Log.i(
-                                "[Native Contact Editor] Sync account raw id is $syncAccountRawId"
-                            )
-                        }
-                    }
-                }
-                if (pictureByteArray != null) {
-                    updatePicture()
-                }
-            } catch (e: Exception) {
-                Log.e("[Native Contact Editor] Exception raised while applying changes: $e")
-            }
-        } else {
-            Log.e("[Native Contact Editor] WRITE_CONTACTS permission isn't granted!")
-        }
-        changes.clear()
-    }
-
-    private fun addChanges(operation: ContentProviderOperation) {
-        Log.i("[Native Contact Editor] Adding operation: $operation")
-        changes.add(operation)
-    }
-
-    private fun addPhoneNumber(phoneNumber: String) {
-        val insert = ContentProviderOperation.newInsert(contactUri)
-            .withValue(ContactsContract.Data.RAW_CONTACT_ID, rawId)
-            .withValue(
-                ContactsContract.Data.MIMETYPE,
-                CommonDataKinds.Phone.CONTENT_ITEM_TYPE
-            )
-            .withValue(CommonDataKinds.Phone.NUMBER, phoneNumber)
-            .withValue(
-                CommonDataKinds.Phone.TYPE,
-                CommonDataKinds.Phone.TYPE_MOBILE
-            )
-            .build()
-        addChanges(insert)
-    }
-
-    private fun updatePhoneNumber(currentValue: String, phoneNumber: String) {
-        val update = ContentProviderOperation.newUpdate(contactUri)
-            .withSelection(
-                phoneNumberSelection,
-                arrayOf(
-                    friend.refKey,
-                    CommonDataKinds.Phone.CONTENT_ITEM_TYPE,
-                    currentValue,
-                    currentValue
-                )
-            )
-            .withValue(ContactsContract.Data.MIMETYPE, CommonDataKinds.Phone.CONTENT_ITEM_TYPE)
-            .withValue(CommonDataKinds.Phone.NUMBER, phoneNumber)
-            .withValue(
-                CommonDataKinds.Phone.TYPE,
-                CommonDataKinds.Phone.TYPE_MOBILE
-            )
-            .build()
-        addChanges(update)
-    }
-
-    private fun removePhoneNumber(phoneNumber: String) {
-        val delete = ContentProviderOperation.newDelete(contactUri)
-            .withSelection(
-                phoneNumberSelection,
-                arrayOf(
-                    friend.refKey,
-                    CommonDataKinds.Phone.CONTENT_ITEM_TYPE,
-                    phoneNumber,
-                    phoneNumber
-                )
-            )
-            .build()
-        addChanges(delete)
-    }
-
-    private fun addSipAddress(address: String) {
-        val insert = ContentProviderOperation.newInsert(contactUri)
-            .withValue(ContactsContract.Data.RAW_CONTACT_ID, rawId)
-            .withValue(
-                ContactsContract.Data.MIMETYPE,
-                CommonDataKinds.SipAddress.CONTENT_ITEM_TYPE
-            )
-            .withValue("data1", address) // value
-            .build()
-        addChanges(insert)
-    }
-
-    private fun updateLinphoneOrSipAddress(currentValue: String, sipAddress: String) {
-        val updateLegacy = ContentProviderOperation.newUpdate(contactUri)
-            .withSelection(
-                "${ContactsContract.Data.CONTACT_ID} =? AND ${ContactsContract.Data.MIMETYPE} =? AND data1=?",
-                arrayOf(
-                    friend.refKey,
-                    AppUtils.getString(R.string.linphone_address_mime_type),
-                    currentValue
-                )
-            )
-            .withValue("data1", sipAddress) // value
-            .withValue("data2", AppUtils.getString(R.string.app_name)) // summary
-            .withValue("data3", sipAddress) // detail
-            .build()
-
-        val update = ContentProviderOperation.newUpdate(contactUri)
-            .withSelection(
-                "${ContactsContract.Data.CONTACT_ID} =? AND ${ContactsContract.Data.MIMETYPE} =? AND data1=?",
-                arrayOf(
-                    friend.refKey,
-                    CommonDataKinds.SipAddress.CONTENT_ITEM_TYPE,
-                    currentValue
-                )
-            )
-            .withValue("data1", sipAddress) // value
-            .build()
-
-        addChanges(updateLegacy)
-        addChanges(update)
-    }
-
-    private fun removeLinphoneOrSipAddress(sipAddress: String) {
-        val delete = ContentProviderOperation.newDelete(contactUri)
-            .withSelection(
-                "${ContactsContract.Data.CONTACT_ID} =? AND (${ContactsContract.Data.MIMETYPE} =? OR ${ContactsContract.Data.MIMETYPE} =?) AND data1=?",
-                arrayOf(
-                    friend.refKey,
-                    CommonDataKinds.SipAddress.CONTENT_ITEM_TYPE,
-                    AppUtils.getString(R.string.linphone_address_mime_type),
-                    sipAddress
-                )
-            )
-            .build()
-        addChanges(delete)
-    }
-
-    private fun setPresenceLinphoneSipAddressForPhoneNumber(sipAddress: String, phoneNumber: String) {
-        val contentResolver = coreContext.context.contentResolver
-        val cursor = contentResolver.query(
-            ContactsContract.Data.CONTENT_URI,
-            arrayOf("data1"),
-            "${ContactsContract.Data.RAW_CONTACT_ID} = ? AND ${ContactsContract.Data.MIMETYPE} = ? AND data3 = ?",
-            arrayOf(
-                syncAccountRawId,
-                AppUtils.getString(R.string.linphone_address_mime_type),
-                phoneNumber
-            ),
-            null
-        )
-        val count = cursor?.count ?: 0
-        val data1 = if (count > 0) {
-            if (cursor?.moveToFirst() == true) {
-                try {
-                    cursor.getString(cursor.getColumnIndexOrThrow("data1"))
-                } catch (iae: IllegalArgumentException) {
-                    Log.e("[Native Contact Editor] Exception: $iae")
-                }
-            } else {
-                null
-            }
-        } else {
-            null
-        }
-        cursor?.close()
-
-        val address = if (sipAddress.endsWith(";user=phone")) {
-            sipAddress.substring(0, sipAddress.length - ";user=phone".length)
-        } else {
-            sipAddress
-        }
-
-        if (count == 0) {
-            Log.i(
-                "[Native Contact Editor] No existing presence information found for this phone number ($phoneNumber) & SIP address ($address), let's add it"
-            )
-            addPresenceLinphoneSipAddressForPhoneNumber(address, phoneNumber)
-        } else {
-            if (data1 != null && data1 == address) {
-                Log.d(
-                    "[Native Contact Editor] There is already an entry for this phone number and SIP address, skipping"
-                )
-            } else {
-                Log.w(
-                    "[Native Contact Editor] There is already an entry for this phone number ($phoneNumber) but not for the same SIP address ($data1 != $address)"
-                )
-                updatePresenceLinphoneSipAddressForPhoneNumber(address, phoneNumber)
-            }
-        }
-    }
-
-    private fun addPresenceLinphoneSipAddressForPhoneNumber(address: String, detail: String) {
-        val insert = ContentProviderOperation.newInsert(contactUri)
-            .withValue(ContactsContract.Data.RAW_CONTACT_ID, syncAccountRawId)
-            .withValue(
-                ContactsContract.Data.MIMETYPE,
-                AppUtils.getString(R.string.linphone_address_mime_type)
-            )
-            .withValue("data1", address) // value
-            .withValue("data2", AppUtils.getString(R.string.app_name)) // summary
-            .withValue("data3", detail) // detail
-            .build()
-        addChanges(insert)
-    }
-
-    private fun updatePresenceLinphoneSipAddressForPhoneNumber(
-        sipAddress: String,
-        phoneNumber: String
-    ) {
-        val update = ContentProviderOperation.newUpdate(contactUri)
-            .withSelection(
-                presenceUpdateSelection,
-                arrayOf(
-                    friend.refKey,
-                    AppUtils.getString(R.string.linphone_address_mime_type),
-                    phoneNumber
-                )
-            )
-            .withValue(
-                ContactsContract.Data.MIMETYPE,
-                AppUtils.getString(R.string.linphone_address_mime_type)
-            )
-            .withValue("data1", sipAddress) // value
-            .withValue("data2", AppUtils.getString(R.string.app_name)) // summary
-            .withValue("data3", phoneNumber) // detail
-            .build()
-        addChanges(update)
-    }
-
-    private fun updatePicture() {
-        val value = pictureByteArray
-        val id = rawId
-        if (value == null || id == null) return
-
-        try {
-            val uri = Uri.withAppendedPath(
-                ContentUris.withAppendedId(RawContacts.CONTENT_URI, id.toLong()),
-                RawContacts.DisplayPhoto.CONTENT_DIRECTORY
-            )
-            val contentResolver = coreContext.context.contentResolver
-            val assetFileDescriptor = contentResolver.openAssetFileDescriptor(uri, "rw")
-            val outputStream = assetFileDescriptor?.createOutputStream()
-            outputStream?.write(value)
-            outputStream?.close()
-            assetFileDescriptor?.close()
-            Log.i("[Native Contact Editor] Picture updated")
-        } catch (e: Exception) {
-            Log.e("[Native Contact Editor] Failed to update picture, raised exception: $e")
-        }
-
-        pictureByteArray = null
-    }
-}
diff --git a/app/src/main/java/org/linphone/core/BootReceiver.kt b/app/src/main/java/org/linphone/core/BootReceiver.kt
deleted file mode 100644
index 951eacde0..000000000
--- a/app/src/main/java/org/linphone/core/BootReceiver.kt
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.core
-
-import android.content.BroadcastReceiver
-import android.content.Context
-import android.content.Intent
-import androidx.core.app.NotificationManagerCompat
-import org.linphone.LinphoneApplication.Companion.corePreferences
-import org.linphone.R
-import org.linphone.compatibility.Compatibility
-import org.linphone.core.tools.Log
-
-class BootReceiver : BroadcastReceiver() {
-    override fun onReceive(context: Context, intent: Intent) {
-        if (intent.action.equals(Intent.ACTION_BOOT_COMPLETED, ignoreCase = true)) {
-            val autoStart = corePreferences.autoStart
-            Log.i("[Boot Receiver] Device is starting, autoStart is $autoStart")
-            if (autoStart) {
-                startService(context)
-            }
-        } else if (intent.action.equals(Intent.ACTION_MY_PACKAGE_REPLACED, ignoreCase = true)) {
-            val autoStart = corePreferences.autoStart
-            Log.i("[Boot Receiver] App has been updated, autoStart is $autoStart")
-            if (autoStart) {
-                startService(context)
-            }
-        }
-    }
-
-    private fun startService(context: Context) {
-        val serviceChannel = context.getString(R.string.notification_channel_service_id)
-        val notificationManager = NotificationManagerCompat.from(context)
-        if (Compatibility.getChannelImportance(notificationManager, serviceChannel) == NotificationManagerCompat.IMPORTANCE_NONE) {
-            Log.w("[Boot Receiver] Service channel is disabled!")
-            return
-        }
-
-        val serviceIntent = Intent(Intent.ACTION_MAIN).setClass(context, CoreService::class.java)
-        serviceIntent.putExtra("StartForeground", true)
-        Compatibility.startForegroundService(context, serviceIntent)
-    }
-}
diff --git a/app/src/main/java/org/linphone/core/CoreContext.kt b/app/src/main/java/org/linphone/core/CoreContext.kt
deleted file mode 100644
index 812642c77..000000000
--- a/app/src/main/java/org/linphone/core/CoreContext.kt
+++ /dev/null
@@ -1,1319 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.core
-
-import android.app.Application
-import android.content.Context
-import android.content.Intent
-import android.content.SharedPreferences
-import android.graphics.PixelFormat
-import android.media.AudioDeviceCallback
-import android.media.AudioDeviceInfo
-import android.media.AudioManager
-import android.os.Handler
-import android.os.Looper
-import android.security.keystore.KeyGenParameterSpec
-import android.security.keystore.KeyProperties
-import android.telephony.TelephonyManager
-import android.util.Base64
-import android.util.Pair
-import android.view.*
-import android.webkit.MimeTypeMap
-import androidx.lifecycle.*
-import androidx.loader.app.LoaderManager
-import com.google.firebase.crashlytics.FirebaseCrashlytics
-import java.io.File
-import java.math.BigInteger
-import java.nio.charset.StandardCharsets
-import java.security.KeyStore
-import java.security.MessageDigest
-import java.text.Collator
-import java.util.*
-import javax.crypto.Cipher
-import javax.crypto.KeyGenerator
-import javax.crypto.SecretKey
-import javax.crypto.spec.GCMParameterSpec
-import kotlin.math.abs
-import kotlinx.coroutines.*
-import org.linphone.BuildConfig
-import org.linphone.LinphoneApplication.Companion.corePreferences
-import org.linphone.R
-import org.linphone.compatibility.Compatibility
-import org.linphone.compatibility.PhoneStateInterface
-import org.linphone.contact.ContactLoader
-import org.linphone.contact.ContactsManager
-import org.linphone.contact.getContactForPhoneNumberOrAddress
-import org.linphone.core.tools.Log
-import org.linphone.mediastream.Version
-import org.linphone.notifications.NotificationsManager
-import org.linphone.telecom.TelecomHelper
-import org.linphone.utils.*
-import org.linphone.utils.Event
-
-class CoreContext(
-    val context: Context,
-    coreConfig: Config,
-    service: CoreService? = null,
-    useAutoStartDescription: Boolean = false
-) :
-    LifecycleOwner, ViewModelStoreOwner {
-
-    private val _lifecycleRegistry = LifecycleRegistry(this)
-    override val lifecycle: Lifecycle
-        get() = _lifecycleRegistry
-
-    private val _viewModelStore = ViewModelStore()
-    override val viewModelStore: ViewModelStore
-        get() = _viewModelStore
-
-    private val contactLoader = ContactLoader()
-
-    private val collator: Collator = Collator.getInstance()
-
-    var stopped = false
-    val core: Core
-    val handler: Handler = Handler(Looper.getMainLooper())
-
-    var screenWidth: Float = 0f
-    var screenHeight: Float = 0f
-
-    val appVersion: String by lazy {
-        val appVersion = BuildConfig.VERSION_NAME
-        val appBranch = context.getString(R.string.linphone_app_branch)
-        val appBuildType = BuildConfig.BUILD_TYPE
-        "$appVersion ($appBranch, $appBuildType)"
-    }
-
-    val sdkVersion: String by lazy {
-        val sdkVersion = context.getString(org.linphone.core.R.string.linphone_sdk_version)
-        val sdkBranch = context.getString(org.linphone.core.R.string.linphone_sdk_branch)
-        val sdkBuildType = org.linphone.core.BuildConfig.BUILD_TYPE
-        "$sdkVersion ($sdkBranch, $sdkBuildType)"
-    }
-
-    val contactsManager: ContactsManager by lazy {
-        ContactsManager(context)
-    }
-
-    val notificationsManager: NotificationsManager by lazy {
-        NotificationsManager(context)
-    }
-
-    val callErrorMessageResourceId: MutableLiveData<Event<String>> by lazy {
-        MutableLiveData<Event<String>>()
-    }
-
-    val coroutineScope = CoroutineScope(Dispatchers.Main + SupervisorJob())
-
-    private val loggingService = Factory.instance().loggingService
-
-    private var overlayX = 0f
-    private var overlayY = 0f
-    private var callOverlay: View? = null
-    private var previousCallState = Call.State.Idle
-    private lateinit var phoneStateListener: PhoneStateInterface
-
-    private val activityMonitor = ActivityMonitor()
-
-    private val listener: CoreListenerStub = object : CoreListenerStub() {
-        override fun onGlobalStateChanged(core: Core, state: GlobalState, message: String) {
-            Log.i("[Context] Global state changed [$state]")
-            if (state == GlobalState.On) {
-                if (corePreferences.disableVideo) {
-                    // if video has been disabled, don't forget to tell the Core to disable it as well
-                    Log.w(
-                        "[Context] Video has been disabled in app, disabling it as well in the Core"
-                    )
-                    core.isVideoCaptureEnabled = false
-                    core.isVideoDisplayEnabled = false
-
-                    val videoPolicy = core.videoActivationPolicy
-                    videoPolicy.automaticallyInitiate = false
-                    videoPolicy.automaticallyAccept = false
-                    core.videoActivationPolicy = videoPolicy
-                }
-
-                fetchContacts()
-            }
-        }
-
-        override fun onAccountRegistrationStateChanged(
-            core: Core,
-            account: Account,
-            state: RegistrationState?,
-            message: String
-        ) {
-            Log.i(
-                "[Context] Account [${account.params.identityAddress?.asStringUriOnly()}] registration state changed [$state]"
-            )
-            if (state == RegistrationState.Ok && account == core.defaultAccount) {
-                notificationsManager.stopForegroundNotificationIfPossible()
-            }
-        }
-
-        override fun onPushNotificationReceived(core: Core, payload: String?) {
-            Log.i("[Context] Push notification received: $payload")
-        }
-
-        override fun onCallStateChanged(
-            core: Core,
-            call: Call,
-            state: Call.State,
-            message: String
-        ) {
-            Log.i("[Context] Call state changed [$state]")
-            if (state == Call.State.IncomingReceived || state == Call.State.IncomingEarlyMedia) {
-                if (declineCallDueToGsmActiveCall()) {
-                    call.decline(Reason.Busy)
-                    return
-                }
-
-                // Starting SDK 24 (Android 7.0) we rely on the fullscreen intent of the call incoming notification
-                if (Version.sdkStrictlyBelow(Version.API24_NOUGAT_70)) {
-                    onIncomingReceived()
-                }
-
-                if (corePreferences.autoAnswerEnabled) {
-                    val autoAnswerDelay = corePreferences.autoAnswerDelay
-                    if (autoAnswerDelay == 0) {
-                        Log.w("[Context] Auto answering call immediately")
-                        answerCall(call)
-                    } else {
-                        Log.i(
-                            "[Context] Scheduling auto answering in $autoAnswerDelay milliseconds"
-                        )
-                        handler.postDelayed(
-                            {
-                                Log.w("[Context] Auto answering call")
-                                answerCall(call)
-                            },
-                            autoAnswerDelay.toLong()
-                        )
-                    }
-                }
-            } else if (state == Call.State.OutgoingProgress) {
-                val conferenceInfo = core.findConferenceInformationFromUri(call.remoteAddress)
-                // Do not show outgoing call view for conference calls, wait for connected state
-                if (conferenceInfo == null) {
-                    onOutgoingStarted()
-                }
-
-                if (core.callsNb == 1 && corePreferences.routeAudioToBluetoothIfAvailable) {
-                    AudioRouteUtils.routeAudioToBluetooth(call)
-                }
-            } else if (state == Call.State.Connected) {
-                onCallStarted()
-            } else if (state == Call.State.StreamsRunning) {
-                if (previousCallState == Call.State.Connected) {
-                    // Do not automatically route audio to bluetooth after first call
-                    if (core.callsNb == 1) {
-                        // Only try to route bluetooth / headphone / headset when the call is in StreamsRunning for the first time
-                        Log.i(
-                            "[Context] First call going into StreamsRunning state for the first time, trying to route audio to headset or bluetooth if available"
-                        )
-                        if (AudioRouteUtils.isHeadsetAudioRouteAvailable()) {
-                            AudioRouteUtils.routeAudioToHeadset(call)
-                        } else if (corePreferences.routeAudioToBluetoothIfAvailable && AudioRouteUtils.isBluetoothAudioRouteAvailable()) {
-                            AudioRouteUtils.routeAudioToBluetooth(call)
-                        }
-                    }
-
-                    // Only start call recording when the call is in StreamsRunning for the first time
-                    if (corePreferences.automaticallyStartCallRecording && !call.params.isRecording) {
-                        if (call.conference == null) { // TODO: FIXME: We disabled conference recording for now
-                            Log.i(
-                                "[Context] We were asked to start the call recording automatically"
-                            )
-                            call.startRecording()
-                        }
-                    }
-                }
-            } else if (state == Call.State.End || state == Call.State.Error || state == Call.State.Released) {
-                if (state == Call.State.Error) {
-                    Log.w(
-                        "[Context] Call error reason is ${call.errorInfo.protocolCode} / ${call.errorInfo.reason} / ${call.errorInfo.phrase}"
-                    )
-                    val toastMessage = when (call.errorInfo.reason) {
-                        Reason.Busy -> context.getString(R.string.call_error_user_busy)
-                        Reason.IOError -> context.getString(R.string.call_error_io_error)
-                        Reason.NotAcceptable -> context.getString(
-                            R.string.call_error_incompatible_media_params
-                        )
-                        Reason.NotFound -> context.getString(R.string.call_error_user_not_found)
-                        Reason.ServerTimeout -> context.getString(
-                            R.string.call_error_server_timeout
-                        )
-                        Reason.TemporarilyUnavailable -> context.getString(
-                            R.string.call_error_temporarily_unavailable
-                        )
-                        else -> context.getString(R.string.call_error_generic).format(
-                            "${call.errorInfo.protocolCode} / ${call.errorInfo.phrase}"
-                        )
-                    }
-                    callErrorMessageResourceId.value = Event(toastMessage)
-                } else if (state == Call.State.End &&
-                    call.dir == Call.Dir.Outgoing &&
-                    call.errorInfo.reason == Reason.Declined &&
-                    core.callsNb == 0
-                ) {
-                    Log.i("[Context] Call has been declined")
-                    val toastMessage = context.getString(R.string.call_error_declined)
-                    callErrorMessageResourceId.value = Event(toastMessage)
-                }
-            }
-
-            previousCallState = state
-        }
-
-        override fun onLastCallEnded(core: Core) {
-            Log.i("[Context] Last call has ended")
-            removeCallOverlay()
-            if (!core.isMicEnabled) {
-                Log.w("[Context] Mic was muted in Core, enabling it back for next call")
-                core.isMicEnabled = true
-            }
-        }
-
-        override fun onMessagesReceived(
-            core: Core,
-            chatRoom: ChatRoom,
-            messages: Array<out ChatMessage>
-        ) {
-            for (message in messages) {
-                exportFileInMessage(message)
-            }
-        }
-    }
-
-    private val loggingServiceListener = object : LoggingServiceListenerStub() {
-        override fun onLogMessageWritten(
-            logService: LoggingService,
-            domain: String,
-            level: LogLevel,
-            message: String
-        ) {
-            if (corePreferences.logcatLogsOutput) {
-                when (level) {
-                    LogLevel.Error -> android.util.Log.e(domain, message)
-                    LogLevel.Warning -> android.util.Log.w(domain, message)
-                    LogLevel.Message -> android.util.Log.i(domain, message)
-                    LogLevel.Fatal -> android.util.Log.wtf(domain, message)
-                    else -> android.util.Log.d(domain, message)
-                }
-            }
-            FirebaseCrashlytics.getInstance().log("[$domain] [${level.name}] $message")
-        }
-    }
-
-    init {
-        if (context.resources.getBoolean(R.bool.crashlytics_enabled)) {
-            loggingService.addListener(loggingServiceListener)
-            Log.i("[Context] Crashlytics enabled, register logging service listener")
-        }
-
-        _lifecycleRegistry.currentState = Lifecycle.State.INITIALIZED
-
-        Log.i("=========================================")
-        Log.i("==== Linphone-android information dump ====")
-        Log.i("VERSION=${BuildConfig.VERSION_NAME} / ${BuildConfig.VERSION_CODE}")
-        Log.i("PACKAGE=${BuildConfig.APPLICATION_ID}")
-        Log.i("BUILD TYPE=${BuildConfig.BUILD_TYPE}")
-        Log.i("=========================================")
-
-        if (service != null) {
-            Log.i("[Context] Starting foreground service")
-            notificationsManager.startForegroundToKeepAppAlive(service, useAutoStartDescription)
-        }
-
-        core = Factory.instance().createCoreWithConfig(coreConfig, context)
-
-        stopped = false
-        _lifecycleRegistry.currentState = Lifecycle.State.CREATED
-
-        (context as Application).registerActivityLifecycleCallbacks(activityMonitor)
-        Log.i("[Context] Ready")
-    }
-
-    private val audioDeviceCallback = object : AudioDeviceCallback() {
-        override fun onAudioDevicesAdded(addedDevices: Array<out AudioDeviceInfo>?) {
-            if (!addedDevices.isNullOrEmpty()) {
-                Log.i("[Context] [${addedDevices.size}] new device(s) have been added")
-                core.reloadSoundDevices()
-            }
-        }
-
-        override fun onAudioDevicesRemoved(removedDevices: Array<out AudioDeviceInfo>?) {
-            if (!removedDevices.isNullOrEmpty()) {
-                Log.i("[Context] [${removedDevices.size}] existing device(s) have been removed")
-                core.reloadSoundDevices()
-            }
-        }
-    }
-
-    fun start() {
-        Log.i("[Context] Starting")
-
-        core.addListener(listener)
-
-        // CoreContext listener must be added first!
-        if (Version.sdkAboveOrEqual(Version.API26_O_80) && corePreferences.useTelecomManager) {
-            if (Compatibility.hasTelecomManagerPermissions(context)) {
-                Log.i(
-                    "[Context] Creating Telecom Helper, disabling audio focus requests in AudioHelper"
-                )
-                core.config.setBool("audio", "android_disable_audio_focus_requests", true)
-                val telecomHelper = TelecomHelper.required(context)
-                Log.i(
-                    "[Context] Telecom Helper created, account is ${if (telecomHelper.isAccountEnabled()) "enabled" else "disabled"}"
-                )
-            } else {
-                Log.w("[Context] Can't create Telecom Helper, permissions have been revoked")
-                corePreferences.useTelecomManager = false
-            }
-        }
-
-        configureCore()
-
-        core.start()
-        _lifecycleRegistry.currentState = Lifecycle.State.STARTED
-
-        initPhoneStateListener()
-
-        notificationsManager.onCoreReady()
-
-        collator.strength = Collator.NO_DECOMPOSITION
-
-        if (corePreferences.vfsEnabled) {
-            val notClearedCount = FileUtils.countFilesInDirectory(corePreferences.vfsCachePath)
-            if (notClearedCount > 0) {
-                Log.w(
-                    "[Context] [VFS] There are [$notClearedCount] plain files not cleared from previous app lifetime, removing them now"
-                )
-            }
-            FileUtils.clearExistingPlainFiles()
-        }
-
-        if (corePreferences.keepServiceAlive) {
-            Log.i("[Context] Background mode setting is enabled, starting Service")
-            notificationsManager.startForeground()
-        }
-
-        _lifecycleRegistry.currentState = Lifecycle.State.RESUMED
-
-        val audioManager = context.getSystemService(Context.AUDIO_SERVICE) as AudioManager
-        audioManager.registerAudioDeviceCallback(audioDeviceCallback, handler)
-        Log.i("[Context] Started")
-    }
-
-    fun stop() {
-        Log.i("[Context] Stopping")
-        coroutineScope.cancel()
-
-        if (::phoneStateListener.isInitialized) {
-            phoneStateListener.destroy()
-        }
-        notificationsManager.destroy()
-        contactsManager.destroy()
-        if (TelecomHelper.exists()) {
-            Log.i("[Context] Destroying telecom helper")
-            TelecomHelper.get().destroy()
-            TelecomHelper.destroy()
-        }
-
-        val audioManager = context.getSystemService(Context.AUDIO_SERVICE) as AudioManager
-        audioManager.unregisterAudioDeviceCallback(audioDeviceCallback)
-
-        core.stop()
-        core.removeListener(listener)
-        stopped = true
-        _lifecycleRegistry.currentState = Lifecycle.State.DESTROYED
-        loggingService.removeListener(loggingServiceListener)
-
-        (context as Application).unregisterActivityLifecycleCallbacks(activityMonitor)
-    }
-
-    fun onForeground() {
-        // We can't rely on defaultAccount?.params?.isPublishEnabled
-        // as it will be modified by the SDK when changing the presence status
-        if (corePreferences.publishPresence) {
-            Log.i("[Context] App is in foreground, PUBLISHING presence as Online")
-            core.consolidatedPresence = ConsolidatedPresence.Online
-        }
-    }
-
-    fun onBackground() {
-        // We can't rely on defaultAccount?.params?.isPublishEnabled
-        // as it will be modified by the SDK when changing the presence status
-        if (corePreferences.publishPresence) {
-            Log.i("[Context] App is in background, un-PUBLISHING presence info")
-            // We don't use ConsolidatedPresence.Busy but Offline to do an unsubscribe,
-            // Flexisip will handle the Busy status depending on other devices
-            core.consolidatedPresence = ConsolidatedPresence.Offline
-        }
-    }
-
-    private fun configureCore() {
-        Log.i("[Context] Configuring Core")
-
-        core.staticPicture = corePreferences.staticPicturePath
-
-        // Migration code
-        if (core.config.getBool("app", "incoming_call_vibration", true)) {
-            core.isVibrationOnIncomingCallEnabled = true
-            core.config.setBool("app", "incoming_call_vibration", false)
-        }
-
-        if (core.config.getInt("misc", "conference_layout", 1) > 1) {
-            core.config.setInt("misc", "conference_layout", 1)
-        }
-
-        // Now LIME server URL is set on accounts
-        val limeServerUrl = core.limeX3DhServerUrl.orEmpty()
-        if (limeServerUrl.isNotEmpty()) {
-            Log.w("[Context] Removing LIME X3DH server URL from Core config")
-            core.limeX3DhServerUrl = null
-        }
-
-        // Disable Telecom Manager on Android < 10 to prevent crash due to OS bug in Android 9
-        if (Version.sdkStrictlyBelow(Version.API29_ANDROID_10)) {
-            if (corePreferences.useTelecomManager) {
-                Log.w(
-                    "[Context] Android < 10 detected, disabling telecom manager to prevent crash due to OS bug"
-                )
-            }
-            corePreferences.useTelecomManager = false
-            corePreferences.manuallyDisabledTelecomManager = true
-        }
-
-        initUserCertificates()
-
-        computeUserAgent()
-
-        val fiveTwoMigrationRequired = core.config.getBool("app", "migration_5.2_required", true)
-        if (fiveTwoMigrationRequired) {
-            Log.i(
-                "[Context] Starting migration of muted chat room from shared preferences to our SDK"
-            )
-            val sharedPreferences: SharedPreferences = context.getSharedPreferences(
-                "notifications",
-                Context.MODE_PRIVATE
-            )
-            val editor = sharedPreferences.edit()
-
-            for (chatRoom in core.chatRooms) {
-                val id = LinphoneUtils.getChatRoomId(chatRoom)
-                if (sharedPreferences.getBoolean(id, false)) {
-                    Log.i("[Context] Migrating muted flag for chat room [$id]")
-                    chatRoom.muted = true
-                    editor.remove(id)
-                }
-            }
-
-            editor.apply()
-            core.config.setBool(
-                "app",
-                "migration_5.2_required",
-                false
-            )
-            Log.i("[Context] Migration of muted chat room finished")
-
-            core.setVideoCodecPriorityPolicy(CodecPriorityPolicy.Auto)
-            Log.i("[Context] Video codec priority policy updated to Auto")
-        }
-
-        val fiveOneMigrationRequired = core.config.getBool("app", "migration_5.1_required", true)
-        if (fiveOneMigrationRequired) {
-            core.config.setBool(
-                "sip",
-                "update_presence_model_timestamp_before_publish_expires_refresh",
-                true
-            )
-        }
-
-        for (account in core.accountList) {
-            if (account.params.identityAddress?.domain == corePreferences.defaultDomain) {
-                var paramsChanged = false
-                val params = account.params.clone()
-
-                if (fiveOneMigrationRequired) {
-                    val newExpire = 31536000 // 1 year
-                    if (account.params.expires != newExpire) {
-                        Log.i(
-                            "[Context] Updating expire on account ${params.identityAddress?.asString()} from ${account.params.expires} to newExpire"
-                        )
-                        params.expires = newExpire
-                        paramsChanged = true
-                    }
-
-                    // Enable presence publish/subscribe for new feature
-                    if (!account.params.isPublishEnabled) {
-                        Log.i(
-                            "[Context] Enabling presence publish on account ${params.identityAddress?.asString()}"
-                        )
-                        params.isPublishEnabled = true
-                        params.publishExpires = 120
-                        paramsChanged = true
-                    }
-                }
-
-                // Ensure conference factory URI is set on sip.linphone.org accounts
-                if (account.params.conferenceFactoryUri == null) {
-                    val uri = corePreferences.conferenceServerUri
-                    Log.i(
-                        "[Context] Setting conference factory on account ${params.identityAddress?.asString()} to default value: $uri"
-                    )
-                    params.conferenceFactoryUri = uri
-                    paramsChanged = true
-                }
-
-                // Ensure audio/video conference factory URI is set on sip.linphone.org accounts
-                if (account.params.audioVideoConferenceFactoryAddress == null) {
-                    val uri = corePreferences.audioVideoConferenceServerUri
-                    val address = core.interpretUrl(uri, false)
-                    if (address != null) {
-                        Log.i(
-                            "[Context] Setting audio/video conference factory on account ${params.identityAddress?.asString()} to default value: $uri"
-                        )
-                        params.audioVideoConferenceFactoryAddress = address
-                        paramsChanged = true
-                    } else {
-                        Log.e("[Context] Failed to parse audio/video conference factory URI: $uri")
-                    }
-                }
-
-                // Enable Bundle mode by default
-                if (!account.params.isRtpBundleEnabled) {
-                    Log.i(
-                        "[Context] Enabling RTP bundle mode on account ${params.identityAddress?.asString()}"
-                    )
-                    params.isRtpBundleEnabled = true
-                    paramsChanged = true
-                }
-
-                // Ensure we allow CPIM messages in basic chat rooms
-                if (!account.params.isCpimInBasicChatRoomEnabled) {
-                    params.isCpimInBasicChatRoomEnabled = true
-                    paramsChanged = true
-                    Log.i(
-                        "[Context] CPIM allowed in basic chat rooms for account ${params.identityAddress?.asString()}"
-                    )
-                }
-
-                if (account.params.limeServerUrl.isNullOrEmpty()) {
-                    if (limeServerUrl.isNotEmpty()) {
-                        params.limeServerUrl = limeServerUrl
-                        paramsChanged = true
-                        Log.i(
-                            "[Context] Moving Core's LIME X3DH server URL [$limeServerUrl] on account ${params.identityAddress?.asString()}"
-                        )
-                    } else {
-                        params.limeServerUrl = corePreferences.limeServerUrl
-                        paramsChanged = true
-                        Log.w(
-                            "[Context] Linphone account [${params.identityAddress?.asString()}] didn't have a LIME X3DH server URL, setting one: ${corePreferences.limeServerUrl}"
-                        )
-                    }
-                }
-
-                if (paramsChanged) {
-                    Log.i("[Context] Account params have been updated, apply changes")
-                    account.params = params
-                }
-            }
-        }
-        core.config.setBool("app", "migration_5.1_required", false)
-
-        Log.i("[Context] Core configured")
-    }
-
-    private fun computeUserAgent() {
-        val deviceName: String = corePreferences.deviceName
-        val appName: String = context.resources.getString(R.string.user_agent_app_name)
-        val androidVersion = BuildConfig.VERSION_NAME
-        val userAgent = "$appName/$androidVersion ($deviceName) LinphoneSDK"
-        val sdkVersion = context.getString(org.linphone.core.R.string.linphone_sdk_version)
-        val sdkBranch = context.getString(org.linphone.core.R.string.linphone_sdk_branch)
-        val sdkUserAgent = "$sdkVersion ($sdkBranch)"
-        core.setUserAgent(userAgent, sdkUserAgent)
-    }
-
-    private fun initUserCertificates() {
-        val userCertsPath = corePreferences.userCertificatesPath
-        val f = File(userCertsPath)
-        if (!f.exists()) {
-            if (!f.mkdir()) {
-                Log.e("[Context] $userCertsPath can't be created.")
-            }
-        }
-        core.userCertificatesPath = userCertsPath
-    }
-
-    fun fetchContacts() {
-        if (corePreferences.enableNativeAddressBookIntegration) {
-            if (PermissionHelper.required(context).hasReadContactsPermission()) {
-                Log.i("[Context] Init contacts loader")
-                val manager = LoaderManager.getInstance(this@CoreContext)
-                manager.restartLoader(0, null, contactLoader)
-            }
-        }
-    }
-
-    fun newAccountConfigured(isLinphoneAccount: Boolean) {
-        Log.i(
-            "[Context] A new ${if (isLinphoneAccount) AppUtils.getString(R.string.app_name) else "third-party"} account has been configured"
-        )
-
-        if (isLinphoneAccount) {
-            core.config.setString("sip", "rls_uri", corePreferences.defaultRlsUri)
-            val rlsAddress = core.interpretUrl(corePreferences.defaultRlsUri, false)
-            if (rlsAddress != null) {
-                for (friendList in core.friendsLists) {
-                    friendList.rlsAddress = rlsAddress
-                }
-            }
-            if (core.mediaEncryption == MediaEncryption.None) {
-                Log.i("[Context] Enabling SRTP media encryption instead of None")
-                core.mediaEncryption = MediaEncryption.SRTP
-            }
-        } else {
-            Log.i("[Context] Background mode with foreground service automatically enabled")
-            corePreferences.keepServiceAlive = true
-            notificationsManager.startForeground()
-        }
-
-        contactsManager.updateLocalContacts()
-    }
-
-    /* Call related functions */
-
-    fun initPhoneStateListener() {
-        if (PermissionHelper.required(context).hasReadPhoneStatePermission()) {
-            try {
-                phoneStateListener =
-                    Compatibility.createPhoneListener(
-                        context.getSystemService(Context.TELEPHONY_SERVICE) as TelephonyManager
-                    )
-            } catch (exception: SecurityException) {
-                val hasReadPhoneStatePermission =
-                    PermissionHelper.get().hasReadPhoneStateOrPhoneNumbersPermission()
-                Log.e(
-                    "[Context] Failed to create phone state listener: $exception, READ_PHONE_STATE permission status is $hasReadPhoneStatePermission"
-                )
-            }
-        } else {
-            Log.w(
-                "[Context] Can't create phone state listener, READ_PHONE_STATE permission isn't granted"
-            )
-        }
-    }
-
-    fun declineCallDueToGsmActiveCall(): Boolean {
-        if (!corePreferences.useTelecomManager) { // Can't use the following call with Telecom Manager API as it will "fake" GSM calls
-            var gsmCallActive = false
-            if (::phoneStateListener.isInitialized) {
-                gsmCallActive = phoneStateListener.isInCall()
-            }
-
-            if (gsmCallActive) {
-                Log.w("[Context] Refusing the call with reason busy because a GSM call is active")
-                return true
-            }
-        } else {
-            if (TelecomHelper.exists()) {
-                if (!TelecomHelper.get().isIncomingCallPermitted() ||
-                    TelecomHelper.get().isInManagedCall()
-                ) {
-                    Log.w(
-                        "[Context] Refusing the call with reason busy because Telecom Manager will reject the call"
-                    )
-                    return true
-                }
-            } else {
-                Log.e("[Context] Telecom Manager singleton wasn't created!")
-            }
-        }
-        return false
-    }
-
-    fun videoUpdateRequestTimedOut(call: Call) {
-        coroutineScope.launch {
-            Log.w("[Context] 30 seconds have passed, declining video request")
-            answerCallVideoUpdateRequest(call, false)
-        }
-    }
-
-    fun answerCallVideoUpdateRequest(call: Call, accept: Boolean) {
-        val params = core.createCallParams(call)
-
-        if (accept) {
-            params?.isVideoEnabled = true
-            core.isVideoCaptureEnabled = true
-            core.isVideoDisplayEnabled = true
-        } else {
-            params?.isVideoEnabled = false
-        }
-
-        call.acceptUpdate(params)
-    }
-
-    fun answerCall(call: Call) {
-        Log.i("[Context] Answering call $call")
-        val params = core.createCallParams(call)
-        if (params == null) {
-            Log.w("[Context] Answering call without params!")
-            call.accept()
-            return
-        }
-
-        params.recordFile = LinphoneUtils.getRecordingFilePathForAddress(call.remoteAddress)
-
-        if (LinphoneUtils.checkIfNetworkHasLowBandwidth(context)) {
-            Log.w("[Context] Enabling low bandwidth mode!")
-            params.isLowBandwidthEnabled = true
-        }
-
-        if (call.callLog.wasConference()) {
-            // Prevent incoming group call to start in audio only layout
-            // Do the same as the conference waiting room
-            params.isVideoEnabled = true
-            params.videoDirection = if (core.videoActivationPolicy.automaticallyInitiate) MediaDirection.SendRecv else MediaDirection.RecvOnly
-            Log.i(
-                "[Context] Enabling video on call params to prevent audio-only layout when answering"
-            )
-        }
-
-        call.acceptWithParams(params)
-    }
-
-    fun declineCall(call: Call) {
-        val voiceMailUri = corePreferences.voiceMailUri
-        if (voiceMailUri != null && corePreferences.redirectDeclinedCallToVoiceMail) {
-            val voiceMailAddress = core.interpretUrl(voiceMailUri, false)
-            if (voiceMailAddress != null) {
-                Log.i("[Context] Redirecting call $call to voice mail URI: $voiceMailUri")
-                call.redirectTo(voiceMailAddress)
-            }
-        } else {
-            val reason = if (core.callsNb > 1) {
-                Reason.Busy
-            } else {
-                Reason.Declined
-            }
-            Log.i("[Context] Declining call [$call] with reason [$reason]")
-            call.decline(reason)
-        }
-    }
-
-    fun terminateCall(call: Call) {
-        Log.i("[Context] Terminating call $call")
-        call.terminate()
-    }
-
-    fun transferCallTo(addressToCall: String): Boolean {
-        val currentCall = core.currentCall ?: core.calls.firstOrNull()
-        if (currentCall == null) {
-            Log.e("[Context] Couldn't find a call to transfer")
-        } else {
-            val address = core.interpretUrl(addressToCall, LinphoneUtils.applyInternationalPrefix())
-            if (address != null) {
-                Log.i("[Context] Transferring current call to $addressToCall")
-                currentCall.transferTo(address)
-                return true
-            }
-        }
-        return false
-    }
-
-    fun startCall(to: String) {
-        var stringAddress = to.trim()
-        if (android.util.Patterns.PHONE.matcher(to).matches()) {
-            val contact = contactsManager.findContactByPhoneNumber(to)
-            val alias = contact?.getContactForPhoneNumberOrAddress(to)
-            if (alias != null) {
-                Log.i("[Context] Found matching alias $alias for phone number $to, using it")
-                stringAddress = alias
-            }
-        }
-
-        val address: Address? = core.interpretUrl(
-            stringAddress,
-            LinphoneUtils.applyInternationalPrefix()
-        )
-        if (address == null) {
-            Log.e("[Context] Failed to parse $stringAddress, abort outgoing call")
-            callErrorMessageResourceId.value = Event(
-                context.getString(R.string.call_error_network_unreachable)
-            )
-            return
-        }
-
-        startCall(address)
-    }
-
-    fun startCall(
-        address: Address,
-        callParams: CallParams? = null,
-        forceZRTP: Boolean = false,
-        localAddress: Address? = null
-    ) {
-        if (!core.isNetworkReachable) {
-            Log.e("[Context] Network unreachable, abort outgoing call")
-            callErrorMessageResourceId.value = Event(
-                context.getString(R.string.call_error_network_unreachable)
-            )
-            return
-        }
-
-        val params = callParams ?: core.createCallParams(null)
-        if (params == null) {
-            val call = core.inviteAddress(address)
-            Log.w("[Context] Starting call $call without params")
-            return
-        }
-
-        if (forceZRTP) {
-            params.mediaEncryption = MediaEncryption.ZRTP
-        }
-        if (LinphoneUtils.checkIfNetworkHasLowBandwidth(context)) {
-            Log.w("[Context] Enabling low bandwidth mode!")
-            params.isLowBandwidthEnabled = true
-        }
-        params.recordFile = LinphoneUtils.getRecordingFilePathForAddress(address)
-
-        if (localAddress != null) {
-            val account = core.accountList.find { account ->
-                account.params.identityAddress?.weakEqual(localAddress) ?: false
-            }
-            if (account != null) {
-                params.account = account
-                Log.i(
-                    "[Context] Using account matching address ${localAddress.asStringUriOnly()} as From"
-                )
-            } else {
-                Log.e(
-                    "[Context] Failed to find account matching address ${localAddress.asStringUriOnly()}"
-                )
-            }
-        }
-
-        if (corePreferences.sendEarlyMedia) {
-            params.isEarlyMediaSendingEnabled = true
-        }
-
-        val call = core.inviteAddressWithParams(address, params)
-        Log.i("[Context] Starting call $call")
-    }
-
-    fun switchCamera() {
-        val currentDevice = core.videoDevice
-        Log.i("[Context] Current camera device is $currentDevice")
-
-        for (camera in core.videoDevicesList) {
-            if (camera != currentDevice && camera != "StaticImage: Static picture") {
-                Log.i("[Context] New camera device will be $camera")
-                core.videoDevice = camera
-                break
-            }
-        }
-
-        val conference = core.conference
-        if (conference == null || !conference.isIn) {
-            val call = core.currentCall
-            if (call == null) {
-                Log.w("[Context] Switching camera while not in call")
-                return
-            }
-            call.update(null)
-        }
-    }
-
-    fun showSwitchCameraButton(): Boolean {
-        return !corePreferences.disableVideo && core.videoDevicesList.size > 2 // Count StaticImage camera
-    }
-
-    fun createCallOverlay() {
-        if (!corePreferences.showCallOverlay || !corePreferences.systemWideCallOverlay || callOverlay != null) {
-            return
-        }
-
-        if (overlayY == 0f) overlayY = AppUtils.pixelsToDp(40f)
-        val windowManager = context.getSystemService(Context.WINDOW_SERVICE) as WindowManager
-        // WRAP_CONTENT doesn't work well on some launchers...
-        val params: WindowManager.LayoutParams = WindowManager.LayoutParams(
-            AppUtils.getDimension(R.dimen.call_overlay_size).toInt(),
-            AppUtils.getDimension(R.dimen.call_overlay_size).toInt(),
-            Compatibility.getOverlayType(),
-            WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE,
-            PixelFormat.TRANSLUCENT
-        )
-        params.x = overlayX.toInt()
-        params.y = overlayY.toInt()
-        params.gravity = Gravity.TOP or Gravity.CENTER_HORIZONTAL
-        val overlay = LayoutInflater.from(context).inflate(R.layout.call_overlay, null)
-
-        var initX = overlayX
-        var initY = overlayY
-        overlay.setOnTouchListener { view, event ->
-            when (event.action) {
-                MotionEvent.ACTION_DOWN -> {
-                    initX = params.x - event.rawX
-                    initY = params.y - event.rawY
-                }
-                MotionEvent.ACTION_MOVE -> {
-                    val x = (event.rawX + initX).toInt()
-                    val y = (event.rawY + initY).toInt()
-
-                    params.x = x
-                    params.y = y
-                    windowManager.updateViewLayout(overlay, params)
-                }
-                MotionEvent.ACTION_UP -> {
-                    if (abs(overlayX - params.x) < CorePreferences.OVERLAY_CLICK_SENSITIVITY &&
-                        abs(overlayY - params.y) < CorePreferences.OVERLAY_CLICK_SENSITIVITY
-                    ) {
-                        view.performClick()
-                    }
-                    overlayX = params.x.toFloat()
-                    overlayY = params.y.toFloat()
-                }
-                else -> return@setOnTouchListener false
-            }
-            true
-        }
-        overlay.setOnClickListener {
-            onCallOverlayClick()
-        }
-
-        try {
-            windowManager.addView(overlay, params)
-            callOverlay = overlay
-        } catch (e: Exception) {
-            Log.e("[Context] Failed to add overlay in windowManager: $e")
-        }
-    }
-
-    fun onCallOverlayClick() {
-        val call = core.currentCall ?: core.calls.firstOrNull()
-        if (call != null) {
-            Log.i("[Context] Overlay clicked, go back to call view")
-            when (call.state) {
-                Call.State.IncomingReceived, Call.State.IncomingEarlyMedia -> onIncomingReceived()
-                Call.State.OutgoingInit, Call.State.OutgoingProgress, Call.State.OutgoingRinging, Call.State.OutgoingEarlyMedia -> onOutgoingStarted()
-                else -> onCallStarted()
-            }
-        } else {
-            Log.e("[Context] Couldn't find call, why is the overlay clicked?!")
-        }
-    }
-
-    fun removeCallOverlay() {
-        if (callOverlay != null) {
-            val windowManager = context.getSystemService(Context.WINDOW_SERVICE) as WindowManager
-            windowManager.removeView(callOverlay)
-            callOverlay = null
-        }
-    }
-
-    /* Coroutine related */
-
-    private fun exportFileInMessage(message: ChatMessage) {
-        // Only do it if auto download feature isn't disabled, otherwise it's done in the user-initiated download process
-        if (core.maxSizeForAutoDownloadIncomingFiles != -1) {
-            var hasFile = false
-            for (content in message.contents) {
-                if (content.isFile) {
-                    hasFile = true
-                    break
-                }
-            }
-            if (hasFile) {
-                exportFilesInMessageToMediaStore(message)
-            }
-        }
-    }
-
-    private fun exportFilesInMessageToMediaStore(message: ChatMessage) {
-        if (message.isEphemeral) {
-            Log.w("[Context] Do not make ephemeral file(s) public")
-            return
-        }
-        if (corePreferences.vfsEnabled) {
-            Log.w("[Context] [VFS] Do not make received file(s) public when VFS is enabled")
-            return
-        }
-        if (!corePreferences.makePublicMediaFilesDownloaded) {
-            Log.w("[Context] Making received files public setting disabled")
-            return
-        }
-
-        if (PermissionHelper.get().hasWriteExternalStoragePermission()) {
-            for (content in message.contents) {
-                if (content.isFile && content.filePath != null && content.userData == null) {
-                    Log.i("[Context] Trying to export file [${content.name}] to MediaStore")
-                    addContentToMediaStore(content)
-                }
-            }
-        } else {
-            Log.e(
-                "[Context] Can't make file public, app doesn't have WRITE_EXTERNAL_STORAGE permission"
-            )
-        }
-    }
-
-    fun addContentToMediaStore(content: Content) {
-        if (corePreferences.vfsEnabled) {
-            Log.w("[Context] [VFS] Do not make received file(s) public when VFS is enabled")
-            return
-        }
-        if (!corePreferences.makePublicMediaFilesDownloaded) {
-            Log.w("[Context] Making received files public setting disabled")
-            return
-        }
-
-        if (PermissionHelper.get().hasWriteExternalStoragePermission()) {
-            coroutineScope.launch {
-                val filePath = content.filePath.orEmpty()
-                Log.i("[Context] Trying to export file [$filePath] through Media Store API")
-
-                val extension = FileUtils.getExtensionFromFileName(filePath)
-                val mime = MimeTypeMap.getSingleton().getMimeTypeFromExtension(extension)
-                when (FileUtils.getMimeType(mime)) {
-                    FileUtils.MimeType.Image -> {
-                        if (Compatibility.addImageToMediaStore(context, content)) {
-                            Log.i(
-                                "[Context] Successfully exported image [${content.name}] to Media Store"
-                            )
-                        } else {
-                            Log.e(
-                                "[Context] Something went wrong while copying file to Media Store..."
-                            )
-                        }
-                    }
-                    FileUtils.MimeType.Video -> {
-                        if (Compatibility.addVideoToMediaStore(context, content)) {
-                            Log.i(
-                                "[Context] Successfully exported video [${content.name}] to Media Store"
-                            )
-                        } else {
-                            Log.e(
-                                "[Context] Something went wrong while copying file to Media Store..."
-                            )
-                        }
-                    }
-                    FileUtils.MimeType.Audio -> {
-                        if (Compatibility.addAudioToMediaStore(context, content)) {
-                            Log.i(
-                                "[Context] Successfully exported audio [${content.name}] to Media Store"
-                            )
-                        } else {
-                            Log.e(
-                                "[Context] Something went wrong while copying file to Media Store..."
-                            )
-                        }
-                    }
-                    else -> {
-                        Log.w(
-                            "[Context] File [$filePath] isn't either an image, an audio file or a video [${content.type}/${content.subtype}], can't add it to the Media Store"
-                        )
-                    }
-                }
-            }
-        }
-    }
-
-    fun checkIfForegroundServiceNotificationCanBeRemovedAfterDelay(delayInMs: Long) {
-        coroutineScope.launch {
-            withContext(Dispatchers.Default) {
-                delay(delayInMs)
-                withContext(Dispatchers.Main) {
-                    if (core.defaultAccount != null && core.defaultAccount?.state == RegistrationState.Ok) {
-                        Log.i(
-                            "[Context] Default account is registered, cancel foreground service notification if possible"
-                        )
-                        notificationsManager.stopForegroundNotificationIfPossible()
-                    }
-                }
-            }
-        }
-    }
-
-    /* Start call related activities */
-
-    private fun onIncomingReceived() {
-        if (corePreferences.preventInterfaceFromShowingUp) {
-            Log.w("[Context] We were asked to not show the incoming call screen")
-            return
-        }
-
-        Log.i("[Context] Starting IncomingCallActivity")
-        val intent = Intent(context, org.linphone.activities.voip.CallActivity::class.java)
-        // This flag is required to start an Activity from a Service context
-        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_REORDER_TO_FRONT)
-        context.startActivity(intent)
-    }
-
-    private fun onOutgoingStarted() {
-        if (corePreferences.preventInterfaceFromShowingUp) {
-            Log.w("[Context] We were asked to not show the outgoing call screen")
-            return
-        }
-
-        Log.i("[Context] Starting OutgoingCallActivity")
-        val intent = Intent(context, org.linphone.activities.voip.CallActivity::class.java)
-        // This flag is required to start an Activity from a Service context
-        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_REORDER_TO_FRONT)
-        context.startActivity(intent)
-    }
-
-    fun onCallStarted() {
-        if (corePreferences.preventInterfaceFromShowingUp) {
-            Log.w("[Context] We were asked to not show the call screen")
-            return
-        }
-
-        Log.i("[Context] Starting CallActivity")
-        val intent = Intent(context, org.linphone.activities.voip.CallActivity::class.java)
-        // This flag is required to start an Activity from a Service context
-        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_REORDER_TO_FRONT)
-        context.startActivity(intent)
-    }
-
-    /* VFS */
-
-    companion object {
-        private const val TRANSFORMATION = "AES/GCM/NoPadding"
-        private const val ANDROID_KEY_STORE = "AndroidKeyStore"
-        private const val ALIAS = "vfs"
-        private const val LINPHONE_VFS_ENCRYPTION_AES256GCM128_SHA256 = 2
-        private const val VFS_IV = "vfsiv"
-        private const val VFS_KEY = "vfskey"
-
-        @Throws(java.lang.Exception::class)
-        private fun generateSecretKey() {
-            val keyGenerator =
-                KeyGenerator.getInstance(KeyProperties.KEY_ALGORITHM_AES, ANDROID_KEY_STORE)
-            keyGenerator.init(
-                KeyGenParameterSpec.Builder(
-                    ALIAS,
-                    KeyProperties.PURPOSE_ENCRYPT or KeyProperties.PURPOSE_DECRYPT
-                )
-                    .setBlockModes(KeyProperties.BLOCK_MODE_GCM)
-                    .setEncryptionPaddings(KeyProperties.ENCRYPTION_PADDING_NONE)
-                    .build()
-            )
-            keyGenerator.generateKey()
-        }
-
-        @Throws(java.lang.Exception::class)
-        private fun getSecretKey(): SecretKey? {
-            val ks = KeyStore.getInstance(ANDROID_KEY_STORE)
-            ks.load(null)
-            val entry = ks.getEntry(ALIAS, null) as KeyStore.SecretKeyEntry
-            return entry.secretKey
-        }
-
-        @Throws(java.lang.Exception::class)
-        fun generateToken(): String {
-            return sha512(UUID.randomUUID().toString())
-        }
-
-        @Throws(java.lang.Exception::class)
-        private fun encryptData(textToEncrypt: String): Pair<ByteArray, ByteArray> {
-            val cipher = Cipher.getInstance(TRANSFORMATION)
-            cipher.init(Cipher.ENCRYPT_MODE, getSecretKey())
-            val iv = cipher.iv
-            return Pair<ByteArray, ByteArray>(
-                iv,
-                cipher.doFinal(textToEncrypt.toByteArray(StandardCharsets.UTF_8))
-            )
-        }
-
-        @Throws(java.lang.Exception::class)
-        private fun decryptData(encrypted: String?, encryptionIv: ByteArray): String {
-            val cipher = Cipher.getInstance(TRANSFORMATION)
-            val spec = GCMParameterSpec(128, encryptionIv)
-            cipher.init(Cipher.DECRYPT_MODE, getSecretKey(), spec)
-            val encryptedData = Base64.decode(encrypted, Base64.DEFAULT)
-            return String(cipher.doFinal(encryptedData), StandardCharsets.UTF_8)
-        }
-
-        @Throws(java.lang.Exception::class)
-        fun encryptToken(string_to_encrypt: String): Pair<String?, String?> {
-            val encryptedData = encryptData(string_to_encrypt)
-            return Pair<String?, String?>(
-                Base64.encodeToString(encryptedData.first, Base64.DEFAULT),
-                Base64.encodeToString(encryptedData.second, Base64.DEFAULT)
-            )
-        }
-
-        @Throws(java.lang.Exception::class)
-        fun sha512(input: String): String {
-            val md = MessageDigest.getInstance("SHA-512")
-            val messageDigest = md.digest(input.toByteArray())
-            val no = BigInteger(1, messageDigest)
-            var hashtext = no.toString(16)
-            while (hashtext.length < 32) {
-                hashtext = "0$hashtext"
-            }
-            return hashtext
-        }
-
-        @Throws(java.lang.Exception::class)
-        fun getVfsKey(sharedPreferences: SharedPreferences): String {
-            val keyStore = KeyStore.getInstance(ANDROID_KEY_STORE)
-            keyStore.load(null)
-            return decryptData(
-                sharedPreferences.getString(VFS_KEY, null),
-                Base64.decode(sharedPreferences.getString(VFS_IV, null), Base64.DEFAULT)
-            )
-        }
-
-        fun activateVFS() {
-            try {
-                Log.i("[Context] [VFS] Activating VFS")
-                val preferences = corePreferences.encryptedSharedPreferences
-                if (preferences == null) {
-                    Log.e("[Context] [VFS] Can't get encrypted SharedPreferences, can't init VFS")
-                    return
-                }
-
-                if (preferences.getString(VFS_IV, null) == null) {
-                    generateSecretKey()
-                    encryptToken(generateToken()).let { data ->
-                        preferences
-                            .edit()
-                            .putString(VFS_IV, data.first)
-                            .putString(VFS_KEY, data.second)
-                            .commit()
-                    }
-                }
-                Factory.instance().setVfsEncryption(
-                    LINPHONE_VFS_ENCRYPTION_AES256GCM128_SHA256,
-                    getVfsKey(preferences).toByteArray().copyOfRange(0, 32),
-                    32
-                )
-
-                Log.i("[Context] [VFS] VFS activated")
-            } catch (e: Exception) {
-                Log.f("[Context] [VFS] Unable to activate VFS encryption: $e")
-            }
-        }
-    }
-}
diff --git a/app/src/main/java/org/linphone/core/CorePreferences.kt b/app/src/main/java/org/linphone/core/CorePreferences.kt
deleted file mode 100644
index e65c90932..000000000
--- a/app/src/main/java/org/linphone/core/CorePreferences.kt
+++ /dev/null
@@ -1,769 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.core
-
-import android.content.Context
-import android.content.SharedPreferences
-import androidx.security.crypto.EncryptedSharedPreferences
-import androidx.security.crypto.MasterKey
-import java.io.File
-import java.io.FileInputStream
-import java.io.FileOutputStream
-import java.security.KeyStoreException
-import org.linphone.LinphoneApplication.Companion.coreContext
-import org.linphone.compatibility.Compatibility
-import org.linphone.core.tools.Log
-import org.linphone.utils.LinphoneUtils
-
-class CorePreferences constructor(private val context: Context) {
-    private var _config: Config? = null
-    var config: Config
-        get() = _config ?: coreContext.core.config
-        set(value) {
-            _config = value
-        }
-
-    /* VFS encryption */
-
-    companion object {
-        const val OVERLAY_CLICK_SENSITIVITY = 10
-
-        private const val encryptedSharedPreferencesFile = "encrypted.pref"
-    }
-
-    val encryptedSharedPreferences: SharedPreferences? by lazy {
-        val masterKey: MasterKey = MasterKey.Builder(
-            context,
-            MasterKey.DEFAULT_MASTER_KEY_ALIAS
-        ).setKeyScheme(MasterKey.KeyScheme.AES256_GCM).build()
-
-        try {
-            EncryptedSharedPreferences.create(
-                context,
-                encryptedSharedPreferencesFile,
-                masterKey,
-                EncryptedSharedPreferences.PrefKeyEncryptionScheme.AES256_SIV,
-                EncryptedSharedPreferences.PrefValueEncryptionScheme.AES256_GCM
-            )
-        } catch (kse: KeyStoreException) {
-            Log.e("[VFS] Keystore exception: $kse")
-            null
-        } catch (e: Exception) {
-            Log.e("[VFS] Exception: $e")
-            null
-        }
-    }
-
-    var vfsEnabled: Boolean
-        get() = encryptedSharedPreferences?.getBoolean("vfs_enabled", false) ?: false
-        set(value) {
-            val preferences = encryptedSharedPreferences
-            if (preferences == null) {
-                Log.e("[VFS] Failed to get encrypted SharedPreferences")
-                return
-            }
-
-            if (!value && preferences.getBoolean("vfs_enabled", false)) {
-                Log.w("[VFS] It is not possible to disable VFS once it has been enabled")
-                return
-            }
-
-            preferences.edit().putBoolean("vfs_enabled", value)?.apply()
-            // When VFS is enabled we disable logcat output for linphone logs
-            // TODO: decide if we do it
-            // logcatLogsOutput = false
-        }
-
-    /* App settings */
-
-    var debugLogs: Boolean
-        get() = config.getBool("app", "debug", org.linphone.BuildConfig.DEBUG)
-        set(value) {
-            config.setBool("app", "debug", value)
-        }
-
-    var logcatLogsOutput: Boolean
-        get() = config.getBool("app", "print_logs_into_logcat", true)
-        set(value) {
-            config.setBool("app", "print_logs_into_logcat", value)
-        }
-
-    var autoStart: Boolean
-        get() = config.getBool("app", "auto_start", true)
-        set(value) {
-            config.setBool("app", "auto_start", value)
-        }
-
-    var keepServiceAlive: Boolean
-        get() = config.getBool("app", "keep_service_alive", false)
-        set(value) {
-            config.setBool("app", "keep_service_alive", value)
-        }
-
-    var readAndAgreeTermsAndPrivacy: Boolean
-        get() = config.getBool("app", "read_and_agree_terms_and_privacy", false)
-        set(value) {
-            config.setBool("app", "read_and_agree_terms_and_privacy", value)
-        }
-
-    /* UI */
-
-    var forcePortrait: Boolean
-        get() = config.getBool("app", "force_portrait_orientation", false)
-        set(value) {
-            config.setBool("app", "force_portrait_orientation", value)
-        }
-
-    var replaceSipUriByUsername: Boolean
-        get() = config.getBool("app", "replace_sip_uri_by_username", false)
-        set(value) {
-            config.setBool("app", "replace_sip_uri_by_username", value)
-        }
-
-    var enableAnimations: Boolean
-        get() = config.getBool("app", "enable_animations", false)
-        set(value) {
-            config.setBool("app", "enable_animations", value)
-        }
-
-    /** -1 means auto, 0 no, 1 yes */
-    var darkMode: Int
-        get() {
-            if (!darkModeAllowed) return 0
-            return config.getInt("app", "dark_mode", -1)
-        }
-        set(value) {
-            config.setInt("app", "dark_mode", value)
-        }
-
-    /** Allow to make screenshots of encrypted chat rooms, disables fragment's secure mode */
-    var disableSecureMode: Boolean
-        get() = config.getBool("app", "disable_fragment_secure_mode", false)
-        set(value) {
-            config.setBool("app", "disable_fragment_secure_mode", value)
-        }
-
-    /* Audio */
-
-    /* Video */
-
-    var videoPreview: Boolean
-        get() = config.getBool("app", "video_preview", false)
-        set(value) = config.setBool("app", "video_preview", value)
-
-    /* Chat */
-
-    var preventMoreThanOneFilePerMessage: Boolean
-        get() = config.getBool("app", "prevent_more_than_one_file_per_message", false)
-        set(value) {
-            config.setBool("app", "prevent_more_than_one_file_per_message", value)
-        }
-
-    var markAsReadUponChatMessageNotificationDismissal: Boolean
-        get() = config.getBool("app", "mark_as_read_notif_dismissal", false)
-        set(value) {
-            config.setBool("app", "mark_as_read_notif_dismissal", value)
-        }
-
-    var makePublicMediaFilesDownloaded: Boolean
-        // Keep old name for backward compatibility
-        get() = config.getBool("app", "make_downloaded_images_public_in_gallery", true)
-        set(value) {
-            config.setBool("app", "make_downloaded_images_public_in_gallery", value)
-        }
-
-    var useInAppFileViewerForNonEncryptedFiles: Boolean
-        get() = config.getBool("app", "use_in_app_file_viewer_for_non_encrypted_files", false)
-        set(value) {
-            config.setBool("app", "use_in_app_file_viewer_for_non_encrypted_files", value)
-        }
-
-    var hideChatMessageContentInNotification: Boolean
-        get() = config.getBool("app", "hide_chat_message_content_in_notification", false)
-        set(value) {
-            config.setBool("app", "hide_chat_message_content_in_notification", value)
-        }
-
-    var hideEmptyRooms: Boolean
-        get() = config.getBool("misc", "hide_empty_chat_rooms", true)
-        set(value) {
-            config.setBool("misc", "hide_empty_chat_rooms", value)
-        }
-
-    var hideRoomsFromRemovedProxies: Boolean
-        get() = config.getBool("misc", "hide_chat_rooms_from_removed_proxies", true)
-        set(value) {
-            config.setBool("misc", "hide_chat_rooms_from_removed_proxies", value)
-        }
-
-    var deviceName: String
-        get() = config.getString("app", "device_name", Compatibility.getDeviceName(context))!!
-        set(value) = config.setString("app", "device_name", value)
-
-    var chatRoomShortcuts: Boolean
-        get() = config.getBool("app", "chat_room_shortcuts", true)
-        set(value) {
-            config.setBool("app", "chat_room_shortcuts", value)
-        }
-
-    /* Voice Recordings */
-
-    var voiceRecordingMaxDuration: Int
-        get() = config.getInt("app", "voice_recording_max_duration", 600000) // in ms
-        set(value) = config.setInt("app", "voice_recording_max_duration", value)
-
-    var holdToRecordVoiceMessage: Boolean
-        get() = config.getBool("app", "voice_recording_hold_and_release_mode", false)
-        set(value) = config.setBool("app", "voice_recording_hold_and_release_mode", value)
-
-    var sendVoiceRecordingRightAway: Boolean
-        get() = config.getBool("app", "voice_recording_send_right_away", false)
-        set(value) = config.setBool("app", "voice_recording_send_right_away", value)
-
-    /* Contacts */
-
-    var storePresenceInNativeContact: Boolean
-        get() = config.getBool("app", "store_presence_in_native_contact", false)
-        set(value) {
-            config.setBool("app", "store_presence_in_native_contact", value)
-        }
-
-    var showNewContactAccountDialog: Boolean
-        get() = config.getBool("app", "show_new_contact_account_dialog", true)
-        set(value) {
-            config.setBool("app", "show_new_contact_account_dialog", value)
-        }
-
-    var displayOrganization: Boolean
-        get() = config.getBool("app", "display_contact_organization", contactOrganizationVisible)
-        set(value) {
-            config.setBool("app", "display_contact_organization", value)
-        }
-
-    var contactsShortcuts: Boolean
-        get() = config.getBool("app", "contact_shortcuts", false)
-        set(value) {
-            config.setBool("app", "contact_shortcuts", value)
-        }
-
-    var publishPresence: Boolean
-        get() = config.getBool("app", "publish_presence", true)
-        set(value) {
-            config.setBool("app", "publish_presence", value)
-        }
-
-    /* Call */
-
-    var sendEarlyMedia: Boolean
-        get() = config.getBool("sip", "outgoing_calls_early_media", false)
-        set(value) {
-            config.setBool("sip", "outgoing_calls_early_media", value)
-        }
-
-    var acceptEarlyMedia: Boolean
-        get() = config.getBool("sip", "incoming_calls_early_media", false)
-        set(value) {
-            config.setBool("sip", "incoming_calls_early_media", value)
-        }
-
-    var autoAnswerEnabled: Boolean
-        get() = config.getBool("app", "auto_answer", false)
-        set(value) {
-            config.setBool("app", "auto_answer", value)
-        }
-
-    var autoAnswerDelay: Int
-        get() = config.getInt("app", "auto_answer_delay", 0)
-        set(value) {
-            config.setInt("app", "auto_answer_delay", value)
-        }
-
-    // Show overlay inside of application
-    var showCallOverlay: Boolean
-        get() = config.getBool("app", "call_overlay", true)
-        set(value) {
-            config.setBool("app", "call_overlay", value)
-        }
-
-    // Show overlay even when app is in background, requires permission
-    var systemWideCallOverlay: Boolean
-        get() = config.getBool("app", "system_wide_call_overlay", false)
-        set(value) {
-            config.setBool("app", "system_wide_call_overlay", value)
-        }
-
-    var callRightAway: Boolean
-        get() = config.getBool("app", "call_right_away", false)
-        set(value) {
-            config.setBool("app", "call_right_away", value)
-        }
-
-    // Will send user to contacts list directly
-    var skipDialerForNewCallAndTransfer: Boolean
-        get() = config.getBool("app", "skip_dialer_for_new_call_and_transfer", false)
-        set(value) {
-            config.setBool("app", "skip_dialer_for_new_call_and_transfer", value)
-        }
-
-    var automaticallyStartCallRecording: Boolean
-        get() = config.getBool("app", "auto_start_call_record", false)
-        set(value) {
-            config.setBool("app", "auto_start_call_record", value)
-        }
-
-    var useTelecomManager: Boolean
-        // Some permissions are required, so keep it to false so user has to manually enable it and give permissions
-        get() = config.getBool("app", "use_self_managed_telecom_manager", false)
-        set(value) {
-            config.setBool("app", "use_self_managed_telecom_manager", value)
-            // We need to disable audio focus requests when enabling telecom manager, otherwise it creates conflicts
-            config.setBool("audio", "android_disable_audio_focus_requests", value)
-        }
-
-    // We will try to auto enable Telecom Manager feature, but in case user disables it don't try again
-    var manuallyDisabledTelecomManager: Boolean
-        get() = config.getBool("app", "user_disabled_self_managed_telecom_manager", false)
-        set(value) {
-            config.setBool("app", "user_disabled_self_managed_telecom_manager", value)
-        }
-
-    // Also uses Hearing Aids if available
-    var routeAudioToBluetoothIfAvailable: Boolean
-        get() = config.getBool("app", "route_audio_to_bluetooth_if_available", true)
-        set(value) {
-            config.setBool("app", "route_audio_to_bluetooth_if_available", value)
-        }
-
-    // This won't be done if bluetooth or wired headset is used
-    var routeAudioToSpeakerWhenVideoIsEnabled: Boolean
-        get() = config.getBool("app", "route_audio_to_speaker_when_video_enabled", true)
-        set(value) {
-            config.setBool("app", "route_audio_to_speaker_when_video_enabled", value)
-        }
-
-    // Automatically handled by SDK
-    var pauseCallsWhenAudioFocusIsLost: Boolean
-        get() = config.getBool("audio", "android_pause_calls_when_audio_focus_lost", true)
-        set(value) {
-            config.setBool("audio", "android_pause_calls_when_audio_focus_lost", value)
-        }
-
-    var enableFullScreenWhenJoiningVideoCall: Boolean
-        get() = config.getBool("app", "enter_video_call_enable_full_screen_mode", false)
-        set(value) {
-            config.setBool("app", "enter_video_call_enable_full_screen_mode", value)
-        }
-
-    var enableFullScreenWhenJoiningVideoConference: Boolean
-        get() = config.getBool("app", "enter_video_conference_enable_full_screen_mode", true)
-        set(value) {
-            config.setBool("app", "enter_video_conference_enable_full_screen_mode", value)
-        }
-
-    var disableBroadcastConference: Boolean
-        get() = config.getBool("app", "disable_broadcast_conference_feature", true)
-        set(value) {
-            config.setBool("app", "disable_broadcast_conference_feature", value)
-        }
-
-    /* Assistant */
-
-    var firstStart: Boolean
-        get() = config.getBool("app", "first_start", true)
-        set(value) {
-            config.setBool("app", "first_start", value)
-        }
-
-    var xmlRpcServerUrl: String?
-        get() = config.getString("assistant", "xmlrpc_url", null)
-        set(value) {
-            config.setString("assistant", "xmlrpc_url", value)
-        }
-
-    var hideLinkPhoneNumber: Boolean
-        get() = config.getBool("app", "hide_link_phone_number", false)
-        set(value) {
-            config.setBool("app", "hide_link_phone_number", value)
-        }
-
-    /* Dialog related */
-
-    var limeSecurityPopupEnabled: Boolean
-        get() = config.getBool("app", "lime_security_popup_enabled", true)
-        set(value) {
-            config.setBool("app", "lime_security_popup_enabled", value)
-        }
-
-    /* Other */
-
-    var voiceMailUri: String?
-        get() = config.getString("app", "voice_mail", null)
-        set(value) {
-            config.setString("app", "voice_mail", value)
-        }
-
-    var redirectDeclinedCallToVoiceMail: Boolean
-        get() = config.getBool("app", "redirect_declined_call_to_voice_mail", true)
-        set(value) {
-            config.setBool("app", "redirect_declined_call_to_voice_mail", value)
-        }
-
-    var lastUpdateAvailableCheckTimestamp: Int
-        get() = config.getInt("app", "version_check_url_last_timestamp", 0)
-        set(value) {
-            config.setInt("app", "version_check_url_last_timestamp", value)
-        }
-
-    var defaultAccountAvatarPath: String?
-        get() = config.getString("app", "default_avatar_path", null)
-        set(value) {
-            config.setString("app", "default_avatar_path", value)
-        }
-
-    /* *** Read only application settings, some were previously in non_localizable_custom *** */
-
-    /* UI related */
-
-    val contactOrganizationVisible: Boolean
-        get() = config.getBool("app", "display_contact_organization", true)
-
-    private val darkModeAllowed: Boolean
-        get() = config.getBool("app", "dark_mode_allowed", true)
-
-    /* Feature related */
-
-    val showScreenshotButton: Boolean
-        get() = config.getBool("app", "show_take_screenshot_button_in_call", false)
-
-    val dtmfKeypadVibration: Boolean
-        get() = config.getBool("app", "dtmf_keypad_vibraton", false)
-
-    val allowMultipleFilesAndTextInSameMessage: Boolean
-        get() = config.getBool("app", "allow_multiple_files_and_text_in_same_message", true)
-
-    val enableNativeAddressBookIntegration: Boolean
-        get() = config.getBool("app", "enable_native_address_book", true)
-
-    val fetchContactsFromDefaultDirectory: Boolean
-        get() = config.getBool("app", "fetch_contacts_from_default_directory", true)
-
-    val delayBeforeShowingContactsSearchSpinner: Int
-        get() = config.getInt("app", "delay_before_showing_contacts_search_spinner", 200)
-
-    // From Android Contact APIs we can also retrieve the internationalized phone number
-    // By default we display the same value as the native address book app
-    val preferNormalizedPhoneNumbersFromAddressBook: Boolean
-        get() = config.getBool("app", "prefer_normalized_phone_numbers_from_address_book", false)
-
-    val hideStaticImageCamera: Boolean
-        get() = config.getBool("app", "hide_static_image_camera", true)
-
-    // Will prevent user adding contact and editing / removing existing contacts
-    val readOnlyNativeContacts: Boolean
-        get() = config.getBool("app", "read_only_native_address_book", false)
-
-    // Will hide the contacts selector to allow listing all contacts, even those without a SIP address
-    val onlyShowSipContactsList: Boolean
-        get() = config.getBool("app", "only_show_sip_contacts_list", false)
-
-    // Will hide the SIP contacts selector, leaving only the all contacts list
-    val hideSipContactsList: Boolean
-        get() = config.getBool("app", "hide_sip_contacts_list", false)
-
-    // Will disable chat feature completely
-    val disableChat: Boolean
-        get() = config.getBool("app", "disable_chat_feature", false)
-
-    // Will disable video feature completely
-    val disableVideo: Boolean
-        get() = config.getBool("app", "disable_video_feature", false)
-
-    val forceEndToEndEncryptedChat: Boolean
-        get() = config.getBool("app", "force_lime_chat_rooms", false)
-
-    // Turning this ON will show the secure chat button even if there is no LIME capability in presence (or no presence)
-    val allowEndToEndEncryptedChatWithoutPresence: Boolean
-        get() = config.getBool("app", "allow_lime_friend_without_capability", false)
-
-    val showEmojiPickerButton: Boolean
-        get() = config.getBool("app", "show_emoji_picker", true)
-
-    // This will prevent UI from showing up, except for the launcher & the foreground service notification
-    val preventInterfaceFromShowingUp: Boolean
-        get() = config.getBool("app", "keep_app_invisible", false)
-
-    // By default we will record voice messages using MKV format and Opus audio encoding
-    // If disabled, WAV format will be used instead. Warning: files will be heavier!
-    val voiceMessagesFormatMkv: Boolean
-        get() = config.getBool("app", "record_voice_messages_in_mkv_format", true)
-
-    val useEphemeralPerDeviceMode: Boolean
-        get() = config.getBool("app", "ephemeral_chat_messages_settings_per_device", true)
-
-    // If enabled user will see all ringtones bundled in our SDK
-    // and will be able to choose which one to use if not using it's device's default
-    val showAllRingtones: Boolean
-        get() = config.getBool("app", "show_all_available_ringtones", false)
-
-    val showContactInviteBySms: Boolean
-        get() = config.getBool("app", "show_invite_contact_by_sms", true)
-
-    val autoRemoteProvisioningOnConfigUriHandler: Boolean
-        get() = config.getBool("app", "auto_apply_provisioning_config_uri_handler", false)
-
-    val askForAccountPasswordToAccessSettings: Boolean
-        get() = config.getBool("app", "require_password_to_access_settings", false)
-
-    /* Default values related */
-
-    val defaultDomain: String
-        get() = config.getString("app", "default_domain", "sip.linphone.org")!!
-
-    val defaultRlsUri: String
-        get() = config.getString("sip", "rls_uri", "sips:rls@sip.linphone.org")!!
-
-    val debugPopupCode: String
-        get() = config.getString("app", "debug_popup_magic", "#1234#")!!
-
-    // If there is more participants than this value in a conference, force ActiveSpeaker layout
-    val maxConferenceParticipantsForMosaicLayout: Int
-        get() = config.getInt("app", "conference_mosaic_layout_max_participants", 6)
-
-    val conferenceServerUri: String
-        get() = config.getString(
-            "app",
-            "default_conference_factory_uri",
-            "sip:conference-factory@sip.linphone.org"
-        )!!
-
-    val audioVideoConferenceServerUri: String
-        get() = config.getString(
-            "app",
-            "default_audio_video_conference_factory_uri",
-            "sip:videoconference-factory@sip.linphone.org"
-        )!!
-
-    val limeServerUrl: String
-        get() = config.getString(
-            "app",
-            "default_lime_server_url",
-            "https://lime.linphone.org/lime-server/lime-server.php"
-        )!!
-
-    val checkUpdateAvailableInterval: Int
-        get() = config.getInt("app", "version_check_interval", 86400000)
-
-    /* Assistant */
-
-    val showCreateAccount: Boolean
-        get() = config.getBool("app", "assistant_create_account", true)
-
-    val showLinphoneLogin: Boolean
-        get() = config.getBool("app", "assistant_linphone_login", true)
-
-    val showGenericLogin: Boolean
-        get() = config.getBool("app", "assistant_generic_login", true)
-
-    val showRemoteProvisioning: Boolean
-        get() = config.getBool("app", "assistant_remote_provisioning", true)
-
-    /* Side Menu */
-
-    val showAccountsInSideMenu: Boolean
-        get() = config.getBool("app", "side_menu_accounts", true)
-
-    val showAssistantInSideMenu: Boolean
-        get() = config.getBool("app", "side_menu_assistant", true)
-
-    val showSettingsInSideMenu: Boolean
-        get() = config.getBool("app", "side_menu_settings", true)
-
-    val showRecordingsInSideMenu: Boolean
-        get() = config.getBool("app", "side_menu_recordings", true)
-
-    val showScheduledConferencesInSideMenu: Boolean
-        get() = config.getBool(
-            "app",
-            "side_menu_conferences",
-            LinphoneUtils.isRemoteConferencingAvailable()
-        )
-
-    val showAboutInSideMenu: Boolean
-        get() = config.getBool("app", "side_menu_about", true)
-
-    val showQuitInSideMenu: Boolean
-        get() = config.getBool("app", "side_menu_quit", true)
-
-    /* Settings */
-
-    val allowDtlsTransport: Boolean
-        get() = config.getBool("app", "allow_dtls_transport", false)
-
-    val showAccountSettings: Boolean
-        get() = config.getBool("app", "settings_accounts", true)
-
-    val showTunnelSettings: Boolean
-        get() = config.getBool("app", "settings_tunnel", true)
-
-    val showAudioSettings: Boolean
-        get() = config.getBool("app", "settings_audio", true)
-
-    val showVideoSettings: Boolean
-        get() = config.getBool("app", "settings_video", !disableVideo)
-
-    val showCallSettings: Boolean
-        get() = config.getBool("app", "settings_call", true)
-
-    val showChatSettings: Boolean
-        get() = config.getBool("app", "settings_chat", !disableChat)
-
-    val showNetworkSettings: Boolean
-        get() = config.getBool("app", "settings_network", true)
-
-    val showContactsSettings: Boolean
-        get() = config.getBool("app", "settings_contacts", true)
-
-    val showAdvancedSettings: Boolean
-        get() = config.getBool("app", "settings_advanced", true)
-
-    val showConferencesSettings: Boolean
-        get() = config.getBool(
-            "app",
-            "settings_conferences",
-            LinphoneUtils.isRemoteConferencingAvailable()
-        )
-
-    /* Assets stuff */
-
-    val configPath: String
-        get() = context.filesDir.absolutePath + "/.linphonerc"
-
-    val factoryConfigPath: String
-        get() = context.filesDir.absolutePath + "/linphonerc"
-
-    val linphoneDefaultValuesPath: String
-        get() = context.filesDir.absolutePath + "/assistant_linphone_default_values"
-
-    val defaultValuesPath: String
-        get() = context.filesDir.absolutePath + "/assistant_default_values"
-
-    val ringtonesPath: String
-        get() = context.filesDir.absolutePath + "/share/sounds/linphone/rings/"
-
-    val defaultRingtonePath: String
-        get() = ringtonesPath + "notes_of_the_optimistic.mkv"
-
-    val userCertificatesPath: String
-        get() = context.filesDir.absolutePath + "/user-certs"
-
-    val staticPicturePath: String
-        get() = context.filesDir.absolutePath + "/share/images/nowebcamcif.jpg"
-
-    val vfsCachePath: String
-        get() = context.cacheDir.absolutePath + "/evfs/"
-
-    fun copyAssetsFromPackage() {
-        copy("linphonerc_default", configPath)
-        copy("linphonerc_factory", factoryConfigPath, true)
-        copy("assistant_linphone_default_values", linphoneDefaultValuesPath, true)
-        copy("assistant_default_values", defaultValuesPath, true)
-
-        move(
-            context.filesDir.absolutePath + "/linphone-log-history.db",
-            context.filesDir.absolutePath + "/call-history.db"
-        )
-        move(
-            context.filesDir.absolutePath + "/zrtp_secrets",
-            context.filesDir.absolutePath + "/zrtp-secrets.db"
-        )
-    }
-
-    fun getString(resource: Int): String {
-        return context.getString(resource)
-    }
-
-    private fun copy(from: String, to: String, overrideIfExists: Boolean = false) {
-        val outFile = File(to)
-        if (outFile.exists()) {
-            if (!overrideIfExists) {
-                android.util.Log.i(
-                    context.getString(org.linphone.R.string.app_name),
-                    "[Preferences] File $to already exists"
-                )
-                return
-            }
-        }
-        android.util.Log.i(
-            context.getString(org.linphone.R.string.app_name),
-            "[Preferences] Overriding $to by $from asset"
-        )
-
-        val outStream = FileOutputStream(outFile)
-        val inFile = context.assets.open(from)
-        val buffer = ByteArray(1024)
-        var length: Int = inFile.read(buffer)
-
-        while (length > 0) {
-            outStream.write(buffer, 0, length)
-            length = inFile.read(buffer)
-        }
-
-        inFile.close()
-        outStream.flush()
-        outStream.close()
-    }
-
-    private fun move(from: String, to: String, overrideIfExists: Boolean = false) {
-        val inFile = File(from)
-        val outFile = File(to)
-        if (inFile.exists()) {
-            if (outFile.exists() && !overrideIfExists) {
-                android.util.Log.w(
-                    context.getString(org.linphone.R.string.app_name),
-                    "[Preferences] Can't move [$from] to [$to], destination file already exists"
-                )
-            } else {
-                val inStream = FileInputStream(inFile)
-                val outStream = FileOutputStream(outFile)
-
-                val buffer = ByteArray(1024)
-                var read: Int
-                while (inStream.read(buffer).also { read = it } != -1) {
-                    outStream.write(buffer, 0, read)
-                }
-
-                inStream.close()
-                outStream.flush()
-                outStream.close()
-
-                inFile.delete()
-                android.util.Log.i(
-                    context.getString(org.linphone.R.string.app_name),
-                    "[Preferences] Successfully moved [$from] to [$to]"
-                )
-            }
-        } else {
-            android.util.Log.w(
-                context.getString(org.linphone.R.string.app_name),
-                "[Preferences] Can't move [$from] to [$to], source file doesn't exists"
-            )
-        }
-    }
-}
diff --git a/app/src/main/java/org/linphone/core/CorePushReceiver.kt b/app/src/main/java/org/linphone/core/CorePushReceiver.kt
deleted file mode 100644
index d771183df..000000000
--- a/app/src/main/java/org/linphone/core/CorePushReceiver.kt
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.core
-
-import android.content.BroadcastReceiver
-import android.content.Context
-import android.content.Intent
-import org.linphone.LinphoneApplication.Companion.ensureCoreExists
-import org.linphone.core.tools.Log
-
-class CorePushReceiver : BroadcastReceiver() {
-    override fun onReceive(context: Context, intent: Intent) {
-        ensureCoreExists(context.applicationContext, true)
-        Log.i("[Push Notification] Push notification has been received in broadcast receiver")
-    }
-}
diff --git a/app/src/main/java/org/linphone/core/CoreService.kt b/app/src/main/java/org/linphone/core/CoreService.kt
deleted file mode 100644
index f2f715efb..000000000
--- a/app/src/main/java/org/linphone/core/CoreService.kt
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
-     * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.core
-
-import android.content.Intent
-import org.linphone.LinphoneApplication
-import org.linphone.LinphoneApplication.Companion.coreContext
-import org.linphone.LinphoneApplication.Companion.corePreferences
-import org.linphone.LinphoneApplication.Companion.ensureCoreExists
-import org.linphone.core.tools.Log
-import org.linphone.core.tools.service.CoreService
-
-class CoreService : CoreService() {
-    override fun onCreate() {
-        super.onCreate()
-        Log.i("[Service] Created")
-    }
-
-    override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
-        Log.i("[Service] Starting, ensuring Core exists")
-
-        if (corePreferences.keepServiceAlive) {
-            Log.i("[Service] Starting as foreground to keep app alive in background")
-            val contextCreated = ensureCoreExists(
-                applicationContext,
-                pushReceived = false,
-                service = this,
-                useAutoStartDescription = false
-            )
-            if (!contextCreated) {
-                // Only start foreground notification if context already exists, otherwise context will do it itself
-                coreContext.notificationsManager.startForegroundToKeepAppAlive(this, false)
-            }
-        } else if (intent?.extras?.get("StartForeground") == true) {
-            Log.i("[Service] Starting as foreground due to device boot or app update")
-            val contextCreated = ensureCoreExists(
-                applicationContext,
-                pushReceived = false,
-                service = this,
-                useAutoStartDescription = true,
-                skipCoreStart = true
-            )
-            if (contextCreated) {
-                coreContext.start()
-            } else {
-                // Only start foreground notification if context already exists, otherwise context will do it itself
-                coreContext.notificationsManager.startForegroundToKeepAppAlive(this, true)
-            }
-            coreContext.checkIfForegroundServiceNotificationCanBeRemovedAfterDelay(5000)
-        } else {
-            ensureCoreExists(
-                applicationContext,
-                pushReceived = false,
-                service = this,
-                useAutoStartDescription = false
-            )
-        }
-
-        coreContext.notificationsManager.serviceCreated(this)
-
-        return super.onStartCommand(intent, flags, startId)
-    }
-
-    override fun createServiceNotificationChannel() {
-        // Done elsewhere
-    }
-
-    override fun showForegroundServiceNotification(isVideoCall: Boolean) {
-        Log.i("[Service] Starting service as foreground")
-        coreContext.notificationsManager.startCallForeground(this)
-    }
-
-    override fun hideForegroundServiceNotification() {
-        Log.i("[Service] Stopping service as foreground")
-        coreContext.notificationsManager.stopCallForeground()
-    }
-
-    override fun onTaskRemoved(rootIntent: Intent?) {
-        if (LinphoneApplication.contextExists()) {
-            if (coreContext.core.callsNb > 0) {
-                Log.w(
-                    "[Service] Task removed but there is at least one active call, do not stop the Core!"
-                )
-            } else if (!corePreferences.keepServiceAlive) {
-                if (coreContext.core.isInBackground) {
-                    Log.i("[Service] Task removed, stopping Core")
-                    coreContext.stop()
-                } else {
-                    Log.w("[Service] Task removed but Core is not in background, skipping")
-                }
-            } else {
-                Log.i(
-                    "[Service] Task removed but we were asked to keep the service alive, so doing nothing"
-                )
-            }
-        }
-
-        super.onTaskRemoved(rootIntent)
-    }
-
-    override fun onDestroy() {
-        if (LinphoneApplication.contextExists()) {
-            Log.i("[Service] Stopping")
-            coreContext.notificationsManager.serviceDestroyed()
-        }
-
-        super.onDestroy()
-    }
-}
diff --git a/app/src/main/java/org/linphone/notifications/NotificationBroadcastReceiver.kt b/app/src/main/java/org/linphone/notifications/NotificationBroadcastReceiver.kt
deleted file mode 100644
index 6665f3f1c..000000000
--- a/app/src/main/java/org/linphone/notifications/NotificationBroadcastReceiver.kt
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.notifications
-
-import android.app.NotificationManager
-import android.app.RemoteInput
-import android.content.BroadcastReceiver
-import android.content.Context
-import android.content.Intent
-import org.linphone.LinphoneApplication.Companion.coreContext
-import org.linphone.LinphoneApplication.Companion.ensureCoreExists
-import org.linphone.core.Call
-import org.linphone.core.Core
-import org.linphone.core.tools.Log
-
-class NotificationBroadcastReceiver : BroadcastReceiver() {
-    override fun onReceive(context: Context, intent: Intent) {
-        Log.i("[Notification Broadcast Receiver] Ensuring Core exists")
-        ensureCoreExists(context.applicationContext, false)
-
-        val notificationId = intent.getIntExtra(NotificationsManager.INTENT_NOTIF_ID, 0)
-        Log.i(
-            "[Notification Broadcast Receiver] Got notification broadcast for ID [$notificationId]"
-        )
-
-        if (intent.action == NotificationsManager.INTENT_REPLY_NOTIF_ACTION || intent.action == NotificationsManager.INTENT_MARK_AS_READ_ACTION) {
-            handleChatIntent(context, intent, notificationId)
-        } else if (intent.action == NotificationsManager.INTENT_ANSWER_CALL_NOTIF_ACTION || intent.action == NotificationsManager.INTENT_HANGUP_CALL_NOTIF_ACTION) {
-            handleCallIntent(intent)
-        }
-    }
-
-    private fun handleChatIntent(context: Context, intent: Intent, notificationId: Int) {
-        val remoteSipAddress = intent.getStringExtra(NotificationsManager.INTENT_REMOTE_ADDRESS)
-        if (remoteSipAddress == null) {
-            Log.e(
-                "[Notification Broadcast Receiver] Remote SIP address is null for notification id $notificationId"
-            )
-            return
-        }
-        val core: Core = coreContext.core
-
-        val remoteAddress = core.interpretUrl(remoteSipAddress, false)
-        if (remoteAddress == null) {
-            Log.e(
-                "[Notification Broadcast Receiver] Couldn't interpret remote address $remoteSipAddress"
-            )
-            return
-        }
-
-        val localIdentity = intent.getStringExtra(NotificationsManager.INTENT_LOCAL_IDENTITY)
-        if (localIdentity == null) {
-            Log.e(
-                "[Notification Broadcast Receiver] Local identity is null for notification id $notificationId"
-            )
-            return
-        }
-        val localAddress = core.interpretUrl(localIdentity, false)
-        if (localAddress == null) {
-            Log.e(
-                "[Notification Broadcast Receiver] Couldn't interpret local address $localIdentity"
-            )
-            return
-        }
-
-        val room = core.searchChatRoom(null, localAddress, remoteAddress, arrayOfNulls(0))
-        if (room == null) {
-            Log.e(
-                "[Notification Broadcast Receiver] Couldn't find chat room for remote address $remoteSipAddress and local address $localIdentity"
-            )
-            return
-        }
-
-        if (intent.action == NotificationsManager.INTENT_REPLY_NOTIF_ACTION) {
-            val reply = getMessageText(intent)?.toString()
-            if (reply == null) {
-                Log.e("[Notification Broadcast Receiver] Couldn't get reply text")
-                return
-            }
-
-            val msg = room.createMessageFromUtf8(reply)
-            msg.userData = notificationId
-            msg.addListener(coreContext.notificationsManager.chatListener)
-            msg.send()
-            Log.i("[Notification Broadcast Receiver] Reply sent for notif id $notificationId")
-        } else {
-            room.markAsRead()
-            if (!coreContext.notificationsManager.dismissChatNotification(room)) {
-                Log.w(
-                    "[Notification Broadcast Receiver] Notifications Manager failed to cancel notification"
-                )
-                val notificationManager = context.getSystemService(NotificationManager::class.java)
-                notificationManager.cancel(NotificationsManager.CHAT_TAG, notificationId)
-            }
-        }
-    }
-
-    private fun handleCallIntent(intent: Intent) {
-        val remoteSipAddress = intent.getStringExtra(NotificationsManager.INTENT_REMOTE_ADDRESS)
-        if (remoteSipAddress == null) {
-            Log.e("[Notification Broadcast Receiver] Remote SIP address is null for notification")
-            return
-        }
-
-        val core: Core = coreContext.core
-
-        val remoteAddress = core.interpretUrl(remoteSipAddress, false)
-        val call = if (remoteAddress != null) core.getCallByRemoteAddress2(remoteAddress) else null
-        if (call == null) {
-            Log.e(
-                "[Notification Broadcast Receiver] Couldn't find call from remote address $remoteSipAddress"
-            )
-            return
-        }
-
-        if (intent.action == NotificationsManager.INTENT_ANSWER_CALL_NOTIF_ACTION) {
-            coreContext.answerCall(call)
-        } else {
-            if (call.state == Call.State.IncomingReceived ||
-                call.state == Call.State.IncomingEarlyMedia
-            ) {
-                coreContext.declineCall(call)
-            } else {
-                coreContext.terminateCall(call)
-            }
-        }
-    }
-
-    private fun getMessageText(intent: Intent): CharSequence? {
-        val remoteInput = RemoteInput.getResultsFromIntent(intent)
-        return remoteInput?.getCharSequence(NotificationsManager.KEY_TEXT_REPLY)
-    }
-}
diff --git a/app/src/main/java/org/linphone/notifications/NotificationsManager.kt b/app/src/main/java/org/linphone/notifications/NotificationsManager.kt
deleted file mode 100644
index d28715188..000000000
--- a/app/src/main/java/org/linphone/notifications/NotificationsManager.kt
+++ /dev/null
@@ -1,1385 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.notifications
-
-import android.annotation.SuppressLint
-import android.app.Notification
-import android.app.NotificationManager
-import android.app.PendingIntent
-import android.content.Context
-import android.content.Intent
-import android.graphics.Bitmap
-import android.net.Uri
-import android.os.Bundle
-import android.webkit.MimeTypeMap
-import androidx.core.app.NotificationCompat
-import androidx.core.app.NotificationManagerCompat
-import androidx.core.app.Person
-import androidx.core.app.RemoteInput
-import androidx.core.content.ContextCompat
-import androidx.core.content.LocusIdCompat
-import androidx.core.graphics.drawable.IconCompat
-import androidx.navigation.NavDeepLinkBuilder
-import org.linphone.LinphoneApplication.Companion.coreContext
-import org.linphone.LinphoneApplication.Companion.corePreferences
-import org.linphone.R
-import org.linphone.activities.chat_bubble.ChatBubbleActivity
-import org.linphone.activities.main.MainActivity
-import org.linphone.activities.voip.CallActivity
-import org.linphone.compatibility.Compatibility
-import org.linphone.contact.getPerson
-import org.linphone.contact.getThumbnailUri
-import org.linphone.core.*
-import org.linphone.core.tools.Log
-import org.linphone.utils.*
-
-class Notifiable(val notificationId: Int) {
-    val messages: ArrayList<NotifiableMessage> = arrayListOf()
-
-    var isGroup: Boolean = false
-    var groupTitle: String? = null
-    var localIdentity: String? = null
-    var myself: String? = null
-    var remoteAddress: String? = null
-}
-
-class NotifiableMessage(
-    var message: String,
-    val friend: Friend?,
-    val sender: String,
-    val time: Long,
-    val senderAvatar: Bitmap? = null,
-    var filePath: Uri? = null,
-    var fileMime: String? = null,
-    val isOutgoing: Boolean = false,
-    val isReaction: Boolean = false,
-    val reactionToMessageId: String? = null,
-    val reactionFrom: String? = null
-)
-
-class NotificationsManager(private val context: Context) {
-    companion object {
-        const val CHAT_NOTIFICATIONS_GROUP = "CHAT_NOTIF_GROUP"
-        const val KEY_TEXT_REPLY = "key_text_reply"
-        const val INTENT_NOTIF_ID = "NOTIFICATION_ID"
-        const val INTENT_REPLY_NOTIF_ACTION = "org.linphone.REPLY_ACTION"
-        const val INTENT_HANGUP_CALL_NOTIF_ACTION = "org.linphone.HANGUP_CALL_ACTION"
-        const val INTENT_ANSWER_CALL_NOTIF_ACTION = "org.linphone.ANSWER_CALL_ACTION"
-        const val INTENT_MARK_AS_READ_ACTION = "org.linphone.MARK_AS_READ_ACTION"
-        const val INTENT_LOCAL_IDENTITY = "LOCAL_IDENTITY"
-        const val INTENT_REMOTE_ADDRESS = "REMOTE_ADDRESS"
-
-        private const val SERVICE_NOTIF_ID = 1
-        private const val MISSED_CALLS_NOTIF_ID = 10
-
-        const val CHAT_TAG = "Chat"
-        private const val MISSED_CALL_TAG = "Missed call"
-    }
-
-    private val notificationManager: NotificationManagerCompat by lazy {
-        NotificationManagerCompat.from(context)
-    }
-    private val chatNotificationsMap: HashMap<String, Notifiable> = HashMap()
-    private val callNotificationsMap: HashMap<String, Notifiable> = HashMap()
-    private val previousChatNotifications: ArrayList<Int> = arrayListOf()
-    private val chatBubbleNotifications: ArrayList<Int> = arrayListOf()
-
-    private var currentForegroundServiceNotificationId: Int = 0
-    private var serviceNotification: Notification? = null
-
-    private var service: CoreService? = null
-
-    var currentlyDisplayedChatRoomAddress: String? = null
-
-    private val listener: CoreListenerStub = object : CoreListenerStub() {
-        override fun onCallStateChanged(
-            core: Core,
-            call: Call,
-            state: Call.State,
-            message: String
-        ) {
-            Log.i("[Notifications Manager] Call state changed [$state]")
-
-            if (corePreferences.preventInterfaceFromShowingUp) {
-                Log.w("[Notifications Manager] We were asked to not show the call notifications")
-                return
-            }
-
-            when (call.state) {
-                Call.State.IncomingEarlyMedia, Call.State.IncomingReceived -> {
-                    if (service != null) {
-                        Log.i(
-                            "[Notifications Manager] Service isn't null, show incoming call notification"
-                        )
-                        displayIncomingCallNotification(call, false)
-                    } else {
-                        Log.w("[Notifications Manager] No service found, waiting for it to start")
-                    }
-                }
-                Call.State.End, Call.State.Error -> dismissCallNotification(call)
-                Call.State.Released -> {
-                    if (LinphoneUtils.isCallLogMissed(call.callLog)) {
-                        displayMissedCallNotification(call.remoteAddress)
-                    }
-                }
-                Call.State.OutgoingInit, Call.State.OutgoingProgress, Call.State.OutgoingRinging -> {
-                    displayCallNotification(call, false)
-                }
-                else -> displayCallNotification(call, true)
-            }
-        }
-
-        override fun onMessagesReceived(
-            core: Core,
-            room: ChatRoom,
-            messages: Array<out ChatMessage>
-        ) {
-            Log.i("[Notifications Manager] Received ${messages.size} aggregated messages")
-            if (corePreferences.disableChat) return
-
-            if (corePreferences.preventInterfaceFromShowingUp) {
-                Log.w("[Notifications Manager] We were asked to not show the chat notifications")
-                return
-            }
-
-            if (currentlyDisplayedChatRoomAddress == room.peerAddress.asStringUriOnly()) {
-                Log.i(
-                    "[Notifications Manager] Chat room is currently displayed, do not notify received message"
-                )
-                // Mark as read is now done in the DetailChatRoomFragment
-                return
-            }
-
-            if (room.muted) {
-                val id = LinphoneUtils.getChatRoomId(room.localAddress, room.peerAddress)
-                Log.i("[Notifications Manager] Chat room $id has been muted")
-                return
-            }
-
-            if (corePreferences.chatRoomShortcuts) {
-                if (ShortcutsHelper.isShortcutToChatRoomAlreadyCreated(context, room)) {
-                    Log.i("[Notifications Manager] Chat room shortcut already exists")
-                } else {
-                    Log.i(
-                        "[Notifications Manager] Ensure chat room shortcut exists for bubble notification"
-                    )
-                    ShortcutsHelper.createShortcutsToChatRooms(context)
-                }
-            }
-
-            val notifiable = getNotifiableForRoom(room)
-            val updated = updateChatNotifiableWithMessages(notifiable, room, messages)
-            if (!updated) {
-                Log.w(
-                    "[Notifications Manager] No changes made to notifiable, do not display it again"
-                )
-                return
-            }
-
-            if (notifiable.messages.isNotEmpty()) {
-                displayChatNotifiable(room, notifiable)
-            } else {
-                Log.w(
-                    "[Notifications Manager] No message to display in received aggregated messages"
-                )
-            }
-        }
-
-        override fun onReactionRemoved(
-            core: Core,
-            chatRoom: ChatRoom,
-            message: ChatMessage,
-            address: Address
-        ) {
-            Log.i(
-                "[Notifications Manager] [${address.asStringUriOnly()}] removed it's previously sent reaction for chat message [$message]"
-            )
-            if (corePreferences.disableChat) return
-
-            if (chatRoom.muted) {
-                val id = LinphoneUtils.getChatRoomId(chatRoom.localAddress, chatRoom.peerAddress)
-                Log.i("[Notifications Manager] Chat room $id has been muted")
-                return
-            }
-
-            val chatRoomPeerAddress = chatRoom.peerAddress.asStringUriOnly()
-            var notifiable: Notifiable? = chatNotificationsMap[chatRoomPeerAddress]
-            if (notifiable == null) {
-                Log.i(
-                    "[Notifications Manager] No notification for chat room [$chatRoomPeerAddress], nothing to do"
-                )
-                return
-            }
-
-            val from = address.asStringUriOnly()
-            val found = notifiable.messages.find {
-                it.isReaction && it.reactionToMessageId == message.messageId && it.reactionFrom == from
-            }
-            if (found != null) {
-                if (notifiable.messages.remove(found)) {
-                    if (notifiable.messages.isNotEmpty()) {
-                        Log.i(
-                            "[Notifications Manager] After removing original reaction notification there is still messages, updating notification"
-                        )
-                        displayChatNotifiable(chatRoom, notifiable)
-                    } else {
-                        Log.i(
-                            "[Notifications Manager] After removing original reaction notification there is nothing left to display, remove notification"
-                        )
-                        notificationManager.cancel(CHAT_TAG, notifiable.notificationId)
-                    }
-                }
-            } else {
-                Log.w(
-                    "[Notifications Manager] Original reaction not found in currently displayed notification"
-                )
-            }
-        }
-
-        override fun onNewMessageReaction(
-            core: Core,
-            chatRoom: ChatRoom,
-            message: ChatMessage,
-            reaction: ChatMessageReaction
-        ) {
-            val address = reaction.fromAddress
-            val defaultAccountAddress = core.defaultAccount?.params?.identityAddress
-            // Do not notify our own reactions, it won't be done anyway since the chat room is very likely to be currently displayed
-            if (defaultAccountAddress != null && defaultAccountAddress.weakEqual(address)) return
-
-            Log.i(
-                "[Notifications Manager] Reaction received [${reaction.body}] from [${address.asStringUriOnly()}] for chat message [$message]"
-            )
-            if (corePreferences.disableChat) return
-
-            if (corePreferences.preventInterfaceFromShowingUp) {
-                Log.w("[Notifications Manager] We were asked to not show the chat notifications")
-                return
-            }
-
-            if (currentlyDisplayedChatRoomAddress == chatRoom.peerAddress.asStringUriOnly()) {
-                Log.i(
-                    "[Notifications Manager] Chat room is currently displayed, do not notify received reaction"
-                )
-                // Mark as read is now done in the DetailChatRoomFragment
-                return
-            }
-
-            if (chatRoom.muted) {
-                val id = LinphoneUtils.getChatRoomId(chatRoom.localAddress, chatRoom.peerAddress)
-                Log.i("[Notifications Manager] Chat room $id has been muted")
-                return
-            }
-
-            if (coreContext.contactsManager.isAddressMyself(address)) {
-                Log.i(
-                    "[Notifications Manager] Reaction has been sent by ourselves, do not notify it"
-                )
-                return
-            }
-
-            if (corePreferences.chatRoomShortcuts) {
-                if (ShortcutsHelper.isShortcutToChatRoomAlreadyCreated(context, chatRoom)) {
-                    Log.i("[Notifications Manager] Chat room shortcut already exists")
-                } else {
-                    Log.i(
-                        "[Notifications Manager] Ensure chat room shortcut exists for bubble notification"
-                    )
-                    ShortcutsHelper.createShortcutsToChatRooms(context)
-                }
-            }
-
-            val newNotifiable = createChatReactionNotifiable(
-                chatRoom,
-                reaction.body,
-                address,
-                message
-            )
-            if (newNotifiable.messages.isNotEmpty()) {
-                displayChatNotifiable(chatRoom, newNotifiable)
-            } else {
-                Log.e(
-                    "[Notifications Manager] Notifiable is empty but we should have displayed the reaction!"
-                )
-            }
-        }
-
-        override fun onChatRoomRead(core: Core, chatRoom: ChatRoom) {
-            val address = chatRoom.peerAddress.asStringUriOnly()
-            val notifiable = chatNotificationsMap[address]
-            if (notifiable != null) {
-                if (chatBubbleNotifications.contains(notifiable.notificationId)) {
-                    Log.i(
-                        "[Notifications Manager] Chat room [$chatRoom] has been marked as read, not removing notification because of a chat bubble"
-                    )
-                } else {
-                    Log.i(
-                        "[Notifications Manager] Chat room [$chatRoom] has been marked as read, removing notification if any"
-                    )
-                    dismissChatNotification(chatRoom)
-                }
-            } else {
-                val notificationId = getNotificationIdForChat(chatRoom)
-                if (chatBubbleNotifications.contains(notificationId)) {
-                    Log.i(
-                        "[Notifications Manager] Chat room [$chatRoom] has been marked as read but no notifiable found, not removing notification because of a chat bubble"
-                    )
-                } else {
-                    Log.i(
-                        "[Notifications Manager] Chat room [$chatRoom] has been marked as read but no notifiable found, removing notification if any"
-                    )
-                    dismissChatNotification(chatRoom)
-                }
-            }
-        }
-
-        override fun onLastCallEnded(core: Core) {
-            Log.i(
-                "[Notifications Manager] Last call ended, make sure foreground service is stopped and notification removed"
-            )
-            stopCallForeground()
-        }
-    }
-
-    val chatListener: ChatMessageListener = object : ChatMessageListenerStub() {
-        override fun onMsgStateChanged(message: ChatMessage, state: ChatMessage.State) {
-            message.userData ?: return
-            val id = message.userData as Int
-            Log.i("[Notifications Manager] Reply message state changed [$state] for id $id")
-
-            if (state != ChatMessage.State.InProgress) {
-                // No need to be called here twice
-                message.removeListener(this)
-            }
-
-            if (state == ChatMessage.State.Delivered || state == ChatMessage.State.Displayed) {
-                val address = message.chatRoom.peerAddress.asStringUriOnly()
-                val notifiable = chatNotificationsMap[address]
-                if (notifiable != null) {
-                    if (notifiable.notificationId != id) {
-                        Log.w(
-                            "[Notifications Manager] ID doesn't match: ${notifiable.notificationId} != $id"
-                        )
-                    }
-                    displayReplyMessageNotification(message, notifiable)
-                } else {
-                    Log.e(
-                        "[Notifications Manager] Couldn't find notification for chat room $address"
-                    )
-                    cancel(id, CHAT_TAG)
-                }
-            } else if (state == ChatMessage.State.NotDelivered) {
-                Log.e("[Notifications Manager] Reply wasn't delivered")
-                cancel(id, CHAT_TAG)
-            }
-        }
-    }
-
-    init {
-        Compatibility.createNotificationChannels(context, notificationManager)
-
-        val manager = context.getSystemService(NotificationManager::class.java) as NotificationManager
-        for (notification in manager.activeNotifications) {
-            if (notification.tag.isNullOrEmpty()) { // We use null tag for call notifications otherwise it will create duplicates when used with Service.startForeground()...
-                Log.w(
-                    "[Notifications Manager] Found existing call? notification [${notification.id}], cancelling it"
-                )
-                manager.cancel(notification.id)
-            } else if (notification.tag == CHAT_TAG) {
-                Log.i(
-                    "[Notifications Manager] Found existing chat notification [${notification.id}]"
-                )
-                previousChatNotifications.add(notification.id)
-            }
-        }
-    }
-
-    fun onCoreReady() {
-        coreContext.core.addListener(listener)
-    }
-
-    fun destroy() {
-        // Don't use cancelAll to keep message notifications !
-        // When a message is received by a push, it will create a CoreService
-        // but it might be getting killed quite quickly after that
-        // causing the notification to be missed by the user...
-        Log.i(
-            "[Notifications Manager] Getting destroyed, clearing foreground Service & call notifications"
-        )
-
-        if (currentForegroundServiceNotificationId > 0 && !corePreferences.keepServiceAlive) {
-            Log.i("[Notifications Manager] Clearing foreground Service")
-            stopForegroundNotification()
-        }
-
-        if (callNotificationsMap.size > 0) {
-            Log.i("[Notifications Manager] Clearing call notifications")
-            for (notifiable in callNotificationsMap.values) {
-                notificationManager.cancel(notifiable.notificationId)
-            }
-        }
-
-        coreContext.core.removeListener(listener)
-    }
-
-    @SuppressLint("MissingPermission")
-    private fun notify(id: Int, notification: Notification, tag: String? = null) {
-        if (!PermissionHelper.get().hasPostNotificationsPermission()) {
-            Log.w(
-                "[Notifications Manager] Can't notify [$id] with tag [$tag], POST_NOTIFICATIONS permission isn't granted!"
-            )
-            return
-        }
-
-        Log.i("[Notifications Manager] Notifying [$id] with tag [$tag]")
-        try {
-            notificationManager.notify(tag, id, notification)
-        } catch (iae: IllegalArgumentException) {
-            if (service == null && tag == null) {
-                // We can't notify using CallStyle if there isn't a foreground service running
-                Log.w(
-                    "[Notifications Manager] Foreground service hasn't started yet, can't display a CallStyle notification until then: $iae"
-                )
-            } else {
-                Log.e("[Notifications Manager] Exception occurred: $iae")
-            }
-        }
-    }
-
-    fun cancel(id: Int, tag: String? = null) {
-        Log.i("[Notifications Manager] Canceling [$id] with tag [$tag]")
-        notificationManager.cancel(tag, id)
-    }
-
-    fun resetChatNotificationCounterForSipUri(sipUri: String) {
-        val notifiable: Notifiable? = chatNotificationsMap[sipUri]
-        notifiable?.messages?.clear()
-    }
-
-    /* Service related */
-
-    fun startForeground() {
-        val serviceChannel = context.getString(R.string.notification_channel_service_id)
-        if (Compatibility.getChannelImportance(notificationManager, serviceChannel) == NotificationManagerCompat.IMPORTANCE_NONE) {
-            Log.w("[Notifications Manager] Service channel is disabled!")
-            return
-        }
-
-        val coreService = service
-        if (coreService != null) {
-            startForeground(coreService)
-        } else {
-            Log.w(
-                "[Notifications Manager] Can't start service as foreground without a service, starting it now"
-            )
-            val intent = Intent()
-            intent.setClass(coreContext.context, CoreService::class.java)
-            try {
-                Compatibility.startForegroundService(coreContext.context, intent)
-            } catch (ise: IllegalStateException) {
-                Log.e("[Notifications Manager] Failed to start Service: $ise")
-            } catch (se: SecurityException) {
-                Log.e("[Notifications Manager] Failed to start Service: $se")
-            }
-        }
-    }
-
-    fun startCallForeground(coreService: CoreService) {
-        service = coreService
-        when {
-            currentForegroundServiceNotificationId != 0 -> {
-                if (currentForegroundServiceNotificationId != SERVICE_NOTIF_ID) {
-                    Log.e(
-                        "[Notifications Manager] There is already a foreground service notification [$currentForegroundServiceNotificationId]"
-                    )
-                } else {
-                    Log.i(
-                        "[Notifications Manager] There is already a foreground service notification, no need to use the call notification to keep Service alive"
-                    )
-                }
-            }
-            coreContext.core.callsNb > 0 -> {
-                // When this method will be called, we won't have any notification yet
-                val call = coreContext.core.currentCall ?: coreContext.core.calls[0]
-                when (call.state) {
-                    Call.State.IncomingReceived, Call.State.IncomingEarlyMedia -> {
-                        Log.i(
-                            "[Notifications Manager] Creating incoming call notification to be used as foreground service"
-                        )
-                        displayIncomingCallNotification(call, true)
-                    }
-                    else -> {
-                        Log.i(
-                            "[Notifications Manager] Creating call notification to be used as foreground service"
-                        )
-                        displayCallNotification(call, true)
-                    }
-                }
-            }
-        }
-    }
-
-    private fun startForeground(coreService: CoreService) {
-        service = coreService
-
-        val notification = serviceNotification ?: createServiceNotification(false)
-        if (notification == null) {
-            Log.e(
-                "[Notifications Manager] Failed to create service notification, aborting foreground service!"
-            )
-            return
-        }
-
-        currentForegroundServiceNotificationId = SERVICE_NOTIF_ID
-        Log.i(
-            "[Notifications Manager] Starting service as foreground [$currentForegroundServiceNotificationId]"
-        )
-
-        val core = coreContext.core
-        val isActiveCall = if (core.callsNb > 0) {
-            val currentCall = core.currentCall ?: core.calls.first()
-            when (currentCall.state) {
-                Call.State.IncomingReceived, Call.State.IncomingEarlyMedia, Call.State.OutgoingInit, Call.State.OutgoingProgress, Call.State.OutgoingRinging -> false
-                else -> true
-            }
-        } else {
-            false
-        }
-
-        Compatibility.startDataSyncForegroundService(
-            coreService,
-            currentForegroundServiceNotificationId,
-            notification,
-            isActiveCall
-        )
-    }
-
-    fun startForegroundToKeepAppAlive(
-        coreService: CoreService,
-        useAutoStartDescription: Boolean = true
-    ) {
-        service = coreService
-
-        val notification = serviceNotification ?: createServiceNotification(useAutoStartDescription)
-        if (notification == null) {
-            Log.e(
-                "[Notifications Manager] Failed to create service notification, aborting foreground service!"
-            )
-            return
-        }
-
-        currentForegroundServiceNotificationId = SERVICE_NOTIF_ID
-        Log.i(
-            "[Notifications Manager] Starting service as foreground [$currentForegroundServiceNotificationId]"
-        )
-
-        Compatibility.startDataSyncForegroundService(
-            coreService,
-            currentForegroundServiceNotificationId,
-            notification,
-            false
-        )
-    }
-
-    private fun startForeground(
-        notificationId: Int,
-        callNotification: Notification,
-        isCallActive: Boolean
-    ) {
-        val coreService = service
-        if (coreService != null && (currentForegroundServiceNotificationId == 0 || currentForegroundServiceNotificationId == notificationId)) {
-            Log.i(
-                "[Notifications Manager] Starting service as foreground using call notification [$notificationId]"
-            )
-            try {
-                currentForegroundServiceNotificationId = notificationId
-
-                Compatibility.startCallForegroundService(
-                    coreService,
-                    currentForegroundServiceNotificationId,
-                    callNotification,
-                    isCallActive
-                )
-            } catch (e: Exception) {
-                Log.e("[Notifications Manager] Foreground service wasn't allowed! $e")
-                currentForegroundServiceNotificationId = 0
-            }
-        } else {
-            Log.w(
-                "[Notifications Manager] Can't start foreground service using notification id [$notificationId] (current foreground service notification id is [$currentForegroundServiceNotificationId]) and service [$coreService]"
-            )
-        }
-    }
-
-    fun stopForegroundNotification() {
-        if (service != null) {
-            if (currentForegroundServiceNotificationId != 0) {
-                Log.i(
-                    "[Notifications Manager] Stopping service as foreground [$currentForegroundServiceNotificationId]"
-                )
-                currentForegroundServiceNotificationId = 0
-            }
-            service?.stopForeground(true)
-        }
-    }
-
-    fun stopForegroundNotificationIfPossible() {
-        if (service != null && currentForegroundServiceNotificationId == SERVICE_NOTIF_ID && !corePreferences.keepServiceAlive) {
-            Log.i(
-                "[Notifications Manager] Stopping auto-started service notification [$currentForegroundServiceNotificationId]"
-            )
-            stopForegroundNotification()
-        }
-    }
-
-    fun stopCallForeground() {
-        if (service != null && currentForegroundServiceNotificationId != SERVICE_NOTIF_ID) {
-            Log.i(
-                "[Notifications Manager] Stopping call notification [$currentForegroundServiceNotificationId] used as foreground service"
-            )
-            stopForegroundNotification()
-        }
-    }
-
-    fun serviceCreated(createdService: CoreService) {
-        Log.i("[Notifications Manager] Service has been created, keeping it around")
-        service = createdService
-    }
-
-    fun serviceDestroyed() {
-        Log.i("[Notifications Manager] Service has been destroyed")
-        stopForegroundNotification()
-        service = null
-    }
-
-    private fun createServiceNotification(useAutoStartDescription: Boolean = false): Notification? {
-        val serviceChannel = context.getString(R.string.notification_channel_service_id)
-        if (Compatibility.getChannelImportance(notificationManager, serviceChannel) == NotificationManagerCompat.IMPORTANCE_NONE) {
-            Log.w("[Notifications Manager] Service channel is disabled!")
-            return null
-        }
-
-        val pendingIntent = NavDeepLinkBuilder(context)
-            .setComponentName(MainActivity::class.java)
-            .setGraph(R.navigation.main_nav_graph)
-            .setDestination(R.id.dialerFragment)
-            .createPendingIntent()
-
-        val builder = NotificationCompat.Builder(context, serviceChannel)
-            .setContentTitle(context.getString(R.string.service_name))
-            .setContentText(
-                if (useAutoStartDescription) {
-                    context.getString(
-                        R.string.service_auto_start_description
-                    )
-                } else {
-                    context.getString(R.string.service_description)
-                }
-            )
-            .setSmallIcon(R.drawable.topbar_service_notification)
-            .setCategory(NotificationCompat.CATEGORY_SERVICE)
-            .setVisibility(NotificationCompat.VISIBILITY_SECRET)
-            .setWhen(System.currentTimeMillis())
-            .setShowWhen(true)
-            .setOngoing(true)
-            .setColor(ContextCompat.getColor(context, R.color.primary_color))
-
-        if (!corePreferences.preventInterfaceFromShowingUp) {
-            builder.setContentIntent(pendingIntent)
-        }
-
-        val notif = builder.build()
-        serviceNotification = notif
-        return notif
-    }
-
-    /* Call related */
-
-    private fun getNotificationIdForCall(call: Call): Int {
-        return call.callLog.startDate.toInt()
-    }
-
-    private fun getNotifiableForCall(call: Call): Notifiable {
-        val address = call.remoteAddress.asStringUriOnly()
-        var notifiable: Notifiable? = callNotificationsMap[address]
-        if (notifiable == null) {
-            notifiable = Notifiable(getNotificationIdForCall(call))
-            notifiable.remoteAddress = call.remoteAddress.asStringUriOnly()
-
-            callNotificationsMap[address] = notifiable
-        }
-        return notifiable
-    }
-
-    fun getPerson(friend: Friend?, displayName: String, picture: Bitmap?): Person {
-        return friend?.getPerson()
-            ?: Person.Builder()
-                .setName(displayName)
-                .setIcon(
-                    if (picture != null) {
-                        IconCompat.createWithAdaptiveBitmap(picture)
-                    } else {
-                        coreContext.contactsManager.contactAvatar
-                    }
-                )
-                .setKey(displayName)
-                .build()
-    }
-
-    fun displayIncomingCallNotification(call: Call, useAsForeground: Boolean) {
-        if (coreContext.declineCallDueToGsmActiveCall()) {
-            Log.w(
-                "[Notifications Manager] Call will be declined, do not show incoming call notification"
-            )
-            return
-        }
-
-        val notifiable = getNotifiableForCall(call)
-        if (notifiable.notificationId == currentForegroundServiceNotificationId) {
-            Log.i(
-                "[Notifications Manager] There is already a Service foreground notification for this incoming call, skipping"
-            )
-            return
-        }
-
-        try {
-            val showLockScreenNotification = android.provider.Settings.Secure.getInt(
-                context.contentResolver,
-                "lock_screen_show_notifications",
-                0
-            )
-            Log.i(
-                "[Notifications Manager] Are notifications allowed on lock screen? ${showLockScreenNotification != 0} ($showLockScreenNotification)"
-            )
-        } catch (e: Exception) {
-            Log.e(
-                "[Notifications Manager] Failed to get android.provider.Settings.Secure.getInt(lock_screen_show_notifications): $e"
-            )
-        }
-
-        val incomingCallNotificationIntent = Intent(context, CallActivity::class.java)
-        incomingCallNotificationIntent.addFlags(
-            Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_NO_USER_ACTION or Intent.FLAG_FROM_BACKGROUND
-        )
-        val pendingIntent = PendingIntent.getActivity(
-            context,
-            0,
-            incomingCallNotificationIntent,
-            PendingIntent.FLAG_CANCEL_CURRENT or PendingIntent.FLAG_IMMUTABLE
-        )
-
-        val notification = Compatibility.createIncomingCallNotification(
-            context,
-            call,
-            notifiable,
-            pendingIntent,
-            this
-        )
-        Log.i(
-            "[Notifications Manager] Notifying incoming call notification [${notifiable.notificationId}]"
-        )
-        notify(notifiable.notificationId, notification)
-
-        if (useAsForeground) {
-            Log.i(
-                "[Notifications Manager] Notifying incoming call notification for foreground service [${notifiable.notificationId}]"
-            )
-            startForeground(notifiable.notificationId, notification, false)
-        }
-    }
-
-    private fun displayMissedCallNotification(remoteAddress: Address) {
-        val missedCallCount: Int = coreContext.core.missedCallsCount
-        val body: String
-        if (missedCallCount > 1) {
-            body = context.getString(R.string.missed_calls_notification_body)
-                .format(missedCallCount)
-            Log.i(
-                "[Notifications Manager] Updating missed calls notification count to $missedCallCount"
-            )
-        } else {
-            val friend: Friend? = coreContext.contactsManager.findContactByAddress(remoteAddress)
-            body = context.getString(R.string.missed_call_notification_body)
-                .format(friend?.name ?: LinphoneUtils.getDisplayName(remoteAddress))
-            Log.i("[Notifications Manager] Creating missed call notification")
-        }
-
-        val pendingIntent = NavDeepLinkBuilder(context)
-            .setComponentName(MainActivity::class.java)
-            .setGraph(R.navigation.main_nav_graph)
-            .setDestination(R.id.masterCallLogsFragment)
-            .createPendingIntent()
-
-        val builder = NotificationCompat.Builder(
-            context,
-            context.getString(R.string.notification_channel_missed_call_id)
-        )
-            .setContentTitle(context.getString(R.string.missed_call_notification_title))
-            .setContentText(body)
-            .setSmallIcon(R.drawable.topbar_missed_call_notification)
-            .setAutoCancel(true)
-            // .setCategory(NotificationCompat.CATEGORY_EVENT) No one really matches "missed call"
-            .setVisibility(NotificationCompat.VISIBILITY_PRIVATE)
-            .setWhen(System.currentTimeMillis())
-            .setShowWhen(true)
-            .setNumber(missedCallCount)
-            .setColor(ContextCompat.getColor(context, R.color.notification_led_color))
-
-        if (!corePreferences.preventInterfaceFromShowingUp) {
-            builder.setContentIntent(pendingIntent)
-        }
-
-        val notification = builder.build()
-        notify(MISSED_CALLS_NOTIF_ID, notification, MISSED_CALL_TAG)
-    }
-
-    fun dismissMissedCallNotification() {
-        cancel(MISSED_CALLS_NOTIF_ID, MISSED_CALL_TAG)
-    }
-
-    private fun displayCallNotification(call: Call, isCallActive: Boolean) {
-        val notifiable = getNotifiableForCall(call)
-
-        val serviceChannel = context.getString(R.string.notification_channel_service_id)
-        val channelToUse = when (
-            val serviceChannelImportance = Compatibility.getChannelImportance(
-                notificationManager,
-                serviceChannel
-            )
-        ) {
-            NotificationManagerCompat.IMPORTANCE_NONE -> {
-                Log.w(
-                    "[Notifications Manager] Service channel is disabled, using incoming call channel instead!"
-                )
-                context.getString(R.string.notification_channel_incoming_call_id)
-            }
-            NotificationManagerCompat.IMPORTANCE_LOW -> {
-                // Expected, nothing to do
-                serviceChannel
-            }
-            else -> {
-                // If user disables & enabled back service notifications channel, importance won't be low anymore but default!
-                Log.w(
-                    "[Notifications Manager] Service channel importance is $serviceChannelImportance and not LOW (${NotificationManagerCompat.IMPORTANCE_LOW}) as expected!"
-                )
-                serviceChannel
-            }
-        }
-
-        val callNotificationIntent = Intent(context, CallActivity::class.java)
-        callNotificationIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-        val pendingIntent = PendingIntent.getActivity(
-            context,
-            0,
-            callNotificationIntent,
-            PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
-        )
-
-        val notification = Compatibility.createCallNotification(
-            context,
-            call,
-            notifiable,
-            pendingIntent,
-            channelToUse,
-            this
-        )
-        Log.i("[Notifications Manager] Notifying call notification [${notifiable.notificationId}]")
-        notify(notifiable.notificationId, notification)
-
-        val coreService = service
-        if (coreService != null && (currentForegroundServiceNotificationId == 0 || currentForegroundServiceNotificationId == notifiable.notificationId)) {
-            Log.i(
-                "[Notifications Manager] Notifying call notification for foreground service [${notifiable.notificationId}]"
-            )
-            startForeground(notifiable.notificationId, notification, isCallActive)
-        } else if (coreService != null && currentForegroundServiceNotificationId == SERVICE_NOTIF_ID) {
-            // To add microphone & camera foreground service use to foreground service if needed
-            startForeground(coreService)
-        }
-    }
-
-    private fun dismissCallNotification(call: Call) {
-        val address = call.remoteAddress.asStringUriOnly()
-        val notifiable: Notifiable? = callNotificationsMap[address]
-        if (notifiable != null) {
-            cancel(notifiable.notificationId)
-            callNotificationsMap.remove(address)
-        } else {
-            Log.w("[Notifications Manager] No notification found for call ${call.callLog.callId}")
-        }
-
-        // To remove microphone & camera foreground service use to foreground service if needed
-        val coreService = service
-        if (coreService != null && currentForegroundServiceNotificationId == SERVICE_NOTIF_ID) {
-            startForeground(coreService)
-        }
-    }
-
-    /* Chat related */
-
-    private fun getNotificationIdForChat(chatRoom: ChatRoom): Int {
-        return LinphoneUtils.getChatRoomId(chatRoom).hashCode()
-    }
-
-    private fun displayChatNotifiable(room: ChatRoom, notifiable: Notifiable) {
-        val localAddress = room.localAddress.asStringUriOnly()
-        val peerAddress = room.peerAddress.asStringUriOnly()
-        val args = Bundle()
-        args.putString("RemoteSipUri", peerAddress)
-        args.putString("LocalSipUri", localAddress)
-
-        val pendingIntent = NavDeepLinkBuilder(context)
-            .setComponentName(MainActivity::class.java)
-            .setGraph(R.navigation.main_nav_graph)
-            .setDestination(R.id.masterChatRoomsFragment)
-            .setArguments(args)
-            .createPendingIntent()
-
-        // PendingIntents attached to bubbles must be mutable
-        val target = Intent(context, ChatBubbleActivity::class.java)
-        target.putExtra("RemoteSipUri", peerAddress)
-        target.putExtra("LocalSipUri", localAddress)
-        val bubbleIntent = PendingIntent.getActivity(
-            context,
-            notifiable.notificationId,
-            target,
-            Compatibility.getUpdateCurrentPendingIntentFlag()
-        )
-
-        val id = LinphoneUtils.getChatRoomId(room.localAddress, room.peerAddress)
-        val me = coreContext.contactsManager.getMePerson(room.localAddress)
-        val notification = createMessageNotification(
-            notifiable,
-            pendingIntent,
-            bubbleIntent,
-            id,
-            me
-        )
-        notify(notifiable.notificationId, notification, CHAT_TAG)
-    }
-
-    private fun updateChatNotifiableWithMessages(
-        notifiable: Notifiable,
-        room: ChatRoom,
-        messages: Array<out ChatMessage>
-    ): Boolean {
-        var updated = false
-        for (message in messages) {
-            if (message.isRead || message.isOutgoing) continue
-            val friend = coreContext.contactsManager.findContactByAddress(message.fromAddress)
-            val notifiableMessage = getNotifiableMessage(message, friend)
-            notifiable.messages.add(notifiableMessage)
-            updated = true
-        }
-
-        if (room.hasCapability(ChatRoom.Capabilities.OneToOne.toInt())) {
-            notifiable.isGroup = false
-        } else {
-            notifiable.isGroup = true
-            notifiable.groupTitle = room.subject
-        }
-        return updated
-    }
-
-    private fun createChatReactionNotifiable(
-        room: ChatRoom,
-        reaction: String,
-        from: Address,
-        message: ChatMessage
-    ): Notifiable {
-        val notifiable = getNotifiableForRoom(room)
-
-        // Check for previous reaction notifiable from the same person for the same message
-        val fromAddr = from.asStringUriOnly()
-        val found = notifiable.messages.find {
-            it.isReaction && it.reactionToMessageId == message.messageId && it.reactionFrom == fromAddr
-        }
-        if (found != null) {
-            Log.i(
-                "[Notifications Manager] Found a previous notifiable for a reaction from the same person to the same message, removing it"
-            )
-            notifiable.messages.remove(found)
-        }
-
-        val friend = coreContext.contactsManager.findContactByAddress(from)
-        val roundPicture = ImageUtils.getRoundBitmapFromUri(context, friend?.getThumbnailUri())
-        val displayName = friend?.name ?: LinphoneUtils.getDisplayName(from)
-
-        val originalMessage = LinphoneUtils.getTextDescribingMessage(message)
-        val text = AppUtils.getString(R.string.chat_message_reaction_received).format(
-            displayName,
-            reaction,
-            originalMessage
-        )
-
-        val notifiableMessage = NotifiableMessage(
-            text,
-            friend,
-            displayName,
-            message.time,
-            senderAvatar = roundPicture,
-            isOutgoing = false,
-            isReaction = true,
-            reactionToMessageId = message.messageId,
-            reactionFrom = from.asStringUriOnly()
-        )
-        notifiable.messages.add(notifiableMessage)
-
-        return notifiable
-    }
-
-    private fun getNotifiableForRoom(room: ChatRoom): Notifiable {
-        val address = room.peerAddress.asStringUriOnly()
-        var notifiable: Notifiable? = chatNotificationsMap[address]
-        if (notifiable == null) {
-            notifiable = Notifiable(getNotificationIdForChat(room))
-            notifiable.myself = LinphoneUtils.getDisplayName(room.localAddress)
-            notifiable.localIdentity = room.localAddress.asStringUriOnly()
-            notifiable.remoteAddress = room.peerAddress.asStringUriOnly()
-
-            chatNotificationsMap[address] = notifiable
-
-            if (room.hasCapability(ChatRoom.Capabilities.OneToOne.toInt())) {
-                notifiable.isGroup = false
-            } else {
-                notifiable.isGroup = true
-                notifiable.groupTitle = room.subject
-            }
-        }
-        return notifiable
-    }
-
-    private fun getNotifiableMessage(message: ChatMessage, friend: Friend?): NotifiableMessage {
-        val roundPicture = ImageUtils.getRoundBitmapFromUri(context, friend?.getThumbnailUri())
-        val displayName = friend?.name ?: LinphoneUtils.getDisplayName(message.fromAddress)
-        val text = LinphoneUtils.getTextDescribingMessage(message)
-        val notifiableMessage = NotifiableMessage(
-            text,
-            friend,
-            displayName,
-            message.time * 1000, /* Linphone timestamps are in seconds */
-            senderAvatar = roundPicture,
-            isOutgoing = message.isOutgoing
-        )
-
-        for (content in message.contents) {
-            if (content.isFile) {
-                val path = content.filePath
-                if (path != null) {
-                    val contentUri: Uri = FileUtils.getPublicFilePath(context, path)
-                    val filePath: String = contentUri.toString()
-                    val extension = FileUtils.getExtensionFromFileName(filePath)
-                    if (extension.isNotEmpty()) {
-                        val mime =
-                            MimeTypeMap.getSingleton().getMimeTypeFromExtension(extension)
-                        notifiableMessage.filePath = contentUri
-                        notifiableMessage.fileMime = mime
-                        Log.i(
-                            "[Notifications Manager] Added file $contentUri with MIME $mime to notification"
-                        )
-                    } else {
-                        Log.e(
-                            "[Notifications Manager] Couldn't find extension for incoming message with file $path"
-                        )
-                    }
-                }
-            }
-        }
-
-        return notifiableMessage
-    }
-
-    private fun displayReplyMessageNotification(message: ChatMessage, notifiable: Notifiable) {
-        Log.i(
-            "[Notifications Manager] Updating message notification with reply for notification ${notifiable.notificationId}"
-        )
-
-        val text = message.contents.find { content -> content.isText }?.utf8Text ?: ""
-        val senderAddress = message.fromAddress
-        val reply = NotifiableMessage(
-            text,
-            null,
-            notifiable.myself ?: LinphoneUtils.getDisplayName(senderAddress),
-            System.currentTimeMillis(),
-            isOutgoing = true
-        )
-        notifiable.messages.add(reply)
-
-        displayChatNotifiable(message.chatRoom, notifiable)
-    }
-
-    fun dismissChatNotification(room: ChatRoom): Boolean {
-        val address = room.peerAddress.asStringUriOnly()
-        val notifiable: Notifiable? = chatNotificationsMap[address]
-        if (notifiable != null) {
-            Log.i(
-                "[Notifications Manager] Dismissing notification for chat room $room with id ${notifiable.notificationId}"
-            )
-            notifiable.messages.clear()
-            cancel(notifiable.notificationId, CHAT_TAG)
-            return true
-        } else {
-            val previousNotificationId = previousChatNotifications.find { id ->
-                id == getNotificationIdForChat(
-                    room
-                )
-            }
-            if (previousNotificationId != null) {
-                if (chatBubbleNotifications.contains(previousNotificationId)) {
-                    Log.i(
-                        "[Notifications Manager] Found previous notification with same ID [$previousNotificationId] but not cancelling it as it's ID is in chat bubbles list"
-                    )
-                } else {
-                    Log.i(
-                        "[Notifications Manager] Found previous notification with same ID [$previousNotificationId], canceling it"
-                    )
-                    cancel(previousNotificationId, CHAT_TAG)
-                }
-                return true
-            }
-        }
-        return false
-    }
-
-    fun changeDismissNotificationUponReadForChatRoom(chatRoom: ChatRoom, dismiss: Boolean) {
-        val notificationId = getNotificationIdForChat(chatRoom)
-        if (dismiss) {
-            Log.i(
-                "[Notifications Manager] Allow notification with id [$notificationId] to be dismissed when chat room will be marked as read, used for chat bubble"
-            )
-            chatBubbleNotifications.add(notificationId)
-        } else {
-            Log.i(
-                "[Notifications Manager] Prevent notification with id [$notificationId] from being dismissed when chat room will be marked as read, used for chat bubble"
-            )
-            chatBubbleNotifications.remove(notificationId)
-        }
-    }
-
-    /* Notifications */
-
-    private fun createMessageNotification(
-        notifiable: Notifiable,
-        pendingIntent: PendingIntent,
-        bubbleIntent: PendingIntent,
-        id: String,
-        me: Person
-    ): Notification {
-        val style = NotificationCompat.MessagingStyle(me)
-        val allPersons = arrayListOf<Person>()
-
-        var lastPersonAvatar: Bitmap? = null
-        var lastPerson: Person? = null
-        for (message in notifiable.messages) {
-            val friend = message.friend
-            val person = getPerson(friend, message.sender, message.senderAvatar)
-
-            if (!message.isOutgoing) {
-                // We don't want to see our own avatar
-                lastPerson = person
-                lastPersonAvatar = message.senderAvatar
-
-                if (allPersons.find { it.key == person.key } == null) {
-                    allPersons.add(person)
-                }
-            }
-
-            val senderPerson = if (message.isOutgoing) null else person // Use null for ourselves
-            val msg = if (corePreferences.hideChatMessageContentInNotification) {
-                NotificationCompat.MessagingStyle.Message(
-                    AppUtils.getString(R.string.chat_message_notification_hidden_content),
-                    message.time,
-                    senderPerson
-                )
-            } else {
-                val tmp = NotificationCompat.MessagingStyle.Message(
-                    message.message,
-                    message.time,
-                    senderPerson
-                )
-                if (message.filePath != null) tmp.setData(message.fileMime, message.filePath)
-                tmp
-            }
-
-            style.addMessage(msg)
-            if (message.isOutgoing) {
-                style.addHistoricMessage(msg)
-            }
-        }
-
-        style.conversationTitle = if (notifiable.isGroup) notifiable.groupTitle else lastPerson?.name
-        style.isGroupConversation = notifiable.isGroup
-
-        val icon = lastPerson?.icon ?: coreContext.contactsManager.contactAvatar
-        val bubble = NotificationCompat.BubbleMetadata.Builder(bubbleIntent, icon)
-            .setDesiredHeightResId(R.dimen.chat_message_bubble_desired_height)
-            .build()
-
-        val largeIcon = if (notifiable.isGroup) coreContext.contactsManager.groupBitmap else lastPersonAvatar
-        val notificationBuilder = NotificationCompat.Builder(
-            context,
-            context.getString(R.string.notification_channel_chat_id)
-        )
-            .setSmallIcon(R.drawable.topbar_chat_notification)
-            .setAutoCancel(true)
-            .setLargeIcon(largeIcon)
-            .setColor(ContextCompat.getColor(context, R.color.primary_color))
-            .setCategory(NotificationCompat.CATEGORY_MESSAGE)
-            .setGroup(CHAT_NOTIFICATIONS_GROUP)
-            .setVisibility(NotificationCompat.VISIBILITY_PRIVATE)
-            .setNumber(notifiable.messages.size)
-            .setWhen(System.currentTimeMillis())
-            .setShowWhen(true)
-            .setStyle(style)
-            .addAction(getReplyMessageAction(notifiable))
-            .addAction(getMarkMessageAsReadAction(notifiable))
-            .setShortcutId(id)
-            .setLocusId(LocusIdCompat(id))
-
-        for (person in allPersons) {
-            notificationBuilder.addPerson(person)
-        }
-
-        if (!corePreferences.preventInterfaceFromShowingUp) {
-            notificationBuilder.setContentIntent(pendingIntent)
-        }
-
-        if (corePreferences.markAsReadUponChatMessageNotificationDismissal) {
-            Log.i(
-                "[Notifications Manager] Chat room will be marked as read when notification will be dismissed"
-            )
-            notificationBuilder
-                .setDeleteIntent(getMarkMessageAsReadPendingIntent(notifiable))
-        }
-
-        if (!Compatibility.canChatMessageChannelBubble(context)) {
-            Log.w("[Notifications Manager] This conversation wasn't granted bubble permission yet")
-        }
-        // We still need to set the bubbleMetadata, otherwise user won't ever be able to enable bubbles!
-        notificationBuilder.bubbleMetadata = bubble
-        return notificationBuilder.build()
-    }
-
-    /* Notifications actions */
-
-    fun getCallAnswerPendingIntent(notifiable: Notifiable): PendingIntent {
-        val answerIntent = Intent(context, NotificationBroadcastReceiver::class.java)
-        answerIntent.action = INTENT_ANSWER_CALL_NOTIF_ACTION
-        answerIntent.putExtra(INTENT_NOTIF_ID, notifiable.notificationId)
-        answerIntent.putExtra(INTENT_REMOTE_ADDRESS, notifiable.remoteAddress)
-
-        return PendingIntent.getBroadcast(
-            context,
-            notifiable.notificationId,
-            answerIntent,
-            PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
-        )
-    }
-
-    fun getCallAnswerAction(notifiable: Notifiable): NotificationCompat.Action {
-        return NotificationCompat.Action.Builder(
-            R.drawable.call_audio_start,
-            context.getString(R.string.incoming_call_notification_answer_action_label),
-            getCallAnswerPendingIntent(notifiable)
-        ).build()
-    }
-
-    fun getCallDeclinePendingIntent(notifiable: Notifiable): PendingIntent {
-        val hangupIntent = Intent(context, NotificationBroadcastReceiver::class.java)
-        hangupIntent.action = INTENT_HANGUP_CALL_NOTIF_ACTION
-        hangupIntent.putExtra(INTENT_NOTIF_ID, notifiable.notificationId)
-        hangupIntent.putExtra(INTENT_REMOTE_ADDRESS, notifiable.remoteAddress)
-
-        return PendingIntent.getBroadcast(
-            context,
-            notifiable.notificationId,
-            hangupIntent,
-            PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
-        )
-    }
-
-    fun getCallDeclineAction(notifiable: Notifiable): NotificationCompat.Action {
-        return NotificationCompat.Action.Builder(
-            R.drawable.call_hangup,
-            context.getString(R.string.incoming_call_notification_hangup_action_label),
-            getCallDeclinePendingIntent(notifiable)
-        )
-            .setShowsUserInterface(false)
-            .build()
-    }
-
-    private fun getReplyMessageAction(notifiable: Notifiable): NotificationCompat.Action {
-        val replyLabel =
-            context.resources.getString(R.string.received_chat_notification_reply_label)
-        val remoteInput =
-            RemoteInput.Builder(KEY_TEXT_REPLY).setLabel(replyLabel).build()
-
-        val replyIntent = Intent(context, NotificationBroadcastReceiver::class.java)
-        replyIntent.action = INTENT_REPLY_NOTIF_ACTION
-        replyIntent.putExtra(INTENT_NOTIF_ID, notifiable.notificationId)
-        replyIntent.putExtra(INTENT_LOCAL_IDENTITY, notifiable.localIdentity)
-        replyIntent.putExtra(INTENT_REMOTE_ADDRESS, notifiable.remoteAddress)
-
-        // PendingIntents attached to actions with remote inputs must be mutable
-        val replyPendingIntent = PendingIntent.getBroadcast(
-            context,
-            notifiable.notificationId,
-            replyIntent,
-            Compatibility.getUpdateCurrentPendingIntentFlag()
-        )
-        return NotificationCompat.Action.Builder(
-            R.drawable.chat_send_over,
-            context.getString(R.string.received_chat_notification_reply_label),
-            replyPendingIntent
-        )
-            .addRemoteInput(remoteInput)
-            .setAllowGeneratedReplies(true)
-            .setShowsUserInterface(false)
-            .setSemanticAction(NotificationCompat.Action.SEMANTIC_ACTION_REPLY)
-            .build()
-    }
-
-    private fun getMarkMessageAsReadPendingIntent(notifiable: Notifiable): PendingIntent {
-        val markAsReadIntent = Intent(context, NotificationBroadcastReceiver::class.java)
-        markAsReadIntent.action = INTENT_MARK_AS_READ_ACTION
-        markAsReadIntent.putExtra(INTENT_NOTIF_ID, notifiable.notificationId)
-        markAsReadIntent.putExtra(INTENT_LOCAL_IDENTITY, notifiable.localIdentity)
-        markAsReadIntent.putExtra(INTENT_REMOTE_ADDRESS, notifiable.remoteAddress)
-
-        return PendingIntent.getBroadcast(
-            context,
-            notifiable.notificationId,
-            markAsReadIntent,
-            PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
-        )
-    }
-
-    private fun getMarkMessageAsReadAction(notifiable: Notifiable): NotificationCompat.Action {
-        val markAsReadPendingIntent = getMarkMessageAsReadPendingIntent(notifiable)
-        return NotificationCompat.Action.Builder(
-            R.drawable.chat_send_over,
-            context.getString(R.string.received_chat_notification_mark_as_read_label),
-            markAsReadPendingIntent
-        )
-            .setShowsUserInterface(false)
-            .setSemanticAction(NotificationCompat.Action.SEMANTIC_ACTION_MARK_AS_READ)
-            .build()
-    }
-}
diff --git a/app/src/main/java/org/linphone/telecom/NativeCallWrapper.kt b/app/src/main/java/org/linphone/telecom/NativeCallWrapper.kt
deleted file mode 100644
index 823490e32..000000000
--- a/app/src/main/java/org/linphone/telecom/NativeCallWrapper.kt
+++ /dev/null
@@ -1,178 +0,0 @@
-/*
- * Copyright (c) 2010-2021 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.telecom
-
-import android.annotation.TargetApi
-import android.graphics.drawable.Icon
-import android.os.Bundle
-import android.telecom.CallAudioState
-import android.telecom.Connection
-import android.telecom.DisconnectCause
-import android.telecom.StatusHints
-import org.linphone.LinphoneApplication.Companion.coreContext
-import org.linphone.R
-import org.linphone.core.Call
-import org.linphone.core.tools.Log
-import org.linphone.utils.AudioRouteUtils
-
-@TargetApi(29)
-class NativeCallWrapper(var callId: String) : Connection() {
-    init {
-        val properties = connectionProperties or PROPERTY_SELF_MANAGED
-        connectionProperties = properties
-
-        val capabilities = connectionCapabilities or CAPABILITY_MUTE or CAPABILITY_SUPPORT_HOLD or CAPABILITY_HOLD
-        connectionCapabilities = capabilities
-
-        audioModeIsVoip = true
-        statusHints = StatusHints(
-            "",
-            Icon.createWithResource(coreContext.context, R.drawable.linphone_logo_tinted),
-            Bundle()
-        )
-    }
-
-    override fun onStateChanged(state: Int) {
-        Log.i(
-            "[Connection] Telecom state changed [${intStateToString(state)}] for call with id: $callId"
-        )
-        super.onStateChanged(state)
-    }
-
-    override fun onAnswer(videoState: Int) {
-        Log.i("[Connection] Answering telecom call with id: $callId")
-        getCall()?.accept() ?: selfDestroy()
-    }
-
-    override fun onHold() {
-        Log.i("[Connection] Pausing telecom call with id: $callId")
-        getCall()?.let { call ->
-            if (call.conference != null) {
-                call.conference?.leave()
-            } else {
-                call.pause()
-            }
-        } ?: selfDestroy()
-        setOnHold()
-    }
-
-    override fun onUnhold() {
-        Log.i("[Connection] Resuming telecom call with id: $callId")
-        getCall()?.let { call ->
-            if (call.conference != null) {
-                call.conference?.enter()
-            } else {
-                call.resume()
-            }
-        } ?: selfDestroy()
-        setActive()
-    }
-
-    override fun onCallAudioStateChanged(state: CallAudioState) {
-        Log.i("[Connection] Audio state changed: $state")
-
-        val call = getCall()
-        if (call != null) {
-            if (getState() != STATE_ACTIVE && getState() != STATE_DIALING) {
-                Log.w(
-                    "[Connection] Call state isn't STATE_ACTIVE or STATE_DIALING, ignoring mute mic & audio route directive from TelecomManager"
-                )
-                return
-            }
-
-            if (state.isMuted != call.microphoneMuted) {
-                Log.w(
-                    "[Connection] Connection audio state asks for changing in mute: ${state.isMuted}, currently is ${call.microphoneMuted}"
-                )
-                if (state.isMuted) {
-                    Log.w("[Connection] Muting microphone")
-                    call.microphoneMuted = true
-                }
-            }
-
-            when (state.route) {
-                CallAudioState.ROUTE_EARPIECE -> AudioRouteUtils.routeAudioToEarpiece(call, true)
-                CallAudioState.ROUTE_SPEAKER -> AudioRouteUtils.routeAudioToSpeaker(call, true)
-                CallAudioState.ROUTE_BLUETOOTH -> AudioRouteUtils.routeAudioToBluetooth(call, true)
-                CallAudioState.ROUTE_WIRED_HEADSET -> AudioRouteUtils.routeAudioToHeadset(
-                    call,
-                    true
-                )
-            }
-        } else {
-            selfDestroy()
-        }
-    }
-
-    override fun onPlayDtmfTone(c: Char) {
-        Log.i("[Connection] Sending DTMF [$c] in telecom call with id: $callId")
-        getCall()?.sendDtmf(c) ?: selfDestroy()
-    }
-
-    override fun onDisconnect() {
-        Log.i("[Connection] Terminating telecom call with id: $callId")
-        getCall()?.terminate() ?: selfDestroy()
-    }
-
-    override fun onAbort() {
-        Log.i("[Connection] Aborting telecom call with id: $callId")
-        getCall()?.terminate() ?: selfDestroy()
-    }
-
-    override fun onReject() {
-        Log.i("[Connection] Rejecting telecom call with id: $callId")
-        getCall()?.terminate() ?: selfDestroy()
-    }
-
-    override fun onSilence() {
-        Log.i("[Connection] Call with id: $callId asked to be silenced")
-        coreContext.core.stopRinging()
-    }
-
-    fun stateAsString(): String {
-        return stateToString(state)
-    }
-
-    private fun getCall(): Call? {
-        return coreContext.core.getCallByCallid(callId)
-    }
-
-    private fun selfDestroy() {
-        if (coreContext.core.callsNb == 0) {
-            Log.e("[Connection] No call in Core, destroy connection")
-            setDisconnected(DisconnectCause(DisconnectCause.LOCAL))
-            destroy()
-        }
-    }
-
-    private fun intStateToString(state: Int): String {
-        return when (state) {
-            STATE_INITIALIZING -> "STATE_INITIALIZING"
-            STATE_NEW -> "STATE_NEW"
-            STATE_RINGING -> "STATE_RINGING"
-            STATE_DIALING -> "STATE_DIALING"
-            STATE_ACTIVE -> "STATE_ACTIVE"
-            STATE_HOLDING -> "STATE_HOLDING"
-            STATE_DISCONNECTED -> "STATE_DISCONNECTED"
-            STATE_PULLING_CALL -> "STATE_PULLING_CALL"
-            else -> "STATE_UNKNOWN"
-        }
-    }
-}
diff --git a/app/src/main/java/org/linphone/telecom/TelecomConnectionService.kt b/app/src/main/java/org/linphone/telecom/TelecomConnectionService.kt
deleted file mode 100644
index fddfc8bb6..000000000
--- a/app/src/main/java/org/linphone/telecom/TelecomConnectionService.kt
+++ /dev/null
@@ -1,299 +0,0 @@
-/*
- * Copyright (c) 2010-2021 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.telecom
-
-import android.annotation.TargetApi
-import android.content.ComponentName
-import android.content.Intent
-import android.net.Uri
-import android.telecom.*
-import org.linphone.LinphoneApplication
-import org.linphone.LinphoneApplication.Companion.coreContext
-import org.linphone.LinphoneApplication.Companion.ensureCoreExists
-import org.linphone.core.Call
-import org.linphone.core.Core
-import org.linphone.core.CoreListenerStub
-import org.linphone.core.tools.Log
-
-@TargetApi(29)
-class TelecomConnectionService : ConnectionService() {
-    private val listener: CoreListenerStub = object : CoreListenerStub() {
-        override fun onCallStateChanged(
-            core: Core,
-            call: Call,
-            state: Call.State?,
-            message: String
-        ) {
-            Log.i(
-                "[Telecom Connection Service] call [${call.callLog.callId}] state changed: $state"
-            )
-            when (call.state) {
-                Call.State.OutgoingProgress -> {
-                    for (connection in TelecomHelper.get().connections) {
-                        if (connection.callId.isEmpty()) {
-                            Log.i(
-                                "[Telecom Connection Service] Updating connection with call ID: ${call.callLog.callId}"
-                            )
-                            connection.callId = core.currentCall?.callLog?.callId ?: ""
-                        }
-                    }
-                }
-                Call.State.Error -> onCallError(call)
-                Call.State.End, Call.State.Released -> onCallEnded(call)
-                Call.State.Paused, Call.State.Pausing, Call.State.PausedByRemote -> onCallPaused(
-                    call
-                )
-                Call.State.Connected, Call.State.StreamsRunning -> onCallConnected(call)
-                else -> {}
-            }
-        }
-
-        override fun onLastCallEnded(core: Core) {
-            val connectionsCount = TelecomHelper.get().connections.size
-            if (connectionsCount > 0) {
-                Log.w(
-                    "[Telecom Connection Service] Last call ended, there is $connectionsCount connections still alive"
-                )
-                for (connection in TelecomHelper.get().connections) {
-                    Log.w(
-                        "[Telecom Connection Service] Destroying zombie connection ${connection.callId}"
-                    )
-                    connection.setDisconnected(DisconnectCause(DisconnectCause.OTHER))
-                    connection.destroy()
-                }
-            }
-        }
-    }
-
-    override fun onCreate() {
-        super.onCreate()
-
-        Log.i("[Telecom Connection Service] onCreate()")
-        ensureCoreExists(applicationContext)
-        coreContext.core.addListener(listener)
-    }
-
-    override fun onUnbind(intent: Intent?): Boolean {
-        if (LinphoneApplication.contextExists()) {
-            Log.i("[Telecom Connection Service] onUnbind()")
-            coreContext.core.removeListener(listener)
-        }
-
-        return super.onUnbind(intent)
-    }
-
-    override fun onCreateOutgoingConnection(
-        connectionManagerPhoneAccount: PhoneAccountHandle?,
-        request: ConnectionRequest
-    ): Connection {
-        if (coreContext.core.callsNb == 0) {
-            Log.w("[Telecom Connection Service] No call in Core, aborting outgoing connection!")
-            return Connection.createCanceledConnection()
-        }
-
-        val accountHandle = request.accountHandle
-        val componentName = ComponentName(applicationContext, this.javaClass)
-        return if (accountHandle != null && componentName == accountHandle.componentName) {
-            Log.i("[Telecom Connection Service] Creating outgoing connection")
-
-            val extras = request.extras
-            var callId = extras.getString("Call-ID")
-            val displayName = extras.getString("DisplayName")
-            if (callId == null) {
-                callId = coreContext.core.currentCall?.callLog?.callId ?: ""
-            }
-            Log.i(
-                "[Telecom Connection Service] Outgoing connection is for call [$callId] with display name [$displayName]"
-            )
-
-            // Prevents user dialing back from native dialer app history
-            if (callId.isEmpty() && displayName.isNullOrEmpty()) {
-                Log.e(
-                    "[Telecom Connection Service] Looks like a call was made from native dialer history, aborting"
-                )
-                return Connection.createFailedConnection(DisconnectCause(DisconnectCause.OTHER))
-            }
-
-            val connection = NativeCallWrapper(callId)
-            val call = coreContext.core.calls.find { it.callLog.callId == callId }
-            if (call != null) {
-                val callState = call.state
-                Log.i(
-                    "[Telecom Connection Service] Found outgoing call from ID [$callId] with state [$callState]"
-                )
-                when (callState) {
-                    Call.State.OutgoingEarlyMedia, Call.State.OutgoingInit, Call.State.OutgoingProgress, Call.State.OutgoingRinging -> connection.setDialing()
-                    Call.State.Paused, Call.State.PausedByRemote, Call.State.Pausing -> connection.setOnHold()
-                    Call.State.End, Call.State.Error, Call.State.Released -> connection.setDisconnected(
-                        DisconnectCause(DisconnectCause.ERROR)
-                    )
-                    else -> connection.setActive()
-                }
-            } else {
-                Log.w(
-                    "[Telecom Connection Service] Outgoing call not found for cal ID [$callId], assuming it's state is dialing"
-                )
-                connection.setDialing()
-            }
-
-            val providedHandle = request.address
-            connection.setAddress(providedHandle, TelecomManager.PRESENTATION_ALLOWED)
-            connection.setCallerDisplayName(displayName, TelecomManager.PRESENTATION_ALLOWED)
-            Log.i("[Telecom Connection Service] Address is $providedHandle")
-
-            TelecomHelper.get().connections.add(connection)
-            connection
-        } else {
-            Log.e("[Telecom Connection Service] Error: $accountHandle $componentName")
-            Connection.createFailedConnection(
-                DisconnectCause(
-                    DisconnectCause.ERROR,
-                    "Invalid inputs: $accountHandle $componentName"
-                )
-            )
-        }
-    }
-
-    override fun onCreateIncomingConnection(
-        connectionManagerPhoneAccount: PhoneAccountHandle?,
-        request: ConnectionRequest
-    ): Connection {
-        if (coreContext.core.callsNb == 0) {
-            Log.w("[Telecom Connection Service] No call in Core, aborting incoming connection!")
-            return Connection.createCanceledConnection()
-        }
-
-        val accountHandle = request.accountHandle
-        val componentName = ComponentName(applicationContext, this.javaClass)
-        return if (accountHandle != null && componentName == accountHandle.componentName) {
-            Log.i("[Telecom Connection Service] Creating incoming connection")
-
-            val extras = request.extras
-            val incomingExtras = extras.getBundle(TelecomManager.EXTRA_INCOMING_CALL_EXTRAS)
-            var callId = incomingExtras?.getString("Call-ID")
-            val displayName = incomingExtras?.getString("DisplayName")
-            if (callId == null) {
-                callId = coreContext.core.currentCall?.callLog?.callId ?: ""
-            }
-            Log.i(
-                "[Telecom Connection Service] Incoming connection is for call [$callId] with display name [$displayName]"
-            )
-
-            val connection = NativeCallWrapper(callId)
-            val call = coreContext.core.calls.find { it.callLog.callId == callId }
-            if (call != null) {
-                val callState = call.state
-                Log.i(
-                    "[Telecom Connection Service] Found incoming call from ID [$callId] with state [$callState]"
-                )
-                when (callState) {
-                    Call.State.IncomingEarlyMedia, Call.State.IncomingReceived -> connection.setRinging()
-                    Call.State.Paused, Call.State.PausedByRemote, Call.State.Pausing -> connection.setOnHold()
-                    Call.State.End, Call.State.Error, Call.State.Released -> connection.setDisconnected(
-                        DisconnectCause(DisconnectCause.ERROR)
-                    )
-                    else -> connection.setActive()
-                }
-            } else {
-                Log.w(
-                    "[Telecom Connection Service] Incoming call not found for cal ID [$callId], assuming it's state is ringing"
-                )
-                connection.setRinging()
-            }
-
-            val providedHandle =
-                incomingExtras?.getParcelable<Uri>(TelecomManager.EXTRA_INCOMING_CALL_ADDRESS)
-            connection.setAddress(providedHandle, TelecomManager.PRESENTATION_ALLOWED)
-            connection.setCallerDisplayName(displayName, TelecomManager.PRESENTATION_ALLOWED)
-            Log.i("[Telecom Connection Service] Address is $providedHandle")
-
-            TelecomHelper.get().connections.add(connection)
-            connection
-        } else {
-            Log.e("[Telecom Connection Service] Error: $accountHandle $componentName")
-            Connection.createFailedConnection(
-                DisconnectCause(
-                    DisconnectCause.ERROR,
-                    "Invalid inputs: $accountHandle $componentName"
-                )
-            )
-        }
-    }
-
-    private fun onCallError(call: Call) {
-        val callId = call.callLog.callId
-        val connection = TelecomHelper.get().findConnectionForCallId(callId.orEmpty())
-        if (connection == null) {
-            Log.e("[Telecom Connection Service] Failed to find connection for call id: $callId")
-            return
-        }
-
-        TelecomHelper.get().connections.remove(connection)
-        Log.i(
-            "[Telecom Connection Service] Call [$callId] is in error, destroying connection currently in ${connection.stateAsString()}"
-        )
-        connection.setDisconnected(DisconnectCause(DisconnectCause.ERROR))
-        connection.destroy()
-    }
-
-    private fun onCallEnded(call: Call) {
-        val callId = call.callLog.callId
-        val connection = TelecomHelper.get().findConnectionForCallId(callId.orEmpty())
-        if (connection == null) {
-            Log.e("[Telecom Connection Service] Failed to find connection for call id: $callId")
-            return
-        }
-
-        TelecomHelper.get().connections.remove(connection)
-        val reason = call.reason
-        Log.i(
-            "[Telecom Connection Service] Call [$callId] ended with reason: $reason, destroying connection currently in ${connection.stateAsString()}"
-        )
-        connection.setDisconnected(DisconnectCause(DisconnectCause.LOCAL))
-        connection.destroy()
-    }
-
-    private fun onCallPaused(call: Call) {
-        val callId = call.callLog.callId
-        val connection = TelecomHelper.get().findConnectionForCallId(callId.orEmpty())
-        if (connection == null) {
-            Log.e("[Telecom Connection Service] Failed to find connection for call id: $callId")
-            return
-        }
-        Log.i(
-            "[Telecom Connection Service] Setting connection as on hold, currently in ${connection.stateAsString()}"
-        )
-        connection.setOnHold()
-    }
-
-    private fun onCallConnected(call: Call) {
-        val callId = call.callLog.callId
-        val connection = TelecomHelper.get().findConnectionForCallId(callId.orEmpty())
-        if (connection == null) {
-            Log.e("[Telecom Connection Service] Failed to find connection for call id: $callId")
-            return
-        }
-
-        Log.i(
-            "[Telecom Connection Service] Setting connection as active, currently in ${connection.stateAsString()}"
-        )
-        connection.setActive()
-    }
-}
diff --git a/app/src/main/java/org/linphone/telecom/TelecomHelper.kt b/app/src/main/java/org/linphone/telecom/TelecomHelper.kt
deleted file mode 100644
index 3f55f3a89..000000000
--- a/app/src/main/java/org/linphone/telecom/TelecomHelper.kt
+++ /dev/null
@@ -1,251 +0,0 @@
-/*
- * Copyright (c) 2010-2021 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.telecom
-
-import android.annotation.SuppressLint
-import android.annotation.TargetApi
-import android.content.ComponentName
-import android.content.Context
-import android.graphics.drawable.Icon
-import android.net.Uri
-import android.os.Bundle
-import android.telecom.PhoneAccount
-import android.telecom.PhoneAccountHandle
-import android.telecom.TelecomManager
-import android.telecom.TelecomManager.*
-import kotlin.Exception
-import org.linphone.LinphoneApplication.Companion.coreContext
-import org.linphone.R
-import org.linphone.core.Call
-import org.linphone.core.Core
-import org.linphone.core.CoreListenerStub
-import org.linphone.core.tools.Log
-import org.linphone.utils.LinphoneUtils
-import org.linphone.utils.PermissionHelper
-import org.linphone.utils.SingletonHolder
-
-@TargetApi(29)
-class TelecomHelper private constructor(context: Context) {
-    companion object : SingletonHolder<TelecomHelper, Context>(::TelecomHelper)
-
-    private val telecomManager: TelecomManager = context.getSystemService(Context.TELECOM_SERVICE) as TelecomManager
-
-    private var account: PhoneAccount = initPhoneAccount(context)
-
-    val connections = arrayListOf<NativeCallWrapper>()
-
-    private val listener: CoreListenerStub = object : CoreListenerStub() {
-        override fun onCallStateChanged(
-            core: Core,
-            call: Call,
-            state: Call.State?,
-            message: String
-        ) {
-            Log.i("[Telecom Helper] Call state changed: ${call.state}")
-
-            try {
-                if (call.dir == Call.Dir.Incoming && call.state == Call.State.IncomingReceived) {
-                    onIncomingCall(call)
-                } else if (call.dir == Call.Dir.Outgoing && call.state == Call.State.OutgoingProgress) {
-                    onOutgoingCall(call)
-                }
-            } catch (se: SecurityException) {
-                Log.e("[Telecom Helper] Exception while trying to place call: $se")
-            }
-        }
-    }
-
-    init {
-        coreContext.core.addListener(listener)
-        Log.i("[Telecom Helper] Created")
-    }
-
-    fun destroy() {
-        coreContext.core.removeListener(listener)
-        Log.i("[Telecom Helper] Destroyed")
-    }
-
-    fun isIncomingCallPermitted(): Boolean {
-        val incomingCallPermitted = telecomManager.isIncomingCallPermitted(account.accountHandle)
-        Log.i("[Telecom Helper] Is incoming call permitted? $incomingCallPermitted")
-        return incomingCallPermitted
-    }
-
-    @SuppressLint("MissingPermission")
-    fun isInManagedCall(): Boolean {
-        // Don't use telecomManager.isInCall as our own self-managed calls will be considered!
-        val isInManagedCall = telecomManager.isInManagedCall
-        Log.i("[Telecom Helper] Is in managed call? $isInManagedCall")
-        return isInManagedCall
-    }
-
-    fun isAccountEnabled(): Boolean {
-        val enabled = account.isEnabled
-        Log.i("[Telecom Helper] Is account enabled ? $enabled")
-        return enabled
-    }
-
-    @SuppressLint("MissingPermission")
-    fun findExistingAccount(context: Context): PhoneAccount? {
-        if (PermissionHelper.required(context).hasReadPhoneStateOrPhoneNumbersPermission()) {
-            try {
-                var account: PhoneAccount? = null
-                val phoneAccountHandleList: List<PhoneAccountHandle> =
-                    telecomManager.selfManagedPhoneAccounts
-                val connectionService = ComponentName(context, TelecomConnectionService::class.java)
-                for (phoneAccountHandle in phoneAccountHandleList) {
-                    val phoneAccount: PhoneAccount =
-                        telecomManager.getPhoneAccount(phoneAccountHandle)
-                    if (phoneAccountHandle.componentName == connectionService) {
-                        Log.i("[Telecom Helper] Found existing phone account: $phoneAccount")
-                        account = phoneAccount
-                        break
-                    }
-                }
-                if (account == null) {
-                    Log.w("[Telecom Helper] Existing phone account not found")
-                }
-                return account
-            } catch (se: SecurityException) {
-                Log.w("[Telecom Helper] Can't check phone accounts: $se")
-            }
-        } else {
-            Log.e("[Telecom Helper] Can't search for existing phone account, missing permission(s)")
-        }
-        return null
-    }
-
-    fun updateAccount(newAccount: PhoneAccount?) {
-        if (newAccount != null) {
-            Log.i("[Telecom Helper] Updating account object: $newAccount")
-            account = newAccount
-        }
-    }
-
-    fun removeAccount() {
-        if (account.isEnabled) {
-            Log.w("[Telecom Helper] Unregistering phone account handler from telecom manager")
-            telecomManager.unregisterPhoneAccount(account.accountHandle)
-        } else {
-            Log.w("[Telecom Helper] Account wasn't enabled, skipping...")
-        }
-    }
-
-    fun findConnectionForCallId(callId: String): NativeCallWrapper? {
-        return connections.find { connection ->
-            connection.callId == callId
-        }
-    }
-
-    private fun initPhoneAccount(context: Context): PhoneAccount {
-        val account: PhoneAccount? = findExistingAccount(context)
-        if (account == null) {
-            Log.i("[Telecom Helper] Phone account not found, let's create it")
-            return createAccount(context)
-        }
-        return account
-    }
-
-    private fun createAccount(context: Context): PhoneAccount {
-        val accountHandle = PhoneAccountHandle(
-            ComponentName(context, TelecomConnectionService::class.java),
-            context.packageName
-        )
-        // Take care that identity may be parsed, otherwise Android OS may crash during startup
-        // and user will have to do a factory reset...
-        val identity = coreContext.core.defaultAccount?.params?.identityAddress?.asStringUriOnly()
-            ?: coreContext.core.createPrimaryContactParsed()?.asStringUriOnly()
-            ?: "sip:linphone.android@sip.linphone.org"
-
-        val address = Uri.parse(identity)
-            ?: throw Exception("[Telecom Helper] Identity address for phone account is null!")
-        val account = PhoneAccount.builder(accountHandle, context.getString(R.string.app_name))
-            .setAddress(address)
-            .setIcon(Icon.createWithResource(context, R.drawable.linphone_logo_tinted))
-            .setCapabilities(PhoneAccount.CAPABILITY_SELF_MANAGED)
-            .setHighlightColor(context.getColor(R.color.primary_color))
-            .setShortDescription(context.getString(R.string.app_description))
-            .setSupportedUriSchemes(listOf(PhoneAccount.SCHEME_SIP))
-            .build()
-
-        try {
-            telecomManager.registerPhoneAccount(account)
-            Log.i("[Telecom Helper] Phone account created: $account")
-        } catch (uoe: UnsupportedOperationException) {
-            Log.e("[Telecom Helper] Unsupported Operation Exception: $uoe")
-        } catch (e: Exception) {
-            Log.e("[Telecom Helper] Exception: $e")
-        }
-        return account
-    }
-
-    private fun onIncomingCall(call: Call) {
-        Log.i(
-            "[Telecom Helper] Incoming call received from ${call.remoteAddress.asStringUriOnly()}, using account handle ${account.accountHandle}"
-        )
-
-        val extras = prepareBundle(call)
-        telecomManager.addNewIncomingCall(
-            account.accountHandle,
-            Bundle().apply {
-                putBundle(EXTRA_INCOMING_CALL_EXTRAS, extras)
-                putParcelable(EXTRA_PHONE_ACCOUNT_HANDLE, account.accountHandle)
-            }
-        )
-    }
-
-    @SuppressLint("MissingPermission")
-    private fun onOutgoingCall(call: Call) {
-        Log.i(
-            "[Telecom Helper] Outgoing call started to ${call.remoteAddress.asStringUriOnly()}, using account handle ${account.accountHandle}"
-        )
-
-        val extras = prepareBundle(call)
-        telecomManager.placeCall(
-            Uri.parse(call.remoteAddress.asStringUriOnly()),
-            Bundle().apply {
-                putBundle(EXTRA_OUTGOING_CALL_EXTRAS, extras)
-                putParcelable(EXTRA_PHONE_ACCOUNT_HANDLE, account.accountHandle)
-            }
-        )
-    }
-
-    private fun prepareBundle(call: Call): Bundle {
-        val extras = Bundle()
-        val address = call.remoteAddress
-
-        if (call.dir == Call.Dir.Outgoing) {
-            extras.putString(
-                EXTRA_CALL_BACK_NUMBER,
-                call.remoteAddress.asStringUriOnly()
-            )
-        } else {
-            extras.putParcelable(EXTRA_INCOMING_CALL_ADDRESS, Uri.parse(address.asStringUriOnly()))
-        }
-
-        extras.putString("Call-ID", call.callLog.callId)
-
-        val contact = coreContext.contactsManager.findContactByAddress(call.remoteAddress)
-        val displayName = contact?.name ?: LinphoneUtils.getDisplayName(call.remoteAddress)
-        extras.putString("DisplayName", displayName)
-
-        return extras
-    }
-}
diff --git a/app/src/main/java/org/linphone/utils/ActivityMonitor.kt b/app/src/main/java/org/linphone/utils/ActivityMonitor.kt
deleted file mode 100644
index 20f4fe482..000000000
--- a/app/src/main/java/org/linphone/utils/ActivityMonitor.kt
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * Copyright (c) 2010-2021 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.utils
-
-import android.app.Activity
-import android.app.Application.ActivityLifecycleCallbacks
-import android.os.Bundle
-import org.linphone.LinphoneApplication.Companion.coreContext
-import org.linphone.core.tools.service.AndroidDispatcher
-import org.linphone.core.tools.service.CoreManager
-
-class ActivityMonitor : ActivityLifecycleCallbacks {
-    private val activities = ArrayList<Activity>()
-    private var mActive = false
-    private var mRunningActivities = 0
-    private var mLastChecker: InactivityChecker? = null
-
-    @Synchronized
-    override fun onActivityCreated(activity: Activity, savedInstanceState: Bundle?) {
-        if (!activities.contains(activity)) activities.add(activity)
-    }
-
-    override fun onActivityStarted(activity: Activity) {
-    }
-
-    @Synchronized
-    override fun onActivityResumed(activity: Activity) {
-        if (!activities.contains(activity)) {
-            activities.add(activity)
-        }
-        mRunningActivities++
-        checkActivity()
-    }
-
-    @Synchronized
-    override fun onActivityPaused(activity: Activity) {
-        if (!activities.contains(activity)) {
-            activities.add(activity)
-        } else {
-            mRunningActivities--
-            checkActivity()
-        }
-    }
-
-    override fun onActivityStopped(activity: Activity) {
-    }
-
-    @Synchronized
-    override fun onActivityDestroyed(activity: Activity) {
-        activities.remove(activity)
-    }
-
-    private fun startInactivityChecker() {
-        if (mLastChecker != null) mLastChecker!!.cancel()
-        AndroidDispatcher.dispatchOnUIThreadAfter(
-            InactivityChecker().also { mLastChecker = it },
-            2000
-        )
-    }
-
-    private fun checkActivity() {
-        if (mRunningActivities == 0) {
-            if (mActive) startInactivityChecker()
-        } else if (mRunningActivities > 0) {
-            if (!mActive) {
-                mActive = true
-                onForegroundMode()
-            }
-            if (mLastChecker != null) {
-                mLastChecker!!.cancel()
-                mLastChecker = null
-            }
-        }
-    }
-
-    private fun onBackgroundMode() {
-        coreContext.onBackground()
-    }
-
-    private fun onForegroundMode() {
-        coreContext.onForeground()
-    }
-
-    override fun onActivitySaveInstanceState(activity: Activity, outState: Bundle) {}
-    internal inner class InactivityChecker : Runnable {
-        private var isCanceled = false
-        fun cancel() {
-            isCanceled = true
-        }
-
-        override fun run() {
-            if (CoreManager.isReady()) {
-                synchronized(CoreManager.instance()) {
-                    if (!isCanceled) {
-                        if (mRunningActivities == 0 && mActive) {
-                            mActive = false
-                            onBackgroundMode()
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
diff --git a/app/src/main/java/org/linphone/utils/AppUtils.kt b/app/src/main/java/org/linphone/utils/AppUtils.kt
deleted file mode 100644
index 88d61b66e..000000000
--- a/app/src/main/java/org/linphone/utils/AppUtils.kt
+++ /dev/null
@@ -1,255 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.utils
-
-import android.app.Activity
-import android.content.ActivityNotFoundException
-import android.content.Context
-import android.content.Intent
-import android.media.AudioManager
-import android.os.Bundle
-import android.text.format.Formatter.formatShortFileSize
-import android.util.TypedValue
-import androidx.core.content.res.ResourcesCompat
-import androidx.emoji2.text.EmojiCompat
-import androidx.media.AudioAttributesCompat
-import androidx.media.AudioFocusRequestCompat
-import androidx.media.AudioManagerCompat
-import androidx.recyclerview.widget.DividerItemDecoration
-import androidx.recyclerview.widget.LinearLayoutManager
-import java.util.*
-import org.linphone.LinphoneApplication.Companion.coreContext
-import org.linphone.R
-import org.linphone.activities.main.viewmodels.SharedMainViewModel
-import org.linphone.core.tools.Log
-
-/**
- * Various utility methods for application
- */
-class AppUtils {
-    interface KeyboardVisibilityListener {
-        fun onKeyboardVisibilityChanged(visible: Boolean)
-    }
-
-    companion object {
-        private val emojiCompat: EmojiCompat?
-            get() = initEmojiCompat()
-
-        private fun initEmojiCompat(): EmojiCompat? {
-            return try {
-                EmojiCompat.get()
-            } catch (ise: IllegalStateException) {
-                Log.w(
-                    "[App Utils] EmojiCompat.get() triggered IllegalStateException [$ise], trying manual init"
-                )
-                EmojiCompat.init(coreContext.context)
-            }
-        }
-
-        fun getString(id: Int): String {
-            return coreContext.context.getString(id)
-        }
-
-        fun getStringWithPlural(id: Int, count: Int): String {
-            return coreContext.context.resources.getQuantityString(id, count, count)
-        }
-
-        fun getStringWithPlural(id: Int, count: Int, value: String): String {
-            return coreContext.context.resources.getQuantityString(id, count, value)
-        }
-
-        fun getDimension(id: Int): Float {
-            return coreContext.context.resources.getDimension(id)
-        }
-
-        fun getInitials(displayName: String, limit: Int = 2): String {
-            if (displayName.isEmpty()) return ""
-
-            val split = displayName.uppercase(Locale.getDefault()).split(" ")
-            var initials = ""
-            var characters = 0
-            val emoji = emojiCompat
-
-            for (i in split.indices) {
-                if (split[i].isNotEmpty()) {
-                    try {
-                        if (emoji?.loadState == EmojiCompat.LOAD_STATE_SUCCEEDED && emoji.hasEmojiGlyph(
-                                split[i]
-                            )
-                        ) {
-                            val glyph = emoji.process(split[i])
-                            if (characters > 0) { // Limit initial to 1 emoji only
-                                Log.d("[App Utils] We limit initials to one emoji only")
-                                initials = ""
-                            }
-                            initials += glyph
-                            break // Limit initial to 1 emoji only
-                        } else {
-                            initials += split[i][0]
-                        }
-                    } catch (ise: IllegalStateException) {
-                        Log.e("[App Utils] Can't call hasEmojiGlyph: $ise")
-                        initials += split[i][0]
-                    }
-
-                    characters += 1
-                    if (characters >= limit) break
-                }
-            }
-            return initials
-        }
-
-        fun isTextOnlyContainingEmoji(text: String): Boolean {
-            val emoji = emojiCompat
-            emoji ?: return false
-
-            if (emoji.loadState != EmojiCompat.LOAD_STATE_SUCCEEDED) {
-                Log.w(
-                    "[App Utils] Can't check emoji presence in text due to EmojiCompat library not loaded yet [${emoji.loadState}]"
-                )
-                return false
-            }
-
-            try {
-                for (split in text.split(" ")) {
-                    // We only check the first and last chars of the split for commodity
-                    if (emoji.getEmojiStart(split, 0) == -1 ||
-                        emoji.getEmojiEnd(split, split.length - 1) == -1
-                    ) {
-                        Log.d("[App Utils] Found a non-emoji character in [$text]")
-                        return false
-                    }
-                }
-            } catch (npe: NullPointerException) {
-                Log.e(
-                    "[App Utils] Can't check emoji presence in text due to NPE in EmojiCompat library, assuming there is none"
-                )
-                // This can happen in EmojiCompat library, mProcessor can be null (https://issuetracker.google.com/issues/277182750)
-                return false
-            }
-
-            Log.d("[App Utils] It seems text [$text] only contains emoji(s)")
-            return true
-        }
-
-        fun pixelsToDp(pixels: Float): Float {
-            return TypedValue.applyDimension(
-                TypedValue.COMPLEX_UNIT_DIP,
-                pixels,
-                coreContext.context.resources.displayMetrics
-            )
-        }
-
-        fun dpToPixels(context: Context, dp: Float): Float {
-            return dp * context.resources.displayMetrics.density
-        }
-
-        fun bytesToDisplayableSize(bytes: Long): String {
-            return formatShortFileSize(coreContext.context, bytes)
-        }
-
-        fun shareUploadedLogsUrl(activity: Activity, info: String) {
-            val appName = activity.getString(R.string.app_name)
-            val intent = Intent(Intent.ACTION_SEND)
-            intent.putExtra(
-                Intent.EXTRA_EMAIL,
-                arrayOf(activity.getString(R.string.about_bugreport_email))
-            )
-            intent.putExtra(Intent.EXTRA_SUBJECT, "$appName Logs")
-            intent.putExtra(Intent.EXTRA_TEXT, info)
-            intent.type = "text/plain"
-
-            try {
-                activity.startActivity(
-                    Intent.createChooser(
-                        intent,
-                        activity.getString(R.string.share_uploaded_logs_link)
-                    )
-                )
-            } catch (ex: ActivityNotFoundException) {
-                Log.e(ex)
-            }
-        }
-
-        fun getDividerDecoration(context: Context, layoutManager: LinearLayoutManager): DividerItemDecoration {
-            val dividerItemDecoration = DividerItemDecoration(context, layoutManager.orientation)
-            val divider = ResourcesCompat.getDrawable(context.resources, R.drawable.divider, null)
-            if (divider != null) dividerItemDecoration.setDrawable(divider)
-            return dividerItemDecoration
-        }
-
-        fun createBundleWithSharedTextAndFiles(sharedViewModel: SharedMainViewModel): Bundle {
-            val bundle = Bundle()
-            bundle.putString("TextToShare", sharedViewModel.textToShare.value.orEmpty())
-            bundle.putStringArrayList("FilesToShare", sharedViewModel.filesToShare.value)
-
-            // Remove values from shared view model
-            sharedViewModel.textToShare.value = ""
-            sharedViewModel.filesToShare.value = arrayListOf()
-
-            return bundle
-        }
-
-        fun isMediaVolumeLow(context: Context): Boolean {
-            val audioManager = context.getSystemService(Context.AUDIO_SERVICE) as AudioManager
-            val currentVolume = audioManager.getStreamVolume(AudioManager.STREAM_MUSIC)
-            val maxVolume = audioManager.getStreamMaxVolume(AudioManager.STREAM_MUSIC)
-            Log.i("[Media Volume] Current value is $currentVolume, max value is $maxVolume")
-            return currentVolume <= maxVolume * 0.5
-        }
-
-        fun acquireAudioFocusForVoiceRecordingOrPlayback(context: Context): AudioFocusRequestCompat {
-            val audioManager = context.getSystemService(Context.AUDIO_SERVICE) as AudioManager
-            val audioAttrs = AudioAttributesCompat.Builder()
-                .setUsage(AudioAttributesCompat.USAGE_MEDIA)
-                .setContentType(AudioAttributesCompat.CONTENT_TYPE_SPEECH)
-                .build()
-
-            val request =
-                AudioFocusRequestCompat.Builder(
-                    AudioManagerCompat.AUDIOFOCUS_GAIN_TRANSIENT_EXCLUSIVE
-                )
-                    .setAudioAttributes(audioAttrs)
-                    .setOnAudioFocusChangeListener { }
-                    .build()
-            when (AudioManagerCompat.requestAudioFocus(audioManager, request)) {
-                AudioManager.AUDIOFOCUS_REQUEST_GRANTED -> {
-                    Log.i("[Audio Focus] Voice recording/playback audio focus request granted")
-                }
-                AudioManager.AUDIOFOCUS_REQUEST_FAILED -> {
-                    Log.w("[Audio Focus] Voice recording/playback audio focus request failed")
-                }
-                AudioManager.AUDIOFOCUS_REQUEST_DELAYED -> {
-                    Log.w("[Audio Focus] Voice recording/playback audio focus request delayed")
-                }
-            }
-            return request
-        }
-
-        fun releaseAudioFocusForVoiceRecordingOrPlayback(
-            context: Context,
-            request: AudioFocusRequestCompat
-        ) {
-            val audioManager = context.getSystemService(Context.AUDIO_SERVICE) as AudioManager
-            AudioManagerCompat.abandonAudioFocusRequest(audioManager, request)
-            Log.i("[Audio Focus] Voice recording/playback audio focus request abandoned")
-        }
-    }
-}
diff --git a/app/src/main/java/org/linphone/utils/AudioRouteUtils.kt b/app/src/main/java/org/linphone/utils/AudioRouteUtils.kt
deleted file mode 100644
index fd95886fd..000000000
--- a/app/src/main/java/org/linphone/utils/AudioRouteUtils.kt
+++ /dev/null
@@ -1,343 +0,0 @@
-/*
- * Copyright (c) 2010-2021 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.utils
-
-import android.telecom.CallAudioState
-import org.linphone.LinphoneApplication.Companion.coreContext
-import org.linphone.compatibility.Compatibility
-import org.linphone.core.AudioDevice
-import org.linphone.core.Call
-import org.linphone.core.tools.Log
-import org.linphone.telecom.TelecomHelper
-
-class AudioRouteUtils {
-    companion object {
-        private fun applyAudioRouteChange(
-            call: Call?,
-            types: List<AudioDevice.Type>,
-            output: Boolean = true
-        ) {
-            val currentCall = if (coreContext.core.callsNb > 0) {
-                call ?: coreContext.core.currentCall ?: coreContext.core.calls[0]
-            } else {
-                Log.w("[Audio Route Helper] No call found, setting audio route on Core")
-                null
-            }
-            val conference = coreContext.core.conference
-            val capability = if (output) {
-                AudioDevice.Capabilities.CapabilityPlay
-            } else {
-                AudioDevice.Capabilities.CapabilityRecord
-            }
-            val preferredDriver = if (output) {
-                coreContext.core.defaultOutputAudioDevice?.driverName
-            } else {
-                coreContext.core.defaultInputAudioDevice?.driverName
-            }
-
-            val extendedAudioDevices = coreContext.core.extendedAudioDevices
-            Log.i(
-                "[Audio Route Helper] Looking for an ${if (output) "output" else "input"} audio device with capability [$capability], driver name [$preferredDriver] and type [$types] in extended audio devices list (size ${extendedAudioDevices.size})"
-            )
-            val foundAudioDevice = extendedAudioDevices.find {
-                it.driverName == preferredDriver && types.contains(it.type) && it.hasCapability(
-                    capability
-                )
-            }
-            val audioDevice = if (foundAudioDevice == null) {
-                Log.w(
-                    "[Audio Route Helper] Failed to find an audio device with capability [$capability], driver name [$preferredDriver] and type [$types]"
-                )
-                extendedAudioDevices.find {
-                    types.contains(it.type) && it.hasCapability(capability)
-                }
-            } else {
-                foundAudioDevice
-            }
-
-            if (audioDevice == null) {
-                Log.e(
-                    "[Audio Route Helper] Couldn't find audio device with capability [$capability] and type [$types]"
-                )
-                for (device in extendedAudioDevices) {
-                    // TODO: switch to debug?
-                    Log.i(
-                        "[Audio Route Helper] Extended audio device: [${device.deviceName} (${device.driverName}) ${device.type} / ${device.capabilities}]"
-                    )
-                }
-                return
-            }
-            if (conference != null && conference.isIn) {
-                Log.i(
-                    "[Audio Route Helper] Found [${audioDevice.type}] ${if (output) "playback" else "recorder"} audio device [${audioDevice.deviceName} (${audioDevice.driverName})], routing conference audio to it"
-                )
-                if (output) {
-                    conference.outputAudioDevice = audioDevice
-                } else {
-                    conference.inputAudioDevice = audioDevice
-                }
-            } else if (currentCall != null) {
-                Log.i(
-                    "[Audio Route Helper] Found [${audioDevice.type}] ${if (output) "playback" else "recorder"} audio device [${audioDevice.deviceName} (${audioDevice.driverName})], routing call audio to it"
-                )
-                if (output) {
-                    currentCall.outputAudioDevice = audioDevice
-                } else {
-                    currentCall.inputAudioDevice = audioDevice
-                }
-            } else {
-                Log.i(
-                    "[Audio Route Helper] Found [${audioDevice.type}] ${if (output) "playback" else "recorder"} audio device [${audioDevice.deviceName} (${audioDevice.driverName})], changing core default audio device"
-                )
-                if (output) {
-                    coreContext.core.outputAudioDevice = audioDevice
-                } else {
-                    coreContext.core.inputAudioDevice = audioDevice
-                }
-            }
-        }
-
-        private fun routeAudioTo(
-            call: Call?,
-            types: List<AudioDevice.Type>,
-            skipTelecom: Boolean = false
-        ) {
-            val currentCall = call ?: coreContext.core.currentCall ?: coreContext.core.calls.firstOrNull()
-            if (currentCall != null && !skipTelecom && TelecomHelper.exists()) {
-                Log.i(
-                    "[Audio Route Helper] Call provided & Telecom Helper exists, trying to dispatch audio route change through Telecom API"
-                )
-                val connection = TelecomHelper.get().findConnectionForCallId(
-                    currentCall.callLog.callId.orEmpty()
-                )
-                if (connection != null) {
-                    val route = when (types.first()) {
-                        AudioDevice.Type.Earpiece -> CallAudioState.ROUTE_EARPIECE
-                        AudioDevice.Type.Speaker -> CallAudioState.ROUTE_SPEAKER
-                        AudioDevice.Type.Headphones, AudioDevice.Type.Headset -> CallAudioState.ROUTE_WIRED_HEADSET
-                        AudioDevice.Type.Bluetooth, AudioDevice.Type.BluetoothA2DP, AudioDevice.Type.HearingAid -> CallAudioState.ROUTE_BLUETOOTH
-                        else -> CallAudioState.ROUTE_WIRED_OR_EARPIECE
-                    }
-                    Log.i(
-                        "[Audio Route Helper] Telecom Helper & matching connection found, dispatching audio route change through it"
-                    )
-                    // We will be called here again by NativeCallWrapper.onCallAudioStateChanged()
-                    // but this time with skipTelecom = true
-                    if (!Compatibility.changeAudioRouteForTelecomManager(connection, route)) {
-                        Log.w(
-                            "[Audio Route Helper] Connection is already using this route internally, make the change!"
-                        )
-                        applyAudioRouteChange(currentCall, types)
-                    }
-                } else {
-                    Log.w("[Audio Route Helper] Telecom Helper found but no matching connection!")
-                    applyAudioRouteChange(currentCall, types)
-                }
-            } else {
-                applyAudioRouteChange(call, types)
-            }
-        }
-
-        fun routeAudioToEarpiece(call: Call? = null, skipTelecom: Boolean = false) {
-            routeAudioTo(call, arrayListOf(AudioDevice.Type.Earpiece), skipTelecom)
-        }
-
-        fun routeAudioToSpeaker(call: Call? = null, skipTelecom: Boolean = false) {
-            routeAudioTo(call, arrayListOf(AudioDevice.Type.Speaker), skipTelecom)
-        }
-
-        fun routeAudioToBluetooth(call: Call? = null, skipTelecom: Boolean = false) {
-            routeAudioTo(
-                call,
-                arrayListOf(AudioDevice.Type.Bluetooth, AudioDevice.Type.HearingAid),
-                skipTelecom
-            )
-        }
-
-        fun routeAudioToHeadset(call: Call? = null, skipTelecom: Boolean = false) {
-            routeAudioTo(
-                call,
-                arrayListOf(AudioDevice.Type.Headphones, AudioDevice.Type.Headset),
-                skipTelecom
-            )
-        }
-
-        fun isSpeakerAudioRouteCurrentlyUsed(call: Call? = null): Boolean {
-            val currentCall = if (coreContext.core.callsNb > 0) {
-                call ?: coreContext.core.currentCall ?: coreContext.core.calls[0]
-            } else {
-                Log.w("[Audio Route Helper] No call found, checking audio route on Core")
-                null
-            }
-            val conference = coreContext.core.conference
-
-            val audioDevice = if (conference != null && conference.isIn) {
-                conference.outputAudioDevice
-            } else if (currentCall != null) {
-                currentCall.outputAudioDevice
-            } else {
-                coreContext.core.outputAudioDevice
-            }
-
-            if (audioDevice == null) return false
-            Log.i(
-                "[Audio Route Helper] Playback audio device currently in use is [${audioDevice.deviceName} (${audioDevice.driverName}) ${audioDevice.type}]"
-            )
-            return audioDevice.type == AudioDevice.Type.Speaker
-        }
-
-        fun isBluetoothAudioRouteCurrentlyUsed(call: Call? = null): Boolean {
-            if (coreContext.core.callsNb == 0) {
-                Log.w("[Audio Route Helper] No call found, so bluetooth audio route isn't used")
-                return false
-            }
-            val currentCall = call ?: coreContext.core.currentCall ?: coreContext.core.calls[0]
-            val conference = coreContext.core.conference
-
-            val audioDevice = if (conference != null && conference.isIn) {
-                conference.outputAudioDevice
-            } else {
-                currentCall.outputAudioDevice
-            }
-
-            if (audioDevice == null) return false
-            Log.i(
-                "[Audio Route Helper] Playback audio device currently in use is [${audioDevice.deviceName} (${audioDevice.driverName}) ${audioDevice.type}]"
-            )
-            return audioDevice.type == AudioDevice.Type.Bluetooth || audioDevice.type == AudioDevice.Type.HearingAid
-        }
-
-        fun isBluetoothAudioRouteAvailable(): Boolean {
-            for (audioDevice in coreContext.core.audioDevices) {
-                if ((audioDevice.type == AudioDevice.Type.Bluetooth || audioDevice.type == AudioDevice.Type.HearingAid) &&
-                    audioDevice.hasCapability(AudioDevice.Capabilities.CapabilityPlay)
-                ) {
-                    Log.i(
-                        "[Audio Route Helper] Found bluetooth audio device [${audioDevice.deviceName} (${audioDevice.driverName})]"
-                    )
-                    return true
-                }
-            }
-            return false
-        }
-
-        private fun isBluetoothAudioRecorderAvailable(): Boolean {
-            for (audioDevice in coreContext.core.audioDevices) {
-                if ((audioDevice.type == AudioDevice.Type.Bluetooth || audioDevice.type == AudioDevice.Type.HearingAid) &&
-                    audioDevice.hasCapability(AudioDevice.Capabilities.CapabilityRecord)
-                ) {
-                    Log.i(
-                        "[Audio Route Helper] Found bluetooth audio recorder [${audioDevice.deviceName} (${audioDevice.driverName})]"
-                    )
-                    return true
-                }
-            }
-            return false
-        }
-
-        fun isHeadsetAudioRouteAvailable(): Boolean {
-            for (audioDevice in coreContext.core.audioDevices) {
-                if ((audioDevice.type == AudioDevice.Type.Headset || audioDevice.type == AudioDevice.Type.Headphones) &&
-                    audioDevice.hasCapability(AudioDevice.Capabilities.CapabilityPlay)
-                ) {
-                    Log.i(
-                        "[Audio Route Helper] Found headset/headphones audio device [${audioDevice.deviceName} (${audioDevice.driverName})]"
-                    )
-                    return true
-                }
-            }
-            return false
-        }
-
-        private fun isHeadsetAudioRecorderAvailable(): Boolean {
-            for (audioDevice in coreContext.core.audioDevices) {
-                if ((audioDevice.type == AudioDevice.Type.Headset || audioDevice.type == AudioDevice.Type.Headphones) &&
-                    audioDevice.hasCapability(AudioDevice.Capabilities.CapabilityRecord)
-                ) {
-                    Log.i(
-                        "[Audio Route Helper] Found headset/headphones audio recorder [${audioDevice.deviceName} (${audioDevice.driverName})]"
-                    )
-                    return true
-                }
-            }
-            return false
-        }
-
-        fun getAudioPlaybackDeviceIdForCallRecordingOrVoiceMessage(): String? {
-            // In case no headphones/headset/hearing aid/bluetooth is connected, use speaker sound card to play recordings, otherwise use earpiece
-            // If none are available, default one will be used
-            var headphonesCard: String? = null
-            var bluetoothCard: String? = null
-            var speakerCard: String? = null
-            var earpieceCard: String? = null
-            for (device in coreContext.core.audioDevices) {
-                if (device.hasCapability(AudioDevice.Capabilities.CapabilityPlay)) {
-                    when (device.type) {
-                        AudioDevice.Type.Headphones, AudioDevice.Type.Headset -> {
-                            headphonesCard = device.id
-                        }
-                        AudioDevice.Type.Bluetooth, AudioDevice.Type.HearingAid -> {
-                            bluetoothCard = device.id
-                        }
-                        AudioDevice.Type.Speaker -> {
-                            speakerCard = device.id
-                        }
-                        AudioDevice.Type.Earpiece -> {
-                            earpieceCard = device.id
-                        }
-                        else -> {}
-                    }
-                }
-            }
-            Log.i(
-                "[Audio Route Helper] Found headset/headphones/hearingAid sound card [$headphonesCard], bluetooth sound card [$bluetoothCard], speaker sound card [$speakerCard] and earpiece sound card [$earpieceCard]"
-            )
-            return headphonesCard ?: bluetoothCard ?: speakerCard ?: earpieceCard
-        }
-
-        fun getAudioRecordingDeviceForVoiceMessage(): AudioDevice? {
-            // In case no headphones/headset/hearing aid/bluetooth is connected, use microphone
-            // If none are available, default one will be used
-            var bluetoothAudioDevice: AudioDevice? = null
-            var headsetAudioDevice: AudioDevice? = null
-            var builtinMicrophone: AudioDevice? = null
-            for (device in coreContext.core.audioDevices) {
-                if (device.hasCapability(AudioDevice.Capabilities.CapabilityRecord)) {
-                    when (device.type) {
-                        AudioDevice.Type.Bluetooth, AudioDevice.Type.HearingAid -> {
-                            bluetoothAudioDevice = device
-                        }
-                        AudioDevice.Type.Headset, AudioDevice.Type.Headphones -> {
-                            headsetAudioDevice = device
-                        }
-                        AudioDevice.Type.Microphone -> {
-                            builtinMicrophone = device
-                        }
-                        else -> {}
-                    }
-                }
-            }
-            Log.i(
-                "[Audio Route Helper] Found headset/headphones/hearingAid [${headsetAudioDevice?.id}], bluetooth [${bluetoothAudioDevice?.id}] and builtin microphone [${builtinMicrophone?.id}]"
-            )
-            return headsetAudioDevice ?: bluetoothAudioDevice ?: builtinMicrophone
-        }
-    }
-}
diff --git a/app/src/main/java/org/linphone/utils/ContactUtils.kt b/app/src/main/java/org/linphone/utils/ContactUtils.kt
deleted file mode 100644
index 1c4098aa7..000000000
--- a/app/src/main/java/org/linphone/utils/ContactUtils.kt
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright (c) 2010-2021 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.utils
-
-import android.content.ContentResolver
-import android.net.Uri
-import android.provider.ContactsContract
-import java.io.*
-import org.linphone.LinphoneApplication.Companion.coreContext
-import org.linphone.core.tools.Log
-
-class ContactUtils {
-    companion object {
-        fun getContactVcardFilePath(contactUri: Uri): String? {
-            val contentResolver: ContentResolver = coreContext.context.contentResolver
-            val lookupUri = ContactsContract.Contacts.getLookupUri(contentResolver, contactUri)
-            Log.i("[Contact Utils] Contact lookup URI is $lookupUri")
-
-            val contactID = FileUtils.getNameFromFilePath(lookupUri.toString())
-            Log.i("[Contact Utils] Contact ID is $contactID")
-
-            val contact = coreContext.contactsManager.findContactById(contactID)
-            if (contact == null) {
-                Log.e("[Contact Utils] Failed to find contact with ID $contactID")
-                return null
-            }
-
-            val vcard = contact.vcard?.asVcard4String()
-            if (vcard == null) {
-                Log.e("[Contact Utils] Failed to get vCard from contact $contactID")
-                return null
-            }
-
-            val contactName = contact.name?.replace(" ", "_") ?: contactID
-            val vcardPath = FileUtils.getFileStoragePath("$contactName.vcf")
-            val inputStream = ByteArrayInputStream(vcard.toByteArray())
-            try {
-                FileOutputStream(vcardPath).use { out ->
-                    val buffer = ByteArray(4096)
-                    var bytesRead: Int
-                    while (inputStream.read(buffer).also { bytesRead = it } >= 0) {
-                        out.write(buffer, 0, bytesRead)
-                    }
-                }
-            } catch (e: IOException) {
-                Log.e("[Contact Utils] creating vcard file exception: $e")
-                return null
-            }
-
-            Log.i("[Contact Utils] Contact vCard path is $vcardPath")
-            return vcardPath.absolutePath
-        }
-    }
-}
diff --git a/app/src/main/java/org/linphone/utils/DataBindingUtils.kt b/app/src/main/java/org/linphone/utils/DataBindingUtils.kt
deleted file mode 100644
index e7bd08092..000000000
--- a/app/src/main/java/org/linphone/utils/DataBindingUtils.kt
+++ /dev/null
@@ -1,898 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.utils
-
-import android.annotation.SuppressLint
-import android.app.Activity
-import android.content.Context
-import android.text.Editable
-import android.text.TextWatcher
-import android.util.Patterns
-import android.view.*
-import android.view.inputmethod.EditorInfo
-import android.view.inputmethod.InputMethodManager
-import android.widget.*
-import android.widget.SeekBar.OnSeekBarChangeListener
-import androidx.appcompat.content.res.AppCompatResources
-import androidx.constraintlayout.widget.ConstraintLayout
-import androidx.constraintlayout.widget.Guideline
-import androidx.core.view.ViewCompat
-import androidx.core.view.WindowInsetsCompat
-import androidx.core.view.doOnLayout
-import androidx.databinding.*
-import androidx.emoji2.emojipicker.EmojiPickerView
-import androidx.emoji2.emojipicker.EmojiViewItem
-import androidx.lifecycle.LifecycleOwner
-import coil.dispose
-import coil.load
-import coil.request.CachePolicy
-import coil.request.videoFrameMillis
-import coil.transform.CircleCropTransformation
-import com.google.android.material.switchmaterial.SwitchMaterial
-import kotlinx.coroutines.*
-import org.linphone.BR
-import org.linphone.LinphoneApplication.Companion.coreContext
-import org.linphone.LinphoneApplication.Companion.corePreferences
-import org.linphone.R
-import org.linphone.activities.main.settings.SettingListener
-import org.linphone.activities.voip.data.ConferenceParticipantDeviceData
-import org.linphone.activities.voip.views.ScrollDotsView
-import org.linphone.contact.ContactAvatarGenerator
-import org.linphone.contact.ContactDataInterface
-import org.linphone.contact.getPictureUri
-import org.linphone.core.ConsolidatedPresence
-import org.linphone.core.tools.Log
-import org.linphone.views.VoiceRecordProgressBar
-
-/**
- * This file contains all the data binding necessary for the app
- */
-
-fun View.hideKeyboard() {
-    try {
-        val imm =
-            context.getSystemService(Activity.INPUT_METHOD_SERVICE) as InputMethodManager
-        imm.hideSoftInputFromWindow(windowToken, 0)
-    } catch (_: Exception) {}
-}
-
-fun View.setKeyboardInsetListener(lambda: (visible: Boolean) -> Unit) {
-    doOnLayout {
-        var isKeyboardVisible = ViewCompat.getRootWindowInsets(this)?.isVisible(
-            WindowInsetsCompat.Type.ime()
-        ) == true
-
-        lambda(isKeyboardVisible)
-
-        // See https://issuetracker.google.com/issues/281942480
-        ViewCompat.setOnApplyWindowInsetsListener(
-            rootView
-        ) { view, insets ->
-            val keyboardVisibilityChanged = ViewCompat.getRootWindowInsets(view)
-                ?.isVisible(WindowInsetsCompat.Type.ime()) == true
-            if (keyboardVisibilityChanged != isKeyboardVisible) {
-                isKeyboardVisible = keyboardVisibilityChanged
-                lambda(isKeyboardVisible)
-            }
-            ViewCompat.onApplyWindowInsets(view, insets)
-        }
-    }
-}
-
-@BindingAdapter("android:src")
-fun ImageView.setSourceImageResource(resource: Int) {
-    this.setImageResource(resource)
-}
-
-@BindingAdapter("android:contentDescription")
-fun ImageView.setContentDescription(resource: Int) {
-    if (resource == 0) {
-        Log.w("Can't set content description with resource id 0")
-        return
-    }
-    this.contentDescription = context.getString(resource)
-}
-
-@BindingAdapter("android:textStyle")
-fun TextView.setTypeface(typeface: Int) {
-    this.setTypeface(null, typeface)
-}
-
-@BindingAdapter("android:layout_size")
-fun View.setLayoutSize(dimension: Float) {
-    if (dimension == 0f) return
-    this.layoutParams.height = dimension.toInt()
-    this.layoutParams.width = dimension.toInt()
-}
-
-@BindingAdapter("backgroundImage")
-fun LinearLayout.setBackgroundImage(resource: Int) {
-    this.setBackgroundResource(resource)
-}
-
-@Suppress("DEPRECATION")
-@BindingAdapter("style")
-fun TextView.setStyle(resource: Int) {
-    this.setTextAppearance(context, resource)
-}
-
-@BindingAdapter("android:layout_marginLeft")
-fun setLeftMargin(view: View, margin: Float) {
-    val layoutParams = view.layoutParams as RelativeLayout.LayoutParams
-    layoutParams.leftMargin = margin.toInt()
-    view.layoutParams = layoutParams
-}
-
-@BindingAdapter("android:layout_marginRight")
-fun setRightMargin(view: View, margin: Float) {
-    val layoutParams = view.layoutParams as RelativeLayout.LayoutParams
-    layoutParams.rightMargin = margin.toInt()
-    view.layoutParams = layoutParams
-}
-
-@BindingAdapter("android:layout_alignLeft")
-fun setLayoutLeftAlign(view: View, oldTargetId: Int, newTargetId: Int) {
-    val layoutParams = view.layoutParams as RelativeLayout.LayoutParams
-    if (oldTargetId != 0) layoutParams.removeRule(RelativeLayout.ALIGN_LEFT)
-    if (newTargetId != 0) layoutParams.addRule(RelativeLayout.ALIGN_LEFT, newTargetId)
-    view.layoutParams = layoutParams
-}
-
-@BindingAdapter("android:layout_alignRight")
-fun setLayoutRightAlign(view: View, oldTargetId: Int, newTargetId: Int) {
-    val layoutParams = view.layoutParams as RelativeLayout.LayoutParams
-    if (oldTargetId != 0) layoutParams.removeRule(RelativeLayout.ALIGN_RIGHT)
-    if (newTargetId != 0) layoutParams.addRule(RelativeLayout.ALIGN_RIGHT, newTargetId)
-    view.layoutParams = layoutParams
-}
-
-@BindingAdapter("android:layout_toLeftOf")
-fun setLayoutToLeftOf(view: View, oldTargetId: Int, newTargetId: Int) {
-    val layoutParams = view.layoutParams as RelativeLayout.LayoutParams
-    if (oldTargetId != 0) layoutParams.removeRule(RelativeLayout.LEFT_OF)
-    if (newTargetId != 0) layoutParams.addRule(RelativeLayout.LEFT_OF, newTargetId)
-    view.layoutParams = layoutParams
-}
-
-@BindingAdapter("android:layout_gravity")
-fun setLayoutGravity(view: View, gravity: Int) {
-    val layoutParams = view.layoutParams as LinearLayout.LayoutParams
-    layoutParams.gravity = gravity
-    view.layoutParams = layoutParams
-}
-
-@BindingAdapter("layout_constraintGuide_percent")
-fun setLayoutConstraintGuidePercent(guideline: Guideline, percent: Float) {
-    val params = guideline.layoutParams as ConstraintLayout.LayoutParams
-    params.guidePercent = percent
-    guideline.layoutParams = params
-}
-
-@BindingAdapter("onClickToggleSwitch")
-fun switchSetting(view: View, switchId: Int) {
-    val switch: SwitchMaterial = view.findViewById(switchId)
-    view.setOnClickListener { switch.isChecked = !switch.isChecked }
-}
-
-@BindingAdapter("onValueChanged")
-fun editTextSetting(view: EditText, lambda: () -> Unit) {
-    view.addTextChangedListener(object : TextWatcher {
-        override fun afterTextChanged(s: Editable?) {
-            lambda()
-        }
-
-        override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
-
-        override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {}
-    })
-}
-
-@BindingAdapter("onSettingImeDone")
-fun editTextImeDone(view: EditText, lambda: () -> Unit) {
-    view.setOnEditorActionListener { _, actionId, _ ->
-        if (actionId == EditorInfo.IME_ACTION_DONE) {
-            lambda()
-
-            view.clearFocus()
-
-            val imm = view.context.getSystemService(Activity.INPUT_METHOD_SERVICE) as InputMethodManager
-            imm.hideSoftInputFromWindow(view.windowToken, 0)
-
-            return@setOnEditorActionListener true
-        }
-        false
-    }
-}
-
-@BindingAdapter("onFocusChangeVisibilityOf")
-fun setEditTextOnFocusChangeVisibilityOf(editText: EditText, view: View) {
-    editText.setOnFocusChangeListener { _, hasFocus ->
-        view.visibility = if (hasFocus) View.VISIBLE else View.INVISIBLE
-    }
-}
-
-@BindingAdapter("selectedIndex", "settingListener")
-fun spinnerSetting(spinner: Spinner, selectedIndex: Int, listener: SettingListener?) {
-    spinner.setSelection(selectedIndex, true)
-
-    spinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
-        override fun onNothingSelected(parent: AdapterView<*>?) {}
-
-        override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
-            // From Crashlytics it seems this method may be called with a null listener
-            listener?.onListValueChanged(position)
-        }
-    }
-}
-
-@BindingAdapter("onProgressChanged")
-fun setListener(view: SeekBar, lambda: (Any) -> Unit) {
-    view.setOnSeekBarChangeListener(object : OnSeekBarChangeListener {
-        override fun onProgressChanged(seekBar: SeekBar?, progress: Int, fromUser: Boolean) {
-            if (fromUser) lambda(progress)
-        }
-
-        override fun onStartTrackingTouch(seekBar: SeekBar?) {}
-
-        override fun onStopTrackingTouch(seekBar: SeekBar?) {}
-    })
-}
-
-@BindingAdapter("inflatedLifecycleOwner")
-fun setInflatedViewStubLifecycleOwner(view: View, enable: Boolean) {
-    val binding = DataBindingUtil.bind<ViewDataBinding>(view)
-    // This is a bit hacky...
-    if (view.context is LifecycleOwner) {
-        binding?.lifecycleOwner = view.context as? LifecycleOwner
-    }
-}
-
-@BindingAdapter("entries")
-fun setEntries(
-    viewGroup: ViewGroup,
-    entries: List<ViewDataBinding>?
-) {
-    viewGroup.removeAllViews()
-    if (entries != null) {
-        for (i in entries) {
-            viewGroup.addView(i.root)
-        }
-    }
-}
-
-private fun <T> setEntries(
-    viewGroup: ViewGroup,
-    entries: List<T>?,
-    layoutId: Int,
-    onLongClick: View.OnLongClickListener?,
-    parent: Any?
-) {
-    viewGroup.removeAllViews()
-    if (entries != null) {
-        val inflater = viewGroup.context.getSystemService(Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater
-        for (entry in entries) {
-            val binding = DataBindingUtil.inflate<ViewDataBinding>(
-                inflater,
-                layoutId,
-                viewGroup,
-                false
-            )
-            binding.setVariable(BR.data, entry)
-            binding.setVariable(BR.longClickListener, onLongClick)
-            binding.setVariable(BR.parent, parent)
-
-            // This is a bit hacky...
-            if (viewGroup.context is LifecycleOwner) {
-                binding.lifecycleOwner = viewGroup.context as? LifecycleOwner
-            }
-
-            viewGroup.addView(binding.root)
-        }
-    }
-}
-
-@BindingAdapter("entries", "layout")
-fun <T> setEntries(
-    viewGroup: ViewGroup,
-    entries: List<T>?,
-    layoutId: Int
-) {
-    setEntries(viewGroup, entries, layoutId, null, null)
-}
-
-@BindingAdapter("entries", "layout", "onLongClick")
-fun <T> setEntries(
-    viewGroup: ViewGroup,
-    entries: List<T>?,
-    layoutId: Int,
-    onLongClick: View.OnLongClickListener?
-) {
-    setEntries(viewGroup, entries, layoutId, onLongClick, null)
-}
-
-@BindingAdapter("entries", "layout", "parent")
-fun <T> setEntries(
-    viewGroup: ViewGroup,
-    entries: List<T>?,
-    layoutId: Int,
-    parent: Any?
-) {
-    setEntries(viewGroup, entries, layoutId, null, parent)
-}
-
-@BindingAdapter("android:scaleType")
-fun setImageViewScaleType(imageView: ImageView, scaleType: ImageView.ScaleType) {
-    imageView.scaleType = scaleType
-}
-
-@BindingAdapter("coilRounded")
-fun loadRoundImageWithCoil(imageView: ImageView, path: String?) {
-    if (!path.isNullOrEmpty() && FileUtils.isExtensionImage(path)) {
-        imageView.load(path) {
-            transformations(CircleCropTransformation())
-        }
-    } else {
-        Log.w("[Data Binding] [Coil] Can't load $path")
-    }
-}
-
-@BindingAdapter("coil")
-fun loadImageWithCoil(imageView: ImageView, path: String?) {
-    if (!path.isNullOrEmpty() && FileUtils.isExtensionImage(path)) {
-        if (corePreferences.vfsEnabled && path.startsWith(corePreferences.vfsCachePath)) {
-            imageView.load(path) {
-                diskCachePolicy(CachePolicy.DISABLED)
-                listener(
-                    onError = { _, result ->
-                        Log.e(
-                            "[Data Binding] [VFS] [Coil] Error loading [$path]: ${result.throwable}"
-                        )
-                    }
-                )
-            }
-        } else {
-            imageView.load(path) {
-                listener(
-                    onError = { _, result ->
-                        Log.e("[Data Binding] [Coil] Error loading [$path]: ${result.throwable}")
-                    }
-                )
-            }
-        }
-    } else if (path != null) {
-        Log.w("[Data Binding] [Coil] Can't load $path")
-    }
-}
-
-private suspend fun loadContactPictureWithCoil(
-    imageView: ImageView,
-    contact: ContactDataInterface?,
-    useThumbnail: Boolean,
-    size: Int = 0,
-    textSize: Int = 0,
-    color: Int = 0,
-    textColor: Int = 0,
-    defaultAvatar: String? = null
-) {
-    imageView.dispose()
-
-    val context = imageView.context
-    if (contact == null) {
-        if (defaultAvatar != null) {
-            imageView.load(defaultAvatar) {
-                transformations(CircleCropTransformation())
-            }
-        } else {
-            imageView.load(R.drawable.icon_single_contact_avatar)
-        }
-    } else if (contact.showGroupChatAvatar) {
-        imageView.load(
-            AppCompatResources.getDrawable(context, R.drawable.icon_multiple_contacts_avatar)
-        )
-    } else {
-        val displayName = contact.contact.value?.name ?: contact.displayName.value.orEmpty()
-        val source = contact.contact.value?.getPictureUri(useThumbnail)
-        val sourceStr = source.toString()
-        val base64 = if (ImageUtils.isBase64(sourceStr)) {
-            Log.d("[Coil] Picture URI is base64 encoded")
-            ImageUtils.getBase64ImageFromString(sourceStr)
-        } else {
-            null
-        }
-
-        imageView.load(base64 ?: source) {
-            transformations(CircleCropTransformation())
-            error(
-                if (displayName.isEmpty() || AppUtils.getInitials(displayName) == "+") {
-                    AppCompatResources.getDrawable(context, R.drawable.icon_single_contact_avatar)
-                } else {
-                    coroutineScope {
-                        withContext(Dispatchers.IO) {
-                            val builder = ContactAvatarGenerator(context)
-                            builder.setLabel(displayName)
-                            if (size > 0) {
-                                builder.setAvatarSize(AppUtils.getDimension(size).toInt())
-                            }
-                            if (textSize > 0) {
-                                builder.setTextSize(AppUtils.getDimension(textSize))
-                            }
-                            if (color > 0) {
-                                builder.setBackgroundColorAttribute(color)
-                            }
-                            if (textColor > 0) {
-                                builder.setTextColorResource(textColor)
-                            }
-                            builder.build()
-                        }
-                    }
-                }
-            )
-        }
-    }
-}
-
-@BindingAdapter("coilContact")
-fun loadContactPictureWithCoil(imageView: ImageView, contact: ContactDataInterface?) {
-    val coroutineScope = contact?.coroutineScope ?: coreContext.coroutineScope
-    coroutineScope.launch {
-        withContext(Dispatchers.Main) {
-            loadContactPictureWithCoil(imageView, contact, true)
-        }
-    }
-}
-
-@BindingAdapter("coilContactBig")
-fun loadBigContactPictureWithCoil(imageView: ImageView, contact: ContactDataInterface?) {
-    val coroutineScope = contact?.coroutineScope ?: coreContext.coroutineScope
-    coroutineScope.launch {
-        withContext(Dispatchers.Main) {
-            loadContactPictureWithCoil(
-                imageView,
-                contact,
-                false,
-                R.dimen.contact_avatar_big_size,
-                R.dimen.contact_avatar_text_big_size
-            )
-        }
-    }
-}
-
-@BindingAdapter("coilVoipContactAlt")
-fun loadVoipContactPictureWithCoilAlt(imageView: ImageView, contact: ContactDataInterface?) {
-    val coroutineScope = contact?.coroutineScope ?: coreContext.coroutineScope
-    coroutineScope.launch {
-        withContext(Dispatchers.Main) {
-            loadContactPictureWithCoil(
-                imageView,
-                contact,
-                false,
-                R.dimen.voip_contact_avatar_max_size,
-                R.dimen.voip_contact_avatar_text_size,
-                R.attr.voipParticipantBackgroundColor,
-                R.color.white_color
-            )
-        }
-    }
-}
-
-@BindingAdapter("coilVoipContact")
-fun loadVoipContactPictureWithCoil(imageView: ImageView, contact: ContactDataInterface?) {
-    val coroutineScope = contact?.coroutineScope ?: coreContext.coroutineScope
-    coroutineScope.launch {
-        withContext(Dispatchers.Main) {
-            loadContactPictureWithCoil(
-                imageView,
-                contact,
-                false,
-                R.dimen.voip_contact_avatar_max_size,
-                R.dimen.voip_contact_avatar_text_size,
-                R.attr.voipBackgroundColor,
-                R.color.white_color
-            )
-        }
-    }
-}
-
-@BindingAdapter("coilSelfAvatar")
-fun loadSelfAvatarWithCoil(imageView: ImageView, contact: ContactDataInterface?) {
-    val coroutineScope = contact?.coroutineScope ?: coreContext.coroutineScope
-    coroutineScope.launch {
-        withContext(Dispatchers.Main) {
-            loadContactPictureWithCoil(
-                imageView,
-                contact,
-                false,
-                R.dimen.voip_contact_avatar_max_size,
-                R.dimen.voip_contact_avatar_text_size,
-                R.attr.voipBackgroundColor,
-                R.color.white_color,
-                corePreferences.defaultAccountAvatarPath
-            )
-        }
-    }
-}
-
-@BindingAdapter("coilGoneIfError")
-fun loadAvatarWithCoil(imageView: ImageView, path: String?) {
-    if (path != null) {
-        imageView.visibility = View.VISIBLE
-        imageView.load(path) {
-            transformations(CircleCropTransformation())
-            listener(
-                onError = { _, result ->
-                    Log.e("[Data Binding] [Coil] Error loading [$path]: ${result.throwable}")
-                    imageView.visibility = View.GONE
-                },
-                onSuccess = { _, _ ->
-                    imageView.visibility = View.VISIBLE
-                }
-            )
-        }
-    } else {
-        imageView.visibility = View.GONE
-    }
-}
-
-@BindingAdapter("coilVideoPreview")
-fun loadVideoPreview(imageView: ImageView, path: String?) {
-    if (!path.isNullOrEmpty() && FileUtils.isExtensionVideo(path)) {
-        imageView.load(path) {
-            videoFrameMillis(0)
-            listener(
-                onError = { _, result ->
-                    Log.e(
-                        "[Data Binding] [Coil] Error getting preview picture from video? [$path]: ${result.throwable}"
-                    )
-                },
-                onSuccess = { _, _ ->
-                    // Display "play" button above video preview
-                    LayoutInflater.from(imageView.context).inflate(
-                        R.layout.video_play_button,
-                        imageView.parent as ViewGroup
-                    )
-                }
-            )
-        }
-    }
-}
-
-@BindingAdapter("assistantPhoneNumberValidation")
-fun addPhoneNumberEditTextValidation(editText: EditText, enabled: Boolean) {
-    if (!enabled) return
-    editText.addTextChangedListener(object : TextWatcher {
-        override fun afterTextChanged(s: Editable?) {
-            when {
-                s?.matches(Regex("\\d+")) == false ->
-                    editText.error =
-                        editText.context.getString(
-                            R.string.assistant_error_phone_number_invalid_characters
-                        )
-            }
-        }
-
-        override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
-
-        override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {}
-    })
-}
-
-@BindingAdapter("assistantPhoneNumberPrefixValidation")
-fun addPrefixEditTextValidation(editText: EditText, enabled: Boolean) {
-    if (!enabled) return
-    editText.addTextChangedListener(object : TextWatcher {
-        override fun afterTextChanged(s: Editable?) {
-            if ((s?.length ?: 0) > 1) {
-                val dialPlan = PhoneNumberUtils.getDialPlanFromCountryCallingPrefix(
-                    s.toString().substring(1)
-                )
-                if (dialPlan == null) {
-                    editText.error =
-                        editText.context.getString(
-                            R.string.assistant_error_invalid_international_prefix
-                        )
-                }
-            }
-        }
-
-        override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
-
-        @SuppressLint("SetTextI18n")
-        override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
-            if (s.isNullOrEmpty() || !s.startsWith("+")) {
-                editText.setText("+$s")
-            }
-        }
-    })
-}
-
-@BindingAdapter("assistantUsernameValidation")
-fun addUsernameEditTextValidation(editText: EditText, enabled: Boolean) {
-    if (!enabled) return
-    val usernameRegexp = corePreferences.config.getString(
-        "assistant",
-        "username_regex",
-        "^[a-z0-9+_.\\-]*\$"
-    )!!
-    val usernameMaxLength = corePreferences.config.getInt("assistant", "username_max_length", 64)
-    editText.addTextChangedListener(object : TextWatcher {
-        override fun afterTextChanged(s: Editable?) {
-            when {
-                s?.matches(Regex(usernameRegexp)) == false ->
-                    editText.error =
-                        editText.context.getString(
-                            R.string.assistant_error_username_invalid_characters
-                        )
-                (s?.length ?: 0) > usernameMaxLength -> {
-                    editText.error =
-                        editText.context.getString(R.string.assistant_error_username_too_long)
-                }
-            }
-        }
-
-        override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
-
-        override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {}
-    })
-}
-
-@BindingAdapter("emailConfirmationValidation")
-fun addEmailEditTextValidation(editText: EditText, enabled: Boolean) {
-    if (!enabled) return
-    editText.addTextChangedListener(object : TextWatcher {
-        override fun afterTextChanged(s: Editable?) {}
-
-        override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
-
-        override fun onTextChanged(s: CharSequence, start: Int, before: Int, count: Int) {
-            if (!Patterns.EMAIL_ADDRESS.matcher(s).matches()) {
-                editText.error =
-                    editText.context.getString(R.string.assistant_error_invalid_email_address)
-            }
-        }
-    })
-}
-
-@BindingAdapter("urlConfirmationValidation")
-fun addUrlEditTextValidation(editText: EditText, enabled: Boolean) {
-    if (!enabled) return
-    editText.addTextChangedListener(object : TextWatcher {
-        override fun afterTextChanged(s: Editable?) {}
-
-        override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
-
-        override fun onTextChanged(s: CharSequence, start: Int, before: Int, count: Int) {
-            if (!Patterns.WEB_URL.matcher(s).matches()) {
-                editText.error =
-                    editText.context.getString(R.string.assistant_remote_provisioning_wrong_format)
-            }
-        }
-    })
-}
-
-@BindingAdapter("passwordConfirmationValidation")
-fun addPasswordConfirmationEditTextValidation(password: EditText, passwordConfirmation: EditText) {
-    password.addTextChangedListener(object : TextWatcher {
-        override fun afterTextChanged(s: Editable?) {}
-
-        override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
-
-        override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
-            if (passwordConfirmation.text == null || s == null || passwordConfirmation.text.toString() != s.toString()) {
-                passwordConfirmation.error =
-                    passwordConfirmation.context.getString(
-                        R.string.assistant_error_passwords_dont_match
-                    )
-            } else {
-                passwordConfirmation.error = null // To clear other edit text field error
-            }
-        }
-    })
-
-    passwordConfirmation.addTextChangedListener(object : TextWatcher {
-        override fun afterTextChanged(s: Editable?) {}
-
-        override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
-
-        override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
-            if (password.text == null || s == null || password.text.toString() != s.toString()) {
-                passwordConfirmation.error =
-                    passwordConfirmation.context.getString(
-                        R.string.assistant_error_passwords_dont_match
-                    )
-            }
-        }
-    })
-}
-
-@BindingAdapter("errorMessage")
-fun setEditTextError(editText: EditText, error: String?) {
-    if (error != editText.error) {
-        editText.error = error
-    }
-}
-
-@InverseBindingAdapter(attribute = "errorMessage")
-fun getEditTextError(editText: EditText): String? {
-    return editText.error?.toString()
-}
-
-@BindingAdapter("errorMessageAttrChanged")
-fun setEditTextErrorListener(editText: EditText, attrChange: InverseBindingListener) {
-    editText.addTextChangedListener(object : TextWatcher {
-        override fun afterTextChanged(s: Editable?) {
-            attrChange.onChange()
-        }
-
-        override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {
-            editText.error = null
-            attrChange.onChange()
-        }
-
-        override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {}
-    })
-}
-
-@BindingAdapter("max")
-fun VoiceRecordProgressBar.setProgressMax(max: Int) {
-    setMax(max)
-}
-
-@BindingAdapter("android:progress")
-fun VoiceRecordProgressBar.setPrimaryProgress(progress: Int) {
-    setProgress(progress)
-}
-
-@BindingAdapter("android:secondaryProgress")
-fun VoiceRecordProgressBar.setSecProgress(progress: Int) {
-    setSecondaryProgress(progress)
-}
-
-@BindingAdapter("secondaryProgressTint")
-fun VoiceRecordProgressBar.setSecProgressTint(color: Int) {
-    setSecondaryProgressTint(color)
-}
-
-@BindingAdapter("android:layout_margin")
-fun setConstraintLayoutMargins(view: View, margins: Float) {
-    val params = view.layoutParams as ConstraintLayout.LayoutParams
-    val m = margins.toInt()
-    params.setMargins(m, m, m, m)
-    view.layoutParams = params
-}
-
-@BindingAdapter("android:layout_marginTop")
-fun setConstraintLayoutTopMargin(view: View, margins: Float) {
-    val params = view.layoutParams as ConstraintLayout.LayoutParams
-    val m = margins.toInt()
-    params.setMargins(params.leftMargin, m, params.rightMargin, params.bottomMargin)
-    view.layoutParams = params
-}
-
-@BindingAdapter("android:layout_marginBottom")
-fun setConstraintLayoutBottomMargin(view: View, margins: Float) {
-    val params = view.layoutParams as ConstraintLayout.LayoutParams
-    val m = margins.toInt()
-    params.setMargins(params.leftMargin, params.topMargin, params.rightMargin, m)
-    view.layoutParams = params
-}
-
-@BindingAdapter("android:layout_marginEnd")
-fun setConstraintLayoutEndMargin(view: View, margins: Float) {
-    val params = view.layoutParams as ConstraintLayout.LayoutParams
-    val m = margins.toInt()
-    params.marginEnd = m
-    view.layoutParams = params
-}
-
-@BindingAdapter("android:onTouch")
-fun View.setTouchListener(listener: View.OnTouchListener?) {
-    if (listener != null) {
-        setOnTouchListener(listener)
-    }
-}
-
-@BindingAdapter("entries")
-fun Spinner.setEntries(entries: List<Any>?) {
-    if (entries != null) {
-        val arrayAdapter = ArrayAdapter(context, android.R.layout.simple_spinner_item, entries)
-        arrayAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
-        adapter = arrayAdapter
-    }
-}
-
-@BindingAdapter("selectedValueAttrChanged")
-fun Spinner.setInverseBindingListener(listener: InverseBindingListener) {
-    onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
-        override fun onItemSelected(parent: AdapterView<*>, view: View, position: Int, id: Long) {
-            if (tag != position) {
-                listener.onChange()
-            }
-        }
-
-        override fun onNothingSelected(parent: AdapterView<*>) {}
-    }
-}
-
-@BindingAdapter("selectedValue")
-fun Spinner.setSelectedValue(value: Any?) {
-    if (adapter != null) {
-        val position = (adapter as ArrayAdapter<Any>).getPosition(value)
-        setSelection(position, false)
-        tag = position
-    }
-}
-
-@InverseBindingAdapter(attribute = "selectedValue", event = "selectedValueAttrChanged")
-fun Spinner.getSelectedValue(): Any? {
-    return selectedItem
-}
-
-@BindingAdapter("participantTextureView")
-fun setParticipantTextureView(
-    textureView: TextureView,
-    conferenceParticipantData: ConferenceParticipantDeviceData
-) {
-    conferenceParticipantData.setTextureView(textureView)
-}
-
-@BindingAdapter("itemCount")
-fun ScrollDotsView.setItems(count: Int) {
-    setItemCount(count)
-}
-
-@BindingAdapter("selectedDot")
-fun ScrollDotsView.setSelectedIndex(index: Int) {
-    setSelectedDot(index)
-}
-
-@BindingAdapter("presenceIcon")
-fun ImageView.setPresenceIcon(presence: ConsolidatedPresence?) {
-    if (presence == null) return
-
-    val icon = when (presence) {
-        ConsolidatedPresence.Online -> R.drawable.led_online
-        ConsolidatedPresence.DoNotDisturb -> R.drawable.led_do_not_disturb
-        ConsolidatedPresence.Busy -> R.drawable.led_away
-        else -> R.drawable.led_not_registered
-    }
-    setImageResource(icon)
-
-    val contentDescription = when (presence) {
-        ConsolidatedPresence.Online -> AppUtils.getString(
-            R.string.content_description_presence_online
-        )
-        ConsolidatedPresence.DoNotDisturb -> AppUtils.getString(
-            R.string.content_description_presence_do_not_disturb
-        )
-        else -> AppUtils.getString(R.string.content_description_presence_offline)
-    }
-    setContentDescription(contentDescription)
-}
-
-interface EmojiPickedListener {
-    fun onEmojiPicked(item: EmojiViewItem)
-}
-
-@BindingAdapter("emojiPickedListener")
-fun EmojiPickerView.setEmojiPickedListener(listener: EmojiPickedListener) {
-    setOnEmojiPickedListener { emoji ->
-        listener.onEmojiPicked(emoji)
-    }
-}
diff --git a/app/src/main/java/org/linphone/utils/DialogUtils.kt b/app/src/main/java/org/linphone/utils/DialogUtils.kt
deleted file mode 100644
index f88a958c1..000000000
--- a/app/src/main/java/org/linphone/utils/DialogUtils.kt
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.utils
-
-import android.app.Dialog
-import android.content.Context
-import android.graphics.drawable.ColorDrawable
-import android.graphics.drawable.Drawable
-import android.view.LayoutInflater
-import android.view.Window
-import android.view.WindowManager
-import androidx.core.content.ContextCompat
-import androidx.databinding.DataBindingUtil
-import org.linphone.R
-import org.linphone.activities.main.viewmodels.DialogViewModel
-import org.linphone.databinding.DialogBinding
-import org.linphone.databinding.VoipDialogBinding
-
-class DialogUtils {
-    companion object {
-        fun getDialog(context: Context, viewModel: DialogViewModel): Dialog {
-            val dialog = Dialog(context)
-            dialog.requestWindowFeature(Window.FEATURE_NO_TITLE)
-
-            val binding: DialogBinding = DataBindingUtil.inflate(
-                LayoutInflater.from(context),
-                R.layout.dialog,
-                null,
-                false
-            )
-            binding.viewModel = viewModel
-            dialog.setContentView(binding.root)
-
-            val d: Drawable = ColorDrawable(
-                ContextCompat.getColor(dialog.context, R.color.dark_grey_color)
-            )
-            d.alpha = 200
-            dialog.window
-                ?.setLayout(
-                    WindowManager.LayoutParams.MATCH_PARENT,
-                    WindowManager.LayoutParams.MATCH_PARENT
-                )
-            dialog.window?.setBackgroundDrawable(d)
-            return dialog
-        }
-
-        fun getVoipDialog(context: Context, viewModel: DialogViewModel): Dialog {
-            val dialog = Dialog(context, R.style.AppTheme)
-            dialog.requestWindowFeature(Window.FEATURE_NO_TITLE)
-
-            val binding: VoipDialogBinding = DataBindingUtil.inflate(
-                LayoutInflater.from(context),
-                R.layout.voip_dialog,
-                null,
-                false
-            )
-            binding.viewModel = viewModel
-            dialog.setContentView(binding.root)
-
-            val d: Drawable = ColorDrawable(
-                ContextCompat.getColor(dialog.context, R.color.voip_dark_gray)
-            )
-            d.alpha = 166
-            dialog.window
-                ?.setLayout(
-                    WindowManager.LayoutParams.MATCH_PARENT,
-                    WindowManager.LayoutParams.MATCH_PARENT
-                )
-            dialog.window?.setBackgroundDrawable(d)
-            return dialog
-        }
-    }
-}
diff --git a/app/src/main/java/org/linphone/utils/Event.kt b/app/src/main/java/org/linphone/utils/Event.kt
deleted file mode 100644
index 0e3a53f19..000000000
--- a/app/src/main/java/org/linphone/utils/Event.kt
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.utils
-
-import java.util.concurrent.atomic.AtomicBoolean
-
-/**
- * This class allows to limit the number of notification for an event.
- * The first one to consume the event will stop the dispatch.
- */
-open class Event<out T>(private val content: T) {
-    private val handled = AtomicBoolean(false)
-
-    fun consumed(): Boolean {
-        return handled.get()
-    }
-
-    fun consume(handleContent: (T) -> Unit) {
-        if (!handled.get()) {
-            handled.set(true)
-            handleContent(content)
-        }
-    }
-}
diff --git a/app/src/main/java/org/linphone/utils/FileUtils.kt b/app/src/main/java/org/linphone/utils/FileUtils.kt
deleted file mode 100644
index 7300364c1..000000000
--- a/app/src/main/java/org/linphone/utils/FileUtils.kt
+++ /dev/null
@@ -1,562 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.utils
-
-import android.app.Activity
-import android.content.ActivityNotFoundException
-import android.content.Context
-import android.content.Intent
-import android.database.CursorIndexOutOfBoundsException
-import android.net.Uri
-import android.os.Environment
-import android.os.ParcelFileDescriptor
-import android.os.Process.myUid
-import android.provider.OpenableColumns
-import android.system.Os.fstat
-import android.webkit.MimeTypeMap
-import androidx.core.content.FileProvider
-import java.io.*
-import java.text.SimpleDateFormat
-import java.util.*
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.async
-import kotlinx.coroutines.coroutineScope
-import kotlinx.coroutines.withContext
-import org.linphone.LinphoneApplication.Companion.coreContext
-import org.linphone.LinphoneApplication.Companion.corePreferences
-import org.linphone.R
-import org.linphone.core.tools.Log
-
-class FileUtils {
-    enum class MimeType {
-        PlainText,
-        Pdf,
-        Image,
-        Video,
-        Audio,
-        Unknown
-    }
-
-    companion object {
-        fun getNameFromFilePath(filePath: String): String {
-            var name = filePath
-            val i = filePath.lastIndexOf('/')
-            if (i > 0) {
-                name = filePath.substring(i + 1)
-            }
-            return name
-        }
-
-        fun getExtensionFromFileName(fileName: String): String {
-            var extension = MimeTypeMap.getFileExtensionFromUrl(fileName)
-            if (extension.isNullOrEmpty()) {
-                val i = fileName.lastIndexOf('.')
-                if (i > 0) {
-                    extension = fileName.substring(i + 1)
-                }
-            }
-
-            return extension.lowercase(Locale.getDefault())
-        }
-
-        fun getMimeType(type: String?): MimeType {
-            if (type.isNullOrEmpty()) return MimeType.Unknown
-            return when {
-                type.startsWith("image/") -> MimeType.Image
-                type.startsWith("text/plain") -> MimeType.PlainText
-                type.startsWith("video/") -> MimeType.Video
-                type.startsWith("audio/") -> MimeType.Audio
-                type.startsWith("application/pdf") -> MimeType.Pdf
-                else -> MimeType.Unknown
-            }
-        }
-
-        fun isExtensionImage(path: String): Boolean {
-            val extension = getExtensionFromFileName(path)
-            val type = MimeTypeMap.getSingleton().getMimeTypeFromExtension(extension)
-            return getMimeType(type) == MimeType.Image
-        }
-
-        fun isExtensionVideo(path: String): Boolean {
-            val extension = getExtensionFromFileName(path)
-            val type = MimeTypeMap.getSingleton().getMimeTypeFromExtension(extension)
-            return getMimeType(type) == MimeType.Video
-        }
-
-        fun clearExistingPlainFiles() {
-            val dir = File(corePreferences.vfsCachePath)
-            if (dir.exists()) {
-                for (file in dir.listFiles().orEmpty()) {
-                    Log.w(
-                        "[File Utils] [VFS] Found forgotten plain file [${file.path}], deleting it"
-                    )
-                    deleteFile(file.path)
-                }
-            }
-        }
-
-        fun getFileStorageDir(isPicture: Boolean = false): File {
-            var path: File? = null
-            if (Environment.getExternalStorageState() == Environment.MEDIA_MOUNTED) {
-                Log.w("[File Utils] External storage is mounted")
-                var directory = Environment.DIRECTORY_DOWNLOADS
-                if (isPicture) {
-                    Log.w("[File Utils] Using pictures directory instead of downloads")
-                    directory = Environment.DIRECTORY_PICTURES
-                }
-                path = coreContext.context.getExternalFilesDir(directory)
-            }
-
-            val returnPath: File = path ?: coreContext.context.filesDir
-            if (path == null) {
-                Log.w(
-                    "[File Utils] Couldn't get external storage path, using internal"
-                )
-            }
-
-            return returnPath
-        }
-
-        private fun getFileStorageCacheDir(fileName: String): File {
-            val path = coreContext.context.cacheDir
-            Log.i("[File Utils] Cache directory is: $path")
-
-            var file = File(path, fileName)
-            var prefix = 1
-            while (file.exists()) {
-                file = File(path, prefix.toString() + "_" + fileName)
-                Log.w("[File Utils] File with that name already exists, renamed to ${file.name}")
-                prefix += 1
-            }
-            return file
-        }
-
-        fun getFileStoragePath(fileName: String): File {
-            val path = getFileStorageDir(isExtensionImage(fileName))
-            var file = File(path, fileName)
-
-            var prefix = 1
-            while (file.exists()) {
-                file = File(path, prefix.toString() + "_" + fileName)
-                Log.w("[File Utils] File with that name already exists, renamed to ${file.name}")
-                prefix += 1
-            }
-            return file
-        }
-
-        suspend fun getFilesPathFromPickerIntent(data: Intent?, temporaryImageFilePath: File?): List<String> {
-            var filePath: String? = null
-            if (data != null) {
-                val clipData = data.clipData
-                if (clipData != null && clipData.itemCount > 1) { // Multiple selection
-                    Log.i("[File Utils] Found ${clipData.itemCount} elements")
-                    val list = arrayListOf<String>()
-                    for (i in 0 until clipData.itemCount) {
-                        val dataUri = clipData.getItemAt(i).uri
-                        if (dataUri != null) {
-                            filePath = dataUri.toString()
-                            Log.i("[File Utils] Using data URI $filePath")
-                        }
-                        filePath = copyToLocalStorage(filePath)
-                        if (filePath != null) list.add(filePath)
-                    }
-                    return list
-                } else { // Single selection
-                    val dataUri = if (clipData != null && clipData.itemCount == 1) {
-                        clipData.getItemAt(0).uri
-                    } else {
-                        data.data
-                    }
-                    if (dataUri != null) {
-                        filePath = dataUri.toString()
-                        Log.i("[File Utils] Using data URI $filePath")
-                    } else if (temporaryImageFilePath?.exists() == true) {
-                        filePath = temporaryImageFilePath.absolutePath
-                        Log.i("[File Utils] Data URI is null, using $filePath")
-                    }
-                    filePath = copyToLocalStorage(filePath)
-                    if (filePath != null) return arrayListOf(filePath)
-                }
-            } else if (temporaryImageFilePath?.exists() == true) {
-                filePath = temporaryImageFilePath.absolutePath
-                Log.i("[File Utils] Data is null, using $filePath")
-                filePath = copyToLocalStorage(filePath)
-                if (filePath != null) return arrayListOf(filePath)
-            }
-            return arrayListOf()
-        }
-
-        suspend fun getFilePathFromPickerIntent(data: Intent?, temporaryImageFilePath: File?): String? {
-            var filePath: String? = null
-            if (data != null) {
-                val clipData = data.clipData
-                if (clipData != null && clipData.itemCount > 1) { // Multiple selection
-                    Log.e("[File Utils] Expecting only one file, got ${clipData.itemCount}")
-                } else { // Single selection
-                    val dataUri = if (clipData != null && clipData.itemCount == 1) {
-                        clipData.getItemAt(0).uri
-                    } else {
-                        data.data
-                    }
-                    if (dataUri != null) {
-                        filePath = dataUri.toString()
-                        Log.i("[File Utils] Using data URI $filePath")
-                    } else if (temporaryImageFilePath?.exists() == true) {
-                        filePath = temporaryImageFilePath.absolutePath
-                        Log.i("[File Utils] Data URI is null, using $filePath")
-                    }
-                }
-            } else if (temporaryImageFilePath?.exists() == true) {
-                filePath = temporaryImageFilePath.absolutePath
-                Log.i("[File Utils] Data is null, using $filePath")
-            }
-            return copyToLocalStorage(filePath)
-        }
-
-        suspend fun copyToLocalStorage(filePath: String?): String? {
-            if (filePath != null) {
-                val uriToParse = Uri.parse(filePath)
-                if (filePath.startsWith("content://com.android.contacts/contacts/lookup/")) {
-                    Log.i("[File Utils] Contact sharing URI detected")
-                    return ContactUtils.getContactVcardFilePath(uriToParse)
-                } else if (filePath.startsWith("content://") ||
-                    filePath.startsWith("file://")
-                ) {
-                    val result = getFilePath(coreContext.context, uriToParse)
-                    Log.i(
-                        "[File Utils] Path was using a content or file scheme, real path is: $result"
-                    )
-                    if (result == null) {
-                        Log.e("[File Utils] Failed to get access to file $uriToParse")
-                    }
-                    return result
-                }
-            }
-            return filePath
-        }
-
-        fun deleteFile(filePath: String) {
-            val file = File(filePath)
-            if (file.exists()) {
-                try {
-                    if (file.delete()) {
-                        Log.i("[File Utils] Deleted $filePath")
-                    } else {
-                        Log.e("[File Utils] Can't delete $filePath")
-                    }
-                } catch (e: Exception) {
-                    Log.e("[File Utils] Can't delete $filePath, exception: $e")
-                }
-            } else {
-                Log.e("[File Utils] File $filePath doesn't exists")
-            }
-        }
-
-        suspend fun getFilePath(context: Context, uri: Uri): String? {
-            var result: String? = null
-            val name: String = getNameFromUri(uri, context)
-
-            try {
-                if (fstat(
-                        ParcelFileDescriptor.open(
-                                File(uri.path),
-                                ParcelFileDescriptor.MODE_READ_ONLY
-                            ).fileDescriptor
-                    ).st_uid != myUid()
-                ) {
-                    Log.e("[File Utils] File descriptor UID different from our, denying copy!")
-                    return result
-                }
-            } catch (e: Exception) {
-                Log.e("[File Utils] Can't check file ownership: ", e)
-            }
-
-            try {
-                val localFile: File = createFile(name)
-                val remoteFile =
-                    context.contentResolver.openInputStream(uri)
-                Log.i(
-                    "[File Utils] Trying to copy file from " +
-                        uri.toString() +
-                        " to local file " +
-                        localFile.absolutePath
-                )
-                coroutineScope {
-                    val deferred = async { copyToFile(remoteFile, localFile) }
-                    if (deferred.await()) {
-                        Log.i("[File Utils] Copy successful")
-                        result = localFile.absolutePath
-                    } else {
-                        Log.e("[File Utils] Copy failed")
-                    }
-                    withContext(Dispatchers.IO) {
-                        remoteFile?.close()
-                    }
-                }
-            } catch (e: IOException) {
-                Log.e("[File Utils] getFilePath exception: ", e)
-            }
-
-            return result
-        }
-
-        private fun getNameFromUri(uri: Uri, context: Context): String {
-            var name = ""
-            if (uri.scheme == "content") {
-                val returnCursor =
-                    context.contentResolver.query(uri, null, null, null, null)
-                if (returnCursor != null) {
-                    returnCursor.moveToFirst()
-                    val nameIndex = returnCursor.getColumnIndex(OpenableColumns.DISPLAY_NAME)
-                    if (nameIndex != -1) {
-                        try {
-                            val displayName = returnCursor.getString(nameIndex)
-                            if (displayName != null) {
-                                name = displayName
-                            } else {
-                                Log.e(
-                                    "[File Utils] Failed to get the display name for URI $uri, returned value is null"
-                                )
-                            }
-                        } catch (e: CursorIndexOutOfBoundsException) {
-                            Log.e(
-                                "[File Utils] Failed to get the display name for URI $uri, exception is $e"
-                            )
-                        }
-                    } else {
-                        Log.e("[File Utils] Couldn't get DISPLAY_NAME column index for URI: $uri")
-                    }
-                    returnCursor.close()
-                }
-            } else if (uri.scheme == "file") {
-                name = uri.lastPathSegment ?: ""
-            }
-            return name
-        }
-
-        suspend fun copyFileTo(filePath: String, outputStream: OutputStream?): Boolean {
-            if (outputStream == null) {
-                Log.e("[File Utils] Can't copy file $filePath to given null output stream")
-                return false
-            }
-
-            val file = File(filePath)
-            if (!file.exists()) {
-                Log.e("[File Utils] Can't copy file $filePath, it doesn't exists")
-                return false
-            }
-
-            try {
-                withContext(Dispatchers.IO) {
-                    val inputStream = FileInputStream(file)
-                    val buffer = ByteArray(4096)
-                    var bytesRead: Int
-                    while (inputStream.read(buffer).also { bytesRead = it } >= 0) {
-                        outputStream.write(buffer, 0, bytesRead)
-                    }
-                }
-                return true
-            } catch (e: IOException) {
-                Log.e("[File Utils] copyFileTo exception: $e")
-            }
-            return false
-        }
-
-        private suspend fun copyToFile(inputStream: InputStream?, destFile: File?): Boolean {
-            if (inputStream == null || destFile == null) return false
-            try {
-                withContext(Dispatchers.IO) {
-                    FileOutputStream(destFile).use { out ->
-                        val buffer = ByteArray(4096)
-                        var bytesRead: Int
-                        while (inputStream.read(buffer).also { bytesRead = it } >= 0) {
-                            out.write(buffer, 0, bytesRead)
-                        }
-                    }
-                }
-                return true
-            } catch (e: IOException) {
-                Log.e("[File Utils] copyToFile exception: $e")
-            }
-            return false
-        }
-
-        suspend fun copyFileToCache(plainFilePath: String): String? {
-            val cacheFile = getFileStorageCacheDir(getNameFromFilePath(plainFilePath))
-            try {
-                withContext(Dispatchers.IO) {
-                    FileOutputStream(cacheFile).use { out ->
-                        copyFileTo(plainFilePath, out)
-                    }
-                }
-                return cacheFile.absolutePath
-            } catch (e: IOException) {
-                Log.e("[File Utils] copyFileToCache exception: $e")
-            }
-            return null
-        }
-
-        private fun createFile(file: String): File {
-            var fileName = file
-
-            if (fileName.isEmpty()) fileName = getStartDate()
-            if (!fileName.contains(".")) {
-                fileName = "$fileName.unknown"
-            }
-
-            return getFileStoragePath(fileName)
-        }
-
-        private fun getStartDate(): String {
-            return try {
-                SimpleDateFormat("yyyyMMdd_HHmmss", Locale.ROOT).format(Date())
-            } catch (e: RuntimeException) {
-                SimpleDateFormat("yyyyMMdd_HHmmss", Locale.getDefault()).format(Date())
-            }
-        }
-
-        fun getPublicFilePath(context: Context, path: String): Uri {
-            val contentUri: Uri
-            when {
-                path.startsWith("file://") -> {
-                    val file = File(path.substring("file://".length))
-                    contentUri = FileProvider.getUriForFile(
-                        context,
-                        context.getString(R.string.file_provider),
-                        file
-                    )
-                }
-                path.startsWith("content://") -> {
-                    contentUri = Uri.parse(path)
-                }
-                else -> {
-                    val file = File(path)
-                    contentUri = try {
-                        FileProvider.getUriForFile(
-                            context,
-                            context.getString(R.string.file_provider),
-                            file
-                        )
-                    } catch (e: Exception) {
-                        Log.e(
-                            "[Chat Message] Couldn't get URI for file $file using file provider ${context.getString(
-                                R.string.file_provider
-                            )}"
-                        )
-                        Uri.parse(path)
-                    }
-                }
-            }
-            return contentUri
-        }
-
-        fun openFileInThirdPartyApp(
-            activity: Activity,
-            contentFilePath: String,
-            newTask: Boolean = false
-        ): Boolean {
-            val intent = Intent(Intent.ACTION_VIEW)
-            val contentUri: Uri = getPublicFilePath(activity, contentFilePath)
-            val filePath: String = contentUri.toString()
-            Log.i("[File Viewer] Trying to open file: $filePath")
-            var type: String? = null
-            val extension = getExtensionFromFileName(filePath)
-
-            if (extension.isNotEmpty()) {
-                Log.i("[File Viewer] Found extension $extension")
-                type = MimeTypeMap.getSingleton().getMimeTypeFromExtension(extension)
-            } else {
-                Log.e("[File Viewer] Couldn't find extension")
-            }
-
-            if (type != null) {
-                Log.i("[File Viewer] Found matching MIME type $type")
-            } else {
-                type = if (extension == "linphonerc") {
-                    "text/plain"
-                } else {
-                    "file/$extension"
-                }
-                Log.w(
-                    "[File Viewer] Can't get MIME type from extension: $extension, will use $type"
-                )
-            }
-
-            intent.setDataAndType(contentUri, type)
-            intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
-            if (newTask) {
-                intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-            }
-
-            try {
-                activity.startActivity(intent)
-                return true
-            } catch (anfe: ActivityNotFoundException) {
-                Log.e("[File Viewer] Can't open file in third party app: $anfe")
-            }
-            return false
-        }
-
-        fun openMediaStoreFile(
-            activity: Activity,
-            contentFilePath: String,
-            newTask: Boolean = false
-        ): Boolean {
-            val intent = Intent(Intent.ACTION_VIEW)
-            val contentUri: Uri = Uri.parse(contentFilePath)
-            intent.data = contentUri
-            intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
-            if (newTask) {
-                intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-            }
-
-            try {
-                activity.startActivity(intent)
-                return true
-            } catch (anfe: ActivityNotFoundException) {
-                Log.e("[File Viewer] Can't open media store export in third party app: $anfe")
-            }
-            return false
-        }
-
-        fun writeIntoFile(bytes: ByteArray, file: File) {
-            val inStream = ByteArrayInputStream(bytes)
-            val outStream = FileOutputStream(file)
-
-            val buffer = ByteArray(1024)
-            var read: Int
-            while (inStream.read(buffer).also { read = it } != -1) {
-                outStream.write(buffer, 0, read)
-            }
-
-            inStream.close()
-            outStream.flush()
-            outStream.close()
-        }
-
-        fun countFilesInDirectory(path: String): Int {
-            val dir = File(path)
-            if (dir.exists()) {
-                return dir.listFiles().orEmpty().size
-            }
-            return -1
-        }
-    }
-}
diff --git a/app/src/main/java/org/linphone/utils/ImageUtils.kt b/app/src/main/java/org/linphone/utils/ImageUtils.kt
deleted file mode 100644
index 44f0c650b..000000000
--- a/app/src/main/java/org/linphone/utils/ImageUtils.kt
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.utils
-
-import android.content.Context
-import android.graphics.*
-import android.net.Uri
-import android.util.Base64
-import java.io.FileNotFoundException
-import org.linphone.compatibility.Compatibility
-import org.linphone.core.tools.Log
-
-class ImageUtils {
-    companion object {
-        private const val BASE64_REGEX = "^data:image\\/(gif|png|jpeg|bmp|webp|svg\\+xml)(;charset=utf-8)?;base64,[A-Za-z0-9+\\/]+={0,2}\$"
-
-        fun isBase64(source: String): Boolean {
-            return source.matches(Regex(BASE64_REGEX))
-        }
-
-        fun getBase64ImageFromString(base64: String): ByteArray? {
-            val substring = base64.substring(base64.indexOf(",") + 1)
-            return Base64.decode(substring, Base64.DEFAULT)
-        }
-
-        fun getRoundBitmapFromUri(
-            context: Context,
-            fromPictureUri: Uri?
-        ): Bitmap? {
-            var bm: Bitmap? = null
-            if (fromPictureUri != null) {
-                bm = try {
-                    // We make a copy to ensure Bitmap will be Software and not Hardware, required for shortcuts
-                    Compatibility.getBitmapFromUri(context, fromPictureUri).copy(
-                        Bitmap.Config.ARGB_8888,
-                        true
-                    )
-                } catch (fnfe: FileNotFoundException) {
-                    return null
-                } catch (e: Exception) {
-                    Log.e("[Image Utils] Failed to get bitmap from URI [$fromPictureUri]: $e")
-                    return null
-                }
-            }
-            if (bm != null) {
-                val roundBm = getRoundBitmap(bm)
-                if (roundBm != null) {
-                    bm.recycle()
-                    return roundBm
-                }
-            }
-            return bm
-        }
-
-        fun rotateImage(source: Bitmap, angle: Float): Bitmap {
-            val matrix = Matrix()
-            matrix.postRotate(angle)
-            val rotatedBitmap = Bitmap.createBitmap(
-                source,
-                0,
-                0,
-                source.width,
-                source.height,
-                matrix,
-                true
-            )
-            source.recycle()
-            return rotatedBitmap
-        }
-
-        private fun getRoundBitmap(bitmap: Bitmap): Bitmap? {
-            val output =
-                Bitmap.createBitmap(bitmap.width, bitmap.height, Bitmap.Config.ARGB_8888)
-            val canvas = Canvas(output)
-            val color = -0xbdbdbe
-            val paint = Paint()
-            val rect =
-                Rect(0, 0, bitmap.width, bitmap.height)
-            paint.isAntiAlias = true
-            canvas.drawARGB(0, 0, 0, 0)
-            paint.color = color
-            canvas.drawCircle(
-                bitmap.width / 2.toFloat(),
-                bitmap.height / 2.toFloat(),
-                bitmap.width / 2.toFloat(),
-                paint
-            )
-            paint.xfermode = PorterDuffXfermode(PorterDuff.Mode.SRC_IN)
-            canvas.drawBitmap(bitmap, rect, rect, paint)
-            return output
-        }
-    }
-}
diff --git a/app/src/main/java/org/linphone/utils/LinphoneUtils.kt b/app/src/main/java/org/linphone/utils/LinphoneUtils.kt
deleted file mode 100644
index 85efa1468..000000000
--- a/app/src/main/java/org/linphone/utils/LinphoneUtils.kt
+++ /dev/null
@@ -1,346 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.utils
-
-import android.annotation.SuppressLint
-import android.content.Context
-import android.net.ConnectivityManager
-import android.net.NetworkInfo
-import android.telephony.TelephonyManager.*
-import java.security.MessageDigest
-import java.security.NoSuchAlgorithmException
-import java.text.DateFormat
-import java.text.SimpleDateFormat
-import java.util.*
-import okhttp3.internal.and
-import org.linphone.LinphoneApplication.Companion.coreContext
-import org.linphone.LinphoneApplication.Companion.corePreferences
-import org.linphone.R
-import org.linphone.core.*
-import org.linphone.core.tools.Log
-
-/**
- * Various utility methods for Linphone SDK
- */
-class LinphoneUtils {
-    companion object {
-        private const val RECORDING_DATE_PATTERN = "dd-MM-yyyy-HH-mm-ss"
-
-        fun getDisplayName(address: Address?): String {
-            if (address == null) return "[null]"
-            if (address.displayName == null) {
-                val account = coreContext.core.accountList.find { account ->
-                    account.params.identityAddress?.asStringUriOnly() == address.asStringUriOnly()
-                }
-                val localDisplayName = account?.params?.identityAddress?.displayName
-                // Do not return an empty local display name
-                if (!localDisplayName.isNullOrEmpty()) {
-                    return localDisplayName
-                }
-            }
-            // Do not return an empty display name
-            return address.displayName ?: address.username ?: address.asString()
-        }
-
-        fun getDisplayableAddress(address: Address?): String {
-            if (address == null) return "[null]"
-            return if (corePreferences.replaceSipUriByUsername) {
-                address.username ?: address.asStringUriOnly()
-            } else {
-                val copy = address.clone()
-                copy.clean() // To remove gruu if any
-                copy.asStringUriOnly()
-            }
-        }
-
-        fun getCleanedAddress(address: Address): Address {
-            // To remove the GRUU if any
-            val cleanAddress = address.clone()
-            cleanAddress.clean()
-            return cleanAddress
-        }
-
-        fun getConferenceAddress(call: Call): Address? {
-            val remoteContact = call.remoteContact
-            val conferenceAddress = if (call.dir == Call.Dir.Incoming) {
-                if (remoteContact != null) {
-                    coreContext.core.interpretUrl(remoteContact, false)
-                } else {
-                    null
-                }
-            } else {
-                call.remoteAddress
-            }
-            return conferenceAddress
-        }
-
-        fun getConferenceSubject(conference: Conference): String? {
-            return if (conference.subject.isNullOrEmpty()) {
-                val conferenceAddress = conference.conferenceAddress ?: return conference.subject
-                val conferenceInfo = coreContext.core.findConferenceInformationFromUri(
-                    conferenceAddress
-                )
-                if (conferenceInfo != null) {
-                    conferenceInfo.subject
-                } else {
-                    if (conference.me.isFocus) {
-                        AppUtils.getString(R.string.conference_local_title)
-                    } else {
-                        AppUtils.getString(R.string.conference_default_title)
-                    }
-                }
-            } else {
-                conference.subject
-            }
-        }
-
-        fun isEndToEndEncryptedChatAvailable(): Boolean {
-            val core = coreContext.core
-            return core.isLimeX3DhEnabled &&
-                (core.limeX3DhServerUrl != null || core.defaultAccount?.params?.limeServerUrl != null) &&
-                core.defaultAccount?.params?.conferenceFactoryUri != null
-        }
-
-        fun isGroupChatAvailable(): Boolean {
-            val core = coreContext.core
-            return core.defaultAccount?.params?.conferenceFactoryUri != null
-        }
-
-        fun isRemoteConferencingAvailable(): Boolean {
-            val core = coreContext.core
-            return core.defaultAccount?.params?.audioVideoConferenceFactoryAddress != null
-        }
-
-        fun createOneToOneChatRoom(participant: Address, isSecured: Boolean = false): ChatRoom? {
-            val core: Core = coreContext.core
-            val defaultAccount = core.defaultAccount
-
-            val params = core.createDefaultChatRoomParams()
-            params.isGroupEnabled = false
-            params.backend = ChatRoom.Backend.Basic
-            if (isSecured) {
-                params.subject = AppUtils.getString(R.string.chat_room_dummy_subject)
-                params.isEncryptionEnabled = true
-                params.backend = ChatRoom.Backend.FlexisipChat
-            }
-
-            val participants = arrayOf(participant)
-
-            return core.searchChatRoom(
-                params,
-                defaultAccount?.params?.identityAddress,
-                null,
-                participants
-            )
-                ?: core.createChatRoom(
-                    params,
-                    defaultAccount?.params?.identityAddress,
-                    participants
-                )
-        }
-
-        fun getConferenceInvitationsChatRoomParams(): ChatRoomParams {
-            val chatRoomParams = coreContext.core.createDefaultChatRoomParams()
-            chatRoomParams.isGroupEnabled = false
-            if (isEndToEndEncryptedChatAvailable()) {
-                chatRoomParams.backend = ChatRoom.Backend.FlexisipChat
-                chatRoomParams.isEncryptionEnabled = true
-            } else {
-                chatRoomParams.backend = ChatRoom.Backend.Basic
-                chatRoomParams.isEncryptionEnabled = false
-            }
-            chatRoomParams.subject = "Meeting invitation" // Won't be used
-            return chatRoomParams
-        }
-
-        fun deleteFilesAttachedToEventLog(eventLog: EventLog) {
-            if (eventLog.type == EventLog.Type.ConferenceChatMessage) {
-                val message = eventLog.chatMessage
-                if (message != null) deleteFilesAttachedToChatMessage(message)
-            }
-        }
-
-        fun deleteFilesAttachedToChatMessage(chatMessage: ChatMessage) {
-            for (content in chatMessage.contents) {
-                val filePath = content.filePath
-                if (!filePath.isNullOrEmpty()) {
-                    Log.i("[Linphone Utils] Deleting file $filePath")
-                    FileUtils.deleteFile(filePath)
-                }
-            }
-        }
-
-        fun getRecordingFilePathForAddress(address: Address): String {
-            val displayName = getDisplayName(address)
-            val dateFormat: DateFormat = SimpleDateFormat(
-                RECORDING_DATE_PATTERN,
-                Locale.getDefault()
-            )
-            val fileName = "${displayName}_${dateFormat.format(Date())}.mkv"
-            return FileUtils.getFileStoragePath(fileName).absolutePath
-        }
-
-        fun getRecordingFilePathForConference(subject: String?): String {
-            val dateFormat: DateFormat = SimpleDateFormat(
-                RECORDING_DATE_PATTERN,
-                Locale.getDefault()
-            )
-            val fileName = if (subject.isNullOrEmpty()) {
-                "conference_${dateFormat.format(Date())}.mkv"
-            } else {
-                "${subject}_${dateFormat.format(Date())}.mkv"
-            }
-            return FileUtils.getFileStoragePath(fileName).absolutePath
-        }
-
-        fun getRecordingDateFromFileName(name: String): Date {
-            return SimpleDateFormat(RECORDING_DATE_PATTERN, Locale.getDefault()).parse(name)
-        }
-
-        @SuppressLint("MissingPermission")
-        fun checkIfNetworkHasLowBandwidth(context: Context): Boolean {
-            val connMgr = context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
-            val networkInfo: NetworkInfo? = connMgr.activeNetworkInfo
-            if (networkInfo != null && networkInfo.isConnected) {
-                if (networkInfo.type == ConnectivityManager.TYPE_MOBILE) {
-                    return when (networkInfo.subtype) {
-                        NETWORK_TYPE_EDGE, NETWORK_TYPE_GPRS, NETWORK_TYPE_IDEN -> true
-                        else -> false
-                    }
-                }
-            }
-            // In doubt return false
-            return false
-        }
-
-        fun isCallLogMissed(callLog: CallLog): Boolean {
-            return (
-                callLog.dir == Call.Dir.Incoming &&
-                    (
-                        callLog.status == Call.Status.Missed ||
-                            callLog.status == Call.Status.Aborted ||
-                            callLog.status == Call.Status.EarlyAborted
-                        )
-                )
-        }
-
-        fun getChatRoomId(room: ChatRoom): String {
-            return getChatRoomId(room.localAddress, room.peerAddress)
-        }
-
-        fun getChatRoomId(localAddress: Address, remoteAddress: Address): String {
-            val localSipUri = localAddress.clone()
-            localSipUri.clean()
-            val remoteSipUri = remoteAddress.clone()
-            remoteSipUri.clean()
-            return "${localSipUri.asStringUriOnly()}~${remoteSipUri.asStringUriOnly()}"
-        }
-
-        fun getAccountsNotHidden(): List<Account> {
-            val list = arrayListOf<Account>()
-
-            for (account in coreContext.core.accountList) {
-                if (account.getCustomParam("hidden") != "1") {
-                    list.add(account)
-                }
-            }
-
-            return list
-        }
-
-        fun applyInternationalPrefix(): Boolean {
-            val account = coreContext.core.defaultAccount
-            if (account != null) {
-                val params = account.params
-                return params.useInternationalPrefixForCallsAndChats
-            }
-
-            return true // Legacy behavior
-        }
-
-        fun isPushNotificationAvailable(): Boolean {
-            val core = coreContext.core
-            if (!core.isPushNotificationAvailable) {
-                return false
-            }
-
-            val pushConfig = core.pushNotificationConfig ?: return false
-            if (pushConfig.provider.isNullOrEmpty()) return false
-            if (pushConfig.param.isNullOrEmpty()) return false
-            if (pushConfig.prid.isNullOrEmpty()) return false
-
-            return true
-        }
-
-        fun isFileTransferAvailable(): Boolean {
-            val core = coreContext.core
-            return core.fileTransferServer.orEmpty().isNotEmpty()
-        }
-
-        fun hashPassword(
-            userId: String,
-            password: String,
-            realm: String,
-            algorithm: String = "MD5"
-        ): String? {
-            val input = "$userId:$realm:$password"
-            try {
-                val digestEngine = MessageDigest.getInstance(algorithm)
-                val digest = digestEngine.digest(input.toByteArray())
-                val hexString = StringBuffer()
-                for (i in digest.indices) {
-                    hexString.append(Integer.toHexString(digest[i].and(0xFF)))
-                }
-                return hexString.toString()
-            } catch (nsae: NoSuchAlgorithmException) {
-                Log.e("[Side Menu] Can't compute hash using [$algorithm] algorithm!")
-            }
-
-            return null
-        }
-
-        fun getTextDescribingMessage(message: ChatMessage): String {
-            // If message contains text, then use that
-            var text = message.contents.find { content -> content.isText }?.utf8Text ?: ""
-
-            if (text.isEmpty()) {
-                val firstContent = message.contents.firstOrNull()
-                if (firstContent?.isIcalendar == true) {
-                    text = AppUtils.getString(
-                        R.string.conference_invitation_notification_short_desc
-                    )
-                } else if (firstContent?.isVoiceRecording == true) {
-                    text = AppUtils.getString(
-                        R.string.chat_message_voice_recording_notification_short_desc
-                    )
-                } else {
-                    for (content in message.contents) {
-                        if (text.isNotEmpty()) {
-                            text += ", "
-                        }
-                        text += content.name
-                    }
-                }
-            }
-
-            return text
-        }
-    }
-}
diff --git a/app/src/main/java/org/linphone/utils/PatternClickableSpan.kt b/app/src/main/java/org/linphone/utils/PatternClickableSpan.kt
deleted file mode 100644
index 19b1f8735..000000000
--- a/app/src/main/java/org/linphone/utils/PatternClickableSpan.kt
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright (c) 2010-2022 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.utils
-
-import android.text.SpannableStringBuilder
-import android.text.Spanned
-import android.text.style.ClickableSpan
-import android.view.View
-import android.widget.TextView
-import java.util.regex.Pattern
-
-class PatternClickableSpan {
-    private var patterns: ArrayList<SpannablePatternItem> = ArrayList()
-
-    inner class SpannablePatternItem(
-        var pattern: Pattern,
-        var listener: SpannableClickedListener
-    )
-
-    interface SpannableClickedListener {
-        fun onSpanClicked(text: String)
-    }
-
-    inner class StyledClickableSpan(var item: SpannablePatternItem) : ClickableSpan() {
-        override fun onClick(widget: View) {
-            val tv = widget as TextView
-            val span = tv.text as Spanned
-            val start = span.getSpanStart(this)
-            val end = span.getSpanEnd(this)
-            val text = span.subSequence(start, end)
-            item.listener.onSpanClicked(text.toString())
-        }
-    }
-
-    fun add(
-        pattern: Pattern,
-        listener: SpannableClickedListener
-    ): PatternClickableSpan {
-        patterns.add(SpannablePatternItem(pattern, listener))
-        return this
-    }
-
-    fun build(editable: CharSequence?): SpannableStringBuilder {
-        val ssb = SpannableStringBuilder(editable)
-        for (item in patterns) {
-            val matcher = item.pattern.matcher(ssb)
-            while (matcher.find()) {
-                val start = matcher.start()
-                val end = matcher.end()
-                val url = StyledClickableSpan(item)
-                ssb.setSpan(url, start, end, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
-            }
-        }
-        return ssb
-    }
-}
diff --git a/app/src/main/java/org/linphone/utils/PermissionHelper.kt b/app/src/main/java/org/linphone/utils/PermissionHelper.kt
deleted file mode 100644
index e50e7d04c..000000000
--- a/app/src/main/java/org/linphone/utils/PermissionHelper.kt
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.utils
-
-import android.Manifest
-import android.content.Context
-import org.linphone.compatibility.Compatibility
-import org.linphone.core.tools.Log
-import org.linphone.mediastream.Version
-
-/**
- * Helper methods to check whether a permission has been granted and log the result
- */
-class PermissionHelper private constructor(private val context: Context) {
-    companion object : SingletonHolder<PermissionHelper, Context>(::PermissionHelper)
-
-    private fun hasPermission(permission: String): Boolean {
-        val granted = Compatibility.hasPermission(context, permission)
-
-        if (granted) {
-            Log.d("[Permission Helper] Permission $permission is granted")
-        } else {
-            Log.w("[Permission Helper] Permission $permission is denied")
-        }
-
-        return granted
-    }
-
-    fun hasReadContactsPermission(): Boolean {
-        return hasPermission(Manifest.permission.READ_CONTACTS)
-    }
-
-    fun hasWriteContactsPermission(): Boolean {
-        return hasPermission(Manifest.permission.WRITE_CONTACTS)
-    }
-
-    fun hasReadPhoneStatePermission(): Boolean {
-        return hasPermission(Manifest.permission.READ_PHONE_STATE)
-    }
-
-    fun hasReadPhoneStateOrPhoneNumbersPermission(): Boolean {
-        return Compatibility.hasReadPhoneStateOrNumbersPermission(context)
-    }
-
-    fun hasReadExternalStoragePermission(): Boolean {
-        return Compatibility.hasReadExternalStoragePermission(context)
-    }
-
-    fun hasWriteExternalStoragePermission(): Boolean {
-        if (Version.sdkAboveOrEqual(Version.API29_ANDROID_10)) return true
-        return hasPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE)
-    }
-
-    fun hasCameraPermission(): Boolean {
-        return hasPermission(Manifest.permission.CAMERA)
-    }
-
-    fun hasRecordAudioPermission(): Boolean {
-        return hasPermission(Manifest.permission.RECORD_AUDIO)
-    }
-
-    fun hasPostNotificationsPermission(): Boolean {
-        return Compatibility.hasPostNotificationsPermission(context)
-    }
-}
diff --git a/app/src/main/java/org/linphone/utils/PhoneNumberUtils.kt b/app/src/main/java/org/linphone/utils/PhoneNumberUtils.kt
deleted file mode 100644
index 901c4b3c2..000000000
--- a/app/src/main/java/org/linphone/utils/PhoneNumberUtils.kt
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.utils
-
-import android.annotation.SuppressLint
-import android.content.Context
-import android.content.res.Resources
-import android.provider.ContactsContract
-import android.telephony.TelephonyManager
-import org.linphone.core.DialPlan
-import org.linphone.core.Factory
-import org.linphone.core.tools.Log
-
-class PhoneNumberUtils {
-    companion object {
-        fun getDialPlanForCurrentCountry(context: Context): DialPlan? {
-            try {
-                val tm = context.getSystemService(Context.TELEPHONY_SERVICE) as TelephonyManager
-                val countryIso = tm.networkCountryIso
-                return getDialPlanFromCountryCode(countryIso)
-            } catch (e: java.lang.Exception) {
-                Log.e("[Phone Number Utils] $e")
-            }
-            return null
-        }
-
-        @SuppressLint("MissingPermission", "HardwareIds")
-        fun getDevicePhoneNumber(context: Context): String? {
-            if (PermissionHelper.get().hasReadPhoneStateOrPhoneNumbersPermission()) {
-                try {
-                    val tm = context.getSystemService(Context.TELEPHONY_SERVICE) as TelephonyManager
-                    return tm.line1Number
-                } catch (e: java.lang.Exception) {
-                    Log.e("[Phone Number Utils] $e")
-                }
-            }
-            return null
-        }
-
-        fun getDialPlanFromCountryCallingPrefix(countryCode: String): DialPlan? {
-            for (c in Factory.instance().dialPlans) {
-                if (countryCode == c.countryCallingCode) return c
-            }
-            return null
-        }
-
-        fun addressBookLabelTypeToVcardParamString(type: Int, default: String?): String {
-            return when (type) {
-                ContactsContract.CommonDataKinds.Phone.TYPE_ASSISTANT -> "assistant"
-                ContactsContract.CommonDataKinds.Phone.TYPE_CALLBACK -> "callback"
-                ContactsContract.CommonDataKinds.Phone.TYPE_CAR -> "car"
-                ContactsContract.CommonDataKinds.Phone.TYPE_COMPANY_MAIN -> "work,main"
-                ContactsContract.CommonDataKinds.Phone.TYPE_FAX_HOME -> "home,fax"
-                ContactsContract.CommonDataKinds.Phone.TYPE_FAX_WORK -> "work,fax"
-                ContactsContract.CommonDataKinds.Phone.TYPE_HOME -> "home"
-                ContactsContract.CommonDataKinds.Phone.TYPE_ISDN -> "isdn"
-                ContactsContract.CommonDataKinds.Phone.TYPE_MAIN -> "main"
-                ContactsContract.CommonDataKinds.Phone.TYPE_MMS -> "text"
-                ContactsContract.CommonDataKinds.Phone.TYPE_MOBILE -> "cell"
-                ContactsContract.CommonDataKinds.Phone.TYPE_OTHER -> "other"
-                ContactsContract.CommonDataKinds.Phone.TYPE_OTHER_FAX -> "fax"
-                ContactsContract.CommonDataKinds.Phone.TYPE_PAGER -> "pager"
-                ContactsContract.CommonDataKinds.Phone.TYPE_RADIO -> "radio"
-                ContactsContract.CommonDataKinds.Phone.TYPE_TELEX -> "telex"
-                ContactsContract.CommonDataKinds.Phone.TYPE_TTY_TDD -> "textphone"
-                ContactsContract.CommonDataKinds.Phone.TYPE_WORK -> "work"
-                ContactsContract.CommonDataKinds.Phone.TYPE_WORK_MOBILE -> "work,cell"
-                ContactsContract.CommonDataKinds.Phone.TYPE_WORK_PAGER -> "work,pager"
-                ContactsContract.CommonDataKinds.BaseTypes.TYPE_CUSTOM -> default ?: "custom"
-                else -> default ?: type.toString()
-            }
-        }
-
-        fun vcardParamStringToAddressBookLabel(resources: Resources, label: String): String {
-            if (label.isEmpty()) return label
-            val type = labelToType(label)
-            return ContactsContract.CommonDataKinds.Phone.getTypeLabel(resources, type, label).toString()
-        }
-
-        private fun labelToType(label: String): Int {
-            return when (label) {
-                "assistant" -> ContactsContract.CommonDataKinds.Phone.TYPE_ASSISTANT
-                "callback" -> ContactsContract.CommonDataKinds.Phone.TYPE_CALLBACK
-                "car" -> ContactsContract.CommonDataKinds.Phone.TYPE_CAR
-                "work,main" -> ContactsContract.CommonDataKinds.Phone.TYPE_COMPANY_MAIN
-                "home,fax" -> ContactsContract.CommonDataKinds.Phone.TYPE_FAX_HOME
-                "work,fax" -> ContactsContract.CommonDataKinds.Phone.TYPE_FAX_WORK
-                "home" -> ContactsContract.CommonDataKinds.Phone.TYPE_HOME
-                "isdn" -> ContactsContract.CommonDataKinds.Phone.TYPE_ISDN
-                "main" -> ContactsContract.CommonDataKinds.Phone.TYPE_MAIN
-                "text" -> ContactsContract.CommonDataKinds.Phone.TYPE_MMS
-                "cell" -> ContactsContract.CommonDataKinds.Phone.TYPE_MOBILE
-                "other" -> ContactsContract.CommonDataKinds.Phone.TYPE_OTHER
-                "fax" -> ContactsContract.CommonDataKinds.Phone.TYPE_OTHER_FAX
-                "pager" -> ContactsContract.CommonDataKinds.Phone.TYPE_PAGER
-                "radio" -> ContactsContract.CommonDataKinds.Phone.TYPE_RADIO
-                "telex" -> ContactsContract.CommonDataKinds.Phone.TYPE_TELEX
-                "textphone" -> ContactsContract.CommonDataKinds.Phone.TYPE_TTY_TDD
-                "work" -> ContactsContract.CommonDataKinds.Phone.TYPE_WORK
-                "work,cell" -> ContactsContract.CommonDataKinds.Phone.TYPE_WORK_MOBILE
-                "work,pager" -> ContactsContract.CommonDataKinds.Phone.TYPE_WORK_PAGER
-                "custom" -> ContactsContract.CommonDataKinds.BaseTypes.TYPE_CUSTOM
-                else -> ContactsContract.CommonDataKinds.BaseTypes.TYPE_CUSTOM
-            }
-        }
-
-        private fun getDialPlanFromCountryCode(countryCode: String): DialPlan? {
-            for (c in Factory.instance().dialPlans) {
-                if (countryCode.equals(c.isoCountryCode, ignoreCase = true)) return c
-            }
-            return null
-        }
-
-        fun arePhoneNumberWeakEqual(number1: String, number2: String): Boolean {
-            return trimPhoneNumber(number1) == trimPhoneNumber(number2)
-        }
-
-        private fun trimPhoneNumber(phoneNumber: String): String {
-            return phoneNumber.replace(" ", "")
-                .replace("-", "")
-                .replace("(", "")
-                .replace(")", "")
-        }
-    }
-}
diff --git a/app/src/main/java/org/linphone/utils/PowerManagerUtils.kt b/app/src/main/java/org/linphone/utils/PowerManagerUtils.kt
deleted file mode 100644
index f54c7d44a..000000000
--- a/app/src/main/java/org/linphone/utils/PowerManagerUtils.kt
+++ /dev/null
@@ -1,163 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.utils
-
-import android.content.ComponentName
-import android.content.Context
-import android.content.Intent
-import android.content.pm.PackageManager
-import android.content.pm.ResolveInfo
-import android.net.Uri
-
-class PowerManagerUtils {
-    companion object {
-        // https://stackoverflow.com/questions/31638986/protected-apps-setting-on-huawei-phones-and-how-to-handle-it
-        private val POWER_MANAGER_INTENTS = arrayOf(
-            Intent()
-                .setComponent(
-                    ComponentName(
-                        "com.miui.securitycenter",
-                        "com.miui.permcenter.autostart.AutoStartManagementActivity"
-                    )
-                ),
-            Intent()
-                .setComponent(
-                    ComponentName(
-                        "com.letv.android.letvsafe",
-                        "com.letv.android.letvsafe.AutobootManageActivity"
-                    )
-                ),
-            Intent()
-                .setComponent(
-                    ComponentName(
-                        "com.huawei.systemmanager",
-                        "com.huawei.systemmanager.appcontrol.activity.StartupAppControlActivity"
-                    )
-                ),
-            Intent()
-                .setComponent(
-                    ComponentName(
-                        "com.huawei.systemmanager",
-                        "com.huawei.systemmanager.optimize.process.ProtectActivity"
-                    )
-                ),
-            Intent()
-                .setComponent(
-                    ComponentName(
-                        "com.coloros.safecenter",
-                        "com.coloros.safecenter.permission.startup.StartupAppListActivity"
-                    )
-                ),
-            Intent()
-                .setComponent(
-                    ComponentName(
-                        "com.coloros.safecenter",
-                        "com.coloros.safecenter.startupapp.StartupAppListActivity"
-                    )
-                ),
-            Intent()
-                .setComponent(
-                    ComponentName(
-                        "com.oppo.safe",
-                        "com.oppo.safe.permission.startup.StartupAppListActivity"
-                    )
-                ),
-            Intent()
-                .setComponent(
-                    ComponentName(
-                        "com.iqoo.secure",
-                        "com.iqoo.secure.ui.phoneoptimize.AddWhiteListActivity"
-                    )
-                ),
-            Intent()
-                .setComponent(
-                    ComponentName(
-                        "com.iqoo.secure",
-                        "com.iqoo.secure.ui.phoneoptimize.BgStartUpManager"
-                    )
-                ),
-            Intent()
-                .setComponent(
-                    ComponentName(
-                        "com.vivo.permissionmanager",
-                        "com.vivo.permissionmanager.activity.BgStartUpManagerActivity"
-                    )
-                ),
-            Intent()
-                .setComponent(
-                    ComponentName(
-                        "com.samsung.android.lool",
-                        "com.samsung.android.sm.ui.battery.BatteryActivity"
-                    )
-                ),
-            Intent()
-                .setComponent(
-                    ComponentName(
-                        "com.htc.pitroad",
-                        "com.htc.pitroad.landingpage.activity.LandingPageActivity"
-                    )
-                ),
-            Intent()
-                .setComponent(
-                    ComponentName(
-                        "com.asus.mobilemanager",
-                        "com.asus.mobilemanager.MainActivity"
-                    )
-                ),
-            Intent()
-                .setComponent(
-                    ComponentName(
-                        "com.asus.mobilemanager",
-                        "com.asus.mobilemanager.autostart.AutoStartActivity"
-                    )
-                ),
-            Intent()
-                .setComponent(
-                    ComponentName(
-                        "com.asus.mobilemanager",
-                        "com.asus.mobilemanager.entry.FunctionActivity"
-                    )
-                )
-                .setData(Uri.parse("mobilemanager://function/entry/AutoStart")),
-            Intent()
-                .setComponent(
-                    ComponentName(
-                        "com.dewav.dwappmanager",
-                        "com.dewav.dwappmanager.memory.SmartClearupWhiteList"
-                    )
-                )
-        )
-
-        fun getDevicePowerManagerIntent(context: Context): Intent? {
-            for (intent in POWER_MANAGER_INTENTS) {
-                if (isIntentCallable(context, intent)) {
-                    return intent
-                }
-            }
-            return null
-        }
-
-        private fun isIntentCallable(context: Context, intent: Intent): Boolean {
-            val list: List<ResolveInfo> = context.packageManager
-                .queryIntentActivities(intent, PackageManager.MATCH_DEFAULT_ONLY)
-            return list.isNotEmpty()
-        }
-    }
-}
diff --git a/app/src/main/java/org/linphone/utils/RecyclerViewHeaderDecoration.kt b/app/src/main/java/org/linphone/utils/RecyclerViewHeaderDecoration.kt
deleted file mode 100644
index 4b598a4e7..000000000
--- a/app/src/main/java/org/linphone/utils/RecyclerViewHeaderDecoration.kt
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.utils
-
-import android.content.Context
-import android.graphics.Canvas
-import android.graphics.Rect
-import android.util.SparseArray
-import android.view.View
-import android.view.ViewGroup
-import androidx.recyclerview.widget.RecyclerView
-
-class RecyclerViewHeaderDecoration(private val context: Context, private val adapter: HeaderAdapter) : RecyclerView.ItemDecoration() {
-    private val headers: SparseArray<View> = SparseArray()
-
-    override fun getItemOffsets(
-        outRect: Rect,
-        view: View,
-        parent: RecyclerView,
-        state: RecyclerView.State
-    ) {
-        val position = (view.layoutParams as RecyclerView.LayoutParams).bindingAdapterPosition
-
-        if (position != RecyclerView.NO_POSITION && adapter.displayHeaderForPosition(position)) {
-            val headerView: View = adapter.getHeaderViewForPosition(view.context, position)
-            headers.put(position, headerView)
-            measureHeaderView(headerView, parent)
-            outRect.top = headerView.height
-        } else {
-            headers.remove(position)
-        }
-    }
-
-    private fun measureHeaderView(view: View, parent: ViewGroup) {
-        if (view.layoutParams == null) {
-            view.layoutParams = ViewGroup.LayoutParams(
-                ViewGroup.LayoutParams.MATCH_PARENT,
-                ViewGroup.LayoutParams.WRAP_CONTENT
-            )
-        }
-
-        val widthSpec = View.MeasureSpec.makeMeasureSpec(parent.width, View.MeasureSpec.EXACTLY)
-        val heightSpec = View.MeasureSpec.makeMeasureSpec(parent.height, View.MeasureSpec.EXACTLY)
-        val childWidth = ViewGroup.getChildMeasureSpec(
-            widthSpec,
-            parent.paddingLeft + parent.paddingRight,
-            view.layoutParams.width
-        )
-        val childHeight = ViewGroup.getChildMeasureSpec(
-            heightSpec,
-            parent.paddingTop + parent.paddingBottom,
-            view.layoutParams.height
-        )
-
-        view.measure(childWidth, childHeight)
-        view.layout(0, 0, view.measuredWidth, view.measuredHeight)
-    }
-
-    override fun onDraw(canvas: Canvas, parent: RecyclerView, state: RecyclerView.State) {
-        for (i in 0 until parent.childCount) {
-            val child = parent.getChildAt(i)
-            val position = parent.getChildAdapterPosition(child)
-            if (position != RecyclerView.NO_POSITION && adapter.displayHeaderForPosition(position)) {
-                canvas.save()
-                val headerView: View = headers.get(position) ?: adapter.getHeaderViewForPosition(
-                    context,
-                    position
-                )
-                canvas.translate(0f, child.y - headerView.height)
-                headerView.draw(canvas)
-                canvas.restore()
-            }
-        }
-    }
-}
-
-interface HeaderAdapter {
-    fun displayHeaderForPosition(position: Int): Boolean
-
-    fun getHeaderViewForPosition(context: Context, position: Int): View
-}
diff --git a/app/src/main/java/org/linphone/utils/RecyclerViewSwipeUtils.kt b/app/src/main/java/org/linphone/utils/RecyclerViewSwipeUtils.kt
deleted file mode 100644
index 764e7dbc0..000000000
--- a/app/src/main/java/org/linphone/utils/RecyclerViewSwipeUtils.kt
+++ /dev/null
@@ -1,344 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.utils
-
-import android.graphics.Canvas
-import android.graphics.Color
-import android.graphics.PorterDuff
-import android.graphics.Typeface
-import android.graphics.drawable.ColorDrawable
-import android.text.TextPaint
-import android.util.TypedValue
-import androidx.core.content.ContextCompat
-import androidx.recyclerview.widget.ItemTouchHelper
-import androidx.recyclerview.widget.RecyclerView
-import org.linphone.core.tools.Log
-
-/**
- * Helper class to properly display swipe actions in list items.
- */
-class RecyclerViewSwipeUtils(
-    direction: Int,
-    configuration: RecyclerViewSwipeConfiguration,
-    listener: RecyclerViewSwipeListener
-) : ItemTouchHelper(RecyclerViewSwipeUtilsCallback(direction, configuration, listener))
-
-class RecyclerViewSwipeConfiguration {
-    class Action(
-        val text: String = "",
-        val textColor: Int = Color.WHITE,
-        val backgroundColor: Int = 0,
-        val icon: Int = 0,
-        val iconTint: Int = 0,
-        val preventFor: Class<*>? = null
-    )
-
-    val iconMargin = 16f
-
-    val actionTextSizeUnit = TypedValue.COMPLEX_UNIT_SP
-
-    // At least CROSSCALL Action-X3 device doesn't have SANS_SERIF typeface...
-    val actionTextFont: Typeface? = Typeface.SANS_SERIF
-    val actionTextSize = 14f
-
-    var leftToRightAction = Action()
-    var rightToLeftAction = Action()
-}
-
-private class RecyclerViewSwipeUtilsCallback(
-    val direction: Int,
-    val configuration: RecyclerViewSwipeConfiguration,
-    val listener: RecyclerViewSwipeListener
-) : ItemTouchHelper.SimpleCallback(0, direction) {
-
-    fun leftToRightSwipe(
-        canvas: Canvas,
-        recyclerView: RecyclerView,
-        viewHolder: RecyclerView.ViewHolder,
-        dX: Float
-    ) {
-        if (configuration.leftToRightAction.backgroundColor != 0) {
-            val background = ColorDrawable(configuration.leftToRightAction.backgroundColor)
-            background.setBounds(
-                viewHolder.itemView.left,
-                viewHolder.itemView.top,
-                viewHolder.itemView.left + dX.toInt(),
-                viewHolder.itemView.bottom
-            )
-            background.draw(canvas)
-        }
-
-        val horizontalMargin: Int = TypedValue.applyDimension(
-            TypedValue.COMPLEX_UNIT_DIP,
-            configuration.iconMargin,
-            recyclerView.context.resources.displayMetrics
-        ).toInt()
-        var iconWidth = 0
-
-        if (configuration.leftToRightAction.icon != 0) {
-            val icon =
-                ContextCompat.getDrawable(
-                    recyclerView.context,
-                    configuration.leftToRightAction.icon
-                )
-            iconWidth = icon?.intrinsicWidth ?: 0
-            if (icon != null && dX > iconWidth) {
-                val halfIcon = icon.intrinsicHeight / 2
-                val top =
-                    viewHolder.itemView.top + ((viewHolder.itemView.bottom - viewHolder.itemView.top) / 2 - halfIcon)
-
-                // Icon won't move past the swipe threshold, thus indicating to the user
-                // it has reached the required distance for swipe action to be done
-                val threshold = getSwipeThreshold(viewHolder) * viewHolder.itemView.right
-                val left = if (dX < threshold) {
-                    viewHolder.itemView.left + dX.toInt() - iconWidth
-                } else {
-                    viewHolder.itemView.left + threshold.toInt() - iconWidth
-                }
-
-                icon.setBounds(
-                    left,
-                    top,
-                    left + iconWidth,
-                    top + icon.intrinsicHeight
-                )
-
-                @Suppress("DEPRECATION")
-                if (configuration.leftToRightAction.iconTint != 0) {
-                    icon.setColorFilter(
-                        configuration.leftToRightAction.iconTint,
-                        PorterDuff.Mode.SRC_IN
-                    )
-                }
-                icon.draw(canvas)
-            }
-        }
-
-        if (configuration.leftToRightAction.text.isNotEmpty() && dX > horizontalMargin + iconWidth) {
-            val textPaint = TextPaint()
-            textPaint.isAntiAlias = true
-            textPaint.textSize = TypedValue.applyDimension(
-                configuration.actionTextSizeUnit,
-                configuration.actionTextSize,
-                recyclerView.context.resources.displayMetrics
-            )
-            textPaint.color = configuration.leftToRightAction.textColor
-            textPaint.typeface = configuration.actionTextFont
-
-            val margin = if (iconWidth > 0) horizontalMargin / 2 else 0
-            val textX =
-                (viewHolder.itemView.left + horizontalMargin + iconWidth + margin).toFloat()
-            val textY =
-                (viewHolder.itemView.top + (viewHolder.itemView.bottom - viewHolder.itemView.top) / 2.0 + textPaint.textSize / 2).toFloat()
-            canvas.drawText(
-                configuration.leftToRightAction.text,
-                textX,
-                textY,
-                textPaint
-            )
-        }
-    }
-
-    fun rightToLeftSwipe(
-        canvas: Canvas,
-        recyclerView: RecyclerView,
-        viewHolder: RecyclerView.ViewHolder,
-        dX: Float
-    ) {
-        if (configuration.rightToLeftAction.backgroundColor != 0) {
-            val background = ColorDrawable(configuration.rightToLeftAction.backgroundColor)
-            background.setBounds(
-                viewHolder.itemView.right + dX.toInt(),
-                viewHolder.itemView.top,
-                viewHolder.itemView.right,
-                viewHolder.itemView.bottom
-            )
-            background.draw(canvas)
-        }
-
-        val horizontalMargin: Int = TypedValue.applyDimension(
-            TypedValue.COMPLEX_UNIT_DIP,
-            configuration.iconMargin,
-            recyclerView.context.resources.displayMetrics
-        ).toInt()
-        var iconWidth = 0
-        var imageLeftBorder = viewHolder.itemView.right
-
-        if (configuration.rightToLeftAction.icon != 0) {
-            val icon =
-                ContextCompat.getDrawable(
-                    recyclerView.context,
-                    configuration.rightToLeftAction.icon
-                )
-            iconWidth = icon?.intrinsicWidth ?: 0
-            if (icon != null && dX < viewHolder.itemView.right - iconWidth) {
-                val halfIcon = icon.intrinsicHeight / 2
-                val top =
-                    viewHolder.itemView.top + ((viewHolder.itemView.bottom - viewHolder.itemView.top) / 2 - halfIcon)
-
-                // Icon won't move past the swipe threshold, thus indicating to the user
-                // it has reached the required distance for swipe action to be done
-                val threshold = -(getSwipeThreshold(viewHolder) * viewHolder.itemView.right)
-                val right = if (dX > threshold) {
-                    viewHolder.itemView.right + dX.toInt()
-                } else {
-                    viewHolder.itemView.right + threshold.toInt()
-                }
-                imageLeftBorder = right - icon.intrinsicWidth
-
-                icon.setBounds(
-                    imageLeftBorder,
-                    top,
-                    right,
-                    top + icon.intrinsicHeight
-                )
-
-                @Suppress("DEPRECATION")
-                if (configuration.rightToLeftAction.iconTint != 0) {
-                    icon.setColorFilter(
-                        configuration.rightToLeftAction.iconTint,
-                        PorterDuff.Mode.SRC_IN
-                    )
-                }
-                icon.draw(canvas)
-            }
-        }
-
-        if (configuration.rightToLeftAction.text.isNotEmpty() && dX < -horizontalMargin - iconWidth) {
-            val textPaint = TextPaint()
-            textPaint.isAntiAlias = true
-            textPaint.textSize = TypedValue.applyDimension(
-                configuration.actionTextSizeUnit,
-                configuration.actionTextSize,
-                recyclerView.context.resources.displayMetrics
-            )
-            textPaint.color = configuration.rightToLeftAction.textColor
-            textPaint.typeface = configuration.actionTextFont
-
-            val margin =
-                if (imageLeftBorder == viewHolder.itemView.right) horizontalMargin else horizontalMargin / 2
-            val textX =
-                imageLeftBorder - textPaint.measureText(configuration.rightToLeftAction.text) - margin
-            val textY =
-                (viewHolder.itemView.top + (viewHolder.itemView.bottom - viewHolder.itemView.top) / 2.0 + textPaint.textSize / 2).toFloat()
-            canvas.drawText(
-                configuration.rightToLeftAction.text,
-                textX,
-                textY,
-                textPaint
-            )
-        }
-    }
-
-    fun applyConfiguration(
-        canvas: Canvas,
-        recyclerView: RecyclerView,
-        viewHolder: RecyclerView.ViewHolder,
-        dX: Float,
-        actionState: Int
-    ) {
-        try {
-            if (actionState != ItemTouchHelper.ACTION_STATE_SWIPE) return
-
-            if (dX > 0) {
-                leftToRightSwipe(canvas, recyclerView, viewHolder, dX)
-            } else if (dX < 0) {
-                rightToLeftSwipe(canvas, recyclerView, viewHolder, dX)
-            }
-        } catch (e: Exception) {
-            Log.e("[RecyclerView Swipe Utils] $e")
-        }
-    }
-
-    override fun getSwipeDirs(
-        recyclerView: RecyclerView,
-        viewHolder: RecyclerView.ViewHolder
-    ): Int {
-        // Prevent swipe actions for a specific ViewHolder class if needed
-        // Used to allow swipe actions on chat messages but not events
-        var dirFlags = direction
-        if (direction and ItemTouchHelper.RIGHT != 0) {
-            val classToPrevent = configuration.leftToRightAction.preventFor
-            if (classToPrevent != null) {
-                if (classToPrevent.isInstance(viewHolder)) {
-                    dirFlags = dirFlags and ItemTouchHelper.RIGHT.inv()
-                }
-            }
-        }
-        if (direction or ItemTouchHelper.LEFT != 0) {
-            val classToPrevent = configuration.rightToLeftAction.preventFor
-            if (classToPrevent != null) {
-                if (classToPrevent.isInstance(viewHolder)) {
-                    dirFlags = dirFlags and ItemTouchHelper.LEFT.inv()
-                }
-            }
-        }
-        return dirFlags
-    }
-
-    override fun onMove(
-        recyclerView: RecyclerView,
-        viewHolder: RecyclerView.ViewHolder,
-        target: RecyclerView.ViewHolder
-    ): Boolean {
-        return false
-    }
-
-    override fun onSwiped(
-        viewHolder: RecyclerView.ViewHolder,
-        direction: Int
-    ) {
-        if (direction == ItemTouchHelper.LEFT) {
-            listener.onRightToLeftSwipe(viewHolder)
-        } else if (direction == ItemTouchHelper.RIGHT) {
-            listener.onLeftToRightSwipe(viewHolder)
-        }
-    }
-
-    override fun getSwipeThreshold(viewHolder: RecyclerView.ViewHolder): Float {
-        return .33f // A third of the screen is required to validate swipe move (default is .5f)
-    }
-
-    override fun onChildDraw(
-        canvas: Canvas,
-        recyclerView: RecyclerView,
-        viewHolder: RecyclerView.ViewHolder,
-        dX: Float,
-        dY: Float,
-        actionState: Int,
-        isCurrentlyActive: Boolean
-    ) {
-        applyConfiguration(canvas, recyclerView, viewHolder, dX, actionState)
-        super.onChildDraw(
-            canvas,
-            recyclerView,
-            viewHolder,
-            dX,
-            dY,
-            actionState,
-            isCurrentlyActive
-        )
-    }
-}
-
-interface RecyclerViewSwipeListener {
-    fun onLeftToRightSwipe(viewHolder: RecyclerView.ViewHolder)
-    fun onRightToLeftSwipe(viewHolder: RecyclerView.ViewHolder)
-}
diff --git a/app/src/main/java/org/linphone/utils/ShortcutsHelper.kt b/app/src/main/java/org/linphone/utils/ShortcutsHelper.kt
deleted file mode 100644
index 65ed4dd19..000000000
--- a/app/src/main/java/org/linphone/utils/ShortcutsHelper.kt
+++ /dev/null
@@ -1,247 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.utils
-
-import android.annotation.TargetApi
-import android.content.Context
-import android.content.Intent
-import android.content.pm.ShortcutInfo
-import android.os.Bundle
-import androidx.collection.ArraySet
-import androidx.core.app.Person
-import androidx.core.content.LocusIdCompat
-import androidx.core.content.pm.ShortcutInfoCompat
-import androidx.core.content.pm.ShortcutManagerCompat
-import androidx.core.graphics.drawable.IconCompat
-import kotlin.math.min
-import org.linphone.LinphoneApplication.Companion.coreContext
-import org.linphone.activities.main.MainActivity
-import org.linphone.contact.getPerson
-import org.linphone.core.Address
-import org.linphone.core.ChatRoom
-import org.linphone.core.ChatRoom.Capabilities
-import org.linphone.core.Friend
-import org.linphone.core.tools.Log
-import org.linphone.mediastream.Version
-
-@TargetApi(25)
-class ShortcutsHelper(val context: Context) {
-    companion object {
-        fun createShortcutsToContacts(context: Context) {
-            val shortcuts = ArrayList<ShortcutInfoCompat>()
-            if (ShortcutManagerCompat.isRateLimitingActive(context)) {
-                Log.e("[Shortcut Helper] Rate limiting is active, aborting")
-                return
-            }
-
-            val maxShortcuts = min(ShortcutManagerCompat.getMaxShortcutCountPerActivity(context), 5)
-            var count = 0
-            val processedAddresses = arrayListOf<String>()
-            for (room in coreContext.core.chatRooms) {
-                // Android can usually only have around 4-5 shortcuts at a time
-                if (count >= maxShortcuts) {
-                    Log.w("[Shortcut Helper] Max amount of shortcuts reached ($count)")
-                    break
-                }
-
-                val addresses: ArrayList<Address> = arrayListOf(room.peerAddress)
-                if (!room.hasCapability(Capabilities.Basic.toInt())) {
-                    addresses.clear()
-                    for (participant in room.participants) {
-                        addresses.add(participant.address)
-                    }
-                }
-                for (address in addresses) {
-                    if (count >= maxShortcuts) {
-                        Log.w("[Shortcut Helper] Max amount of shortcuts reached ($count)")
-                        break
-                    }
-
-                    val stringAddress = address.asStringUriOnly()
-                    if (!processedAddresses.contains(stringAddress)) {
-                        processedAddresses.add(stringAddress)
-                        val contact: Friend? =
-                            coreContext.contactsManager.findContactByAddress(address)
-
-                        if (contact != null && contact.refKey != null) {
-                            val shortcut: ShortcutInfoCompat? = createContactShortcut(
-                                context,
-                                contact
-                            )
-                            if (shortcut != null) {
-                                Log.i(
-                                    "[Shortcut Helper] Creating launcher shortcut for ${shortcut.shortLabel}"
-                                )
-                                shortcuts.add(shortcut)
-                                count += 1
-                            }
-                        } else {
-                            Log.w("[Shortcut Helper] Contact not found for address: $stringAddress")
-                        }
-                    }
-                }
-            }
-            ShortcutManagerCompat.setDynamicShortcuts(context, shortcuts)
-        }
-
-        private fun createContactShortcut(context: Context, contact: Friend): ShortcutInfoCompat? {
-            try {
-                val categories: ArraySet<String> = ArraySet()
-                categories.add(ShortcutInfo.SHORTCUT_CATEGORY_CONVERSATION)
-
-                val person = contact.getPerson()
-                val icon = person.icon
-                val id = contact.refKey ?: return null
-
-                val intent = Intent(Intent.ACTION_MAIN)
-                intent.setClass(context, MainActivity::class.java)
-                intent.putExtra("ContactId", id)
-
-                return ShortcutInfoCompat.Builder(context, id)
-                    .setShortLabel(contact.name ?: "")
-                    .setIcon(icon)
-                    .setPerson(person)
-                    .setCategories(categories)
-                    .setIntent(intent)
-                    .build()
-            } catch (e: Exception) {
-                Log.e(
-                    "[Shortcuts Helper] createContactShortcut for contact [${contact.name}] exception: $e"
-                )
-            }
-
-            return null
-        }
-
-        fun createShortcutsToChatRooms(context: Context) {
-            val shortcuts = ArrayList<ShortcutInfoCompat>()
-            if (ShortcutManagerCompat.isRateLimitingActive(context)) {
-                Log.e("[Shortcut Helper] Rate limiting is active, aborting")
-                return
-            }
-            Log.i("[Shortcut Helper] Creating launcher shortcuts for chat rooms")
-            val maxShortcuts = min(ShortcutManagerCompat.getMaxShortcutCountPerActivity(context), 5)
-            var count = 0
-            for (room in coreContext.core.chatRooms) {
-                // Android can usually only have around 4-5 shortcuts at a time
-                if (count >= maxShortcuts) {
-                    Log.w("[Shortcut Helper] Max amount of shortcuts reached ($count)")
-                    break
-                }
-
-                val shortcut: ShortcutInfoCompat? = createChatRoomShortcut(context, room)
-                if (shortcut != null) {
-                    Log.i("[Shortcut Helper] Created launcher shortcut for ${shortcut.shortLabel}")
-                    shortcuts.add(shortcut)
-                    count += 1
-                }
-            }
-            ShortcutManagerCompat.setDynamicShortcuts(context, shortcuts)
-            Log.i("[Shortcut Helper] Created $count launcher shortcuts")
-        }
-
-        private fun createChatRoomShortcut(context: Context, chatRoom: ChatRoom): ShortcutInfoCompat? {
-            val localAddress = chatRoom.localAddress.asStringUriOnly()
-            val peerAddress = chatRoom.peerAddress.asStringUriOnly()
-            val id = LinphoneUtils.getChatRoomId(chatRoom.localAddress, chatRoom.peerAddress)
-
-            try {
-                val categories: ArraySet<String> = ArraySet()
-                categories.add(ShortcutInfo.SHORTCUT_CATEGORY_CONVERSATION)
-
-                val personsList = arrayListOf<Person>()
-                val subject: String
-                val icon: IconCompat
-                if (chatRoom.hasCapability(Capabilities.Basic.toInt())) {
-                    val contact =
-                        coreContext.contactsManager.findContactByAddress(chatRoom.peerAddress)
-                    val person = contact?.getPerson()
-                    if (person != null) {
-                        personsList.add(person)
-                    }
-
-                    icon = person?.icon ?: coreContext.contactsManager.contactAvatar
-                    subject = contact?.name ?: LinphoneUtils.getDisplayName(chatRoom.peerAddress)
-                } else if (chatRoom.hasCapability(Capabilities.OneToOne.toInt()) && chatRoom.participants.isNotEmpty()) {
-                    val address = chatRoom.participants.first().address
-                    val contact =
-                        coreContext.contactsManager.findContactByAddress(address)
-                    val person = contact?.getPerson()
-                    if (person != null) {
-                        personsList.add(person)
-                    }
-
-                    subject = contact?.name ?: LinphoneUtils.getDisplayName(address)
-                    icon = person?.icon ?: coreContext.contactsManager.contactAvatar
-                } else {
-                    for (participant in chatRoom.participants) {
-                        val contact =
-                            coreContext.contactsManager.findContactByAddress(participant.address)
-                        if (contact != null) {
-                            personsList.add(contact.getPerson())
-                        }
-                    }
-                    subject = chatRoom.subject.orEmpty()
-                    icon = coreContext.contactsManager.groupAvatar
-                }
-
-                val persons = arrayOfNulls<Person>(personsList.size)
-                personsList.toArray(persons)
-
-                val args = Bundle()
-                args.putString("RemoteSipUri", peerAddress)
-                args.putString("LocalSipUri", localAddress)
-
-                val intent = Intent(Intent.ACTION_MAIN)
-                intent.setClass(context, MainActivity::class.java)
-                intent.putExtra("Chat", true)
-                intent.putExtra("RemoteSipUri", peerAddress)
-                intent.putExtra("LocalSipUri", localAddress)
-
-                return ShortcutInfoCompat.Builder(context, id)
-                    .setShortLabel(subject)
-                    .setIcon(icon)
-                    .setPersons(persons)
-                    .setCategories(categories)
-                    .setIntent(intent)
-                    .setLongLived(Version.sdkAboveOrEqual(Version.API30_ANDROID_11))
-                    .setLocusId(LocusIdCompat(id))
-                    .build()
-            } catch (e: Exception) {
-                Log.e("[Shortcuts Helper] createChatRoomShortcut for id [$id] exception: $e")
-            }
-
-            return null
-        }
-
-        fun removeShortcuts(context: Context) {
-            Log.w("[Shortcut Helper] Removing all contacts shortcuts")
-            ShortcutManagerCompat.removeAllDynamicShortcuts(context)
-        }
-
-        fun isShortcutToChatRoomAlreadyCreated(context: Context, chatRoom: ChatRoom): Boolean {
-            val id = LinphoneUtils.getChatRoomId(chatRoom.localAddress, chatRoom.peerAddress)
-            val found = ShortcutManagerCompat.getDynamicShortcuts(context).find {
-                it.id == id
-            }
-            return found != null
-        }
-    }
-}
diff --git a/app/src/main/java/org/linphone/utils/SingletonHolder.kt b/app/src/main/java/org/linphone/utils/SingletonHolder.kt
deleted file mode 100644
index 379ba4e3a..000000000
--- a/app/src/main/java/org/linphone/utils/SingletonHolder.kt
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.utils
-
-/**
- * Helper class to create singletons like CoreContext.
- */
-open class SingletonHolder<out T : Any, in A>(val creator: (A) -> T) {
-    @Volatile private var instance: T? = null
-
-    fun exists(): Boolean {
-        return instance != null
-    }
-
-    fun destroy() {
-        instance = null
-    }
-
-    fun get(): T {
-        // Will throw NPE if needed
-        return instance!!
-    }
-
-    fun create(arg: A): T {
-        val i = instance
-        if (i != null) {
-            return i
-        }
-
-        return synchronized(this) {
-            val i2 = instance
-            if (i2 != null) {
-                i2
-            } else {
-                val created = creator(arg)
-                instance = created
-                created
-            }
-        }
-    }
-
-    fun required(arg: A): T {
-        return instance ?: create(arg)
-    }
-}
diff --git a/app/src/main/java/org/linphone/utils/TimestampUtils.kt b/app/src/main/java/org/linphone/utils/TimestampUtils.kt
deleted file mode 100644
index baf0e7262..000000000
--- a/app/src/main/java/org/linphone/utils/TimestampUtils.kt
+++ /dev/null
@@ -1,174 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.utils
-
-import java.text.DateFormat
-import java.text.Format
-import java.text.SimpleDateFormat
-import java.util.*
-import org.linphone.LinphoneApplication
-
-class TimestampUtils {
-    companion object {
-        fun isToday(timestamp: Long, timestampInSecs: Boolean = true): Boolean {
-            val cal = Calendar.getInstance()
-            cal.timeInMillis = if (timestampInSecs) timestamp * 1000 else timestamp
-            return isSameDay(cal, Calendar.getInstance())
-        }
-
-        fun isYesterday(timestamp: Long, timestampInSecs: Boolean = true): Boolean {
-            val yesterday = Calendar.getInstance()
-            yesterday.roll(Calendar.DAY_OF_MONTH, -1)
-            val cal = Calendar.getInstance()
-            cal.timeInMillis = if (timestampInSecs) timestamp * 1000 else timestamp
-            return isSameDay(cal, yesterday)
-        }
-
-        fun isSameDay(timestamp1: Long, timestamp2: Long, timestampInSecs: Boolean = true): Boolean {
-            val cal1 = Calendar.getInstance()
-            cal1.timeInMillis = if (timestampInSecs) timestamp1 * 1000 else timestamp1
-            val cal2 = Calendar.getInstance()
-            cal2.timeInMillis = if (timestampInSecs) timestamp2 * 1000 else timestamp2
-            return isSameDay(cal1, cal2)
-        }
-
-        fun isSameDay(
-            cal1: Date,
-            cal2: Date
-        ): Boolean {
-            return isSameDay(cal1.time, cal2.time, false)
-        }
-
-        fun dateToString(date: Long, timestampInSecs: Boolean = true): String {
-            val dateFormat: Format = android.text.format.DateFormat.getDateFormat(
-                LinphoneApplication.coreContext.context
-            )
-            val pattern = (dateFormat as SimpleDateFormat).toLocalizedPattern()
-
-            val calendar = Calendar.getInstance()
-            calendar.timeInMillis = if (timestampInSecs) date * 1000 else date
-
-            // See https://github.com/material-components/material-components-android/issues/882
-            val dateFormatter = SimpleDateFormat(pattern, Locale.getDefault())
-            dateFormatter.timeZone = TimeZone.getTimeZone("UTC")
-            return dateFormatter.format(calendar.time)
-        }
-
-        fun timeToString(hour: Int, minutes: Int): String {
-            val use24hFormat = android.text.format.DateFormat.is24HourFormat(
-                LinphoneApplication.coreContext.context
-            )
-            val calendar = Calendar.getInstance()
-            calendar.set(Calendar.HOUR_OF_DAY, hour)
-            calendar.set(Calendar.MINUTE, minutes)
-
-            return if (use24hFormat) {
-                SimpleDateFormat("HH'h'mm", Locale.getDefault()).format(calendar.time)
-            } else {
-                SimpleDateFormat("h:mm a", Locale.getDefault()).format(calendar.time)
-            }
-        }
-
-        fun timeToString(time: Long, timestampInSecs: Boolean = true): String {
-            val use24hFormat = android.text.format.DateFormat.is24HourFormat(
-                LinphoneApplication.coreContext.context
-            )
-            val calendar = Calendar.getInstance()
-            calendar.timeInMillis = if (timestampInSecs) time * 1000 else time
-
-            return if (use24hFormat) {
-                SimpleDateFormat("HH'h'mm", Locale.getDefault()).format(calendar.time)
-            } else {
-                SimpleDateFormat("h:mm a", Locale.getDefault()).format(calendar.time)
-            }
-        }
-
-        fun durationToString(hours: Int, minutes: Int): String {
-            val calendar = Calendar.getInstance()
-            calendar.set(Calendar.HOUR_OF_DAY, hours)
-            calendar.set(Calendar.MINUTE, minutes)
-            val pattern = when {
-                hours == 0 -> "mm'min'"
-                hours < 10 && minutes == 0 -> "H'h'"
-                hours < 10 && minutes > 0 -> "H'h'mm"
-                hours >= 10 && minutes == 0 -> "HH'h'"
-                else -> "HH'h'mm"
-            }
-            return SimpleDateFormat(pattern, Locale.getDefault()).format(calendar.time)
-        }
-
-        private fun isSameYear(timestamp: Long, timestampInSecs: Boolean = true): Boolean {
-            val cal = Calendar.getInstance()
-            cal.timeInMillis = if (timestampInSecs) timestamp * 1000 else timestamp
-            return isSameYear(cal, Calendar.getInstance())
-        }
-
-        fun toString(
-            timestamp: Long,
-            onlyDate: Boolean = false,
-            timestampInSecs: Boolean = true,
-            shortDate: Boolean = true,
-            hideYear: Boolean = true
-        ): String {
-            val dateFormat = if (isToday(timestamp, timestampInSecs)) {
-                DateFormat.getTimeInstance(DateFormat.SHORT)
-            } else {
-                if (onlyDate) {
-                    DateFormat.getDateInstance(if (shortDate) DateFormat.SHORT else DateFormat.FULL)
-                } else {
-                    DateFormat.getDateTimeInstance(
-                        if (shortDate) DateFormat.SHORT else DateFormat.MEDIUM,
-                        DateFormat.SHORT
-                    )
-                }
-            } as SimpleDateFormat
-
-            if (hideYear || isSameYear(timestamp, timestampInSecs)) {
-                // Remove the year part of the format
-                dateFormat.applyPattern(
-                    dateFormat.toPattern().replace(
-                        "/?y+/?|,?\\s?y+\\s?".toRegex(),
-                        if (shortDate) "" else " "
-                    )
-                )
-            }
-
-            val millis = if (timestampInSecs) timestamp * 1000 else timestamp
-            return dateFormat.format(Date(millis)).capitalize(Locale.getDefault())
-        }
-
-        private fun isSameDay(
-            cal1: Calendar,
-            cal2: Calendar
-        ): Boolean {
-            return cal1[Calendar.ERA] == cal2[Calendar.ERA] &&
-                cal1[Calendar.YEAR] == cal2[Calendar.YEAR] &&
-                cal1[Calendar.DAY_OF_YEAR] == cal2[Calendar.DAY_OF_YEAR]
-        }
-
-        private fun isSameYear(
-            cal1: Calendar,
-            cal2: Calendar
-        ): Boolean {
-            return cal1[Calendar.ERA] == cal2[Calendar.ERA] &&
-                cal1[Calendar.YEAR] == cal2[Calendar.YEAR]
-        }
-    }
-}
diff --git a/app/src/main/java/org/linphone/views/MarqueeTextView.kt b/app/src/main/java/org/linphone/views/MarqueeTextView.kt
deleted file mode 100644
index 55cd5d3eb..000000000
--- a/app/src/main/java/org/linphone/views/MarqueeTextView.kt
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.views
-
-import android.content.Context
-import android.text.TextUtils
-import android.util.AttributeSet
-import androidx.appcompat.widget.AppCompatTextView
-
-/**
- * The purpose of this class is to have a TextView automatically configured for marquee ellipsize.
- */
-class MarqueeTextView : AppCompatTextView {
-    constructor(context: Context) : super(context) {
-        init()
-    }
-
-    constructor(context: Context, attrs: AttributeSet?) : super(context, attrs) {
-        init()
-    }
-
-    constructor(context: Context, attrs: AttributeSet?, defStyleAttr: Int) : super(
-        context,
-        attrs,
-        defStyleAttr
-    ) {
-        init()
-    }
-
-    fun init() {
-        ellipsize = TextUtils.TruncateAt.MARQUEE
-        marqueeRepeatLimit = -0x1
-        isSelected = true
-    }
-}
diff --git a/app/src/main/java/org/linphone/views/SettingTextInputEditText.kt b/app/src/main/java/org/linphone/views/SettingTextInputEditText.kt
deleted file mode 100644
index 6340f2896..000000000
--- a/app/src/main/java/org/linphone/views/SettingTextInputEditText.kt
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 2010-2021 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.views
-
-import android.app.Activity
-import android.content.Context
-import android.util.AttributeSet
-import android.view.inputmethod.InputMethodManager
-import com.google.android.material.textfield.TextInputEditText
-import org.linphone.activities.main.settings.SettingListener
-
-class SettingTextInputEditText : TextInputEditText {
-    constructor(context: Context) : super(context)
-
-    constructor(context: Context, attrs: AttributeSet?) : super(context, attrs)
-
-    constructor(context: Context, attrs: AttributeSet?, defStyleAttr: Int) : super(
-        context,
-        attrs,
-        defStyleAttr
-    )
-
-    fun fakeImeDone(listener: SettingListener) {
-        listener.onTextValueChanged(text.toString())
-
-        // Send IME action DONE to trigger onSettingImeDone binding adapter, but that doesn't work...
-        // val inputConnection = BaseInputConnection(this, true)
-        // inputConnection.performEditorAction(EditorInfo.IME_ACTION_DONE)
-
-        // Will make check icon to disappear thanks to onFocusChangeVisibilityOf binding adapter
-        clearFocus()
-
-        // Hide keyboard
-        val imm = context.getSystemService(Activity.INPUT_METHOD_SERVICE) as InputMethodManager
-        imm.hideSoftInputFromWindow(windowToken, 0)
-    }
-}
diff --git a/app/src/main/java/org/linphone/views/VoiceRecordProgressBar.kt b/app/src/main/java/org/linphone/views/VoiceRecordProgressBar.kt
deleted file mode 100644
index 619717f28..000000000
--- a/app/src/main/java/org/linphone/views/VoiceRecordProgressBar.kt
+++ /dev/null
@@ -1,352 +0,0 @@
-/*
- * Copyright (c) 2010-2021 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.views
-
-import android.content.Context
-import android.graphics.Canvas
-import android.graphics.Rect
-import android.graphics.drawable.*
-import android.os.Parcel
-import android.os.Parcelable
-import android.util.AttributeSet
-import android.view.View
-import org.linphone.R
-
-class VoiceRecordProgressBar : View {
-    companion object {
-        const val MAX_LEVEL = 10000
-    }
-
-    private var minWidth = 0
-    private var maxWidth = 0
-    private var minHeight = 0
-    private var maxHeight = 0
-
-    private var progress = 0
-    private var secondaryProgress = 0
-    private var max = 0
-    private var progressDrawable: Drawable? = null
-
-    private var primaryLeftMargin: Float = 0f
-    private var primaryRightMargin: Float = 0f
-
-    constructor(context: Context) : this(context, null)
-
-    constructor(context: Context, attrs: AttributeSet?) : this(context, attrs, 0)
-
-    constructor(context: Context, attrs: AttributeSet?, defStyle: Int) : super(
-        context,
-        attrs,
-        defStyle
-    ) {
-        max = 100
-        progress = 0
-        secondaryProgress = 0
-        minWidth = 24
-        maxWidth = 48
-        minHeight = 24
-        maxHeight = 48
-
-        context.theme.obtainStyledAttributes(
-            attrs,
-            R.styleable.VoiceRecordProgressBar,
-            0,
-            0
-        ).apply {
-
-            try {
-                val drawable = getDrawable(R.styleable.VoiceRecordProgressBar_progressDrawable)
-                if (drawable != null) {
-                    setProgressDrawable(drawable)
-                }
-                setPrimaryLeftMargin(
-                    getDimension(R.styleable.VoiceRecordProgressBar_primaryLeftMargin, 0f)
-                )
-                setPrimaryRightMargin(
-                    getDimension(R.styleable.VoiceRecordProgressBar_primaryRightMargin, 0f)
-                )
-                setMax(getInteger(R.styleable.VoiceRecordProgressBar_max, 100))
-            } finally {
-                recycle()
-            }
-        }
-
-        setProgress(0)
-        setSecondaryProgress(0)
-    }
-
-    override fun onSaveInstanceState(): Parcelable {
-        val superState: Parcelable? = super.onSaveInstanceState()
-        val savedState = SavedState(superState)
-        savedState.max = max
-        savedState.progress = progress
-        savedState.secondaryProgress = secondaryProgress
-        return savedState
-    }
-
-    override fun onRestoreInstanceState(state: Parcelable) {
-        val savedState = state as SavedState
-        super.onRestoreInstanceState(savedState.superState)
-        setMax(savedState.max)
-        setProgress(savedState.progress)
-        setSecondaryProgress(savedState.secondaryProgress)
-    }
-
-    override fun drawableStateChanged() {
-        super.drawableStateChanged()
-        updateDrawableState()
-    }
-
-    override fun invalidateDrawable(drawable: Drawable) {
-        if (verifyDrawable(drawable)) {
-            val dirty: Rect = drawable.bounds
-            val scrollX: Int = scrollX + paddingLeft
-            val scrollY: Int = scrollY + paddingTop
-            invalidate(
-                dirty.left + scrollX,
-                dirty.top + scrollY,
-                dirty.right + scrollX,
-                dirty.bottom + scrollY
-            )
-        } else {
-            super.invalidateDrawable(drawable)
-        }
-    }
-
-    override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
-        val drawable: Drawable? = progressDrawable
-        var dw = 0
-        var dh = 0
-
-        if (drawable != null) {
-            dw = minWidth.coerceAtLeast(maxWidth.coerceAtMost(drawable.intrinsicWidth))
-            dh = minHeight.coerceAtLeast(maxHeight.coerceAtMost(drawable.intrinsicHeight))
-        }
-
-        updateDrawableState()
-        dw += paddingRight + paddingLeft
-        dh += paddingBottom + paddingTop
-
-        setMeasuredDimension(
-            resolveSizeAndState(dw, widthMeasureSpec, 0),
-            resolveSizeAndState(dh, heightMeasureSpec, 0)
-        )
-    }
-
-    override fun onSizeChanged(w: Int, h: Int, oldw: Int, oldh: Int) {
-        updateDrawableBounds(w, h)
-    }
-
-    override fun verifyDrawable(who: Drawable): Boolean {
-        return who === progressDrawable || super.verifyDrawable(who)
-    }
-
-    override fun jumpDrawablesToCurrentState() {
-        super.jumpDrawablesToCurrentState()
-        progressDrawable?.jumpToCurrentState()
-    }
-
-    private fun setPrimaryLeftMargin(margin: Float) {
-        primaryLeftMargin = margin
-    }
-
-    private fun setPrimaryRightMargin(margin: Float) {
-        primaryRightMargin = margin
-    }
-
-    fun setProgress(p: Int) {
-        var progress = p
-        if (progress < 0) {
-            progress = 0
-        }
-        if (progress > max) {
-            progress = max
-        }
-
-        if (progress != this.progress) {
-            this.progress = progress
-            refreshProgress(android.R.id.progress, this.progress)
-        }
-    }
-
-    fun setSecondaryProgress(sp: Int) {
-        var secondaryProgress = sp
-        if (secondaryProgress < 0) {
-            secondaryProgress = 0
-        }
-        if (secondaryProgress > max) {
-            secondaryProgress = max
-        }
-
-        if (secondaryProgress != this.secondaryProgress) {
-            this.secondaryProgress = secondaryProgress
-            refreshProgress(android.R.id.secondaryProgress, this.secondaryProgress)
-        }
-    }
-
-    fun setMax(m: Int) {
-        var max = m
-        if (max < 0) {
-            max = 0
-        }
-        if (max != this.max) {
-            this.max = max
-            postInvalidate()
-            if (progress > max) {
-                progress = max
-            }
-            refreshProgress(android.R.id.progress, progress)
-        }
-    }
-
-    fun setSecondaryProgressTint(color: Int) {
-        val drawable = progressDrawable
-        if (drawable != null) {
-            if (drawable is LayerDrawable) {
-                val secondaryProgressDrawable = drawable.findDrawableByLayerId(
-                    android.R.id.secondaryProgress
-                )
-                secondaryProgressDrawable?.setTint(color)
-            }
-        }
-    }
-
-    private fun setProgressDrawable(drawable: Drawable) {
-        val needUpdate: Boolean = if (progressDrawable != null && drawable !== progressDrawable) {
-            progressDrawable?.callback = null
-            true
-        } else {
-            false
-        }
-
-        drawable.callback = this
-        // Make sure the ProgressBar is always tall enough
-        val drawableHeight = drawable.minimumHeight
-        if (maxHeight < drawableHeight) {
-            maxHeight = drawableHeight
-            requestLayout()
-        }
-
-        progressDrawable = drawable
-        postInvalidate()
-
-        if (needUpdate) {
-            updateDrawableBounds(width, height)
-            updateDrawableState()
-
-            refreshProgress(android.R.id.progress, progress)
-            refreshProgress(android.R.id.secondaryProgress, secondaryProgress)
-        }
-    }
-
-    private fun refreshProgress(id: Int, progress: Int) {
-        var scale: Float = if (max > 0) (progress.toFloat() / max) else 0f
-
-        if (id == android.R.id.progress && scale > 0) {
-            if (width > 0) {
-                // Wait for secondaryProgress to have reached primaryLeftMargin to start primaryProgress at 0
-                val leftOffset = primaryLeftMargin / width
-                if (scale < leftOffset) return
-
-                // Prevent primaryProgress to go further than (width - rightMargin)
-                val rightOffset = primaryRightMargin / width
-                if (scale > 1 - rightOffset) {
-                    scale = 1 - rightOffset
-                }
-
-                // Remove left margin from primary progress
-                scale -= leftOffset
-
-                // Since we use setBounds() to apply margins to the Bitmaps,
-                // the width of the bitmap is reduced so we have to adapt the level
-                val widthScale = width - (primaryLeftMargin + primaryRightMargin)
-                scale = ((scale * width) / widthScale)
-            }
-        }
-
-        val drawable: Drawable? = progressDrawable
-        if (drawable != null) {
-            var progressDrawable: Drawable? = null
-            if (drawable is LayerDrawable) {
-                progressDrawable = drawable.findDrawableByLayerId(id)
-            }
-            (progressDrawable ?: drawable).level = (scale * MAX_LEVEL).toInt()
-        } else {
-            invalidate()
-        }
-    }
-
-    private fun updateDrawableState() {
-        val state = drawableState
-        if (progressDrawable != null && progressDrawable?.isStateful == true) {
-            progressDrawable?.state = state
-        }
-    }
-
-    private fun updateDrawableBounds(w: Int, h: Int) {
-        val right: Int = w - paddingRight - paddingLeft
-        val bottom: Int = h - paddingBottom - paddingTop
-        progressDrawable?.setBounds(0, 0, right, bottom)
-    }
-
-    @Synchronized
-    override fun onDraw(canvas: Canvas) {
-        super.onDraw(canvas)
-        val drawable = progressDrawable as? LayerDrawable
-
-        if (drawable != null) {
-            canvas.save()
-            canvas.translate(paddingLeft.toFloat(), paddingTop.toFloat())
-
-            for (i in 0 until drawable.numberOfLayers) {
-                val drawableLayer = drawable.getDrawable(i)
-                if (i != 1) {
-                    canvas.translate(primaryLeftMargin, 0f)
-                    drawableLayer.draw(canvas)
-                    drawableLayer.setBounds(
-                        0,
-                        0,
-                        width - primaryRightMargin.toInt() - primaryLeftMargin.toInt(),
-                        height
-                    )
-                    canvas.translate(-primaryLeftMargin, 0f)
-                } else {
-                    drawableLayer.draw(canvas)
-                }
-            }
-
-            canvas.restore()
-        }
-    }
-
-    internal class SavedState(superState: Parcelable?) : BaseSavedState(superState) {
-        var max = 0
-        var progress = 0
-        var secondaryProgress = 0
-
-        override fun writeToParcel(output: Parcel, flags: Int) {
-            super.writeToParcel(output, flags)
-
-            output.writeInt(max)
-            output.writeInt(progress)
-            output.writeInt(secondaryProgress)
-        }
-    }
-}
diff --git a/app/src/main/res/color/dark_primary_text_color.xml b/app/src/main/res/color/dark_primary_text_color.xml
deleted file mode 100644
index a0eaff7cb..000000000
--- a/app/src/main/res/color/dark_primary_text_color.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_enabled="false" android:color="@color/toolbar_color"/>
-    <item android:color="@color/white_color"/>
-</selector>
\ No newline at end of file
diff --git a/app/src/main/res/color/light_primary_text_color.xml b/app/src/main/res/color/light_primary_text_color.xml
deleted file mode 100644
index 13b5f1ece..000000000
--- a/app/src/main/res/color/light_primary_text_color.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_enabled="false" android:color="@color/grey_color"/>
-    <item android:color="@color/dark_grey_color"/>
-</selector>
\ No newline at end of file
diff --git a/app/src/main/res/color/voip_extra_button_text_color.xml b/app/src/main/res/color/voip_extra_button_text_color.xml
deleted file mode 100644
index 336ccd7b2..000000000
--- a/app/src/main/res/color/voip_extra_button_text_color.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_enabled="false" android:color="?attr/voipFormFieldBackgroundColor" />
-    <item android:state_pressed="true" android:color="?attr/voipTextColor2" />
-    <item android:color="@color/white_color"/>
-</selector>
diff --git a/app/src/main/res/drawable-hdpi/topbar_call_notification.png b/app/src/main/res/drawable-hdpi/topbar_call_notification.png
deleted file mode 100644
index ab24cd5c1..000000000
Binary files a/app/src/main/res/drawable-hdpi/topbar_call_notification.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/topbar_call_paused_notification.png b/app/src/main/res/drawable-hdpi/topbar_call_paused_notification.png
deleted file mode 100644
index 8718035ef..000000000
Binary files a/app/src/main/res/drawable-hdpi/topbar_call_paused_notification.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/topbar_chat_notification.png b/app/src/main/res/drawable-hdpi/topbar_chat_notification.png
deleted file mode 100644
index 975acd34e..000000000
Binary files a/app/src/main/res/drawable-hdpi/topbar_chat_notification.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/topbar_missed_call_notification.png b/app/src/main/res/drawable-hdpi/topbar_missed_call_notification.png
deleted file mode 100644
index 8f4ac5aed..000000000
Binary files a/app/src/main/res/drawable-hdpi/topbar_missed_call_notification.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/topbar_service_notification.png b/app/src/main/res/drawable-hdpi/topbar_service_notification.png
deleted file mode 100644
index f4c3cf5c4..000000000
Binary files a/app/src/main/res/drawable-hdpi/topbar_service_notification.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/topbar_videocall_notification.png b/app/src/main/res/drawable-hdpi/topbar_videocall_notification.png
deleted file mode 100644
index acb444856..000000000
Binary files a/app/src/main/res/drawable-hdpi/topbar_videocall_notification.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/topbar_call_notification.png b/app/src/main/res/drawable-mdpi/topbar_call_notification.png
deleted file mode 100644
index adf504c79..000000000
Binary files a/app/src/main/res/drawable-mdpi/topbar_call_notification.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/topbar_call_paused_notification.png b/app/src/main/res/drawable-mdpi/topbar_call_paused_notification.png
deleted file mode 100644
index 63fff65b9..000000000
Binary files a/app/src/main/res/drawable-mdpi/topbar_call_paused_notification.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/topbar_chat_notification.png b/app/src/main/res/drawable-mdpi/topbar_chat_notification.png
deleted file mode 100644
index 618d4869c..000000000
Binary files a/app/src/main/res/drawable-mdpi/topbar_chat_notification.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/topbar_missed_call_notification.png b/app/src/main/res/drawable-mdpi/topbar_missed_call_notification.png
deleted file mode 100644
index bdb453946..000000000
Binary files a/app/src/main/res/drawable-mdpi/topbar_missed_call_notification.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/topbar_service_notification.png b/app/src/main/res/drawable-mdpi/topbar_service_notification.png
deleted file mode 100644
index 20cce4f92..000000000
Binary files a/app/src/main/res/drawable-mdpi/topbar_service_notification.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/topbar_videocall_notification.png b/app/src/main/res/drawable-mdpi/topbar_videocall_notification.png
deleted file mode 100644
index 87bce3552..000000000
Binary files a/app/src/main/res/drawable-mdpi/topbar_videocall_notification.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/audio_recording_default.png b/app/src/main/res/drawable-xhdpi/audio_recording_default.png
deleted file mode 100644
index 6e800a6bc..000000000
Binary files a/app/src/main/res/drawable-xhdpi/audio_recording_default.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/audio_recording_reply_preview_default.png b/app/src/main/res/drawable-xhdpi/audio_recording_reply_preview_default.png
deleted file mode 100644
index e4a9b2087..000000000
Binary files a/app/src/main/res/drawable-xhdpi/audio_recording_reply_preview_default.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/back_default.png b/app/src/main/res/drawable-xhdpi/back_default.png
deleted file mode 100644
index b81b9fb89..000000000
Binary files a/app/src/main/res/drawable-xhdpi/back_default.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/backspace_default.png b/app/src/main/res/drawable-xhdpi/backspace_default.png
deleted file mode 100644
index 1280f1698..000000000
Binary files a/app/src/main/res/drawable-xhdpi/backspace_default.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/call_add.png b/app/src/main/res/drawable-xhdpi/call_add.png
deleted file mode 100644
index db4ca84b4..000000000
Binary files a/app/src/main/res/drawable-xhdpi/call_add.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/call_alt_start_default.png b/app/src/main/res/drawable-xhdpi/call_alt_start_default.png
deleted file mode 100644
index 836a0ec5d..000000000
Binary files a/app/src/main/res/drawable-xhdpi/call_alt_start_default.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/call_audio_start.png b/app/src/main/res/drawable-xhdpi/call_audio_start.png
deleted file mode 100644
index 3f7b6932d..000000000
Binary files a/app/src/main/res/drawable-xhdpi/call_audio_start.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/call_back_default.png b/app/src/main/res/drawable-xhdpi/call_back_default.png
deleted file mode 100644
index 3045bd866..000000000
Binary files a/app/src/main/res/drawable-xhdpi/call_back_default.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/call_hangup.png b/app/src/main/res/drawable-xhdpi/call_hangup.png
deleted file mode 100644
index 23fb40172..000000000
Binary files a/app/src/main/res/drawable-xhdpi/call_hangup.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/call_incoming.png b/app/src/main/res/drawable-xhdpi/call_incoming.png
deleted file mode 100644
index 89d593a4c..000000000
Binary files a/app/src/main/res/drawable-xhdpi/call_incoming.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/call_missed.png b/app/src/main/res/drawable-xhdpi/call_missed.png
deleted file mode 100644
index e1074ffaf..000000000
Binary files a/app/src/main/res/drawable-xhdpi/call_missed.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/call_outgoing.png b/app/src/main/res/drawable-xhdpi/call_outgoing.png
deleted file mode 100644
index c6df94bd9..000000000
Binary files a/app/src/main/res/drawable-xhdpi/call_outgoing.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/call_quality_indicator_0.png b/app/src/main/res/drawable-xhdpi/call_quality_indicator_0.png
deleted file mode 100644
index 06804eda3..000000000
Binary files a/app/src/main/res/drawable-xhdpi/call_quality_indicator_0.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/call_quality_indicator_1.png b/app/src/main/res/drawable-xhdpi/call_quality_indicator_1.png
deleted file mode 100644
index faa61c3e2..000000000
Binary files a/app/src/main/res/drawable-xhdpi/call_quality_indicator_1.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/call_quality_indicator_2.png b/app/src/main/res/drawable-xhdpi/call_quality_indicator_2.png
deleted file mode 100644
index 6bf7b78f6..000000000
Binary files a/app/src/main/res/drawable-xhdpi/call_quality_indicator_2.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/call_quality_indicator_3.png b/app/src/main/res/drawable-xhdpi/call_quality_indicator_3.png
deleted file mode 100644
index a9a2fa03e..000000000
Binary files a/app/src/main/res/drawable-xhdpi/call_quality_indicator_3.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/call_quality_indicator_4.png b/app/src/main/res/drawable-xhdpi/call_quality_indicator_4.png
deleted file mode 100644
index e2c95d4f7..000000000
Binary files a/app/src/main/res/drawable-xhdpi/call_quality_indicator_4.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/call_start_default.png b/app/src/main/res/drawable-xhdpi/call_start_default.png
deleted file mode 100644
index bcbd2e068..000000000
Binary files a/app/src/main/res/drawable-xhdpi/call_start_default.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/call_status_incoming.png b/app/src/main/res/drawable-xhdpi/call_status_incoming.png
deleted file mode 100644
index bb3f4d0ff..000000000
Binary files a/app/src/main/res/drawable-xhdpi/call_status_incoming.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/call_status_missed.png b/app/src/main/res/drawable-xhdpi/call_status_missed.png
deleted file mode 100644
index 582040717..000000000
Binary files a/app/src/main/res/drawable-xhdpi/call_status_missed.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/call_status_outgoing.png b/app/src/main/res/drawable-xhdpi/call_status_outgoing.png
deleted file mode 100644
index 5ae14394b..000000000
Binary files a/app/src/main/res/drawable-xhdpi/call_status_outgoing.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/call_transfer.png b/app/src/main/res/drawable-xhdpi/call_transfer.png
deleted file mode 100644
index ef831ef39..000000000
Binary files a/app/src/main/res/drawable-xhdpi/call_transfer.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/call_video_start.png b/app/src/main/res/drawable-xhdpi/call_video_start.png
deleted file mode 100644
index a936b8894..000000000
Binary files a/app/src/main/res/drawable-xhdpi/call_video_start.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/camera_switch_default.png b/app/src/main/res/drawable-xhdpi/camera_switch_default.png
deleted file mode 100644
index 532cf3187..000000000
Binary files a/app/src/main/res/drawable-xhdpi/camera_switch_default.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/chat_delivered.png b/app/src/main/res/drawable-xhdpi/chat_delivered.png
deleted file mode 100644
index b49e4e7e8..000000000
Binary files a/app/src/main/res/drawable-xhdpi/chat_delivered.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/chat_error.png b/app/src/main/res/drawable-xhdpi/chat_error.png
deleted file mode 100644
index 1979db520..000000000
Binary files a/app/src/main/res/drawable-xhdpi/chat_error.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/chat_file_over.png b/app/src/main/res/drawable-xhdpi/chat_file_over.png
deleted file mode 100644
index b36547ca1..000000000
Binary files a/app/src/main/res/drawable-xhdpi/chat_file_over.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/chat_group_add_default.png b/app/src/main/res/drawable-xhdpi/chat_group_add_default.png
deleted file mode 100644
index 54a8954b9..000000000
Binary files a/app/src/main/res/drawable-xhdpi/chat_group_add_default.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/chat_group_delete.png b/app/src/main/res/drawable-xhdpi/chat_group_delete.png
deleted file mode 100644
index 18b42abed..000000000
Binary files a/app/src/main/res/drawable-xhdpi/chat_group_delete.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/chat_group_new_default.png b/app/src/main/res/drawable-xhdpi/chat_group_new_default.png
deleted file mode 100644
index 7fbb9ae8f..000000000
Binary files a/app/src/main/res/drawable-xhdpi/chat_group_new_default.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/chat_new_default.png b/app/src/main/res/drawable-xhdpi/chat_new_default.png
deleted file mode 100644
index 7d94f9738..000000000
Binary files a/app/src/main/res/drawable-xhdpi/chat_new_default.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/chat_read.png b/app/src/main/res/drawable-xhdpi/chat_read.png
deleted file mode 100644
index 5c00f33e6..000000000
Binary files a/app/src/main/res/drawable-xhdpi/chat_read.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/chat_send_over.png b/app/src/main/res/drawable-xhdpi/chat_send_over.png
deleted file mode 100644
index cce92a4b9..000000000
Binary files a/app/src/main/res/drawable-xhdpi/chat_send_over.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/chat_start_default.png b/app/src/main/res/drawable-xhdpi/chat_start_default.png
deleted file mode 100644
index 3bb7892f9..000000000
Binary files a/app/src/main/res/drawable-xhdpi/chat_start_default.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/check_selected.png b/app/src/main/res/drawable-xhdpi/check_selected.png
deleted file mode 100644
index 07298e894..000000000
Binary files a/app/src/main/res/drawable-xhdpi/check_selected.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/check_unselected.png b/app/src/main/res/drawable-xhdpi/check_unselected.png
deleted file mode 100644
index 3e8704632..000000000
Binary files a/app/src/main/res/drawable-xhdpi/check_unselected.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/chevron_list_close_default.png b/app/src/main/res/drawable-xhdpi/chevron_list_close_default.png
deleted file mode 100644
index 80de198cc..000000000
Binary files a/app/src/main/res/drawable-xhdpi/chevron_list_close_default.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/chevron_list_open_default.png b/app/src/main/res/drawable-xhdpi/chevron_list_open_default.png
deleted file mode 100644
index 422f69f9c..000000000
Binary files a/app/src/main/res/drawable-xhdpi/chevron_list_open_default.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/collapse_default.png b/app/src/main/res/drawable-xhdpi/collapse_default.png
deleted file mode 100644
index c6895edc8..000000000
Binary files a/app/src/main/res/drawable-xhdpi/collapse_default.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/conference_schedule_calendar_default.png b/app/src/main/res/drawable-xhdpi/conference_schedule_calendar_default.png
deleted file mode 100644
index 59fe950fb..000000000
Binary files a/app/src/main/res/drawable-xhdpi/conference_schedule_calendar_default.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/conference_schedule_participants_default.png b/app/src/main/res/drawable-xhdpi/conference_schedule_participants_default.png
deleted file mode 100644
index a58af55e1..000000000
Binary files a/app/src/main/res/drawable-xhdpi/conference_schedule_participants_default.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/conference_schedule_time_default.png b/app/src/main/res/drawable-xhdpi/conference_schedule_time_default.png
deleted file mode 100644
index 7a9534617..000000000
Binary files a/app/src/main/res/drawable-xhdpi/conference_schedule_time_default.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/contact_add_default.png b/app/src/main/res/drawable-xhdpi/contact_add_default.png
deleted file mode 100644
index 83c8f26df..000000000
Binary files a/app/src/main/res/drawable-xhdpi/contact_add_default.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/contact_default.png b/app/src/main/res/drawable-xhdpi/contact_default.png
deleted file mode 100644
index f2abc78db..000000000
Binary files a/app/src/main/res/drawable-xhdpi/contact_default.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/contacts_all_default.png b/app/src/main/res/drawable-xhdpi/contacts_all_default.png
deleted file mode 100644
index eb98ed424..000000000
Binary files a/app/src/main/res/drawable-xhdpi/contacts_all_default.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/contacts_sip_default.png b/app/src/main/res/drawable-xhdpi/contacts_sip_default.png
deleted file mode 100644
index 2dad4eb12..000000000
Binary files a/app/src/main/res/drawable-xhdpi/contacts_sip_default.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/delete_default.png b/app/src/main/res/drawable-xhdpi/delete_default.png
deleted file mode 100644
index 76e3d112a..000000000
Binary files a/app/src/main/res/drawable-xhdpi/delete_default.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/deselect_all_default.png b/app/src/main/res/drawable-xhdpi/deselect_all_default.png
deleted file mode 100644
index 69ee8a272..000000000
Binary files a/app/src/main/res/drawable-xhdpi/deselect_all_default.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/dialer_background.png b/app/src/main/res/drawable-xhdpi/dialer_background.png
deleted file mode 100644
index ccb0eedd9..000000000
Binary files a/app/src/main/res/drawable-xhdpi/dialer_background.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/edit_default.png b/app/src/main/res/drawable-xhdpi/edit_default.png
deleted file mode 100644
index 5550b05a2..000000000
Binary files a/app/src/main/res/drawable-xhdpi/edit_default.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/emoji_default.png b/app/src/main/res/drawable-xhdpi/emoji_default.png
deleted file mode 100644
index 563340737..000000000
Binary files a/app/src/main/res/drawable-xhdpi/emoji_default.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ephemeral_messages_default.png b/app/src/main/res/drawable-xhdpi/ephemeral_messages_default.png
deleted file mode 100644
index a9acdf1f3..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ephemeral_messages_default.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/file_audio_default.png b/app/src/main/res/drawable-xhdpi/file_audio_default.png
deleted file mode 100644
index 7cdd59372..000000000
Binary files a/app/src/main/res/drawable-xhdpi/file_audio_default.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/file_default.png b/app/src/main/res/drawable-xhdpi/file_default.png
deleted file mode 100644
index 086edeacc..000000000
Binary files a/app/src/main/res/drawable-xhdpi/file_default.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/file_pdf_default.png b/app/src/main/res/drawable-xhdpi/file_pdf_default.png
deleted file mode 100644
index eca17905f..000000000
Binary files a/app/src/main/res/drawable-xhdpi/file_pdf_default.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/file_picture_default.png b/app/src/main/res/drawable-xhdpi/file_picture_default.png
deleted file mode 100644
index 2bee7e7df..000000000
Binary files a/app/src/main/res/drawable-xhdpi/file_picture_default.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/file_video_default.png b/app/src/main/res/drawable-xhdpi/file_video_default.png
deleted file mode 100644
index f08f014f3..000000000
Binary files a/app/src/main/res/drawable-xhdpi/file_video_default.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/footer_chat.png b/app/src/main/res/drawable-xhdpi/footer_chat.png
deleted file mode 100644
index 08baaa4bc..000000000
Binary files a/app/src/main/res/drawable-xhdpi/footer_chat.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/footer_contacts.png b/app/src/main/res/drawable-xhdpi/footer_contacts.png
deleted file mode 100644
index fe35fecbf..000000000
Binary files a/app/src/main/res/drawable-xhdpi/footer_contacts.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/footer_dialer.png b/app/src/main/res/drawable-xhdpi/footer_dialer.png
deleted file mode 100644
index d76f053e3..000000000
Binary files a/app/src/main/res/drawable-xhdpi/footer_dialer.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/footer_history.png b/app/src/main/res/drawable-xhdpi/footer_history.png
deleted file mode 100644
index 96bfde0b6..000000000
Binary files a/app/src/main/res/drawable-xhdpi/footer_history.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/forward_message_default.png b/app/src/main/res/drawable-xhdpi/forward_message_default.png
deleted file mode 100644
index b51542ec8..000000000
Binary files a/app/src/main/res/drawable-xhdpi/forward_message_default.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/forwarded_message_default.png b/app/src/main/res/drawable-xhdpi/forwarded_message_default.png
deleted file mode 100644
index 55c5d617f..000000000
Binary files a/app/src/main/res/drawable-xhdpi/forwarded_message_default.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/fullscreen_default.png b/app/src/main/res/drawable-xhdpi/fullscreen_default.png
deleted file mode 100644
index afbb2de2e..000000000
Binary files a/app/src/main/res/drawable-xhdpi/fullscreen_default.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/history_all_default.png b/app/src/main/res/drawable-xhdpi/history_all_default.png
deleted file mode 100644
index 867e2cf70..000000000
Binary files a/app/src/main/res/drawable-xhdpi/history_all_default.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/history_missed_default.png b/app/src/main/res/drawable-xhdpi/history_missed_default.png
deleted file mode 100644
index 0ccad7b92..000000000
Binary files a/app/src/main/res/drawable-xhdpi/history_missed_default.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/info.png b/app/src/main/res/drawable-xhdpi/info.png
deleted file mode 100644
index 22ba01c96..000000000
Binary files a/app/src/main/res/drawable-xhdpi/info.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/linphone_app_name_logo.png b/app/src/main/res/drawable-xhdpi/linphone_app_name_logo.png
deleted file mode 100644
index bfef888d2..000000000
Binary files a/app/src/main/res/drawable-xhdpi/linphone_app_name_logo.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/linphone_logo.png b/app/src/main/res/drawable-xhdpi/linphone_logo.png
deleted file mode 100644
index 533a93450..000000000
Binary files a/app/src/main/res/drawable-xhdpi/linphone_logo.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/list_details_default.png b/app/src/main/res/drawable-xhdpi/list_details_default.png
deleted file mode 100644
index 756af521b..000000000
Binary files a/app/src/main/res/drawable-xhdpi/list_details_default.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/menu_about_default.png b/app/src/main/res/drawable-xhdpi/menu_about_default.png
deleted file mode 100644
index 37b24bbaa..000000000
Binary files a/app/src/main/res/drawable-xhdpi/menu_about_default.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/menu_add_contact.png b/app/src/main/res/drawable-xhdpi/menu_add_contact.png
deleted file mode 100644
index 3ac3f3574..000000000
Binary files a/app/src/main/res/drawable-xhdpi/menu_add_contact.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/menu_assistant_default.png b/app/src/main/res/drawable-xhdpi/menu_assistant_default.png
deleted file mode 100644
index 8b6955242..000000000
Binary files a/app/src/main/res/drawable-xhdpi/menu_assistant_default.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/menu_contact.png b/app/src/main/res/drawable-xhdpi/menu_contact.png
deleted file mode 100644
index 8bbe253df..000000000
Binary files a/app/src/main/res/drawable-xhdpi/menu_contact.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/menu_copy_text_default.png b/app/src/main/res/drawable-xhdpi/menu_copy_text_default.png
deleted file mode 100644
index ac945fb5e..000000000
Binary files a/app/src/main/res/drawable-xhdpi/menu_copy_text_default.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/menu_default.png b/app/src/main/res/drawable-xhdpi/menu_default.png
deleted file mode 100644
index d203ff475..000000000
Binary files a/app/src/main/res/drawable-xhdpi/menu_default.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/menu_delete_default.png b/app/src/main/res/drawable-xhdpi/menu_delete_default.png
deleted file mode 100644
index 65d612aae..000000000
Binary files a/app/src/main/res/drawable-xhdpi/menu_delete_default.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/menu_ephemeral_messages_default.png b/app/src/main/res/drawable-xhdpi/menu_ephemeral_messages_default.png
deleted file mode 100644
index bbe180afd..000000000
Binary files a/app/src/main/res/drawable-xhdpi/menu_ephemeral_messages_default.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/menu_forward_default.png b/app/src/main/res/drawable-xhdpi/menu_forward_default.png
deleted file mode 100644
index 9a5b9d85f..000000000
Binary files a/app/src/main/res/drawable-xhdpi/menu_forward_default.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/menu_group_info_default.png b/app/src/main/res/drawable-xhdpi/menu_group_info_default.png
deleted file mode 100644
index 249d74a56..000000000
Binary files a/app/src/main/res/drawable-xhdpi/menu_group_info_default.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/menu_meeting_schedule.png b/app/src/main/res/drawable-xhdpi/menu_meeting_schedule.png
deleted file mode 100644
index 64ba07792..000000000
Binary files a/app/src/main/res/drawable-xhdpi/menu_meeting_schedule.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/menu_notifications_off.png b/app/src/main/res/drawable-xhdpi/menu_notifications_off.png
deleted file mode 100644
index 556e26a8b..000000000
Binary files a/app/src/main/res/drawable-xhdpi/menu_notifications_off.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/menu_notifications_on.png b/app/src/main/res/drawable-xhdpi/menu_notifications_on.png
deleted file mode 100644
index d9fa816ad..000000000
Binary files a/app/src/main/res/drawable-xhdpi/menu_notifications_on.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/menu_options_default.png b/app/src/main/res/drawable-xhdpi/menu_options_default.png
deleted file mode 100644
index 3a1c7800f..000000000
Binary files a/app/src/main/res/drawable-xhdpi/menu_options_default.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/menu_recordings_default.png b/app/src/main/res/drawable-xhdpi/menu_recordings_default.png
deleted file mode 100644
index 3bef81d13..000000000
Binary files a/app/src/main/res/drawable-xhdpi/menu_recordings_default.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/menu_reply_default.png b/app/src/main/res/drawable-xhdpi/menu_reply_default.png
deleted file mode 100644
index 7f898c47e..000000000
Binary files a/app/src/main/res/drawable-xhdpi/menu_reply_default.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/menu_security_default.png b/app/src/main/res/drawable-xhdpi/menu_security_default.png
deleted file mode 100644
index 477de590a..000000000
Binary files a/app/src/main/res/drawable-xhdpi/menu_security_default.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/next_default.png b/app/src/main/res/drawable-xhdpi/next_default.png
deleted file mode 100644
index 3cea216fb..000000000
Binary files a/app/src/main/res/drawable-xhdpi/next_default.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/numpad_0.png b/app/src/main/res/drawable-xhdpi/numpad_0.png
deleted file mode 100644
index 9e1e99f0e..000000000
Binary files a/app/src/main/res/drawable-xhdpi/numpad_0.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/numpad_1.png b/app/src/main/res/drawable-xhdpi/numpad_1.png
deleted file mode 100644
index 8a0e0ec82..000000000
Binary files a/app/src/main/res/drawable-xhdpi/numpad_1.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/numpad_2.png b/app/src/main/res/drawable-xhdpi/numpad_2.png
deleted file mode 100644
index 4d5e7a30a..000000000
Binary files a/app/src/main/res/drawable-xhdpi/numpad_2.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/numpad_3.png b/app/src/main/res/drawable-xhdpi/numpad_3.png
deleted file mode 100644
index 0c9976674..000000000
Binary files a/app/src/main/res/drawable-xhdpi/numpad_3.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/numpad_4.png b/app/src/main/res/drawable-xhdpi/numpad_4.png
deleted file mode 100644
index ac4f7811a..000000000
Binary files a/app/src/main/res/drawable-xhdpi/numpad_4.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/numpad_5.png b/app/src/main/res/drawable-xhdpi/numpad_5.png
deleted file mode 100644
index 1edd6d68c..000000000
Binary files a/app/src/main/res/drawable-xhdpi/numpad_5.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/numpad_6.png b/app/src/main/res/drawable-xhdpi/numpad_6.png
deleted file mode 100644
index 83f40dc0b..000000000
Binary files a/app/src/main/res/drawable-xhdpi/numpad_6.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/numpad_7.png b/app/src/main/res/drawable-xhdpi/numpad_7.png
deleted file mode 100644
index 0cab6cb80..000000000
Binary files a/app/src/main/res/drawable-xhdpi/numpad_7.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/numpad_8.png b/app/src/main/res/drawable-xhdpi/numpad_8.png
deleted file mode 100644
index 1e1aac033..000000000
Binary files a/app/src/main/res/drawable-xhdpi/numpad_8.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/numpad_9.png b/app/src/main/res/drawable-xhdpi/numpad_9.png
deleted file mode 100644
index db29328f2..000000000
Binary files a/app/src/main/res/drawable-xhdpi/numpad_9.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/numpad_hash.png b/app/src/main/res/drawable-xhdpi/numpad_hash.png
deleted file mode 100644
index 48ca9dae2..000000000
Binary files a/app/src/main/res/drawable-xhdpi/numpad_hash.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/numpad_star.png b/app/src/main/res/drawable-xhdpi/numpad_star.png
deleted file mode 100644
index 5eda5fb98..000000000
Binary files a/app/src/main/res/drawable-xhdpi/numpad_star.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/quit_default.png b/app/src/main/res/drawable-xhdpi/quit_default.png
deleted file mode 100644
index a8896a98a..000000000
Binary files a/app/src/main/res/drawable-xhdpi/quit_default.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/record_audio_message_default.png b/app/src/main/res/drawable-xhdpi/record_audio_message_default.png
deleted file mode 100644
index 715ff2bb1..000000000
Binary files a/app/src/main/res/drawable-xhdpi/record_audio_message_default.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/record_pause_default.png b/app/src/main/res/drawable-xhdpi/record_pause_default.png
deleted file mode 100644
index 15e1af51f..000000000
Binary files a/app/src/main/res/drawable-xhdpi/record_pause_default.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/record_play_default.png b/app/src/main/res/drawable-xhdpi/record_play_default.png
deleted file mode 100644
index 134279fc0..000000000
Binary files a/app/src/main/res/drawable-xhdpi/record_play_default.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/record_stop_default.png b/app/src/main/res/drawable-xhdpi/record_stop_default.png
deleted file mode 100644
index 14f700c3d..000000000
Binary files a/app/src/main/res/drawable-xhdpi/record_stop_default.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/replied_message_default.png b/app/src/main/res/drawable-xhdpi/replied_message_default.png
deleted file mode 100644
index de2fe7649..000000000
Binary files a/app/src/main/res/drawable-xhdpi/replied_message_default.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/resizable_assistant_button_default.9.png b/app/src/main/res/drawable-xhdpi/resizable_assistant_button_default.9.png
deleted file mode 100644
index cc63e9cdd..000000000
Binary files a/app/src/main/res/drawable-xhdpi/resizable_assistant_button_default.9.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/resizable_assistant_button_disabled.9.png b/app/src/main/res/drawable-xhdpi/resizable_assistant_button_disabled.9.png
deleted file mode 100644
index df69f9217..000000000
Binary files a/app/src/main/res/drawable-xhdpi/resizable_assistant_button_disabled.9.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/resizable_assistant_button_over.9.png b/app/src/main/res/drawable-xhdpi/resizable_assistant_button_over.9.png
deleted file mode 100644
index d8c4b0ee2..000000000
Binary files a/app/src/main/res/drawable-xhdpi/resizable_assistant_button_over.9.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/resizable_text_field.9.png b/app/src/main/res/drawable-xhdpi/resizable_text_field.9.png
deleted file mode 100644
index 51ad75cf4..000000000
Binary files a/app/src/main/res/drawable-xhdpi/resizable_text_field.9.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/scroll_to_bottom_default.png b/app/src/main/res/drawable-xhdpi/scroll_to_bottom_default.png
deleted file mode 100644
index 3be410ae1..000000000
Binary files a/app/src/main/res/drawable-xhdpi/scroll_to_bottom_default.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/search.png b/app/src/main/res/drawable-xhdpi/search.png
deleted file mode 100644
index c487f5a1c..000000000
Binary files a/app/src/main/res/drawable-xhdpi/search.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/security_1_indicator.png b/app/src/main/res/drawable-xhdpi/security_1_indicator.png
deleted file mode 100644
index 0aa4a2e04..000000000
Binary files a/app/src/main/res/drawable-xhdpi/security_1_indicator.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/security_2_indicator.png b/app/src/main/res/drawable-xhdpi/security_2_indicator.png
deleted file mode 100644
index 910e3d124..000000000
Binary files a/app/src/main/res/drawable-xhdpi/security_2_indicator.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/security_alert_indicator.png b/app/src/main/res/drawable-xhdpi/security_alert_indicator.png
deleted file mode 100644
index 54a340667..000000000
Binary files a/app/src/main/res/drawable-xhdpi/security_alert_indicator.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/security_ko.png b/app/src/main/res/drawable-xhdpi/security_ko.png
deleted file mode 100644
index 9bd476a71..000000000
Binary files a/app/src/main/res/drawable-xhdpi/security_ko.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/security_ok.png b/app/src/main/res/drawable-xhdpi/security_ok.png
deleted file mode 100644
index 9ca4a19f2..000000000
Binary files a/app/src/main/res/drawable-xhdpi/security_ok.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/security_pending.png b/app/src/main/res/drawable-xhdpi/security_pending.png
deleted file mode 100644
index aa7081af8..000000000
Binary files a/app/src/main/res/drawable-xhdpi/security_pending.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/security_post_quantum.png b/app/src/main/res/drawable-xhdpi/security_post_quantum.png
deleted file mode 100644
index 9be1c4cdb..000000000
Binary files a/app/src/main/res/drawable-xhdpi/security_post_quantum.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/security_toggle_icon_green.png b/app/src/main/res/drawable-xhdpi/security_toggle_icon_green.png
deleted file mode 100644
index 368e30c79..000000000
Binary files a/app/src/main/res/drawable-xhdpi/security_toggle_icon_green.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/security_toggle_icon_grey.png b/app/src/main/res/drawable-xhdpi/security_toggle_icon_grey.png
deleted file mode 100644
index c77235794..000000000
Binary files a/app/src/main/res/drawable-xhdpi/security_toggle_icon_grey.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/select_all_default.png b/app/src/main/res/drawable-xhdpi/select_all_default.png
deleted file mode 100644
index cefe12239..000000000
Binary files a/app/src/main/res/drawable-xhdpi/select_all_default.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/settings_advanced_default.png b/app/src/main/res/drawable-xhdpi/settings_advanced_default.png
deleted file mode 100644
index 099a7770e..000000000
Binary files a/app/src/main/res/drawable-xhdpi/settings_advanced_default.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/settings_audio_default.png b/app/src/main/res/drawable-xhdpi/settings_audio_default.png
deleted file mode 100644
index 4072d173f..000000000
Binary files a/app/src/main/res/drawable-xhdpi/settings_audio_default.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/settings_call_default.png b/app/src/main/res/drawable-xhdpi/settings_call_default.png
deleted file mode 100644
index 951452780..000000000
Binary files a/app/src/main/res/drawable-xhdpi/settings_call_default.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/settings_chat_default.png b/app/src/main/res/drawable-xhdpi/settings_chat_default.png
deleted file mode 100644
index 8a3f155ee..000000000
Binary files a/app/src/main/res/drawable-xhdpi/settings_chat_default.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/settings_conferences_default.png b/app/src/main/res/drawable-xhdpi/settings_conferences_default.png
deleted file mode 100644
index 97a08dba0..000000000
Binary files a/app/src/main/res/drawable-xhdpi/settings_conferences_default.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/settings_contacts_default.png b/app/src/main/res/drawable-xhdpi/settings_contacts_default.png
deleted file mode 100644
index 3f034f8e3..000000000
Binary files a/app/src/main/res/drawable-xhdpi/settings_contacts_default.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/settings_network_default.png b/app/src/main/res/drawable-xhdpi/settings_network_default.png
deleted file mode 100644
index dbafc78d7..000000000
Binary files a/app/src/main/res/drawable-xhdpi/settings_network_default.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/settings_video_default.png b/app/src/main/res/drawable-xhdpi/settings_video_default.png
deleted file mode 100644
index 876270d33..000000000
Binary files a/app/src/main/res/drawable-xhdpi/settings_video_default.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/splashscreen_branding.png b/app/src/main/res/drawable-xhdpi/splashscreen_branding.png
deleted file mode 100644
index 99ec7945b..000000000
Binary files a/app/src/main/res/drawable-xhdpi/splashscreen_branding.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/topbar_call_notification.png b/app/src/main/res/drawable-xhdpi/topbar_call_notification.png
deleted file mode 100644
index eedae47f2..000000000
Binary files a/app/src/main/res/drawable-xhdpi/topbar_call_notification.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/topbar_call_paused_notification.png b/app/src/main/res/drawable-xhdpi/topbar_call_paused_notification.png
deleted file mode 100644
index dc53b1382..000000000
Binary files a/app/src/main/res/drawable-xhdpi/topbar_call_paused_notification.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/topbar_chat_notification.png b/app/src/main/res/drawable-xhdpi/topbar_chat_notification.png
deleted file mode 100644
index b21cc706c..000000000
Binary files a/app/src/main/res/drawable-xhdpi/topbar_chat_notification.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/topbar_missed_call_notification.png b/app/src/main/res/drawable-xhdpi/topbar_missed_call_notification.png
deleted file mode 100644
index da9fbf0d4..000000000
Binary files a/app/src/main/res/drawable-xhdpi/topbar_missed_call_notification.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/topbar_service_notification.png b/app/src/main/res/drawable-xhdpi/topbar_service_notification.png
deleted file mode 100644
index 8e3d1a11f..000000000
Binary files a/app/src/main/res/drawable-xhdpi/topbar_service_notification.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/topbar_videocall_notification.png b/app/src/main/res/drawable-xhdpi/topbar_videocall_notification.png
deleted file mode 100644
index ca72e9d31..000000000
Binary files a/app/src/main/res/drawable-xhdpi/topbar_videocall_notification.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/valid_default.png b/app/src/main/res/drawable-xhdpi/valid_default.png
deleted file mode 100644
index 52bc36535..000000000
Binary files a/app/src/main/res/drawable-xhdpi/valid_default.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/voicemail.png b/app/src/main/res/drawable-xhdpi/voicemail.png
deleted file mode 100644
index 63d880993..000000000
Binary files a/app/src/main/res/drawable-xhdpi/voicemail.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/voip_audio_routes.png b/app/src/main/res/drawable-xhdpi/voip_audio_routes.png
deleted file mode 100644
index fae4e84e3..000000000
Binary files a/app/src/main/res/drawable-xhdpi/voip_audio_routes.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/voip_bluetooth.png b/app/src/main/res/drawable-xhdpi/voip_bluetooth.png
deleted file mode 100644
index 3010fb418..000000000
Binary files a/app/src/main/res/drawable-xhdpi/voip_bluetooth.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/voip_call.png b/app/src/main/res/drawable-xhdpi/voip_call.png
deleted file mode 100644
index 1a95c052e..000000000
Binary files a/app/src/main/res/drawable-xhdpi/voip_call.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/voip_call_add.png b/app/src/main/res/drawable-xhdpi/voip_call_add.png
deleted file mode 100644
index 8237f3305..000000000
Binary files a/app/src/main/res/drawable-xhdpi/voip_call_add.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/voip_call_chat.png b/app/src/main/res/drawable-xhdpi/voip_call_chat.png
deleted file mode 100644
index be4a138de..000000000
Binary files a/app/src/main/res/drawable-xhdpi/voip_call_chat.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/voip_call_forward.png b/app/src/main/res/drawable-xhdpi/voip_call_forward.png
deleted file mode 100644
index cc61de482..000000000
Binary files a/app/src/main/res/drawable-xhdpi/voip_call_forward.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/voip_call_header_active.png b/app/src/main/res/drawable-xhdpi/voip_call_header_active.png
deleted file mode 100644
index 3ef0106bc..000000000
Binary files a/app/src/main/res/drawable-xhdpi/voip_call_header_active.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/voip_call_header_incoming.png b/app/src/main/res/drawable-xhdpi/voip_call_header_incoming.png
deleted file mode 100644
index 7a8d458ad..000000000
Binary files a/app/src/main/res/drawable-xhdpi/voip_call_header_incoming.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/voip_call_header_outgoing.png b/app/src/main/res/drawable-xhdpi/voip_call_header_outgoing.png
deleted file mode 100644
index 474abe754..000000000
Binary files a/app/src/main/res/drawable-xhdpi/voip_call_header_outgoing.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/voip_call_header_paused.png b/app/src/main/res/drawable-xhdpi/voip_call_header_paused.png
deleted file mode 100644
index fdcfaf5d2..000000000
Binary files a/app/src/main/res/drawable-xhdpi/voip_call_header_paused.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/voip_call_list_menu.png b/app/src/main/res/drawable-xhdpi/voip_call_list_menu.png
deleted file mode 100644
index b4e2ff3bf..000000000
Binary files a/app/src/main/res/drawable-xhdpi/voip_call_list_menu.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/voip_call_more.png b/app/src/main/res/drawable-xhdpi/voip_call_more.png
deleted file mode 100644
index 73bb13b36..000000000
Binary files a/app/src/main/res/drawable-xhdpi/voip_call_more.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/voip_call_numpad.png b/app/src/main/res/drawable-xhdpi/voip_call_numpad.png
deleted file mode 100644
index f6e562387..000000000
Binary files a/app/src/main/res/drawable-xhdpi/voip_call_numpad.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/voip_call_participants.png b/app/src/main/res/drawable-xhdpi/voip_call_participants.png
deleted file mode 100644
index b2b766b14..000000000
Binary files a/app/src/main/res/drawable-xhdpi/voip_call_participants.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/voip_call_record.png b/app/src/main/res/drawable-xhdpi/voip_call_record.png
deleted file mode 100644
index 9c392dc47..000000000
Binary files a/app/src/main/res/drawable-xhdpi/voip_call_record.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/voip_call_stats.png b/app/src/main/res/drawable-xhdpi/voip_call_stats.png
deleted file mode 100644
index 018f605f6..000000000
Binary files a/app/src/main/res/drawable-xhdpi/voip_call_stats.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/voip_calls_list.png b/app/src/main/res/drawable-xhdpi/voip_calls_list.png
deleted file mode 100644
index a3d69b84e..000000000
Binary files a/app/src/main/res/drawable-xhdpi/voip_calls_list.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/voip_camera_off.png b/app/src/main/res/drawable-xhdpi/voip_camera_off.png
deleted file mode 100644
index dd41c338b..000000000
Binary files a/app/src/main/res/drawable-xhdpi/voip_camera_off.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/voip_camera_on.png b/app/src/main/res/drawable-xhdpi/voip_camera_on.png
deleted file mode 100644
index 7109c577d..000000000
Binary files a/app/src/main/res/drawable-xhdpi/voip_camera_on.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/voip_cancel.png b/app/src/main/res/drawable-xhdpi/voip_cancel.png
deleted file mode 100644
index 493b35e79..000000000
Binary files a/app/src/main/res/drawable-xhdpi/voip_cancel.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/voip_change_camera.png b/app/src/main/res/drawable-xhdpi/voip_change_camera.png
deleted file mode 100644
index d6dc15cb8..000000000
Binary files a/app/src/main/res/drawable-xhdpi/voip_change_camera.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/voip_chat_rooms_list.png b/app/src/main/res/drawable-xhdpi/voip_chat_rooms_list.png
deleted file mode 100644
index edf722c7e..000000000
Binary files a/app/src/main/res/drawable-xhdpi/voip_chat_rooms_list.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/voip_conference.png b/app/src/main/res/drawable-xhdpi/voip_conference.png
deleted file mode 100644
index a2bbc39e6..000000000
Binary files a/app/src/main/res/drawable-xhdpi/voip_conference.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/voip_conference_active_speaker.png b/app/src/main/res/drawable-xhdpi/voip_conference_active_speaker.png
deleted file mode 100644
index 18f21106a..000000000
Binary files a/app/src/main/res/drawable-xhdpi/voip_conference_active_speaker.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/voip_conference_audio_only.png b/app/src/main/res/drawable-xhdpi/voip_conference_audio_only.png
deleted file mode 100644
index fd57a3f27..000000000
Binary files a/app/src/main/res/drawable-xhdpi/voip_conference_audio_only.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/voip_conference_mosaic.png b/app/src/main/res/drawable-xhdpi/voip_conference_mosaic.png
deleted file mode 100644
index 8fa0137b7..000000000
Binary files a/app/src/main/res/drawable-xhdpi/voip_conference_mosaic.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/voip_conference_paused_big.png b/app/src/main/res/drawable-xhdpi/voip_conference_paused_big.png
deleted file mode 100644
index 745f17220..000000000
Binary files a/app/src/main/res/drawable-xhdpi/voip_conference_paused_big.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/voip_conference_play_big.png b/app/src/main/res/drawable-xhdpi/voip_conference_play_big.png
deleted file mode 100644
index 303d05faa..000000000
Binary files a/app/src/main/res/drawable-xhdpi/voip_conference_play_big.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/voip_copy.png b/app/src/main/res/drawable-xhdpi/voip_copy.png
deleted file mode 100644
index 43639693e..000000000
Binary files a/app/src/main/res/drawable-xhdpi/voip_copy.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/voip_delete.png b/app/src/main/res/drawable-xhdpi/voip_delete.png
deleted file mode 100644
index 3022d156d..000000000
Binary files a/app/src/main/res/drawable-xhdpi/voip_delete.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/voip_dropdown.png b/app/src/main/res/drawable-xhdpi/voip_dropdown.png
deleted file mode 100644
index d9fccac91..000000000
Binary files a/app/src/main/res/drawable-xhdpi/voip_dropdown.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/voip_earpiece.png b/app/src/main/res/drawable-xhdpi/voip_earpiece.png
deleted file mode 100644
index e95a30801..000000000
Binary files a/app/src/main/res/drawable-xhdpi/voip_earpiece.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/voip_edit.png b/app/src/main/res/drawable-xhdpi/voip_edit.png
deleted file mode 100644
index c24930212..000000000
Binary files a/app/src/main/res/drawable-xhdpi/voip_edit.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/voip_export.png b/app/src/main/res/drawable-xhdpi/voip_export.png
deleted file mode 100644
index 3fdfa078a..000000000
Binary files a/app/src/main/res/drawable-xhdpi/voip_export.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/voip_hangup.png b/app/src/main/res/drawable-xhdpi/voip_hangup.png
deleted file mode 100644
index a2ceab5d8..000000000
Binary files a/app/src/main/res/drawable-xhdpi/voip_hangup.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/voip_info.png b/app/src/main/res/drawable-xhdpi/voip_info.png
deleted file mode 100644
index ae8dd86f8..000000000
Binary files a/app/src/main/res/drawable-xhdpi/voip_info.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/voip_mandatory.png b/app/src/main/res/drawable-xhdpi/voip_mandatory.png
deleted file mode 100644
index 4be37f7e4..000000000
Binary files a/app/src/main/res/drawable-xhdpi/voip_mandatory.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/voip_meeting_schedule.png b/app/src/main/res/drawable-xhdpi/voip_meeting_schedule.png
deleted file mode 100644
index 168e3460f..000000000
Binary files a/app/src/main/res/drawable-xhdpi/voip_meeting_schedule.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/voip_menu_more.png b/app/src/main/res/drawable-xhdpi/voip_menu_more.png
deleted file mode 100644
index 64abbbba8..000000000
Binary files a/app/src/main/res/drawable-xhdpi/voip_menu_more.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/voip_merge_calls.png b/app/src/main/res/drawable-xhdpi/voip_merge_calls.png
deleted file mode 100644
index 6c4da5988..000000000
Binary files a/app/src/main/res/drawable-xhdpi/voip_merge_calls.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/voip_micro_off.png b/app/src/main/res/drawable-xhdpi/voip_micro_off.png
deleted file mode 100644
index 57569b4f2..000000000
Binary files a/app/src/main/res/drawable-xhdpi/voip_micro_off.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/voip_micro_on.png b/app/src/main/res/drawable-xhdpi/voip_micro_on.png
deleted file mode 100644
index 6552d35d5..000000000
Binary files a/app/src/main/res/drawable-xhdpi/voip_micro_on.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/voip_multiple_contacts_avatar.png b/app/src/main/res/drawable-xhdpi/voip_multiple_contacts_avatar.png
deleted file mode 100644
index 5b0732545..000000000
Binary files a/app/src/main/res/drawable-xhdpi/voip_multiple_contacts_avatar.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/voip_multiple_contacts_avatar_alt.png b/app/src/main/res/drawable-xhdpi/voip_multiple_contacts_avatar_alt.png
deleted file mode 100644
index 983c1448d..000000000
Binary files a/app/src/main/res/drawable-xhdpi/voip_multiple_contacts_avatar_alt.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/voip_numpad_0.png b/app/src/main/res/drawable-xhdpi/voip_numpad_0.png
deleted file mode 100644
index 115bdb17d..000000000
Binary files a/app/src/main/res/drawable-xhdpi/voip_numpad_0.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/voip_numpad_1.png b/app/src/main/res/drawable-xhdpi/voip_numpad_1.png
deleted file mode 100644
index 4d8b7f5cc..000000000
Binary files a/app/src/main/res/drawable-xhdpi/voip_numpad_1.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/voip_numpad_2.png b/app/src/main/res/drawable-xhdpi/voip_numpad_2.png
deleted file mode 100644
index 6b561c468..000000000
Binary files a/app/src/main/res/drawable-xhdpi/voip_numpad_2.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/voip_numpad_3.png b/app/src/main/res/drawable-xhdpi/voip_numpad_3.png
deleted file mode 100644
index 386715586..000000000
Binary files a/app/src/main/res/drawable-xhdpi/voip_numpad_3.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/voip_numpad_4.png b/app/src/main/res/drawable-xhdpi/voip_numpad_4.png
deleted file mode 100644
index e3dfdcc51..000000000
Binary files a/app/src/main/res/drawable-xhdpi/voip_numpad_4.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/voip_numpad_5.png b/app/src/main/res/drawable-xhdpi/voip_numpad_5.png
deleted file mode 100644
index a18af28e5..000000000
Binary files a/app/src/main/res/drawable-xhdpi/voip_numpad_5.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/voip_numpad_6.png b/app/src/main/res/drawable-xhdpi/voip_numpad_6.png
deleted file mode 100644
index 79279cb99..000000000
Binary files a/app/src/main/res/drawable-xhdpi/voip_numpad_6.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/voip_numpad_7.png b/app/src/main/res/drawable-xhdpi/voip_numpad_7.png
deleted file mode 100644
index c68656fd3..000000000
Binary files a/app/src/main/res/drawable-xhdpi/voip_numpad_7.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/voip_numpad_8.png b/app/src/main/res/drawable-xhdpi/voip_numpad_8.png
deleted file mode 100644
index 8d84c96ba..000000000
Binary files a/app/src/main/res/drawable-xhdpi/voip_numpad_8.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/voip_numpad_9.png b/app/src/main/res/drawable-xhdpi/voip_numpad_9.png
deleted file mode 100644
index af3e0e0bf..000000000
Binary files a/app/src/main/res/drawable-xhdpi/voip_numpad_9.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/voip_numpad_hash.png b/app/src/main/res/drawable-xhdpi/voip_numpad_hash.png
deleted file mode 100644
index 790e7d12e..000000000
Binary files a/app/src/main/res/drawable-xhdpi/voip_numpad_hash.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/voip_numpad_star.png b/app/src/main/res/drawable-xhdpi/voip_numpad_star.png
deleted file mode 100644
index 5a2649de4..000000000
Binary files a/app/src/main/res/drawable-xhdpi/voip_numpad_star.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/voip_pause.png b/app/src/main/res/drawable-xhdpi/voip_pause.png
deleted file mode 100644
index e888da937..000000000
Binary files a/app/src/main/res/drawable-xhdpi/voip_pause.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/voip_remote_recording.png b/app/src/main/res/drawable-xhdpi/voip_remote_recording.png
deleted file mode 100644
index 3e4e94009..000000000
Binary files a/app/src/main/res/drawable-xhdpi/voip_remote_recording.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/voip_screenshot.png b/app/src/main/res/drawable-xhdpi/voip_screenshot.png
deleted file mode 100644
index e1880264a..000000000
Binary files a/app/src/main/res/drawable-xhdpi/voip_screenshot.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/voip_single_contact_avatar.png b/app/src/main/res/drawable-xhdpi/voip_single_contact_avatar.png
deleted file mode 100644
index e8806b0e4..000000000
Binary files a/app/src/main/res/drawable-xhdpi/voip_single_contact_avatar.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/voip_single_contact_avatar_alt.png b/app/src/main/res/drawable-xhdpi/voip_single_contact_avatar_alt.png
deleted file mode 100644
index 58a69d43b..000000000
Binary files a/app/src/main/res/drawable-xhdpi/voip_single_contact_avatar_alt.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/voip_speaker_off.png b/app/src/main/res/drawable-xhdpi/voip_speaker_off.png
deleted file mode 100644
index c018c9899..000000000
Binary files a/app/src/main/res/drawable-xhdpi/voip_speaker_off.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/voip_speaker_on.png b/app/src/main/res/drawable-xhdpi/voip_speaker_on.png
deleted file mode 100644
index 07f13c9b6..000000000
Binary files a/app/src/main/res/drawable-xhdpi/voip_speaker_on.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/voip_spinner.png b/app/src/main/res/drawable-xhdpi/voip_spinner.png
deleted file mode 100644
index 8238de56b..000000000
Binary files a/app/src/main/res/drawable-xhdpi/voip_spinner.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/topbar_call_notification.png b/app/src/main/res/drawable-xxhdpi/topbar_call_notification.png
deleted file mode 100644
index ada072d3f..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/topbar_call_notification.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/topbar_call_paused_notification.png b/app/src/main/res/drawable-xxhdpi/topbar_call_paused_notification.png
deleted file mode 100644
index ef886c53c..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/topbar_call_paused_notification.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/topbar_chat_notification.png b/app/src/main/res/drawable-xxhdpi/topbar_chat_notification.png
deleted file mode 100644
index c00ce5b01..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/topbar_chat_notification.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/topbar_missed_call_notification.png b/app/src/main/res/drawable-xxhdpi/topbar_missed_call_notification.png
deleted file mode 100644
index c75fae050..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/topbar_missed_call_notification.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/topbar_service_notification.png b/app/src/main/res/drawable-xxhdpi/topbar_service_notification.png
deleted file mode 100644
index 89ab907d9..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/topbar_service_notification.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/topbar_videocall_notification.png b/app/src/main/res/drawable-xxhdpi/topbar_videocall_notification.png
deleted file mode 100644
index 1e5a1abb8..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/topbar_videocall_notification.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/topbar_call_notification.png b/app/src/main/res/drawable-xxxhdpi/topbar_call_notification.png
deleted file mode 100644
index 130558d24..000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/topbar_call_notification.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/topbar_call_paused_notification.png b/app/src/main/res/drawable-xxxhdpi/topbar_call_paused_notification.png
deleted file mode 100644
index 16c60ecdd..000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/topbar_call_paused_notification.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/topbar_chat_notification.png b/app/src/main/res/drawable-xxxhdpi/topbar_chat_notification.png
deleted file mode 100644
index 144d25d0c..000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/topbar_chat_notification.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/topbar_missed_call_notification.png b/app/src/main/res/drawable-xxxhdpi/topbar_missed_call_notification.png
deleted file mode 100644
index 1eb46e47b..000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/topbar_missed_call_notification.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/topbar_service_notification.png b/app/src/main/res/drawable-xxxhdpi/topbar_service_notification.png
deleted file mode 100644
index bb12c773d..000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/topbar_service_notification.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/topbar_videocall_notification.png b/app/src/main/res/drawable-xxxhdpi/topbar_videocall_notification.png
deleted file mode 100644
index 23184c99e..000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/topbar_videocall_notification.png and /dev/null differ
diff --git a/app/src/main/res/drawable/assistant_button.xml b/app/src/main/res/drawable/assistant_button.xml
deleted file mode 100644
index 6dd7bfb0d..000000000
--- a/app/src/main/res/drawable/assistant_button.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:state_pressed="true"
-		  android:drawable="@drawable/resizable_assistant_button_over" />
-	<item android:state_enabled="false"
-		  android:drawable="@drawable/resizable_assistant_button_disabled" />
-	<item
-		android:drawable="@drawable/resizable_assistant_button_default" />
-</selector>
-
diff --git a/app/src/main/res/drawable/assistant_button_text_color.xml b/app/src/main/res/drawable/assistant_button_text_color.xml
deleted file mode 100644
index 1797de9ce..000000000
--- a/app/src/main/res/drawable/assistant_button_text_color.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:state_enabled="true"
-		android:color="@color/black_color"/>
-	<item
-		android:color="@color/light_grey_color"/>
-</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/avatar_border.xml b/app/src/main/res/drawable/avatar_border.xml
deleted file mode 100644
index 045c7bfcb..000000000
--- a/app/src/main/res/drawable/avatar_border.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval">
-    <stroke android:width="5dp" android:color="?attr/accentColor"/>
-    <size android:width="200dp" android:height="200dp" />
-</shape>
diff --git a/app/src/main/res/drawable/back.xml b/app/src/main/res/drawable/back.xml
deleted file mode 100644
index a298e171c..000000000
--- a/app/src/main/res/drawable/back.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true">
-        <bitmap android:src="@drawable/back_default"
-            android:tint="?attr/drawableTintOverColor"/>
-    </item>
-    <item android:state_enabled="false">
-        <bitmap android:src="@drawable/back_default"
-            android:tint="?attr/drawableTintDisabledColor"/>
-    </item>
-    <item>
-        <bitmap android:src="@drawable/back_default"
-            android:tint="?attr/drawableTintColor"/>
-    </item>
-</selector>
diff --git a/app/src/main/res/drawable/background_round_primary_color.xml b/app/src/main/res/drawable/background_round_primary_color.xml
deleted file mode 100644
index 0907fcd1e..000000000
--- a/app/src/main/res/drawable/background_round_primary_color.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval">
-    <solid android:color="@color/primary_color"/>
-    <size android:width="35dp" android:height="35dp" />
-</shape>
diff --git a/app/src/main/res/drawable/background_round_secondary_color.xml b/app/src/main/res/drawable/background_round_secondary_color.xml
deleted file mode 100644
index 4b8a04dad..000000000
--- a/app/src/main/res/drawable/background_round_secondary_color.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval">
-    <solid android:color="@color/dark_grey_color"/>
-    <size android:width="35dp" android:height="35dp" />
-</shape>
diff --git a/app/src/main/res/drawable/backspace.xml b/app/src/main/res/drawable/backspace.xml
deleted file mode 100644
index 70117222f..000000000
--- a/app/src/main/res/drawable/backspace.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true">
-        <bitmap android:src="@drawable/backspace_default"
-            android:tint="?attr/drawableTintOverColor"/>
-    </item>
-    <item android:state_enabled="false">
-        <bitmap android:src="@drawable/backspace_default"
-            android:tint="?attr/drawableTintDisabledColor"/>
-    </item>
-    <item>
-        <bitmap android:src="@drawable/backspace_default"
-            android:tint="?attr/drawableTintColor"/>
-    </item>
-</selector>
diff --git a/app/src/main/res/drawable/button_background.xml b/app/src/main/res/drawable/button_background.xml
deleted file mode 100644
index 1b672fdfc..000000000
--- a/app/src/main/res/drawable/button_background.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true"
-        android:drawable="@drawable/shape_button_pressed_background" />
-    <item android:state_enabled="false"
-        android:drawable="@drawable/shape_button_disabled_background" />
-    <item
-        android:drawable="@drawable/shape_button_background" />
-</selector>
diff --git a/app/src/main/res/drawable/button_background_dark.xml b/app/src/main/res/drawable/button_background_dark.xml
deleted file mode 100644
index 8f13c7bd7..000000000
--- a/app/src/main/res/drawable/button_background_dark.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:state_pressed="true"
-		android:drawable="@color/grey_color" />
-	<item android:state_enabled="false"
-		android:drawable="@color/voip_dark_color" />
-	<item android:state_selected="true"
-		android:drawable="@color/voip_dark_color" />
-	<item
-		android:drawable="@color/voip_dark_color" />
-</selector>
diff --git a/app/src/main/res/drawable/button_background_light.xml b/app/src/main/res/drawable/button_background_light.xml
deleted file mode 100644
index c0df18fdd..000000000
--- a/app/src/main/res/drawable/button_background_light.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:state_pressed="true"
-		android:drawable="@color/light_grey_color" />
-	<item android:state_enabled="false"
-		android:drawable="@color/toolbar_color" />
-	<item android:state_selected="true"
-		android:drawable="@color/toolbar_color" />
-	<item
-		android:drawable="@color/toolbar_color" />
-</selector>
diff --git a/app/src/main/res/drawable/button_background_reverse.xml b/app/src/main/res/drawable/button_background_reverse.xml
deleted file mode 100644
index 9b7432f25..000000000
--- a/app/src/main/res/drawable/button_background_reverse.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true"
-        android:drawable="@drawable/shape_button_background" />
-    <item android:state_enabled="false"
-        android:drawable="@drawable/shape_button_disabled_background" />
-    <item
-        android:drawable="@drawable/shape_button_pressed_background" />
-</selector>
diff --git a/app/src/main/res/drawable/button_call_answer_background.xml b/app/src/main/res/drawable/button_call_answer_background.xml
deleted file mode 100644
index e7f8c8abd..000000000
--- a/app/src/main/res/drawable/button_call_answer_background.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true"
-        android:drawable="@drawable/shape_call_answer_pressed_background" />
-    <item
-        android:drawable="@drawable/shape_call_answer_background" />
-</selector>
diff --git a/app/src/main/res/drawable/button_call_context_menu_background.xml b/app/src/main/res/drawable/button_call_context_menu_background.xml
deleted file mode 100644
index c20f7aa56..000000000
--- a/app/src/main/res/drawable/button_call_context_menu_background.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true"
-        android:drawable="@color/primary_color" />
-    <item
-        android:drawable="@color/voip_gray" />
-</selector>
diff --git a/app/src/main/res/drawable/button_call_numpad_background.xml b/app/src/main/res/drawable/button_call_numpad_background.xml
deleted file mode 100644
index b30990ebf..000000000
--- a/app/src/main/res/drawable/button_call_numpad_background.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true"
-        android:drawable="@drawable/shape_call_numpad_pressed_background" />
-    <item
-        android:drawable="@drawable/shape_call_numpad_background" />
-</selector>
diff --git a/app/src/main/res/drawable/button_call_recording_background.xml b/app/src/main/res/drawable/button_call_recording_background.xml
deleted file mode 100644
index 1f3680b7c..000000000
--- a/app/src/main/res/drawable/button_call_recording_background.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_selected="true"
-        android:drawable="@drawable/shape_call_recording_on_background" />
-    <item android:state_enabled="false"
-        android:drawable="@drawable/shape_toggle_disabled_background" />
-    <item
-        android:drawable="@drawable/shape_call_recording_off_background" />
-</selector>
diff --git a/app/src/main/res/drawable/button_call_terminate_background.xml b/app/src/main/res/drawable/button_call_terminate_background.xml
deleted file mode 100644
index f584585fe..000000000
--- a/app/src/main/res/drawable/button_call_terminate_background.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true"
-        android:drawable="@drawable/shape_call_terminate_pressed_background" />
-    <item
-        android:drawable="@drawable/shape_call_terminate_background" />
-</selector>
diff --git a/app/src/main/res/drawable/button_conference_info.xml b/app/src/main/res/drawable/button_conference_info.xml
deleted file mode 100644
index d60f4e6fa..000000000
--- a/app/src/main/res/drawable/button_conference_info.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_selected="true"
-        android:drawable="@drawable/icon_info_selected" />
-    <item android:state_enabled="false"
-        android:drawable="@drawable/icon_info" />
-    <item android:state_pressed="true"
-        android:drawable="@drawable/icon_info_selected" />
-    <item
-        android:drawable="@drawable/icon_info" />
-</selector>
diff --git a/app/src/main/res/drawable/button_green_background.xml b/app/src/main/res/drawable/button_green_background.xml
deleted file mode 100644
index 8d4cfbb68..000000000
--- a/app/src/main/res/drawable/button_green_background.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true"
-        android:drawable="@drawable/shape_rect_orange_button" />
-    <item android:state_enabled="false"
-        android:drawable="@drawable/shape_rect_gray_button" />
-    <item
-        android:drawable="@drawable/shape_rect_green_button" />
-</selector>
diff --git a/app/src/main/res/drawable/button_orange_background.xml b/app/src/main/res/drawable/button_orange_background.xml
deleted file mode 100644
index bff93f486..000000000
--- a/app/src/main/res/drawable/button_orange_background.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true"
-        android:drawable="@drawable/shape_rect_green_button" />
-    <item android:state_enabled="false"
-        android:drawable="@drawable/shape_rect_light_gray_button" />
-    <item
-        android:drawable="@drawable/shape_rect_orange_button" />
-</selector>
diff --git a/app/src/main/res/drawable/button_round_background.xml b/app/src/main/res/drawable/button_round_background.xml
deleted file mode 100644
index afc56ca3b..000000000
--- a/app/src/main/res/drawable/button_round_background.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_enabled="false"
-        android:drawable="@drawable/shape_round_button_disabled" />
-    <item android:state_pressed="true"
-        android:drawable="@drawable/shape_round_button_pressed" />
-    <item
-        android:drawable="@drawable/shape_round_button" />
-</selector>
diff --git a/app/src/main/res/drawable/button_toggle_background.xml b/app/src/main/res/drawable/button_toggle_background.xml
deleted file mode 100644
index c2292dae4..000000000
--- a/app/src/main/res/drawable/button_toggle_background.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true"
-        android:drawable="@drawable/shape_toggle_pressed_background" />
-    <item android:state_selected="true"
-        android:drawable="@drawable/shape_toggle_on_background" />
-    <item android:state_enabled="false"
-        android:drawable="@drawable/shape_toggle_disabled_background" />
-    <item
-        android:drawable="@drawable/shape_toggle_off_background" />
-</selector>
diff --git a/app/src/main/res/drawable/button_toggle_background_reverse.xml b/app/src/main/res/drawable/button_toggle_background_reverse.xml
deleted file mode 100644
index 3ef75d708..000000000
--- a/app/src/main/res/drawable/button_toggle_background_reverse.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true"
-        android:drawable="@drawable/shape_button_background" />
-    <item android:state_selected="true"
-        android:drawable="@drawable/shape_toggle_on_background" />
-    <item android:state_enabled="false"
-        android:drawable="@drawable/shape_toggle_disabled_background" />
-    <item
-        android:drawable="@drawable/shape_toggle_pressed_background" />
-</selector>
diff --git a/app/src/main/res/drawable/call.xml b/app/src/main/res/drawable/call.xml
deleted file mode 100644
index 9ed0f637e..000000000
--- a/app/src/main/res/drawable/call.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@color/green_color" android:state_pressed="true" />
-    <item android:drawable="@color/green_color" android:state_enabled="false" />
-    <item android:drawable="@color/primary_color" />
-</selector>
-
diff --git a/app/src/main/res/drawable/call_alt_start.xml b/app/src/main/res/drawable/call_alt_start.xml
deleted file mode 100644
index 43d9d8be7..000000000
--- a/app/src/main/res/drawable/call_alt_start.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true">
-        <bitmap android:src="@drawable/call_alt_start_default"
-            android:tint="?attr/drawableTintOverColor"/>
-    </item>
-    <item android:state_enabled="false">
-        <bitmap android:src="@drawable/call_alt_start_default"
-            android:tint="?attr/drawableTintDisabledColor"/>
-    </item>
-    <item>
-        <bitmap android:src="@drawable/call_alt_start_default"
-            android:tint="?attr/drawableTintColor"/>
-    </item>
-</selector>
diff --git a/app/src/main/res/drawable/call_back.xml b/app/src/main/res/drawable/call_back.xml
deleted file mode 100644
index 1442cb11c..000000000
--- a/app/src/main/res/drawable/call_back.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <bitmap android:src="@drawable/call_back_default"
-            android:tint="@color/white_color"/>
-    </item>
-</selector>
diff --git a/app/src/main/res/drawable/camera_switch.xml b/app/src/main/res/drawable/camera_switch.xml
deleted file mode 100644
index a79f649b7..000000000
--- a/app/src/main/res/drawable/camera_switch.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true">
-        <bitmap android:src="@drawable/camera_switch_default"
-            android:tint="?attr/drawableTintOverColor"/>
-    </item>
-    <item android:state_enabled="false">
-        <bitmap android:src="@drawable/camera_switch_default"
-            android:tint="?attr/drawableTintDisabledColor"/>
-    </item>
-    <item android:state_selected="true">
-        <bitmap android:src="@drawable/camera_switch_default"
-            android:tint="?attr/drawableTintOverColor"/>
-    </item>
-    <item>
-        <bitmap android:src="@drawable/camera_switch_default"
-            android:tint="?attr/drawableTintColor"/>
-    </item>
-</selector>
-
diff --git a/app/src/main/res/drawable/cancel.xml b/app/src/main/res/drawable/cancel.xml
deleted file mode 100644
index 67bd03f05..000000000
--- a/app/src/main/res/drawable/cancel.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true"
-        android:drawable="@drawable/cancel_shape" />
-    <item
-        android:drawable="@drawable/cancel_shape" />
-</selector>
-
-
diff --git a/app/src/main/res/drawable/cancel_shape.xml b/app/src/main/res/drawable/cancel_shape.xml
deleted file mode 100644
index fef6bb93a..000000000
--- a/app/src/main/res/drawable/cancel_shape.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:width="120dp"
-        android:height="120dp"
-        android:bottom="@dimen/field_shape_margin"
-        android:top="@dimen/field_shape_margin"
-        android:end="@dimen/field_shape_margin"
-        android:start="@dimen/field_shape_margin">
-        <rotate
-            android:fromDegrees="45"
-            android:pivotX="50%"
-            android:pivotY="50%">
-            <shape android:shape="line">
-                <stroke android:width="7dp" android:color="?attr/drawableTintColor" />
-            </shape>
-        </rotate>
-    </item>
-    <item
-        android:width="120dp"
-        android:height="120dp"
-        android:bottom="@dimen/field_shape_margin"
-        android:top="@dimen/field_shape_margin"
-        android:end="@dimen/field_shape_margin"
-        android:start="@dimen/field_shape_margin">
-        <rotate
-            android:fromDegrees="135"
-            android:pivotX="50%"
-            android:pivotY="50%">
-            <shape android:shape="line">
-                <stroke android:width="7dp" android:color="?attr/drawableTintColor" />
-            </shape>
-        </rotate>
-    </item>
-</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/chat_bubble_incoming_full.xml b/app/src/main/res/drawable/chat_bubble_incoming_full.xml
deleted file mode 100644
index a8d9a3b32..000000000
--- a/app/src/main/res/drawable/chat_bubble_incoming_full.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
-    <solid android:color="@color/chat_bubble_incoming_color"/>
-    <corners android:radius="@dimen/chat_message_round_corner_radius"/>
-</shape>
diff --git a/app/src/main/res/drawable/chat_bubble_incoming_reactions.xml b/app/src/main/res/drawable/chat_bubble_incoming_reactions.xml
deleted file mode 100644
index 31e85ee7a..000000000
--- a/app/src/main/res/drawable/chat_bubble_incoming_reactions.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
-    <solid android:color="@color/chat_bubble_incoming_color"/>
-    <stroke android:width="1dp" android:color="@color/white_color" />
-    <corners android:radius="@dimen/chat_message_round_corner_radius"/>
-</shape>
diff --git a/app/src/main/res/drawable/chat_bubble_incoming_split_1.xml b/app/src/main/res/drawable/chat_bubble_incoming_split_1.xml
deleted file mode 100644
index d531a9917..000000000
--- a/app/src/main/res/drawable/chat_bubble_incoming_split_1.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
-    <solid android:color="@color/chat_bubble_incoming_color"/>
-    <corners android:radius="@dimen/chat_message_round_corner_radius" android:bottomLeftRadius="0dp"/>
-</shape>
diff --git a/app/src/main/res/drawable/chat_bubble_incoming_split_2.xml b/app/src/main/res/drawable/chat_bubble_incoming_split_2.xml
deleted file mode 100644
index 277b01a2f..000000000
--- a/app/src/main/res/drawable/chat_bubble_incoming_split_2.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
-    <solid android:color="@color/chat_bubble_incoming_color"/>
-    <corners android:radius="@dimen/chat_message_round_corner_radius" android:topLeftRadius="0dp" android:bottomLeftRadius="0dp"/>
-</shape>
diff --git a/app/src/main/res/drawable/chat_bubble_incoming_split_3.xml b/app/src/main/res/drawable/chat_bubble_incoming_split_3.xml
deleted file mode 100644
index 7bc997138..000000000
--- a/app/src/main/res/drawable/chat_bubble_incoming_split_3.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
-    <solid android:color="@color/chat_bubble_incoming_color"/>
-    <corners android:radius="@dimen/chat_message_round_corner_radius" android:topLeftRadius="0dp"/>
-</shape>
diff --git a/app/src/main/res/drawable/chat_bubble_outgoing_full.xml b/app/src/main/res/drawable/chat_bubble_outgoing_full.xml
deleted file mode 100644
index 2117a9a5e..000000000
--- a/app/src/main/res/drawable/chat_bubble_outgoing_full.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
-    <solid android:color="@color/chat_bubble_outgoing_color"/>
-    <corners android:radius="@dimen/chat_message_round_corner_radius"/>
-</shape>
diff --git a/app/src/main/res/drawable/chat_bubble_outgoing_reactions.xml b/app/src/main/res/drawable/chat_bubble_outgoing_reactions.xml
deleted file mode 100644
index d06e116ae..000000000
--- a/app/src/main/res/drawable/chat_bubble_outgoing_reactions.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
-    <solid android:color="@color/chat_bubble_outgoing_color"/>
-    <stroke android:width="1dp" android:color="@color/white_color" />
-    <corners android:radius="@dimen/chat_message_round_corner_radius"/>
-</shape>
diff --git a/app/src/main/res/drawable/chat_bubble_outgoing_split_1.xml b/app/src/main/res/drawable/chat_bubble_outgoing_split_1.xml
deleted file mode 100644
index 42f873e03..000000000
--- a/app/src/main/res/drawable/chat_bubble_outgoing_split_1.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
-    <solid android:color="@color/chat_bubble_outgoing_color"/>
-    <corners android:radius="@dimen/chat_message_round_corner_radius" android:bottomRightRadius="0dp"/>
-</shape>
diff --git a/app/src/main/res/drawable/chat_bubble_outgoing_split_2.xml b/app/src/main/res/drawable/chat_bubble_outgoing_split_2.xml
deleted file mode 100644
index 97bd2976e..000000000
--- a/app/src/main/res/drawable/chat_bubble_outgoing_split_2.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
-    <solid android:color="@color/chat_bubble_outgoing_color"/>
-    <corners android:radius="@dimen/chat_message_round_corner_radius" android:topRightRadius="0dp" android:bottomRightRadius="0dp"/>
-</shape>
diff --git a/app/src/main/res/drawable/chat_bubble_outgoing_split_3.xml b/app/src/main/res/drawable/chat_bubble_outgoing_split_3.xml
deleted file mode 100644
index e1c6f9d03..000000000
--- a/app/src/main/res/drawable/chat_bubble_outgoing_split_3.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
-    <solid android:color="@color/chat_bubble_outgoing_color"/>
-    <corners android:radius="@dimen/chat_message_round_corner_radius" android:topRightRadius="0dp"/>
-</shape>
diff --git a/app/src/main/res/drawable/chat_bubble_reply_background.xml b/app/src/main/res/drawable/chat_bubble_reply_background.xml
deleted file mode 100644
index 3725abfdf..000000000
--- a/app/src/main/res/drawable/chat_bubble_reply_background.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/white_color"/>
-    <corners android:radius="@dimen/chat_message_round_corner_radius"/>
-    <padding android:left="0dp" android:top="0dp" android:right="0dp" android:bottom="0dp" />
-</shape>
diff --git a/app/src/main/res/drawable/chat_bubble_reply_file_background.xml b/app/src/main/res/drawable/chat_bubble_reply_file_background.xml
deleted file mode 100644
index 5b2b91dca..000000000
--- a/app/src/main/res/drawable/chat_bubble_reply_file_background.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="?attr/drawableBackgroundColor"/>
-    <stroke android:color="@color/chat_bubble_file_background_border_color" android:width="1dp" />
-    <corners android:radius="@dimen/chat_message_round_corner_radius"/>
-    <padding android:left="0dp" android:top="0dp" android:right="0dp" android:bottom="0dp" />
-</shape>
diff --git a/app/src/main/res/drawable/chat_bubble_reply_incoming_indicator.xml b/app/src/main/res/drawable/chat_bubble_reply_incoming_indicator.xml
deleted file mode 100644
index 3bb03b37b..000000000
--- a/app/src/main/res/drawable/chat_bubble_reply_incoming_indicator.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
-    <solid android:color="@color/chat_bubble_incoming_color_dark"/>
-    <corners android:radius="@dimen/chat_message_round_corner_radius" android:topRightRadius="0dp" android:bottomRightRadius="0dp"/>
-</shape>
diff --git a/app/src/main/res/drawable/chat_bubble_reply_outgoing_indicator.xml b/app/src/main/res/drawable/chat_bubble_reply_outgoing_indicator.xml
deleted file mode 100644
index 3cd2b9b0b..000000000
--- a/app/src/main/res/drawable/chat_bubble_reply_outgoing_indicator.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
-    <solid android:color="@color/chat_bubble_outgoing_color_dark"/>
-    <corners android:radius="@dimen/chat_message_round_corner_radius" android:topRightRadius="0dp" android:bottomRightRadius="0dp"/>
-</shape>
diff --git a/app/src/main/res/drawable/chat_file.xml b/app/src/main/res/drawable/chat_file.xml
deleted file mode 100644
index 5a820aa57..000000000
--- a/app/src/main/res/drawable/chat_file.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:state_pressed="true">
-		<bitmap android:src="@drawable/chat_file_over"
-			android:tint="?attr/drawableTintOverColor"/>
-	</item>
-	<item android:state_enabled="false">
-		<bitmap android:src="@drawable/chat_file_over"
-			android:tint="?attr/drawableTintDisabledColor"/>
-	</item>
-	<item>
-		<bitmap android:src="@drawable/chat_file_over"
-			android:tint="?attr/drawableTintColor"/>
-	</item>
-</selector>
diff --git a/app/src/main/res/drawable/chat_group_add.xml b/app/src/main/res/drawable/chat_group_add.xml
deleted file mode 100644
index 9ee4744df..000000000
--- a/app/src/main/res/drawable/chat_group_add.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <bitmap android:src="@drawable/chat_group_add_default"
-            android:tint="?attr/drawableTintColor" />
-    </item>
-</selector>
-
diff --git a/app/src/main/res/drawable/chat_group_new.xml b/app/src/main/res/drawable/chat_group_new.xml
deleted file mode 100644
index 16fac5aa7..000000000
--- a/app/src/main/res/drawable/chat_group_new.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true">
-        <bitmap android:src="@drawable/chat_group_new_default"
-            android:tint="?attr/drawableTintOverColor"/>
-    </item>
-    <item android:state_enabled="false">
-        <bitmap android:src="@drawable/chat_group_new_default"
-            android:tint="?attr/drawableTintDisabledColor"/>
-    </item>
-    <item>
-        <bitmap android:src="@drawable/chat_group_new_default"
-            android:tint="?attr/drawableTintColor"/>
-    </item>
-</selector>
diff --git a/app/src/main/res/drawable/chat_message_audio_record_preview_progress.xml b/app/src/main/res/drawable/chat_message_audio_record_preview_progress.xml
deleted file mode 100644
index f6419f6e9..000000000
--- a/app/src/main/res/drawable/chat_message_audio_record_preview_progress.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:id="@android:id/background"
-        android:gravity="fill_horizontal">
-        <shape android:shape="rectangle" android:tint="@color/white_color">
-            <corners android:radius="@dimen/chat_message_round_corner_radius"/>
-            <size android:height="40dp" />
-        </shape>
-    </item>
-    <item android:id="@android:id/secondaryProgress"
-        android:gravity="center_vertical|fill_horizontal">
-        <scale android:scaleWidth="100%">
-            <shape android:shape="rectangle" android:tint="@color/green_color">
-                <corners android:radius="@dimen/chat_message_round_corner_radius"/>
-                <size android:height="40dp" />
-            </shape>
-        </scale>
-    </item>
-    <item android:id="@android:id/progress"
-        android:gravity="fill_horizontal">
-        <bitmap android:src="@drawable/audio_recording_default"
-            android:gravity="center_vertical"
-            android:tileModeX="repeat"/>
-    </item>
-</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/chat_message_audio_record_progress.xml b/app/src/main/res/drawable/chat_message_audio_record_progress.xml
deleted file mode 100644
index c004038dc..000000000
--- a/app/src/main/res/drawable/chat_message_audio_record_progress.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:id="@android:id/background"
-        android:gravity="center_vertical|fill_horizontal">
-        <bitmap android:src="@drawable/audio_recording_default"
-            android:tint="@color/dark_grey_color"
-            android:tileModeX="repeat"/>
-    </item>
-    <item android:id="@android:id/secondaryProgress"
-        android:gravity="center_vertical|fill_horizontal">
-        <scale android:scaleWidth="100%">
-            <shape android:shape="rectangle" android:tint="@color/chat_bubble_incoming_color_dark">
-                <corners android:radius="@dimen/chat_message_round_corner_radius"/>
-                <size android:height="40dp"/>
-            </shape>
-        </scale>
-    </item>
-    <item android:id="@android:id/progress"
-        android:gravity="center_vertical|fill_horizontal">
-        <scale android:scaleWidth="100%">
-            <bitmap android:src="@drawable/audio_recording_default"
-                android:tint="@color/white_color"
-                android:tileModeX="repeat"/>
-        </scale>
-    </item>
-</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/chat_message_voice_recording_background.xml b/app/src/main/res/drawable/chat_message_voice_recording_background.xml
deleted file mode 100644
index 3725abfdf..000000000
--- a/app/src/main/res/drawable/chat_message_voice_recording_background.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/white_color"/>
-    <corners android:radius="@dimen/chat_message_round_corner_radius"/>
-    <padding android:left="0dp" android:top="0dp" android:right="0dp" android:bottom="0dp" />
-</shape>
diff --git a/app/src/main/res/drawable/chat_new.xml b/app/src/main/res/drawable/chat_new.xml
deleted file mode 100644
index fa5e61254..000000000
--- a/app/src/main/res/drawable/chat_new.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true">
-        <bitmap android:src="@drawable/chat_new_default"
-            android:tint="?attr/drawableTintOverColor"/>
-    </item>
-    <item android:state_enabled="false">
-        <bitmap android:src="@drawable/chat_new_default"
-            android:tint="?attr/drawableTintDisabledColor"/>
-    </item>
-    <item>
-        <bitmap android:src="@drawable/chat_new_default"
-            android:tint="?attr/drawableTintColor"/>
-    </item>
-</selector>
diff --git a/app/src/main/res/drawable/chat_room_menu_add_contact.xml b/app/src/main/res/drawable/chat_room_menu_add_contact.xml
deleted file mode 100644
index 474e025f6..000000000
--- a/app/src/main/res/drawable/chat_room_menu_add_contact.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <bitmap android:src="@drawable/menu_add_contact"
-            android:tint="?attr/drawableTintColor"/>
-    </item>
-</selector>
diff --git a/app/src/main/res/drawable/chat_room_menu_delete.xml b/app/src/main/res/drawable/chat_room_menu_delete.xml
deleted file mode 100644
index cb9f81675..000000000
--- a/app/src/main/res/drawable/chat_room_menu_delete.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <bitmap android:src="@drawable/menu_delete_default"
-            android:tint="?attr/drawableTintColor"/>
-    </item>
-</selector>
diff --git a/app/src/main/res/drawable/chat_room_menu_devices.xml b/app/src/main/res/drawable/chat_room_menu_devices.xml
deleted file mode 100644
index f4453ccda..000000000
--- a/app/src/main/res/drawable/chat_room_menu_devices.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_enabled="false">
-        <bitmap android:src="@drawable/menu_security_default"
-            android:tint="?attr/drawableTintDisabledColor"/>
-    </item>
-    <item>
-        <bitmap android:src="@drawable/menu_security_default"
-            android:tint="?attr/drawableTintColor"/>
-    </item>
-</selector>
diff --git a/app/src/main/res/drawable/chat_room_menu_ephemeral.xml b/app/src/main/res/drawable/chat_room_menu_ephemeral.xml
deleted file mode 100644
index 55433de52..000000000
--- a/app/src/main/res/drawable/chat_room_menu_ephemeral.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_enabled="false">
-        <bitmap android:src="@drawable/menu_ephemeral_messages_default"
-            android:tint="?attr/drawableTintDisabledColor"/>
-    </item>
-    <item>
-        <bitmap android:src="@drawable/menu_ephemeral_messages_default"
-            android:tint="?attr/drawableTintColor"/>
-    </item>
-</selector>
diff --git a/app/src/main/res/drawable/chat_room_menu_group_info.xml b/app/src/main/res/drawable/chat_room_menu_group_info.xml
deleted file mode 100644
index d15e39140..000000000
--- a/app/src/main/res/drawable/chat_room_menu_group_info.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <bitmap android:src="@drawable/menu_group_info_default"
-            android:tint="?attr/drawableTintColor"/>
-    </item>
-</selector>
diff --git a/app/src/main/res/drawable/chat_room_menu_meeting.xml b/app/src/main/res/drawable/chat_room_menu_meeting.xml
deleted file mode 100644
index 88f9dfd62..000000000
--- a/app/src/main/res/drawable/chat_room_menu_meeting.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_enabled="false">
-        <bitmap android:src="@drawable/menu_meeting_schedule"
-            android:tint="?attr/drawableTintDisabledColor"/>
-    </item>
-    <item>
-        <bitmap android:src="@drawable/menu_meeting_schedule"
-            android:tint="?attr/drawableTintColor"/>
-    </item>
-</selector>
diff --git a/app/src/main/res/drawable/chat_room_menu_mute_notifications.xml b/app/src/main/res/drawable/chat_room_menu_mute_notifications.xml
deleted file mode 100644
index 34f6f8794..000000000
--- a/app/src/main/res/drawable/chat_room_menu_mute_notifications.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <bitmap android:src="@drawable/menu_notifications_off"
-            android:tint="?attr/drawableTintColor"/>
-    </item>
-</selector>
diff --git a/app/src/main/res/drawable/chat_room_menu_unmute_notifications.xml b/app/src/main/res/drawable/chat_room_menu_unmute_notifications.xml
deleted file mode 100644
index e53b378eb..000000000
--- a/app/src/main/res/drawable/chat_room_menu_unmute_notifications.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <bitmap android:src="@drawable/menu_notifications_on"
-            android:tint="?attr/drawableTintColor"/>
-    </item>
-</selector>
diff --git a/app/src/main/res/drawable/chat_room_menu_view_contact.xml b/app/src/main/res/drawable/chat_room_menu_view_contact.xml
deleted file mode 100644
index 248584507..000000000
--- a/app/src/main/res/drawable/chat_room_menu_view_contact.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <bitmap android:src="@drawable/menu_contact"
-            android:tint="?attr/drawableTintColor"/>
-    </item>
-</selector>
diff --git a/app/src/main/res/drawable/chat_send_message.xml b/app/src/main/res/drawable/chat_send_message.xml
deleted file mode 100644
index 47af131b5..000000000
--- a/app/src/main/res/drawable/chat_send_message.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true">
-        <bitmap android:src="@drawable/chat_send_over"
-            android:tint="?attr/drawableTintOverColor"/>
-    </item>
-    <item android:state_enabled="false">
-        <bitmap android:src="@drawable/chat_send_over"
-            android:tint="?attr/drawableTintDisabledColor"/>
-    </item>
-    <item>
-        <bitmap android:src="@drawable/chat_send_over"
-            android:tint="?attr/drawableTintColor"/>
-    </item>
-</selector>
-
diff --git a/app/src/main/res/drawable/chevron_list_close.xml b/app/src/main/res/drawable/chevron_list_close.xml
deleted file mode 100644
index d826e42e9..000000000
--- a/app/src/main/res/drawable/chevron_list_close.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true">
-        <bitmap android:src="@drawable/chevron_list_close_default"
-            android:tint="?attr/drawableTintOverColor"/>
-    </item>
-    <item android:state_enabled="false">
-        <bitmap android:src="@drawable/chevron_list_close_default"
-            android:tint="?attr/drawableTintDisabledColor"/>
-    </item>
-    <item>
-        <bitmap android:src="@drawable/chevron_list_close_default"
-            android:tint="?attr/drawableTintColor"/>
-    </item>
-</selector>
diff --git a/app/src/main/res/drawable/chevron_list_open.xml b/app/src/main/res/drawable/chevron_list_open.xml
deleted file mode 100644
index 37bcf729b..000000000
--- a/app/src/main/res/drawable/chevron_list_open.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true">
-        <bitmap android:src="@drawable/chevron_list_open_default"
-            android:tint="?attr/drawableTintOverColor"/>
-    </item>
-    <item android:state_enabled="false">
-        <bitmap android:src="@drawable/chevron_list_open_default"
-            android:tint="?attr/drawableTintDisabledColor"/>
-    </item>
-    <item>
-        <bitmap android:src="@drawable/chevron_list_open_default"
-            android:tint="?attr/drawableTintColor"/>
-    </item>
-</selector>
diff --git a/app/src/main/res/drawable/contact.xml b/app/src/main/res/drawable/contact.xml
deleted file mode 100644
index 3a33fc108..000000000
--- a/app/src/main/res/drawable/contact.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true">
-        <bitmap android:src="@drawable/contact_default"
-            android:tint="?attr/drawableTintOverColor"/>
-    </item>
-    <item android:state_enabled="false">
-        <bitmap android:src="@drawable/contact_default"
-            android:tint="?attr/drawableTintDisabledColor"/>
-    </item>
-    <item>
-        <bitmap android:src="@drawable/contact_default"
-            android:tint="?attr/drawableTintColor"/>
-    </item>
-</selector>
diff --git a/app/src/main/res/drawable/contact_add.xml b/app/src/main/res/drawable/contact_add.xml
deleted file mode 100644
index d3e79717c..000000000
--- a/app/src/main/res/drawable/contact_add.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true">
-        <bitmap android:src="@drawable/contact_add_default"
-            android:tint="?attr/drawableTintOverColor"/>
-    </item>
-    <item android:state_enabled="false">
-        <bitmap android:src="@drawable/contact_add_default"
-            android:tint="?attr/drawableTintDisabledColor"/>
-    </item>
-    <item>
-        <bitmap android:src="@drawable/contact_add_default"
-            android:tint="?attr/drawableTintColor"/>
-    </item>
-</selector>
diff --git a/app/src/main/res/drawable/contacts_all.xml b/app/src/main/res/drawable/contacts_all.xml
deleted file mode 100644
index b6ecf35ff..000000000
--- a/app/src/main/res/drawable/contacts_all.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true">
-        <bitmap android:src="@drawable/contacts_all_default"
-            android:tint="?attr/drawableTintOverColor"/>
-    </item>
-    <item android:state_enabled="false">
-        <bitmap android:src="@drawable/contacts_all_default"
-            android:tint="?attr/accentColor"/>
-    </item>
-    <item>
-        <bitmap android:src="@drawable/contacts_all_default"
-            android:tint="?attr/drawableTintColor"/>
-    </item>
-</selector>
diff --git a/app/src/main/res/drawable/contacts_sip.xml b/app/src/main/res/drawable/contacts_sip.xml
deleted file mode 100644
index 33d9524f0..000000000
--- a/app/src/main/res/drawable/contacts_sip.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true">
-        <bitmap android:src="@drawable/contacts_sip_default"
-            android:tint="?attr/drawableTintOverColor"/>
-    </item>
-    <item android:state_enabled="false">
-        <bitmap android:src="@drawable/contacts_sip_default"
-            android:tint="?attr/accentColor"/>
-    </item>
-    <item>
-        <bitmap android:src="@drawable/contacts_sip_default"
-            android:tint="?attr/drawableTintColor"/>
-    </item>
-</selector>
diff --git a/app/src/main/res/drawable/delete.xml b/app/src/main/res/drawable/delete.xml
deleted file mode 100644
index a3000e1f3..000000000
--- a/app/src/main/res/drawable/delete.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true">
-        <bitmap android:src="@drawable/delete_default"
-            android:tint="?attr/drawableTintOverColor"/>
-    </item>
-    <item android:state_enabled="false">
-        <bitmap android:src="@drawable/delete_default"
-            android:tint="?attr/drawableTintDisabledColor"/>
-    </item>
-    <item>
-        <bitmap android:src="@drawable/delete_default"
-            android:tint="?attr/drawableTintColor"/>
-    </item>
-</selector>
diff --git a/app/src/main/res/drawable/deselect_all.xml b/app/src/main/res/drawable/deselect_all.xml
deleted file mode 100644
index 2011e9ade..000000000
--- a/app/src/main/res/drawable/deselect_all.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true">
-        <bitmap android:src="@drawable/deselect_all_default"
-            android:tint="?attr/drawableTintOverColor"/>
-    </item>
-    <item android:state_enabled="false">
-        <bitmap android:src="@drawable/deselect_all_default"
-            android:tint="?attr/drawableTintDisabledColor"/>
-    </item>
-    <item>
-        <bitmap android:src="@drawable/deselect_all_default"
-            android:tint="?attr/drawableTintColor"/>
-    </item>
-</selector>
diff --git a/app/src/main/res/drawable/dialog_delete_icon.xml b/app/src/main/res/drawable/dialog_delete_icon.xml
deleted file mode 100644
index bf1d1d574..000000000
--- a/app/src/main/res/drawable/dialog_delete_icon.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <bitmap android:src="@drawable/menu_delete_default"
-            android:tint="@color/white_color"/>
-    </item>
-</selector>
diff --git a/app/src/main/res/drawable/divider.xml b/app/src/main/res/drawable/divider.xml
deleted file mode 100644
index 1ac7d6320..000000000
--- a/app/src/main/res/drawable/divider.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <size
-        android:width="1dp"
-        android:height="1dp" />
-    <solid android:color="@color/light_grey_color" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/edit.xml b/app/src/main/res/drawable/edit.xml
deleted file mode 100644
index 180eea212..000000000
--- a/app/src/main/res/drawable/edit.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true">
-        <bitmap android:src="@drawable/edit_default"
-            android:tint="?attr/drawableTintOverColor"/>
-    </item>
-    <item android:state_selected="true">
-        <bitmap android:src="@drawable/edit_default"
-            android:tint="?attr/drawableTintOverColor"/>
-    </item>
-    <item android:state_enabled="false">
-        <bitmap android:src="@drawable/edit_default"
-            android:tint="?attr/drawableTintDisabledColor"/>
-    </item>
-    <item>
-        <bitmap android:src="@drawable/edit_default"
-            android:tint="?attr/drawableTintColor"/>
-    </item>
-</selector>
diff --git a/app/src/main/res/drawable/emoji.xml b/app/src/main/res/drawable/emoji.xml
deleted file mode 100644
index 3785640c2..000000000
--- a/app/src/main/res/drawable/emoji.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true">
-        <bitmap android:src="@drawable/emoji_default"
-            android:tint="?attr/drawableTintOverColor"/>
-    </item>
-    <item android:state_selected="true">
-        <bitmap android:src="@drawable/emoji_default"
-            android:tint="?attr/drawableTintOverColor"/>
-    </item>
-    <item android:state_enabled="false">
-        <bitmap android:src="@drawable/emoji_default"
-            android:tint="?attr/drawableTintDisabledColor"/>
-    </item>
-    <item>
-        <bitmap android:src="@drawable/emoji_default"
-            android:tint="@color/dark_grey_color"/>
-    </item>
-</selector>
diff --git a/app/src/main/res/drawable/ephemeral_messages.xml b/app/src/main/res/drawable/ephemeral_messages.xml
deleted file mode 100644
index 3b8fb391d..000000000
--- a/app/src/main/res/drawable/ephemeral_messages.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <bitmap android:src="@drawable/ephemeral_messages_default"
-            android:tint="?attr/drawableTintOverColor"/>
-    </item>
-</selector>
diff --git a/app/src/main/res/drawable/event_decoration_gray.xml b/app/src/main/res/drawable/event_decoration_gray.xml
deleted file mode 100644
index 626663ad7..000000000
--- a/app/src/main/res/drawable/event_decoration_gray.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="line">
-    <stroke android:width="1dp" android:color="?attr/dividerColor"/>
-    <size android:height="1dp" android:width="50dp" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/event_decoration_red.xml b/app/src/main/res/drawable/event_decoration_red.xml
deleted file mode 100644
index f9e4927bf..000000000
--- a/app/src/main/res/drawable/event_decoration_red.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="line">
-    <stroke android:width="1dp" android:color="@color/red_color"/>
-    <size android:height="1dp" android:width="50dp" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/field_add.xml b/app/src/main/res/drawable/field_add.xml
deleted file mode 100644
index d5ab69493..000000000
--- a/app/src/main/res/drawable/field_add.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true"
-        android:drawable="@drawable/field_add_over" />
-    <item android:state_enabled="false"
-        android:drawable="@drawable/field_add_disabled" />
-    <item
-        android:drawable="@drawable/field_add_default" />
-</selector>
-
diff --git a/app/src/main/res/drawable/field_add_default.xml b/app/src/main/res/drawable/field_add_default.xml
deleted file mode 100644
index 29cf8f588..000000000
--- a/app/src/main/res/drawable/field_add_default.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-	<item>
-		<shape android:shape="oval">
-			<solid android:color="@color/primary_color"/>
-			<size android:width="@dimen/field_button_size" android:height="@dimen/field_button_size"/>
-		</shape>
-	</item>
-	<item android:drawable="@drawable/field_add_shape" />
-</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/field_add_disabled.xml b/app/src/main/res/drawable/field_add_disabled.xml
deleted file mode 100644
index 4421590c7..000000000
--- a/app/src/main/res/drawable/field_add_disabled.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-	<item>
-		<shape android:shape="oval">
-			<solid android:color="@color/grey_color"/>
-			<size android:width="@dimen/field_button_size" android:height="@dimen/field_button_size"/>
-		</shape>
-	</item>
-	<item android:drawable="@drawable/field_add_shape" />
-</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/field_add_over.xml b/app/src/main/res/drawable/field_add_over.xml
deleted file mode 100644
index 496327588..000000000
--- a/app/src/main/res/drawable/field_add_over.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-	<item>
-		<shape android:shape="oval">
-			<solid android:color="@color/green_color"/>
-			<size android:width="@dimen/field_button_size" android:height="@dimen/field_button_size"/>
-		</shape>
-	</item>
-	<item android:drawable="@drawable/field_add_shape" />
-</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/field_add_shape.xml b/app/src/main/res/drawable/field_add_shape.xml
deleted file mode 100644
index a335e3ba3..000000000
--- a/app/src/main/res/drawable/field_add_shape.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:bottom="@dimen/field_shape_margin"
-        android:top="@dimen/field_shape_margin"
-        android:end="@dimen/field_shape_margin"
-        android:start="@dimen/field_shape_margin">
-        <shape android:shape="line">
-            <stroke android:width="2dp" android:color="@android:color/white" />
-        </shape>
-    </item>
-    <item
-        android:bottom="@dimen/field_shape_margin"
-        android:top="@dimen/field_shape_margin"
-        android:end="@dimen/field_shape_margin"
-        android:start="@dimen/field_shape_margin">
-        <rotate
-            android:fromDegrees="90"
-            android:pivotX="50%"
-            android:pivotY="50%">
-            <shape android:shape="line">
-                <stroke android:width="2dp" android:color="@android:color/white" />
-            </shape>
-        </rotate>
-    </item>
-</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/field_clean.xml b/app/src/main/res/drawable/field_clean.xml
deleted file mode 100644
index 0400c9278..000000000
--- a/app/src/main/res/drawable/field_clean.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true"
-        android:drawable="@drawable/field_clean_over" />
-    <item
-        android:drawable="@drawable/field_clean_default" />
-</selector>
-
diff --git a/app/src/main/res/drawable/field_clean_default.xml b/app/src/main/res/drawable/field_clean_default.xml
deleted file mode 100644
index b29f380c1..000000000
--- a/app/src/main/res/drawable/field_clean_default.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-	<item>
-		<shape android:shape="oval">
-			<solid android:color="@color/black_color"/>
-			<size android:width="@dimen/field_button_size" android:height="@dimen/field_button_size"/>
-		</shape>
-	</item>
-	<item android:drawable="@drawable/field_clean_shape" />
-</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/field_clean_over.xml b/app/src/main/res/drawable/field_clean_over.xml
deleted file mode 100644
index a5c707556..000000000
--- a/app/src/main/res/drawable/field_clean_over.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-	<item>
-		<shape android:shape="oval">
-			<solid android:color="@color/red_color"/>
-			<size android:width="@dimen/field_button_size" android:height="@dimen/field_button_size"/>
-		</shape>
-	</item>
-	<item android:drawable="@drawable/field_clean_shape" />
-</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/field_clean_shape.xml b/app/src/main/res/drawable/field_clean_shape.xml
deleted file mode 100644
index 1c9e1349b..000000000
--- a/app/src/main/res/drawable/field_clean_shape.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:bottom="@dimen/field_shape_margin"
-        android:top="@dimen/field_shape_margin"
-        android:end="@dimen/field_shape_margin"
-        android:start="@dimen/field_shape_margin">
-        <rotate
-            android:fromDegrees="45"
-            android:pivotX="50%"
-            android:pivotY="50%">
-            <shape android:shape="line">
-                <stroke android:width="2dp" android:color="@android:color/white" />
-            </shape>
-        </rotate>
-    </item>
-    <item
-        android:bottom="@dimen/field_shape_margin"
-        android:top="@dimen/field_shape_margin"
-        android:end="@dimen/field_shape_margin"
-        android:start="@dimen/field_shape_margin">
-        <rotate
-            android:fromDegrees="135"
-            android:pivotX="50%"
-            android:pivotY="50%">
-            <shape android:shape="line">
-                <stroke android:width="2dp" android:color="@android:color/white" />
-            </shape>
-        </rotate>
-    </item>
-</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/field_remove.xml b/app/src/main/res/drawable/field_remove.xml
deleted file mode 100644
index 3fc616dd3..000000000
--- a/app/src/main/res/drawable/field_remove.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true"
-        android:drawable="@drawable/field_remove_over" />
-    <item android:state_enabled="false"
-        android:drawable="@drawable/field_remove_disabled" />
-    <item
-        android:drawable="@drawable/field_remove_default" />
-</selector>
-
diff --git a/app/src/main/res/drawable/field_remove_default.xml b/app/src/main/res/drawable/field_remove_default.xml
deleted file mode 100644
index 214b742f1..000000000
--- a/app/src/main/res/drawable/field_remove_default.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-	<item>
-		<shape android:shape="oval">
-			<solid android:color="@color/black_color"/>
-			<size android:width="@dimen/field_button_size" android:height="@dimen/field_button_size"/>
-		</shape>
-	</item>
-	<item android:drawable="@drawable/field_remove_shape" />
-</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/field_remove_disabled.xml b/app/src/main/res/drawable/field_remove_disabled.xml
deleted file mode 100644
index 5c582da40..000000000
--- a/app/src/main/res/drawable/field_remove_disabled.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-	<item>
-		<shape android:shape="oval">
-			<solid android:color="@color/grey_color"/>
-			<size android:width="@dimen/field_button_size" android:height="@dimen/field_button_size"/>
-		</shape>
-	</item>
-	<item android:drawable="@drawable/field_remove_shape" />
-</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/field_remove_over.xml b/app/src/main/res/drawable/field_remove_over.xml
deleted file mode 100644
index b8a988b7d..000000000
--- a/app/src/main/res/drawable/field_remove_over.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-	<item>
-		<shape android:shape="oval">
-			<solid android:color="@color/red_color"/>
-			<size android:width="@dimen/field_button_size" android:height="@dimen/field_button_size"/>
-		</shape>
-	</item>
-	<item android:drawable="@drawable/field_remove_shape" />
-</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/field_remove_shape.xml b/app/src/main/res/drawable/field_remove_shape.xml
deleted file mode 100644
index 75f5c4f69..000000000
--- a/app/src/main/res/drawable/field_remove_shape.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:bottom="@dimen/field_shape_margin"
-        android:top="@dimen/field_shape_margin"
-        android:end="@dimen/field_shape_margin"
-        android:start="@dimen/field_shape_margin">
-        <shape android:shape="line">
-            <stroke android:width="2dp" android:color="@android:color/white" />
-        </shape>
-    </item>
-</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/file.xml b/app/src/main/res/drawable/file.xml
deleted file mode 100644
index f874e16f6..000000000
--- a/app/src/main/res/drawable/file.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_enabled="false">
-        <bitmap android:src="@drawable/file_default"
-            android:tint="?attr/drawableTintDisabledColor"/>
-    </item>
-    <item>
-        <bitmap android:src="@drawable/file_default"
-            android:tint="?attr/drawableTintColor"/>
-    </item>
-</selector>
diff --git a/app/src/main/res/drawable/file_audio.xml b/app/src/main/res/drawable/file_audio.xml
deleted file mode 100644
index 2adba2380..000000000
--- a/app/src/main/res/drawable/file_audio.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_enabled="false">
-        <bitmap android:src="@drawable/file_audio_default"
-            android:tint="?attr/drawableTintDisabledColor"/>
-    </item>
-    <item>
-        <bitmap android:src="@drawable/file_audio_default"
-            android:tint="?attr/drawableTintColor"/>
-    </item>
-</selector>
diff --git a/app/src/main/res/drawable/file_pdf.xml b/app/src/main/res/drawable/file_pdf.xml
deleted file mode 100644
index a932850e1..000000000
--- a/app/src/main/res/drawable/file_pdf.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_enabled="false">
-        <bitmap android:src="@drawable/file_pdf_default"
-            android:tint="?attr/drawableTintDisabledColor"/>
-    </item>
-    <item>
-        <bitmap android:src="@drawable/file_pdf_default"
-            android:tint="?attr/drawableTintColor"/>
-    </item>
-</selector>
diff --git a/app/src/main/res/drawable/file_picture.xml b/app/src/main/res/drawable/file_picture.xml
deleted file mode 100644
index 6f49ac200..000000000
--- a/app/src/main/res/drawable/file_picture.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_enabled="false">
-        <bitmap android:src="@drawable/file_picture_default"
-            android:tint="?attr/drawableTintDisabledColor"/>
-    </item>
-    <item>
-        <bitmap android:src="@drawable/file_picture_default"
-            android:tint="?attr/drawableTintColor"/>
-    </item>
-</selector>
diff --git a/app/src/main/res/drawable/file_video.xml b/app/src/main/res/drawable/file_video.xml
deleted file mode 100644
index 1b178b560..000000000
--- a/app/src/main/res/drawable/file_video.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_enabled="false">
-        <bitmap android:src="@drawable/file_video_default"
-            android:tint="?attr/drawableTintDisabledColor"/>
-    </item>
-    <item>
-        <bitmap android:src="@drawable/file_video_default"
-            android:tint="?attr/drawableTintColor"/>
-    </item>
-</selector>
diff --git a/app/src/main/res/drawable/footer_button.xml b/app/src/main/res/drawable/footer_button.xml
deleted file mode 100644
index b23178869..000000000
--- a/app/src/main/res/drawable/footer_button.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:state_pressed="true"
-		android:drawable="@color/primary_color" />
-	<item android:state_selected="true"
-		android:drawable="@color/voip_dark_color" />
-	<item
-		android:drawable="@color/voip_dark_color" />
-</selector>
diff --git a/app/src/main/res/drawable/generated_avatar_bg.xml b/app/src/main/res/drawable/generated_avatar_bg.xml
deleted file mode 100644
index 87e6684b1..000000000
--- a/app/src/main/res/drawable/generated_avatar_bg.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval">
-    <solid android:color="?attr/primaryTextColor"/>
-    <size android:width="35dp" android:height="35dp" />
-</shape>
diff --git a/app/src/main/res/drawable/hidden_unread_message_count_bg.xml b/app/src/main/res/drawable/hidden_unread_message_count_bg.xml
deleted file mode 100644
index 6c1145f56..000000000
--- a/app/src/main/res/drawable/hidden_unread_message_count_bg.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval">
-    <solid android:color="@color/transparent_color"/>
-    <size android:width="20dp" android:height="20dp"/>
-</shape>
diff --git a/app/src/main/res/drawable/history_all.xml b/app/src/main/res/drawable/history_all.xml
deleted file mode 100644
index b3f33e5c1..000000000
--- a/app/src/main/res/drawable/history_all.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true">
-        <bitmap android:src="@drawable/history_all_default"
-            android:tint="?attr/drawableTintOverColor"/>
-    </item>
-    <item android:state_enabled="false">
-        <bitmap android:src="@drawable/history_all_default"
-            android:tint="?attr/accentColor"/>
-    </item>
-    <item>
-        <bitmap android:src="@drawable/history_all_default"
-            android:tint="?attr/drawableTintColor"/>
-    </item>
-</selector>
diff --git a/app/src/main/res/drawable/history_detail_background.xml b/app/src/main/res/drawable/history_detail_background.xml
deleted file mode 100644
index c1c0dbff4..000000000
--- a/app/src/main/res/drawable/history_detail_background.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true"
-        android:drawable="@drawable/history_detail_background_pressed" />
-</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/history_detail_background_pressed.xml b/app/src/main/res/drawable/history_detail_background_pressed.xml
deleted file mode 100644
index 50f07b529..000000000
--- a/app/src/main/res/drawable/history_detail_background_pressed.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval">
-    <solid android:color="@color/light_grey_color"/>
-</shape>
diff --git a/app/src/main/res/drawable/history_missed.xml b/app/src/main/res/drawable/history_missed.xml
deleted file mode 100644
index 4a634f2ca..000000000
--- a/app/src/main/res/drawable/history_missed.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true">
-        <bitmap android:src="@drawable/history_missed_default"
-            android:tint="?attr/drawableTintOverColor"/>
-    </item>
-    <item android:state_enabled="false">
-        <bitmap android:src="@drawable/history_missed_default"
-            android:tint="?attr/accentColor"/>
-    </item>
-    <item>
-        <bitmap android:src="@drawable/history_missed_default"
-            android:tint="?attr/drawableTintColor"/>
-    </item>
-</selector>
diff --git a/app/src/main/res/drawable/icon_apply.xml b/app/src/main/res/drawable/icon_apply.xml
deleted file mode 100644
index 3be5be72e..000000000
--- a/app/src/main/res/drawable/icon_apply.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true">
-        <bitmap android:src="@drawable/valid_default"
-            android:tint="?attr/drawableTintOverColor"/>
-    </item>
-    <item android:state_enabled="false">
-        <bitmap android:src="@drawable/valid_default"
-            android:tint="?attr/drawableTintDisabledColor"/>
-    </item>
-    <item>
-        <bitmap android:src="@drawable/valid_default"
-            android:tint="?attr/drawableTintColor"/>
-    </item>
-</selector>
diff --git a/app/src/main/res/drawable/icon_audio_routes.xml b/app/src/main/res/drawable/icon_audio_routes.xml
deleted file mode 100644
index b694e1b51..000000000
--- a/app/src/main/res/drawable/icon_audio_routes.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <bitmap android:src="@drawable/voip_audio_routes"
-            android:tint="@color/white_color"/>
-    </item>
-</selector>
diff --git a/app/src/main/res/drawable/icon_bluetooth.xml b/app/src/main/res/drawable/icon_bluetooth.xml
deleted file mode 100644
index 42ad75065..000000000
--- a/app/src/main/res/drawable/icon_bluetooth.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <bitmap android:src="@drawable/voip_bluetooth"
-            android:tint="@color/white_color"/>
-    </item>
-</selector>
diff --git a/app/src/main/res/drawable/icon_call_add.xml b/app/src/main/res/drawable/icon_call_add.xml
deleted file mode 100644
index f559fbf98..000000000
--- a/app/src/main/res/drawable/icon_call_add.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true">
-        <bitmap android:src="@drawable/voip_call_add"
-            android:tint="?attr/voipDrawablePressedColor"/>
-    </item>
-    <item android:state_enabled="false">
-        <bitmap android:src="@drawable/voip_call_add"
-            android:tint="?attr/voipDrawableDisabledColor"/>
-    </item>
-    <item>
-        <bitmap android:src="@drawable/voip_call_add"
-            android:tint="?attr/voipDrawableColor2"/>
-    </item>
-</selector>
diff --git a/app/src/main/res/drawable/icon_call_answer.xml b/app/src/main/res/drawable/icon_call_answer.xml
deleted file mode 100644
index 86a06a63b..000000000
--- a/app/src/main/res/drawable/icon_call_answer.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <bitmap android:src="@drawable/voip_call"
-            android:tint="@color/white_color"/>
-    </item>
-</selector>
diff --git a/app/src/main/res/drawable/icon_call_answer_video.xml b/app/src/main/res/drawable/icon_call_answer_video.xml
deleted file mode 100644
index 849f6050e..000000000
--- a/app/src/main/res/drawable/icon_call_answer_video.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <bitmap android:src="@drawable/voip_camera_on"
-            android:tint="@color/white_color"/>
-    </item>
-</selector>
diff --git a/app/src/main/res/drawable/icon_call_camera_switch.xml b/app/src/main/res/drawable/icon_call_camera_switch.xml
deleted file mode 100644
index d8b0d6de6..000000000
--- a/app/src/main/res/drawable/icon_call_camera_switch.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <bitmap android:src="@drawable/voip_change_camera"
-            android:tint="@color/white_color"/>
-    </item>
-</selector>
diff --git a/app/src/main/res/drawable/icon_call_chat.xml b/app/src/main/res/drawable/icon_call_chat.xml
deleted file mode 100644
index ad97ebc4f..000000000
--- a/app/src/main/res/drawable/icon_call_chat.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true">
-        <bitmap android:src="@drawable/voip_call_chat"
-            android:tint="?attr/voipDrawablePressedColor"/>
-    </item>
-    <item android:state_enabled="false">
-        <bitmap android:src="@drawable/voip_call_chat"
-            android:tint="?attr/voipDrawableDisabledColor"/>
-    </item>
-    <item>
-        <bitmap android:src="@drawable/voip_call_chat"
-            android:tint="?attr/voipDrawableColor2"/>
-    </item>
-</selector>
diff --git a/app/src/main/res/drawable/icon_call_chat_rooms.xml b/app/src/main/res/drawable/icon_call_chat_rooms.xml
deleted file mode 100644
index 584556375..000000000
--- a/app/src/main/res/drawable/icon_call_chat_rooms.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <bitmap android:src="@drawable/voip_chat_rooms_list"
-            android:tint="?attr/voipDrawableColor"/>
-    </item>
-</selector>
diff --git a/app/src/main/res/drawable/icon_call_forward.xml b/app/src/main/res/drawable/icon_call_forward.xml
deleted file mode 100644
index 7caa899f1..000000000
--- a/app/src/main/res/drawable/icon_call_forward.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true">
-        <bitmap android:src="@drawable/voip_call_forward"
-            android:tint="?attr/voipDrawablePressedColor"/>
-    </item>
-    <item android:state_enabled="false">
-        <bitmap android:src="@drawable/voip_call_forward"
-            android:tint="?attr/voipDrawableDisabledColor"/>
-    </item>
-    <item>
-        <bitmap android:src="@drawable/voip_call_forward"
-            android:tint="?attr/voipDrawableColor2"/>
-    </item>
-</selector>
diff --git a/app/src/main/res/drawable/icon_call_hangup.xml b/app/src/main/res/drawable/icon_call_hangup.xml
deleted file mode 100644
index 35cc67534..000000000
--- a/app/src/main/res/drawable/icon_call_hangup.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <bitmap android:src="@drawable/voip_hangup"
-            android:tint="@color/white_color"/>
-    </item>
-</selector>
diff --git a/app/src/main/res/drawable/icon_call_more.xml b/app/src/main/res/drawable/icon_call_more.xml
deleted file mode 100644
index 488e9e3bf..000000000
--- a/app/src/main/res/drawable/icon_call_more.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <bitmap android:src="@drawable/voip_call_more"
-            android:tint="@color/white_color"/>
-    </item>
-</selector>
diff --git a/app/src/main/res/drawable/icon_call_numpad.xml b/app/src/main/res/drawable/icon_call_numpad.xml
deleted file mode 100644
index 6768b101a..000000000
--- a/app/src/main/res/drawable/icon_call_numpad.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true">
-        <bitmap android:src="@drawable/voip_call_numpad"
-            android:tint="?attr/voipTextColor2"/>
-    </item>
-    <item android:state_enabled="false">
-        <bitmap android:src="@drawable/voip_call_numpad"
-            android:tint="?attr/voipFormFieldBackgroundColor"/>
-    </item>
-    <item>
-        <bitmap android:src="@drawable/voip_call_numpad"
-            android:tint="@color/white_color"/>
-    </item>
-</selector>
diff --git a/app/src/main/res/drawable/icon_call_participants.xml b/app/src/main/res/drawable/icon_call_participants.xml
deleted file mode 100644
index 31f960464..000000000
--- a/app/src/main/res/drawable/icon_call_participants.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true">
-        <bitmap android:src="@drawable/voip_call_participants"
-            android:tint="?attr/voipDrawablePressedColor"/>
-    </item>
-    <item android:state_enabled="false">
-        <bitmap android:src="@drawable/voip_call_participants"
-            android:tint="?attr/voipDrawableDisabledColor"/>
-    </item>
-    <item>
-        <bitmap android:src="@drawable/voip_call_participants"
-            android:tint="?attr/voipDrawableColor2"/>
-    </item>
-</selector>
diff --git a/app/src/main/res/drawable/icon_call_record.xml b/app/src/main/res/drawable/icon_call_record.xml
deleted file mode 100644
index 2d3fdbdf9..000000000
--- a/app/src/main/res/drawable/icon_call_record.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <bitmap android:src="@drawable/voip_call_record"
-            android:tint="@color/white_color"/>
-    </item>
-</selector>
diff --git a/app/src/main/res/drawable/icon_call_screenshot.xml b/app/src/main/res/drawable/icon_call_screenshot.xml
deleted file mode 100644
index 6fe24f800..000000000
--- a/app/src/main/res/drawable/icon_call_screenshot.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <bitmap android:src="@drawable/voip_screenshot"
-            android:tint="@color/white_color"/>
-    </item>
-</selector>
diff --git a/app/src/main/res/drawable/icon_call_stats.xml b/app/src/main/res/drawable/icon_call_stats.xml
deleted file mode 100644
index 3cf57a966..000000000
--- a/app/src/main/res/drawable/icon_call_stats.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true">
-        <bitmap android:src="@drawable/voip_call_stats"
-            android:tint="?attr/voipDrawablePressedColor"/>
-    </item>
-    <item android:state_enabled="false">
-        <bitmap android:src="@drawable/voip_call_stats"
-            android:tint="?attr/voipDrawableDisabledColor"/>
-    </item>
-    <item>
-        <bitmap android:src="@drawable/voip_call_stats"
-            android:tint="?attr/voipDrawableColor2"/>
-    </item>
-</selector>
diff --git a/app/src/main/res/drawable/icon_calls_list.xml b/app/src/main/res/drawable/icon_calls_list.xml
deleted file mode 100644
index 937a6ff20..000000000
--- a/app/src/main/res/drawable/icon_calls_list.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true">
-        <bitmap android:src="@drawable/voip_calls_list"
-            android:tint="?attr/voipDrawablePressedColor"/>
-    </item>
-    <item android:state_enabled="false">
-        <bitmap android:src="@drawable/voip_calls_list"
-            android:tint="?attr/voipDrawableDisabledColor"/>
-    </item>
-    <item>
-        <bitmap android:src="@drawable/voip_calls_list"
-            android:tint="?attr/voipDrawableColor2"/>
-    </item>
-</selector>
diff --git a/app/src/main/res/drawable/icon_calls_list_menu.xml b/app/src/main/res/drawable/icon_calls_list_menu.xml
deleted file mode 100644
index 3a4602cee..000000000
--- a/app/src/main/res/drawable/icon_calls_list_menu.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true">
-        <bitmap android:src="@drawable/voip_call_list_menu"
-            android:tint="?attr/voipDrawablePressedColor"/>
-    </item>
-    <item android:state_enabled="false">
-        <bitmap android:src="@drawable/voip_call_list_menu"
-            android:tint="?attr/voipDrawableDisabledColor"/>
-    </item>
-    <item>
-        <bitmap android:src="@drawable/voip_call_list_menu"
-            android:tint="?attr/voipDrawableColor2"/>
-    </item>
-</selector>
diff --git a/app/src/main/res/drawable/icon_cancel.xml b/app/src/main/res/drawable/icon_cancel.xml
deleted file mode 100644
index 052b79e93..000000000
--- a/app/src/main/res/drawable/icon_cancel.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <bitmap android:src="@drawable/voip_cancel"
-            android:tint="?attr/voipDrawableColor"/>
-    </item>
-</selector>
diff --git a/app/src/main/res/drawable/icon_cancel_alt.xml b/app/src/main/res/drawable/icon_cancel_alt.xml
deleted file mode 100644
index 07d6cc058..000000000
--- a/app/src/main/res/drawable/icon_cancel_alt.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <bitmap android:src="@drawable/voip_cancel"
-            android:tint="@color/voip_gray"/>
-    </item>
-</selector>
diff --git a/app/src/main/res/drawable/icon_conference_layout_active_speaker.xml b/app/src/main/res/drawable/icon_conference_layout_active_speaker.xml
deleted file mode 100644
index eb53c13ea..000000000
--- a/app/src/main/res/drawable/icon_conference_layout_active_speaker.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true">
-        <bitmap android:src="@drawable/voip_conference_active_speaker"
-            android:tint="?attr/voipDrawablePressedColor"/>
-    </item>
-    <item android:state_enabled="false">
-        <bitmap android:src="@drawable/voip_conference_active_speaker"
-            android:tint="?attr/voipDrawableDisabledColor"/>
-    </item>
-    <item>
-        <bitmap android:src="@drawable/voip_conference_active_speaker"
-            android:tint="?attr/voipDrawableColor2"/>
-    </item>
-</selector>
diff --git a/app/src/main/res/drawable/icon_conference_layout_audio_only.xml b/app/src/main/res/drawable/icon_conference_layout_audio_only.xml
deleted file mode 100644
index 3736e6500..000000000
--- a/app/src/main/res/drawable/icon_conference_layout_audio_only.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true">
-        <bitmap android:src="@drawable/voip_conference_audio_only"
-            android:tint="?attr/voipDrawablePressedColor"/>
-    </item>
-    <item android:state_enabled="false">
-        <bitmap android:src="@drawable/voip_conference_audio_only"
-            android:tint="?attr/voipDrawableDisabledColor"/>
-    </item>
-    <item>
-        <bitmap android:src="@drawable/voip_conference_audio_only"
-            android:tint="?attr/voipDrawableColor2"/>
-    </item>
-</selector>
diff --git a/app/src/main/res/drawable/icon_conference_layout_grid.xml b/app/src/main/res/drawable/icon_conference_layout_grid.xml
deleted file mode 100644
index 1f3bbc190..000000000
--- a/app/src/main/res/drawable/icon_conference_layout_grid.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true">
-        <bitmap android:src="@drawable/voip_conference_mosaic"
-            android:tint="?attr/voipTextColor2"/>
-    </item>
-    <item android:state_enabled="false">
-        <bitmap android:src="@drawable/voip_conference_mosaic"
-            android:tint="?attr/voipFormFieldBackgroundColor"/>
-    </item>
-    <item>
-        <bitmap android:src="@drawable/voip_conference_mosaic"
-            android:tint="?attr/voipDrawableColor2"/>
-    </item>
-</selector>
diff --git a/app/src/main/res/drawable/icon_copy.xml b/app/src/main/res/drawable/icon_copy.xml
deleted file mode 100644
index 278fa0562..000000000
--- a/app/src/main/res/drawable/icon_copy.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <bitmap android:src="@drawable/voip_copy"
-            android:tint="@color/white_color"/>
-    </item>
-</selector>
diff --git a/app/src/main/res/drawable/icon_delete.xml b/app/src/main/res/drawable/icon_delete.xml
deleted file mode 100644
index bd647fa54..000000000
--- a/app/src/main/res/drawable/icon_delete.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <bitmap android:src="@drawable/voip_delete"
-            android:tint="@color/white_color"/>
-    </item>
-</selector>
diff --git a/app/src/main/res/drawable/icon_earpiece.xml b/app/src/main/res/drawable/icon_earpiece.xml
deleted file mode 100644
index 69b03ecc0..000000000
--- a/app/src/main/res/drawable/icon_earpiece.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <bitmap android:src="@drawable/voip_earpiece"
-            android:tint="@color/white_color"/>
-    </item>
-</selector>
diff --git a/app/src/main/res/drawable/icon_edit.xml b/app/src/main/res/drawable/icon_edit.xml
deleted file mode 100644
index d9a3f921a..000000000
--- a/app/src/main/res/drawable/icon_edit.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <bitmap android:src="@drawable/voip_edit"
-            android:tint="@color/white_color"/>
-    </item>
-</selector>
diff --git a/app/src/main/res/drawable/icon_edit_alt.xml b/app/src/main/res/drawable/icon_edit_alt.xml
deleted file mode 100644
index 74da8157b..000000000
--- a/app/src/main/res/drawable/icon_edit_alt.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <bitmap android:src="@drawable/voip_edit"
-            android:tint="?attr/voipDrawableColor"/>
-    </item>
-</selector>
diff --git a/app/src/main/res/drawable/icon_ephemeral_message.xml b/app/src/main/res/drawable/icon_ephemeral_message.xml
deleted file mode 100644
index 299072bab..000000000
--- a/app/src/main/res/drawable/icon_ephemeral_message.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
-    <item
-        android:drawable="@drawable/ephemeral_messages"
-        android:width="11.6dp"
-        android:height="13dp" />
-</layer-list >
\ No newline at end of file
diff --git a/app/src/main/res/drawable/icon_forwarded_message.xml b/app/src/main/res/drawable/icon_forwarded_message.xml
deleted file mode 100644
index c210b3dce..000000000
--- a/app/src/main/res/drawable/icon_forwarded_message.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
-    <item
-        android:drawable="@drawable/forwarded_message_default"
-        android:width="15dp"
-        android:height="12dp" />
-</layer-list >
\ No newline at end of file
diff --git a/app/src/main/res/drawable/icon_info.xml b/app/src/main/res/drawable/icon_info.xml
deleted file mode 100644
index 99fd6a38f..000000000
--- a/app/src/main/res/drawable/icon_info.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <bitmap android:src="@drawable/voip_info"
-            android:tint="?attr/voipDrawableColor"/>
-    </item>
-</selector>
diff --git a/app/src/main/res/drawable/icon_info_selected.xml b/app/src/main/res/drawable/icon_info_selected.xml
deleted file mode 100644
index 67b628ef2..000000000
--- a/app/src/main/res/drawable/icon_info_selected.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <bitmap android:src="@drawable/voip_info"
-            android:tint="@color/primary_color"/>
-    </item>
-</selector>
diff --git a/app/src/main/res/drawable/icon_meeting_schedule.xml b/app/src/main/res/drawable/icon_meeting_schedule.xml
deleted file mode 100644
index 9fcd02f66..000000000
--- a/app/src/main/res/drawable/icon_meeting_schedule.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <bitmap android:src="@drawable/voip_meeting_schedule"
-            android:tint="?attr/drawableTintColor"/>
-    </item>
-</selector>
diff --git a/app/src/main/res/drawable/icon_menu_more.xml b/app/src/main/res/drawable/icon_menu_more.xml
deleted file mode 100644
index 19c7e24b7..000000000
--- a/app/src/main/res/drawable/icon_menu_more.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true">
-        <bitmap android:src="@drawable/voip_menu_more"
-            android:tint="?attr/drawableTintOverColor"/>
-    </item>
-    <item android:state_enabled="false">
-        <bitmap android:src="@drawable/voip_menu_more"
-            android:tint="?attr/drawableTintDisabledColor"/>
-    </item>
-    <item>
-        <bitmap android:src="@drawable/voip_menu_more"
-            android:tint="?attr/drawableTintColor"/>
-    </item>
-</selector>
diff --git a/app/src/main/res/drawable/icon_merge_calls_local_conference.xml b/app/src/main/res/drawable/icon_merge_calls_local_conference.xml
deleted file mode 100644
index 2fdd2e68a..000000000
--- a/app/src/main/res/drawable/icon_merge_calls_local_conference.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <bitmap android:src="@drawable/voip_merge_calls"
-            android:tint="@color/white_color"/>
-    </item>
-</selector>
diff --git a/app/src/main/res/drawable/icon_mic_muted.xml b/app/src/main/res/drawable/icon_mic_muted.xml
deleted file mode 100644
index 1ab7fc636..000000000
--- a/app/src/main/res/drawable/icon_mic_muted.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <bitmap android:src="@drawable/voip_micro_off"
-            android:tint="@color/white_color"/>
-    </item>
-</selector>
diff --git a/app/src/main/res/drawable/icon_multiple_contacts_avatar.xml b/app/src/main/res/drawable/icon_multiple_contacts_avatar.xml
deleted file mode 100644
index 15fac96a6..000000000
--- a/app/src/main/res/drawable/icon_multiple_contacts_avatar.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <bitmap android:src="@drawable/voip_multiple_contacts_avatar"
-            android:tint="?attr/drawableTintColor2"/>
-    </item>
-</selector>
diff --git a/app/src/main/res/drawable/icon_next.xml b/app/src/main/res/drawable/icon_next.xml
deleted file mode 100644
index 968192312..000000000
--- a/app/src/main/res/drawable/icon_next.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true">
-        <bitmap android:src="@drawable/next_default"
-            android:tint="?attr/drawableTintOverColor"/>
-    </item>
-    <item android:state_enabled="false">
-        <bitmap android:src="@drawable/next_default"
-            android:tint="?attr/drawableTintDisabledColor"/>
-    </item>
-    <item>
-        <bitmap android:src="@drawable/next_default"
-            android:tint="?attr/drawableTintColor"/>
-    </item>
-</selector>
diff --git a/app/src/main/res/drawable/icon_pause.xml b/app/src/main/res/drawable/icon_pause.xml
deleted file mode 100644
index 09787beba..000000000
--- a/app/src/main/res/drawable/icon_pause.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <bitmap android:src="@drawable/voip_pause"
-            android:tint="@color/white_color"/>
-    </item>
-</selector>
diff --git a/app/src/main/res/drawable/icon_replied_message.xml b/app/src/main/res/drawable/icon_replied_message.xml
deleted file mode 100644
index dcc78b5c6..000000000
--- a/app/src/main/res/drawable/icon_replied_message.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
-    <item
-        android:drawable="@drawable/replied_message_default"
-        android:width="15dp"
-        android:height="12dp" />
-</layer-list >
\ No newline at end of file
diff --git a/app/src/main/res/drawable/icon_schedule_date.xml b/app/src/main/res/drawable/icon_schedule_date.xml
deleted file mode 100644
index 5f29ac622..000000000
--- a/app/src/main/res/drawable/icon_schedule_date.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <bitmap android:src="@drawable/conference_schedule_calendar_default"
-            android:tint="?attr/voipDrawableColor"/>
-    </item>
-</selector>
diff --git a/app/src/main/res/drawable/icon_schedule_participants.xml b/app/src/main/res/drawable/icon_schedule_participants.xml
deleted file mode 100644
index 45741792a..000000000
--- a/app/src/main/res/drawable/icon_schedule_participants.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <bitmap android:src="@drawable/conference_schedule_participants_default"
-            android:tint="?attr/voipDrawableColor"/>
-    </item>
-</selector>
diff --git a/app/src/main/res/drawable/icon_schedule_time.xml b/app/src/main/res/drawable/icon_schedule_time.xml
deleted file mode 100644
index f165174c6..000000000
--- a/app/src/main/res/drawable/icon_schedule_time.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <bitmap android:src="@drawable/conference_schedule_time_default"
-            android:tint="?attr/voipDrawableColor"/>
-    </item>
-</selector>
diff --git a/app/src/main/res/drawable/icon_share.xml b/app/src/main/res/drawable/icon_share.xml
deleted file mode 100644
index 4b7a252ee..000000000
--- a/app/src/main/res/drawable/icon_share.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <bitmap android:src="@drawable/voip_export"
-            android:tint="?attr/drawableTintColor"/>
-    </item>
-</selector>
-
-
diff --git a/app/src/main/res/drawable/icon_single_contact_avatar.xml b/app/src/main/res/drawable/icon_single_contact_avatar.xml
deleted file mode 100644
index 0af513c72..000000000
--- a/app/src/main/res/drawable/icon_single_contact_avatar.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <bitmap android:src="@drawable/voip_single_contact_avatar"
-            android:tint="?attr/drawableTintColor2"/>
-    </item>
-</selector>
diff --git a/app/src/main/res/drawable/icon_speaker.xml b/app/src/main/res/drawable/icon_speaker.xml
deleted file mode 100644
index ab3fd031b..000000000
--- a/app/src/main/res/drawable/icon_speaker.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <bitmap android:src="@drawable/voip_speaker_on"
-            android:tint="@color/white_color"/>
-    </item>
-</selector>
diff --git a/app/src/main/res/drawable/icon_spinner.xml b/app/src/main/res/drawable/icon_spinner.xml
deleted file mode 100644
index f3537e7bd..000000000
--- a/app/src/main/res/drawable/icon_spinner.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <bitmap android:src="@drawable/voip_spinner"
-            android:tint="@color/white_color"/>
-    </item>
-</selector>
diff --git a/app/src/main/res/drawable/icon_spinner_background.xml b/app/src/main/res/drawable/icon_spinner_background.xml
deleted file mode 100644
index f50b58b1b..000000000
--- a/app/src/main/res/drawable/icon_spinner_background.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <layer-list>
-            <item>
-                <shape>
-                    <gradient
-                        android:angle="90"
-                        android:endColor="?attr/voipFormBackgroundColor"
-                        android:startColor="?attr/voipFormBackgroundColor"
-                        android:type="linear" />
-                    <stroke android:width="@dimen/conference_schedule_form_field_border_thickness" android:color="?attr/voipFormFieldBackgroundColor" />
-                    <corners android:radius="0dp" />
-                    <padding android:bottom="3dp" android:left="3dp" android:right="3dp" android:top="3dp" />
-                </shape>
-            </item>
-
-            <item android:right="5dp">
-                <bitmap android:gravity="center_vertical|right" android:src="@drawable/voip_dropdown" />
-            </item>
-
-        </layer-list>
-    </item>
-</selector>
diff --git a/app/src/main/res/drawable/icon_spinner_rotating.xml b/app/src/main/res/drawable/icon_spinner_rotating.xml
deleted file mode 100644
index 6b8ed48ca..000000000
--- a/app/src/main/res/drawable/icon_spinner_rotating.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<rotate xmlns:android="http://schemas.android.com/apk/res/android"
-    android:fromDegrees="0"
-    android:toDegrees="720"
-    android:drawable="@drawable/icon_spinner">
-</rotate>
diff --git a/app/src/main/res/drawable/icon_toggle_camera.xml b/app/src/main/res/drawable/icon_toggle_camera.xml
deleted file mode 100644
index 80a10a84f..000000000
--- a/app/src/main/res/drawable/icon_toggle_camera.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_selected="true">
-        <bitmap android:src="@drawable/voip_camera_on"
-            android:tint="@color/white_color"/>
-    </item>
-    <item>
-        <bitmap android:src="@drawable/voip_camera_off"
-            android:tint="@color/white_color"/>
-    </item>
-</selector>
diff --git a/app/src/main/res/drawable/icon_toggle_mic.xml b/app/src/main/res/drawable/icon_toggle_mic.xml
deleted file mode 100644
index 40b18e3f8..000000000
--- a/app/src/main/res/drawable/icon_toggle_mic.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_selected="true">
-        <bitmap android:src="@drawable/voip_micro_off"
-            android:tint="@color/white_color"/>
-    </item>
-    <item>
-        <bitmap android:src="@drawable/voip_micro_on"
-            android:tint="@color/white_color"/>
-    </item>
-</selector>
diff --git a/app/src/main/res/drawable/icon_toggle_speaker.xml b/app/src/main/res/drawable/icon_toggle_speaker.xml
deleted file mode 100644
index e9f43e1a1..000000000
--- a/app/src/main/res/drawable/icon_toggle_speaker.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_selected="true">
-        <bitmap android:src="@drawable/voip_speaker_on"
-            android:tint="@color/white_color"/>
-    </item>
-    <item>
-        <bitmap android:src="@drawable/voip_speaker_off"
-            android:tint="@color/white_color"/>
-    </item>
-</selector>
diff --git a/app/src/main/res/drawable/icon_video_conf_history_filter.xml b/app/src/main/res/drawable/icon_video_conf_history_filter.xml
deleted file mode 100644
index 65b3aa6ed..000000000
--- a/app/src/main/res/drawable/icon_video_conf_history_filter.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true">
-        <bitmap android:src="@drawable/voip_conference"
-            android:tint="?attr/drawableTintOverColor"/>
-    </item>
-    <item android:state_enabled="false">
-        <bitmap android:src="@drawable/voip_conference"
-            android:tint="?attr/accentColor"/>
-    </item>
-    <item>
-        <bitmap android:src="@drawable/voip_conference"
-            android:tint="?attr/drawableTintColor"/>
-    </item>
-</selector>
diff --git a/app/src/main/res/drawable/icon_video_conf_incoming.xml b/app/src/main/res/drawable/icon_video_conf_incoming.xml
deleted file mode 100644
index 57bca35d7..000000000
--- a/app/src/main/res/drawable/icon_video_conf_incoming.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <bitmap android:src="@drawable/voip_conference"
-            android:tint="@color/white_color"/>
-    </item>
-</selector>
diff --git a/app/src/main/res/drawable/icon_video_conf_new.xml b/app/src/main/res/drawable/icon_video_conf_new.xml
deleted file mode 100644
index 2c1dd4e58..000000000
--- a/app/src/main/res/drawable/icon_video_conf_new.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true">
-        <bitmap android:src="@drawable/voip_conference"
-            android:tint="?attr/drawableTintOverColor"/>
-    </item>
-    <item android:state_enabled="false">
-        <bitmap android:src="@drawable/voip_conference"
-            android:tint="?attr/drawableTintDisabledColor"/>
-    </item>
-    <item>
-        <bitmap android:src="@drawable/voip_conference"
-            android:tint="?attr/drawableTintColor"/>
-    </item>
-</selector>
diff --git a/app/src/main/res/drawable/led_away.xml b/app/src/main/res/drawable/led_away.xml
deleted file mode 100644
index 53b2810ea..000000000
--- a/app/src/main/res/drawable/led_away.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval">
-    <solid android:color="@color/led_registration_in_progress"/>
-    <size android:width="15dp" android:height="15dp"/>
-</shape>
diff --git a/app/src/main/res/drawable/led_background.xml b/app/src/main/res/drawable/led_background.xml
deleted file mode 100644
index d46d2c20a..000000000
--- a/app/src/main/res/drawable/led_background.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval">
-    <solid android:color="?attr/backgroundColor"/>
-    <size android:width="20dp" android:height="20dp"/>
-</shape>
diff --git a/app/src/main/res/drawable/led_do_not_disturb.xml b/app/src/main/res/drawable/led_do_not_disturb.xml
deleted file mode 100644
index e2ce8ac4b..000000000
--- a/app/src/main/res/drawable/led_do_not_disturb.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval">
-    <solid android:color="@color/led_error"/>
-    <size android:width="15dp" android:height="15dp"/>
-</shape>
diff --git a/app/src/main/res/drawable/led_error.xml b/app/src/main/res/drawable/led_error.xml
deleted file mode 100644
index e2ce8ac4b..000000000
--- a/app/src/main/res/drawable/led_error.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval">
-    <solid android:color="@color/led_error"/>
-    <size android:width="15dp" android:height="15dp"/>
-</shape>
diff --git a/app/src/main/res/drawable/led_not_registered.xml b/app/src/main/res/drawable/led_not_registered.xml
deleted file mode 100644
index f95c698ac..000000000
--- a/app/src/main/res/drawable/led_not_registered.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval">
-    <solid android:color="@color/led_not_registered"/>
-    <size android:width="15dp" android:height="15dp"/>
-</shape>
diff --git a/app/src/main/res/drawable/led_online.xml b/app/src/main/res/drawable/led_online.xml
deleted file mode 100644
index 7c701e958..000000000
--- a/app/src/main/res/drawable/led_online.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval">
-    <solid android:color="@color/led_registered"/>
-    <size android:width="15dp" android:height="15dp"/>
-</shape>
diff --git a/app/src/main/res/drawable/led_registered.xml b/app/src/main/res/drawable/led_registered.xml
deleted file mode 100644
index 7c701e958..000000000
--- a/app/src/main/res/drawable/led_registered.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval">
-    <solid android:color="@color/led_registered"/>
-    <size android:width="15dp" android:height="15dp"/>
-</shape>
diff --git a/app/src/main/res/drawable/led_registration_in_progress.xml b/app/src/main/res/drawable/led_registration_in_progress.xml
deleted file mode 100644
index 53b2810ea..000000000
--- a/app/src/main/res/drawable/led_registration_in_progress.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval">
-    <solid android:color="@color/led_registration_in_progress"/>
-    <size android:width="15dp" android:height="15dp"/>
-</shape>
diff --git a/app/src/main/res/drawable/linphone_logo_tinted.xml b/app/src/main/res/drawable/linphone_logo_tinted.xml
deleted file mode 100644
index e04a976a4..000000000
--- a/app/src/main/res/drawable/linphone_logo_tinted.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <bitmap android:src="@drawable/linphone_logo"
-            android:tint="?attr/accentColor"/>
-    </item>
-</selector>
diff --git a/app/src/main/res/drawable/list_detail.xml b/app/src/main/res/drawable/list_detail.xml
deleted file mode 100644
index 271ded33e..000000000
--- a/app/src/main/res/drawable/list_detail.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <bitmap android:src="@drawable/list_details_default"
-            android:tint="?attr/accentColor"/>
-    </item>
-</selector>
diff --git a/app/src/main/res/drawable/menu.xml b/app/src/main/res/drawable/menu.xml
deleted file mode 100644
index 035606757..000000000
--- a/app/src/main/res/drawable/menu.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_enabled="false">
-        <bitmap android:src="@drawable/menu_default"
-            android:tint="@color/light_grey_color"/>
-    </item>
-    <item>
-        <bitmap android:src="@drawable/menu_default"
-            android:tint="@color/white_color"/>
-    </item>
-</selector>
diff --git a/app/src/main/res/drawable/menu_about.xml b/app/src/main/res/drawable/menu_about.xml
deleted file mode 100644
index 9fbb4ec59..000000000
--- a/app/src/main/res/drawable/menu_about.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true">
-        <bitmap android:src="@drawable/menu_about_default"
-            android:tint="?attr/drawableTintOverColor"/>
-    </item>
-    <item android:state_enabled="false">
-        <bitmap android:src="@drawable/menu_about_default"
-            android:tint="?attr/drawableTintDisabledColor"/>
-    </item>
-    <item>
-        <bitmap android:src="@drawable/menu_about_default"
-            android:tint="?attr/drawableTintColor"/>
-    </item>
-</selector>
diff --git a/app/src/main/res/drawable/menu_assistant.xml b/app/src/main/res/drawable/menu_assistant.xml
deleted file mode 100644
index 44b13bd10..000000000
--- a/app/src/main/res/drawable/menu_assistant.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true">
-        <bitmap android:src="@drawable/menu_assistant_default"
-            android:tint="?attr/drawableTintOverColor"/>
-    </item>
-    <item android:state_enabled="false">
-        <bitmap android:src="@drawable/menu_assistant_default"
-            android:tint="?attr/drawableTintDisabledColor"/>
-    </item>
-    <item>
-        <bitmap android:src="@drawable/menu_assistant_default"
-            android:tint="?attr/drawableTintColor"/>
-    </item>
-</selector>
diff --git a/app/src/main/res/drawable/menu_background.xml b/app/src/main/res/drawable/menu_background.xml
deleted file mode 100644
index 414e4d2eb..000000000
--- a/app/src/main/res/drawable/menu_background.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true"
-        android:drawable="@drawable/menu_pressed_background_color" />
-    <item
-        android:drawable="@drawable/menu_background_color" />
-</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/menu_background_color.xml b/app/src/main/res/drawable/menu_background_color.xml
deleted file mode 100644
index b0f1a4a64..000000000
--- a/app/src/main/res/drawable/menu_background_color.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
-    <solid android:color="?attr/backgroundColor"/>
-    <size
-        android:width="@dimen/chat_message_popup_width"
-        android:height="@dimen/chat_message_popup_item_height" />
-</shape>
diff --git a/app/src/main/res/drawable/menu_copy_text.xml b/app/src/main/res/drawable/menu_copy_text.xml
deleted file mode 100644
index 1e3a90666..000000000
--- a/app/src/main/res/drawable/menu_copy_text.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <bitmap android:src="@drawable/menu_copy_text_default"
-            android:tint="?attr/drawableTintColor"/>
-    </item>
-</selector>
diff --git a/app/src/main/res/drawable/menu_delete.xml b/app/src/main/res/drawable/menu_delete.xml
deleted file mode 100644
index 95753c8e2..000000000
--- a/app/src/main/res/drawable/menu_delete.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <bitmap android:src="@drawable/menu_delete_default"
-            android:tint="@color/red_color"/>
-    </item>
-</selector>
diff --git a/app/src/main/res/drawable/menu_forward.xml b/app/src/main/res/drawable/menu_forward.xml
deleted file mode 100644
index 15c32f263..000000000
--- a/app/src/main/res/drawable/menu_forward.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <bitmap android:src="@drawable/menu_forward_default"
-            android:tint="?attr/drawableTintColor"/>
-    </item>
-</selector>
diff --git a/app/src/main/res/drawable/menu_imdn_info.xml b/app/src/main/res/drawable/menu_imdn_info.xml
deleted file mode 100644
index d15e39140..000000000
--- a/app/src/main/res/drawable/menu_imdn_info.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <bitmap android:src="@drawable/menu_group_info_default"
-            android:tint="?attr/drawableTintColor"/>
-    </item>
-</selector>
diff --git a/app/src/main/res/drawable/menu_options.xml b/app/src/main/res/drawable/menu_options.xml
deleted file mode 100644
index 056ff36da..000000000
--- a/app/src/main/res/drawable/menu_options.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true">
-        <bitmap android:src="@drawable/menu_options_default"
-            android:tint="?attr/drawableTintOverColor"/>
-    </item>
-    <item android:state_enabled="false">
-        <bitmap android:src="@drawable/menu_options_default"
-            android:tint="?attr/drawableTintDisabledColor"/>
-    </item>
-    <item>
-        <bitmap android:src="@drawable/menu_options_default"
-            android:tint="?attr/drawableTintColor"/>
-    </item>
-</selector>
diff --git a/app/src/main/res/drawable/menu_pressed_background_color.xml b/app/src/main/res/drawable/menu_pressed_background_color.xml
deleted file mode 100644
index ae56471dd..000000000
--- a/app/src/main/res/drawable/menu_pressed_background_color.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
-    <solid android:color="?attr/dividerColor"/>
-    <size
-        android:width="@dimen/chat_message_popup_width"
-        android:height="@dimen/chat_message_popup_item_height" />
-</shape>
diff --git a/app/src/main/res/drawable/menu_recordings.xml b/app/src/main/res/drawable/menu_recordings.xml
deleted file mode 100644
index e4d5f5e5e..000000000
--- a/app/src/main/res/drawable/menu_recordings.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true">
-        <bitmap android:src="@drawable/menu_recordings_default"
-            android:tint="?attr/drawableTintOverColor"/>
-    </item>
-    <item android:state_enabled="false">
-        <bitmap android:src="@drawable/menu_recordings_default"
-            android:tint="?attr/drawableTintDisabledColor"/>
-    </item>
-    <item>
-        <bitmap android:src="@drawable/menu_recordings_default"
-            android:tint="?attr/drawableTintColor"/>
-    </item>
-</selector>
diff --git a/app/src/main/res/drawable/menu_reply.xml b/app/src/main/res/drawable/menu_reply.xml
deleted file mode 100644
index c3099128f..000000000
--- a/app/src/main/res/drawable/menu_reply.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <bitmap android:src="@drawable/menu_reply_default"
-            android:tint="?attr/drawableTintColor"/>
-    </item>
-</selector>
diff --git a/app/src/main/res/drawable/numpad_eight.xml b/app/src/main/res/drawable/numpad_eight.xml
deleted file mode 100644
index eba2595e3..000000000
--- a/app/src/main/res/drawable/numpad_eight.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true">
-        <bitmap android:src="@drawable/numpad_8"
-            android:tint="?attr/accentColor"/>
-    </item>
-    <item>
-        <bitmap android:src="@drawable/numpad_8"
-            android:tint="?attr/drawableTintColor"/>
-    </item>
-</selector>
-
diff --git a/app/src/main/res/drawable/numpad_five.xml b/app/src/main/res/drawable/numpad_five.xml
deleted file mode 100644
index bd19a35a0..000000000
--- a/app/src/main/res/drawable/numpad_five.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true">
-        <bitmap android:src="@drawable/numpad_5"
-            android:tint="?attr/accentColor"/>
-    </item>
-    <item>
-        <bitmap android:src="@drawable/numpad_5"
-            android:tint="?attr/drawableTintColor"/>
-    </item>
-</selector>
diff --git a/app/src/main/res/drawable/numpad_four.xml b/app/src/main/res/drawable/numpad_four.xml
deleted file mode 100644
index 791010381..000000000
--- a/app/src/main/res/drawable/numpad_four.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true">
-        <bitmap android:src="@drawable/numpad_4"
-            android:tint="?attr/accentColor"/>
-    </item>
-    <item>
-        <bitmap android:src="@drawable/numpad_4"
-            android:tint="?attr/drawableTintColor"/>
-    </item>
-</selector>
diff --git a/app/src/main/res/drawable/numpad_nine.xml b/app/src/main/res/drawable/numpad_nine.xml
deleted file mode 100644
index 4fcf8ba72..000000000
--- a/app/src/main/res/drawable/numpad_nine.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true">
-        <bitmap android:src="@drawable/numpad_9"
-            android:tint="?attr/accentColor"/>
-    </item>
-    <item>
-        <bitmap android:src="@drawable/numpad_9"
-            android:tint="?attr/drawableTintColor"/>
-    </item>
-</selector>
diff --git a/app/src/main/res/drawable/numpad_one.xml b/app/src/main/res/drawable/numpad_one.xml
deleted file mode 100644
index 392b53e3f..000000000
--- a/app/src/main/res/drawable/numpad_one.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true">
-        <bitmap android:src="@drawable/numpad_1"
-            android:tint="?attr/accentColor"/>
-    </item>
-    <item>
-        <bitmap android:src="@drawable/numpad_1"
-            android:tint="?attr/drawableTintColor"/>
-    </item>
-</selector>
diff --git a/app/src/main/res/drawable/numpad_seven.xml b/app/src/main/res/drawable/numpad_seven.xml
deleted file mode 100644
index a8aad2d4f..000000000
--- a/app/src/main/res/drawable/numpad_seven.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true">
-        <bitmap android:src="@drawable/numpad_7"
-            android:tint="?attr/accentColor"/>
-    </item>
-    <item>
-        <bitmap android:src="@drawable/numpad_7"
-            android:tint="?attr/drawableTintColor"/>
-    </item>
-</selector>
diff --git a/app/src/main/res/drawable/numpad_sharp.xml b/app/src/main/res/drawable/numpad_sharp.xml
deleted file mode 100644
index 84bbed502..000000000
--- a/app/src/main/res/drawable/numpad_sharp.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true">
-        <bitmap android:src="@drawable/numpad_hash"
-            android:tint="?attr/accentColor"/>
-    </item>
-    <item>
-        <bitmap android:src="@drawable/numpad_hash"
-            android:tint="?attr/drawableTintColor"/>
-    </item>
-</selector>
diff --git a/app/src/main/res/drawable/numpad_six.xml b/app/src/main/res/drawable/numpad_six.xml
deleted file mode 100644
index de101da62..000000000
--- a/app/src/main/res/drawable/numpad_six.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true">
-        <bitmap android:src="@drawable/numpad_6"
-            android:tint="?attr/accentColor"/>
-    </item>
-    <item>
-        <bitmap android:src="@drawable/numpad_6"
-            android:tint="?attr/drawableTintColor"/>
-    </item>
-</selector>
diff --git a/app/src/main/res/drawable/numpad_star_digit.xml b/app/src/main/res/drawable/numpad_star_digit.xml
deleted file mode 100644
index 985778188..000000000
--- a/app/src/main/res/drawable/numpad_star_digit.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true">
-        <bitmap android:src="@drawable/numpad_star"
-            android:tint="?attr/accentColor"/>
-    </item>
-    <item>
-        <bitmap android:src="@drawable/numpad_star"
-            android:tint="?attr/drawableTintColor"/>
-    </item>
-</selector>
diff --git a/app/src/main/res/drawable/numpad_three.xml b/app/src/main/res/drawable/numpad_three.xml
deleted file mode 100644
index ed428bb70..000000000
--- a/app/src/main/res/drawable/numpad_three.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true">
-        <bitmap android:src="@drawable/numpad_3"
-            android:tint="?attr/accentColor"/>
-    </item>
-    <item>
-        <bitmap android:src="@drawable/numpad_3"
-            android:tint="?attr/drawableTintColor"/>
-    </item>
-</selector>
diff --git a/app/src/main/res/drawable/numpad_two.xml b/app/src/main/res/drawable/numpad_two.xml
deleted file mode 100644
index 3762419f4..000000000
--- a/app/src/main/res/drawable/numpad_two.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true">
-        <bitmap android:src="@drawable/numpad_2"
-            android:tint="?attr/accentColor"/>
-    </item>
-    <item>
-        <bitmap android:src="@drawable/numpad_2"
-            android:tint="?attr/drawableTintColor"/>
-    </item>
-</selector>
diff --git a/app/src/main/res/drawable/numpad_zero.xml b/app/src/main/res/drawable/numpad_zero.xml
deleted file mode 100644
index c43fe66e8..000000000
--- a/app/src/main/res/drawable/numpad_zero.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true">
-        <bitmap android:src="@drawable/numpad_0"
-            android:tint="?attr/accentColor"/>
-    </item>
-    <item>
-        <bitmap android:src="@drawable/numpad_0"
-            android:tint="?attr/drawableTintColor"/>
-    </item>
-</selector>
diff --git a/app/src/main/res/drawable/record_audio_message.xml b/app/src/main/res/drawable/record_audio_message.xml
deleted file mode 100644
index a3b70050b..000000000
--- a/app/src/main/res/drawable/record_audio_message.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true">
-        <bitmap android:src="@drawable/record_audio_message_default"
-            android:tint="?attr/drawableTintOverColor"/>
-    </item>
-    <item android:state_selected="true">
-        <bitmap android:src="@drawable/record_audio_message_default"
-            android:tint="?attr/drawableTintOverColor"/>
-    </item>
-    <item android:state_enabled="false">
-        <bitmap android:src="@drawable/record_audio_message_default"
-            android:tint="?attr/drawableTintDisabledColor"/>
-    </item>
-    <item>
-        <bitmap android:src="@drawable/record_audio_message_default"
-            android:tint="?attr/drawableTintColor"/>
-    </item>
-</selector>
-
diff --git a/app/src/main/res/drawable/record_pause_dark.xml b/app/src/main/res/drawable/record_pause_dark.xml
deleted file mode 100644
index 7e7a59878..000000000
--- a/app/src/main/res/drawable/record_pause_dark.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <bitmap android:src="@drawable/record_pause_default"
-            android:tint="@color/dark_grey_color"/>
-    </item>
-</selector>
-
diff --git a/app/src/main/res/drawable/record_pause_light.xml b/app/src/main/res/drawable/record_pause_light.xml
deleted file mode 100644
index 5af5e7552..000000000
--- a/app/src/main/res/drawable/record_pause_light.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <bitmap android:src="@drawable/record_pause_default"
-            android:tint="@color/toolbar_color"/>
-    </item>
-</selector>
-
diff --git a/app/src/main/res/drawable/record_play_dark.xml b/app/src/main/res/drawable/record_play_dark.xml
deleted file mode 100644
index 33721dc80..000000000
--- a/app/src/main/res/drawable/record_play_dark.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <bitmap android:src="@drawable/record_play_default"
-            android:tint="@color/dark_grey_color"/>
-    </item>
-</selector>
-
diff --git a/app/src/main/res/drawable/record_play_light.xml b/app/src/main/res/drawable/record_play_light.xml
deleted file mode 100644
index f17480c37..000000000
--- a/app/src/main/res/drawable/record_play_light.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <bitmap android:src="@drawable/record_play_default"
-            android:tint="@color/toolbar_color"/>
-    </item>
-</selector>
-
diff --git a/app/src/main/res/drawable/record_stop_light.xml b/app/src/main/res/drawable/record_stop_light.xml
deleted file mode 100644
index 1d80da938..000000000
--- a/app/src/main/res/drawable/record_stop_light.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <bitmap android:src="@drawable/record_stop_default"
-            android:tint="@color/toolbar_color"/>
-    </item>
-</selector>
-
diff --git a/app/src/main/res/drawable/recording_play_pause.xml b/app/src/main/res/drawable/recording_play_pause.xml
deleted file mode 100644
index cb4e8130a..000000000
--- a/app/src/main/res/drawable/recording_play_pause.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_selected="true">
-        <bitmap android:src="@drawable/record_pause_default"
-            android:tint="?attr/accentColor"/>
-    </item>
-    <item>
-        <bitmap android:src="@drawable/record_play_default"
-            android:tint="?attr/accentColor"/>
-    </item>
-</selector>
diff --git a/app/src/main/res/drawable/rect_orange_button.xml b/app/src/main/res/drawable/rect_orange_button.xml
deleted file mode 100644
index 683e0fb36..000000000
--- a/app/src/main/res/drawable/rect_orange_button.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_enabled="false"
-        android:drawable="@drawable/shape_rect_orange_disabled_button" />
-    <item android:state_pressed="true"
-        android:drawable="@drawable/shape_rect_green_button" />
-    <item
-        android:drawable="@drawable/shape_rect_orange_button" />
-</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/resizable_assistant_button.xml b/app/src/main/res/drawable/resizable_assistant_button.xml
deleted file mode 100644
index eeef6ce02..000000000
--- a/app/src/main/res/drawable/resizable_assistant_button.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:state_enabled="false"
-		android:drawable="@drawable/resizable_assistant_button_disabled" />
-	<item android:state_pressed="true"
-		android:drawable="@drawable/resizable_assistant_button_over" />
-	<item
-		android:drawable="@drawable/resizable_assistant_button_default" />
-</selector>
diff --git a/app/src/main/res/drawable/round_button_background.xml b/app/src/main/res/drawable/round_button_background.xml
deleted file mode 100644
index 5a67aa4b6..000000000
--- a/app/src/main/res/drawable/round_button_background.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item
-		android:drawable="@drawable/round_button_background_default" />
-</selector>
diff --git a/app/src/main/res/drawable/round_button_background_default.xml b/app/src/main/res/drawable/round_button_background_default.xml
deleted file mode 100644
index 63eba8a5c..000000000
--- a/app/src/main/res/drawable/round_button_background_default.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval">
-    <solid android:color="?attr/drawableTintColor3"/>
-    <size android:width="30dp" android:height="30dp"/>
-</shape>
diff --git a/app/src/main/res/drawable/round_orange_button_background.xml b/app/src/main/res/drawable/round_orange_button_background.xml
deleted file mode 100644
index 5c7e546c9..000000000
--- a/app/src/main/res/drawable/round_orange_button_background.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:state_pressed="true"
-		  android:drawable="@drawable/round_orange_button_background_over" />
-	<item android:state_enabled="false"
-		android:drawable="@drawable/round_orange_button_background_disabled" />
-	<item
-		android:drawable="@drawable/round_orange_button_background_default" />
-</selector>
diff --git a/app/src/main/res/drawable/round_orange_button_background_default.xml b/app/src/main/res/drawable/round_orange_button_background_default.xml
deleted file mode 100644
index 211384486..000000000
--- a/app/src/main/res/drawable/round_orange_button_background_default.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval">
-    <solid android:color="@color/primary_color"/>
-    <size android:width="30dp" android:height="30dp"/>
-</shape>
diff --git a/app/src/main/res/drawable/round_orange_button_background_disabled.xml b/app/src/main/res/drawable/round_orange_button_background_disabled.xml
deleted file mode 100644
index 0ec6324be..000000000
--- a/app/src/main/res/drawable/round_orange_button_background_disabled.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval">
-    <solid android:color="@color/grey_color"/>
-    <size android:width="30dp" android:height="30dp"/>
-</shape>
diff --git a/app/src/main/res/drawable/round_orange_button_background_over.xml b/app/src/main/res/drawable/round_orange_button_background_over.xml
deleted file mode 100644
index abad4e866..000000000
--- a/app/src/main/res/drawable/round_orange_button_background_over.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval">
-    <solid android:color="@color/green_color"/>
-    <size android:width="30dp" android:height="30dp"/>
-</shape>
diff --git a/app/src/main/res/drawable/round_recording_button_background_dark.xml b/app/src/main/res/drawable/round_recording_button_background_dark.xml
deleted file mode 100644
index 70fdb4900..000000000
--- a/app/src/main/res/drawable/round_recording_button_background_dark.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval">
-    <solid android:color="@color/white_color"/>
-    <size android:width="30dp" android:height="30dp"/>
-</shape>
diff --git a/app/src/main/res/drawable/round_recording_button_background_light.xml b/app/src/main/res/drawable/round_recording_button_background_light.xml
deleted file mode 100644
index d6194f718..000000000
--- a/app/src/main/res/drawable/round_recording_button_background_light.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval">
-    <solid android:color="@color/dark_grey_color"/>
-    <size android:width="30dp" android:height="30dp"/>
-</shape>
diff --git a/app/src/main/res/drawable/scroll_to_bottom.xml b/app/src/main/res/drawable/scroll_to_bottom.xml
deleted file mode 100644
index 30ca8234c..000000000
--- a/app/src/main/res/drawable/scroll_to_bottom.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true">
-        <bitmap android:src="@drawable/scroll_to_bottom_default"
-            android:tint="?attr/drawableTintOverColor"/>
-    </item>
-    <item android:state_enabled="false">
-        <bitmap android:src="@drawable/scroll_to_bottom_default"
-            android:tint="?attr/drawableTintDisabledColor"/>
-    </item>
-    <item android:state_selected="true">
-        <bitmap android:src="@drawable/scroll_to_bottom_default"
-            android:tint="?attr/drawableTintOverColor"/>
-    </item>
-    <item>
-        <bitmap android:src="@drawable/scroll_to_bottom_default"
-            android:tint="?attr/drawableTintColor"/>
-    </item>
-</selector>
-
diff --git a/app/src/main/res/drawable/select_all.xml b/app/src/main/res/drawable/select_all.xml
deleted file mode 100644
index 294ddea41..000000000
--- a/app/src/main/res/drawable/select_all.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true">
-        <bitmap android:src="@drawable/select_all_default"
-            android:tint="?attr/drawableTintOverColor"/>
-    </item>
-    <item android:state_enabled="false">
-        <bitmap android:src="@drawable/select_all_default"
-            android:tint="?attr/drawableTintDisabledColor"/>
-    </item>
-    <item>
-        <bitmap android:src="@drawable/select_all_default"
-            android:tint="?attr/drawableTintColor"/>
-    </item>
-</selector>
diff --git a/app/src/main/res/drawable/settings_advanced.xml b/app/src/main/res/drawable/settings_advanced.xml
deleted file mode 100644
index 4d26576b3..000000000
--- a/app/src/main/res/drawable/settings_advanced.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true">
-        <bitmap android:src="@drawable/settings_advanced_default"
-            android:tint="?attr/accentColor"/>
-    </item>
-
-    <item>
-        <bitmap android:src="@drawable/settings_advanced_default"
-            android:tint="?attr/drawableTintColor"/>
-    </item>
-</selector>
-
diff --git a/app/src/main/res/drawable/settings_audio.xml b/app/src/main/res/drawable/settings_audio.xml
deleted file mode 100644
index bd1f54345..000000000
--- a/app/src/main/res/drawable/settings_audio.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true">
-        <bitmap android:src="@drawable/settings_audio_default"
-            android:tint="?attr/accentColor"/>
-    </item>
-
-    <item>
-        <bitmap android:src="@drawable/settings_audio_default"
-            android:tint="?attr/drawableTintColor"/>
-    </item>
-</selector>
-
diff --git a/app/src/main/res/drawable/settings_call.xml b/app/src/main/res/drawable/settings_call.xml
deleted file mode 100644
index 1eaeea4cd..000000000
--- a/app/src/main/res/drawable/settings_call.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true">
-        <bitmap android:src="@drawable/settings_call_default"
-            android:tint="?attr/accentColor"/>
-    </item>
-
-    <item>
-        <bitmap android:src="@drawable/settings_call_default"
-            android:tint="?attr/drawableTintColor"/>
-    </item>
-</selector>
-
diff --git a/app/src/main/res/drawable/settings_chat.xml b/app/src/main/res/drawable/settings_chat.xml
deleted file mode 100644
index 91f3146d7..000000000
--- a/app/src/main/res/drawable/settings_chat.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true">
-        <bitmap android:src="@drawable/settings_chat_default"
-            android:tint="?attr/accentColor"/>
-    </item>
-
-    <item>
-        <bitmap android:src="@drawable/settings_chat_default"
-            android:tint="?attr/drawableTintColor"/>
-    </item>
-</selector>
-
diff --git a/app/src/main/res/drawable/settings_conferences.xml b/app/src/main/res/drawable/settings_conferences.xml
deleted file mode 100644
index 1c4d4d873..000000000
--- a/app/src/main/res/drawable/settings_conferences.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true">
-        <bitmap android:src="@drawable/settings_conferences_default"
-            android:tint="?attr/accentColor"/>
-    </item>
-    <item>
-        <bitmap android:src="@drawable/settings_conferences_default"
-            android:tint="?attr/drawableTintColor"/>
-    </item>
-</selector>
-
diff --git a/app/src/main/res/drawable/settings_contacts.xml b/app/src/main/res/drawable/settings_contacts.xml
deleted file mode 100644
index 134672d7d..000000000
--- a/app/src/main/res/drawable/settings_contacts.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true">
-        <bitmap android:src="@drawable/settings_contacts_default"
-            android:tint="?attr/accentColor"/>
-    </item>
-
-    <item>
-        <bitmap android:src="@drawable/settings_contacts_default"
-            android:tint="?attr/drawableTintColor"/>
-    </item>
-</selector>
-
diff --git a/app/src/main/res/drawable/settings_network.xml b/app/src/main/res/drawable/settings_network.xml
deleted file mode 100644
index 718e0d587..000000000
--- a/app/src/main/res/drawable/settings_network.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true">
-        <bitmap android:src="@drawable/settings_network_default"
-            android:tint="?attr/accentColor"/>
-    </item>
-
-    <item>
-        <bitmap android:src="@drawable/settings_network_default"
-            android:tint="?attr/drawableTintColor"/>
-    </item>
-</selector>
-
diff --git a/app/src/main/res/drawable/settings_video.xml b/app/src/main/res/drawable/settings_video.xml
deleted file mode 100644
index 9d840fda9..000000000
--- a/app/src/main/res/drawable/settings_video.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true">
-        <bitmap android:src="@drawable/settings_video_default"
-            android:tint="?attr/accentColor"/>
-    </item>
-    <item>
-        <bitmap android:src="@drawable/settings_video_default"
-            android:tint="?attr/drawableTintColor"/>
-    </item>
-</selector>
-
diff --git a/app/src/main/res/drawable/shape_audio_only_me_background.xml b/app/src/main/res/drawable/shape_audio_only_me_background.xml
deleted file mode 100644
index 86c42db08..000000000
--- a/app/src/main/res/drawable/shape_audio_only_me_background.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
-    <corners android:radius="6.7dp" />
-    <solid android:color="?attr/voipMeParticipantBackgroundColor"/>
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_audio_only_remote_background.xml b/app/src/main/res/drawable/shape_audio_only_remote_background.xml
deleted file mode 100644
index ec1d610aa..000000000
--- a/app/src/main/res/drawable/shape_audio_only_remote_background.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
-    <corners android:radius="6.7dp" />
-    <solid android:color="?attr/voipParticipantBackgroundColor"/>
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_audio_routes_background.xml b/app/src/main/res/drawable/shape_audio_routes_background.xml
deleted file mode 100644
index 25038835b..000000000
--- a/app/src/main/res/drawable/shape_audio_routes_background.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
-    <corners android:radius="6.7dp" />
-    <solid android:color="@color/voip_gray"/>
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_button_background.xml b/app/src/main/res/drawable/shape_button_background.xml
deleted file mode 100644
index b12bba2b6..000000000
--- a/app/src/main/res/drawable/shape_button_background.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval">
-    <size android:height="60dp" android:width="60dp"/>
-    <solid android:color="@color/voip_gray"/>
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_button_disabled_background.xml b/app/src/main/res/drawable/shape_button_disabled_background.xml
deleted file mode 100644
index b9a64291c..000000000
--- a/app/src/main/res/drawable/shape_button_disabled_background.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval">
-    <size android:height="60dp" android:width="60dp"/>
-    <solid android:color="@color/voip_light_gray"/>
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_button_pressed_background.xml b/app/src/main/res/drawable/shape_button_pressed_background.xml
deleted file mode 100644
index adcc6ce8b..000000000
--- a/app/src/main/res/drawable/shape_button_pressed_background.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval">
-    <size android:height="60dp" android:width="60dp"/>
-    <solid android:color="@color/voip_dark_gray"/>
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_call_answer_background.xml b/app/src/main/res/drawable/shape_call_answer_background.xml
deleted file mode 100644
index f456f09ef..000000000
--- a/app/src/main/res/drawable/shape_call_answer_background.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
-    <corners android:radius="74dp" />
-    <size android:height="60dp" />
-    <solid android:color="@color/green_color" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_call_answer_pressed_background.xml b/app/src/main/res/drawable/shape_call_answer_pressed_background.xml
deleted file mode 100644
index 72b56a9a5..000000000
--- a/app/src/main/res/drawable/shape_call_answer_pressed_background.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
-    <corners android:radius="74dp" />
-    <size android:height="60dp" />
-    <solid android:color="@color/dark_green_color" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_call_numpad_background.xml b/app/src/main/res/drawable/shape_call_numpad_background.xml
deleted file mode 100644
index d5a2c3cd7..000000000
--- a/app/src/main/res/drawable/shape_call_numpad_background.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval">
-    <size android:height="60dp" android:width="60dp" />
-    <solid android:color="@color/voip_numpad_background"/>
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_call_numpad_pressed_background.xml b/app/src/main/res/drawable/shape_call_numpad_pressed_background.xml
deleted file mode 100644
index 8e2fd88e2..000000000
--- a/app/src/main/res/drawable/shape_call_numpad_pressed_background.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval">
-    <size android:height="60dp" android:width="60dp" />
-    <solid android:color="@color/voip_gray_blue_color"/>
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_call_popup_background.xml b/app/src/main/res/drawable/shape_call_popup_background.xml
deleted file mode 100644
index 9c9303055..000000000
--- a/app/src/main/res/drawable/shape_call_popup_background.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
-    <corners android:radius="20dp" />
-    <solid android:color="@color/voip_translucent_popup_alt_background"/>
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_call_recording_off_background.xml b/app/src/main/res/drawable/shape_call_recording_off_background.xml
deleted file mode 100644
index 8fb61094a..000000000
--- a/app/src/main/res/drawable/shape_call_recording_off_background.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval">
-    <size android:width="35dp" android:height="35dp" />
-    <solid android:color="@color/voip_call_record_background"/>
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_call_recording_on_background.xml b/app/src/main/res/drawable/shape_call_recording_on_background.xml
deleted file mode 100644
index 35da9f606..000000000
--- a/app/src/main/res/drawable/shape_call_recording_on_background.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval">
-    <size android:width="35dp" android:height="35dp" />
-    <solid android:color="@color/primary_color"/>
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_call_terminate_background.xml b/app/src/main/res/drawable/shape_call_terminate_background.xml
deleted file mode 100644
index a8b903a58..000000000
--- a/app/src/main/res/drawable/shape_call_terminate_background.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
-    <corners android:radius="74dp" />
-    <size android:height="60dp" />
-    <solid android:color="@color/primary_color" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_call_terminate_pressed_background.xml b/app/src/main/res/drawable/shape_call_terminate_pressed_background.xml
deleted file mode 100644
index 622eae85f..000000000
--- a/app/src/main/res/drawable/shape_call_terminate_pressed_background.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
-    <corners android:radius="74dp" />
-    <size android:height="60dp" />
-    <solid android:color="@color/primary_dark_color" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_conference_active_speaker_border.xml b/app/src/main/res/drawable/shape_conference_active_speaker_border.xml
deleted file mode 100644
index 98a0c1b7f..000000000
--- a/app/src/main/res/drawable/shape_conference_active_speaker_border.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
-    <stroke android:width="2dp" android:color="?attr/colorPrimary"/>
-    <corners android:radius="15dp"/>
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_conference_audio_only_border.xml b/app/src/main/res/drawable/shape_conference_audio_only_border.xml
deleted file mode 100644
index d276b1039..000000000
--- a/app/src/main/res/drawable/shape_conference_audio_only_border.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
-    <stroke android:width="2dp" android:color="?attr/colorPrimary"/>
-    <corners android:radius="6.7dp"/>
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_conference_invite_background.xml b/app/src/main/res/drawable/shape_conference_invite_background.xml
deleted file mode 100644
index 041c8baa4..000000000
--- a/app/src/main/res/drawable/shape_conference_invite_background.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
-    <corners android:radius="@dimen/chat_message_round_corner_radius" />
-    <solid android:color="?attr/backgroundColor3"/>
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_dialog_background.xml b/app/src/main/res/drawable/shape_dialog_background.xml
deleted file mode 100644
index 1321d5ec0..000000000
--- a/app/src/main/res/drawable/shape_dialog_background.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
-    <corners android:radius="7dp" />
-    <solid android:color="@color/dark_grey_color"/>
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_dialog_handle.xml b/app/src/main/res/drawable/shape_dialog_handle.xml
deleted file mode 100644
index 030e5bcf1..000000000
--- a/app/src/main/res/drawable/shape_dialog_handle.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
-    <corners android:radius="5dp"/>
-    <size android:height="5dp" android:width="30dp"/>
-    <solid android:color="@color/voip_light_gray"/>
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_edittext_background.xml b/app/src/main/res/drawable/shape_edittext_background.xml
deleted file mode 100644
index 825ef744b..000000000
--- a/app/src/main/res/drawable/shape_edittext_background.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
-    <stroke android:width="@dimen/conference_schedule_form_field_border_thickness" android:color="?attr/voipFormFieldBackgroundColor" />
-    <corners android:radius="0dp" />
-    <padding android:bottom="3dp" android:left="3dp" android:right="3dp" android:top="3dp" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_extra_buttons_background.xml b/app/src/main/res/drawable/shape_extra_buttons_background.xml
deleted file mode 100644
index 294ee7cb4..000000000
--- a/app/src/main/res/drawable/shape_extra_buttons_background.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
-    <corners android:radius="20dp" />
-    <solid android:color="?attr/voipExtraButtonsBackgroundColor"/>
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_form_field_background.xml b/app/src/main/res/drawable/shape_form_field_background.xml
deleted file mode 100644
index fce78c8c5..000000000
--- a/app/src/main/res/drawable/shape_form_field_background.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
-    <corners android:radius="3dp" />
-    <solid android:color="?attr/voipFormBackgroundColor"/>
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_me_background.xml b/app/src/main/res/drawable/shape_me_background.xml
deleted file mode 100644
index 1efdf15a6..000000000
--- a/app/src/main/res/drawable/shape_me_background.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
-    <corners android:radius="20dp" />
-    <solid android:color="?attr/voipMeParticipantBackgroundColor"/>
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_orange_circle.xml b/app/src/main/res/drawable/shape_orange_circle.xml
deleted file mode 100644
index d894e038a..000000000
--- a/app/src/main/res/drawable/shape_orange_circle.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval">
-    <corners android:radius="5dp" />
-    <size android:height="60dp" android:width="60dp"/>
-    <solid android:color="@color/primary_color"/>
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_own_reaction_background.xml b/app/src/main/res/drawable/shape_own_reaction_background.xml
deleted file mode 100644
index 9821f0651..000000000
--- a/app/src/main/res/drawable/shape_own_reaction_background.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
-    <corners android:radius="10dp" />
-    <solid android:color="@color/voip_light_gray"/>
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_rect_gray_button.xml b/app/src/main/res/drawable/shape_rect_gray_button.xml
deleted file mode 100644
index 7bd9f74ca..000000000
--- a/app/src/main/res/drawable/shape_rect_gray_button.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
-    <corners android:radius="5dp" />
-    <size android:height="20dp" android:width="20dp"/>
-    <solid android:color="@color/voip_gray"/>
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_rect_green_button.xml b/app/src/main/res/drawable/shape_rect_green_button.xml
deleted file mode 100644
index 0a51a8db5..000000000
--- a/app/src/main/res/drawable/shape_rect_green_button.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
-    <corners android:radius="5dp" />
-    <size android:height="20dp" android:width="20dp"/>
-    <solid android:color="@color/green_color"/>
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_rect_light_gray_button.xml b/app/src/main/res/drawable/shape_rect_light_gray_button.xml
deleted file mode 100644
index 6e2eaa7ba..000000000
--- a/app/src/main/res/drawable/shape_rect_light_gray_button.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
-    <corners android:radius="5dp" />
-    <size android:height="20dp" android:width="20dp"/>
-    <solid android:color="@color/voip_light_gray"/>
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_rect_orange_button.xml b/app/src/main/res/drawable/shape_rect_orange_button.xml
deleted file mode 100644
index e239fdbfc..000000000
--- a/app/src/main/res/drawable/shape_rect_orange_button.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
-    <corners android:radius="5dp" />
-    <size android:height="20dp" android:width="20dp"/>
-    <solid android:color="@color/primary_color"/>
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_rect_orange_disabled_button.xml b/app/src/main/res/drawable/shape_rect_orange_disabled_button.xml
deleted file mode 100644
index 7928e4f48..000000000
--- a/app/src/main/res/drawable/shape_rect_orange_disabled_button.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
-    <corners android:radius="5dp" />
-    <size android:height="20dp" android:width="20dp"/>
-    <solid android:color="@color/primary_color_disabled"/>
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_remote_background.xml b/app/src/main/res/drawable/shape_remote_background.xml
deleted file mode 100644
index f77318418..000000000
--- a/app/src/main/res/drawable/shape_remote_background.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
-    <corners android:radius="20dp" />
-    <solid android:color="?attr/voipParticipantBackgroundColor"/>
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_remote_paused_background.xml b/app/src/main/res/drawable/shape_remote_paused_background.xml
deleted file mode 100644
index 8663b555c..000000000
--- a/app/src/main/res/drawable/shape_remote_paused_background.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
-    <corners android:radius="20dp" />
-    <solid android:color="@color/voip_conference_participant_paused_background"/>
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_remote_recording_background.xml b/app/src/main/res/drawable/shape_remote_recording_background.xml
deleted file mode 100644
index 7247f620a..000000000
--- a/app/src/main/res/drawable/shape_remote_recording_background.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
-    <corners android:radius="45dp" />
-    <solid android:color="@color/dark_grey_color"/>
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_remote_video_background.xml b/app/src/main/res/drawable/shape_remote_video_background.xml
deleted file mode 100644
index 6b924bcef..000000000
--- a/app/src/main/res/drawable/shape_remote_video_background.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
-    <corners android:radius="20dp" />
-    <solid android:color="@color/black_color"/>
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_round_button.xml b/app/src/main/res/drawable/shape_round_button.xml
deleted file mode 100644
index e4607cb25..000000000
--- a/app/src/main/res/drawable/shape_round_button.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval">
-    <size android:height="60dp" android:width="60dp"/>
-    <solid android:color="@color/primary_color"/>
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_round_button_disabled.xml b/app/src/main/res/drawable/shape_round_button_disabled.xml
deleted file mode 100644
index b9a64291c..000000000
--- a/app/src/main/res/drawable/shape_round_button_disabled.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval">
-    <size android:height="60dp" android:width="60dp"/>
-    <solid android:color="@color/voip_light_gray"/>
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_round_button_pressed.xml b/app/src/main/res/drawable/shape_round_button_pressed.xml
deleted file mode 100644
index adcc6ce8b..000000000
--- a/app/src/main/res/drawable/shape_round_button_pressed.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval">
-    <size android:height="60dp" android:width="60dp"/>
-    <solid android:color="@color/voip_dark_gray"/>
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_round_dark_gray_background.xml b/app/src/main/res/drawable/shape_round_dark_gray_background.xml
deleted file mode 100644
index d1cf0fab4..000000000
--- a/app/src/main/res/drawable/shape_round_dark_gray_background.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
-    <corners android:radius="7dp" />
-    <solid android:color="?attr/backgroundColor3"/>
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_round_dark_gray_background_with_orange_border.xml b/app/src/main/res/drawable/shape_round_dark_gray_background_with_orange_border.xml
deleted file mode 100644
index dfd68923b..000000000
--- a/app/src/main/res/drawable/shape_round_dark_gray_background_with_orange_border.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
-    <corners android:radius="7dp" />
-    <solid android:color="?attr/backgroundColor3"/>
-    <stroke android:width="2dp" android:color="?attr/colorPrimary"/>
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_round_gray_background.xml b/app/src/main/res/drawable/shape_round_gray_background.xml
deleted file mode 100644
index adc21b355..000000000
--- a/app/src/main/res/drawable/shape_round_gray_background.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
-    <corners android:radius="7dp" />
-    <solid android:color="?attr/backgroundColor4"/>
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_round_gray_background_with_orange_border.xml b/app/src/main/res/drawable/shape_round_gray_background_with_orange_border.xml
deleted file mode 100644
index 2dd378d80..000000000
--- a/app/src/main/res/drawable/shape_round_gray_background_with_orange_border.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
-    <corners android:radius="7dp" />
-    <solid android:color="?attr/backgroundColor4"/>
-    <stroke android:width="2dp" android:color="?attr/colorPrimary"/>
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_round_red_background.xml b/app/src/main/res/drawable/shape_round_red_background.xml
deleted file mode 100644
index 9cc11d1e7..000000000
--- a/app/src/main/res/drawable/shape_round_red_background.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
-    <corners android:radius="7dp" />
-    <solid android:color="?attr/voipCancelledMeetingBackgroundColor"/>
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_round_red_background_with_orange_border.xml b/app/src/main/res/drawable/shape_round_red_background_with_orange_border.xml
deleted file mode 100644
index 033bc92ea..000000000
--- a/app/src/main/res/drawable/shape_round_red_background_with_orange_border.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
-    <corners android:radius="7dp" />
-    <solid android:color="?attr/voipCancelledMeetingBackgroundColor"/>
-    <stroke android:width="2dp" android:color="?attr/colorPrimary"/>
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_toggle_disabled_background.xml b/app/src/main/res/drawable/shape_toggle_disabled_background.xml
deleted file mode 100644
index b9a64291c..000000000
--- a/app/src/main/res/drawable/shape_toggle_disabled_background.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval">
-    <size android:height="60dp" android:width="60dp"/>
-    <solid android:color="@color/voip_light_gray"/>
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_toggle_off_background.xml b/app/src/main/res/drawable/shape_toggle_off_background.xml
deleted file mode 100644
index b12bba2b6..000000000
--- a/app/src/main/res/drawable/shape_toggle_off_background.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval">
-    <size android:height="60dp" android:width="60dp"/>
-    <solid android:color="@color/voip_gray"/>
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_toggle_on_background.xml b/app/src/main/res/drawable/shape_toggle_on_background.xml
deleted file mode 100644
index e4607cb25..000000000
--- a/app/src/main/res/drawable/shape_toggle_on_background.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval">
-    <size android:height="60dp" android:width="60dp"/>
-    <solid android:color="@color/primary_color"/>
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_toggle_pressed_background.xml b/app/src/main/res/drawable/shape_toggle_pressed_background.xml
deleted file mode 100644
index adcc6ce8b..000000000
--- a/app/src/main/res/drawable/shape_toggle_pressed_background.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval">
-    <size android:height="60dp" android:width="60dp"/>
-    <solid android:color="@color/voip_dark_gray"/>
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_transparent_reaction_background.xml b/app/src/main/res/drawable/shape_transparent_reaction_background.xml
deleted file mode 100644
index 15e76c3b7..000000000
--- a/app/src/main/res/drawable/shape_transparent_reaction_background.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
-    <solid android:color="@color/transparent_color"/>
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/status_led_background.xml b/app/src/main/res/drawable/status_led_background.xml
deleted file mode 100644
index 7147daf3c..000000000
--- a/app/src/main/res/drawable/status_led_background.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval">
-    <solid android:color="@color/white_color"/>
-    <size android:width="20dp" android:height="20dp"/>
-</shape>
diff --git a/app/src/main/res/drawable/unread_message_count_bg.xml b/app/src/main/res/drawable/unread_message_count_bg.xml
deleted file mode 100644
index 940a12693..000000000
--- a/app/src/main/res/drawable/unread_message_count_bg.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval">
-    <solid android:color="@color/primary_color"/>
-    <size android:width="20dp" android:height="20dp"/>
-</shape>
diff --git a/app/src/main/res/drawable/valid.xml b/app/src/main/res/drawable/valid.xml
deleted file mode 100644
index 3be5be72e..000000000
--- a/app/src/main/res/drawable/valid.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true">
-        <bitmap android:src="@drawable/valid_default"
-            android:tint="?attr/drawableTintOverColor"/>
-    </item>
-    <item android:state_enabled="false">
-        <bitmap android:src="@drawable/valid_default"
-            android:tint="?attr/drawableTintDisabledColor"/>
-    </item>
-    <item>
-        <bitmap android:src="@drawable/valid_default"
-            android:tint="?attr/drawableTintColor"/>
-    </item>
-</selector>
diff --git a/app/src/main/res/drawable/vector_linphone_logo.xml b/app/src/main/res/drawable/vector_linphone_logo.xml
deleted file mode 100644
index 9c1d994f9..000000000
--- a/app/src/main/res/drawable/vector_linphone_logo.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:name="vector"
-    android:width="60dp"
-    android:height="60dp"
-    android:viewportWidth="60"
-    android:viewportHeight="60">
-    <group
-        android:name="group"
-        android:translateX="15"
-        android:translateY="15"
-        android:scaleX="0.5"
-        android:scaleY="0.5">
-        <path
-            android:name="path"
-            android:pathData="M 53.893 48.839 C 56.543 45.357 58.459 41.276 59.39 36.828 C 51.515 43.716 41.339 47.882 30.236 47.882 C 19.111 47.882 9.047 43.873 1.173 36.976 C 4.074 50.479 15.993 60.599 30.266 60.599 C 36.279 60.598 41.87 58.797 46.551 55.708 C 49.343 57.294 56.667 61.285 57.624 60.051 C 58.282 59.201 56.671 55.692 56.671 55.692 L 53.893 48.839 Z M 59.301 21.99 C 59.189 21.455 58.702 20.063 58.702 20.063 C 54.383 8.89 42.981 0.963 30.318 0.963 L 30.245 0.963 C 24.273 0.963 18.582 2.728 13.782 5.763 C 11.591 4.504 3.17 -0.209 2.138 1.115 C 1.48 1.962 3.092 5.461 3.092 5.461 L 6.052 12.731 C 4.31 14.952 2.884 17.415 1.86 20.063 C 1.86 20.063 1.373 21.455 1.261 21.99 C 1.101 22.752 0.883 24.274 0.883 24.274 L 4.937 20.151 C 4.937 20.151 7.942 21.927 10.81 22.819 C 11.936 23.168 13.046 23.566 14.185 23.852 C 15.909 24.285 16.698 25.828 16.693 27.244 C 16.688 28.443 16.696 29.639 16.689 30.838 C 16.688 31.38 16.879 31.784 17.365 32.067 C 18.49 32.72 19.705 33.117 20.955 33.44 C 24.199 34.277 26.923 34.736 30.245 34.701 L 30.318 34.701 C 33.64 34.736 36.364 34.277 39.608 33.44 C 40.858 33.117 42.072 32.72 43.198 32.067 C 43.684 31.784 43.874 31.38 43.873 30.838 C 43.866 29.639 43.874 28.443 43.869 27.244 C 43.864 25.828 44.653 24.285 46.377 23.852 C 47.516 23.566 48.628 23.168 49.752 22.819 C 52.62 21.927 55.626 20.151 55.626 20.151 L 59.68 24.274 C 59.68 24.274 59.462 22.752 59.301 21.99"
-            android:fillColor="@color/primary_color"
-            android:strokeWidth="1"/>
-    </group>
-</vector>
diff --git a/app/src/main/res/layout-land/about_fragment.xml b/app/src/main/res/layout-land/about_fragment.xml
deleted file mode 100644
index 3a351bf9f..000000000
--- a/app/src/main/res/layout-land/about_fragment.xml
+++ /dev/null
@@ -1,191 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <data>
-        <import type="android.view.View"/>
-        <variable
-            name="privacyPolicyClickListener"
-            type="android.view.View.OnClickListener"/>
-        <variable
-            name="licenseClickListener"
-            type="android.view.View.OnClickListener"/>
-        <variable
-            name="weblateClickListener"
-            type="android.view.View.OnClickListener"/>
-        <variable
-            name="viewModel"
-            type="org.linphone.activities.main.about.AboutViewModel" />
-    </data>
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="?attr/backgroundColor">
-
-        <LinearLayout
-            android:id="@+id/top_bar"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/main_activity_top_bar_size"
-            android:layout_gravity="center_horizontal"
-            android:background="?attr/lightToolbarBackgroundColor"
-            android:orientation="horizontal">
-
-            <ImageView
-                android:id="@+id/back"
-                android:contentDescription="@string/content_description_go_back"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="0.2"
-                android:background="?attr/button_background_drawable"
-                android:padding="18dp"
-                android:src="@drawable/back" />
-
-            <TextView
-                style="@style/accent_colored_title_font"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="0.6"
-                android:gravity="center"
-                android:singleLine="true"
-                android:ellipsize="end"
-                android:padding="15dp"
-                android:text="@string/about"/>
-
-            <View
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="0.2"
-                android:visibility="invisible" />
-
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_below="@id/top_bar"
-            android:orientation="horizontal"
-            android:baselineAligned="false">
-
-            <LinearLayout
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:background="@color/voip_dark_color2"
-                android:gravity="center"
-                android:orientation="vertical"
-                android:padding="20dp">
-
-                <ImageView
-                    android:layout_width="50dp"
-                    android:layout_height="wrap_content"
-                    android:adjustViewBounds="true"
-                    android:layout_gravity="center"
-                    android:layout_marginBottom="10dp"
-                    android:contentDescription="@null"
-                    android:src="@drawable/linphone_logo_tinted"/>
-
-                <ImageView
-                    android:layout_width="125dp"
-                    android:layout_height="wrap_content"
-                    android:adjustViewBounds="true"
-                    android:layout_gravity="center"
-                    android:contentDescription="@null"
-                    android:src="@drawable/linphone_app_name_logo" />
-
-                <TextView
-                    android:textSize="13sp"
-                    android:textColor="?accentColor"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:text="@string/app_description" />
-
-                <TextView
-                    style="@style/about_version_font"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:gravity="center"
-                    android:paddingTop="20dp"
-                    android:textColorLink="?attr/secondaryTextColor"
-                    android:text="@{String.format(@string/about_version, viewModel.appVersion)}" />
-
-                <TextView
-                    style="@style/about_version_font"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:gravity="center"
-                    android:textColorLink="?attr/secondaryTextColor"
-                    android:text="@{String.format(@string/about_liblinphone_sdk_version, viewModel.sdkVersion)}" />
-
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:gravity="center"
-                android:orientation="vertical"
-                android:background="?attr/backgroundColor"
-                android:padding="10dp">
-
-                <TextView
-                    android:textColor="?attr/accentColor"
-                    android:textSize="16sp"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:autoLink="web"
-                    android:gravity="center"
-                    android:paddingTop="20dp"
-                    android:text="@string/about_link"
-                    android:textColorLink="@color/primary_color" />
-
-                <TextView
-                    android:onClick="@{privacyPolicyClickListener}"
-                    style="@style/about_license_font"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:autoLink="web"
-                    android:paddingTop="10dp"
-                    android:gravity="center"
-                    android:text="@string/about_privacy_policy"
-                    android:textColorLink="@color/primary_color" />
-
-                <TextView
-                    android:onClick="@{licenseClickListener}"
-                    style="@style/about_license_font"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:gravity="center"
-                    android:paddingTop="10dp"
-                    android:paddingBottom="10dp"
-                    android:text="@string/about_text" />
-
-                <TextView
-                    android:onClick="@{weblateClickListener}"
-                    android:textColor="?attr/accentColor"
-                    android:textSize="16sp"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:gravity="center"
-                    android:paddingTop="10dp"
-                    android:paddingBottom="20dp"
-                    android:text="@string/about_weblate_translation" />
-
-                <View
-                    android:layout_width="match_parent"
-                    android:layout_height="1dp"
-                    android:background="?attr/dividerColor" />
-
-            </LinearLayout>
-
-        </LinearLayout>
-
-    </RelativeLayout>
-
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-land/assistant_welcome_fragment.xml b/app/src/main/res/layout-land/assistant_welcome_fragment.xml
deleted file mode 100644
index d89ae4936..000000000
--- a/app/src/main/res/layout-land/assistant_welcome_fragment.xml
+++ /dev/null
@@ -1,166 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools">
-
-    <data>
-        <import type="android.view.View"/>
-        <variable
-            name="createAccountClickListener"
-            type="android.view.View.OnClickListener"/>
-        <variable
-            name="accountLoginClickListener"
-            type="android.view.View.OnClickListener"/>
-        <variable
-            name="genericAccountLoginClickListener"
-            type="android.view.View.OnClickListener"/>
-        <variable
-            name="remoteProvisioningClickListener"
-            type="android.view.View.OnClickListener"/>
-        <variable
-            name="viewModel"
-            type="org.linphone.activities.assistant.viewmodels.WelcomeViewModel" />
-    </data>
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <androidx.fragment.app.FragmentContainerView
-            android:id="@+id/top_bar_fragment"
-            android:name="org.linphone.activities.assistant.fragments.TopBarFragment"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/main_activity_top_bar_size"
-            android:layout_alignParentTop="true"
-            tools:layout="@layout/assistant_top_bar_fragment" />
-
-        <androidx.core.widget.NestedScrollView
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_below="@id/top_bar_fragment">
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical">
-
-                <TextView
-                    style="@style/standard_text_font"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:gravity="center"
-                    android:text="@string/assistant_welcome_title"
-                    android:paddingTop="10dp"
-                    android:textAllCaps="true" />
-
-                <TextView
-                    style="@style/standard_small_text_font"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:gravity="center"
-                    android:layout_gravity="top"
-                    android:paddingTop="10dp"
-                    android:text="@string/assistant_welcome_desc" />
-
-                <GridLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:columnCount="2">
-
-                    <LinearLayout
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="fill"
-                        android:layout_columnSpan="2"
-                        android:orientation="horizontal"
-                        android:layout_margin="10dp">
-
-                        <CheckBox
-                            android:enabled="@{!viewModel.termsAndPrivacyAccepted}"
-                            android:checked="@={viewModel.termsAndPrivacyAccepted}"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"/>
-
-                        <TextView
-                            android:id="@+id/terms_and_privacy"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content" />
-
-                    </LinearLayout>
-
-                    <TextView
-                        android:id="@+id/account_creation"
-                        android:enabled="@{viewModel.termsAndPrivacyAccepted}"
-                        android:visibility="@{viewModel.showCreateAccount ? View.VISIBLE : View.GONE}"
-                        android:onClick="@{createAccountClickListener}"
-                        style="@style/button_font"
-                        android:gravity="center"
-                        android:padding="10dp"
-                        android:layout_margin="20dp"
-                        android:layout_width="wrap_content"
-                        android:layout_gravity="fill"
-                        android:layout_columnWeight="1"
-                        android:layout_height="wrap_content"
-                        android:background="@drawable/assistant_button"
-                        android:textColor="@drawable/assistant_button_text_color"
-                        android:text="@string/assistant_create_account" />
-
-                    <TextView
-                        android:id="@+id/account_connection"
-                        android:enabled="@{viewModel.termsAndPrivacyAccepted}"
-                        android:visibility="@{viewModel.showLinphoneLogin ? View.VISIBLE : View.GONE}"
-                        android:onClick="@{accountLoginClickListener}"
-                        style="@style/button_font"
-                        android:gravity="center"
-                        android:padding="10dp"
-                        android:layout_margin="20dp"
-                        android:layout_width="wrap_content"
-                        android:layout_gravity="fill"
-                        android:layout_columnWeight="1"
-                        android:layout_height="wrap_content"
-                        android:background="@drawable/assistant_button"
-                        android:textColor="@drawable/assistant_button_text_color"
-                        android:text="@string/assistant_login_linphone" />
-
-                    <TextView
-                        android:id="@+id/generic_connection"
-                        android:enabled="@{viewModel.termsAndPrivacyAccepted}"
-                        android:visibility="@{viewModel.showGenericLogin ? View.VISIBLE : View.GONE}"
-                        android:onClick="@{genericAccountLoginClickListener}"
-                        style="@style/button_font"
-                        android:gravity="center"
-                        android:padding="10dp"
-                        android:layout_margin="20dp"
-                        android:layout_width="wrap_content"
-                        android:layout_gravity="fill"
-                        android:layout_columnWeight="1"
-                        android:layout_height="wrap_content"
-                        android:background="@drawable/assistant_button"
-                        android:textColor="@drawable/assistant_button_text_color"
-                        android:text="@string/assistant_login_generic" />
-
-                    <TextView
-                        android:id="@+id/remote_configuration"
-                        android:enabled="@{viewModel.termsAndPrivacyAccepted}"
-                        android:visibility="@{viewModel.showRemoteProvisioning ? View.VISIBLE : View.GONE}"
-                        android:onClick="@{remoteProvisioningClickListener}"
-                        style="@style/button_font"
-                        android:gravity="center"
-                        android:padding="10dp"
-                        android:layout_margin="20dp"
-                        android:layout_width="wrap_content"
-                        android:layout_gravity="fill"
-                        android:layout_columnWeight="1"
-                        android:layout_height="wrap_content"
-                        android:background="@drawable/assistant_button"
-                        android:textColor="@drawable/assistant_button_text_color"
-                        android:text="@string/assistant_remote_provisioning" />
-
-                </GridLayout>
-
-            </LinearLayout>
-
-        </androidx.core.widget.NestedScrollView>
-
-    </RelativeLayout>
-
-</layout>
diff --git a/app/src/main/res/layout-land/conference_waiting_room_fragment.xml b/app/src/main/res/layout-land/conference_waiting_room_fragment.xml
deleted file mode 100644
index 64c9d3c78..000000000
--- a/app/src/main/res/layout-land/conference_waiting_room_fragment.xml
+++ /dev/null
@@ -1,312 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <data>
-
-        <import type="android.view.View" />
-
-        <import type="org.linphone.activities.voip.ConferenceDisplayMode" />
-
-        <variable
-            name="viewModel"
-            type="org.linphone.activities.main.conference.viewmodels.ConferenceWaitingRoomViewModel" />
-    </data>
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="?attr/voipBackgroundColor">
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:background="@drawable/shape_remote_video_background"
-            android:visibility="@{viewModel.isVideoEnabled ? View.VISIBLE : View.GONE, default=gone}">
-
-            <org.linphone.activities.voip.views.RoundCornersTextureView
-                android:id="@+id/local_preview_video_surface"
-                android:layout_width="0dp"
-                android:layout_height="0dp"
-                app:alignTopRight="false"
-                app:displayMode="occupy_all_space"
-                app:radius="0"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
-
-            <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_margin="5dp"
-                android:contentDescription="@string/content_description_switch_camera"
-                android:enabled="@{!viewModel.joinInProgress}"
-                android:onClick="@{() -> viewModel.switchCamera()}"
-                android:padding="10dp"
-                android:src="@drawable/icon_call_camera_switch"
-                android:visibility="@{viewModel.isSwitchCameraAvailable ? View.VISIBLE : View.GONE}"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
-
-        </androidx.constraintlayout.widget.ConstraintLayout>
-
-        <TextView
-            android:id="@+id/conference_subject"
-            style="@style/conference_waiting_room_subject_font"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerHorizontal="true"
-            android:layout_margin="20dp"
-            android:ellipsize="end"
-            android:maxLines="1"
-            android:text="@{viewModel.subject, default=`Conference subject`}" />
-
-        <TextView
-            style="@style/conference_waiting_room_no_video_font"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerInParent="true"
-            android:text="@string/conference_waiting_room_video_disabled"
-            android:visibility="@{viewModel.isVideoEnabled ? View.GONE : View.VISIBLE}" />
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:id="@+id/conference_controls"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_above="@id/buttons"
-            android:layout_marginBottom="20dp"
-            android:orientation="horizontal">
-
-            <TextView
-                android:id="@+id/cancel"
-                style="@style/big_orange_button_font"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="20dp"
-                android:layout_marginEnd="10dp"
-                android:layout_weight="1"
-                android:background="@drawable/shape_rect_gray_button"
-                android:gravity="center"
-                android:onClick="@{() -> viewModel.cancel()}"
-                android:paddingLeft="20dp"
-                android:paddingTop="8dp"
-                android:paddingRight="20dp"
-                android:paddingBottom="8dp"
-                android:text="@string/conference_waiting_room_cancel_call"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toStartOf="@id/start"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintHorizontal_chainStyle="spread"
-                app:layout_constraintWidth_max="@dimen/conference_waiting_room_buttons_max_width"/>
-
-            <TextView
-                android:id="@+id/start"
-                style="@style/big_orange_button_bold_font"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="10dp"
-                android:layout_marginEnd="20dp"
-                android:layout_weight="1"
-                android:background="@drawable/button_orange_background"
-                android:enabled="@{!viewModel.joinInProgress}"
-                android:gravity="center"
-                android:onClick="@{() -> viewModel.start()}"
-                android:paddingLeft="20dp"
-                android:paddingTop="8dp"
-                android:paddingRight="20dp"
-                android:paddingBottom="8dp"
-                android:text="@string/conference_waiting_room_start_call"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toEndOf="@id/cancel"
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintWidth_max="@dimen/conference_waiting_room_buttons_max_width" />
-
-        </androidx.constraintlayout.widget.ConstraintLayout>
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_above="@id/buttons"
-            android:layout_centerHorizontal="true"
-            android:layout_marginBottom="10dp"
-            android:background="@drawable/shape_audio_routes_background"
-            android:translationY="@{viewModel.audioRoutesMenuTranslateY, default=@dimen/voip_audio_routes_menu_translate_y}"
-            android:orientation="vertical">
-
-            <ImageView
-                android:layout_width="@dimen/voip_call_button_size"
-                android:layout_height="@dimen/voip_call_button_size"
-                android:layout_margin="5dp"
-                android:background="@drawable/button_toggle_background_reverse"
-                android:contentDescription="@string/content_description_use_bluetooth_headset"
-                android:onClick="@{() -> viewModel.setBluetoothAudioRoute()}"
-                android:selected="@{viewModel.isBluetoothHeadsetSelected}"
-                android:src="@drawable/icon_bluetooth" />
-
-            <ImageView
-                android:layout_width="@dimen/voip_call_button_size"
-                android:layout_height="@dimen/voip_call_button_size"
-                android:layout_margin="5dp"
-                android:background="@drawable/button_toggle_background_reverse"
-                android:contentDescription="@string/content_description_use_earpiece"
-                android:onClick="@{() -> viewModel.setEarpieceAudioRoute()}"
-                android:selected="@{!viewModel.isSpeakerSelected &amp;&amp; !viewModel.isBluetoothHeadsetSelected}"
-                android:src="@drawable/icon_earpiece" />
-
-            <ImageView
-                android:layout_width="@dimen/voip_call_button_size"
-                android:layout_height="@dimen/voip_call_button_size"
-                android:layout_margin="5dp"
-                android:background="@drawable/button_toggle_background_reverse"
-                android:contentDescription="@string/content_description_use_speaker"
-                android:onClick="@{() -> viewModel.setSpeakerAudioRoute()}"
-                android:selected="@{viewModel.isSpeakerSelected}"
-                android:src="@drawable/icon_speaker" />
-
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_above="@id/buttons"
-            android:layout_alignParentEnd="true"
-            android:layout_marginEnd="15dp"
-            android:layout_marginBottom="10dp"
-            android:background="@drawable/shape_audio_routes_background"
-            android:translationY="@{viewModel.conferenceLayoutMenuTranslateY, default=@dimen/voip_audio_routes_menu_translate_y}"
-            android:orientation="vertical">
-
-            <ImageView
-                android:layout_width="@dimen/voip_call_button_size"
-                android:layout_height="@dimen/voip_call_button_size"
-                android:layout_margin="5dp"
-                android:background="@drawable/button_toggle_background_reverse"
-                android:contentDescription="@string/conference_display_mode_mosaic"
-                android:onClick="@{() -> viewModel.setMosaicLayout()}"
-                android:padding="10dp"
-                android:selected="@{viewModel.selectedLayout == ConferenceDisplayMode.GRID}"
-                android:src="@drawable/icon_conference_layout_grid"
-                app:tint="@color/white_color" />
-
-            <ImageView
-                android:layout_width="@dimen/voip_call_button_size"
-                android:layout_height="@dimen/voip_call_button_size"
-                android:layout_margin="5dp"
-                android:background="@drawable/button_toggle_background_reverse"
-                android:contentDescription="@string/conference_display_mode_active_speaker"
-                android:onClick="@{() -> viewModel.setActiveSpeakerLayout()}"
-                android:padding="10dp"
-                android:selected="@{viewModel.selectedLayout == ConferenceDisplayMode.ACTIVE_SPEAKER}"
-                android:src="@drawable/icon_conference_layout_active_speaker"
-                app:tint="@color/white_color" />
-
-            <ImageView
-                android:layout_width="@dimen/voip_call_button_size"
-                android:layout_height="@dimen/voip_call_button_size"
-                android:layout_margin="5dp"
-                android:background="@drawable/button_toggle_background_reverse"
-                android:contentDescription="@string/conference_display_mode_audio_only"
-                android:onClick="@{() -> viewModel.setAudioOnlyLayout()}"
-                android:padding="10dp"
-                android:selected="@{viewModel.selectedLayout == ConferenceDisplayMode.AUDIO_ONLY}"
-                android:src="@drawable/icon_conference_layout_audio_only"
-                app:tint="@color/white_color" />
-
-        </LinearLayout>
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:id="@+id/buttons"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/voip_buttons_fragment_size"
-            android:layout_alignParentBottom="true"
-            android:layout_marginBottom="10dp">
-
-            <ImageView
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_marginEnd="5dp"
-                android:background="@drawable/button_background_reverse"
-                android:contentDescription="@{viewModel.isMicrophoneMuted ? @string/content_description_disable_mic_mute : @string/content_description_enable_mic_mute}"
-                android:enabled="@{!viewModel.joinInProgress}"
-                android:onClick="@{() -> viewModel.toggleMuteMicrophone()}"
-                android:padding="5dp"
-                android:selected="@{viewModel.isMicrophoneMuted}"
-                android:src="@drawable/icon_toggle_mic"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintDimensionRatio="W,1:1"
-                app:layout_constraintEnd_toStartOf="@id/speaker" />
-
-            <RelativeLayout
-                android:id="@+id/speaker"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintDimensionRatio="W,1:1"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent">
-
-                <ImageView
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:background="@drawable/button_background_reverse"
-                    android:contentDescription="@{viewModel.isSpeakerSelected ? @string/content_description_disable_speaker : @string/content_description_enable_speaker}"
-                    android:enabled="@{!viewModel.joinInProgress}"
-                    android:onClick="@{() -> viewModel.toggleSpeaker()}"
-                    android:padding="5dp"
-                    android:selected="@{viewModel.isSpeakerSelected}"
-                    android:src="@drawable/icon_toggle_speaker"
-                    android:visibility="@{viewModel.audioRoutesEnabled ? View.GONE : View.VISIBLE}" />
-
-                <ImageView
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:background="@drawable/button_toggle_background_reverse"
-                    android:contentDescription="@string/content_description_toggle_audio_menu"
-                    android:enabled="@{!viewModel.joinInProgress}"
-                    android:onClick="@{() -> viewModel.toggleAudioRoutesMenu()}"
-                    android:padding="5dp"
-                    android:selected="@{viewModel.audioRoutesSelected}"
-                    android:src="@drawable/icon_audio_routes"
-                    android:visibility="@{viewModel.audioRoutesEnabled ? View.VISIBLE : View.GONE, default=gone}" />
-
-            </RelativeLayout>
-
-            <ImageView
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_marginStart="5dp"
-                android:background="@drawable/button_background_reverse"
-                android:contentDescription="@{viewModel.isVideoEnabled ? @string/content_description_disable_video : @string/content_description_enable_video}"
-                android:enabled="@{!viewModel.joinInProgress &amp;&amp; viewModel.isVideoAvailable &amp;&amp; !viewModel.isLowBandwidth}"
-                android:onClick="@{() -> viewModel.toggleVideo()}"
-                android:padding="5dp"
-                android:selected="@{viewModel.isVideoEnabled}"
-                android:visibility="@{viewModel.hideVideo ? View.GONE : View.VISIBLE}"
-                android:src="@drawable/icon_toggle_camera"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintDimensionRatio="W,1:1"
-                app:layout_constraintStart_toEndOf="@id/speaker" />
-
-            <ImageView
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_marginEnd="20dp"
-                android:background="@drawable/button_toggle_background_reverse"
-                android:contentDescription="@string/content_description_toggle_layout_menu"
-                android:enabled="@{!viewModel.joinInProgress &amp;&amp; !viewModel.isLowBandwidth}"
-                android:onClick="@{() -> viewModel.toggleLayoutMenu()}"
-                android:padding="10dp"
-                android:selected="@{viewModel.layoutMenuSelected}"
-                android:src="@{viewModel.selectedLayout == ConferenceDisplayMode.ACTIVE_SPEAKER ? @drawable/icon_conference_layout_active_speaker : viewModel.selectedLayout == ConferenceDisplayMode.AUDIO_ONLY ? @drawable/icon_conference_layout_audio_only : @drawable/icon_conference_layout_grid, default=@drawable/icon_conference_layout_grid}"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintDimensionRatio="W,1:1"
-                app:layout_constraintEnd_toEndOf="parent" />
-
-        </androidx.constraintlayout.widget.ConstraintLayout>
-
-    </RelativeLayout>
-
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-land/dialer_fragment.xml b/app/src/main/res/layout-land/dialer_fragment.xml
deleted file mode 100644
index a911071a9..000000000
--- a/app/src/main/res/layout-land/dialer_fragment.xml
+++ /dev/null
@@ -1,141 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <data>
-        <import type="android.view.View"/>
-        <variable
-            name="newContactClickListener"
-            type="android.view.View.OnClickListener"/>
-        <variable
-            name="newConferenceClickListener"
-            type="android.view.View.OnClickListener"/>
-        <variable
-            name="transferCallClickListener"
-            type="android.view.View.OnClickListener"/>
-        <variable
-            name="viewModel"
-            type="org.linphone.activities.main.dialer.viewmodels.DialerViewModel"/>
-    </data>
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <RelativeLayout
-            android:id="@+id/address_bar"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/main_activity_top_bar_size"
-            android:layout_alignParentTop="true"
-            android:background="?attr/lightToolbarBackgroundColor">
-
-            <ImageView
-                android:id="@+id/erase"
-                android:onClick="@{() -> viewModel.eraseLastChar()}"
-                android:onLongClick="@{() -> viewModel.eraseAll()}"
-                android:contentDescription="@string/content_description_dialer_erase"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:paddingLeft="10dp"
-                android:paddingRight="10dp"
-                android:layout_alignParentRight="true"
-                android:layout_centerVertical="true"
-                android:focusableInTouchMode="true"
-                android:src="@drawable/backspace" />
-
-            <EditText
-                android:id="@+id/sip_uri_input"
-                android:text="@={viewModel.enteredUri}"
-                android:beforeTextChanged="@{(text, start, count, after) -> viewModel.onBeforeUriChanged(sipUriInput, count, after)}"
-                android:afterTextChanged="@{(text) -> viewModel.onAfterUriChanged(sipUriInput, text)}"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_centerVertical="true"
-                android:layout_toLeftOf="@id/erase"
-                android:background="@color/transparent_color"
-                android:backgroundTint="@color/transparent_color"
-                android:ellipsize="start"
-                android:hint="@string/dialer_address_bar_hint"
-                android:inputType="textEmailAddress|textUri|textNoSuggestions"
-                android:paddingLeft="20dp"
-                android:paddingRight="5dp"
-                android:textColorHint="@color/light_grey_color" />
-
-        </RelativeLayout>
-
-        <LinearLayout
-            android:id="@+id/controls"
-            android:layout_alignParentBottom="true"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/main_activity_top_bar_size">
-
-            <ImageView
-                android:onClick="@{newConferenceClickListener}"
-                android:visibility="@{viewModel.scheduleConferenceAvailable ? View.VISIBLE : View.GONE}"
-                android:contentDescription="@string/content_description_create_conference"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight="2"
-                android:background="?attr/button_background_drawable"
-                android:padding="5dp"
-                android:src="@drawable/icon_video_conf_new" />
-
-            <ImageView
-                android:onClick="@{newContactClickListener}"
-                android:visibility="@{viewModel.scheduleConferenceAvailable || viewModel.hideAddContactButton ? View.GONE : View.VISIBLE, default=gone}"
-                android:enabled="@{viewModel.enteredUri.length() > 0}"
-                android:contentDescription="@string/content_description_add_contact"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight="2"
-                android:background="?attr/button_background_drawable"
-                android:padding="15dp"
-                android:src="@drawable/contact_add" />
-
-            <ImageView
-                android:onClick="@{() -> viewModel.startCall()}"
-                android:visibility="@{viewModel.atLeastOneCall ? View.GONE : View.VISIBLE}"
-                android:contentDescription="@string/content_description_start_call"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:background="@drawable/call"
-                android:padding="12dp"
-                android:src="@{viewModel.autoInitiateVideoCalls ? @drawable/call_video_start : @drawable/call_audio_start, default=@drawable/call_audio_start}" />
-
-            <ImageView
-                android:onClick="@{() -> viewModel.startCall()}"
-                android:visibility="@{viewModel.atLeastOneCall &amp;&amp; !viewModel.transferVisibility ? View.VISIBLE : View.GONE, default=gone}"
-                android:contentDescription="@string/content_description_add_call"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:background="@drawable/call"
-                android:padding="12dp"
-                android:src="@drawable/call_add" />
-
-            <ImageView
-                android:onClick="@{transferCallClickListener}"
-                android:visibility="@{viewModel.atLeastOneCall &amp;&amp; viewModel.transferVisibility ? View.VISIBLE : View.GONE, default=gone}"
-                android:contentDescription="@string/content_description_transfer_call"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:background="@drawable/call"
-                android:padding="12dp"
-                android:src="@drawable/call_transfer" />
-
-        </LinearLayout>
-
-        <ImageView
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_below="@id/address_bar"
-            android:layout_above="@id/controls"
-            android:padding="30dp"
-            android:layout_centerHorizontal="true"
-            android:contentDescription="@null"
-            android:src="@drawable/dialer_background" />
-
-    </RelativeLayout>
-
-</layout>
diff --git a/app/src/main/res/layout-land/main_activity_content.xml b/app/src/main/res/layout-land/main_activity_content.xml
deleted file mode 100644
index 016fb5554..000000000
--- a/app/src/main/res/layout-land/main_activity_content.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <!-- For proper snack bar placement -->
-    <androidx.coordinatorlayout.widget.CoordinatorLayout
-        android:id="@+id/coordinator"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_toRightOf="@id/tabs_fragment">
-
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
-
-            <androidx.fragment.app.FragmentContainerView
-                android:id="@+id/nav_host_fragment"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:name="androidx.navigation.fragment.NavHostFragment"
-                app:defaultNavHost="true"
-                app:navGraph="@navigation/main_nav_graph"
-                tools:layout="@layout/dialer_fragment" />
-
-        </RelativeLayout>
-
-    </androidx.coordinatorlayout.widget.CoordinatorLayout>
-
-    <androidx.fragment.app.FragmentContainerView
-        android:id="@+id/tabs_fragment"
-        android:name="org.linphone.activities.main.fragments.TabsFragment"
-        android:layout_width="@dimen/main_activity_tabs_fragment_size"
-        android:layout_height="match_parent"
-        android:layout_alignParentLeft="true"
-        tools:layout="@layout/tabs_fragment"/>
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-land/tabs_fragment.xml b/app/src/main/res/layout-land/tabs_fragment.xml
deleted file mode 100644
index 72e54530a..000000000
--- a/app/src/main/res/layout-land/tabs_fragment.xml
+++ /dev/null
@@ -1,152 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <data>
-        <import type="android.view.View"/>
-        <variable
-            name="historyClickListener"
-            type="android.view.View.OnClickListener"/>
-        <variable
-            name="contactsClickListener"
-            type="android.view.View.OnClickListener"/>
-        <variable
-            name="dialerClickListener"
-            type="android.view.View.OnClickListener"/>
-        <variable
-            name="chatClickListener"
-            type="android.view.View.OnClickListener"/>
-        <variable
-            name="viewModel"
-            type="org.linphone.activities.main.viewmodels.TabsViewModel" />
-    </data>
-
-    <androidx.constraintlayout.motion.widget.MotionLayout
-        android:id="@+id/motion_layout"
-        android:layout_width="@dimen/main_activity_tabs_fragment_size"
-        android:layout_height="match_parent"
-        app:layoutDescription="@xml/motion_main_activity_tabs_selector_land">
-
-        <androidx.constraintlayout.widget.Guideline
-            android:id="@+id/guidelineTop"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            layout_constraintGuide_percent="@{viewModel.leftAnchor, default=0.25}" />
-
-        <androidx.constraintlayout.widget.Guideline
-            android:id="@+id/guidelineMiddle"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            layout_constraintGuide_percent="@{viewModel.middleAnchor, default=0.5}" />
-
-        <androidx.constraintlayout.widget.Guideline
-            android:id="@+id/guidelineBottom"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            layout_constraintGuide_percent="@{viewModel.rightAnchor, default=0.75}" />
-
-        <ImageView
-            android:id="@+id/history"
-            android:onClick="@{historyClickListener}"
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_centerInParent="true"
-            android:contentDescription="@string/content_description_menu_history"
-            android:padding="15dp"
-            android:background="@drawable/footer_button"
-            android:src="@drawable/footer_history"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintBottom_toTopOf="@id/guidelineTop" />
-
-        <TextView
-            android:id="@+id/history_unread_count"
-            style="@style/unread_count_font"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginRight="5dp"
-            android:layout_marginTop="5dp"
-            android:gravity="center"
-            android:translationY="@{viewModel.historyMissedCountTranslateY}"
-            android:background="@{viewModel.missedCallsCount == 0 ? @drawable/hidden_unread_message_count_bg : @drawable/unread_message_count_bg}"
-            android:text="@{viewModel.missedCallsCount == 0 ? `` : String.valueOf(viewModel.missedCallsCount)}"
-            app:layout_constraintRight_toRightOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <RelativeLayout
-            android:id="@+id/contacts"
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:background="@drawable/footer_button"
-            android:onClick="@{contactsClickListener}"
-            app:layout_constraintTop_toTopOf="@id/guidelineTop"
-            app:layout_constraintBottom_toTopOf="@id/guidelineMiddle">
-
-            <ImageView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_centerInParent="true"
-                android:contentDescription="@string/content_description_menu_contacts"
-                android:padding="15dp"
-                android:src="@drawable/footer_contacts" />
-
-        </RelativeLayout>
-
-        <RelativeLayout
-            android:id="@+id/dialer"
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:background="@drawable/footer_button"
-            android:onClick="@{dialerClickListener}"
-            app:layout_constraintTop_toTopOf="@id/guidelineMiddle"
-            app:layout_constraintBottom_toTopOf="@id/guidelineBottom">
-
-            <ImageView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_centerInParent="true"
-                android:contentDescription="@string/content_description_menu_dialer"
-                android:padding="15dp"
-                android:src="@drawable/footer_dialer" />
-
-        </RelativeLayout>
-
-        <ImageView
-            android:id="@+id/chat"
-            android:onClick="@{chatClickListener}"
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_centerInParent="true"
-            android:contentDescription="@string/content_description_menu_chat"
-            android:padding="15dp"
-            android:src="@drawable/footer_chat"
-            android:background="@drawable/footer_button"
-            app:layout_constraintTop_toTopOf="@id/guidelineBottom"
-            app:layout_constraintBottom_toBottomOf="parent" />
-
-        <TextView
-            android:id="@+id/chat_unread_count"
-            style="@style/unread_count_font"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginRight="5dp"
-            android:layout_marginTop="5dp"
-            android:gravity="center"
-            android:translationY="@{viewModel.chatUnreadCountTranslateY}"
-            android:background="@{viewModel.unreadMessagesCount == 0 ? @drawable/hidden_unread_message_count_bg : @drawable/unread_message_count_bg}"
-            android:text="@{viewModel.unreadMessagesCount == 0 ? `` : String.valueOf(viewModel.unreadMessagesCount)}"
-            app:layout_constraintRight_toRightOf="parent"
-            app:layout_constraintTop_toTopOf="@id/guidelineBottom" />
-
-        <View
-            android:id="@+id/selector"
-            android:layout_width="@dimen/tabs_fragment_selector_size"
-            android:layout_height="0dp"
-            android:background="?attr/accentColor" />
-
-    </androidx.constraintlayout.motion.widget.MotionLayout>
-
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-land/voip_conference_active_speaker.xml b/app/src/main/res/layout-land/voip_conference_active_speaker.xml
deleted file mode 100644
index df24c7f74..000000000
--- a/app/src/main/res/layout-land/voip_conference_active_speaker.xml
+++ /dev/null
@@ -1,363 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <data>
-
-        <import type="android.view.View" />
-
-        <variable
-            name="conferenceViewModel"
-            type="org.linphone.activities.voip.viewmodels.ConferenceViewModel" />
-
-        <variable
-            name="controlsViewModel"
-            type="org.linphone.activities.voip.viewmodels.ControlsViewModel" />
-
-        <variable
-            name="inflatedVisibility"
-            type="Integer" />
-    </data>
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/conference_constraint_layout"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_margin="@{controlsViewModel.fullScreenMode || controlsViewModel.pipMode ? @dimen/margin_0dp : @dimen/voip_remote_margin, default=@dimen/voip_remote_margin}"
-        android:paddingBottom="@{controlsViewModel.fullScreenMode || controlsViewModel.pipMode ? @dimen/margin_0dp : @dimen/voip_buttons_fragment_margin_size}"
-        android:visibility="@{inflatedVisibility}"
-        inflatedLifecycleOwner="@{true}">
-
-        <View
-            android:id="@+id/top_barrier"
-            android:layout_width="0dp"
-            android:layout_height="1dp"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            android:layout_marginTop="@{controlsViewModel.folded || controlsViewModel.fullScreenMode || controlsViewModel.pipMode ? @dimen/margin_0dp : conferenceViewModel.isRemotelyRecorded ? @dimen/voip_single_call_header_size_with_record_info : @dimen/voip_single_call_header_size, default=@dimen/voip_single_call_header_size}"/>
-
-        <androidx.constraintlayout.widget.Guideline
-            android:id="@+id/hinge_top"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            app:layout_constraintGuide_percent="0" />
-
-        <androidx.constraintlayout.widget.Guideline
-            android:id="@+id/hinge_bottom"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            app:layout_constraintGuide_percent="1" />
-
-        <TextView
-            android:id="@+id/remote_name"
-            style="@style/call_header_title"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="10dp"
-            android:layout_marginTop="@{controlsViewModel.folded ? @dimen/voip_conference_header_folded_top_margin : @dimen/margin_0dp}"
-            android:ellipsize="end"
-            android:maxLines="1"
-            android:text="@{conferenceViewModel.subject, default=@string/conference_default_title}"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toStartOf="@id/toggle_conference_recording"
-            app:layout_constraintTop_toBottomOf="@id/hinge_top" />
-
-        <Chronometer
-            android:id="@+id/active_conference_timer"
-            style="@style/call_header_subtitle"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/remote_name" />
-
-        <ImageView
-            android:id="@+id/toggle_pause_conference"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
-            android:background="@drawable/button_toggle_background"
-            android:contentDescription="@string/content_description_pause_call"
-            android:enabled="@{!conferenceViewModel.conferenceCreationPending}"
-            android:onClick="@{() -> conferenceViewModel.pauseConference()}"
-            android:padding="5dp"
-            android:selected="@{conferenceViewModel.isConferenceLocallyPaused}"
-            android:src="@drawable/icon_pause"
-            app:layout_constraintBottom_toBottomOf="@id/active_conference_timer"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="@id/remote_name" />
-
-        <ImageView
-            android:id="@+id/toggle_conference_recording"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
-            android:layout_marginEnd="10dp"
-            android:background="@drawable/button_toggle_background"
-            android:contentDescription="@string/content_description_toggle_recording"
-            android:onClick="@{() -> conferenceViewModel.toggleRecording()}"
-            android:padding="7dp"
-            android:selected="@{conferenceViewModel.isRecording}"
-            android:src="@drawable/icon_call_record"
-            android:visibility="gone"
-            app:layout_constraintBottom_toBottomOf="@id/active_conference_timer"
-            app:layout_constraintEnd_toStartOf="@id/toggle_pause_conference"
-            app:layout_constraintTop_toTopOf="@id/remote_name" />
-
-        <include
-            android:id="@+id/remote_recording"
-            layout="@layout/voip_remote_recording"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            app:layout_constraintTop_toBottomOf="@id/active_conference_timer"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            android:visibility="@{conferenceViewModel.isRemotelyRecorded ? View.VISIBLE : View.GONE, default=gone}" />
-
-        <androidx.constraintlayout.widget.Group
-            android:id="@+id/group"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:visibility="@{controlsViewModel.fullScreenMode || controlsViewModel.pipMode ? View.GONE : View.VISIBLE}"
-            app:constraint_referenced_ids="remote_name,active_conference_timer,toggle_pause_conference" />
-
-        <org.linphone.activities.voip.views.ScrollDotsView
-            android:id="@+id/scroll_indicator"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:visibility="@{controlsViewModel.pipMode || !conferenceViewModel.moreThanTwoParticipants ? View.GONE : View.VISIBLE}"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/top_barrier"
-            app:layout_constraintBottom_toBottomOf="@id/hinge_bottom"
-            android:layout_marginEnd="@{controlsViewModel.fullScreenMode ? @dimen/margin_0dp : @dimen/voip_conference_active_speaker_dots_margin, default=@dimen/voip_conference_active_speaker_dots_margin}"
-            app:dotColor="@color/voip_gray_dots"
-            app:dotRadius="5dp"
-            app:scrollView="@id/miniatures"
-            app:itemCount="@{conferenceViewModel.conferenceParticipantDevices.size()}"
-            app:selectedDot="@{0}"
-            app:selectedDotColor="@color/voip_dark_gray" />
-
-        <ScrollView
-            android:id="@+id/miniatures"
-            android:fillViewport="true"
-            android:layout_width="wrap_content"
-            android:layout_height="0dp"
-            android:layout_marginBottom="5dp"
-            app:layout_constraintBottom_toTopOf="@id/local_participant_background"
-            app:layout_constraintEnd_toStartOf="@id/scroll_indicator"
-            app:layout_constraintTop_toBottomOf="@id/top_barrier"
-            android:visibility="@{conferenceViewModel.moreThanTwoParticipants ? View.VISIBLE : View.GONE, default=gone}"
-            android:scrollbars="none">
-
-            <com.google.android.flexbox.FlexboxLayout
-                android:id="@+id/flexbox_layout"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                app:alignItems="stretch"
-                app:entries="@{conferenceViewModel.activeSpeakerConferenceParticipantDevices}"
-                app:flexDirection="column_reverse"
-                app:flexWrap="nowrap"
-                app:justifyContent="flex_start"
-                app:layout="@{@layout/voip_conference_participant_remote_active_speaker_miniature}" />
-
-        </ScrollView>
-
-        <View
-            android:id="@+id/active_speaker_background"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:visibility="@{conferenceViewModel.speakingParticipantFound ? View.VISIBLE : View.GONE}"
-            app:layout_constraintTop_toBottomOf="@id/top_barrier"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toStartOf="@id/miniatures"
-            app:layout_constraintBottom_toBottomOf="@id/hinge_bottom"
-            android:layout_marginTop="@{controlsViewModel.fullScreenMode ? @dimen/margin_0dp : @dimen/voip_active_speaker_top_margin, default=@dimen/voip_active_speaker_top_margin}"
-            android:background="@{!conferenceViewModel.speakingParticipant.isInConference ? @drawable/shape_remote_paused_background : @drawable/shape_remote_background, default=@drawable/shape_remote_background}"
-            android:onClick="@{() -> controlsViewModel.toggleFullScreen()}"/>
-
-        <ImageView
-            android:id="@+id/speaking_participant_avatar"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:contentDescription="@null"
-            android:visibility="@{conferenceViewModel.speakingParticipantFound ? View.VISIBLE : View.GONE}"
-            coilVoipContact="@{conferenceViewModel.speakingParticipant}"
-            android:background="@drawable/generated_avatar_bg"
-            app:layout_constraintBottom_toBottomOf="@id/active_speaker_background"
-            app:layout_constraintEnd_toEndOf="@id/active_speaker_background"
-            app:layout_constraintHeight_max="@dimen/voip_contact_avatar_max_size"
-            app:layout_constraintStart_toStartOf="@id/active_speaker_background"
-            app:layout_constraintTop_toTopOf="@id/active_speaker_background"
-            app:layout_constraintWidth_max="@dimen/voip_contact_avatar_max_size"
-            app:layout_constraintDimensionRatio="1:1" />
-
-        <ImageView
-            android:id="@+id/speaking_participant_paused"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:background="@drawable/shape_button_background"
-            android:contentDescription="@string/content_description_participant_is_paused"
-            android:src="@drawable/icon_pause"
-            android:visibility="@{conferenceViewModel.speakingParticipantFound &amp;&amp; conferenceViewModel.speakingParticipant.isInConference ? View.GONE : View.VISIBLE, default=gone}"
-            app:layout_constraintDimensionRatio="1:1"
-            app:layout_constraintBottom_toBottomOf="@id/active_speaker_background"
-            app:layout_constraintEnd_toEndOf="@id/active_speaker_background"
-            app:layout_constraintHeight_max="@dimen/voip_contact_avatar_max_size"
-            app:layout_constraintStart_toStartOf="@id/active_speaker_background"
-            app:layout_constraintTop_toTopOf="@id/active_speaker_background"
-            app:layout_constraintWidth_max="@dimen/voip_contact_avatar_max_size" />
-
-        <ProgressBar
-            android:id="@+id/speaking_participant_joining"
-            android:layout_width="@dimen/voip_conference_participant_joining_icon_size_active_speaker"
-            android:layout_height="@dimen/voip_conference_participant_joining_icon_size_active_speaker"
-            android:indeterminate="true"
-            android:indeterminateDrawable="@drawable/icon_spinner_rotating"
-            android:visibility="@{conferenceViewModel.speakingParticipant.isJoining ? View.VISIBLE : View.GONE, default=gone}"
-            app:layout_constraintLeft_toLeftOf="@id/active_speaker_background"
-            app:layout_constraintTop_toTopOf="@id/active_speaker_background" />
-
-        <org.linphone.activities.voip.views.RoundCornersTextureView
-            android:id="@+id/conference_active_speaker_remote_video"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:visibility="@{!conferenceViewModel.isConferenceLocallyPaused &amp;&amp; conferenceViewModel.speakingParticipantVideoEnabled ? View.VISIBLE : View.GONE}"
-            app:layout_constraintBottom_toBottomOf="@id/active_speaker_background"
-            app:layout_constraintEnd_toEndOf="@id/active_speaker_background"
-            app:layout_constraintStart_toStartOf="@id/active_speaker_background"
-            app:layout_constraintTop_toTopOf="@id/active_speaker_background" />
-
-        <ImageView
-            android:id="@+id/active_speaker_muted"
-            android:layout_width="@dimen/voip_conference_participant_mic_muted_icon_size_active_speaker"
-            android:layout_height="@dimen/voip_conference_participant_mic_muted_icon_size_active_speaker"
-            android:layout_margin="5dp"
-            android:background="@drawable/shape_toggle_pressed_background"
-            android:contentDescription="@string/content_description_conference_participant_mic_muted"
-            android:padding="2dp"
-            android:src="@drawable/icon_mic_muted"
-            android:visibility="@{conferenceViewModel.speakingParticipant.isMuted &amp;&amp; !conferenceViewModel.moreThanTwoParticipants ? View.VISIBLE : View.GONE, default=gone}"
-            app:layout_constraintLeft_toLeftOf="@id/active_speaker_background"
-            app:layout_constraintTop_toTopOf="@id/active_speaker_background" />
-
-        <TextView
-            android:id="@+id/speaking_participant_name"
-            style="@style/call_remote_name_font"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="10dp"
-            android:layout_marginBottom="10dp"
-            android:text="@{conferenceViewModel.speakingParticipant.contact.name ?? conferenceViewModel.speakingParticipant.displayName}"
-            app:layout_constraintBottom_toBottomOf="@id/active_speaker_background"
-            app:layout_constraintStart_toStartOf="@id/active_speaker_background" />
-
-        <View
-            android:id="@+id/local_participant_background"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:visibility="@{conferenceViewModel.isMeListenerOnly ? View.GONE : View.VISIBLE}"
-            app:layout_constraintTop_toBottomOf="@id/top_barrier"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintBottom_toBottomOf="@id/hinge_bottom"
-            android:layout_marginTop="@{controlsViewModel.fullScreenMode  ? @dimen/margin_0dp : @dimen/voip_active_speaker_top_margin, default=@dimen/voip_active_speaker_top_margin}"
-            android:background="@drawable/shape_me_background"
-            android:onClick="@{() -> controlsViewModel.toggleFullScreen()}"/>
-
-        <ImageView
-            android:id="@+id/local_participant_avatar"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:layout_margin="10dp"
-            android:contentDescription="@null"
-            android:visibility="@{conferenceViewModel.isMeListenerOnly ? View.GONE : View.VISIBLE}"
-            coilSelfAvatar="@{conferenceViewModel.meParticipant}"
-            android:background="@drawable/generated_avatar_bg"
-            app:layout_constraintDimensionRatio="1:1"
-            app:layout_constraintBottom_toBottomOf="@id/local_participant_background"
-            app:layout_constraintEnd_toEndOf="@id/local_participant_background"
-            app:layout_constraintHeight_max="@dimen/voip_contact_avatar_max_size"
-            app:layout_constraintStart_toStartOf="@id/local_participant_background"
-            app:layout_constraintTop_toTopOf="@id/local_participant_background"
-            app:layout_constraintWidth_max="@dimen/voip_contact_avatar_max_size" />
-
-        <org.linphone.activities.voip.views.RoundCornersTextureView
-            android:id="@+id/local_preview_video_surface"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            app:alignTopRight="false"
-            app:displayMode="occupy_all_space"
-            android:visibility="@{conferenceViewModel.meParticipant.isInConference &amp;&amp; controlsViewModel.isSendingVideo ? View.VISIBLE : View.GONE, default=gone}"
-            app:layout_constraintBottom_toBottomOf="@id/local_participant_background"
-            app:layout_constraintEnd_toEndOf="@id/local_participant_background"
-            app:layout_constraintStart_toStartOf="@id/local_participant_background"
-            app:layout_constraintTop_toTopOf="@id/local_participant_background" />
-
-        <TextView
-            android:id="@+id/local_participant_name"
-            style="@style/call_remote_name_font"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="5dp"
-            android:layout_marginEnd="5dp"
-            android:layout_marginBottom="5dp"
-            android:visibility="@{conferenceViewModel.isMeListenerOnly ? View.GONE : View.VISIBLE}"
-            android:text="@{conferenceViewModel.meParticipant.contact.name ?? conferenceViewModel.meParticipant.displayName}"
-            app:layout_constraintBottom_toBottomOf="@id/local_participant_background"
-            app:layout_constraintStart_toStartOf="@id/local_participant_background"
-            app:layout_constraintEnd_toEndOf="@id/local_participant_background"/>
-
-        <ImageView
-            android:id="@+id/switch_camera"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_margin="@{conferenceViewModel.twoOrMoreParticipants ? @dimen/margin_0dp : @dimen/voip_active_speaker_top_margin, default=@dimen/voip_active_speaker_top_margin}"
-            android:padding="10dp"
-            android:contentDescription="@string/content_description_switch_camera"
-            android:onClick="@{() -> controlsViewModel.switchCamera()}"
-            android:src="@drawable/icon_call_camera_switch"
-            android:visibility="@{controlsViewModel.isSwitchCameraAvailable &amp;&amp; !controlsViewModel.pipMode ? View.VISIBLE : View.GONE}"
-            app:layout_constraintEnd_toEndOf="@id/local_participant_background"
-            app:layout_constraintTop_toTopOf="@id/local_participant_background" />
-
-        <ImageView
-            android:id="@+id/local_participant_speaking_border"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:contentDescription="@null"
-            android:src="@drawable/shape_conference_active_speaker_border"
-            android:visibility="@{conferenceViewModel.meParticipant.isSpeaking ? View.VISIBLE : View.GONE, default=gone}"
-            app:layout_constraintBottom_toBottomOf="@id/local_participant_background"
-            app:layout_constraintLeft_toLeftOf="@id/local_participant_background"
-            app:layout_constraintRight_toRightOf="@id/local_participant_background"
-            app:layout_constraintTop_toTopOf="@id/local_participant_background" />
-
-        <ImageView
-            android:id="@+id/local_participant_muted"
-            android:layout_width="@dimen/voip_conference_participant_mic_muted_icon_size_active_speaker"
-            android:layout_height="@dimen/voip_conference_participant_mic_muted_icon_size_active_speaker"
-            android:layout_margin="@{conferenceViewModel.twoOrMoreParticipants ? @dimen/mute_mic_miniature_margin : @dimen/mute_mic_grid_margin, default=@dimen/mute_mic_grid_margin}"
-            android:background="@drawable/shape_toggle_pressed_background"
-            android:contentDescription="@string/content_description_conference_participant_mic_muted"
-            android:padding="2dp"
-            android:src="@drawable/icon_mic_muted"
-            android:visibility="@{conferenceViewModel.meParticipant.isMuted ? View.VISIBLE : View.GONE, default=gone}"
-            app:layout_constraintLeft_toLeftOf="@id/local_participant_background"
-            app:layout_constraintTop_toTopOf="@id/local_participant_background" />
-
-        <ImageView
-            android:id="@+id/local_participant_paused"
-            android:layout_width="@dimen/voip_conference_active_speaker_miniature_avatar_size"
-            android:layout_height="@dimen/voip_conference_active_speaker_miniature_avatar_size"
-            android:background="@drawable/shape_button_background"
-            android:contentDescription="@string/content_description_participant_is_paused"
-            android:src="@drawable/icon_pause"
-            android:visibility="@{conferenceViewModel.conferenceCreationPending || !conferenceViewModel.isConferenceLocallyPaused || conferenceViewModel.meParticipant.isJoining ? View.GONE : View.VISIBLE, default=gone}"
-            app:layout_constraintBottom_toBottomOf="@id/local_participant_background"
-            app:layout_constraintEnd_toEndOf="@id/local_participant_background"
-            app:layout_constraintStart_toStartOf="@id/local_participant_background"
-            app:layout_constraintTop_toTopOf="@id/local_participant_background" />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-land/voip_conference_grid.xml b/app/src/main/res/layout-land/voip_conference_grid.xml
deleted file mode 100644
index ecac814f9..000000000
--- a/app/src/main/res/layout-land/voip_conference_grid.xml
+++ /dev/null
@@ -1,139 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <data>
-
-        <import type="android.view.View" />
-
-        <variable
-            name="conferenceViewModel"
-            type="org.linphone.activities.voip.viewmodels.ConferenceViewModel" />
-
-        <variable
-            name="controlsViewModel"
-            type="org.linphone.activities.voip.viewmodels.ControlsViewModel" />
-
-        <variable
-            name="inflatedVisibility"
-            type="Integer" />
-    </data>
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/conference_constraint_layout"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_margin="@{controlsViewModel.fullScreenMode || controlsViewModel.pipMode ? @dimen/margin_0dp : @dimen/voip_remote_margin, default=@dimen/voip_remote_margin}"
-        android:paddingBottom="@{controlsViewModel.fullScreenMode || controlsViewModel.pipMode ? @dimen/margin_0dp : @dimen/voip_buttons_fragment_margin_size}"
-        android:visibility="@{inflatedVisibility}"
-        inflatedLifecycleOwner="@{true}">
-
-        <View
-            android:id="@+id/top_barrier"
-            android:layout_width="0dp"
-            android:layout_height="1dp"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            android:layout_marginTop="@{controlsViewModel.fullScreenMode || controlsViewModel.pipMode || controlsViewModel.folded ? @dimen/margin_0dp : conferenceViewModel.isRemotelyRecorded ? @dimen/voip_single_call_header_size_with_record_info : @dimen/voip_single_call_header_size, default=@dimen/voip_single_call_header_size}"/>
-
-        <androidx.constraintlayout.widget.Guideline
-            android:id="@+id/hinge_top"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            app:layout_constraintGuide_percent="0" />
-
-        <androidx.constraintlayout.widget.Guideline
-            android:id="@+id/hinge_bottom"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            app:layout_constraintGuide_percent="1" />
-
-        <androidx.constraintlayout.widget.Group
-            android:id="@+id/group"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:visibility="@{controlsViewModel.fullScreenMode || controlsViewModel.pipMode ? View.GONE : View.VISIBLE}"
-            app:constraint_referenced_ids="remote_name,active_conference_timer,toggle_pause_conference" />
-
-        <TextView
-            android:id="@+id/remote_name"
-            style="@style/call_header_title"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="10dp"
-            android:layout_marginTop="@{controlsViewModel.folded ? @dimen/voip_conference_header_folded_top_margin : @dimen/margin_0dp}"
-            android:ellipsize="end"
-            android:maxLines="1"
-            android:text="@{conferenceViewModel.subject, default=@string/conference_default_title}"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toStartOf="@id/toggle_conference_recording"
-            app:layout_constraintTop_toBottomOf="@id/hinge_top" />
-
-        <Chronometer
-            android:id="@+id/active_conference_timer"
-            style="@style/call_header_subtitle"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/remote_name" />
-
-        <ImageView
-            android:id="@+id/toggle_pause_conference"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
-            android:background="@drawable/button_toggle_background"
-            android:contentDescription="@string/content_description_pause_call"
-            android:enabled="@{!conferenceViewModel.conferenceCreationPending}"
-            android:onClick="@{() -> conferenceViewModel.pauseConference()}"
-            android:padding="5dp"
-            android:selected="@{conferenceViewModel.isConferenceLocallyPaused}"
-            android:src="@drawable/icon_pause"
-            app:layout_constraintBottom_toBottomOf="@id/active_conference_timer"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="@id/remote_name" />
-
-        <ImageView
-            android:id="@+id/toggle_conference_recording"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
-            android:layout_marginEnd="10dp"
-            android:background="@drawable/button_toggle_background"
-            android:contentDescription="@string/content_description_toggle_recording"
-            android:onClick="@{() -> conferenceViewModel.toggleRecording()}"
-            android:padding="7dp"
-            android:selected="@{conferenceViewModel.isRecording}"
-            android:src="@drawable/icon_call_record"
-            android:visibility="gone"
-            app:layout_constraintBottom_toBottomOf="@id/active_conference_timer"
-            app:layout_constraintEnd_toStartOf="@id/toggle_pause_conference"
-            app:layout_constraintTop_toTopOf="@id/remote_name" />
-
-        <include
-            android:id="@+id/remote_recording"
-            layout="@layout/voip_remote_recording"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            app:layout_constraintTop_toBottomOf="@id/active_conference_timer"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            android:visibility="@{conferenceViewModel.isRemotelyRecorded ? View.VISIBLE : View.GONE, default=gone}" />
-
-        <org.linphone.activities.voip.views.GridBoxLayout
-            android:id="@+id/grid_box_layout"
-            centerContent="@{true}"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            app:layout_constraintTop_toBottomOf="@id/top_barrier"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintBottom_toTopOf="@id/hinge_bottom"
-            android:onClick="@{() -> controlsViewModel.toggleFullScreen()}"
-            app:entries="@{conferenceViewModel.conferenceParticipantDevices}"
-            app:layout="@{@layout/voip_conference_participant_remote_grid}" />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-land/voip_numpad.xml b/app/src/main/res/layout-land/voip_numpad.xml
deleted file mode 100644
index 3e21ebf53..000000000
--- a/app/src/main/res/layout-land/voip_numpad.xml
+++ /dev/null
@@ -1,225 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <data>
-        <import type="android.view.View" />
-        <variable
-            name="controlsViewModel"
-            type="org.linphone.activities.voip.viewmodels.ControlsViewModel" />
-        <variable
-            name="inflatedVisibility"
-            type="Integer" />
-    </data>
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/numpad_layout"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="@color/voip_translucent_popup_background"
-        android:clickable="true"
-        android:visibility="@{inflatedVisibility}"
-        inflatedLifecycleOwner="@{true}">
-
-        <View
-            android:id="@+id/background"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_marginStart="10dp"
-            android:layout_marginEnd="10dp"
-            android:background="@drawable/shape_call_popup_background"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintWidth_max="@dimen/voip_views_max_width" />
-
-        <ImageView
-            android:id="@+id/hide_numpad"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
-            android:layout_margin="10dp"
-            android:contentDescription="@string/content_description_hide_numpad"
-            android:onClick="@{() -> controlsViewModel.hideNumpad()}"
-            android:src="@drawable/icon_cancel_alt"
-            app:layout_constraintEnd_toEndOf="@id/background"
-            app:layout_constraintTop_toTopOf="@id/background" />
-
-        <TextView
-            android:id="@+id/entered_dtmfs"
-            style="@style/call_dtmf_history_font"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_margin="10dp"
-            android:ellipsize="start"
-            android:gravity="center_horizontal"
-            android:maxLines="1"
-            android:text="@{controlsViewModel.dtmfHistory, default=`0123456`}"
-            app:layout_constraintEnd_toStartOf="@id/hide_numpad"
-            app:layout_constraintStart_toStartOf="@id/background"
-            app:layout_constraintTop_toTopOf="@id/background" />
-
-        <ImageView
-            android:id="@+id/dtmf_1"
-            style="@style/call_numpad_digit"
-            android:contentDescription="@string/content_description_numpad_1"
-            android:onClick="@{() -> controlsViewModel.handleDtmfClick('1')}"
-            android:src="@drawable/voip_numpad_1"
-            app:layout_constraintBottom_toTopOf="@id/dtmf_4"
-            app:layout_constraintDimensionRatio="1:1"
-            app:layout_constraintEnd_toStartOf="@id/dtmf_2"
-            app:layout_constraintHorizontal_chainStyle="spread"
-            app:layout_constraintStart_toStartOf="@id/background"
-            app:layout_constraintTop_toBottomOf="@id/entered_dtmfs"
-            app:layout_constraintVertical_chainStyle="spread"
-            app:layout_constraintWidth_max="@dimen/voip_numpad_button_max_size" />
-
-        <ImageView
-            android:id="@+id/dtmf_2"
-            style="@style/call_numpad_digit"
-            android:contentDescription="@string/content_description_numpad_2"
-            android:onClick="@{() -> controlsViewModel.handleDtmfClick('2')}"
-            android:src="@drawable/voip_numpad_2"
-            app:layout_constraintBottom_toTopOf="@id/dtmf_5"
-            app:layout_constraintDimensionRatio="1:1"
-            app:layout_constraintEnd_toStartOf="@id/dtmf_3"
-            app:layout_constraintStart_toEndOf="@id/dtmf_1"
-            app:layout_constraintTop_toBottomOf="@id/entered_dtmfs"
-            app:layout_constraintVertical_chainStyle="spread"
-            app:layout_constraintWidth_max="@dimen/voip_numpad_button_max_size" />
-
-        <ImageView
-            android:id="@+id/dtmf_3"
-            style="@style/call_numpad_digit"
-            android:contentDescription="@string/content_description_numpad_3"
-            android:onClick="@{() -> controlsViewModel.handleDtmfClick('3')}"
-            android:src="@drawable/voip_numpad_3"
-            app:layout_constraintBottom_toTopOf="@id/dtmf_6"
-            app:layout_constraintDimensionRatio="1:1"
-            app:layout_constraintEnd_toEndOf="@id/background"
-            app:layout_constraintStart_toEndOf="@id/dtmf_2"
-            app:layout_constraintTop_toBottomOf="@id/entered_dtmfs"
-            app:layout_constraintVertical_chainStyle="spread"
-            app:layout_constraintWidth_max="@dimen/voip_numpad_button_max_size" />
-
-        <ImageView
-            android:id="@+id/dtmf_4"
-            style="@style/call_numpad_digit"
-            android:contentDescription="@string/content_description_numpad_4"
-            android:onClick="@{() -> controlsViewModel.handleDtmfClick('4')}"
-            android:src="@drawable/voip_numpad_4"
-            app:layout_constraintBottom_toTopOf="@id/dtmf_7"
-            app:layout_constraintDimensionRatio="1:1"
-            app:layout_constraintEnd_toStartOf="@id/dtmf_5"
-            app:layout_constraintHorizontal_chainStyle="spread"
-            app:layout_constraintStart_toStartOf="@id/background"
-            app:layout_constraintTop_toBottomOf="@id/dtmf_1"
-            app:layout_constraintWidth_max="@dimen/voip_numpad_button_max_size" />
-
-        <ImageView
-            android:id="@+id/dtmf_5"
-            style="@style/call_numpad_digit"
-            android:contentDescription="@string/content_description_numpad_5"
-            android:onClick="@{() -> controlsViewModel.handleDtmfClick('5')}"
-            android:src="@drawable/voip_numpad_5"
-            app:layout_constraintBottom_toTopOf="@id/dtmf_8"
-            app:layout_constraintDimensionRatio="1:1"
-            app:layout_constraintEnd_toStartOf="@id/dtmf_6"
-            app:layout_constraintStart_toEndOf="@id/dtmf_4"
-            app:layout_constraintTop_toBottomOf="@id/dtmf_2"
-            app:layout_constraintWidth_max="@dimen/voip_numpad_button_max_size" />
-
-        <ImageView
-            android:id="@+id/dtmf_6"
-            style="@style/call_numpad_digit"
-            android:contentDescription="@string/content_description_numpad_6"
-            android:onClick="@{() -> controlsViewModel.handleDtmfClick('6')}"
-            android:src="@drawable/voip_numpad_6"
-            app:layout_constraintBottom_toTopOf="@id/dtmf_9"
-            app:layout_constraintDimensionRatio="1:1"
-            app:layout_constraintEnd_toEndOf="@id/background"
-            app:layout_constraintStart_toEndOf="@id/dtmf_5"
-            app:layout_constraintTop_toBottomOf="@id/dtmf_3"
-            app:layout_constraintWidth_max="@dimen/voip_numpad_button_max_size" />
-
-        <ImageView
-            android:id="@+id/dtmf_7"
-            style="@style/call_numpad_digit"
-            android:contentDescription="@string/content_description_numpad_7"
-            android:onClick="@{() -> controlsViewModel.handleDtmfClick('7')}"
-            android:src="@drawable/voip_numpad_7"
-            app:layout_constraintBottom_toTopOf="@id/dtmf_star"
-            app:layout_constraintDimensionRatio="1:1"
-            app:layout_constraintEnd_toStartOf="@id/dtmf_8"
-            app:layout_constraintHorizontal_chainStyle="spread"
-            app:layout_constraintStart_toStartOf="@id/background"
-            app:layout_constraintTop_toBottomOf="@id/dtmf_4"
-            app:layout_constraintWidth_max="@dimen/voip_numpad_button_max_size" />
-
-        <ImageView
-            android:id="@+id/dtmf_8"
-            style="@style/call_numpad_digit"
-            android:contentDescription="@string/content_description_numpad_8"
-            android:onClick="@{() -> controlsViewModel.handleDtmfClick('8')}"
-            android:src="@drawable/voip_numpad_8"
-            app:layout_constraintBottom_toTopOf="@id/dtmf_0"
-            app:layout_constraintDimensionRatio="1:1"
-            app:layout_constraintEnd_toStartOf="@id/dtmf_9"
-            app:layout_constraintStart_toEndOf="@id/dtmf_7"
-            app:layout_constraintTop_toBottomOf="@id/dtmf_5"
-            app:layout_constraintWidth_max="@dimen/voip_numpad_button_max_size" />
-
-        <ImageView
-            android:id="@+id/dtmf_9"
-            style="@style/call_numpad_digit"
-            android:contentDescription="@string/content_description_numpad_9"
-            android:onClick="@{() -> controlsViewModel.handleDtmfClick('9')}"
-            android:src="@drawable/voip_numpad_9"
-            app:layout_constraintBottom_toTopOf="@id/dtmf_sharp"
-            app:layout_constraintDimensionRatio="1:1"
-            app:layout_constraintEnd_toEndOf="@id/background"
-            app:layout_constraintStart_toEndOf="@id/dtmf_8"
-            app:layout_constraintTop_toBottomOf="@id/dtmf_6"
-            app:layout_constraintWidth_max="@dimen/voip_numpad_button_max_size" />
-
-        <ImageView
-            android:id="@+id/dtmf_star"
-            style="@style/call_numpad_digit"
-            android:contentDescription="@string/content_description_numpad_star"
-            android:onClick="@{() -> controlsViewModel.handleDtmfClick('*')}"
-            android:src="@drawable/voip_numpad_star"
-            app:layout_constraintBottom_toBottomOf="@id/background"
-            app:layout_constraintDimensionRatio="1:1"
-            app:layout_constraintEnd_toStartOf="@id/dtmf_0"
-            app:layout_constraintHorizontal_chainStyle="spread"
-            app:layout_constraintStart_toStartOf="@id/background"
-            app:layout_constraintTop_toBottomOf="@id/dtmf_7"
-            app:layout_constraintWidth_max="@dimen/voip_numpad_button_max_size" />
-
-        <ImageView
-            android:id="@+id/dtmf_0"
-            style="@style/call_numpad_digit"
-            android:contentDescription="@string/content_description_numpad_0"
-            android:onClick="@{() -> controlsViewModel.handleDtmfClick('0')}"
-            android:src="@drawable/voip_numpad_0"
-            app:layout_constraintBottom_toBottomOf="@id/background"
-            app:layout_constraintDimensionRatio="1:1"
-            app:layout_constraintEnd_toStartOf="@id/dtmf_sharp"
-            app:layout_constraintStart_toEndOf="@id/dtmf_star"
-            app:layout_constraintTop_toBottomOf="@id/dtmf_8"
-            app:layout_constraintWidth_max="@dimen/voip_numpad_button_max_size" />
-
-        <ImageView
-            android:id="@+id/dtmf_sharp"
-            style="@style/call_numpad_digit"
-            android:contentDescription="@string/content_description_numpad_sharp"
-            android:onClick="@{() -> controlsViewModel.handleDtmfClick('#')}"
-            android:src="@drawable/voip_numpad_hash"
-            app:layout_constraintBottom_toBottomOf="@id/background"
-            app:layout_constraintDimensionRatio="1:1"
-            app:layout_constraintEnd_toEndOf="@id/background"
-            app:layout_constraintStart_toEndOf="@id/dtmf_0"
-            app:layout_constraintTop_toBottomOf="@id/dtmf_9"
-            app:layout_constraintWidth_max="@dimen/voip_numpad_button_max_size" />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-sw533dp-land/dialer_fragment.xml b/app/src/main/res/layout-sw533dp-land/dialer_fragment.xml
deleted file mode 100644
index 50137dd74..000000000
--- a/app/src/main/res/layout-sw533dp-land/dialer_fragment.xml
+++ /dev/null
@@ -1,182 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <data>
-        <import type="android.view.View"/>
-        <variable
-            name="newContactClickListener"
-            type="android.view.View.OnClickListener"/>
-        <variable
-            name="newConferenceClickListener"
-            type="android.view.View.OnClickListener"/>
-        <variable
-            name="transferCallClickListener"
-            type="android.view.View.OnClickListener"/>
-        <variable
-            name="viewModel"
-            type="org.linphone.activities.main.dialer.viewmodels.DialerViewModel"/>
-    </data>
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="@color/grey_color">
-
-        <ImageView
-            android:visibility="@{viewModel.showPreview ? View.GONE : View.VISIBLE}"
-            android:layout_width="match_parent"
-            android:layout_height="300dp"
-            android:layout_centerVertical="true"
-            android:layout_toLeftOf="@id/ui_layout"
-            android:padding="30dp"
-            android:contentDescription="@null"
-            android:src="@drawable/dialer_background" />
-
-        <org.linphone.mediastream.video.capture.CaptureTextureView
-            android:id="@+id/video_preview_window"
-            android:visibility="@{viewModel.showPreview ? View.VISIBLE : View.GONE, default=gone}"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_centerInParent="true"/>
-
-        <ImageView
-            android:onClick="@{() -> viewModel.switchCamera()}"
-            android:visibility="@{viewModel.showPreview &amp;&amp; viewModel.showSwitchCamera ? View.VISIBLE : View.GONE, default=gone}"
-            android:contentDescription="@string/content_description_switch_camera"
-            android:layout_alignParentLeft="true"
-            android:layout_alignParentTop="true"
-            android:layout_width="50dp"
-            android:layout_height="50dp"
-            android:layout_margin="20dp"
-            android:background="@drawable/round_button_background"
-            android:padding="10dp"
-            android:src="@drawable/camera_switch" />
-
-        <RelativeLayout
-            android:id="@+id/ui_layout"
-            android:layout_width="300dp"
-            android:layout_height="460dp"
-            android:layout_marginRight="50dp"
-            android:layout_centerVertical="true"
-            android:layout_alignParentRight="true"
-            android:background="?attr/backgroundColor">
-
-            <RelativeLayout
-                android:id="@+id/address_bar"
-                android:layout_width="match_parent"
-                android:layout_height="@dimen/main_activity_top_bar_size"
-                android:layout_alignParentTop="true"
-                android:background="?attr/lightToolbarBackgroundColor">
-
-                <ImageView
-                    android:id="@+id/erase"
-                    android:onClick="@{() -> viewModel.eraseLastChar()}"
-                    android:onLongClick="@{() -> viewModel.eraseAll()}"
-                    android:contentDescription="@string/content_description_dialer_erase"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:paddingLeft="10dp"
-                    android:paddingRight="10dp"
-                    android:layout_alignParentRight="true"
-                    android:layout_centerVertical="true"
-                    android:focusableInTouchMode="true"
-                    android:src="@drawable/backspace" />
-
-                <EditText
-                    android:id="@+id/sip_uri_input"
-                    android:text="@={viewModel.enteredUri}"
-                    android:beforeTextChanged="@{(text, start, count, after) -> viewModel.onBeforeUriChanged(sipUriInput, count, after)}"
-                    android:afterTextChanged="@{(text) -> viewModel.onAfterUriChanged(sipUriInput, text)}"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_centerVertical="true"
-                    android:layout_toLeftOf="@id/erase"
-                    android:background="@color/transparent_color"
-                    android:backgroundTint="@color/transparent_color"
-                    android:ellipsize="start"
-                    android:hint="@string/dialer_address_bar_hint"
-                    android:inputType="textEmailAddress|textUri|textNoSuggestions"
-                    android:paddingLeft="20dp"
-                    android:paddingRight="5dp"
-                    android:textColorHint="@color/light_grey_color" />
-
-            </RelativeLayout>
-
-            <LinearLayout
-                android:id="@+id/controls"
-                android:layout_alignParentBottom="true"
-                android:layout_width="match_parent"
-                android:layout_height="@dimen/main_activity_top_bar_size">
-
-                <ImageView
-                    android:onClick="@{newConferenceClickListener}"
-                    android:visibility="@{viewModel.scheduleConferenceAvailable ? View.VISIBLE : View.GONE}"
-                    android:contentDescription="@string/content_description_create_conference"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="2"
-                    android:background="?attr/button_background_drawable"
-                    android:padding="5dp"
-                    android:src="@drawable/icon_video_conf_new" />
-
-                <ImageView
-                    android:onClick="@{newContactClickListener}"
-                    android:visibility="@{viewModel.scheduleConferenceAvailable || viewModel.hideAddContactButton ? View.GONE : View.VISIBLE, default=gone}"
-                    android:enabled="@{viewModel.enteredUri.length() > 0}"
-                    android:contentDescription="@string/content_description_add_contact"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="2"
-                    android:background="?attr/button_background_drawable"
-                    android:padding="15dp"
-                    android:src="@drawable/contact_add" />
-
-                <ImageView
-                    android:onClick="@{() -> viewModel.startCall()}"
-                    android:visibility="@{viewModel.atLeastOneCall ? View.GONE : View.VISIBLE}"
-                    android:contentDescription="@string/content_description_start_call"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:background="@drawable/call"
-                    android:padding="12dp"
-                    android:src="@{viewModel.autoInitiateVideoCalls ? @drawable/call_video_start : @drawable/call_audio_start, default=@drawable/call_audio_start}" />
-
-                <ImageView
-                    android:onClick="@{() -> viewModel.startCall()}"
-                    android:visibility="@{viewModel.atLeastOneCall &amp;&amp; !viewModel.transferVisibility ? View.VISIBLE : View.GONE, default=gone}"
-                    android:contentDescription="@string/content_description_add_call"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:background="@drawable/call"
-                    android:padding="12dp"
-                    android:src="@drawable/call_add" />
-
-                <ImageView
-                    android:onClick="@{transferCallClickListener}"
-                    android:visibility="@{viewModel.atLeastOneCall &amp;&amp; viewModel.transferVisibility ? View.VISIBLE : View.GONE, default=gone}"
-                    android:contentDescription="@string/content_description_transfer_call"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:background="@drawable/call"
-                    android:padding="12dp"
-                    android:src="@drawable/call_transfer" />
-
-            </LinearLayout>
-
-            <include
-                layout="@layout/numpad"
-                android:layout_above="@id/controls"
-                android:layout_below="@id/address_bar"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                app:keyListener="@{viewModel.onKeyClick}" />
-
-        </RelativeLayout>
-
-    </RelativeLayout>
-
-</layout>
diff --git a/app/src/main/res/layout-sw600dp/dialer_fragment.xml b/app/src/main/res/layout-sw600dp/dialer_fragment.xml
deleted file mode 100644
index 4c513ca49..000000000
--- a/app/src/main/res/layout-sw600dp/dialer_fragment.xml
+++ /dev/null
@@ -1,182 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <data>
-        <import type="android.view.View"/>
-        <variable
-            name="newContactClickListener"
-            type="android.view.View.OnClickListener"/>
-        <variable
-            name="newConferenceClickListener"
-            type="android.view.View.OnClickListener"/>
-        <variable
-            name="transferCallClickListener"
-            type="android.view.View.OnClickListener"/>
-        <variable
-            name="viewModel"
-            type="org.linphone.activities.main.dialer.viewmodels.DialerViewModel"/>
-    </data>
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="@color/grey_color">
-
-        <ImageView
-            android:visibility="@{viewModel.showPreview ? View.GONE : View.VISIBLE}"
-            android:layout_width="400dp"
-            android:layout_height="wrap_content"
-            android:layout_above="@id/ui_layout"
-            android:padding="30dp"
-            android:layout_centerHorizontal="true"
-            android:contentDescription="@null"
-            android:src="@drawable/dialer_background" />
-
-        <org.linphone.mediastream.video.capture.CaptureTextureView
-            android:id="@+id/video_preview_window"
-            android:visibility="@{viewModel.showPreview ? View.VISIBLE : View.GONE, default=gone}"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_centerInParent="true"/>
-
-        <ImageView
-            android:onClick="@{() -> viewModel.switchCamera()}"
-            android:visibility="@{viewModel.showPreview &amp;&amp; viewModel.showSwitchCamera ? View.VISIBLE : View.GONE, default=gone}"
-            android:contentDescription="@string/content_description_switch_camera"
-            android:layout_alignParentLeft="true"
-            android:layout_alignParentTop="true"
-            android:layout_width="50dp"
-            android:layout_height="50dp"
-            android:layout_margin="20dp"
-            android:background="@drawable/round_button_background"
-            android:padding="10dp"
-            android:src="@drawable/camera_switch" />
-
-        <RelativeLayout
-            android:id="@+id/ui_layout"
-            android:layout_width="300dp"
-            android:layout_height="460dp"
-            android:layout_centerHorizontal="true"
-            android:layout_marginBottom="50dp"
-            android:layout_alignParentBottom="true"
-            android:background="?attr/backgroundColor">
-
-            <RelativeLayout
-                android:id="@+id/address_bar"
-                android:layout_width="match_parent"
-                android:layout_height="@dimen/main_activity_top_bar_size"
-                android:layout_alignParentTop="true"
-                android:background="?attr/lightToolbarBackgroundColor">
-
-                <ImageView
-                    android:id="@+id/erase"
-                    android:onClick="@{() -> viewModel.eraseLastChar()}"
-                    android:onLongClick="@{() -> viewModel.eraseAll()}"
-                    android:contentDescription="@string/content_description_dialer_erase"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:paddingLeft="10dp"
-                    android:paddingRight="10dp"
-                    android:layout_alignParentRight="true"
-                    android:layout_centerVertical="true"
-                    android:focusableInTouchMode="true"
-                    android:src="@drawable/backspace" />
-
-                <EditText
-                    android:id="@+id/sip_uri_input"
-                    android:text="@={viewModel.enteredUri}"
-                    android:beforeTextChanged="@{(text, start, count, after) -> viewModel.onBeforeUriChanged(sipUriInput, count, after)}"
-                    android:afterTextChanged="@{(text) -> viewModel.onAfterUriChanged(sipUriInput, text)}"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_centerVertical="true"
-                    android:layout_toLeftOf="@id/erase"
-                    android:background="@color/transparent_color"
-                    android:backgroundTint="@color/transparent_color"
-                    android:ellipsize="start"
-                    android:hint="@string/dialer_address_bar_hint"
-                    android:inputType="textEmailAddress|textUri|textNoSuggestions"
-                    android:paddingLeft="20dp"
-                    android:paddingRight="5dp"
-                    android:textColorHint="@color/light_grey_color" />
-
-            </RelativeLayout>
-
-            <LinearLayout
-                android:id="@+id/controls"
-                android:layout_alignParentBottom="true"
-                android:layout_width="match_parent"
-                android:layout_height="@dimen/main_activity_top_bar_size">
-
-                <ImageView
-                    android:onClick="@{newConferenceClickListener}"
-                    android:visibility="@{viewModel.scheduleConferenceAvailable ? View.VISIBLE : View.GONE}"
-                    android:contentDescription="@string/content_description_create_conference"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="2"
-                    android:background="?attr/button_background_drawable"
-                    android:padding="5dp"
-                    android:src="@drawable/icon_video_conf_new" />
-
-                <ImageView
-                    android:onClick="@{newContactClickListener}"
-                    android:visibility="@{viewModel.scheduleConferenceAvailable || viewModel.hideAddContactButton ? View.GONE : View.VISIBLE, default=gone}"
-                    android:enabled="@{viewModel.enteredUri.length() > 0}"
-                    android:contentDescription="@string/content_description_add_contact"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="2"
-                    android:background="?attr/button_background_drawable"
-                    android:padding="15dp"
-                    android:src="@drawable/contact_add" />
-
-                <ImageView
-                    android:onClick="@{() -> viewModel.startCall()}"
-                    android:visibility="@{viewModel.atLeastOneCall ? View.GONE : View.VISIBLE}"
-                    android:contentDescription="@string/content_description_start_call"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:background="@drawable/call"
-                    android:padding="12dp"
-                    android:src="@{viewModel.autoInitiateVideoCalls ? @drawable/call_video_start : @drawable/call_audio_start, default=@drawable/call_audio_start}" />
-
-                <ImageView
-                    android:onClick="@{() -> viewModel.startCall()}"
-                    android:visibility="@{viewModel.atLeastOneCall &amp;&amp; !viewModel.transferVisibility ? View.VISIBLE : View.GONE, default=gone}"
-                    android:contentDescription="@string/content_description_add_call"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:background="@drawable/call"
-                    android:padding="12dp"
-                    android:src="@drawable/call_add" />
-
-                <ImageView
-                    android:onClick="@{transferCallClickListener}"
-                    android:visibility="@{viewModel.atLeastOneCall &amp;&amp; viewModel.transferVisibility ? View.VISIBLE : View.GONE, default=gone}"
-                    android:contentDescription="@string/content_description_transfer_call"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:background="@drawable/call"
-                    android:padding="12dp"
-                    android:src="@drawable/call_transfer" />
-
-            </LinearLayout>
-
-            <include
-                layout="@layout/numpad"
-                android:layout_above="@id/controls"
-                android:layout_below="@id/address_bar"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                app:keyListener="@{viewModel.onKeyClick}" />
-
-        </RelativeLayout>
-
-    </RelativeLayout>
-
-</layout>
diff --git a/app/src/main/res/layout/about_fragment.xml b/app/src/main/res/layout/about_fragment.xml
deleted file mode 100644
index 6198b5301..000000000
--- a/app/src/main/res/layout/about_fragment.xml
+++ /dev/null
@@ -1,197 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <data>
-        <import type="android.view.View"/>
-        <variable
-            name="privacyPolicyClickListener"
-            type="android.view.View.OnClickListener"/>
-        <variable
-            name="licenseClickListener"
-            type="android.view.View.OnClickListener"/>
-        <variable
-            name="weblateClickListener"
-            type="android.view.View.OnClickListener"/>
-        <variable
-            name="viewModel"
-            type="org.linphone.activities.main.about.AboutViewModel" />
-    </data>
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="?attr/backgroundColor">
-
-        <LinearLayout
-            android:id="@+id/top_bar"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/main_activity_top_bar_size"
-            android:layout_gravity="center_horizontal"
-            android:background="?attr/lightToolbarBackgroundColor"
-            android:orientation="horizontal">
-
-            <ImageView
-                android:id="@+id/back"
-                android:contentDescription="@string/content_description_go_back"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="0.2"
-                android:background="?attr/button_background_drawable"
-                android:padding="18dp"
-                android:src="@drawable/back" />
-
-            <TextView
-                style="@style/accent_colored_title_font"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="0.6"
-                android:gravity="center"
-                android:singleLine="true"
-                android:ellipsize="end"
-                android:padding="15dp"
-                android:text="@string/about"/>
-
-            <View
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="0.2"
-                android:visibility="invisible" />
-
-        </LinearLayout>
-
-        <androidx.core.widget.NestedScrollView
-            android:layout_below="@id/top_bar"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical">
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_gravity="center"
-                    android:background="@color/voip_dark_color2"
-                    android:gravity="center"
-                    android:orientation="vertical"
-                    android:padding="20dp">
-
-                    <ImageView
-                        android:layout_width="50dp"
-                        android:layout_height="wrap_content"
-                        android:adjustViewBounds="true"
-                        android:layout_gravity="center"
-                        android:layout_marginBottom="10dp"
-                        android:contentDescription="@null"
-                        android:src="@drawable/linphone_logo_tinted"/>
-
-                    <ImageView
-                        android:layout_width="125dp"
-                        android:layout_height="wrap_content"
-                        android:adjustViewBounds="true"
-                        android:layout_gravity="center"
-                        android:contentDescription="@null"
-                        android:src="@drawable/linphone_app_name_logo" />
-
-                    <TextView
-                        android:textSize="13sp"
-                        android:textColor="?accentColor"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center"
-                        android:text="@string/app_description" />
-
-                    <TextView
-                        style="@style/about_version_font"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center"
-                        android:gravity="center"
-                        android:paddingTop="20dp"
-                        android:textColorLink="?attr/secondaryTextColor"
-                        android:textIsSelectable="true"
-                        android:text="@{String.format(@string/about_version, viewModel.appVersion)}" />
-
-                    <TextView
-                        style="@style/about_version_font"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center"
-                        android:gravity="center"
-                        android:textColorLink="?attr/secondaryTextColor"
-                        android:textIsSelectable="true"
-                        android:text="@{String.format(@string/about_liblinphone_sdk_version, viewModel.sdkVersion)}" />
-
-                </LinearLayout>
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_gravity="center"
-                    android:orientation="vertical"
-                    android:background="?attr/backgroundColor"
-                    android:padding="10dp">
-
-                    <TextView
-                        android:textColor="?attr/accentColor"
-                        android:textSize="16sp"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center"
-                        android:autoLink="web"
-                        android:gravity="center"
-                        android:paddingTop="20dp"
-                        android:text="@string/about_link"
-                        android:textColorLink="@color/primary_color" />
-
-                    <TextView
-                        android:onClick="@{privacyPolicyClickListener}"
-                        style="@style/about_license_font"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center"
-                        android:autoLink="web"
-                        android:paddingTop="10dp"
-                        android:gravity="center"
-                        android:text="@string/about_privacy_policy"
-                        android:textColorLink="@color/primary_color" />
-
-                    <TextView
-                        android:onClick="@{licenseClickListener}"
-                        style="@style/about_license_font"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center"
-                        android:gravity="center"
-                        android:paddingTop="10dp"
-                        android:paddingBottom="10dp"
-                        android:text="@string/about_text" />
-
-                    <TextView
-                        android:onClick="@{weblateClickListener}"
-                        android:textColor="?attr/accentColor"
-                        android:textSize="16sp"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center"
-                        android:gravity="center"
-                        android:paddingTop="10dp"
-                        android:paddingBottom="20dp"
-                        android:text="@string/about_weblate_translation" />
-
-                    <View
-                        android:layout_width="match_parent"
-                        android:layout_height="1dp"
-                        android:background="?attr/dividerColor" />
-
-                </LinearLayout>
-
-            </LinearLayout>
-
-        </androidx.core.widget.NestedScrollView>
-
-    </RelativeLayout>
-
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/assistant_account_login_fragment.xml b/app/src/main/res/layout/assistant_account_login_fragment.xml
deleted file mode 100644
index b6051be74..000000000
--- a/app/src/main/res/layout/assistant_account_login_fragment.xml
+++ /dev/null
@@ -1,282 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    xmlns:bind="http://schemas.android.com/apk/res-auto"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <data>
-        <import type="android.view.View"/>
-        <variable
-            name="selectCountryClickListener"
-            type="android.view.View.OnClickListener"/>
-        <variable
-            name="infoClickListener"
-            type="android.view.View.OnClickListener"/>
-        <variable
-            name="forgotPasswordClickListener"
-            type="android.view.View.OnClickListener"/>
-        <variable
-            name="viewModel"
-            type="org.linphone.activities.assistant.viewmodels.AccountLoginViewModel" />
-    </data>
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <androidx.fragment.app.FragmentContainerView
-            android:id="@+id/top_bar_fragment"
-            android:name="org.linphone.activities.assistant.fragments.TopBarFragment"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/main_activity_top_bar_size"
-            android:layout_alignParentTop="true"
-            tools:layout="@layout/assistant_top_bar_fragment" />
-
-        <androidx.core.widget.NestedScrollView
-            android:layout_below="@id/top_bar_fragment"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:paddingRight="30dp"
-                android:paddingLeft="30dp"
-                android:orientation="vertical">
-
-                <TextView
-                    style="@style/standard_text_font"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:gravity="center"
-                    android:text="@string/assistant_linphone_account"
-                    android:paddingTop="10dp"
-                    android:textAllCaps="true" />
-
-                <RelativeLayout
-                    android:visibility="@{viewModel.loginWithUsernamePassword ? View.GONE: View.VISIBLE}"
-                    android:layout_marginBottom="5dp"
-                    android:paddingTop="10dp"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
-
-                    <TextView
-                        android:id="@+id/phone_number_desc"
-                        style="@style/standard_small_text_font"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:gravity="center"
-                        android:layout_alignParentTop="true"
-                        android:paddingTop="10dp"
-                        android:text="@string/assistant_create_account_part_1" />
-
-                    <TextView
-                        android:id="@+id/select_country_label"
-                        android:text="@string/select_your_country"
-                        style="@style/assistant_input_field_header_font"
-                        android:textAllCaps="true"
-                        android:layout_marginTop="20dp"
-                        android:layout_below="@id/phone_number_desc"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"/>
-
-                    <ImageView
-                        android:onClick="@{infoClickListener}"
-                        android:contentDescription="@string/content_description_phone_number_use"
-                        android:src="@drawable/info"
-                        android:layout_alignParentEnd="true"
-                        android:layout_alignTop="@id/select_country_label"
-                        android:layout_above="@id/select_country"
-                        android:layout_width="20dp"
-                        android:layout_height="20dp"/>
-
-                    <TextView
-                        android:onClick="@{selectCountryClickListener}"
-                        android:id="@+id/select_country"
-                        style="@style/button_font"
-                        android:text="@{viewModel.countryName.length > 0 ? viewModel.countryName : @string/select_your_country}"
-                        android:background="@drawable/resizable_assistant_button"
-                        android:textColor="@drawable/assistant_button_text_color"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:padding="10dp"
-                        android:layout_marginTop="5dp"
-                        android:gravity="center"
-                        android:layout_below="@id/select_country_label"/>
-
-                    <LinearLayout
-                        android:orientation="horizontal"
-                        android:layout_marginTop="10dp"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_below="@id/select_country">
-
-                        <com.google.android.material.textfield.TextInputLayout
-                            android:layout_width="100dp"
-                            android:layout_height="wrap_content"
-                            android:layout_marginRight="10dp"
-                            android:hint="@string/international_prefix">
-
-                            <com.google.android.material.textfield.TextInputEditText
-                                assistantPhoneNumberPrefixValidation="@{true}"
-                                errorMessage="@={viewModel.prefixError}"
-                                android:text="@={viewModel.prefix}"
-                                android:imeOptions="actionNext"
-                                android:singleLine="true"
-                                android:inputType="phone"
-                                android:background="@color/transparent_color"
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"/>
-
-                        </com.google.android.material.textfield.TextInputLayout>
-
-                        <com.google.android.material.textfield.TextInputLayout
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:hint="@string/phone_number">
-
-                            <com.google.android.material.textfield.TextInputEditText
-                                assistantPhoneNumberValidation="@{true}"
-                                errorMessage="@={viewModel.phoneNumberError}"
-                                android:text="@={viewModel.phoneNumber}"
-                                android:imeOptions="actionDone"
-                                android:singleLine="true"
-                                android:inputType="phone"
-                                android:background="@color/transparent_color"
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"/>
-
-                        </com.google.android.material.textfield.TextInputLayout>
-
-                    </LinearLayout>
-
-                </RelativeLayout>
-
-                <LinearLayout
-                    android:visibility="@{viewModel.loginWithUsernamePassword ? View.VISIBLE: View.GONE}"
-                    android:layout_marginBottom="5dp"
-                    android:paddingTop="10dp"
-                    android:orientation="vertical"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
-
-                    <TextView
-                        style="@style/standard_small_text_font"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:gravity="center"
-                        android:paddingTop="10dp"
-                        android:text="@string/assistant_linphone_login_desc" />
-
-                    <com.google.android.material.textfield.TextInputLayout
-                        android:id="@+id/username_layout"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="16dp"
-                        android:hint="@string/username">
-
-                        <com.google.android.material.textfield.TextInputEditText
-                            errorMessage="@={viewModel.usernameError}"
-                            android:text="@={viewModel.username}"
-                            android:imeOptions="actionNext"
-                            android:singleLine="true"
-                            android:inputType="text|textNoSuggestions"
-                            android:background="@color/transparent_color"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"/>
-
-                    </com.google.android.material.textfield.TextInputLayout>
-
-                    <com.google.android.material.textfield.TextInputLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        app:endIconMode="password_toggle"
-                        android:hint="@string/password">
-
-                        <com.google.android.material.textfield.TextInputEditText
-                            errorMessage="@={viewModel.passwordError}"
-                            android:text="@={viewModel.password}"
-                            android:imeOptions="actionDone"
-                            android:singleLine="true"
-                            android:inputType="textPassword"
-                            android:background="@color/transparent_color"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"/>
-
-                    </com.google.android.material.textfield.TextInputLayout>
-
-                    <TextView
-                        android:onClick="@{forgotPasswordClickListener}"
-                        android:textColor="?attr/accentColor"
-                        android:textSize="12sp"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="right"
-                        android:gravity="right"
-                        android:paddingTop="6dp"
-                        android:text="@string/assistant_login_forgotten_password" />
-
-                </LinearLayout>
-
-                <LinearLayout
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:orientation="horizontal"
-                    android:gravity="center"
-                    android:paddingTop="10dp"
-                    android:visibility="@{viewModel.forceLoginUsingUsernameAndPassword ? View.GONE : View.VISIBLE}">
-
-                    <com.google.android.material.switchmaterial.SwitchMaterial
-                        android:checked="@={viewModel.loginWithUsernamePassword}"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"/>
-
-                    <TextView
-                        style="@style/standard_small_text_font"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:gravity="left"
-                        android:text="@string/assistant_login_with_username" />
-
-                </LinearLayout>
-
-                <com.google.android.material.textfield.TextInputLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:hint="@string/assistant_display_name_optional">
-
-                    <com.google.android.material.textfield.TextInputEditText
-                        android:text="@={viewModel.displayName}"
-                        android:imeOptions="actionDone"
-                        android:singleLine="true"
-                        android:inputType="textPersonName"
-                        android:background="@color/transparent_color"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"/>
-
-                </com.google.android.material.textfield.TextInputLayout>
-
-                <TextView
-                    android:onClick="@{() -> viewModel.login()}"
-                    android:enabled="@{viewModel.loginEnabled, default=false}"
-                    android:text="@string/assistant_login"
-                    android:background="@drawable/assistant_button"
-                    android:textColor="@drawable/assistant_button_text_color"
-                    style="@style/button_font"
-                    android:layout_gravity="center"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_margin="20dp"
-                    android:padding="10dp"/>
-
-            </LinearLayout>
-
-        </androidx.core.widget.NestedScrollView>
-
-        <include
-            layout="@layout/wait_layout"
-            bind:visibility="@{viewModel.waitForServerAnswer}"/>
-
-    </RelativeLayout>
-
-</layout>
diff --git a/app/src/main/res/layout/assistant_activity.xml b/app/src/main/res/layout/assistant_activity.xml
deleted file mode 100644
index 3b2192ec4..000000000
--- a/app/src/main/res/layout/assistant_activity.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/coordinator"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="?attr/backgroundColor">
-
-        <androidx.fragment.app.FragmentContainerView
-            android:id="@+id/nav_host_fragment"
-            android:name="androidx.navigation.fragment.NavHostFragment"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            app:defaultNavHost="true"
-            app:navGraph="@navigation/assistant_nav_graph" />
-
-    </RelativeLayout>
-
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/assistant_country_picker_cell.xml b/app/src/main/res/layout/assistant_country_picker_cell.xml
deleted file mode 100644
index ccc3d74d9..000000000
--- a/app/src/main/res/layout/assistant_country_picker_cell.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="40dp"
-    android:layout_gravity="center"
-    android:orientation="horizontal"
-    android:padding="5dp">
-
-    <TextView
-        android:id="@+id/country_name"
-        style="@style/standard_text_font"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent" />
-
-    <TextView
-        android:id="@+id/country_prefix"
-        style="@style/standard_text_font"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:paddingLeft="5dp" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/assistant_country_picker_fragment.xml b/app/src/main/res/layout/assistant_country_picker_fragment.xml
deleted file mode 100644
index a387259a4..000000000
--- a/app/src/main/res/layout/assistant_country_picker_fragment.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <data>
-        <import type="android.view.View"/>
-        <variable
-            name="cancelClickListener"
-            type="android.view.View.OnClickListener"/>
-    </data>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical"
-        android:background="?attr/backgroundColor">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:padding="10dp">
-
-            <TextView
-                style="@style/standard_text_font"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:gravity="center_vertical|center"
-                android:singleLine="true"
-                android:text="@string/assistant_choose_country" />
-
-        </LinearLayout>
-
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_margin="10dp">
-
-            <com.google.android.material.textfield.TextInputLayout
-                android:layout_toLeftOf="@id/clear_field"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:hint="@string/assistant_choose_country_title">
-
-                <com.google.android.material.textfield.TextInputEditText
-                    android:id="@+id/search_country"
-                    android:imeOptions="actionDone"
-                    android:singleLine="true"
-                    android:inputType="textPersonName"
-                    android:background="@color/transparent_color"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"/>
-
-            </com.google.android.material.textfield.TextInputLayout>
-
-            <ImageView
-                android:id="@+id/clear_field"
-                android:onClick="@{() -> searchCountry.setText(``)}"
-                android:contentDescription="@string/content_description_clear_field"
-                android:layout_width="30dp"
-                android:layout_height="30dp"
-                android:layout_alignParentRight="true"
-                android:layout_centerVertical="true"
-                android:paddingLeft="5dp"
-                android:paddingRight="5dp"
-                android:src="@drawable/field_clean" />
-
-        </RelativeLayout>
-
-        <ListView
-            android:id="@+id/countryList"
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_weight="1"
-            android:cacheColorHint="@color/transparent_color"
-            android:divider="@color/light_grey_color"
-            android:dividerHeight="1dp" />
-
-        <TextView
-            android:onClick="@{cancelClickListener}"
-            style="@style/button_font"
-            android:padding="10dp"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/dialog_cancel"
-            android:gravity="right" />
-
-    </LinearLayout>
-
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/assistant_echo_canceller_calibration_fragment.xml b/app/src/main/res/layout/assistant_echo_canceller_calibration_fragment.xml
deleted file mode 100644
index acf86c157..000000000
--- a/app/src/main/res/layout/assistant_echo_canceller_calibration_fragment.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools">
-
-    <data>
-        <variable
-            name="viewModel"
-            type="org.linphone.activities.assistant.viewmodels.EchoCancellerCalibrationViewModel" />
-    </data>
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <androidx.fragment.app.FragmentContainerView
-            android:id="@+id/top_bar_fragment"
-            android:name="org.linphone.activities.assistant.fragments.TopBarFragment"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/main_activity_top_bar_size"
-            android:layout_alignParentTop="true"
-            tools:layout="@layout/assistant_top_bar_fragment" />
-
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_below="@id/top_bar_fragment"
-            android:padding="30dp"
-            android:orientation="vertical"
-            android:background="?attr/backgroundColor">
-
-            <TextView
-                android:text="@string/assistant_ec_calibration"
-                style="@style/standard_text_font"
-                android:textAllCaps="true"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:gravity="center"
-                android:layout_centerHorizontal="true"/>
-
-            <ImageView
-                android:src="@drawable/linphone_logo_tinted"
-                android:layout_width="150dp"
-                android:layout_height="150dp"
-                android:contentDescription="@null"
-                android:layout_centerInParent="true"/>
-
-            <ProgressBar
-                android:layout_height="wrap_content"
-                android:layout_width="wrap_content"
-                android:layout_alignParentBottom="true"
-                android:layout_centerHorizontal="true" />
-
-        </RelativeLayout>
-
-    </RelativeLayout>
-
-</layout>
diff --git a/app/src/main/res/layout/assistant_email_account_creation_fragment.xml b/app/src/main/res/layout/assistant_email_account_creation_fragment.xml
deleted file mode 100644
index e690c83d5..000000000
--- a/app/src/main/res/layout/assistant_email_account_creation_fragment.xml
+++ /dev/null
@@ -1,169 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    xmlns:bind="http://schemas.android.com/apk/res-auto"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <data>
-        <import type="android.view.View"/>
-        <variable
-            name="viewModel"
-            type="org.linphone.activities.assistant.viewmodels.EmailAccountCreationViewModel" />
-    </data>
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <androidx.fragment.app.FragmentContainerView
-            android:id="@+id/top_bar_fragment"
-            android:name="org.linphone.activities.assistant.fragments.TopBarFragment"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/main_activity_top_bar_size"
-            android:layout_alignParentTop="true"
-            tools:layout="@layout/assistant_top_bar_fragment" />
-
-        <androidx.core.widget.NestedScrollView
-            android:layout_below="@id/top_bar_fragment"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:paddingRight="30dp"
-                android:paddingLeft="30dp"
-                android:orientation="vertical">
-
-                <TextView
-                    style="@style/standard_text_font"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:gravity="center"
-                    android:text="@string/assistant_create_account"
-                    android:paddingTop="10dp"
-                    android:textAllCaps="true" />
-
-                <TextView
-                    style="@style/standard_small_text_font"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:gravity="center"
-                    android:layout_gravity="top"
-                    android:paddingTop="20dp"
-                    android:text="@string/assistant_create_account_part_email" />
-
-                <com.google.android.material.textfield.TextInputLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:hint="@string/username">
-
-                    <com.google.android.material.textfield.TextInputEditText
-                        assistantUsernameValidation="@{true}"
-                        errorMessage="@={viewModel.usernameError}"
-                        android:text="@={viewModel.username}"
-                        android:imeOptions="actionNext"
-                        android:singleLine="true"
-                        android:inputType="text|textNoSuggestions"
-                        android:background="@color/transparent_color"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"/>
-
-                </com.google.android.material.textfield.TextInputLayout>
-
-                <com.google.android.material.textfield.TextInputLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:hint="@string/email">
-
-                    <com.google.android.material.textfield.TextInputEditText
-                        errorMessage="@={viewModel.emailError}"
-                        emailConfirmationValidation="@{true}"
-                        android:text="@={viewModel.email}"
-                        android:imeOptions="actionNext"
-                        android:singleLine="true"
-                        android:inputType="text|textEmailAddress"
-                        android:background="@color/transparent_color"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"/>
-
-                </com.google.android.material.textfield.TextInputLayout>
-
-                <com.google.android.material.textfield.TextInputLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    app:endIconMode="password_toggle"
-                    android:hint="@string/password">
-
-                    <com.google.android.material.textfield.TextInputEditText
-                        errorMessage="@={viewModel.passwordError}"
-                        passwordConfirmationValidation="@{passwordConfirmation}"
-                        android:text="@={viewModel.password}"
-                        android:imeOptions="actionNext"
-                        android:singleLine="true"
-                        android:inputType="textPassword"
-                        android:background="@color/transparent_color"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"/>
-
-                </com.google.android.material.textfield.TextInputLayout>
-
-                <com.google.android.material.textfield.TextInputLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    app:endIconMode="password_toggle"
-                    android:hint="@string/assistant_confirm_password">
-
-                    <com.google.android.material.textfield.TextInputEditText
-                        android:id="@+id/password_confirmation"
-                        errorMessage="@={viewModel.passwordConfirmationError}"
-                        android:text="@={viewModel.passwordConfirmation}"
-                        android:imeOptions="actionDone"
-                        android:singleLine="true"
-                        android:inputType="textPassword"
-                        android:background="@color/transparent_color"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"/>
-
-                </com.google.android.material.textfield.TextInputLayout>
-
-                <com.google.android.material.textfield.TextInputLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:hint="@string/assistant_display_name_optional">
-
-                    <com.google.android.material.textfield.TextInputEditText
-                        android:text="@={viewModel.displayName}"
-                        android:imeOptions="actionDone"
-                        android:singleLine="true"
-                        android:inputType="textPersonName"
-                        android:background="@color/transparent_color"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"/>
-
-                </com.google.android.material.textfield.TextInputLayout>
-
-                <TextView
-                    android:onClick="@{() -> viewModel.create()}"
-                    android:enabled="@{viewModel.createEnabled, default=false}"
-                    android:text="@string/assistant_create_account"
-                    android:background="@drawable/assistant_button"
-                    android:textColor="@drawable/assistant_button_text_color"
-                    android:layout_gravity="center"
-                    style="@style/button_font"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_margin="20dp"
-                    android:padding="10dp"/>
-
-            </LinearLayout>
-
-        </androidx.core.widget.NestedScrollView>
-
-        <include
-            layout="@layout/wait_layout"
-            bind:visibility="@{viewModel.waitForServerAnswer}"/>
-
-    </RelativeLayout>
-
-</layout>
diff --git a/app/src/main/res/layout/assistant_email_account_validation_fragment.xml b/app/src/main/res/layout/assistant_email_account_validation_fragment.xml
deleted file mode 100644
index 6a487897e..000000000
--- a/app/src/main/res/layout/assistant_email_account_validation_fragment.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    xmlns:bind="http://schemas.android.com/apk/res-auto">
-
-    <data>
-        <import type="android.view.View"/>
-        <variable
-            name="viewModel"
-            type="org.linphone.activities.assistant.viewmodels.EmailAccountValidationViewModel" />
-    </data>
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <androidx.fragment.app.FragmentContainerView
-            android:id="@+id/top_bar_fragment"
-            android:name="org.linphone.activities.assistant.fragments.TopBarFragment"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/main_activity_top_bar_size"
-            android:layout_alignParentTop="true"
-            tools:layout="@layout/assistant_top_bar_fragment" />
-
-        <LinearLayout
-            android:layout_below="@id/top_bar_fragment"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:paddingLeft="30dp"
-            android:paddingRight="30dp"
-            android:gravity="center_horizontal"
-            android:orientation="vertical" >
-
-            <TextView
-                android:text="@string/assistant_create_account"
-                style="@style/standard_text_font"
-                android:paddingTop="10dp"
-                android:textAllCaps="true"
-                android:gravity="center_horizontal"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"/>
-
-            <TextView
-                android:text="@string/assistant_validate_account_1"
-                style="@style/standard_small_text_font"
-                android:paddingTop="20dp"
-                android:gravity="center_horizontal"
-                android:layout_gravity="center"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"/>
-
-            <TextView
-                android:text="@{viewModel.email}"
-                style="@style/standard_text_font"
-                android:gravity="center_horizontal"
-                android:layout_gravity="center"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"/>
-
-            <TextView
-                android:text="@string/assistant_validate_account_2"
-                style="@style/standard_small_text_font"
-                android:paddingTop="10dp"
-                android:gravity="center"
-                android:layout_gravity="center"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"/>
-
-            <TextView
-                android:onClick="@{() -> viewModel.finish()}"
-                android:text="@string/assistant_finish"
-                android:background="@drawable/assistant_button"
-                android:textColor="@drawable/assistant_button_text_color"
-                style="@style/button_font"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_margin="20dp"
-                android:padding="10dp"/>
-
-        </LinearLayout>
-
-        <include
-            layout="@layout/wait_layout"
-            bind:visibility="@{viewModel.waitForServerAnswer}"/>
-
-    </RelativeLayout>
-
-</layout>
diff --git a/app/src/main/res/layout/assistant_generic_account_login_fragment.xml b/app/src/main/res/layout/assistant_generic_account_login_fragment.xml
deleted file mode 100644
index 86376a5eb..000000000
--- a/app/src/main/res/layout/assistant_generic_account_login_fragment.xml
+++ /dev/null
@@ -1,189 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    xmlns:bind="http://schemas.android.com/apk/res-auto"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <data>
-        <import type="android.view.View"/>
-        <import type="org.linphone.core.TransportType"/>
-        <variable
-            name="viewModel"
-            type="org.linphone.activities.assistant.viewmodels.GenericLoginViewModel" />
-    </data>
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <androidx.fragment.app.FragmentContainerView
-            android:id="@+id/top_bar_fragment"
-            android:name="org.linphone.activities.assistant.fragments.TopBarFragment"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/main_activity_top_bar_size"
-            android:layout_alignParentTop="true"
-            tools:layout="@layout/assistant_top_bar_fragment" />
-
-        <androidx.core.widget.NestedScrollView
-            android:layout_below="@id/top_bar_fragment"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:padding="10dp"
-                android:orientation="vertical">
-
-                <TextView
-                    style="@style/standard_text_font"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:gravity="center"
-                    android:text="@string/assistant_generic_account"
-                    android:paddingTop="10dp"
-                    android:textAllCaps="true" />
-
-                <TextView
-                    style="@style/standard_small_text_font"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:gravity="center"
-                    android:layout_gravity="top"
-                    android:paddingTop="20dp"
-                    android:text="@string/assistant_login_desc" />
-
-                <com.google.android.material.textfield.TextInputLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:hint="@string/username">
-
-                    <com.google.android.material.textfield.TextInputEditText
-                        android:text="@={viewModel.username}"
-                        android:imeOptions="actionNext"
-                        android:singleLine="true"
-                        android:inputType="text|textNoSuggestions"
-                        android:background="@color/transparent_color"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"/>
-
-                </com.google.android.material.textfield.TextInputLayout>
-
-                <com.google.android.material.textfield.TextInputLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    app:endIconMode="password_toggle"
-                    android:hint="@string/password">
-
-                    <com.google.android.material.textfield.TextInputEditText
-                        android:text="@={viewModel.password}"
-                        android:imeOptions="actionNext"
-                        android:singleLine="true"
-                        android:inputType="textPassword"
-                        android:background="@color/transparent_color"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"/>
-
-                </com.google.android.material.textfield.TextInputLayout>
-
-                <com.google.android.material.textfield.TextInputLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:hint="@string/domain">
-
-                    <com.google.android.material.textfield.TextInputEditText
-                        android:text="@={viewModel.domain}"
-                        android:imeOptions="actionNext"
-                        android:singleLine="true"
-                        android:inputType="textUri"
-                        android:background="@color/transparent_color"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"/>
-
-                </com.google.android.material.textfield.TextInputLayout>
-
-                <com.google.android.material.textfield.TextInputLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:hint="@string/assistant_display_name_optional">
-
-                    <com.google.android.material.textfield.TextInputEditText
-                        android:text="@={viewModel.displayName}"
-                        android:imeOptions="actionDone"
-                        android:singleLine="true"
-                        android:inputType="textPersonName"
-                        android:background="@color/transparent_color"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"/>
-
-                </com.google.android.material.textfield.TextInputLayout>
-
-                <RadioGroup
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:padding="10dp"
-                    android:gravity="center"
-                    android:orientation="horizontal">
-
-                    <TextView
-                        style="@style/assistant_input_field_header_font"
-                        android:layout_width="wrap_content"
-                        android:layout_height="match_parent"
-                        android:gravity="center"
-                        android:text="@string/transport"
-                        android:textAllCaps="true" />
-
-                    <com.google.android.material.radiobutton.MaterialRadioButton
-                        android:checked="@{viewModel.transport == TransportType.Udp}"
-                        android:onClick="@{() -> viewModel.setTransport(TransportType.Udp)}"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_margin="5dp"
-                        android:textColor="?attr/primaryTextColor"
-                        android:text="@string/transport_udp" />
-
-                    <com.google.android.material.radiobutton.MaterialRadioButton
-                        android:checked="@{viewModel.transport == TransportType.Tcp}"
-                        android:onClick="@{() -> viewModel.setTransport(TransportType.Tcp)}"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_margin="5dp"
-                        android:textColor="?attr/primaryTextColor"
-                        android:text="@string/transport_tcp" />
-
-                    <com.google.android.material.radiobutton.MaterialRadioButton
-                        android:checked="@{viewModel.transport == TransportType.Tls}"
-                        android:onClick="@{() -> viewModel.setTransport(TransportType.Tls)}"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_margin="5dp"
-                        android:textColor="?attr/primaryTextColor"
-                        android:text="@string/transport_tls" />
-
-                </RadioGroup>
-
-                <TextView
-                    android:onClick="@{() -> viewModel.createAccountAndAuthInfo()}"
-                    android:enabled="@{viewModel.loginEnabled, default=false}"
-                    android:text="@string/assistant_login"
-                    android:background="@drawable/assistant_button"
-                    android:textColor="@drawable/assistant_button_text_color"
-                    style="@style/button_font"
-                    android:layout_gravity="center"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_margin="10dp"
-                    android:padding="10dp"/>
-
-            </LinearLayout>
-
-        </androidx.core.widget.NestedScrollView>
-
-        <include
-            layout="@layout/wait_layout"
-            bind:visibility="@{viewModel.waitForServerAnswer}"/>
-
-    </RelativeLayout>
-
-</layout>
diff --git a/app/src/main/res/layout/assistant_generic_account_warning_fragment.xml b/app/src/main/res/layout/assistant_generic_account_warning_fragment.xml
deleted file mode 100644
index b4ab8d0c1..000000000
--- a/app/src/main/res/layout/assistant_generic_account_warning_fragment.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools">
-
-    <data>
-        <import type="android.view.View"/>
-        <variable
-            name="understoodClickListener"
-            type="android.view.View.OnClickListener"/>
-    </data>
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <androidx.fragment.app.FragmentContainerView
-            android:id="@+id/top_bar_fragment"
-            android:name="org.linphone.activities.assistant.fragments.TopBarFragment"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/main_activity_top_bar_size"
-            android:layout_alignParentTop="true"
-            tools:layout="@layout/assistant_top_bar_fragment" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_below="@id/top_bar_fragment"
-            android:orientation="vertical"
-            android:layout_marginLeft="20dp"
-            android:layout_marginRight="20dp"
-            android:gravity="center_horizontal">
-            
-            <TextView
-                android:id="@+id/warning_text"
-                style="@style/standard_small_text_font"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_gravity="top"
-                android:layout_marginTop="20dp"
-                android:text="@string/assistant_generic_account_warning"/>
-
-            <TextView
-                android:textColor="?attr/accentColor"
-                android:textSize="16sp"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:autoLink="web"
-                android:gravity="center"
-                android:paddingTop="20dp"
-                android:textColorLink="@color/primary_color"
-                android:text="@string/assistant_generic_account_warning_contact_link" />
-
-            <Button
-                android:onClick="@{understoodClickListener}"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="40dp"
-                android:text="@string/assistant_generic_account_warning_continue_button_text" />
-            
-        </LinearLayout>
-
-    </RelativeLayout>
-
-</layout>
diff --git a/app/src/main/res/layout/assistant_no_push_warning_fragment.xml b/app/src/main/res/layout/assistant_no_push_warning_fragment.xml
deleted file mode 100644
index 7a2ad8a60..000000000
--- a/app/src/main/res/layout/assistant_no_push_warning_fragment.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools">
-
-    <data>
-        <import type="android.view.View"/>
-        <variable
-            name="understoodClickListener"
-            type="android.view.View.OnClickListener"/>
-    </data>
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <androidx.fragment.app.FragmentContainerView
-            android:id="@+id/top_bar_fragment"
-            android:name="org.linphone.activities.assistant.fragments.TopBarFragment"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/main_activity_top_bar_size"
-            android:layout_alignParentTop="true"
-            tools:layout="@layout/assistant_top_bar_fragment" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_below="@id/top_bar_fragment"
-            android:orientation="vertical"
-            android:layout_marginLeft="20dp"
-            android:layout_marginRight="20dp"
-            android:gravity="center_horizontal">
-
-            <TextView
-                android:id="@+id/warning_text"
-                style="@style/standard_small_text_font"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_gravity="top"
-                android:layout_marginTop="20dp"
-                android:text="@string/assistant_no_push_warning"/>
-
-            <TextView
-                android:textColor="?attr/accentColor"
-                android:textSize="16sp"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:autoLink="web"
-                android:gravity="center"
-                android:paddingTop="10dp"
-                android:textColorLink="@color/primary_color"
-                android:text="@string/assistant_forgotten_password_link" />
-
-        </LinearLayout>
-
-    </RelativeLayout>
-
-</layout>
diff --git a/app/src/main/res/layout/assistant_phone_account_creation_fragment.xml b/app/src/main/res/layout/assistant_phone_account_creation_fragment.xml
deleted file mode 100644
index 32ba06300..000000000
--- a/app/src/main/res/layout/assistant_phone_account_creation_fragment.xml
+++ /dev/null
@@ -1,262 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    xmlns:bind="http://schemas.android.com/apk/res-auto">
-
-    <data>
-        <import type="android.view.View"/>
-        <variable
-            name="selectCountryClickListener"
-            type="android.view.View.OnClickListener"/>
-        <variable
-            name="infoClickListener"
-            type="android.view.View.OnClickListener"/>
-        <variable
-            name="viewModel"
-            type="org.linphone.activities.assistant.viewmodels.PhoneAccountCreationViewModel" />
-    </data>
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <androidx.fragment.app.FragmentContainerView
-            android:id="@+id/top_bar_fragment"
-            android:name="org.linphone.activities.assistant.fragments.TopBarFragment"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/main_activity_top_bar_size"
-            android:layout_alignParentTop="true"
-            tools:layout="@layout/assistant_top_bar_fragment" />
-
-        <androidx.core.widget.NestedScrollView
-            android:layout_below="@id/top_bar_fragment"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical">
-
-                <TextView
-                    style="@style/standard_text_font"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:gravity="center"
-                    android:text="@string/assistant_create_account"
-                    android:layout_marginTop="10dp"
-                    android:textAllCaps="true" />
-
-                <TextView
-                    style="@style/standard_small_text_font"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:gravity="center"
-                    android:layout_gravity="top"
-                    android:layout_marginTop="10dp"
-                    android:text="@string/assistant_create_account_part_1" />
-
-                <RelativeLayout
-                    android:layout_marginBottom="5dp"
-                    android:paddingRight="30dp"
-                    android:paddingLeft="30dp"
-                    android:paddingTop="10dp"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
-
-                    <TextView
-                        android:id="@+id/select_country_label"
-                        android:text="@string/select_your_country"
-                        style="@style/assistant_input_field_header_font"
-                        android:textAllCaps="true"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"/>
-
-                    <ImageView
-                        android:onClick="@{infoClickListener}"
-                        android:contentDescription="@string/content_description_phone_number_use"
-                        android:src="@drawable/info"
-                        android:layout_alignParentEnd="true"
-                        android:layout_alignTop="@id/select_country_label"
-                        android:layout_above="@id/select_country"
-                        android:layout_width="20dp"
-                        android:layout_height="20dp"/>
-
-                    <TextView
-                        android:id="@+id/select_country"
-                        style="@style/button_font"
-                        android:onClick="@{selectCountryClickListener}"
-                        android:text="@{viewModel.countryName.length > 0 ? viewModel.countryName : @string/select_your_country}"
-                        android:background="@drawable/resizable_assistant_button"
-                        android:textColor="@drawable/assistant_button_text_color"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:padding="10dp"
-                        android:layout_marginTop="5dp"
-                        android:gravity="center"
-                        android:layout_below="@id/select_country_label"/>
-
-                    <LinearLayout
-                        android:orientation="vertical"
-                        android:layout_marginTop="10dp"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_below="@id/select_country">
-
-                        <LinearLayout
-                            android:orientation="horizontal"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content">
-
-                            <com.google.android.material.textfield.TextInputLayout
-                                android:layout_width="100dp"
-                                android:layout_height="wrap_content"
-                                android:layout_marginRight="10dp"
-                                android:hint="@string/international_prefix">
-
-                                <com.google.android.material.textfield.TextInputEditText
-                                    assistantPhoneNumberPrefixValidation="@{true}"
-                                    errorMessage="@={viewModel.prefixError}"
-                                    android:text="@={viewModel.prefix}"
-                                    android:imeOptions="actionNext"
-                                    android:singleLine="true"
-                                    android:inputType="phone"
-                                    android:background="@color/transparent_color"
-                                    android:layout_width="match_parent"
-                                    android:layout_height="wrap_content"/>
-
-                            </com.google.android.material.textfield.TextInputLayout>
-
-                            <com.google.android.material.textfield.TextInputLayout
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:hint="@string/phone_number">
-
-                                <com.google.android.material.textfield.TextInputEditText
-                                    assistantPhoneNumberValidation="@{true}"
-                                    errorMessage="@={viewModel.phoneNumberError}"
-                                    android:text="@={viewModel.phoneNumber}"
-                                    android:imeOptions="actionDone"
-                                    android:singleLine="true"
-                                    android:inputType="phone"
-                                    android:background="@color/transparent_color"
-                                    android:layout_width="match_parent"
-                                    android:layout_height="wrap_content"/>
-
-                            </com.google.android.material.textfield.TextInputLayout>
-
-                        </LinearLayout>
-
-                        <LinearLayout
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:orientation="horizontal"
-                            android:gravity="center"
-                            android:paddingTop="10dp">
-
-                            <com.google.android.material.switchmaterial.SwitchMaterial
-                                android:checked="@={viewModel.useUsername}"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"/>
-
-                            <TextView
-                                style="@style/standard_small_text_font"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:gravity="left"
-                                android:text="@string/assistant_use_username_instead_or_phone_number" />
-
-                        </LinearLayout>
-
-                        <com.google.android.material.textfield.TextInputLayout
-                            android:visibility="@{viewModel.useUsername ? View.VISIBLE : View.GONE}"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:hint="@string/username">
-
-                            <com.google.android.material.textfield.TextInputEditText
-                                assistantUsernameValidation="@{true}"
-                                errorMessage="@={viewModel.usernameError}"
-                                android:text="@={viewModel.username}"
-                                android:imeOptions="actionDone"
-                                android:singleLine="true"
-                                android:inputType="text|textNoSuggestions"
-                                android:background="@color/transparent_color"
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"/>
-
-                        </com.google.android.material.textfield.TextInputLayout>
-
-                        <com.google.android.material.textfield.TextInputLayout
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:hint="@string/assistant_display_name_optional">
-
-                            <com.google.android.material.textfield.TextInputEditText
-                                android:text="@={viewModel.displayName}"
-                                android:imeOptions="actionDone"
-                                android:singleLine="true"
-                                android:inputType="textPersonName"
-                                android:background="@color/transparent_color"
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"/>
-
-                        </com.google.android.material.textfield.TextInputLayout>
-
-                    </LinearLayout>
-
-                </RelativeLayout>
-
-                <TextView
-                    android:onClick="@{() ->viewModel.create()}"
-                    android:enabled="@{viewModel.createEnabled, default=false}"
-                    android:text="@string/assistant_create_account"
-                    android:background="@drawable/assistant_button"
-                    android:textColor="@drawable/assistant_button_text_color"
-                    android:layout_gravity="center"
-                    style="@style/button_font"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_margin="20dp"
-                    android:padding="10dp"/>
-
-                <View
-                    android:layout_width="match_parent"
-                    android:layout_height="1dp"
-                    android:layout_marginTop="10dp"
-                    android:layout_marginStart="5dp"
-                    android:layout_marginEnd="5dp"
-                    android:background="?attr/dividerColor" />
-
-                <TextView
-                    style="@style/standard_small_text_font"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:gravity="center"
-                    android:layout_gravity="top"
-                    android:layout_marginTop="20dp"
-                    android:text="@string/assistant_alternative_way_create_account" />
-
-                <TextView
-                    android:textColor="?attr/accentColor"
-                    android:textSize="16sp"
-                    android:textColorLink="@color/primary_color"
-                    android:autoLink="web"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:gravity="center"
-                    android:layout_gravity="top"
-                    android:paddingTop="5dp"
-                    android:text="@string/assistant_forgotten_password_link" />
-
-            </LinearLayout>
-
-        </androidx.core.widget.NestedScrollView>
-
-        <include
-            layout="@layout/wait_layout"
-            bind:visibility="@{viewModel.waitForServerAnswer}"/>
-
-    </RelativeLayout>
-
-</layout>
diff --git a/app/src/main/res/layout/assistant_phone_account_linking_fragment.xml b/app/src/main/res/layout/assistant_phone_account_linking_fragment.xml
deleted file mode 100644
index 762692f80..000000000
--- a/app/src/main/res/layout/assistant_phone_account_linking_fragment.xml
+++ /dev/null
@@ -1,194 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    xmlns:bind="http://schemas.android.com/apk/res-auto">
-
-    <data>
-        <import type="android.view.View"/>
-        <variable
-            name="selectCountryClickListener"
-            type="android.view.View.OnClickListener"/>
-        <variable
-            name="infoClickListener"
-            type="android.view.View.OnClickListener"/>
-        <variable
-            name="viewModel"
-            type="org.linphone.activities.assistant.viewmodels.PhoneAccountLinkingViewModel" />
-    </data>
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <androidx.fragment.app.FragmentContainerView
-            android:id="@+id/top_bar_fragment"
-            android:name="org.linphone.activities.assistant.fragments.TopBarFragment"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/main_activity_top_bar_size"
-            android:layout_alignParentTop="true"
-            tools:layout="@layout/assistant_top_bar_fragment" />
-
-        <androidx.core.widget.NestedScrollView
-            android:layout_below="@id/top_bar_fragment"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:paddingRight="30dp"
-                android:paddingLeft="30dp"
-                android:orientation="vertical">
-
-                <TextView
-                    style="@style/standard_text_font"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:gravity="center"
-                    android:text="@string/assistant_link_account"
-                    android:paddingTop="10dp"
-                    android:textAllCaps="true" />
-
-                <TextView
-                    android:text="@string/assistant_link_phone_number"
-                    style="@style/standard_small_text_font"
-                    android:paddingTop="20dp"
-                    android:gravity="center_horizontal"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"/>
-
-                <TextView
-                    android:text="@{viewModel.username}"
-                    style="@style/standard_text_font"
-                    android:gravity="center_horizontal"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"/>
-
-                <TextView
-                    style="@style/standard_small_text_font"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:gravity="center"
-                    android:layout_gravity="top"
-                    android:paddingTop="20dp"
-                    android:text="@string/assistant_create_account_part_1" />
-
-                <RelativeLayout
-                    android:layout_marginBottom="5dp"
-                    android:paddingTop="10dp"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
-
-                    <TextView
-                        android:id="@+id/select_country_label"
-                        android:text="@string/select_your_country"
-                        style="@style/assistant_input_field_header_font"
-                        android:textAllCaps="true"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"/>
-
-                    <ImageView
-                        android:onClick="@{infoClickListener}"
-                        android:contentDescription="@string/content_description_phone_number_use"
-                        android:src="@drawable/info"
-                        android:layout_alignParentEnd="true"
-                        android:layout_alignTop="@id/select_country_label"
-                        android:layout_above="@id/select_country"
-                        android:layout_width="20dp"
-                        android:layout_height="20dp"/>
-
-                    <TextView
-                        android:id="@+id/select_country"
-                        android:onClick="@{selectCountryClickListener}"
-                        android:text="@{viewModel.countryName.length > 0 ? viewModel.countryName : @string/select_your_country}"
-                        style="@style/button_font"
-                        android:background="@drawable/resizable_assistant_button"
-                        android:textColor="@drawable/assistant_button_text_color"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:padding="10dp"
-                        android:layout_marginTop="5dp"
-                        android:gravity="center"
-                        android:layout_below="@id/select_country_label"/>
-
-                    <LinearLayout
-                        android:orientation="horizontal"
-                        android:layout_marginTop="10dp"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_below="@id/select_country">
-
-                        <com.google.android.material.textfield.TextInputLayout
-                            android:layout_width="100dp"
-                            android:layout_height="wrap_content"
-                            android:layout_marginRight="10dp"
-                            android:hint="@string/international_prefix">
-
-                            <com.google.android.material.textfield.TextInputEditText
-                                assistantPhoneNumberPrefixValidation="@{true}"
-                                errorMessage="@={viewModel.prefixError}"
-                                android:text="@={viewModel.prefix}"
-                                android:imeOptions="actionNext"
-                                android:singleLine="true"
-                                android:inputType="phone"
-                                android:background="@color/transparent_color"
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"/>
-
-                        </com.google.android.material.textfield.TextInputLayout>
-
-                        <com.google.android.material.textfield.TextInputLayout
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:hint="@string/phone_number">
-
-                            <com.google.android.material.textfield.TextInputEditText
-                                assistantPhoneNumberValidation="@{true}"
-                                errorMessage="@={viewModel.phoneNumberError}"
-                                android:text="@={viewModel.phoneNumber}"
-                                android:imeOptions="actionDone"
-                                android:singleLine="true"
-                                android:inputType="phone"
-                                android:background="@color/transparent_color"
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"/>
-
-                        </com.google.android.material.textfield.TextInputLayout>
-
-                    </LinearLayout>
-
-                </RelativeLayout>
-
-                <TextView
-                    android:onClick="@{() -> viewModel.link()}"
-                    android:enabled="@{viewModel.linkEnabled, default=false}"
-                    android:text="@string/assistant_link_account"
-                    android:background="@drawable/assistant_button"
-                    android:textColor="@drawable/assistant_button_text_color"
-                    android:layout_gravity="center"
-                    style="@style/button_font"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_margin="20dp"
-                    android:padding="10dp"/>
-
-                <TextView
-                    android:visibility="@{viewModel.allowSkip ? View.VISIBLE : View.GONE}"
-                    android:onClick="@{() -> viewModel.skip()}"
-                    style="@style/standard_small_text_font"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:text="@string/assistant_link_phone_number_skip"/>
-
-            </LinearLayout>
-
-        </androidx.core.widget.NestedScrollView>
-
-        <include
-            layout="@layout/wait_layout"
-            bind:visibility="@{viewModel.waitForServerAnswer}"/>
-
-    </RelativeLayout>
-
-</layout>
diff --git a/app/src/main/res/layout/assistant_phone_account_validation_fragment.xml b/app/src/main/res/layout/assistant_phone_account_validation_fragment.xml
deleted file mode 100644
index e047a3b8e..000000000
--- a/app/src/main/res/layout/assistant_phone_account_validation_fragment.xml
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    xmlns:bind="http://schemas.android.com/apk/res-auto">
-
-    <data>
-        <import type="android.view.View"/>
-        <variable
-            name="viewModel"
-            type="org.linphone.activities.assistant.viewmodels.PhoneAccountValidationViewModel" />
-    </data>
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <androidx.fragment.app.FragmentContainerView
-            android:id="@+id/top_bar_fragment"
-            android:name="org.linphone.activities.assistant.fragments.TopBarFragment"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/main_activity_top_bar_size"
-            android:layout_alignParentTop="true"
-            tools:layout="@layout/assistant_top_bar_fragment" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/top_bar_fragment"
-            android:paddingLeft="30dp"
-            android:paddingRight="30dp"
-            android:gravity="center_horizontal"
-            android:orientation="vertical" >
-
-            <TextView
-                android:id="@+id/title_account_creation"
-                android:visibility="@{viewModel.isCreation ? View.VISIBLE : View.GONE, default=gone}"
-                android:text="@string/assistant_create_account"
-                style="@style/standard_text_font"
-                android:textAllCaps="true"
-                android:gravity="center_horizontal"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:paddingTop="10dp"/>
-
-            <TextView
-                android:id="@+id/title_account_login"
-                android:visibility="@{viewModel.isLogin ? View.VISIBLE : View.GONE}"
-                android:text="@string/assistant_login_linphone"
-                style="@style/standard_text_font"
-                android:textAllCaps="true"
-                android:gravity="center_horizontal"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:paddingTop="10dp"/>
-
-            <TextView
-                android:id="@+id/title_account_linking"
-                android:visibility="@{viewModel.isLinking ? View.VISIBLE : View.GONE, default=gone}"
-                android:text="@string/assistant_link_account"
-                style="@style/standard_text_font"
-                android:textAllCaps="true"
-                android:gravity="center_horizontal"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:paddingTop="10dp"/>
-
-            <TextView
-                android:text="@string/assistant_create_account_part_2"
-                style="@style/standard_small_text_font"
-                android:paddingTop="20dp"
-                android:gravity="center_horizontal"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"/>
-
-            <TextView
-                android:text="@{viewModel.phoneNumber}"
-                style="@style/standard_text_font"
-                android:gravity="center_horizontal"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"/>
-
-            <TextView
-                android:text="@string/assistant_create_account_part_3"
-                style="@style/standard_small_text_font"
-                android:paddingTop="20dp"
-                android:gravity="center_horizontal"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"/>
-
-            <com.google.android.material.textfield.TextInputLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:hint="@string/assistant_confirmation_code">
-
-                <com.google.android.material.textfield.TextInputEditText
-                    android:text="@={viewModel.code}"
-                    android:imeOptions="actionDone"
-                    android:singleLine="true"
-                    android:inputType="number"
-                    android:background="@color/transparent_color"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"/>
-
-            </com.google.android.material.textfield.TextInputLayout>
-
-            <TextView
-                android:onClick="@{() -> viewModel.finish()}"
-                android:text="@string/assistant_finish"
-                android:enabled="@{viewModel.code.length() > 0, default=false}"
-                android:background="@drawable/assistant_button"
-                android:textColor="@drawable/assistant_button_text_color"
-                style="@style/button_font"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_margin="20dp"
-                android:padding="10dp"/>
-
-        </LinearLayout>
-
-        <include
-            layout="@layout/wait_layout"
-            bind:visibility="@{viewModel.waitForServerAnswer}"/>
-
-    </RelativeLayout>
-
-</layout>
diff --git a/app/src/main/res/layout/assistant_qr_code_fragment.xml b/app/src/main/res/layout/assistant_qr_code_fragment.xml
deleted file mode 100644
index d2941547b..000000000
--- a/app/src/main/res/layout/assistant_qr_code_fragment.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <data>
-        <import type="android.view.View"/>
-        <variable
-            name="viewModel"
-            type="org.linphone.activities.assistant.viewmodels.QrCodeViewModel" />
-    </data>
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <androidx.fragment.app.FragmentContainerView
-            android:id="@+id/top_bar_fragment"
-            android:name="org.linphone.activities.assistant.fragments.TopBarFragment"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/main_activity_top_bar_size"
-            android:layout_alignParentTop="true"
-            tools:layout="@layout/assistant_top_bar_fragment" />
-
-        <RelativeLayout
-            android:layout_below="@id/top_bar_fragment"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:background="@color/black_color">
-
-            <org.linphone.activities.voip.views.RoundCornersTextureView
-                android:id="@+id/qr_code_capture_texture"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                app:alignTopRight="false"
-                app:displayMode="occupy_all_space"
-                app:radius="0"
-                android:layout_centerInParent="true"/>
-
-            <ImageView
-                android:onClick="@{() -> viewModel.switchCamera()}"
-                android:visibility="@{viewModel.showSwitchCamera ? View.VISIBLE : View.GONE}"
-                android:contentDescription="@string/content_description_switch_camera"
-                android:layout_width="50dp"
-                android:layout_height="50dp"
-                android:layout_margin="5dp"
-                android:background="@drawable/round_button_background"
-                android:padding="10dp"
-                android:src="@drawable/camera_switch"/>
-
-        </RelativeLayout>
-
-    </RelativeLayout>
-
-</layout>
diff --git a/app/src/main/res/layout/assistant_remote_provisioning_fragment.xml b/app/src/main/res/layout/assistant_remote_provisioning_fragment.xml
deleted file mode 100644
index 3cfbfb2f0..000000000
--- a/app/src/main/res/layout/assistant_remote_provisioning_fragment.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    xmlns:bind="http://schemas.android.com/apk/res-auto">
-
-    <data>
-        <import type="android.view.View"/>
-        <variable
-            name="qrCodeClickListener"
-            type="android.view.View.OnClickListener"/>
-        <variable
-            name="viewModel"
-            type="org.linphone.activities.assistant.viewmodels.RemoteProvisioningViewModel" />
-    </data>
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <androidx.fragment.app.FragmentContainerView
-            android:id="@+id/top_bar_fragment"
-            android:name="org.linphone.activities.assistant.fragments.TopBarFragment"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/main_activity_top_bar_size"
-            android:layout_alignParentTop="true"
-            tools:layout="@layout/assistant_top_bar_fragment" />
-
-        <LinearLayout
-            android:layout_below="@id/top_bar_fragment"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:paddingLeft="30dp"
-            android:paddingRight="30dp"
-            android:orientation="vertical">
-
-            <TextView
-                style="@style/standard_text_font"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:gravity="center"
-                android:text="@string/assistant_remote_provisioning_title"
-                android:paddingTop="10dp"
-                android:textAllCaps="true" />
-
-            <TextView
-                style="@style/standard_small_text_font"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:gravity="center"
-                android:layout_gravity="top"
-                android:paddingTop="10dp"
-                android:text="@string/assistant_remote_provisioning_desc" />
-
-            <com.google.android.material.textfield.TextInputLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:hint="@string/assistant_remote_provisioning_url">
-
-                <com.google.android.material.textfield.TextInputEditText
-                    errorMessage="@={viewModel.urlError}"
-                    urlConfirmationValidation="@{true}"
-                    android:text="@={viewModel.urlToFetch}"
-                    android:imeOptions="actionDone"
-                    android:singleLine="true"
-                    android:inputType="textUri"
-                    android:background="@color/transparent_color"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"/>
-
-            </com.google.android.material.textfield.TextInputLayout>
-
-            <TextView
-                android:onClick="@{() -> viewModel.fetchAndApply()}"
-                android:enabled="@{viewModel.fetchEnabled}"
-                android:text="@string/assistant_fetch_apply"
-                android:background="@drawable/assistant_button"
-                android:textColor="@drawable/assistant_button_text_color"
-                style="@style/button_font"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:padding="10dp"
-                android:layout_marginTop="20dp"/>
-
-            <TextView
-                android:onClick="@{qrCodeClickListener}"
-                android:text="@string/assistant_launch_qrcode"
-                android:background="@drawable/assistant_button"
-                android:textColor="@drawable/assistant_button_text_color"
-                style="@style/button_font"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:padding="10dp"
-                android:layout_marginTop="20dp"/>
-
-        </LinearLayout>
-
-        <include
-            layout="@layout/wait_layout"
-            bind:visibility="@{viewModel.fetchInProgress}"/>
-
-    </RelativeLayout>
-
-</layout>
diff --git a/app/src/main/res/layout/assistant_top_bar_fragment.xml b/app/src/main/res/layout/assistant_top_bar_fragment.xml
deleted file mode 100644
index f845ca7cd..000000000
--- a/app/src/main/res/layout/assistant_top_bar_fragment.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <data>
-        <import type="android.view.View"/>
-    </data>
-
-    <LinearLayout
-        android:id="@+id/top_bar"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/main_activity_top_bar_size"
-        android:layout_gravity="center_horizontal"
-        android:background="?attr/lightToolbarBackgroundColor"
-        android:orientation="horizontal">
-
-        <ImageView
-            android:id="@+id/back"
-            android:contentDescription="@string/content_description_go_back"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="0.2"
-            android:background="?attr/button_background_drawable"
-            android:padding="18dp"
-            android:src="@drawable/back" />
-
-        <TextView
-            style="@style/accent_colored_title_font"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="0.6"
-            android:gravity="center"
-            android:singleLine="true"
-            android:ellipsize="end"
-            android:padding="15dp"
-            android:text="@string/assistant"/>
-
-        <View
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="0.2"
-            android:visibility="invisible" />
-
-    </LinearLayout>
-
-</layout>
diff --git a/app/src/main/res/layout/assistant_welcome_fragment.xml b/app/src/main/res/layout/assistant_welcome_fragment.xml
deleted file mode 100644
index 54aa1e66d..000000000
--- a/app/src/main/res/layout/assistant_welcome_fragment.xml
+++ /dev/null
@@ -1,163 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools">
-
-    <data>
-        <import type="android.view.View"/>
-        <variable
-            name="createAccountClickListener"
-            type="android.view.View.OnClickListener"/>
-        <variable
-            name="accountLoginClickListener"
-            type="android.view.View.OnClickListener"/>
-        <variable
-            name="genericAccountLoginClickListener"
-            type="android.view.View.OnClickListener"/>
-        <variable
-            name="remoteProvisioningClickListener"
-            type="android.view.View.OnClickListener"/>
-        <variable
-            name="viewModel"
-            type="org.linphone.activities.assistant.viewmodels.WelcomeViewModel" />
-    </data>
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <androidx.fragment.app.FragmentContainerView
-            android:id="@+id/top_bar_fragment"
-            android:name="org.linphone.activities.assistant.fragments.TopBarFragment"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/main_activity_top_bar_size"
-            android:layout_alignParentTop="true"
-            tools:layout="@layout/assistant_top_bar_fragment" />
-
-        <androidx.core.widget.NestedScrollView
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_below="@id/top_bar_fragment">
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical">
-
-                <TextView
-                    style="@style/standard_text_font"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:gravity="center"
-                    android:text="@string/assistant_welcome_title"
-                    android:paddingTop="10dp"
-                    android:textAllCaps="true" />
-
-                <TextView
-                    style="@style/standard_small_text_font"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:gravity="center"
-                    android:layout_gravity="top"
-                    android:paddingTop="10dp"
-                    android:text="@string/assistant_welcome_desc" />
-
-                <GridLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:columnCount="1">
-
-                    <LinearLayout
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="fill"
-                        android:layout_columnSpan="1"
-                        android:orientation="horizontal"
-                        android:gravity="center_vertical"
-                        android:layout_margin="10dp">
-
-                        <CheckBox
-                            android:enabled="@{!viewModel.termsAndPrivacyAccepted}"
-                            android:checked="@={viewModel.termsAndPrivacyAccepted}"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"/>
-
-                        <TextView
-                            android:id="@+id/terms_and_privacy"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content" />
-
-                    </LinearLayout>
-
-                    <TextView
-                        android:id="@+id/account_creation"
-                        android:enabled="@{viewModel.termsAndPrivacyAccepted}"
-                        android:visibility="@{viewModel.showCreateAccount ? View.VISIBLE : View.GONE}"
-                        android:onClick="@{createAccountClickListener}"
-                        style="@style/button_font"
-                        android:gravity="center"
-                        android:padding="10dp"
-                        android:layout_margin="20dp"
-                        android:layout_width="wrap_content"
-                        android:layout_gravity="fill"
-                        android:layout_height="wrap_content"
-                        android:background="@drawable/assistant_button"
-                        android:textColor="@drawable/assistant_button_text_color"
-                        android:text="@string/assistant_create_account" />
-
-                    <TextView
-                        android:id="@+id/account_connection"
-                        android:enabled="@{viewModel.termsAndPrivacyAccepted}"
-                        android:visibility="@{viewModel.showLinphoneLogin ? View.VISIBLE : View.GONE}"
-                        android:onClick="@{accountLoginClickListener}"
-                        style="@style/button_font"
-                        android:gravity="center"
-                        android:padding="10dp"
-                        android:layout_margin="20dp"
-                        android:layout_width="wrap_content"
-                        android:layout_gravity="fill"
-                        android:layout_height="wrap_content"
-                        android:background="@drawable/assistant_button"
-                        android:textColor="@drawable/assistant_button_text_color"
-                        android:text="@string/assistant_login_linphone" />
-
-                    <TextView
-                        android:id="@+id/generic_connection"
-                        android:enabled="@{viewModel.termsAndPrivacyAccepted}"
-                        android:visibility="@{viewModel.showGenericLogin ? View.VISIBLE : View.GONE}"
-                        android:onClick="@{genericAccountLoginClickListener}"
-                        style="@style/button_font"
-                        android:gravity="center"
-                        android:padding="10dp"
-                        android:layout_margin="20dp"
-                        android:layout_width="wrap_content"
-                        android:layout_gravity="fill"
-                        android:layout_height="wrap_content"
-                        android:background="@drawable/assistant_button"
-                        android:textColor="@drawable/assistant_button_text_color"
-                        android:text="@string/assistant_login_generic" />
-
-                    <TextView
-                        android:id="@+id/remote_configuration"
-                        android:enabled="@{viewModel.termsAndPrivacyAccepted}"
-                        android:visibility="@{viewModel.showRemoteProvisioning ? View.VISIBLE : View.GONE}"
-                        android:onClick="@{remoteProvisioningClickListener}"
-                        style="@style/button_font"
-                        android:gravity="center"
-                        android:padding="10dp"
-                        android:layout_margin="20dp"
-                        android:layout_width="wrap_content"
-                        android:layout_gravity="fill"
-                        android:layout_height="wrap_content"
-                        android:background="@drawable/assistant_button"
-                        android:textColor="@drawable/assistant_button_text_color"
-                        android:text="@string/assistant_remote_provisioning" />
-
-                </GridLayout>
-
-            </LinearLayout>
-
-        </androidx.core.widget.NestedScrollView>
-
-    </RelativeLayout>
-
-</layout>
diff --git a/app/src/main/res/layout/call_incoming_notification_heads_up.xml b/app/src/main/res/layout/call_incoming_notification_heads_up.xml
deleted file mode 100644
index 3f77a8a49..000000000
--- a/app/src/main/res/layout/call_incoming_notification_heads_up.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-
-    <LinearLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerVertical="true"
-        android:orientation="vertical">
-
-        <TextView
-            android:id="@+id/caller"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            style="@android:style/TextAppearance.Material.Notification.Title"/>
-
-        <TextView
-            android:id="@+id/sip_uri"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:textColor="@color/primary_color"
-            style="@android:style/TextAppearance.Material.Notification.Line2"/>
-
-        <TextView
-            android:id="@+id/incoming_call_info"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            style="@android:style/TextAppearance.Material.Notification.Info"/>
-
-    </LinearLayout>
-
-    <ImageView
-        android:id="@+id/caller_picture"
-        android:contentDescription="@null"
-        android:layout_width="50dp"
-        android:layout_height="50dp"
-        android:adjustViewBounds="true"
-        android:src="@drawable/voip_single_contact_avatar_alt"
-        android:layout_alignParentRight="true"
-        android:layout_centerVertical="true"
-        android:layout_marginTop="5dp"
-        android:layout_marginBottom="5dp"
-        android:layout_marginRight="20dp" />
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/call_overlay.xml b/app/src/main/res/layout/call_overlay.xml
deleted file mode 100644
index 1ba09c4cd..000000000
--- a/app/src/main/res/layout/call_overlay.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <data>
-        <import type="android.view.View" />
-        <variable
-            name="visibility"
-            type="Boolean" />
-    </data>
-
-    <RelativeLayout
-        android:layout_width="@dimen/call_overlay_size"
-        android:layout_height="@dimen/call_overlay_size"
-        android:visibility="@{visibility ? View.VISIBLE : View.GONE}">
-
-        <ImageView
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:background="@drawable/background_round_primary_color"
-            android:contentDescription="@string/content_description_go_back_to_call"
-            android:adjustViewBounds="true"
-            android:padding="10dp"
-            android:src="@drawable/call_back" />
-
-    </RelativeLayout>
-
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/chat_bubble_activity.xml b/app/src/main/res/layout/chat_bubble_activity.xml
deleted file mode 100644
index c5e39e588..000000000
--- a/app/src/main/res/layout/chat_bubble_activity.xml
+++ /dev/null
@@ -1,183 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <data>
-        <import type="android.view.View"/>
-        <variable
-            name="closeBubbleClickListener"
-            type="android.view.View.OnClickListener"/>
-        <variable
-            name="openAppClickListener"
-            type="android.view.View.OnClickListener"/>
-        <variable
-            name="sendMessageClickListener"
-            type="android.view.View.OnClickListener"/>
-        <variable
-            name="viewModel"
-            type="org.linphone.activities.main.chat.viewmodels.ChatRoomViewModel" />
-        <variable
-            name="chatSendingViewModel"
-            type="org.linphone.activities.main.chat.viewmodels.ChatMessageSendingViewModel" />
-    </data>
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="?attr/backgroundColor">
-
-        <LinearLayout
-            android:id="@+id/top_bar"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/main_activity_top_bar_size"
-            android:background="?attr/lightToolbarBackgroundColor"
-            android:orientation="horizontal">
-
-            <ImageView
-                android:contentDescription="@string/content_description_close_bubble"
-                android:onClick="@{closeBubbleClickListener}"
-                android:visibility="invisible"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="0.2"
-                android:padding="15dp"
-                android:background="?attr/button_background_drawable"
-                android:src="@drawable/collapse_default"
-                app:tint="?attr/drawableTintColor" />
-
-            <LinearLayout
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_gravity="center"
-                android:layout_weight="0.4"
-                android:gravity="center"
-                android:orientation="vertical"
-                android:paddingLeft="5dp">
-
-                <org.linphone.views.MarqueeTextView
-                    android:text="@{viewModel.oneToOneChatRoom ? (viewModel.contact.name ?? viewModel.displayName) : viewModel.subject}"
-                    style="@style/toolbar_small_title_font"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:singleLine="true" />
-
-                <org.linphone.views.MarqueeTextView
-                    android:text="@{viewModel.participants}"
-                    android:visibility="@{viewModel.oneToOneChatRoom ? View.GONE : View.VISIBLE}"
-                    style="@style/toolbar_small_title_font"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:singleLine="true" />
-
-            </LinearLayout>
-
-            <ImageView
-                android:onClick="@{openAppClickListener}"
-                android:contentDescription="@string/content_description_open_app"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="0.2"
-                android:padding="15dp"
-                android:background="?attr/button_background_drawable"
-                app:tint="?attr/drawableTintColor"
-                android:src="@drawable/fullscreen_default"/>
-
-        </LinearLayout>
-
-        <LinearLayout
-            android:id="@+id/footer"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_alignParentBottom="true"
-            android:gravity="center_vertical"
-            android:background="?attr/backgroundColor"
-            android:orientation="horizontal">
-
-            <EditText
-                android:id="@+id/message"
-                android:enabled="@{!chatSendingViewModel.isReadOnly}"
-                android:text="@={chatSendingViewModel.textToSend}"
-                android:imeOptions="@{chatSendingViewModel.imeFlags}"
-                android:hint="@string/chat_room_sending_message_hint"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:layout_marginTop="5dp"
-                android:layout_marginBottom="5dp"
-                android:layout_marginStart="10dp"
-                android:layout_weight="1"
-                android:background="@drawable/resizable_text_field"
-                android:inputType="textShortMessage|textMultiLine|textAutoComplete|textAutoCorrect|textCapSentences"
-                android:maxLines="6"
-                android:padding="5dp"
-                android:textColor="@color/black_color"
-                android:textCursorDrawable="@null" />
-
-            <RelativeLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content">
-
-                <ImageView
-                    android:id="@+id/send_message"
-                    android:onClick="@{sendMessageClickListener}"
-                    android:enabled="@{chatSendingViewModel.sendMessageEnabled &amp;&amp; !chatSendingViewModel.isReadOnly}"
-                    android:contentDescription="@string/content_description_send_message"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:padding="10dp"
-                    android:src="@drawable/chat_send_message" />
-
-                <ImageView
-                    android:visibility="@{viewModel.chatRoom.isEphemeralEnabled() ? View.VISIBLE : View.GONE, default=gone}"
-                    android:enabled="@{chatSendingViewModel.sendMessageEnabled &amp;&amp; !chatSendingViewModel.isReadOnly}"
-                    android:contentDescription="@string/content_description_ephemeral_message"
-                    android:clickable="false"
-                    android:layout_width="20dp"
-                    android:layout_height="wrap_content"
-                    android:adjustViewBounds="true"
-                    android:layout_alignRight="@id/send_message"
-                    android:layout_alignBottom="@id/send_message"
-                    android:padding="5dp"
-                    android:src="@drawable/ephemeral_messages" />
-
-            </RelativeLayout>
-
-        </LinearLayout>
-
-        <TextView
-            android:id="@+id/remote_composing"
-            android:text="@{viewModel.composingList, default=@string/chat_remote_is_composing}"
-            android:visibility="@{viewModel.remoteIsComposing ? View.VISIBLE : View.INVISIBLE}"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_above="@id/footer"
-            android:layout_marginLeft="5dp"
-            style="@style/standard_small_text_font" />
-
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/chat_messages_list"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_above="@id/remote_composing"
-            android:layout_below="@+id/top_bar"
-            android:cacheColorHint="@color/transparent_color"
-            android:choiceMode="multipleChoice"
-            android:divider="@android:color/transparent"
-            android:listSelector="@color/transparent_color"
-            android:transcriptMode="normal" />
-
-        <ImageView
-            android:src="@{viewModel.securityLevelIcon, default=@drawable/security_alert_indicator}"
-            android:visibility="@{viewModel.encryptedChatRoom ? View.VISIBLE : View.GONE}"
-            android:contentDescription="@{viewModel.securityLevelContentDescription}"
-            android:adjustViewBounds="true"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/top_bar"
-            android:layout_alignParentRight="true"
-            android:layout_marginTop="8dp"
-            android:layout_marginRight="8dp" />
-
-    </RelativeLayout>
-
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/chat_event_list_cell.xml b/app/src/main/res/layout/chat_event_list_cell.xml
deleted file mode 100644
index 172ce2d65..000000000
--- a/app/src/main/res/layout/chat_event_list_cell.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <data>
-        <import type="android.view.View"/>
-        <variable
-            name="position"
-            type="Integer"/>
-        <variable
-            name="clickListener"
-            type="android.view.View.OnClickListener" />
-        <variable
-            name="data"
-            type="org.linphone.activities.main.chat.data.EventData" />
-        <variable
-            name="selectionListViewModel"
-            type="org.linphone.activities.main.viewmodels.ListTopBarViewModel" />
-    </data>
-
-    <RelativeLayout
-        android:onClick="@{clickListener}"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center">
-
-        <CheckBox
-            android:id="@+id/select"
-            android:onClick="@{() -> selectionListViewModel.onToggleSelect(position)}"
-            android:visibility="@{selectionListViewModel.isEditionEnabled ? View.VISIBLE : View.GONE}"
-            android:checked="@{selectionListViewModel.selectedItems.contains(position)}"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentRight="true"
-            android:layout_centerVertical="true"
-            android:layout_marginLeft="5dp"
-            android:layout_marginRight="5dp" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="35dp"
-            android:layout_marginTop="5dp"
-            android:layout_marginBottom="5dp"
-            android:layout_toLeftOf="@id/select"
-            android:background="@{data.security || data.groupLeft ? @drawable/event_decoration_red : @drawable/event_decoration_gray, default=@drawable/event_decoration_gray}"
-            android:gravity="center"
-            android:orientation="horizontal">
-
-            <!-- Ugly hack to prevent last character to be missing half of it, don't know why yet -->
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:background="?attr/backgroundColor"
-                android:fontFamily="sans-serif"
-                android:lineSpacingExtra="0sp"
-                android:paddingLeft="5dp"
-                android:paddingRight="5dp"
-                android:text="@{data.text + ' '}"
-                android:textColor="@{data.security || data.groupLeft ? @color/red_color : @color/light_grey_color}"
-                android:textSize="13sp"
-                android:textStyle="italic" />
-
-        </LinearLayout>
-
-    </RelativeLayout>
-
-</layout>
diff --git a/app/src/main/res/layout/chat_message_attachment_cell.xml b/app/src/main/res/layout/chat_message_attachment_cell.xml
deleted file mode 100644
index 9482eea7a..000000000
--- a/app/src/main/res/layout/chat_message_attachment_cell.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:tools="http://schemas.android.com/tools"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <data>
-        <import type="android.view.View"/>
-        <variable
-            name="data"
-            type="org.linphone.activities.main.chat.data.ChatMessageAttachmentData" />
-    </data>
-
-    <RelativeLayout
-        android:layout_width="110dp"
-        android:layout_height="110dp"
-        android:layout_margin="5dp"
-        android:orientation="vertical">
-
-        <View
-            android:layout_width="100dp"
-            android:layout_height="100dp"
-            android:layout_alignParentBottom="true"
-            android:layout_alignParentLeft="true"
-            android:background="?attr/backgroundColor"/>
-
-        <ImageView
-            android:visibility="@{data.image ? View.VISIBLE : View.GONE, default=gone}"
-            android:contentDescription="@string/content_description_pending_file_transfer"
-            android:layout_width="100dp"
-            android:layout_height="100dp"
-            android:layout_alignParentBottom="true"
-            android:layout_alignParentLeft="true"
-            android:adjustViewBounds="true"
-            android:scaleType="centerCrop"
-            coil="@{data.path}"/>
-
-        <TextView
-            android:visibility="@{data.video ? View.VISIBLE : View.GONE, default=gone}"
-            style="@style/chat_file_attachment_font"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_alignParentBottom="true"
-            android:layout_marginBottom="5dp"
-            android:layout_marginRight="10dp"
-            android:ellipsize="middle"
-            android:singleLine="true"
-            android:padding="10dp"
-            android:gravity="center"
-            android:textAlignment="center"
-            android:drawablePadding="5dp"
-            android:text="@{data.fileName, default=`test.mkv`}"
-            app:drawableTopCompat="@drawable/file_video" />
-
-        <ImageView
-            android:visibility="@{data.video ? View.VISIBLE : View.GONE, default=gone}"
-            android:contentDescription="@string/content_description_pending_file_transfer"
-            android:layout_width="100dp"
-            android:layout_height="100dp"
-            android:layout_alignParentBottom="true"
-            android:layout_alignParentLeft="true"
-            android:adjustViewBounds="true"
-            android:scaleType="centerCrop"
-            coilVideoPreview="@{data.path}"/>
-
-        <TextView
-            style="@style/chat_file_attachment_font"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_alignParentBottom="true"
-            android:layout_marginBottom="5dp"
-            android:layout_marginRight="10dp"
-            android:ellipsize="middle"
-            android:singleLine="true"
-            android:padding="10dp"
-            android:gravity="center"
-            android:textAlignment="center"
-            android:drawablePadding="5dp"
-            android:visibility="@{data.image || data.video ? View.GONE : View.VISIBLE, default=gone}"
-            android:text="@{data.fileName, default=`test.txt`}"
-            android:drawableTop="@{data.pdf ? @drawable/file_pdf : (data.audio ? @drawable/file_audio : @drawable/file), default=@drawable/file}"
-            tools:ignore="UseCompatTextViewDrawableXml" />
-
-        <ImageView
-            android:onClick="@{() -> data.delete()}"
-            android:contentDescription="@string/content_description_remove_pending_file_transfer"
-            android:layout_width="20dp"
-            android:layout_height="20dp"
-            android:layout_alignParentTop="true"
-            android:layout_alignParentRight="true"
-            android:src="@drawable/field_clean" />
-
-    </RelativeLayout>
-
-</layout>
diff --git a/app/src/main/res/layout/chat_message_conference_invitation_content_cell.xml b/app/src/main/res/layout/chat_message_conference_invitation_content_cell.xml
deleted file mode 100644
index 4ca0c747c..000000000
--- a/app/src/main/res/layout/chat_message_conference_invitation_content_cell.xml
+++ /dev/null
@@ -1,150 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <data>
-        <import type="android.view.View"/>
-        <variable
-            name="data"
-            type="org.linphone.activities.main.chat.data.ChatMessageContentData" />
-        <variable
-            name="longClickListener"
-            type="android.view.View.OnLongClickListener"/>
-        <variable
-            name="inflatedVisibility"
-            type="Integer" />
-    </data>
-
-    <LinearLayout
-        android:onLongClick="@{longClickListener}"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:minWidth="250dp"
-        android:orientation="vertical"
-        android:padding="10dp"
-        android:background="@drawable/shape_conference_invite_background"
-        android:visibility="@{inflatedVisibility}"
-        inflatedLifecycleOwner="@{true}">
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            style="@style/conference_invite_title_font"
-            android:text="@{data.isBroadcast ? @string/conference_broadcast_invite_title : @string/conference_invite_title, default=@string/conference_invite_title}"
-            android:visibility="@{data.isConferenceUpdated || data.isConferenceCancelled ? View.GONE : View.VISIBLE}"/>
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            style="@style/conference_update_title_font"
-            android:text="@string/conference_update_title"
-            android:visibility="@{data.isConferenceUpdated ? View.VISIBLE : View.GONE, default=gone}"/>
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            style="@style/conference_cancel_title_font"
-            android:text="@string/conference_cancel_title"
-            android:visibility="@{data.isConferenceCancelled ? View.VISIBLE : View.GONE, default=gone}"/>
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="5dp"
-            android:layout_marginBottom="10dp"
-            style="@style/conference_invite_desc_font"
-            android:maxLines="2"
-            android:ellipsize="end"
-            android:text="@{data.conferenceSubject, default=`Lorem ipsum dolor sit amet!`}"/>
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:drawablePadding="5dp"
-            android:layout_marginBottom="2dp"
-            android:visibility="@{data.isConferenceCancelled ? View.GONE : View.VISIBLE}"
-            style="@style/conference_invite_dat_time_font"
-            android:text="@{data.conferenceParticipantCount, default=`3 participants`}"
-            app:drawableStartCompat="@drawable/icon_schedule_participants"/>
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="23dp"
-            android:layout_marginBottom="2dp"
-            android:visibility="@{data.isBroadcast &amp;&amp; data.isSpeaker ? View.VISIBLE : View.GONE}"
-            style="@style/conference_invite_dat_time_font"
-            android:text="@string/conference_broadcast_invite_you_are_speaker"/>
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:drawablePadding="5dp"
-            android:layout_marginBottom="2dp"
-            style="@style/conference_invite_dat_time_font"
-            android:text="@{data.conferenceDate, default=`Mon. October 9th, 2021`}"
-            app:drawableStartCompat="@drawable/icon_schedule_date" />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:drawablePadding="5dp"
-            style="@style/conference_invite_dat_time_font"
-            android:text="@{data.conferenceTime + (data.showDuration ? ` (` + data.conferenceDuration + `)` : ``), default=`5:35 PM (2h)`}"
-            app:drawableStartCompat="@drawable/icon_schedule_time" />
-
-        <TextView
-            android:visibility="@{data.conferenceDescription.length() == 0 ? View.GONE : View.VISIBLE}"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
-            style="@style/conference_invite_desc_title_font"
-            android:text="@string/conference_description_title"/>
-
-        <TextView
-            android:visibility="@{data.conferenceDescription.length() == 0 ? View.GONE : View.VISIBLE}"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            style="@style/conference_invite_desc_font"
-            android:maxLines="3"
-            android:ellipsize="end"
-            android:text="@{data.conferenceDescription, default=`Lorem ipsum dolor sit amet`}"/>
-
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="5dp">
-
-            <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="25dp"
-                android:layout_centerVertical="true"
-                android:layout_marginEnd="10dp"
-                android:layout_toStartOf="@id/join_conference"
-                android:contentDescription="@string/content_description_share_ics"
-                android:onClick="@{() -> data.openFile()}"
-                android:src="@drawable/icon_share" />
-
-            <TextView
-                android:id="@+id/join_conference"
-                style="@style/conference_invite_join_font"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentEnd="true"
-                android:layout_centerVertical="true"
-                android:layout_gravity="center_vertical|end"
-                android:layout_marginTop="10dp"
-                android:background="@drawable/button_green_background"
-                android:enabled="@{data.isOutgoing || !data.isConferenceCancelled}"
-                android:onClick="@{() -> data.callConferenceAddress()}"
-                android:paddingLeft="20dp"
-                android:paddingTop="8dp"
-                android:paddingRight="20dp"
-                android:paddingBottom="8dp"
-                android:text="@string/conference_invite_join" />
-
-        </RelativeLayout>
-
-    </LinearLayout>
-
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/chat_message_content_cell.xml b/app/src/main/res/layout/chat_message_content_cell.xml
deleted file mode 100644
index 921b6ebac..000000000
--- a/app/src/main/res/layout/chat_message_content_cell.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <data>
-        <import type="android.view.View"/>
-        <variable
-            name="data"
-            type="org.linphone.activities.main.chat.data.ChatMessageContentData" />
-        <variable
-            name="longClickListener"
-            type="android.view.View.OnLongClickListener"/>
-    </data>
-
-    <RelativeLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_margin="5dp">
-
-        <ViewStub
-            android:id="@+id/image_content"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout="@layout/chat_message_image_content_cell"
-            android:visibility="@{!data.downloadable &amp;&amp; data.image ? View.VISIBLE : View.GONE}"
-            app:inflatedVisibility="@{!data.downloadable &amp;&amp; data.image ? View.VISIBLE : View.GONE}"
-            app:data="@{data}"
-            app:longClickListener="@{longClickListener}"/>
-
-        <ViewStub
-            android:id="@+id/video_content"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout="@layout/chat_message_video_content_cell"
-            android:visibility="@{!data.downloadable &amp;&amp; data.video ? View.VISIBLE : View.GONE}"
-            app:inflatedVisibility="@{!data.downloadable &amp;&amp; data.video ? View.VISIBLE : View.GONE}"
-            app:data="@{data}"
-            app:longClickListener="@{longClickListener}"/>
-
-        <ViewStub
-            android:id="@+id/voice_recording_content"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout="@layout/chat_message_voice_record_content_cell"
-            android:visibility="@{!data.downloadable &amp;&amp; data.voiceRecording ? View.VISIBLE : View.GONE}"
-            app:data="@{data}"
-            app:longClickListener="@{longClickListener}"
-            app:inflatedVisibility="@{!data.downloadable &amp;&amp; data.voiceRecording ? View.VISIBLE : View.GONE}"/>
-
-        <ViewStub
-            android:id="@+id/conference_invitation_content"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout="@layout/chat_message_conference_invitation_content_cell"
-            android:visibility="@{!data.downloadable &amp;&amp; data.conferenceSchedule ? View.VISIBLE : View.GONE}"
-            app:data="@{data}"
-            app:longClickListener="@{longClickListener}"
-            app:inflatedVisibility="@{!data.downloadable &amp;&amp; data.conferenceSchedule ? View.VISIBLE : View.GONE}" />
-
-        <ViewStub
-            android:id="@+id/generic_file_content"
-            android:layout_width="@dimen/chat_message_bubble_file_size"
-            android:layout_height="wrap_content"
-            android:minHeight="@dimen/chat_message_bubble_file_size"
-            android:orientation="vertical"
-            android:gravity="center"
-            android:background="?attr/backgroundColor"
-            android:layout="@layout/chat_message_generic_file_content_cell"
-            android:visibility="@{data.audio || data.pdf || data.genericFile ? View.VISIBLE : View.GONE}"
-            app:data="@{data}"
-            app:longClickListener="@{longClickListener}"
-            app:inflatedVisibility="@{data.audio || data.pdf || data.genericFile ? View.VISIBLE : View.GONE}" />
-
-        <ViewStub
-            android:id="@+id/downloadable_file_content"
-            android:layout_width="@dimen/chat_message_bubble_file_size"
-            android:layout_height="wrap_content"
-            android:minHeight="@dimen/chat_message_bubble_file_size"
-            android:orientation="vertical"
-            android:gravity="center"
-            android:background="?attr/backgroundColor"
-            android:layout="@layout/chat_message_downloadable_file_content_cell"
-            android:visibility="@{data.downloadable ? View.VISIBLE : View.GONE}"
-            app:data="@{data}"
-            app:longClickListener="@{longClickListener}"
-            app:inflatedVisibility="@{data.downloadable ? View.VISIBLE : View.GONE}" />
-
-        <!-- Keep two views below here instead of chat_message_downloadable_file_content_cell.xml
-            layout because of viewstub lifecycleowner databinding issue -->
-        <com.google.android.material.progressindicator.CircularProgressIndicator
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:visibility="@{data.fileTransferProgress ? View.VISIBLE : View.GONE, default=gone}"
-            android:max="100"
-            android:layout_centerInParent="true"
-            app:trackColor="?attr/backgroundColor"
-            android:progress="@{data.fileTransferProgressInt, default=50}"
-            android:background="@drawable/background_round_secondary_color" />
-
-        <TextView
-            android:visibility="@{data.fileTransferProgress ? View.VISIBLE : View.GONE, default=gone}"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerInParent="true"
-            style="@style/file_transfer_progress_font"
-            android:text="@{data.fileTransferProgressInt + `%`, default=`50%`}"/>
-
-    </RelativeLayout>
-
-</layout>
diff --git a/app/src/main/res/layout/chat_message_downloadable_file_content_cell.xml b/app/src/main/res/layout/chat_message_downloadable_file_content_cell.xml
deleted file mode 100644
index 75d3b3fac..000000000
--- a/app/src/main/res/layout/chat_message_downloadable_file_content_cell.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:tools="http://schemas.android.com/tools"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <data>
-        <import type="android.view.View" />
-        <variable
-            name="data"
-            type="org.linphone.activities.main.chat.data.ChatMessageContentData" />
-        <variable
-            name="longClickListener"
-            type="android.view.View.OnLongClickListener"/>
-        <variable
-            name="inflatedVisibility"
-            type="Integer" />
-    </data>
-
-    <LinearLayout
-        android:layout_width="@dimen/chat_message_bubble_file_size"
-        android:layout_height="wrap_content"
-        android:minHeight="@dimen/chat_message_bubble_file_size"
-        android:orientation="vertical"
-        android:gravity="center"
-        android:background="?attr/backgroundColor"
-        android:visibility="@{inflatedVisibility}"
-        inflatedLifecycleOwner="@{true}">
-
-        <TextView
-            style="@style/chat_file_attachment_font"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_margin="5dp"
-            android:drawablePadding="5dp"
-            android:ellipsize="middle"
-            android:gravity="center"
-            android:onClick="@{() -> data.download()}"
-            android:onLongClick="@{longClickListener}"
-            android:singleLine="true"
-            android:text="@{data.fileName, default=`test.pdf`}"
-            android:textAlignment="center"
-            android:drawableTop="@{data.video ? @drawable/file_video : (data.image ? @drawable/file_picture : (data.pdf ? @drawable/file_pdf : (data.audio ? @drawable/file_audio : (data.voiceRecording ? @drawable/audio_recording_reply_preview_default : @drawable/file)))), default=@drawable/file}"
-            tools:ignore="UseCompatTextViewDrawableXml" />
-
-        <TextView
-            style="@style/chat_file_attachment_font"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:layout_marginBottom="5dp"
-            android:text="@{data.downloadLabel, default=`Download (10ko)`}"
-            android:onClick="@{() -> data.download()}"
-            android:visibility="@{data.downloadable ? View.VISIBLE : View.GONE}"/>
-
-    </LinearLayout>
-
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/chat_message_generic_file_content_cell.xml b/app/src/main/res/layout/chat_message_generic_file_content_cell.xml
deleted file mode 100644
index 5fc5951c9..000000000
--- a/app/src/main/res/layout/chat_message_generic_file_content_cell.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:tools="http://schemas.android.com/tools"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <data>
-        <import type="android.view.View" />
-        <variable
-            name="data"
-            type="org.linphone.activities.main.chat.data.ChatMessageContentData" />
-        <variable
-            name="longClickListener"
-            type="android.view.View.OnLongClickListener"/>
-        <variable
-            name="inflatedVisibility"
-            type="Integer" />
-    </data>
-
-    <RelativeLayout
-        android:onClick="@{() -> data.openFile()}"
-        android:onLongClick="@{longClickListener}"
-        android:layout_width="@dimen/chat_message_bubble_file_size"
-        android:layout_height="wrap_content"
-        android:minHeight="@dimen/chat_message_bubble_file_size"
-        android:orientation="vertical"
-        android:gravity="center"
-        android:background="?attr/backgroundColor"
-        android:visibility="@{inflatedVisibility}"
-        inflatedLifecycleOwner="@{true}">
-
-        <TextView
-            style="@style/chat_file_attachment_font"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_margin="5dp"
-            android:drawablePadding="5dp"
-            android:ellipsize="middle"
-            android:gravity="center"
-            android:singleLine="true"
-            android:text="@{data.fileName, default=`test.pdf`}"
-            android:textAlignment="center"
-            android:drawableTop="@{data.video ? @drawable/file_video : (data.image ? @drawable/file_picture : (data.pdf ? @drawable/file_pdf : (data.audio ? @drawable/file_audio : (data.voiceRecording ? @drawable/audio_recording_reply_preview_default : @drawable/file)))), default=@drawable/file}"
-            tools:ignore="UseCompatTextViewDrawableXml" />
-
-    </RelativeLayout>
-
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/chat_message_image_content_cell.xml b/app/src/main/res/layout/chat_message_image_content_cell.xml
deleted file mode 100644
index aa47d9402..000000000
--- a/app/src/main/res/layout/chat_message_image_content_cell.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:tools="http://schemas.android.com/tools"
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <data>
-        <import type="android.view.View" />
-        <import type="android.widget.ImageView.ScaleType"/>
-        <variable
-            name="data"
-            type="org.linphone.activities.main.chat.data.ChatMessageContentData" />
-        <variable
-            name="longClickListener"
-            type="android.view.View.OnLongClickListener"/>
-        <variable
-            name="inflatedVisibility"
-            type="Integer" />
-    </data>
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:onClick="@{() -> data.openFile()}"
-        android:onLongClick="@{longClickListener}"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:visibility="@{inflatedVisibility}"
-        inflatedLifecycleOwner="@{true}">
-
-        <ImageView
-            android:contentDescription="@string/content_description_downloaded_file_transfer"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            app:layout_constraintHeight_max="@dimen/chat_message_bubble_image_height_big"
-            app:layout_constraintHeight_min="@dimen/chat_message_bubble_image_height_small"
-            android:layout_size="@{data.alone ? 0f : @dimen/chat_message_bubble_file_size}"
-            coil="@{data.filePath}"
-            android:scaleType="@{data.alone ? ScaleType.FIT_CENTER : ScaleType.CENTER_CROP}"
-            android:adjustViewBounds="true"
-            tools:ignore="MissingConstraints" />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/chat_message_list_cell.xml b/app/src/main/res/layout/chat_message_list_cell.xml
deleted file mode 100644
index 836428dbe..000000000
--- a/app/src/main/res/layout/chat_message_list_cell.xml
+++ /dev/null
@@ -1,247 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools">
-
-    <data>
-        <import type="android.view.View" />
-        <import type="android.view.Gravity" />
-        <import type="com.google.android.flexbox.JustifyContent" />
-        <import type="org.linphone.core.ConsolidatedPresence"/>
-        <variable
-            name="contextMenuClickListener"
-            type="android.view.View.OnLongClickListener" />
-        <variable
-            name="clickListener"
-            type="android.view.View.OnClickListener" />
-        <variable
-            name="replyClickListener"
-            type="android.view.View.OnClickListener" />
-        <variable
-            name="position"
-            type="Integer" />
-        <variable
-            name="data"
-            type="org.linphone.activities.main.chat.data.ChatMessageData" />
-        <variable
-            name="selectionListViewModel"
-            type="org.linphone.activities.main.viewmodels.ListTopBarViewModel" />
-    </data>
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:onClick="@{clickListener}">
-
-        <CheckBox
-            android:id="@+id/select"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignTop="@id/background"
-            android:layout_alignParentRight="true"
-            android:layout_marginRight="5dp"
-            android:checked="@{selectionListViewModel.selectedItems.contains(position)}"
-            android:onClick="@{() -> selectionListViewModel.onToggleSelect(position)}"
-            android:visibility="@{selectionListViewModel.isEditionEnabled ? View.VISIBLE : View.GONE, default=gone}" />
-
-        <!-- To align with security badge if visible -->
-        <View
-            android:id="@+id/rightMark"
-            android:layout_width="8dp"
-            android:layout_height="1dp"
-            android:layout_alignParentRight="true" />
-
-        <ImageView
-            android:id="@+id/imdn"
-            android:layout_width="10dp"
-            android:layout_height="10dp"
-            android:layout_alignBottom="@id/background"
-            android:layout_toLeftOf="@{selectionListViewModel.isEditionEnabled ? @id/select : @id/rightMark}"
-            android:contentDescription="@string/content_description_delivery_status"
-            android:src="@{data.imdnIcon, default=@drawable/chat_delivered}"
-            android:visibility="@{data.chatMessage.outgoing ? (data.showImdn ? View.VISIBLE : View.INVISIBLE) : View.INVISIBLE}" />
-
-        <ImageView
-            android:id="@+id/avatar"
-            android:layout_width="@dimen/contact_avatar_size"
-            android:layout_height="@dimen/contact_avatar_size"
-            android:contentDescription="@null"
-            coilContact="@{data}"
-            android:layout_below="@id/time"
-            android:layout_alignParentLeft="true"
-            android:layout_marginLeft="10dp"
-            android:layout_marginRight="10dp"
-            android:background="@drawable/generated_avatar_bg"
-            android:src="@drawable/voip_single_contact_avatar"
-            android:gravity="center"
-            android:visibility="@{data.chatMessage.outgoing || selectionListViewModel.isEditionEnabled ? View.GONE : (data.hideAvatar ? View.INVISIBLE : View.VISIBLE)}" />
-
-        <ImageView
-            android:layout_width="@dimen/contact_presence_badge_size"
-            android:layout_height="@dimen/contact_presence_badge_size"
-            android:layout_alignBottom="@id/avatar"
-            android:layout_marginStart="35dp"
-            android:adjustViewBounds="true"
-            android:background="@drawable/led_background"
-            android:padding="2dp"
-            app:presenceIcon="@{data.presenceStatus}"
-            android:visibility="@{data.chatMessage.outgoing || selectionListViewModel.isEditionEnabled || data.hideAvatar || data.presenceStatus == ConsolidatedPresence.Offline ? View.GONE : View.VISIBLE, default=gone}"
-            tools:ignore="ContentDescription" />
-
-        <LinearLayout
-            android:id="@+id/background"
-            android:background="@drawable/chat_bubble_outgoing_full"
-            backgroundImage="@{data.backgroundRes, default=@drawable/chat_bubble_outgoing_full}"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/time"
-            android:layout_marginLeft="@{selectionListViewModel.isEditionEnabled ? @dimen/edit_chat_message_bubble_left_margin : !data.chatMessage.outgoing ? @dimen/incoming_chat_message_bubble_left_margin : @dimen/outgoing_chat_message_bubble_left_margin}"
-            android:layout_marginRight="@{data.chatMessage.outgoing ? @dimen/outgoing_chat_message_bubble_right_margin : @dimen/incoming_chat_message_bubble_right_margin}"
-            android:layout_marginBottom="1dp"
-            android:layout_toLeftOf="@{data.chatMessage.outgoing || selectionListViewModel.isEditionEnabled ? @id/imdn : 0}"
-            android:layout_toRightOf="@id/avatar"
-            android:descendantFocusability="blocksDescendants"
-            android:onClick="@{clickListener}"
-            android:onLongClick="@{contextMenuClickListener}"
-            android:orientation="vertical"
-            android:paddingBottom="5dp">
-
-            <TextView
-                style="@style/chat_message_reply_forward_indicator_font"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="5dp"
-                android:layout_marginRight="5dp"
-                android:layout_marginTop="5dp"
-                android:drawablePadding="3dp"
-                android:gravity="center_vertical"
-                android:text="@string/chat_message_forwarded"
-                android:visibility="@{data.chatMessage.forward ? View.VISIBLE : View.GONE, default=gone}"
-                app:drawableLeftCompat="@drawable/icon_forwarded_message"
-                tools:ignore="SmallSp" />
-
-            <TextView
-                style="@style/chat_message_reply_forward_indicator_font"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="5dp"
-                android:layout_marginRight="5dp"
-                android:layout_marginTop="5dp"
-                android:drawablePadding="3dp"
-                android:gravity="center_vertical"
-                android:text="@string/chat_message_replied"
-                android:visibility="@{data.chatMessage.reply ? View.VISIBLE : View.GONE, default=gone}"
-                app:drawableLeftCompat="@drawable/icon_replied_message"
-                tools:ignore="SmallSp" />
-
-            <include
-                layout="@layout/chat_message_reply_bubble"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="@{data.chatMessage.outgoing ? Gravity.RIGHT : Gravity.LEFT}"
-                android:layout_marginLeft="10dp"
-                android:layout_marginTop="5dp"
-                android:layout_marginRight="10dp"
-                android:visibility="@{data.replyData != null ? View.VISIBLE : View.GONE, default=gone}"
-                app:clickListener="@{replyClickListener}"
-                app:data="@{data.replyData}" />
-
-            <com.google.android.flexbox.FlexboxLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="5dp"
-                android:layout_marginTop="5dp"
-                android:layout_marginRight="5dp"
-                android:longClickable="true"
-                app:alignItems="center"
-                app:entries="@{data.contents}"
-                app:flexWrap="wrap"
-                app:justifyContent="@{data.chatMessage.outgoing ? JustifyContent.FLEX_END : JustifyContent.FLEX_START}"
-                app:layout="@{@layout/chat_message_content_cell}"
-                app:onLongClick="@{contextMenuClickListener}" />
-
-            <org.linphone.activities.main.chat.views.MultiLineWrapContentWidthTextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="@{data.chatMessage.outgoing ? Gravity.RIGHT : Gravity.LEFT}"
-                android:layout_marginLeft="10dp"
-                android:layout_marginTop="5dp"
-                android:layout_marginRight="10dp"
-                android:layout_marginBottom="5dp"
-                android:fontFamily="sans-serif"
-                android:lineSpacingExtra="-1.7sp"
-                android:longClickable="true"
-                android:onClick="@{clickListener}"
-                android:onLongClick="@{contextMenuClickListener}"
-                android:text="@{data.text, default=`Lorem Ipsum: dolor sit amet`}"
-                android:textColor="@color/dark_grey_color"
-                android:textSize="@{data.isTextEmoji ? @dimen/chat_message_emoji_font_size : @dimen/chat_message_text_font_size, default=@dimen/chat_message_text_font_size}"
-                android:textStyle="normal"
-                android:visibility="@{data.text.length > 0 ? View.VISIBLE : View.GONE}" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="right"
-                android:layout_marginLeft="5dp"
-                android:layout_marginRight="5dp"
-                android:drawablePadding="3dp"
-                android:fontFamily="sans-serif"
-                android:gravity="center_vertical|right"
-                android:lineSpacingExtra="3.3sp"
-                android:text="@{data.ephemeralLifetime, default=`00:00`}"
-                android:textColor="@color/primary_color"
-                android:textSize="12sp"
-                android:textStyle="normal"
-                android:visibility="@{data.chatMessage.ephemeral ? View.VISIBLE : View.GONE, default=gone}"
-                app:drawableRightCompat="@drawable/icon_ephemeral_message" />
-
-        </LinearLayout>
-
-        <LinearLayout
-            android:onClick="@{() -> data.showReactionsList()}"
-            android:visibility="@{data.reactions.size() > 0 ? View.VISIBLE : View.GONE, default=gone}"
-            android:id="@+id/reactions"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:background="@{data.chatMessage.outgoing ? @drawable/chat_bubble_outgoing_reactions : @drawable/chat_bubble_incoming_reactions, default=@drawable/chat_bubble_outgoing_reactions}"
-            android:padding="2dp"
-            android:layout_marginTop="-10dp"
-            android:layout_marginStart="5dp"
-            android:layout_marginEnd="5dp"
-            android:layout_marginBottom="5dp"
-            android:layout_below="@id/background"
-            android:layout_alignLeft="@{data.chatMessage.outgoing || selectionListViewModel.isEditionEnabled ? 0 : @id/background}"
-            android:layout_alignRight="@{data.chatMessage.outgoing || selectionListViewModel.isEditionEnabled ? @id/background : 0}"
-            android:orientation="horizontal"
-            android:gravity="center_vertical"
-            entries="@{data.reactions}"
-            layout="@{@layout/chat_message_reaction}"/>
-
-        <TextView
-            android:id="@+id/time"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignLeft="@{data.chatMessage.outgoing || selectionListViewModel.isEditionEnabled ? 0 : @id/background}"
-            android:layout_alignRight="@{data.chatMessage.outgoing || selectionListViewModel.isEditionEnabled ? @id/background : 0}"
-            android:layout_alignParentTop="true"
-            android:layout_marginTop="7dp"
-            android:fontFamily="sans-serif"
-            android:lineSpacingExtra="0sp"
-            android:text="@{data.chatMessage.outgoing ? data.time : data.time + ` - ` + (data.contact.name ?? data.displayName), default=`07/11 13:19 - John Doe`}"
-            android:textColor="@color/chat_bubble_text_color"
-            android:textSize="13sp"
-            android:textStyle="normal"
-            android:visibility="@{data.hideTime ? View.GONE : View.VISIBLE}" />
-
-        <ProgressBar
-            android:layout_width="10dp"
-            android:layout_height="10dp"
-            android:layout_alignBottom="@id/background"
-            android:layout_toRightOf="@id/background"
-            android:indeterminateTint="?attr/accentColor"
-            android:visibility="@{data.sendInProgress ? View.VISIBLE : View.GONE}" />
-
-    </RelativeLayout>
-
-</layout>
diff --git a/app/src/main/res/layout/chat_message_long_press_menu.xml b/app/src/main/res/layout/chat_message_long_press_menu.xml
deleted file mode 100644
index 9869d74c3..000000000
--- a/app/src/main/res/layout/chat_message_long_press_menu.xml
+++ /dev/null
@@ -1,227 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <data>
-        <import type="android.view.View" />
-        <variable
-            name="emojiClickListener"
-            type="View.OnClickListener" />
-        <variable
-            name="resendClickListener"
-            type="View.OnClickListener" />
-        <variable
-            name="copyTextClickListener"
-            type="View.OnClickListener" />
-        <variable
-            name="forwardClickListener"
-            type="View.OnClickListener" />
-        <variable
-            name="replyClickListener"
-            type="View.OnClickListener" />
-        <variable
-            name="imdnClickListener"
-            type="View.OnClickListener" />
-        <variable
-            name="addToContactsClickListener"
-            type="View.OnClickListener" />
-        <variable
-            name="deleteClickListener"
-            type="View.OnClickListener" />
-        <variable
-            name="resendHidden"
-            type="Boolean" />
-        <variable
-            name="imdnHidden"
-            type="Boolean" />
-        <variable
-            name="copyTextHidden"
-            type="Boolean" />
-        <variable
-            name="forwardHidden"
-            type="Boolean" />
-        <variable
-            name="addToContactsHidden"
-            type="Boolean" />
-        <variable
-            name="replyHidden"
-            type="Boolean" />
-        <variable
-            name="heartSelected"
-            type="Boolean" />
-        <variable
-            name="thumbsUpSelected"
-            type="Boolean" />
-        <variable
-            name="laughingSelected"
-            type="Boolean" />
-        <variable
-            name="surprisedSelected"
-            type="Boolean" />
-        <variable
-            name="cryingSelected"
-            type="Boolean" />
-    </data>
-
-    <LinearLayout
-        android:layout_width="@dimen/chat_message_popup_width"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:background="?attr/backgroundColor">
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/chat_message_popup_item_height"
-            android:layout_marginTop="5dp">
-
-            <TextView
-                style="@style/chat_message_emoji_reaction_font"
-                android:onClick="@{emojiClickListener}"
-                android:id="@+id/love"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:padding="10dp"
-                android:text="@string/emoji_love"
-                android:textColor="?attr/primaryTextColor"
-                android:background="@{heartSelected ? @drawable/shape_own_reaction_background : @drawable/shape_transparent_reaction_background, default=@drawable/shape_own_reaction_background}"
-                app:layout_constraintEnd_toStartOf="@id/thumbs_up"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintBottom_toBottomOf="parent"/>
-
-            <TextView
-                style="@style/chat_message_emoji_reaction_font"
-                android:onClick="@{emojiClickListener}"
-                android:id="@+id/thumbs_up"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:padding="10dp"
-                android:text="@string/emoji_thumbs_up"
-                android:textColor="?attr/primaryTextColor"
-                android:background="@{thumbsUpSelected ? @drawable/shape_own_reaction_background : @drawable/shape_transparent_reaction_background}"
-                app:layout_constraintEnd_toStartOf="@id/laughing"
-                app:layout_constraintStart_toEndOf="@id/love"
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintBottom_toBottomOf="parent" />
-
-            <TextView
-                style="@style/chat_message_emoji_reaction_font"
-                android:onClick="@{emojiClickListener}"
-                android:id="@+id/laughing"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:padding="10dp"
-                android:text="@string/emoji_laughing"
-                android:textColor="?attr/primaryTextColor"
-                android:background="@{laughingSelected ? @drawable/shape_own_reaction_background : @drawable/shape_transparent_reaction_background}"
-                app:layout_constraintEnd_toStartOf="@id/surprised"
-                app:layout_constraintStart_toEndOf="@id/thumbs_up"
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintBottom_toBottomOf="parent" />
-
-            <TextView
-                style="@style/chat_message_emoji_reaction_font"
-                android:onClick="@{emojiClickListener}"
-                android:id="@+id/surprised"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:padding="10dp"
-                android:text="@string/emoji_surprised"
-                android:textColor="?attr/primaryTextColor"
-                android:background="@{surprisedSelected ? @drawable/shape_own_reaction_background : @drawable/shape_transparent_reaction_background}"
-                app:layout_constraintEnd_toStartOf="@id/tear"
-                app:layout_constraintStart_toEndOf="@id/laughing"
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintBottom_toBottomOf="parent" />
-
-            <TextView
-                style="@style/chat_message_emoji_reaction_font"
-                android:onClick="@{emojiClickListener}"
-                android:id="@+id/tear"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:padding="10dp"
-                android:text="@string/emoji_tear"
-                android:textColor="?attr/primaryTextColor"
-                android:background="@{cryingSelected ? @drawable/shape_own_reaction_background : @drawable/shape_transparent_reaction_background}"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toEndOf="@id/surprised"
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintBottom_toBottomOf="parent" />
-
-        </androidx.constraintlayout.widget.ConstraintLayout>
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/chat_message_popup_item_height"
-            android:layout_marginTop="5dp"
-            android:background="@drawable/menu_background"
-            android:visibility="@{resendHidden ? View.GONE : View.VISIBLE}"
-            android:onClick="@{resendClickListener}"
-            style="@style/popup_item_font"
-            android:text="@string/chat_message_context_menu_resend"
-            app:drawableRightCompat="@drawable/chat_send_message" />
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/chat_message_popup_item_height"
-            android:background="@drawable/menu_background"
-            android:visibility="@{copyTextHidden ? View.GONE : View.VISIBLE}"
-            android:onClick="@{copyTextClickListener}"
-            style="@style/popup_item_font"
-            android:text="@string/chat_message_context_menu_copy_text"
-            app:drawableRightCompat="@drawable/menu_copy_text" />
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/chat_message_popup_item_height"
-            android:background="@drawable/menu_background"
-            android:onClick="@{forwardClickListener}"
-            android:visibility="@{forwardHidden ? View.GONE : View.VISIBLE}"
-            style="@style/popup_item_font"
-            android:text="@string/chat_message_context_menu_forward"
-            app:drawableRightCompat="@drawable/menu_forward" />
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/chat_message_popup_item_height"
-            android:background="@drawable/menu_background"
-            android:onClick="@{replyClickListener}"
-            android:visibility="@{replyHidden ? View.GONE : View.VISIBLE}"
-            style="@style/popup_item_font"
-            android:text="@string/chat_message_context_menu_reply"
-            app:drawableRightCompat="@drawable/menu_reply" />
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/chat_message_popup_item_height"
-            android:background="@drawable/menu_background"
-            android:visibility="@{imdnHidden ? View.GONE : View.VISIBLE}"
-            android:onClick="@{imdnClickListener}"
-            style="@style/popup_item_font"
-            android:text="@string/chat_message_context_menu_imdn_info"
-            app:drawableRightCompat="@drawable/menu_imdn_info" />
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/chat_message_popup_item_height"
-            android:background="@drawable/menu_background"
-            android:visibility="@{addToContactsHidden ? View.GONE : View.VISIBLE}"
-            android:onClick="@{addToContactsClickListener}"
-            style="@style/popup_item_font"
-            android:text="@string/chat_message_context_menu_add_to_contacts"
-            app:drawableRightCompat="@drawable/chat_room_menu_add_contact" />
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/chat_message_popup_item_height"
-            android:background="@drawable/menu_background"
-            android:onClick="@{deleteClickListener}"
-            style="@style/popup_item_font"
-            android:textColor="@color/red_color"
-            android:text="@string/chat_message_context_menu_delete"
-            app:drawableRightCompat="@drawable/menu_delete" />
-
-    </LinearLayout>
-
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/chat_message_reaction.xml b/app/src/main/res/layout/chat_message_reaction.xml
deleted file mode 100644
index f7768bf09..000000000
--- a/app/src/main/res/layout/chat_message_reaction.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout
-    xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <data>
-        <variable
-            name="data"
-            type="String" />
-    </data>
-
-    <TextView
-        android:textSize="@{data.matches(`\\d+`) ? @dimen/chat_message_emoji_reactions_count_font_size : @dimen/chat_message_emoji_reaction_font_size, default=@dimen/chat_message_emoji_reaction_font_size}"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textColor="@color/dark_grey_color"
-        android:layout_marginStart="2dp"
-        android:layout_marginEnd="2dp"
-        android:text="@{data, default=@string/emoji_love}"/>
-
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/chat_message_reactions_list_cell.xml b/app/src/main/res/layout/chat_message_reactions_list_cell.xml
deleted file mode 100644
index 9587b324a..000000000
--- a/app/src/main/res/layout/chat_message_reactions_list_cell.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <data>
-        <import type="android.view.View" />
-        <variable
-            name="data"
-            type="org.linphone.activities.main.chat.data.ChatMessageReactionData" />
-    </data>
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="55dp"
-        android:padding="10dp">
-
-        <ImageView
-            coilContact="@{data}"
-            android:id="@+id/avatar"
-            android:layout_width="@dimen/contact_avatar_size"
-            android:layout_height="@dimen/contact_avatar_size"
-            android:background="@drawable/generated_avatar_bg"
-            android:contentDescription="@null"
-            android:src="@drawable/voip_single_contact_avatar"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent"/>
-
-        <TextView
-            style="@style/contact_name_list_cell_font"
-            android:id="@+id/contact"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="10dp"
-            android:text="@{data.contact.name ?? data.displayName, default=`John Doe`}"
-            app:layout_constraintStart_toEndOf="@id/avatar"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent"/>
-
-        <TextView
-            style="@style/chat_message_emoji_reaction_font"
-            android:id="@+id/reaction"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="10dp"
-            android:text="@{data.reaction, default=@string/emoji_love}"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent"/>
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/chat_message_reactions_list_dialog.xml b/app/src/main/res/layout/chat_message_reactions_list_dialog.xml
deleted file mode 100644
index bfe522776..000000000
--- a/app/src/main/res/layout/chat_message_reactions_list_dialog.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <data>
-        <import type="android.view.View" />
-        <variable
-            name="data"
-            type="org.linphone.activities.main.chat.data.ChatMessageReactionsListData" />
-    </data>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:background="?attr/backgroundColor">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:layout_marginTop="10dp"
-            android:layout_marginBottom="10dp"
-            android:src="@drawable/shape_dialog_handle" />
-
-        <com.google.android.material.tabs.TabLayout
-            android:id="@+id/tabs"
-            app:tabMode="fixed"
-            app:tabGravity="fill"
-            app:tabPadding="0dp"
-            app:tabInlineLabel="true"
-            app:tabTextColor="?attr/primaryTextColor"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="?attr/backgroundColor" />
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:layout_marginStart="2dp"
-            android:layout_marginEnd="2dp"
-            android:layout_marginBottom="5dp"
-            android:background="?dividerColor" />
-
-        <androidx.core.widget.NestedScrollView
-            android:layout_width="match_parent"
-            android:layout_height="220dp">
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical"
-                entries="@{data.filteredReactions}"
-                layout="@{@layout/chat_message_reactions_list_cell}" />
-
-        </androidx.core.widget.NestedScrollView>
-
-    </LinearLayout>
-
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/chat_message_reply.xml b/app/src/main/res/layout/chat_message_reply.xml
deleted file mode 100644
index 917b7ad98..000000000
--- a/app/src/main/res/layout/chat_message_reply.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <data>
-        <import type="android.view.View"/>
-        <variable
-            name="cancelClickListener"
-            type="android.view.View.OnClickListener" />
-        <variable
-            name="data"
-            type="org.linphone.activities.main.chat.data.ChatMessageData" />
-        <variable
-            name="inflatedVisibility"
-            type="Integer" />
-    </data>
-
-    <RelativeLayout
-        android:id="@+id/chat_message_reply"
-        android:background="@{data.chatMessage.isOutgoing ? @color/chat_bubble_outgoing_color : @color/chat_bubble_incoming_color, default=@color/chat_bubble_incoming_color}"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:visibility="@{inflatedVisibility}"
-        inflatedLifecycleOwner="@{true}">
-
-        <LinearLayout
-            android:id="@+id/reply_layout"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:paddingTop="10dp"
-            android:paddingBottom="10dp"
-            android:layout_marginLeft="10dp"
-            android:orientation="vertical"
-            android:layout_toLeftOf="@id/clear_reply">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                style="@style/chat_message_reply_sender_font"
-                android:text="@{data.contact.name ?? data.displayName, default=Tintin}"/>
-
-            <HorizontalScrollView
-                android:visibility="@{data.contents.size() == 0 ? View.GONE : View.VISIBLE}"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="5dp">
-
-                <LinearLayout
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:orientation="horizontal"
-                    android:gravity="center_vertical"
-                    app:entries="@{data.contents}"
-                    app:layout="@{@layout/chat_message_reply_preview_content_cell}"/>
-
-            </HorizontalScrollView>
-
-            <TextView
-                android:visibility="@{data.text.length() == 0 ? View.GONE : View.VISIBLE}"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="5dp"
-                android:maxLines="5"
-                android:ellipsize="end"
-                style="@style/chat_message_reply_font"
-                android:text="@{data.text, default=`Lorem Ipsum`}"/>
-
-        </LinearLayout>
-
-        <ImageView
-            android:id="@+id/clear_reply"
-            android:onClick="@{cancelClickListener}"
-            android:contentDescription="@string/content_description_cancel_reply"
-            android:layout_width="30dp"
-            android:layout_height="30dp"
-            android:layout_alignParentRight="true"
-            android:layout_centerVertical="true"
-            android:layout_marginLeft="5dp"
-            android:layout_marginRight="10dp"
-            android:padding="5dp"
-            android:src="@drawable/field_clean" />
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:background="?attr/dividerColor"
-            android:layout_below="@id/reply_layout"/>
-
-    </RelativeLayout>
-
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/chat_message_reply_bubble.xml b/app/src/main/res/layout/chat_message_reply_bubble.xml
deleted file mode 100644
index 3c8521d13..000000000
--- a/app/src/main/res/layout/chat_message_reply_bubble.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <data>
-        <import type="android.view.View"/>
-        <variable
-            name="clickListener"
-            type="android.view.View.OnClickListener" />
-        <variable
-            name="data"
-            type="org.linphone.activities.main.chat.data.ChatMessageData" />
-    </data>
-
-    <LinearLayout
-        android:background="@drawable/chat_bubble_reply_background"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="10dp"
-        android:layout_marginRight="10dp"
-        android:layout_marginTop="5dp"
-        android:orientation="horizontal"
-        android:onClick="@{clickListener}">
-
-        <View
-            android:id="@+id/color"
-            android:layout_width="10dp"
-            android:layout_height="match_parent"
-            android:background="@{data.chatMessage.isOutgoing ? @drawable/chat_bubble_reply_outgoing_indicator : @drawable/chat_bubble_reply_incoming_indicator, default=@drawable/chat_bubble_reply_outgoing_indicator}" />
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="5dp"
-            android:visibility="@{data.contents.size() > 0 ? View.VISIBLE : View.GONE}">
-
-            <com.google.android.flexbox.FlexboxLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintWidth_max="@dimen/chat_message_content_preview_max_width"
-                app:entries="@{data.contents}"
-                app:layout="@{@layout/chat_message_reply_content_cell}"
-                app:flexWrap="wrap"
-                app:alignItems="center"
-                app:justifyContent="flex_start"/>
-
-        </androidx.constraintlayout.widget.ConstraintLayout>
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="5dp"
-            android:layout_marginRight="10dp"
-            android:paddingTop="10dp"
-            android:paddingBottom="10dp"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                style="@style/chat_message_reply_sender_font"
-                android:text="@{data.contact.name ?? data.displayName, default=Tintin}"/>
-
-            <TextView
-                android:visibility="@{data.text.length() == 0 ? View.GONE : View.VISIBLE}"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:singleLine="false"
-                android:layout_marginTop="5dp"
-                android:maxLines="5"
-                android:ellipsize="end"
-                style="@style/chat_message_reply_font"
-                android:text="@{data.text, default=`Lorem ipsum`}"/>
-
-        </LinearLayout>
-
-    </LinearLayout>
-
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/chat_message_reply_content_cell.xml b/app/src/main/res/layout/chat_message_reply_content_cell.xml
deleted file mode 100644
index 8410eaa39..000000000
--- a/app/src/main/res/layout/chat_message_reply_content_cell.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <data>
-        <import type="android.view.View"/>
-        <import type="android.widget.ImageView.ScaleType"/>
-        <variable
-            name="data"
-            type="org.linphone.activities.main.chat.data.ChatMessageContentData" />
-    </data>
-
-    <RelativeLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_margin="5dp">
-
-        <ImageView
-            android:contentDescription="@string/content_description_downloaded_file_transfer"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:maxHeight="@dimen/chat_message_bubble_image_height_small"
-            android:layout_size="@{data.alone ? 0f : @dimen/chat_message_small_bubble_file_size}"
-            coil="@{data.filePath}"
-            android:visibility="@{data.image ? View.VISIBLE : View.GONE, default=gone}"
-            android:scaleType="@{ScaleType.CENTER_CROP}"
-            android:adjustViewBounds="true" />
-
-        <ImageView
-            android:layout_width="@dimen/chat_message_small_bubble_file_size"
-            android:layout_height="@dimen/chat_message_small_bubble_file_size"
-            android:background="@drawable/chat_bubble_reply_file_background"
-            android:contentDescription="@{data.fileName}"
-            android:padding="10dp"
-            android:src="@drawable/file_video"
-            android:visibility="@{data.video ? View.VISIBLE : View.GONE, default=gone}" />
-
-        <ImageView
-            android:contentDescription="@string/content_description_downloaded_file_transfer"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:maxHeight="@dimen/chat_message_bubble_image_height_small"
-            android:layout_size="@{data.alone ? 0f : @dimen/chat_message_small_bubble_file_size}"
-            coilVideoPreview="@{data.filePath}"
-            android:visibility="@{data.video ? View.VISIBLE : View.GONE, default=gone}"
-            android:scaleType="@{ScaleType.CENTER_CROP}"
-            android:adjustViewBounds="true" />
-
-        <TextView
-            android:visibility="@{data.isVoiceRecording ? View.VISIBLE : View.GONE, default=gone}"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:drawablePadding="2dp"
-            android:gravity="center"
-            android:text="@{data.formattedDuration, default=`00:00`}"
-            android:textColor="@color/light_primary_text_color"
-            app:drawableTopCompat="@drawable/audio_recording_reply_preview_default" />
-
-        <TextView
-            android:visibility="@{data.isConferenceSchedule ? View.VISIBLE : View.GONE, default=gone}"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:background="@drawable/chat_bubble_reply_file_background"
-            android:text="@{data.conferenceSubject, default=`Lorem Ipsum`}"
-            android:textColor="?attr/primaryTextColor"
-            android:padding="5dp"
-            android:maxLines="3"
-            android:ellipsize="end"
-            android:layout_centerVertical="true"
-            app:drawableTopCompat="@drawable/icon_meeting_schedule" />
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_size="@{data.alone ? 0f : @dimen/chat_message_small_bubble_file_size}"
-            android:background="@drawable/chat_bubble_reply_file_background"
-            android:contentDescription="@{data.fileName}"
-            android:maxHeight="@dimen/chat_message_bubble_image_height_small"
-            android:padding="10dp"
-            android:src="@{data.video ? @drawable/file_video : (data.image ? @drawable/file_picture : (data.pdf ? @drawable/file_pdf : (data.audio ? @drawable/file_audio : @drawable/file))), default=@drawable/file}"
-            android:visibility="@{data.downloadable || data.pdf || data.audio || data.genericFile ? View.VISIBLE : View.GONE}" />
-
-    </RelativeLayout>
-
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/chat_message_reply_preview_content_cell.xml b/app/src/main/res/layout/chat_message_reply_preview_content_cell.xml
deleted file mode 100644
index 573e3d714..000000000
--- a/app/src/main/res/layout/chat_message_reply_preview_content_cell.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <data>
-        <import type="android.view.View"/>
-        <import type="android.widget.ImageView.ScaleType"/>
-        <variable
-            name="data"
-            type="org.linphone.activities.main.chat.data.ChatMessageContentData" />
-    </data>
-
-    <RelativeLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content">
-
-        <ImageView
-            android:contentDescription="@string/content_description_downloaded_file_transfer"
-            android:layout_width="@dimen/chat_message_small_bubble_file_size"
-            android:layout_height="@dimen/chat_message_small_bubble_file_size"
-            android:layout_margin="5dp"
-            coil="@{data.filePath}"
-            android:visibility="@{data.image ? View.VISIBLE : View.GONE, default=gone}"
-            android:scaleType="@{ScaleType.CENTER_CROP}"
-            android:adjustViewBounds="true" />
-
-        <ImageView
-            android:layout_width="@dimen/chat_message_small_bubble_file_size"
-            android:layout_height="@dimen/chat_message_small_bubble_file_size"
-            android:layout_margin="5dp"
-            android:background="@drawable/chat_bubble_reply_file_background"
-            android:contentDescription="@{data.fileName}"
-            android:padding="10dp"
-            android:src="@drawable/file_video"
-            android:visibility="@{data.video ? View.VISIBLE : View.GONE, default=gone}" />
-
-        <ImageView
-            android:contentDescription="@string/content_description_downloaded_file_transfer"
-            android:layout_width="@dimen/chat_message_small_bubble_file_size"
-            android:layout_height="@dimen/chat_message_small_bubble_file_size"
-            android:layout_margin="5dp"
-            coilVideoPreview="@{data.filePath}"
-            android:visibility="@{data.video ? View.VISIBLE : View.GONE, default=gone}"
-            android:scaleType="@{ScaleType.CENTER_CROP}"
-            android:adjustViewBounds="true" />
-
-        <TextView
-            android:visibility="@{data.isVoiceRecording ? View.VISIBLE : View.GONE, default=gone}"
-            android:layout_width="wrap_content"
-            android:layout_height="@dimen/progress_bar_height"
-            android:drawablePadding="5dp"
-            android:gravity="center"
-            android:text="@{data.formattedDuration, default=`00:00`}"
-            android:textColor="@color/light_primary_text_color"
-            app:drawableLeftCompat="@drawable/audio_recording_reply_preview_default" />
-
-        <TextView
-            android:visibility="@{data.isConferenceSchedule ? View.VISIBLE : View.GONE, default=gone}"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:maxWidth="@dimen/chat_message_content_preview_max_width"
-            android:maxLines="3"
-            android:ellipsize="end"
-            android:background="@drawable/chat_bubble_reply_file_background"
-            android:text="@{data.conferenceSubject, default=`Lorem Ipsum`}"
-            android:textColor="?attr/primaryTextColor"
-            android:drawablePadding="5dp"
-            android:padding="5dp"
-            android:layout_centerVertical="true"
-            app:drawableTopCompat="@drawable/icon_meeting_schedule" />
-
-        <ImageView
-            android:layout_width="@dimen/chat_message_small_bubble_file_size"
-            android:layout_height="@dimen/chat_message_small_bubble_file_size"
-            android:layout_margin="5dp"
-            android:background="@drawable/chat_bubble_reply_file_background"
-            android:contentDescription="@{data.fileName}"
-            android:padding="10dp"
-            android:src="@{data.video ? @drawable/file_video : (data.image ? @drawable/file_picture : (data.pdf ? @drawable/file_pdf : (data.audio ? @drawable/file_audio : @drawable/file))), default=@drawable/file}"
-            android:visibility="@{data.downloadable || data.pdf || data.audio || data.genericFile ? View.VISIBLE : View.GONE}" />
-
-    </RelativeLayout>
-
-</layout>
diff --git a/app/src/main/res/layout/chat_message_video_content_cell.xml b/app/src/main/res/layout/chat_message_video_content_cell.xml
deleted file mode 100644
index 04d3ac979..000000000
--- a/app/src/main/res/layout/chat_message_video_content_cell.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <data>
-        <import type="android.view.View" />
-        <import type="android.widget.ImageView.ScaleType"/>
-        <variable
-            name="data"
-            type="org.linphone.activities.main.chat.data.ChatMessageContentData" />
-        <variable
-            name="longClickListener"
-            type="android.view.View.OnLongClickListener"/>
-        <variable
-            name="inflatedVisibility"
-            type="Integer" />
-    </data>
-
-    <RelativeLayout
-        android:onClick="@{() -> data.openFile()}"
-        android:onLongClick="@{longClickListener}"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:visibility="@{inflatedVisibility}"
-        inflatedLifecycleOwner="@{true}"
-        android:background="?attr/backgroundColor">
-
-        <TextView
-            style="@style/chat_file_attachment_font"
-            android:layout_width="100dp"
-            android:layout_height="wrap_content"
-            android:layout_centerInParent="true"
-            android:ellipsize="middle"
-            android:singleLine="true"
-            android:padding="10dp"
-            android:gravity="center"
-            android:textAlignment="center"
-            android:drawablePadding="5dp"
-            android:text="@{data.fileName, default=`test.mkv`}"
-            app:drawableTopCompat="@drawable/file_video" />
-
-        <ImageView
-            android:contentDescription="@string/content_description_downloaded_file_transfer"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:maxHeight="@dimen/chat_message_bubble_image_height_big"
-            android:layout_size="@{data.alone ? 0f : @dimen/chat_message_bubble_file_size}"
-            coilVideoPreview="@{data.filePath}"
-            android:scaleType="@{data.alone ? ScaleType.FIT_CENTER : ScaleType.CENTER_CROP}"
-            android:adjustViewBounds="true" />
-
-    </RelativeLayout>
-
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/chat_message_voice_record_content_cell.xml b/app/src/main/res/layout/chat_message_voice_record_content_cell.xml
deleted file mode 100644
index 26649428e..000000000
--- a/app/src/main/res/layout/chat_message_voice_record_content_cell.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <data>
-        <import type="android.view.View"/>
-        <import type="android.widget.ImageView.ScaleType"/>
-        <variable
-            name="data"
-            type="org.linphone.activities.main.chat.data.ChatMessageContentData" />
-        <variable
-            name="longClickListener"
-            type="android.view.View.OnLongClickListener"/>
-        <variable
-            name="inflatedVisibility"
-            type="Integer" />
-    </data>
-
-    <RelativeLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:onLongClick="@{longClickListener}"
-        android:visibility="@{inflatedVisibility}"
-        inflatedLifecycleOwner="@{true}">
-
-        <org.linphone.views.VoiceRecordProgressBar
-            style="@style/Widget.AppCompat.ProgressBar.Horizontal"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/progress_bar_height"
-            android:layout_centerVertical="true"
-            android:progress="@{data.voiceRecordPlayingPosition}"
-            android:secondaryProgress="@{data.voiceRecordPlayingPosition}"
-            app:max="@{data.voiceRecordDuration}"
-            app:progressDrawable="@drawable/chat_message_audio_record_progress"
-            app:secondaryProgressTint="@{data.outgoing ? @color/chat_bubble_outgoing_color_dark : @color/chat_bubble_incoming_color_dark}"
-            app:primaryLeftMargin="40dp"
-            app:primaryRightMargin="50dp"/>
-
-        <ImageView
-            android:id="@+id/play_voice_record"
-            android:layout_width="30dp"
-            android:layout_height="30dp"
-            android:layout_alignParentLeft="true"
-            android:layout_centerVertical="true"
-            android:layout_marginLeft="5dp"
-            android:layout_marginRight="5dp"
-            android:contentDescription="@string/content_description_play_voice_recording"
-            android:background="@drawable/round_recording_button_background_dark"
-            android:onClick="@{() -> data.isVoiceRecordPlaying() ? data.pauseVoiceRecording() : data.playVoiceRecording()}"
-            android:padding="9dp"
-            android:src="@{data.isVoiceRecordPlaying() ? @drawable/record_pause_dark : @drawable/record_play_dark, default=@drawable/record_play_dark}" />
-
-        <TextView
-            android:id="@+id/recording_duration"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentRight="true"
-            android:layout_centerVertical="true"
-            android:layout_marginLeft="5dp"
-            android:layout_marginRight="5dp"
-            android:text="@{data.formattedDuration, default=`00:00`}"
-            android:textColor="@color/light_primary_text_color"
-            android:textSize="15sp" />
-
-    </RelativeLayout>
-
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/chat_message_voice_recording.xml b/app/src/main/res/layout/chat_message_voice_recording.xml
deleted file mode 100644
index d7d2dde5f..000000000
--- a/app/src/main/res/layout/chat_message_voice_recording.xml
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <data>
-        <import type="android.view.View"/>
-        <variable
-            name="viewModel"
-            type="org.linphone.activities.main.chat.viewmodels.ChatMessageSendingViewModel" />
-        <variable
-            name="inflatedVisibility"
-            type="Integer" />
-    </data>
-
-    <RelativeLayout
-        android:id="@+id/voice_recording"
-        android:background="?attr/backgroundColor2"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingTop="10dp"
-        android:paddingBottom="10dp"
-        android:visibility="@{inflatedVisibility}"
-        inflatedLifecycleOwner="@{true}">
-
-        <ImageView
-            android:id="@+id/cancel_recording"
-            android:onClick="@{() -> viewModel.cancelVoiceRecording()}"
-            android:contentDescription="@string/content_description_cancel_voice_recording"
-            android:layout_width="30dp"
-            android:layout_height="30dp"
-            android:layout_alignParentLeft="true"
-            android:layout_centerVertical="true"
-            android:layout_marginLeft="10dp"
-            android:layout_marginRight="10dp"
-            android:src="@drawable/delete" />
-
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:layout_toRightOf="@id/cancel_recording"
-            android:layout_toLeftOf="@id/play_pause_stop"
-            android:background="@drawable/chat_message_voice_recording_background">
-
-            <org.linphone.views.VoiceRecordProgressBar
-                android:visibility="@{viewModel.isVoiceRecording ? View.GONE : View.VISIBLE}"
-                android:layout_width="match_parent"
-                android:layout_height="@dimen/progress_bar_height"
-                style="@style/Widget.AppCompat.ProgressBar.Horizontal"
-                android:progress="@{viewModel.voiceRecordPlayingPosition}"
-                android:secondaryProgress="@{viewModel.voiceRecordPlayingPosition}"
-                app:max="@{viewModel.voiceRecordingDuration}"
-                app:progressDrawable="@drawable/chat_message_audio_record_progress"
-                app:secondaryProgressTint="@{@color/green_color}"
-                app:primaryRightMargin="50dp"/>
-
-            <ProgressBar
-                android:visibility="@{viewModel.isVoiceRecording ? View.VISIBLE : View.GONE}"
-                android:layout_width="match_parent"
-                android:layout_height="@dimen/progress_bar_height"
-                android:layout_toLeftOf="@id/duration"
-                style="@style/Widget.AppCompat.ProgressBar.Horizontal"
-                android:progressDrawable="@drawable/chat_message_audio_record_preview_progress"
-                android:max="@{viewModel.voiceRecordingProgressBarMax}"
-                android:progress="@{viewModel.voiceRecordingDuration}"/>
-
-            <TextView
-                android:id="@+id/duration"
-                android:text="@{viewModel.formattedDuration, default=`00:00`}"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="5dp"
-                android:layout_marginRight="5dp"
-                android:layout_centerVertical="true"
-                android:layout_alignParentEnd="true"
-                android:textColor="@color/light_primary_text_color"
-                android:textSize="15sp" />
-
-        </RelativeLayout>
-
-        <LinearLayout
-            android:id="@+id/play_pause_stop"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginRight="10dp"
-            android:layout_marginLeft="10dp"
-            android:layout_centerVertical="true"
-            android:layout_alignParentRight="true">
-
-            <ImageView
-                android:visibility="@{viewModel.isVoiceRecording ? View.VISIBLE : View.GONE}"
-                android:onClick="@{() -> viewModel.stopVoiceRecording()}"
-                android:contentDescription="@string/content_description_stop_voice_recording"
-                android:layout_width="30dp"
-                android:layout_height="30dp"
-                android:padding="9dp"
-                android:background="@drawable/round_recording_button_background_light"
-                android:src="@drawable/record_stop_light" />
-
-            <ImageView
-                android:visibility="@{!viewModel.isVoiceRecording &amp;&amp; !viewModel.isPlayingVoiceRecording ? View.VISIBLE : View.GONE, default=gone}"
-                android:onClick="@{() -> viewModel.playRecordedMessage()}"
-                android:contentDescription="@string/content_description_play_voice_recording"
-                android:layout_width="30dp"
-                android:layout_height="30dp"
-                android:padding="9dp"
-                android:background="@drawable/round_recording_button_background_light"
-                android:src="@drawable/record_play_light" />
-
-            <ImageView
-                android:visibility="@{!viewModel.isVoiceRecording &amp;&amp; viewModel.isPlayingVoiceRecording ? View.VISIBLE : View.GONE, default=gone}"
-                android:onClick="@{() -> viewModel.pauseRecordedMessage()}"
-                android:contentDescription="@string/content_description_pause_voice_recording_playback"
-                android:layout_width="30dp"
-                android:layout_height="30dp"
-                android:padding="9dp"
-                android:background="@drawable/round_recording_button_background_light"
-                android:src="@drawable/record_pause_light" />
-
-        </LinearLayout>
-
-    </RelativeLayout>
-
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/chat_room_creation_fragment.xml b/app/src/main/res/layout/chat_room_creation_fragment.xml
deleted file mode 100644
index 9eb6ac052..000000000
--- a/app/src/main/res/layout/chat_room_creation_fragment.xml
+++ /dev/null
@@ -1,229 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:bind="http://schemas.android.com/tools">
-
-    <data>
-        <import type="android.view.View"/>
-        <variable
-            name="allContactsToggleClickListener"
-            type="android.view.View.OnClickListener"/>
-        <variable
-            name="sipContactsToggleClickListener"
-            type="android.view.View.OnClickListener"/>
-        <variable
-            name="nextClickListener"
-            type="android.view.View.OnClickListener"/>
-        <variable
-            name="viewModel"
-            type="org.linphone.activities.main.chat.viewmodels.ChatRoomCreationViewModel" />
-    </data>
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <LinearLayout
-            android:id="@+id/top_bar"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/main_activity_top_bar_size"
-            android:background="?attr/lightToolbarBackgroundColor"
-            android:orientation="horizontal">
-
-            <ImageView
-                android:id="@+id/back"
-                android:contentDescription="@string/content_description_go_back"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_gravity="left"
-                android:layout_weight="1"
-                android:background="?attr/button_background_drawable"
-                android:padding="18dp"
-                android:src="@drawable/back" />
-
-            <LinearLayout
-                android:visibility="@{viewModel.secureChatAvailable &amp;&amp; !viewModel.secureChatMandatory ? View.VISIBLE : View.INVISIBLE}"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_marginLeft="5dp"
-                android:layout_marginRight="5dp"
-                android:layout_weight="2"
-                android:gravity="center"
-                android:orientation="horizontal">
-
-                <ImageView
-                    android:onClick="@{() -> viewModel.updateEncryption(false)}"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:contentDescription="@string/content_description_e2e_encryption_disabled"
-                    android:src="@drawable/security_toggle_icon_grey"/>
-
-                <com.google.android.material.switchmaterial.SwitchMaterial
-                    android:checked="@={viewModel.isEncrypted}"
-                    android:layout_width="50dp"
-                    android:layout_height="match_parent"
-                    android:layout_marginLeft="10dp"
-                    android:layout_marginRight="10dp"
-                    android:switchMinWidth="50dp"
-                    android:textOff=""
-                    android:textOn=""/>
-
-                <ImageView
-                    android:onClick="@{() -> viewModel.updateEncryption(true)}"
-                    android:contentDescription="@string/content_description_e2e_encryption_enabled"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:src="@drawable/security_toggle_icon_green" />
-
-            </LinearLayout>
-
-            <RelativeLayout
-                android:visibility="@{viewModel.createGroupChat ? View.GONE : View.VISIBLE}"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="1">
-
-                <ImageView
-                    android:onClick="@{allContactsToggleClickListener}"
-                    android:enabled="@{viewModel.sipContactsSelected}"
-                    android:contentDescription="@string/content_description_show_all_contacts"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:background="?attr/button_background_drawable"
-                    android:padding="15dp"
-                    android:src="@drawable/contacts_all" />
-
-                <View
-                    android:visibility="@{viewModel.sipContactsSelected ? View.GONE : View.VISIBLE}"
-                    android:layout_width="match_parent"
-                    android:layout_height="5dp"
-                    android:layout_alignParentBottom="true"
-                    android:background="?attr/accentColor" />
-
-            </RelativeLayout>
-
-            <RelativeLayout
-                android:visibility="@{viewModel.createGroupChat ? View.GONE : View.VISIBLE}"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="1">
-
-                <ImageView
-                    android:onClick="@{sipContactsToggleClickListener}"
-                    android:enabled="@{!viewModel.sipContactsSelected}"
-                    android:contentDescription="@string/content_description_show_sip_contacts"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:background="?attr/button_background_drawable"
-                    android:gravity="center"
-                    android:padding="15dp"
-                    android:src="@drawable/contacts_sip" />
-
-                <View
-                    android:visibility="@{viewModel.sipContactsSelected ? View.VISIBLE : View.GONE}"
-                    android:layout_width="match_parent"
-                    android:layout_height="5dp"
-                    android:layout_alignParentBottom="true"
-                    android:background="?attr/accentColor" />
-            </RelativeLayout>
-
-            <ImageView
-                android:onClick="@{nextClickListener}"
-                android:enabled="@{viewModel.selectedAddresses.size() > 0}"
-                android:visibility="@{viewModel.createGroupChat ? View.VISIBLE : View.GONE}"
-                android:contentDescription="@string/content_description_continue_chat_room_creation"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_gravity="right"
-                android:layout_weight="1"
-                android:background="?attr/button_background_drawable"
-                android:padding="18dp"
-                android:src="@drawable/valid" />
-
-        </LinearLayout>
-
-        <EditText
-            android:id="@+id/searchBar"
-            android:text="@={viewModel.filter}"
-            android:layout_width="match_parent"
-            android:layout_height="40dp"
-            android:inputType="textPersonName|textNoSuggestions"
-            android:layout_below="@id/top_bar"
-            android:layout_margin="10dp"
-            android:drawableLeft="@drawable/search"
-            android:drawablePadding="10dp"
-            android:background="@color/transparent_color"
-            android:backgroundTint="@color/transparent_color"
-            android:hint="@string/contact_filter_hint"/>
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignTop="@id/searchBar"
-            android:layout_alignRight="@id/searchBar"
-            android:layout_alignBottom="@id/searchBar"
-            android:onClick="@{() -> viewModel.clearFilter()}"
-            android:contentDescription="@string/content_description_clear_field"
-            android:src="@drawable/field_clean" />
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:layout_below="@id/searchBar"
-            android:background="?attr/dividerColor" />
-
-        <HorizontalScrollView
-            android:visibility="@{viewModel.createGroupChat ? View.VISIBLE : View.GONE}"
-            android:id="@+id/layoutContactsSelected"
-            android:layout_below="@id/searchBar"
-            android:layout_width="match_parent"
-            android:layout_height="50dp"
-            android:background="?attr/lightToolbarBackgroundColor"
-            android:fadeScrollbars="false"
-            android:lines="1">
-
-            <LinearLayout
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:lines="1"
-                android:orientation="horizontal"
-                android:paddingLeft="10dp"
-                android:paddingRight="10dp"
-                android:scrollIndicators="bottom"
-                app:entries="@{viewModel.selectedAddresses}"
-                app:parent="@{viewModel}"
-                app:layout="@{@layout/contact_selected_cell}" />
-
-        </HorizontalScrollView>
-
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/contactsList"
-            android:layout_below="@id/layoutContactsSelected"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent" />
-
-        <TextView
-            style="@style/empty_list_font"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:gravity="center"
-            android:text="@string/no_sip_contact"
-            android:visibility="@{viewModel.sipContactsSelected &amp;&amp; viewModel.contactsList.empty ? View.VISIBLE : View.GONE}" />
-
-        <TextView
-            style="@style/empty_list_font"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:gravity="center"
-            android:text="@string/no_contact"
-            android:visibility="@{!viewModel.sipContactsSelected &amp;&amp; viewModel.contactsList.empty ? View.VISIBLE : View.GONE}" />
-
-        <include
-            layout="@layout/wait_layout"
-            bind:visibility="@{viewModel.waitForChatRoomCreation || viewModel.fetchInProgress}" />
-
-    </RelativeLayout>
-
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/chat_room_detail_fragment.xml b/app/src/main/res/layout/chat_room_detail_fragment.xml
deleted file mode 100644
index 17f074c36..000000000
--- a/app/src/main/res/layout/chat_room_detail_fragment.xml
+++ /dev/null
@@ -1,235 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <data>
-        <import type="android.view.View"/>
-        <import type="org.linphone.core.ConsolidatedPresence"/>
-        <variable
-            name="menuClickListener"
-            type="android.view.View.OnClickListener"/>
-        <variable
-            name="menuLongClickListener"
-            type="android.view.View.OnLongClickListener"/>
-        <variable
-            name="securityIconClickListener"
-            type="android.view.View.OnClickListener"/>
-        <variable
-            name="attachFileClickListener"
-            type="android.view.View.OnClickListener"/>
-        <variable
-            name="voiceRecordingTouchListener"
-            type="android.view.View.OnTouchListener" />
-        <variable
-            name="cancelReplyToClickListener"
-            type="android.view.View.OnClickListener" />
-        <variable
-            name="scrollToBottomClickListener"
-            type="android.view.View.OnClickListener"/>
-        <variable
-            name="groupCallListener"
-            type="android.view.View.OnClickListener"/>
-        <variable
-            name="viewModel"
-            type="org.linphone.activities.main.chat.viewmodels.ChatRoomViewModel" />
-        <variable
-            name="chatSendingViewModel"
-            type="org.linphone.activities.main.chat.viewmodels.ChatMessageSendingViewModel" />
-        <variable
-            name="sharedMainViewModel"
-            type="org.linphone.activities.main.viewmodels.SharedMainViewModel" />
-    </data>
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="?attr/backgroundColor"
-        android:clickable="true">
-
-        <LinearLayout
-            android:id="@+id/top_bar"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/main_activity_top_bar_size"
-            android:background="?attr/lightToolbarBackgroundColor"
-            android:orientation="horizontal">
-
-            <ImageView
-                android:id="@+id/back"
-                android:contentDescription="@string/content_description_go_back"
-                android:visibility="@{sharedMainViewModel.isSlidingPaneSlideable ? View.VISIBLE : View.GONE}"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="0.2"
-                android:background="?attr/button_background_drawable"
-                android:padding="18dp"
-                android:src="@drawable/back" />
-
-            <LinearLayout
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_gravity="center_vertical|left"
-                android:layout_weight="0.4"
-                android:gravity="center_vertical|left"
-                android:orientation="vertical"
-                android:paddingStart="5dp"
-                android:paddingEnd="5dp">
-
-                <org.linphone.views.MarqueeTextView
-                    android:text="@{viewModel.oneToOneChatRoom ? (viewModel.contact.name ?? viewModel.displayName) : viewModel.subject, default=`Lorem Ipsum Dolor Sit Amet`}"
-                    style="@style/toolbar_small_title_font"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:singleLine="true" />
-
-                <org.linphone.views.MarqueeTextView
-                    android:text="@{viewModel.participants, default=`John Doe`}"
-                    android:visibility="@{viewModel.oneToOneChatRoom ? View.GONE : View.VISIBLE, default=gone}"
-                    style="@style/toolbar_small_title_font"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:singleLine="true" />
-
-                <org.linphone.views.MarqueeTextView
-                    android:id="@+id/last_seen_at"
-                    android:text="@{viewModel.lastPresenceInfo, default=`Online`}"
-                    android:visibility="@{viewModel.oneToOneChatRoom &amp;&amp; viewModel.presenceStatus != ConsolidatedPresence.Offline ? View.VISIBLE : View.GONE}"
-                    style="@style/chat_last_seen_at_font"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:singleLine="true" />
-
-            </LinearLayout>
-
-            <ImageView
-                android:onClick="@{() -> viewModel.startCall()}"
-                android:contentDescription="@string/content_description_start_call"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="0.2"
-                android:background="?attr/button_background_drawable"
-                android:padding="15dp"
-                android:visibility="@{viewModel.oneToOneChatRoom ? View.VISIBLE : View.GONE}"
-                android:src="@drawable/call_alt_start" />
-
-            <ImageView
-                android:onClick="@{groupCallListener}"
-                android:contentDescription="@string/content_description_start_call"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="0.2"
-                android:background="?attr/button_background_drawable"
-                android:padding="7dp"
-                android:enabled="@{viewModel.groupCallAvailable &amp;&amp; !chatSendingViewModel.isReadOnly}"
-                android:visibility="@{viewModel.oneToOneChatRoom ? View.GONE : View.VISIBLE}"
-                android:src="@drawable/icon_video_conf_new" />
-
-            <ImageView
-                android:id="@+id/menu"
-                android:onClick="@{menuClickListener}"
-                android:onLongClick="@{menuLongClickListener}"
-                android:contentDescription="@string/content_description_show_chat_room_menu"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="0.2"
-                android:background="?attr/button_background_drawable"
-                android:padding="15dp"
-                android:src="@drawable/icon_menu_more"/>
-
-        </LinearLayout>
-
-        <androidx.fragment.app.FragmentContainerView
-            android:id="@+id/list_edit_top_bar_fragment"
-            android:name="org.linphone.activities.main.fragments.ListTopBarFragment"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/main_activity_top_bar_size"
-            android:layout_alignTop="@id/top_bar"
-            tools:layout="@layout/list_edit_top_bar_fragment" />
-
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/chat_messages_list"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_above="@id/footer"
-            android:layout_below="@+id/top_bar"
-            android:cacheColorHint="@color/transparent_color"
-            android:choiceMode="multipleChoice"
-            android:clipToPadding="false"
-            android:divider="@android:color/transparent"
-            android:listSelector="@color/transparent_color"
-            android:paddingBottom="20dp"
-            android:transcriptMode="normal" />
-
-        <TextView
-            android:id="@+id/remote_composing"
-            style="@style/standard_small_text_font"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_above="@id/footer"
-            android:paddingStart="5dp"
-            android:paddingEnd="5dp"
-            android:background="?attr/backgroundColor"
-            android:text="@{viewModel.composingList, default=@string/chat_remote_is_composing}"
-            android:visibility="@{viewModel.remoteIsComposing ? View.VISIBLE : View.GONE, default=gone}" />
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/top_bar"
-            android:layout_alignParentEnd="true"
-            android:layout_marginTop="8dp"
-            android:layout_marginEnd="8dp"
-            android:adjustViewBounds="true"
-            android:contentDescription="@{viewModel.securityLevelContentDescription}"
-            android:onClick="@{securityIconClickListener}"
-            android:src="@{viewModel.securityLevelIcon, default=@drawable/security_alert_indicator}"
-            android:visibility="@{viewModel.encryptedChatRoom ? View.VISIBLE : View.GONE}" />
-
-        <include
-            android:id="@+id/footer"
-            layout="@layout/chat_room_sending"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_alignParentBottom="true"
-            app:viewModel="@{viewModel}"
-            app:chatSendingViewModel="@{chatSendingViewModel}"
-            app:attachFileClickListener="@{attachFileClickListener}"
-            app:voiceRecordingTouchListener="@{voiceRecordingTouchListener}"
-            app:cancelReplyToClickListener="@{cancelReplyToClickListener}"/>
-
-        <RelativeLayout
-            android:onClick="@{scrollToBottomClickListener}"
-            android:visibility="@{viewModel.isUserScrollingUp &amp;&amp; !chatSendingViewModel.isEmojiPickerOpen ? View.VISIBLE : View.GONE, default=gone}"
-            android:layout_width="50dp"
-            android:layout_height="50dp"
-            android:layout_marginEnd="5dp"
-            android:layout_marginBottom="10dp"
-            android:layout_above="@id/footer"
-            android:layout_alignParentEnd="true">
-
-            <ImageView
-                android:layout_width="40dp"
-                android:layout_height="40dp"
-                android:layout_alignParentStart="true"
-                android:layout_alignParentBottom="true"
-                android:background="@drawable/round_button_background"
-                android:padding="13dp"
-                android:contentDescription="@string/content_descripton_scroll_to_bottom"
-                android:src="@drawable/scroll_to_bottom" />
-
-            <TextView
-                style="@style/unread_count_font"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentTop="true"
-                android:layout_alignParentEnd="true"
-                android:background="@{viewModel.unreadMessagesCount == 0 ? @drawable/hidden_unread_message_count_bg : @drawable/unread_message_count_bg, default=@drawable/unread_message_count_bg}"
-                android:gravity="center"
-                android:text="@{viewModel.unreadMessagesCount == 0 ? `` : String.valueOf(viewModel.unreadMessagesCount), default=1}"
-                android:translationY="@{viewModel.chatUnreadCountTranslateY}" />
-
-        </RelativeLayout>
-
-    </RelativeLayout>
-
-</layout>
diff --git a/app/src/main/res/layout/chat_room_devices_child_cell.xml b/app/src/main/res/layout/chat_room_devices_child_cell.xml
deleted file mode 100644
index 553d55503..000000000
--- a/app/src/main/res/layout/chat_room_devices_child_cell.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <data>
-        <import type="android.view.View"/>
-        <variable
-            name="data"
-            type="org.linphone.activities.main.chat.data.DevicesListChildData" />
-    </data>
-
-    <RelativeLayout
-        android:onClick="@{() -> data.onClick()}"
-        android:layout_width="match_parent"
-        android:layout_height="40dp"
-        android:background="?attr/backgroundColor2"
-        android:gravity="center_vertical">
-
-        <org.linphone.views.MarqueeTextView
-            android:text="@{data.deviceName}"
-            style="@style/contact_name_list_cell_font"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:layout_marginLeft="55dp"
-            android:layout_marginRight="5dp"
-            android:layout_toLeftOf="@id/security_level"
-            android:singleLine="true" />
-
-        <ImageView
-            android:id="@+id/security_level"
-            android:src="@{data.securityLevelIcon, default=@drawable/security_alert_indicator}"
-            android:contentDescription="@{data.securityContentDescription}"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentRight="true"
-            android:layout_centerVertical="true"
-            android:layout_marginRight="10dp" />
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:layout_alignParentBottom="true"
-            android:background="?attr/dividerColor" />
-
-    </RelativeLayout>
-
-</layout>
diff --git a/app/src/main/res/layout/chat_room_devices_fragment.xml b/app/src/main/res/layout/chat_room_devices_fragment.xml
deleted file mode 100644
index ee4a376ca..000000000
--- a/app/src/main/res/layout/chat_room_devices_fragment.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <data>
-        <import type="android.view.View"/>
-        <variable
-            name="viewModel"
-            type="org.linphone.activities.main.chat.viewmodels.DevicesListViewModel" />
-    </data>
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <LinearLayout
-            android:id="@+id/top_bar"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/main_activity_top_bar_size"
-            android:background="?attr/lightToolbarBackgroundColor"
-            android:orientation="horizontal">
-
-            <ImageView
-                android:id="@+id/back"
-                android:contentDescription="@string/content_description_go_back"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="0.2"
-                android:background="?attr/button_background_drawable"
-                android:padding="18dp"
-                android:src="@drawable/back" />
-
-            <TextView
-                style="@style/toolbar_small_title_font"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="0.8"
-                android:gravity="center"
-                android:padding="15dp"
-                android:ellipsize="end"
-                android:singleLine="true"
-                android:text="@string/chat_room_devices_fragment_title" />
-
-        </LinearLayout>
-
-        <androidx.core.widget.NestedScrollView
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_below="@id/top_bar">
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical"
-                app:entries="@{viewModel.participants}"
-                app:layout="@{@layout/chat_room_devices_group_cell}" />
-
-        </androidx.core.widget.NestedScrollView>
-
-    </RelativeLayout>
-
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/chat_room_devices_group_cell.xml b/app/src/main/res/layout/chat_room_devices_group_cell.xml
deleted file mode 100644
index 3934d0b58..000000000
--- a/app/src/main/res/layout/chat_room_devices_group_cell.xml
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools">
-
-    <data>
-        <import type="android.view.View"/>
-        <import type="org.linphone.core.ConsolidatedPresence"/>
-        <variable
-            name="data"
-            type="org.linphone.activities.main.chat.data.DevicesListGroupData" />
-    </data>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical">
-
-        <RelativeLayout
-            android:onClick="@{() -> data.devices.size() == 1 ? data.onClick() : data.toggleExpanded()}"
-            android:layout_width="match_parent"
-            android:layout_height="50dp"
-            android:layout_marginLeft="10dp"
-            android:layout_marginRight="10dp"
-            android:gravity="center_vertical">
-
-            <RelativeLayout
-                android:id="@+id/avatar"
-                android:layout_width="45dp"
-                android:layout_height="wrap_content"
-                android:layout_centerVertical="true">
-
-                <ImageView
-                    android:id="@+id/avatar_icon"
-                    coilContact="@{data}"
-                    android:layout_width="@dimen/contact_avatar_size"
-                    android:layout_height="@dimen/contact_avatar_size"
-                    android:layout_alignParentStart="true"
-                    android:layout_centerHorizontal="true"
-                    android:background="@drawable/generated_avatar_bg"
-                    android:src="@drawable/voip_single_contact_avatar"
-                    android:contentDescription="@null" />
-
-                <ImageView
-                    android:layout_width="@dimen/contact_presence_badge_size"
-                    android:layout_height="@dimen/contact_presence_badge_size"
-                    android:layout_alignBottom="@id/avatar_icon"
-                    android:layout_marginStart="25dp"
-                    android:adjustViewBounds="true"
-                    android:background="@drawable/led_background"
-                    android:padding="@dimen/contact_presence_badge_padding"
-                    app:presenceIcon="@{data.presenceStatus}"
-                    android:visibility="@{data.presenceStatus == ConsolidatedPresence.Offline ? View.GONE : View.VISIBLE, default=gone}"
-                    tools:ignore="ContentDescription" />
-
-                <ImageView
-                    android:layout_width="20dp"
-                    android:layout_height="20dp"
-                    android:layout_alignParentTop="true"
-                    android:layout_alignParentEnd="true"
-                    android:contentDescription="@{data.securityLevelContentDescription}"
-                    android:src="@{data.securityLevelIcon, default=@drawable/security_alert_indicator}" />
-
-            </RelativeLayout>
-
-            <LinearLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerVertical="true"
-                android:layout_marginLeft="10dp"
-                android:layout_marginRight="5dp"
-                android:layout_toLeftOf="@id/right"
-                android:layout_toRightOf="@id/avatar"
-                android:paddingTop="5dp"
-                android:paddingBottom="5dp"
-                android:orientation="vertical">
-
-                <org.linphone.views.MarqueeTextView
-                    android:text="@{data.contact.name ?? data.displayName}"
-                    style="@style/contact_name_list_cell_font"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:singleLine="true" />
-
-                <org.linphone.views.MarqueeTextView
-                    android:text="@{data.sipUri}"
-                    style="@style/sip_uri_small_font"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:singleLine="true"/>
-
-            </LinearLayout>
-
-            <LinearLayout
-                android:id="@+id/right"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentRight="true"
-                android:layout_centerVertical="true"
-                android:gravity="center"
-                android:orientation="horizontal"
-                android:layout_marginRight="10dp">
-
-                <ImageView
-                    android:visibility="@{data.devices.size() == 1 ? View.GONE : View.VISIBLE, default=visible}"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:contentDescription="@string/content_description_toggle_participant_devices_list"
-                    android:src="@{data.isExpanded ? @drawable/chevron_list_open : @drawable/chevron_list_close, default=@drawable/chevron_list_open}"/>
-
-                <ImageView
-                    android:visibility="@{data.devices.size() == 1 ? View.VISIBLE : View.GONE, default=gone}"
-                    android:src="@{data.securityLevelIcon, default=@drawable/security_alert_indicator}"
-                    android:contentDescription="@{data.securityLevelContentDescription}"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content" />
-
-            </LinearLayout>
-
-        </RelativeLayout>
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:background="?attr/dividerColor" />
-
-        <LinearLayout
-            android:visibility="@{data.devices.size() > 1 &amp;&amp; data.isExpanded ? View.VISIBLE : View.GONE, default=gone}"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical"
-            app:entries="@{data.devices}"
-            app:layout="@{@layout/chat_room_devices_child_cell}"/>
-
-    </LinearLayout>
-
-</layout>
diff --git a/app/src/main/res/layout/chat_room_ephemeral_duration_cell.xml b/app/src/main/res/layout/chat_room_ephemeral_duration_cell.xml
deleted file mode 100644
index 0755e9958..000000000
--- a/app/src/main/res/layout/chat_room_ephemeral_duration_cell.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <data>
-        <import type="android.view.View" />
-        <import type="android.graphics.Typeface" />
-        <variable
-            name="data"
-            type="org.linphone.activities.main.chat.data.EphemeralDurationData" />
-    </data>
-
-    <RelativeLayout
-        android:onClick="@{() -> data.setSelected()}"
-        android:layout_width="match_parent"
-        android:layout_height="60dp">
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:text="@{data.textResource}"
-            android:layout_marginLeft="20dp"
-            android:layout_toLeftOf="@id/selected"
-            android:textColor="?attr/primaryTextColor"
-            android:textSize="20sp"
-            android:textStyle="@{data.selected ? Typeface.BOLD : Typeface.NORMAL}" />
-
-        <ImageView
-            android:id="@+id/selected"
-            android:visibility="@{data.selected ? View.VISIBLE : View.GONE}"
-            android:contentDescription="@string/content_description_ephemeral_duration_selected"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentRight="true"
-            android:layout_marginRight="20dp"
-            android:layout_centerVertical="true"
-            android:adjustViewBounds="true"
-            android:src="@drawable/check_selected" />
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:layout_alignParentBottom="true"
-            android:background="?attr/dividerColor" />
-
-    </RelativeLayout>
-
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/chat_room_ephemeral_fragment.xml b/app/src/main/res/layout/chat_room_ephemeral_fragment.xml
deleted file mode 100644
index 23976e98a..000000000
--- a/app/src/main/res/layout/chat_room_ephemeral_fragment.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <data>
-        <import type="android.view.View"/>
-        <variable
-            name="validClickListener"
-            type="android.view.View.OnClickListener"/>
-        <variable
-            name="viewModel"
-            type="org.linphone.activities.main.chat.viewmodels.EphemeralViewModel" />
-    </data>
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <LinearLayout
-            android:id="@+id/top_bar"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/main_activity_top_bar_size"
-            android:background="?attr/lightToolbarBackgroundColor"
-            android:orientation="horizontal">
-
-            <ImageView
-                android:id="@+id/back"
-                android:contentDescription="@string/content_description_go_back"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="0.2"
-                android:background="?attr/button_background_drawable"
-                android:padding="18dp"
-                android:src="@drawable/back" />
-
-            <TextView
-                style="@style/toolbar_small_title_font"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="0.6"
-                android:gravity="center"
-                android:padding="15dp"
-                android:ellipsize="end"
-                android:singleLine="true"
-                android:text="@string/chat_room_ephemeral_fragment_title" />
-
-            <ImageView
-                android:onClick="@{validClickListener}"
-                android:contentDescription="@string/content_description_ephemeral_duration_change"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="0.2"
-                android:background="?attr/button_background_drawable"
-                android:padding="18dp"
-                android:src="@drawable/valid" />
-
-        </LinearLayout>
-
-        <androidx.core.widget.NestedScrollView
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_below="@id/top_bar">
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:gravity="center"
-                android:orientation="vertical">
-
-                <ImageView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:adjustViewBounds="true"
-                    android:layout_marginTop="20dp"
-                    android:layout_marginBottom="20dp"
-                    android:contentDescription="@null"
-                    android:src="@drawable/ephemeral_messages" />
-
-                <TextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:textColor="?attr/primaryTextColor"
-                    android:textSize="20sp"
-                    android:gravity="center"
-                    android:layout_marginBottom="20dp"
-                    android:layout_marginLeft="20dp"
-                    android:layout_marginRight="20dp"
-                    android:text="@string/chat_room_ephemeral_messages_desc"/>
-
-                <View
-                    android:layout_width="match_parent"
-                    android:layout_height="1dp"
-                    android:background="?attr/dividerColor" />
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:orientation="vertical"
-                    app:entries="@{viewModel.durationsList}"
-                    app:layout="@{@layout/chat_room_ephemeral_duration_cell}" />
-
-            </LinearLayout>
-
-        </androidx.core.widget.NestedScrollView>
-
-    </RelativeLayout>
-
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/chat_room_group_info_fragment.xml b/app/src/main/res/layout/chat_room_group_info_fragment.xml
deleted file mode 100644
index 75ab3235d..000000000
--- a/app/src/main/res/layout/chat_room_group_info_fragment.xml
+++ /dev/null
@@ -1,163 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:bind="http://schemas.android.com/tools">
-
-    <data>
-        <import type="android.view.View"/>
-        <variable
-            name="nextClickListener"
-            type="android.view.View.OnClickListener"/>
-        <variable
-            name="participantsClickListener"
-            type="android.view.View.OnClickListener"/>
-        <variable
-            name="leaveClickListener"
-            type="android.view.View.OnClickListener"/>
-        <variable
-            name="viewModel"
-            type="org.linphone.activities.main.chat.viewmodels.GroupInfoViewModel" />
-    </data>
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <LinearLayout
-            android:layout_above="@id/leave_group"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="vertical">
-
-            <LinearLayout
-                android:id="@+id/top_bar"
-                android:layout_width="match_parent"
-                android:layout_height="@dimen/main_activity_top_bar_size"
-                android:background="?attr/lightToolbarBackgroundColor"
-                android:orientation="horizontal">
-
-                <ImageView
-                    android:id="@+id/back"
-                    android:contentDescription="@string/content_description_go_back"
-                    android:layout_width="0dp"
-                    android:layout_height="match_parent"
-                    android:layout_gravity="left"
-                    android:layout_weight="0.2"
-                    android:background="?attr/button_background_drawable"
-                    android:padding="18dp"
-                    android:src="@drawable/back" />
-
-                <TextView
-                    android:text="@string/chat_room_group_info_title"
-                    style="@style/toolbar_small_title_font"
-                    android:layout_width="0dp"
-                    android:layout_height="match_parent"
-                    android:layout_weight="0.4"
-                    android:ellipsize="end"
-                    android:gravity="center"
-                    android:singleLine="true" />
-
-                <ImageView
-                    android:onClick="@{nextClickListener}"
-                    android:enabled="@{viewModel.isMeAdmin &amp;&amp; viewModel.participants.size() > 0 &amp;&amp; viewModel.subject.length() > 0}"
-                    android:visibility="@{viewModel.meAdmin ? View.VISIBLE : View.INVISIBLE}"
-                    android:contentDescription="@string/content_description_create_chat_room"
-                    android:layout_width="0dp"
-                    android:layout_height="match_parent"
-                    android:layout_weight="0.2"
-                    android:background="?attr/button_background_drawable"
-                    android:padding="18dp"
-                    android:src="@drawable/valid" />
-
-            </LinearLayout>
-
-            <RelativeLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_margin="10dp">
-
-                <com.google.android.material.textfield.TextInputLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:paddingRight="5dp"
-                    android:hint="@string/chat_room_group_info_subject_hint">
-
-                    <com.google.android.material.textfield.TextInputEditText
-                        android:text="@={viewModel.subject}"
-                        android:enabled="@{viewModel.meAdmin}"
-                        android:imeOptions="actionDone"
-                        android:singleLine="true"
-                        android:inputType="textEmailSubject"
-                        android:background="@color/transparent_color"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"/>
-
-                </com.google.android.material.textfield.TextInputLayout>
-
-            </RelativeLayout>
-
-            <RelativeLayout
-                android:onClick="@{participantsClickListener}"
-                android:enabled="@{viewModel.meAdmin}"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="?attr/lightToolbarBackgroundColor"
-                android:paddingTop="8dp"
-                android:paddingBottom="8dp">
-
-                <TextView
-                    android:text="@string/chat_room_group_info_participants"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:gravity="center"
-                    android:textColor="?attr/primaryTextColor"
-                    android:textSize="15sp"
-                    android:textStyle="bold" />
-
-                <ImageView
-                    android:visibility="@{viewModel.meAdmin ? View.VISIBLE : View.GONE}"
-                    android:contentDescription="@string/content_description_add_participants"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_alignParentRight="true"
-                    android:layout_centerVertical="true"
-                    android:paddingRight="10dp"
-                    android:src="@drawable/chat_group_add" />
-
-            </RelativeLayout>
-
-            <androidx.recyclerview.widget.RecyclerView
-                android:id="@+id/participants"
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:layout_weight="1"
-                android:divider="?attr/dividerColor"
-                android:dividerHeight="1dp" />
-
-        </LinearLayout>
-
-        <TextView
-            android:id="@+id/leave_group"
-            android:visibility="@{viewModel.canLeaveGroup ? View.VISIBLE : View.GONE}"
-            android:onClick="@{leaveClickListener}"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentBottom="true"
-            android:layout_centerHorizontal="true"
-            android:paddingLeft="20dp"
-            android:paddingTop="8dp"
-            android:paddingRight="20dp"
-            android:paddingBottom="8dp"
-            android:layout_marginTop="10dp"
-            android:layout_marginBottom="10dp"
-            android:layout_gravity="center"
-            android:background="@drawable/shape_rect_orange_button"
-            android:text="@string/chat_room_group_info_leave"
-            style="@style/big_orange_button_font"/>
-
-        <include
-            layout="@layout/wait_layout"
-            bind:visibility="@{viewModel.waitForChatRoomCreation}" />
-
-    </RelativeLayout>
-
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/chat_room_group_info_participant_cell.xml b/app/src/main/res/layout/chat_room_group_info_participant_cell.xml
deleted file mode 100644
index 8a25056a3..000000000
--- a/app/src/main/res/layout/chat_room_group_info_participant_cell.xml
+++ /dev/null
@@ -1,161 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools">
-
-    <data>
-        <import type="android.view.View"/>
-        <import type="org.linphone.core.ChatRoom.SecurityLevel"/>
-        <import type="org.linphone.core.ConsolidatedPresence"/>
-        <variable
-            name="removeClickListener"
-            type="android.view.View.OnClickListener"/>
-        <variable
-            name="data"
-            type="org.linphone.activities.main.chat.data.GroupInfoParticipantData" />
-        <variable
-            name="isEncrypted"
-            type="Boolean" />
-    </data>
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="40dp"
-        android:layout_margin="5dp">
-
-        <RelativeLayout
-            android:id="@+id/avatar"
-            android:layout_width="45dp"
-            android:layout_height="wrap_content"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent">
-
-            <ImageView
-                android:id="@+id/avatar_icon"
-                coilContact="@{data}"
-                android:layout_width="@dimen/contact_avatar_size"
-                android:layout_height="@dimen/contact_avatar_size"
-                android:layout_alignParentStart="true"
-                android:layout_centerHorizontal="true"
-                android:background="@drawable/generated_avatar_bg"
-                android:contentDescription="@null"
-                android:src="@drawable/voip_single_contact_avatar" />
-
-            <ImageView
-                android:layout_width="@dimen/contact_presence_badge_size"
-                android:layout_height="@dimen/contact_presence_badge_size"
-                android:layout_alignBottom="@id/avatar_icon"
-                android:layout_marginStart="25dp"
-                android:adjustViewBounds="true"
-                android:background="@drawable/led_background"
-                android:padding="@dimen/contact_presence_badge_padding"
-                android:visibility="@{data.presenceStatus == ConsolidatedPresence.Offline ? View.GONE : View.VISIBLE, default=gone}"
-                app:presenceIcon="@{data.presenceStatus}"
-                tools:ignore="ContentDescription" />
-
-            <ImageView
-                android:layout_width="20dp"
-                android:layout_height="20dp"
-                android:layout_alignParentTop="true"
-                android:layout_alignParentEnd="true"
-                android:contentDescription="@string/content_description_contact_can_do_encryption"
-                android:src="@drawable/security_toggle_icon_green"
-                android:visibility="@{isEncrypted &amp;&amp; data.securityLevel == SecurityLevel.ClearText ? View.VISIBLE : View.GONE, default=gone}" />
-
-            <ImageView
-                android:layout_width="20dp"
-                android:layout_height="20dp"
-                android:layout_alignParentTop="true"
-                android:layout_alignParentEnd="true"
-                android:contentDescription="@{data.securityLevelContentDescription}"
-                android:src="@{data.securityLevelIcon, default=@drawable/security_alert_indicator}"
-                android:visibility="@{isEncrypted &amp;&amp; data.securityLevel != SecurityLevel.ClearText ? View.VISIBLE : View.GONE, default=gone}" />
-
-        </RelativeLayout>
-
-        <ImageView
-            android:id="@+id/delete"
-            android:layout_width="wrap_content"
-            android:layout_height="0dp"
-            android:contentDescription="@string/content_description_remove_contact_from_chat_room"
-            android:onClick="@{removeClickListener}"
-            android:paddingLeft="5dp"
-            android:paddingRight="5dp"
-            android:src="@drawable/chat_group_delete"
-            android:visibility="@{data.showAdminControls ? View.VISIBLE : View.GONE, default=gone}"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <TextView
-            android:id="@+id/isAdmin"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:contentDescription="@string/content_description_contact_is_admin"
-            android:enabled="@{data.showAdminControls &amp;&amp; data.canBeSetAdmin}"
-            android:onClick="@{() -> data.unSetAdmin()}"
-            android:text="@string/chat_room_group_info_admin"
-            android:textColor="?attr/primaryTextColor"
-            android:textStyle="bold"
-            android:padding="10dp"
-            android:visibility="@{data.admin ? View.VISIBLE : View.GONE, default=gone}"
-            android:drawablePadding="5dp"
-            app:drawableStartCompat="@drawable/check_selected"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toStartOf="@id/delete"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <TextView
-            android:id="@+id/isNotAdmin"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:contentDescription="@string/content_description_contact_is_not_admin"
-            android:enabled="@{data.showAdminControls &amp;&amp; data.canBeSetAdmin}"
-            android:onClick="@{() -> data.setAdmin()}"
-            android:text="@string/chat_room_group_info_admin"
-            android:textColor="?attr/primarySubtextLightColor"
-            android:padding="10dp"
-            android:visibility="@{data.admin ? View.GONE : (data.showAdminControls &amp;&amp; data.canBeSetAdmin ? View.VISIBLE : View.GONE), default=gone}"
-            app:drawableStartCompat="@drawable/check_unselected"
-            android:drawablePadding="5dp"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toStartOf="@id/isAdmin"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <androidx.constraintlayout.widget.Barrier
-            android:id="@+id/admin_barrier"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            app:barrierDirection="left"
-            app:constraint_referenced_ids="isAdmin, isNotAdmin" />
-
-        <org.linphone.views.MarqueeTextView
-            android:id="@+id/display_name"
-            style="@style/contact_name_list_cell_font"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:singleLine="true"
-            android:layout_marginStart="5dp"
-            android:text="@{data.contact.name ?? data.displayName, default=`John Doe`}"
-            app:layout_constraintBottom_toTopOf="@+id/sipUri"
-            app:layout_constraintEnd_toStartOf="@id/admin_barrier"
-            app:layout_constraintStart_toEndOf="@id/avatar"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <org.linphone.views.MarqueeTextView
-            android:id="@+id/sipUri"
-            style="@style/sip_uri_small_font"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:singleLine="true"
-            android:layout_marginStart="5dp"
-            android:text="@{data.sipUri, default=`sip:john@sip.example.org`}"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toStartOf="@id/admin_barrier"
-            app:layout_constraintStart_toEndOf="@id/avatar"
-            app:layout_constraintTop_toBottomOf="@+id/display_name" />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-</layout>
diff --git a/app/src/main/res/layout/chat_room_imdn_fragment.xml b/app/src/main/res/layout/chat_room_imdn_fragment.xml
deleted file mode 100644
index d8bf44461..000000000
--- a/app/src/main/res/layout/chat_room_imdn_fragment.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <data>
-        <import type="android.view.View"/>
-        <variable
-            name="viewModel"
-            type="org.linphone.activities.main.chat.viewmodels.ImdnViewModel" />
-    </data>
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <LinearLayout
-            android:id="@+id/top_bar"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/main_activity_top_bar_size"
-            android:background="?attr/lightToolbarBackgroundColor"
-            android:orientation="horizontal"
-            app:layout_constraintTop_toTopOf="parent">
-
-            <ImageView
-                android:id="@+id/back"
-                android:contentDescription="@string/content_description_go_back"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="0.2"
-                android:background="?attr/button_background_drawable"
-                android:padding="18dp"
-                android:src="@drawable/back" />
-
-            <TextView
-                style="@style/toolbar_small_title_font"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="0.6"
-                android:gravity="center"
-                android:padding="15dp"
-                android:text="@string/chat_message_imdn_info" />
-
-            <View
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="0.2" />
-
-        </LinearLayout>
-
-        <include
-            android:id="@+id/message"
-            layout="@layout/chat_message_list_cell"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            app:data="@{viewModel.chatMessageViewModel}"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/top_bar"
-            app:layout_constraintHeight_max="200dp"/>
-
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/participantsList"
-            android:layout_marginTop="5dp"
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            app:layout_constraintTop_toBottomOf="@id/message"
-            app:layout_constraintBottom_toBottomOf="parent"/>
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/chat_room_imdn_participant_cell.xml b/app/src/main/res/layout/chat_room_imdn_participant_cell.xml
deleted file mode 100644
index 2a69b1b88..000000000
--- a/app/src/main/res/layout/chat_room_imdn_participant_cell.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools">
-
-    <data>
-        <import type="android.view.View"/>
-        <import type="org.linphone.core.ConsolidatedPresence"/>
-        <variable
-            name="data"
-            type="org.linphone.activities.main.chat.data.ImdnParticipantData" />
-    </data>
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:padding="5dp"
-        android:gravity="center_vertical">
-
-        <ImageView
-            android:id="@+id/avatar"
-            android:layout_width="@dimen/contact_avatar_size"
-            android:layout_height="@dimen/contact_avatar_size"
-            android:layout_centerVertical="true"
-            android:layout_marginRight="10dp"
-            coilContact="@{data}"
-            android:background="@drawable/generated_avatar_bg"
-            android:src="@drawable/voip_single_contact_avatar"
-            android:contentDescription="@null"/>
-
-        <ImageView
-            android:layout_width="@dimen/contact_presence_badge_size"
-            android:layout_height="@dimen/contact_presence_badge_size"
-            android:layout_alignBottom="@id/avatar"
-            android:layout_marginBottom="-3dp"
-            android:layout_marginStart="25dp"
-            android:adjustViewBounds="true"
-            android:background="@drawable/led_background"
-            android:padding="@dimen/contact_presence_badge_padding"
-            app:presenceIcon="@{data.presenceStatus}"
-            android:visibility="@{data.presenceStatus == ConsolidatedPresence.Offline ? View.GONE : View.VISIBLE, default=gone}"
-            tools:ignore="ContentDescription" />
-
-        <TextView
-            android:id="@+id/time"
-            android:text="@{data.time}"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentRight="true"
-            android:layout_centerVertical="true"
-            android:layout_marginRight="10dp" />
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:layout_marginLeft="10dp"
-            android:layout_marginRight="5dp"
-            android:layout_toLeftOf="@id/time"
-            android:layout_toRightOf="@id/avatar"
-            android:orientation="vertical">
-
-            <org.linphone.views.MarqueeTextView
-                style="@style/contact_name_list_cell_font"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:singleLine="true"
-                android:text="@{data.contact.name ?? data.displayName}" />
-
-            <org.linphone.views.MarqueeTextView
-                style="@style/sip_uri_small_font"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:singleLine="true"
-                android:text="@{data.sipUri}" />
-
-        </LinearLayout>
-
-    </RelativeLayout>
-
-</layout>
diff --git a/app/src/main/res/layout/chat_room_list_cell.xml b/app/src/main/res/layout/chat_room_list_cell.xml
deleted file mode 100644
index d65cd2572..000000000
--- a/app/src/main/res/layout/chat_room_list_cell.xml
+++ /dev/null
@@ -1,220 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:tools="http://schemas.android.com/tools"
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <data>
-        <import type="android.view.View" />
-        <import type="org.linphone.core.ConsolidatedPresence"/>
-        <variable
-            name="clickListener"
-            type="android.view.View.OnClickListener" />
-        <variable
-            name="longClickListener"
-            type="android.view.View.OnLongClickListener" />
-        <variable
-            name="position"
-            type="Integer" />
-        <variable
-            name="forwardPending"
-            type="Boolean" />
-        <variable
-            name="data"
-            type="org.linphone.activities.main.chat.data.ChatRoomData" />
-        <variable
-            name="selectionListViewModel"
-            type="org.linphone.activities.main.viewmodels.ListTopBarViewModel" />
-    </data>
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="80dp"
-        android:background="?attr/backgroundColor"
-        android:gravity="center_vertical"
-        android:onClick="@{clickListener}"
-        android:onLongClick="@{longClickListener}"
-        android:orientation="horizontal"
-        android:paddingLeft="5dp"
-        android:paddingTop="5dp"
-        android:paddingRight="5dp">
-
-        <ImageView
-            android:id="@+id/avatar"
-            coilContact="@{data}"
-            android:layout_width="@dimen/contact_avatar_size"
-            android:layout_height="@dimen/contact_avatar_size"
-            android:layout_marginStart="5dp"
-            android:contentDescription="@null"
-            android:background="@drawable/generated_avatar_bg"
-            android:src="@drawable/voip_single_contact_avatar"
-            app:layout_constraintBottom_toTopOf="@id/date"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintVertical_chainStyle="packed" />
-
-        <ImageView
-            android:layout_width="@dimen/contact_presence_badge_size"
-            android:layout_height="@dimen/contact_presence_badge_size"
-            android:layout_marginStart="25dp"
-            android:adjustViewBounds="true"
-            android:background="@drawable/led_background"
-            android:padding="@dimen/contact_presence_badge_padding"
-            app:presenceIcon="@{data.presenceStatus}"
-            android:visibility="@{data.presenceStatus == ConsolidatedPresence.Offline ? View.GONE : View.VISIBLE, default=gone}"
-            app:layout_constraintStart_toStartOf="@id/avatar"
-            app:layout_constraintBottom_toBottomOf="@id/avatar"
-            tools:ignore="ContentDescription"/>
-
-        <ImageView
-            android:id="@+id/securityLevel"
-            android:layout_width="20dp"
-            android:layout_height="20dp"
-            android:layout_marginStart="25dp"
-            android:contentDescription="@{data.securityLevelContentDescription}"
-            android:src="@{data.securityLevelIcon, default=@drawable/security_alert_indicator}"
-            android:visibility="@{data.encryptedChatRoom ? View.VISIBLE : View.INVISIBLE, default=invisible}"
-            app:layout_constraintStart_toStartOf="@id/avatar"
-            app:layout_constraintTop_toTopOf="@id/avatar" />
-
-        <TextView
-            android:id="@+id/date"
-            style="@style/chat_room_last_updated_time_font"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="5dp"
-            android:paddingRight="10dp"
-            android:maxLines="1"
-            android:text="@{data.lastUpdate, default=`10:11 PM`}"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="@id/avatar"
-            app:layout_constraintEnd_toEndOf="@id/securityLevel"
-            app:layout_constraintTop_toBottomOf="@id/avatar"
-            tools:ignore="RtlHardcoded,RtlSymmetry" />
-
-        <TextView
-            android:id="@+id/title"
-            style="@style/contact_name_list_cell_font"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="10dp"
-            android:layout_marginEnd="5dp"
-            android:singleLine="true"
-            android:ellipsize="end"
-            android:text="@{data.oneToOneChatRoom ? (data.contact.name ?? data.displayName) : data.subject, default=`Lorem Ipsum`}"
-            app:layout_constraintStart_toEndOf="@id/date"
-            app:layout_constraintEnd_toStartOf="@id/unread"
-            app:layout_constraintTop_toTopOf="@id/avatar" />
-
-        <ImageView
-            android:id="@+id/imdn"
-            android:layout_width="15dp"
-            android:layout_height="wrap_content"
-            android:paddingEnd="3dp"
-            android:contentDescription="@string/content_description_delivery_status"
-            android:src="@{data.lastMessageImdnIcon, default=@drawable/chat_delivered}"
-            android:visibility="@{data.showLastMessageImdnIcon ? View.VISIBLE : View.GONE}"
-            app:layout_constraintStart_toStartOf="@id/title"
-            app:layout_constraintTop_toTopOf="@id/lastMessage"/>
-
-        <TextView
-            android:id="@+id/lastMessage"
-            style="@style/standard_small_text_font"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="10dp"
-            android:ellipsize="end"
-            android:maxLines="2"
-            android:text="@{data.lastMessageText, default=`Lorem ipsum dolor sit amet`}"
-            app:layout_constraintStart_toEndOf="@id/imdn"
-            app:layout_constraintEnd_toStartOf="@id/endBarrier"
-            app:layout_constraintTop_toBottomOf="@id/title" />
-
-        <CheckBox
-            android:id="@+id/select"
-            android:layout_width="30dp"
-            android:layout_height="20dp"
-            android:checked="@{selectionListViewModel.selectedItems.contains(position)}"
-            android:onClick="@{() -> selectionListViewModel.onToggleSelect(position)}"
-            android:visibility="@{selectionListViewModel.isEditionEnabled ? View.VISIBLE : View.GONE, default=gone}"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="@id/title" />
-
-        <ImageView
-            android:id="@+id/muted"
-            android:layout_width="wrap_content"
-            android:layout_height="20dp"
-            android:layout_marginEnd="10dp"
-            android:adjustViewBounds="true"
-            android:contentDescription="@string/content_description_muted_chat_room"
-            android:src="@drawable/chat_room_menu_mute_notifications"
-            android:visibility="@{data.notificationsMuted ? View.VISIBLE : View.GONE, default=gone}"
-            app:layout_constraintEnd_toStartOf="@id/endBarrier3"
-            app:layout_constraintTop_toTopOf="@id/title" />
-
-        <TextView
-            android:id="@+id/unread"
-            style="@style/unread_count_font"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="10dp"
-            android:background="@drawable/unread_message_count_bg"
-            android:ellipsize="end"
-            android:gravity="center"
-            android:singleLine="true"
-            android:text="@{String.valueOf(data.unreadMessagesCount)}"
-            android:visibility="@{data.unreadMessagesCount == 0 ? View.GONE : View.VISIBLE, default=gone}"
-            app:layout_constraintEnd_toStartOf="@id/endBarrier2"
-            app:layout_constraintTop_toTopOf="@id/title" />
-
-        <ImageView
-            android:id="@+id/ephemeral"
-            android:layout_width="wrap_content"
-            android:layout_height="20dp"
-            android:layout_marginEnd="10dp"
-            android:layout_marginBottom="5dp"
-            android:adjustViewBounds="true"
-            android:contentDescription="@string/content_description_ephemeral_chat_room"
-            android:src="@drawable/ephemeral_messages"
-            android:visibility="@{data.ephemeralEnabled ? View.VISIBLE : View.GONE, default=gone}"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toStartOf="@id/forward" />
-
-        <ImageView
-            android:id="@+id/forward"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
-            android:layout_marginEnd="5dp"
-            android:background="@drawable/background_round_secondary_color"
-            android:contentDescription="@string/content_description_forward_message"
-            android:padding="10dp"
-            android:src="@drawable/forward_message_default"
-            android:visibility="@{forwardPending ? View.VISIBLE : View.GONE, default=gone}"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <androidx.constraintlayout.widget.Barrier
-            android:id="@+id/endBarrier"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            app:barrierDirection="left"
-            app:constraint_referenced_ids="ephemeral, muted, forward"
-            app:layout_constraintStart_toEndOf="@id/lastMessage"/>
-
-        <androidx.constraintlayout.widget.Barrier
-            android:id="@+id/endBarrier3"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            app:barrierDirection="left"
-            app:constraint_referenced_ids="select, forward"/>
-
-        <androidx.constraintlayout.widget.Barrier
-            android:id="@+id/endBarrier2"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            app:barrierDirection="left"
-            app:constraint_referenced_ids="muted, forward"/>
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/chat_room_master_fragment.xml b/app/src/main/res/layout/chat_room_master_fragment.xml
deleted file mode 100644
index 7865fab1f..000000000
--- a/app/src/main/res/layout/chat_room_master_fragment.xml
+++ /dev/null
@@ -1,166 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <data>
-        <import type="android.view.View" />
-        <variable
-            name="newOneToOneChatRoomClickListener"
-            type="android.view.View.OnClickListener"/>
-        <variable
-            name="newGroupChatRoomClickListener"
-            type="android.view.View.OnClickListener"/>
-        <variable
-            name="editClickListener"
-            type="android.view.View.OnClickListener"/>
-        <variable
-            name="cancelForwardClickListener"
-            type="android.view.View.OnClickListener" />
-        <variable
-            name="cancelSharingClickListener"
-            type="android.view.View.OnClickListener" />
-        <variable
-            name="viewModel"
-            type="org.linphone.activities.main.chat.viewmodels.ChatRoomsListViewModel" />
-    </data>
-
-    <androidx.slidingpanelayout.widget.SlidingPaneLayout
-        android:id="@+id/sliding_pane"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        tools:context=".MainActivity">
-
-    <RelativeLayout
-        android:layout_width="@dimen/master_fragment_width"
-        android:layout_height="match_parent"
-        android:layout_gravity="start"
-        android:background="?attr/backgroundColor">
-
-        <LinearLayout
-            android:id="@+id/top_bar"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="?attr/lightToolbarBackgroundColor"
-            android:orientation="vertical">
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="@dimen/main_activity_top_bar_size"
-                android:orientation="horizontal">
-
-                <ImageView
-                    android:onClick="@{cancelForwardClickListener}"
-                    android:visibility="@{viewModel.forwardPending ? View.VISIBLE : View.GONE}"
-                    android:contentDescription="@string/content_description_cancel_forward"
-                    android:layout_width="0dp"
-                    android:layout_height="match_parent"
-                    android:layout_weight="0.2"
-                    android:background="?attr/button_background_drawable"
-                    android:padding="10dp"
-                    android:src="@drawable/cancel" />
-
-                <ImageView
-                    android:onClick="@{cancelSharingClickListener}"
-                    android:visibility="@{viewModel.fileSharingPending || viewModel.textSharingPending ? View.VISIBLE : View.GONE}"
-                    android:contentDescription="@string/content_description_cancel_sharing"
-                    android:layout_width="0dp"
-                    android:layout_height="match_parent"
-                    android:layout_weight="0.2"
-                    android:background="?attr/button_background_drawable"
-                    android:padding="10dp"
-                    android:src="@drawable/cancel" />
-
-                <ImageView
-                    android:onClick="@{newOneToOneChatRoomClickListener}"
-                    android:contentDescription="@string/content_description_create_one_to_one_chat_room"
-                    android:layout_width="0dp"
-                    android:layout_height="match_parent"
-                    android:layout_weight="0.2"
-                    android:background="?attr/button_background_drawable"
-                    android:padding="15dp"
-                    android:src="@drawable/chat_new" />
-
-                <ImageView
-                    android:visibility="@{viewModel.groupChatAvailable ? View.VISIBLE : View.GONE}"
-                    android:onClick="@{newGroupChatRoomClickListener}"
-                    android:contentDescription="@string/content_description_create_group_chat_room"
-                    android:layout_width="0dp"
-                    android:layout_height="match_parent"
-                    android:layout_weight="0.2"
-                    android:background="?attr/button_background_drawable"
-                    android:padding="10dp"
-                    android:src="@drawable/chat_group_new" />
-
-                <View
-                    android:layout_width="0dp"
-                    android:layout_height="match_parent"
-                    android:layout_weight="0.4" />
-
-                <ImageView
-                    android:onClick="@{editClickListener}"
-                    android:enabled="@{!viewModel.chatRooms.empty}"
-                    android:visibility="@{viewModel.forwardPending || viewModel.fileSharingPending || viewModel.textSharingPending ? View.GONE : View.VISIBLE}"
-                    android:contentDescription="@string/content_description_enter_edition_mode"
-                    android:layout_width="0dp"
-                    android:layout_height="match_parent"
-                    android:layout_weight="0.2"
-                    android:background="?attr/button_background_drawable"
-                    android:padding="15dp"
-                    android:src="@drawable/delete" />
-
-            </LinearLayout>
-
-            <TextView
-                android:visibility="@{viewModel.fileSharingPending || viewModel.textSharingPending || viewModel.forwardPending ? View.VISIBLE : View.GONE, default=gone}"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="?attr/backgroundContrastColor"
-                android:textColor="?attr/secondaryTextColor"
-                android:padding="10dp"
-                android:text="@{viewModel.fileSharingPending ? @string/chat_room_choose_conversation_for_file_sharing : (viewModel.textSharingPending ? @string/chat_room_choose_conversation_for_text_sharing : @string/chat_room_choose_conversation_for_message_forward)}" />
-
-        </LinearLayout>
-
-        <androidx.fragment.app.FragmentContainerView
-            android:id="@+id/list_edit_top_bar_fragment"
-            android:name="org.linphone.activities.main.fragments.ListTopBarFragment"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/main_activity_top_bar_size"
-            android:layout_alignTop="@id/top_bar"
-            tools:layout="@layout/list_edit_top_bar_fragment" />
-
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/chatList"
-            android:layout_below="@id/top_bar"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent" />
-
-        <TextView
-            style="@style/empty_list_font"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerInParent="true"
-            android:text="@string/no_chat_history"
-            android:visibility="@{viewModel.chatRooms.empty ? View.VISIBLE : View.GONE}" />
-
-        <View
-            android:layout_width="1dp"
-            android:layout_height="match_parent"
-            android:layout_alignParentRight="true"
-            android:background="?attr/dividerColor" />
-
-    </RelativeLayout>
-
-    <androidx.fragment.app.FragmentContainerView
-        android:id="@+id/chat_nav_container"
-        android:name="androidx.navigation.fragment.NavHostFragment"
-        android:layout_width="300dp"
-        android:layout_height="match_parent"
-        android:layout_weight="1"
-        app:defaultNavHost="false"
-        app:navGraph="@navigation/chat_nav_graph"/>
-
-    </androidx.slidingpanelayout.widget.SlidingPaneLayout>
-
-</layout>
diff --git a/app/src/main/res/layout/chat_room_menu.xml b/app/src/main/res/layout/chat_room_menu.xml
deleted file mode 100644
index b163d5dac..000000000
--- a/app/src/main/res/layout/chat_room_menu.xml
+++ /dev/null
@@ -1,169 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <data>
-        <import type="android.view.View" />
-        <variable
-            name="groupInfoListener"
-            type="View.OnClickListener" />
-        <variable
-            name="devicesListener"
-            type="View.OnClickListener" />
-        <variable
-            name="ephemeralListener"
-            type="View.OnClickListener" />
-        <variable
-            name="meetingListener"
-            type="View.OnClickListener" />
-        <variable
-            name="editionModeListener"
-            type="View.OnClickListener" />
-        <variable
-            name="muteListener"
-            type="View.OnClickListener" />
-        <variable
-            name="unmuteListener"
-            type="View.OnClickListener" />
-        <variable
-            name="groupInfoHidden"
-            type="Boolean" />
-        <variable
-            name="devicesHidden"
-            type="Boolean" />
-        <variable
-            name="ephemeralHidden"
-            type="Boolean" />
-        <variable
-            name="meetingHidden"
-            type="Boolean" />
-        <variable
-            name="muteHidden"
-            type="Boolean" />
-        <variable
-            name="unmuteHidden"
-            type="Boolean" />
-        <variable
-            name="addToContactsListener"
-            type="View.OnClickListener" />
-        <variable
-            name="addToContactsHidden"
-            type="Boolean" />
-        <variable
-            name="goToContactListener"
-            type="View.OnClickListener" />
-        <variable
-            name="goToContactHidden"
-            type="Boolean" />
-        <variable
-            name="devicesEnabled"
-            type="Boolean" />
-        <variable
-            name="ephemeralEnabled"
-            type="Boolean" />
-        <variable
-            name="meetingEnabled"
-            type="Boolean" />
-    </data>
-
-    <LinearLayout
-        android:layout_width="@dimen/chat_message_popup_width"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:background="?attr/backgroundColor">
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/chat_room_popup_item_height"
-            android:visibility="@{addToContactsHidden ? View.GONE : View.VISIBLE}"
-            android:background="@drawable/menu_background"
-            android:onClick="@{addToContactsListener}"
-            style="@style/popup_item_font"
-            android:text="@string/chat_message_context_menu_add_to_contacts"
-            app:drawableRightCompat="@drawable/chat_room_menu_add_contact" />
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/chat_room_popup_item_height"
-            android:visibility="@{goToContactHidden ? View.GONE : View.VISIBLE}"
-            android:background="@drawable/menu_background"
-            android:onClick="@{goToContactListener}"
-            style="@style/popup_item_font"
-            android:text="@string/chat_room_context_menu_go_to_contact"
-            app:drawableRightCompat="@drawable/chat_room_menu_view_contact" />
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/chat_room_popup_item_height"
-            android:visibility="@{groupInfoHidden ? View.GONE : View.VISIBLE}"
-            android:background="@drawable/menu_background"
-            android:onClick="@{groupInfoListener}"
-            style="@style/popup_item_font"
-            android:text="@string/chat_room_context_menu_group_info"
-            app:drawableRightCompat="@drawable/chat_room_menu_group_info" />
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/chat_room_popup_item_height"
-            android:visibility="@{devicesHidden ? View.GONE : View.VISIBLE}"
-            android:background="@drawable/menu_background"
-            android:onClick="@{devicesListener}"
-            android:enabled="@{devicesEnabled}"
-            style="@style/popup_item_font"
-            android:text="@string/chat_room_context_menu_participants_devices"
-            app:drawableRightCompat="@drawable/chat_room_menu_devices" />
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/chat_room_popup_item_height"
-            android:visibility="@{ephemeralHidden ? View.GONE : View.VISIBLE}"
-            android:background="@drawable/menu_background"
-            android:onClick="@{ephemeralListener}"
-            android:enabled="@{ephemeralEnabled}"
-            style="@style/popup_item_font"
-            android:text="@string/chat_message_context_menu_ephemeral_messages"
-            app:drawableRightCompat="@drawable/chat_room_menu_ephemeral" />
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/chat_room_popup_item_height"
-            android:visibility="@{meetingHidden ? View.GONE : View.VISIBLE}"
-            android:background="@drawable/menu_background"
-            android:onClick="@{meetingListener}"
-            android:enabled="@{meetingEnabled}"
-            style="@style/popup_item_font"
-            android:text="@string/conference_schedule_title"
-            app:drawableRightCompat="@drawable/chat_room_menu_meeting" />
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/chat_room_popup_item_height"
-            android:background="@drawable/menu_background"
-            android:visibility="@{muteHidden ? View.GONE : View.VISIBLE}"
-            android:onClick="@{muteListener}"
-            style="@style/popup_item_font"
-            android:text="@string/chat_message_context_menu_turn_off_notifications"
-            app:drawableRightCompat="@drawable/chat_room_menu_mute_notifications" />
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/chat_room_popup_item_height"
-            android:background="@drawable/menu_background"
-            android:visibility="@{unmuteHidden ? View.GONE : View.VISIBLE}"
-            android:onClick="@{unmuteListener}"
-            style="@style/popup_item_font"
-            android:text="@string/chat_message_context_menu_turn_on_notifications"
-            app:drawableRightCompat="@drawable/chat_room_menu_unmute_notifications" />
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/chat_room_popup_item_height"
-            android:background="@drawable/menu_background"
-            android:onClick="@{editionModeListener}"
-            style="@style/popup_item_font"
-            android:text="@string/chat_message_context_menu_delete_messages"
-            app:drawableRightCompat="@drawable/chat_room_menu_delete" />
-
-    </LinearLayout>
-
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/chat_room_sending.xml b/app/src/main/res/layout/chat_room_sending.xml
deleted file mode 100644
index 34806707f..000000000
--- a/app/src/main/res/layout/chat_room_sending.xml
+++ /dev/null
@@ -1,271 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <data>
-        <import type="android.view.View"/>
-        <variable
-            name="attachFileClickListener"
-            type="android.view.View.OnClickListener"/>
-        <variable
-            name="voiceRecordingTouchListener"
-            type="android.view.View.OnTouchListener" />
-        <variable
-            name="cancelReplyToClickListener"
-            type="android.view.View.OnClickListener" />
-        <variable
-            name="viewModel"
-            type="org.linphone.activities.main.chat.viewmodels.ChatRoomViewModel" />
-        <variable
-            name="chatSendingViewModel"
-            type="org.linphone.activities.main.chat.viewmodels.ChatMessageSendingViewModel" />
-    </data>
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="?attr/lightToolbarBackgroundColor">
-
-        <androidx.constraintlayout.widget.Group
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:visibility="@{chatSendingViewModel.isReadOnly ? View.GONE : View.VISIBLE}"
-            app:constraint_referenced_ids="attached_files, attach_file, voice_record, message, send_message" />
-
-        <ViewStub
-            android:id="@+id/stubbed_message_to_reply_to"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:inflatedId="@+id/chat_message_reply"
-            android:layout="@layout/chat_message_reply"
-            android:visibility="@{chatSendingViewModel.isPendingAnswer ? View.VISIBLE : View.GONE, default=gone}"
-            app:cancelClickListener="@{cancelReplyToClickListener}"
-            app:data="@{chatSendingViewModel.pendingChatMessageToReplyTo}"
-            app:inflatedVisibility="@{chatSendingViewModel.isPendingAnswer ? View.VISIBLE : View.GONE}"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <androidx.constraintlayout.widget.Barrier
-            android:id="@+id/reply_barrier"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            app:barrierDirection="bottom"
-            app:constraint_referenced_ids="stubbed_message_to_reply_to, chat_message_reply" />
-
-        <ViewStub
-            android:id="@+id/stubbed_voice_recording"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:inflatedId="@+id/voice_recording"
-            android:layout="@layout/chat_message_voice_recording"
-            android:visibility="@{chatSendingViewModel.isPendingVoiceRecord ? View.VISIBLE : View.GONE, default=gone}"
-            app:inflatedVisibility="@{chatSendingViewModel.isPendingVoiceRecord ? View.VISIBLE : View.GONE}"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/reply_barrier"
-            app:viewModel="@{chatSendingViewModel}" />
-
-        <androidx.constraintlayout.widget.Barrier
-            android:id="@+id/voice_barrier"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            app:barrierDirection="bottom"
-            app:constraint_referenced_ids="stubbed_voice_recording, voice_recording" />
-
-        <View
-            android:id="@+id/voice_recording_separator"
-            android:layout_width="0dp"
-            android:layout_height="1dp"
-            android:background="?attr/dividerColor"
-            android:visibility="@{chatSendingViewModel.isPendingVoiceRecord &amp;&amp; chatSendingViewModel.attachments.size() > 0 ? View.VISIBLE : View.GONE, default=gone}"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/voice_barrier" />
-
-        <androidx.constraintlayout.widget.Barrier
-            android:id="@+id/chat_message_reply_voice_barrier"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            app:barrierDirection="bottom"
-            app:constraint_referenced_ids="stubbed_message_to_reply_to, stubbed_voice_recording, voice_recording_separator" />
-
-        <HorizontalScrollView
-            android:id="@+id/attached_files"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:background="?attr/backgroundColor2"
-            android:orientation="horizontal"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/voice_recording_separator">
-
-            <LinearLayout
-                android:layout_width="wrap_content"
-                android:layout_height="120dp"
-                android:orientation="horizontal"
-                android:visibility="@{chatSendingViewModel.attachingFileInProgress || (chatSendingViewModel.attachments.size() > 0) ? View.VISIBLE : View.GONE, default=gone}"
-                app:entries="@{chatSendingViewModel.attachments}"
-                app:layout="@{@layout/chat_message_attachment_cell}" />
-
-        </HorizontalScrollView>
-
-        <androidx.emoji2.emojipicker.EmojiPickerView
-            android:id="@+id/emoji_picker"
-            android:layout_width="0dp"
-            android:layout_height="@dimen/chat_room_emoji_picker_height"
-            android:visibility="@{chatSendingViewModel.isEmojiPickerOpen ? View.VISIBLE : View.GONE, default=gone}"
-            app:emojiPickedListener="@{(emoji) -> message.getText().insert(message.getSelectionStart(), emoji.emoji)}"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/attached_files" />
-
-        <ImageView
-            android:id="@+id/attach_file"
-            android:layout_width="@dimen/chat_message_sending_icons_size"
-            android:layout_height="0dp"
-            android:layout_marginStart="@dimen/chat_message_sending_icons_margin"
-            android:contentDescription="@string/content_description_attach_file"
-            android:enabled="@{chatSendingViewModel.attachFileEnabled &amp;&amp; !chatSendingViewModel.attachFilePending &amp;&amp; chatSendingViewModel.isFileTransferAvailable}"
-            android:onClick="@{attachFileClickListener}"
-            android:paddingTop="@dimen/chat_message_sending_icons_margin"
-            android:paddingBottom="@dimen/chat_message_sending_icons_margin"
-            android:src="@drawable/chat_file"
-            app:layout_constraintHeight_max="@dimen/chat_message_sending_icons_size"
-            app:layout_constraintBottom_toBottomOf="@id/message"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="@id/message" />
-
-        <ImageView
-            android:id="@+id/voice_record"
-            android:layout_width="@dimen/chat_message_sending_icons_size"
-            android:layout_height="0dp"
-            android:layout_marginStart="@dimen/chat_message_sending_icons_margin"
-            android:contentDescription="@string/content_description_voice_recording"
-            android:onClick="@{() -> chatSendingViewModel.toggleVoiceRecording()}"
-            android:onTouch="@{voiceRecordingTouchListener}"
-            android:paddingTop="@dimen/chat_message_sending_icons_margin"
-            android:paddingBottom="@dimen/chat_message_sending_icons_margin"
-            android:selected="@{chatSendingViewModel.isVoiceRecording}"
-            android:enabled="@{chatSendingViewModel.isFileTransferAvailable}"
-            android:src="@drawable/record_audio_message"
-            app:layout_constraintHeight_max="@dimen/chat_message_sending_icons_size"
-            app:layout_constraintBottom_toBottomOf="@id/message"
-            app:layout_constraintStart_toEndOf="@id/attach_file"
-            app:layout_constraintTop_toTopOf="@id/message" />
-
-        <org.linphone.activities.main.chat.views.RichEditText
-            android:id="@+id/message"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/emoji_picker"
-            android:layout_gravity="center_vertical"
-            android:layout_marginStart="@dimen/chat_message_sending_icons_margin"
-            android:layout_marginEnd="@{chatSendingViewModel.isEmojiPickerVisible ? @dimen/margin_0dp : @dimen/chat_message_sending_icons_margin}"
-            android:layout_marginTop="10dp"
-            android:layout_marginBottom="10dp"
-            android:background="@color/header_background_color"
-            android:hint="@{chatSendingViewModel.isPendingAnswer ? @string/chat_room_sending_reply_hint : @string/chat_room_sending_message_hint}"
-            android:imeOptions="@{chatSendingViewModel.imeFlags}"
-            android:inputType="textShortMessage|textMultiLine|textAutoComplete|textAutoCorrect|textCapSentences"
-            android:maxLines="6"
-            android:padding="5dp"
-            android:text="@={chatSendingViewModel.textToSend}"
-            android:textColor="@color/black_color"
-            android:textCursorDrawable="@null"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toStartOf="@id/emoji_picker_toggle"
-            app:layout_constraintStart_toEndOf="@id/voice_record"
-            app:layout_constraintTop_toBottomOf="@id/emoji_picker" />
-
-        <ImageView
-            android:id="@+id/emoji_picker_toggle"
-            android:layout_width="@dimen/chat_message_sending_icons_size"
-            android:layout_height="0dp"
-            android:layout_marginEnd="@dimen/chat_message_sending_icons_margin"
-            android:onClick="@{() -> chatSendingViewModel.toggleEmojiPicker()}"
-            android:paddingTop="@dimen/chat_message_sending_icons_margin"
-            android:paddingBottom="@dimen/chat_message_sending_icons_margin"
-            android:src="@drawable/emoji"
-            android:background="@color/header_background_color"
-            android:contentDescription="@string/content_description_emoji_picker"
-            android:selected="@{chatSendingViewModel.isEmojiPickerOpen}"
-            android:visibility="@{chatSendingViewModel.isEmojiPickerVisible ? View.VISIBLE : View.GONE}"
-            app:layout_constraintHeight_max="@dimen/chat_message_sending_icons_size"
-            app:layout_constraintBottom_toBottomOf="@id/message"
-            app:layout_constraintEnd_toStartOf="@id/send_message"
-            app:layout_constraintTop_toTopOf="@id/message" />
-
-        <ImageView
-            android:id="@+id/send_message"
-            android:layout_width="@dimen/chat_message_sending_icons_size"
-            android:layout_height="0dp"
-            android:layout_marginEnd="@dimen/chat_message_sending_icons_margin"
-            android:contentDescription="@string/content_description_send_message"
-            android:enabled="@{chatSendingViewModel.sendMessageEnabled &amp;&amp; !chatSendingViewModel.attachingFileInProgress}"
-            android:onClick="@{() -> chatSendingViewModel.sendMessage()}"
-            android:paddingTop="@dimen/chat_message_sending_icons_margin"
-            android:paddingBottom="@dimen/chat_message_sending_icons_margin"
-            android:src="@drawable/chat_send_message"
-            app:layout_constraintHeight_max="@dimen/chat_message_sending_icons_size"
-            app:layout_constraintBottom_toBottomOf="@id/message"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="@id/message" />
-
-        <ImageView
-            android:id="@+id/send_ephemeral_message"
-            android:layout_width="20dp"
-            android:layout_height="wrap_content"
-            android:adjustViewBounds="true"
-            android:clickable="false"
-            android:contentDescription="@string/content_description_ephemeral_message"
-            android:enabled="@{chatSendingViewModel.sendMessageEnabled}"
-            android:padding="5dp"
-            android:src="@drawable/ephemeral_messages"
-            android:visibility="@{!chatSendingViewModel.isReadOnly &amp;&amp; viewModel.chatRoom.isEphemeralEnabled() ? View.VISIBLE : View.GONE, default=gone}"
-            app:layout_constraintBottom_toBottomOf="@id/send_message"
-            app:layout_constraintEnd_toEndOf="@id/send_message" />
-
-        <View
-            android:id="@+id/attaching_files_in_progress_background"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:background="#99c4c4c4"
-            android:clickable="true"
-            android:focusable="true"
-            android:visibility="@{chatSendingViewModel.attachingFileInProgress ? View.VISIBLE : View.GONE, default=gone}"
-            app:layout_constraintBottom_toBottomOf="@id/emoji_picker"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="@id/emoji_picker" />
-
-        <ProgressBar
-            android:id="@+id/attaching_files_in_progress"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:indeterminate="true"
-            android:indeterminateDrawable="@drawable/icon_spinner_rotating"
-            android:indeterminateTint="?attr/accentColor"
-            android:visibility="@{chatSendingViewModel.attachingFileInProgress ? View.VISIBLE : View.GONE, default=gone}"
-            app:layout_constraintBottom_toTopOf="@id/attaching_files_in_progress_label"
-            app:layout_constraintEnd_toEndOf="@id/attaching_files_in_progress_background"
-            app:layout_constraintStart_toStartOf="@id/attaching_files_in_progress_background"
-            app:layout_constraintTop_toBottomOf="@id/emoji_picker" />
-
-        <TextView
-            android:id="@+id/attaching_files_in_progress_label"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:gravity="center_horizontal"
-            android:text="@string/operation_in_progress_wait"
-            android:textColor="@color/primary_color"
-            android:textStyle="bold"
-            android:visibility="@{chatSendingViewModel.attachingFileInProgress ? View.VISIBLE : View.GONE, default=gone}"
-            app:layout_constraintBottom_toTopOf="@id/emoji_picker"
-            app:layout_constraintEnd_toEndOf="@id/attaching_files_in_progress_background"
-            app:layout_constraintStart_toStartOf="@id/attaching_files_in_progress_background"
-            app:layout_constraintTop_toBottomOf="@id/attaching_files_in_progress" />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/chat_unread_messages_list_header.xml b/app/src/main/res/layout/chat_unread_messages_list_header.xml
deleted file mode 100644
index 0b41e89b5..000000000
--- a/app/src/main/res/layout/chat_unread_messages_list_header.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <data>
-        <variable
-            name="title"
-            type="String" />
-    </data>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="5dp"
-        android:layout_marginBottom="5dp"
-        android:gravity="center"
-        android:background="@drawable/event_decoration_gray"
-        android:orientation="horizontal">
-
-        <TextView
-            android:text="@{title}"
-            android:textSize="13sp"
-            android:fontFamily="sans-serif"
-            android:lineSpacingExtra="0sp"
-            android:textStyle="italic"
-            android:textColor="@color/light_grey_color"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:paddingRight="5dp"
-            android:paddingLeft="5dp"
-            android:background="?attr/backgroundColor" />
-
-    </LinearLayout>
-
-</layout>
diff --git a/app/src/main/res/layout/conference_schedule_cell.xml b/app/src/main/res/layout/conference_schedule_cell.xml
deleted file mode 100644
index 56629db53..000000000
--- a/app/src/main/res/layout/conference_schedule_cell.xml
+++ /dev/null
@@ -1,384 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:tools="http://schemas.android.com/tools"
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <data>
-        <import type="android.view.View" />
-        <variable
-            name="clickListener"
-            type="android.view.View.OnClickListener" />
-        <variable
-            name="longClickListener"
-            type="android.view.View.OnLongClickListener" />
-        <variable
-            name="copyAddressClickListener"
-            type="android.view.View.OnClickListener" />
-        <variable
-            name="joinConferenceClickListener"
-            type="android.view.View.OnClickListener" />
-        <variable
-            name="editConferenceClickListener"
-            type="android.view.View.OnClickListener" />
-        <variable
-            name="deleteConferenceClickListener"
-            type="android.view.View.OnClickListener" />
-        <variable
-            name="position"
-            type="Integer" />
-        <variable
-            name="selectionListViewModel"
-            type="org.linphone.activities.main.viewmodels.ListTopBarViewModel" />
-        <variable
-            name="data"
-            type="org.linphone.activities.main.conference.data.ScheduledConferenceData" />
-    </data>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:onClick="@{clickListener}"
-        android:onLongClick="@{longClickListener}"
-        android:paddingStart="10dp"
-        android:paddingEnd="10dp"
-        android:orientation="vertical">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:layout_marginTop="5dp"
-            android:background="@drawable/shape_round_gray_background"
-            backgroundImage="@{data.backgroundResId, default=@drawable/shape_round_gray_background}">
-
-            <RelativeLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="10dp"
-                android:layout_marginStart="5dp"
-                android:layout_marginEnd="5dp">
-
-                <LinearLayout
-                    android:id="@+id/time"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:orientation="horizontal"
-                    android:layout_alignParentStart="true">
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:drawablePadding="5dp"
-                        style="@style/conference_invite_desc_font"
-                        android:text="@{data.time, default=`5:35 PM`}"
-                        app:drawableStartCompat="@drawable/icon_schedule_time" />
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="5dp"
-                        style="@style/conference_invite_desc_font"
-                        android:visibility="@{data.showDuration ? View.VISIBLE : View.GONE}"
-                        android:text="@{`(` + data.duration + `)`, default=`(2h)`}" />
-
-                </LinearLayout>
-
-                <CheckBox
-                    android:id="@+id/select"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_alignParentEnd="true"
-                    android:checked="@{selectionListViewModel.selectedItems.contains(position)}"
-                    android:onClick="@{() -> selectionListViewModel.onToggleSelect(position)}"
-                    android:paddingLeft="5dp"
-                    android:paddingRight="5dp"
-                    android:visibility="@{selectionListViewModel.isEditionEnabled ? View.VISIBLE : View.GONE, default=gone}" />
-
-                <TextView
-                    style="@style/conference_invite_desc_font"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_toStartOf="@id/select"
-                    android:layout_marginStart="2dp"
-                    android:layout_marginEnd="5dp"
-                    android:layout_toEndOf="@id/time"
-                    android:ellipsize="end"
-                    android:gravity="end"
-                    android:text="@{@string/conference_schedule_organizer + ` ` + data.organizer, default=`Organizer: Me`}" />
-
-            </RelativeLayout>
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="5dp"
-                android:layout_marginStart="5dp"
-                android:layout_marginEnd="5dp"
-                style="@style/conference_cancel_title_font"
-                android:visibility="@{data.isConferenceCancelled ? View.VISIBLE : View.GONE, default=gone}"
-                android:text="@{data.canEdit ? @string/conference_scheduled_cancelled_by_me : @string/conference_scheduled_cancelled_by_organizer, default=@string/conference_scheduled_cancelled_by_organizer}"/>
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal">
-
-                <TextView
-                    android:id="@+id/meeting_type"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="5dp"
-                    android:layout_marginStart="5dp"
-                    android:layout_marginEnd="5dp"
-                    style="@style/conference_invite_subject_font"
-                    android:text="@{data.isBroadcast() ? @string/conference_broadcast_title : @string/conference_meeting_title, default=@string/conference_meeting_title}"/>
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="5dp"
-                    android:layout_marginStart="5dp"
-                    android:layout_marginEnd="5dp"
-                    style="@style/conference_invite_subject_font"
-                    android:maxLines="2"
-                    android:text="@{data.subject, default=`Lorem Ipsum`}"/>
-
-            </LinearLayout>
-
-            <LinearLayout
-                android:visibility="@{data.expanded ? View.GONE : View.VISIBLE}"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="5dp"
-                android:layout_marginBottom="10dp"
-                android:layout_marginStart="5dp"
-                android:layout_marginEnd="5dp"
-                android:orientation="horizontal">
-
-                <TextView
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:drawablePadding="5dp"
-                    android:layout_marginEnd="10dp"
-                    style="@style/conference_invite_desc_font"
-                    android:maxLines="2"
-                    android:ellipsize="end"
-                    android:text="@{data.participantsShort, default=`Daryl Martin`}"
-                    android:visibility="@{data.isConferenceCancelled ? View.INVISIBLE : View.VISIBLE}"
-                    app:drawableStartCompat="@drawable/icon_schedule_participants" />
-
-                <ImageView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginEnd="10dp"
-                    android:enabled="@{!selectionListViewModel.isEditionEnabled}"
-                    android:contentDescription="@string/content_description_toggle_conference_info_details"
-                    android:src="@drawable/button_conference_info"/>
-
-            </LinearLayout>
-
-            <RelativeLayout
-                android:visibility="@{data.expanded ? View.VISIBLE : View.GONE, default=gone}"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="5dp"
-                android:layout_marginStart="5dp"
-                android:layout_marginEnd="5dp">
-
-                <ImageView
-                    android:id="@+id/selected_info"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_alignParentTop="true"
-                    android:layout_alignParentEnd="true"
-                    android:layout_marginEnd="10dp"
-                    android:layout_marginBottom="10dp"
-                    android:selected="@{true}"
-                    android:enabled="@{!selectionListViewModel.isEditionEnabled}"
-                    android:contentDescription="@string/content_description_toggle_conference_info_details"
-                    android:src="@drawable/button_conference_info" />
-
-                <TextView
-                    style="@style/conference_invite_desc_font"
-                    android:id="@+id/speakers_title"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_alignParentTop="true"
-                    android:layout_alignParentStart="true"
-                    android:text="@string/conference_invite_speakers_list_title"
-                    android:textSize="16sp"
-                    android:textColor="@color/voip_dark_gray"
-                    android:drawableStart="@drawable/icon_schedule_participants"
-                    android:drawablePadding="5dp"
-                    android:visibility="@{data.isConferenceCancelled || !data.isBroadcast ? View.GONE : View.VISIBLE}"
-                    android:src="@drawable/icon_schedule_participants"/>
-
-                <TextView
-                    android:id="@+id/speakers_list"
-                    style="@style/conference_invite_desc_font"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="23dp"
-                    android:layout_marginEnd="10dp"
-                    android:layout_marginBottom="10dp"
-                    android:layout_toStartOf="@id/selected_info"
-                    android:layout_below="@id/speakers_title"
-                    android:background="@color/transparent_color"
-                    android:drawablePadding="5dp"
-                    android:visibility="@{data.isConferenceCancelled || !data.isBroadcast ? View.GONE : View.VISIBLE}"
-                    android:text="@{data.speakersExpanded, default=`Daryl Martin\nMartin Pecheur`}"
-                    tools:ignore="LabelFor" />
-
-                <TextView
-                    style="@style/conference_invite_desc_font"
-                    android:id="@+id/participants_title"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_below="@id/speakers_list"
-                    android:layout_alignParentStart="true"
-                    android:text="@string/conference_invite_participants_list_title"
-                    android:textSize="16sp"
-                    android:textColor="@color/voip_dark_gray"
-                    android:drawableStart="@drawable/icon_schedule_participants"
-                    android:drawablePadding="5dp"
-                    android:visibility="@{data.isConferenceCancelled ? View.GONE : View.VISIBLE}"
-                    android:src="@drawable/icon_schedule_participants"/>
-
-                <TextView
-                    android:id="@+id/participants_list"
-                    style="@style/conference_invite_desc_font"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="23dp"
-                    android:layout_marginEnd="10dp"
-                    android:layout_toStartOf="@id/selected_info"
-                    android:layout_below="@id/participants_title"
-                    android:background="@color/transparent_color"
-                    android:drawablePadding="5dp"
-                    android:visibility="@{data.isConferenceCancelled ? View.GONE : View.VISIBLE}"
-                    android:text="@{data.participantsExpanded, default=`Daryl Martin\nMartin Pecheur`}"
-                    tools:ignore="LabelFor" />
-
-            </RelativeLayout>
-
-            <LinearLayout
-                android:visibility="@{data.expanded ? View.VISIBLE : View.GONE, default=gone}"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical">
-
-                <TextView
-                    android:visibility="@{data.description.length() == 0 ? View.GONE : View.VISIBLE}"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="10dp"
-                    android:layout_marginStart="10dp"
-                    android:layout_marginEnd="10dp"
-                    style="@style/conference_scheduling_font_alt"
-                    android:text="@string/conference_description_title"/>
-
-                <TextView
-                    android:visibility="@{data.description.length() == 0 ? View.GONE : View.VISIBLE}"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="10dp"
-                    android:layout_marginEnd="10dp"
-                    style="@style/conference_invite_desc_font"
-                    android:text="@{data.description, default=`Lorem ipsum dolor sit amet`}"/>
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    style="@style/conference_scheduling_font_alt"
-                    android:layout_marginTop="10dp"
-                    android:layout_marginStart="10dp"
-                    android:layout_marginEnd="10dp"
-                    android:visibility="@{data.isConferenceCancelled ? View.GONE : View.VISIBLE}"
-                    android:text="@{data.isBroadcast ? @string/conference_schedule_broadcast_address_title : @string/conference_schedule_address_title, default=@string/conference_schedule_address_title}"/>
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="5dp"
-                    android:layout_marginStart="10dp"
-                    android:layout_marginEnd="10dp"
-                    android:orientation="horizontal"
-                    android:visibility="@{data.isConferenceCancelled ? View.GONE : View.VISIBLE}">
-
-                    <TextView
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:padding="10dp"
-                        android:maxLines="1"
-                        android:ellipsize="end"
-                        style="@style/conference_scheduling_address_font"
-                        android:background="@color/white_color"
-                        android:text="@{data.address}"/>
-
-                    <ImageView
-                        android:onClick="@{copyAddressClickListener}"
-                        android:layout_width="40dp"
-                        android:layout_height="40dp"
-                        android:layout_gravity="center"
-                        android:background="@drawable/button_background"
-                        android:layout_marginStart="10dp"
-                        android:src="@drawable/icon_copy"
-                        android:contentDescription="@string/content_description_copy_conference_address"/>
-
-                </LinearLayout>
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="10dp"
-                    android:layout_marginEnd="10dp"
-                    android:layout_marginBottom="10dp"
-                    android:gravity="end"
-                    android:orientation="horizontal">
-
-                    <TextView
-                        android:onClick="@{joinConferenceClickListener}"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:background="@drawable/button_green_background"
-                        android:visibility="@{data.isConferenceCancelled ? View.GONE : View.VISIBLE}"
-                        android:paddingLeft="20dp"
-                        android:paddingTop="8dp"
-                        android:paddingRight="20dp"
-                        android:paddingBottom="8dp"
-                        android:layout_gravity="center_vertical|end"
-                        style="@style/conference_invite_join_font"
-                        android:text="@string/conference_invite_join"/>
-
-                    <ImageView
-                        android:onClick="@{editConferenceClickListener}"
-                        android:visibility="@{data.canEdit &amp;&amp; !data.isConferenceCancelled ? View.VISIBLE : View.GONE, default=gone}"
-                        android:layout_width="40dp"
-                        android:layout_height="40dp"
-                        android:layout_gravity="center"
-                        android:background="@drawable/button_background"
-                        android:layout_marginStart="10dp"
-                        android:src="@drawable/icon_edit"
-                        android:contentDescription="@string/content_description_edit_conference"/>
-
-                    <ImageView
-                        android:onClick="@{deleteConferenceClickListener}"
-                        android:layout_width="40dp"
-                        android:layout_height="40dp"
-                        android:layout_gravity="center"
-                        android:background="@drawable/button_background"
-                        android:layout_marginStart="10dp"
-                        android:src="@drawable/icon_delete"
-                        android:contentDescription="@string/content_description_delete_conference"/>
-
-                </LinearLayout>
-
-            </LinearLayout>
-
-        </LinearLayout>
-
-    </LinearLayout>
-
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/conference_schedule_list_header.xml b/app/src/main/res/layout/conference_schedule_list_header.xml
deleted file mode 100644
index 55c3f8434..000000000
--- a/app/src/main/res/layout/conference_schedule_list_header.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <data>
-        <variable
-            name="title"
-            type="String" />
-    </data>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="?attr/voipBackgroundBWColor"
-        android:orientation="vertical">
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
-            android:layout_marginStart="10dp"
-            style="@style/conference_invite_title_font"
-            android:text="@{title}" />
-
-    </LinearLayout>
-
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/conference_scheduling_fragment.xml b/app/src/main/res/layout/conference_scheduling_fragment.xml
deleted file mode 100644
index ff58b8d28..000000000
--- a/app/src/main/res/layout/conference_scheduling_fragment.xml
+++ /dev/null
@@ -1,396 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <data>
-        <import type="android.view.View" />
-        <variable
-            name="nextClickListener"
-            type="android.view.View.OnClickListener" />
-        <variable
-            name="datePickerClickListener"
-            type="android.view.View.OnClickListener" />
-        <variable
-            name="timePickerClickListener"
-            type="android.view.View.OnClickListener" />
-        <variable
-            name="viewModel"
-            type="org.linphone.activities.main.conference.viewmodels.ConferenceSchedulingViewModel" />
-    </data>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical"
-        android:background="?attr/voipBackgroundBWColor">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/main_activity_top_bar_size"
-            android:layout_gravity="center_horizontal"
-            android:background="?attr/voipToolbarBackgroundColor"
-            android:orientation="horizontal">
-
-            <ImageView
-                android:id="@+id/back"
-                android:contentDescription="@string/content_description_go_back"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="0.2"
-                android:padding="18dp"
-                android:src="@drawable/back" />
-
-            <TextView
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="0.6"
-                android:gravity="center"
-                android:orientation="horizontal"
-                style="@style/calls_list_header_font"
-                android:text="@{viewModel.isUpdate ? @string/conference_schedule_edit : viewModel.scheduleForLater ? @string/conference_schedule_title : @string/conference_group_call_title, default=@string/conference_group_call_title}"/>
-
-            <ImageView
-                android:onClick="@{nextClickListener}"
-                android:enabled="@{viewModel.continueEnabled, default=false}"
-                android:contentDescription="@string/content_description_enter_edition_mode"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="0.2"
-                android:padding="18dp"
-                android:src="@drawable/icon_next" />
-
-        </LinearLayout>
-
-        <ScrollView
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical">
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="10dp"
-                    android:layout_marginStart="10dp"
-                    android:layout_marginEnd="10dp"
-                    android:orientation="vertical">
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        style="@style/conference_scheduling_font"
-                        android:text="@string/conference_schedule_subject_title"
-                        android:drawablePadding="5dp"
-                        app:drawableRightCompat="@drawable/voip_mandatory" />
-
-                    <EditText
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:padding="10dp"
-                        android:layout_marginTop="5dp"
-                        android:inputType="text"
-                        style="@style/conference_scheduling_font"
-                        android:background="@drawable/shape_edittext_background"
-                        android:hint="@{viewModel.scheduleForLater ? @string/conference_schedule_subject_hint : @string/conference_group_call_subject_hint, default=@string/conference_group_call_subject_hint}"
-                        android:text="@={viewModel.subject}" />
-
-                </LinearLayout>
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="vertical"
-                    android:layout_margin="10dp"
-                    android:gravity="center"
-                    android:background="@drawable/shape_form_field_background">
-
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:orientation="horizontal"
-                        android:gravity="center">
-
-                        <com.google.android.material.switchmaterial.SwitchMaterial
-                            android:checked="@={viewModel.scheduleForLater}"
-                            android:enabled="@{!viewModel.isUpdate}"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginStart="10dp"/>
-
-                        <TextView
-                            android:onClick="@{() -> viewModel.toggleSchedule()}"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_margin="10dp"
-                            style="@style/conference_scheduling_font"
-                            android:text="@string/conference_schedule_later"/>
-
-                    </LinearLayout>
-
-                    <LinearLayout
-                        android:visibility="@{viewModel.scheduleForLater ? View.VISIBLE: View.GONE}"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:layout_margin="10dp"
-                        android:orientation="vertical">
-
-                        <LinearLayout
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_margin="5dp"
-                            android:orientation="vertical"
-                            android:visibility="@{viewModel.isBroadcastAllowed ? View.VISIBLE : View.GONE, default=gone}">
-
-                            <TextView
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                style="@style/conference_scheduling_font"
-                                android:text="@string/conference_schedule_mode"/>
-
-                            <Spinner
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:padding="10dp"
-                                android:layout_marginTop="5dp"
-                                style="@style/conference_scheduling_font"
-                                android:background="@drawable/icon_spinner_background"
-                                app:entries="@{viewModel.modesList}"
-                                app:selectedValue="@={viewModel.mode}"/>
-
-                        </LinearLayout>
-
-                        <LinearLayout
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:orientation="horizontal"
-                            android:baselineAligned="false">
-
-                            <LinearLayout
-                                android:layout_width="0dp"
-                                android:layout_height="wrap_content"
-                                android:layout_weight="1"
-                                android:layout_columnWeight="1"
-                                android:layout_margin="5dp"
-                                android:orientation="vertical">
-
-                                <TextView
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    style="@style/conference_scheduling_font"
-                                    android:text="@string/conference_schedule_date"
-                                    android:drawablePadding="5dp"
-                                    app:drawableRightCompat="@drawable/voip_mandatory"/>
-
-                                <TextView
-                                    android:onClick="@{datePickerClickListener}"
-                                    android:layout_width="match_parent"
-                                    android:layout_height="wrap_content"
-                                    android:padding="10dp"
-                                    android:layout_marginTop="5dp"
-                                    style="@style/conference_scheduling_font"
-                                    android:background="@drawable/icon_spinner_background"
-                                    android:text="@{viewModel.formattedDate}" />
-
-                            </LinearLayout>
-
-                            <LinearLayout
-                                android:layout_width="0dp"
-                                android:layout_height="wrap_content"
-                                android:layout_weight="1"
-                                android:layout_columnWeight="1"
-                                android:layout_margin="5dp"
-                                android:orientation="vertical">
-
-                                <TextView
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    style="@style/conference_scheduling_font"
-                                    android:text="@string/conference_schedule_duration"/>
-
-                                <Spinner
-                                    android:layout_width="match_parent"
-                                    android:layout_height="wrap_content"
-                                    android:padding="10dp"
-                                    android:layout_marginTop="5dp"
-                                    style="@style/conference_scheduling_font"
-                                    android:background="@drawable/icon_spinner_background"
-                                    app:entries="@{viewModel.durationList}"
-                                    app:selectedValue="@={viewModel.duration}"/>
-
-                            </LinearLayout>
-
-                        </LinearLayout>
-
-                        <LinearLayout
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:orientation="horizontal"
-                            android:baselineAligned="false">
-
-                            <LinearLayout
-                                android:layout_width="0dp"
-                                android:layout_height="wrap_content"
-                                android:layout_weight="1"
-                                android:layout_margin="5dp"
-                                android:orientation="vertical">
-
-                                <TextView
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    style="@style/conference_scheduling_font"
-                                    android:text="@string/conference_schedule_time"
-                                    android:drawablePadding="5dp"
-                                    app:drawableRightCompat="@drawable/voip_mandatory"/>
-
-                                <TextView
-                                    android:onClick="@{timePickerClickListener}"
-                                    android:layout_width="match_parent"
-                                    android:layout_height="wrap_content"
-                                    android:padding="10dp"
-                                    android:layout_marginTop="5dp"
-                                    style="@style/conference_scheduling_font"
-                                    android:background="@drawable/icon_spinner_background"
-                                    android:text="@{viewModel.formattedTime}" />
-
-                            </LinearLayout>
-
-                            <LinearLayout
-                                android:layout_width="0dp"
-                                android:layout_height="wrap_content"
-                                android:layout_weight="1"
-                                android:layout_margin="5dp"
-                                android:orientation="vertical">
-
-                                <TextView
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    style="@style/conference_scheduling_font"
-                                    android:text="@string/conference_schedule_timezone"/>
-
-                                <Spinner
-                                    android:layout_width="match_parent"
-                                    android:layout_height="wrap_content"
-                                    android:padding="10dp"
-                                    android:layout_marginTop="5dp"
-                                    style="@style/conference_scheduling_font"
-                                    android:background="@drawable/icon_spinner_background"
-                                    app:entries="@{viewModel.timeZones}"
-                                    app:selectedValue="@={viewModel.timeZone}"/>
-
-                            </LinearLayout>
-
-                        </LinearLayout>
-
-                        <LinearLayout
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_margin="5dp"
-                            android:orientation="vertical">
-
-                            <TextView
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                style="@style/conference_scheduling_font"
-                                android:text="@string/conference_schedule_description_title"/>
-
-                            <EditText
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:padding="10dp"
-                                android:layout_marginTop="5dp"
-                                android:gravity="top"
-                                android:minLines="3"
-                                android:maxLines="5"
-                                android:inputType="textMultiLine"
-                                style="@style/conference_scheduling_font"
-                                android:background="@drawable/shape_edittext_background"
-                                android:hint="@string/conference_schedule_description_hint"
-                                android:text="@={viewModel.description}"/>
-
-                        </LinearLayout>
-
-                        <com.google.android.material.checkbox.MaterialCheckBox
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_marginTop="5dp"
-                            android:text="@{viewModel.isUpdate ? @string/conference_schedule_send_updated_invite_chat : @string/conference_schedule_send_invite_chat, default=@string/conference_schedule_send_invite_chat}"
-                            android:checked="@={viewModel.sendInviteViaChat, default=true}"
-                            style="@style/conference_scheduling_font"/>
-
-                        <com.google.android.material.checkbox.MaterialCheckBox
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_marginTop="5dp"
-                            android:visibility="gone"
-                            android:text="@{viewModel.isUpdate ? @string/conference_schedule_send_updated_invite_email : @string/conference_schedule_send_invite_email, default=@string/conference_schedule_send_invite_email}"
-                            android:checked="@={viewModel.sendInviteViaEmail}"
-                            style="@style/conference_scheduling_font"/>
-
-                    </LinearLayout>
-
-                </LinearLayout>
-
-                <TextView
-                    android:visibility="gone"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:layout_marginTop="10dp"
-                    android:text="@string/conference_schedule_encryption"
-                    style="@style/conference_scheduling_font"/>
-
-                <LinearLayout
-                    android:visibility="gone"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="5dp"
-                    android:gravity="center"
-                    android:orientation="horizontal">
-
-                    <ImageView
-                        android:onClick="@{() -> viewModel.updateEncryption(false)}"
-                        android:layout_width="wrap_content"
-                        android:layout_height="match_parent"
-                        android:contentDescription="@string/content_description_e2e_encryption_disabled"
-                        android:src="@drawable/security_toggle_icon_grey"/>
-
-                    <com.google.android.material.switchmaterial.SwitchMaterial
-                        android:checked="@={viewModel.isEncrypted}"
-                        android:layout_width="50dp"
-                        android:layout_height="match_parent"
-                        android:layout_marginLeft="10dp"
-                        android:layout_marginRight="10dp"
-                        android:switchMinWidth="50dp"
-                        android:textOff=""
-                        android:textOn=""/>
-
-                    <ImageView
-                        android:onClick="@{() -> viewModel.updateEncryption(true)}"
-                        android:contentDescription="@string/content_description_e2e_encryption_enabled"
-                        android:layout_width="wrap_content"
-                        android:layout_height="match_parent"
-                        android:src="@drawable/security_toggle_icon_green" />
-
-                </LinearLayout>
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:layout_marginTop="10dp"
-                    android:layout_marginBottom="10dp"
-                    style="@style/conference_scheduling_font"
-                    android:text="@string/conference_schedule_mandatory_field"
-                    android:drawablePadding="5dp"
-                    app:drawableLeftCompat="@drawable/voip_mandatory" />
-
-            </LinearLayout>
-
-        </ScrollView>
-
-    </LinearLayout>
-
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/conference_scheduling_participant_cell.xml b/app/src/main/res/layout/conference_scheduling_participant_cell.xml
deleted file mode 100644
index e0ba5d24c..000000000
--- a/app/src/main/res/layout/conference_scheduling_participant_cell.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <data>
-        <import type="android.view.View" />
-        <variable
-            name="data"
-            type="org.linphone.activities.main.conference.data.ConferenceSchedulingParticipantData" />
-    </data>
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/conference_scheduling_participant_cell_height"
-        android:gravity="center_vertical"
-        android:background="?attr/backgroundColor">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_marginLeft="5dp"
-            android:layout_marginRight="5dp"
-            android:orientation="horizontal"
-            android:baselineAligned="false">
-
-            <RelativeLayout
-                android:id="@+id/avatar"
-                android:layout_width="45dp"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical">
-
-                <ImageView
-                    coilContact="@{data}"
-                    android:layout_width="@dimen/contact_avatar_size"
-                    android:layout_height="@dimen/contact_avatar_size"
-                    android:layout_alignParentStart="true"
-                    android:layout_centerHorizontal="true"
-                    android:background="@drawable/generated_avatar_bg"
-                    android:src="@drawable/voip_single_contact_avatar"
-                    android:contentDescription="@null" />
-
-                <ImageView
-                    android:visibility="@{data.showLimeBadge ? View.VISIBLE : View.GONE, default=gone}"
-                    android:layout_width="20dp"
-                    android:layout_height="20dp"
-                    android:layout_alignParentTop="true"
-                    android:layout_alignParentEnd="true"
-                    android:contentDescription="@string/content_description_contact_can_do_encryption"
-                    android:src="@drawable/security_toggle_icon_green" />
-
-            </RelativeLayout>
-
-            <LinearLayout
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:gravity="center_vertical"
-                android:orientation="vertical">
-
-                <TextView
-                    style="@style/contact_name_list_cell_font"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:gravity="top|left"
-                    android:lines="1"
-                    android:text="@{data.contact.name ?? data.displayName}" />
-
-                <TextView
-                    style="@style/conference_scheduling_participant_sip_uri_font"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:ellipsize="end"
-                    android:gravity="bottom|left"
-                    android:lines="1"
-                    android:text="@{data.sipUri}" />
-
-            </LinearLayout>
-
-        </LinearLayout>
-
-        <ImageView
-            android:onClick="@{() -> data.changeIsSpeaker()}"
-            android:visibility="@{data.showBroadcastControls ? View.VISIBLE : View.GONE}"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:padding="10dp"
-            android:src="@{data.isSpeaker ? @drawable/field_remove : @drawable/field_add, default=@drawable/field_add}"
-            android:layout_alignParentEnd="true"
-            android:layout_centerVertical="true"
-            android:layout_marginEnd="5dp" />
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:layout_alignParentBottom="true"
-            android:background="?attr/dividerColor"
-            android:visibility="@{data.showDivider ? View.VISIBLE : View.GONE}" />
-
-    </RelativeLayout>
-
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/conference_scheduling_participants_list_fragment.xml b/app/src/main/res/layout/conference_scheduling_participants_list_fragment.xml
deleted file mode 100644
index 888f00baf..000000000
--- a/app/src/main/res/layout/conference_scheduling_participants_list_fragment.xml
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <data>
-        <import type="android.view.View"/>
-        <variable
-            name="nextClickListener"
-            type="android.view.View.OnClickListener"/>
-        <variable
-            name="viewModel"
-            type="org.linphone.activities.main.conference.viewmodels.ConferenceSchedulingViewModel" />
-    </data>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical"
-        android:background="?attr/voipBackgroundBWColor">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/main_activity_top_bar_size"
-            android:layout_gravity="center_horizontal"
-            android:background="?attr/voipToolbarBackgroundColor"
-            android:orientation="horizontal">
-
-            <ImageView
-                android:id="@+id/back"
-                android:contentDescription="@string/content_description_go_back"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="0.2"
-                android:padding="18dp"
-                android:src="@drawable/back" />
-
-            <TextView
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="0.6"
-                android:gravity="center"
-                android:orientation="horizontal"
-                style="@style/calls_list_header_font"
-                android:text="@string/conference_schedule_participants_list"/>
-
-            <ImageView
-                android:onClick="@{nextClickListener}"
-                android:enabled="@{viewModel.selectedAddresses.size() > 0}"
-                android:contentDescription="@string/content_description_enter_edition_mode"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="0.2"
-                android:padding="18dp"
-                android:src="@drawable/icon_next" />
-
-        </LinearLayout>
-
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-
-            <EditText
-                android:id="@+id/searchBar"
-                android:text="@={viewModel.filter}"
-                android:layout_width="match_parent"
-                android:layout_height="40dp"
-                android:inputType="textPersonName|textNoSuggestions"
-                android:layout_margin="10dp"
-                android:drawableLeft="@drawable/search"
-                android:drawablePadding="10dp"
-                android:background="@color/transparent_color"
-                android:backgroundTint="@color/transparent_color"
-                android:hint="@string/contact_filter_hint"/>
-
-            <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignTop="@id/searchBar"
-                android:layout_alignRight="@id/searchBar"
-                android:layout_alignBottom="@id/searchBar"
-                android:onClick="@{() -> viewModel.clearFilter()}"
-                android:contentDescription="@string/content_description_clear_field"
-                android:src="@drawable/field_clean" />
-
-        </RelativeLayout>
-
-        <HorizontalScrollView
-            android:id="@+id/layoutContactsSelected"
-            android:layout_width="match_parent"
-            android:layout_height="50dp"
-            android:background="?attr/voipToolbarBackgroundColor"
-            android:fadeScrollbars="false"
-            android:lines="1">
-
-            <LinearLayout
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:lines="1"
-                android:orientation="horizontal"
-                android:paddingLeft="10dp"
-                android:paddingRight="10dp"
-                android:scrollIndicators="bottom"
-                app:entries="@{viewModel.selectedAddresses}"
-                app:parent="@{viewModel}"
-                app:layout="@{@layout/contact_selected_cell}" />
-
-        </HorizontalScrollView>
-
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/contactsList"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent" />
-
-        <TextView
-            style="@style/empty_list_font"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:gravity="center"
-            android:text="@string/no_sip_contact"
-            android:visibility="@{viewModel.sipContactsSelected &amp;&amp; viewModel.contactsList.empty ? View.VISIBLE : View.GONE}" />
-
-        <TextView
-            style="@style/empty_list_font"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:gravity="center"
-            android:text="@string/no_contact"
-            android:visibility="@{!viewModel.sipContactsSelected &amp;&amp; viewModel.contactsList.empty ? View.VISIBLE : View.GONE}" />
-
-    </LinearLayout>
-
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/conference_scheduling_summary_fragment.xml b/app/src/main/res/layout/conference_scheduling_summary_fragment.xml
deleted file mode 100644
index 3fac679d6..000000000
--- a/app/src/main/res/layout/conference_scheduling_summary_fragment.xml
+++ /dev/null
@@ -1,388 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:bind="http://schemas.android.com/tools">
-
-    <data>
-        <import type="android.view.View" />
-        <variable
-            name="viewModel"
-            type="org.linphone.activities.main.conference.viewmodels.ConferenceSchedulingViewModel" />
-    </data>
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="?attr/voipBackgroundBWColor">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="vertical">
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="@dimen/main_activity_top_bar_size"
-                android:layout_gravity="center_horizontal"
-                android:background="?attr/voipToolbarBackgroundColor"
-                android:orientation="horizontal">
-
-                <ImageView
-                    android:id="@+id/back"
-                    android:contentDescription="@string/content_description_go_back"
-                    android:layout_width="0dp"
-                    android:layout_height="match_parent"
-                    android:layout_weight="0.2"
-                    android:padding="18dp"
-                    android:src="@drawable/back" />
-
-                <TextView
-                    android:layout_width="0dp"
-                    android:layout_height="match_parent"
-                    android:layout_weight="0.6"
-                    android:gravity="center"
-                    android:orientation="horizontal"
-                    style="@style/calls_list_header_font"
-                    android:text="@{viewModel.isModeBroadcastCurrentlySelected() ? @string/conference_schedule_broadcast_summary : viewModel.scheduleForLater ? @string/conference_schedule_summary : @string/conference_group_call_summary, default=@string/conference_group_call_summary}"/>
-
-                <View
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="0.2" />
-
-            </LinearLayout>
-
-            <androidx.core.widget.NestedScrollView
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:layout_weight="1">
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:orientation="vertical">
-
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="10dp"
-                        android:layout_marginStart="5dp"
-                        android:layout_marginEnd="5dp"
-                        android:orientation="vertical">
-
-                        <RelativeLayout
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_marginStart="5dp"
-                            android:layout_marginEnd="5dp">
-
-                            <TextView
-                                style="@style/conference_scheduling_font"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_alignParentBottom="true"
-                                android:text="@string/conference_schedule_subject_title" />
-
-                            <ImageView
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_alignParentEnd="true"
-                                android:adjustViewBounds="true"
-                                android:src="@drawable/security_2_indicator"
-                                android:contentDescription="@string/content_description_encrypted_conference"
-                                android:visibility="@{viewModel.isEncrypted ? View.VISIBLE : View.GONE}" />
-
-                        </RelativeLayout>
-
-                        <EditText
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:enabled="false"
-                            android:padding="10dp"
-                            android:layout_marginTop="5dp"
-                            android:layout_marginStart="5dp"
-                            android:layout_marginEnd="5dp"
-                            android:inputType="textEmailSubject"
-                            style="@style/conference_scheduling_font"
-                            android:background="?attr/voipFormDisabledFieldBackgroundColor"
-                            android:text="@{viewModel.subject}"
-                            bind:ignore="LabelFor" />
-
-                    </LinearLayout>
-
-                    <LinearLayout
-                        android:visibility="@{viewModel.scheduleForLater ? View.VISIBLE: View.GONE}"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:orientation="vertical"
-                        android:layout_margin="5dp">
-
-                        <LinearLayout
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:orientation="horizontal"
-                            android:baselineAligned="false">
-
-                            <LinearLayout
-                                android:layout_width="0dp"
-                                android:layout_height="wrap_content"
-                                android:layout_weight="1"
-                                android:layout_margin="5dp"
-                                android:orientation="vertical">
-
-                                <TextView
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    style="@style/conference_scheduling_font"
-                                    android:text="@string/conference_schedule_date"/>
-
-                                <TextView
-                                    android:layout_width="match_parent"
-                                    android:layout_height="wrap_content"
-                                    android:padding="10dp"
-                                    android:layout_marginTop="5dp"
-                                    style="@style/conference_scheduling_font"
-                                    android:background="?attr/voipFormDisabledFieldBackgroundColor"
-                                    android:text="@{viewModel.formattedDate}" />
-
-                            </LinearLayout>
-
-                            <LinearLayout
-                                android:layout_width="0dp"
-                                android:layout_height="wrap_content"
-                                android:layout_weight="1"
-                                android:layout_margin="5dp"
-                                android:orientation="vertical">
-
-                                <TextView
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    style="@style/conference_scheduling_font"
-                                    android:text="@string/conference_schedule_duration"/>
-
-                                <TextView
-                                    android:layout_width="match_parent"
-                                    android:layout_height="wrap_content"
-                                    android:padding="10dp"
-                                    android:layout_marginTop="5dp"
-                                    style="@style/conference_scheduling_font"
-                                    android:background="?attr/voipFormDisabledFieldBackgroundColor"
-                                    android:text="@{viewModel.duration.toString()}" />
-
-                            </LinearLayout>
-
-                        </LinearLayout>
-
-                        <LinearLayout
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:orientation="horizontal"
-                            android:baselineAligned="false">
-
-                            <LinearLayout
-                                android:layout_width="0dp"
-                                android:layout_height="wrap_content"
-                                android:layout_weight="1"
-                                android:layout_margin="5dp"
-                                android:orientation="vertical">
-
-                                <TextView
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    style="@style/conference_scheduling_font"
-                                    android:text="@string/conference_schedule_time"/>
-
-                                <TextView
-                                    android:layout_width="match_parent"
-                                    android:layout_height="wrap_content"
-                                    android:padding="10dp"
-                                    android:layout_marginTop="5dp"
-                                    style="@style/conference_scheduling_font"
-                                    android:background="?attr/voipFormDisabledFieldBackgroundColor"
-                                    android:text="@{viewModel.formattedTime}" />
-
-                            </LinearLayout>
-
-                            <LinearLayout
-                                android:layout_width="0dp"
-                                android:layout_height="wrap_content"
-                                android:layout_weight="1"
-                                android:layout_margin="5dp"
-                                android:orientation="vertical">
-
-                                <TextView
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    style="@style/conference_scheduling_font"
-                                    android:text="@string/conference_schedule_timezone"/>
-
-                                <TextView
-                                    android:layout_width="match_parent"
-                                    android:layout_height="wrap_content"
-                                    android:padding="10dp"
-                                    android:layout_marginTop="5dp"
-                                    android:maxLines="1"
-                                    android:ellipsize="end"
-                                    style="@style/conference_scheduling_font"
-                                    android:background="?attr/voipFormDisabledFieldBackgroundColor"
-                                    android:text="@{viewModel.timeZone.toString()}" />
-
-                            </LinearLayout>
-
-                        </LinearLayout>
-
-                        <LinearLayout
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_margin="5dp"
-                            android:orientation="vertical"
-                            android:visibility="@{viewModel.description.length() == 0 ? View.GONE : View.VISIBLE}">
-
-                            <TextView
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                style="@style/conference_scheduling_font"
-                                android:text="@string/conference_schedule_description_hint"/>
-
-                            <EditText
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:enabled="false"
-                                android:padding="10dp"
-                                android:layout_marginTop="5dp"
-                                android:gravity="top"
-                                android:minLines="3"
-                                android:maxLines="5"
-                                android:inputType="textMultiLine"
-                                style="@style/conference_scheduling_font"
-                                android:background="?attr/voipFormDisabledFieldBackgroundColor"
-                                android:hint="@string/conference_schedule_description_hint"
-                                android:text="@{viewModel.description}"/>
-
-                        </LinearLayout>
-
-                    </LinearLayout>
-
-                    <TextView
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="10dp"
-                        android:layout_marginLeft="10dp"
-                        android:layout_marginBottom="20dp"
-                        style="@style/conference_scheduling_font"
-                        android:visibility="@{viewModel.scheduleForLater &amp;&amp; viewModel.sendInviteViaChat ? View.VISIBLE : View.GONE}"
-                        android:text="@string/conference_schedule_send_invite_chat_summary"/>
-
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:visibility="@{viewModel.isModeBroadcastCurrentlySelected() ? View.VISIBLE : View.GONE}"
-                        android:background="?attr/voipFormDisabledFieldBackgroundColor">
-
-                        <TextView
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:padding="5dp"
-                            android:layout_marginLeft="20dp"
-                            style="@style/calls_list_header_font"
-                            android:text="@string/conference_schedule_speakers_list"/>
-
-                    </LinearLayout>
-
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:orientation="vertical"
-                        android:visibility="@{viewModel.isModeBroadcastCurrentlySelected() ? View.VISIBLE : View.GONE}"
-                        app:entries="@{viewModel.speakersData}"
-                        app:layout="@{@layout/conference_scheduling_participant_cell}" />
-
-                    <TextView
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="20dp"
-                        android:layout_marginBottom="20dp"
-                        android:layout_marginLeft="10dp"
-                        style="@style/calls_list_header_font"
-                        android:textColor="@color/light_grey_color"
-                        android:visibility="@{viewModel.isModeBroadcastCurrentlySelected() &amp;&amp; viewModel.speakersData.size() == 0 ? View.VISIBLE : View.GONE}"
-                        android:text="@string/conference_schedule_speakers_list_empty"/>
-
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:background="?attr/voipFormDisabledFieldBackgroundColor">
-
-                        <TextView
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:padding="5dp"
-                            android:layout_marginLeft="20dp"
-                            style="@style/calls_list_header_font"
-                            android:text="@string/conference_schedule_participants_list"/>
-
-                    </LinearLayout>
-
-                    <TextView
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="20dp"
-                        android:layout_marginLeft="10dp"
-                        style="@style/calls_list_header_font"
-                        android:textColor="@color/light_grey_color"
-                        android:visibility="@{viewModel.participantsData.size() == 0 ? View.VISIBLE : View.GONE, default=gone}"
-                        android:text="@string/conference_schedule_participants_list_empty"/>
-
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:orientation="vertical"
-                        app:entries="@{viewModel.participantsData}"
-                        app:layout="@{@layout/conference_scheduling_participant_cell}" />
-
-                </LinearLayout>
-
-            </androidx.core.widget.NestedScrollView>
-
-            <TextView
-                android:onClick="@{() -> viewModel.createConference()}"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:paddingLeft="20dp"
-                android:paddingTop="8dp"
-                android:paddingRight="20dp"
-                android:paddingBottom="8dp"
-                android:layout_marginTop="10dp"
-                android:layout_marginBottom="10dp"
-                android:layout_gravity="center"
-                android:background="@drawable/rect_orange_button"
-                android:visibility="@{viewModel.isModeBroadcastCurrentlySelected() ? View.GONE : View.VISIBLE}"
-                android:text="@{viewModel.isUpdate ? @string/conference_schedule_edit : viewModel.scheduleForLater ? @string/conference_schedule_start : @string/conference_group_call_create, default=@string/conference_group_call_create}"
-                style="@style/big_orange_button_font"/>
-
-            <TextView
-                android:onClick="@{() -> viewModel.createConference()}"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:paddingLeft="20dp"
-                android:paddingTop="8dp"
-                android:paddingRight="20dp"
-                android:paddingBottom="8dp"
-                android:layout_marginTop="10dp"
-                android:layout_marginBottom="10dp"
-                android:layout_gravity="center"
-                android:background="@drawable/rect_orange_button"
-                android:enabled="@{viewModel.participantsData.size() != 0 &amp;&amp; viewModel.speakersData.size() != 0}"
-                android:visibility="@{viewModel.isModeBroadcastCurrentlySelected() ? View.VISIBLE : View.GONE, default=gone}"
-                android:text="@{viewModel.isUpdate ? @string/conference_broadcast_edit : @string/conference_broadcast_start, default=@string/conference_broadcast_start}"
-                style="@style/big_orange_button_font"/>
-
-        </LinearLayout>
-
-        <include
-            layout="@layout/wait_layout"
-            bind:visibility="@{viewModel.conferenceCreationInProgress, default=gone}" />
-
-    </RelativeLayout>
-
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/conference_waiting_room_fragment.xml b/app/src/main/res/layout/conference_waiting_room_fragment.xml
deleted file mode 100644
index 5cb11aafe..000000000
--- a/app/src/main/res/layout/conference_waiting_room_fragment.xml
+++ /dev/null
@@ -1,317 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <data>
-
-        <import type="android.view.View" />
-
-        <import type="org.linphone.activities.voip.ConferenceDisplayMode" />
-
-        <variable
-            name="viewModel"
-            type="org.linphone.activities.main.conference.viewmodels.ConferenceWaitingRoomViewModel" />
-    </data>
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="?attr/voipBackgroundColor">
-
-        <TextView
-            android:id="@+id/conference_subject"
-            style="@style/conference_waiting_room_subject_font"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerHorizontal="true"
-            android:layout_margin="20dp"
-            android:ellipsize="end"
-            android:maxLines="1"
-            android:text="@{viewModel.subject, default=`Conference subject`}" />
-
-        <TextView
-            style="@style/conference_waiting_room_no_video_font"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerInParent="true"
-            android:text="@{viewModel.isConferenceBroadcastWithListenerRole ? @string/conference_waiting_room_listener_broadcast : @string/conference_waiting_room_video_disabled, default=@string/conference_waiting_room_video_disabled}"
-            android:visibility="@{viewModel.isVideoEnabled ? View.GONE : View.VISIBLE}" />
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_above="@id/conference_controls"
-            android:layout_below="@id/conference_subject"
-            android:layout_marginStart="10dp"
-            android:layout_marginEnd="10dp"
-            android:layout_marginBottom="20dp"
-            android:background="@drawable/shape_remote_video_background"
-            android:visibility="@{viewModel.isVideoEnabled ? View.VISIBLE : View.GONE, default=gone}">
-
-            <org.linphone.activities.voip.views.RoundCornersTextureView
-                android:id="@+id/local_preview_video_surface"
-                android:layout_width="0dp"
-                android:layout_height="0dp"
-                app:alignTopRight="false"
-                app:displayMode="occupy_all_space"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
-
-            <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_margin="5dp"
-                android:contentDescription="@string/content_description_switch_camera"
-                android:enabled="@{!viewModel.joinInProgress}"
-                android:onClick="@{() -> viewModel.switchCamera()}"
-                android:padding="10dp"
-                android:src="@drawable/icon_call_camera_switch"
-                android:visibility="@{viewModel.isSwitchCameraAvailable ? View.VISIBLE : View.GONE}"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
-
-        </androidx.constraintlayout.widget.ConstraintLayout>
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:id="@+id/conference_controls"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_above="@id/buttons"
-            android:layout_marginBottom="20dp"
-            android:orientation="horizontal">
-
-            <TextView
-                android:id="@+id/cancel"
-                style="@style/big_orange_button_font"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="20dp"
-                android:layout_marginEnd="10dp"
-                android:layout_weight="1"
-                android:background="@drawable/shape_rect_gray_button"
-                android:gravity="center"
-                android:onClick="@{() -> viewModel.cancel()}"
-                android:paddingLeft="20dp"
-                android:paddingTop="8dp"
-                android:paddingRight="20dp"
-                android:paddingBottom="8dp"
-                android:text="@string/conference_waiting_room_cancel_call"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toStartOf="@id/start"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintWidth_max="@dimen/conference_waiting_room_buttons_max_width"/>
-
-            <TextView
-                android:id="@+id/start"
-                style="@style/big_orange_button_bold_font"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="10dp"
-                android:layout_marginEnd="20dp"
-                android:layout_weight="1"
-                android:background="@drawable/button_orange_background"
-                android:enabled="@{viewModel.networkReachable &amp;&amp; !viewModel.joinInProgress}"
-                android:gravity="center"
-                android:onClick="@{() -> viewModel.start()}"
-                android:paddingLeft="20dp"
-                android:paddingTop="8dp"
-                android:paddingRight="20dp"
-                android:paddingBottom="8dp"
-                android:text="@string/conference_waiting_room_start_call"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toEndOf="@id/cancel"
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintHorizontal_chainStyle="spread"
-                app:layout_constraintWidth_max="@dimen/conference_waiting_room_buttons_max_width" />
-
-        </androidx.constraintlayout.widget.ConstraintLayout>
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_above="@id/buttons"
-            android:layout_centerHorizontal="true"
-            android:layout_marginBottom="10dp"
-            android:background="@drawable/shape_audio_routes_background"
-            android:translationY="@{viewModel.audioRoutesMenuTranslateY, default=@dimen/voip_audio_routes_menu_translate_y}"
-            android:orientation="vertical">
-
-            <ImageView
-                android:layout_width="@dimen/voip_call_button_size"
-                android:layout_height="@dimen/voip_call_button_size"
-                android:layout_margin="5dp"
-                android:background="@drawable/button_toggle_background_reverse"
-                android:contentDescription="@string/content_description_use_bluetooth_headset"
-                android:onClick="@{() -> viewModel.setBluetoothAudioRoute()}"
-                android:selected="@{viewModel.isBluetoothHeadsetSelected}"
-                android:src="@drawable/icon_bluetooth" />
-
-            <ImageView
-                android:layout_width="@dimen/voip_call_button_size"
-                android:layout_height="@dimen/voip_call_button_size"
-                android:layout_margin="5dp"
-                android:background="@drawable/button_toggle_background_reverse"
-                android:contentDescription="@string/content_description_use_earpiece"
-                android:onClick="@{() -> viewModel.setEarpieceAudioRoute()}"
-                android:selected="@{!viewModel.isSpeakerSelected &amp;&amp; !viewModel.isBluetoothHeadsetSelected}"
-                android:src="@drawable/icon_earpiece" />
-
-            <ImageView
-                android:layout_width="@dimen/voip_call_button_size"
-                android:layout_height="@dimen/voip_call_button_size"
-                android:layout_margin="5dp"
-                android:background="@drawable/button_toggle_background_reverse"
-                android:contentDescription="@string/content_description_use_speaker"
-                android:onClick="@{() -> viewModel.setSpeakerAudioRoute()}"
-                android:selected="@{viewModel.isSpeakerSelected}"
-                android:src="@drawable/icon_speaker" />
-
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_above="@id/buttons"
-            android:layout_alignParentEnd="true"
-            android:layout_marginEnd="15dp"
-            android:layout_marginBottom="10dp"
-            android:background="@drawable/shape_audio_routes_background"
-            android:translationY="@{viewModel.conferenceLayoutMenuTranslateY, default=@dimen/voip_audio_routes_menu_translate_y}"
-            android:orientation="vertical">
-
-            <ImageView
-                android:layout_width="@dimen/voip_call_button_size"
-                android:layout_height="@dimen/voip_call_button_size"
-                android:layout_margin="5dp"
-                android:background="@drawable/button_toggle_background_reverse"
-                android:contentDescription="@string/conference_display_mode_mosaic"
-                android:onClick="@{() -> viewModel.setMosaicLayout()}"
-                android:padding="10dp"
-                android:selected="@{viewModel.selectedLayout == ConferenceDisplayMode.GRID}"
-                android:src="@drawable/icon_conference_layout_grid"
-                app:tint="@color/white_color" />
-
-            <ImageView
-                android:layout_width="@dimen/voip_call_button_size"
-                android:layout_height="@dimen/voip_call_button_size"
-                android:layout_margin="5dp"
-                android:background="@drawable/button_toggle_background_reverse"
-                android:contentDescription="@string/conference_display_mode_active_speaker"
-                android:onClick="@{() -> viewModel.setActiveSpeakerLayout()}"
-                android:padding="10dp"
-                android:selected="@{viewModel.selectedLayout == ConferenceDisplayMode.ACTIVE_SPEAKER}"
-                android:src="@drawable/icon_conference_layout_active_speaker"
-                app:tint="@color/white_color" />
-
-            <ImageView
-                android:layout_width="@dimen/voip_call_button_size"
-                android:layout_height="@dimen/voip_call_button_size"
-                android:layout_margin="5dp"
-                android:background="@drawable/button_toggle_background_reverse"
-                android:contentDescription="@string/conference_display_mode_audio_only"
-                android:onClick="@{() -> viewModel.setAudioOnlyLayout()}"
-                android:padding="10dp"
-                android:selected="@{viewModel.selectedLayout == ConferenceDisplayMode.AUDIO_ONLY}"
-                android:src="@drawable/icon_conference_layout_audio_only"
-                app:tint="@color/white_color" />
-
-        </LinearLayout>
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:id="@+id/buttons"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/voip_buttons_fragment_size"
-            android:layout_alignParentBottom="true"
-            android:layout_marginBottom="10dp">
-
-            <ImageView
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_marginEnd="5dp"
-                android:background="@drawable/button_background_reverse"
-                android:contentDescription="@{viewModel.isMicrophoneMuted ? @string/content_description_disable_mic_mute : @string/content_description_enable_mic_mute}"
-                android:enabled="@{!viewModel.isConferenceBroadcastWithListenerRole &amp;&amp; !viewModel.joinInProgress}"
-                android:onClick="@{() -> viewModel.toggleMuteMicrophone()}"
-                android:padding="5dp"
-                android:selected="@{viewModel.isMicrophoneMuted}"
-                android:src="@drawable/icon_toggle_mic"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintDimensionRatio="W,1:1"
-                app:layout_constraintEnd_toStartOf="@id/speaker" />
-
-            <RelativeLayout
-                android:id="@+id/speaker"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintDimensionRatio="W,1:1"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent">
-
-                <ImageView
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:background="@drawable/button_background_reverse"
-                    android:contentDescription="@{viewModel.isSpeakerSelected ? @string/content_description_disable_speaker : @string/content_description_enable_speaker}"
-                    android:enabled="@{!viewModel.joinInProgress}"
-                    android:onClick="@{() -> viewModel.toggleSpeaker()}"
-                    android:padding="5dp"
-                    android:selected="@{viewModel.isSpeakerSelected}"
-                    android:src="@drawable/icon_toggle_speaker"
-                    android:visibility="@{viewModel.audioRoutesEnabled ? View.GONE : View.VISIBLE}" />
-
-                <ImageView
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:background="@drawable/button_toggle_background_reverse"
-                    android:contentDescription="@string/content_description_toggle_audio_menu"
-                    android:enabled="@{!viewModel.joinInProgress}"
-                    android:onClick="@{() -> viewModel.toggleAudioRoutesMenu()}"
-                    android:padding="5dp"
-                    android:selected="@{viewModel.audioRoutesSelected}"
-                    android:src="@drawable/icon_audio_routes"
-                    android:visibility="@{viewModel.audioRoutesEnabled ? View.VISIBLE : View.GONE, default=gone}" />
-
-            </RelativeLayout>
-
-            <ImageView
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_marginStart="5dp"
-                android:background="@drawable/button_background_reverse"
-                android:contentDescription="@{viewModel.isVideoEnabled ? @string/content_description_disable_video : @string/content_description_enable_video}"
-                android:enabled="@{!viewModel.isConferenceBroadcastWithListenerRole &amp;&amp; !viewModel.joinInProgress &amp;&amp; viewModel.isVideoAvailable &amp;&amp; !viewModel.isLowBandwidth}"
-                android:onClick="@{() -> viewModel.toggleVideo()}"
-                android:padding="5dp"
-                android:selected="@{viewModel.isVideoEnabled}"
-                android:visibility="@{viewModel.hideVideo ? View.GONE : View.VISIBLE}"
-                android:src="@drawable/icon_toggle_camera"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintDimensionRatio="W,1:1"
-                app:layout_constraintStart_toEndOf="@id/speaker" />
-
-            <ImageView
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_marginEnd="20dp"
-                android:background="@drawable/button_toggle_background_reverse"
-                android:contentDescription="@string/content_description_toggle_layout_menu"
-                android:enabled="@{!viewModel.joinInProgress &amp;&amp; !viewModel.isLowBandwidth}"
-                android:onClick="@{() -> viewModel.toggleLayoutMenu()}"
-                android:padding="10dp"
-                android:selected="@{viewModel.layoutMenuSelected}"
-                android:src="@{viewModel.selectedLayout == ConferenceDisplayMode.ACTIVE_SPEAKER ? @drawable/icon_conference_layout_active_speaker : viewModel.selectedLayout == ConferenceDisplayMode.AUDIO_ONLY ? @drawable/icon_conference_layout_audio_only : @drawable/icon_conference_layout_grid, default=@drawable/icon_conference_layout_grid}"
-                android:visibility="@{viewModel.hideVideo ? View.GONE : View.VISIBLE}"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintDimensionRatio="W,1:1"
-                app:layout_constraintEnd_toEndOf="parent" />
-
-        </androidx.constraintlayout.widget.ConstraintLayout>
-
-    </RelativeLayout>
-
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/conferences_scheduled_fragment.xml b/app/src/main/res/layout/conferences_scheduled_fragment.xml
deleted file mode 100644
index a4cd5f7e7..000000000
--- a/app/src/main/res/layout/conferences_scheduled_fragment.xml
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools">
-
-    <data>
-        <import type="android.view.View" />
-        <variable
-            name="newConferenceClickListener"
-            type="android.view.View.OnClickListener"/>
-        <variable
-            name="viewModel"
-            type="org.linphone.activities.main.conference.viewmodels.ScheduledConferencesViewModel" />
-    </data>
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical"
-        android:background="?attr/voipBackgroundBWColor">
-
-        <LinearLayout
-            android:id="@+id/top_bar"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/main_activity_top_bar_size"
-            android:layout_gravity="center_horizontal"
-            android:background="?attr/voipToolbarBackgroundColor"
-            android:orientation="horizontal">
-
-            <ImageView
-                android:id="@+id/back"
-                android:contentDescription="@string/content_description_go_back"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="0.2"
-                android:padding="18dp"
-                android:src="@drawable/back" />
-
-            <TextView
-                style="@style/accent_colored_title_font"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="0.6"
-                android:gravity="center"
-                android:singleLine="true"
-                android:ellipsize="end"
-                android:padding="15dp"
-                android:text="@string/conference_scheduled"/>
-
-            <ImageView
-                android:onClick="@{newConferenceClickListener}"
-                android:contentDescription="@string/content_description_create_conference"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="0.2"
-                android:padding="5dp"
-                android:src="@drawable/icon_video_conf_new" />
-
-        </LinearLayout>
-
-        <androidx.fragment.app.FragmentContainerView
-            android:id="@+id/list_edit_top_bar_fragment"
-            android:name="org.linphone.activities.main.fragments.ListTopBarFragment"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/main_activity_top_bar_size"
-            android:layout_alignTop="@id/top_bar"
-            tools:layout="@layout/list_edit_top_bar_fragment" />
-
-        <com.google.android.material.chip.ChipGroup
-            android:id="@+id/chips"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/top_bar"
-            android:layout_marginStart="10dp"
-            android:layout_marginEnd="10dp">
-
-            <com.google.android.material.chip.Chip
-                style="@style/Widget.MaterialComponents.Chip.Choice"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:onCheckedChanged="@{() -> viewModel.applyFilter()}"
-                android:checked="@={viewModel.showTerminated, default=false}"
-                android:text="@string/conference_scheduled_terminated_filter" />
-
-            <com.google.android.material.chip.Chip
-                style="@style/Widget.MaterialComponents.Chip.Choice"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:onCheckedChanged="@{() -> viewModel.applyFilter()}"
-                android:checked="@={!viewModel.showTerminated, default=true}"
-                android:text="@string/conference_scheduled_future_filter" />
-
-        </com.google.android.material.chip.ChipGroup>
-
-        <View
-            android:id="@+id/divider"
-            android:layout_below="@id/chips"
-            android:layout_width="wrap_content"
-            android:layout_height="1dp"
-            android:background="?attr/dividerColor" />
-
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/conference_info_list"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_marginBottom="10dp"
-            android:layout_below="@id/divider" />
-
-        <TextView
-            style="@style/empty_list_font"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:gravity="center"
-            android:text="@string/conference_no_schedule"
-            android:visibility="@{!viewModel.showTerminated &amp;&amp; viewModel.conferences.empty ? View.VISIBLE : View.GONE}" />
-
-        <TextView
-            style="@style/empty_list_font"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:gravity="center"
-            android:text="@string/conference_no_terminated_schedule"
-            android:visibility="@{viewModel.showTerminated &amp;&amp; viewModel.conferences.empty ? View.VISIBLE : View.GONE, default=gone}" />
-    </RelativeLayout>
-
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/contact_detail_cell.xml b/app/src/main/res/layout/contact_detail_cell.xml
deleted file mode 100644
index f07e7a3c3..000000000
--- a/app/src/main/res/layout/contact_detail_cell.xml
+++ /dev/null
@@ -1,145 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <data>
-        <import type="android.view.View" />
-        <variable
-            name="data"
-            type="org.linphone.activities.main.contact.data.ContactNumberOrAddressData" />
-    </data>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical">
-
-        <View
-            android:layout_width="wrap_content"
-            android:layout_height="1dp"
-            android:layout_marginLeft="10dp"
-            android:layout_marginRight="10dp"
-            android:background="?attr/dividerColor" />
-
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-
-            <TextView
-                android:text="@{data.sip ? @string/sip_address : @string/phone_number}"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerInParent="true"
-                android:layout_marginTop="10dp"
-                android:textAllCaps="true"
-                android:textColor="?attr/primarySubtextDarkColor" />
-
-            <ImageView
-                android:visibility="@{data.hasPresence ? View.VISIBLE : View.GONE}"
-                android:contentDescription="@string/content_description_linphone_user"
-                android:layout_width="20dp"
-                android:layout_height="20dp"
-                android:layout_alignParentRight="true"
-                android:layout_centerVertical="true"
-                android:layout_marginRight="10dp"
-                android:adjustViewBounds="true"
-                android:scaleType="centerInside"
-                android:src="@drawable/linphone_logo_tinted" />
-
-            <TextView
-                android:visibility="@{data.showInvite ? View.VISIBLE : View.GONE}"
-                android:onClick="@{() -> data.smsInvite()}"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentRight="true"
-                android:layout_centerVertical="true"
-                android:layout_marginRight="10dp"
-                android:padding="10dp"
-                android:text="@string/contact_invite_friend"
-                android:textColor="?attr/accentColor"
-                android:textSize="16.7sp"
-                android:fontFamily="sans-serif"
-                android:lineSpacingExtra="16.7sp" />
-
-        </RelativeLayout>
-
-        <TextView
-            android:text="@{data.displayedValue}"
-            style="@style/contact_name_list_cell_font"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:fadingEdge="horizontal"
-            android:gravity="center"
-            android:marqueeRepeatLimit="marquee_forever"
-            android:textIsSelectable="true"
-            android:scrollHorizontally="true"
-            android:singleLine="true" />
-
-        <TextView
-            android:text="@{data.typeLabel}"
-            android:visibility="@{data.typeLabel.length() > 0 ? View.VISIBLE : View.GONE, default=gone}"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:textColor="?attr/primarySubtextDarkColor"
-            android:textSize="13sp" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:orientation="horizontal">
-
-            <ImageView
-                android:onClick="@{() -> data.startCall()}"
-                android:enabled="@{data.address != null}"
-                android:contentDescription="@string/content_description_start_call"
-                android:layout_width="60dp"
-                android:layout_height="60dp"
-                android:layout_margin="10dp"
-                android:background="@drawable/round_orange_button_background"
-                android:src="@drawable/call_start_default" />
-
-            <ImageView
-                android:onClick="@{() -> data.startChat(false)}"
-                android:enabled="@{data.address != null}"
-                android:visibility="@{data.chatAllowed &amp;&amp; !data.hidePlainChat ? View.VISIBLE : View.GONE}"
-                android:contentDescription="@string/content_description_start_chat"
-                android:layout_width="60dp"
-                android:layout_height="60dp"
-                android:layout_margin="10dp"
-                android:background="@drawable/round_orange_button_background"
-                android:src="@drawable/chat_start_default" />
-
-            <RelativeLayout
-                android:onClick="@{() -> data.startChat(true)}"
-                android:enabled="@{data.address != null}"
-                android:visibility="@{data.chatAllowed &amp;&amp; data.showSecureChat ? View.VISIBLE : View.GONE}"
-                android:layout_width="70dp"
-                android:layout_height="60dp"
-                android:layout_margin="10dp">
-
-                <ImageView
-                    android:contentDescription="@string/content_description_start_encrypted_chat"
-                    android:layout_width="60dp"
-                    android:layout_height="60dp"
-                    android:layout_alignParentLeft="true"
-                    android:layout_centerVertical="true"
-                    android:background="@drawable/round_orange_button_background"
-                    android:src="@drawable/chat_start_default" />
-
-                <ImageView
-                    android:layout_width="21dp"
-                    android:layout_height="21dp"
-                    android:layout_marginTop="4dp"
-                    android:layout_alignParentTop="true"
-                    android:layout_alignParentRight="true"
-                    android:contentDescription="@string/content_description_start_encrypted_chat"
-                    android:src="@drawable/security_toggle_icon_green" />
-
-            </RelativeLayout>
-
-        </LinearLayout>
-
-    </LinearLayout>
-
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/contact_detail_fragment.xml b/app/src/main/res/layout/contact_detail_fragment.xml
deleted file mode 100644
index fe3f75ee4..000000000
--- a/app/src/main/res/layout/contact_detail_fragment.xml
+++ /dev/null
@@ -1,148 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools">
-
-    <data>
-        <import type="android.view.View" />
-        <import type="org.linphone.core.ConsolidatedPresence"/>
-        <variable
-            name="deleteClickListener"
-            type="android.view.View.OnClickListener"/>
-        <variable
-            name="editClickListener"
-            type="android.view.View.OnClickListener"/>
-        <variable
-            name="viewModel"
-            type="org.linphone.activities.main.contact.viewmodels.ContactViewModel" />
-        <variable
-            name="sharedMainViewModel"
-            type="org.linphone.activities.main.viewmodels.SharedMainViewModel" />
-    </data>
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <LinearLayout
-            android:id="@+id/top_bar"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/main_activity_top_bar_size"
-            android:background="?attr/lightToolbarBackgroundColor"
-            android:orientation="horizontal">
-
-            <ImageView
-                android:id="@+id/back"
-                android:visibility="@{sharedMainViewModel.isSlidingPaneSlideable ? View.VISIBLE : View.GONE}"
-                android:contentDescription="@string/content_description_go_back"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="0.2"
-                android:background="?attr/button_background_drawable"
-                android:padding="18dp"
-                android:src="@drawable/back" />
-
-            <View
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="0.4" />
-
-            <ImageView
-                android:onClick="@{editClickListener}"
-                android:visibility="@{viewModel.isNativeContact &amp;&amp; !viewModel.readOnlyNativeAddressBook ? View.VISIBLE : View.INVISIBLE}"
-                android:contentDescription="@string/content_description_edit_contact"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="0.2"
-                android:background="?attr/button_background_drawable"
-                android:padding="15dp"
-                android:src="@drawable/edit" />
-
-            <ImageView
-                android:onClick="@{deleteClickListener}"
-                android:visibility="@{viewModel.isNativeContact &amp;&amp; !viewModel.readOnlyNativeAddressBook ? View.VISIBLE : View.INVISIBLE}"
-                android:contentDescription="@string/content_description_delete_contact"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="0.2"
-                android:background="?attr/button_background_drawable"
-                android:padding="15dp"
-                android:src="@drawable/delete" />
-
-        </LinearLayout>
-
-        <androidx.core.widget.NestedScrollView
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_below="@id/top_bar">
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:gravity="center"
-                android:orientation="vertical"
-                android:paddingTop="20dp">
-
-                <RelativeLayout
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content">
-
-                    <ImageView
-                        android:id="@+id/avatar"
-                        android:layout_width="@dimen/contact_avatar_big_size"
-                        android:layout_height="@dimen/contact_avatar_big_size"
-                        coilContactBig="@{viewModel}"
-                        android:background="@drawable/generated_avatar_bg"
-                        android:src="@drawable/voip_single_contact_avatar"
-                        android:contentDescription="@null" />
-
-                    <ImageView
-                        android:layout_width="@dimen/contact_presence_big_badge_size"
-                        android:layout_height="@dimen/contact_presence_big_badge_size"
-                        android:layout_alignBottom="@id/avatar"
-                        android:layout_marginStart="70dp"
-                        android:adjustViewBounds="true"
-                        android:background="@drawable/led_background"
-                        android:padding="@dimen/contact_presence_big_badge_padding"
-                        app:presenceIcon="@{viewModel.presenceStatus}"
-                        android:visibility="@{viewModel.presenceStatus == ConsolidatedPresence.Offline ? View.GONE : View.VISIBLE, default=gone}"
-                        tools:ignore="ContentDescription" />
-
-                </RelativeLayout>
-
-                <TextView
-                    android:text="@{viewModel.contact.name ?? viewModel.displayName}"
-                    style="@style/big_contact_name_font"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:gravity="center_horizontal"
-                    android:layout_gravity="center" />
-
-                <org.linphone.views.MarqueeTextView
-                    android:visibility="@{viewModel.displayOrganization ? View.VISIBLE : View.GONE}"
-                    android:text="@{viewModel.contact.organization}"
-                    style="@style/contact_organization_font"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:singleLine="true" />
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:paddingTop="10dp"
-                    android:orientation="vertical"
-                    app:entries="@{viewModel.numbersAndAddresses}"
-                    app:layout="@{@layout/contact_detail_cell}"/>
-
-            </LinearLayout>
-
-        </androidx.core.widget.NestedScrollView>
-
-        <include
-            layout="@layout/wait_layout"
-            tools:visibility="@{viewModel.waitForChatRoomCreation}"/>
-
-    </RelativeLayout>
-
-</layout>
diff --git a/app/src/main/res/layout/contact_editor_fragment.xml b/app/src/main/res/layout/contact_editor_fragment.xml
deleted file mode 100644
index 235d4c0fc..000000000
--- a/app/src/main/res/layout/contact_editor_fragment.xml
+++ /dev/null
@@ -1,213 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <data>
-        <import type="android.view.View"/>
-        <variable
-            name="avatarClickListener"
-            type="android.view.View.OnClickListener"/>
-        <variable
-            name="saveChangesClickListener"
-            type="android.view.View.OnClickListener"/>
-        <variable
-            name="viewModel"
-            type="org.linphone.activities.main.contact.data.ContactEditorData" />
-    </data>
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <LinearLayout
-            android:id="@+id/top_bar"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/main_activity_top_bar_size"
-            android:background="?attr/lightToolbarBackgroundColor"
-            android:orientation="horizontal">
-
-            <ImageView
-                android:id="@+id/back"
-                android:contentDescription="@string/content_description_discard_changes"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="0.2"
-                android:background="?attr/button_background_drawable"
-                android:padding="10dp"
-                android:src="@drawable/cancel" />
-
-            <View
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="0.6" />
-
-            <ImageView
-                android:id="@+id/ok"
-                android:enabled="@{!viewModel.firstName.empty || !viewModel.lastName.empty}"
-                android:contentDescription="@string/content_description_confirm_contact_edit"
-                android:onClick="@{saveChangesClickListener}"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="0.2"
-                android:background="?attr/button_background_drawable"
-                android:padding="18dp"
-                android:src="@drawable/valid" />
-
-        </LinearLayout>
-
-        <androidx.core.widget.NestedScrollView
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_below="@id/top_bar">
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:gravity="center"
-                android:orientation="vertical"
-                android:paddingTop="20dp"
-                android:layout_marginLeft="10dp"
-                android:layout_marginRight="10dp">
-
-                <FrameLayout
-                    android:layout_width="@dimen/contact_avatar_big_size"
-                    android:layout_height="@dimen/contact_avatar_big_size">
-
-                    <ImageView
-                        android:id="@+id/avatar"
-                        android:onClick="@{avatarClickListener}"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        coilContactBig="@{viewModel}"
-                        android:background="@drawable/generated_avatar_bg"
-                        android:src="@drawable/voip_single_contact_avatar"
-                        android:contentDescription="@null" />
-
-                    <ImageView
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:contentDescription="@string/content_description_change_contact_picture"
-                        coilGoneIfError="@{viewModel.tempPicturePath}"/>
-
-                </FrameLayout>
-
-                <com.google.android.material.textfield.TextInputLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:hint="@string/contact_last_name">
-
-                    <com.google.android.material.textfield.TextInputEditText
-                        android:text="@={viewModel.lastName}"
-                        android:imeOptions="actionDone"
-                        android:singleLine="true"
-                        android:inputType="textPersonName|textCapWords"
-                        android:background="@color/transparent_color"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"/>
-
-                </com.google.android.material.textfield.TextInputLayout>
-
-                <com.google.android.material.textfield.TextInputLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:hint="@string/contact_first_name">
-
-                    <com.google.android.material.textfield.TextInputEditText
-                        android:text="@={viewModel.firstName}"
-                        android:imeOptions="actionDone"
-                        android:singleLine="true"
-                        android:inputType="textPersonName|textCapWords"
-                        android:background="@color/transparent_color"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"/>
-
-                </com.google.android.material.textfield.TextInputLayout>
-
-                <com.google.android.material.textfield.TextInputLayout
-                    android:visibility="@{viewModel.displayOrganization ? View.VISIBLE : View.GONE}"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:hint="@string/contact_organization">
-
-                    <com.google.android.material.textfield.TextInputEditText
-                        android:text="@={viewModel.organization}"
-                        android:imeOptions="actionDone"
-                        android:singleLine="true"
-                        android:inputType="textPersonName|textCapWords"
-                        android:background="@color/transparent_color"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"/>
-
-                </com.google.android.material.textfield.TextInputLayout>
-
-                <RelativeLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="40dp"
-                    android:layout_marginTop="10dp"
-                    android:layout_gravity="center">
-
-                    <TextView
-                        style="@style/contact_edit_form_label_font"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_centerVertical="true"
-                        android:text="@string/sip_addresses"
-                        android:textAllCaps="true" />
-
-                    <ImageView
-                        android:onClick="@{() -> viewModel.addEmptySipAddress()}"
-                        android:contentDescription="@string/content_description_add_sip_address_field"
-                        android:layout_width="30dp"
-                        android:layout_height="30dp"
-                        android:layout_alignParentRight="true"
-                        android:layout_centerVertical="true"
-                        android:src="@drawable/field_add" />
-
-                </RelativeLayout>
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="vertical"
-                    app:entries="@{viewModel.addresses}"
-                    app:layout="@{@layout/contact_number_address_editor_cell}"/>
-
-                <RelativeLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="40dp"
-                    android:layout_marginTop="10dp"
-                    android:layout_gravity="center">
-
-                    <TextView
-                        style="@style/contact_edit_form_label_font"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_centerVertical="true"
-                        android:text="@string/phone_numbers"
-                        android:textAllCaps="true" />
-
-                    <ImageView
-                        android:onClick="@{() -> viewModel.addEmptyPhoneNumber()}"
-                        android:contentDescription="@string/content_description_add_phone_number_field"
-                        android:layout_width="30dp"
-                        android:layout_height="30dp"
-                        android:layout_alignParentRight="true"
-                        android:layout_centerVertical="true"
-                        android:src="@drawable/field_add" />
-
-                </RelativeLayout>
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="vertical"
-                    app:entries="@{viewModel.numbers}"
-                    app:layout="@{@layout/contact_number_address_editor_cell}"/>
-
-            </LinearLayout>
-
-        </androidx.core.widget.NestedScrollView>
-
-    </RelativeLayout>
-
-</layout>
diff --git a/app/src/main/res/layout/contact_list_cell.xml b/app/src/main/res/layout/contact_list_cell.xml
deleted file mode 100644
index 33cb88757..000000000
--- a/app/src/main/res/layout/contact_list_cell.xml
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools">
-
-    <data>
-        <import type="android.view.View"/>
-        <import type="org.linphone.core.ConsolidatedPresence"/>
-        <variable
-            name="clickListener"
-            type="android.view.View.OnClickListener"/>
-        <variable
-            name="longClickListener"
-            type="android.view.View.OnLongClickListener"/>
-        <variable
-            name="position"
-            type="Integer"/>
-        <variable
-            name="viewModel"
-            type="org.linphone.activities.main.contact.viewmodels.ContactViewModel" />
-        <variable
-            name="selectionListViewModel"
-            type="org.linphone.activities.main.viewmodels.ListTopBarViewModel" />
-    </data>
-
-    <RelativeLayout
-        android:onClick="@{clickListener}"
-        android:onLongClick="@{longClickListener}"
-        android:layout_width="match_parent"
-        android:layout_height="50dp"
-        android:paddingTop="5dp"
-        android:paddingBottom="5dp"
-        android:layout_marginLeft="10dp"
-        android:layout_marginRight="10dp"
-        android:background="?attr/backgroundColor"
-        android:gravity="center_vertical">
-
-        <ImageView
-            android:id="@+id/avatar"
-            android:layout_width="@dimen/contact_avatar_size"
-            android:layout_height="@dimen/contact_avatar_size"
-            coilContact="@{viewModel}"
-            android:layout_marginRight="10dp"
-            android:layout_centerVertical="true"
-            android:background="@drawable/generated_avatar_bg"
-            android:src="@drawable/voip_single_contact_avatar"
-            android:contentDescription="@null" />
-
-        <ImageView
-            android:layout_width="@dimen/contact_presence_badge_size"
-            android:layout_height="@dimen/contact_presence_badge_size"
-            android:layout_alignBottom="@id/avatar"
-            android:layout_marginStart="25dp"
-            android:adjustViewBounds="true"
-            android:background="@drawable/led_background"
-            android:padding="@dimen/contact_presence_badge_padding"
-            app:presenceIcon="@{viewModel.presenceStatus}"
-            android:visibility="@{viewModel.presenceStatus == ConsolidatedPresence.Offline ? View.GONE : View.VISIBLE, default=gone}"
-            tools:ignore="ContentDescription" />
-
-        <LinearLayout
-            android:id="@+id/right"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:layout_centerVertical="true"
-            android:layout_alignParentRight="true">
-
-            <ImageView
-                android:layout_width="20dp"
-                android:layout_height="20dp"
-                android:adjustViewBounds="true"
-                android:scaleType="centerInside"
-                android:src="@drawable/linphone_logo_tinted"
-                android:layout_marginRight="10dp"
-                android:contentDescription="@string/content_description_linphone_user"
-                android:visibility="@{viewModel.hasLongTermPresence ? View.VISIBLE : View.GONE, default=gone}" />
-
-            <CheckBox
-                android:onClick="@{() -> selectionListViewModel.onToggleSelect(position)}"
-                android:visibility="@{selectionListViewModel.isEditionEnabled &amp;&amp; viewModel.isNativeContact ? View.VISIBLE : View.GONE, default=gone}"
-                android:checked="@{selectionListViewModel.selectedItems.contains(position)}"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:paddingLeft="5dp"
-                android:paddingRight="5dp" />
-
-        </LinearLayout>
-
-        <RelativeLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:layout_toLeftOf="@id/right"
-            android:layout_toRightOf="@id/avatar">
-
-            <org.linphone.views.MarqueeTextView
-                android:id="@+id/name"
-                android:text="@{viewModel.contact.name ?? viewModel.displayName}"
-                style="@style/contact_name_list_cell_font"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentTop="true"
-                android:singleLine="true" />
-
-            <org.linphone.views.MarqueeTextView
-                android:id="@+id/contactOrganization"
-                android:text="@{viewModel.contact.organization}"
-                android:visibility="@{viewModel.displayOrganization &amp;&amp; viewModel.contact.organization.length() > 0 ? View.VISIBLE : View.GONE}"
-                style="@style/contact_organization_font"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_alignParentBottom="true"
-                android:singleLine="true" />
-
-        </RelativeLayout>
-
-    </RelativeLayout>
-
-</layout>
diff --git a/app/src/main/res/layout/contact_master_fragment.xml b/app/src/main/res/layout/contact_master_fragment.xml
deleted file mode 100644
index cd9dd2e14..000000000
--- a/app/src/main/res/layout/contact_master_fragment.xml
+++ /dev/null
@@ -1,214 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <data>
-        <import type="android.view.View"/>
-        <variable
-            name="allContactsToggleClickListener"
-            type="android.view.View.OnClickListener"/>
-        <variable
-            name="sipContactsToggleClickListener"
-            type="android.view.View.OnClickListener"/>
-        <variable
-            name="newContactClickListener"
-            type="android.view.View.OnClickListener"/>
-        <variable
-            name="editClickListener"
-            type="android.view.View.OnClickListener"/>
-        <variable
-            name="viewModel"
-            type="org.linphone.activities.main.contact.viewmodels.ContactsListViewModel" />
-    </data>
-
-    <androidx.slidingpanelayout.widget.SlidingPaneLayout
-        android:id="@+id/sliding_pane"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        tools:context=".MainActivity">
-
-        <RelativeLayout
-            android:layout_width="@dimen/master_fragment_width"
-            android:layout_height="match_parent"
-            android:background="?attr/backgroundColor"
-            android:layout_gravity="start">
-
-            <LinearLayout
-                android:id="@+id/top_bar"
-                android:layout_width="match_parent"
-                android:layout_height="@dimen/main_activity_top_bar_size"
-                android:background="?attr/lightToolbarBackgroundColor"
-                android:orientation="horizontal">
-
-                <RelativeLayout
-                    android:layout_width="0dp"
-                    android:layout_height="match_parent"
-                    android:layout_weight="0.2"
-                    android:visibility="@{viewModel.onlyShowSipContactsList ? View.GONE : View.VISIBLE}">
-
-                    <ImageView
-                        android:onClick="@{allContactsToggleClickListener}"
-                        android:enabled="@{viewModel.sipContactsSelected}"
-                        android:contentDescription="@string/content_description_show_all_contacts"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:background="?attr/button_background_drawable"
-                        android:padding="15dp"
-                        android:src="@drawable/contacts_all" />
-
-                    <View
-                        android:visibility="@{viewModel.sipContactsSelected ? View.GONE : View.VISIBLE}"
-                        android:layout_width="match_parent"
-                        android:layout_height="5dp"
-                        android:layout_alignParentBottom="true"
-                        android:background="?attr/accentColor" />
-
-                </RelativeLayout>
-
-                <RelativeLayout
-                    android:layout_width="0dp"
-                    android:layout_height="match_parent"
-                    android:layout_weight="0.2"
-                    android:visibility="@{viewModel.hideSipContactsList ? View.GONE : View.VISIBLE}">
-
-                    <ImageView
-                        android:onClick="@{sipContactsToggleClickListener}"
-                        android:enabled="@{!viewModel.sipContactsSelected}"
-                        android:contentDescription="@string/content_description_show_sip_contacts"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:background="?attr/button_background_drawable"
-                        android:gravity="center"
-                        android:padding="15dp"
-                        android:src="@drawable/contacts_sip" />
-
-                    <View
-                        android:visibility="@{viewModel.sipContactsSelected ? View.VISIBLE : View.GONE}"
-                        android:layout_width="match_parent"
-                        android:layout_height="5dp"
-                        android:layout_alignParentBottom="true"
-                        android:background="?attr/accentColor" />
-
-                </RelativeLayout>
-
-                <View
-                    android:layout_width="0dp"
-                    android:layout_height="match_parent"
-                    android:layout_weight="0.2"
-                    android:visibility="@{viewModel.onlyShowSipContactsList || viewModel.hideSipContactsList ? View.VISIBLE : View.GONE}" />
-
-                <View
-                    android:layout_width="0dp"
-                    android:layout_height="match_parent"
-                    android:layout_weight="0.2" />
-
-                <ImageView
-                    android:onClick="@{newContactClickListener}"
-                    android:contentDescription="@string/content_description_add_contact"
-                    android:layout_width="0dp"
-                    android:layout_height="match_parent"
-                    android:layout_weight="0.2"
-                    android:background="?attr/button_background_drawable"
-                    android:padding="15dp"
-                    android:src="@drawable/contact_add"
-                    android:visibility="@{viewModel.nativeAddressBookEnabled &amp;&amp; !viewModel.readOnlyNativeAddressBook ? View.VISIBLE : View.INVISIBLE}"/>
-
-                <ImageView
-                    android:onClick="@{editClickListener}"
-                    android:enabled="@{!viewModel.contactsList.empty}"
-                    android:contentDescription="@string/content_description_enter_edition_mode"
-                    android:layout_width="0dp"
-                    android:layout_height="match_parent"
-                    android:layout_weight="0.2"
-                    android:background="?attr/button_background_drawable"
-                    android:padding="15dp"
-                    android:src="@drawable/delete"
-                    android:visibility="@{viewModel.readOnlyNativeAddressBook ? View.INVISIBLE : View.VISIBLE}" />
-
-            </LinearLayout>
-
-            <androidx.fragment.app.FragmentContainerView
-                android:id="@+id/list_edit_top_bar_fragment"
-                android:name="org.linphone.activities.main.fragments.ListTopBarFragment"
-                android:layout_width="match_parent"
-                android:layout_height="@dimen/main_activity_top_bar_size"
-                android:layout_alignTop="@id/top_bar"
-                tools:layout="@layout/list_edit_top_bar_fragment" />
-
-            <EditText
-                android:id="@+id/searchBar"
-                android:text="@={viewModel.filter}"
-                android:layout_width="match_parent"
-                android:layout_height="40dp"
-                android:layout_below="@id/top_bar"
-                android:layout_margin="10dp"
-                android:inputType="textPersonName|textNoSuggestions"
-                android:drawableLeft="@drawable/search"
-                android:drawablePadding="10dp"
-                android:background="@color/transparent_color"
-                android:backgroundTint="@color/transparent_color"
-                android:hint="@string/contact_filter_hint"/>
-
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:layout_below="@id/searchBar"
-                android:background="?attr/dividerColor" />
-
-            <androidx.recyclerview.widget.RecyclerView
-                android:id="@+id/contactsList"
-                android:layout_below="@id/searchBar"
-                android:layout_marginTop="5dp"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent" />
-
-            <RelativeLayout
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_below="@id/searchBar">
-
-                <TextView
-                    style="@style/empty_list_font"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_centerVertical="true"
-                    android:gravity="center"
-                    android:text="@string/no_sip_contact"
-                    android:visibility="@{viewModel.sipContactsSelected &amp;&amp; viewModel.contactsList.empty ? View.VISIBLE : View.GONE}" />
-
-                <TextView
-                    style="@style/empty_list_font"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_centerVertical="true"
-                    android:gravity="center"
-                    android:text="@string/no_contact"
-                    android:visibility="@{!viewModel.sipContactsSelected &amp;&amp; viewModel.contactsList.empty ? View.VISIBLE : View.GONE}" />
-
-                <include
-                    layout="@layout/wait_layout"
-                    app:visibility="@{viewModel.fetchInProgress}"/>
-
-            </RelativeLayout>
-
-            <View
-                android:layout_width="1dp"
-                android:layout_height="match_parent"
-                android:layout_alignParentRight="true"
-                android:background="?attr/dividerColor" />
-
-        </RelativeLayout>
-
-        <androidx.fragment.app.FragmentContainerView
-            android:id="@+id/contacts_nav_container"
-            android:name="androidx.navigation.fragment.NavHostFragment"
-            android:layout_width="300dp"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            app:defaultNavHost="false"
-            app:navGraph="@navigation/contacts_nav_graph"/>
-
-    </androidx.slidingpanelayout.widget.SlidingPaneLayout>
-
-</layout>
diff --git a/app/src/main/res/layout/contact_number_address_editor_cell.xml b/app/src/main/res/layout/contact_number_address_editor_cell.xml
deleted file mode 100644
index dceaa1e5c..000000000
--- a/app/src/main/res/layout/contact_number_address_editor_cell.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android">
-    <data>
-        <import type="android.view.View" />
-        <import type="android.text.InputType" />
-        <variable
-            name="data"
-            type="org.linphone.activities.main.contact.data.NumberOrAddressEditorData" />
-    </data>
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:visibility="@{data.toRemove ? View.GONE : View.VISIBLE, default=visible}"
-        android:paddingBottom="5dp">
-
-        <com.google.android.material.textfield.TextInputLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_toLeftOf="@id/delete"
-            android:paddingRight="5dp"
-            android:hint="@{data.sipAddress ? @string/sip_address : @string/phone_number, default=@string/sip_address}">
-
-            <com.google.android.material.textfield.TextInputEditText
-                android:text="@={data.newValue}"
-                android:imeOptions="actionDone"
-                android:singleLine="true"
-                android:inputType="@{data.sipAddress ? InputType.TYPE_TEXT_VARIATION_EMAIL_ADDRESS : InputType.TYPE_CLASS_PHONE}"
-                android:background="@color/transparent_color"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"/>
-
-        </com.google.android.material.textfield.TextInputLayout>
-
-        <ImageView
-            android:id="@+id/delete"
-            android:onClick="@{() -> data.remove()}"
-            android:contentDescription="@string/content_description_clear_field"
-            android:layout_width="30dp"
-            android:layout_height="30dp"
-            android:layout_alignParentRight="true"
-            android:layout_centerVertical="true"
-            android:src="@drawable/field_remove"
-            android:layout_marginLeft="5dp" />
-
-    </RelativeLayout>
-
-</layout>
diff --git a/app/src/main/res/layout/contact_selected_cell.xml b/app/src/main/res/layout/contact_selected_cell.xml
deleted file mode 100644
index 760a086c8..000000000
--- a/app/src/main/res/layout/contact_selected_cell.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <data>
-        <import type="android.view.View"/>
-        <variable
-            name="data"
-            type="org.linphone.core.Address" />
-        <variable
-            name="parent"
-            type="org.linphone.contact.ContactsSelectionViewModel" />
-    </data>
-
-    <LinearLayout
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:orientation="horizontal"
-        android:gravity="center_vertical|left"
-        android:layout_marginRight="5dp">
-
-        <ImageView
-            android:onClick="@{() -> parent.toggleSelectionForAddress(data)}"
-            android:contentDescription="@string/content_description_remove_contact_from_selection"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_marginRight="3dp"
-            android:gravity="center"
-            android:src="@drawable/chat_group_delete" />
-
-        <TextView
-            android:text="@{data.displayName ?? data.username}"
-            style="@style/contact_name_list_cell_font"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_marginRight="5dp"
-            android:gravity="center"
-            android:lines="1"
-            android:scrollHorizontally="true" />
-
-    </LinearLayout>
-
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/contact_selection_cell.xml b/app/src/main/res/layout/contact_selection_cell.xml
deleted file mode 100644
index 7b9c69e78..000000000
--- a/app/src/main/res/layout/contact_selection_cell.xml
+++ /dev/null
@@ -1,133 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools">
-
-    <data>
-        <import type="android.view.View"/>
-        <import type="org.linphone.core.ConsolidatedPresence"/>
-        <variable
-            name="clickListener"
-            type="android.view.View.OnClickListener"/>
-        <variable
-            name="data"
-            type="org.linphone.contact.ContactSelectionData" />
-    </data>
-
-    <FrameLayout
-        android:layout_width="match_parent"
-        android:layout_height="60dp">
-
-        <RelativeLayout
-            android:onClick="@{clickListener}"
-            android:enabled="@{!data.isDisabled}"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:gravity="center_vertical"
-            android:orientation="vertical"
-            android:padding="5dp">
-
-            <RelativeLayout
-                android:id="@+id/avatar"
-                android:layout_width="45dp"
-                android:layout_height="wrap_content"
-                android:layout_centerVertical="true">
-
-                <ImageView
-                    android:id="@+id/avatar_icon"
-                    coilContact="@{data}"
-                    android:layout_width="@dimen/contact_avatar_size"
-                    android:layout_height="@dimen/contact_avatar_size"
-                    android:layout_alignParentStart="true"
-                    android:layout_centerHorizontal="true"
-                    android:background="@drawable/generated_avatar_bg"
-                    android:src="@drawable/voip_single_contact_avatar"
-                    android:contentDescription="@null" />
-
-                <ImageView
-                    android:layout_width="@dimen/contact_presence_badge_size"
-                    android:layout_height="@dimen/contact_presence_badge_size"
-                    android:layout_alignBottom="@id/avatar_icon"
-                    android:layout_marginStart="25dp"
-                    android:adjustViewBounds="true"
-                    android:background="@drawable/led_background"
-                    android:padding="@dimen/contact_presence_badge_padding"
-                    app:presenceIcon="@{data.presenceStatus}"
-                    android:visibility="@{data.presenceStatus == ConsolidatedPresence.Offline ? View.GONE : View.VISIBLE, default=gone}"
-                    tools:ignore="ContentDescription" />
-
-                <ImageView
-                    android:visibility="@{data.hasLimeX3DHCapability ? View.VISIBLE : View.GONE, default=gone}"
-                    android:layout_width="20dp"
-                    android:layout_height="20dp"
-                    android:layout_alignParentTop="true"
-                    android:layout_alignParentEnd="true"
-                    android:contentDescription="@string/content_description_contact_can_do_encryption"
-                    android:src="@drawable/security_toggle_icon_green" />
-
-            </RelativeLayout>
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_centerVertical="true"
-                android:layout_marginLeft="5dp"
-                android:layout_marginRight="5dp"
-                android:layout_toLeftOf="@id/linphone_user"
-                android:layout_toRightOf="@id/avatar"
-                android:gravity="center_vertical"
-                android:orientation="vertical">
-
-                <TextView
-                    style="@style/contact_name_list_cell_font"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:gravity="top|left"
-                    android:lines="1"
-                    android:text="@{data.contact.name ?? data.displayName}" />
-
-                <TextView
-                    style="@style/sip_uri_font"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:ellipsize="end"
-                    android:gravity="bottom|left"
-                    android:lines="1"
-                    android:text="@{data.sipUri}" />
-
-            </LinearLayout>
-
-            <ImageView
-                android:visibility="@{data.linphoneUser ? View.VISIBLE : View.INVISIBLE}"
-                android:id="@+id/linphone_user"
-                android:layout_width="30dp"
-                android:layout_height="30dp"
-                android:layout_toLeftOf="@id/contact_is_select"
-                android:layout_centerVertical="true"
-                android:paddingRight="10dp"
-                android:contentDescription="@string/content_description_linphone_user"
-                android:src="@drawable/linphone_logo_tinted" />
-
-            <ImageView
-                android:visibility="@{data.isSelected ? View.VISIBLE : View.INVISIBLE}"
-                android:id="@+id/contact_is_select"
-                android:layout_width="40dp"
-                android:layout_height="40dp"
-                android:layout_alignParentRight="true"
-                android:layout_centerInParent="true"
-                android:layout_gravity="right"
-                android:paddingRight="20dp"
-                android:contentDescription="@string/content_description_contact_selected"
-                android:src="@drawable/check_selected" />
-
-        </RelativeLayout>
-
-        <View
-            android:visibility="@{data.isDisabled ? View.VISIBLE : View.GONE}"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:background="@color/contact_disabled_color"/>
-
-    </FrameLayout>
-
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/contact_sync_account_picker_cell.xml b/app/src/main/res/layout/contact_sync_account_picker_cell.xml
deleted file mode 100644
index 7f0e5a42f..000000000
--- a/app/src/main/res/layout/contact_sync_account_picker_cell.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="40dp"
-    android:layout_gravity="center"
-    android:orientation="horizontal"
-    android:padding="5dp">
-
-    <ImageView
-        android:id="@+id/account_icon"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:contentDescription="@null"
-        android:adjustViewBounds="true"/>
-
-    <TextView
-        android:id="@+id/account_name"
-        style="@style/standard_text_font"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:paddingLeft="5dp" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/contact_sync_account_picker_fragment.xml b/app/src/main/res/layout/contact_sync_account_picker_fragment.xml
deleted file mode 100644
index cce12b119..000000000
--- a/app/src/main/res/layout/contact_sync_account_picker_fragment.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <data>
-        <import type="android.view.View"/>
-        <variable
-            name="localSyncAccountClickListener"
-            type="android.view.View.OnClickListener"/>
-    </data>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical"
-        android:background="?attr/backgroundColor">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:padding="10dp">
-
-            <TextView
-                style="@style/standard_text_font"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:gravity="center_vertical|center"
-                android:singleLine="true"
-                android:text="@string/contact_new_choose_sync_account" />
-
-        </LinearLayout>
-
-        <ListView
-            android:id="@+id/accountsList"
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_weight="1"
-            android:cacheColorHint="@color/transparent_color"
-            android:divider="@color/light_grey_color"
-            android:dividerHeight="1dp" />
-
-        <TextView
-            android:onClick="@{localSyncAccountClickListener}"
-            style="@style/button_font"
-            android:padding="10dp"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/contact_local_sync_account"
-            android:gravity="right" />
-
-    </LinearLayout>
-
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialer_fragment.xml b/app/src/main/res/layout/dialer_fragment.xml
deleted file mode 100644
index bfdbc5798..000000000
--- a/app/src/main/res/layout/dialer_fragment.xml
+++ /dev/null
@@ -1,140 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <data>
-        <import type="android.view.View"/>
-        <variable
-            name="newContactClickListener"
-            type="android.view.View.OnClickListener"/>
-        <variable
-            name="newConferenceClickListener"
-            type="android.view.View.OnClickListener"/>
-        <variable
-            name="transferCallClickListener"
-            type="android.view.View.OnClickListener"/>
-        <variable
-            name="viewModel"
-            type="org.linphone.activities.main.dialer.viewmodels.DialerViewModel"/>
-    </data>
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <RelativeLayout
-            android:id="@+id/address_bar"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/main_activity_top_bar_size"
-            android:layout_alignParentTop="true"
-            android:background="?attr/lightToolbarBackgroundColor">
-
-            <ImageView
-                android:id="@+id/erase"
-                android:onClick="@{() -> viewModel.eraseLastChar()}"
-                android:onLongClick="@{() -> viewModel.eraseAll()}"
-                android:contentDescription="@string/content_description_dialer_erase"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:paddingLeft="10dp"
-                android:paddingRight="10dp"
-                android:layout_alignParentRight="true"
-                android:layout_centerVertical="true"
-                android:focusableInTouchMode="true"
-                android:src="@drawable/backspace" />
-
-            <EditText
-                android:id="@+id/sip_uri_input"
-                android:text="@={viewModel.enteredUri}"
-                android:beforeTextChanged="@{(text, start, count, after) -> viewModel.onBeforeUriChanged(sipUriInput, count, after)}"
-                android:afterTextChanged="@{(text) -> viewModel.onAfterUriChanged(sipUriInput, text)}"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_centerVertical="true"
-                android:layout_toLeftOf="@id/erase"
-                android:background="@color/transparent_color"
-                android:backgroundTint="@color/transparent_color"
-                android:ellipsize="start"
-                android:hint="@string/dialer_address_bar_hint"
-                android:inputType="textEmailAddress|textUri|textNoSuggestions"
-                android:paddingLeft="20dp"
-                android:paddingRight="5dp"
-                android:textColorHint="@color/light_grey_color" />
-
-        </RelativeLayout>
-
-        <LinearLayout
-            android:id="@+id/controls"
-            android:layout_width="match_parent"
-            android:layout_height="60dp"
-            android:layout_alignParentBottom="true">
-
-            <ImageView
-                android:onClick="@{newConferenceClickListener}"
-                android:visibility="@{viewModel.scheduleConferenceAvailable ? View.VISIBLE : View.GONE}"
-                android:contentDescription="@string/content_description_create_conference"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight="2"
-                android:background="?attr/button_background_drawable"
-                android:padding="5dp"
-                android:src="@drawable/icon_video_conf_new" />
-
-            <ImageView
-                android:onClick="@{newContactClickListener}"
-                android:visibility="@{viewModel.scheduleConferenceAvailable || viewModel.hideAddContactButton ? View.GONE : View.VISIBLE, default=gone}"
-                android:enabled="@{viewModel.enteredUri.length() > 0}"
-                android:contentDescription="@string/content_description_add_contact"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight="2"
-                android:background="?attr/button_background_drawable"
-                android:padding="15dp"
-                android:src="@drawable/contact_add" />
-
-            <ImageView
-                android:onClick="@{() -> viewModel.startCall()}"
-                android:visibility="@{viewModel.atLeastOneCall ? View.GONE : View.VISIBLE}"
-                android:contentDescription="@string/content_description_start_call"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:background="@drawable/call"
-                android:padding="12dp"
-                android:src="@{viewModel.autoInitiateVideoCalls ? @drawable/call_video_start : @drawable/call_audio_start, default=@drawable/call_audio_start}" />
-
-            <ImageView
-                android:onClick="@{() -> viewModel.startCall()}"
-                android:visibility="@{viewModel.atLeastOneCall &amp;&amp; !viewModel.transferVisibility ? View.VISIBLE : View.GONE, default=gone}"
-                android:contentDescription="@string/content_description_add_call"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:background="@drawable/call"
-                android:padding="12dp"
-                android:src="@drawable/call_add" />
-
-            <ImageView
-                android:onClick="@{transferCallClickListener}"
-                android:visibility="@{viewModel.atLeastOneCall &amp;&amp; viewModel.transferVisibility ? View.VISIBLE : View.GONE, default=gone}"
-                android:contentDescription="@string/content_description_transfer_call"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:background="@drawable/call"
-                android:padding="12dp"
-                android:src="@drawable/call_transfer" />
-
-        </LinearLayout>
-
-        <include
-            layout="@layout/numpad"
-            android:layout_above="@id/controls"
-            android:layout_below="@id/address_bar"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            app:keyListener="@{viewModel.onKeyClick}" />
-
-    </RelativeLayout>
-
-</layout>
diff --git a/app/src/main/res/layout/dialog.xml b/app/src/main/res/layout/dialog.xml
deleted file mode 100644
index b5c779d75..000000000
--- a/app/src/main/res/layout/dialog.xml
+++ /dev/null
@@ -1,160 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <data>
-        <import type="android.view.View"/>
-        <import type="android.text.InputType"/>
-        <variable
-            name="viewModel"
-            type="org.linphone.activities.main.viewmodels.DialogViewModel" />
-    </data>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:gravity="center"
-        android:orientation="vertical"
-        android:focusable="true"
-        android:clickable="true">
-
-        <ImageView
-            android:layout_width="60dp"
-            android:layout_height="60dp"
-            android:layout_margin="15dp"
-            android:adjustViewBounds="true"
-            android:contentDescription="@{viewModel.title}"
-            android:src="@{viewModel.iconResource, default=@drawable/security_alert_indicator}"
-            android:visibility="@{viewModel.showIcon ? View.VISIBLE : View.GONE}" />
-
-        <TextView
-            style="@style/dialog_title_font"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_margin="15dp"
-            android:gravity="center"
-            android:text="@{viewModel.title, default=Title}"
-            android:visibility="@{viewModel.showTitle ? View.VISIBLE : View.GONE}" />
-
-        <TextView
-            style="@style/dialog_message_font"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_margin="15dp"
-            android:gravity="center"
-            android:text="@{viewModel.message, default=Message}"/>
-
-        <TextView
-            android:textColor="?attr/accentColor"
-            android:textSize="16sp"
-            android:textColorLink="@color/primary_color"
-            android:autoLink="web"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:text="@string/assistant_forgotten_password_link"
-            android:visibility="@{viewModel.showSubscribeLinphoneOrgLink ? View.VISIBLE : View.GONE}" />
-
-        <com.google.android.material.textfield.TextInputLayout
-            android:id="@+id/settings_input_layout"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_margin="@dimen/settings_margin"
-            android:hint="@{viewModel.passwordTitle}"
-            android:textColorHint="@color/white_color"
-            android:visibility="@{viewModel.showPassword ? View.VISIBLE : View.GONE}"
-            app:helperTextTextColor="@color/white_color"
-            app:helperText="@{viewModel.passwordSubtitle}"
-            app:helperTextEnabled="@{viewModel.passwordSubtitle.length() > 0}">
-
-            <org.linphone.views.SettingTextInputEditText
-                android:id="@+id/settings_input"
-                android:text="@={viewModel.password}"
-                android:imeOptions="actionDone"
-                android:inputType="@{InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD}"
-                android:maxLines="1"
-                android:background="@color/transparent_color"
-                android:textColor="@color/white_color"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"/>
-
-        </com.google.android.material.textfield.TextInputLayout>
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:layout_margin="5dp"
-            android:orientation="horizontal"
-            android:visibility="@{viewModel.showDoNotAskAgain ? View.VISIBLE : View.GONE}">
-
-            <com.google.android.material.switchmaterial.SwitchMaterial
-                android:checked="@={viewModel.doNotAskAgain}"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content" />
-
-            <TextView
-                style="@style/dialog_message_font"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="10dp"
-                android:text="@string/dialog_do_not_ask_again" />
-
-        </LinearLayout>
-
-        <com.google.android.flexbox.FlexboxLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:layout_margin="15dp"
-            android:gravity="center"
-            app:flexWrap="nowrap"
-            app:alignItems="center"
-            app:justifyContent="center">
-
-            <TextView
-                android:onClick="@{() -> viewModel.onCancelClicked()}"
-                style="@style/dialog_cancel_button_font"
-                android:layout_width="137dp"
-                android:layout_height="wrap_content"
-                android:layout_margin="10dp"
-                android:gravity="center"
-                android:background="@drawable/resizable_assistant_button"
-                android:ellipsize="end"
-                android:padding="10dp"
-                android:text="@{viewModel.cancelLabel ?? @string/dialog_cancel, default=@string/dialog_cancel}"
-                android:visibility="@{viewModel.showCancel ? View.VISIBLE : View.GONE}" />
-
-            <TextView
-                android:onClick="@{() -> viewModel.onDeleteClicked()}"
-                style="@style/dialog_action_button_font"
-                android:layout_width="137dp"
-                android:layout_height="wrap_content"
-                android:layout_margin="10dp"
-                android:gravity="center"
-                android:background="@drawable/resizable_assistant_button"
-                android:backgroundTint="@color/red_color"
-                android:ellipsize="end"
-                android:padding="10dp"
-                android:text="@{viewModel.deleteLabel ?? @string/dialog_delete, default=@string/dialog_delete}"
-                android:visibility="@{viewModel.showDelete ? View.VISIBLE : View.GONE}" />
-
-            <TextView
-                android:onClick="@{() -> viewModel.onOkClicked()}"
-                style="@style/dialog_action_button_font"
-                android:layout_width="137dp"
-                android:layout_height="wrap_content"
-                android:layout_margin="10dp"
-                android:gravity="center"
-                android:background="@drawable/resizable_assistant_button"
-                android:backgroundTint="@color/green_color"
-                android:ellipsize="end"
-                android:padding="10dp"
-                android:text="@{viewModel.okLabel, default=OK}"
-                android:visibility="@{viewModel.showOk ? View.VISIBLE : View.GONE}" />
-
-        </com.google.android.flexbox.FlexboxLayout>
-
-    </LinearLayout>
-
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/empty_fragment.xml b/app/src/main/res/layout/empty_fragment.xml
deleted file mode 100644
index d829e291c..000000000
--- a/app/src/main/res/layout/empty_fragment.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/file_audio_viewer_fragment.xml b/app/src/main/res/layout/file_audio_viewer_fragment.xml
deleted file mode 100644
index addb6c537..000000000
--- a/app/src/main/res/layout/file_audio_viewer_fragment.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools">
-
-    <data>
-        <import type="android.view.View"/>
-        <variable
-            name="viewModel"
-            type="org.linphone.activities.main.files.viewmodels.AudioFileViewModel" />
-    </data>
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="?attr/backgroundColor">
-
-        <androidx.fragment.app.FragmentContainerView
-            android:id="@+id/top_bar_fragment"
-            android:name="org.linphone.activities.main.files.fragments.TopBarFragment"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_alignParentTop="true"
-            tools:layout="@layout/file_viewer_top_bar_fragment" />
-
-        <RelativeLayout
-            android:id="@+id/anchor"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_below="@id/top_bar_fragment" />
-
-    </RelativeLayout>
-
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/file_config_viewer_fragment.xml b/app/src/main/res/layout/file_config_viewer_fragment.xml
deleted file mode 100644
index aaf1172d6..000000000
--- a/app/src/main/res/layout/file_config_viewer_fragment.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <data>
-        <import type="android.view.View"/>
-        <variable
-            name="exportClickListener"
-            type="android.view.View.OnClickListener"/>
-        <variable
-            name="viewModel"
-            type="org.linphone.activities.main.dialer.viewmodels.ConfigFileViewModel" />
-    </data>
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="?attr/backgroundColor">
-
-        <LinearLayout
-            android:id="@+id/top_bar"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/main_activity_top_bar_size"
-            android:layout_gravity="center_horizontal"
-            android:background="?attr/lightToolbarBackgroundColor"
-            android:orientation="horizontal">
-
-            <ImageView
-                android:id="@+id/back"
-                android:contentDescription="@string/content_description_go_back"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="0.2"
-                android:background="?attr/button_background_drawable"
-                android:padding="18dp"
-                android:src="@drawable/back" />
-
-            <View
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="0.6"/>
-
-            <ImageView
-                android:onClick="@{exportClickListener}"
-                android:contentDescription="@string/content_description_export"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="0.2"
-                android:background="?attr/button_background_drawable"
-                android:padding="18dp"
-                android:src="@drawable/settings_network" />
-
-        </LinearLayout>
-
-        <ScrollView
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_below="@id/top_bar">
-
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_margin="10dp"
-                android:singleLine="false"
-                android:textIsSelectable="true"
-                android:text="@{viewModel.text}" />
-
-        </ScrollView>
-
-    </RelativeLayout>
-
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/file_image_viewer_fragment.xml b/app/src/main/res/layout/file_image_viewer_fragment.xml
deleted file mode 100644
index f50ba5bf4..000000000
--- a/app/src/main/res/layout/file_image_viewer_fragment.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools">
-
-    <data>
-        <import type="android.view.View"/>
-        <variable
-            name="viewModel"
-            type="org.linphone.activities.main.files.viewmodels.ImageFileViewModel" />
-    </data>
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="@color/black_color">
-
-        <androidx.fragment.app.FragmentContainerView
-            android:id="@+id/top_bar_fragment"
-            android:name="org.linphone.activities.main.files.fragments.TopBarFragment"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_alignParentTop="true"
-            android:visibility="@{viewModel.fullScreenMode ? View.GONE : View.VISIBLE}"
-            tools:layout="@layout/file_viewer_top_bar_fragment" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_below="@id/top_bar_fragment"
-            android:orientation="vertical">
-
-            <com.github.chrisbanes.photoview.PhotoView
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:adjustViewBounds="true"
-                android:onClick="@{() -> viewModel.toggleFullScreen()}"
-                android:scaleType="fitCenter"
-                coil="@{viewModel.filePath}"/>
-
-        </LinearLayout>
-
-    </RelativeLayout>
-
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/file_pdf_viewer_cell.xml b/app/src/main/res/layout/file_pdf_viewer_cell.xml
deleted file mode 100644
index de433d575..000000000
--- a/app/src/main/res/layout/file_pdf_viewer_cell.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <com.github.chrisbanes.photoview.PhotoView
-        android:id="@+id/pdf_image"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerHorizontal="true" />
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/file_pdf_viewer_fragment.xml b/app/src/main/res/layout/file_pdf_viewer_fragment.xml
deleted file mode 100644
index 71f48d1d2..000000000
--- a/app/src/main/res/layout/file_pdf_viewer_fragment.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:bind="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools">
-
-    <data>
-        <import type="android.view.View"/>
-        <variable
-            name="viewModel"
-            type="org.linphone.activities.main.files.viewmodels.PdfFileViewModel" />
-    </data>
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="?attr/backgroundColor">
-
-        <androidx.fragment.app.FragmentContainerView
-            android:id="@+id/top_bar_fragment"
-            android:name="org.linphone.activities.main.files.fragments.TopBarFragment"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_alignParentTop="true"
-            tools:layout="@layout/file_viewer_top_bar_fragment" />
-
-        <androidx.viewpager2.widget.ViewPager2
-            android:id="@+id/pdf_view_pager"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="vertical"
-            android:layout_below="@id/top_bar_fragment" />
-
-        <include
-            layout="@layout/wait_layout"
-            bind:visibility="@{viewModel.operationInProgress}"/>
-
-    </RelativeLayout>
-
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/file_text_viewer_fragment.xml b/app/src/main/res/layout/file_text_viewer_fragment.xml
deleted file mode 100644
index 73baa9ebe..000000000
--- a/app/src/main/res/layout/file_text_viewer_fragment.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    xmlns:bind="http://schemas.android.com/apk/res-auto">
-
-    <data>
-        <import type="android.view.View"/>
-        <variable
-            name="viewModel"
-            type="org.linphone.activities.main.files.viewmodels.TextFileViewModel" />
-    </data>
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="?attr/backgroundColor">
-
-        <androidx.fragment.app.FragmentContainerView
-            android:id="@+id/top_bar_fragment"
-            android:name="org.linphone.activities.main.files.fragments.TopBarFragment"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_alignParentTop="true"
-            tools:layout="@layout/file_viewer_top_bar_fragment" />
-
-        <ScrollView
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_below="@id/top_bar_fragment">
-
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_margin="10dp"
-                android:singleLine="false"
-                android:textIsSelectable="true"
-                android:text="@{viewModel.text}"/>
-
-        </ScrollView>
-
-        <include
-            layout="@layout/wait_layout"
-            bind:visibility="@{viewModel.operationInProgress}"/>
-
-    </RelativeLayout>
-
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/file_video_viewer_fragment.xml b/app/src/main/res/layout/file_video_viewer_fragment.xml
deleted file mode 100644
index fa4c27f96..000000000
--- a/app/src/main/res/layout/file_video_viewer_fragment.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools">
-
-    <data>
-        <import type="android.view.View"/>
-        <variable
-            name="viewModel"
-            type="org.linphone.activities.main.files.viewmodels.VideoFileViewModel" />
-    </data>
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="@color/black_color">
-
-        <androidx.fragment.app.FragmentContainerView
-            android:id="@+id/top_bar_fragment"
-            android:name="org.linphone.activities.main.files.fragments.TopBarFragment"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_alignParentTop="true"
-            android:visibility="@{viewModel.fullScreenMode ? View.GONE : View.VISIBLE}"
-            tools:layout="@layout/file_viewer_top_bar_fragment" />
-
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_below="@id/top_bar_fragment">
-
-            <VideoView
-                android:id="@+id/video_view"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_centerInParent="true"
-                android:onClick="@{() -> viewModel.toggleFullScreen()}"/>
-
-        </RelativeLayout>
-
-    </RelativeLayout>
-
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/file_viewer_top_bar_fragment.xml b/app/src/main/res/layout/file_viewer_top_bar_fragment.xml
deleted file mode 100644
index f3c5b98dd..000000000
--- a/app/src/main/res/layout/file_viewer_top_bar_fragment.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <data>
-        <import type="android.view.View"/>
-        <variable
-            name="exportClickListener"
-            type="android.view.View.OnClickListener"/>
-    </data>
-
-    <LinearLayout
-        android:id="@+id/top_bar"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/main_activity_top_bar_size"
-        android:layout_gravity="center_horizontal"
-        android:background="?attr/lightToolbarBackgroundColor"
-        android:orientation="horizontal">
-
-        <ImageView
-            android:id="@+id/back"
-            android:contentDescription="@string/content_description_go_back"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="0.2"
-            android:background="?attr/button_background_drawable"
-            android:padding="18dp"
-            android:src="@drawable/back" />
-
-        <org.linphone.views.MarqueeTextView
-            android:id="@+id/file_name"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="0.6"
-            style="@style/toolbar_small_title_font"
-            android:singleLine="true"
-            android:gravity="center"/>
-
-        <ImageView
-            android:onClick="@{exportClickListener}"
-            android:contentDescription="@string/content_description_export"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="0.2"
-            android:background="?attr/button_background_drawable"
-            android:padding="18dp"
-            android:src="@drawable/settings_network" />
-
-    </LinearLayout>
-
-</layout>
diff --git a/app/src/main/res/layout/generic_list_header.xml b/app/src/main/res/layout/generic_list_header.xml
deleted file mode 100644
index 7c36dc2a2..000000000
--- a/app/src/main/res/layout/generic_list_header.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <data>
-        <variable
-            name="title"
-            type="String" />
-    </data>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="?attr/backgroundColor"
-        android:orientation="vertical">
-
-        <TextView
-            android:text="@{title}"
-            style="@style/accent_colored_title_font"
-            android:layout_width="match_parent"
-            android:layout_height="40dp"
-            android:gravity="center" />
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:background="?attr/dividerColor" />
-
-    </LinearLayout>
-
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/history_conf_detail_fragment.xml b/app/src/main/res/layout/history_conf_detail_fragment.xml
deleted file mode 100644
index 9592ccb37..000000000
--- a/app/src/main/res/layout/history_conf_detail_fragment.xml
+++ /dev/null
@@ -1,199 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <data>
-
-        <import type="android.view.View" />
-
-        <variable
-            name="newContactClickListener"
-            type="android.view.View.OnClickListener" />
-
-        <variable
-            name="contactClickListener"
-            type="android.view.View.OnClickListener" />
-
-        <variable
-            name="viewModel"
-            type="org.linphone.activities.main.history.viewmodels.CallLogViewModel" />
-
-        <variable
-            name="sharedMainViewModel"
-            type="org.linphone.activities.main.viewmodels.SharedMainViewModel" />
-    </data>
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="?attr/voipBackgroundBWColor">
-
-        <LinearLayout
-            android:id="@+id/top_bar"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/main_activity_top_bar_size"
-            android:background="?attr/voipToolbarBackgroundColor"
-            android:orientation="horizontal">
-
-            <ImageView
-                android:id="@+id/back"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="0.2"
-                android:contentDescription="@string/content_description_go_back"
-                android:padding="18dp"
-                android:src="@drawable/back"
-                android:visibility="@{sharedMainViewModel.isSlidingPaneSlideable ? View.VISIBLE : View.GONE}" />
-
-            <TextView
-                style="@style/calls_list_header_font"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_marginLeft="5dp"
-                android:layout_weight="0.8"
-                android:gravity="center_vertical"
-                android:text="@{viewModel.conferenceSubject, default=`Conference subject`}" />
-
-        </LinearLayout>
-
-        <androidx.core.widget.NestedScrollView
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_below="@id/top_bar">
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:paddingTop="10dp"
-                android:paddingBottom="5dp">
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="10dp"
-                    android:layout_marginEnd="10dp"
-                    android:orientation="horizontal"
-                    android:baselineAligned="false">
-
-                    <LinearLayout
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_margin="5dp"
-                        android:layout_weight="1"
-                        android:orientation="vertical">
-
-                        <TextView
-                            style="@style/conference_scheduling_font"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="@string/conference_schedule_date" />
-
-                        <TextView
-                            style="@style/conference_scheduling_font"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_marginTop="5dp"
-                            android:background="?attr/voipFormDisabledFieldBackgroundColor"
-                            android:padding="10dp"
-                            android:text="@{viewModel.conferenceDate}" />
-
-                    </LinearLayout>
-
-                    <LinearLayout
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_margin="5dp"
-                        android:layout_weight="1"
-                        android:orientation="vertical">
-
-                        <TextView
-                            style="@style/conference_scheduling_font"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="@string/conference_schedule_time" />
-
-                        <TextView
-                            style="@style/conference_scheduling_font"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_marginTop="5dp"
-                            android:background="?attr/voipFormDisabledFieldBackgroundColor"
-                            android:padding="10dp"
-                            android:text="@{viewModel.conferenceTime}" />
-
-                    </LinearLayout>
-
-                </LinearLayout>
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="20dp"
-                    android:background="?attr/voipFormDisabledFieldBackgroundColor">
-
-                    <TextView
-                        style="@style/calls_list_header_font"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginLeft="20dp"
-                        android:padding="5dp"
-                        android:text="@string/conference_organizer" />
-
-                </LinearLayout>
-
-                <include
-                    layout="@layout/conference_scheduling_participant_cell"
-                    app:data="@{viewModel.organizerParticipantData}" />
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:background="?attr/voipFormDisabledFieldBackgroundColor">
-
-                    <TextView
-                        style="@style/calls_list_header_font"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginLeft="20dp"
-                        android:padding="5dp"
-                        android:text="@string/conference_schedule_participants_list" />
-
-                </LinearLayout>
-
-                <androidx.core.widget.NestedScrollView
-                    android:layout_width="match_parent"
-                    android:layout_height="0dp"
-                    android:layout_weight="1">
-
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:orientation="vertical"
-                        app:entries="@{viewModel.conferenceParticipantsData}"
-                        app:layout="@{@layout/conference_scheduling_participant_cell}" />
-
-                </androidx.core.widget.NestedScrollView>
-
-                <TextView
-                    style="@style/big_orange_button_font"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:layout_marginTop="10dp"
-                    android:layout_marginBottom="10dp"
-                    android:background="@drawable/shape_rect_orange_button"
-                    android:paddingLeft="20dp"
-                    android:paddingTop="8dp"
-                    android:paddingRight="20dp"
-                    android:paddingBottom="8dp"
-                    android:text="@string/conference_go_to_chat"
-                    android:visibility="gone" />
-
-            </LinearLayout>
-
-        </androidx.core.widget.NestedScrollView>
-
-    </RelativeLayout>
-
-</layout>
diff --git a/app/src/main/res/layout/history_detail_cell.xml b/app/src/main/res/layout/history_detail_cell.xml
deleted file mode 100644
index f682ba7a3..000000000
--- a/app/src/main/res/layout/history_detail_cell.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <data>
-        <import type="android.view.View"/>
-        <variable
-            name="data"
-            type="org.linphone.activities.main.history.viewmodels.CallLogViewModel" />
-    </data>
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:padding="10dp">
-
-        <ImageView
-            android:src="@{data.directionIconResource}"
-            android:contentDescription="@{data.iconContentDescription}"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentLeft="true"
-            android:layout_centerVertical="true"
-            android:paddingLeft="10dp"
-            android:paddingRight="10dp" />
-
-        <org.linphone.views.MarqueeTextView
-            android:text="@{data.date + ` - ` + data.duration}"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerHorizontal="true"
-            android:layout_centerVertical="true" />
-
-    </RelativeLayout>
-
-</layout>
diff --git a/app/src/main/res/layout/history_detail_fragment.xml b/app/src/main/res/layout/history_detail_fragment.xml
deleted file mode 100644
index ff74d4bcb..000000000
--- a/app/src/main/res/layout/history_detail_fragment.xml
+++ /dev/null
@@ -1,215 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:bind="http://schemas.android.com/tools">
-
-    <data>
-        <import type="android.view.View"/>
-        <import type="org.linphone.core.ConsolidatedPresence"/>
-        <variable
-            name="newContactClickListener"
-            type="android.view.View.OnClickListener"/>
-        <variable
-            name="contactClickListener"
-            type="android.view.View.OnClickListener"/>
-        <variable
-            name="viewModel"
-            type="org.linphone.activities.main.history.viewmodels.CallLogViewModel" />
-        <variable
-            name="sharedMainViewModel"
-            type="org.linphone.activities.main.viewmodels.SharedMainViewModel" />
-    </data>
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <LinearLayout
-            android:id="@+id/top_bar"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/main_activity_top_bar_size"
-            android:background="?attr/lightToolbarBackgroundColor"
-            android:orientation="horizontal">
-
-            <ImageView
-                android:id="@+id/back"
-                android:visibility="@{sharedMainViewModel.isSlidingPaneSlideable ? View.VISIBLE : View.GONE}"
-                android:contentDescription="@string/content_description_go_back"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="0.2"
-                android:background="?attr/button_background_drawable"
-                android:padding="18dp"
-                android:src="@drawable/back" />
-
-            <View
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="0.6" />
-
-            <ImageView
-                android:onClick="@{newContactClickListener}"
-                android:visibility="@{viewModel.contact != null || viewModel.readOnlyNativeAddressBook ? View.GONE : View.VISIBLE}"
-                android:contentDescription="@string/content_description_add_contact"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="0.2"
-                android:background="?attr/button_background_drawable"
-                android:padding="15dp"
-                android:src="@drawable/contact_add" />
-
-            <ImageView
-                android:onClick="@{contactClickListener}"
-                android:visibility="@{viewModel.contact == null ? View.GONE : View.VISIBLE}"
-                android:contentDescription="@string/content_description_go_to_contact"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="0.2"
-                android:background="?attr/button_background_drawable"
-                android:padding="15dp"
-                android:src="@drawable/contact" />
-
-        </LinearLayout>
-
-        <androidx.core.widget.NestedScrollView
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_below="@id/top_bar">
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:gravity="center"
-                android:orientation="vertical"
-                android:paddingTop="10dp"
-                android:paddingBottom="5dp">
-
-                <RelativeLayout
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content">
-
-                    <ImageView
-                        android:id="@+id/avatar"
-                        android:layout_marginTop="10dp"
-                        android:layout_width="@dimen/contact_avatar_big_size"
-                        android:layout_height="@dimen/contact_avatar_big_size"
-                        coilContactBig="@{viewModel}"
-                        android:background="@drawable/generated_avatar_bg"
-                        android:src="@drawable/voip_single_contact_avatar"
-                        android:contentDescription="@null" />
-
-                    <ImageView
-                        android:layout_width="@dimen/contact_presence_big_badge_size"
-                        android:layout_height="@dimen/contact_presence_big_badge_size"
-                        android:layout_alignBottom="@id/avatar"
-                        android:layout_marginStart="70dp"
-                        android:adjustViewBounds="true"
-                        android:background="@drawable/led_background"
-                        android:padding="@dimen/contact_presence_big_badge_padding"
-                        app:presenceIcon="@{viewModel.presenceStatus}"
-                        android:visibility="@{viewModel.presenceStatus == ConsolidatedPresence.Offline ? View.GONE : View.VISIBLE, default=gone}"
-                        bind:ignore="ContentDescription" />
-
-                </RelativeLayout>
-
-                <TextView
-                    android:text="@{viewModel.contact.name ?? viewModel.displayName}"
-                    style="@style/big_contact_name_font"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:gravity="center_horizontal" />
-
-                <org.linphone.views.MarqueeTextView
-                    android:text="@{viewModel.peerSipUri}"
-                    android:textIsSelectable="true"
-                    style="@style/sip_uri_font"
-                    android:singleLine="true"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content" />
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:gravity="center"
-                    android:orientation="horizontal">
-
-                    <ImageView
-                        android:onClick="@{() -> viewModel.startCall()}"
-                        android:contentDescription="@string/content_description_start_call"
-                        android:layout_width="60dp"
-                        android:layout_height="60dp"
-                        android:layout_margin="10dp"
-                        android:background="@drawable/round_orange_button_background"
-                        android:src="@drawable/call_start_default" />
-
-                    <ImageView
-                        android:layout_width="56dp"
-                        android:layout_height="60dp"
-                        android:layout_margin="10dp"
-                        android:background="@drawable/round_orange_button_background"
-                        android:contentDescription="@string/content_description_start_chat"
-                        android:onClick="@{() -> viewModel.startChat(false)}"
-                        android:src="@drawable/chat_start_default"
-                        android:visibility="@{viewModel.chatAllowed &amp;&amp; !viewModel.hidePlainChat ? View.VISIBLE : View.GONE}" />
-
-                    <RelativeLayout
-                        android:onClick="@{() -> viewModel.startChat(true)}"
-                        android:visibility="@{viewModel.chatAllowed &amp;&amp; viewModel.secureChatAllowed ? View.VISIBLE : View.GONE}"
-                        android:layout_width="70dp"
-                        android:layout_height="60dp"
-                        android:layout_margin="10dp">
-
-                        <ImageView
-                            android:layout_width="60dp"
-                            android:layout_height="60dp"
-                            android:layout_alignParentLeft="true"
-                            android:layout_centerVertical="true"
-                            android:background="@drawable/round_orange_button_background"
-                            android:contentDescription="@string/content_description_start_encrypted_chat"
-                            android:src="@drawable/chat_start_default" />
-
-                        <ImageView
-                            android:layout_width="21dp"
-                            android:layout_height="21dp"
-                            android:layout_marginTop="4dp"
-                            android:layout_alignParentTop="true"
-                            android:layout_alignParentRight="true"
-                            android:contentDescription="@string/content_description_start_encrypted_chat"
-                            android:src="@drawable/security_toggle_icon_green" />
-
-                    </RelativeLayout>
-
-                </LinearLayout>
-
-                <View
-                    android:layout_width="wrap_content"
-                    android:layout_height="1dp"
-                    android:background="?attr/dividerColor" />
-
-                <TextView
-                    style="@style/assistant_input_field_header_font"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:layout_marginTop="5dp"
-                    android:text="@string/history_calls_list"
-                    android:textAllCaps="true" />
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="vertical"
-                    app:entries="@{viewModel.relatedCallLogs}"
-                    app:layout="@{@layout/history_detail_cell}"/>
-
-            </LinearLayout>
-
-        </androidx.core.widget.NestedScrollView>
-
-        <include
-            layout="@layout/wait_layout"
-            bind:visibility="@{viewModel.waitForChatRoomCreation}" />
-
-    </RelativeLayout>
-
-</layout>
diff --git a/app/src/main/res/layout/history_list_cell.xml b/app/src/main/res/layout/history_list_cell.xml
deleted file mode 100644
index fef2934ac..000000000
--- a/app/src/main/res/layout/history_list_cell.xml
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools">
-
-    <data>
-
-        <import type="android.view.View" />
-        <import type="org.linphone.core.ConsolidatedPresence"/>
-
-        <variable
-            name="clickListener"
-            type="android.view.View.OnClickListener" />
-
-        <variable
-            name="longClickListener"
-            type="android.view.View.OnLongClickListener" />
-
-        <variable
-            name="detailsClickListener"
-            type="android.view.View.OnClickListener" />
-
-        <variable
-            name="position"
-            type="Integer" />
-
-        <variable
-            name="viewModel"
-            type="org.linphone.activities.main.history.viewmodels.CallLogViewModel" />
-
-        <variable
-            name="selectionListViewModel"
-            type="org.linphone.activities.main.viewmodels.ListTopBarViewModel" />
-
-        <variable
-            name="groupCount"
-            type="Integer" />
-    </data>
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="50dp"
-        android:background="?attr/backgroundColor"
-        android:gravity="center_vertical"
-        android:onClick="@{clickListener}"
-        android:onLongClick="@{longClickListener}"
-        android:paddingTop="5dp"
-        android:paddingBottom="5dp">
-
-        <LinearLayout
-            android:id="@+id/right"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_alignParentRight="true"
-            android:layout_marginLeft="5dp"
-            android:layout_marginRight="10dp"
-            android:orientation="horizontal">
-
-            <ImageView
-                android:layout_width="40dp"
-                android:layout_height="40dp"
-                android:adjustViewBounds="true"
-                android:background="@drawable/history_detail_background"
-                android:contentDescription="@string/content_description_show_call_details"
-                android:enabled="@{!selectionListViewModel.isEditionEnabled}"
-                android:onClick="@{detailsClickListener}"
-                android:src="@drawable/list_detail" />
-
-            <CheckBox
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:checked="@{selectionListViewModel.selectedItems.contains(position)}"
-                android:onClick="@{() -> selectionListViewModel.onToggleSelect(position)}"
-                android:paddingLeft="5dp"
-                android:paddingRight="5dp"
-                android:visibility="@{selectionListViewModel.isEditionEnabled ? View.VISIBLE : View.GONE, default=gone}" />
-
-        </LinearLayout>
-
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_marginLeft="10dp"
-            android:layout_toLeftOf="@id/right"
-            android:gravity="center_vertical">
-
-            <ImageView
-                android:id="@+id/avatar"
-                coilContact="@{viewModel}"
-                android:layout_width="@dimen/contact_avatar_size"
-                android:layout_height="@dimen/contact_avatar_size"
-                android:layout_alignParentLeft="true"
-                android:layout_marginRight="10dp"
-                android:contentDescription="@null"
-                android:background="@drawable/generated_avatar_bg"
-                android:src="@drawable/voip_single_contact_avatar" />
-
-            <ImageView
-                android:layout_width="@dimen/contact_presence_badge_size"
-                android:layout_height="@dimen/contact_presence_badge_size"
-                android:layout_alignBottom="@id/avatar"
-                android:layout_marginStart="25dp"
-                android:adjustViewBounds="true"
-                android:background="@drawable/led_background"
-                android:padding="@dimen/contact_presence_badge_padding"
-                app:presenceIcon="@{viewModel.presenceStatus}"
-                android:visibility="@{viewModel.presenceStatus == ConsolidatedPresence.Offline ? View.GONE : View.VISIBLE, default=gone}"
-                tools:ignore="ContentDescription" />
-
-            <ImageView
-                android:id="@+id/icon"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:layout_marginRight="10dp"
-                android:layout_toRightOf="@id/avatar"
-                android:adjustViewBounds="true"
-                android:contentDescription="@{viewModel.iconContentDescription}"
-                android:paddingTop="10dp"
-                android:paddingBottom="10dp"
-                android:src="@{viewModel.statusIconResource, default=@drawable/call_status_outgoing}"
-                android:visibility="@{viewModel.isConferenceCallLog ? View.GONE : View.VISIBLE}" />
-
-            <org.linphone.views.MarqueeTextView
-                android:id="@+id/sip_uri"
-                style="@style/contact_name_list_cell_font"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:layout_toRightOf="@id/icon"
-                android:gravity="center_vertical"
-                android:singleLine="true"
-                android:text="@{(viewModel.isConferenceCallLog ? viewModel.conferenceSubject : viewModel.contact.name ?? viewModel.displayName) + (groupCount > 1 ? ` (` + groupCount + `)` : ``), default=`Frodo Baggins (6)`}" />
-
-        </RelativeLayout>
-
-    </RelativeLayout>
-
-</layout>
diff --git a/app/src/main/res/layout/history_master_fragment.xml b/app/src/main/res/layout/history_master_fragment.xml
deleted file mode 100644
index e7f4eb315..000000000
--- a/app/src/main/res/layout/history_master_fragment.xml
+++ /dev/null
@@ -1,186 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <data>
-        <import type="android.view.View"/>
-        <import type="org.linphone.activities.main.history.viewmodels.CallLogsFilter"/>
-        <variable
-            name="editClickListener"
-            type="android.view.View.OnClickListener"/>
-        <variable
-            name="viewModel"
-            type="org.linphone.activities.main.history.viewmodels.CallLogsListViewModel" />
-    </data>
-
-    <androidx.slidingpanelayout.widget.SlidingPaneLayout
-        android:id="@+id/sliding_pane"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        tools:context=".MainActivity">
-
-        <RelativeLayout
-            android:layout_width="@dimen/master_fragment_width"
-            android:layout_height="match_parent"
-            android:background="?attr/backgroundColor"
-            android:layout_gravity="start">
-
-            <LinearLayout
-                android:id="@+id/top_bar"
-                android:layout_width="match_parent"
-                android:layout_height="@dimen/main_activity_top_bar_size"
-                android:background="?attr/lightToolbarBackgroundColor"
-                android:orientation="horizontal">
-
-                <RelativeLayout
-                    android:layout_width="0dp"
-                    android:layout_height="match_parent"
-                    android:layout_weight="0.2">
-
-                    <ImageView
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:background="?attr/button_background_drawable"
-                        android:contentDescription="@string/content_description_show_all_calls"
-                        android:enabled="@{viewModel.filter != CallLogsFilter.ALL}"
-                        android:onClick="@{() -> viewModel.showAllCallLogs()}"
-                        android:padding="15dp"
-                        android:src="@drawable/history_all" />
-
-                    <View
-                        android:visibility="@{viewModel.filter == CallLogsFilter.ALL ? View.VISIBLE : View.GONE}"
-                        android:layout_width="match_parent"
-                        android:layout_height="5dp"
-                        android:layout_alignParentBottom="true"
-                        android:background="?attr/accentColor" />
-
-                </RelativeLayout>
-
-                <RelativeLayout
-                    android:layout_width="0dp"
-                    android:layout_height="match_parent"
-                    android:layout_weight="0.2">
-
-                    <ImageView
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:background="?attr/button_background_drawable"
-                        android:contentDescription="@string/content_description_show_missed_calls"
-                        android:enabled="@{viewModel.filter != CallLogsFilter.MISSED}"
-                        android:gravity="center"
-                        android:onClick="@{() -> viewModel.showOnlyMissedCallLogs()}"
-                        android:padding="15dp"
-                        android:src="@drawable/history_missed" />
-
-                    <View
-                        android:visibility="@{viewModel.filter == CallLogsFilter.MISSED ? View.VISIBLE : View.GONE}"
-                        android:layout_width="match_parent"
-                        android:layout_height="5dp"
-                        android:layout_alignParentBottom="true"
-                        android:background="?attr/accentColor" />
-
-                </RelativeLayout>
-
-                <RelativeLayout
-                    android:layout_width="0dp"
-                    android:layout_height="match_parent"
-                    android:layout_weight="0.2"
-                    android:visibility="@{viewModel.showConferencesFilter ? View.VISIBLE : View.INVISIBLE}">
-
-                    <ImageView
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:background="?attr/button_background_drawable"
-                        android:contentDescription="@string/content_description_show_missed_calls"
-                        android:enabled="@{viewModel.filter != CallLogsFilter.CONFERENCE}"
-                        android:gravity="center"
-                        android:onClick="@{() -> viewModel.showOnlyConferenceCallLogs()}"
-                        android:padding="8dp"
-                        android:src="@drawable/icon_video_conf_history_filter" />
-
-                    <View
-                        android:visibility="@{viewModel.filter == CallLogsFilter.CONFERENCE ? View.VISIBLE : View.GONE}"
-                        android:layout_width="match_parent"
-                        android:layout_height="5dp"
-                        android:layout_alignParentBottom="true"
-                        android:background="?attr/accentColor" />
-
-                </RelativeLayout>
-
-                <View
-                    android:layout_width="0dp"
-                    android:layout_height="match_parent"
-                    android:layout_weight="0.2" />
-
-                <ImageView
-                    android:onClick="@{editClickListener}"
-                    android:enabled="@{!viewModel.callLogs.empty}"
-                    android:contentDescription="@string/content_description_enter_edition_mode"
-                    android:layout_width="0dp"
-                    android:layout_height="match_parent"
-                    android:layout_weight="0.2"
-                    android:background="?attr/button_background_drawable"
-                    android:padding="15dp"
-                    android:src="@drawable/delete" />
-
-            </LinearLayout>
-
-            <androidx.fragment.app.FragmentContainerView
-                android:id="@+id/list_edit_top_bar_fragment"
-                android:name="org.linphone.activities.main.fragments.ListTopBarFragment"
-                android:layout_width="match_parent"
-                android:layout_height="@dimen/main_activity_top_bar_size"
-                android:layout_alignTop="@id/top_bar"
-                tools:layout="@layout/list_edit_top_bar_fragment" />
-
-            <androidx.recyclerview.widget.RecyclerView
-                android:id="@+id/callLogsList"
-                android:layout_below="@id/top_bar"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent" />
-
-            <TextView
-                style="@style/empty_list_font"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerInParent="true"
-                android:text="@string/no_call_history"
-                android:visibility="@{viewModel.callLogs.empty &amp;&amp; viewModel.filter == CallLogsFilter.ALL ? View.VISIBLE : View.GONE}" />
-
-            <TextView
-                style="@style/empty_list_font"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerInParent="true"
-                android:text="@string/no_missed_call_history"
-                android:visibility="@{viewModel.callLogs.empty &amp;&amp; viewModel.filter == CallLogsFilter.MISSED ? View.VISIBLE : View.GONE}" />
-
-            <TextView
-                style="@style/empty_list_font"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerInParent="true"
-                android:text="@string/no_conference_call_history"
-                android:visibility="@{viewModel.callLogs.empty &amp;&amp; viewModel.filter == CallLogsFilter.CONFERENCE ? View.VISIBLE : View.GONE}" />
-
-            <View
-                android:layout_width="1dp"
-                android:layout_height="match_parent"
-                android:layout_alignParentRight="true"
-                android:background="?attr/dividerColor" />
-
-        </RelativeLayout>
-
-        <androidx.fragment.app.FragmentContainerView
-            android:id="@+id/history_nav_container"
-            android:name="androidx.navigation.fragment.NavHostFragment"
-            android:layout_width="300dp"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            app:defaultNavHost="false"
-            app:navGraph="@navigation/history_nav_graph"/>
-
-    </androidx.slidingpanelayout.widget.SlidingPaneLayout>
-
-</layout>
diff --git a/app/src/main/res/layout/imdn_list_header.xml b/app/src/main/res/layout/imdn_list_header.xml
deleted file mode 100644
index 88f39c36f..000000000
--- a/app/src/main/res/layout/imdn_list_header.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <data>
-        <import type="androidx.core.content.ContextCompat"/>
-        <variable
-            name="title"
-            type="Integer" />
-        <variable
-            name="textColor"
-            type="Integer" />
-        <variable
-            name="icon"
-            type="Integer" />
-    </data>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="@color/header_background_color"
-            android:gravity="center"
-            android:orientation="horizontal">
-
-            <TextView
-                android:text="@{title, default=@string/chat_message_imdn_displayed}"
-                android:textColor="@{ContextCompat.getColor(context,textColor)}"
-                android:textSize="15sp"
-                android:textStyle="bold"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content" />
-
-            <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:padding="5dp"
-                android:contentDescription="@{title}"
-                android:src="@{icon, default=@drawable/chat_read}" />
-
-        </LinearLayout>
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:background="?attr/dividerColor" />
-
-    </LinearLayout>
-
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/list_edit_top_bar_fragment.xml b/app/src/main/res/layout/list_edit_top_bar_fragment.xml
deleted file mode 100644
index 1adca829a..000000000
--- a/app/src/main/res/layout/list_edit_top_bar_fragment.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <data>
-        <import type="android.view.View" />
-        <variable
-            name="cancelClickListener"
-            type="android.view.View.OnClickListener"/>
-        <variable
-            name="selectAllClickListener"
-            type="android.view.View.OnClickListener"/>
-        <variable
-            name="unSelectAllClickListener"
-            type="android.view.View.OnClickListener"/>
-        <variable
-            name="deleteClickListener"
-            type="android.view.View.OnClickListener"/>
-        <variable
-            name="viewModel"
-            type="org.linphone.activities.main.viewmodels.ListTopBarViewModel" />
-    </data>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/main_activity_top_bar_size"
-        android:background="?attr/lightToolbarBackgroundColor"
-        android:visibility="@{viewModel.isEditionEnabled ? View.VISIBLE : View.GONE, default=gone}"
-        android:orientation="horizontal">
-
-        <ImageView
-            android:onClick="@{cancelClickListener}"
-            android:contentDescription="@string/content_description_exit_edition_mode"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="0.2"
-            android:background="?attr/button_background_drawable"
-            android:padding="10dp"
-            android:src="@drawable/cancel" />
-
-        <View
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="0.4" />
-
-        <ImageView
-            android:onClick="@{selectAllClickListener}"
-            android:visibility="@{viewModel.isSelectionNotEmpty ? View.GONE : View.VISIBLE}"
-            android:contentDescription="@string/content_description_select_all"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="0.2"
-            android:background="?attr/button_background_drawable"
-            android:padding="15dp"
-            android:src="@drawable/select_all" />
-
-        <ImageView
-            android:onClick="@{unSelectAllClickListener}"
-            android:visibility="@{viewModel.isSelectionNotEmpty ? View.VISIBLE : View.GONE}"
-            android:contentDescription="@string/content_description_unselect_all"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="0.2"
-            android:background="?attr/button_background_drawable"
-            android:padding="15dp"
-            android:src="@drawable/deselect_all" />
-
-        <ImageView
-            android:onClick="@{deleteClickListener}"
-            android:enabled="@{viewModel.isSelectionNotEmpty}"
-            android:contentDescription="@string/content_description_delete_selection"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="0.2"
-            android:background="?attr/button_background_drawable"
-            android:padding="15dp"
-            android:src="@drawable/delete" />
-
-    </LinearLayout>
-
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/main_activity.xml b/app/src/main/res/layout/main_activity.xml
deleted file mode 100644
index 2b5c798e1..000000000
--- a/app/src/main/res/layout/main_activity.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools">
-
-    <data>
-        <import type="android.view.View" />
-        <variable
-            name="viewModel"
-            type="org.linphone.activities.main.viewmodels.SharedMainViewModel" />
-        <variable
-            name="callOverlayViewModel"
-            type="org.linphone.activities.main.viewmodels.CallOverlayViewModel" />
-    </data>
-
-    <androidx.coordinatorlayout.widget.CoordinatorLayout
-        android:id="@+id/root_coordinator_layout"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:background="?attr/backgroundColor">
-
-            <androidx.fragment.app.FragmentContainerView
-                android:id="@+id/status_fragment"
-                android:name="org.linphone.activities.main.fragments.StatusFragment"
-                android:layout_width="match_parent"
-                android:layout_height="@dimen/status_fragment_size"
-                android:layout_alignParentTop="true"
-                tools:layout="@layout/status_fragment" />
-
-            <androidx.drawerlayout.widget.DrawerLayout
-                android:id="@+id/side_menu"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_below="@id/status_fragment">
-
-                <include
-                    android:id="@+id/content"
-                    layout="@layout/main_activity_content"/>
-
-                <!-- Side Menu -->
-                <RelativeLayout
-                    android:id="@+id/side_menu_content"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_gravity="left">
-
-                    <androidx.fragment.app.FragmentContainerView
-                        android:id="@+id/side_menu_fragment"
-                        android:name="org.linphone.activities.main.sidemenu.fragments.SideMenuFragment"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        tools:layout="@layout/side_menu_fragment" />
-
-                </RelativeLayout>
-
-            </androidx.drawerlayout.widget.DrawerLayout>
-
-            <include
-                android:id="@+id/call_overlay"
-                layout="@layout/call_overlay"
-                android:layout_width="@dimen/call_overlay_size"
-                android:layout_height="@dimen/call_overlay_size"
-                android:layout_centerHorizontal="true"
-                android:layout_alignParentBottom="true"
-                tools:visibility="@{callOverlayViewModel.displayCallOverlay}"/>
-
-        </RelativeLayout>
-
-    </androidx.coordinatorlayout.widget.CoordinatorLayout>
-
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/main_activity_content.xml b/app/src/main/res/layout/main_activity_content.xml
deleted file mode 100644
index 165df6d6b..000000000
--- a/app/src/main/res/layout/main_activity_content.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <!-- For proper snack bar placement -->
-    <androidx.coordinatorlayout.widget.CoordinatorLayout
-        android:id="@+id/coordinator"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_above="@id/tabs_fragment">
-
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
-
-            <androidx.fragment.app.FragmentContainerView
-                android:id="@+id/nav_host_fragment"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:name="androidx.navigation.fragment.NavHostFragment"
-                app:defaultNavHost="true"
-                app:navGraph="@navigation/main_nav_graph"
-                tools:layout="@layout/dialer_fragment" />
-
-        </RelativeLayout>
-
-    </androidx.coordinatorlayout.widget.CoordinatorLayout>
-
-    <androidx.fragment.app.FragmentContainerView
-        android:id="@+id/tabs_fragment"
-        android:name="org.linphone.activities.main.fragments.TabsFragment"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/main_activity_tabs_fragment_size"
-        android:layout_alignParentBottom="true"
-        tools:layout="@layout/tabs_fragment"/>
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/numpad.xml b/app/src/main/res/layout/numpad.xml
deleted file mode 100644
index a56274651..000000000
--- a/app/src/main/res/layout/numpad.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <data>
-        <variable
-            name="keyListener"
-            type="org.linphone.activities.main.dialer.NumpadDigitListener" />
-    </data>
-
-    <com.google.android.flexbox.FlexboxLayout
-        android:id="@+id/numpad"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:padding="10dp"
-        android:background="?attr/backgroundColor"
-        app:flexWrap="wrap"
-        app:justifyContent="space_around"
-        app:alignItems="center"
-        app:alignContent="space_around">
-
-        <ImageView
-            style="@style/numpad_digit"
-            android:src="@drawable/numpad_one"
-            android:contentDescription="@string/content_description_numpad_1"
-            android:onClick="@{() -> keyListener.handleClick('1')}"
-            android:onLongClick="@{() -> keyListener.handleLongClick('1')}"  />
-
-        <ImageView
-            style="@style/numpad_digit"
-            android:contentDescription="@string/content_description_numpad_2"
-            android:src="@drawable/numpad_two"
-            android:onClick="@{() -> keyListener.handleClick('2')}" />
-
-        <ImageView
-            style="@style/numpad_digit"
-            android:contentDescription="@string/content_description_numpad_3"
-            android:src="@drawable/numpad_three"
-            android:onClick="@{() -> keyListener.handleClick('3')}" />
-
-        <ImageView
-            style="@style/numpad_digit"
-            app:layout_wrapBefore="true"
-            android:src="@drawable/numpad_four"
-            android:contentDescription="@string/content_description_numpad_4"
-            android:onClick="@{() -> keyListener.handleClick('4')}" />
-
-        <ImageView
-            style="@style/numpad_digit"
-            android:src="@drawable/numpad_five"
-            android:contentDescription="@string/content_description_numpad_5"
-            android:onClick="@{() -> keyListener.handleClick('5')}" />
-
-        <ImageView
-            style="@style/numpad_digit"
-            android:src="@drawable/numpad_six"
-            android:contentDescription="@string/content_description_numpad_6"
-            android:onClick="@{() -> keyListener.handleClick('6')}" />
-
-        <ImageView
-            style="@style/numpad_digit"
-            app:layout_wrapBefore="true"
-            android:src="@drawable/numpad_seven"
-            android:contentDescription="@string/content_description_numpad_7"
-            android:onClick="@{() -> keyListener.handleClick('7')}" />
-
-        <ImageView
-            style="@style/numpad_digit"
-            android:src="@drawable/numpad_eight"
-            android:contentDescription="@string/content_description_numpad_8"
-            android:onClick="@{() -> keyListener.handleClick('8')}" />
-
-        <ImageView
-            style="@style/numpad_digit"
-            android:src="@drawable/numpad_nine"
-            android:contentDescription="@string/content_description_numpad_9"
-            android:onClick="@{() -> keyListener.handleClick('9')}" />
-
-        <ImageView
-            style="@style/numpad_digit"
-            app:layout_wrapBefore="true"
-            android:src="@drawable/numpad_star_digit"
-            android:contentDescription="@string/content_description_numpad_star"
-            android:onClick="@{() -> keyListener.handleClick('*')}" />
-
-        <ImageView
-            style="@style/numpad_digit"
-            android:src="@drawable/numpad_zero"
-            android:onClick="@{() -> keyListener.handleClick('0')}"
-            android:contentDescription="@string/content_description_numpad_0"
-            android:onLongClick="@{() -> keyListener.handleLongClick('+')}"/>
-
-        <ImageView
-            style="@style/numpad_digit"
-            android:src="@drawable/numpad_sharp"
-            android:contentDescription="@string/content_description_numpad_sharp"
-            android:onClick="@{() -> keyListener.handleClick('#')}" />
-
-    </com.google.android.flexbox.FlexboxLayout>
-
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/recording_list_cell.xml b/app/src/main/res/layout/recording_list_cell.xml
deleted file mode 100644
index 26f26cb2b..000000000
--- a/app/src/main/res/layout/recording_list_cell.xml
+++ /dev/null
@@ -1,136 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <data>
-        <import type="android.view.View"/>
-        <variable
-            name="clickListener"
-            type="android.view.View.OnClickListener"/>
-        <variable
-            name="playListener"
-            type="android.view.View.OnClickListener"/>
-        <variable
-            name="position"
-            type="Integer"/>
-        <variable
-            name="data"
-            type="org.linphone.activities.main.recordings.data.RecordingData" />
-        <variable
-            name="selectionListViewModel"
-            type="org.linphone.activities.main.viewmodels.ListTopBarViewModel" />
-    </data>
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:onClick="@{clickListener}"
-        android:layout_width="match_parent"
-        android:layout_height="50dp"
-        android:paddingTop="5dp"
-        android:paddingBottom="5dp"
-        android:layout_marginLeft="5dp"
-        android:layout_marginRight="5dp"
-        android:background="?attr/backgroundColor">
-
-        <ImageView
-            android:id="@+id/record_play_pause"
-            android:layout_width="wrap_content"
-            android:layout_height="0dp"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            android:adjustViewBounds="true"
-            android:contentDescription="@string/content_description_recording_toggle_play"
-            android:onClick="@{playListener}"
-            android:padding="5dp"
-            android:selected="@{data.isPlaying}"
-            android:src="@drawable/recording_play_pause" />
-
-        <CheckBox
-            android:id="@+id/delete"
-            android:layout_width="wrap_content"
-            android:layout_height="0dp"
-            android:onClick="@{() -> selectionListViewModel.onToggleSelect(position)}"
-            android:visibility="@{selectionListViewModel.isEditionEnabled ? View.VISIBLE : View.GONE, default=gone}"
-            android:checked="@{selectionListViewModel.selectedItems.contains(position)}"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintEnd_toEndOf="parent" />
-
-        <ImageView
-            android:id="@+id/export"
-            android:layout_width="30dp"
-            android:layout_height="wrap_content"
-            android:padding="5dp"
-            android:onClick="@{() -> data.export()}"
-            android:src="@drawable/icon_share"
-            android:contentDescription="@string/content_description_recording_export"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintEnd_toStartOf="@id/delete" />
-
-        <RelativeLayout
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            app:layout_constraintStart_toEndOf="@id/record_play_pause"
-            app:layout_constraintEnd_toStartOf="@id/export"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent"
-            android:layout_marginLeft="10dp"
-            android:layout_marginRight="10dp">
-
-            <LinearLayout
-                android:id="@+id/record_description"
-                style="@style/contact_name_list_cell_font"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentStart="true"
-                android:layout_alignParentTop="true"
-                android:layout_toLeftOf="@id/playing_info"
-                android:layout_marginEnd="5dp">
-
-                <TextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:maxLines="1"
-                    android:ellipsize="end"
-                    android:text="@{data.name + `-` + data.formattedDate, default=`This is a sample meeeting recording - 13:50`}" />
-
-            </LinearLayout>
-
-            <LinearLayout
-                android:id="@+id/playing_info"
-                style="@style/standard_text_font"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentTop="true"
-                android:layout_alignParentEnd="true"
-                android:layout_alignParentRight="true"
-                android:orientation="horizontal">
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:text="@{data.formattedPosition + `/` + data.formattedDuration, default=`00:00/00:04`}" />
-
-            </LinearLayout>
-
-            <SeekBar
-                android:id="@+id/record_progression_bar"
-                onProgressChanged="@{(progress) -> data.onProgressChanged(progress)}"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_alignParentStart="true"
-                android:layout_alignParentEnd="true"
-                android:layout_alignParentBottom="true"
-                android:layout_marginRight="5dp"
-                android:max="@{data.duration}"
-                android:progress="@{data.position}"
-                android:progressTint="?attr/accentColor"
-                android:thumbTint="?attr/accentColor" />
-
-        </RelativeLayout>
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-</layout>
diff --git a/app/src/main/res/layout/recordings_fragment.xml b/app/src/main/res/layout/recordings_fragment.xml
deleted file mode 100644
index b582696ef..000000000
--- a/app/src/main/res/layout/recordings_fragment.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools">
-
-    <data>
-        <import type="android.view.View"/>
-        <variable
-            name="editClickListener"
-            type="android.view.View.OnClickListener"/>
-        <variable
-            name="videoTouchListener"
-            type="android.view.View.OnTouchListener" />
-        <variable
-            name="viewModel"
-            type="org.linphone.activities.main.recordings.viewmodels.RecordingsViewModel" />
-    </data>
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="?attr/backgroundColor">
-
-        <LinearLayout
-            android:id="@+id/top_bar"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/main_activity_top_bar_size"
-            android:layout_gravity="center_horizontal"
-            android:background="?attr/lightToolbarBackgroundColor"
-            android:orientation="horizontal">
-
-            <ImageView
-                android:id="@+id/back"
-                android:contentDescription="@string/content_description_go_back"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="0.2"
-                android:background="?attr/button_background_drawable"
-                android:padding="18dp"
-                android:src="@drawable/back" />
-
-            <TextView
-                style="@style/accent_colored_title_font"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="0.6"
-                android:gravity="center"
-                android:singleLine="true"
-                android:ellipsize="end"
-                android:padding="15dp"
-                android:text="@string/recordings"/>
-
-            <ImageView
-                android:onClick="@{editClickListener}"
-                android:enabled="@{!viewModel.recordingsList.empty}"
-                android:contentDescription="@string/content_description_enter_edition_mode"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="0.2"
-                android:background="?attr/button_background_drawable"
-                android:padding="15dp"
-                android:src="@drawable/delete" />
-
-        </LinearLayout>
-
-        <androidx.fragment.app.FragmentContainerView
-            android:id="@+id/list_edit_top_bar_fragment"
-            android:name="org.linphone.activities.main.fragments.ListTopBarFragment"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/main_activity_top_bar_size"
-            android:layout_alignTop="@id/top_bar"
-            tools:layout="@layout/list_edit_top_bar_fragment" />
-
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/recordings_list"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_below="@id/top_bar"/>
-
-        <TextView
-            android:visibility="@{viewModel.recordingsList.empty ? View.VISIBLE : View.GONE}"
-            style="@style/empty_list_font"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_centerVertical="true"
-            android:gravity="center"
-            android:text="@string/recordings_empty_list" />
-
-        <TextureView
-            android:id="@+id/recording_video_surface"
-            android:onTouch="@{videoTouchListener}"
-            android:visibility="@{viewModel.isVideoVisible ? View.VISIBLE : View.GONE, default=gone}"
-            android:layout_width="300dp"
-            android:layout_height="300dp"
-            android:layout_alignParentRight="true"
-            android:layout_alignParentBottom="true" />
-
-    </RelativeLayout>
-
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/settings_account_cell.xml b/app/src/main/res/layout/settings_account_cell.xml
deleted file mode 100644
index 5ae82b408..000000000
--- a/app/src/main/res/layout/settings_account_cell.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <data>
-        <import type="android.view.View" />
-        <variable
-            name="data"
-            type="org.linphone.activities.main.settings.viewmodels.AccountSettingsViewModel" />
-    </data>
-
-    <RelativeLayout
-        android:onClick="@{() -> data.accountsSettingsListener.onAccountClicked(data.identity)}"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center_vertical|left">
-
-        <ImageView
-            android:id="@+id/led"
-            android:background="@drawable/led_background"
-            android:padding="@dimen/contact_presence_badge_padding"
-            android:src="@{data.iconResource, default=@drawable/led_not_registered}"
-            android:contentDescription="@{data.iconContentDescription}"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentRight="true"
-            android:layout_centerVertical="true"
-            android:layout_marginLeft="10dp"
-            android:layout_marginRight="10dp" />
-
-        <org.linphone.views.MarqueeTextView
-            android:id="@+id/settings_title"
-            android:text="@{data.displayUsernameInsteadOfIdentity ? data.userName : data.identity}"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:singleLine="true"
-            android:layout_toLeftOf="@id/led"
-            android:layout_marginTop="15dp"
-            android:layout_marginLeft="10dp"
-            android:layout_marginRight="10dp"
-            style="@style/settings_item_font"/>
-
-        <org.linphone.views.MarqueeTextView
-            android:id="@+id/settings_subtitle"
-            android:visibility="@{data.isDefault() ? View.VISIBLE : View.GONE}"
-            android:text="@string/settings_default_account_subtitle"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:singleLine="true"
-            android:layout_below="@id/settings_title"
-            android:layout_toLeftOf="@id/led"
-            android:layout_marginLeft="10dp"
-            android:layout_marginRight="10dp"
-            style="@style/settings_item_subtitle_font"/>
-
-        <View
-            android:layout_marginTop="15dp"
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:layout_below="@id/settings_subtitle"
-            android:background="?attr/dividerColor" />
-
-    </RelativeLayout>
-
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/settings_account_fragment.xml b/app/src/main/res/layout/settings_account_fragment.xml
deleted file mode 100644
index df82c0bae..000000000
--- a/app/src/main/res/layout/settings_account_fragment.xml
+++ /dev/null
@@ -1,274 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:linphone="http://schemas.android.com/apk/res-auto"
-    xmlns:bind="http://schemas.android.com/tools">
-
-    <data>
-        <import type="android.view.View"/>
-        <import type="android.text.InputType"/>
-        <variable
-            name="viewModel"
-            type="org.linphone.activities.main.settings.viewmodels.AccountSettingsViewModel"/>
-        <variable
-            name="sharedMainViewModel"
-            type="org.linphone.activities.main.viewmodels.SharedMainViewModel" />
-    </data>
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-        <LinearLayout
-            android:id="@+id/top_bar"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/main_activity_top_bar_size"
-            android:layout_gravity="center_horizontal"
-            android:background="?attr/lightToolbarBackgroundColor"
-            android:orientation="horizontal">
-
-            <ImageView
-                android:id="@+id/back"
-                android:visibility="@{sharedMainViewModel.isSlidingPaneSlideable ? View.VISIBLE : View.GONE}"
-                android:contentDescription="@string/content_description_go_back"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="0.2"
-                android:background="?attr/button_background_drawable"
-                android:padding="18dp"
-                android:src="@drawable/back" />
-
-            <TextView
-                style="@style/accent_colored_title_font"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="0.6"
-                android:gravity="center"
-                android:singleLine="true"
-                android:ellipsize="end"
-                android:padding="15dp"
-                android:text="@string/settings_accounts_title"/>
-
-            <View
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="0.2"
-                android:visibility="@{sharedMainViewModel.isSlidingPaneSlideable ? View.INVISIBLE : View.GONE}" />
-
-        </LinearLayout>
-
-        <androidx.core.widget.NestedScrollView
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_below="@id/top_bar">
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical">
-
-                <include
-                    layout="@layout/settings_widget_text"
-                    linphone:title="@{@string/account_settings_user_name_title}"
-                    linphone:subtitle="@{@string/account_settings_user_name_summary}"
-                    linphone:listener="@{viewModel.userNameListener}"
-                    linphone:defaultValue="@{viewModel.userName}"
-                    linphone:inputType="@{InputType.TYPE_TEXT_VARIATION_PERSON_NAME}"/>
-
-                <include
-                    layout="@layout/settings_widget_text"
-                    linphone:title="@{@string/account_settings_user_id_title}"
-                    linphone:subtitle="@{@string/account_settings_user_id_summary}"
-                    linphone:listener="@{viewModel.userIdListener}"
-                    linphone:defaultValue="@{viewModel.userId}"
-                    linphone:inputType="@{InputType.TYPE_TEXT_VARIATION_PERSON_NAME}"/>
-
-                <include
-                    layout="@layout/settings_widget_text"
-                    linphone:title="@{@string/account_settings_password_title}"
-                    linphone:subtitle="@{@string/account_settings_password_summary}"
-                    linphone:listener="@{viewModel.passwordListener}"
-                    linphone:defaultValue="@{viewModel.password}"
-                    linphone:inputType="@{InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD}"/>
-
-                <include
-                    layout="@layout/settings_widget_text"
-                    linphone:title="@{@string/account_settings_domain_title}"
-                    linphone:subtitle="@{@string/account_settings_domain_summary}"
-                    linphone:listener="@{viewModel.domainListener}"
-                    linphone:defaultValue="@{viewModel.domain}"
-                    linphone:inputType="@{InputType.TYPE_TEXT_VARIATION_EMAIL_ADDRESS}"/>
-
-                <include
-                    layout="@layout/settings_widget_text"
-                    linphone:title="@{@string/account_settings_display_name_title}"
-                    linphone:listener="@{viewModel.displayNameListener}"
-                    linphone:defaultValue="@{viewModel.displayName}"
-                    linphone:inputType="@{InputType.TYPE_TEXT_VARIATION_PERSON_NAME}"/>
-
-                <TextView
-                    style="@style/settings_category_font"
-                    android:text="@string/account_settings_manage_title"
-                    android:paddingTop="15dp"
-                    android:layout_marginLeft="10dp"
-                    android:layout_marginRight="10dp"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"/>
-
-                <include
-                    layout="@layout/settings_widget_switch"
-                    linphone:title="@{@string/account_settings_disable_title}"
-                    linphone:listener="@{viewModel.disableListener}"
-                    linphone:checked="@={viewModel.disable}"/>
-
-                <include
-                    layout="@layout/settings_widget_switch"
-                    linphone:title="@{@string/account_settings_default_title}"
-                    linphone:listener="@{viewModel.isDefaultListener}"
-                    linphone:checked="@={viewModel.isDefault}"
-                    linphone:enabled="@{!viewModel.isDefault}"/>
-
-                <include
-                    layout="@layout/settings_widget_basic"
-                    linphone:title="@{@string/account_settings_link_phone_number_title}"
-                    linphone:listener="@{viewModel.linkPhoneNumberListener}"
-                    linphone:enabled="@{viewModel.pushNotificationsAvailable}"
-                    android:visibility="@{viewModel.hideLinkPhoneNumber ? View.GONE : View.VISIBLE}"/>
-
-                <include
-                    layout="@layout/settings_widget_basic"
-                    linphone:title="@{@string/account_settings_delete_title}"
-                    linphone:listener="@{viewModel.deleteListener}"/>
-
-                <TextView
-                    style="@style/settings_category_font"
-                    android:text="@string/account_settings_advanced_title"
-                    android:paddingTop="15dp"
-                    android:layout_marginLeft="10dp"
-                    android:layout_marginRight="10dp"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"/>
-
-                <include
-                    layout="@layout/settings_widget_switch"
-                    linphone:title="@{@string/account_settings_push_notification_title}"
-                    linphone:subtitle="@{@string/account_settings_push_notification_summary}"
-                    linphone:listener="@{viewModel.pushNotificationListener}"
-                    linphone:checked="@={viewModel.pushNotification}"
-                    android:visibility="@{viewModel.pushNotificationsAvailable ? View.VISIBLE : View.GONE}"/>
-
-                <include
-                    layout="@layout/settings_widget_list"
-                    linphone:title="@{@string/account_settings_transport_title}"
-                    linphone:listener="@{viewModel.transportListener}"
-                    linphone:selectedIndex="@{viewModel.transportIndex}"
-                    linphone:labels="@{viewModel.transportLabels}"/>
-
-                <include
-                    layout="@layout/settings_widget_text"
-                    linphone:title="@{@string/account_settings_proxy_title}"
-                    linphone:listener="@{viewModel.proxyListener}"
-                    linphone:defaultValue="@{viewModel.proxy}"
-                    linphone:inputType="@{InputType.TYPE_TEXT_VARIATION_URI}"/>
-
-                <include
-                    layout="@layout/settings_widget_switch"
-                    linphone:title="@{@string/account_settings_outbound_proxy_title}"
-                    linphone:subtitle="@{@string/account_settings_outbound_proxy_summary}"
-                    linphone:listener="@{viewModel.outboundProxyListener}"
-                    linphone:checked="@={viewModel.outboundProxy}"/>
-
-                <include
-                    layout="@layout/settings_widget_text"
-                    linphone:title="@{@string/account_settings_stun_server_title}"
-                    linphone:listener="@{viewModel.stunServerListener}"
-                    linphone:defaultValue="@{viewModel.stunServer}"
-                    linphone:inputType="@{InputType.TYPE_TEXT_VARIATION_URI}"/>
-
-                <include
-                    layout="@layout/settings_widget_switch"
-                    linphone:title="@{@string/account_settings_ice_title}"
-                    linphone:listener="@{viewModel.iceListener}"
-                    linphone:checked="@={viewModel.ice}"/>
-
-                <include
-                    layout="@layout/settings_widget_switch"
-                    linphone:title="@{@string/account_settings_avpf_title}"
-                    linphone:listener="@{viewModel.avpfListener}"
-                    linphone:checked="@={viewModel.avpf}"/>
-
-                <include
-                    layout="@layout/settings_widget_text"
-                    linphone:title="@{@string/account_settings_avpf_rr_interval_title}"
-                    linphone:subtitle="@{@string/account_settings_avpf_rr_interval_summary}"
-                    linphone:listener="@{viewModel.avpfRrIntervalListener}"
-                    linphone:defaultValue="@{viewModel.avpfRrInterval.toString()}"
-                    linphone:inputType="@{InputType.TYPE_CLASS_NUMBER}"
-                    linphone:enabled="@{viewModel.avpf}"/>
-
-                <include
-                    layout="@layout/settings_widget_text"
-                    linphone:title="@{@string/account_settings_expires_title}"
-                    linphone:subtitle="@{@string/account_settings_expires_summary}"
-                    linphone:listener="@{viewModel.expiresListener}"
-                    linphone:defaultValue="@{viewModel.expires.toString()}"
-                    linphone:inputType="@{InputType.TYPE_CLASS_NUMBER}"/>
-
-                <include
-                    layout="@layout/settings_widget_text"
-                    linphone:title="@{@string/account_settings_prefix_title}"
-                    linphone:subtitle="@{@string/account_settings_prefix_summary}"
-                    linphone:listener="@{viewModel.prefixListener}"
-                    linphone:defaultValue="@{viewModel.prefix}"
-                    linphone:inputType="@{InputType.TYPE_CLASS_NUMBER}"/>
-
-                <include
-                    layout="@layout/settings_widget_switch"
-                    linphone:title="@{@string/account_settings_apply_prefix_for_calls_title}"
-                    linphone:subtitle="@{@string/account_settings_apply_prefix_for_calls_summary}"
-                    linphone:listener="@{viewModel.dialPrefixListener}"
-                    linphone:checked="@={viewModel.dialPrefix}"/>
-
-                <include
-                    layout="@layout/settings_widget_switch"
-                    linphone:title="@{@string/account_settings_escape_plus_title}"
-                    linphone:listener="@{viewModel.escapePlusListener}"
-                    linphone:checked="@={viewModel.escapePlus}"/>
-
-                <include
-                    layout="@layout/settings_widget_text"
-                    linphone:title="@{@string/account_setting_conference_factory_address}"
-                    linphone:listener="@{viewModel.conferenceFactoryUriListener}"
-                    linphone:defaultValue="@{viewModel.conferenceFactoryUri}"
-                    linphone:inputType="@{InputType.TYPE_CLASS_TEXT}"/>
-
-                <include
-                    layout="@layout/settings_widget_text"
-                    linphone:title="@{@string/account_setting_audio_video_conference_factory_address}"
-                    linphone:listener="@{viewModel.audioVideoConferenceFactoryUriListener}"
-                    linphone:defaultValue="@{viewModel.audioVideoConferenceFactoryUri}"
-                    linphone:inputType="@{InputType.TYPE_CLASS_TEXT}"/>
-
-                <include
-                    layout="@layout/settings_widget_text"
-                    linphone:title="@{@string/account_setting_end_to_end_encryption_keys_server_url}"
-                    linphone:listener="@{viewModel.limeServerUrlListener}"
-                    linphone:defaultValue="@{viewModel.limeServerUrl}"
-                    linphone:inputType="@{InputType.TYPE_CLASS_TEXT}"/>
-
-                <include
-                    layout="@layout/settings_widget_switch"
-                    linphone:title="@{@string/account_setting_disable_bundle_mode_title}"
-                    linphone:listener="@{viewModel.disableBundleModeListener}"
-                    linphone:checked="@={viewModel.disableBundleMode}"/>
-
-            </LinearLayout>
-
-        </androidx.core.widget.NestedScrollView>
-
-        <include
-            layout="@layout/wait_layout"
-            bind:visibility="@{viewModel.waitForUnregister}"/>
-
-    </RelativeLayout>
-
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/settings_advanced_fragment.xml b/app/src/main/res/layout/settings_advanced_fragment.xml
deleted file mode 100644
index 74440b301..000000000
--- a/app/src/main/res/layout/settings_advanced_fragment.xml
+++ /dev/null
@@ -1,206 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:linphone="http://schemas.android.com/apk/res-auto"
-    xmlns:bind="http://schemas.android.com/tools">
-
-    <data>
-        <import type="android.view.View"/>
-        <import type="android.text.InputType"/>
-        <variable
-            name="viewModel"
-            type="org.linphone.activities.main.settings.viewmodels.AdvancedSettingsViewModel"/>
-        <variable
-            name="sharedMainViewModel"
-            type="org.linphone.activities.main.viewmodels.SharedMainViewModel" />
-    </data>
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-        <LinearLayout
-            android:id="@+id/top_bar"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/main_activity_top_bar_size"
-            android:layout_gravity="center_horizontal"
-            android:background="?attr/lightToolbarBackgroundColor"
-            android:orientation="horizontal">
-
-            <ImageView
-                android:id="@+id/back"
-                android:visibility="@{sharedMainViewModel.isSlidingPaneSlideable ? View.VISIBLE : View.GONE}"
-                android:contentDescription="@string/content_description_go_back"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="0.2"
-                android:background="?attr/button_background_drawable"
-                android:padding="18dp"
-                android:src="@drawable/back" />
-
-            <TextView
-                style="@style/accent_colored_title_font"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="0.6"
-                android:gravity="center"
-                android:singleLine="true"
-                android:ellipsize="end"
-                android:padding="15dp"
-                android:text="@string/settings_advanced_title"/>
-
-            <View
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="0.2"
-                android:visibility="@{sharedMainViewModel.isSlidingPaneSlideable ? View.INVISIBLE : View.GONE}" />
-
-        </LinearLayout>
-
-        <androidx.core.widget.NestedScrollView
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_below="@id/top_bar">
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical">
-
-                <TextView
-                    style="@style/settings_category_font"
-                    android:text="@string/advanced_settings_debug_title"
-                    android:paddingTop="15dp"
-                    android:layout_marginLeft="10dp"
-                    android:layout_marginRight="10dp"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"/>
-
-                <include
-                    layout="@layout/settings_widget_switch"
-                    linphone:title="@{@string/advanced_settings_debug_mode_title}"
-                    linphone:listener="@{viewModel.debugModeListener}"
-                    linphone:checked="@={viewModel.debugMode}"/>
-
-                <include
-                    layout="@layout/settings_widget_text"
-                    linphone:title="@{@string/advanced_settings_logs_server_url_title}"
-                    linphone:subtitle="@{@string/advanced_settings_logs_server_url_summary}"
-                    linphone:listener="@{viewModel.logsServerUrlListener}"
-                    linphone:defaultValue="@{viewModel.logsServerUrl}"
-                    linphone:inputType="@{InputType.TYPE_TEXT_VARIATION_URI}"
-                    linphone:enabled="@{viewModel.debugMode}"/>
-
-                <include
-                    layout="@layout/settings_widget_basic"
-                    linphone:title="@{@string/advanced_settings_send_debug_logs_title}"
-                    linphone:listener="@{viewModel.sendDebugLogsListener}"
-                    linphone:enabled="@{viewModel.debugMode}"/>
-
-                <include
-                    layout="@layout/settings_widget_basic"
-                    linphone:title="@{@string/advanced_settings_reset_debug_logs_title}"
-                    linphone:listener="@{viewModel.resetDebugLogsListener}"
-                    linphone:enabled="@{viewModel.debugMode}"/>
-
-                <TextView
-                    style="@style/settings_category_font"
-                    android:text="@string/advanced_settings_other_title"
-                    android:paddingTop="15dp"
-                    android:layout_marginLeft="10dp"
-                    android:layout_marginRight="10dp"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"/>
-
-                <include
-                    layout="@layout/settings_widget_switch"
-                    linphone:enabled="@{viewModel.backgroundModeEnabled}"
-                    linphone:title="@{@string/advanced_settings_background_mode_title}"
-                    linphone:subtitle="@{@string/advanced_settings_background_mode_summary}"
-                    linphone:listener="@{viewModel.backgroundModeListener}"
-                    linphone:checked="@={viewModel.backgroundMode}"/>
-
-                <include
-                    layout="@layout/settings_widget_switch"
-                    linphone:title="@{@string/advanced_settings_auto_start_title}"
-                    linphone:listener="@{viewModel.autoStartListener}"
-                    linphone:checked="@={viewModel.autoStart}"/>
-
-                <include
-                    layout="@layout/settings_widget_list"
-                    linphone:title="@{@string/advanced_settings_dark_mode_title}"
-                    linphone:listener="@{viewModel.darkModeListener}"
-                    linphone:selectedIndex="@{viewModel.darkModeIndex}"
-                    linphone:labels="@{viewModel.darkModeLabels}"/>
-
-                <include
-                    layout="@layout/settings_widget_switch"
-                    linphone:title="@{@string/advanced_settings_animations_title}"
-                    linphone:listener="@{viewModel.animationsListener}"
-                    linphone:checked="@={viewModel.animations}"/>
-
-                <include
-                    layout="@layout/settings_widget_text"
-                    linphone:title="@{@string/advanced_settings_device_name_title}"
-                    linphone:subtitle="@{@string/advanced_settings_device_name_summary}"
-                    linphone:listener="@{viewModel.deviceNameListener}"
-                    linphone:defaultValue="@{viewModel.deviceName}"/>
-
-                <include
-                    layout="@layout/settings_widget_text"
-                    linphone:title="@{@string/advanced_settings_remote_provisioning_url_title}"
-                    linphone:listener="@{viewModel.remoteProvisioningUrlListener}"
-                    linphone:defaultValue="@{viewModel.remoteProvisioningUrl}"
-                    linphone:inputType="@{InputType.TYPE_TEXT_VARIATION_URI}"/>
-
-                <include
-                    layout="@layout/settings_widget_switch"
-                    linphone:title="@{@string/advanced_settings_vfs_title}"
-                    linphone:subtitle="@{@string/advanced_settings_vfs_summary}"
-                    linphone:listener="@{viewModel.vfsListener}"
-                    linphone:checked="@={viewModel.vfs}"
-                    linphone:enabled="@{!viewModel.vfs}"/>
-
-                <include
-                    layout="@layout/settings_widget_switch"
-                    linphone:title="@{@string/advanced_settings_disable_fragment_security_title}"
-                    linphone:subtitle="@{@string/advanced_settings_disable_fragment_security_summary}"
-                    linphone:listener="@{viewModel.disableSecureFragmentListener}"
-                    linphone:checked="@={viewModel.disableSecureFragment}"/>
-
-                <TextView
-                    style="@style/settings_category_font"
-                    android:text="@string/advanced_settings_android_title"
-                    android:paddingTop="15dp"
-                    android:layout_marginLeft="10dp"
-                    android:layout_marginRight="10dp"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"/>
-
-                <include
-                    layout="@layout/settings_widget_basic"
-                    android:visibility="@{viewModel.batterySettingsVisibility ? View.VISIBLE : View.GONE}"
-                    linphone:listener="@{viewModel.goToBatterySettingsListener}"
-                    linphone:title="@{@string/advanced_settings_go_to_battery_optimization_settings}" />
-
-                <include
-                    layout="@layout/settings_widget_basic"
-                    android:visibility="@{viewModel.powerManagerSettingsVisibility ? View.VISIBLE : View.GONE}"
-                    linphone:listener="@{viewModel.goToPowerManagerSettingsListener}"
-                    linphone:title="@{@string/advanced_settings_go_to_power_manager_settings}" />
-
-                <include
-                    layout="@layout/settings_widget_basic"
-                    linphone:listener="@{viewModel.goToAndroidSettingsListener}"
-                    linphone:title="@{@string/advanced_settings_go_to_android_app_settings}" />
-
-            </LinearLayout>
-
-        </androidx.core.widget.NestedScrollView>
-
-        <include
-            layout="@layout/wait_layout"
-            bind:visibility="@{viewModel.uploadInProgress}"/>
-
-    </RelativeLayout>
-
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/settings_audio_fragment.xml b/app/src/main/res/layout/settings_audio_fragment.xml
deleted file mode 100644
index 914c402c2..000000000
--- a/app/src/main/res/layout/settings_audio_fragment.xml
+++ /dev/null
@@ -1,161 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:linphone="http://schemas.android.com/apk/res-auto">
-
-    <data>
-        <import type="android.view.View"/>
-        <import type="android.text.InputType"/>
-        <variable
-            name="viewModel"
-            type="org.linphone.activities.main.settings.viewmodels.AudioSettingsViewModel"/>
-        <variable
-            name="sharedMainViewModel"
-            type="org.linphone.activities.main.viewmodels.SharedMainViewModel" />
-    </data>
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-        <LinearLayout
-            android:id="@+id/top_bar"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/main_activity_top_bar_size"
-            android:layout_gravity="center_horizontal"
-            android:background="?attr/lightToolbarBackgroundColor"
-            android:orientation="horizontal">
-
-            <ImageView
-                android:id="@+id/back"
-                android:visibility="@{sharedMainViewModel.isSlidingPaneSlideable ? View.VISIBLE : View.GONE}"
-                android:contentDescription="@string/content_description_go_back"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="0.2"
-                android:background="?attr/button_background_drawable"
-                android:padding="18dp"
-                android:src="@drawable/back" />
-
-            <TextView
-                style="@style/accent_colored_title_font"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="0.6"
-                android:gravity="center"
-                android:singleLine="true"
-                android:ellipsize="end"
-                android:padding="15dp"
-                android:text="@string/settings_audio_title"/>
-
-            <View
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="0.2"
-                android:visibility="@{sharedMainViewModel.isSlidingPaneSlideable ? View.INVISIBLE : View.GONE}" />
-
-        </LinearLayout>
-
-        <androidx.core.widget.NestedScrollView
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_below="@id/top_bar">
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical">
-
-                <include
-                    layout="@layout/settings_widget_switch"
-                    linphone:title="@{@string/audio_settings_software_echo_cancellation_title}"
-                    linphone:subtitle="@{@string/audio_settings_echo_cancellation_summary}"
-                    linphone:listener="@{viewModel.softwareEchoCancellerListener}"
-                    linphone:checked="@={viewModel.softwareEchoCanceller}"/>
-
-                <include
-                    layout="@layout/settings_widget_basic"
-                    linphone:title="@{@string/audio_settings_echo_canceller_calibration_title}"
-                    linphone:subtitle="@{viewModel.softwareEchoCalibration}"
-                    linphone:listener="@{viewModel.softwareEchoCancellerCalibrationListener}"/>
-
-                <include
-                    layout="@layout/settings_widget_basic"
-                    android:visibility="@{viewModel.showEchoTester ? View.VISIBLE : View.GONE, default=gone}"
-                    linphone:title="@{@string/audio_settings_echo_tester_title}"
-                    linphone:subtitle="@{viewModel.echoTesterStatus}"
-                    linphone:listener="@{viewModel.echoTesterListener}"/>
-
-                <include
-                    layout="@layout/settings_widget_switch"
-                    linphone:title="@{@string/audio_settings_adaptive_rate_control_title}"
-                    linphone:listener="@{viewModel.adaptiveRateControlListener}"
-                    linphone:checked="@={viewModel.adaptiveRateControl}"/>
-
-                <include
-                    layout="@layout/settings_widget_list"
-                    linphone:title="@{@string/audio_settings_input_device_title}"
-                    linphone:subtitle="@{@string/audio_settings_input_device_summary}"
-                    linphone:listener="@{viewModel.inputAudioDeviceListener}"
-                    linphone:selectedIndex="@{viewModel.inputAudioDeviceIndex}"
-                    linphone:labels="@{viewModel.inputAudioDeviceLabels}"/>
-
-                <include
-                    layout="@layout/settings_widget_list"
-                    linphone:title="@{@string/audio_settings_output_device_title}"
-                    linphone:subtitle="@{@string/audio_settings_output_device_summary}"
-                    linphone:listener="@{viewModel.outputAudioDeviceListener}"
-                    linphone:selectedIndex="@{viewModel.outputAudioDeviceIndex}"
-                    linphone:labels="@{viewModel.outputAudioDeviceLabels}"/>
-
-                <include
-                    layout="@layout/settings_widget_switch"
-                    linphone:title="@{@string/audio_settings_prefer_bluetooth_devices_title}"
-                    linphone:listener="@{viewModel.preferBluetoothDevicesListener}"
-                    linphone:checked="@={viewModel.preferBluetoothDevices}"/>
-
-                <include
-                    layout="@layout/settings_widget_list"
-                    linphone:title="@{@string/audio_settings_codec_bitrate_title}"
-                    linphone:listener="@{viewModel.codecBitrateListener}"
-                    linphone:selectedIndex="@{viewModel.codecBitrateIndex}"
-                    linphone:labels="@{viewModel.codecBitrateLabels}"/>
-
-                <include
-                    layout="@layout/settings_widget_text"
-                    linphone:title="@{@string/audio_settings_microphone_gain_title}"
-                    linphone:subtitle="@{@string/audio_settings_microphone_gain_summary}"
-                    linphone:listener="@{viewModel.microphoneGainListener}"
-                    linphone:defaultValue="@{viewModel.microphoneGain.toString()}"
-                    linphone:inputType="@{InputType.TYPE_CLASS_NUMBER | InputType.TYPE_NUMBER_FLAG_SIGNED |  InputType.TYPE_NUMBER_FLAG_DECIMAL}"/>
-
-                <include
-                    layout="@layout/settings_widget_text"
-                    linphone:title="@{@string/audio_settings_playback_gain_title}"
-                    linphone:subtitle="@{@string/audio_settings_playback_gain_summary}"
-                    linphone:listener="@{viewModel.playbackGainListener}"
-                    linphone:defaultValue="@{viewModel.playbackGain.toString()}"
-                    linphone:inputType="@{InputType.TYPE_CLASS_NUMBER | InputType.TYPE_NUMBER_FLAG_SIGNED | InputType.TYPE_NUMBER_FLAG_DECIMAL}"/>
-
-                <TextView
-                    style="@style/settings_category_font"
-                    android:id="@+id/pref_video_codecs_header"
-                    android:text="@string/audio_settings_codecs_title"
-                    android:paddingTop="15dp"
-                    android:layout_marginLeft="10dp"
-                    android:layout_marginRight="10dp"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"/>
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="vertical"
-                    linphone:entries="@{viewModel.audioCodecs}"/>
-
-            </LinearLayout>
-
-        </androidx.core.widget.NestedScrollView>
-
-    </RelativeLayout>
-
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/settings_call_fragment.xml b/app/src/main/res/layout/settings_call_fragment.xml
deleted file mode 100644
index fc7a122db..000000000
--- a/app/src/main/res/layout/settings_call_fragment.xml
+++ /dev/null
@@ -1,227 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:linphone="http://schemas.android.com/apk/res-auto">
-
-    <data>
-        <import type="android.view.View"/>
-        <import type="android.text.InputType"/>
-        <variable
-            name="viewModel"
-            type="org.linphone.activities.main.settings.viewmodels.CallSettingsViewModel"/>
-        <variable
-            name="sharedMainViewModel"
-            type="org.linphone.activities.main.viewmodels.SharedMainViewModel" />
-    </data>
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-        <LinearLayout
-            android:id="@+id/top_bar"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/main_activity_top_bar_size"
-            android:layout_gravity="center_horizontal"
-            android:background="?attr/lightToolbarBackgroundColor"
-            android:orientation="horizontal">
-
-            <ImageView
-                android:id="@+id/back"
-                android:visibility="@{sharedMainViewModel.isSlidingPaneSlideable ? View.VISIBLE : View.GONE}"
-                android:contentDescription="@string/content_description_go_back"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="0.2"
-                android:background="?attr/button_background_drawable"
-                android:padding="18dp"
-                android:src="@drawable/back" />
-
-            <TextView
-                style="@style/accent_colored_title_font"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="0.6"
-                android:gravity="center"
-                android:singleLine="true"
-                android:ellipsize="end"
-                android:padding="15dp"
-                android:text="@string/settings_call_title"/>
-
-            <View
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="0.2"
-                android:visibility="@{sharedMainViewModel.isSlidingPaneSlideable ? View.INVISIBLE : View.GONE}" />
-
-        </LinearLayout>
-
-        <androidx.core.widget.NestedScrollView
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_below="@id/top_bar">
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical">
-
-                <include
-                    layout="@layout/settings_widget_switch"
-                    linphone:title="@{@string/call_settings_device_ringtone_title}"
-                    android:visibility="@{viewModel.showRingtonesList ? View.GONE : View.VISIBLE}"
-                    linphone:listener="@{viewModel.deviceRingtoneListener}"
-                    linphone:checked="@={viewModel.deviceRingtone}"/>
-
-                <include
-                    layout="@layout/settings_widget_list"
-                    android:visibility="@{viewModel.showRingtonesList ? View.VISIBLE : View.GONE, default=gone}"
-                    linphone:title="@{@string/call_settings_ringtones_title}"
-                    linphone:listener="@{viewModel.ringtoneListener}"
-                    linphone:selectedIndex="@{viewModel.ringtoneIndex}"
-                    linphone:labels="@{viewModel.ringtoneLabels}"/>
-
-                <include
-                    layout="@layout/settings_widget_switch"
-                    linphone:title="@{@string/call_settings_vibrate_title}"
-                    linphone:listener="@{viewModel.vibrateOnIncomingCallListener}"
-                    linphone:checked="@={viewModel.vibrateOnIncomingCall}"
-                    android:visibility="@{viewModel.canVibrate ? View.VISIBLE : View.GONE}"/>
-
-                <include
-                    layout="@layout/settings_widget_list"
-                    linphone:title="@{@string/call_settings_encryption_title}"
-                    linphone:listener="@{viewModel.encryptionListener}"
-                    linphone:selectedIndex="@{viewModel.encryptionIndex}"
-                    linphone:labels="@{viewModel.encryptionLabels}"/>
-
-                <include
-                    layout="@layout/settings_widget_switch"
-                    linphone:title="@{@string/call_settings_encryption_mandatory_title}"
-                    linphone:listener="@{viewModel.encryptionMandatoryListener}"
-                    linphone:checked="@={viewModel.encryptionMandatory}"
-                    linphone:enabled="@{viewModel.encryptionIndex != 0}" />
-
-                <include
-                    layout="@layout/settings_widget_switch"
-                    linphone:title="@{@string/call_settings_use_telecom_manager_title}"
-                    linphone:subtitle="@{@string/call_settings_use_telecom_manager_summary}"
-                    android:visibility="@{viewModel.api29OrHigher ? View.VISIBLE : View.GONE}"
-                    linphone:listener="@{viewModel.useTelecomManagerListener}"
-                    linphone:checked="@={viewModel.useTelecomManager}"/>
-
-                <include
-                    layout="@layout/settings_widget_switch"
-                    linphone:title="@{@string/call_settings_overlay_title}"
-                    linphone:listener="@{viewModel.overlayListener}"
-                    linphone:checked="@={viewModel.overlay}"/>
-
-                <include
-                    layout="@layout/settings_widget_switch"
-                    linphone:title="@{@string/call_settings_system_wide_overlay_title}"
-                    linphone:subtitle="@{@string/call_settings_system_wide_overlay_summary}"
-                    linphone:listener="@{viewModel.systemWideOverlayListener}"
-                    linphone:checked="@={viewModel.systemWideOverlay}"
-                    linphone:enabled="@{viewModel.overlay}"/>
-
-                <include
-                    layout="@layout/settings_widget_switch"
-                    linphone:title="@{@string/call_settings_sipinfo_dtmf_title}"
-                    linphone:listener="@{viewModel.sipInfoDtmfListener}"
-                    linphone:checked="@={viewModel.sipInfoDtmf}"/>
-
-                <include
-                    layout="@layout/settings_widget_switch"
-                    linphone:title="@{@string/call_settings_rfc2833_dtmf_title}"
-                    linphone:listener="@{viewModel.rfc2833DtmfListener}"
-                    linphone:checked="@={viewModel.rfc2833Dtmf}"/>
-
-                <include
-                    layout="@layout/settings_widget_switch"
-                    linphone:title="@{@string/call_settings_auto_start_recording_title}"
-                    linphone:listener="@{viewModel.autoStartCallRecordingListener}"
-                    linphone:checked="@={viewModel.autoStartCallRecording}"/>
-
-                <include
-                    layout="@layout/settings_widget_switch"
-                    linphone:title="@{@string/call_settings_remote_recording_title}"
-                    linphone:listener="@{viewModel.remoteCallRecordingListener}"
-                    linphone:checked="@={viewModel.remoteCallRecording}"
-                    android:visibility="gone"/>
-
-                <include
-                    layout="@layout/settings_widget_switch"
-                    linphone:title="@{@string/call_settings_auto_start_title}"
-                    linphone:subtitle="@{@string/call_settings_auto_start_summary}"
-                    linphone:listener="@{viewModel.autoStartListener}"
-                    linphone:checked="@={viewModel.autoStart}"/>
-
-                <include
-                    layout="@layout/settings_widget_switch"
-                    linphone:title="@{@string/call_settings_auto_answer_title}"
-                    linphone:listener="@{viewModel.autoAnswerListener}"
-                    linphone:checked="@={viewModel.autoAnswer}"/>
-
-                <include
-                    layout="@layout/settings_widget_text"
-                    linphone:title="@{@string/call_settings_auto_answer_delay_title}"
-                    linphone:subtitle="@{@string/call_settings_auto_answer_delay_summary}"
-                    linphone:listener="@{viewModel.autoAnswerDelayListener}"
-                    linphone:defaultValue="@{viewModel.autoAnswerDelay.toString()}"
-                    linphone:inputType="@{InputType.TYPE_CLASS_NUMBER}"
-                    linphone:enabled="@{viewModel.autoAnswer}"
-                    android:visibility="@{viewModel.autoAnswer ? View.VISIBLE : View.GONE}"/>
-
-                <include
-                    layout="@layout/settings_widget_text"
-                    linphone:title="@{@string/call_settings_incoming_timeout_title}"
-                    linphone:subtitle="@{@string/call_settings_incoming_timeout_summary}"
-                    linphone:listener="@{viewModel.incomingTimeoutListener}"
-                    linphone:defaultValue="@{viewModel.incomingTimeout.toString()}"
-                    linphone:inputType="@{InputType.TYPE_CLASS_NUMBER}"/>
-
-                <include
-                    layout="@layout/settings_widget_text"
-                    linphone:title="@{@string/call_settings_voice_mail_uri_title}"
-                    linphone:listener="@{viewModel.voiceMailUriListener}"
-                    linphone:defaultValue="@{viewModel.voiceMailUri}"
-                    linphone:inputType="@{InputType.TYPE_TEXT_VARIATION_URI}"/>
-
-                <include
-                    layout="@layout/settings_widget_switch"
-                    linphone:title="@{@string/call_settings_redirect_to_voice_mail_declined_calls_title}"
-                    linphone:listener="@{viewModel.redirectToVoiceMailIncomingDeclinedCallsListener}"
-                    linphone:checked="@={viewModel.redirectToVoiceMailIncomingDeclinedCalls}"
-                    linphone:enabled="@{viewModel.voiceMailUri.length() > 0}"/>
-
-                <include
-                    layout="@layout/settings_widget_switch"
-                    linphone:title="@{@string/call_settings_accept_early_media_title}"
-                    linphone:listener="@{viewModel.acceptEarlyMediaListener}"
-                    linphone:checked="@={viewModel.acceptEarlyMedia}"/>
-
-                <include
-                    layout="@layout/settings_widget_switch"
-                    linphone:title="@{@string/call_settings_ring_during_early_media_title}"
-                    linphone:listener="@{viewModel.ringDuringEarlyMediaListener}"
-                    linphone:checked="@={viewModel.ringDuringEarlyMedia}"
-                    linphone:enabled="@{viewModel.acceptEarlyMedia}"/>
-
-                <include
-                    layout="@layout/settings_widget_switch"
-                    linphone:title="@{@string/call_settings_pause_calls_lost_audio_focus_title}"
-                    linphone:listener="@{viewModel.pauseCallsWhenAudioFocusIsLostListener}"
-                    linphone:checked="@={viewModel.pauseCallsWhenAudioFocusIsLost}"
-                    linphone:enabled="@{!viewModel.useTelecomManager}"/>
-
-                <include
-                    layout="@layout/settings_widget_basic"
-                    linphone:listener="@{viewModel.goToAndroidNotificationSettingsListener}"
-                    linphone:title="@{@string/call_settings_go_to_android_notification_settings}" />
-
-            </LinearLayout>
-
-        </androidx.core.widget.NestedScrollView>
-
-    </RelativeLayout>
-
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/settings_chat_fragment.xml b/app/src/main/res/layout/settings_chat_fragment.xml
deleted file mode 100644
index 0f99bb55f..000000000
--- a/app/src/main/res/layout/settings_chat_fragment.xml
+++ /dev/null
@@ -1,161 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:linphone="http://schemas.android.com/apk/res-auto">
-
-    <data>
-        <import type="android.view.View"/>
-        <import type="android.text.InputType"/>
-        <variable
-            name="viewModel"
-            type="org.linphone.activities.main.settings.viewmodels.ChatSettingsViewModel"/>
-        <variable
-            name="sharedMainViewModel"
-            type="org.linphone.activities.main.viewmodels.SharedMainViewModel" />
-    </data>
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-        <LinearLayout
-            android:id="@+id/top_bar"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/main_activity_top_bar_size"
-            android:layout_gravity="center_horizontal"
-            android:background="?attr/lightToolbarBackgroundColor"
-            android:orientation="horizontal">
-
-            <ImageView
-                android:id="@+id/back"
-                android:visibility="@{sharedMainViewModel.isSlidingPaneSlideable ? View.VISIBLE : View.GONE}"
-                android:contentDescription="@string/content_description_go_back"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="0.2"
-                android:background="?attr/button_background_drawable"
-                android:padding="18dp"
-                android:src="@drawable/back" />
-
-            <TextView
-                style="@style/accent_colored_title_font"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="0.6"
-                android:gravity="center"
-                android:singleLine="true"
-                android:ellipsize="end"
-                android:padding="15dp"
-                android:text="@string/settings_chat_title"/>
-
-            <View
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="0.2"
-                android:visibility="@{sharedMainViewModel.isSlidingPaneSlideable ? View.INVISIBLE : View.GONE}" />
-
-        </LinearLayout>
-
-        <androidx.core.widget.NestedScrollView
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_below="@id/top_bar">
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical">
-
-                <include
-                    layout="@layout/settings_widget_switch"
-                    linphone:title="@{@string/chat_settings_mark_as_read_notif_dismissal_title}"
-                    linphone:listener="@{viewModel.markAsReadNotifDismissalListener}"
-                    linphone:checked="@={viewModel.markAsReadNotifDismissal}"/>
-
-                <include
-                    layout="@layout/settings_widget_list"
-                    linphone:title="@{@string/chat_settings_auto_download_title}"
-                    linphone:subtitle="@{@string/chat_settings_auto_download_summary}"
-                    linphone:listener="@{viewModel.autoDownloadListener}"
-                    linphone:selectedIndex="@{viewModel.autoDownloadIndex}"
-                    linphone:labels="@{viewModel.autoDownloadLabels}"/>
-
-                <include
-                    layout="@layout/settings_widget_text"
-                    linphone:title="@{@string/chat_settings_auto_download_max_size_title}"
-                    linphone:subtitle="@{@string/chat_settings_auto_download_max_size_summary}"
-                    linphone:listener="@{viewModel.autoDownloadMaxSizeListener}"
-                    linphone:defaultValue="@{viewModel.autoDownloadMaxSize.toString()}"
-                    linphone:inputType="@{InputType.TYPE_CLASS_NUMBER}"
-                    linphone:enabled="@{viewModel.autoDownloadIndex == 2}"
-                    android:visibility="@{viewModel.autoDownloadIndex == 2 ? View.VISIBLE : View.GONE}"/>
-
-                <include
-                    layout="@layout/settings_widget_switch"
-                    linphone:title="@{@string/chat_settings_auto_download_voice_recordings}"
-                    linphone:listener="@{viewModel.autoDownloadVoiceRecordingsListener}"
-                    linphone:checked="@={viewModel.autoDownloadVoiceRecordings}"/>
-
-                <include
-                    layout="@layout/settings_widget_switch"
-                    linphone:title="@{@string/chat_settings_downloaded_media_public_title}"
-                    linphone:enabled="@{!viewModel.vfs}"
-                    linphone:subtitle="@{@string/chat_settings_downloaded_media_public_summary}"
-                    linphone:listener="@{viewModel.downloadedMediaPublicListener}"
-                    linphone:checked="@={viewModel.downloadedMediaPublic}"/>
-
-                <include
-                    layout="@layout/settings_widget_switch"
-                    linphone:title="@{@string/chat_settings_use_in_app_file_viewer_title}"
-                    linphone:subtitle="@{@string/chat_settings_use_in_app_file_viewer_summary}"
-                    linphone:enabled="@{!viewModel.vfs}"
-                    linphone:listener="@{viewModel.useInAppFileViewerListener}"
-                    linphone:checked="@={viewModel.useInAppFileViewer}"/>
-
-                <include
-                    layout="@layout/settings_widget_switch"
-                    linphone:title="@{@string/chat_settings_hide_notification_content_title}"
-                    linphone:subtitle="@{@string/chat_settings_hide_notification_content_summary}"
-                    linphone:listener="@{viewModel.hideNotificationContentListener}"
-                    linphone:checked="@={viewModel.hideNotificationContent}"/>
-
-                <include
-                    layout="@layout/settings_widget_switch"
-                    android:visibility="gone"
-                    linphone:title="@{@string/chat_settings_launcher_shortcuts_title}"
-                    linphone:subtitle="@{@string/chat_settings_launcher_shortcuts_summary}"
-                    linphone:listener="@{viewModel.launcherShortcutsListener}"
-                    linphone:checked="@={viewModel.launcherShortcuts}"/>
-
-                <include
-                    layout="@layout/settings_widget_switch"
-                    linphone:title="@{@string/chat_settings_hide_empty_rooms_title}"
-                    linphone:listener="@{viewModel.hideEmptyRoomsListener}"
-                    linphone:checked="@={viewModel.hideEmptyRooms}"/>
-
-                <include
-                    layout="@layout/settings_widget_switch"
-                    linphone:title="@{@string/chat_settings_hide_rooms_removed_proxies_title}"
-                    linphone:subtitle="@{@string/chat_settings_hide_rooms_removed_proxies_summary}"
-                    linphone:listener="@{viewModel.hideRoomsRemovedProxiesListener}"
-                    linphone:checked="@={viewModel.hideRoomsRemovedProxies}"/>
-
-                <include
-                    layout="@layout/settings_widget_text"
-                    linphone:title="@{@string/chat_settings_file_sharing_url_title}"
-                    linphone:subtitle="@{@string/chat_settings_file_sharing_url_summary}"
-                    linphone:listener="@{viewModel.fileSharingUrlListener}"
-                    linphone:defaultValue="@{viewModel.fileSharingUrl}"
-                    linphone:inputType="@{InputType.TYPE_TEXT_VARIATION_URI}"/>
-
-                <include
-                    layout="@layout/settings_widget_basic"
-                    linphone:listener="@{viewModel.goToAndroidNotificationSettingsListener}"
-                    linphone:title="@{@string/chat_settings_go_to_android_notification_settings}" />
-
-            </LinearLayout>
-
-        </androidx.core.widget.NestedScrollView>
-
-    </RelativeLayout>
-
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/settings_conferences_fragment.xml b/app/src/main/res/layout/settings_conferences_fragment.xml
deleted file mode 100644
index 6a9c2949f..000000000
--- a/app/src/main/res/layout/settings_conferences_fragment.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:linphone="http://schemas.android.com/apk/res-auto">
-
-    <data>
-        <import type="android.view.View"/>
-        <import type="android.text.InputType"/>
-        <variable
-            name="viewModel"
-            type="org.linphone.activities.main.settings.viewmodels.ConferencesSettingsViewModel"/>
-        <variable
-            name="sharedMainViewModel"
-            type="org.linphone.activities.main.viewmodels.SharedMainViewModel" />
-    </data>
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-        <LinearLayout
-            android:id="@+id/top_bar"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/main_activity_top_bar_size"
-            android:layout_gravity="center_horizontal"
-            android:background="?attr/lightToolbarBackgroundColor"
-            android:orientation="horizontal">
-
-            <ImageView
-                android:id="@+id/back"
-                android:visibility="@{sharedMainViewModel.isSlidingPaneSlideable ? View.VISIBLE : View.GONE}"
-                android:contentDescription="@string/content_description_go_back"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="0.2"
-                android:background="?attr/button_background_drawable"
-                android:padding="18dp"
-                android:src="@drawable/back" />
-
-            <TextView
-                style="@style/accent_colored_title_font"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="0.6"
-                android:gravity="center"
-                android:singleLine="true"
-                android:ellipsize="end"
-                android:padding="15dp"
-                android:text="@string/settings_conferences_title"/>
-
-            <View
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="0.2"
-                android:visibility="@{sharedMainViewModel.isSlidingPaneSlideable ? View.INVISIBLE : View.GONE}" />
-
-        </LinearLayout>
-
-        <androidx.core.widget.NestedScrollView
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_below="@id/top_bar">
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical">
-
-                <include
-                    layout="@layout/settings_widget_list"
-                    linphone:title="@{@string/conferences_settings_layout_title}"
-                    linphone:listener="@{viewModel.layoutListener}"
-                    linphone:selectedIndex="@{viewModel.layoutIndex}"
-                    linphone:labels="@{viewModel.layoutLabels}"/>
-
-                <!--<include
-                    layout="@layout/settings_widget_switch"
-                    linphone:title="@{@string/conferences_settings_enable_broadcast_title}"
-                    linphone:subtitle="@{@string/conferences_settings_enable_broadcast_summary}"
-                    linphone:listener="@{viewModel.enableBroadcastListener}"
-                    linphone:checked="@={viewModel.enableBroadcast}"/>-->
-
-            </LinearLayout>
-
-        </androidx.core.widget.NestedScrollView>
-
-    </RelativeLayout>
-
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/settings_contacts_fragment.xml b/app/src/main/res/layout/settings_contacts_fragment.xml
deleted file mode 100644
index 957fff8d6..000000000
--- a/app/src/main/res/layout/settings_contacts_fragment.xml
+++ /dev/null
@@ -1,147 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:linphone="http://schemas.android.com/apk/res-auto">
-
-    <data>
-        <import type="android.view.View"/>
-        <variable
-            name="viewModel"
-            type="org.linphone.activities.main.settings.viewmodels.ContactsSettingsViewModel"/>
-        <variable
-            name="sharedMainViewModel"
-            type="org.linphone.activities.main.viewmodels.SharedMainViewModel" />
-    </data>
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-        <LinearLayout
-            android:id="@+id/top_bar"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/main_activity_top_bar_size"
-            android:layout_gravity="center_horizontal"
-            android:background="?attr/lightToolbarBackgroundColor"
-            android:orientation="horizontal">
-
-            <ImageView
-                android:id="@+id/back"
-                android:visibility="@{sharedMainViewModel.isSlidingPaneSlideable ? View.VISIBLE : View.GONE}"
-                android:contentDescription="@string/content_description_go_back"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="0.2"
-                android:background="?attr/button_background_drawable"
-                android:padding="18dp"
-                android:src="@drawable/back" />
-
-            <TextView
-                style="@style/accent_colored_title_font"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="0.6"
-                android:gravity="center"
-                android:singleLine="true"
-                android:ellipsize="end"
-                android:padding="15dp"
-                android:text="@string/settings_contacts_title"/>
-
-            <View
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="0.2"
-                android:visibility="@{sharedMainViewModel.isSlidingPaneSlideable ? View.INVISIBLE : View.GONE}" />
-
-        </LinearLayout>
-
-        <androidx.core.widget.NestedScrollView
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_below="@id/top_bar">
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical">
-
-                <include
-                    layout="@layout/settings_widget_switch"
-                    linphone:title="@{@string/contacts_settings_friendlist_subscribe_title}"
-                    linphone:listener="@{viewModel.friendListSubscribeListener}"
-                    linphone:checked="@={viewModel.friendListSubscribe}"
-                    linphone:enabled="@{viewModel.readContactsPermissionGranted &amp;&amp; viewModel.rlsAddressAvailable}"/>
-
-                <include
-                    layout="@layout/settings_widget_switch"
-                    linphone:title="@{@string/account_setting_publish_presence_title}"
-                    linphone:listener="@{viewModel.publishPresenceListener}"
-                    linphone:checked="@={viewModel.publishPresence}"/>
-
-                <include
-                    layout="@layout/settings_widget_switch"
-                    linphone:title="@{@string/contacts_settings_show_new_contact_account_dialog_title}"
-                    linphone:subtitle="@{@string/contacts_settings_show_new_contact_account_dialog_summary}"
-                    linphone:listener="@{viewModel.showNewContactAccountDialogListener}"
-                    linphone:checked="@={viewModel.showNewContactAccountDialog}"
-                    linphone:enabled="@{viewModel.readContactsPermissionGranted}"/>
-
-                <include
-                    layout="@layout/settings_widget_switch"
-                    linphone:title="@{@string/contacts_settings_native_presence_title}"
-                    linphone:subtitle="@{@string/contacts_settings_native_presence_summary}"
-                    linphone:listener="@{viewModel.nativePresenceListener}"
-                    linphone:checked="@={viewModel.nativePresence}"
-                    linphone:enabled="@{viewModel.readContactsPermissionGranted &amp;&amp; viewModel.friendListSubscribe}"/>
-
-                <include
-                    layout="@layout/settings_widget_switch"
-                    linphone:title="@{@string/contacts_settings_show_organization_title}"
-                    linphone:listener="@{viewModel.showOrganizationListener}"
-                    linphone:checked="@={viewModel.showOrganization}"
-                    linphone:enabled="@{viewModel.readContactsPermissionGranted}"/>
-
-                <include
-                    layout="@layout/settings_widget_switch"
-                    android:visibility="gone"
-                    linphone:title="@{@string/contacts_settings_launcher_shortcuts_title}"
-                    linphone:subtitle="@{@string/contacts_settings_launcher_shortcuts_summary}"
-                    linphone:listener="@{viewModel.launcherShortcutsListener}"
-                    linphone:checked="@={viewModel.launcherShortcuts}"
-                    linphone:enabled="@{viewModel.readContactsPermissionGranted}"/>
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:visibility="@{viewModel.ldapAvailable ? View.VISIBLE : View.GONE}"
-                    android:orientation="vertical">
-
-                    <TextView
-                        style="@style/settings_category_font"
-                        android:text="@string/contacts_settings_ldap_title"
-                        android:paddingTop="15dp"
-                        android:layout_marginLeft="10dp"
-                        android:layout_marginRight="10dp"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"/>
-
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:orientation="vertical"
-                        linphone:entries="@{viewModel.ldapConfigurations}"
-                        linphone:layout="@{@layout/settings_ldap_cell}"/>
-
-                    <include
-                        layout="@layout/settings_widget_basic"
-                        linphone:listener="@{viewModel.ldapNewSettingsListener}"
-                        linphone:title="@{@string/contacts_settings_create_new_ldap_config_title}" />
-
-                </LinearLayout>
-
-            </LinearLayout>
-
-        </androidx.core.widget.NestedScrollView>
-
-    </RelativeLayout>
-
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/settings_fragment.xml b/app/src/main/res/layout/settings_fragment.xml
deleted file mode 100644
index dc17cf24d..000000000
--- a/app/src/main/res/layout/settings_fragment.xml
+++ /dev/null
@@ -1,211 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:linphone="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools">
-
-    <data>
-        <import type="android.view.View"/>
-        <import type="android.text.InputType"/>
-        <variable
-            name="viewModel"
-            type="org.linphone.activities.main.settings.viewmodels.SettingsViewModel" />
-    </data>
-
-    <androidx.slidingpanelayout.widget.SlidingPaneLayout
-        android:id="@+id/sliding_pane"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        tools:context=".MainActivity">
-
-        <RelativeLayout
-            android:layout_width="@dimen/master_fragment_width"
-            android:layout_height="match_parent"
-            android:background="?attr/backgroundColor"
-            android:layout_gravity="start">
-
-            <LinearLayout
-                android:id="@+id/top_bar"
-                android:layout_width="match_parent"
-                android:layout_height="@dimen/main_activity_top_bar_size"
-                android:layout_gravity="center_horizontal"
-                android:background="?attr/lightToolbarBackgroundColor"
-                android:orientation="horizontal">
-
-                <ImageView
-                    android:id="@+id/back"
-                    android:contentDescription="@string/content_description_go_back"
-                    android:layout_width="0dp"
-                    android:layout_height="match_parent"
-                    android:layout_weight="0.2"
-                    android:background="?attr/button_background_drawable"
-                    android:padding="18dp"
-                    android:src="@drawable/back" />
-
-                <TextView
-                    style="@style/accent_colored_title_font"
-                    android:layout_width="0dp"
-                    android:layout_height="match_parent"
-                    android:layout_weight="0.6"
-                    android:gravity="center"
-                    android:singleLine="true"
-                    android:ellipsize="end"
-                    android:padding="15dp"
-                    android:text="@string/settings"/>
-
-                <View
-                    android:layout_width="0dp"
-                    android:layout_height="match_parent"
-                    android:layout_weight="0.2"
-                    android:visibility="invisible" />
-
-            </LinearLayout>
-
-            <androidx.core.widget.NestedScrollView
-                android:layout_below="@id/top_bar"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent">
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:paddingTop="5dp"
-                    android:paddingBottom="5dp"
-                    android:orientation="vertical">
-
-                    <TextView
-                        style="@style/settings_category_font"
-                        android:text="@string/settings_primary_account_title"
-                        android:layout_marginLeft="10dp"
-                        android:layout_marginRight="10dp"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:visibility="@{viewModel.accounts.empty ? View.VISIBLE : View.GONE}"/>
-
-                    <include
-                        layout="@layout/settings_widget_text"
-                        linphone:title="@{@string/settings_primary_account_display_name_title}"
-                        linphone:listener="@{viewModel.primaryAccountDisplayNameListener}"
-                        linphone:defaultValue="@{viewModel.primaryAccountDisplayName}"
-                        linphone:inputType="@{InputType.TYPE_CLASS_TEXT}"
-                        android:visibility="@{viewModel.accounts.empty ? View.VISIBLE : View.GONE}"/>
-
-                    <include
-                        layout="@layout/settings_widget_text"
-                        linphone:title="@{@string/settings_primary_account_username_title}"
-                        linphone:listener="@{viewModel.primaryAccountUsernameListener}"
-                        linphone:defaultValue="@{viewModel.primaryAccountUsername}"
-                        linphone:inputType="@{InputType.TYPE_CLASS_TEXT}"
-                        android:visibility="@{viewModel.accounts.empty ? View.VISIBLE : View.GONE}"/>
-
-                    <TextView
-                        style="@style/settings_category_font"
-                        android:text="@string/settings_accounts_title"
-                        android:visibility="@{viewModel.showAccountSettings &amp;&amp; !viewModel.accounts.empty ? View.VISIBLE : View.GONE}"
-                        android:layout_marginLeft="10dp"
-                        android:layout_marginRight="10dp"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"/>
-
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:orientation="vertical"
-                        android:visibility="@{viewModel.showAccountSettings ? View.VISIBLE : View.GONE}"
-                        linphone:entries="@{viewModel.accounts}"
-                        linphone:layout="@{@layout/settings_account_cell}"/>
-
-                    <TextView
-                        style="@style/settings_category_font"
-                        android:text="@string/settings_list_title"
-                        android:paddingTop="15dp"
-                        android:layout_marginLeft="10dp"
-                        android:layout_marginRight="10dp"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"/>
-
-                    <include
-                        layout="@layout/settings_widget_basic"
-                        linphone:listener="@{viewModel.tunnelSettingsListener}"
-                        android:visibility="@{viewModel.showTunnelSettings ? View.VISIBLE : View.GONE}"
-                        linphone:title="@{@string/settings_tunnel_title}" />
-
-                    <include
-                        layout="@layout/settings_widget_basic"
-                        android:visibility="@{viewModel.showAudioSettings ? View.VISIBLE : View.GONE}"
-                        linphone:listener="@{viewModel.audioSettingsListener}"
-                        linphone:title="@{@string/settings_audio_title}"
-                        linphone:icon="@{@drawable/settings_audio}" />
-
-                    <include
-                        layout="@layout/settings_widget_basic"
-                        android:visibility="@{viewModel.showVideoSettings ? View.VISIBLE : View.GONE}"
-                        linphone:listener="@{viewModel.videoSettingsListener}"
-                        linphone:title="@{@string/settings_video_title}"
-                        linphone:icon="@{@drawable/settings_video}" />
-
-                    <include
-                        layout="@layout/settings_widget_basic"
-                        android:visibility="@{viewModel.showCallSettings ? View.VISIBLE : View.GONE}"
-                        linphone:listener="@{viewModel.callSettingsListener}"
-                        linphone:title="@{@string/settings_call_title}"
-                        linphone:icon="@{@drawable/settings_call}" />
-
-                    <include
-                        layout="@layout/settings_widget_basic"
-                        android:visibility="@{viewModel.showConferencesSettings ? View.VISIBLE : View.GONE}"
-                        linphone:listener="@{viewModel.conferencesSettingsListener}"
-                        linphone:title="@{@string/settings_conferences_title}"
-                        linphone:icon="@{@drawable/settings_conferences}" />
-
-                    <include
-                        layout="@layout/settings_widget_basic"
-                        android:visibility="@{viewModel.showChatSettings ? View.VISIBLE : View.GONE}"
-                        linphone:listener="@{viewModel.chatSettingsListener}"
-                        linphone:title="@{@string/settings_chat_title}"
-                        linphone:icon="@{@drawable/settings_chat}" />
-
-                    <include
-                        layout="@layout/settings_widget_basic"
-                        android:visibility="@{viewModel.showNetworkSettings ? View.VISIBLE : View.GONE}"
-                        linphone:listener="@{viewModel.networkSettingsListener}"
-                        linphone:title="@{@string/settings_network_title}"
-                        linphone:icon="@{@drawable/settings_network}" />
-
-                    <include
-                        layout="@layout/settings_widget_basic"
-                        android:visibility="@{viewModel.showContactsSettings ? View.VISIBLE : View.GONE}"
-                        linphone:listener="@{viewModel.contactsSettingsListener}"
-                        linphone:title="@{@string/settings_contacts_title}"
-                        linphone:icon="@{@drawable/settings_contacts}" />
-
-                    <include
-                        layout="@layout/settings_widget_basic"
-                        android:visibility="@{viewModel.showAdvancedSettings ? View.VISIBLE : View.GONE}"
-                        linphone:listener="@{viewModel.advancedSettingsListener}"
-                        linphone:title="@{@string/settings_advanced_title}"
-                        linphone:icon="@{@drawable/settings_advanced}" />
-
-                </LinearLayout>
-
-            </androidx.core.widget.NestedScrollView>
-
-            <View
-                android:layout_width="1dp"
-                android:layout_height="match_parent"
-                android:layout_alignParentRight="true"
-                android:background="?attr/dividerColor" />
-
-        </RelativeLayout>
-
-        <androidx.fragment.app.FragmentContainerView
-            android:id="@+id/settings_nav_container"
-            android:name="androidx.navigation.fragment.NavHostFragment"
-            android:layout_width="300dp"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            linphone:defaultNavHost="false"
-            linphone:navGraph="@navigation/settings_nav_graph"/>
-
-    </androidx.slidingpanelayout.widget.SlidingPaneLayout>
-
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/settings_ldap_cell.xml b/app/src/main/res/layout/settings_ldap_cell.xml
deleted file mode 100644
index 510114c5e..000000000
--- a/app/src/main/res/layout/settings_ldap_cell.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <data>
-        <import type="android.view.View" />
-        <variable
-            name="data"
-            type="org.linphone.activities.main.settings.viewmodels.LdapSettingsViewModel" />
-    </data>
-
-    <RelativeLayout
-        android:onClick="@{() -> data.ldapSettingsListener.onAccountClicked(data.index)}"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center_vertical|left">
-
-        <org.linphone.views.MarqueeTextView
-            android:id="@+id/settings_title"
-            style="@style/settings_item_font"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="10dp"
-            android:layout_marginTop="15dp"
-            android:layout_marginRight="10dp"
-            android:singleLine="true"
-            android:text="@{data.ldapServer, default=`ldap://ldap.example.org`}" />
-
-        <View
-            android:layout_marginTop="15dp"
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:layout_below="@id/settings_title"
-            android:background="?attr/dividerColor" />
-
-    </RelativeLayout>
-
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/settings_ldap_fragment.xml b/app/src/main/res/layout/settings_ldap_fragment.xml
deleted file mode 100644
index 1e12014a7..000000000
--- a/app/src/main/res/layout/settings_ldap_fragment.xml
+++ /dev/null
@@ -1,234 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:linphone="http://schemas.android.com/apk/res-auto">
-
-    <data>
-        <import type="android.view.View"/>
-        <import type="android.text.InputType"/>
-        <variable
-            name="viewModel"
-            type="org.linphone.activities.main.settings.viewmodels.LdapSettingsViewModel"/>
-        <variable
-            name="sharedMainViewModel"
-            type="org.linphone.activities.main.viewmodels.SharedMainViewModel" />
-    </data>
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-        <LinearLayout
-            android:id="@+id/top_bar"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/main_activity_top_bar_size"
-            android:layout_gravity="center_horizontal"
-            android:background="?attr/lightToolbarBackgroundColor"
-            android:orientation="horizontal">
-
-            <ImageView
-                android:id="@+id/back"
-                android:visibility="@{sharedMainViewModel.isSlidingPaneSlideable ? View.VISIBLE : View.GONE}"
-                android:contentDescription="@string/content_description_go_back"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="0.2"
-                android:background="?attr/button_background_drawable"
-                android:padding="18dp"
-                android:src="@drawable/back" />
-
-            <TextView
-                style="@style/accent_colored_title_font"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="0.6"
-                android:gravity="center"
-                android:singleLine="true"
-                android:ellipsize="end"
-                android:padding="15dp"
-                android:text="@string/contacts_settings_ldap_title"/>
-
-            <View
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="0.2"
-                android:visibility="@{sharedMainViewModel.isSlidingPaneSlideable ? View.INVISIBLE : View.GONE}" />
-
-        </LinearLayout>
-
-        <androidx.core.widget.NestedScrollView
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_below="@id/top_bar">
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical">
-
-                <include
-                    layout="@layout/settings_widget_switch"
-                    linphone:title="@{@string/contacts_settings_ldap_enable_title}"
-                    linphone:listener="@{viewModel.ldapEnableListener}"
-                    linphone:checked="@={viewModel.ldapEnable}"/>
-
-                <include
-                    layout="@layout/settings_widget_basic"
-                    linphone:title="@{@string/contacts_settings_ldap_delete_title}"
-                    linphone:listener="@{viewModel.deleteListener}"/>
-
-                <TextView
-                    style="@style/settings_category_font"
-                    android:text="@string/contacts_settings_ldap_connection_title"
-                    android:paddingTop="5dp"
-                    android:layout_marginLeft="10dp"
-                    android:layout_marginRight="10dp"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"/>
-
-                <include
-                    layout="@layout/settings_widget_text"
-                    linphone:title="@{@string/contacts_settings_ldap_server_title}"
-                    linphone:listener="@{viewModel.ldapServerListener}"
-                    linphone:defaultValue="@{viewModel.ldapServer}"
-                    linphone:inputType="@{InputType.TYPE_TEXT_VARIATION_URI}"/>
-
-                <include
-                    layout="@layout/settings_widget_text"
-                    linphone:title="@{@string/contacts_settings_ldap_bind_dn_title}"
-                    linphone:listener="@{viewModel.ldapBindDnListener}"
-                    linphone:defaultValue="@{viewModel.ldapBindDn}"
-                    linphone:inputType="@{InputType.TYPE_CLASS_TEXT}"/>
-
-                <include
-                    layout="@layout/settings_widget_text"
-                    linphone:title="@{@string/contacts_settings_ldap_password_title}"
-                    linphone:listener="@{viewModel.ldapPasswordListener}"
-                    linphone:defaultValue="@{viewModel.ldapPassword}"
-                    linphone:inputType="@{InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD}"/>
-
-                <include
-                    layout="@layout/settings_widget_list"
-                    linphone:title="@{@string/contacts_settings_ldap_auth_method_title}"
-                    linphone:listener="@{viewModel.ldapAuthMethodListener}"
-                    linphone:selectedIndex="@{viewModel.ldapAuthMethodIndex}"
-                    linphone:labels="@{viewModel.ldapAuthMethodLabels}"/>
-
-                <include
-                    layout="@layout/settings_widget_switch"
-                    linphone:title="@{@string/contacts_settings_ldap_tls_title}"
-                    linphone:listener="@{viewModel.ldapTlsListener}"
-                    linphone:checked="@={viewModel.ldapTls}"/>
-
-                <include
-                    layout="@layout/settings_widget_list"
-                    linphone:title="@{@string/contacts_settings_ldap_cert_check_title}"
-                    linphone:listener="@{viewModel.ldapCertCheckListener}"
-                    linphone:selectedIndex="@{viewModel.ldapCertCheckIndex}"
-                    linphone:labels="@{viewModel.ldapCertCheckLabels}"/>
-
-                <TextView
-                    style="@style/settings_category_font"
-                    android:text="@string/contacts_settings_ldap_search_title"
-                    android:paddingTop="5dp"
-                    android:layout_marginLeft="10dp"
-                    android:layout_marginRight="10dp"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"/>
-
-                <include
-                    layout="@layout/settings_widget_text"
-                    linphone:title="@{@string/contacts_settings_ldap_search_base_title}"
-                    linphone:subtitle="@{@string/contacts_settings_ldap_search_base_subtitle}"
-                    linphone:listener="@{viewModel.ldapSearchBaseListener}"
-                    linphone:defaultValue="@{viewModel.ldapSearchBase}"
-                    linphone:inputType="@{InputType.TYPE_CLASS_TEXT}"/>
-
-                <include
-                    layout="@layout/settings_widget_text"
-                    linphone:title="@{@string/contacts_settings_ldap_search_filter_title}"
-                    linphone:listener="@{viewModel.ldapSearchFilterListener}"
-                    linphone:defaultValue="@{viewModel.ldapSearchFilter}"
-                    linphone:inputType="@{InputType.TYPE_CLASS_TEXT}"/>
-
-                <include
-                    layout="@layout/settings_widget_text"
-                    linphone:title="@{@string/contacts_settings_ldap_search_max_results_title}"
-                    linphone:listener="@{viewModel.ldapSearchMaxResultsListener}"
-                    linphone:defaultValue="@{viewModel.ldapSearchMaxResults.toString()}"
-                    linphone:inputType="@{InputType.TYPE_CLASS_NUMBER}"/>
-
-                <include
-                    layout="@layout/settings_widget_text"
-                    linphone:title="@{@string/contacts_settings_ldap_search_timeout_title}"
-                    linphone:subtitle="@{@string/contacts_settings_ldap_search_timeout_subtitle}"
-                    linphone:listener="@{viewModel.ldapSearchTimeoutListener}"
-                    linphone:defaultValue="@{viewModel.ldapSearchTimeout.toString()}"
-                    linphone:inputType="@{InputType.TYPE_CLASS_NUMBER}"/>
-
-                <include
-                    layout="@layout/settings_widget_text"
-                    linphone:title="@{@string/contacts_settings_ldap_request_delay_title}"
-                    linphone:subtitle="@{@string/contacts_settings_ldap_request_delay_subtitle}"
-                    linphone:listener="@{viewModel.ldapRequestDelayListener}"
-                    linphone:defaultValue="@{viewModel.ldapRequestDelay.toString()}"
-                    linphone:inputType="@{InputType.TYPE_CLASS_NUMBER}"/>
-
-                <include
-                    layout="@layout/settings_widget_text"
-                    linphone:title="@{@string/contacts_settings_ldap_minimum_characters_title}"
-                    linphone:listener="@{viewModel.ldapMinimumCharactersListener}"
-                    linphone:defaultValue="@{viewModel.ldapMinimumCharacters.toString()}"
-                    linphone:inputType="@{InputType.TYPE_CLASS_NUMBER}"/>
-
-                <TextView
-                    style="@style/settings_category_font"
-                    android:text="@string/contacts_settings_ldap_parsing_title"
-                    android:paddingTop="5dp"
-                    android:layout_marginLeft="10dp"
-                    android:layout_marginRight="10dp"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"/>
-
-                <include
-                    layout="@layout/settings_widget_text"
-                    linphone:title="@{@string/contacts_settings_ldap_name_attribute_title}"
-                    linphone:listener="@{viewModel.ldapNameAttributeListener}"
-                    linphone:defaultValue="@{viewModel.ldapNameAttribute}"
-                    linphone:inputType="@{InputType.TYPE_CLASS_TEXT}"/>
-
-                <include
-                    layout="@layout/settings_widget_text"
-                    linphone:title="@{@string/contacts_settings_ldap_sip_attribute_title}"
-                    linphone:listener="@{viewModel.ldapSipAttributeListener}"
-                    linphone:defaultValue="@{viewModel.ldapSipAttribute}"
-                    linphone:inputType="@{InputType.TYPE_CLASS_TEXT}"/>
-
-                <include
-                    layout="@layout/settings_widget_text"
-                    linphone:title="@{@string/contacts_settings_ldap_sip_domain_title}"
-                    linphone:listener="@{viewModel.ldapSipDomainListener}"
-                    linphone:defaultValue="@{viewModel.ldapSipDomain}"
-                    linphone:inputType="@{InputType.TYPE_CLASS_TEXT}"/>
-
-                <TextView
-                    style="@style/settings_category_font"
-                    android:text="@string/contacts_settings_ldap_misc_title"
-                    android:paddingTop="5dp"
-                    android:layout_marginLeft="10dp"
-                    android:layout_marginRight="10dp"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"/>
-
-                <include
-                    layout="@layout/settings_widget_switch"
-                    linphone:title="@{@string/contacts_settings_ldap_debug_title}"
-                    linphone:listener="@{viewModel.ldapDebugListener}"
-                    linphone:checked="@={viewModel.ldapDebug}"/>
-
-            </LinearLayout>
-
-        </androidx.core.widget.NestedScrollView>
-
-    </RelativeLayout>
-
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/settings_network_fragment.xml b/app/src/main/res/layout/settings_network_fragment.xml
deleted file mode 100644
index a55c7bfad..000000000
--- a/app/src/main/res/layout/settings_network_fragment.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:linphone="http://schemas.android.com/apk/res-auto">
-
-    <data>
-        <import type="android.view.View"/>
-        <import type="android.text.InputType"/>
-        <variable
-            name="viewModel"
-            type="org.linphone.activities.main.settings.viewmodels.NetworkSettingsViewModel"/>
-        <variable
-            name="sharedMainViewModel"
-            type="org.linphone.activities.main.viewmodels.SharedMainViewModel" />
-    </data>
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-        <LinearLayout
-            android:id="@+id/top_bar"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/main_activity_top_bar_size"
-            android:layout_gravity="center_horizontal"
-            android:background="?attr/lightToolbarBackgroundColor"
-            android:orientation="horizontal">
-
-            <ImageView
-                android:id="@+id/back"
-                android:visibility="@{sharedMainViewModel.isSlidingPaneSlideable ? View.VISIBLE : View.GONE}"
-                android:contentDescription="@string/content_description_go_back"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="0.2"
-                android:background="?attr/button_background_drawable"
-                android:padding="18dp"
-                android:src="@drawable/back" />
-
-            <TextView
-                style="@style/accent_colored_title_font"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="0.6"
-                android:gravity="center"
-                android:singleLine="true"
-                android:ellipsize="end"
-                android:padding="15dp"
-                android:text="@string/settings_network_title"/>
-
-            <View
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="0.2"
-                android:visibility="@{sharedMainViewModel.isSlidingPaneSlideable ? View.INVISIBLE : View.GONE}" />
-
-        </LinearLayout>
-
-        <androidx.core.widget.NestedScrollView
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_below="@id/top_bar">
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical">
-
-                <include
-                    layout="@layout/settings_widget_switch"
-                    linphone:title="@{@string/network_settings_wifi_only_title}"
-                    linphone:listener="@{viewModel.wifiOnlyListener}"
-                    linphone:checked="@={viewModel.wifiOnly}"/>
-
-                <include
-                    layout="@layout/settings_widget_switch"
-                    linphone:title="@{@string/network_settings_allow_ipv6_title}"
-                    linphone:listener="@{viewModel.allowIpv6Listener}"
-                    linphone:checked="@={viewModel.allowIpv6}"/>
-
-                <include
-                    layout="@layout/settings_widget_switch"
-                    linphone:title="@{@string/network_settings_random_ports_title}"
-                    linphone:listener="@{viewModel.randomPortsListener}"
-                    linphone:checked="@={viewModel.randomPorts}"/>
-
-                <include
-                    layout="@layout/settings_widget_text"
-                    linphone:title="@{@string/network_settings_sip_port_title}"
-                    linphone:listener="@{viewModel.sipPortListener}"
-                    linphone:defaultValue="@{viewModel.sipPort.toString()}"
-                    linphone:inputType="@{InputType.TYPE_CLASS_NUMBER}"
-                    linphone:enabled="@{!viewModel.randomPorts}"
-                    android:visibility="@{viewModel.randomPorts ? View.GONE : View.VISIBLE}"/>
-
-            </LinearLayout>
-
-        </androidx.core.widget.NestedScrollView>
-
-    </RelativeLayout>
-
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/settings_tunnel_fragment.xml b/app/src/main/res/layout/settings_tunnel_fragment.xml
deleted file mode 100644
index 1d2694ff9..000000000
--- a/app/src/main/res/layout/settings_tunnel_fragment.xml
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:linphone="http://schemas.android.com/apk/res-auto">
-
-    <data>
-        <import type="android.view.View"/>
-        <import type="android.text.InputType"/>
-        <variable
-            name="viewModel"
-            type="org.linphone.activities.main.settings.viewmodels.TunnelSettingsViewModel"/>
-        <variable
-            name="sharedMainViewModel"
-            type="org.linphone.activities.main.viewmodels.SharedMainViewModel" />
-    </data>
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-        <LinearLayout
-            android:id="@+id/top_bar"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/main_activity_top_bar_size"
-            android:layout_gravity="center_horizontal"
-            android:background="?attr/lightToolbarBackgroundColor"
-            android:orientation="horizontal">
-
-            <ImageView
-                android:id="@+id/back"
-                android:visibility="@{sharedMainViewModel.isSlidingPaneSlideable ? View.VISIBLE : View.GONE}"
-                android:contentDescription="@string/content_description_go_back"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="0.2"
-                android:background="?attr/button_background_drawable"
-                android:padding="18dp"
-                android:src="@drawable/back" />
-
-            <TextView
-                style="@style/accent_colored_title_font"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="0.6"
-                android:gravity="center"
-                android:singleLine="true"
-                android:ellipsize="end"
-                android:padding="15dp"
-                android:text="@string/settings_tunnel_title"/>
-
-            <View
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="0.2"
-                android:visibility="@{sharedMainViewModel.isSlidingPaneSlideable ? View.INVISIBLE : View.GONE}" />
-
-        </LinearLayout>
-
-        <androidx.core.widget.NestedScrollView
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_below="@id/top_bar">
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical">
-
-                <include
-                    layout="@layout/settings_widget_text"
-                    linphone:title="@{@string/tunnel_settings_hostname_url_title}"
-                    linphone:listener="@{viewModel.hostnameUrlListener}"
-                    linphone:defaultValue="@{viewModel.hostnameUrl}"
-                    linphone:inputType="@{InputType.TYPE_TEXT_VARIATION_URI}"/>
-
-                <include
-                    layout="@layout/settings_widget_text"
-                    linphone:title="@{@string/tunnel_settings_port_title}"
-                    linphone:listener="@{viewModel.portListener}"
-                    linphone:defaultValue="@{viewModel.port.toString()}"
-                    linphone:inputType="@{InputType.TYPE_CLASS_NUMBER}"/>
-
-                <include
-                    layout="@layout/settings_widget_switch"
-                    linphone:title="@{@string/tunnel_settings_dual_mode_title}"
-                    linphone:subtitle="@{@string/tunnel_settings_dual_mode_summary}"
-                    linphone:listener="@{viewModel.useDualModeListener}"
-                    linphone:checked="@={viewModel.useDualMode}"/>
-
-                <include
-                    layout="@layout/settings_widget_text"
-                    linphone:title="@{@string/tunnel_settings_dual_hostname_url_title}"
-                    linphone:subtitle="@{@string/tunnel_settings_dual_hostname_url_summary}"
-                    linphone:listener="@{viewModel.hostnameUrl2Listener}"
-                    linphone:defaultValue="@{viewModel.hostnameUrl2}"
-                    linphone:inputType="@{InputType.TYPE_TEXT_VARIATION_URI}"
-                    linphone:enabled="@{viewModel.useDualMode}"
-                    android:visibility="@{viewModel.useDualMode ? View.VISIBLE : View.GONE}"/>
-
-                <include
-                    layout="@layout/settings_widget_text"
-                    linphone:title="@{@string/tunnel_settings_dual_port_title}"
-                    linphone:subtitle="@{@string/tunnel_settings_dual_port_summary}"
-                    linphone:listener="@{viewModel.port2Listener}"
-                    linphone:defaultValue="@{viewModel.port2.toString()}"
-                    linphone:inputType="@{InputType.TYPE_CLASS_NUMBER}"
-                    linphone:enabled="@{viewModel.useDualMode}"
-                    android:visibility="@{viewModel.useDualMode ? View.VISIBLE : View.GONE}"/>
-
-                <include
-                    layout="@layout/settings_widget_list"
-                    linphone:title="@{@string/tunnel_settings_mode_title}"
-                    linphone:listener="@{viewModel.modeListener}"
-                    linphone:selectedIndex="@{viewModel.modeIndex}"
-                    linphone:labels="@{viewModel.modeLabels}"/>
-
-            </LinearLayout>
-
-        </androidx.core.widget.NestedScrollView>
-
-    </RelativeLayout>
-
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/settings_video_fragment.xml b/app/src/main/res/layout/settings_video_fragment.xml
deleted file mode 100644
index 0e78392f6..000000000
--- a/app/src/main/res/layout/settings_video_fragment.xml
+++ /dev/null
@@ -1,163 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:linphone="http://schemas.android.com/apk/res-auto">
-
-    <data>
-        <import type="android.view.View"/>
-        <import type="android.text.InputType"/>
-        <variable
-            name="viewModel"
-            type="org.linphone.activities.main.settings.viewmodels.VideoSettingsViewModel"/>
-        <variable
-            name="sharedMainViewModel"
-            type="org.linphone.activities.main.viewmodels.SharedMainViewModel" />
-    </data>
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-        <LinearLayout
-            android:id="@+id/top_bar"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/main_activity_top_bar_size"
-            android:layout_gravity="center_horizontal"
-            android:background="?attr/lightToolbarBackgroundColor"
-            android:orientation="horizontal">
-
-            <ImageView
-                android:id="@+id/back"
-                android:visibility="@{sharedMainViewModel.isSlidingPaneSlideable ? View.VISIBLE : View.GONE}"
-                android:contentDescription="@string/content_description_go_back"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="0.2"
-                android:background="?attr/button_background_drawable"
-                android:padding="18dp"
-                android:src="@drawable/back" />
-
-            <TextView
-                style="@style/accent_colored_title_font"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="0.6"
-                android:gravity="center"
-                android:singleLine="true"
-                android:ellipsize="end"
-                android:padding="15dp"
-                android:text="@string/settings_video_title"/>
-
-            <View
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="0.2"
-                android:visibility="@{sharedMainViewModel.isSlidingPaneSlideable ? View.INVISIBLE : View.GONE}" />
-
-        </LinearLayout>
-
-        <androidx.core.widget.NestedScrollView
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_below="@id/top_bar">
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical">
-
-                <include
-                    layout="@layout/settings_widget_switch"
-                    linphone:title="@{@string/video_settings_enable_title}"
-                    linphone:listener="@{viewModel.enableVideoListener}"
-                    linphone:checked="@={viewModel.enableVideo}"/>
-
-                <include
-                    layout="@layout/settings_widget_switch"
-                    linphone:title="@{@string/video_settings_tablet_preview_title}"
-                    linphone:listener="@{viewModel.tabletPreviewListener}"
-                    linphone:checked="@={viewModel.tabletPreview}"
-                    linphone:enabled="@{viewModel.enableVideo}"
-                    android:visibility="@{viewModel.isTablet ? View.VISIBLE : View.GONE}"/>
-
-                <include
-                    layout="@layout/settings_widget_switch"
-                    linphone:title="@{@string/video_settings_initiate_call_title}"
-                    linphone:subtitle="@{@string/video_settings_initiate_call_summary}"
-                    linphone:listener="@{viewModel.initiateCallListener}"
-                    linphone:checked="@={viewModel.initiateCall}"
-                    linphone:enabled="@{viewModel.enableVideo}"/>
-
-                <include
-                    layout="@layout/settings_widget_switch"
-                    linphone:title="@{@string/video_settings_automatically_accept_title}"
-                    linphone:subtitle="@{@string/video_settings_automatically_accept_summary}"
-                    linphone:listener="@{viewModel.autoAcceptListener}"
-                    linphone:checked="@={viewModel.autoAccept}"
-                    linphone:enabled="@{viewModel.enableVideo}"/>
-
-                <include
-                    layout="@layout/settings_widget_list"
-                    linphone:title="@{@string/video_settings_camera_device_title}"
-                    linphone:listener="@{viewModel.cameraDeviceListener}"
-                    linphone:selectedIndex="@{viewModel.cameraDeviceIndex}"
-                    linphone:labels="@{viewModel.cameraDeviceLabels}"
-                    linphone:enabled="@{viewModel.enableVideo}"/>
-
-                <include
-                    layout="@layout/settings_widget_list"
-                    linphone:title="@{@string/video_settings_video_size_title}"
-                    linphone:listener="@{viewModel.videoSizeListener}"
-                    linphone:selectedIndex="@{viewModel.videoSizeIndex}"
-                    linphone:labels="@{viewModel.videoSizeLabels}"
-                    linphone:enabled="@{viewModel.enableVideo}"/>
-
-                <include
-                    layout="@layout/settings_widget_list"
-                    linphone:title="@{@string/video_settings_video_preset_title}"
-                    linphone:listener="@{viewModel.videoPresetListener}"
-                    linphone:selectedIndex="@{viewModel.videoPresetIndex}"
-                    linphone:labels="@{viewModel.videoPresetLabels}"
-                    linphone:enabled="@{viewModel.enableVideo}"/>
-
-                <include
-                    layout="@layout/settings_widget_list"
-                    linphone:title="@{@string/video_settings_preferred_fps_title}"
-                    linphone:listener="@{viewModel.preferredFpsListener}"
-                    linphone:selectedIndex="@{viewModel.preferredFpsIndex}"
-                    linphone:labels="@{viewModel.preferredFpsLabels}"
-                    linphone:enabled="@{viewModel.enableVideo}"
-                    android:visibility="@{viewModel.videoPresetIndex == 2 ? View.VISIBLE : View.GONE}"/>
-
-                <include
-                    layout="@layout/settings_widget_text"
-                    linphone:title="@{@string/video_settings_bandwidth_limit_title}"
-                    linphone:subtitle="@{@string/video_settings_bandwidth_limit_summary}"
-                    linphone:listener="@{viewModel.bandwidthLimitListener}"
-                    linphone:defaultValue="@{viewModel.bandwidthLimit.toString()}"
-                    linphone:inputType="@{InputType.TYPE_CLASS_NUMBER}"
-                    linphone:enabled="@{viewModel.enableVideo}"
-                    android:visibility="@{viewModel.videoPresetIndex == 2 ? View.VISIBLE : View.GONE}"/>
-
-                <TextView
-                    style="@style/settings_category_font"
-                    android:id="@+id/pref_video_codecs_header"
-                    android:text="@string/video_settings_codecs_title"
-                    android:paddingTop="15dp"
-                    android:layout_marginLeft="10dp"
-                    android:layout_marginRight="10dp"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"/>
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="vertical"
-                    linphone:entries="@{viewModel.videoCodecs}"/>
-
-            </LinearLayout>
-
-        </androidx.core.widget.NestedScrollView>
-
-    </RelativeLayout>
-
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/settings_widget_basic.xml b/app/src/main/res/layout/settings_widget_basic.xml
deleted file mode 100644
index 12084bff2..000000000
--- a/app/src/main/res/layout/settings_widget_basic.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <data>
-        <import type="android.view.View"/>
-        <variable
-            name="title"
-            type="String" />
-        <variable
-            name="subtitle"
-            type="String" />
-        <variable
-            name="enabled"
-            type="Boolean" />
-        <variable
-            name="icon"
-            type="android.graphics.drawable.Drawable" />
-        <variable
-            name="listener"
-            type="org.linphone.activities.main.settings.SettingListener" />
-    </data>
-
-    <RelativeLayout
-        android:onClick="@{() -> listener.onClicked()}"
-        android:enabled="@{enabled ?? true}"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-        <ImageView
-            android:id="@+id/icon"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:adjustViewBounds="true"
-            android:layout_marginLeft="@dimen/settings_margin"
-            android:layout_alignParentLeft="true"
-            android:layout_centerVertical="true"
-            android:contentDescription="@null"
-            android:visibility="@{icon != null ? View.VISIBLE : View.GONE}"
-            android:src="@{icon}" />
-
-        <TextView
-            android:id="@+id/settings_title"
-            android:layout_width="match_parent"
-            android:layout_height="25dp"
-            android:gravity="center_vertical"
-            android:text="@{title}"
-            android:enabled="@{enabled ?? true}"
-            android:visibility="@{title.length() > 0 ? View.VISIBLE : View.GONE}"
-            android:maxLines="2"
-            android:layout_marginTop="15dp"
-            android:layout_marginLeft="@dimen/settings_margin"
-            android:layout_marginRight="@dimen/settings_margin"
-            android:layout_toRightOf="@id/icon"
-            style="@style/settings_item_font"
-            app:autoSizeTextType="uniform"
-            app:autoSizeMinTextSize="@dimen/setting_title_min_size"
-            app:autoSizeMaxTextSize="@dimen/setting_title_max_size"
-            app:autoSizeStepGranularity="@dimen/settings_granularity_step"/>
-
-        <TextView
-            android:id="@+id/settings_subtitle"
-            android:text="@{subtitle}"
-            android:enabled="@{enabled ?? true}"
-            android:layout_width="match_parent"
-            android:layout_height="20dp"
-            android:gravity="center_vertical"
-            android:visibility="@{subtitle.length() > 0 ? View.VISIBLE : View.GONE}"
-            android:maxLines="1"
-            android:layout_below="@id/settings_title"
-            android:layout_marginLeft="@dimen/settings_margin"
-            android:layout_marginRight="@dimen/settings_margin"
-            android:layout_toRightOf="@id/icon"
-            style="@style/settings_item_subtitle_font"
-            app:autoSizeTextType="uniform"
-            app:autoSizeMinTextSize="@dimen/setting_subtitle_min_size"
-            app:autoSizeMaxTextSize="@dimen/setting_subtitle_max_size"
-            app:autoSizeStepGranularity="@dimen/settings_granularity_step"/>
-
-        <View
-            android:layout_marginTop="15dp"
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:layout_below="@id/settings_subtitle"
-            android:background="?attr/dividerColor" />
-
-    </RelativeLayout>
-
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/settings_widget_list.xml b/app/src/main/res/layout/settings_widget_list.xml
deleted file mode 100644
index a10a4fce6..000000000
--- a/app/src/main/res/layout/settings_widget_list.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <data>
-        <import type="android.view.View"/>
-        <variable
-            name="title"
-            type="String" />
-        <variable
-            name="subtitle"
-            type="String" />
-        <variable
-            name="selectedIndex"
-            type="Integer" />
-        <variable
-            name="enabled"
-            type="Boolean" />
-        <variable
-            name="labels"
-            type="java.util.ArrayList&lt;String&gt;" />
-        <variable
-            name="listener"
-            type="org.linphone.activities.main.settings.SettingListener" />
-    </data>
-
-    <RelativeLayout
-        android:onClick="@{() -> listener.onClicked()}"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-        <TextView
-            android:id="@+id/settings_title"
-            android:layout_width="match_parent"
-            android:layout_height="25dp"
-            android:gravity="center_vertical"
-            android:text="@{title}"
-            android:enabled="@{enabled ?? true}"
-            android:visibility="@{title.length() > 0 ? View.VISIBLE : View.GONE}"
-            android:maxLines="2"
-            android:layout_marginTop="15dp"
-            android:layout_marginLeft="@dimen/settings_margin"
-            android:layout_marginRight="@dimen/settings_margin"
-            style="@style/settings_item_font"
-            app:autoSizeTextType="uniform"
-            app:autoSizeMinTextSize="@dimen/setting_title_min_size"
-            app:autoSizeMaxTextSize="@dimen/setting_title_max_size"
-            app:autoSizeStepGranularity="@dimen/settings_granularity_step"/>
-
-        <TextView
-            android:id="@+id/settings_subtitle"
-            android:text="@{subtitle}"
-            android:enabled="@{enabled ?? true}"
-            android:layout_width="match_parent"
-            android:layout_height="20dp"
-            android:gravity="center_vertical"
-            android:visibility="@{subtitle.length() > 0 ? View.VISIBLE : View.GONE}"
-            android:maxLines="1"
-            android:layout_below="@id/settings_title"
-            android:layout_marginLeft="@dimen/settings_margin"
-            android:layout_marginRight="@dimen/settings_margin"
-            style="@style/settings_item_subtitle_font"
-            app:autoSizeTextType="uniform"
-            app:autoSizeMinTextSize="@dimen/setting_subtitle_min_size"
-            app:autoSizeMaxTextSize="@dimen/setting_subtitle_max_size"
-            app:autoSizeStepGranularity="@dimen/settings_granularity_step"/>
-
-        <Spinner
-            android:id="@+id/settings_spinner"
-            android:entries="@{labels}"
-            selectedIndex="@{selectedIndex}"
-            settingListener="@{listener}"
-            android:enabled="@{enabled ?? true}"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/settings_subtitle"
-            android:layout_marginLeft="@dimen/settings_margin"
-            android:layout_marginRight="@dimen/settings_margin" />
-
-        <View
-            android:layout_marginTop="15dp"
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:layout_below="@id/settings_spinner"
-            android:background="?attr/dividerColor" />
-
-    </RelativeLayout>
-
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/settings_widget_switch.xml b/app/src/main/res/layout/settings_widget_switch.xml
deleted file mode 100644
index 0528a0255..000000000
--- a/app/src/main/res/layout/settings_widget_switch.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <data>
-        <import type="android.view.View"/>
-        <variable
-            name="title"
-            type="String" />
-        <variable
-            name="subtitle"
-            type="String" />
-        <variable
-            name="checked"
-            type="Boolean" />
-        <variable
-            name="enabled"
-            type="Boolean" />
-        <variable
-            name="listener"
-            type="org.linphone.activities.main.settings.SettingListener" />
-    </data>
-
-    <RelativeLayout
-        android:enabled="@{enabled ?? true}"
-        onClickToggleSwitch="@{@id/setting_switch}"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-        <com.google.android.material.switchmaterial.SwitchMaterial
-            android:id="@+id/setting_switch"
-            android:enabled="@{enabled ?? true}"
-            android:checked="@={checked}"
-            android:onCheckedChanged="@{(switch, value) -> listener.onBoolValueChanged(value)}"
-            android:layout_centerVertical="true"
-            android:layout_alignParentRight="true"
-            android:layout_marginRight="@dimen/settings_margin"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content" />
-
-        <TextView
-            android:id="@+id/settings_title"
-            android:layout_width="match_parent"
-            android:layout_height="25dp"
-            android:gravity="center_vertical"
-            android:text="@{title}"
-            android:enabled="@{enabled ?? true}"
-            android:visibility="@{title.length() > 0 ? View.VISIBLE : View.GONE}"
-            android:maxLines="2"
-            android:layout_toLeftOf="@id/setting_switch"
-            android:layout_marginTop="15dp"
-            android:layout_marginLeft="@dimen/settings_margin"
-            android:layout_marginRight="@dimen/settings_margin"
-            style="@style/settings_item_font"
-            app:autoSizeTextType="uniform"
-            app:autoSizeMinTextSize="@dimen/setting_title_min_size"
-            app:autoSizeMaxTextSize="@dimen/setting_title_max_size"
-            app:autoSizeStepGranularity="@dimen/settings_granularity_step"/>
-
-        <TextView
-            android:id="@+id/settings_subtitle"
-            android:text="@{subtitle}"
-            android:enabled="@{enabled ?? true}"
-            android:layout_width="match_parent"
-            android:layout_height="20dp"
-            android:gravity="center_vertical"
-            android:visibility="@{subtitle.length() > 0 ? View.VISIBLE : View.GONE}"
-            android:maxLines="1"
-            android:layout_below="@id/settings_title"
-            android:layout_toLeftOf="@id/setting_switch"
-            android:layout_marginLeft="@dimen/settings_margin"
-            android:layout_marginRight="@dimen/settings_margin"
-            style="@style/settings_item_subtitle_font"
-            app:autoSizeTextType="uniform"
-            app:autoSizeMinTextSize="@dimen/setting_subtitle_min_size"
-            app:autoSizeMaxTextSize="@dimen/setting_subtitle_max_size"
-            app:autoSizeStepGranularity="@dimen/settings_granularity_step"/>
-
-        <View
-            android:layout_marginTop="15dp"
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:layout_below="@id/settings_subtitle"
-            android:background="?attr/dividerColor" />
-
-    </RelativeLayout>
-
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/settings_widget_switch_and_text.xml b/app/src/main/res/layout/settings_widget_switch_and_text.xml
deleted file mode 100644
index e5c53f797..000000000
--- a/app/src/main/res/layout/settings_widget_switch_and_text.xml
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <data>
-        <import type="android.view.View"/>
-        <import type="android.text.InputType"/>
-        <variable
-            name="switch_title"
-            type="String" />
-        <variable
-            name="switch_subtitle"
-            type="String" />
-        <variable
-            name="text_title"
-            type="String" />
-        <variable
-            name="text_subtitle"
-            type="String" />
-        <variable
-            name="defaultValue"
-            type="String" />
-        <variable
-            name="checked"
-            type="Boolean" />
-        <variable
-            name="enabled"
-            type="Boolean" />
-        <variable
-            name="listener"
-            type="org.linphone.activities.main.settings.SettingListener" />
-    </data>
-
-    <RelativeLayout
-        android:enabled="@{enabled ?? true}"
-        onClickToggleSwitch="@{@id/setting_switch}"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-        <com.google.android.material.switchmaterial.SwitchMaterial
-            android:id="@+id/setting_switch"
-            android:enabled="@{enabled ?? true}"
-            android:checked="@={checked}"
-            android:onCheckedChanged="@{(switch, value) -> listener.onBoolValueChanged(value)}"
-            android:layout_centerVertical="true"
-            android:layout_alignParentRight="true"
-            android:layout_marginRight="@dimen/settings_margin"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content" />
-
-        <TextView
-            android:id="@+id/settings_title"
-            android:layout_width="match_parent"
-            android:layout_height="25dp"
-            android:gravity="center_vertical"
-            android:text="@{switch_title}"
-            android:enabled="@{enabled ?? true}"
-            android:visibility="@{switch_title.length() > 0 ? View.VISIBLE : View.GONE}"
-            android:maxLines="2"
-            android:layout_toLeftOf="@id/setting_switch"
-            android:layout_marginTop="15dp"
-            android:layout_marginLeft="@dimen/settings_margin"
-            android:layout_marginRight="@dimen/settings_margin"
-            style="@style/settings_item_font"
-            app:autoSizeTextType="uniform"
-            app:autoSizeMinTextSize="@dimen/setting_title_min_size"
-            app:autoSizeMaxTextSize="@dimen/setting_title_max_size"
-            app:autoSizeStepGranularity="@dimen/settings_granularity_step"/>
-
-        <TextView
-            android:id="@+id/settings_subtitle"
-            android:text="@{switch_subtitle}"
-            android:enabled="@{enabled ?? true}"
-            android:layout_width="match_parent"
-            android:layout_height="20dp"
-            android:gravity="center_vertical"
-            android:visibility="@{switch_subtitle.length() > 0 ? View.VISIBLE : View.GONE}"
-            android:maxLines="1"
-            android:layout_below="@id/settings_title"
-            android:layout_toLeftOf="@id/setting_switch"
-            android:layout_marginLeft="@dimen/settings_margin"
-            android:layout_marginRight="@dimen/settings_margin"
-            style="@style/settings_item_subtitle_font"
-            app:autoSizeTextType="uniform"
-            app:autoSizeMinTextSize="@dimen/setting_subtitle_min_size"
-            app:autoSizeMaxTextSize="@dimen/setting_subtitle_max_size"
-            app:autoSizeStepGranularity="@dimen/settings_granularity_step"/>
-
-        <com.google.android.material.textfield.TextInputLayout
-            android:id="@+id/settings_input_layout"
-            android:visibility="@{settingSwitch.checked ? View.VISIBLE : View.GONE}"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/settings_subtitle"
-            android:layout_toLeftOf="@id/setting_switch"
-            android:layout_marginTop="5dp"
-            android:layout_marginLeft="@dimen/settings_margin"
-            android:layout_marginRight="@dimen/settings_margin"
-            android:enabled="@{enabled ?? true}"
-            android:hint="@{text_title}"
-            app:helperText="@{text_subtitle}"
-            app:helperTextEnabled="@{text_subtitle.length() > 0}">
-
-            <com.google.android.material.textfield.TextInputEditText
-                android:id="@+id/settings_input"
-                android:text="@{defaultValue}"
-                android:imeOptions="actionDone"
-                android:inputType="@{InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS}"
-                onValueChanged="@{() -> listener.onTextValueChanged(settingsInput.getText().toString())}"
-                android:maxLines="1"
-                android:background="@color/transparent_color"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"/>
-
-        </com.google.android.material.textfield.TextInputLayout>
-
-        <View
-            android:layout_marginTop="15dp"
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:layout_below="@id/settings_input_layout"
-            android:background="?attr/dividerColor" />
-
-    </RelativeLayout>
-
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/settings_widget_text.xml b/app/src/main/res/layout/settings_widget_text.xml
deleted file mode 100644
index 6a483763a..000000000
--- a/app/src/main/res/layout/settings_widget_text.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <data>
-        <import type="android.view.View"/>
-        <import type="android.text.InputType"/>
-        <variable
-            name="title"
-            type="String" />
-        <variable
-            name="subtitle"
-            type="String" />
-        <variable
-            name="defaultValue"
-            type="String" />
-        <variable
-            name="inputType"
-            type="Integer" />
-        <variable
-            name="enabled"
-            type="Boolean" />
-        <variable
-            name="listener"
-            type="org.linphone.activities.main.settings.SettingListener" />
-    </data>
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-        <ImageView
-            android:id="@+id/settings_commit_input"
-            android:onClick="@{() -> settingsInput.fakeImeDone(listener)}"
-            android:visibility="invisible"
-            android:contentDescription="@string/content_description_confirm_contact_edit"
-            android:layout_width="20dp"
-            android:layout_height="20dp"
-            android:layout_marginRight="@dimen/settings_margin"
-            android:src="@drawable/valid"
-            android:layout_alignParentRight="true"
-            android:layout_centerVertical="true" />
-
-        <com.google.android.material.textfield.TextInputLayout
-            android:id="@+id/settings_input_layout"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_toLeftOf="@id/settings_commit_input"
-            android:layout_marginTop="5dp"
-            android:layout_marginLeft="@dimen/settings_margin"
-            android:layout_marginRight="@dimen/settings_margin"
-            android:enabled="@{enabled ?? true}"
-            android:hint="@{title}"
-            app:helperText="@{subtitle}"
-            app:helperTextEnabled="@{subtitle.length() > 0}">
-
-            <org.linphone.views.SettingTextInputEditText
-                android:id="@+id/settings_input"
-                onFocusChangeVisibilityOf="@{settingsCommitInput}"
-                onSettingImeDone="@{() -> listener.onTextValueChanged(settingsInput.getText().toString())}"
-                android:text="@{defaultValue}"
-                android:imeOptions="actionDone"
-                android:inputType="@{inputType ?? InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS}"
-                android:maxLines="1"
-                android:background="@color/transparent_color"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"/>
-
-        </com.google.android.material.textfield.TextInputLayout>
-
-        <View
-            android:layout_marginTop="15dp"
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:layout_below="@id/settings_input_layout"
-            android:background="?attr/dividerColor" />
-
-    </RelativeLayout>
-
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/side_menu_account_cell.xml b/app/src/main/res/layout/side_menu_account_cell.xml
deleted file mode 100644
index bb8d85374..000000000
--- a/app/src/main/res/layout/side_menu_account_cell.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <data>
-        <import type="android.view.View" />
-        <variable
-            name="data"
-            type="org.linphone.activities.main.settings.viewmodels.AccountSettingsViewModel" />
-    </data>
-
-    <RelativeLayout
-        android:onClick="@{() -> data.accountsSettingsListener.onAccountClicked(data.identity)}"
-        android:layout_width="match_parent"
-        android:layout_height="35dp"
-        android:gravity="center">
-
-        <TextView
-            android:text="@{data.displayName + ` ` + (data.displayUsernameInsteadOfIdentity ? data.userName : data.identity)}"
-            android:textColor="?attr/primaryTextColor"
-            android:textSize="13sp"
-            android:singleLine="true"
-            android:ellipsize="end"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:gravity="center_vertical"
-            android:padding="2dp"
-            android:layout_marginLeft="@dimen/settings_margin" />
-
-        <ImageView
-            android:src="@{data.iconResource, default=@drawable/led_not_registered}"
-            android:background="@drawable/led_background"
-            android:contentDescription="@{data.iconContentDescription}"
-            android:layout_width="20dp"
-            android:layout_height="wrap_content"
-            android:layout_alignParentRight="true"
-            android:layout_centerVertical="true"
-            android:layout_marginRight="@dimen/settings_margin"
-            android:padding="@dimen/contact_presence_badge_padding" />
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:layout_alignParentBottom="true"
-            android:background="?attr/dividerColor" />
-
-    </RelativeLayout>
-
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/side_menu_fragment.xml b/app/src/main/res/layout/side_menu_fragment.xml
deleted file mode 100644
index ead22be46..000000000
--- a/app/src/main/res/layout/side_menu_fragment.xml
+++ /dev/null
@@ -1,345 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools">
-
-    <data>
-        <import type="android.view.View"/>
-        <import type="org.linphone.core.ConsolidatedPresence"/>
-        <variable
-            name="selfPictureClickListener"
-            type="android.view.View.OnClickListener"/>
-        <variable
-            name="assistantClickListener"
-            type="android.view.View.OnClickListener"/>
-        <variable
-            name="settingsClickListener"
-            type="android.view.View.OnClickListener"/>
-        <variable
-            name="recordingsClickListener"
-            type="android.view.View.OnClickListener"/>
-        <variable
-            name="aboutClickListener"
-            type="android.view.View.OnClickListener"/>
-        <variable
-            name="conferencesClickListener"
-            type="android.view.View.OnClickListener"/>
-        <variable
-            name="quitClickListener"
-            type="android.view.View.OnClickListener"/>
-        <variable
-            name="viewModel"
-            type="org.linphone.activities.main.sidemenu.viewmodels.SideMenuViewModel" />
-    </data>
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:clickable="true"
-        android:background="?attr/backgroundColor">
-
-        <RelativeLayout
-            android:id="@+id/main_account"
-            android:onClick="@{() -> viewModel.defaultAccountViewModel.accountsSettingsListener.onAccountClicked(viewModel.defaultAccountViewModel.identity)}"
-            android:enabled="@{viewModel.defaultAccountFound}"
-            android:visibility="@{viewModel.showAccounts ? View.VISIBLE : View.GONE}"
-            android:layout_width="match_parent"
-            android:layout_height="70dp"
-            android:background="?attr/lightToolbarBackgroundColor">
-
-            <ImageView
-                android:id="@+id/avatar"
-                coilRounded="@{viewModel.defaultAccountAvatar}"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:layout_margin="10dp"
-                android:adjustViewBounds="true"
-                android:background="@drawable/generated_avatar_bg"
-                android:contentDescription="@string/content_description_change_own_picture"
-                android:onClick="@{selfPictureClickListener}"
-                android:src="@drawable/icon_single_contact_avatar"
-                android:visibility="@{viewModel.defaultAccountFound ? View.VISIBLE : View.GONE}" />
-
-            <ImageView
-                android:id="@+id/avatar_border"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:layout_marginStart="10dp"
-                android:layout_marginTop="10dp"
-                android:layout_marginEnd="10dp"
-                android:layout_marginBottom="10dp"
-                android:adjustViewBounds="true"
-                android:contentDescription="@null"
-                android:src="@drawable/avatar_border"
-                android:visibility="@{viewModel.defaultAccountFound ? View.VISIBLE : View.GONE}" />
-
-            <ImageView
-                android:layout_width="@dimen/contact_presence_badge_size"
-                android:layout_height="@dimen/contact_presence_badge_size"
-                android:layout_alignBottom="@id/avatar"
-                android:layout_marginStart="45dp"
-                android:adjustViewBounds="true"
-                android:background="@drawable/led_background"
-                android:padding="@dimen/contact_presence_badge_padding"
-                app:presenceIcon="@{viewModel.presenceStatus}"
-                android:visibility="@{!viewModel.defaultAccountFound || viewModel.presenceStatus == ConsolidatedPresence.Offline ? View.GONE : View.VISIBLE, default=gone}"
-                tools:ignore="ContentDescription" />
-
-            <LinearLayout
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:layout_toRightOf="@id/avatar_border"
-                android:gravity="center_vertical"
-                android:orientation="vertical">
-
-                <TextView
-                    android:visibility="@{viewModel.defaultAccountFound ? View.GONE : View.VISIBLE, default=gone}"
-                    android:text="@string/no_account_configured"
-                    android:textColor="?attr/lightToolbarTextColor"
-                    android:textStyle="bold"
-                    android:textSize="18sp"
-                    android:padding="10dp"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content" />
-
-                <TextView
-                    android:visibility="@{viewModel.defaultAccountFound ? View.VISIBLE : View.GONE}"
-                    android:text="@{viewModel.defaultAccountViewModel.displayName.isEmpty() ? viewModel.defaultAccountViewModel.userName : viewModel.defaultAccountViewModel.displayName}"
-                    android:textColor="?attr/lightToolbarTextColor"
-                    android:textStyle="bold"
-                    android:textSize="18sp"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content" />
-
-                <TextView
-                    android:visibility="@{viewModel.defaultAccountFound ? View.VISIBLE : View.GONE}"
-                    android:text="@{viewModel.defaultAccountViewModel.displayUsernameInsteadOfIdentity ? viewModel.defaultAccountViewModel.userName : viewModel.defaultAccountViewModel.identity}"
-                    style="@style/sip_uri_small_font"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content" />
-
-            </LinearLayout>
-
-            <ImageView
-                android:background="@drawable/led_background"
-                android:src="@{viewModel.defaultAccountViewModel.iconResource, default=@drawable/led_not_registered}"
-                android:contentDescription="@{viewModel.defaultAccountViewModel.iconContentDescription}"
-                android:layout_width="20dp"
-                android:layout_height="wrap_content"
-                android:layout_alignParentTop="true"
-                android:layout_alignParentRight="true"
-                android:layout_marginTop="10dp"
-                android:layout_marginRight="10dp"
-                android:padding="@dimen/contact_presence_badge_padding" />
-
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:layout_alignParentBottom="true"
-                android:background="?attr/dividerColor" />
-
-        </RelativeLayout>
-
-        <androidx.core.widget.NestedScrollView
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_below="@id/main_account"
-            android:layout_above="@id/side_menu_quit">
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical">
-
-                <LinearLayout
-                    android:visibility="@{viewModel.showAccounts ? View.VISIBLE : View.GONE}"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="vertical"
-                    app:entries="@{viewModel.accounts}"
-                    app:layout="@{@layout/side_menu_account_cell}"/>
-
-                <LinearLayout
-                    android:onClick="@{assistantClickListener}"
-                    android:visibility="@{viewModel.showAssistant ? View.VISIBLE : View.GONE}"
-                    android:layout_width="match_parent"
-                    android:layout_height="45dp">
-
-                    <ImageView
-                        android:layout_width="45dp"
-                        android:layout_height="45dp"
-                        android:padding="10dp"
-                        android:contentDescription="@string/assistant"
-                        android:src="@drawable/menu_assistant" />
-
-                    <TextView
-                        android:text="@string/assistant"
-                        style="@style/standard_text_font"
-                        android:layout_width="match_parent"
-                        android:layout_height="45dp"
-                        android:gravity="center_vertical"
-                        android:paddingLeft="5dp"
-                        android:paddingRight="16dp" />
-
-                </LinearLayout>
-
-                <View
-                    android:visibility="@{viewModel.showAssistant ? View.VISIBLE : View.GONE}"
-                    android:layout_width="match_parent"
-                    android:layout_height="1dp"
-                    android:background="?dividerColor" />
-
-                <LinearLayout
-                    android:onClick="@{settingsClickListener}"
-                    android:visibility="@{viewModel.showSettings ? View.VISIBLE : View.GONE}"
-                    android:layout_width="match_parent"
-                    android:layout_height="45dp">
-
-                    <ImageView
-                        android:layout_width="45dp"
-                        android:layout_height="45dp"
-                        android:padding="10dp"
-                        android:contentDescription="@string/settings"
-                        android:src="@drawable/menu_options" />
-
-                    <TextView
-                        android:text="@string/settings"
-                        style="@style/standard_text_font"
-                        android:layout_width="match_parent"
-                        android:layout_height="45dp"
-                        android:gravity="center_vertical"
-                        android:paddingLeft="5dp"
-                        android:paddingRight="16dp" />
-
-                </LinearLayout>
-
-                <View
-                    android:visibility="@{viewModel.showSettings ? View.VISIBLE : View.GONE}"
-                    android:layout_width="match_parent"
-                    android:layout_height="1dp"
-                    android:background="?dividerColor" />
-
-                <LinearLayout
-                    android:onClick="@{recordingsClickListener}"
-                    android:visibility="@{viewModel.showRecordings ? View.VISIBLE : View.GONE}"
-                    android:layout_width="match_parent"
-                    android:layout_height="45dp">
-
-                    <ImageView
-                        android:layout_width="45dp"
-                        android:layout_height="45dp"
-                        android:padding="10dp"
-                        android:contentDescription="@string/recordings"
-                        android:src="@drawable/menu_recordings" />
-
-                    <TextView
-                        android:text="@string/recordings"
-                        style="@style/standard_text_font"
-                        android:layout_width="match_parent"
-                        android:layout_height="45dp"
-                        android:gravity="center_vertical"
-                        android:paddingLeft="5dp"
-                        android:paddingRight="16dp" />
-
-                </LinearLayout>
-
-                <View
-                    android:visibility="@{viewModel.showRecordings ? View.VISIBLE : View.GONE}"
-                    android:layout_width="match_parent"
-                    android:layout_height="1dp"
-                    android:background="?dividerColor" />
-
-                <LinearLayout
-                    android:onClick="@{conferencesClickListener}"
-                    android:visibility="@{viewModel.showScheduledConferences ? View.VISIBLE : View.GONE}"
-                    android:layout_width="match_parent"
-                    android:layout_height="45dp">
-
-                    <ImageView
-                        android:layout_width="45dp"
-                        android:layout_height="45dp"
-                        android:padding="7dp"
-                        android:contentDescription="@string/conference_scheduled"
-                        android:src="@drawable/icon_meeting_schedule" />
-
-                    <TextView
-                        android:text="@string/conference_scheduled"
-                        style="@style/standard_text_font"
-                        android:layout_width="match_parent"
-                        android:layout_height="45dp"
-                        android:gravity="center_vertical"
-                        android:paddingLeft="5dp"
-                        android:paddingRight="16dp" />
-
-                </LinearLayout>
-
-                <View
-                    android:visibility="@{viewModel.showScheduledConferences ? View.VISIBLE : View.GONE}"
-                    android:layout_width="match_parent"
-                    android:layout_height="1dp"
-                    android:background="?dividerColor" />
-
-                <LinearLayout
-                    android:onClick="@{aboutClickListener}"
-                    android:visibility="@{viewModel.showAbout ? View.VISIBLE : View.GONE}"
-                    android:layout_width="match_parent"
-                    android:layout_height="45dp">
-
-                    <ImageView
-                        android:layout_width="45dp"
-                        android:layout_height="45dp"
-                        android:padding="10dp"
-                        android:contentDescription="@string/about"
-                        android:src="@drawable/menu_about" />
-
-                    <TextView
-                        android:text="@string/about"
-                        style="@style/standard_text_font"
-                        android:layout_width="match_parent"
-                        android:layout_height="45dp"
-                        android:gravity="center_vertical"
-                        android:paddingLeft="5dp"
-                        android:paddingRight="16dp" />
-
-                </LinearLayout>
-
-                <View
-                    android:visibility="@{viewModel.showAbout ? View.VISIBLE : View.GONE}"
-                    android:layout_width="match_parent"
-                    android:layout_height="1dp"
-                    android:background="?dividerColor" />
-
-            </LinearLayout>
-
-        </androidx.core.widget.NestedScrollView>
-
-        <LinearLayout
-            android:id="@+id/side_menu_quit"
-            android:onClick="@{quitClickListener}"
-            android:visibility="@{viewModel.showQuit ? View.VISIBLE : View.GONE}"
-            android:layout_width="match_parent"
-            android:layout_height="50dp"
-            android:layout_alignParentBottom="true"
-            android:background="?attr/accentColor"
-            android:orientation="horizontal"
-            android:gravity="center_vertical">
-
-            <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:padding="5dp"
-                android:contentDescription="@string/quit"
-                android:src="@drawable/quit_default" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:textColor="?attr/accentTextColor"
-                android:textSize="21sp"
-                android:text="@string/quit" />
-
-        </LinearLayout>
-
-    </RelativeLayout>
-
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/status_fragment.xml b/app/src/main/res/layout/status_fragment.xml
deleted file mode 100644
index f41bb55c3..000000000
--- a/app/src/main/res/layout/status_fragment.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <data>
-        <import type="android.view.View"/>
-        <variable
-            name="menuClickListener"
-            type="android.view.View.OnClickListener"/>
-        <variable
-            name="refreshClickListener"
-            type="android.view.View.OnClickListener"/>
-        <variable
-            name="viewModel"
-            type="org.linphone.activities.main.viewmodels.StatusViewModel" />
-    </data>
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/status_fragment_size"
-        android:background="?attr/accentColor"
-        android:orientation="horizontal">
-
-        <ImageView
-            android:id="@+id/menu_button"
-            android:onClick="@{menuClickListener}"
-            android:contentDescription="@string/content_description_toggle_side_menu"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentLeft="true"
-            android:layout_centerInParent="true"
-            android:padding="10dp"
-            android:src="@drawable/menu" />
-
-        <ImageView
-            android:id="@+id/status_led"
-            android:background="@drawable/status_led_background"
-            android:src="@{viewModel.registrationStatusDrawable, default=@drawable/led_not_registered}"
-            android:onClick="@{refreshClickListener}"
-            android:contentDescription="@{viewModel.registrationStatusText}"
-            android:layout_width="20dp"
-            android:layout_height="wrap_content"
-            android:padding="2dp"
-            android:layout_centerInParent="true"
-            android:layout_toRightOf="@id/menu_button"
-            android:adjustViewBounds="true" />
-
-        <TextView
-            android:text="@{viewModel.registrationStatusText, default=@string/status_not_connected}"
-            android:onClick="@{refreshClickListener}"
-            android:textColor="?attr/accentTextColor"
-            android:textSize="15sp"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_centerVertical="true"
-            android:layout_toRightOf="@id/status_led"
-            android:gravity="center_vertical"
-            android:paddingLeft="5dp" />
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:contentDescription="@string/content_description_voice_mail"
-            android:layout_centerVertical="true"
-            android:layout_toLeftOf="@id/voice_mail_count"
-            android:gravity="center_vertical"
-            android:src="@drawable/voicemail"
-            android:visibility="@{viewModel.voiceMailCount > 0 ? View.VISIBLE : View.GONE, default=gone}" />
-
-        <TextView
-            android:id="@+id/voice_mail_count"
-            android:text="@{viewModel.voiceMailCount.toString()}"
-            android:visibility="@{viewModel.voiceMailCount > 0 ? View.VISIBLE : View.GONE, default=gone}"
-            android:textColor="?attr/secondaryTextColor"
-            android:textSize="21sp"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_alignParentRight="true"
-            android:gravity="center_vertical"
-            android:paddingLeft="5dp"
-            android:paddingRight="10dp" />
-
-    </RelativeLayout>
-
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/tabs_fragment.xml b/app/src/main/res/layout/tabs_fragment.xml
deleted file mode 100644
index 69d49e642..000000000
--- a/app/src/main/res/layout/tabs_fragment.xml
+++ /dev/null
@@ -1,152 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <data>
-        <import type="android.view.View"/>
-        <variable
-            name="historyClickListener"
-            type="android.view.View.OnClickListener"/>
-        <variable
-            name="contactsClickListener"
-            type="android.view.View.OnClickListener"/>
-        <variable
-            name="dialerClickListener"
-            type="android.view.View.OnClickListener"/>
-        <variable
-            name="chatClickListener"
-            type="android.view.View.OnClickListener"/>
-        <variable
-            name="viewModel"
-            type="org.linphone.activities.main.viewmodels.TabsViewModel" />
-    </data>
-
-    <androidx.constraintlayout.motion.widget.MotionLayout
-        android:id="@+id/motion_layout"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/main_activity_tabs_fragment_size"
-        app:layoutDescription="@xml/motion_main_activity_tabs_selector">
-
-        <androidx.constraintlayout.widget.Guideline
-            android:id="@+id/guidelineLeft"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:orientation="vertical"
-            layout_constraintGuide_percent="@{viewModel.leftAnchor, default=0.25}" />
-
-        <androidx.constraintlayout.widget.Guideline
-            android:id="@+id/guidelineMiddle"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:orientation="vertical"
-            layout_constraintGuide_percent="@{viewModel.middleAnchor, default=0.5}" />
-
-        <androidx.constraintlayout.widget.Guideline
-            android:id="@+id/guidelineRight"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:orientation="vertical"
-            layout_constraintGuide_percent="@{viewModel.rightAnchor, default=0.75}" />
-
-        <ImageView
-            android:id="@+id/history"
-            android:onClick="@{historyClickListener}"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_centerInParent="true"
-            android:padding="15dp"
-            android:contentDescription="@string/content_description_menu_history"
-            android:src="@drawable/footer_history"
-            android:background="@drawable/footer_button"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="@id/guidelineLeft" />
-
-        <TextView
-            android:id="@+id/history_unread_count"
-            style="@style/unread_count_font"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginRight="25dp"
-            android:layout_marginTop="5dp"
-            android:gravity="center"
-            android:translationY="@{viewModel.historyMissedCountTranslateY}"
-            android:background="@{viewModel.missedCallsCount == 0 ? @drawable/hidden_unread_message_count_bg : @drawable/unread_message_count_bg}"
-            android:text="@{viewModel.missedCallsCount == 0 ? `` : String.valueOf(viewModel.missedCallsCount)}"
-            app:layout_constraintRight_toLeftOf="@id/guidelineLeft"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <RelativeLayout
-            android:id="@+id/contacts"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:background="@drawable/footer_button"
-            android:onClick="@{contactsClickListener}"
-            app:layout_constraintStart_toStartOf="@id/guidelineLeft"
-            app:layout_constraintEnd_toEndOf="@id/guidelineMiddle">
-
-            <ImageView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_centerInParent="true"
-                android:padding="15dp"
-                android:contentDescription="@string/content_description_menu_contacts"
-                android:src="@drawable/footer_contacts" />
-
-        </RelativeLayout>
-
-        <RelativeLayout
-            android:id="@+id/dialer"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:background="@drawable/footer_button"
-            android:onClick="@{dialerClickListener}"
-            app:layout_constraintStart_toStartOf="@id/guidelineMiddle"
-            app:layout_constraintEnd_toEndOf="@id/guidelineRight">
-
-            <ImageView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_centerInParent="true"
-                android:padding="15dp"
-                android:contentDescription="@string/content_description_menu_dialer"
-                android:src="@drawable/footer_dialer" />
-
-        </RelativeLayout>
-
-        <ImageView
-            android:id="@+id/chat"
-            android:onClick="@{chatClickListener}"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_centerInParent="true"
-            android:contentDescription="@string/content_description_menu_chat"
-            android:padding="15dp"
-            android:src="@drawable/footer_chat"
-            android:background="@drawable/footer_button"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="@id/guidelineRight" />
-
-        <TextView
-            android:id="@+id/chat_unread_count"
-            style="@style/unread_count_font"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginRight="25dp"
-            android:layout_marginTop="5dp"
-            android:gravity="center"
-            android:translationY="@{viewModel.chatUnreadCountTranslateY}"
-            android:background="@{viewModel.unreadMessagesCount == 0 ? @drawable/hidden_unread_message_count_bg : @drawable/unread_message_count_bg}"
-            android:text="@{viewModel.unreadMessagesCount == 0 ? `` : String.valueOf(viewModel.unreadMessagesCount)}"
-            app:layout_constraintRight_toRightOf="parent"
-            app:layout_constraintTop_toTopOf="parent"/>
-
-        <View
-            android:id="@+id/selector"
-            android:layout_width="0dp"
-            android:layout_height="@dimen/tabs_fragment_selector_size"
-            android:background="?attr/accentColor" />
-
-    </androidx.constraintlayout.motion.widget.MotionLayout>
-
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/video_play_button.xml b/app/src/main/res/layout/video_play_button.xml
deleted file mode 100644
index 5688963d8..000000000
--- a/app/src/main/res/layout/video_play_button.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="@dimen/play_pause_button_size"
-    android:layout_height="@dimen/play_pause_button_size"
-    android:padding="9dp"
-    android:src="@drawable/record_play_dark"
-    android:background="@drawable/round_recording_button_background_dark"
-    android:contentDescription="@null"
-    android:layout_centerInParent="true"/>
\ No newline at end of file
diff --git a/app/src/main/res/layout/voip_activity.xml b/app/src/main/res/layout/voip_activity.xml
deleted file mode 100644
index 8b6c65cfc..000000000
--- a/app/src/main/res/layout/voip_activity.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <data>
-        <import type="android.view.View" />
-        <variable
-            name="controlsViewModel"
-            type="org.linphone.activities.voip.viewmodels.ControlsViewModel" />
-    </data>
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:keepScreenOn="true">
-
-        <androidx.fragment.app.FragmentContainerView
-            android:id="@+id/status_fragment"
-            android:visibility="@{controlsViewModel.fullScreenMode || controlsViewModel.pipMode ? View.GONE : View.VISIBLE}"
-            android:name="org.linphone.activities.voip.fragments.StatusFragment"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/status_fragment_size"
-            app:layout_constraintTop_toTopOf="parent"
-            tools:layout="@layout/voip_status_fragment" />
-
-        <androidx.fragment.app.FragmentContainerView
-            android:id="@+id/nav_host_fragment"
-            android:name="androidx.navigation.fragment.NavHostFragment"
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            app:defaultNavHost="true"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/status_fragment"
-            app:navGraph="@navigation/call_nav_graph"
-            tools:layout="@layout/voip_single_call_fragment" />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/voip_buttons.xml b/app/src/main/res/layout/voip_buttons.xml
deleted file mode 100644
index 900732e93..000000000
--- a/app/src/main/res/layout/voip_buttons.xml
+++ /dev/null
@@ -1,148 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <data>
-
-        <import type="android.view.View" />
-
-        <import type="org.linphone.activities.voip.ConferenceDisplayMode" />
-
-        <variable
-            name="controlsViewModel"
-            type="org.linphone.activities.voip.viewmodels.ControlsViewModel" />
-
-        <variable
-            name="callsViewModel"
-            type="org.linphone.activities.voip.viewmodels.CallsViewModel" />
-
-        <variable
-            name="conferenceViewModel"
-            type="org.linphone.activities.voip.viewmodels.ConferenceViewModel" />
-    </data>
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/buttons_layout"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/voip_buttons_fragment_size">
-
-        <ImageView
-            android:id="@+id/hangup"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:background="@drawable/button_call_terminate_background"
-            android:contentDescription="@string/content_description_terminate_call"
-            android:onClick="@{() -> controlsViewModel.hangUp()}"
-            android:padding="5dp"
-            android:src="@drawable/icon_call_hangup"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintDimensionRatio="W,1.26:1"
-            app:layout_constraintStart_toStartOf="parent" />
-
-        <ImageView
-            android:id="@+id/microphone"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_marginEnd="5dp"
-            android:background="@drawable/button_background_reverse"
-            android:contentDescription="@{callsViewModel.isMicrophoneMuted ? @string/content_description_disable_mic_mute : @string/content_description_enable_mic_mute}"
-            android:enabled="@{callsViewModel.isMuteMicrophoneEnabled &amp;&amp; !conferenceViewModel.isMeListenerOnly}"
-            android:onClick="@{() -> callsViewModel.toggleMuteMicrophone()}"
-            android:padding="5dp"
-            android:selected="@{callsViewModel.isMicrophoneMuted || conferenceViewModel.isMeListenerOnly}"
-            android:src="@drawable/icon_toggle_mic"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintDimensionRatio="W,1:1"
-            app:layout_constraintEnd_toStartOf="@id/speaker"
-            app:layout_constraintHorizontal_chainStyle="packed"
-            app:layout_constraintStart_toEndOf="@id/hangup" />
-
-        <ImageView
-            android:id="@+id/speaker"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:background="@drawable/button_background_reverse"
-            android:contentDescription="@{controlsViewModel.isSpeakerSelected ? @string/content_description_disable_speaker : @string/content_description_enable_speaker}"
-            android:onClick="@{() -> controlsViewModel.toggleSpeaker()}"
-            android:padding="5dp"
-            android:selected="@{controlsViewModel.isSpeakerSelected}"
-            android:src="@drawable/icon_toggle_speaker"
-            android:visibility="@{controlsViewModel.audioRoutesEnabled ? View.GONE : View.VISIBLE}"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintDimensionRatio="W,1:1"
-            app:layout_constraintEnd_toStartOf="@id/audio_routes"
-            app:layout_constraintStart_toEndOf="@id/microphone" />
-
-        <ImageView
-            android:id="@+id/audio_routes"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:background="@drawable/button_toggle_background_reverse"
-            android:contentDescription="@string/content_description_toggle_audio_menu"
-            android:onClick="@{() -> controlsViewModel.toggleRoutesMenu()}"
-            android:padding="5dp"
-            android:selected="@{controlsViewModel.audioRoutesSelected}"
-            android:src="@drawable/icon_audio_routes"
-            android:visibility="@{controlsViewModel.audioRoutesEnabled ? View.VISIBLE : View.GONE, default=gone}"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintDimensionRatio="W,1:1"
-            app:layout_constraintEnd_toStartOf="@id/video"
-            app:layout_constraintStart_toEndOf="@id/speaker" />
-
-        <ImageView
-            android:id="@+id/video"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_marginStart="5dp"
-            android:background="@drawable/button_background_reverse"
-            android:contentDescription="@{controlsViewModel.isVideoEnabled &amp;&amp; controlsViewModel.isSendingVideo ? @string/content_description_disable_video : @string/content_description_enable_video}"
-            android:enabled="@{controlsViewModel.isVideoAvailable &amp;&amp; !controlsViewModel.isVideoUpdateInProgress &amp;&amp; !conferenceViewModel.isMeListenerOnly}"
-            android:onClick="@{() -> (!conferenceViewModel.conferenceExists || conferenceViewModel.conferenceDisplayMode != ConferenceDisplayMode.AUDIO_ONLY) ? controlsViewModel.toggleVideo() : conferenceViewModel.switchLayoutFromAudioOnlyToActiveSpeaker()}"
-            android:padding="5dp"
-            android:selected="@{controlsViewModel.isVideoEnabled &amp;&amp; controlsViewModel.isSendingVideo &amp;&amp; !conferenceViewModel.isMeListenerOnly}"
-            android:visibility="@{controlsViewModel.hideVideo ? View.GONE : View.VISIBLE}"
-            android:src="@drawable/icon_toggle_camera"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintDimensionRatio="W,1:1"
-            app:layout_constraintEnd_toStartOf="@id/more"
-            app:layout_constraintStart_toEndOf="@id/audio_routes" />
-
-        <ProgressBar
-            android:id="@+id/video_toggle_in_progress"
-            style="?android:attr/progressBarStyle"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:visibility="@{controlsViewModel.isVideoUpdateInProgress ? View.VISIBLE : View.GONE, default=gone}"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="@id/video"
-            app:layout_constraintStart_toStartOf="@id/video" />
-
-        <ImageView
-            android:id="@+id/more"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:background="@drawable/button_background"
-            android:contentDescription="@string/content_description_call_context_menu"
-            android:onClick="@{() -> controlsViewModel.showExtraButtons()}"
-            android:padding="5dp"
-            android:src="@drawable/icon_call_more"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintDimensionRatio="W,1:1"
-            app:layout_constraintEnd_toEndOf="parent" />
-
-        <TextView
-            android:id="@+id/extra_count"
-            style="@style/unread_count_font"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:background="@drawable/unread_message_count_bg"
-            android:gravity="center"
-            android:text="@{String.valueOf(callsViewModel.chatAndCallsCount), default=2}"
-            android:translationY="@{controlsViewModel.bouncyCounterTranslateY}"
-            android:visibility="@{callsViewModel.chatAndCallsCount == 0 ? View.GONE : View.VISIBLE}"
-            app:layout_constraintEnd_toEndOf="@id/more"
-            app:layout_constraintTop_toTopOf="@id/more" />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/voip_buttons_audio_routes.xml b/app/src/main/res/layout/voip_buttons_audio_routes.xml
deleted file mode 100644
index a44bc97b3..000000000
--- a/app/src/main/res/layout/voip_buttons_audio_routes.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <data>
-        <import type="android.view.View" />
-        <variable
-            name="controlsViewModel"
-            type="org.linphone.activities.voip.viewmodels.ControlsViewModel" />
-        <variable
-            name="inflatedVisibility"
-            type="Integer" />
-    </data>
-
-    <LinearLayout
-        android:id="@+id/audio_routes_layout"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:background="@drawable/shape_audio_routes_background"
-        android:translationY="@{controlsViewModel.audioRoutesMenuTranslateY, default=@dimen/voip_audio_routes_menu_translate_y}"
-        android:visibility="@{inflatedVisibility}"
-        android:orientation="vertical"
-        inflatedLifecycleOwner="@{true}">
-
-        <ImageView
-            android:id="@+id/bluetooth_audio_route"
-            android:selected="@{controlsViewModel.isBluetoothHeadsetSelected}"
-            android:onClick="@{() -> controlsViewModel.forceBluetoothAudioRoute()}"
-            android:contentDescription="@string/content_description_use_bluetooth_headset"
-            android:layout_width="@dimen/voip_call_button_size"
-            android:layout_height="@dimen/voip_call_button_size"
-            android:background="@drawable/button_toggle_background_reverse"
-            android:layout_margin="5dp"
-            android:src="@drawable/icon_bluetooth" />
-
-        <ImageView
-            android:id="@+id/earpiece_audio_route"
-            android:selected="@{!controlsViewModel.isSpeakerSelected &amp;&amp; !controlsViewModel.isBluetoothHeadsetSelected}"
-            android:onClick="@{() -> controlsViewModel.forceEarpieceAudioRoute()}"
-            android:contentDescription="@string/content_description_use_earpiece"
-            android:layout_width="@dimen/voip_call_button_size"
-            android:layout_height="@dimen/voip_call_button_size"
-            android:background="@drawable/button_toggle_background_reverse"
-            android:layout_margin="5dp"
-            android:src="@drawable/icon_earpiece" />
-
-        <ImageView
-            android:id="@+id/speaker_audio_route"
-            android:selected="@{controlsViewModel.isSpeakerSelected}"
-            android:onClick="@{() -> controlsViewModel.forceSpeakerAudioRoute()}"
-            android:contentDescription="@string/content_description_use_speaker"
-            android:layout_width="@dimen/voip_call_button_size"
-            android:layout_height="@dimen/voip_call_button_size"
-            android:background="@drawable/button_toggle_background_reverse"
-            android:layout_margin="5dp"
-            android:src="@drawable/icon_speaker" />
-
-    </LinearLayout>
-
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/voip_buttons_extra.xml b/app/src/main/res/layout/voip_buttons_extra.xml
deleted file mode 100644
index f29954e58..000000000
--- a/app/src/main/res/layout/voip_buttons_extra.xml
+++ /dev/null
@@ -1,203 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools">
-
-    <data>
-
-        <import type="android.view.View" />
-
-        <import type="org.linphone.activities.voip.ConferenceDisplayMode" />
-
-        <variable
-            name="controlsViewModel"
-            type="org.linphone.activities.voip.viewmodels.ControlsViewModel" />
-
-        <variable
-            name="callsViewModel"
-            type="org.linphone.activities.voip.viewmodels.CallsViewModel" />
-
-        <variable
-            name="conferenceViewModel"
-            type="org.linphone.activities.voip.viewmodels.ConferenceViewModel" />
-    </data>
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/extra_buttons_layout"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/voip_call_extra_buttons_height"
-        android:layout_marginStart="15dp"
-        android:layout_marginEnd="15dp"
-        android:background="@drawable/shape_extra_buttons_background"
-        android:gravity="center">
-
-        <TextView
-            android:id="@+id/numpad"
-            style="@style/call_options_font"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:onClick="@{() -> controlsViewModel.showNumpad()}"
-            android:text="@string/call_action_numpad"
-            android:enabled="@{!conferenceViewModel.isBroadcast}"
-            app:drawableTopCompat="@drawable/icon_call_numpad"
-            app:layout_constraintBottom_toBottomOf="@id/chat"
-            app:layout_constraintEnd_toStartOf="@id/call_stats"
-            app:layout_constraintHorizontal_chainStyle="spread"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="@id/chat" />
-
-        <TextView
-            android:id="@+id/call_stats"
-            style="@style/call_options_font"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:onClick="@{() -> controlsViewModel.showCallStats(false)}"
-            android:text="@string/call_action_statistics"
-            app:drawableTopCompat="@drawable/icon_call_stats"
-            app:layout_constraintBottom_toBottomOf="@id/chat"
-            app:layout_constraintEnd_toStartOf="@id/chat"
-            app:layout_constraintStart_toEndOf="@id/numpad"
-            app:layout_constraintTop_toTopOf="@id/chat" />
-
-        <TextView
-            android:id="@+id/chat"
-            style="@style/call_options_font"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_centerInParent="true"
-            android:gravity="center"
-            android:onClick="@{() -> controlsViewModel.goToChat()}"
-            android:visibility="@{controlsViewModel.chatDisabled ? View.INVISIBLE : View.VISIBLE}"
-            android:text="@string/call_action_chat"
-            app:drawableTopCompat="@drawable/icon_call_chat"
-            app:layout_constraintBottom_toTopOf="@id/calls"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@id/call_stats"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintVertical_chainStyle="spread" />
-
-        <TextView
-            android:id="@+id/unread_chat_count"
-            style="@style/unread_count_font"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="60dp"
-            android:background="@drawable/unread_message_count_bg"
-            android:gravity="center"
-            android:text="@{String.valueOf(callsViewModel.currentCallUnreadChatMessageCount), default=1}"
-            android:translationY="@{controlsViewModel.bouncyCounterTranslateY}"
-            android:visibility="@{callsViewModel.currentCallUnreadChatMessageCount == 0 || controlsViewModel.chatDisabled ? View.GONE : View.VISIBLE}"
-            app:layout_constraintEnd_toEndOf="@id/chat"
-            app:layout_constraintStart_toStartOf="@id/chat"
-            app:layout_constraintTop_toTopOf="@id/chat" />
-
-        <ProgressBar
-            android:id="@+id/chat_room_creation_progress"
-            style="?android:attr/progressBarStyle"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:visibility="@{controlsViewModel.chatRoomCreationInProgress ? View.VISIBLE : View.GONE, default=gone}"
-            app:layout_constraintBottom_toBottomOf="@id/chat"
-            app:layout_constraintEnd_toEndOf="@id/chat"
-            app:layout_constraintStart_toStartOf="@id/chat"
-            app:layout_constraintTop_toTopOf="@id/chat" />
-
-        <TextView
-            android:id="@+id/transfer_call"
-            style="@style/call_options_font"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:onClick="@{() -> controlsViewModel.transferCall()}"
-            android:text="@{controlsViewModel.attendedTransfer ? @string/call_action_attended_transfer_call : @string/call_action_transfer_call, default=@string/call_action_transfer_call}"
-            android:visibility="@{conferenceViewModel.conferenceExists ? View.GONE : View.VISIBLE, default=gone}"
-            app:drawableTopCompat="@drawable/icon_call_forward"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toStartOf="@id/conference_participants"
-            app:layout_constraintHorizontal_chainStyle="spread"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/numpad" />
-
-        <TextView
-            android:id="@+id/conference_participants"
-            style="@style/call_options_font"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:onClick="@{() -> controlsViewModel.goToConferenceParticipantsList()}"
-            android:text="@string/call_action_participants_list"
-            android:visibility="@{conferenceViewModel.conferenceExists ? View.VISIBLE : View.GONE}"
-            app:drawableTopCompat="@drawable/icon_call_participants"
-            app:layout_constraintBottom_toBottomOf="@id/calls"
-            app:layout_constraintEnd_toStartOf="@id/add_call"
-            app:layout_constraintHorizontal_chainStyle="spread"
-            app:layout_constraintStart_toEndOf="@id/transfer_call"
-            app:layout_constraintTop_toTopOf="@id/calls" />
-
-        <TextView
-            android:id="@+id/add_call"
-            style="@style/call_options_font"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:onClick="@{() -> controlsViewModel.goToDialerForNewCall()}"
-            android:text="@string/call_action_add_call"
-            android:visibility="@{conferenceViewModel.conferenceExists ? View.GONE : View.VISIBLE, default=gone}"
-            app:drawableTopCompat="@drawable/icon_call_add"
-            app:layout_constraintBottom_toBottomOf="@id/calls"
-            app:layout_constraintEnd_toStartOf="@id/conference_layout"
-            app:layout_constraintStart_toEndOf="@id/conference_participants"
-            app:layout_constraintTop_toTopOf="@id/calls" />
-
-        <TextView
-            android:id="@+id/conference_layout"
-            style="@style/call_options_font"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:drawableTop="@{conferenceViewModel.conferenceDisplayMode == ConferenceDisplayMode.ACTIVE_SPEAKER ? @drawable/icon_conference_layout_active_speaker : conferenceViewModel.conferenceDisplayMode == ConferenceDisplayMode.AUDIO_ONLY ? @drawable/icon_conference_layout_audio_only : @drawable/icon_conference_layout_grid, default=@drawable/icon_conference_layout_grid}"
-            android:enabled="@{conferenceViewModel.isVideoConference}"
-            android:gravity="center"
-            android:onClick="@{() -> controlsViewModel.goToConferenceLayout()}"
-            android:text="@string/call_action_change_conf_layout"
-            android:visibility="@{conferenceViewModel.conferenceExists ? View.VISIBLE : View.GONE}"
-            app:layout_constraintBottom_toBottomOf="@id/calls"
-            app:layout_constraintEnd_toStartOf="@id/calls"
-            app:layout_constraintStart_toEndOf="@id/add_call"
-            app:layout_constraintTop_toTopOf="@id/calls"
-            tools:ignore="UseCompatTextViewDrawableXml" />
-
-        <TextView
-            android:id="@+id/calls"
-            style="@style/call_options_font"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:onClick="@{() -> controlsViewModel.goToCallsList()}"
-            android:text="@string/call_action_calls_list"
-            android:enabled="@{!conferenceViewModel.isBroadcast}"
-            app:drawableTopCompat="@drawable/icon_calls_list"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@id/conference_layout"
-            app:layout_constraintTop_toBottomOf="@id/chat" />
-
-        <TextView
-            android:id="@+id/paused_calls_count"
-            style="@style/unread_count_font"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="60dp"
-            android:background="@drawable/unread_message_count_bg"
-            android:gravity="center"
-            android:text="@{String.valueOf(callsViewModel.inactiveCallsCount), default=1}"
-            android:translationY="@{controlsViewModel.bouncyCounterTranslateY}"
-            android:visibility="@{callsViewModel.inactiveCallsCount == 0 ? View.GONE : View.VISIBLE}"
-            app:layout_constraintEnd_toEndOf="@id/calls"
-            app:layout_constraintStart_toStartOf="@id/calls"
-            app:layout_constraintTop_toTopOf="@id/calls" />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/voip_buttons_incoming.xml b/app/src/main/res/layout/voip_buttons_incoming.xml
deleted file mode 100644
index d037b6876..000000000
--- a/app/src/main/res/layout/voip_buttons_incoming.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <data>
-
-        <import type="android.view.View" />
-
-        <variable
-            name="viewModel"
-            type="org.linphone.activities.voip.viewmodels.ControlsViewModel" />
-    </data>
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/voip_buttons_fragment_size">
-
-        <ImageView
-            android:id="@+id/hangup"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_marginEnd="5dp"
-            android:background="@drawable/button_call_terminate_background"
-            android:contentDescription="@string/content_description_terminate_call"
-            android:onClick="@{() -> viewModel.hangUp()}"
-            android:padding="5dp"
-            android:src="@drawable/icon_call_hangup"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintDimensionRatio="W,1.26:1"
-            app:layout_constraintEnd_toStartOf="@id/answer"
-            app:layout_constraintHorizontal_chainStyle="packed"
-            app:layout_constraintStart_toStartOf="parent" />
-
-        <ImageView
-            android:id="@+id/answer"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_marginStart="5dp"
-            android:background="@drawable/button_call_answer_background"
-            android:contentDescription="@string/content_description_answer_call"
-            android:onClick="@{() -> viewModel.answer()}"
-            android:padding="5dp"
-            android:src="@{viewModel.isIncomingCallVideo ? @drawable/icon_call_answer_video : @drawable/icon_call_answer, default=@drawable/icon_call_answer_video}"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintDimensionRatio="W,1.26:1"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@id/hangup" />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/voip_buttons_outgoing.xml b/app/src/main/res/layout/voip_buttons_outgoing.xml
deleted file mode 100644
index 353c28853..000000000
--- a/app/src/main/res/layout/voip_buttons_outgoing.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <data>
-
-        <import type="android.view.View" />
-
-        <variable
-            name="callsViewModel"
-            type="org.linphone.activities.voip.viewmodels.CallsViewModel" />
-
-        <variable
-            name="controlsViewModel"
-            type="org.linphone.activities.voip.viewmodels.ControlsViewModel" />
-    </data>
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/voip_buttons_fragment_size">
-
-        <ImageView
-            android:id="@+id/hangup"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:background="@drawable/button_call_terminate_background"
-            android:contentDescription="@string/content_description_terminate_call"
-            android:onClick="@{() -> controlsViewModel.hangUp()}"
-            android:padding="5dp"
-            android:src="@drawable/icon_call_hangup"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintDimensionRatio="W,1.26:1"
-            app:layout_constraintStart_toStartOf="parent" />
-
-        <ImageView
-            android:id="@+id/microphone"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_marginEnd="5dp"
-            android:background="@drawable/button_background_reverse"
-            android:contentDescription="@{callsViewModel.isMicrophoneMuted ? @string/content_description_disable_mic_mute : @string/content_description_enable_mic_mute}"
-            android:enabled="@{callsViewModel.isMuteMicrophoneEnabled}"
-            android:onClick="@{() -> callsViewModel.toggleMuteMicrophone()}"
-            android:padding="5dp"
-            android:selected="@{callsViewModel.isMicrophoneMuted}"
-            android:src="@drawable/icon_toggle_mic"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintDimensionRatio="W,1:1"
-            app:layout_constraintEnd_toStartOf="@id/speaker"
-            app:layout_constraintHorizontal_chainStyle="packed"
-            app:layout_constraintStart_toStartOf="@id/hangup" />
-
-        <ImageView
-            android:id="@+id/speaker"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_marginStart="5dp"
-            android:background="@drawable/button_background_reverse"
-            android:contentDescription="@{controlsViewModel.isSpeakerSelected ? @string/content_description_disable_speaker : @string/content_description_enable_speaker}"
-            android:onClick="@{() -> controlsViewModel.toggleSpeaker()}"
-            android:padding="5dp"
-            android:selected="@{controlsViewModel.isSpeakerSelected}"
-            android:src="@drawable/icon_toggle_speaker"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintDimensionRatio="W,1:1"
-            app:layout_constraintEnd_toEndOf="@id/numpad"
-            app:layout_constraintStart_toEndOf="@id/microphone" />
-
-        <ImageView
-            android:id="@+id/numpad"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:background="@drawable/button_background"
-            android:contentDescription="@string/content_description_show_numpad"
-            android:onClick="@{() -> controlsViewModel.showNumpad()}"
-            android:padding="10dp"
-            android:src="@drawable/icon_call_numpad"
-            android:visibility="@{controlsViewModel.isOutgoingEarlyMedia ? View.VISIBLE : View.GONE, default=gone}"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintDimensionRatio="W,1:1"
-            app:layout_constraintEnd_toEndOf="parent" />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/voip_call_context_menu.xml b/app/src/main/res/layout/voip_call_context_menu.xml
deleted file mode 100644
index 510245543..000000000
--- a/app/src/main/res/layout/voip_call_context_menu.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <data>
-        <import type="android.view.View" />
-        <variable
-            name="hidePause"
-            type="Boolean" />
-        <variable
-            name="hideResume"
-            type="Boolean" />
-        <variable
-            name="hideTransfer"
-            type="Boolean" />
-        <variable
-            name="hideAccept"
-            type="Boolean" />
-        <variable
-            name="resumeClickListener"
-            type="android.view.View.OnClickListener" />
-        <variable
-            name="pauseClickListener"
-            type="android.view.View.OnClickListener" />
-        <variable
-            name="transferClickListener"
-            type="android.view.View.OnClickListener" />
-        <variable
-            name="answerClickListener"
-            type="android.view.View.OnClickListener" />
-        <variable
-            name="hangupClickListener"
-            type="android.view.View.OnClickListener" />
-    </data>
-
-    <LinearLayout
-        android:layout_width="@dimen/chat_message_popup_width"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:background="@color/white_color">
-
-        <TextView
-            android:onClick="@{resumeClickListener}"
-            android:visibility="@{hideResume ? View.GONE : View.VISIBLE}"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/voip_call_context_menu_item_height"
-            android:layout_marginBottom="1dp"
-            android:background="@drawable/button_call_context_menu_background"
-            style="@style/call_context_menu_item_font"
-            android:text="@string/call_context_action_resume" />
-
-        <TextView
-            android:onClick="@{pauseClickListener}"
-            android:visibility="@{hidePause ? View.GONE : View.VISIBLE}"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/voip_call_context_menu_item_height"
-            android:layout_marginBottom="1dp"
-            android:background="@drawable/button_call_context_menu_background"
-            style="@style/call_context_menu_item_font"
-            android:text="@string/call_context_action_pause" />
-
-        <TextView
-            android:onClick="@{transferClickListener}"
-            android:visibility="@{hideTransfer ? View.GONE : View.VISIBLE}"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/voip_call_context_menu_item_height"
-            android:layout_marginBottom="1dp"
-            android:background="@drawable/button_call_context_menu_background"
-            style="@style/call_context_menu_item_font"
-            android:text="@string/call_context_action_transfer" />
-
-        <TextView
-            android:onClick="@{answerClickListener}"
-            android:visibility="@{hideAccept? View.GONE : View.VISIBLE}"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/voip_call_context_menu_item_height"
-            android:layout_marginBottom="1dp"
-            android:background="@drawable/button_call_context_menu_background"
-            style="@style/call_context_menu_item_font"
-            android:text="@string/call_context_action_answer" />
-
-        <TextView
-            android:onClick="@{hangupClickListener}"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/voip_call_context_menu_item_height"
-            android:background="@drawable/button_call_context_menu_background"
-            style="@style/call_context_menu_item_font"
-            android:text="@string/call_context_action_hangup" />
-
-    </LinearLayout>
-
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/voip_call_incoming_fragment.xml b/app/src/main/res/layout/voip_call_incoming_fragment.xml
deleted file mode 100644
index a9ae0f199..000000000
--- a/app/src/main/res/layout/voip_call_incoming_fragment.xml
+++ /dev/null
@@ -1,249 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <data>
-
-        <import type="android.view.View" />
-
-        <variable
-            name="callsViewModel"
-            type="org.linphone.activities.voip.viewmodels.CallsViewModel" />
-
-        <variable
-            name="controlsViewModel"
-            type="org.linphone.activities.voip.viewmodels.ControlsViewModel" />
-    </data>
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="?attr/voipBackgroundColor">
-
-        <TextureView
-            android:id="@+id/remote_video_surface"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent" />
-
-        <ProgressBar
-            android:id="@+id/progress"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="20dp"
-            android:indeterminate="true"
-            android:indeterminateDrawable="@drawable/icon_spinner_rotating"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <TextView
-            android:id="@+id/incoming_call_title"
-            style="@style/call_header_title"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
-            android:text="@{callsViewModel.currentCallData.isConferenceCall ? @string/conference_incoming_title : @string/call_incoming_title, default=@string/call_incoming_title}"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/progress" />
-
-        <Chronometer
-            android:id="@+id/incoming_call_timer"
-            style="@style/call_header_title"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="5dp"
-            android:visibility="@{callsViewModel.currentCallData.isConferenceCall ? View.GONE : View.VISIBLE, default=visible}"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/incoming_call_title" />
-
-        <TextView
-            android:id="@+id/incoming_conference_subject"
-            style="@style/call_header_title"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="5dp"
-            android:text="@{callsViewModel.currentCallData.remoteConferenceSubject, default=`Conference subject`}"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/incoming_call_title" />
-
-        <ImageView
-            android:id="@+id/avatar"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:layout_margin="10dp"
-            android:contentDescription="@null"
-            android:background="@drawable/generated_avatar_bg"
-            coilVoipContactAlt="@{callsViewModel.currentCallData}"
-            app:layout_constraintBottom_toTopOf="@id/caller_name"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintHeight_max="@dimen/voip_contact_avatar_max_size"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/incoming_call_timer"
-            app:layout_constraintVertical_chainStyle="packed"
-            app:layout_constraintWidth_max="@dimen/voip_contact_avatar_max_size"
-            app:layout_constraintDimensionRatio="1:1" />
-
-        <TextView
-            android:id="@+id/caller_name"
-            style="@style/call_header_title"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="15dp"
-            android:ellipsize="end"
-            android:maxLines="1"
-            android:text="@{callsViewModel.currentCallData.contact.name ?? callsViewModel.currentCallData.displayName, default=`Bilbo Baggins`}"
-            app:layout_constraintBottom_toTopOf="@id/sipAddress"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/avatar" />
-
-        <TextView
-            android:id="@+id/sipAddress"
-            style="@style/call_header_subtitle"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_margin="5dp"
-            android:ellipsize="end"
-            android:gravity="center"
-            android:maxLines="1"
-            android:text="@{callsViewModel.currentCallData.displayableAddress, default=`sip:bilbo.baggins@sip.linphone.org`}"
-            android:textIsSelectable="true"
-            app:layout_constraintBottom_toTopOf="@id/buttons"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/caller_name" />
-
-        <ImageView
-            android:id="@+id/conference_avatar"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:src="@drawable/icon_video_conf_incoming"
-            android:contentDescription="@null"
-            app:layout_constraintBottom_toTopOf="@id/participants_count"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintHeight_max="120dp"
-            app:layout_constraintHeight_min="40dp"
-            app:layout_constraintVertical_weight="0.5"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/incoming_conference_subject"
-            app:layout_constraintVertical_chainStyle="packed" />
-
-        <LinearLayout
-            android:id="@+id/participants_count"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="20dp"
-            android:layout_marginEnd="20dp"
-            android:layout_marginBottom="10dp"
-            android:background="@drawable/event_decoration_gray"
-            android:gravity="center"
-            android:orientation="horizontal"
-            app:layout_constraintBottom_toTopOf="@id/participants_list"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintVertical_weight="0"
-            app:layout_constraintTop_toBottomOf="@id/conference_avatar">
-
-            <TextView
-                style="@style/call_header_title"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:background="?attr/voipBackgroundColor"
-                android:lineSpacingExtra="0sp"
-                android:paddingLeft="10dp"
-                android:paddingRight="10dp"
-                android:text="@{callsViewModel.currentCallData.conferenceParticipantsCountLabel, default=`Participants (6)`}" />
-
-        </LinearLayout>
-
-        <androidx.core.widget.NestedScrollView
-            android:id="@+id/participants_list"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:layout_marginStart="5dp"
-            android:layout_marginEnd="5dp"
-            android:layout_marginBottom="10dp"
-            android:fadeScrollbars="false"
-            android:scrollbars="vertical"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/participants_count"
-            app:layout_constraintBottom_toTopOf="@id/buttons"
-            app:layout_constraintHeight_max="400dp"
-            app:layout_constraintVertical_weight="2">
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical"
-                app:entries="@{callsViewModel.currentCallData.conferenceParticipants}"
-                app:layout="@{@layout/voip_conference_incoming_participant_cell}" />
-
-        </androidx.core.widget.NestedScrollView>
-
-        <TextView
-            android:id="@+id/early_media_caller_name"
-            style="@style/call_header_title"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="15dp"
-            android:ellipsize="end"
-            android:maxLines="1"
-            android:text="@{callsViewModel.currentCallData.contact.name ?? callsViewModel.currentCallData.displayName, default=`Bilbo Baggins`}"
-            app:layout_constraintBottom_toTopOf="@id/early_media_sipAddress"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent" />
-
-        <TextView
-            android:id="@+id/early_media_sipAddress"
-            style="@style/call_header_subtitle"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_margin="10dp"
-            android:ellipsize="end"
-            android:gravity="center"
-            android:maxLines="1"
-            android:text="@{callsViewModel.currentCallData.displayableAddress, default=`sip:bilbo.baggins@sip.linphone.org`}"
-            app:layout_constraintBottom_toTopOf="@id/buttons"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent" />
-
-        <androidx.constraintlayout.widget.Group
-            android:id="@+id/single_call_group"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:visibility="@{callsViewModel.currentCallData.isConferenceCall || controlsViewModel.isIncomingEarlyMediaVideo ? View.GONE : View.VISIBLE, default=visible}"
-            app:constraint_referenced_ids="avatar, caller_name, sipAddress" />
-
-        <androidx.constraintlayout.widget.Group
-            android:id="@+id/conference_group"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:visibility="@{callsViewModel.currentCallData.isConferenceCall ? View.VISIBLE : View.GONE, default=gone}"
-            app:constraint_referenced_ids="incoming_conference_subject, conference_avatar, participants_count, participants_list" />
-
-        <androidx.constraintlayout.widget.Group
-            android:id="@+id/single_call_early_media_group"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:visibility="@{controlsViewModel.isIncomingEarlyMediaVideo ? View.VISIBLE : View.GONE, default=gone}"
-            app:constraint_referenced_ids="early_media_caller_name, early_media_sipAddress" />
-
-        <include
-            android:id="@+id/buttons"
-            layout="@layout/voip_buttons_incoming"
-            android:layout_width="0dp"
-            android:layout_height="@dimen/voip_buttons_fragment_size"
-            android:layout_margin="10dp"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintWidth_max="@dimen/voip_buttons_max_width"
-            app:viewModel="@{controlsViewModel}" />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/voip_call_outgoing_fragment.xml b/app/src/main/res/layout/voip_call_outgoing_fragment.xml
deleted file mode 100644
index 69fd78dbb..000000000
--- a/app/src/main/res/layout/voip_call_outgoing_fragment.xml
+++ /dev/null
@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <data>
-
-        <import type="android.view.View" />
-
-        <variable
-            name="callsViewModel"
-            type="org.linphone.activities.voip.viewmodels.CallsViewModel" />
-
-        <variable
-            name="controlsViewModel"
-            type="org.linphone.activities.voip.viewmodels.ControlsViewModel" />
-    </data>
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="?attr/voipBackgroundColor">
-
-        <ProgressBar
-            android:id="@+id/progress"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="20dp"
-            android:indeterminate="true"
-            android:indeterminateDrawable="@drawable/icon_spinner_rotating"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <TextView
-            android:id="@+id/outgoing_call_title"
-            style="@style/call_header_title"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
-            android:text="@string/call_outgoing_title"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/progress" />
-
-        <Chronometer
-            android:id="@+id/outgoing_call_timer"
-            style="@style/call_header_title"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="5dp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/outgoing_call_title" />
-
-        <ImageView
-            android:id="@+id/avatar"
-            coilVoipContactAlt="@{callsViewModel.currentCallData}"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:layout_margin="10dp"
-            android:contentDescription="@null"
-            android:background="@drawable/generated_avatar_bg"
-            android:visibility="@{callsViewModel.currentCallData.isConferenceCall ? View.GONE : View.VISIBLE}"
-            app:layout_constraintBottom_toTopOf="@id/conference_avatar"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintHeight_max="@dimen/voip_contact_avatar_max_size"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/outgoing_call_timer"
-            app:layout_constraintVertical_chainStyle="packed"
-            app:layout_constraintWidth_max="@dimen/voip_contact_avatar_max_size"
-            app:layout_constraintDimensionRatio="1:1" />
-
-        <ImageView
-            android:id="@+id/conference_avatar"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:layout_margin="10dp"
-            android:contentDescription="@null"
-            android:src="@drawable/icon_multiple_contacts_avatar"
-            android:background="@drawable/generated_avatar_bg"
-            android:visibility="@{callsViewModel.currentCallData.isConferenceCall ? View.VISIBLE : View.GONE, default=gone}"
-            app:layout_constraintBottom_toTopOf="@id/callee_name"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintHeight_max="@dimen/voip_contact_avatar_max_size"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/avatar"
-            app:layout_constraintVertical_chainStyle="packed"
-            app:layout_constraintWidth_max="@dimen/voip_contact_avatar_max_size" />
-
-        <TextView
-            android:id="@+id/callee_name"
-            style="@style/call_header_title"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="15dp"
-            android:ellipsize="end"
-            android:maxLines="1"
-            android:text="@{callsViewModel.currentCallData.remoteConferenceSubject ?? callsViewModel.currentCallData.contact.name ?? callsViewModel.currentCallData.displayName, default=`Bilbo Baggins`}"
-            app:layout_constraintBottom_toTopOf="@id/callee_address"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/conference_avatar" />
-
-        <TextView
-            android:id="@+id/callee_address"
-            style="@style/call_header_subtitle"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_margin="5dp"
-            android:ellipsize="end"
-            android:gravity="center"
-            android:maxLines="1"
-            android:text="@{callsViewModel.currentCallData.isConferenceCall ? callsViewModel.currentCallData.remoteConferenceSubject : callsViewModel.currentCallData.displayableAddress, default=`sip:bilbo.baggins@sip.linphone.org`}"
-            android:textIsSelectable="true"
-            app:layout_constraintBottom_toTopOf="@id/buttons"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/callee_name" />
-
-        <include
-            android:id="@+id/buttons"
-            layout="@layout/voip_buttons_outgoing"
-            android:layout_width="0dp"
-            android:layout_height="@dimen/voip_buttons_fragment_size"
-            android:layout_margin="10dp"
-            app:callsViewModel="@{callsViewModel}"
-            app:controlsViewModel="@{controlsViewModel}"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintWidth_max="@dimen/voip_buttons_max_width" />
-
-        <org.linphone.activities.voip.views.RoundCornersTextureView
-            android:id="@+id/local_preview_video_surface"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:layout_margin="10dp"
-            android:layout_size="@{@dimen/video_preview_max_size}"
-            app:alignTopRight="true"
-            app:displayMode="black_bars"
-            app:layout_constraintBottom_toTopOf="@id/buttons"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintHeight_max="200dp"
-            app:layout_constraintWidth_max="200dp" />
-
-        <ImageView
-            android:id="@+id/switch_camera"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_margin="5dp"
-            android:contentDescription="@string/content_description_switch_camera"
-            android:onClick="@{() -> controlsViewModel.switchCamera()}"
-            android:padding="10dp"
-            android:src="@drawable/icon_call_camera_switch"
-            android:visibility="@{controlsViewModel.isSwitchCameraAvailable &amp;&amp; !controlsViewModel.pipMode ? View.VISIBLE : View.GONE, default=gone}"
-            app:layout_constraintEnd_toEndOf="@id/local_preview_video_surface"
-            app:layout_constraintTop_toTopOf="@id/local_preview_video_surface" />
-
-        <ViewStub
-            android:id="@+id/stub_numpad"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout="@layout/voip_numpad"
-            android:visibility="@{controlsViewModel.numpadVisible ? View.VISIBLE : View.GONE, default=gone}"
-            app:controlsViewModel="@{controlsViewModel}"
-            app:inflatedVisibility="@{controlsViewModel.numpadVisible ? View.VISIBLE : View.GONE}" />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/voip_call_paused.xml b/app/src/main/res/layout/voip_call_paused.xml
deleted file mode 100644
index ed08f06ea..000000000
--- a/app/src/main/res/layout/voip_call_paused.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <data>
-        <import type="android.view.View" />
-        <variable
-            name="data"
-            type="org.linphone.activities.voip.data.CallData" />
-        <variable
-            name="inflatedVisibility"
-            type="Integer" />
-    </data>
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/locally_paused_call_layout"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="@color/voip_translucent_popup_background"
-        android:clickable="true"
-        android:focusable="true"
-        android:visibility="@{inflatedVisibility}"
-        inflatedLifecycleOwner="@{true}">
-
-        <ImageView
-            android:id="@+id/resume_call"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            app:layout_constraintHeight_max="@dimen/voip_contact_avatar_max_size"
-            app:layout_constraintWidth_max="@dimen/voip_contact_avatar_max_size"
-            app:layout_constraintDimensionRatio="1:1"
-            android:layout_marginTop="5dp"
-            android:background="@drawable/shape_orange_circle"
-            android:contentDescription="@null"
-            android:onClick="@{() -> data.resume()}"
-            android:padding="40dp"
-            android:src="@drawable/voip_conference_play_big"
-            app:layout_constraintBottom_toTopOf="@id/paused_title"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintVertical_chainStyle="packed" />
-
-        <TextView
-            android:id="@+id/paused_title"
-            style="@style/conference_paused_title_font"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="20dp"
-            android:gravity="center"
-            android:text="@string/call_locally_paused_title"
-            app:layout_constraintBottom_toTopOf="@id/paused_subtitle"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/resume_call" />
-
-        <TextView
-            android:id="@+id/paused_subtitle"
-            style="@style/conference_paused_subtitle_font"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="5dp"
-            android:gravity="center"
-            android:text="@string/call_locally_paused_subtitle"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/paused_title" />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/voip_call_paused_by_remote.xml b/app/src/main/res/layout/voip_call_paused_by_remote.xml
deleted file mode 100644
index c543e40d4..000000000
--- a/app/src/main/res/layout/voip_call_paused_by_remote.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <data>
-        <import type="android.view.View" />
-        <variable
-            name="inflatedVisibility"
-            type="Integer" />
-    </data>
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/remotely_paused_call_layout"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="@color/voip_translucent_popup_background"
-        android:clickable="true"
-        android:focusable="true"
-        android:visibility="@{inflatedVisibility}"
-        inflatedLifecycleOwner="@{true}">
-
-        <ImageView
-            android:id="@+id/paused_call"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            app:layout_constraintHeight_max="@dimen/voip_contact_avatar_max_size"
-            app:layout_constraintWidth_max="@dimen/voip_contact_avatar_max_size"
-            app:layout_constraintDimensionRatio="1:1"
-            android:layout_marginTop="5dp"
-            android:background="@drawable/shape_orange_circle"
-            android:contentDescription="@null"
-            android:padding="40dp"
-            android:src="@drawable/voip_conference_paused_big"
-            app:layout_constraintBottom_toTopOf="@id/paused_title"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintVertical_chainStyle="packed" />
-
-        <TextView
-            android:id="@+id/paused_title"
-            style="@style/conference_paused_title_font"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="20dp"
-            android:layout_marginBottom="5dp"
-            android:gravity="center"
-            android:text="@string/call_remotely_paused_title"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/paused_call" />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/voip_call_stat_cell.xml b/app/src/main/res/layout/voip_call_stat_cell.xml
deleted file mode 100644
index 6d4f8bf77..000000000
--- a/app/src/main/res/layout/voip_call_stat_cell.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <data>
-        <import type="android.view.View" />
-        <variable
-            name="data"
-            type="org.linphone.activities.voip.data.StatItemData" />
-    </data>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center"
-        android:orientation="horizontal">
-
-        <TextView
-            android:text="@{data.type.nameResource}"
-            style="@style/call_stats_font"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center" />
-
-        <TextView
-            android:text="@{data.value}"
-            style="@style/call_stats_font"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="5dp"
-            android:maxLines="1"
-            android:ellipsize="end"
-            android:gravity="center" />
-
-    </LinearLayout>
-
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/voip_call_stats.xml b/app/src/main/res/layout/voip_call_stats.xml
deleted file mode 100644
index 4b5f02834..000000000
--- a/app/src/main/res/layout/voip_call_stats.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <data>
-        <import type="android.view.View" />
-        <variable
-            name="statsViewModel"
-            type="org.linphone.activities.voip.viewmodels.StatisticsListViewModel" />
-        <variable
-            name="controlsViewModel"
-            type="org.linphone.activities.voip.viewmodels.ControlsViewModel" />
-        <variable
-            name="inflatedVisibility"
-            type="Integer" />
-    </data>
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/stats_layout"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="@color/voip_translucent_popup_background"
-        android:clickable="true"
-        android:visibility="@{inflatedVisibility}"
-        inflatedLifecycleOwner="@{true}">
-
-        <View
-            android:id="@+id/background"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_marginStart="10dp"
-            android:layout_marginTop="80dp"
-            android:layout_marginEnd="10dp"
-            android:layout_marginBottom="70dp"
-            android:background="@drawable/shape_call_popup_background"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintWidth_max="@dimen/voip_views_max_width" />
-
-        <ImageView
-            android:id="@+id/hide_stats"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
-            android:layout_margin="10dp"
-            android:contentDescription="@string/content_description_hide_statistics"
-            android:onClick="@{() -> controlsViewModel.hideCallStats()}"
-            android:src="@drawable/icon_cancel_alt"
-            app:layout_constraintEnd_toEndOf="@id/background"
-            app:layout_constraintTop_toTopOf="@id/background" />
-
-        <androidx.core.widget.NestedScrollView
-            android:id="@+id/stats_scroll_layout"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:layout_below="@id/hide_stats"
-            app:layout_constraintEnd_toEndOf="@id/background"
-            app:layout_constraintStart_toStartOf="@id/background"
-            app:layout_constraintTop_toBottomOf="@id/hide_stats"
-            app:layout_constraintBottom_toBottomOf="@id/background"
-            android:layout_marginBottom="10dp">
-
-            <LinearLayout
-                android:id="@+id/stats_list_layout"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical"
-                app:entries="@{statsViewModel.callStatsList}"
-                app:layout="@{@layout/voip_call_stats_cell}" />
-
-        </androidx.core.widget.NestedScrollView>
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/voip_call_stats_cell.xml b/app/src/main/res/layout/voip_call_stats_cell.xml
deleted file mode 100644
index fab57ff2f..000000000
--- a/app/src/main/res/layout/voip_call_stats_cell.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <data>
-        <import type="android.view.View" />
-        <variable
-            name="data"
-            type="org.linphone.activities.voip.data.CallStatisticsData" />
-    </data>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center"
-        android:orientation="vertical">
-
-        <TextView
-            style="@style/call_stats_title_font"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center_vertical|center"
-            android:text="@string/call_settings_encryption_title"
-            tools:gravity="center" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:paddingLeft="5dp"
-            android:paddingRight="5dp"
-            android:paddingBottom="10dp"
-            app:entries="@{data.mediaEncryptionStats}"
-            app:layout="@{@layout/voip_call_stat_cell}" />
-
-        <TextView
-            style="@style/call_stats_title_font"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center_vertical|center"
-            android:layout_marginTop="10dp"
-            android:text="@string/call_stats_audio"
-            tools:gravity="center" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="start|center"
-            android:paddingLeft="5dp"
-            android:paddingRight="5dp"
-            android:paddingBottom="10dp"
-            android:orientation="vertical"
-            app:entries="@{data.audioStats}"
-            app:layout="@{@layout/voip_call_stat_cell}"/>
-
-        <TextView
-            android:visibility="@{data.isVideoEnabled ? View.VISIBLE : View.GONE, default=gone}"
-            style="@style/call_stats_title_font"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center_vertical|center"
-            android:text="@string/call_stats_video"
-            tools:gravity="center" />
-
-        <LinearLayout
-            android:visibility="@{data.isVideoEnabled ? View.VISIBLE : View.GONE, default=gone}"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:paddingLeft="5dp"
-            android:paddingRight="5dp"
-            android:paddingBottom="10dp"
-            app:entries="@{data.videoStats}"
-            app:layout="@{@layout/voip_call_stat_cell}" />
-
-    </LinearLayout>
-
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/voip_calls_cell.xml b/app/src/main/res/layout/voip_calls_cell.xml
deleted file mode 100644
index 0443c31d9..000000000
--- a/app/src/main/res/layout/voip_calls_cell.xml
+++ /dev/null
@@ -1,145 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <data>
-        <import type="android.view.View" />
-        <variable
-            name="data"
-            type="org.linphone.activities.voip.data.CallData" />
-    </data>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="@color/white_color">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/voip_call_list_size"
-            android:background="@{data.isPaused ? @color/voip_calls_list_inactive_background : @color/voip_dark_gray, default=@color/voip_dark_gray}"
-            android:orientation="horizontal"
-            android:layout_marginBottom="1dp">
-
-            <RelativeLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginRight="10dp">
-
-                <ImageView
-                    android:visibility="@{data.isInRemoteConference ? View.GONE : View.VISIBLE}"
-                    android:layout_width="@dimen/contact_avatar_size"
-                    android:layout_height="@dimen/contact_avatar_size"
-                    android:contentDescription="@null"
-                    coilContact="@{data}"
-                    android:layout_marginLeft="40dp"
-                    android:layout_marginRight="10dp"
-                    android:layout_centerVertical="true"
-                    android:background="@drawable/generated_avatar_bg"
-                    android:src="@drawable/voip_single_contact_avatar"/>
-
-                <ImageView
-                    android:visibility="@{data.isInRemoteConference ? View.VISIBLE : View.GONE, default=gone}"
-                    android:layout_width="45dp"
-                    android:layout_height="45dp"
-                    android:layout_marginLeft="40dp"
-                    android:layout_centerVertical="true"
-                    android:contentDescription="@null"
-                    android:background="@drawable/generated_avatar_bg"
-                    android:src="@drawable/icon_multiple_contacts_avatar" />
-
-                <ImageView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:contentDescription="@null"
-                    android:src="@{data.isIncoming ? @drawable/voip_call_header_incoming : data.isOutgoing ? @drawable/voip_call_header_outgoing : data.isPaused ? @drawable/voip_call_header_paused : @drawable/voip_call_header_active, default=@drawable/voip_call_header_active}" />
-
-            </RelativeLayout>
-
-            <LinearLayout
-                android:visibility="@{data.isPaused ? View.GONE : View.VISIBLE}"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:layout_gravity="center_vertical"
-                android:orientation="vertical">
-
-                <TextView
-                    android:visibility="@{data.isInRemoteConference ? View.GONE : View.VISIBLE}"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:maxLines="1"
-                    android:ellipsize="end"
-                    style="@style/call_list_active_name_font"
-                    android:text="@{data.contact.name ?? data.displayName, default=`Bilbo Baggins`}"/>
-
-                <TextView
-                    android:visibility="@{data.isInRemoteConference ? View.VISIBLE : View.GONE, default=gone}"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:maxLines="1"
-                    android:ellipsize="end"
-                    style="@style/call_list_active_name_font"
-                    android:text="@{data.remoteConferenceSubject}"/>
-
-                <TextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:maxLines="1"
-                    android:ellipsize="end"
-                    style="@style/call_list_active_sip_uri_font"
-                    android:text="@{data.displayableAddress, default=`bilbo.baggins@sip.linphone.org`}"
-                    android:textIsSelectable="true"/>
-
-            </LinearLayout>
-            <!-- Data binding doesn't work on styles... :'( -->
-            <LinearLayout
-                android:visibility="@{data.isPaused ? View.VISIBLE : View.GONE, default=gone}"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:layout_gravity="center_vertical"
-                android:orientation="vertical">
-
-                <TextView
-                    android:visibility="@{data.isInRemoteConference ? View.GONE : View.VISIBLE}"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:maxLines="1"
-                    android:ellipsize="end"
-                    style="@style/call_list_name_font"
-                    android:text="@{data.contact.name ?? data.displayName, default=`Bilbo Baggins`}"/>
-
-                <TextView
-                    android:visibility="@{data.isInRemoteConference ? View.VISIBLE : View.GONE, default=gone}"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:maxLines="1"
-                    android:ellipsize="end"
-                    style="@style/call_list_name_font"
-                    android:text="@{data.remoteConferenceSubject}"/>
-
-                <TextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:maxLines="1"
-                    android:ellipsize="end"
-                    style="@style/call_list_sip_uri_font"
-                    android:text="@{data.displayableAddress, default=`bilbo.baggins@sip.linphone.org`}"/>
-
-            </LinearLayout>
-
-            <ImageView
-                android:id="@+id/context_menu"
-                android:onClick="@{() -> data.showContextMenu(contextMenu)}"
-                android:layout_width="wrap_content"
-                android:layout_height="60dp"
-                android:layout_gravity="center_vertical"
-                android:src="@drawable/icon_calls_list_menu"
-                android:padding="5dp"
-                android:contentDescription="@string/content_description_call_context_menu"/>
-
-        </LinearLayout>
-
-    </LinearLayout>
-
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/voip_calls_list_fragment.xml b/app/src/main/res/layout/voip_calls_list_fragment.xml
deleted file mode 100644
index 59e90a3e2..000000000
--- a/app/src/main/res/layout/voip_calls_list_fragment.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <data>
-        <import type="android.view.View" />
-        <variable
-            name="addCallClickListener"
-            type="android.view.View.OnClickListener" />
-        <variable
-            name="cancelClickListener"
-            type="android.view.View.OnClickListener"/>
-        <variable
-            name="callsViewModel"
-            type="org.linphone.activities.voip.viewmodels.CallsViewModel" />
-        <variable
-            name="conferenceViewModel"
-            type="org.linphone.activities.voip.viewmodels.ConferenceViewModel" />
-        <variable
-            name="controlsViewModel"
-            type="org.linphone.activities.voip.viewmodels.ControlsViewModel" />
-    </data>
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:id="@+id/top_bar"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/voip_top_bar_size"
-            android:background="?attr/voipToolbarBackgroundColor"
-            app:layout_constraintTop_toTopOf="parent">
-
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:gravity="center_vertical"
-                android:layout_marginStart="20dp"
-                android:text="@string/call_action_calls_list"
-                style="@style/calls_list_header_font"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintBottom_toBottomOf="parent"/>
-
-            <ImageView
-                android:onClick="@{cancelClickListener}"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:padding="10dp"
-                android:src="@drawable/icon_cancel"
-                android:contentDescription="@string/cancel"
-                app:layout_constraintEnd_toEndOf="parent"/>
-
-        </androidx.constraintlayout.widget.ConstraintLayout>
-
-        <androidx.core.widget.NestedScrollView
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:background="?attr/voipBackgroundBWColor"
-            app:layout_constraintTop_toBottomOf="@id/top_bar"
-            app:layout_constraintBottom_toBottomOf="parent">
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical"
-                app:entries="@{callsViewModel.callsData}"
-                app:layout="@{@layout/voip_calls_cell}"/>
-
-        </androidx.core.widget.NestedScrollView>
-
-        <LinearLayout
-            android:id="@+id/bottom_buttons"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent">
-
-            <ImageView
-                android:onClick="@{addCallClickListener}"
-                android:layout_width="@dimen/voip_floating_button_size"
-                android:layout_height="@dimen/voip_floating_button_size"
-                android:layout_margin="10dp"
-                android:padding="5dp"
-                android:background="@drawable/button_round_background"
-                android:src="@drawable/icon_call_add"
-                android:contentDescription="@string/cancel"/>
-
-            <ImageView
-                android:onClick="@{() -> conferenceViewModel.addCallsToConference()}"
-                android:enabled="@{callsViewModel.callsData.size() >= 2 &amp;&amp; conferenceViewModel.isMeAdmin}"
-                android:visibility="@{conferenceViewModel.conferenceExists ? View.VISIBLE : View.GONE, default=gone}"
-                android:layout_width="@dimen/voip_floating_button_size"
-                android:layout_height="@dimen/voip_floating_button_size"
-                android:layout_margin="10dp"
-                android:background="@drawable/button_round_background"
-                android:src="@drawable/icon_merge_calls_local_conference"
-                android:contentDescription="@string/cancel"/>
-
-            <ImageView
-                android:onClick="@{() -> callsViewModel.mergeCallsIntoConference()}"
-                android:enabled="@{callsViewModel.callsData.size() >= 2}"
-                android:visibility="@{conferenceViewModel.conferenceExists ? View.GONE : View.VISIBLE}"
-                android:layout_width="@dimen/voip_floating_button_size"
-                android:layout_height="@dimen/voip_floating_button_size"
-                android:layout_margin="10dp"
-                android:background="@drawable/button_round_background"
-                android:src="@drawable/icon_merge_calls_local_conference"
-                android:contentDescription="@string/cancel"/>
-
-        </LinearLayout>
-
-        <org.linphone.activities.voip.views.RoundCornersTextureView
-            android:id="@+id/local_preview_video_surface"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:layout_margin="10dp"
-            android:layout_size="@{@dimen/video_preview_max_size}"
-            app:alignTopRight="true"
-            app:displayMode="black_bars"
-            app:layout_constraintBottom_toTopOf="@id/bottom_buttons"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintHeight_max="200dp"
-            app:layout_constraintWidth_max="200dp" />
-
-        <ImageView
-            android:id="@+id/switch_camera"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_margin="5dp"
-            android:contentDescription="@string/content_description_switch_camera"
-            android:onClick="@{() -> controlsViewModel.switchCamera()}"
-            android:padding="10dp"
-            android:src="@drawable/icon_call_camera_switch"
-            android:visibility="@{controlsViewModel.isSwitchCameraAvailable &amp;&amp; !controlsViewModel.pipMode ? View.VISIBLE : View.GONE, default=gone}"
-            app:layout_constraintEnd_toEndOf="@id/local_preview_video_surface"
-            app:layout_constraintTop_toTopOf="@id/local_preview_video_surface" />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/voip_chat_fragment.xml b/app/src/main/res/layout/voip_chat_fragment.xml
deleted file mode 100644
index c5e3f541a..000000000
--- a/app/src/main/res/layout/voip_chat_fragment.xml
+++ /dev/null
@@ -1,202 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <data>
-        <import type="android.view.View"/>
-        <variable
-            name="cancelClickListener"
-            type="android.view.View.OnClickListener"/>
-        <variable
-            name="attachFileClickListener"
-            type="android.view.View.OnClickListener"/>
-        <variable
-            name="chatRoomsListClickListener"
-            type="android.view.View.OnClickListener"/>
-        <variable
-            name="viewModel"
-            type="org.linphone.activities.main.chat.viewmodels.ChatRoomViewModel" />
-        <variable
-            name="chatSendingViewModel"
-            type="org.linphone.activities.main.chat.viewmodels.ChatMessageSendingViewModel" />
-    </data>
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <LinearLayout
-            android:id="@+id/top_bar"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/voip_top_bar_size"
-            android:background="?attr/voipToolbarBackgroundColor"
-            android:orientation="horizontal">
-
-            <LinearLayout
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="0.6"
-                android:gravity="start|center_vertical"
-                android:layout_marginStart="20dp"
-                android:orientation="vertical">
-
-                <org.linphone.views.MarqueeTextView
-                    android:text="@{viewModel.oneToOneChatRoom ? (viewModel.contact.name ?? viewModel.displayName) : viewModel.subject}"
-                    style="@style/toolbar_small_title_font"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:singleLine="true" />
-
-                <org.linphone.views.MarqueeTextView
-                    android:text="@{viewModel.participants}"
-                    android:visibility="@{viewModel.oneToOneChatRoom ? View.GONE : View.VISIBLE}"
-                    style="@style/toolbar_small_title_font"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:singleLine="true" />
-
-            </LinearLayout>
-
-            <ImageView
-                android:onClick="@{chatRoomsListClickListener}"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="0.2"
-                android:src="@drawable/icon_call_chat_rooms"
-                android:contentDescription="@string/content_description_go_to_chat_rooms_list"
-                app:layout_constraintEnd_toEndOf="parent"/>
-
-            <ImageView
-                android:onClick="@{cancelClickListener}"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="0.2"
-                android:padding="10dp"
-                android:src="@drawable/icon_cancel"
-                android:contentDescription="@string/cancel"
-                app:layout_constraintEnd_toEndOf="parent"/>
-
-        </LinearLayout>
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_below="@id/top_bar"
-            android:background="?attr/voipBackgroundBWColor" />
-
-        <LinearLayout
-            android:id="@+id/footer"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_alignParentBottom="true"
-            android:background="?attr/backgroundColor"
-            android:gravity="center_vertical"
-            android:orientation="vertical">
-
-            <include
-                layout="@layout/chat_message_reply"
-                android:visibility="@{chatSendingViewModel.isPendingAnswer ? View.VISIBLE : View.GONE, default=gone}"
-                app:data="@{chatSendingViewModel.pendingChatMessageToReplyTo}"
-                app:cancelClickListener="@{() -> chatSendingViewModel.cancelReply()}" />
-
-            <HorizontalScrollView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="?attr/backgroundColor2"
-                android:orientation="horizontal">
-
-                <LinearLayout
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:orientation="horizontal"
-                    app:entries="@{chatSendingViewModel.attachments}"
-                    app:layout="@{@layout/chat_message_attachment_cell}" />
-
-            </HorizontalScrollView>
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:visibility="@{chatSendingViewModel.isReadOnly ? View.GONE : View.VISIBLE}"
-                android:gravity="center_vertical"
-                android:background="?attr/lightToolbarBackgroundColor"
-                android:orientation="horizontal">
-
-                <ImageView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:contentDescription="@string/content_description_attach_file"
-                    android:enabled="@{chatSendingViewModel.attachFileEnabled}"
-                    android:onClick="@{attachFileClickListener}"
-                    android:padding="10dp"
-                    android:src="@drawable/chat_file" />
-
-                <EditText
-                    android:id="@+id/message"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:layout_marginTop="10dp"
-                    android:layout_marginBottom="10dp"
-                    android:layout_weight="1"
-                    android:background="@drawable/resizable_text_field"
-                    android:hint="@{chatSendingViewModel.isPendingAnswer ? @string/chat_room_sending_reply_hint : @string/chat_room_sending_message_hint}"
-                    android:imeOptions="flagNoExtractUi"
-                    android:inputType="textShortMessage|textMultiLine|textAutoComplete|textAutoCorrect|textCapSentences"
-                    android:maxLines="6"
-                    android:padding="5dp"
-                    android:text="@={chatSendingViewModel.textToSend}"
-                    android:textColor="@color/black_color"
-                    android:textCursorDrawable="@null" />
-
-                <ImageView
-                    android:id="@+id/send_message"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:contentDescription="@string/content_description_send_message"
-                    android:enabled="@{chatSendingViewModel.sendMessageEnabled}"
-                    android:onClick="@{() -> chatSendingViewModel.sendMessage()}"
-                    android:padding="10dp"
-                    android:src="@drawable/chat_send_message" />
-
-            </LinearLayout>
-
-        </LinearLayout>
-
-        <TextView
-            android:id="@+id/remote_composing"
-            android:text="@{viewModel.composingList, default=@string/chat_remote_is_composing}"
-            android:visibility="@{viewModel.remoteIsComposing ? View.VISIBLE : View.INVISIBLE}"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_above="@id/footer"
-            android:layout_marginLeft="5dp"
-            style="@style/standard_small_text_font" />
-
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/chat_messages_list"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_above="@id/remote_composing"
-            android:layout_below="@+id/top_bar"
-            android:cacheColorHint="@color/transparent_color"
-            android:choiceMode="multipleChoice"
-            android:divider="@android:color/transparent"
-            android:listSelector="@color/transparent_color"
-            android:transcriptMode="normal" />
-
-        <ImageView
-            android:src="@{viewModel.securityLevelIcon, default=@drawable/security_alert_indicator}"
-            android:visibility="@{viewModel.encryptedChatRoom ? View.VISIBLE : View.GONE}"
-            android:contentDescription="@{viewModel.securityLevelContentDescription}"
-            android:adjustViewBounds="true"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/top_bar"
-            android:layout_alignParentRight="true"
-            android:layout_marginTop="8dp"
-            android:layout_marginRight="8dp" />
-
-    </RelativeLayout>
-
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/voip_conference_active_speaker.xml b/app/src/main/res/layout/voip_conference_active_speaker.xml
deleted file mode 100644
index 2d2fd7234..000000000
--- a/app/src/main/res/layout/voip_conference_active_speaker.xml
+++ /dev/null
@@ -1,358 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <data>
-
-        <import type="android.view.View" />
-
-        <variable
-            name="conferenceViewModel"
-            type="org.linphone.activities.voip.viewmodels.ConferenceViewModel" />
-
-        <variable
-            name="controlsViewModel"
-            type="org.linphone.activities.voip.viewmodels.ControlsViewModel" />
-
-        <variable
-            name="inflatedVisibility"
-            type="Integer" />
-    </data>
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/conference_constraint_layout"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_margin="@{controlsViewModel.fullScreenMode || controlsViewModel.pipMode ? @dimen/margin_0dp : @dimen/voip_remote_margin, default=@dimen/voip_remote_margin}"
-        android:paddingBottom="@{controlsViewModel.fullScreenMode || controlsViewModel.pipMode ? @dimen/margin_0dp : @dimen/voip_buttons_fragment_margin_size}"
-        android:visibility="@{inflatedVisibility}"
-        inflatedLifecycleOwner="@{true}">
-
-        <View
-            android:id="@+id/top_barrier"
-            android:layout_width="0dp"
-            android:layout_height="1dp"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            android:layout_marginTop="@{controlsViewModel.folded || controlsViewModel.fullScreenMode || controlsViewModel.pipMode ? @dimen/margin_0dp : conferenceViewModel.isRemotelyRecorded ? @dimen/voip_single_call_header_size_with_record_info : @dimen/voip_single_call_header_size, default=@dimen/voip_single_call_header_size}"/>
-
-        <androidx.constraintlayout.widget.Guideline
-            android:id="@+id/hinge_top"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            app:layout_constraintGuide_percent="0" />
-
-        <androidx.constraintlayout.widget.Guideline
-            android:id="@+id/hinge_bottom"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            app:layout_constraintGuide_percent="1" />
-
-        <androidx.constraintlayout.widget.Group
-            android:id="@+id/group"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:visibility="@{controlsViewModel.fullScreenMode || controlsViewModel.pipMode ? View.GONE : View.VISIBLE}"
-            app:constraint_referenced_ids="remote_name,active_conference_timer,toggle_pause_conference" />
-
-        <TextView
-            android:id="@+id/remote_name"
-            style="@style/call_header_title"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="10dp"
-            android:layout_marginTop="@{controlsViewModel.folded ? @dimen/voip_conference_header_folded_top_margin : @dimen/margin_0dp}"
-            android:ellipsize="end"
-            android:maxLines="1"
-            android:text="@{conferenceViewModel.subject, default=@string/conference_default_title}"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toStartOf="@id/toggle_conference_recording"
-            app:layout_constraintTop_toBottomOf="@id/hinge_top" />
-
-        <Chronometer
-            android:id="@+id/active_conference_timer"
-            style="@style/call_header_subtitle"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/remote_name" />
-
-        <ImageView
-            android:id="@+id/toggle_pause_conference"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
-            android:background="@drawable/button_toggle_background"
-            android:contentDescription="@string/content_description_pause_call"
-            android:enabled="@{!conferenceViewModel.conferenceCreationPending}"
-            android:onClick="@{() -> conferenceViewModel.pauseConference()}"
-            android:padding="5dp"
-            android:selected="@{conferenceViewModel.isConferenceLocallyPaused}"
-            android:src="@drawable/icon_pause"
-            app:layout_constraintBottom_toBottomOf="@id/active_conference_timer"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="@id/remote_name" />
-
-        <ImageView
-            android:id="@+id/toggle_conference_recording"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
-            android:layout_marginEnd="10dp"
-            android:background="@drawable/button_toggle_background"
-            android:contentDescription="@string/content_description_toggle_recording"
-            android:onClick="@{() -> conferenceViewModel.toggleRecording()}"
-            android:padding="7dp"
-            android:selected="@{conferenceViewModel.isRecording}"
-            android:src="@drawable/icon_call_record"
-            android:visibility="gone"
-            app:layout_constraintBottom_toBottomOf="@id/active_conference_timer"
-            app:layout_constraintEnd_toStartOf="@id/toggle_pause_conference"
-            app:layout_constraintTop_toTopOf="@id/remote_name" />
-
-        <include
-            android:id="@+id/remote_recording"
-            layout="@layout/voip_remote_recording"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            app:layout_constraintTop_toBottomOf="@id/active_conference_timer"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            android:visibility="@{conferenceViewModel.isRemotelyRecorded ? View.VISIBLE : View.GONE, default=gone}" />
-
-        <View
-            android:id="@+id/active_speaker_background"
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:visibility="@{conferenceViewModel.speakingParticipantFound ? View.VISIBLE : View.GONE}"
-            app:layout_constraintTop_toBottomOf="@id/top_barrier"
-            app:layout_constraintBottom_toTopOf="@id/miniatures"
-            android:layout_marginTop="@{controlsViewModel.fullScreenMode ? @dimen/margin_0dp : @dimen/voip_active_speaker_top_margin, default=@dimen/voip_active_speaker_top_margin}"
-            android:background="@{!conferenceViewModel.speakingParticipant.isInConference ? @drawable/shape_remote_paused_background : @drawable/shape_remote_background, default=@drawable/shape_remote_background}"
-            android:onClick="@{() -> controlsViewModel.toggleFullScreen()}"/>
-
-        <ImageView
-            android:id="@+id/speaking_participant_avatar"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:layout_margin="10dp"
-            android:contentDescription="@null"
-            android:visibility="@{conferenceViewModel.speakingParticipantFound ? View.VISIBLE : View.GONE}"
-            coilVoipContact="@{conferenceViewModel.speakingParticipant}"
-            android:background="@drawable/generated_avatar_bg"
-            app:layout_constraintBottom_toBottomOf="@id/active_speaker_background"
-            app:layout_constraintEnd_toEndOf="@id/active_speaker_background"
-            app:layout_constraintHeight_max="@dimen/voip_contact_avatar_max_size"
-            app:layout_constraintStart_toStartOf="@id/active_speaker_background"
-            app:layout_constraintTop_toTopOf="@id/active_speaker_background"
-            app:layout_constraintWidth_max="@dimen/voip_contact_avatar_max_size"
-            app:layout_constraintDimensionRatio="1:1" />
-
-        <ImageView
-            android:id="@+id/speaking_participant_paused"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:layout_margin="10dp"
-            android:background="@drawable/shape_button_background"
-            android:contentDescription="@string/content_description_participant_is_paused"
-            android:src="@drawable/icon_pause"
-            android:visibility="@{conferenceViewModel.speakingParticipantFound &amp;&amp; conferenceViewModel.speakingParticipant.isInConference ? View.GONE : View.VISIBLE, default=gone}"
-            app:layout_constraintDimensionRatio="1:1"
-            app:layout_constraintBottom_toBottomOf="@id/active_speaker_background"
-            app:layout_constraintEnd_toEndOf="@id/active_speaker_background"
-            app:layout_constraintHeight_max="@dimen/voip_contact_avatar_max_size"
-            app:layout_constraintStart_toStartOf="@id/active_speaker_background"
-            app:layout_constraintTop_toTopOf="@id/active_speaker_background"
-            app:layout_constraintWidth_max="@dimen/voip_contact_avatar_max_size" />
-
-        <ProgressBar
-            android:id="@+id/speaking_participant_joining"
-            android:layout_width="@dimen/voip_conference_participant_joining_icon_size_active_speaker"
-            android:layout_height="@dimen/voip_conference_participant_joining_icon_size_active_speaker"
-            android:indeterminate="true"
-            android:indeterminateDrawable="@drawable/icon_spinner_rotating"
-            android:visibility="@{conferenceViewModel.speakingParticipant.isJoining ? View.VISIBLE : View.GONE, default=gone}"
-            app:layout_constraintLeft_toLeftOf="@id/active_speaker_background"
-            app:layout_constraintTop_toTopOf="@id/active_speaker_background" />
-
-        <org.linphone.activities.voip.views.RoundCornersTextureView
-            android:id="@+id/conference_active_speaker_remote_video"
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:visibility="@{!conferenceViewModel.isConferenceLocallyPaused &amp;&amp; conferenceViewModel.speakingParticipantVideoEnabled ? View.VISIBLE : View.GONE}"
-            app:layout_constraintBottom_toBottomOf="@id/active_speaker_background"
-            app:layout_constraintTop_toTopOf="@id/active_speaker_background" />
-
-        <ImageView
-            android:id="@+id/active_speaker_muted"
-            android:layout_width="@dimen/voip_conference_participant_mic_muted_icon_size_active_speaker"
-            android:layout_height="@dimen/voip_conference_participant_mic_muted_icon_size_active_speaker"
-            android:layout_margin="5dp"
-            android:background="@drawable/shape_toggle_pressed_background"
-            android:contentDescription="@string/content_description_conference_participant_mic_muted"
-            android:padding="2dp"
-            android:src="@drawable/icon_mic_muted"
-            android:visibility="@{conferenceViewModel.speakingParticipant.isMuted &amp;&amp; !conferenceViewModel.moreThanTwoParticipants ? View.VISIBLE : View.GONE, default=gone}"
-            app:layout_constraintLeft_toLeftOf="@id/active_speaker_background"
-            app:layout_constraintTop_toTopOf="@id/active_speaker_background" />
-
-        <TextView
-            android:id="@+id/speaking_participant_name"
-            style="@style/call_remote_name_font"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="10dp"
-            android:layout_marginBottom="10dp"
-            android:text="@{conferenceViewModel.speakingParticipant.contact.name ?? conferenceViewModel.speakingParticipant.displayName}"
-            app:layout_constraintBottom_toBottomOf="@id/active_speaker_background"
-            app:layout_constraintStart_toStartOf="@id/active_speaker_background" />
-
-        <HorizontalScrollView
-            android:id="@+id/miniatures"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="5dp"
-            app:layout_constraintStart_toEndOf="@id/local_participant_background"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintBottom_toTopOf="@id/scroll_indicator"
-            android:visibility="@{conferenceViewModel.moreThanTwoParticipants ? View.VISIBLE : View.GONE, default=gone}"
-            android:scrollbars="none">
-
-            <com.google.android.flexbox.FlexboxLayout
-                android:id="@+id/flexbox_layout"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                app:alignItems="stretch"
-                app:entries="@{conferenceViewModel.activeSpeakerConferenceParticipantDevices}"
-                app:flexDirection="row"
-                app:flexWrap="nowrap"
-                app:justifyContent="flex_start"
-                app:layout="@{@layout/voip_conference_participant_remote_active_speaker_miniature}" />
-
-        </HorizontalScrollView>
-
-        <org.linphone.activities.voip.views.ScrollDotsView
-            android:id="@+id/scroll_indicator"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:visibility="@{controlsViewModel.pipMode || !conferenceViewModel.moreThanTwoParticipants ? View.GONE : View.VISIBLE, default=gone}"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintBottom_toBottomOf="@id/hinge_bottom"
-            android:layout_marginBottom="@{controlsViewModel.fullScreenMode ? @dimen/margin_0dp : @dimen/voip_conference_active_speaker_dots_margin, default=@dimen/voip_conference_active_speaker_dots_margin}"
-            app:dotColor="@color/voip_gray_dots"
-            app:dotRadius="5dp"
-            app:scrollView="@id/miniatures"
-            app:itemCount="@{conferenceViewModel.conferenceParticipantDevices.size()}"
-            app:selectedDot="@{0}"
-            app:selectedDotColor="@color/voip_dark_gray" />
-
-        <View
-            android:id="@+id/local_participant_background"
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:visibility="@{conferenceViewModel.isMeListenerOnly ? View.GONE : View.VISIBLE}"
-            app:layout_constraintTop_toBottomOf="@id/top_barrier"
-            app:layout_constraintBottom_toBottomOf="@id/hinge_bottom"
-            android:layout_marginTop="@{controlsViewModel.fullScreenMode || conferenceViewModel.twoOrMoreParticipants ? @dimen/margin_0dp : @dimen/voip_active_speaker_top_margin, default=@dimen/voip_active_speaker_top_margin}"
-            android:background="@drawable/shape_me_background"
-            android:onClick="@{() -> controlsViewModel.toggleFullScreen()}"/>
-
-        <ImageView
-            android:id="@+id/local_participant_avatar"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:layout_margin="10dp"
-            android:contentDescription="@null"
-            android:visibility="@{conferenceViewModel.isMeListenerOnly ? View.GONE : View.VISIBLE}"
-            coilSelfAvatar="@{conferenceViewModel.meParticipant}"
-            android:background="@drawable/generated_avatar_bg"
-            app:layout_constraintDimensionRatio="1:1"
-            app:layout_constraintBottom_toBottomOf="@id/local_participant_background"
-            app:layout_constraintEnd_toEndOf="@id/local_participant_background"
-            app:layout_constraintHeight_max="@dimen/voip_contact_avatar_max_size"
-            app:layout_constraintStart_toStartOf="@id/local_participant_background"
-            app:layout_constraintTop_toTopOf="@id/local_participant_background"
-            app:layout_constraintWidth_max="@dimen/voip_contact_avatar_max_size" />
-
-        <org.linphone.activities.voip.views.RoundCornersTextureView
-            android:id="@+id/local_preview_video_surface"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            app:alignTopRight="false"
-            app:displayMode="occupy_all_space"
-            android:visibility="@{conferenceViewModel.meParticipant.isInConference &amp;&amp; controlsViewModel.isSendingVideo ? View.VISIBLE : View.GONE, default=gone}"
-            app:layout_constraintBottom_toBottomOf="@id/local_participant_background"
-            app:layout_constraintEnd_toEndOf="@id/local_participant_background"
-            app:layout_constraintStart_toStartOf="@id/local_participant_background"
-            app:layout_constraintTop_toTopOf="@id/local_participant_background" />
-
-        <TextView
-            android:id="@+id/local_participant_name"
-            style="@style/call_remote_name_font"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="5dp"
-            android:layout_marginEnd="5dp"
-            android:layout_marginBottom="5dp"
-            android:visibility="@{conferenceViewModel.isMeListenerOnly ? View.GONE : View.VISIBLE}"
-            android:text="@{conferenceViewModel.meParticipant.contact.name ?? conferenceViewModel.meParticipant.displayName}"
-            app:layout_constraintBottom_toBottomOf="@id/local_participant_background"
-            app:layout_constraintStart_toStartOf="@id/local_participant_background"
-            app:layout_constraintEnd_toEndOf="@id/local_participant_background"/>
-
-        <ImageView
-            android:id="@+id/switch_camera"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_margin="@{conferenceViewModel.twoOrMoreParticipants ? @dimen/margin_0dp : @dimen/voip_active_speaker_top_margin, default=@dimen/voip_active_speaker_top_margin}"
-            android:padding="10dp"
-            android:contentDescription="@string/content_description_switch_camera"
-            android:onClick="@{() -> controlsViewModel.switchCamera()}"
-            android:src="@drawable/icon_call_camera_switch"
-            android:visibility="@{controlsViewModel.isSwitchCameraAvailable &amp;&amp; !controlsViewModel.pipMode ? View.VISIBLE : View.GONE}"
-            app:layout_constraintEnd_toEndOf="@id/local_participant_background"
-            app:layout_constraintTop_toTopOf="@id/local_participant_background" />
-
-        <ImageView
-            android:id="@+id/local_participant_speaking_border"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:contentDescription="@null"
-            android:src="@drawable/shape_conference_active_speaker_border"
-            android:visibility="@{conferenceViewModel.meParticipant.isSpeaking ? View.VISIBLE : View.GONE, default=gone}"
-            app:layout_constraintBottom_toBottomOf="@id/local_participant_background"
-            app:layout_constraintLeft_toLeftOf="@id/local_participant_background"
-            app:layout_constraintRight_toRightOf="@id/local_participant_background"
-            app:layout_constraintTop_toTopOf="@id/local_participant_background" />
-
-        <ImageView
-            android:id="@+id/local_participant_muted"
-            android:layout_width="@dimen/voip_conference_participant_mic_muted_icon_size_active_speaker"
-            android:layout_height="@dimen/voip_conference_participant_mic_muted_icon_size_active_speaker"
-            android:layout_margin="@{conferenceViewModel.twoOrMoreParticipants ? @dimen/mute_mic_miniature_margin : @dimen/mute_mic_grid_margin, default=@dimen/mute_mic_grid_margin}"
-            android:background="@drawable/shape_toggle_pressed_background"
-            android:contentDescription="@string/content_description_conference_participant_mic_muted"
-            android:padding="2dp"
-            android:src="@drawable/icon_mic_muted"
-            android:visibility="@{conferenceViewModel.meParticipant.isMuted ? View.VISIBLE : View.GONE, default=gone}"
-            app:layout_constraintLeft_toLeftOf="@id/local_participant_background"
-            app:layout_constraintTop_toTopOf="@id/local_participant_background" />
-
-        <ImageView
-            android:id="@+id/local_participant_paused"
-            android:layout_width="@dimen/voip_conference_active_speaker_miniature_avatar_size"
-            android:layout_height="@dimen/voip_conference_active_speaker_miniature_avatar_size"
-            android:background="@drawable/shape_button_background"
-            android:contentDescription="@string/content_description_participant_is_paused"
-            android:src="@drawable/icon_pause"
-            android:visibility="@{conferenceViewModel.conferenceCreationPending || !conferenceViewModel.isConferenceLocallyPaused || conferenceViewModel.meParticipant.isJoining ? View.GONE : View.VISIBLE, default=gone}"
-            app:layout_constraintBottom_toBottomOf="@id/local_participant_background"
-            app:layout_constraintEnd_toEndOf="@id/local_participant_background"
-            app:layout_constraintStart_toStartOf="@id/local_participant_background"
-            app:layout_constraintTop_toTopOf="@id/local_participant_background" />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/voip_conference_audio_only.xml b/app/src/main/res/layout/voip_conference_audio_only.xml
deleted file mode 100644
index c1aa3b580..000000000
--- a/app/src/main/res/layout/voip_conference_audio_only.xml
+++ /dev/null
@@ -1,147 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <data>
-
-        <import type="android.view.View" />
-
-        <variable
-            name="conferenceViewModel"
-            type="org.linphone.activities.voip.viewmodels.ConferenceViewModel" />
-
-        <variable
-            name="controlsViewModel"
-            type="org.linphone.activities.voip.viewmodels.ControlsViewModel" />
-
-        <variable
-            name="inflatedVisibility"
-            type="Integer" />
-    </data>
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/conference_constraint_layout"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_margin="@{controlsViewModel.fullScreenMode || controlsViewModel.pipMode ? @dimen/margin_0dp : @dimen/voip_remote_margin, default=@dimen/voip_remote_margin}"
-        android:paddingBottom="@{controlsViewModel.fullScreenMode || controlsViewModel.pipMode ? @dimen/margin_0dp : @dimen/voip_buttons_fragment_margin_size}"
-        android:visibility="@{inflatedVisibility}"
-        inflatedLifecycleOwner="@{true}">
-
-        <View
-            android:id="@+id/top_barrier"
-            android:layout_width="0dp"
-            android:layout_height="1dp"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            android:layout_marginTop="@{controlsViewModel.folded ? @dimen/margin_0dp : conferenceViewModel.isRemotelyRecorded ? @dimen/voip_single_call_header_size_with_record_info : @dimen/voip_single_call_header_size, default=@dimen/voip_single_call_header_size}"/>
-
-        <androidx.constraintlayout.widget.Guideline
-            android:id="@+id/hinge_top"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            app:layout_constraintGuide_percent="0" />
-
-        <androidx.constraintlayout.widget.Guideline
-            android:id="@+id/hinge_bottom"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            app:layout_constraintGuide_percent="1" />
-
-        <androidx.constraintlayout.widget.Group
-            android:id="@+id/group"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:visibility="@{controlsViewModel.fullScreenMode || controlsViewModel.pipMode ? View.GONE : View.VISIBLE}"
-            app:constraint_referenced_ids="remote_name,active_conference_timer,toggle_pause_conference" />
-
-        <TextView
-            android:id="@+id/remote_name"
-            style="@style/call_header_title"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="10dp"
-            android:layout_marginTop="@{controlsViewModel.folded ? @dimen/voip_conference_header_folded_top_margin : @dimen/margin_0dp}"
-            android:ellipsize="end"
-            android:maxLines="1"
-            android:text="@{conferenceViewModel.subject, default=@string/conference_default_title}"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toStartOf="@id/toggle_conference_recording"
-            app:layout_constraintTop_toBottomOf="@id/hinge_top" />
-
-        <Chronometer
-            android:id="@+id/active_conference_timer"
-            style="@style/call_header_subtitle"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/remote_name" />
-
-        <ImageView
-            android:id="@+id/toggle_pause_conference"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
-            android:background="@drawable/button_toggle_background"
-            android:contentDescription="@string/content_description_pause_call"
-            android:enabled="@{!conferenceViewModel.conferenceCreationPending}"
-            android:onClick="@{() -> conferenceViewModel.pauseConference()}"
-            android:padding="5dp"
-            android:selected="@{conferenceViewModel.isConferenceLocallyPaused}"
-            android:src="@drawable/icon_pause"
-            app:layout_constraintBottom_toBottomOf="@id/active_conference_timer"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="@id/remote_name" />
-
-        <ImageView
-            android:id="@+id/toggle_conference_recording"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
-            android:layout_marginEnd="10dp"
-            android:background="@drawable/button_toggle_background"
-            android:contentDescription="@string/content_description_toggle_recording"
-            android:onClick="@{() -> conferenceViewModel.toggleRecording()}"
-            android:padding="7dp"
-            android:selected="@{conferenceViewModel.isRecording}"
-            android:src="@drawable/icon_call_record"
-            android:visibility="gone"
-            app:layout_constraintBottom_toBottomOf="@id/active_conference_timer"
-            app:layout_constraintEnd_toStartOf="@id/toggle_pause_conference"
-            app:layout_constraintTop_toTopOf="@id/remote_name" />
-
-        <include
-            android:id="@+id/remote_recording"
-            layout="@layout/voip_remote_recording"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            app:layout_constraintTop_toBottomOf="@id/active_conference_timer"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            android:visibility="@{conferenceViewModel.isRemotelyRecorded ? View.VISIBLE : View.GONE, default=gone}" />
-
-        <ScrollView
-            android:id="@+id/grid_scrollview"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            app:layout_constraintTop_toBottomOf="@id/top_barrier"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintBottom_toTopOf="@id/hinge_bottom">
-
-
-            <androidx.gridlayout.widget.GridLayout
-                android:id="@+id/grid_layout"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                app:entries="@{conferenceViewModel.conferenceParticipantDevices}"
-                app:layout="@{@layout/voip_conference_participant_remote_audio_only}"
-                app:columnCount="2"
-                app:orientation="horizontal" />
-
-        </ScrollView>
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/voip_conference_call_fragment.xml b/app/src/main/res/layout/voip_conference_call_fragment.xml
deleted file mode 100644
index 8776fa9f2..000000000
--- a/app/src/main/res/layout/voip_conference_call_fragment.xml
+++ /dev/null
@@ -1,174 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:bind="http://schemas.android.com/tools">
-
-    <data>
-
-        <import type="android.view.View" />
-
-        <import type="org.linphone.activities.voip.ConferenceDisplayMode" />
-
-        <import type="com.google.android.flexbox.FlexDirection" />
-
-        <variable
-            name="controlsViewModel"
-            type="org.linphone.activities.voip.viewmodels.ControlsViewModel" />
-
-        <variable
-            name="callsViewModel"
-            type="org.linphone.activities.voip.viewmodels.CallsViewModel" />
-
-        <variable
-            name="conferenceViewModel"
-            type="org.linphone.activities.voip.viewmodels.ConferenceViewModel" />
-
-        <variable
-            name="statsViewModel"
-            type="org.linphone.activities.voip.viewmodels.StatisticsListViewModel" />
-    </data>
-
-    <androidx.coordinatorlayout.widget.CoordinatorLayout
-        android:id="@+id/coordinator"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="?attr/voipBackgroundColor">
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:id="@+id/constraint_layout"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:background="@{controlsViewModel.fullScreenMode ? @color/black_color : @color/transparent_color}">
-
-            <ViewStub
-                android:id="@+id/stubbed_conference_active_speaker_layout"
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:layout="@layout/voip_conference_active_speaker"
-                android:visibility="@{conferenceViewModel.conferenceDisplayMode == ConferenceDisplayMode.ACTIVE_SPEAKER &amp;&amp; conferenceViewModel.conferenceExists &amp;&amp; !callsViewModel.currentCallData.isActiveAndNotInConference ? View.VISIBLE : View.GONE, default=gone}"
-                app:conferenceViewModel="@{conferenceViewModel}"
-                app:controlsViewModel="@{controlsViewModel}"
-                app:inflatedVisibility="@{conferenceViewModel.conferenceDisplayMode == ConferenceDisplayMode.ACTIVE_SPEAKER &amp;&amp; conferenceViewModel.conferenceExists &amp;&amp; !callsViewModel.currentCallData.isActiveAndNotInConference ? View.VISIBLE : View.GONE}"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
-
-            <ViewStub
-                android:id="@+id/stubbed_conference_grid_layout"
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:layout="@layout/voip_conference_grid"
-                android:visibility="@{conferenceViewModel.conferenceDisplayMode == ConferenceDisplayMode.GRID &amp;&amp; conferenceViewModel.conferenceExists &amp;&amp; !callsViewModel.currentCallData.isActiveAndNotInConference ? View.VISIBLE : View.GONE, default=gone}"
-                app:conferenceViewModel="@{conferenceViewModel}"
-                app:controlsViewModel="@{controlsViewModel}"
-                app:inflatedVisibility="@{conferenceViewModel.conferenceDisplayMode == ConferenceDisplayMode.GRID &amp;&amp; conferenceViewModel.conferenceExists &amp;&amp; !callsViewModel.currentCallData.isActiveAndNotInConference ? View.VISIBLE : View.GONE}"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
-
-            <ViewStub
-                android:id="@+id/stubbed_conference_audio_only_layout"
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:layout="@layout/voip_conference_audio_only"
-                android:visibility="@{conferenceViewModel.conferenceDisplayMode == ConferenceDisplayMode.AUDIO_ONLY &amp;&amp; conferenceViewModel.conferenceExists &amp;&amp; !callsViewModel.currentCallData.isActiveAndNotInConference ? View.VISIBLE : View.GONE, default=gone}"
-                app:conferenceViewModel="@{conferenceViewModel}"
-                app:controlsViewModel="@{controlsViewModel}"
-                app:inflatedVisibility="@{conferenceViewModel.conferenceDisplayMode == ConferenceDisplayMode.AUDIO_ONLY &amp;&amp; conferenceViewModel.conferenceExists &amp;&amp; !callsViewModel.currentCallData.isActiveAndNotInConference ? View.VISIBLE : View.GONE}"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
-
-            <ViewStub
-                android:id="@+id/stubbed_audio_routes"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="12dp"
-                android:layout_marginBottom="10dp"
-                android:layout="@layout/voip_buttons_audio_routes"
-                android:visibility="@{controlsViewModel.audioRoutesEnabled ? View.VISIBLE : View.GONE}"
-                app:controlsViewModel="@{controlsViewModel}"
-                app:inflatedVisibility="@{controlsViewModel.audioRoutesEnabled ? View.VISIBLE : View.GONE}"
-                app:layout_constraintBottom_toTopOf="@id/primary_buttons"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent" />
-
-            <include
-                android:id="@+id/primary_buttons"
-                layout="@layout/voip_buttons"
-                android:layout_width="0dp"
-                android:layout_height="@dimen/voip_buttons_fragment_size"
-                android:layout_marginStart="10dp"
-                android:layout_marginEnd="10dp"
-                android:layout_marginBottom="10dp"
-                android:visibility="@{controlsViewModel.fullScreenMode || controlsViewModel.pipMode ? View.GONE : View.VISIBLE}"
-                app:callsViewModel="@{callsViewModel}"
-                app:conferenceViewModel="@{conferenceViewModel}"
-                app:controlsViewModel="@{controlsViewModel}"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintWidth_max="@dimen/voip_buttons_max_width" />
-
-            <ViewStub
-                android:id="@+id/stubbed_paused_conference"
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:layout_marginBottom="2dp"
-                android:layout="@layout/voip_conference_paused"
-                android:visibility="@{conferenceViewModel.isConferenceLocallyPaused ? View.VISIBLE : View.GONE, default=gone}"
-                app:conferenceViewModel="@{conferenceViewModel}"
-                app:inflatedVisibility="@{conferenceViewModel.isConferenceLocallyPaused ? View.VISIBLE : View.GONE}"
-                app:layout_constraintBottom_toTopOf="@id/primary_buttons"
-                app:layout_constraintTop_toTopOf="parent" />
-
-            <View
-                android:id="@+id/popup_background"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:background="@color/voip_translucent_popup_background"
-                android:onClick="@{() -> controlsViewModel.hideExtraButtons(false)}"
-                android:visibility="@{controlsViewModel.showExtras ? View.VISIBLE : View.GONE, default=gone}" />
-
-            <include
-                android:id="@+id/extra_buttons_layout"
-                layout="@layout/voip_buttons_extra"
-                android:layout_width="0dp"
-                android:layout_height="@dimen/voip_call_extra_buttons_height"
-                android:layout_marginStart="15dp"
-                android:layout_marginEnd="15dp"
-                android:translationY="@{controlsViewModel.extraButtonsMenuTranslateY, default=@dimen/voip_call_extra_buttons_translate_y}"
-                app:callsViewModel="@{callsViewModel}"
-                app:conferenceViewModel="@{conferenceViewModel}"
-                app:controlsViewModel="@{controlsViewModel}"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintWidth_max="@dimen/voip_extra_menu_max_width" />
-
-            <ViewStub
-                android:id="@+id/stubbed_call_stats"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout="@layout/voip_call_stats"
-                android:visibility="@{controlsViewModel.callStatsVisible ? View.VISIBLE : View.GONE, default=gone}"
-                app:controlsViewModel="@{controlsViewModel}"
-                app:inflatedVisibility="@{controlsViewModel.callStatsVisible ? View.VISIBLE : View.GONE}"
-                app:statsViewModel="@{statsViewModel}" />
-
-            <ViewStub
-                android:id="@+id/stubbed_numpad"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout="@layout/voip_numpad"
-                android:visibility="@{controlsViewModel.numpadVisible ? View.VISIBLE : View.GONE, default=gone}"
-                app:controlsViewModel="@{controlsViewModel}"
-                app:inflatedVisibility="@{controlsViewModel.numpadVisible ? View.VISIBLE : View.GONE}" />
-
-        </androidx.constraintlayout.widget.ConstraintLayout>
-
-        <include
-            android:id="@+id/creation_pending_layout"
-            layout="@layout/voip_conference_creation_pending_wait_layout"
-            bind:visibility="@{conferenceViewModel.conferenceCreationPending}" />
-
-    </androidx.coordinatorlayout.widget.CoordinatorLayout>
-
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/voip_conference_creation_pending_wait_layout.xml b/app/src/main/res/layout/voip_conference_creation_pending_wait_layout.xml
deleted file mode 100644
index a2175e333..000000000
--- a/app/src/main/res/layout/voip_conference_creation_pending_wait_layout.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <data>
-        <import type="android.view.View"/>
-        <variable
-            name="visibility"
-            type="Boolean" />
-    </data>
-
-    <RelativeLayout
-        android:id="@+id/creation_pending_layout"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:visibility="@{visibility ? View.VISIBLE : View.GONE}">
-
-        <ProgressBar
-            android:id="@+id/progress"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerInParent="true"
-            android:indeterminate="true"
-            android:indeterminateTint="?attr/accentColor"
-            android:indeterminateDrawable="@drawable/icon_spinner_rotating" />
-
-        <TextView
-            android:id="@+id/progress_text"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="center_horizontal"
-            android:layout_below="@id/progress"
-            android:layout_marginTop="10dp"
-            android:textColor="@color/primary_color"
-            android:textStyle="bold"
-            android:text="@string/operation_in_progress_wait" />
-
-    </RelativeLayout>
-
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/voip_conference_grid.xml b/app/src/main/res/layout/voip_conference_grid.xml
deleted file mode 100644
index ecac814f9..000000000
--- a/app/src/main/res/layout/voip_conference_grid.xml
+++ /dev/null
@@ -1,139 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <data>
-
-        <import type="android.view.View" />
-
-        <variable
-            name="conferenceViewModel"
-            type="org.linphone.activities.voip.viewmodels.ConferenceViewModel" />
-
-        <variable
-            name="controlsViewModel"
-            type="org.linphone.activities.voip.viewmodels.ControlsViewModel" />
-
-        <variable
-            name="inflatedVisibility"
-            type="Integer" />
-    </data>
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/conference_constraint_layout"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_margin="@{controlsViewModel.fullScreenMode || controlsViewModel.pipMode ? @dimen/margin_0dp : @dimen/voip_remote_margin, default=@dimen/voip_remote_margin}"
-        android:paddingBottom="@{controlsViewModel.fullScreenMode || controlsViewModel.pipMode ? @dimen/margin_0dp : @dimen/voip_buttons_fragment_margin_size}"
-        android:visibility="@{inflatedVisibility}"
-        inflatedLifecycleOwner="@{true}">
-
-        <View
-            android:id="@+id/top_barrier"
-            android:layout_width="0dp"
-            android:layout_height="1dp"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            android:layout_marginTop="@{controlsViewModel.fullScreenMode || controlsViewModel.pipMode || controlsViewModel.folded ? @dimen/margin_0dp : conferenceViewModel.isRemotelyRecorded ? @dimen/voip_single_call_header_size_with_record_info : @dimen/voip_single_call_header_size, default=@dimen/voip_single_call_header_size}"/>
-
-        <androidx.constraintlayout.widget.Guideline
-            android:id="@+id/hinge_top"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            app:layout_constraintGuide_percent="0" />
-
-        <androidx.constraintlayout.widget.Guideline
-            android:id="@+id/hinge_bottom"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            app:layout_constraintGuide_percent="1" />
-
-        <androidx.constraintlayout.widget.Group
-            android:id="@+id/group"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:visibility="@{controlsViewModel.fullScreenMode || controlsViewModel.pipMode ? View.GONE : View.VISIBLE}"
-            app:constraint_referenced_ids="remote_name,active_conference_timer,toggle_pause_conference" />
-
-        <TextView
-            android:id="@+id/remote_name"
-            style="@style/call_header_title"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="10dp"
-            android:layout_marginTop="@{controlsViewModel.folded ? @dimen/voip_conference_header_folded_top_margin : @dimen/margin_0dp}"
-            android:ellipsize="end"
-            android:maxLines="1"
-            android:text="@{conferenceViewModel.subject, default=@string/conference_default_title}"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toStartOf="@id/toggle_conference_recording"
-            app:layout_constraintTop_toBottomOf="@id/hinge_top" />
-
-        <Chronometer
-            android:id="@+id/active_conference_timer"
-            style="@style/call_header_subtitle"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/remote_name" />
-
-        <ImageView
-            android:id="@+id/toggle_pause_conference"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
-            android:background="@drawable/button_toggle_background"
-            android:contentDescription="@string/content_description_pause_call"
-            android:enabled="@{!conferenceViewModel.conferenceCreationPending}"
-            android:onClick="@{() -> conferenceViewModel.pauseConference()}"
-            android:padding="5dp"
-            android:selected="@{conferenceViewModel.isConferenceLocallyPaused}"
-            android:src="@drawable/icon_pause"
-            app:layout_constraintBottom_toBottomOf="@id/active_conference_timer"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="@id/remote_name" />
-
-        <ImageView
-            android:id="@+id/toggle_conference_recording"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
-            android:layout_marginEnd="10dp"
-            android:background="@drawable/button_toggle_background"
-            android:contentDescription="@string/content_description_toggle_recording"
-            android:onClick="@{() -> conferenceViewModel.toggleRecording()}"
-            android:padding="7dp"
-            android:selected="@{conferenceViewModel.isRecording}"
-            android:src="@drawable/icon_call_record"
-            android:visibility="gone"
-            app:layout_constraintBottom_toBottomOf="@id/active_conference_timer"
-            app:layout_constraintEnd_toStartOf="@id/toggle_pause_conference"
-            app:layout_constraintTop_toTopOf="@id/remote_name" />
-
-        <include
-            android:id="@+id/remote_recording"
-            layout="@layout/voip_remote_recording"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            app:layout_constraintTop_toBottomOf="@id/active_conference_timer"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            android:visibility="@{conferenceViewModel.isRemotelyRecorded ? View.VISIBLE : View.GONE, default=gone}" />
-
-        <org.linphone.activities.voip.views.GridBoxLayout
-            android:id="@+id/grid_box_layout"
-            centerContent="@{true}"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            app:layout_constraintTop_toBottomOf="@id/top_barrier"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintBottom_toTopOf="@id/hinge_bottom"
-            android:onClick="@{() -> controlsViewModel.toggleFullScreen()}"
-            app:entries="@{conferenceViewModel.conferenceParticipantDevices}"
-            app:layout="@{@layout/voip_conference_participant_remote_grid}" />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/voip_conference_incoming_participant_cell.xml b/app/src/main/res/layout/voip_conference_incoming_participant_cell.xml
deleted file mode 100644
index 57ba082bb..000000000
--- a/app/src/main/res/layout/voip_conference_incoming_participant_cell.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <data>
-        <import type="android.view.View"/>
-        <variable
-            name="data"
-            type="org.linphone.activities.voip.data.ConferenceInfoParticipantData" />
-    </data>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="50dp"
-        android:layout_margin="5dp"
-        android:orientation="vertical"
-        android:gravity="center">
-
-        <org.linphone.views.MarqueeTextView
-            style="@style/call_header_title"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:singleLine="true"
-            android:text="@{data.contact.name ?? data.displayName, default=`Bilbo Baggins`}" />
-
-        <org.linphone.views.MarqueeTextView
-            style="@style/sip_uri_font"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:singleLine="true"
-            android:ellipsize="end"
-            android:text="@{data.sipUri, default=`sip:bilbo.baggins@sip.linphone.org`}" />
-
-
-    </LinearLayout>
-
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/voip_conference_layout_fragment.xml b/app/src/main/res/layout/voip_conference_layout_fragment.xml
deleted file mode 100644
index 1e25ab088..000000000
--- a/app/src/main/res/layout/voip_conference_layout_fragment.xml
+++ /dev/null
@@ -1,167 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <data>
-
-        <import type="android.view.View" />
-
-        <import type="org.linphone.activities.voip.ConferenceDisplayMode" />
-
-        <variable
-            name="cancelClickListener"
-            type="android.view.View.OnClickListener" />
-
-        <variable
-            name="dismissDialogClickListener"
-            type="android.view.View.OnClickListener" />
-
-        <variable
-            name="conferenceViewModel"
-            type="org.linphone.activities.voip.viewmodels.ConferenceViewModel" />
-
-        <variable
-            name="controlsViewModel"
-            type="org.linphone.activities.voip.viewmodels.ControlsViewModel" />
-    </data>
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:id="@+id/top_bar"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/voip_top_bar_size"
-            android:background="?attr/voipToolbarBackgroundColor"
-            app:layout_constraintTop_toTopOf="parent">
-
-            <TextView
-                style="@style/calls_list_header_font"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_marginStart="20dp"
-                android:gravity="center_vertical"
-                android:text="@string/call_action_change_conf_layout"
-                app:layout_constraintTop_toBottomOf="@id/top_bar" />
-
-            <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:contentDescription="@string/cancel"
-                android:onClick="@{cancelClickListener}"
-                android:padding="10dp"
-                android:src="@drawable/icon_cancel"
-                app:layout_constraintEnd_toEndOf="parent" />
-
-        </androidx.constraintlayout.widget.ConstraintLayout>
-
-        <androidx.core.widget.NestedScrollView
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:background="?attr/voipBackgroundBWColor"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/top_bar">
-
-            <RadioGroup
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical">
-
-                <RadioButton
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="20dp"
-                    android:layout_marginTop="10dp"
-                    android:layout_marginEnd="20dp"
-                    android:layout_marginBottom="10dp"
-                    android:checked="@{conferenceViewModel.conferenceDisplayMode == ConferenceDisplayMode.GRID}"
-                    android:drawableEnd="@drawable/icon_conference_layout_grid"
-                    android:drawableTint="?attr/voipDrawableColor"
-                    android:enabled="@{conferenceViewModel.conferenceParticipantDevices.size() > conferenceViewModel.maxParticipantsForMosaicLayout ? false : true}"
-                    android:onClickListener="@{() -> conferenceViewModel.changeLayout(ConferenceDisplayMode.GRID, false)}"
-                    android:text="@string/conference_display_mode_mosaic" />
-
-                <View
-                    android:layout_width="match_parent"
-                    android:layout_height="1dp"
-                    android:background="?attr/dividerColor" />
-
-                <RadioButton
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="20dp"
-                    android:layout_marginTop="10dp"
-                    android:layout_marginEnd="20dp"
-                    android:layout_marginBottom="10dp"
-                    android:checked="@{conferenceViewModel.conferenceDisplayMode == ConferenceDisplayMode.ACTIVE_SPEAKER}"
-                    android:drawableEnd="@drawable/icon_conference_layout_active_speaker"
-                    android:drawableTint="?attr/voipDrawableColor"
-                    android:onClickListener="@{() -> conferenceViewModel.changeLayout(ConferenceDisplayMode.ACTIVE_SPEAKER, false)}"
-                    android:text="@string/conference_display_mode_active_speaker" />
-
-                <View
-                    android:layout_width="match_parent"
-                    android:layout_height="1dp"
-                    android:background="?attr/dividerColor" />
-
-                <RadioButton
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="20dp"
-                    android:layout_marginTop="10dp"
-                    android:layout_marginEnd="20dp"
-                    android:layout_marginBottom="10dp"
-                    android:checked="@{conferenceViewModel.conferenceDisplayMode == ConferenceDisplayMode.AUDIO_ONLY}"
-                    android:drawableEnd="@drawable/icon_conference_layout_audio_only"
-                    android:drawableTint="?attr/voipDrawableColor"
-                    android:onClickListener="@{() -> conferenceViewModel.changeLayout(ConferenceDisplayMode.AUDIO_ONLY, false)}"
-                    android:text="@string/conference_display_mode_audio_only" />
-
-                <View
-                    android:layout_width="match_parent"
-                    android:layout_height="1dp"
-                    android:background="?attr/dividerColor" />
-
-            </RadioGroup>
-
-        </androidx.core.widget.NestedScrollView>
-
-        <org.linphone.activities.voip.views.RoundCornersTextureView
-            android:id="@+id/local_preview_video_surface"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:layout_margin="10dp"
-            android:layout_size="@{@dimen/video_preview_max_size}"
-            app:alignTopRight="true"
-            app:displayMode="black_bars"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintHeight_max="200dp"
-            app:layout_constraintWidth_max="200dp" />
-
-        <ImageView
-            android:id="@+id/switch_camera"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_margin="5dp"
-            android:contentDescription="@string/content_description_switch_camera"
-            android:onClick="@{() -> controlsViewModel.switchCamera()}"
-            android:padding="10dp"
-            android:src="@drawable/icon_call_camera_switch"
-            android:visibility="@{controlsViewModel.isSwitchCameraAvailable &amp;&amp; !controlsViewModel.pipMode ? View.VISIBLE : View.GONE, default=gone}"
-            app:layout_constraintEnd_toEndOf="@id/local_preview_video_surface"
-            app:layout_constraintTop_toTopOf="@id/local_preview_video_surface" />
-
-        <include
-            android:id="@+id/too_many_participants_dialog"
-            layout="@layout/voip_dialog_info"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:visibility="gone"
-            app:dialogMessage="@{@string/conference_layout_too_many_participants_for_mosaic}"
-            app:dismissClickListener="@{dismissDialogClickListener}" />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/voip_conference_participant_broadcast_cell.xml b/app/src/main/res/layout/voip_conference_participant_broadcast_cell.xml
deleted file mode 100644
index 1641977cb..000000000
--- a/app/src/main/res/layout/voip_conference_participant_broadcast_cell.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <data>
-        <import type="android.view.View"/>
-        <variable
-            name="data"
-            type="org.linphone.activities.voip.data.ConferenceParticipantData" />
-    </data>
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="50dp"
-        android:layout_margin="5dp"
-        android:gravity="center_vertical">
-
-        <ImageView
-            android:id="@+id/avatar"
-            android:layout_width="@dimen/contact_avatar_size"
-            android:layout_height="@dimen/contact_avatar_size"
-            android:contentDescription="@null"
-            coilContact="@{data}"
-            android:layout_marginStart="10dp"
-            android:layout_marginEnd="10dp"
-            android:layout_centerVertical="true"
-            android:background="@drawable/generated_avatar_bg"
-            android:src="@drawable/voip_single_contact_avatar"/>
-
-        <ImageView
-            android:id="@+id/delete"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
-            android:layout_alignParentEnd="true"
-            android:layout_centerInParent="true"
-            android:contentDescription="@string/content_description_remove_contact_from_chat_room"
-            android:onClick="@{() -> data.removeParticipantFromConference()}"
-            android:paddingLeft="5dp"
-            android:paddingRight="5dp"
-            android:src="@drawable/icon_cancel_alt"
-            android:visibility="@{data.isMeAdmin ? View.VISIBLE : View.INVISIBLE}" />
-
-        <LinearLayout
-            android:id="@+id/speakerLayout"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:layout_toStartOf="@id/delete"
-            android:layout_marginStart="5dp"
-            android:layout_marginEnd="10dp"
-            android:visibility="@{data.isSpeaker ? View.VISIBLE : View.INVISIBLE}">
-
-            <ImageView
-                android:layout_width="20dp"
-                android:layout_height="20dp"
-                android:layout_gravity="center"
-                android:adjustViewBounds="true"
-                android:padding="5dp"
-                android:scaleType="centerInside"
-                android:contentDescription="@string/content_description_contact_is_speaker"
-                android:src="@drawable/check_selected" />
-
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:text="@string/conference_participants_list_speaker_label"
-                android:textColor="?attr/primaryTextColor" />
-
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:layout_marginStart="10dp"
-            android:layout_toStartOf="@id/speakerLayout"
-            android:layout_toEndOf="@id/avatar"
-            android:orientation="vertical">
-
-            <org.linphone.views.MarqueeTextView
-                style="@style/contact_name_list_cell_font"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:singleLine="true"
-                android:text="@{data.contact.name ?? data.displayName, default=`Bilbo Baggins`}" />
-
-            <org.linphone.views.MarqueeTextView
-                android:id="@+id/sipUri"
-                style="@style/sip_uri_small_font"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:singleLine="true"
-                android:ellipsize="end"
-                android:text="@{data.sipUri, default=`sip:bilbo.baggins@sip.linphone.org`}" />
-
-        </LinearLayout>
-
-    </RelativeLayout>
-
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/voip_conference_participant_cell.xml b/app/src/main/res/layout/voip_conference_participant_cell.xml
deleted file mode 100644
index 0a50cd5f5..000000000
--- a/app/src/main/res/layout/voip_conference_participant_cell.xml
+++ /dev/null
@@ -1,136 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <data>
-        <import type="android.view.View"/>
-        <variable
-            name="data"
-            type="org.linphone.activities.voip.data.ConferenceParticipantData" />
-    </data>
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="50dp"
-        android:layout_margin="5dp"
-        android:gravity="center_vertical">
-
-        <ImageView
-            android:id="@+id/avatar"
-            android:layout_width="@dimen/contact_avatar_size"
-            android:layout_height="@dimen/contact_avatar_size"
-            android:contentDescription="@null"
-            coilContact="@{data}"
-            android:layout_marginStart="10dp"
-            android:layout_marginEnd="10dp"
-            android:layout_centerVertical="true"
-            android:background="@drawable/generated_avatar_bg"
-            android:src="@drawable/voip_single_contact_avatar"/>
-
-        <ImageView
-            android:id="@+id/delete"
-            android:onClick="@{() -> data.removeParticipantFromConference()}"
-            android:visibility="@{data.isMeAdmin ? View.VISIBLE : View.INVISIBLE}"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
-            android:layout_alignParentEnd="true"
-            android:layout_centerInParent="true"
-            android:contentDescription="@string/content_description_remove_contact_from_chat_room"
-            android:paddingLeft="5dp"
-            android:paddingRight="5dp"
-            android:src="@drawable/icon_cancel_alt" />
-
-        <LinearLayout
-            android:id="@+id/adminLayout"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:layout_toStartOf="@id/delete"
-            android:layout_marginStart="5dp">
-
-            <LinearLayout
-                android:id="@+id/isAdminLayout"
-                android:onClick="@{() -> data.unsetAdmin()}"
-                android:visibility="@{data.isAdmin ? View.VISIBLE : View.GONE, default=gone}"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginEnd="10dp">
-
-                <ImageView
-                    android:layout_width="20dp"
-                    android:layout_height="20dp"
-                    android:layout_gravity="center"
-                    android:adjustViewBounds="true"
-                    android:padding="5dp"
-                    android:scaleType="centerInside"
-                    android:contentDescription="@string/content_description_contact_is_admin"
-                    android:src="@drawable/check_selected" />
-
-                <TextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:text="@string/chat_room_group_info_admin"
-                    android:textColor="?attr/primaryTextColor"
-                    android:textStyle="bold" />
-
-            </LinearLayout>
-
-            <LinearLayout
-                android:id="@+id/isNotAdminLayout"
-                android:onClick="@{() -> data.setAdmin()}"
-                android:visibility="@{(data.isAdmin || !data.isMeAdmin) ? View.GONE : View.VISIBLE}"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginEnd="10dp">
-
-                <ImageView
-                    android:layout_width="20dp"
-                    android:layout_height="20dp"
-                    android:layout_gravity="center"
-                    android:adjustViewBounds="true"
-                    android:padding="5dp"
-                    android:scaleType="centerInside"
-                    android:contentDescription="@string/content_description_contact_is_not_admin"
-                    android:src="@drawable/check_unselected" />
-
-                <TextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:text="@string/chat_room_group_info_admin"
-                    android:textColor="?attr/primarySubtextLightColor" />
-
-            </LinearLayout>
-
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:layout_marginStart="10dp"
-            android:layout_toStartOf="@id/adminLayout"
-            android:layout_toEndOf="@id/avatar"
-            android:orientation="vertical">
-
-            <org.linphone.views.MarqueeTextView
-                style="@style/contact_name_list_cell_font"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:singleLine="true"
-                android:text="@{data.contact.name ?? data.displayName, default=`Bilbo Baggins`}" />
-
-            <org.linphone.views.MarqueeTextView
-                android:id="@+id/sipUri"
-                style="@style/sip_uri_small_font"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:singleLine="true"
-                android:ellipsize="end"
-                android:text="@{data.sipUri, default=`sip:bilbo.baggins@sip.linphone.org`}" />
-
-        </LinearLayout>
-
-    </RelativeLayout>
-
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/voip_conference_participant_remote_active_speaker_miniature.xml b/app/src/main/res/layout/voip_conference_participant_remote_active_speaker_miniature.xml
deleted file mode 100644
index 84f73f08d..000000000
--- a/app/src/main/res/layout/voip_conference_participant_remote_active_speaker_miniature.xml
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <data>
-
-        <import type="android.view.View" />
-
-        <variable
-            name="data"
-            type="org.linphone.activities.voip.data.ConferenceParticipantDeviceData" />
-    </data>
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="@dimen/voip_active_speaker_miniature_size"
-        android:layout_height="@dimen/voip_active_speaker_miniature_size"
-        android:layout_margin="5dp"
-        android:background="@{!data.isInConference &amp;&amp; !data.isJoining ? @drawable/shape_remote_paused_background : @drawable/shape_remote_background, default=@drawable/shape_remote_background}"
-        android:visibility="@{data.isActiveSpeaker ? View.GONE : View.VISIBLE}"
-        app:layout_alignSelf="flex_end"
-        app:layout_flexShrink="0">
-
-        <ImageView
-            android:id="@+id/participant_avatar"
-            android:layout_width="@dimen/voip_conference_active_speaker_miniature_avatar_size"
-            android:layout_height="@dimen/voip_conference_active_speaker_miniature_avatar_size"
-            android:background="@drawable/generated_avatar_bg"
-            android:visibility="@{data.isInConference || data.isJoining ? View.VISIBLE : View.GONE}"
-            android:contentDescription="@null"
-            coilVoipContact="@{data}"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintDimensionRatio="1:1" />
-
-        <org.linphone.activities.voip.views.RoundCornersTextureView
-            android:id="@+id/participant_video_surface"
-            participantTextureView="@{data}"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:visibility="@{data.videoEnabled &amp;&amp; data.isInConference ? View.VISIBLE : View.GONE}"
-            app:alignTopRight="false"
-            app:displayMode="hybrid"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <ImageView
-            android:id="@+id/paused"
-            android:layout_width="@dimen/voip_conference_active_speaker_miniature_avatar_size"
-            android:layout_height="@dimen/voip_conference_active_speaker_miniature_avatar_size"
-            android:background="@drawable/shape_button_background"
-            android:contentDescription="@string/content_description_participant_is_paused"
-            android:src="@drawable/icon_pause"
-            android:visibility="@{data.isInConference || data.isJoining ? View.GONE : View.VISIBLE, default=gone}"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <ImageView
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:contentDescription="@null"
-            android:src="@drawable/shape_conference_active_speaker_border"
-            android:visibility="@{data.isSpeaking ? View.VISIBLE : View.GONE, default=gone}"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintRight_toRightOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <TextView
-            android:id="@+id/participant_name"
-            style="@style/call_remote_name_font"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="5dp"
-            android:layout_marginEnd="5dp"
-            android:layout_marginBottom="5dp"
-            android:text="@{data.contact.name ?? data.displayName}"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent" />
-
-        <ProgressBar
-            android:id="@+id/joining"
-            android:layout_width="@dimen/voip_conference_participant_joining_icon_size_active_speaker"
-            android:layout_height="@dimen/voip_conference_participant_joining_icon_size_active_speaker"
-            android:indeterminate="true"
-            android:indeterminateDrawable="@drawable/icon_spinner_rotating"
-            android:visibility="@{data.isJoining ? View.VISIBLE : View.GONE, default=gone}"
-            app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <ImageView
-            android:layout_width="@dimen/voip_conference_participant_mic_muted_icon_size_active_speaker"
-            android:layout_height="@dimen/voip_conference_participant_mic_muted_icon_size_active_speaker"
-            android:layout_margin="@dimen/mute_mic_miniature_margin"
-            android:background="@drawable/shape_toggle_pressed_background"
-            android:contentDescription="@string/content_description_conference_participant_mic_muted"
-            android:padding="2dp"
-            android:src="@drawable/icon_mic_muted"
-            android:visibility="@{data.isMuted ? View.VISIBLE : View.GONE, default=gone}"
-            app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/voip_conference_participant_remote_audio_only.xml b/app/src/main/res/layout/voip_conference_participant_remote_audio_only.xml
deleted file mode 100644
index 4a3b99802..000000000
--- a/app/src/main/res/layout/voip_conference_participant_remote_audio_only.xml
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <data>
-
-        <import type="android.view.View" />
-
-        <variable
-            name="data"
-            type="org.linphone.activities.voip.data.ConferenceParticipantDeviceData" />
-    </data>
-
-    <!-- Width MUST BE 0dp, otherwise column width will be broken when mute mic icon will be show! -->
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="0dp"
-        android:layout_height="@dimen/voip_conference_audio_only_participant_cell_height"
-        app:layout_columnWeight="1"
-        app:layout_gravity="fill_horizontal">
-
-        <View
-            android:id="@+id/view"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:layout_margin="5dp"
-            android:background="@{data.isMe ? @drawable/shape_audio_only_me_background : @drawable/shape_audio_only_remote_background, default=@drawable/shape_audio_only_remote_background}"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <ImageView
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:layout_margin="5dp"
-            android:adjustViewBounds="true"
-            android:contentDescription="@null"
-            android:src="@drawable/shape_conference_audio_only_border"
-            android:visibility="@{data.isSpeaking ? View.VISIBLE : View.GONE, default=gone}"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <ImageView
-            android:id="@+id/participant_avatar"
-            android:layout_width="@dimen/voip_conference_audio_only_participant_avatar_size"
-            android:layout_height="@dimen/voip_conference_audio_only_participant_avatar_size"
-            android:layout_marginStart="10dp"
-            android:contentDescription="@null"
-            android:background="@drawable/generated_avatar_bg"
-            android:visibility="@{data.isInConference || data.isJoining ? View.VISIBLE : View.GONE}"
-            coilVoipContact="@{data}"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toStartOf="@id/paused_avatar"
-            app:layout_constraintHorizontal_chainStyle="spread_inside"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintDimensionRatio="1:1" />
-
-        <ImageView
-            android:id="@+id/paused_avatar"
-            android:layout_width="@dimen/voip_conference_audio_only_participant_avatar_size"
-            android:layout_height="@dimen/voip_conference_audio_only_participant_avatar_size"
-            android:layout_marginStart="10dp"
-            android:background="@drawable/shape_button_background"
-            android:contentDescription="@string/content_description_participant_is_paused"
-            android:src="@drawable/icon_pause"
-            android:visibility="@{data.isInConference || data.isJoining ? View.GONE : View.VISIBLE, default=gone}"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toStartOf="@id/participant_name"
-            app:layout_constraintStart_toEndOf="@id/participant_avatar"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <TextView
-            android:id="@+id/participant_name"
-            style="@style/call_remote_name_small_font"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:layout_marginStart="10dp"
-            android:layout_marginEnd="10dp"
-            android:ellipsize="end"
-            android:gravity="center_vertical"
-            android:maxLines="2"
-            android:text="@{(data.contact.name ?? data.displayName) + (data.isInConference || data.isJoining ? `` : ` ` + @string/conference_participant_paused), default=`Merry Brandybuck`}"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toStartOf="@id/endBarrier"
-            app:layout_constraintStart_toEndOf="@id/paused_avatar"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <androidx.constraintlayout.widget.Barrier
-            android:id="@+id/endBarrier"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            app:barrierDirection="left"
-            app:constraint_referenced_ids="joining, participant_mic_muted" />
-
-        <ProgressBar
-            android:id="@+id/joining"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:indeterminate="true"
-            android:indeterminateDrawable="@drawable/icon_spinner_rotating"
-            android:visibility="@{data.isJoining ? View.VISIBLE : View.GONE, default=gone}"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@id/participant_name"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <ImageView
-            android:id="@+id/participant_mic_muted"
-            android:layout_width="@dimen/voip_conference_participant_mic_muted_icon_size_grid"
-            android:layout_height="@dimen/voip_conference_participant_mic_muted_icon_size_grid"
-            android:layout_marginEnd="@dimen/mute_mic_grid_margin"
-            android:background="@drawable/shape_toggle_pressed_background"
-            android:contentDescription="@string/content_description_conference_participant_mic_muted"
-            android:padding="2dp"
-            android:src="@drawable/icon_mic_muted"
-            android:visibility="@{data.isMuted ? View.VISIBLE : View.GONE, default=gone}"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@id/participant_name"
-            app:layout_constraintTop_toTopOf="parent" />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/voip_conference_participant_remote_grid.xml b/app/src/main/res/layout/voip_conference_participant_remote_grid.xml
deleted file mode 100644
index 4b75e5f32..000000000
--- a/app/src/main/res/layout/voip_conference_participant_remote_grid.xml
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <data>
-
-        <import type="android.view.View" />
-
-        <variable
-            name="data"
-            type="org.linphone.activities.voip.data.ConferenceParticipantDeviceData" />
-    </data>
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        app:layout_constraintDimensionRatio="1:1">
-
-        <View
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:layout_margin="5dp"
-            android:background="@{!data.isInConference &amp;&amp; !data.isJoining ? @drawable/shape_remote_paused_background : data.isMe ? @drawable/shape_me_background : @drawable/shape_remote_background, default=@drawable/shape_remote_background}"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <ImageView
-            android:id="@+id/participant_avatar"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:layout_margin="30dp"
-            android:contentDescription="@null"
-            android:background="@drawable/generated_avatar_bg"
-            android:visibility="@{data.isInConference || data.isJoining ? View.VISIBLE : View.GONE}"
-            coilVoipContact="@{data}"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintHeight_max="@dimen/voip_contact_avatar_max_size"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintWidth_max="@dimen/voip_contact_avatar_max_size"
-            app:layout_constraintDimensionRatio="1:1" />
-
-        <org.linphone.activities.voip.views.RoundCornersTextureView
-            android:id="@+id/participant_video_surface"
-            participantTextureView="@{data}"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:layout_margin="5dp"
-            android:visibility="@{data.videoEnabled &amp;&amp; data.isInConference ? View.VISIBLE : View.GONE}"
-            app:alignTopRight="false"
-            app:displayMode="hybrid"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <ImageView
-            android:id="@+id/paused"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:background="@drawable/shape_button_background"
-            android:contentDescription="@string/content_description_participant_is_paused"
-            android:src="@drawable/icon_pause"
-            android:visibility="@{data.isInConference || data.isJoining ? View.GONE : View.VISIBLE, default=gone}"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <ImageView
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:layout_margin="5dp"
-            android:adjustViewBounds="true"
-            android:contentDescription="@null"
-            android:src="@drawable/shape_conference_active_speaker_border"
-            android:visibility="@{data.isSpeaking ? View.VISIBLE : View.GONE, default=gone}"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <TextView
-            android:id="@+id/participant_name"
-            style="@style/call_remote_name_font"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="15dp"
-            android:layout_marginBottom="15dp"
-            android:text="@{data.contact.name ?? data.displayName}"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="parent" />
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_margin="5dp"
-            android:padding="10dp"
-            android:contentDescription="@string/content_description_switch_camera"
-            android:onClick="@{() -> data.switchCamera()}"
-            android:src="@drawable/icon_call_camera_switch"
-            android:visibility="@{data.videoEnabled &amp;&amp; data.isSwitchCameraAvailable() &amp;&amp; data.isInConference ? View.VISIBLE : View.GONE, default=gone}"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <ProgressBar
-            android:id="@+id/joining"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_margin="2dp"
-            android:indeterminate="true"
-            android:indeterminateDrawable="@drawable/icon_spinner_rotating"
-            android:visibility="@{data.isJoining ? View.VISIBLE : View.GONE, default=gone}"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <ImageView
-            android:layout_width="@dimen/voip_conference_participant_mic_muted_icon_size_grid"
-            android:layout_height="@dimen/voip_conference_participant_mic_muted_icon_size_grid"
-            android:layout_margin="@dimen/mute_mic_grid_margin"
-            android:background="@drawable/shape_toggle_pressed_background"
-            android:contentDescription="@string/content_description_conference_participant_mic_muted"
-            android:padding="2dp"
-            android:src="@drawable/icon_mic_muted"
-            android:visibility="@{data.isMuted ? View.VISIBLE : View.GONE, default=gone}"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/voip_conference_participants_add_fragment.xml b/app/src/main/res/layout/voip_conference_participants_add_fragment.xml
deleted file mode 100644
index 5715105ac..000000000
--- a/app/src/main/res/layout/voip_conference_participants_add_fragment.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <data>
-        <import type="android.view.View"/>
-        <variable
-            name="applyClickListener"
-            type="android.view.View.OnClickListener"/>
-        <variable
-            name="viewModel"
-            type="org.linphone.activities.voip.viewmodels.ConferenceParticipantsViewModel" />
-    </data>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical"
-        android:background="?attr/voipBackgroundBWColor">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/main_activity_top_bar_size"
-            android:layout_gravity="center_horizontal"
-            android:background="?attr/voipToolbarBackgroundColor"
-            android:orientation="horizontal">
-
-            <ImageView
-                android:id="@+id/back"
-                android:contentDescription="@string/content_description_go_back"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="0.2"
-                android:padding="18dp"
-                android:src="@drawable/back" />
-
-            <TextView
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="0.6"
-                android:gravity="center"
-                android:orientation="horizontal"
-                style="@style/calls_list_header_font"
-                android:text="@string/conference_schedule_participants_list"/>
-
-            <ImageView
-                android:onClick="@{applyClickListener}"
-                android:enabled="@{viewModel.selectedAddresses.size() > 0}"
-                android:contentDescription="@string/content_description_enter_edition_mode"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="0.2"
-                android:padding="18dp"
-                android:src="@drawable/icon_apply" />
-
-        </LinearLayout>
-
-        <EditText
-            android:text="@={viewModel.filter}"
-            android:layout_width="match_parent"
-            android:layout_height="40dp"
-            android:inputType="textPersonName"
-            android:layout_margin="10dp"
-            android:drawableLeft="@drawable/search"
-            android:drawablePadding="10dp"
-            android:background="@color/transparent_color"
-            android:backgroundTint="@color/transparent_color"
-            android:hint="@string/contact_filter_hint"/>
-
-        <HorizontalScrollView
-            android:id="@+id/layoutContactsSelected"
-            android:layout_width="match_parent"
-            android:layout_height="50dp"
-            android:background="?attr/voipToolbarBackgroundColor"
-            android:fadeScrollbars="false"
-            android:lines="1">
-
-            <LinearLayout
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:lines="1"
-                android:orientation="horizontal"
-                android:paddingLeft="10dp"
-                android:paddingRight="10dp"
-                android:scrollIndicators="bottom"
-                app:entries="@{viewModel.selectedAddresses}"
-                app:parent="@{viewModel}"
-                app:layout="@{@layout/contact_selected_cell}" />
-
-        </HorizontalScrollView>
-
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/contactsList"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent" />
-
-        <TextView
-            style="@style/empty_list_font"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:gravity="center"
-            android:text="@string/no_sip_contact"
-            android:visibility="@{viewModel.sipContactsSelected &amp;&amp; viewModel.contactsList.empty ? View.VISIBLE : View.GONE}" />
-
-        <TextView
-            style="@style/empty_list_font"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:gravity="center"
-            android:text="@string/no_contact"
-            android:visibility="@{!viewModel.sipContactsSelected &amp;&amp; viewModel.contactsList.empty ? View.VISIBLE : View.GONE}" />
-
-    </LinearLayout>
-
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/voip_conference_participants_fragment.xml b/app/src/main/res/layout/voip_conference_participants_fragment.xml
deleted file mode 100644
index d51cfe6ec..000000000
--- a/app/src/main/res/layout/voip_conference_participants_fragment.xml
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <data>
-
-        <import type="android.view.View" />
-
-        <variable
-            name="editClickListener"
-            type="android.view.View.OnClickListener" />
-
-        <variable
-            name="cancelClickListener"
-            type="android.view.View.OnClickListener" />
-
-        <variable
-            name="conferenceViewModel"
-            type="org.linphone.activities.voip.viewmodels.ConferenceViewModel" />
-
-        <variable
-            name="controlsViewModel"
-            type="org.linphone.activities.voip.viewmodels.ControlsViewModel" />
-    </data>
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:id="@+id/top_bar"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/voip_top_bar_size"
-            android:background="?attr/voipToolbarBackgroundColor"
-            app:layout_constraintTop_toTopOf="parent">
-
-            <TextView
-                style="@style/calls_list_header_font"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_marginStart="20dp"
-                android:gravity="center_vertical"
-                android:text="@string/call_action_participants_list"
-                app:layout_constraintTop_toBottomOf="@id/top_bar" />
-
-            <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:contentDescription="@string/content_description_add_participants"
-                android:onClick="@{editClickListener}"
-                android:src="@drawable/icon_edit_alt"
-                android:visibility="@{conferenceViewModel.isMeAdmin ? View.VISIBLE : View.GONE, default=gone}"
-                app:layout_constraintEnd_toStartOf="@id/cancel" />
-
-            <ImageView
-                android:id="@+id/cancel"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:contentDescription="@string/cancel"
-                android:onClick="@{cancelClickListener}"
-                android:padding="10dp"
-                android:src="@drawable/icon_cancel"
-                app:layout_constraintEnd_toEndOf="parent" />
-
-        </androidx.constraintlayout.widget.ConstraintLayout>
-
-        <androidx.core.widget.NestedScrollView
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:background="?attr/voipBackgroundBWColor"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/top_bar">
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical"
-                app:entries="@{conferenceViewModel.conferenceParticipants}"
-                app:layout="@{conferenceViewModel.isBroadcast ? @layout/voip_conference_participant_broadcast_cell : @layout/voip_conference_participant_cell}" />
-
-        </androidx.core.widget.NestedScrollView>
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/conference_empty"
-            android:visibility="@{conferenceViewModel.conferenceParticipants.empty ? View.VISIBLE : View.GONE}"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/top_bar" />
-
-        <org.linphone.activities.voip.views.RoundCornersTextureView
-            android:id="@+id/local_preview_video_surface"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:layout_margin="10dp"
-            android:layout_size="@{@dimen/video_preview_max_size}"
-            app:alignTopRight="true"
-            app:displayMode="black_bars"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintHeight_max="200dp"
-            app:layout_constraintWidth_max="200dp" />
-
-        <ImageView
-            android:id="@+id/switch_camera"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_margin="5dp"
-            android:contentDescription="@string/content_description_switch_camera"
-            android:onClick="@{() -> controlsViewModel.switchCamera()}"
-            android:padding="10dp"
-            android:src="@drawable/icon_call_camera_switch"
-            android:visibility="@{controlsViewModel.isSwitchCameraAvailable &amp;&amp; !controlsViewModel.pipMode ? View.VISIBLE : View.GONE, default=gone}"
-            app:layout_constraintEnd_toEndOf="@id/local_preview_video_surface"
-            app:layout_constraintTop_toTopOf="@id/local_preview_video_surface" />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/voip_conference_paused.xml b/app/src/main/res/layout/voip_conference_paused.xml
deleted file mode 100644
index e4e85fbf1..000000000
--- a/app/src/main/res/layout/voip_conference_paused.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <data>
-        <import type="android.view.View" />
-        <variable
-            name="conferenceViewModel"
-            type="org.linphone.activities.voip.viewmodels.ConferenceViewModel" />
-        <variable
-            name="inflatedVisibility"
-            type="Integer" />
-    </data>
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="@color/voip_translucent_popup_background"
-        android:clickable="true"
-        android:focusable="true"
-        android:visibility="@{inflatedVisibility}"
-        inflatedLifecycleOwner="@{true}">
-
-        <ImageView
-            android:id="@+id/resume_conference"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            app:layout_constraintHeight_max="@dimen/voip_contact_avatar_max_size"
-            app:layout_constraintWidth_max="@dimen/voip_contact_avatar_max_size"
-            app:layout_constraintDimensionRatio="1:1"
-            android:layout_marginTop="5dp"
-            android:background="@drawable/shape_orange_circle"
-            android:contentDescription="@null"
-            android:onClick="@{() -> conferenceViewModel.resumeConference()}"
-            android:padding="40dp"
-            android:src="@drawable/voip_conference_play_big"
-            app:layout_constraintBottom_toTopOf="@id/out_of_conf_title"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintVertical_chainStyle="packed" />
-
-        <TextView
-            android:id="@+id/out_of_conf_title"
-            style="@style/conference_paused_title_font"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="20dp"
-            android:gravity="center"
-            android:text="@string/conference_paused_title"
-            app:layout_constraintBottom_toTopOf="@id/out_of_conf_subtitle"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/resume_conference" />
-
-        <TextView
-            android:id="@+id/out_of_conf_subtitle"
-            style="@style/conference_paused_subtitle_font"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="5dp"
-            android:gravity="center"
-            android:text="@string/conference_paused_subtitle"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/out_of_conf_title" />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/voip_dialog.xml b/app/src/main/res/layout/voip_dialog.xml
deleted file mode 100644
index 8cf555de1..000000000
--- a/app/src/main/res/layout/voip_dialog.xml
+++ /dev/null
@@ -1,227 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <data>
-        <import type="android.view.View"/>
-        <variable
-            name="viewModel"
-            type="org.linphone.activities.main.viewmodels.DialogViewModel" />
-    </data>
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:onClick="@{() -> viewModel.dismiss()}"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:clickable="true"
-        android:focusable="true">
-
-        <androidx.constraintlayout.widget.Barrier
-            android:id="@+id/top_barrier"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            app:barrierDirection="top"
-            app:constraint_referenced_ids="dialog_icon, dialog_title, dialog_message" />
-
-        <View
-            android:id="@+id/background"
-            android:clickable="true"
-            android:focusable="true"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:layout_marginStart="10dp"
-            android:layout_marginEnd="10dp"
-            android:layout_marginBottom="-20dp"
-            android:layout_marginTop="-10dp"
-            android:background="@drawable/shape_dialog_background"
-            app:layout_constraintBottom_toBottomOf="@id/buttons_bottom_barrier"
-            app:layout_constraintTop_toTopOf="@id/top_barrier"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent" />
-
-        <ImageView
-            android:id="@+id/dialog_icon"
-            android:layout_width="60dp"
-            android:layout_height="60dp"
-            android:layout_marginBottom="10dp"
-            android:adjustViewBounds="true"
-            android:contentDescription="@{viewModel.title}"
-            android:src="@{viewModel.iconResource, default=@drawable/security_alert_indicator}"
-            android:visibility="@{viewModel.showIcon ? View.VISIBLE : View.GONE}"
-            app:layout_constraintVertical_chainStyle="packed"
-            app:layout_constraintBottom_toTopOf="@id/dialog_title"
-            app:layout_constraintEnd_toEndOf="@id/background"
-            app:layout_constraintStart_toStartOf="@id/background"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <TextView
-            android:id="@+id/dialog_title"
-            style="@style/dialog_title_font"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_margin="10dp"
-            android:gravity="center"
-            android:text="@{viewModel.title, default=Title}"
-            android:visibility="@{viewModel.showTitle ? View.VISIBLE : View.GONE}"
-            app:layout_constraintBottom_toTopOf="@id/dialog_message"
-            app:layout_constraintEnd_toEndOf="@id/background"
-            app:layout_constraintStart_toStartOf="@id/background"
-            app:layout_constraintTop_toBottomOf="@id/dialog_icon" />
-
-        <TextView
-            android:id="@+id/dialog_message"
-            style="@style/dialog_message_font"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="20dp"
-            android:layout_marginTop="10dp"
-            android:layout_marginEnd="20dp"
-            android:gravity="center"
-            android:text="@{viewModel.message, default=Message}"
-            app:layout_constraintBottom_toTopOf="@id/dialog_zrtp_1"
-            app:layout_constraintEnd_toEndOf="@id/background"
-            app:layout_constraintStart_toStartOf="@id/background"
-            app:layout_constraintTop_toBottomOf="@id/dialog_title" />
-
-        <androidx.constraintlayout.widget.Group
-            android:id="@+id/dialog_zrtp_group"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:visibility="@{viewModel.showZrtp ? View.VISIBLE : View.GONE}"
-            app:constraint_referenced_ids="dialog_zrtp_1, dialog_zrtp_sas_1, dialog_zrtp_2, dialog_zrtp_sas_2" />
-
-        <TextView
-            android:id="@+id/dialog_zrtp_1"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
-            android:gravity="center"
-            android:text="@string/dialog_zrtp_local_sas"
-            android:textAppearance="@style/dialog_zrtp_white_font"
-            app:layout_constraintBottom_toTopOf="@id/dialog_zrtp_sas_1"
-            app:layout_constraintEnd_toEndOf="@id/background"
-            app:layout_constraintStart_toStartOf="@id/background"
-            app:layout_constraintTop_toBottomOf="@id/dialog_message" />
-
-        <TextView
-            android:id="@+id/dialog_zrtp_sas_1"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="5dp"
-            android:gravity="center"
-            android:text="@{viewModel.zrtpReadSas}"
-            android:textAppearance="@style/dialog_zrtp_colored_font"
-            app:layout_constraintBottom_toTopOf="@id/dialog_zrtp_2"
-            app:layout_constraintEnd_toEndOf="@id/background"
-            app:layout_constraintStart_toStartOf="@id/background"
-            app:layout_constraintTop_toBottomOf="@id/dialog_zrtp_1" />
-
-        <TextView
-            android:id="@+id/dialog_zrtp_2"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
-            android:gravity="center"
-            android:text="@string/dialog_zrtp_remote_sas"
-            android:textAppearance="@style/dialog_zrtp_white_font"
-            app:layout_constraintBottom_toTopOf="@id/dialog_zrtp_sas_2"
-            app:layout_constraintEnd_toEndOf="@id/background"
-            app:layout_constraintStart_toStartOf="@id/background"
-            app:layout_constraintTop_toBottomOf="@id/dialog_zrtp_sas_1" />
-
-        <TextView
-            android:id="@+id/dialog_zrtp_sas_2"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="5dp"
-            android:gravity="center"
-            android:text="@{viewModel.zrtpListenSas}"
-            android:textAppearance="@style/dialog_zrtp_colored_font"
-            app:layout_constraintBottom_toTopOf="@id/cancel_button"
-            app:layout_constraintEnd_toEndOf="@id/background"
-            app:layout_constraintStart_toStartOf="@id/background"
-            app:layout_constraintTop_toBottomOf="@id/dialog_zrtp_2" />
-
-        <TextView
-            android:id="@+id/cancel_button"
-            style="@style/big_orange_button_font"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="10dp"
-            android:layout_marginTop="20dp"
-            android:layout_marginBottom="10dp"
-            android:background="@drawable/shape_rect_gray_button"
-            android:ellipsize="end"
-            android:gravity="center"
-            android:onClick="@{() -> viewModel.onCancelClicked()}"
-            android:padding="10dp"
-            android:singleLine="true"
-            android:text="@{viewModel.cancelLabel, default=Cancel}"
-            android:visibility="@{viewModel.showCancel ? View.VISIBLE : View.GONE}"
-            app:layout_constraintEnd_toStartOf="@id/delete_button"
-            app:layout_constraintHorizontal_chainStyle="spread"
-            app:layout_constraintStart_toStartOf="@id/background"
-            app:layout_constraintTop_toBottomOf="@id/dialog_zrtp_sas_2"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintWidth_max="@dimen/voip_dialog_button_max_width" />
-
-        <TextView
-            android:id="@+id/delete_button"
-            style="@style/big_orange_button_font"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="10dp"
-            android:layout_marginTop="20dp"
-            android:layout_marginEnd="10dp"
-            android:layout_marginBottom="10dp"
-            android:background="@drawable/shape_rect_orange_button"
-            android:ellipsize="end"
-            android:gravity="center"
-            android:onClick="@{() -> viewModel.onDeleteClicked()}"
-            android:padding="10dp"
-            android:singleLine="true"
-            android:text="@{viewModel.deleteLabel, default=Delete}"
-            android:visibility="@{viewModel.showDelete ? View.VISIBLE : View.GONE}"
-            app:layout_constraintEnd_toStartOf="@id/ok_button"
-            app:layout_constraintStart_toEndOf="@id/cancel_button"
-            app:layout_constraintTop_toBottomOf="@id/dialog_zrtp_sas_2"
-            app:layout_constraintWidth_max="@dimen/voip_dialog_button_max_width" />
-
-        <TextView
-            android:id="@+id/ok_button"
-            style="@style/big_orange_button_font"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="10dp"
-            android:layout_marginBottom="10dp"
-            android:layout_marginTop="20dp"
-            android:background="@drawable/shape_rect_green_button"
-            android:ellipsize="end"
-            android:gravity="center"
-            android:onClick="@{() -> viewModel.onOkClicked()}"
-            android:padding="10dp"
-            android:singleLine="true"
-            android:text="@{viewModel.okLabel, default=OK}"
-            android:visibility="@{viewModel.showOk ? View.VISIBLE : View.GONE}"
-            app:layout_constraintEnd_toEndOf="@id/background"
-            app:layout_constraintStart_toEndOf="@id/delete_button"
-            app:layout_constraintTop_toBottomOf="@id/dialog_zrtp_sas_2"
-            app:layout_constraintWidth_max="@dimen/voip_dialog_button_max_width" />
-
-        <androidx.constraintlayout.widget.Barrier
-            android:id="@+id/buttons_top_barrier"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            app:barrierDirection="bottom"
-            app:constraint_referenced_ids="dialog_message, dialog_zrtp_sas_2" />
-
-        <androidx.constraintlayout.widget.Barrier
-            android:id="@+id/buttons_bottom_barrier"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            app:barrierDirection="bottom"
-            app:constraint_referenced_ids="ok_button,delete_button,cancel_button" />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/voip_dialog_info.xml b/app/src/main/res/layout/voip_dialog_info.xml
deleted file mode 100644
index 16e57a6de..000000000
--- a/app/src/main/res/layout/voip_dialog_info.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <data>
-        <import type="android.view.View"/>
-        <variable
-            name="dialogMessage"
-            type="String" />
-        <variable
-            name="dismissClickListener"
-            type="android.view.View.OnClickListener" />
-    </data>
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="@color/voip_translucent_popup_background"
-        android:clickable="true"
-        android:focusable="true">
-
-        <View
-            android:id="@+id/background"
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_marginStart="10dp"
-            android:layout_marginTop="-20dp"
-            android:layout_marginEnd="10dp"
-            android:layout_marginBottom="-20dp"
-            android:background="@drawable/shape_dialog_background"
-            app:layout_constraintBottom_toBottomOf="@id/ok_button"
-            app:layout_constraintTop_toTopOf="@id/dialog_message"/>
-
-        <TextView
-            android:id="@+id/dialog_message"
-            style="@style/dialog_message_font"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="30dp"
-            android:layout_marginEnd="30dp"
-            android:layout_marginBottom="20dp"
-            android:gravity="center"
-            android:text="@{dialogMessage}"
-            app:layout_constraintBottom_toTopOf="@id/ok_button"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"/>
-
-        <TextView
-            android:id="@+id/ok_button"
-            style="@style/big_orange_button_font"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:layout_marginTop="20dp"
-            android:layout_marginBottom="20dp"
-            android:background="@drawable/shape_rect_orange_button"
-            android:onClick="@{dismissClickListener}"
-            android:paddingLeft="40dp"
-            android:paddingTop="8dp"
-            android:paddingRight="40dp"
-            android:paddingBottom="8dp"
-            android:text="@string/dialog_ok"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"/>
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/voip_numpad.xml b/app/src/main/res/layout/voip_numpad.xml
deleted file mode 100644
index 5f5bdbab0..000000000
--- a/app/src/main/res/layout/voip_numpad.xml
+++ /dev/null
@@ -1,227 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <data>
-        <import type="android.view.View" />
-        <variable
-            name="controlsViewModel"
-            type="org.linphone.activities.voip.viewmodels.ControlsViewModel" />
-        <variable
-            name="inflatedVisibility"
-            type="Integer" />
-    </data>
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/numpad_layout"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="@color/voip_translucent_popup_background"
-        android:clickable="true"
-        android:visibility="@{inflatedVisibility}"
-        inflatedLifecycleOwner="@{true}">
-
-        <View
-            android:id="@+id/background"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_marginStart="10dp"
-            android:layout_marginTop="80dp"
-            android:layout_marginEnd="10dp"
-            android:layout_marginBottom="70dp"
-            android:background="@drawable/shape_call_popup_background"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintWidth_max="@dimen/voip_views_max_width" />
-
-        <ImageView
-            android:id="@+id/hide_numpad"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
-            android:layout_margin="10dp"
-            android:contentDescription="@string/content_description_hide_numpad"
-            android:onClick="@{() -> controlsViewModel.hideNumpad()}"
-            android:src="@drawable/icon_cancel_alt"
-            app:layout_constraintEnd_toEndOf="@id/background"
-            app:layout_constraintTop_toTopOf="@id/background" />
-
-        <TextView
-            android:id="@+id/entered_dtmfs"
-            style="@style/call_dtmf_history_font"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_margin="10dp"
-            android:ellipsize="start"
-            android:gravity="center_horizontal"
-            android:maxLines="1"
-            android:text="@{controlsViewModel.dtmfHistory, default=`0123456`}"
-            app:layout_constraintEnd_toEndOf="@id/background"
-            app:layout_constraintStart_toStartOf="@id/background"
-            app:layout_constraintTop_toBottomOf="@id/hide_numpad" />
-
-        <ImageView
-            android:id="@+id/dtmf_1"
-            style="@style/call_numpad_digit"
-            android:contentDescription="@string/content_description_numpad_1"
-            android:onClick="@{() -> controlsViewModel.handleDtmfClick('1')}"
-            android:src="@drawable/voip_numpad_1"
-            app:layout_constraintBottom_toTopOf="@id/dtmf_4"
-            app:layout_constraintDimensionRatio="1:1"
-            app:layout_constraintEnd_toStartOf="@id/dtmf_2"
-            app:layout_constraintHorizontal_chainStyle="spread"
-            app:layout_constraintStart_toStartOf="@id/background"
-            app:layout_constraintTop_toBottomOf="@id/entered_dtmfs"
-            app:layout_constraintVertical_chainStyle="spread"
-            app:layout_constraintWidth_max="@dimen/voip_numpad_button_max_size" />
-
-        <ImageView
-            android:id="@+id/dtmf_2"
-            style="@style/call_numpad_digit"
-            android:contentDescription="@string/content_description_numpad_2"
-            android:onClick="@{() -> controlsViewModel.handleDtmfClick('2')}"
-            android:src="@drawable/voip_numpad_2"
-            app:layout_constraintBottom_toTopOf="@id/dtmf_5"
-            app:layout_constraintDimensionRatio="1:1"
-            app:layout_constraintEnd_toStartOf="@id/dtmf_3"
-            app:layout_constraintStart_toEndOf="@id/dtmf_1"
-            app:layout_constraintTop_toBottomOf="@id/entered_dtmfs"
-            app:layout_constraintVertical_chainStyle="spread"
-            app:layout_constraintWidth_max="@dimen/voip_numpad_button_max_size" />
-
-        <ImageView
-            android:id="@+id/dtmf_3"
-            style="@style/call_numpad_digit"
-            android:contentDescription="@string/content_description_numpad_3"
-            android:onClick="@{() -> controlsViewModel.handleDtmfClick('3')}"
-            android:src="@drawable/voip_numpad_3"
-            app:layout_constraintBottom_toTopOf="@id/dtmf_6"
-            app:layout_constraintDimensionRatio="1:1"
-            app:layout_constraintEnd_toEndOf="@id/background"
-            app:layout_constraintStart_toEndOf="@id/dtmf_2"
-            app:layout_constraintTop_toBottomOf="@id/entered_dtmfs"
-            app:layout_constraintVertical_chainStyle="spread"
-            app:layout_constraintWidth_max="@dimen/voip_numpad_button_max_size" />
-
-        <ImageView
-            android:id="@+id/dtmf_4"
-            style="@style/call_numpad_digit"
-            android:contentDescription="@string/content_description_numpad_4"
-            android:onClick="@{() -> controlsViewModel.handleDtmfClick('4')}"
-            android:src="@drawable/voip_numpad_4"
-            app:layout_constraintBottom_toTopOf="@id/dtmf_7"
-            app:layout_constraintDimensionRatio="1:1"
-            app:layout_constraintEnd_toStartOf="@id/dtmf_5"
-            app:layout_constraintHorizontal_chainStyle="spread"
-            app:layout_constraintStart_toStartOf="@id/background"
-            app:layout_constraintTop_toBottomOf="@id/dtmf_1"
-            app:layout_constraintWidth_max="@dimen/voip_numpad_button_max_size" />
-
-        <ImageView
-            android:id="@+id/dtmf_5"
-            style="@style/call_numpad_digit"
-            android:contentDescription="@string/content_description_numpad_5"
-            android:onClick="@{() -> controlsViewModel.handleDtmfClick('5')}"
-            android:src="@drawable/voip_numpad_5"
-            app:layout_constraintBottom_toTopOf="@id/dtmf_8"
-            app:layout_constraintDimensionRatio="1:1"
-            app:layout_constraintEnd_toStartOf="@id/dtmf_6"
-            app:layout_constraintStart_toEndOf="@id/dtmf_4"
-            app:layout_constraintTop_toBottomOf="@id/dtmf_2"
-            app:layout_constraintWidth_max="@dimen/voip_numpad_button_max_size" />
-
-        <ImageView
-            android:id="@+id/dtmf_6"
-            style="@style/call_numpad_digit"
-            android:contentDescription="@string/content_description_numpad_6"
-            android:onClick="@{() -> controlsViewModel.handleDtmfClick('6')}"
-            android:src="@drawable/voip_numpad_6"
-            app:layout_constraintBottom_toTopOf="@id/dtmf_9"
-            app:layout_constraintDimensionRatio="1:1"
-            app:layout_constraintEnd_toEndOf="@id/background"
-            app:layout_constraintStart_toEndOf="@id/dtmf_5"
-            app:layout_constraintTop_toBottomOf="@id/dtmf_3"
-            app:layout_constraintWidth_max="@dimen/voip_numpad_button_max_size" />
-
-        <ImageView
-            android:id="@+id/dtmf_7"
-            style="@style/call_numpad_digit"
-            android:contentDescription="@string/content_description_numpad_7"
-            android:onClick="@{() -> controlsViewModel.handleDtmfClick('7')}"
-            android:src="@drawable/voip_numpad_7"
-            app:layout_constraintBottom_toTopOf="@id/dtmf_star"
-            app:layout_constraintDimensionRatio="1:1"
-            app:layout_constraintEnd_toStartOf="@id/dtmf_8"
-            app:layout_constraintHorizontal_chainStyle="spread"
-            app:layout_constraintStart_toStartOf="@id/background"
-            app:layout_constraintTop_toBottomOf="@id/dtmf_4"
-            app:layout_constraintWidth_max="@dimen/voip_numpad_button_max_size" />
-
-        <ImageView
-            android:id="@+id/dtmf_8"
-            style="@style/call_numpad_digit"
-            android:contentDescription="@string/content_description_numpad_8"
-            android:onClick="@{() -> controlsViewModel.handleDtmfClick('8')}"
-            android:src="@drawable/voip_numpad_8"
-            app:layout_constraintBottom_toTopOf="@id/dtmf_0"
-            app:layout_constraintDimensionRatio="1:1"
-            app:layout_constraintEnd_toStartOf="@id/dtmf_9"
-            app:layout_constraintStart_toEndOf="@id/dtmf_7"
-            app:layout_constraintTop_toBottomOf="@id/dtmf_5"
-            app:layout_constraintWidth_max="@dimen/voip_numpad_button_max_size" />
-
-        <ImageView
-            android:id="@+id/dtmf_9"
-            style="@style/call_numpad_digit"
-            android:contentDescription="@string/content_description_numpad_9"
-            android:onClick="@{() -> controlsViewModel.handleDtmfClick('9')}"
-            android:src="@drawable/voip_numpad_9"
-            app:layout_constraintBottom_toTopOf="@id/dtmf_sharp"
-            app:layout_constraintDimensionRatio="1:1"
-            app:layout_constraintEnd_toEndOf="@id/background"
-            app:layout_constraintStart_toEndOf="@id/dtmf_8"
-            app:layout_constraintTop_toBottomOf="@id/dtmf_6"
-            app:layout_constraintWidth_max="@dimen/voip_numpad_button_max_size" />
-
-        <ImageView
-            android:id="@+id/dtmf_star"
-            style="@style/call_numpad_digit"
-            android:contentDescription="@string/content_description_numpad_star"
-            android:onClick="@{() -> controlsViewModel.handleDtmfClick('*')}"
-            android:src="@drawable/voip_numpad_star"
-            app:layout_constraintBottom_toBottomOf="@id/background"
-            app:layout_constraintDimensionRatio="1:1"
-            app:layout_constraintEnd_toStartOf="@id/dtmf_0"
-            app:layout_constraintHorizontal_chainStyle="spread"
-            app:layout_constraintStart_toStartOf="@id/background"
-            app:layout_constraintTop_toBottomOf="@id/dtmf_7"
-            app:layout_constraintWidth_max="@dimen/voip_numpad_button_max_size" />
-
-        <ImageView
-            android:id="@+id/dtmf_0"
-            style="@style/call_numpad_digit"
-            android:contentDescription="@string/content_description_numpad_0"
-            android:onClick="@{() -> controlsViewModel.handleDtmfClick('0')}"
-            android:src="@drawable/voip_numpad_0"
-            app:layout_constraintBottom_toBottomOf="@id/background"
-            app:layout_constraintDimensionRatio="1:1"
-            app:layout_constraintEnd_toStartOf="@id/dtmf_sharp"
-            app:layout_constraintStart_toEndOf="@id/dtmf_star"
-            app:layout_constraintTop_toBottomOf="@id/dtmf_8"
-            app:layout_constraintWidth_max="@dimen/voip_numpad_button_max_size" />
-
-        <ImageView
-            android:id="@+id/dtmf_sharp"
-            style="@style/call_numpad_digit"
-            android:contentDescription="@string/content_description_numpad_sharp"
-            android:onClick="@{() -> controlsViewModel.handleDtmfClick('#')}"
-            android:src="@drawable/voip_numpad_hash"
-            app:layout_constraintBottom_toBottomOf="@id/background"
-            app:layout_constraintDimensionRatio="1:1"
-            app:layout_constraintEnd_toEndOf="@id/background"
-            app:layout_constraintStart_toEndOf="@id/dtmf_0"
-            app:layout_constraintTop_toBottomOf="@id/dtmf_9"
-            app:layout_constraintWidth_max="@dimen/voip_numpad_button_max_size" />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/voip_remote_recording.xml b/app/src/main/res/layout/voip_remote_recording.xml
deleted file mode 100644
index 9b41245e0..000000000
--- a/app/src/main/res/layout/voip_remote_recording.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <data>
-
-        <import type="android.view.View" />
-    </data>
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/remote_recording_layout"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingTop="10dp"
-        android:paddingStart="10dp"
-        android:paddingEnd="10dp">
-
-        <View
-            android:id="@+id/remote_recording_background"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:background="@drawable/shape_remote_recording_background"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <ImageView
-            android:id="@+id/remote_recording_icon"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:contentDescription="@null"
-            android:src="@drawable/voip_remote_recording"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toStartOf="@id/remote_recording_text"
-            app:layout_constraintHorizontal_chainStyle="packed"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <TextView
-            android:id="@+id/remote_recording_text"
-            style="@style/call_remote_recording_font"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="10dp"
-            android:gravity="center"
-            android:text="@string/call_remote_recording"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@id/remote_recording_icon"
-            app:layout_constraintTop_toTopOf="parent" />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/voip_single_call_fragment.xml b/app/src/main/res/layout/voip_single_call_fragment.xml
deleted file mode 100644
index 42c3ae54a..000000000
--- a/app/src/main/res/layout/voip_single_call_fragment.xml
+++ /dev/null
@@ -1,355 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:bind="http://schemas.android.com/tools">
-
-    <data>
-
-        <import type="android.view.View" />
-
-        <import type="com.google.android.flexbox.FlexDirection" />
-
-        <variable
-            name="controlsViewModel"
-            type="org.linphone.activities.voip.viewmodels.ControlsViewModel" />
-
-        <variable
-            name="callsViewModel"
-            type="org.linphone.activities.voip.viewmodels.CallsViewModel" />
-
-        <variable
-            name="conferenceViewModel"
-            type="org.linphone.activities.voip.viewmodels.ConferenceViewModel" />
-
-        <variable
-            name="statsViewModel"
-            type="org.linphone.activities.voip.viewmodels.StatisticsListViewModel" />
-    </data>
-
-
-    <androidx.coordinatorlayout.widget.CoordinatorLayout
-        android:id="@+id/coordinator"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="?attr/voipBackgroundColor">
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:id="@+id/constraint_layout"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:background="@{controlsViewModel.fullScreenMode ? @color/black_color : @color/transparent_color}">
-
-            <View
-                android:id="@+id/top_barrier"
-                android:layout_width="0dp"
-                android:layout_height="1dp"
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                android:layout_marginTop="@{controlsViewModel.fullScreenMode || controlsViewModel.pipMode || controlsViewModel.folded ? @dimen/margin_0dp : callsViewModel.currentCallData.isRemotelyRecorded ? @dimen/voip_single_call_header_size_with_record_info : @dimen/voip_single_call_header_size, default=@dimen/voip_single_call_header_size}"/>
-
-            <androidx.constraintlayout.widget.Guideline
-                android:id="@+id/hinge_top"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                app:layout_constraintGuide_percent="0" />
-
-            <androidx.constraintlayout.widget.Guideline
-                android:id="@+id/hinge_bottom"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                app:layout_constraintGuide_percent="1" />
-
-            <androidx.constraintlayout.widget.Group
-                android:id="@+id/group"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:visibility="@{controlsViewModel.fullScreenMode || controlsViewModel.pipMode ? View.GONE : View.VISIBLE}"
-                app:constraint_referenced_ids="remote_name,active_call_timer,remote_address" />
-
-            <TextView
-                android:id="@+id/remote_name"
-                style="@style/call_header_title"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="10dp"
-                android:layout_marginTop="10dp"
-                android:text="@{(callsViewModel.currentCallData.contact.name ?? callsViewModel.currentCallData.displayName) + ` - `, default=`John Doe - `}"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/hinge_top" />
-
-            <Chronometer
-                android:id="@+id/active_call_timer"
-                style="@style/call_header_title"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="10dp"
-                app:layout_constraintStart_toEndOf="@id/remote_name"
-                app:layout_constraintTop_toBottomOf="@id/hinge_top" />
-
-            <TextView
-                android:id="@+id/remote_address"
-                style="@style/call_header_subtitle"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="10dp"
-                android:ellipsize="end"
-                android:maxLines="1"
-                android:text="@{callsViewModel.currentCallData.displayableAddress, default=`sip:johndoe@sip.linphone.org`}"
-                android:textIsSelectable="true"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/remote_name" />
-
-            <include
-                android:id="@+id/remotely_recorded"
-                layout="@layout/voip_remote_recording"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:visibility="@{callsViewModel.currentCallData.isRemotelyRecorded ? View.VISIBLE : View.GONE, default=gone}"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/remote_address" />
-
-            <androidx.constraintlayout.widget.Barrier
-                android:id="@+id/call_header_barrier"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                app:barrierDirection="bottom"
-                app:constraint_referenced_ids="remote_address,remotely_recorded,top_barrier" />
-
-            <androidx.constraintlayout.widget.Barrier
-                android:id="@+id/bottom_barrier"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                app:barrierDirection="top"
-                app:constraint_referenced_ids="primary_buttons,hinge_bottom" />
-
-            <View
-                android:id="@+id/background"
-                android:layout_width="0dp"
-                android:layout_height="0dp"
-                android:layout_margin="@{controlsViewModel.fullScreenMode || controlsViewModel.pipMode ? @dimen/margin_0dp : @dimen/voip_remote_margin, default=@dimen/voip_remote_margin}"
-                android:background="@drawable/shape_remote_background"
-                app:layout_constraintBottom_toTopOf="@id/bottom_barrier"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/call_header_barrier" />
-
-            <ImageView
-                android:id="@+id/avatar"
-                android:layout_width="0dp"
-                android:layout_height="0dp"
-                android:layout_margin="20dp"
-                android:contentDescription="@null"
-                android:background="@drawable/generated_avatar_bg"
-                coilVoipContact="@{callsViewModel.currentCallData}"
-                app:layout_constraintBottom_toBottomOf="@id/background"
-                app:layout_constraintEnd_toEndOf="@id/background"
-                app:layout_constraintHeight_max="@dimen/voip_contact_avatar_max_size"
-                app:layout_constraintStart_toStartOf="@id/background"
-                app:layout_constraintTop_toTopOf="@id/background"
-                app:layout_constraintWidth_max="@dimen/voip_contact_avatar_max_size"
-                app:layout_constraintDimensionRatio="1:1"/>
-
-            <TextView
-                android:id="@+id/display_name"
-                style="@style/call_remote_name_font"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="10dp"
-                android:layout_marginBottom="10dp"
-                android:text="@{callsViewModel.currentCallData.contact.name ?? callsViewModel.currentCallData.displayName}"
-                app:layout_constraintBottom_toBottomOf="@id/background"
-                app:layout_constraintStart_toStartOf="@id/background" />
-
-            <org.linphone.activities.voip.views.RoundCornersTextureView
-                android:id="@+id/remote_video_surface"
-                android:layout_width="0dp"
-                android:layout_height="0dp"
-                android:onClick="@{() -> controlsViewModel.toggleFullScreen()}"
-                android:visibility="@{controlsViewModel.isVideoEnabled &amp;&amp; controlsViewModel.isSendingVideo &amp;&amp; !callsViewModel.currentCallData.isRemotelyPaused &amp;&amp; !callsViewModel.currentCallData.isPaused ? View.VISIBLE : View.GONE, default=gone}"
-                app:layout_constraintBottom_toBottomOf="@id/background"
-                app:layout_constraintEnd_toEndOf="@id/background"
-                app:layout_constraintStart_toStartOf="@id/background"
-                app:layout_constraintTop_toTopOf="@id/background" />
-
-            <ImageView
-                android:id="@+id/record_call"
-                android:layout_width="40dp"
-                android:layout_height="40dp"
-                android:layout_marginStart="10dp"
-                android:layout_marginTop="10dp"
-                android:background="@drawable/button_toggle_background"
-                android:contentDescription="@string/content_description_toggle_recording"
-                android:onClick="@{() -> callsViewModel.currentCallData.toggleRecording()}"
-                android:enabled="@{!callsViewModel.currentCallData.isPaused &amp;&amp; !callsViewModel.currentCallData.isRemotelyPaused}"
-                android:padding="7dp"
-                android:selected="@{callsViewModel.currentCallData.isRecording}"
-                android:src="@drawable/icon_call_record"
-                android:visibility="@{controlsViewModel.fullScreenMode || controlsViewModel.pipMode ? View.GONE : View.VISIBLE}"
-                app:layout_constraintStart_toStartOf="@id/background"
-                app:layout_constraintTop_toTopOf="@id/background" />
-
-            <ImageView
-                android:id="@+id/take_snapshot"
-                android:layout_width="40dp"
-                android:layout_height="40dp"
-                android:layout_margin="10dp"
-                android:background="@drawable/button_toggle_background"
-                android:contentDescription="@string/content_description_take_screenshot"
-                android:onClick="@{() -> controlsViewModel.takeSnapshot()}"
-                android:enabled="@{!callsViewModel.currentCallData.isPaused &amp;&amp; !callsViewModel.currentCallData.isRemotelyPaused}"
-                android:src="@drawable/icon_call_screenshot"
-                android:visibility="@{!controlsViewModel.showTakeSnapshotButton || controlsViewModel.fullScreenMode || controlsViewModel.pipMode ? View.GONE : View.VISIBLE}"
-                app:layout_constraintStart_toStartOf="@id/background"
-                app:layout_constraintTop_toBottomOf="@id/record_call" />
-
-            <ImageView
-                android:id="@+id/pause_call"
-                android:layout_width="40dp"
-                android:layout_height="40dp"
-                android:layout_marginEnd="10dp"
-                android:layout_marginTop="10dp"
-                android:background="@drawable/button_toggle_background"
-                android:contentDescription="@string/content_description_pause_call"
-                android:enabled="@{callsViewModel.currentCallData.isPaused || callsViewModel.currentCallData.canBePaused}"
-                android:onClick="@{() -> callsViewModel.currentCallData.togglePause()}"
-                android:padding="5dp"
-                android:selected="@{callsViewModel.currentCallData.isPaused}"
-                android:src="@drawable/icon_pause"
-                android:visibility="@{controlsViewModel.fullScreenMode || controlsViewModel.pipMode ? View.GONE : View.VISIBLE}"
-                app:layout_constraintEnd_toEndOf="@id/background"
-                app:layout_constraintTop_toTopOf="@id/background" />
-
-            <org.linphone.activities.voip.views.RoundCornersTextureView
-                android:id="@+id/local_preview_video_surface"
-                android:layout_width="0dp"
-                android:layout_height="0dp"
-                android:layout_size="@{controlsViewModel.pipMode ? @dimen/video_preview_pip_max_size : @dimen/video_preview_max_size}"
-                android:visibility="@{controlsViewModel.isVideoEnabled &amp;&amp; !callsViewModel.currentCallData.isRemotelyPaused &amp;&amp; !callsViewModel.currentCallData.isPaused ? View.VISIBLE : View.GONE}"
-                app:alignTopRight="true"
-                app:displayMode="black_bars"
-                app:layout_constraintBottom_toTopOf="@id/bottom_barrier"
-                app:layout_constraintEnd_toEndOf="@id/background"
-                app:layout_constraintHeight_max="200dp"
-                app:layout_constraintWidth_max="200dp"
-                bind:ignore="MissingConstraints" />
-
-            <ImageView
-                android:id="@+id/switch_camera"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_margin="5dp"
-                android:contentDescription="@string/content_description_switch_camera"
-                android:onClick="@{() -> controlsViewModel.switchCamera()}"
-                android:padding="10dp"
-                android:src="@drawable/icon_call_camera_switch"
-                android:visibility="@{controlsViewModel.isSendingVideo &amp;&amp; !callsViewModel.currentCallData.isRemotelyPaused &amp;&amp; !callsViewModel.currentCallData.isPaused &amp;&amp; controlsViewModel.isSwitchCameraAvailable &amp;&amp; !controlsViewModel.pipMode ? View.VISIBLE : View.GONE, default=gone}"
-                app:layout_constraintEnd_toEndOf="@id/local_preview_video_surface"
-                app:layout_constraintTop_toTopOf="@id/local_preview_video_surface" />
-
-            <ViewStub
-                android:id="@+id/stubbed_audio_routes"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="12dp"
-                android:layout_marginBottom="10dp"
-                android:layout="@layout/voip_buttons_audio_routes"
-                android:visibility="@{controlsViewModel.audioRoutesEnabled ? View.VISIBLE : View.GONE}"
-                app:controlsViewModel="@{controlsViewModel}"
-                app:inflatedVisibility="@{controlsViewModel.audioRoutesEnabled ? View.VISIBLE : View.GONE}"
-                app:layout_constraintBottom_toTopOf="@id/primary_buttons"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent" />
-
-            <include
-                android:id="@+id/primary_buttons"
-                layout="@layout/voip_buttons"
-                android:layout_width="0dp"
-                android:layout_height="@dimen/voip_buttons_fragment_size"
-                android:layout_marginStart="10dp"
-                android:layout_marginEnd="10dp"
-                android:layout_marginBottom="10dp"
-                android:visibility="@{controlsViewModel.fullScreenMode || controlsViewModel.pipMode ? View.GONE : View.VISIBLE}"
-                app:callsViewModel="@{callsViewModel}"
-                app:controlsViewModel="@{controlsViewModel}"
-                app:conferenceViewModel="@{conferenceViewModel}"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintWidth_max="@dimen/voip_buttons_max_width" />
-
-            <ViewStub
-                android:id="@+id/stubbed_remotely_paused_call"
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:layout_marginBottom="5dp"
-                android:layout="@layout/voip_call_paused_by_remote"
-                android:visibility="@{callsViewModel.currentCallData.isRemotelyPaused ? View.VISIBLE : View.GONE, default=gone}"
-                app:inflatedVisibility="@{callsViewModel.currentCallData.isRemotelyPaused ? View.VISIBLE : View.GONE}"
-                app:layout_constraintBottom_toTopOf="@id/bottom_barrier"
-                app:layout_constraintTop_toTopOf="parent" />
-
-            <ViewStub
-                android:id="@+id/stubbed_paused_call"
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:layout_marginBottom="5dp"
-                android:layout="@layout/voip_call_paused"
-                android:visibility="@{callsViewModel.currentCallData.isPaused ? View.VISIBLE : View.GONE, default=gone}"
-                app:data="@{callsViewModel.currentCallData}"
-                app:inflatedVisibility="@{callsViewModel.currentCallData.isPaused ? View.VISIBLE : View.GONE}"
-                app:layout_constraintBottom_toTopOf="@id/bottom_barrier"
-                app:layout_constraintTop_toTopOf="parent" />
-
-            <View
-                android:id="@+id/popup_background"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:background="@color/voip_translucent_popup_background"
-                android:onClick="@{() -> controlsViewModel.hideExtraButtons(false)}"
-                android:visibility="@{controlsViewModel.showExtras ? View.VISIBLE : View.GONE, default=gone}" />
-
-            <include
-                android:id="@+id/extra_buttons"
-                layout="@layout/voip_buttons_extra"
-                android:layout_width="0dp"
-                android:layout_height="@dimen/voip_call_extra_buttons_height"
-                android:layout_marginStart="15dp"
-                android:layout_marginEnd="15dp"
-                android:translationY="@{controlsViewModel.extraButtonsMenuTranslateY, default=@dimen/voip_call_extra_buttons_translate_y}"
-                android:visibility="@{View.VISIBLE, default=gone}"
-                app:callsViewModel="@{callsViewModel}"
-                app:conferenceViewModel="@{conferenceViewModel}"
-                app:controlsViewModel="@{controlsViewModel}"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintWidth_max="@dimen/voip_extra_menu_max_width" />
-
-            <ViewStub
-                android:id="@+id/stubbed_call_stats"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout="@layout/voip_call_stats"
-                android:visibility="@{controlsViewModel.callStatsVisible ? View.VISIBLE : View.GONE, default=gone}"
-                app:controlsViewModel="@{controlsViewModel}"
-                app:inflatedVisibility="@{controlsViewModel.callStatsVisible ? View.VISIBLE : View.GONE}"
-                app:statsViewModel="@{statsViewModel}" />
-
-            <ViewStub
-                android:id="@+id/stubbed_numpad"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout="@layout/voip_numpad"
-                android:visibility="@{controlsViewModel.numpadVisible ? View.VISIBLE : View.GONE, default=gone}"
-                app:controlsViewModel="@{controlsViewModel}"
-                app:inflatedVisibility="@{controlsViewModel.numpadVisible ? View.VISIBLE : View.GONE}" />
-
-        </androidx.constraintlayout.widget.ConstraintLayout>
-
-    </androidx.coordinatorlayout.widget.CoordinatorLayout>
-
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/voip_status_fragment.xml b/app/src/main/res/layout/voip_status_fragment.xml
deleted file mode 100644
index dbc77f614..000000000
--- a/app/src/main/res/layout/voip_status_fragment.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <data>
-        <import type="android.view.View"/>
-        <variable
-            name="refreshClickListener"
-            type="android.view.View.OnClickListener"/>
-        <variable
-            name="viewModel"
-            type="org.linphone.activities.voip.viewmodels.StatusViewModel" />
-    </data>
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/status_fragment_size"
-        android:background="?attr/accentColor"
-        android:orientation="horizontal">
-
-        <ImageView
-            android:id="@+id/stats_button"
-            android:onClick="@{() -> viewModel.showCallStats()}"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentStart="true"
-            android:layout_centerInParent="true"
-            android:contentDescription="@{viewModel.callQualityContentDescription}"
-            android:padding="10dp"
-            android:src="@{viewModel.callQualityIcon, default=@drawable/call_quality_indicator_0}" />
-
-        <ImageView
-            android:id="@+id/status_led"
-            android:background="@drawable/status_led_background"
-            android:src="@{viewModel.registrationStatusDrawable, default=@drawable/led_not_registered}"
-            android:onClick="@{refreshClickListener}"
-            android:contentDescription="@{viewModel.registrationStatusText}"
-            android:layout_width="20dp"
-            android:layout_height="wrap_content"
-            android:layout_centerInParent="true"
-            android:layout_toEndOf="@id/stats_button"
-            android:adjustViewBounds="true"
-            android:padding="2dp" />
-
-        <TextView
-            android:text="@{viewModel.registrationStatusText, default=@string/status_not_connected}"
-            android:onClick="@{refreshClickListener}"
-            android:textColor="?attr/accentTextColor"
-            android:textSize="15sp"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_centerVertical="true"
-            android:layout_toEndOf="@id/status_led"
-            android:gravity="center_vertical"
-            android:paddingStart="5dp"
-            android:paddingEnd="5dp" />
-
-        <ImageView
-            android:onClick="@{() -> viewModel.showZrtpDialog()}"
-            android:visibility="@{viewModel.encryptionIconVisible ? View.VISIBLE : View.GONE, default=gone}"
-            android:src="@{viewModel.encryptionIcon, default=@drawable/security_ko}"
-            android:contentDescription="@{viewModel.encryptionContentDescription}"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentEnd="true"
-            android:layout_centerInParent="true"
-            android:adjustViewBounds="true"
-            android:padding="10dp" />
-
-    </RelativeLayout>
-
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/wait_layout.xml b/app/src/main/res/layout/wait_layout.xml
deleted file mode 100644
index 5d1476912..000000000
--- a/app/src/main/res/layout/wait_layout.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <data>
-        <import type="android.view.View"/>
-        <variable
-            name="visibility"
-            type="Boolean" />
-    </data>
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:visibility="@{visibility ? View.VISIBLE : View.GONE}"
-        android:background="#99c4c4c4"
-        android:focusable="true"
-        android:clickable="true">
-
-        <ProgressBar
-            android:id="@+id/progress"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerInParent="true"
-            android:indeterminate="true"
-            android:indeterminateTint="?attr/accentColor"
-            android:indeterminateDrawable="@drawable/icon_spinner_rotating" />
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="center_horizontal"
-            android:layout_below="@id/progress"
-            android:layout_marginTop="10dp"
-            android:textColor="@color/primary_color"
-            android:textStyle="bold"
-            android:text="@string/operation_in_progress_wait" />
-
-    </RelativeLayout>
-
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
deleted file mode 100644
index 4fe59c4e6..000000000
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/primary_color" />
-    <foreground android:drawable="@mipmap/linphone_launcher_icon_foreground" />
-    <monochrome android:drawable="@mipmap/linphone_launcher_icon_foreground"/>
-</adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
deleted file mode 100644
index 4fe59c4e6..000000000
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/primary_color" />
-    <foreground android:drawable="@mipmap/linphone_launcher_icon_foreground" />
-    <monochrome android:drawable="@mipmap/linphone_launcher_icon_foreground"/>
-</adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png
deleted file mode 100644
index af7722189..000000000
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
deleted file mode 100644
index a0dc2e060..000000000
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-hdpi/linphone_launcher_icon_foreground.png b/app/src/main/res/mipmap-hdpi/linphone_launcher_icon_foreground.png
deleted file mode 100644
index 9814db082..000000000
Binary files a/app/src/main/res/mipmap-hdpi/linphone_launcher_icon_foreground.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png
deleted file mode 100644
index 4bf908cd7..000000000
Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
deleted file mode 100644
index 6822c177e..000000000
Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-mdpi/linphone_launcher_icon_foreground.png b/app/src/main/res/mipmap-mdpi/linphone_launcher_icon_foreground.png
deleted file mode 100644
index fc4df8f44..000000000
Binary files a/app/src/main/res/mipmap-mdpi/linphone_launcher_icon_foreground.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
deleted file mode 100644
index 7e717e4d6..000000000
Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
deleted file mode 100644
index af7199df7..000000000
Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xhdpi/linphone_launcher_icon_foreground.png b/app/src/main/res/mipmap-xhdpi/linphone_launcher_icon_foreground.png
deleted file mode 100644
index e00b4c182..000000000
Binary files a/app/src/main/res/mipmap-xhdpi/linphone_launcher_icon_foreground.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
deleted file mode 100644
index 78b30bafa..000000000
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
deleted file mode 100644
index 62992b974..000000000
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/linphone_launcher_icon_foreground.png b/app/src/main/res/mipmap-xxhdpi/linphone_launcher_icon_foreground.png
deleted file mode 100644
index 4cf81b117..000000000
Binary files a/app/src/main/res/mipmap-xxhdpi/linphone_launcher_icon_foreground.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
deleted file mode 100644
index 05c036329..000000000
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
deleted file mode 100644
index e5f1eef82..000000000
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/linphone_launcher_icon_foreground.png b/app/src/main/res/mipmap-xxxhdpi/linphone_launcher_icon_foreground.png
deleted file mode 100644
index bb4ed4310..000000000
Binary files a/app/src/main/res/mipmap-xxxhdpi/linphone_launcher_icon_foreground.png and /dev/null differ
diff --git a/app/src/main/res/navigation/assistant_nav_graph.xml b/app/src/main/res/navigation/assistant_nav_graph.xml
deleted file mode 100644
index a3a609cd2..000000000
--- a/app/src/main/res/navigation/assistant_nav_graph.xml
+++ /dev/null
@@ -1,173 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<navigation xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    app:startDestination="@id/welcomeFragment">
-
-    <fragment
-        android:id="@+id/welcomeFragment"
-        android:name="org.linphone.activities.assistant.fragments.WelcomeFragment"
-        tools:layout="@layout/assistant_welcome_fragment"
-        android:label="WelcomeFragment" >
-        <action
-            android:id="@+id/action_welcomeFragment_to_accountLoginFragment"
-            app:destination="@id/accountLoginFragment" />
-        <action
-            android:id="@+id/action_welcomeFragment_to_emailAccountCreationFragment"
-            app:destination="@id/emailAccountCreationFragment" />
-        <action
-            android:id="@+id/action_welcomeFragment_to_phoneAccountCreationFragment"
-            app:destination="@id/phoneAccountCreationFragment" />
-        <action
-            android:id="@+id/action_welcomeFragment_to_genericAccountWarningFragment"
-            app:destination="@id/genericAccountWarningFragment" />
-        <action
-            android:id="@+id/action_welcomeFragment_to_remoteProvisioningFragment"
-            app:destination="@id/remoteProvisioningFragment" />
-        <action
-            android:id="@+id/action_welcomeFragment_to_noPushWarningFragment"
-            app:destination="@id/noPushWarningFragment" />
-    </fragment>
-    <fragment
-        android:id="@+id/accountLoginFragment"
-        android:name="org.linphone.activities.assistant.fragments.AccountLoginFragment"
-        tools:layout="@layout/assistant_account_login_fragment"
-        android:label="AccountLoginFragment" >
-        <action
-            android:id="@+id/action_accountLoginFragment_to_echoCancellerCalibrationFragment"
-            app:destination="@id/echoCancellerCalibrationFragment" />
-        <action
-            android:id="@+id/action_accountLoginFragment_to_phoneAccountValidationFragment"
-            app:destination="@id/phoneAccountValidationFragment" />
-    </fragment>
-    <fragment
-        android:id="@+id/genericAccountWarningFragment"
-        android:name="org.linphone.activities.assistant.fragments.GenericAccountWarningFragment"
-        tools:layout="@layout/assistant_generic_account_warning_fragment"
-        android:label="GenericAccountWarningFragment" >
-        <action
-            android:id="@+id/action_genericAccountWarningFragment_to_genericAccountLoginFragment"
-            app:destination="@id/genericAccountLoginFragment" />
-    </fragment>
-    <fragment
-        android:id="@+id/genericAccountLoginFragment"
-        android:name="org.linphone.activities.assistant.fragments.GenericAccountLoginFragment"
-        tools:layout="@layout/assistant_generic_account_login_fragment"
-        android:label="GenericAccountLoginFragment" >
-        <action
-            android:id="@+id/action_genericAccountLoginFragment_to_echoCancellerCalibrationFragment"
-            app:destination="@id/echoCancellerCalibrationFragment" />
-    </fragment>
-    <fragment
-        android:id="@+id/remoteProvisioningFragment"
-        android:name="org.linphone.activities.assistant.fragments.RemoteProvisioningFragment"
-        tools:layout="@layout/assistant_remote_provisioning_fragment"
-        android:label="RemoteProvisioningFragment" >
-        <action
-            android:id="@+id/action_remoteProvisioningFragment_to_qrCodeFragment"
-            app:destination="@id/qrCodeFragment" />
-        <action
-            android:id="@+id/action_remoteProvisioningFragment_to_echoCancellerCalibrationFragment"
-            app:destination="@id/echoCancellerCalibrationFragment" />
-    </fragment>
-    <fragment
-        android:id="@+id/emailAccountCreationFragment"
-        android:name="org.linphone.activities.assistant.fragments.EmailAccountCreationFragment"
-        tools:layout="@layout/assistant_email_account_creation_fragment"
-        android:label="EmailAccountCreationFragment" >
-        <action
-            android:id="@+id/action_emailAccountCreationFragment_to_emailAccountValidationFragment"
-            app:destination="@id/emailAccountValidationFragment" />
-    </fragment>
-    <fragment
-        android:id="@+id/emailAccountValidationFragment"
-        android:name="org.linphone.activities.assistant.fragments.EmailAccountValidationFragment"
-        tools:layout="@layout/assistant_email_account_validation_fragment"
-        android:label="EmailAccountValidationFragment" >
-        <action
-            android:id="@+id/action_emailAccountValidationFragment_to_phoneAccountLinkingFragment"
-            app:destination="@id/phoneAccountLinkingFragment" />
-    </fragment>
-    <fragment
-        android:id="@+id/phoneAccountCreationFragment"
-        android:name="org.linphone.activities.assistant.fragments.PhoneAccountCreationFragment"
-        tools:layout="@layout/assistant_phone_account_creation_fragment"
-        android:label="PhoneAccountCreationFragment" >
-        <action
-            android:id="@+id/action_phoneAccountCreationFragment_to_phoneAccountValidationFragment"
-            app:destination="@id/phoneAccountValidationFragment" />
-    </fragment>
-    <fragment
-        android:id="@+id/phoneAccountValidationFragment"
-        android:name="org.linphone.activities.assistant.fragments.PhoneAccountValidationFragment"
-        tools:layout="@layout/assistant_phone_account_validation_fragment"
-        android:label="PhoneAccountValidationFragment" >
-        <action
-            android:id="@+id/action_phoneAccountValidationFragment_to_echoCancellerCalibrationFragment"
-            app:destination="@id/echoCancellerCalibrationFragment" />
-        <argument
-            android:name="PhoneNumber"
-            app:argType="string" />
-        <argument
-            android:name="IsLogin"
-            app:argType="boolean" />
-        <argument
-            android:name="IsCreation"
-            app:argType="boolean" />
-        <argument
-            android:name="IsLinking"
-            app:argType="boolean" />
-    </fragment>
-    <fragment
-        android:id="@+id/qrCodeFragment"
-        android:name="org.linphone.activities.assistant.fragments.QrCodeFragment"
-        tools:layout="@layout/assistant_qr_code_fragment"
-        android:label="QrCodeFragment" />
-    <fragment
-        android:id="@+id/echoCancellerCalibrationFragment"
-        android:name="org.linphone.activities.assistant.fragments.EchoCancellerCalibrationFragment"
-        tools:layout="@layout/assistant_echo_canceller_calibration_fragment"
-        android:label="EchoCancellerCalibrationFragment" />
-    <fragment
-        android:id="@+id/phoneAccountLinkingFragment"
-        tools:layout="@layout/assistant_phone_account_linking_fragment"
-        android:name="org.linphone.activities.assistant.fragments.PhoneAccountLinkingFragment"
-        android:label="PhoneAccountLinkingFragment" >
-        <argument
-            android:name="Username"
-            app:argType="string" />
-        <argument
-            android:name="Password"
-            app:argType="string"
-            app:nullable="true" />
-        <argument
-            android:name="HA1"
-            app:argType="string"
-            app:nullable="true" />
-        <action
-            android:id="@+id/action_phoneAccountLinkingFragment_to_phoneAccountValidationFragment"
-            app:destination="@id/phoneAccountValidationFragment" >
-            <argument
-                android:name="IsCreation"
-                android:defaultValue="false" />
-            <argument
-                android:name="IsLinking"
-                android:defaultValue="false" />
-            <argument
-                android:name="IsLogin"
-                android:defaultValue="false" />
-        </action>
-        <argument
-            android:name="AllowSkip"
-            app:argType="boolean"
-            android:defaultValue="false" />
-        <action
-            android:id="@+id/action_phoneAccountLinkingFragment_to_echoCancellerCalibrationFragment"
-            app:destination="@id/echoCancellerCalibrationFragment" />
-    </fragment>
-    <fragment
-        android:id="@+id/noPushWarningFragment"
-        android:name="org.linphone.activities.assistant.fragments.NoPushWarningFragment"
-        android:label="NoPushWarningFragment"
-        tools:layout="@layout/assistant_no_push_warning_fragment"/>
-</navigation>
\ No newline at end of file
diff --git a/app/src/main/res/navigation/call_nav_graph.xml b/app/src/main/res/navigation/call_nav_graph.xml
deleted file mode 100644
index db1228ecd..000000000
--- a/app/src/main/res/navigation/call_nav_graph.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<navigation xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/call_nav_graph"
-    app:startDestination="@id/singleCallFragment">
-
-    <fragment
-        android:id="@+id/singleCallFragment"
-        android:name="org.linphone.activities.voip.fragments.SingleCallFragment"
-        tools:layout="@layout/voip_single_call_fragment"
-        android:label="SingleCallFragment" >
-        <action
-            android:id="@+id/action_singleCallFragment_to_callsListFragment"
-            app:destination="@id/callsListFragment" />
-        <action
-            android:id="@+id/action_singleCallFragment_to_conferenceParticipantsFragment"
-            app:destination="@id/conferenceParticipantsFragment" />
-        <action
-            android:id="@+id/action_singleCallFragment_to_chatFragment"
-            app:destination="@id/chatFragment" />
-        <action
-            android:id="@+id/action_singleCallFragment_to_conferenceLayoutFragment"
-            app:destination="@id/conferenceLayoutFragment" />
-    </fragment>
-
-    <action android:id="@+id/action_global_singleCallFragment"
-        app:destination="@id/singleCallFragment"/>
-
-    <fragment
-        android:id="@+id/conferenceCallFragment"
-        android:name="org.linphone.activities.voip.fragments.ConferenceCallFragment"
-        tools:layout="@layout/voip_conference_call_fragment"
-        android:label="ConferenceCallFragment" >
-        <action
-            android:id="@+id/action_conferenceCallFragment_to_callsListFragment"
-            app:destination="@id/callsListFragment" />
-        <action
-            android:id="@+id/action_conferenceCallFragment_to_conferenceParticipantsFragment"
-            app:destination="@id/conferenceParticipantsFragment" />
-        <action
-            android:id="@+id/action_conferenceCallFragment_to_chatFragment"
-            app:destination="@id/chatFragment" />
-        <action
-            android:id="@+id/action_conferenceCallFragment_to_conferenceLayoutFragment"
-            app:destination="@id/conferenceLayoutFragment" />
-    </fragment>
-
-    <action
-        android:id="@+id/action_global_conferenceCallFragment"
-        app:destination="@id/conferenceCallFragment"/>
-
-    <fragment
-        android:id="@+id/callsListFragment"
-        android:name="org.linphone.activities.voip.fragments.CallsListFragment"
-        tools:layout="@layout/voip_calls_list_fragment"
-        android:label="CallsListFragment" />
-
-    <fragment
-        android:id="@+id/conferenceParticipantsFragment"
-        android:name="org.linphone.activities.voip.fragments.ConferenceParticipantsFragment"
-        tools:layout="@layout/voip_conference_participants_fragment"
-        android:label="ConferenceParticipantsFragment" >
-        <action
-            android:id="@+id/action_conferenceParticipantsFragment_to_conferenceAddParticipantsFragment"
-            app:destination="@id/conferenceAddParticipantsFragment" />
-    </fragment>
-
-    <fragment
-        android:id="@+id/chatFragment"
-        android:name="org.linphone.activities.voip.fragments.ChatFragment"
-        tools:layout="@layout/voip_chat_fragment"
-        android:label="ChatFragment" >
-        <argument
-            android:name="LocalSipUri"
-            app:argType="string"
-            app:nullable="true" />
-        <argument
-            android:name="RemoteSipUri"
-            app:argType="string"
-            app:nullable="true" />
-    </fragment>
-
-    <fragment
-        android:id="@+id/outgoingCallFragment"
-        android:name="org.linphone.activities.voip.fragments.OutgoingCallFragment"
-        tools:layout="@layout/voip_call_outgoing_fragment"
-        android:label="OutgoingCallFragment" />
-
-    <action android:id="@+id/action_global_outgoingCallFragment"
-        app:destination="@id/outgoingCallFragment" />
-
-    <fragment
-        android:id="@+id/incomingCallFragment"
-        android:name="org.linphone.activities.voip.fragments.IncomingCallFragment"
-        tools:layout="@layout/voip_call_incoming_fragment"
-        android:label="IncomingCallFragment" />
-
-    <action android:id="@+id/action_global_incomingCallFragment"
-        app:destination="@id/incomingCallFragment" />
-
-    <fragment
-        android:id="@+id/conferenceLayoutFragment"
-        android:name="org.linphone.activities.voip.fragments.ConferenceLayoutFragment"
-        tools:layout="@layout/voip_conference_layout_fragment"
-        android:label="ConferenceLayoutFragment" />
-
-    <fragment
-        android:id="@+id/conferenceAddParticipantsFragment"
-        android:name="org.linphone.activities.voip.fragments.ConferenceAddParticipantsFragment"
-        tools:layout="@layout/voip_conference_participants_add_fragment"
-        android:label="ConferenceAddParticipantsFragment" >
-        <action
-            android:id="@+id/action_conferenceAddParticipantsFragment_to_conferenceParticipantsFragment"
-            app:destination="@id/conferenceParticipantsFragment" />
-    </fragment>
-
-</navigation>
\ No newline at end of file
diff --git a/app/src/main/res/navigation/chat_nav_graph.xml b/app/src/main/res/navigation/chat_nav_graph.xml
deleted file mode 100644
index f6ab6f402..000000000
--- a/app/src/main/res/navigation/chat_nav_graph.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<navigation xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/chat_nav_graph"
-    app:startDestination="@id/emptyChatFragment">
-
-    <fragment
-        android:id="@+id/emptyChatFragment"
-        android:name="org.linphone.activities.main.fragments.EmptyFragment"
-        tools:layout="@layout/empty_fragment"
-        android:label="EmptyChatFragment"  />
-
-    <action android:id="@+id/action_global_emptyChatFragment"
-        app:destination="@id/emptyChatFragment" />
-
-    <fragment
-        android:id="@+id/detailChatRoomFragment"
-        android:name="org.linphone.activities.main.chat.fragments.DetailChatRoomFragment"
-        tools:layout="@layout/chat_room_detail_fragment"
-        android:label="DetailChatRoomFragment">
-        <action
-            android:id="@+id/action_detailChatRoomFragment_to_imdnFragment"
-            app:destination="@id/imdnFragment" />
-        <action
-            android:id="@+id/action_detailChatRoomFragment_to_devicesFragment"
-            app:destination="@id/devicesFragment" />
-        <action
-            android:id="@+id/action_detailChatRoomFragment_to_groupInfoFragment"
-            app:destination="@id/groupInfoFragment" />
-        <action
-            android:id="@+id/action_detailChatRoomFragment_to_ephemeralFragment"
-            app:destination="@id/ephemeralFragment" />
-    </fragment>
-
-    <action
-        android:id="@+id/action_global_detailChatRoomFragment"
-        app:destination="@id/detailChatRoomFragment" />
-
-    <fragment
-        android:id="@+id/chatRoomCreationFragment"
-        android:name="org.linphone.activities.main.chat.fragments.ChatRoomCreationFragment"
-        tools:layout="@layout/chat_room_creation_fragment"
-        android:label="ChatRoomCreationFragment">
-        <argument
-            android:name="createGroup"
-            app:argType="boolean"
-            android:defaultValue="false" />
-        <action
-            android:id="@+id/action_chatRoomCreationFragment_to_groupInfoFragment"
-            app:destination="@id/groupInfoFragment" />
-        <action
-            android:id="@+id/action_chatRoomCreationFragment_to_detailChatRoomFragment"
-            app:destination="@id/detailChatRoomFragment" />
-    </fragment>
-
-    <action
-        android:id="@+id/action_global_chatRoomCreationFragment"
-        app:destination="@id/chatRoomCreationFragment" />
-
-    <fragment
-        android:id="@+id/devicesFragment"
-        android:name="org.linphone.activities.main.chat.fragments.DevicesFragment"
-        tools:layout="@layout/chat_room_devices_fragment"
-        android:label="DevicesFragment" />
-
-    <fragment
-        android:id="@+id/groupInfoFragment"
-        android:name="org.linphone.activities.main.chat.fragments.GroupInfoFragment"
-        tools:layout="@layout/chat_room_group_info_fragment"
-        android:label="GroupInfoFragment">
-        <action
-            android:id="@+id/action_groupInfoFragment_to_chatRoomCreationFragment"
-            app:destination="@id/chatRoomCreationFragment" />
-        <action
-            android:id="@+id/action_groupInfoFragment_to_detailChatRoomFragment"
-            app:destination="@id/detailChatRoomFragment" />
-    </fragment>
-
-    <fragment
-        android:id="@+id/imdnFragment"
-        android:name="org.linphone.activities.main.chat.fragments.ImdnFragment"
-        tools:layout="@layout/chat_room_imdn_fragment"
-        android:label="ImdnFragment">
-        <argument
-            android:name="MessageId"
-            app:argType="string" />
-    </fragment>
-
-    <fragment
-        android:id="@+id/ephemeralFragment"
-        android:name="org.linphone.activities.main.chat.fragments.EphemeralFragment"
-        tools:layout="@layout/chat_room_ephemeral_fragment"
-        android:label="EphemeralFragment" />
-
-</navigation>
\ No newline at end of file
diff --git a/app/src/main/res/navigation/contacts_nav_graph.xml b/app/src/main/res/navigation/contacts_nav_graph.xml
deleted file mode 100644
index 11add47d5..000000000
--- a/app/src/main/res/navigation/contacts_nav_graph.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<navigation xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    app:startDestination="@id/emptyContactFragment">
-
-    <fragment
-        android:id="@+id/emptyContactFragment"
-        android:name="org.linphone.activities.main.fragments.EmptyFragment"
-        tools:layout="@layout/empty_fragment"
-        android:label="EmptyContactFragment" />
-
-    <action android:id="@+id/action_global_emptyContactFragment"
-        app:destination="@id/emptyContactFragment" />
-
-    <fragment
-        android:id="@+id/detailContactFragment"
-        android:name="org.linphone.activities.main.contact.fragments.DetailContactFragment"
-        tools:layout="@layout/contact_detail_fragment"
-        android:label="DetailContactFragment">
-
-        <action
-            android:id="@+id/action_detailContactFragment_to_contactEditorFragment"
-            app:destination="@id/contactEditorFragment" />
-
-        <action
-            android:id="@+id/action_detailContactFragment_to_detailChatRoomFragment"
-            app:destination="@id/chat_nav_graph" />
-    </fragment>
-
-    <action
-        android:id="@+id/action_global_detailContactFragment"
-        app:destination="@id/detailContactFragment" />
-
-    <fragment
-        android:id="@+id/contactEditorFragment"
-        android:name="org.linphone.activities.main.contact.fragments.ContactEditorFragment"
-        tools:layout="@layout/contact_editor_fragment"
-        android:label="ContactEditorFragment">
-        <argument
-            android:name="SipUri"
-            app:argType="string"
-            app:nullable="true" />
-        <action
-            android:id="@+id/action_contactEditorFragment_to_detailContactFragment"
-            app:destination="@id/detailContactFragment" />
-    </fragment>
-
-    <action
-        android:id="@+id/action_global_contactEditorFragment"
-        app:destination="@id/contactEditorFragment" />
-
-</navigation>
\ No newline at end of file
diff --git a/app/src/main/res/navigation/history_nav_graph.xml b/app/src/main/res/navigation/history_nav_graph.xml
deleted file mode 100644
index 9b539d297..000000000
--- a/app/src/main/res/navigation/history_nav_graph.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<navigation xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    app:startDestination="@id/emptyCallHistoryFragment">
-
-    <fragment
-        android:id="@+id/emptyCallHistoryFragment"
-        android:name="org.linphone.activities.main.fragments.EmptyFragment"
-        tools:layout="@layout/empty_fragment"
-        android:label="EmptyCallHistoryFragment" />
-
-    <action android:id="@+id/action_global_emptyFragment"
-        app:destination="@id/emptyCallHistoryFragment" />
-
-    <fragment
-        android:id="@+id/detailCallLogFragment"
-        android:name="org.linphone.activities.main.history.fragments.DetailCallLogFragment"
-        tools:layout="@layout/history_detail_fragment"
-        android:label="DetailCallLogFragment" />
-
-    <fragment
-        android:id="@+id/detailConferenceCallLogFragment"
-        android:name="org.linphone.activities.main.history.fragments.DetailConferenceCallLogFragment"
-        tools:layout="@layout/history_conf_detail_fragment"
-        android:label="DetailConferenceCallLogFragment" />
-
-    <action
-        android:id="@+id/action_global_detailCallLogFragment"
-        app:destination="@id/detailCallLogFragment" />
-
-    <action
-        android:id="@+id/action_global_detailConferenceCallLogFragment"
-        app:destination="@id/detailConferenceCallLogFragment" />
-
-</navigation>
\ No newline at end of file
diff --git a/app/src/main/res/navigation/main_nav_graph.xml b/app/src/main/res/navigation/main_nav_graph.xml
deleted file mode 100644
index 5fa7a2a78..000000000
--- a/app/src/main/res/navigation/main_nav_graph.xml
+++ /dev/null
@@ -1,224 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<navigation xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/main_nav_graph_xml"
-    app:startDestination="@id/dialerFragment">
-
-    <fragment
-        android:id="@+id/masterChatRoomsFragment"
-        android:name="org.linphone.activities.main.chat.fragments.MasterChatRoomsFragment"
-        android:label="MasterChatRoomsFragment"
-        tools:layout="@layout/chat_room_master_fragment" >
-        <action
-            android:id="@+id/action_masterChatRoomsFragment_to_dialerFragment"
-            app:destination="@id/dialerFragment" />
-        <action
-            android:id="@+id/action_masterChatRoomsFragment_to_masterCallLogsFragment"
-            app:destination="@id/masterCallLogsFragment" />
-        <action
-            android:id="@+id/action_masterChatRoomsFragment_to_masterContactsFragment"
-            app:destination="@id/masterContactsFragment" />
-        <argument
-            android:name="LocalSipUri"
-            app:argType="string"
-            android:defaultValue="@null"
-            app:nullable="true" />
-        <argument
-            android:name="RemoteSipUri"
-            app:argType="string"
-            android:defaultValue="@null"
-            app:nullable="true" />
-        <deepLink
-            app:uri="linphone-android://chat-room/{LocalSipUri}/{RemoteSipUri}"
-            android:autoVerify="true" />
-    </fragment>
-    <action
-        android:id="@+id/action_global_masterChatRoomsFragment"
-        app:destination="@id/masterChatRoomsFragment" />
-    <fragment
-        android:id="@+id/masterContactsFragment"
-        android:name="org.linphone.activities.main.contact.fragments.MasterContactsFragment"
-        android:label="MasterContactsFragment"
-        tools:layout="@layout/contact_master_fragment" >
-        <action
-            android:id="@+id/action_masterContactsFragment_to_masterCallLogsFragment"
-            app:destination="@id/masterCallLogsFragment" />
-        <action
-            android:id="@+id/action_masterContactsFragment_to_dialerFragment"
-            app:destination="@id/dialerFragment" />
-        <action
-            android:id="@+id/action_masterContactsFragment_to_masterChatRoomsFragment"
-            app:destination="@id/masterChatRoomsFragment" />
-        <deepLink
-            app:uri="linphone-android://contact/view/{id}"
-            android:autoVerify="true" />
-        <deepLink
-            app:uri="linphone-android://contact/view-friend/{address}"
-            android:autoVerify="true" />
-        <deepLink
-            app:uri="linphone-android://contact/new/{sipUri}"
-            android:autoVerify="true" />
-    </fragment>
-    <action
-        android:id="@+id/action_global_masterContactsFragment"
-        app:destination="@id/masterContactsFragment" />
-    <fragment
-        android:id="@+id/masterCallLogsFragment"
-        android:name="org.linphone.activities.main.history.fragments.MasterCallLogsFragment"
-        android:label="MasterCallLogsFragment"
-        tools:layout="@layout/history_master_fragment" >
-        <action
-            android:id="@+id/action_masterCallLogsFragment_to_dialerFragment"
-            app:destination="@id/dialerFragment" />
-        <action
-            android:id="@+id/action_masterCallLogsFragment_to_masterContactsFragment"
-            app:destination="@id/masterContactsFragment" />
-        <action
-            android:id="@+id/action_masterCallLogsFragment_to_masterChatRoomsFragment"
-            app:destination="@id/masterChatRoomsFragment" />
-    </fragment>
-    <action
-        android:id="@+id/action_global_masterCallLogsFragment"
-        app:destination="@id/masterCallLogsFragment"/>
-    <fragment
-        android:id="@+id/dialerFragment"
-        android:name="org.linphone.activities.main.dialer.fragments.DialerFragment"
-        android:label="DialerFragment"
-        tools:layout="@layout/dialer_fragment" >
-        <action
-            android:id="@+id/action_dialerFragment_to_masterCallLogsFragment"
-            app:destination="@id/masterCallLogsFragment"/>
-        <action
-            android:id="@+id/action_dialerFragment_to_masterContactsFragment"
-            app:destination="@id/masterContactsFragment" />
-        <action
-            android:id="@+id/action_dialerFragment_to_masterChatRoomsFragment"
-            app:destination="@id/masterChatRoomsFragment" />
-        <argument
-            android:name="Transfer"
-            app:argType="boolean"
-            android:defaultValue="false" />
-    </fragment>
-    <action
-        android:id="@+id/action_global_dialerFragment"
-        app:destination="@id/dialerFragment" />
-    <fragment
-        android:id="@+id/aboutFragment"
-        android:name="org.linphone.activities.main.about.AboutFragment"
-        tools:layout="@layout/about_fragment"
-        android:label="AboutFragment" />
-    <action
-        android:id="@+id/action_global_aboutFragment"
-        app:destination="@id/aboutFragment" />
-    <fragment
-        android:id="@+id/recordingsFragment"
-        android:name="org.linphone.activities.main.recordings.fragments.RecordingsFragment"
-        tools:layout="@layout/recordings_fragment"
-        android:label="RecordingsFragment" />
-    <action
-        android:id="@+id/action_global_recordingsFragment"
-        app:destination="@id/recordingsFragment" />
-    <fragment
-        android:id="@+id/settingsFragment"
-        android:name="org.linphone.activities.main.settings.fragments.SettingsFragment"
-        tools:layout="@layout/settings_fragment"
-        android:label="SettingsFragment" >
-        <deepLink
-            app:uri="linphone-android://settings/{Identity}"
-            android:autoVerify="true" />
-    </fragment>
-    <action
-        android:id="@+id/action_global_settingsFragment"
-        app:destination="@id/settingsFragment" />
-
-    <fragment
-        android:id="@+id/textViewerFragment"
-        android:name="org.linphone.activities.main.files.fragments.TextViewerFragment"
-        android:label="TextViewerFragment" />
-    <action
-        android:id="@+id/action_global_textViewerFragment"
-        app:destination="@id/textViewerFragment" />
-    <fragment
-        android:id="@+id/pdfViewerFragment"
-        android:name="org.linphone.activities.main.files.fragments.PdfViewerFragment"
-        android:label="PdfViewerFragment" />
-    <action
-        android:id="@+id/action_global_pdfViewerFragment"
-        app:destination="@id/pdfViewerFragment" />
-    <fragment
-        android:id="@+id/imageViewerFragment"
-        android:name="org.linphone.activities.main.files.fragments.ImageViewerFragment"
-        android:label="ImageViewerFragment" />
-    <action
-        android:id="@+id/action_global_imageViewerFragment"
-        app:destination="@id/imageViewerFragment"/>
-    <fragment
-        android:id="@+id/videoViewerFragment"
-        android:name="org.linphone.activities.main.files.fragments.VideoViewerFragment"
-        android:label="VideoViewerFragment" />
-    <action
-        android:id="@+id/action_global_videoViewerFragment"
-        app:destination="@id/videoViewerFragment"/>
-    <fragment
-        android:id="@+id/audioViewerFragment"
-        android:name="org.linphone.activities.main.files.fragments.AudioViewerFragment"
-        android:label="AudioViewerFragment" />
-    <action
-        android:id="@+id/action_global_audioViewerFragment"
-        app:destination="@id/audioViewerFragment"/>
-    <fragment
-        android:id="@+id/configViewerFragment"
-        android:name="org.linphone.activities.main.dialer.fragments.ConfigViewerFragment"
-        android:label="ConfigViewerFragment" />
-    <action
-        android:id="@+id/action_global_configViewerFragment"
-        app:destination="@id/configViewerFragment" />
-
-    <action
-        android:id="@+id/action_global_conferenceSchedulingFragment"
-        app:destination="@id/conference_scheduling_nav_graph" />
-
-    <navigation android:id="@+id/conference_scheduling_nav_graph"
-        app:startDestination="@id/conferenceSchedulingFragment">
-        <fragment
-            android:id="@+id/conferenceSchedulingSummaryFragment"
-            android:name="org.linphone.activities.main.conference.fragments.ConferenceSchedulingSummaryFragment"
-            android:label="ConferenceSchedulingSummaryFragment" />
-        <fragment
-            android:id="@+id/conferenceSchedulingFragment"
-            android:name="org.linphone.activities.main.conference.fragments.ConferenceSchedulingFragment"
-            android:label="ConferenceSchedulingFragment">
-            <action
-                android:id="@+id/action_conferenceSchedulingFragment_to_conferenceSchedulingParticipantsListFragment"
-                app:destination="@id/conferenceSchedulingParticipantsListFragment" />
-        </fragment>
-        <fragment
-            android:id="@+id/conferenceSchedulingParticipantsListFragment"
-            android:name="org.linphone.activities.main.conference.fragments.ConferenceSchedulingParticipantsListFragment"
-            android:label="ConferenceSchedulingParticipantsListFragment">
-            <action
-                android:id="@+id/action_conferenceSchedulingParticipantsListFragment_to_conferenceSchedulingSummaryFragment"
-                app:destination="@id/conferenceSchedulingSummaryFragment" />
-        </fragment>
-    </navigation>
-
-    <fragment
-        android:id="@+id/conferenceWaitingRoomFragment"
-        android:name="org.linphone.activities.main.conference.fragments.ConferenceWaitingRoomFragment"
-        tools:layout="@layout/conference_waiting_room_fragment"
-        android:label="ConferenceWaitingRoomFragment" />
-    <action
-        android:id="@+id/action_global_conferenceWaitingRoomFragment"
-        app:destination="@id/conferenceWaitingRoomFragment"/>
-
-    <fragment
-        android:id="@+id/scheduledConferencesFragment"
-        android:name="org.linphone.activities.main.conference.fragments.ScheduledConferencesFragment"
-        tools:layout="@layout/conferences_scheduled_fragment"
-        android:label="ScheduledConferencesFragment" />
-    <action
-        android:id="@+id/action_global_scheduledConferencesFragment"
-        app:destination="@id/scheduledConferencesFragment"/>
-
-</navigation>
\ No newline at end of file
diff --git a/app/src/main/res/navigation/settings_nav_graph.xml b/app/src/main/res/navigation/settings_nav_graph.xml
deleted file mode 100644
index 6125340e3..000000000
--- a/app/src/main/res/navigation/settings_nav_graph.xml
+++ /dev/null
@@ -1,154 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<navigation xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/settings_nav_graph_xml"
-    app:startDestination="@id/emptySettingsFragment">
-
-    <fragment
-        android:id="@+id/emptySettingsFragment"
-        android:name="org.linphone.activities.main.fragments.EmptyFragment"
-        tools:layout="@layout/empty_fragment"
-        android:label="EmptySettingsFragment" />
-
-    <action android:id="@+id/action_global_emptySettingsFragment"
-        app:destination="@id/emptySettingsFragment" />
-
-    <fragment
-        android:id="@+id/accountSettingsFragment"
-        android:name="org.linphone.activities.main.settings.fragments.AccountSettingsFragment"
-        tools:layout="@layout/settings_account_fragment"
-        android:label="AccountSettingsFragment" >
-        <argument
-            android:name="Identity"
-            app:argType="string" />
-        <action
-            android:id="@+id/action_accountSettingsFragment_to_phoneAccountLinkingFragment"
-            app:destination="@id/phoneAccountLinkingFragment" />
-    </fragment>
-    <fragment
-        android:id="@+id/advancedSettingsFragment"
-        android:name="org.linphone.activities.main.settings.fragments.AdvancedSettingsFragment"
-        tools:layout="@layout/settings_advanced_fragment"
-        android:label="AdvancedSettingsFragment" />
-    <fragment
-        android:id="@+id/audioSettingsFragment"
-        android:name="org.linphone.activities.main.settings.fragments.AudioSettingsFragment"
-        tools:layout="@layout/settings_audio_fragment"
-        android:label="AudioSettingsFragment" />
-    <fragment
-        android:id="@+id/callSettingsFragment"
-        android:name="org.linphone.activities.main.settings.fragments.CallSettingsFragment"
-        tools:layout="@layout/settings_call_fragment"
-        android:label="CallSettingsFragment" />
-    <fragment
-        android:id="@+id/chatSettingsFragment"
-        android:name="org.linphone.activities.main.settings.fragments.ChatSettingsFragment"
-        tools:layout="@layout/settings_chat_fragment"
-        android:label="ChatSettingsFragment" />
-    <fragment
-        android:id="@+id/contactsSettingsFragment"
-        android:name="org.linphone.activities.main.settings.fragments.ContactsSettingsFragment"
-        tools:layout="@layout/settings_contacts_fragment"
-        android:label="ContactsSettingsFragment" >
-        <action
-            android:id="@+id/action_contactsSettingsFragment_to_ldapSettingsFragment"
-            app:destination="@id/ldapSettingsFragment" />
-    </fragment>
-    <fragment
-        android:id="@+id/networkSettingsFragment"
-        android:name="org.linphone.activities.main.settings.fragments.NetworkSettingsFragment"
-        tools:layout="@layout/settings_network_fragment"
-        android:label="NetworkSettingsFragment" />
-    <fragment
-        android:id="@+id/videoSettingsFragment"
-        android:name="org.linphone.activities.main.settings.fragments.VideoSettingsFragment"
-        tools:layout="@layout/settings_video_fragment"
-        android:label="VideoSettingsFragment" />
-    <fragment
-        android:id="@+id/tunnelSettingsFragment"
-        android:name="org.linphone.activities.main.settings.fragments.TunnelSettingsFragment"
-        tools:layout="@layout/settings_tunnel_fragment"
-        android:label="TunnelSettingsFragment" />
-    <action
-        android:id="@+id/action_global_tunnelSettingsFragment"
-        app:destination="@id/tunnelSettingsFragment" />
-    <action
-        android:id="@+id/action_global_videoSettingsFragment"
-        app:destination="@id/videoSettingsFragment" />
-    <action
-        android:id="@+id/action_global_callSettingsFragment"
-        app:destination="@id/callSettingsFragment" />
-    <action
-        android:id="@+id/action_global_networkSettingsFragment"
-        app:destination="@id/networkSettingsFragment" />
-    <action
-        android:id="@+id/action_global_chatSettingsFragment"
-        app:destination="@id/chatSettingsFragment" />
-    <action
-        android:id="@+id/action_global_contactsSettingsFragment"
-        app:destination="@id/contactsSettingsFragment" />
-    <action
-        android:id="@+id/action_global_accountSettingsFragment"
-        app:destination="@id/accountSettingsFragment" />
-    <action
-        android:id="@+id/action_global_advancedSettingsFragment"
-        app:destination="@id/advancedSettingsFragment" />
-    <action
-        android:id="@+id/action_global_conferencesSettingsFragment"
-        app:destination="@id/conferencesSettingsFragment"/>
-    <action
-        android:id="@+id/action_global_audioSettingsFragment"
-        app:destination="@id/audioSettingsFragment" />
-    <fragment
-        android:id="@+id/phoneAccountLinkingFragment"
-        tools:layout="@layout/assistant_phone_account_linking_fragment"
-        android:name="org.linphone.activities.assistant.fragments.PhoneAccountLinkingFragment"
-        android:label="PhoneAccountLinkingFragment" >
-        <action
-            android:id="@+id/action_phoneAccountLinkingFragment_to_phoneAccountValidationFragment"
-            app:destination="@id/phoneAccountValidationFragment" />
-        <argument
-            android:name="Username"
-            app:argType="string" />
-        <argument
-            android:name="Password"
-            app:argType="string"
-            app:nullable="true" />
-        <argument
-            android:name="HA1"
-            app:argType="string"
-            app:nullable="true" />
-    </fragment>
-    <fragment
-        android:id="@+id/phoneAccountValidationFragment"
-        tools:layout="@layout/assistant_phone_account_validation_fragment"
-        android:name="org.linphone.activities.assistant.fragments.PhoneAccountValidationFragment"
-        android:label="PhoneAccountValidationFragment" >
-        <action
-            android:id="@+id/action_phoneAccountValidationFragment_to_accountSettingsFragment"
-            app:destination="@id/accountSettingsFragment" />
-        <argument
-            android:name="PhoneNumber"
-            app:argType="string" />
-        <argument
-            android:name="IsLogin"
-            app:argType="boolean" />
-        <argument
-            android:name="IsCreation"
-            app:argType="boolean" />
-        <argument
-            android:name="IsLinking"
-            app:argType="boolean" />
-    </fragment>
-    <fragment
-        android:id="@+id/ldapSettingsFragment"
-        android:name="org.linphone.activities.main.settings.fragments.LdapSettingsFragment"
-        tools:layout="@layout/settings_ldap_fragment"
-        android:label="LdapSettingsFragment" />
-    <fragment
-        android:id="@+id/conferencesSettingsFragment"
-        tools:layout="@layout/settings_conferences_fragment"
-        android:name="org.linphone.activities.main.settings.fragments.ConferencesSettingsFragment"
-        android:label="ConferencesSettingsFragment" />
-</navigation>
\ No newline at end of file
diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml
deleted file mode 100644
index 40a117f58..000000000
--- a/app/src/main/res/values-bg/strings.xml
+++ /dev/null
@@ -1,814 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE resources [
-<!ENTITY appName "Linphone">
-]>
-<resources xmlns:tools="http://schemas.android.com/tools">
-    <string name="content_description_remove_contact_from_chat_room">Премахнете контакт от разговора</string>
-    <string name="content_description_ephemeral_chat_room">Съобщенията в този разговор са краткотрайни</string>
-    <string name="content_description_start_encrypted_chat">Към шифрован разговор</string>
-    <string name="content_description_change_contact_picture">Промяна на снимката на контакта</string>
-    <string name="content_description_exit_edition_mode">Излезте от режима на редактиране</string>
-    <string name="content_description_voice_mail">Гласова поща</string>
-    <string name="content_description_menu_chat">Разговори</string>
-    <string name="content_description_go_to_contact">Към данните за контакта</string>
-    <string name="content_description_missed_call">Пропуснато обаждане</string>
-    <string name="content_description_outgoing_call">Изходящо обаждане</string>
-    <string name="content_description_security_level_safe">Сигурно</string>
-    <string name="content_description_call_quality_1">Ниско качество на обаждането</string>
-    <string name="content_description_call_not_secured">Обаждането не е сигурно</string>
-    <string name="content_description_chat_message_meeting_attachment">Приложение към среща</string>
-    <string name="content_description_open_app">Отваряне на разговора в приложението</string>
-    <string name="content_description_voice_recording">Записване на гласово съобщение</string>
-    <string name="content_description_stop_voice_recording">Спиране на записа на гласово съобщения</string>
-    <string name="content_description_pause_voice_recording_playback">Поставяне на записа в пауза</string>
-    <string name="content_descripton_scroll_to_bottom">Превъртете до долу или до първото непрочетено съобщение</string>
-    <string name="content_description_call_context_menu">Отворете контекстно меню за обаждането</string>
-    <string name="content_description_create_conference">Създайте нова среща</string>
-    <string name="content_description_copy_conference_address">Копиране на адреса на срещата</string>
-    <string name="content_description_hide_statistics">Скриване на статистиката за обаждането</string>
-    <string name="content_description_conference_participant_mic_muted">Участника си е изключил микрофона</string>
-    <string name="content_description_toggle_conference_info_details">Превключване на подробностите за срещата</string>
-    <string name="content_description_presence_do_not_disturb">Потребителя не желае да го безпокоят</string>
-    <string name="dialog_authentication_required_message">Неуспешна връзка поради липсващи или неверни данни за автентикация
-\n%s.
-\n
-\nМоля опитайте да въведете паролата отново или проверете настройките на акаута.</string>
-    <string name="service_description">Изисква се за получаване на обаждания</string>
-    <string name="sync_account_name">&appName; контакти</string>
-    <string name="about_privacy_policy">Вижте нашата политика за поверителност</string>
-    <string name="logs_reset_complete">Логовете бяха изчистени</string>
-    <string name="phone_numbers">Телефонни номера</string>
-    <string name="assistant_choose_country_title">Име на държава или префикс</string>
-    <string name="username">Потребителско име</string>
-    <string name="email">Имейл</string>
-    <string name="domain">Домейн</string>
-    <string name="sip_addresses">SIP адреси</string>
-    <string name="cancel">Отказ</string>
-    <string name="share_uploaded_logs_link">Споделете връзка до логовете чрез…</string>
-    <string name="today">Днес</string>
-    <string name="yesterday">Вчера</string>
-    <string name="transport_udp">UDP</string>
-    <string name="transport_tcp">TCP</string>
-    <string name="transport_tls">TLS</string>
-    <string name="app_description"><i>Свободния</i> SIP клиент</string>
-    <string name="status_in_progress">Свързване в прогрес</string>
-    <string name="status_error">Неуспешно свързване</string>
-    <string name="about">За нас</string>
-    <string name="recordings">Записи</string>
-    <string name="settings">Настройки</string>
-    <string name="history_calls_list">Обаждания</string>
-    <string name="no_call_history">Няма последни обаждания</string>
-    <string name="no_conference_call_history">Няма групови обаждания</string>
-    <string name="history_delete_one_dialog">Желаете ли да изтриете този запис\?</string>
-    <string name="contact_invite_friend">Покана</string>
-    <string name="no_contact">Нямате контакти в адресната книга.</string>
-    <string name="no_sip_contact">Нямате SIP контакти в адресната книга.</string>
-    <string name="contact_filter_hint">Търсене на контакти</string>
-    <string name="contact_last_name">Фамилия</string>
-    <string name="contact_first_name">Първо име</string>
-    <string name="contact_organization">Организация</string>
-    <string name="contact_choose_existing_or_new_to_add_number">Изберете съществуващ контакт или добавете нов</string>
-    <string name="contact_new_choose_sync_account">Изберете къде да се съхрани този контакт</string>
-    <string name="contact_local_sync_account">Локално съхранение</string>
-    <string name="contact_cant_be_deleted">Този контакт не може да бъде изтрит</string>
-    <string name="contacts_ldap_query_more_results_available">Налични са още резултати, моля редактирайте търсеното</string>
-    <string name="dialer_address_bar_hint">Въведете номер или адрес</string>
-    <string name="debug_popup_enable_logs">Включете логовете</string>
-    <string name="debug_popup_disable_logs">Изключете логовете</string>
-    <string name="dialer_transfer_succeded">Обаждането се трансферира</string>
-    <string name="dialer_transfer_failed">Не може да се трансферира обаждането</string>
-    <string name="no_chat_history">Няма разговори</string>
-    <string name="chat_event_conference_created">Присъединихте се към група</string>
-    <string name="chat_event_conference_destroyed">Напуснахте група</string>
-    <string name="chat_event_participant_added">%s се присъедини</string>
-    <string name="chat_event_participant_removed">%s напусна</string>
-    <string name="chat_event_device_added">ново устройство за %s</string>
-    <string name="chat_room_last_message_sender_format">%s:</string>
-    <string name="chat_event_admin_set">%s е администратор</string>
-    <string name="chat_event_admin_unset">%s вече не е администратор</string>
-    <string name="chat_security_event_man_in_the_middle_detected">Забелязана е MITM хакерска атака за %s</string>
-    <string name="chat_security_event_security_level_downgraded">Нивото на сигурност намаля заради %s</string>
-    <string name="chat_event_ephemeral_disabled">Изключили сте краткотрайните съобщения</string>
-    <string name="chat_event_ephemeral_enabled">Включили сте краткотрайните съобщения: %s</string>
-    <string name="chat_event_ephemeral_lifetime_changed">Срок за изтичане на краткотрайните съобщения: %s</string>
-    <string name="chat_message_download_file">Изтегляне</string>
-    <string name="chat_message_pick_file_dialog">Изберете източник</string>
-    <string name="chat_room_group_info_title">Информация</string>
-    <string name="chat_room_group_info_participants">Участващи</string>
-    <string name="chat_room_group_info_subject_hint">Име на група</string>
-    <string name="chat_room_group_info_admin">Администратор</string>
-    <string name="chat_room_group_info_leave_dialog_button">Напускане</string>
-    <string name="chat_room_group_info_you_are_now_admin">Вие сте администратор</string>
-    <string name="chat_room_group_info_you_are_no_longer_admin">Вече не сте администратор</string>
-    <string name="chat_message_imdn_info">Етап на доставка</string>
-    <string name="chat_message_imdn_displayed">Прочетено</string>
-    <string name="chat_message_imdn_delivered">Доставено</string>
-    <string name="chat_message_imdn_undelivered">Недоставено</string>
-    <string name="chat_message_imdn_sent">Изпратено</string>
-    <string name="chat_message_replied">Отговорено</string>
-    <string name="chat_message_context_menu_forward">Препращане</string>
-    <string name="chat_message_context_menu_reply">Отговор</string>
-    <string name="chat_message_context_menu_imdn_info">Етап на доставка</string>
-    <string name="chat_message_context_menu_delete">Изтриване</string>
-    <string name="chat_message_context_menu_add_to_contacts">Добавяне към контакти</string>
-    <string name="chat_room_file_not_found">Файлът не съществува</string>
-    <string name="chat_room_context_menu_group_info">Информация за групата</string>
-    <string name="chat_room_context_menu_participants_devices">Устройства за чат</string>
-    <string name="chat_room_context_menu_go_to_contact">Към контакт</string>
-    <string name="chat_message_context_menu_ephemeral_messages">Краткотрайни съобщения</string>
-    <string name="chat_message_context_menu_delete_messages">Изтриване на съобщения</string>
-    <string name="chat_message_context_menu_turn_off_notifications">Изключване на известия</string>
-    <string name="chat_message_context_menu_turn_on_notifications">Включване на известия</string>
-    <string name="chat_room_ephemeral_message_disabled">Изключено</string>
-    <string name="chat_room_ephemeral_message_one_minute">1 минута</string>
-    <string name="chat_room_ephemeral_message_one_hour">1 час</string>
-    <string name="chat_room_ephemeral_message_one_day">1 ден</string>
-    <string name="chat_room_ephemeral_message_three_days">3 дни</string>
-    <string name="chat_room_ephemeral_message_one_week">1 седмица</string>
-    <plurals name="chat_room_remote_composing">
-        <item quantity="one">%s пише…</item>
-        <item quantity="other">%s пишат…</item>
-    </plurals>
-    <string name="chat_room_creation_failed_snack">Неуспешно създаване на стая за чат</string>
-    <string name="chat_room_removal_failed_snack">Неуспешно премахване на стая за чат</string>
-    <string name="chat_room_delete_one_dialog">Сигурни ли сте, че искате да изтриете този разговор\?</string>
-    <string name="chat_message_notification_hidden_content">&lt;Редакция&gt;</string>
-    <string name="chat_message_no_app_found_to_handle_file_mime_type">Няма подходящо приложение за такъв тип файл</string>
-    <string name="chat_bubble_cant_open_enrypted_file">Не може да се отвори шифрован файл в чата</string>
-    <string name="chat_message_cant_open_file_in_app_dialog_title">Не може да покажем файла.</string>
-    <string name="chat_message_cant_open_file_in_app_dialog_export_button">Експортиране</string>
-    <string name="chat_message_cant_open_file_in_app_dialog_open_as_text_button">Отваряне като файл</string>
-    <string name="chat_room_sending_reply_hint">Отговор</string>
-    <string name="chat_room_sending_message_hint">Съобщение</string>
-    <string name="chat_message_voice_recording_hold_to_record">Натиснете бутона за да запишете гласово съобщение</string>
-    <string name="chat_message_removal_info">Съобщението ще бъде изтрито</string>
-    <string name="chat_message_abort_removal">Прекъсване</string>
-    <string name="chat_message_download_already_in_progress">Моля изчакайте да завърши първото изтегляне преди да започнете ново</string>
-    <string name="chat_message_voice_recording">Гласово съобщение</string>
-    <string name="chat_room_presence_last_seen_online_today">Онлайн днес в</string>
-    <string name="chat_room_presence_last_seen_online_yesterday">Онлайн вчера в</string>
-    <string name="chat_room_presence_last_seen_online">Онлайн в</string>
-    <string name="chat_room_presence_away">В отсъствие</string>
-    <string name="chat_room_presence_do_not_disturb">Не безпокойте</string>
-    <string name="recordings_export">Експортиране на запис чрез…</string>
-    <string name="conference">Среща</string>
-    <string name="conference_schedule_title">Насрочване на среща</string>
-    <string name="conference_group_call_title">Стартирайте групово обаждане</string>
-    <string name="conference_schedule_mandatory_field">Задължително</string>
-    <string name="conference_schedule_subject_title">Тема</string>
-    <string name="conference_group_call_subject_hint">Тема на групово обаждане</string>
-    <string name="conference_schedule_address_title">Адрес на среща</string>
-    <string name="conference_schedule_description_title">Добавете описание</string>
-    <string name="conference_schedule_description_hint">Описание</string>
-    <string name="conference_schedule_date">Дата</string>
-    <string name="conference_schedule_time">Час</string>
-    <string name="conference_schedule_timezone">Часова зона</string>
-    <string name="conference_schedule_send_invite_chat">Изпратете покана чрез &appName;</string>
-    <string name="conference_schedule_send_invite_email">Изпратете покана чрез имейл</string>
-    <string name="conference_schedule_send_updated_invite_email">Изпратете актуализация чрез имейл</string>
-    <string name="conference_schedule_encryption">Желаете ли да зашифровате срещата\?</string>
-    <string name="conference_schedule_participants_list">Списък с участници</string>
-    <string name="conference_organizer">Организатор</string>
-    <string name="conference_schedule_summary">Информация за срещата</string>
-    <string name="conference_group_call_summary">Информация за груповото обаждане</string>
-    <string name="conference_schedule_start">Насрочване на среща</string>
-    <string name="conference_group_call_create">Стартирайте групово обаждане</string>
-    <string name="conference_paused_title">В момента не участвате в срещата.</string>
-    <string name="conference_paused_subtitle">Натиснете бутона за да се присъедините отново.</string>
-    <string name="conference_default_title">Далечно групово обаждане</string>
-    <string name="conference_local_title">Локално групово обаждане</string>
-    <string name="conference_invite_title">Покана за среща:</string>
-    <string name="conference_cancel_title">Срещата бе отменена:</string>
-    <string name="conference_description_title">Описание</string>
-    <string name="conference_invite_join">Присъединяване</string>
-    <string name="conference_invite_participants_count" tools:ignore="PluralsCandidate">%d участника</string>
-    <string name="conference_display_mode_mosaic">Режим мозайка</string>
-    <string name="conference_waiting_room_video_disabled">Видеото е изключено</string>
-    <string name="conference_no_terminated_schedule">Няма прекратени срещи.</string>
-    <string name="conference_schedule_organizer">Организатор:</string>
-    <string name="conference_go_to_chat">Стая за срещата</string>
-    <string name="conference_admin_set">%s е администратор</string>
-    <string name="conference_invitation_received_notification">Бяхте поканени на среща</string>
-    <string name="conference_invitation">покана за среща</string>
-    <string name="conference_first_to_join">Първи се присъединихте към груповото обаждане</string>
-    <string name="conference_last_user">Всички други участници напуснаха груповото обаждане</string>
-    <string name="conference_incoming_title">Входящо групово обаждане</string>
-    <string name="conference_participants_title">Участници (%d)</string>
-    <string name="conference_start_group_call_dialog_ok_button">Стартиране</string>
-    <string name="conference_scheduled_terminated_filter">Прекратяване</string>
-    <string name="conference_scheduled_future_filter">Насрочване</string>
-    <string name="conference_scheduled_delete_one_dialog">Желаете ли да изтриете тази среща\?</string>
-    <string name="conference_scheduled_delete_many_dialog">Желаете ли да изтриете тези срещи\?</string>
-    <string name="conference_scheduled_cancelled_by_organizer">Конференцията бе прекратена от организатора</string>
-    <string name="conference_scheduled_cancelled_by_me">Вие прекратихте конференцията</string>
-    <string name="call_incoming_title">Входящо обаждане</string>
-    <string name="call_notification_paused">Обаждането e в пауза</string>
-    <string name="call_notification_outgoing">Изходящо обаждане</string>
-    <string name="call_notification_active">Активно обаждане</string>
-    <string name="call_error_user_busy">Абоната е зает</string>
-    <string name="call_error_user_not_found">Не е открит такъв абонат</string>
-    <string name="call_error_network_unreachable">Няма достъп до мрежа</string>
-    <string name="call_error_io_error">Услугата не е достъпна или грешка с мрежата</string>
-    <string name="call_error_server_timeout">Отказ поради прекомерни заявки</string>
-    <string name="call_error_temporarily_unavailable">Временно недостъпно</string>
-    <string name="call_error_generic">Грешка: %s</string>
-    <string name="call_action_participants_list">Списък с участници</string>
-    <string name="call_action_chat">Чат</string>
-    <string name="call_action_calls_list">Списък с обаждания</string>
-    <string name="call_action_numpad">Циферблат</string>
-    <string name="call_action_change_conf_layout">Промяна на оформление</string>
-    <string name="call_action_statistics">Статистика за обаждания</string>
-    <string name="call_context_action_resume">Възобновяване на обаждането</string>
-    <string name="call_context_action_transfer">Трансфериране на обаждането</string>
-    <string name="call_remote_recording">Това обаждане се записва.</string>
-    <string name="call_remotely_paused_title">Обаждането е в пауза от ответната страна.</string>
-    <string name="call_locally_paused_title">Обаждането е в пауза.</string>
-    <string name="call_screenshot_taken">Записана снимка: %s</string>
-    <string name="call_stats_audio">Аудио</string>
-    <string name="call_stats_video">Видео</string>
-    <string name="call_stats_codec">Кодек:</string>
-    <string name="call_stats_ip">IP семейство:</string>
-    <string name="call_stats_upload">Ширина на качване:</string>
-    <string name="call_stats_estimated_download">Приблизителна ширина на теглене:</string>
-    <string name="call_stats_ice">ICE свързаност:</string>
-    <string name="call_stats_video_resolution_sent">Резолюция на изходящо видео:</string>
-    <string name="call_stats_video_fps_sent">Честота на кадрите на изходящо видео:</string>
-    <string name="call_stats_sender_loss_rate">Загуба при изпращане:</string>
-    <string name="call_stats_receiver_loss_rate">Загуба при получаване:</string>
-    <string name="call_stats_encoder_name">Енкодер:</string>
-    <string name="call_stats_decoder_name">Декодер:</string>
-    <string name="call_stats_player_filter">Филтър за възпроизвеждане:</string>
-    <string name="call_stats_capture_filter">Филтър за записване:</string>
-    <string name="call_stats_zrtp_cipher_algo">Шифроващ алгоритъм:</string>
-    <string name="call_stats_zrtp_key_agreement_algo">Алгоритъм за споразумение:</string>
-    <string name="call_stats_zrtp_hash_algo">Алгоритъм за хаширане:</string>
-    <string name="call_stats_zrtp_sas_algo">SAS алгоритъм:</string>
-    <string name="assistant_welcome_title">Добре дошли</string>
-    <string name="assistant_create_account">Създаване на акаунт</string>
-    <string name="assistant_login_linphone">Използване на &appName; акаунт</string>
-    <string name="assistant_login_generic">Използване на SIP акаунт</string>
-    <string name="assistant_remote_provisioning">Изтегляне на настройки от мрежата</string>
-    <string name="assistant_ec_calibration">Калибрира се настройката за заглушаване на ехо</string>
-    <string name="assistant_general_terms">общите условия</string>
-    <string name="assistant_privacy_policy">политиката за поверителност</string>
-    <string name="assistant_read_and_agree_terms">Приемам %1$ и %2$ на Belledonne Communications</string>
-    <string name="assistant_generic_account_warning_continue_button_text">Разбрах</string>
-    <string name="assistant_alternative_way_create_account">Откриване на нов акаунт чрез вашия имейл адрес:</string>
-    <string name="assistant_error_phone_number_invalid_characters">Моля въведете само числа тук</string>
-    <string name="assistant_error_username_already_exists">Потребителското име е заето</string>
-    <string name="assistant_error_phone_number_already_exists">Вече съществува акаунт със същия номер</string>
-    <string name="assistant_error_username_invalid_characters">Непозволени символи</string>
-    <string name="assistant_error_passwords_dont_match">Паролите не са еднакви</string>
-    <string name="assistant_error_invalid_email_address">Имейл адреса не е валиден</string>
-    <string name="assistant_error_username_too_long">Потребителското име е прекалено дълго</string>
-    <string name="assistant_error_invalid_credentials">Акаунта не съществува или паролата е различна</string>
-    <string name="assistant_login_with_username">Използвайте вашето потребителско име и парола вместо телефонен номер</string>
-    <string name="assistant_login_forgotten_password">Забравена парола\?</string>
-    <string name="assistant_confirmation_code">Код за потвърждение</string>
-    <string name="assistant_continue_even_if_credentials_invalid">Продължаване</string>
-    <string name="assistant_display_name_optional">Екранно име (незадължително)</string>
-    <string name="assistant_confirm_password">Потвърдете паролата</string>
-    <string name="assistant_validate_account_2">След като сте готови, моля върнете се тази страница и натиснете бутона.</string>
-    <string name="assistant_create_account_part_3">За да потвърдите вашия телефонен номер, моля въведете четири цифрения код:
-\n</string>
-    <string name="assistant_link_phone_number_skip">Пропускане</string>
-    <string name="assistant_link_account">Свържете акаунт</string>
-    <string name="assistant_remote_provisioning_title">Дистанционно изтегляне на настройки</string>
-    <string name="assistant_remote_provisioning_desc">Моля въведете URL адрес за настройки</string>
-    <string name="assistant_remote_provisioning_url">URL</string>
-    <string name="assistant_remote_provisioning_wrong_format">Неизвестен URL формат, неуспешно изтегляне на профил…</string>
-    <string name="assistant_remote_provisioning_failure">Неуспешно изтегляне или прилагане на профил…</string>
-    <string name="assistant_fetch_apply">Изтегляне и прилагане</string>
-    <string name="assistant_launch_qrcode">QR код</string>
-    <string name="settings_accounts_title">SIP акаунти</string>
-    <string name="settings_list_title">Настройки</string>
-    <string name="settings_tunnel_title">Тунел</string>
-    <string name="settings_audio_title">Аудио</string>
-    <string name="settings_video_title">Видео</string>
-    <string name="settings_call_title">Обаждане</string>
-    <string name="settings_chat_title">Чат</string>
-    <string name="settings_network_title">Мрежа</string>
-    <string name="settings_contacts_title">Контакти</string>
-    <string name="settings_advanced_title">Разширени</string>
-    <string name="settings_conferences_title">Срещи</string>
-    <string name="settings_primary_account_display_name_title">Екранно име</string>
-    <string name="settings_primary_account_username_title">Потребителско име</string>
-    <string name="settings_password_protection_dialog_input_hint">Парола</string>
-    <string name="settings_password_protection_dialog_ok_label">Валидиране</string>
-    <string name="settings_password_protection_dialog_invalid_input">Невалидна парола!</string>
-    <string name="audio_settings_software_echo_cancellation_title">Софтуерно анулиране на ехо</string>
-    <string name="audio_settings_echo_cancellation_summary">Премахва ехото което се чува от ответната страна</string>
-    <string name="audio_settings_echo_canceller_calibration_title">Калибриране за анулиране на ехо</string>
-    <string name="audio_settings_echo_cancellation_calibration_started">Започва калибриране за анулиране на ехо</string>
-    <string name="audio_settings_echo_cancellation_calibration_value">Калибрирано за %s милисекунди</string>
-    <string name="audio_settings_echo_cancellation_calibration_failed">Неуспешно калибриране</string>
-    <string name="audio_settings_echo_tester_title">Тест за ехо</string>
-    <string name="audio_settings_echo_tester_summary">Натиснете за да започне тест за ехо</string>
-    <string name="audio_settings_echo_tester_summary_is_stopped">Теста за ехо е спрян</string>
-    <string name="audio_settings_echo_tester_summary_is_running">Теста за ехо се извършва</string>
-    <string name="audio_settings_input_device_title">Звуково устройство по подразбиране</string>
-    <string name="audio_settings_output_device_title">Изходно звуково устройство по подразбиране</string>
-    <string name="audio_settings_codec_bitrate_title">Ограничение на битрейт за кодека</string>
-    <string name="audio_settings_microphone_gain_summary">(в децибели)</string>
-    <string name="audio_settings_playback_gain_title">Усилване на звука</string>
-    <string name="audio_settings_codecs_title">Кодекси</string>
-    <string name="video_settings_enable_title">Включване на видео</string>
-    <string name="video_settings_tablet_preview_title">Показване на камерата върху циферблата</string>
-    <string name="video_settings_initiate_call_summary">Винаги изпращайте заявки за видео</string>
-    <string name="video_settings_automatically_accept_title">Приемане на входящи заявки за видео</string>
-    <string name="video_settings_automatically_accept_summary">Винаги приемайте заявки за видео</string>
-    <string name="video_settings_camera_device_title">Камера</string>
-    <string name="video_settings_preferred_fps_title">Предпочитана честота на кадрите</string>
-    <string name="video_settings_codecs_title">Кодекси</string>
-    <string name="call_settings_ringtones_title">Мелодия</string>
-    <string name="call_settings_vibrate_title">Вибрация при входящи обаждания</string>
-    <string name="call_settings_encryption_title">Шифроване на медията</string>
-    <string name="call_settings_media_encryption_none">Няма</string>
-    <string name="call_settings_use_telecom_manager_title">Подобряване на връзката с bluetooth устройства</string>
-    <string name="call_settings_overlay_title">Наслагване на известието за обаждане</string>
-    <string name="call_settings_system_wide_overlay_title">Показване на известието извън приложението</string>
-    <string name="call_settings_media_encryption_srtp">SRTP</string>
-    <string name="call_settings_media_encryption_zrtp">ZRTP</string>
-    <string name="call_settings_media_encryption_zrtp_post_quantum">Квантово устойчив ZRTP</string>
-    <string name="call_settings_media_encryption_dtls">DTLS-SRTP</string>
-    <string name="call_settings_auto_start_title">Незабавно стартиране на обаждането</string>
-    <string name="call_settings_auto_answer_title">Автоматично отговаряне на входящи обаждания</string>
-    <string name="call_settings_auto_answer_delay_title">Времетраене за автоматичен отговор</string>
-    <string name="call_settings_auto_answer_delay_summary">в милисекунди</string>
-    <string name="call_settings_incoming_timeout_title">Времетраене за отказ на прекомерни входящи обаждания</string>
-    <string name="call_settings_incoming_timeout_summary">в секунди</string>
-    <string name="call_settings_voice_mail_uri_title">URI за гласова поща</string>
-    <string name="call_settings_accept_early_media_title">Приемане на ранна медия</string>
-    <string name="call_settings_ring_during_early_media_title">Звънене по време на входяща ранна медия</string>
-    <string name="call_settings_go_to_android_notification_settings">Настройки на известия за Андроид</string>
-    <string name="call_settings_auto_start_recording_title">Автоматично записване на обажданията</string>
-    <string name="call_settings_remote_recording_title">Известие когато обаждането се записва от кореспондент</string>
-    <string name="chat_settings_auto_download_summary">Определя дали да се изтеглят файлове прикачени към получени съобщения</string>
-    <string name="chat_settings_auto_download_always">Винаги</string>
-    <string name="chat_settings_auto_download_never">Никога</string>
-    <string name="chat_settings_auto_download_max_size_title">Максимален размер</string>
-    <string name="chat_settings_auto_download_max_size_summary">в байтове</string>
-    <string name="chat_settings_downloaded_media_public_title">Изтеглените файлове да са публични</string>
-    <string name="chat_settings_hide_notification_content_title">Скриване на съдържанието на съобщения в известията</string>
-    <string name="chat_settings_hide_notification_content_summary">Показва се само името на автора</string>
-    <string name="chat_settings_launcher_shortcuts_title">Създаване на преки пътища до стаи при стартиране</string>
-    <string name="chat_settings_hide_empty_rooms_title">Скриване на празни стаи</string>
-    <string name="chat_settings_hide_rooms_removed_proxies_title">Скриване на стаите от премахнат акаунт</string>
-    <string name="chat_settings_hide_rooms_removed_proxies_summary">Ако ви липсват стаи, опитайте да изключите тази настройка</string>
-    <string name="chat_settings_use_in_app_file_viewer_title">Винаги отваряйте файлове в това приложение</string>
-    <string name="chat_settings_use_in_app_file_viewer_summary">Пак ще можете да ги експортирате към други приложения</string>
-    <string name="network_settings_wifi_only_title">Използване само през WiFi</string>
-    <string name="network_settings_random_ports_title">Използване на случайни портове</string>
-    <string name="network_settings_sip_port_title">SIP порт</string>
-    <string name="contacts_settings_native_presence_title">Информация за присъствие на контакти</string>
-    <string name="contacts_settings_show_organization_title">Показване на данни за организация</string>
-    <string name="contacts_settings_launcher_shortcuts_title">Създаване на преки пътища до контакти при стартиране</string>
-    <string name="contacts_settings_launcher_shortcuts_summary">Заменя преките пътища до стаи, ако съществуват такива</string>
-    <string name="contacts_settings_show_new_contact_account_dialog_summary">Ако се изключи, контактите ще се съхраняват локално</string>
-    <string name="contacts_settings_create_new_ldap_config_title">Нова конфигурация LDAP</string>
-    <string name="contacts_settings_ldap_enable_title">Включване</string>
-    <string name="contacts_settings_ldap_delete_title">Изтриване</string>
-    <string name="contacts_settings_ldap_connection_title">Връзка</string>
-    <string name="contacts_settings_ldap_server_title">URL адрес на сървър</string>
-    <string name="contacts_settings_ldap_password_title">Парола</string>
-    <string name="contacts_settings_ldap_auth_method_title">Начин за автентикация</string>
-    <string name="contacts_settings_ldap_auth_method_simple">Прост</string>
-    <string name="contacts_settings_ldap_tls_title">Чрез TLS</string>
-    <string name="contacts_settings_ldap_cert_check_title">Проверка на сертификати</string>
-    <string name="contacts_settings_ldap_cert_check_auto">Автоматично</string>
-    <string name="contacts_settings_ldap_cert_check_disabled">Изключено</string>
-    <string name="contacts_settings_ldap_cert_check_enabled">Включено</string>
-    <string name="contacts_settings_ldap_search_title">Търсене</string>
-    <string name="contacts_settings_ldap_search_base_subtitle">Не може да е празно!</string>
-    <string name="contacts_settings_ldap_search_filter_title">Филтър</string>
-    <string name="contacts_settings_ldap_search_max_results_title">Максимален брой резултати</string>
-    <string name="contacts_settings_ldap_search_timeout_title">Време за изчакване</string>
-    <string name="contacts_settings_ldap_request_delay_title">Време между две заявки</string>
-    <string name="contacts_settings_ldap_request_delay_subtitle">В милисекунди</string>
-    <string name="contacts_settings_ldap_minimum_characters_title">Минимален брой символи за търсене</string>
-    <string name="contacts_settings_ldap_parsing_title">Разбор</string>
-    <string name="contacts_settings_ldap_sip_attribute_title">Атрибути на SIP</string>
-    <string name="contacts_settings_ldap_sip_domain_title">Домейн</string>
-    <string name="contacts_settings_ldap_title">LDAP</string>
-    <string name="contacts_settings_ldap_bind_dn_title">Обвързване на DN</string>
-    <string name="contacts_settings_ldap_debug_title">Отстраняване на грешки</string>
-    <string name="advanced_settings_background_mode_title">Фонов режим</string>
-    <string name="advanced_settings_background_mode_summary">Показване на известие за да не се изключи приложението</string>
-    <string name="advanced_settings_dark_mode_title">Тъмна тема</string>
-    <string name="advanced_settings_dark_mode_label_auto">Автоматично</string>
-    <string name="advanced_settings_dark_mode_label_no">Не</string>
-    <string name="advanced_settings_dark_mode_label_yes">Да</string>
-    <string name="advanced_settings_animations_title">Анимации</string>
-    <string name="advanced_settings_device_name_title">Име на устройството</string>
-    <string name="advanced_settings_remote_provisioning_url_title">URL адрес за доставка</string>
-    <string name="advanced_settings_logs_server_url_title">URL за качване на логовете</string>
-    <string name="advanced_settings_logs_server_url_summary">Моля не редактирате ако не сте сигурни!</string>
-    <string name="advanced_settings_android_title">Андроид</string>
-    <string name="advanced_settings_go_to_power_manager_settings">Настройки на диспечер за захранването</string>
-    <string name="advanced_settings_go_to_android_app_settings">Настройки за Андроид приложение</string>
-    <string name="advanced_settings_vfs_title">Зашифроване на всичко</string>
-    <string name="advanced_settings_send_debug_logs_title">Изпращане на логовете</string>
-    <string name="advanced_settings_reset_debug_logs_title">Анулиране на логовете</string>
-    <string name="advanced_settings_debug_title">Настройка за отстраняване на грешки</string>
-    <string name="advanced_settings_other_title">Други настройки</string>
-    <string name="advanced_settings_disable_fragment_security_summary">Позволяване на записване на екрана когато съдържа поверителна информация</string>
-    <string name="tunnel_settings_hostname_url_title">Име на хост</string>
-    <string name="tunnel_settings_port_title">Порт</string>
-    <string name="tunnel_settings_dual_mode_title">Двоен режим включен</string>
-    <string name="tunnel_settings_dual_hostname_url_title">Име на хост на втори сървър</string>
-    <string name="tunnel_settings_dual_hostname_url_summary">Изисква се в двоен режим</string>
-    <string name="tunnel_settings_dual_port_title">Втори порт на сървър</string>
-    <string name="tunnel_settings_dual_port_summary">Изисква се в двоен режим</string>
-    <string name="tunnel_settings_mode_title">Режим</string>
-    <string name="tunnel_settings_disabled_mode">Изключен</string>
-    <string name="tunnel_settings_auto_mode">Автоматично</string>
-    <string name="account_settings_user_name_title">Потребителско име</string>
-    <string name="account_settings_user_id_title">Име за автентикация</string>
-    <string name="account_settings_user_id_summary">Въведете име за автентикация ако се различава от потребителското име (незадължително)</string>
-    <string name="account_settings_domain_title">Домейн</string>
-    <string name="account_settings_domain_summary">Пример: sip.example.org ако акаунта ви е john@sip.example.org</string>
-    <string name="account_settings_display_name_title">Екранно име</string>
-    <string name="account_settings_manage_title">Управление</string>
-    <string name="account_settings_disable_title">Деактивиране</string>
-    <string name="account_settings_default_title">Използване по подразбиране</string>
-    <string name="account_settings_delete_title">Изтриване</string>
-    <string name="account_settings_advanced_title">Разширени настройки</string>
-    <string name="account_settings_push_notification_title">Разрешете известия</string>
-    <string name="account_settings_transport_title">Транспортен протокол</string>
-    <string name="account_settings_proxy_title">SIP прокси</string>
-    <string name="account_settings_outbound_proxy_title">Изходящо прокси</string>
-    <string name="account_settings_outbound_proxy_summary">Насочете всички обаждания през посоченото SIP прокси</string>
-    <string name="account_settings_stun_server_title">STUN/TURN сървър</string>
-    <string name="account_settings_ice_title">Включете ICE</string>
-    <string name="account_settings_avpf_rr_interval_summary">в секунди (между 1 и 5)</string>
-    <string name="account_settings_expires_title">Време за изтичане</string>
-    <string name="account_settings_expires_summary">Префикс за вашата държава</string>
-    <string name="account_settings_prefix_summary">без +</string>
-    <string name="account_settings_apply_prefix_for_calls_title">Добавяне на префикс при изходящи обаждания и чат</string>
-    <string name="account_settings_escape_plus_title">Замяна на + с 00</string>
-    <string name="account_setting_conference_factory_address">Конферентен фактори URI</string>
-    <string name="account_setting_audio_video_conference_factory_address">Адрес на сървър за E2E шифроване</string>
-    <string name="account_setting_end_to_end_encryption_keys_server_url">Адрес на сървър за E2E шифроване</string>
-    <string name="account_setting_delete_dialog_title">Желаете ли да изтриете вашия акаунт\?</string>
-    <string name="account_settings_transport_udp">UDP</string>
-    <string name="account_settings_transport_tcp">TCP</string>
-    <string name="account_settings_transport_tls">TLS</string>
-    <string name="account_settings_transport_dtls">DTLS</string>
-    <string name="account_settings_avpf_title">AVPF</string>
-    <string name="account_setting_disable_bundle_mode_title">Деактивирайте пакетния режим</string>
-    <string name="notification_channel_incoming_call_name">&appName; известия за входящи обаждания</string>
-    <string name="incoming_call_notification_title">Входящо обаждане</string>
-    <string name="incoming_group_call_notification_title">Входящо групово обаждане</string>
-    <string name="incoming_call_notification_hangup_action_label">Прекратяване</string>
-    <string name="incoming_call_notification_answer_action_label">Отговор</string>
-    <string name="received_chat_notification_reply_label">Отговор</string>
-    <string name="received_chat_notification_mark_as_read_label">Маркиране като прочетено</string>
-    <string name="missed_call_notification_title">Пропуснато обаждане</string>
-    <string name="missed_calls_notification_body" tools:ignore="PluralsCandidate">%d пропуснати обаждания</string>
-    <string name="zrtp_dialog_title">Сигурност на комуникацията</string>
-    <string name="zrtp_dialog_later_button_label">По-късно</string>
-    <string name="zrtp_dialog_correct_button_label">Правилно</string>
-    <string name="dialog_zrtp_local_sas">Кажете:</string>
-    <string name="dialog_zrtp_remote_sas">Вашия кореспондент трябва да каже:</string>
-    <string name="dialog_do_not_ask_again">Не показвай отново</string>
-    <string name="dialog_cancel">Отказ</string>
-    <string name="dialog_delete">Изтриване</string>
-    <string name="dialog_ok">Добре</string>
-    <string name="dialog_accept">Приемане</string>
-    <string name="dialog_decline">Отхвърляне</string>
-    <string name="dialog_call">Обаждане</string>
-    <string name="operation_in_progress_wait">Операцията се извършва, моля изчакайте</string>
-    <string name="dialog_default_delete_one">Сигурни ли сте, че искате да изтриете този предмет\?</string>
-    <string name="dialog_default_delete_many">Сигурни ли сте, че искате да изтриете избраните предмети\?</string>
-    <string name="dialog_update_available">Съществува актуализация</string>
-    <string name="dialog_try_open_file_as_text_body">Желаете ли да го отворите като текстов файл\?</string>
-    <string name="dialog_authentication_required_change_password_label">Потвърждение</string>
-    <string name="content_description_add_sip_address_field">Добавяне на поле за SIP адрес</string>
-    <string name="content_description_add_phone_number_field">Добавяне на поле за телефонен номер</string>
-    <string name="content_description_go_back">Назад</string>
-    <string name="content_description_clear_field">Изтрийте полето до него</string>
-    <string name="content_description_switch_camera">Сменете между предна или задна камера</string>
-    <string name="content_description_pause_call">Пауза на обаждането</string>
-    <string name="content_description_terminate_call">Прекратяване на обаждането</string>
-    <string name="content_description_answer_call">Отговорете на обаждането</string>
-    <string name="content_description_enable_mic_mute">Изключване на микрофона</string>
-    <string name="content_description_disable_mic_mute">Включване на микрофона</string>
-    <string name="content_description_disable_speaker">Пренасочване на звука през слушалки</string>
-    <string name="content_description_go_back_to_call">Назад към обаждането</string>
-    <string name="content_description_enable_video">Включване на видео</string>
-    <string name="content_description_disable_video">Изключване на видео</string>
-    <string name="content_description_use_bluetooth_headset">Използване на bluetooth слушалки за звук</string>
-    <string name="content_description_use_earpiece">Използване на слушалки за звук</string>
-    <string name="content_description_add_call">Стартиране на ново обаждане</string>
-    <string name="content_description_transfer_call">Трансфериране на обаждането до друг</string>
-    <string name="content_description_pending_file_transfer">Файлов трансфер в очакване</string>
-    <string name="content_description_downloaded_file_transfer">Прикачен файл</string>
-    <string name="content_description_delivery_status">Етап на доставка</string>
-    <string name="content_description_forward_message">Препращане на съобщението в този разговор</string>
-    <string name="content_description_ephemeral_message">Съобщението е краткотрайно</string>
-    <string name="content_description_contact_selected">Контакта е маркиран</string>
-    <string name="content_description_e2e_encryption_disabled">Шифроване от \"край до край\" е изключено</string>
-    <string name="content_description_show_all_contacts">Показване на списък с всички контакти</string>
-    <string name="content_description_show_sip_contacts">Показване на списък само със SIP контакти</string>
-    <string name="content_description_remove_contact_from_selection">Размаркиране на контакт</string>
-    <string name="content_description_start_call">Стартиране на обаждане</string>
-    <string name="content_description_show_chat_room_menu">Показване на менюто за стая</string>
-    <string name="content_description_enter_edition_mode">Влезте в режим на редактиране</string>
-    <string name="content_description_attach_file">Прикачване на файл към съобщението</string>
-    <string name="android_14_full_screen_intent_permission_not_granted">Изисква се разрешение за да се показват входящи обаждания</string>
-    <string name="android_14_go_to_full_screen_intent_permission_setting">Покавзане</string>
-    <string name="content_description_ephemeral_duration_selected">Избрано времетраене за краткотрайни съобщения</string>
-    <string name="content_description_ephemeral_duration_change">Променете времетраенето за краткотрайни съобщения</string>
-    <string name="content_description_create_chat_room">Създайте стая за чат</string>
-    <string name="content_description_add_participants">Добавете участници</string>
-    <string name="content_description_contact_is_admin">Контакта е администратор в този разговор</string>
-    <string name="content_description_contact_is_not_admin">Контакта не е администратор в този разговор</string>
-    <string name="content_description_muted_chat_room">Известията за този разговор са изключени</string>
-    <string name="content_description_contact_can_do_encryption">Контакта може да бъде поканен в шифровани разговори</string>
-    <string name="content_description_start_chat">Към разговор</string>
-    <string name="content_description_edit_contact">Редактиране на контакт</string>
-    <string name="content_description_delete_contact">Изтриване на контакт</string>
-    <string name="content_description_discard_changes">Отхвърлете промените</string>
-    <string name="content_description_confirm_contact_edit">Запишете промените</string>
-    <string name="content_description_change_own_picture">Промяна на собствената снимка</string>
-    <string name="content_description_show_call_details">Към подробности за обаждането</string>
-    <string name="content_description_select_all">Маркирайте всички в листа</string>
-    <string name="content_description_unselect_all">Размаркирайте всички</string>
-    <string name="content_description_delete_selection">Изтрийте всички маркирани</string>
-    <string name="content_description_recording_toggle_play">Стартиране или прекъсване на записа</string>
-    <string name="content_description_toggle_side_menu">Показване или скриване на страничното меню</string>
-    <string name="content_description_menu_history">Последни обаждания</string>
-    <string name="content_description_menu_contacts">Контакти</string>
-    <string name="content_description_menu_dialer">Циферблат</string>
-    <string name="content_description_dialer_erase">Премахване на последния символ</string>
-    <string name="content_description_add_contact">Създаване на контакт</string>
-    <string name="content_description_show_all_calls">Показване на всички обаждания</string>
-    <string name="content_description_show_missed_calls">Показване само на пропуснатите обаждания</string>
-    <string name="content_description_incoming_call">Входящо обаждане</string>
-    <string name="content_description_numpad_1">1</string>
-    <string name="content_description_numpad_2">2</string>
-    <string name="content_description_numpad_3">3</string>
-    <string name="content_description_numpad_4">4</string>
-    <string name="content_description_numpad_5">5</string>
-    <string name="content_description_numpad_6">6</string>
-    <string name="content_description_numpad_7">7</string>
-    <string name="content_description_numpad_8">8</string>
-    <string name="content_description_numpad_9">9</string>
-    <string name="content_description_numpad_0">0</string>
-    <string name="content_description_numpad_star">*</string>
-    <string name="content_description_numpad_sharp">#</string>
-    <string name="content_description_create_one_to_one_chat_room">Създаване на нов разговор</string>
-    <string name="content_description_create_group_chat_room">Създаване на нов групов разговор</string>
-    <string name="content_description_security_level_unsafe">Несигурно</string>
-    <string name="content_description_security_level_encrypted">Шифровано</string>
-    <string name="content_description_call_quality_0">Много ниско качество на обаждането</string>
-    <string name="content_description_call_quality_2">Средно качество на обаждането</string>
-    <string name="content_description_call_quality_3">Добро качество на обаждането</string>
-    <string name="content_description_call_quality_4">Максимално качество на обаждането</string>
-    <string name="content_description_call_secured">Обаждането е сигурно</string>
-    <string name="content_description_call_security_pending">Сигурността на обаждането се определя</string>
-    <string name="content_description_chat_message_video_attachment">Приложение към видео</string>
-    <string name="content_description_take_screenshot">Записване на снимка от получен видео клип</string>
-    <string name="content_description_close_bubble">Затваряне на известието</string>
-    <string name="content_description_export">Отваряне на файла с друго приложение</string>
-    <string name="content_description_cancel_forward">Прекратяване на препращането</string>
-    <string name="content_description_cancel_sharing">Прекратяване на споделянето</string>
-    <string name="content_description_cancel_reply">Прекратяване на отговора</string>
-    <string name="content_description_cancel_voice_recording">Прекратяване на записа</string>
-    <string name="content_description_play_voice_recording">Записване</string>
-    <string name="content_description_edit_conference">Редактиране на среща</string>
-    <string name="content_description_delete_conference">Изтриване на среща</string>
-    <string name="content_description_encrypted_conference">Срещата ще бъде шифрована</string>
-    <string name="content_description_share_ics">Експортиране на събитието до календара</string>
-    <string name="content_description_show_numpad">Показване на циферблата</string>
-    <string name="content_description_hide_numpad">Скриване на циферблата</string>
-    <string name="content_description_go_to_chat_rooms_list">Към списъка с участници</string>
-    <string name="content_description_toggle_layout_menu">Показване или скриване на груповото офомление</string>
-    <string name="content_description_participant_is_paused">Участника временно напусна груповото обаждане</string>
-    <string name="content_description_conference_participants">Участници в груповото обаждане</string>
-    <string name="content_description_recording_export">Експортиране на запис</string>
-    <string name="content_description_presence_online">Потребителя е на линия</string>
-    <string name="content_description_presence_offline">Потребителя не е на линия</string>
-    <string name="content_description_emoji_picker">Превключване на менюто с emoji</string>
-    <string name="service_name">&appName; услуга</string>
-    <string name="service_auto_start_description">&appName; бе стартирано автоматично</string>
-    <string name="about_weblate_translation">Помогнете да преведем &appName; на различни езици</string>
-    <string name="logs_upload_failure">Неуспешно качване на логове!</string>
-    <string name="logs_url_copied_to_clipboard">Адреса на логовете бе копиран в клипборда</string>
-    <string name="phone_number">Телефонен номер</string>
-    <string name="select_your_country">Изберете вашата държава</string>
-    <string name="international_prefix">Префикс</string>
-    <string name="assistant_choose_country">Изберете държава</string>
-    <string name="password">Парола</string>
-    <string name="sip_address">SIP адрес</string>
-    <plurals name="days">
-        <item quantity="one">%d ден</item>
-        <item quantity="other">%d дни</item>
-    </plurals>
-    <string name="error_unexpected">Неочаквана грешка…</string>
-    <string name="transport">Транспортен протокол</string>
-    <string name="status_connected">Свързано</string>
-    <string name="status_not_connected">Не е свързано</string>
-    <string name="no_account_configured">Не е настроен акаунт</string>
-    <string name="assistant">Асистент</string>
-    <string name="quit">Напускане</string>
-    <string name="no_missed_call_history">Няма изпуснати обаждания</string>
-    <string name="history_delete_many_dialog">Желаете ли да изтриете тези записи\?</string>
-    <string name="contact_send_sms_invite_text">Здравейте, свържете се с мен чрез &appName;! Може да изтеглите безплатното приложение от %s</string>
-    <string name="contact_editor_write_permission_denied">Няма разрешение да се добавят или редактират контакти</string>
-    <string name="contact_delete_one_dialog">Желаете ли да изтриете този контакт\?
-\nСъщия ще бъде премахнат от адресната книга на вашето устройство</string>
-    <string name="contact_delete_many_dialog">Желаете ли да изтриете тези контакти\?
-\nСъщите ще бъде премахнати от адресната книга на вашето устройство</string>
-    <string name="debug_popup_title">Отстраняване на грешки</string>
-    <string name="debug_popup_send_logs">Изпратете логовете</string>
-    <string name="debug_popup_show_config_file">Вижте конфигурационния файл</string>
-    <string name="chat_remote_is_composing">Ответната страна пише…</string>
-    <string name="chat_event_device_removed">устройството за %s беше премахнато</string>
-    <string name="chat_event_subject_changed">нова тема: %s</string>
-    <string name="chat_security_event_lime_identity_key_changed">Смени се ключ за LIME идентичност за %s</string>
-    <string name="chat_security_event_participant_max_count_exceeded">Максималния брой участници е надвишен с %s</string>
-    <string name="chat_room_devices_fragment_title">Устройства за чат</string>
-    <string name="chat_room_group_info_leave">Напускане на група</string>
-    <string name="chat_room_group_info_leave_dialog_message">Желаете ли да напуснете разговора\?</string>
-    <string name="chat_message_forwarded">Пренасочено</string>
-    <string name="chat_message_context_menu_resend">Повторно изпращане</string>
-    <string name="chat_message_context_menu_copy_text">Копиране на текста</string>
-    <string name="chat_message_forward_confirmation_dialog">Желаете ли па препратите съобщението до тази стая\?</string>
-    <string name="chat_room_choose_conversation_for_message_forward">Изберете или създайте нов разговор за да препратите съобщението</string>
-    <string name="chat_room_choose_conversation_for_file_sharing">Изберете или създайте нов разговор за да споделите файла/файловете</string>
-    <string name="chat_room_choose_conversation_for_text_sharing">Изберете или създайте нов разговор за да споделите текста</string>
-    <string name="chat_room_ephemeral_fragment_title">Краткотрайни съобщения</string>
-    <string name="chat_room_ephemeral_messages_desc">Това съобщение ще бъде заличено от двете страни след като бъде прочетено и след като измине посочения срок.</string>
-    <string name="chat_room_delete_many_dialog">Сигурни ли сте, че искате да изтриете тези разговори\?</string>
-    <string name="chat_message_cant_open_file_in_app_dialog_message">Желаете ли да отворите файла като текст или да го експортирате (разшифрован) към друго приложение\?</string>
-    <string name="chat_message_voice_recording_playback_low_volume">Нивото на звук ви е ниско, моля опитайте да го увеличите</string>
-    <plurals name="chat_room_unread_messages_event">
-        <item quantity="one">%1$d непрочетено съобщение</item>
-        <item quantity="other">%1$d непрочетени съобщения</item>
-    </plurals>
-    <string name="chat_message_voice_recording_received_notification">Вие получихте гласово съобщение</string>
-    <string name="chat_room_presence_online">Онлайн</string>
-    <string name="recordings_empty_list">Няма записи</string>
-    <string name="conference_schedule_later">Желаете ли да насрочите среща за по-късно\?</string>
-    <string name="conference_schedule_subject_hint">Тема на срещата</string>
-    <string name="conference_schedule_duration">Времетраене</string>
-    <string name="conference_schedule_send_updated_invite_chat">Изпратете актуализация чрез &appName;</string>
-    <string name="conference_schedule_send_invite_chat_summary">Поканата ще бъде изпратена чрез моят &appName; акаунт</string>
-    <string name="conference_schedule_edit">Редактиране на среща</string>
-    <string name="conference_schedule_address_copied_to_clipboard">Адреса на срещата бе копиран в клипборда</string>
-    <string name="conference_schedule_info_not_sent_to_participant">Неуспешно изпращане на информация за срещата до участник</string>
-    <string name="conference_update_title">Срещата бе обновена:</string>
-    <string name="conference_display_mode_active_speaker">Режим активен говорител</string>
-    <string name="conference_display_mode_audio_only">Режим само звук</string>
-    <string name="conference_waiting_room_start_call">Стартиране</string>
-    <string name="conference_waiting_room_cancel_call">Прекратяване</string>
-    <string name="conference_scheduled">Срещи</string>
-    <string name="conference_layout_too_many_participants_for_mosaic">Не може да промените оформлението на груповото обаждане защото има прекалено много участници</string>
-    <string name="conference_too_many_participants_for_mosaic_layout">Има прекалено много участници за оформление в мозайка, преминаване към режим на активен говорител</string>
-    <string name="conference_participant_paused">(в пауза)</string>
-    <string name="conference_no_schedule">Няма насрочени срещи.</string>
-    <string name="conference_creation_failed">Неуспешно създаване на среща</string>
-    <string name="conference_admin_unset">%s вече не е администратор</string>
-    <string name="conference_schedule_info_created">Срещата е насрочена</string>
-    <string name="conference_info_removed">Информацията за срещата е заличена</string>
-    <string name="conference_empty">В момента сте сами в това групово обаждане</string>
-    <string name="conference_low_bandwidth">Видеото бе изключено поради ниска скорост на връзката</string>
-    <string name="conference_start_group_call_dialog_title">Групово обаждане</string>
-    <string name="conference_start_group_call_dialog_message">Желаете ли да започнете групово обаждане\?
-\nВсички в тази група ще получат обаждане за да се присъединят към срещата.</string>
-    <string name="call_outgoing_title">Изходящо обаждане</string>
-    <string name="call_error_declined">Обаждането бе отказано</string>
-    <string name="call_error_incompatible_media_params">Несъвместими настройки на медия</string>
-    <string name="call_video_update_requested_dialog">Кореспондента желае да включи видео</string>
-    <string name="call_action_add_call">Ново обаждане</string>
-    <string name="call_action_transfer_call">Трансфериране на обаждане</string>
-    <string name="call_action_attended_transfer_call">Трансфериране с присъствие</string>
-    <string name="call_context_action_pause">Пауза на обаждането</string>
-    <string name="call_context_action_answer">Отговаряне на обаждането</string>
-    <string name="call_context_action_hangup">Прекратяване на обаждането</string>
-    <string name="call_locally_paused_subtitle">Натиснете на бутона за да възобновите обаждането.</string>
-    <string name="call_stats_download">Ширина на теглене:</string>
-    <string name="call_stats_video_resolution_received">Резолюция на входящо видео:</string>
-    <string name="call_stats_video_fps_received">Честота на кадрите на входящо видео:</string>
-    <string name="call_stats_jitter_buffer">Джитър буфер:</string>
-    <string name="call_stats_media_encryption">Шифроване на медия:</string>
-    <string name="call_stats_zrtp_auth_tag_algo">Алгоритъм за автентикация:</string>
-    <string name="assistant_welcome_desc">Този асистент ще ви помогне да настроите вашия SIP акаунт.</string>
-    <string name="assistant_phone_number_info_title">За какво се използва моят телефонен номер\?</string>
-    <string name="assistant_phone_number_link_info_content">"
-\nВашите приятели ще ви открият по-лесно ако свържете телефонен номер с вашия акаунт
-\n
-\nЩе може да видите в вашата адресна книга кой използва &appName; и вашите приятели ще узнаят, че мога да ви се обадят чрез &appName;
-\n"</string>
-    <string name="assistant_phone_number_link_info_content_already_account">Вашите приятели ще ви открият по-лесно ако свържете телефонен номер с вашия акаунт
-\n
-\nЩе може да видите в вашата адресна книга кой използва &appName; и вашите приятели ще узнаят, че мога да ви се обадят чрез &appName;.</string>
-    <string name="assistant_generic_account_warning">Някои от опциите като групов чат и краткотрайни съобщения изискват &appName; акаунт.
-\n
-\nТези опции са скрити ако се регистрирате със SIP акаунт от друг доставчик.
-\n
-\nМоля свържете се с нас ако смятате да използвате тези опции за комерсиални цели.</string>
-    <string name="assistant_no_push_warning">Изглежда, че вашето устройство не може да получава известия.
-\n
-\nИзвестията са необходими за да откриете нов акаунт чрез това приложение. За да продължите, моля посетете нашата страница:</string>
-    <string name="assistant_linphone_account">Използвайте вашия &appName; акаунт</string>
-    <string name="assistant_create_account_part_1">Моля потвърдете кода на вашата държава и въведете вашия телефонен номер</string>
-    <string name="assistant_linphone_login_desc">Моля въведете вашето &appName; потребителско име и парола</string>
-    <string name="assistant_login">Вписване</string>
-    <string name="assistant_finish">Завършване</string>
-    <string name="assistant_generic_account">Използване на SIP акаунт</string>
-    <string name="assistant_login_desc">Моля въведете потребителско име и парола на вашия SIP домейн</string>
-    <string name="assistant_create_account_part_email">Моля въведете потребителско име, имейл адрес и парола за вашия &appName; акаунт</string>
-    <string name="assistant_validate_account_1">Вашия акаунт беше създаден успешно. Моля проверете пощенската си кутия за да потвърдите регистрацията:</string>
-    <string name="assistant_use_username_instead_or_phone_number">Използвайте потребителско име (незадължително)</string>
-    <string name="assistant_create_account_part_2">До вашия телефонен номер бе изпратен SMS с код за потвърждение:</string>
-    <string name="assistant_link_phone_number">Вие ще свържете вашия телефонен номер с следното потребителско име:</string>
-    <string name="assistant_create_email_account_not_validated">Вашия акаунт все още не е активиран, моля натиснете на връзката в съдържанието на получения от вас имейл</string>
-    <string name="settings_default_account_subtitle">Акаунт по подразбиране</string>
-    <string name="settings_primary_account_title">Основен акаунт</string>
-    <string name="settings_password_protection_dialog_title">Моля въведете парола за достъп до настройките</string>
-    <string name="audio_settings_echo_canceller_calibration_summary">Натиснете за да започне калибриране за анулиране на ехо</string>
-    <string name="audio_settings_echo_cancellation_calibration_no_echo">Не е доловено ехо</string>
-    <string name="audio_settings_adaptive_rate_control_title">Адаптивен контрол</string>
-    <string name="audio_settings_input_device_summary">Промените ще се отразят при следващото обаждане</string>
-    <string name="audio_settings_output_device_summary">Промените ще се отразят при следващото обаждане</string>
-    <string name="audio_settings_prefer_bluetooth_devices_title">Насочете звука към bluetooth устройството, ако има такова</string>
-    <string name="audio_settings_microphone_gain_title">Усилване на микрофона</string>
-    <string name="audio_settings_playback_gain_summary">(в децибели)</string>
-    <string name="video_settings_initiate_call_title">Започване на видео обаждане</string>
-    <string name="video_settings_video_size_title">Предпочитан размер за видео</string>
-    <string name="video_settings_video_preset_title">Предварително зададени настройки за видео</string>
-    <string name="video_settings_bandwidth_limit_title">Ограничаване на ширината</string>
-    <string name="video_settings_bandwidth_limit_summary">в килобита/сек</string>
-    <string name="call_settings_device_ringtone_title">Използвайте мелодията на устройството</string>
-    <string name="call_settings_encryption_mandatory_title">Задължително шифроване на медията</string>
-    <string name="call_settings_use_telecom_manager_summary">Изисква някои допълнителни разрешения</string>
-    <string name="call_settings_system_wide_overlay_summary">Моля дайте разрешение за да се наслагват известията</string>
-    <string name="call_settings_sipinfo_dtmf_title">Изпращане на извън обхватни DTMF (SIP INFO)</string>
-    <string name="call_settings_rfc2833_dtmf_title">Изпращане на обхватни DTMF (RFC 2833)</string>
-    <string name="call_settings_auto_start_summary">Обаждането ще започне автоматично ако се стартира от друго приложение</string>
-    <string name="call_settings_redirect_to_voice_mail_declined_calls_title">Пренасочване на отказаните обаждания към URI за гласова поща</string>
-    <string name="call_settings_pause_calls_lost_audio_focus_title">Поставяне на обаждането в пауза при загуба на фокус</string>
-    <string name="chat_settings_mark_as_read_notif_dismissal_title">Премахнатите известия да се маркират като прочетени</string>
-    <string name="chat_settings_file_sharing_url_title">URL на сървър за споделяне</string>
-    <string name="chat_settings_file_sharing_url_summary">Не редактирайте ако не сте сигурни!</string>
-    <string name="chat_settings_auto_download_title">Автоматично изтегляне на входящи файлове</string>
-    <string name="chat_settings_auto_download_under_size">Ако са по-малки от посочения размер</string>
-    <string name="chat_settings_downloaded_media_public_summary">Автоматичното изтегляне на входящи файлове не важи за файловете в краткотрайни съобщения</string>
-    <string name="chat_settings_launcher_shortcuts_summary">Ще се замести от преки пътища до контакти, ако е включено</string>
-    <string name="chat_settings_go_to_android_notification_settings">Настройки за известия на Андроид</string>
-    <string name="chat_settings_auto_download_voice_recordings">Автоматично изтегляне на входящи гласови съобщения</string>
-    <string name="network_settings_allow_ipv6_title">Позволяване на IPv6</string>
-    <string name="contacts_settings_friendlist_subscribe_title">Абониране към списъка с приятели</string>
-    <string name="contacts_settings_native_presence_summary">Добавяне на информационни връзки от &appName; контактите към тези на Андроид</string>
-    <string name="contacts_settings_show_new_contact_account_dialog_title">Винаги да се пита в кой акаунт да се съхраняват нови контакти</string>
-    <string name="contacts_settings_ldap_auth_method_anonymous">Анонимен</string>
-    <string name="contacts_settings_ldap_search_base_title">База на търсене</string>
-    <string name="contacts_settings_ldap_search_timeout_subtitle">В секунди</string>
-    <string name="contacts_settings_ldap_name_attribute_title">Атрибути на име</string>
-    <string name="contacts_settings_ldap_misc_title">Други</string>
-    <string name="advanced_settings_debug_mode_title">Логове за отстраняване на грешки</string>
-    <string name="advanced_settings_auto_start_title">Стартиране заедно с устройството</string>
-    <string name="advanced_settings_device_name_summary">Промените ще се приложат при следващото стартиране</string>
-    <string name="advanced_settings_go_to_battery_optimization_settings">Настройка за спестяване на батерия</string>
-    <string name="advanced_settings_vfs_summary">Веднъж като се включи е невъзможно да се спре!</string>
-    <string name="advanced_settings_disable_fragment_security_title">Изключване на сигурния режим за UI</string>
-    <string name="tunnel_settings_dual_mode_summary">Ще се използва един сървър за качване и втори за теглене</string>
-    <string name="tunnel_settings_always_mode">Винаги</string>
-    <string name="account_settings_user_name_summary">Пример: john ако акаунта ви е john@sip.example.org</string>
-    <string name="account_settings_password_title">Парола</string>
-    <string name="account_settings_password_summary">Паролата се въвежда повторно при промяна на потребителско име или домейн</string>
-    <string name="account_settings_link_phone_number_title">Свържете вашия акаунт</string>
-    <string name="account_settings_push_notification_summary">Не може да се отмени регистрацията</string>
-    <string name="account_settings_avpf_rr_interval_title">AVPF обикновен RTCP интервал</string>
-    <string name="account_settings_prefix_title">Префикс за вашата държава</string>
-    <string name="account_settings_apply_prefix_for_calls_summary">При набиране на номер, добавяне на префикс</string>
-    <string name="account_setting_publish_presence_title">Публикуване на данни за присъствие</string>
-    <string name="account_setting_delete_generic_confirmation_dialog">Вашият акаунт ще бъде изтрит локално.
-\nЗа да го заличите за постоянно, посетете страницата на вашият SIP доставчик.</string>
-    <string name="account_setting_delete_sip_linphone_org_confirmation_dialog">Вашият акаунт ще бъде изтрит локално.
-\nЗа да го заличите за постоянно, посетете нашата платформа за управление:</string>
-    <string name="conferences_settings_layout_title">Оформление по подразбиране</string>
-    <string name="notification_channel_service_name">&appName; известия за услуга</string>
-    <string name="notification_channel_missed_call_name">&appName; известия за пропуснати обаждания</string>
-    <string name="notification_channel_chat_name">&appName; известия за текстови съобщения</string>
-    <string name="missed_call_notification_body">Пропуснато обаждане от %s</string>
-    <string name="zrtp_dialog_explanation">За да повишите нивото на сигурност, проверете следните кодове с вашия кореспондент.</string>
-    <string name="dialog_lime_security_message">Съобщенията при разговори с висока сигурност са шифровани от \"край до край\". Възможно е да се повиши нивото на сигурност на разговора когато участниците извършат автентикация. За да извършите същото, обадете се на вашия контакт и следвайте процеса за автентикация.</string>
-    <string name="dialog_try_open_file_as_text_title">Няма приложение за този тип файл</string>
-    <string name="dialog_apply_remote_provisioning_title">Желаете ли да изтеглите и приложите конфигурация от този адрес\?</string>
-    <string name="dialog_apply_remote_provisioning_button">Прилагане</string>
-    <string name="dialog_authentication_required_title">Изисква се автентикация</string>
-    <string name="content_description_phone_number_use">Покажете за какво се използва телефонният ви номер</string>
-    <string name="content_description_toggle_recording">Включване или изключване на записа на обаждането</string>
-    <string name="content_description_enable_speaker">Пренасочване на звука през тон колони</string>
-    <string name="content_description_toggle_audio_menu">Показване или скриване на звуковото меню</string>
-    <string name="content_description_use_speaker">Използване на тон колони за звук</string>
-    <string name="content_description_remove_pending_file_transfer">Премахване на файловия трансфер</string>
-    <string name="content_description_linphone_user">Контакта е потребител на &appName;</string>
-    <string name="content_description_e2e_encryption_enabled">Шифроване от \"край до край\" е включено</string>
-    <string name="content_description_continue_chat_room_creation">Към крайната стъпка при създаване на стая</string>
-    <string name="content_description_send_message">Изпращане на съобщение</string>
-    <string name="content_description_toggle_participant_devices_list">Показване или скриване на устройствата на участниците</string>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-bn-rBD/strings.xml b/app/src/main/res/values-bn-rBD/strings.xml
deleted file mode 100644
index f5f5ae193..000000000
--- a/app/src/main/res/values-bn-rBD/strings.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE resources [
-<!ENTITY appName "Linphone">
-]>
-<resources>
-    <string name="service_auto_start_description">&appName; স্বয়ংক্রিয়ভাবে চালু হয়েছে</string>
-    <string name="service_name">&appName; পরিষেবা</string>
-    <string name="username">ব্যাবহারকারীর নাম</string>
-    <string name="email">ইমেইল</string>
-    <string name="domain">ডোমেইন</string>
-    <string name="sip_address">এসআইপি ঠিকানা</string>
-    <string name="service_description">আড়ালে থাকা অবস্থায় কলগুলো পেতে এটা আবশ্যিক</string>
-    <string name="about_privacy_policy">আমাদের গোপনীয়তা সুরক্ষা নীতিমালাটি দেখুন</string>
-    <string name="password">শব্দচাবি</string>
-    <string name="sip_addresses">এসআইপি ঠিকানা</string>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
deleted file mode 100644
index 61ff45908..000000000
--- a/app/src/main/res/values-cs/strings.xml
+++ /dev/null
@@ -1,849 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE resources [
-<!ENTITY appName "Linphone">
-]>
-<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingQuantity">
-    <string name="content_description_copy_conference_address">Kopírovat adresu schůzky</string>
-    <string name="call_settings_auto_start_title">Okamžité zahájení volání</string>
-    <string name="call_settings_auto_start_summary">Volání se spustí automaticky, pokud je spuštěno z jiné aplikace</string>
-    <string name="call_settings_incoming_timeout_title">Časový limit příchozího volání</string>
-    <string name="call_settings_voice_mail_uri_title">URI hlasové schránky</string>
-    <string name="content_description_encrypted_conference">Schůzka bude zašifrována</string>
-    <string name="call_settings_pause_calls_lost_audio_focus_title">Pozastavení hovorů při ztrátě zaměření zvuku</string>
-    <string name="content_description_hide_statistics">Skrýt statistiky volání</string>
-    <string name="call_settings_go_to_android_notification_settings">Nastavení oznámení systému Android</string>
-    <string name="content_description_go_to_chat_rooms_list">Přejít na seznam konverzací</string>
-    <string name="call_settings_auto_start_recording_title">Automatické spuštění nahrávání hovorů</string>
-    <string name="content_description_participant_is_paused">Účastník aktuálně opustil skupinový hovor</string>
-    <string name="chat_settings_auto_download_title">Zásady automatického stahování souborů</string>
-    <string name="tunnel_settings_port_title">Port</string>
-    <string name="chat_settings_auto_download_max_size_summary">v bajtech</string>
-    <string name="tunnel_settings_dual_mode_summary">Bude používat jeden server pro nahrávání a druhý pro stahování</string>
-    <string name="chat_settings_downloaded_media_public_summary">Automatické stahování nefunguje u souborů v mizejích zprávách</string>
-    <string name="tunnel_settings_auto_mode">Automaticky</string>
-    <string name="chat_settings_hide_rooms_removed_proxies_title">Skrýt chatovací místnosti z odstraněných konfigurací proxy serverů</string>
-    <string name="account_settings_user_name_title">Uživatelské jméno</string>
-    <string name="chat_settings_hide_rooms_removed_proxies_summary">Pokud vám chybí chatovací místnosti, zkuste zrušit zaškrtnutí tohoto nastavení</string>
-    <string name="account_settings_user_id_summary">Zadejte ověřovací ID, pokud se liší od uživatelského jména (nepovinné)</string>
-    <string name="contacts_settings_friendlist_subscribe_title">Přihlášení do seznamu přátel</string>
-    <string name="account_settings_domain_summary">Příklad: sip.domena.cz pokud je tvůj účet honza@sip.domena.cz</string>
-    <string name="contacts_settings_native_presence_summary">Vložení informačních zkratek z kontaktu &appName; do nativních kontaktů systému Android</string>
-    <string name="account_settings_transport_tls">TLS</string>
-    <string name="contacts_settings_show_new_contact_account_dialog_summary">Pokud je vypnuto, kontakt bude uložen lokálně</string>
-    <string name="account_settings_outbound_proxy_title">Odchozí proxy server</string>
-    <string name="contacts_settings_ldap_connection_title">Připojení</string>
-    <string name="account_settings_avpf_rr_interval_summary">v sekundách (1 až 5)</string>
-    <string name="contacts_settings_ldap_auth_method_title">Autentizační metoda</string>
-    <string name="account_settings_prefix_title">Předčíslí vaší země</string>
-    <string name="contacts_settings_ldap_search_max_results_title">Počet výsledků</string>
-    <string name="account_settings_apply_prefix_for_calls_title">Použít předčíslí pro odchozí hovory a chat</string>
-    <string name="contacts_settings_ldap_request_delay_title">Prodleva mezi dvěma požadavky</string>
-    <string name="conferences_settings_layout_title">Výchozí rozložení</string>
-    <string name="notification_channel_service_name">&appName; oznámení služby</string>
-    <string name="incoming_group_call_notification_title">Příchozí skupinový hovor</string>
-    <string name="chat_message_context_menu_ephemeral_messages">Mizející zprávy</string>
-    <string name="chat_event_ephemeral_lifetime_changed">Datum vypršení platnosti mizejících zpráv: %s</string>
-    <string name="contacts_settings_ldap_name_attribute_title">Atributy názvu</string>
-    <string name="advanced_settings_background_mode_summary">Zobrazí oznámení, aby aplikace zůstala běžet</string>
-    <string name="advanced_settings_device_name_title">Název zařízení</string>
-    <string name="advanced_settings_device_name_summary">Změny budou použity při dalším spuštění</string>
-    <string name="advanced_settings_go_to_android_app_settings">Nastavení aplikace Android</string>
-    <string name="advanced_settings_vfs_title">Šifrovat vše</string>
-    <string name="advanced_settings_other_title">Další nastavení</string>
-    <string name="advanced_settings_disable_fragment_security_summary">Povolení snímání/nahrávání obrazovky v citlivých zobrazeních</string>
-    <string name="incoming_call_notification_answer_action_label">Odpověď</string>
-    <string name="received_chat_notification_mark_as_read_label">Označit jako přečtené</string>
-    <string name="zrtp_dialog_explanation">Chcete-li zvýšit úroveň zabezpečení, můžete si u druhé strany ověřit následující kódy.</string>
-    <string name="zrtp_dialog_correct_button_label">Správně</string>
-    <string name="dialog_decline">Zamítnout</string>
-    <string name="dialog_lime_security_message">Okamžité zprávy jsou v zabezpečených konverzacích šifrovány end-to-end. Úroveň zabezpečení konverzace je možné zvýšit ověřením účastníků. Chcete-li tak učinit, zavolejte kontaktu a postupujte podle postupu ověřování.</string>
-    <string name="content_description_phone_number_use">Ukažte, k čemu se bude vaše telefonní číslo používat</string>
-    <string name="content_description_pause_call">Pozastavit hovor</string>
-    <string name="content_description_answer_call">Přijmout volání</string>
-    <string name="content_description_enable_speaker">Směřovat zvuk do reproduktoru</string>
-    <string name="content_description_use_bluetooth_headset">Použití náhlavní soupravy Bluetooth jako zvukového výstupu</string>
-    <string name="content_description_pending_file_transfer">Čeká se na přenos souborů</string>
-    <string name="content_description_remove_pending_file_transfer">Odstranit čekající přenos souborů</string>
-    <string name="content_description_e2e_encryption_disabled">Koncové šifrování je vypnuto</string>
-    <string name="content_description_show_all_contacts">Zobrazit seznam všech kontaktů</string>
-    <string name="content_description_continue_chat_room_creation">Přejít na poslední krok vytvoření chatu</string>
-    <string name="content_description_toggle_participant_devices_list">Zobrazit nebo skrýt účastnická zařízení</string>
-    <string name="content_description_ephemeral_duration_change">Změna doby trvání mizejících zpráv podle vybrané hodnoty</string>
-    <string name="content_description_ephemeral_chat_room">Zprávy v této konverzaci jsou mizející</string>
-    <string name="content_description_discard_changes">Zahodit změny</string>
-    <string name="content_description_show_call_details">Jít na detail hovoru</string>
-    <string name="content_description_numpad_7">7</string>
-    <string name="content_description_numpad_8">8</string>
-    <string name="content_description_recording_toggle_play">Přehrát nebo pozastavit nahrávání</string>
-    <string name="content_description_voice_mail">Hlasová schránka</string>
-    <string name="content_description_toggle_side_menu">Zobrazit nebo skrýt postranní nabídku</string>
-    <string name="content_description_dialer_erase">Odstranit poslední znak</string>
-    <string name="content_description_go_to_contact">Přejít na detail kontaktu</string>
-    <string name="content_description_show_missed_calls">Zobrazit jen zmeškané hovory</string>
-    <string name="content_description_create_group_chat_room">Vytvořit skupinovou konverzaci</string>
-    <string name="content_description_call_quality_0">Velmi nízká kvalita hovoru</string>
-    <string name="content_description_call_quality_1">Nízká kvalita hovoru</string>
-    <string name="content_description_call_quality_2">Střední kvalita hovoru</string>
-    <string name="content_description_call_quality_3">Dobrá kvalita hovoru</string>
-    <string name="content_description_chat_message_meeting_attachment">Příloha schůzky</string>
-    <string name="content_description_close_bubble">Zavřít bublinu oznámení</string>
-    <string name="content_description_open_app">Otevřít konverzaci v aplikaci místo bubliny</string>
-    <string name="content_description_stop_voice_recording">Zastavit nahrávání hlasu</string>
-    <string name="content_descripton_scroll_to_bottom">Posun na konec nebo na první nepřečtenou zprávu</string>
-    <string name="service_description">Umožňuje příjem hovorů na pozadí</string>
-    <string name="sync_account_name">&appName; kontakty</string>
-    <string name="service_name">&appName; Služba</string>
-    <string name="logs_upload_failure">Odeslání logu selhalo!</string>
-    <string name="logs_reset_complete">Log byl odstraněn</string>
-    <string name="logs_url_copied_to_clipboard">URL adresa logu byla zkopírována do schránky</string>
-    <string name="phone_numbers">Telefonní čísla</string>
-    <string name="select_your_country">Vyberte zemi</string>
-    <string name="international_prefix">Předčíslí</string>
-    <string name="assistant_choose_country_title">Název nebo předčíslí země</string>
-    <string name="username">Uživatelské jméno</string>
-    <string name="password">Heslo</string>
-    <string name="email">E-mail</string>
-    <string name="domain">Doména</string>
-    <string name="sip_address">SIP adresa</string>
-    <string name="sip_addresses">SIP adresy</string>
-    <string name="cancel">Zrušit</string>
-    <plurals name="days" tools:ignore="MissingQuantity">
-        <item quantity="one">den</item>
-        <item quantity="few">dny</item>
-        <item quantity="other">dní</item>
-    </plurals>
-    <string name="transport">Přenos</string>
-    <string name="today">Dnes</string>
-    <string name="yesterday">Včera</string>
-    <string name="transport_udp">UDP</string>
-    <string name="transport_tcp">TCP</string>
-    <string name="transport_tls">TLS</string>
-    <string name="app_description"><i>svobodný</i> SIP klient</string>
-    <string name="status_connected">Připojeno</string>
-    <string name="status_not_connected">Nepřipojeno</string>
-    <string name="status_error">Připojení selhalo</string>
-    <string name="no_account_configured">Nebyl nastaven žádný účet</string>
-    <string name="about">Informace o</string>
-    <string name="assistant">Průvodce</string>
-    <string name="recordings">Nahrávky</string>
-    <string name="settings">Nastavení</string>
-    <string name="quit">Ukončit</string>
-    <string name="history_calls_list">Hovory</string>
-    <string name="no_conference_call_history">Žádné volání na schůzku v historii</string>
-    <string name="history_delete_one_dialog">Přejete si smazat tento záznam\?</string>
-    <string name="history_delete_many_dialog">Přejete si smazat tyto záznamy\?</string>
-    <string name="no_contact">V adresáři nemáte žádný kontakt.</string>
-    <string name="contact_filter_hint">Hledat kontakty</string>
-    <string name="contact_send_sms_invite_text">Ahoj, připojte se ke mně v aplikaci &appName;! Stáhnout si ji můžete zdarma na adrese %s</string>
-    <string name="contact_last_name">Příjmení</string>
-    <string name="contact_first_name">Křestní jméno</string>
-    <string name="contact_organization">Organizace</string>
-    <string name="contact_delete_many_dialog">Opravdu chcete tyto kontakty odstranit\?
-\nOdstraněny budou také z adresáře vašeho zařízení</string>
-    <string name="contact_local_sync_account">Uložit lokálně</string>
-    <string name="contact_cant_be_deleted">Kontakt nemůže být smazán</string>
-    <string name="debug_popup_title">Ladění</string>
-    <string name="debug_popup_enable_logs">Povolit logování</string>
-    <string name="debug_popup_send_logs">Odeslat log</string>
-    <string name="debug_popup_show_config_file">Zobrazit konfigurační soubor</string>
-    <string name="dialer_transfer_succeded">Hovor se přepojuje</string>
-    <string name="dialer_transfer_failed">Hovor nelze přepojit</string>
-    <string name="no_chat_history">Žádné konverzace</string>
-    <string name="chat_event_conference_created">Připojili jste se ke skupině</string>
-    <string name="chat_event_participant_added">%s se připojil</string>
-    <string name="chat_event_participant_removed">%s odešel</string>
-    <string name="chat_event_device_added">nové zařízení pro %s</string>
-    <string name="chat_event_subject_changed">nový předmět: %s</string>
-    <string name="chat_event_admin_unset">%s již není administrátor</string>
-    <string name="chat_security_event_lime_identity_key_changed">Klíč identity LIME změněn pro %s</string>
-    <string name="chat_event_ephemeral_disabled">Zakázali jste mizející zprávy</string>
-    <string name="chat_security_event_participant_max_count_exceeded">Maximální počet účastníků překročen o %s</string>
-    <string name="chat_message_download_file">Stáhnout</string>
-    <string name="chat_room_group_info_title">Informace</string>
-    <string name="chat_room_group_info_participants">Účastníci</string>
-    <string name="chat_room_group_info_admin">Administrátor</string>
-    <string name="chat_room_group_info_leave_dialog_button">Odejít</string>
-    <string name="chat_message_imdn_info">Stav doručení</string>
-    <string name="chat_message_imdn_displayed">Číst</string>
-    <string name="chat_message_imdn_delivered">Doručeno</string>
-    <string name="chat_message_imdn_sent">Odesláno</string>
-    <string name="chat_message_replied">Odpovědět</string>
-    <string name="chat_message_context_menu_resend">Znovu odeslat</string>
-    <string name="chat_message_context_menu_reply">Odpovědět</string>
-    <string name="chat_message_forward_confirmation_dialog">Chcete přeposlat zprávu do této místnosti\?</string>
-    <string name="chat_room_choose_conversation_for_text_sharing">Vyberte nebo vytvořte konverzaci a sdílejte text</string>
-    <string name="chat_room_file_not_found">Soubor nenalezen</string>
-    <string name="chat_room_context_menu_group_info">Informace o skupině</string>
-    <string name="chat_room_context_menu_go_to_contact">Přejít na kontakt</string>
-    <string name="chat_message_context_menu_delete_messages">Smazat zprávy</string>
-    <string name="chat_room_ephemeral_fragment_title">Mizející zprávy</string>
-    <string name="chat_room_ephemeral_message_one_minute">1 minuta</string>
-    <string name="chat_room_ephemeral_message_one_day">1 den</string>
-    <string name="chat_room_ephemeral_message_three_days">3 dny</string>
-    <string name="chat_room_creation_failed_snack">Vytvoření chatovací místnosti selhalo</string>
-    <string name="chat_room_removal_failed_snack">Smazání chatovací místnosti selhalo</string>
-    <string name="chat_room_delete_one_dialog">Určitě chcete tuto konverzaci smazat\?</string>
-    <string name="chat_message_no_app_found_to_handle_file_mime_type">Pro tento typ souboru není k dispozici žádná aplikace</string>
-    <string name="chat_message_cant_open_file_in_app_dialog_export_button">Exportovat</string>
-    <string name="chat_room_sending_reply_hint">Odpovědět</string>
-    <string name="chat_room_sending_message_hint">Zpráva</string>
-    <plurals name="chat_room_unread_messages_event">
-        <item quantity="one">%1$d nepřečtená zpráva</item>
-        <item quantity="few">%1$d nepřečtené zprávy</item>
-        <item quantity="other">%1$d nepřečtených zpráv</item>
-    </plurals>
-    <string name="chat_message_removal_info">Zpráva bude smazána</string>
-    <string name="chat_message_abort_removal">Zrušit</string>
-    <string name="chat_message_voice_recording_received_notification">Obdrželi jste hlasovou zprávu</string>
-    <string name="chat_message_voice_recording">Hlasová zpráva</string>
-    <string name="recordings_export">Exportovat nahrávku pomocí…</string>
-    <string name="conference">Schůzka</string>
-    <string name="conference_group_call_title">Zahájit skupinový hovor</string>
-    <string name="conference_schedule_mandatory_field">Povinné</string>
-    <string name="conference_schedule_subject_title">Předmět</string>
-    <string name="conference_schedule_subject_hint">Předmět schůzky</string>
-    <string name="conference_group_call_subject_hint">Předmět skupinového hovoru</string>
-    <string name="conference_schedule_address_title">Adresa schůzky</string>
-    <string name="conference_schedule_description_title">Přidat popis</string>
-    <string name="conference_schedule_description_hint">Popis</string>
-    <string name="conference_schedule_date">Datum</string>
-    <string name="conference_schedule_timezone">Časová zóna</string>
-    <string name="conference_schedule_send_invite_chat">Poslat pozvánku přes &appName;</string>
-    <string name="conference_schedule_send_updated_invite_chat">Poslat aktualizaci přes &appName;</string>
-    <string name="conference_schedule_encryption">Chcete schůzku zašifrovat\?</string>
-    <string name="conference_schedule_participants_list">Seznam účastníků</string>
-    <string name="conference_organizer">Organizátor</string>
-    <string name="conference_group_call_summary">Informace o skupinovém hovoru</string>
-    <string name="conference_schedule_start">Naplánovat schůzku</string>
-    <string name="conference_schedule_edit">Upravit schůzku</string>
-    <string name="conference_group_call_create">Začít skupinový hovor</string>
-    <string name="conference_paused_title">V současné době jste mimo schůzku.</string>
-    <string name="conference_paused_subtitle">Kliknutím na tlačítko přehrát se k němu připojíte zpět.</string>
-    <string name="conference_default_title">Vzdálený skupinový hovor</string>
-    <string name="conference_invite_title">Pozvánka na schůzku:</string>
-    <string name="conference_cancel_title">Schůzka byla zrušena:</string>
-    <string name="conference_description_title">Popis</string>
-    <string name="conference_invite_join">Připojit se</string>
-    <string name="conference_display_mode_mosaic">Režim mozaiky</string>
-    <string name="conference_display_mode_active_speaker">Režim právě hovořícího</string>
-    <string name="conference_display_mode_audio_only">Pouze režim zvuku</string>
-    <string name="conference_waiting_room_start_call">Zahájit</string>
-    <string name="conference_waiting_room_cancel_call">Zrušit</string>
-    <string name="conference_scheduled">Schůzky</string>
-    <string name="conference_too_many_participants_for_mosaic_layout">Pro mozaikové uspořádání je připojeno příliš mnoho účastníků, přepínám na režim právě hovořícího</string>
-    <string name="conference_participant_paused">(pozastaveno)</string>
-    <string name="conference_no_schedule">Zatím nebyla naplánována žádná schůzka.</string>
-    <string name="conference_no_terminated_schedule">Zatím nebyla zrušena žádná schůzka.</string>
-    <string name="conference_schedule_organizer">Organizátor:</string>
-    <string name="conference_admin_set">%s je nyní administrátor</string>
-    <string name="conference_admin_unset">%s již není administrátor</string>
-    <string name="conference_info_removed">Informace o schůzce byly odstraněny</string>
-    <string name="conference_empty">V současné době jste v tomto skupinovém hovoru sami</string>
-    <string name="conference_invitation_received_notification">Byli jste pozváni na schůzku</string>
-    <string name="conference_invitation">Pozvánka na schůzku</string>
-    <string name="conference_incoming_title">Příchozí skupinový hovor</string>
-    <string name="conference_participants_title">Účastníci (%d)</string>
-    <string name="conference_start_group_call_dialog_ok_button">Zahájit</string>
-    <string name="conference_scheduled_terminated_filter">Ukončeno</string>
-    <string name="conference_scheduled_future_filter">Naplánováno</string>
-    <string name="conference_scheduled_delete_many_dialog">Přejete si tyto schůzky smazat\?</string>
-    <string name="conference_scheduled_cancelled_by_organizer">Konference byla organizátorem zrušena</string>
-    <string name="call_incoming_title">Příchozí hovor</string>
-    <string name="call_outgoing_title">Odchozí hovor</string>
-    <string name="call_notification_outgoing">Odchozí hovor</string>
-    <string name="call_notification_active">Hovor probíhá</string>
-    <string name="call_error_declined">Hovor byl odmítnut</string>
-    <string name="call_error_user_busy">Uživatel je zaneprázdněn</string>
-    <string name="call_error_network_unreachable">Síť není dostupná</string>
-    <string name="call_error_server_timeout">Časový limit serveru</string>
-    <string name="call_error_temporarily_unavailable">Dočasně nedostupné</string>
-    <string name="call_error_generic">Chyba: %s</string>
-    <string name="call_action_participants_list">Seznam účastníků</string>
-    <string name="call_action_chat">Chat</string>
-    <string name="call_action_calls_list">Seznam hovorů</string>
-    <string name="call_action_numpad">Číselník</string>
-    <string name="call_action_add_call">Zahájit nový hovor</string>
-    <string name="call_action_transfer_call">Přepojit hovor</string>
-    <string name="call_context_action_pause">Pozastavit hovor</string>
-    <string name="call_context_action_transfer">Přepojit hovor</string>
-    <string name="call_context_action_hangup">Ukončit hovor</string>
-    <string name="call_remotely_paused_title">Volání bylo pozastaveno vzdáleným účastníkem.</string>
-    <string name="call_locally_paused_title">Pozastavili jste hovor.</string>
-    <string name="call_locally_paused_subtitle">Kliknutím na tlačítko přehrávání pokračujte v hovoru.</string>
-    <string name="call_screenshot_taken">Pořízen snímek: %s</string>
-    <string name="call_stats_audio">Zvuk</string>
-    <string name="call_stats_video">Obraz</string>
-    <string name="call_stats_codec">Kodek:</string>
-    <string name="call_stats_upload">Rychlost nahrávání:</string>
-    <string name="call_stats_download">Rychlost stahování:</string>
-    <string name="call_stats_ice">ICE připojení:</string>
-    <string name="call_stats_video_resolution_received">Rozlišení přijímaného obrazu:</string>
-    <string name="call_stats_sender_loss_rate">Míra ztrátovosti odesílatele:</string>
-    <string name="call_stats_receiver_loss_rate">Míra ztrátovosti příjemce:</string>
-    <string name="call_stats_jitter_buffer">Vyrovnávací paměť Jitter:</string>
-    <string name="call_stats_decoder_name">Dekódování:</string>
-    <string name="call_stats_player_filter">Filtr přehrávače:</string>
-    <string name="call_stats_media_encryption">Šifrování médií:</string>
-    <string name="call_stats_zrtp_sas_algo">SAS algoritmus:</string>
-    <string name="assistant_welcome_title">Vítejte</string>
-    <string name="assistant_login_linphone">Použít &appName; účet</string>
-    <string name="assistant_remote_provisioning">Načtení vzdálené konfigurace</string>
-    <string name="assistant_phone_number_link_info_content_already_account">Své telefonní číslo můžete používat pouze s jedním účtem &appName;.
-\n
-\nPokud jste již své číslo propojili s jiným účtem, ale raději používáte tento účet, jednoduše jej nyní propojte a vaše číslo bude automaticky přesunuto na tento účet.</string>
-    <string name="assistant_privacy_policy">zásady ochrany osobních údajů</string>
-    <string name="assistant_error_username_already_exists">Uživatelské jméno již existuje</string>
-    <string name="assistant_error_phone_number_already_exists">Účet s tímto číslem již existuje</string>
-    <string name="assistant_error_username_invalid_characters">Nalezen nepovolený znak</string>
-    <string name="assistant_error_passwords_dont_match">Hesla se neshodují</string>
-    <string name="assistant_error_invalid_email_address">E-mailová adresa není platná</string>
-    <string name="assistant_linphone_account">Použijte svůj &appName; účet</string>
-    <string name="assistant_create_account_part_1">Potvrďte prosím kód země a zadejte své telefonní číslo</string>
-    <string name="assistant_linphone_login_desc">Zadejte prosím uživatelské jméno a heslo svého &appName; účtu</string>
-    <string name="assistant_login_forgotten_password">Zapomněli jste heslo\?</string>
-    <string name="assistant_login">Přihlásit se</string>
-    <string name="assistant_finish">Dokončit nastavení</string>
-    <string name="assistant_confirmation_code">Potvrzovací kód</string>
-    <string name="assistant_login_desc">Zadejte prosím své uživatelské jméno a heslo s doménou SIP</string>
-    <string name="assistant_display_name_optional">Zobrazované jméno (nepovinné)</string>
-    <string name="assistant_confirm_password">Potvrzení hesla</string>
-    <string name="assistant_validate_account_1">Váš účet je vytvořen. Zkontrolujte prosím své e-maily a ověřte si svůj účet:</string>
-    <string name="assistant_validate_account_2">Po dokončení se vraťte sem a klikněte na tlačítko.</string>
-    <string name="assistant_use_username_instead_or_phone_number">Použít uživatelské jméno (nepovinné)</string>
-    <string name="assistant_create_account_part_3">Pro dokončení ověření telefonního čísla zadejte níže uvedený čtyřmístný kód:
-\n</string>
-    <string name="assistant_link_phone_number_skip">Přeskočit</string>
-    <string name="assistant_link_account">Propojit účet</string>
-    <string name="assistant_remote_provisioning_title">Načtení vzdálené konfigurace</string>
-    <string name="assistant_remote_provisioning_url">URL</string>
-    <string name="assistant_remote_provisioning_failure">Nepodařilo se stáhnout nebo použít profil vzdálené konfigurace…</string>
-    <string name="assistant_fetch_apply">Stáhnout a použít</string>
-    <string name="settings_default_account_subtitle">Výchozí účet</string>
-    <string name="settings_list_title">Nastavení</string>
-    <string name="settings_tunnel_title">Tunel</string>
-    <string name="settings_audio_title">Zvuk</string>
-    <string name="settings_video_title">Obraz</string>
-    <string name="settings_call_title">Hovor</string>
-    <string name="settings_chat_title">Chat</string>
-    <string name="settings_network_title">Síť</string>
-    <string name="settings_contacts_title">Kontakty</string>
-    <string name="settings_advanced_title">Pokročilé</string>
-    <string name="settings_conferences_title">Schůzky</string>
-    <string name="settings_primary_account_title">Hlavní účet</string>
-    <string name="settings_primary_account_display_name_title">Zobrazované jméno</string>
-    <string name="audio_settings_echo_cancellation_summary">Odstraňuje ozvěnu slyšitelnou druhou stranou</string>
-    <string name="audio_settings_echo_canceller_calibration_title">Kalibrace potlačování ozvěny</string>
-    <string name="audio_settings_echo_cancellation_calibration_started">Zahájeno kalibrace potlačování ozvěny</string>
-    <string name="audio_settings_echo_cancellation_calibration_value">Zkalibrováno za %s ms</string>
-    <string name="audio_settings_echo_cancellation_calibration_failed">Kalibrace selhala</string>
-    <string name="audio_settings_echo_cancellation_calibration_no_echo">Nedetekována žádná ozvěna</string>
-    <string name="audio_settings_echo_tester_title">Otestovat ozvěnu</string>
-    <string name="audio_settings_echo_tester_summary">Kliknutím spustíte test ozvěny</string>
-    <string name="audio_settings_echo_tester_summary_is_stopped">Test ozvěny dokončen</string>
-    <string name="audio_settings_echo_tester_summary_is_running">Test ozvěny běží</string>
-    <string name="audio_settings_input_device_title">Výchozí vstupní zvukové zařízení</string>
-    <string name="audio_settings_input_device_summary">Změny se projeví od příštího volání</string>
-    <string name="audio_settings_output_device_title">Výchozí výstupní zvukové zařízení</string>
-    <string name="audio_settings_codec_bitrate_title">Limit datového toku kodeku</string>
-    <string name="audio_settings_microphone_gain_title">Zesílení mikrofonu</string>
-    <string name="audio_settings_microphone_gain_summary">(v decibelech)</string>
-    <string name="audio_settings_playback_gain_title">Zesílení přehrávání</string>
-    <string name="audio_settings_playback_gain_summary">(v decibelech)</string>
-    <string name="audio_settings_codecs_title">Kodeky</string>
-    <string name="video_settings_tablet_preview_title">Zobrazit náhled z kamery na číselníku</string>
-    <string name="video_settings_initiate_call_title">Zahajovat videohovory</string>
-    <string name="video_settings_initiate_call_summary">Vždy posílat žádosti o video</string>
-    <string name="video_settings_automatically_accept_title">Přijímat příchozí požadavky na video</string>
-    <string name="video_settings_camera_device_title">Kamera</string>
-    <string name="video_settings_video_size_title">Preferovaná velikost videa</string>
-    <string name="video_settings_video_preset_title">Předvolba videa</string>
-    <string name="video_settings_preferred_fps_title">Předvolba FPS</string>
-    <string name="video_settings_bandwidth_limit_title">Omezení rychlosti připojení</string>
-    <string name="video_settings_bandwidth_limit_summary">v kbits/s</string>
-    <string name="video_settings_codecs_title">Kodeky</string>
-    <string name="call_settings_ringtones_title">Vyzváněcí tón</string>
-    <string name="call_settings_vibrate_title">Vibrovat během vyzvánění příchozího hovoru</string>
-    <string name="call_settings_encryption_title">Šifrování médií</string>
-    <string name="call_settings_media_encryption_zrtp_post_quantum">Post kvantové ZRTP</string>
-    <string name="call_settings_media_encryption_srtp">SRTP</string>
-    <string name="call_settings_media_encryption_zrtp">ZRTP</string>
-    <string name="call_settings_media_encryption_dtls">DTLS-SRTP</string>
-    <string name="call_settings_encryption_mandatory_title">Šifrování médií je povinné</string>
-    <string name="call_settings_use_telecom_manager_summary">Vyžaduje některá další oprávnění</string>
-    <string name="call_settings_overlay_title">Překryvné oznámení volání</string>
-    <string name="call_settings_system_wide_overlay_title">Zobrazit překryv mimo aplikaci</string>
-    <string name="call_settings_system_wide_overlay_summary">Budete vyzváni k udělení povolení k překrytí</string>
-    <string name="call_settings_sipinfo_dtmf_title">Odesílání DTMF mimo pásmo (SIP INFO)</string>
-    <string name="call_settings_auto_answer_title">Automatický příjem příchozích hovorů</string>
-    <string name="call_settings_auto_answer_delay_title">Čas automatického přijetí</string>
-    <string name="call_settings_auto_answer_delay_summary">v milisekundách</string>
-    <string name="call_settings_incoming_timeout_summary">v sekundách</string>
-    <string name="call_settings_redirect_to_voice_mail_declined_calls_title">Přesměrování odmítnutých hovorů na URI hlasové schránky</string>
-    <string name="call_settings_accept_early_media_title">Přijímat early media</string>
-    <string name="call_settings_ring_during_early_media_title">Vyzvánět při příchozích early media</string>
-    <string name="call_settings_remote_recording_title">Upozornění na nahrávání hovoru protistranou</string>
-    <string name="chat_settings_mark_as_read_notif_dismissal_title">Označit jako přečtený po přečtení notifikace</string>
-    <string name="chat_settings_file_sharing_url_title">Adresa URL sdíleného serveru</string>
-    <string name="chat_settings_file_sharing_url_summary">Neupravujte, pokud nevíte, co děláte!</string>
-    <string name="chat_settings_auto_download_summary">Zda se mají soubory připojené v přijatých zprávách chatu stahovat automaticky, nebo ne</string>
-    <string name="chat_settings_auto_download_always">Vždy</string>
-    <string name="chat_settings_auto_download_never">Nikdy</string>
-    <string name="chat_settings_auto_download_under_size">Pokud je menší než daná maximální velikost</string>
-    <string name="chat_settings_auto_download_max_size_title">Maximální velikost</string>
-    <string name="chat_settings_downloaded_media_public_title">Zpřístupnit stažená média</string>
-    <string name="chat_settings_hide_notification_content_title">Skrytí obsahu zpráv v oznámeních</string>
-    <string name="chat_settings_hide_notification_content_summary">Zobrazí se pouze jméno odesílatele</string>
-    <string name="chat_settings_launcher_shortcuts_title">Vytvoření zástupců chatovacích místností ve spouštěči</string>
-    <string name="chat_settings_launcher_shortcuts_summary">Bude nahrazeno zkratkami kontaktů, pokud jsou povoleny</string>
-    <string name="chat_settings_hide_empty_rooms_title">Skrýt prázdné chatovací místnosti</string>
-    <string name="chat_settings_go_to_android_notification_settings">Nastavení oznámení systému Android</string>
-    <string name="chat_settings_use_in_app_file_viewer_title">Vždy otevírejte soubory v této aplikaci</string>
-    <string name="chat_settings_use_in_app_file_viewer_summary">I nadále je budete moci exportovat v aplikacích třetích stran</string>
-    <string name="chat_settings_auto_download_voice_recordings">Automatické stahování příchozích hlasových nahrávek</string>
-    <string name="network_settings_wifi_only_title">Používat jen na Wi-Fi</string>
-    <string name="network_settings_allow_ipv6_title">Povolit IPv6</string>
-    <string name="network_settings_random_ports_title">Použít náhodné porty</string>
-    <string name="network_settings_sip_port_title">SIP port</string>
-    <string name="contacts_settings_native_presence_title">Informace o přítomnosti v původním kontaktu</string>
-    <string name="contacts_settings_show_organization_title">Zobrazení organizace kontaktu</string>
-    <string name="contacts_settings_launcher_shortcuts_title">Vytvoření zástupců kontaktů ve spouštěči</string>
-    <string name="contacts_settings_launcher_shortcuts_summary">Nahradí zkratky chatovací místnosti, pokud existují</string>
-    <string name="contacts_settings_show_new_contact_account_dialog_title">Vždy se zeptejte, do kterého účtu uložit nově vytvořený kontakt</string>
-    <string name="contacts_settings_create_new_ldap_config_title">Nová konfigurace LDAP</string>
-    <string name="contacts_settings_ldap_title">LDAP</string>
-    <string name="contacts_settings_ldap_enable_title">Povolit</string>
-    <string name="contacts_settings_ldap_delete_title">Smazat</string>
-    <string name="contacts_settings_ldap_server_title">URL serveru</string>
-    <string name="contacts_settings_ldap_bind_dn_title">vázat DN</string>
-    <string name="contacts_settings_ldap_password_title">Heslo</string>
-    <string name="contacts_settings_ldap_auth_method_anonymous">Anonymní</string>
-    <string name="contacts_settings_ldap_auth_method_simple">Jednoduché</string>
-    <string name="contacts_settings_ldap_tls_title">Použít TLS</string>
-    <string name="contacts_settings_ldap_cert_check_title">Zkontrolovat certifikáty</string>
-    <string name="contacts_settings_ldap_cert_check_auto">Automaticky</string>
-    <string name="contacts_settings_ldap_cert_check_disabled">Zakázáno</string>
-    <string name="contacts_settings_ldap_cert_check_enabled">Povoleno</string>
-    <string name="contacts_settings_ldap_search_title">Hledat</string>
-    <string name="contacts_settings_ldap_search_base_title">Základ vyhledávání</string>
-    <string name="contacts_settings_ldap_search_base_subtitle">Nesmí být prázdný!</string>
-    <string name="contacts_settings_ldap_search_filter_title">Filtrovat</string>
-    <string name="contacts_settings_ldap_search_timeout_title">Časový limit</string>
-    <string name="contacts_settings_ldap_search_timeout_subtitle">V sekundách</string>
-    <string name="contacts_settings_ldap_request_delay_subtitle">V milisekundách</string>
-    <string name="contacts_settings_ldap_minimum_characters_title">Minimální počet znaků pro zahájení dotazu</string>
-    <string name="contacts_settings_ldap_parsing_title">Parsování</string>
-    <string name="contacts_settings_ldap_sip_attribute_title">Atributy SIP</string>
-    <string name="contacts_settings_ldap_sip_domain_title">Doména</string>
-    <string name="contacts_settings_ldap_misc_title">Různé</string>
-    <string name="contacts_settings_ldap_debug_title">Ladění</string>
-    <string name="advanced_settings_debug_mode_title">Logování</string>
-    <string name="advanced_settings_background_mode_title">Režim na pozadí</string>
-    <string name="advanced_settings_auto_start_title">Spuštění při startu systému</string>
-    <string name="advanced_settings_dark_mode_title">Tmavé téma</string>
-    <string name="advanced_settings_dark_mode_label_auto">Automaticky</string>
-    <string name="advanced_settings_dark_mode_label_no">Ne</string>
-    <string name="advanced_settings_dark_mode_label_yes">Ano</string>
-    <string name="advanced_settings_animations_title">Animace</string>
-    <string name="advanced_settings_remote_provisioning_url_title">Adresa URL vzdáleného poskytovatele</string>
-    <string name="advanced_settings_logs_server_url_title">Adresa URL serveru pro odesílání logů</string>
-    <string name="advanced_settings_logs_server_url_summary">Neupravujte, pokud nevíte, co děláte!</string>
-    <string name="advanced_settings_android_title">Android</string>
-    <string name="advanced_settings_go_to_battery_optimization_settings">Nastavení optimalizace baterie</string>
-    <string name="advanced_settings_go_to_power_manager_settings">Nastavení správce napájení</string>
-    <string name="tunnel_settings_hostname_url_title">Jméno hostitele</string>
-    <string name="advanced_settings_vfs_summary">Jakmile je jednou povoleno, nelze již vypnout!</string>
-    <string name="advanced_settings_send_debug_logs_title">Odeslat log</string>
-    <string name="advanced_settings_reset_debug_logs_title">Resetovat log</string>
-    <string name="advanced_settings_debug_title">Nastavení ladění</string>
-    <string name="advanced_settings_disable_fragment_security_title">Vypnutí zabezpečeného režimu uživatelského rozhraní</string>
-    <string name="tunnel_settings_dual_mode_title">Duální režim je zapnutý</string>
-    <string name="tunnel_settings_dual_hostname_url_title">Hostitelské jméno druhého serveru</string>
-    <string name="tunnel_settings_dual_hostname_url_summary">Vyžadováno v duálním režimu</string>
-    <string name="tunnel_settings_dual_port_title">Port druhého serveru</string>
-    <string name="tunnel_settings_dual_port_summary">Vyžadováno v duálním režimu</string>
-    <string name="tunnel_settings_mode_title">Režim</string>
-    <string name="tunnel_settings_disabled_mode">Zakázáno</string>
-    <string name="tunnel_settings_always_mode">Vždy</string>
-    <string name="account_settings_user_name_summary">Příklad: honza pokud je tvůj účet honza@sip.domena.cz</string>
-    <string name="account_settings_user_id_title">Id autorizace</string>
-    <string name="account_settings_password_title">Heslo</string>
-    <string name="account_settings_password_summary">Pokud upravíte své uživatelské jméno a/nebo doménu, musíte heslo zadat znovu</string>
-    <string name="account_settings_domain_title">Doména</string>
-    <string name="account_settings_display_name_title">Zobrazované jméno</string>
-    <string name="account_settings_manage_title">Správa</string>
-    <string name="account_settings_disable_title">Zakázat</string>
-    <string name="account_settings_default_title">Použito jako výchozí</string>
-    <string name="account_settings_link_phone_number_title">Propojit účet</string>
-    <string name="account_settings_delete_title">Smazat</string>
-    <string name="account_settings_advanced_title">Pokročilé</string>
-    <string name="account_settings_push_notification_title">Povolit push notifikace</string>
-    <string name="account_settings_push_notification_summary">Konfigurace proxy serveru nejde odregistrovat</string>
-    <string name="account_settings_transport_title">Přenos</string>
-    <string name="account_settings_transport_udp">UDP</string>
-    <string name="account_settings_transport_tcp">TCP</string>
-    <string name="account_settings_transport_dtls">DTLS</string>
-    <string name="account_settings_proxy_title">SIP proxy</string>
-    <string name="account_settings_outbound_proxy_summary">Směrování všech hovorů přes výše uvedený SIP proxy server</string>
-    <string name="account_settings_stun_server_title">STUN/TURN server</string>
-    <string name="account_settings_ice_title">Povolit ICE</string>
-    <string name="account_settings_avpf_title">AVPF</string>
-    <string name="account_settings_avpf_rr_interval_title">Pravidelný interval AVPF RTCP</string>
-    <string name="account_settings_expires_title">Expirace</string>
-    <string name="account_settings_expires_summary">v sekundách</string>
-    <string name="account_settings_prefix_summary">bez znaku +</string>
-    <string name="account_settings_apply_prefix_for_calls_summary">Pokud je vyplněno číslo, přidejte před něj předčíslí</string>
-    <string name="account_settings_escape_plus_title">Nahradit + za 00</string>
-    <string name="account_setting_audio_video_conference_factory_address">URL služby konference pro audio/video</string>
-    <string name="account_setting_conference_factory_address">URL služby konference</string>
-    <string name="account_setting_end_to_end_encryption_keys_server_url">Adresa URL serveru šifrovacích klíčů E2E</string>
-    <string name="notification_channel_missed_call_name">&appName; oznámení o zmeškaných hovorech</string>
-    <string name="notification_channel_incoming_call_name">&appName; oznámení o příchozích hovorech</string>
-    <string name="notification_channel_chat_name">&appName; oznámení okamžitých zpráv</string>
-    <string name="incoming_call_notification_title">Příchozí hovor</string>
-    <string name="incoming_call_notification_hangup_action_label">Zavěsit</string>
-    <string name="received_chat_notification_reply_label">Odpovědět</string>
-    <string name="missed_call_notification_title">Zmeškaný hovor</string>
-    <string name="missed_call_notification_body">Zmeškané hovory od %s</string>
-    <string name="missed_calls_notification_body" tools:ignore="PluralsCandidate">%d zmeškaných hovorů</string>
-    <string name="zrtp_dialog_title">Zabezpečení komunikace</string>
-    <string name="zrtp_dialog_later_button_label">Později</string>
-    <string name="dialog_zrtp_local_sas">Řekněte:</string>
-    <string name="dialog_zrtp_remote_sas">Protistrana musí říci:</string>
-    <string name="dialog_do_not_ask_again">Více již neukazovat</string>
-    <string name="dialog_cancel">Zrušit</string>
-    <string name="dialog_delete">Smazat</string>
-    <string name="dialog_ok">OK</string>
-    <string name="dialog_accept">Přijmout</string>
-    <string name="dialog_call">Hovor</string>
-    <string name="operation_in_progress_wait">Operace probíhá, vyčkejte prosím</string>
-    <string name="dialog_default_delete_one">Opravdu chcete tuto položku odstranit\?</string>
-    <string name="dialog_default_delete_many">Jste si jisti, že chcete svůj výběr odstranit\?</string>
-    <string name="dialog_update_available">K dispozici je aktualizace</string>
-    <string name="dialog_try_open_file_as_text_title">Pro tento typ souboru nebyla nalezena žádná aplikace</string>
-    <string name="dialog_try_open_file_as_text_body">Chcete jej zkusit otevřít jako prostý textový soubor\?</string>
-    <string name="content_description_add_sip_address_field">Přidání pole adresy SIP</string>
-    <string name="content_description_add_phone_number_field">Přidání pole s telefonním číslem</string>
-    <string name="content_description_go_back">Jít zpět</string>
-    <string name="content_description_clear_field">Vyprázdnit vedlejší textové pole</string>
-    <string name="content_description_switch_camera">Přepínání z přední kamery na zadní a naopak</string>
-    <string name="content_description_toggle_recording">Povolení nebo zakázání nahrávání hovoru</string>
-    <string name="content_description_terminate_call">Ukončit volání</string>
-    <string name="content_description_enable_mic_mute">Ztlumit mikrofon</string>
-    <string name="content_description_disable_mic_mute">Zrušit ztlumení mikrofonu</string>
-    <string name="content_description_disable_speaker">Směřovat zvuk do sluchátek</string>
-    <string name="content_description_go_back_to_call">Návrat k zobrazení volání</string>
-    <string name="content_description_enable_video">Povolit video v hovoru</string>
-    <string name="content_description_disable_video">Zakázat video při hovoru</string>
-    <string name="content_description_toggle_audio_menu">Zobrazení nebo skrytí nabídky zvukového výstupu</string>
-    <string name="content_description_use_earpiece">Použití sluchátek jako výstupu zvuku</string>
-    <string name="content_description_use_speaker">Použít reproduktor jako zvukový výstup</string>
-    <string name="content_description_add_call">Zahájit nový hovor</string>
-    <string name="content_description_transfer_call">Přepojit aktuální hovor na někoho jiného</string>
-    <string name="content_description_ephemeral_message">Toto je mizející zpráva</string>
-    <string name="content_description_downloaded_file_transfer">Přiložený soubor</string>
-    <string name="content_description_delivery_status">Stav doručení zprávy</string>
-    <string name="content_description_forward_message">Předat zprávu v této konverzaci</string>
-    <string name="content_description_linphone_user">Kontakt je uživatelem &appName;</string>
-    <string name="content_description_contact_selected">Kontakt je vybrán</string>
-    <string name="content_description_e2e_encryption_enabled">Koncové šifrování je povoleno</string>
-    <string name="content_description_show_sip_contacts">Zobrazit seznam pouze s kontakty SIP</string>
-    <string name="content_description_remove_contact_from_selection">Odebrat kontakt z výběru</string>
-    <string name="content_description_start_call">Zahájit hovor</string>
-    <string name="content_description_show_chat_room_menu">Zobrazit nabídku chatovací místnosti</string>
-    <string name="content_description_enter_edition_mode">Vstup do editačního režimu</string>
-    <string name="content_description_attach_file">Připojit soubor ke zprávě</string>
-    <string name="content_description_send_message">Odeslat zprávu</string>
-    <string name="content_description_ephemeral_duration_selected">Doba do zmizení zprávy</string>
-    <string name="content_description_create_chat_room">Vytvořit chatovací místnost</string>
-    <string name="content_description_add_participants">Přidat účastníky</string>
-    <string name="content_description_remove_contact_from_chat_room">Odebrat kontakt z konverzace</string>
-    <string name="content_description_contact_is_admin">Kontakt je administrátorem v této konverzaci</string>
-    <string name="content_description_contact_is_not_admin">Kontakt není administrátor v této konverzaci</string>
-    <string name="content_description_muted_chat_room">Oznámení jsou pro tuto konverzaci vypnuta</string>
-    <string name="content_description_contact_can_do_encryption">Kontakt lze pozvat v šifrovaných konverzacích</string>
-    <string name="content_description_start_chat">Přejděte ke konverzaci</string>
-    <string name="content_description_start_encrypted_chat">Přejít do šifrované konverzace</string>
-    <string name="content_description_edit_contact">Upravit kontakt</string>
-    <string name="content_description_delete_contact">Smazat kontakt</string>
-    <string name="content_description_confirm_contact_edit">Uložit změny</string>
-    <string name="content_description_change_contact_picture">Změnit obrázek kontaktu</string>
-    <string name="content_description_change_own_picture">Změnit vlastní obrázek</string>
-    <string name="content_description_exit_edition_mode">Odejít z režimu úprav</string>
-    <string name="content_description_select_all">Vybrat vše v seznamu</string>
-    <string name="content_description_unselect_all">Zrušit vývěr všech položek</string>
-    <string name="content_description_delete_selection">Smazat vybrané položky</string>
-    <string name="content_description_numpad_1">1</string>
-    <string name="content_description_numpad_2">2</string>
-    <string name="content_description_numpad_3">3</string>
-    <string name="content_description_numpad_4">4</string>
-    <string name="content_description_numpad_5">5</string>
-    <string name="content_description_numpad_6">6</string>
-    <string name="content_description_numpad_9">9</string>
-    <string name="content_description_numpad_0">0</string>
-    <string name="content_description_numpad_star">*</string>
-    <string name="content_description_numpad_sharp">#</string>
-    <string name="content_description_menu_history">Historie hovorů</string>
-    <string name="content_description_menu_contacts">Kontakty</string>
-    <string name="content_description_menu_dialer">Číselník</string>
-    <string name="content_description_menu_chat">Konverzace</string>
-    <string name="content_description_add_contact">Vytvořit kontakt</string>
-    <string name="content_description_show_all_calls">Zobrazit všechny hovory</string>
-    <string name="content_description_missed_call">Zmeškané hovory</string>
-    <string name="content_description_incoming_call">Příchozí hovor</string>
-    <string name="content_description_outgoing_call">Odchozí hovor</string>
-    <string name="content_description_create_one_to_one_chat_room">Vytvořit konverzaci jeden na jednoho</string>
-    <string name="content_description_security_level_unsafe">Nebezpečné</string>
-    <string name="content_description_security_level_safe">Bezpečné</string>
-    <string name="content_description_security_level_encrypted">Šifrováno</string>
-    <string name="content_description_call_quality_4">Nejlepší kvalita hovoru</string>
-    <string name="content_description_call_not_secured">Hovor není zabezpečený</string>
-    <string name="content_description_call_secured">Hovor je zabezpečený</string>
-    <string name="content_description_call_security_pending">Zabezpečení hovoru se zjišťuje</string>
-    <string name="content_description_chat_message_video_attachment">Video příloha</string>
-    <string name="content_description_take_screenshot">Pořídit snímek obrazovky přijatého videa</string>
-    <string name="content_description_export">Otevřít soubor v aplikaci třetí strany</string>
-    <string name="content_description_cancel_forward">Zrušit přeposílání zpráv</string>
-    <string name="content_description_cancel_sharing">Zrušit sdílení</string>
-    <string name="content_description_cancel_reply">Zrušit odpovědi</string>
-    <string name="content_description_voice_recording">Nahrát hlasovou zprávu</string>
-    <string name="content_description_create_conference">Vytvořit konferenční hovor</string>
-    <string name="content_description_cancel_voice_recording">Zrušit nahrávání hlasu</string>
-    <string name="content_description_pause_voice_recording_playback">Pozastavit nahrávání hlasu</string>
-    <string name="content_description_play_voice_recording">Přehrát nahrávání hlasu</string>
-    <string name="content_description_call_context_menu">Otevřít kontextovou nabídku volání</string>
-    <string name="content_description_edit_conference">Upravit schůzku</string>
-    <string name="content_description_delete_conference">Smazat schůzku</string>
-    <string name="content_description_share_ics">Exportovat událost do kalendáře</string>
-    <string name="content_description_show_numpad">Zobrazit číselník</string>
-    <string name="content_description_hide_numpad">Skrýt číselník</string>
-    <string name="content_description_conference_participant_mic_muted">Účastník má ztlumený mikrofon</string>
-    <string name="content_description_toggle_layout_menu">Zobrazení nebo skrytí nabídky rozvržení skupinových hovorů</string>
-    <string name="content_description_toggle_conference_info_details">Přepnout viditelnost podrobností o schůzce</string>
-    <string name="content_description_conference_participants">Účastníci skupinového hovoru</string>
-    <string name="content_description_recording_export">Exportovat záznam</string>
-    <string name="service_auto_start_description">&appName; byla automaticky spuštěna</string>
-    <string name="about_privacy_policy">Navštivte naše zásady ochrany osobních údajů</string>
-    <string name="about_weblate_translation">Pomozte nám přeložit &appName;</string>
-    <string name="phone_number">Telefonní číslo</string>
-    <string name="assistant_choose_country">Vyberte zemi</string>
-    <string name="share_uploaded_logs_link">Sdílet odkaz na log pomocí…</string>
-    <string name="status_in_progress">Probíhá připojování</string>
-    <string name="no_call_history">Žádný hovor v historii</string>
-    <string name="no_missed_call_history">Žádný zmeškaný hovor v historii</string>
-    <string name="contact_invite_friend">Pozvat</string>
-    <string name="no_sip_contact">V adresáři nemáte žádný SIP kontakt.</string>
-    <string name="contact_choose_existing_or_new_to_add_number">Vyberte kontakt nebo vytvořte nový</string>
-    <string name="contact_editor_write_permission_denied">Oprávnění k úpravě kontaktů odepřeno, kontakt nelze upravit</string>
-    <string name="contact_delete_one_dialog">Chcete tento kontakt odstranit\?
-\nOdstraněn bude také z adresáře vašeho zařízení</string>
-    <string name="contact_new_choose_sync_account">Zvolte, kam se má kontakt uložit</string>
-    <string name="contacts_ldap_query_more_results_available">K dispozici jsou další výsledky, upřesněte hledání</string>
-    <string name="dialer_address_bar_hint">Zadejte číslo nebo adresu</string>
-    <string name="debug_popup_disable_logs">Zakázat logování</string>
-    <string name="chat_remote_is_composing">Vzdálený kontakt píše…</string>
-    <string name="chat_event_conference_destroyed">Opustili jste skupinu</string>
-    <string name="chat_event_device_removed">zařízení pro %s odstraněno</string>
-    <string name="chat_event_admin_set">%s je administrátor</string>
-    <string name="chat_security_event_man_in_the_middle_detected">Útok Man-in-the-middle detekován pro %s</string>
-    <string name="chat_security_event_security_level_downgraded">Úroveň zabezpečení se snížila kvůli %s</string>
-    <string name="chat_event_ephemeral_enabled">Povoleno zasílání mizejících zpráv: %s</string>
-    <string name="chat_message_pick_file_dialog">Vyberte zdroj</string>
-    <string name="chat_room_devices_fragment_title">Zařízení konverzace</string>
-    <string name="chat_room_group_info_subject_hint">Pojmenujte skupinu</string>
-    <string name="chat_room_group_info_leave">Opustit skupinu</string>
-    <string name="chat_room_group_info_leave_dialog_message">Přejete si opustit tuto konverzaci\?</string>
-    <string name="chat_room_group_info_you_are_now_admin">Nyní jste administrátorem</string>
-    <string name="chat_room_group_info_you_are_no_longer_admin">Již nejste administrátorem</string>
-    <string name="chat_message_imdn_undelivered">Nedoručeno</string>
-    <string name="chat_message_forwarded">Přeposláno</string>
-    <string name="chat_message_context_menu_copy_text">Kopírovat text</string>
-    <string name="chat_message_context_menu_forward">Přeposlat</string>
-    <string name="chat_message_context_menu_imdn_info">Stav doručení</string>
-    <string name="chat_message_context_menu_delete">Smazat</string>
-    <string name="chat_message_context_menu_add_to_contacts">Přidat do kontaktů</string>
-    <string name="chat_room_choose_conversation_for_message_forward">Výběr nebo vytvoření konverzace pro předání zprávy</string>
-    <string name="chat_room_choose_conversation_for_file_sharing">Vyberte nebo vytvořte konverzaci pro sdílení souboru(ů)</string>
-    <string name="chat_room_context_menu_participants_devices">Zařízení konverzace</string>
-    <string name="chat_message_context_menu_turn_off_notifications">Zakázat oznámení</string>
-    <string name="chat_message_context_menu_turn_on_notifications">Povolit oznámení</string>
-    <string name="chat_room_ephemeral_messages_desc">Tato zpráva bude po přečtení a uplynutí zvoleného časového limitu na obou stranách smazána.</string>
-    <string name="chat_room_ephemeral_message_disabled">Zakázáno</string>
-    <string name="chat_room_ephemeral_message_one_hour">1 hodina</string>
-    <string name="chat_room_ephemeral_message_one_week">1 týden</string>
-    <plurals name="chat_room_remote_composing" tools:ignore="MissingQuantity">
-        <item quantity="one">%s píše…</item>
-        <item quantity="few">%s píší…</item>
-        <item quantity="other">%s píše…</item>
-    </plurals>
-    <string name="chat_room_delete_many_dialog">Určitě chcete tyto konverzace smazat\?</string>
-    <string name="chat_message_notification_hidden_content">&lt;Redigováno&gt;</string>
-    <string name="chat_bubble_cant_open_enrypted_file">Nelze otevřít zašifrovaný soubor v bublině chatu</string>
-    <string name="chat_message_cant_open_file_in_app_dialog_title">Zdá se, že soubor nemůžeme zobrazit.</string>
-    <string name="chat_message_cant_open_file_in_app_dialog_message">Chcete ji otevřít jako text nebo ji exportovat (nezašifrovanou) do aplikace třetí strany, pokud je k dispozici\?</string>
-    <string name="chat_message_cant_open_file_in_app_dialog_open_as_text_button">Otevřít jako text</string>
-    <string name="chat_message_voice_recording_hold_to_record">Pro nahrání hlasové zprávy podržte tlačítko</string>
-    <string name="chat_message_voice_recording_playback_low_volume">Hlasitost médií je nízká, možná ji budete chtít zvýšit</string>
-    <string name="chat_message_download_already_in_progress">Před zahájením nového stahování počkejte na dokončení prvního</string>
-    <string name="recordings_empty_list">Žádné nahrávky</string>
-    <string name="conference_schedule_title">Naplánovat schůzku</string>
-    <string name="conference_schedule_later">Chcete si naplánovat schůzku na později\?</string>
-    <string name="conference_schedule_time">Čas</string>
-    <string name="conference_schedule_duration">Trvání</string>
-    <string name="conference_schedule_send_invite_email">Poslat pozvánku e-mailem</string>
-    <string name="conference_schedule_send_updated_invite_email">Poslat aktualizaci e-mailem</string>
-    <string name="conference_schedule_send_invite_chat_summary">Pozvánka bude odeslána z mého &appName; účtu</string>
-    <string name="conference_schedule_summary">Informace o schůzce</string>
-    <string name="conference_schedule_address_copied_to_clipboard">Adresa schůzky zkopírovaná do schránky</string>
-    <string name="conference_schedule_info_not_sent_to_participant">Nepodařilo se odeslat informace o schůzce účastníkovi</string>
-    <string name="conference_local_title">Místní skupinový hovor</string>
-    <string name="conference_update_title">Schůzka byla aktualizována:</string>
-    <string name="conference_invite_participants_count" tools:ignore="PluralsCandidate">%d účastníků</string>
-    <string name="conference_waiting_room_video_disabled">Video je momentálně zakázáno</string>
-    <string name="conference_layout_too_many_participants_for_mosaic">Rozložení skupinového hovoru nelze změnit, protože obsahuje příliš mnoho účastníků</string>
-    <string name="conference_go_to_chat">Chatovací místnost schůzky</string>
-    <string name="conference_creation_failed">Nepodařilo se vytvořit schůzku</string>
-    <string name="conference_schedule_info_created">Schůzka byla naplánována</string>
-    <string name="conference_low_bandwidth">Zjištěno pomalé připojení, video zakázáno</string>
-    <string name="conference_first_to_join">Jste první, kdo se připojil ke skupinovému hovoru</string>
-    <string name="conference_last_user">Všichni ostatní účastníci opustili skupinový hovor</string>
-    <string name="conference_start_group_call_dialog_title">Skupinový hovor</string>
-    <string name="conference_start_group_call_dialog_message">Chcete zahájit skupinový hovor\?
-\nVšichni v této skupině obdrží výzvu k připojení se ke schůzce.</string>
-    <string name="conference_scheduled_delete_one_dialog">Přejete si tuto schůzku smazat\?</string>
-    <string name="conference_scheduled_cancelled_by_me">Zrušili jste konferenci</string>
-    <string name="call_notification_paused">Přidržený hovor</string>
-    <string name="call_error_user_not_found">Uživatel nebyl nalezen</string>
-    <string name="call_error_incompatible_media_params">Nekompatibilní parametry médií</string>
-    <string name="call_error_io_error">Služba nebo síť je nedostupná</string>
-    <string name="call_video_update_requested_dialog">Korespondent si přeje zapnout video</string>
-    <string name="call_action_change_conf_layout">Změnit rozložení</string>
-    <string name="call_action_statistics">Statistiky hovorů</string>
-    <string name="call_context_action_resume">Vrátit se k hovoru</string>
-    <string name="call_context_action_answer">Přijmout hovor</string>
-    <string name="call_remote_recording">Tento hovor se nahrává.</string>
-    <string name="call_stats_ip">Rodina protokolu IP:</string>
-    <string name="call_stats_estimated_download">Odhadovaná rychlost stahování:</string>
-    <string name="call_stats_video_resolution_sent">Rozlišení odesílaného obrazu:</string>
-    <string name="call_stats_video_fps_sent">FPS odesílaného obrazu:</string>
-    <string name="call_stats_video_fps_received">FPS přijímaného obrazu:</string>
-    <string name="call_stats_encoder_name">Kódování:</string>
-    <string name="call_stats_capture_filter">Filtr záznamníku:</string>
-    <string name="call_stats_zrtp_cipher_algo">Šifrovací algoritmus:</string>
-    <string name="call_stats_zrtp_key_agreement_algo">Algoritmus pro dohodu klíčů:</string>
-    <string name="call_stats_zrtp_hash_algo">Hashovací algoritmus:</string>
-    <string name="call_stats_zrtp_auth_tag_algo">Autentizační algoritmus:</string>
-    <string name="assistant_welcome_desc">Tento průvodce vám pomůže nakonfigurovat a používat účet SIP.</string>
-    <string name="assistant_create_account">Vytvořit účet</string>
-    <string name="assistant_login_generic">Použít SIP účet</string>
-    <string name="assistant_ec_calibration">Probíhá kalibrace rušení ozvěn</string>
-    <string name="assistant_phone_number_info_title">K čemu bude moje telefonní číslo použito\?</string>
-    <string name="assistant_phone_number_link_info_content">"
-\nPřátelé vás snáze najdou, pokud svůj účet propojíte s telefonním číslem.
-\n
-\nV adresáři uvidíte, kdo používá &appName;, a vaši přátelé budou vědět, že vás mohou zastihnout i na &appName;.
-\n"</string>
-    <string name="assistant_general_terms">podmínky používání</string>
-    <string name="assistant_read_and_agree_terms">Přijímám %1$s a %2$s společnosti Belledonne Communications</string>
-    <string name="assistant_generic_account_warning">Některé funkce vyžadují účet &appName;, například skupinové zprávy nebo mizející zprávy.
-\n
-\nTyto funkce jsou při registraci účtu SIP třetí strany skryté.
-\n
-\nChcete-li je povolit v komerčním projektu, kontaktujte nás.</string>
-    <string name="assistant_generic_account_warning_continue_button_text">Rozumím</string>
-    <string name="assistant_error_phone_number_invalid_characters">Očekávají se zde pouze číslice</string>
-    <string name="assistant_error_username_too_long">Uživatelské jméno je příliš dlouhé</string>
-    <string name="assistant_error_invalid_credentials">Účet neexistuje nebo nesouhlasí heslo</string>
-    <string name="assistant_login_with_username">Místo telefonního čísla použijte své uživatelské jméno a heslo</string>
-    <string name="assistant_continue_even_if_credentials_invalid">Pokračovat</string>
-    <string name="assistant_generic_account">Použít SIP účet</string>
-    <string name="assistant_create_account_part_email">Zadejte prosím uživatelské jméno, e-mail a heslo pro svůj &appName; účet</string>
-    <string name="assistant_create_account_part_2">Na vaše telefonní číslo jsme vám zaslali SMS s ověřovacím kódem:</string>
-    <string name="assistant_link_phone_number">Se svým telefonním číslem spojíte následující uživatelské jméno:</string>
-    <string name="assistant_remote_provisioning_desc">Uveďte prosím adresu URL vaší konfigurace</string>
-    <string name="assistant_remote_provisioning_wrong_format">Neznámý formát adresy URL, nelze stáhnout konfiguraci…</string>
-    <string name="assistant_launch_qrcode">QR kód</string>
-    <string name="settings_accounts_title">SIP Účty</string>
-    <string name="settings_primary_account_username_title">Uživatelské jméno</string>
-    <string name="audio_settings_echo_canceller_calibration_summary">Klepnutím na tlačítko spustíte kalibraci potlačování ozvěny</string>
-    <string name="audio_settings_adaptive_rate_control_title">Adaptivní regulace rychlosti</string>
-    <string name="audio_settings_output_device_summary">Změny se projeví od příštího volání</string>
-    <string name="audio_settings_prefer_bluetooth_devices_title">Směrovat zvuk do zařízení Bluetooth, pokud existuje</string>
-    <string name="video_settings_enable_title">Povolit video</string>
-    <string name="video_settings_automatically_accept_summary">Vždy přijímat požadavky na video</string>
-    <string name="call_settings_device_ringtone_title">Použít vyzváněcí tón zařízení</string>
-    <string name="call_settings_media_encryption_none">Žádné</string>
-    <string name="call_settings_use_telecom_manager_title">Vylepšení interakce se zařízeními Bluetooth</string>
-    <string name="call_settings_rfc2833_dtmf_title">Odesílání DTMF v pásmu (RFC 2833)</string>
-    <string name="chat_room_presence_online">Online</string>
-    <string name="chat_room_presence_last_seen_online_today">Online dnes v</string>
-    <string name="chat_room_presence_last_seen_online_yesterday">Online včera v</string>
-    <string name="chat_room_presence_last_seen_online">Online naposledy</string>
-    <string name="account_setting_publish_presence_title">Zveřejňovat informace o přítomnosti</string>
-    <string name="content_description_presence_online">Uživatel je online</string>
-    <string name="content_description_presence_offline">Uživatel je offline</string>
-    <string name="call_action_attended_transfer_call">Přepojení hovoru s ohlášením</string>
-    <string name="account_setting_delete_generic_confirmation_dialog">Váš účet bude smazán pouze lokálně.
-\nChcete-li jej odstranit trvale, přejděte na webové stránky poskytovatele SIP.</string>
-    <string name="account_setting_delete_dialog_title">Chcete svůj účet smazat\?</string>
-    <string name="account_setting_delete_sip_linphone_org_confirmation_dialog">Váš účet bude smazán pouze lokálně.
-\nChcete-li jej odstranit trvale, přejděte na naši platformu pro správu účtů:</string>
-    <string name="dialog_apply_remote_provisioning_button">Použít</string>
-    <string name="dialog_apply_remote_provisioning_title">Chcete stáhnout a použít konfiguraci z této adresy URL\?</string>
-    <string name="error_unexpected">Neočekávaná chyba…</string>
-    <string name="settings_password_protection_dialog_title">Pro přístup k nastavení zadejte níže své heslo</string>
-    <string name="settings_password_protection_dialog_input_hint">Heslo</string>
-    <string name="settings_password_protection_dialog_ok_label">Ověřit</string>
-    <string name="settings_password_protection_dialog_invalid_input">Nesprávné heslo!</string>
-    <string name="content_description_presence_do_not_disturb">Uživatel si nepřeje být vyrušován</string>
-    <string name="chat_room_last_message_sender_format">%s:</string>
-    <string name="chat_room_presence_do_not_disturb">Nerušit</string>
-    <string name="chat_room_presence_away">Pryč</string>
-    <string name="audio_settings_software_echo_cancellation_title">Softwarové potlačení ozvěny</string>
-    <string name="dialog_authentication_required_message">Připojení se nezdařilo, protože přihlašovací údaje chybí nebo jsou neplatné pro účet
-\n%s.
-\n
-\nMůžete znovu zadat heslo nebo zkontrolovat konfiguraci účtu v nastavení.</string>
-    <string name="content_description_emoji_picker">Přepnutí viditelnosti nástroje pro výběr emoji</string>
-    <string name="dialog_authentication_required_title">Vyžadováno ověření</string>
-    <string name="dialog_authentication_required_change_password_label">Potvrdit</string>
-    <string name="android_14_full_screen_intent_permission_not_granted">Povolení vyžadované pro zobrazení příchozích hovorů zatím nebylo uděleno</string>
-    <string name="android_14_go_to_full_screen_intent_permission_setting">Zobrazit</string>
-    <string name="assistant_error_invalid_international_prefix">Špatná mezinárodní předvolba</string>
-    <string name="yes">Ano</string>
-    <string name="no">Ne</string>
-    <string name="contacts_new_contact_wont_be_visible_warning_dialog">Chystáte se vytvořit nový kontakt bez SIP URI ani telefonního čísla, a proto nebude viditelný v seznamu &appName;.
-\n
-\nChcete jej přesto vytvořit\?</string>
-    <string name="chat_message_voice_recording_notification_short_desc">Hlasová zpráva</string>
-    <string name="chat_message_reaction_received">%s reagoval %s na: %s</string>
-    <string name="chat_message_one_reaction">%s reakce</string>
-    <string name="chat_message_many_reactions">%s reakcí</string>
-    <string name="conference_invitation_notification_short_desc">Pozvánka na schůzku</string>
-    <string name="assistant_alternative_way_create_account">Vytvoření účtu pomocí e-mailu:</string>
-    <string name="assistant_no_push_warning">Zdá se, že vaše zařízení nemůže přijímat push notifikace.
-\n
-\nProtože je nyní vyžadujeme pro vytvoření účtu, nebudete si moci vytvořit účet v aplikaci, ale můžete si ho vytvořit na našich webových stránkách:</string>
-    <string name="assistant_create_email_account_not_validated">Váš účet ještě nebyl aktivován, klikněte prosím na odkaz, který jste obdrželi e-mailem</string>
-    <string name="account_setting_disable_bundle_mode_title">Vypnout bundle režim</string>
-    <string name="conference_schedule_mode">Režim</string>
-    <string name="conference_schedule_mode_meeting">Schůzka</string>
-    <string name="conference_schedule_mode_broadcast">Vysílání</string>
-    <string name="conference_schedule_speakers_list">Seznam účastníků</string>
-    <string name="conference_schedule_speakers_list_empty">Vyberte nejméně jednoho účastníka</string>
-    <string name="conference_broadcast_start">Plán vysílání</string>
-    <string name="conference_broadcast_edit">Upravit vysílání</string>
-    <string name="conference_schedule_broadcast_summary">Info o vysílání</string>
-    <string name="conference_broadcast_invite_you_are_speaker">(vy jste mluvčí)</string>
-    <string name="conference_meeting_title">Schůzka:</string>
-    <string name="conference_broadcast_title">Vysílání:</string>
-    <string name="conference_invite_speakers_list_title">Mluvčí</string>
-    <string name="conference_invite_participants_list_title">Účastníci</string>
-    <string name="conference_participants_list_speaker_label">Mluvčí</string>
-    <string name="conferences_settings_enable_broadcast_title">Povolit vysílání</string>
-    <string name="conferences_settings_enable_broadcast_summary">Funkce je v současné době v beta verzi!</string>
-    <string name="content_description_contact_is_speaker">Kontakt je mluvčí</string>
-    <string name="conference_schedule_broadcast_address_title">Broadcast addresa</string>
-    <string name="conference_schedule_participants_list_empty">Vyberte alespoň jednoho účastníka</string>
-    <string name="conference_broadcast_invite_title">Pozvánka na vysílání:</string>
-    <string name="conference_waiting_room_listener_broadcast">V tomto vysílání nejste mluvčím</string>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
deleted file mode 100644
index 761bde6e1..000000000
--- a/app/src/main/res/values-de/strings.xml
+++ /dev/null
@@ -1,298 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE resources [
-<!ENTITY appName "Linphone">
-]>
-<resources>
-    <string name="service_description">Dies ist erforderlich um Anrufe im Hintergrund anzunehmen</string>
-    <string name="sync_account_name">&appName; Kontakte</string>
-    <string name="about_privacy_policy">Datenschutz-Bestimmungen</string>
-    <string name="logs_reset_complete">Logdatei wurde gelöscht</string>
-    <string name="logs_url_copied_to_clipboard">Logdatei-URL wurde in die Zwischenablage kopiert</string>
-    <string name="phone_number">Telefonnummer</string>
-    <string name="phone_numbers">Telefonnummern</string>
-    <string name="select_your_country">Wähle dein Land</string>
-    <string name="international_prefix">Vorwahl</string>
-    <string name="assistant_choose_country">Wähle ein Land</string>
-    <string name="username">Benutzername</string>
-    <string name="password">Passwort</string>
-    <string name="domain">Domäne</string>
-    <string name="sip_address">SIP-Adresse</string>
-    <string name="sip_addresses">SIP-Adressen</string>
-    <string name="cancel">Abbrechen</string>
-    <plurals name="days">
-        <item quantity="one">%d Tag</item>
-        <item quantity="other">%d Tage</item>
-    </plurals>
-    <string name="share_uploaded_logs_link">Teile die Logdatei-Verknüpfung mit…</string>
-    <string name="email">E-Mail-Adresse</string>
-    <string name="today">Heute</string>
-    <string name="yesterday">Gestern</string>
-    <string name="transport">Transport</string>
-    <string name="service_name">&appName; Dienst</string>
-    <string name="status_connected">Verbunden</string>
-    <string name="status_not_connected">Nicht verbunden</string>
-    <string name="status_in_progress">Verbindung wird hergestellt</string>
-    <string name="status_error">Verbindung fehlgeschlagen</string>
-    <string name="about">Über</string>
-    <string name="assistant">Assistent</string>
-    <string name="recordings">Aufnahmen</string>
-    <string name="settings">Einstellungen</string>
-    <string name="quit">Beenden</string>
-    <string name="history_calls_list">Anrufe</string>
-    <string name="no_call_history">Keine letzten Anrufe</string>
-    <string name="no_missed_call_history">Keine verpassten Anrufe</string>
-    <string name="history_delete_many_dialog">Diese Einträge löschen\?</string>
-    <string name="contact_invite_friend">Einladen</string>
-    <string name="no_account_configured">Kein Konto konfiguriert</string>
-    <string name="no_sip_contact">Kein SIP-Kontakt im Adressbuch.</string>
-    <string name="no_contact">Kein Eintrag im Adressbuch.</string>
-    <string name="contact_filter_hint">Kontakt suchen</string>
-    <string name="contact_last_name">Nachname</string>
-    <string name="contact_first_name">Vorname</string>
-    <string name="contact_organization">Firma</string>
-    <string name="contact_choose_existing_or_new_to_add_number">Wähle einen Kontakt oder lege einen neuen an</string>
-    <string name="contact_delete_many_dialog">Soll dieser Kontakt wirklich gelöscht werden\?\nEr wird auch aus dem Adressbuch des Gerätes gelöscht</string>
-    <string name="contact_new_choose_sync_account">Wo soll der Kontakt gespeichert werden</string>
-    <string name="dialer_address_bar_hint">Telefonnummer oder Adresse eingeben</string>
-    <string name="debug_popup_enable_logs">Log starten</string>
-    <string name="debug_popup_disable_logs">Log stoppen</string>
-    <string name="debug_popup_send_logs">Logdatei senden</string>
-    <string name="no_chat_history">Keine Unterhaltungen</string>
-    <string name="chat_remote_is_composing">Partner schreibt…</string>
-    <string name="chat_event_conference_destroyed">Du hast die Gruppe verlassen</string>
-    <string name="chat_event_participant_added">%s ist beigetreten</string>
-    <string name="chat_event_participant_removed">%s ist ausgetreten</string>
-    <string name="chat_event_device_added">neues Gerät für %s</string>
-    <string name="chat_event_device_removed">Gerät für %s entfernt</string>
-    <string name="chat_event_subject_changed">neuer Betreff: %s</string>
-    <string name="chat_event_admin_set">%s ist Administrator</string>
-    <string name="chat_security_event_lime_identity_key_changed">LIME Identitätsschlüssel für %s geändert</string>
-    <string name="chat_room_group_info_subject_hint">Gruppe benennen</string>
-    <string name="chat_room_group_info_admin">Administrator</string>
-    <string name="chat_room_group_info_leave">Gruppe verlassen</string>
-    <string name="chat_room_group_info_leave_dialog_button">Verlassen</string>
-    <string name="chat_room_group_info_leave_dialog_message">Unterhaltung verlassen\?</string>
-    <string name="chat_message_download_file">Herunterladen</string>
-    <string name="chat_message_pick_file_dialog">Quelle wählen</string>
-    <string name="chat_room_devices_fragment_title">Kommunikationsgeräte</string>
-    <string name="chat_room_group_info_title">Information</string>
-    <string name="chat_room_group_info_you_are_no_longer_admin">Du bist kein Administrator mehr</string>
-    <string name="chat_message_imdn_info">Lieferstatus</string>
-    <string name="chat_message_imdn_displayed">Lesen</string>
-    <string name="chat_message_imdn_delivered">Zugestellt</string>
-    <string name="chat_message_imdn_undelivered">Nicht zugestellt</string>
-    <string name="chat_message_imdn_sent">Gesendet</string>
-    <string name="chat_message_forwarded">Weitergeleitet</string>
-    <string name="chat_message_replied">Antwort</string>
-    <string name="chat_message_context_menu_copy_text">Text kopieren</string>
-    <string name="chat_message_context_menu_forward">Weiterleiten</string>
-    <string name="chat_message_context_menu_reply">Antworten</string>
-    <string name="chat_message_context_menu_imdn_info">Zustellstatus</string>
-    <string name="chat_message_context_menu_delete">Löschen</string>
-    <string name="chat_message_context_menu_add_to_contacts">Zu Kontakten hinzufügen</string>
-    <string name="chat_room_context_menu_group_info">Gruppeninformation</string>
-    <string name="chat_room_ephemeral_message_one_hour">1 Stunde</string>
-    <string name="chat_room_ephemeral_message_one_day">1 Tag</string>
-    <string name="chat_room_ephemeral_message_three_days">3 Tage</string>
-    <string name="chat_room_ephemeral_message_one_week">1 Woche</string>
-    <plurals name="chat_room_remote_composing">
-        <item quantity="one">%s schreibt…</item>
-        <item quantity="other">%s schreiben…</item>
-    </plurals>
-    <string name="chat_room_sending_reply_hint">Antworten</string>
-    <string name="chat_room_sending_message_hint">Nachricht</string>
-    <string name="chat_message_voice_recording_hold_to_record">Knopf halten um eine Sprachnachricht aufzunehmen</string>
-    <string name="call_incoming_title">Ankommender Ruf</string>
-    <string name="call_outgoing_title">Ausgehender Ruf</string>
-    <string name="call_error_user_busy">Besetzt</string>
-    <string name="call_error_user_not_found">Benutzer nicht gefunden</string>
-    <string name="chat_message_voice_recording_playback_low_volume">Die Medienlautstärke ist zu gering, bitte erhöhen</string>
-    <string name="call_notification_paused">Anruf pausiert</string>
-    <string name="call_notification_outgoing">Ausgehender Anruf</string>
-    <string name="call_notification_active">Laufender Anruf</string>
-    <string name="call_video_update_requested_dialog">Gesprächspartner möchte das Video einschalten</string>
-    <string name="call_error_incompatible_media_params">Inkompatible Medienparameter</string>
-    <string name="call_error_network_unreachable">Netzwerk nicht erreichbar</string>
-    <string name="call_error_generic">Fehler: %s</string>
-    <string name="service_auto_start_description">&appName; wurde automatisch gestartet</string>
-    <string name="logs_upload_failure">Hochladen der Logdatei fehlgeschlagen!</string>
-    <string name="assistant_choose_country_title">Ländername oder Vorwahl</string>
-    <string name="app_description">der <i>freie</i> SIP client</string>
-    <string name="history_delete_one_dialog">Diesen Eintrag löschen\?</string>
-    <string name="contact_send_sms_invite_text">Hallo, benutze &appName;! Du kannst es kostenlos hier %s herunterladen</string>
-    <string name="contact_editor_write_permission_denied">Kein Schreibzugriff auf Kontakte, Kontakt kann nicht geändert werden</string>
-    <string name="contact_delete_one_dialog">Soll dieser Kontakt gelöscht werden\?\nEr wird auch aus dem Adressbuch des Gerätes gelöscht</string>
-    <string name="contact_local_sync_account">Lokal speichern</string>
-    <string name="debug_popup_show_config_file">Konfigurationsdatei ansehen</string>
-    <string name="chat_event_conference_created">Du bist der Gruppe beigetreten</string>
-    <string name="chat_event_admin_unset">%s ist kein Administrator mehr</string>
-    <string name="chat_room_group_info_participants">Teilnehmer</string>
-    <string name="chat_room_group_info_you_are_now_admin">Du bist jetzt Administrator</string>
-    <string name="chat_message_context_menu_resend">Nochmal senden</string>
-    <string name="chat_message_forward_confirmation_dialog">Die Nachricht in diesen Raum weiterleiten\?</string>
-    <string name="chat_message_context_menu_delete_messages">Nachrichten löschen</string>
-    <string name="chat_room_ephemeral_message_one_minute">1 Minute</string>
-    <string name="chat_message_cant_open_file_in_app_dialog_export_button">Exportieren</string>
-    <string name="chat_message_cant_open_file_in_app_dialog_open_as_text_button">Als Text öffnen</string>
-    <string name="recordings_empty_list">Keine Aufnahmen</string>
-    <string name="call_error_declined">Anruf abgelehnt</string>
-    <string name="call_error_server_timeout">Zeitüberschreitung des Servers</string>
-    <string name="call_error_io_error">Dienst nicht verfügbar oder Netzwerkfehler</string>
-    <string name="assistant_confirmation_code">Bestätigungscode</string>
-    <string name="assistant_continue_even_if_credentials_invalid">Weiter</string>
-    <string name="assistant_generic_account">SIP-Konto benutzen</string>
-    <string name="assistant_error_invalid_credentials">Das Konto existiert nicht oder das Passwort ist falsch</string>
-    <string name="assistant_login_with_username">Den Benutzernamen und das Passwort anstatt der Telefonnummer verwenden</string>
-    <string name="assistant_linphone_login_desc">Bitte den Benutzernamen und das Passwort des &appName;-Kontos eingeben</string>
-    <string name="assistant_linphone_account">Das &appName;-Konto verwenden</string>
-    <string name="assistant_login_forgotten_password">Passwort vergessen\?</string>
-    <string name="assistant_confirm_password">Passwort bestätigen</string>
-    <string name="assistant_finish">Konfiguration beenden</string>
-    <string name="assistant_login_desc">Bitte Benutzername und Passwort der SIP-Domäne eingeben</string>
-    <string name="assistant_display_name_optional">Angezeigter Name (optional)</string>
-    <string name="assistant_create_account_part_1">Bitte die Ländervorwahl bestätigen und die Telefonnummer eingeben</string>
-    <string name="assistant_link_phone_number_skip">Überspringen</string>
-    <string name="assistant_link_account">Konto verknüpfen</string>
-    <string name="assistant_remote_provisioning_desc">Bitte die Konfigurations-URL angeben</string>
-    <string name="settings_default_account_subtitle">Standardkonto</string>
-    <string name="settings_list_title">Einstellungen</string>
-    <string name="settings_call_title">Anruf</string>
-    <string name="settings_contacts_title">Kontakte</string>
-    <string name="settings_advanced_title">Erweitert</string>
-    <string name="settings_primary_account_title">Primäres Konto</string>
-    <string name="settings_primary_account_username_title">Benutzername</string>
-    <string name="audio_settings_echo_cancellation_summary">Entfernt das Echo das am anderen Ende gehört wird</string>
-    <string name="audio_settings_echo_canceller_calibration_title">Echounterdrückung kalibrieren</string>
-    <string name="audio_settings_microphone_gain_summary">(in Dezibel)</string>
-    <string name="video_settings_video_preset_title">Videovoreinstellungen</string>
-    <string name="video_settings_preferred_fps_title">Bevorzugte Bildwiederholrate</string>
-    <string name="video_settings_bandwidth_limit_title">Bandbreitenbegrenzung</string>
-    <string name="tunnel_settings_auto_mode">Automatisch</string>
-    <string name="account_settings_user_name_title">Benutzername</string>
-    <string name="account_settings_password_title">Passwort</string>
-    <string name="account_settings_default_title">Als Vorgabe verwendet</string>
-    <string name="account_settings_domain_title">Domäne</string>
-    <string name="account_settings_advanced_title">Erweitert</string>
-    <string name="account_settings_escape_plus_title">Ersetze + durch 00</string>
-    <string name="content_description_answer_call">Anruf beantworten</string>
-    <string name="content_description_enable_mic_mute">Mikrofon stummschalten</string>
-    <string name="content_description_enable_speaker">Audioausgabe auf Lautsprecher</string>
-    <string name="content_description_disable_speaker">Audioausgabe auf Hörer</string>
-    <string name="content_description_delete_contact">Kontakt löschen</string>
-    <string name="content_description_discard_changes">Änderungen verwefen</string>
-    <string name="content_description_change_contact_picture">Kontaktfoto ändern</string>
-    <string name="content_description_change_own_picture">Eigenes Foto ändern</string>
-    <string name="content_description_go_to_contact">Gehe zu Kontaktdetails</string>
-    <string name="content_description_show_all_calls">Alle Anrufe anzeigen</string>
-    <string name="content_description_show_missed_calls">Nur verpasste Anrufe anzeigen</string>
-    <string name="content_description_missed_call">Verpasster Anruf</string>
-    <string name="content_description_incoming_call">Ankommender Anruf</string>
-    <string name="content_description_outgoing_call">Ausgehender Anruf</string>
-    <string name="content_description_create_group_chat_room">Gruppenunterhaltung beginnen</string>
-    <string name="content_description_security_level_unsafe">Unsicher</string>
-    <string name="content_description_security_level_safe">Sicher</string>
-    <string name="content_description_security_level_encrypted">Verschlüsselt</string>
-    <string name="content_description_call_quality_0">Sehr niedrige Gesprächsqualität</string>
-    <string name="content_description_call_quality_2">Mittelmäßige Gesprächsqualität</string>
-    <string name="content_description_call_quality_3">Gute Gesprächsqualität</string>
-    <string name="content_description_call_quality_4">Maximale Gesprächsqualität</string>
-    <string name="assistant_remote_provisioning_title">Fernkonfiguration holen</string>
-    <string name="settings_accounts_title">SIP Konten</string>
-    <string name="settings_chat_title">Unterhaltung</string>
-    <string name="settings_network_title">Netzwerk</string>
-    <string name="settings_primary_account_display_name_title">Anzeigename</string>
-    <string name="audio_settings_microphone_gain_title">Mikrofonverstärkung</string>
-    <string name="video_settings_camera_device_title">Kamera</string>
-    <string name="video_settings_video_size_title">Bevorzugte Videogröße</string>
-    <string name="tunnel_settings_always_mode">Immer</string>
-    <string name="account_settings_link_phone_number_title">Verknüpfe dein Konto</string>
-    <string name="account_settings_delete_title">Löschen</string>
-    <string name="account_settings_push_notification_title">Push-Benachrichtigung zulassen</string>
-    <string name="account_settings_avpf_rr_interval_summary">in Sekunden (zwischen 1 und 5)</string>
-    <string name="account_settings_apply_prefix_for_calls_summary">Bei Eingabe einer Nummer Vorwahl angeben</string>
-    <string name="network_settings_sip_port_title">benutzter SIP-Port</string>
-    <string name="content_description_add_call">Neuen Anruf beginnen</string>
-    <string name="content_description_disable_mic_mute">Mikrofonstummschaltung aufheben</string>
-    <string name="content_description_edit_contact">Kontakt editieren</string>
-    <string name="content_description_confirm_contact_edit">Änderungen sichern</string>
-    <string name="content_description_add_contact">Kontakt anlegen</string>
-    <string name="content_description_create_one_to_one_chat_room">Eins-zu-eins-Unterhaltung beginnen</string>
-    <string name="content_description_call_quality_1">Niedrige Gesprächsqualität</string>
-    <string name="no_conference_call_history">Kein Konferenzruf im Verlauf</string>
-    <string name="contact_cant_be_deleted">Der Kontakt kann nicht gelöscht werden</string>
-    <string name="dialer_transfer_succeded">Anruf wird weitergeleitet</string>
-    <string name="dialer_transfer_failed">Weiterleitung fehlgeschlagen</string>
-    <string name="chat_room_choose_conversation_for_message_forward">Auswählen oder erstellen einer Konversation um die Nachricht zu senden</string>
-    <string name="chat_room_choose_conversation_for_file_sharing">Auswählen oder erstellen einer Konversation um die Datei(en) zu teilen</string>
-    <string name="chat_room_file_not_found">Datei nicht gefunden</string>
-    <string name="chat_room_context_menu_participants_devices">Kommunikationsgeräte</string>
-    <string name="chat_room_creation_failed_snack">Erstellen des Chat-Rooms fehlgeschlagen</string>
-    <string name="chat_room_delete_one_dialog">Sind Sie sicher dass Sie die Konversation löschen möchten\?</string>
-    <string name="chat_message_no_app_found_to_handle_file_mime_type">Keine App für diesen Dateityp vorhanden</string>
-    <string name="chat_bubble_cant_open_enrypted_file">Öffnen von verschlüsselter Datei in Chat-Bubble nicht möglich</string>
-    <string name="chat_message_removal_info">Nachricht wird gelöscht</string>
-    <string name="transport_udp">UDP</string>
-    <string name="transport_tcp">TCP</string>
-    <string name="transport_tls">TLS</string>
-    <string name="debug_popup_title">Debug</string>
-    <string name="chat_security_event_participant_max_count_exceeded">Max. Teilnehmeranzahl wurde um %s überschritten</string>
-    <string name="chat_room_ephemeral_messages_desc">Diese Nachricht wird auf beiden Seiten gelöscht, sobald sie gelesen wurde und nach dem gewählten Timeout.</string>
-    <string name="about_weblate_translation">Helfen Sie uns &appName; zu übersetzen</string>
-    <string name="contacts_ldap_query_more_results_available">Weitere Ergebnisse sind verfügbar, verfeinern Sie die Suche</string>
-    <string name="chat_security_event_man_in_the_middle_detected">Man-in-the-Middle-Angriff erkannt für %s</string>
-    <string name="chat_security_event_security_level_downgraded">Sicherheitsstufe wurde aufgrund von %s verringert</string>
-    <string name="chat_room_choose_conversation_for_text_sharing">Auswählen oder erstellen einer Konversation um den Text zu teilen</string>
-    <string name="chat_message_cant_open_file_in_app_dialog_message">Möchten Sie die Datei als Text öffnen oder sie (unverschlüsselt) in eine Anwendung eines Drittanbieters exportieren, falls verfügbar\?</string>
-    <string name="conference">Meeting</string>
-    <string name="conference_schedule_subject_title">Betreff</string>
-    <string name="conference_schedule_description_title">Beschreibung hinzufügen</string>
-    <string name="call_action_transfer_call">Anruf weiterleiten</string>
-    <string name="call_context_action_transfer">Anruf weiterleiten</string>
-    <string name="chat_message_context_menu_ephemeral_messages">Flüchtige Nachrichten</string>
-    <string name="chat_message_voice_recording_notification_short_desc">Sprachnachricht</string>
-    <string name="error_unexpected">Unerwarteter Fehler…</string>
-    <string name="chat_message_abort_removal">Abbruch</string>
-    <string name="chat_message_voice_recording_received_notification">Du hast eine Sprachnachricht erhalten</string>
-    <string name="chat_event_ephemeral_enabled">Du hast flüchtige Nachrichten aktiviert: %s</string>
-    <string name="chat_event_ephemeral_lifetime_changed">Flüchtige Nachrichten Ablaufdatum: %s</string>
-    <string name="chat_room_context_menu_go_to_contact">Kontakt öffnen</string>
-    <string name="chat_room_ephemeral_fragment_title">Flüchtige Nachrichten</string>
-    <string name="chat_room_ephemeral_message_disabled">Deaktiviert</string>
-    <string name="chat_room_delete_many_dialog">Bist Du sicher, dass Du diese Konversationen löschen möchtest\?</string>
-    <string name="chat_message_cant_open_file_in_app_dialog_title">Es scheint, dass wir die Datei nicht anzeigen können.</string>
-    <string name="chat_message_download_already_in_progress">Bitte warte bis der erste Download abgeschlossen ist, bevor Du einen neuen startest</string>
-    <string name="chat_message_voice_recording">Sprachnachricht</string>
-    <string name="conference_schedule_title">Plane ein Meeting</string>
-    <string name="conference_schedule_subject_hint">Meeting Thema</string>
-    <string name="conference_group_call_subject_hint">Gruppenanruf Thema</string>
-    <string name="conference_schedule_address_title">Meeting Adresse</string>
-    <string name="conference_schedule_broadcast_address_title">Broadcast Adresse</string>
-    <string name="conference_schedule_duration">Dauer</string>
-    <string name="conference_schedule_mode">Modus</string>
-    <string name="conference_schedule_mode_meeting">Meeting</string>
-    <string name="conference_schedule_mode_broadcast">Broadcast</string>
-    <string name="conference_schedule_timezone">Zeitzone</string>
-    <string name="chat_room_presence_away">Abwesend</string>
-    <string name="chat_room_presence_online">Online</string>
-    <string name="chat_room_presence_last_seen_online_today">Online heute um</string>
-    <string name="chat_room_presence_last_seen_online_yesterday">Online gestern um</string>
-    <string name="chat_room_presence_last_seen_online">Online am</string>
-    <string name="conference_group_call_title">Starte einen Gruppenanruf</string>
-    <string name="conference_schedule_time">Zeit</string>
-    <string name="chat_room_presence_do_not_disturb">Bitte nicht stören</string>
-    <string name="conference_schedule_description_hint">Beschreibung</string>
-    <string name="conference_schedule_date">Datum</string>
-    <string name="chat_event_ephemeral_disabled">Du hast flüchtige Nachrichten deaktiviert</string>
-    <string name="chat_message_context_menu_turn_off_notifications">Benachrichtigungen deaktivieren</string>
-    <string name="chat_message_context_menu_turn_on_notifications">Benachrichtigungen aktivieren</string>
-    <plurals name="chat_room_unread_messages_event">
-        <item quantity="one">%1$d ungelesene Nachricht</item>
-        <item quantity="other">%1$d ungelesene Nachrichten</item>
-    </plurals>
-    <string name="chat_message_one_reaction">%s Reaktion</string>
-    <string name="chat_message_many_reactions">%s Reaktionen</string>
-    <string name="conference_schedule_later">Möchtest Du ein Meeting für später planen\?</string>
-    <string name="conference_schedule_mandatory_field">Verpflichtend</string>
-    <string name="yes">Ja</string>
-    <string name="no">Nein</string>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
deleted file mode 100644
index a6b3daec9..000000000
--- a/app/src/main/res/values-el/strings.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
deleted file mode 100644
index 45649a14c..000000000
--- a/app/src/main/res/values-es/strings.xml
+++ /dev/null
@@ -1,581 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE resources [
-<!ENTITY appName "Linphone">
-]>
-<resources>
-    <string name="service_name">&appName; Servicio</string>
-    <string name="service_auto_start_description">&appName; se ha iniciado automáticamente</string>
-    <string name="logs_url_copied_to_clipboard">Registra la URL copiada en el portapapeles</string>
-    <string name="service_description">Esto es necesario para recibir llamadas en segundo plano</string>
-    <string name="sync_account_name">&appName; contactos</string>
-    <string name="about_privacy_policy">Visite nuestra política de privacidad</string>
-    <string name="phone_number">Número de teléfono</string>
-    <string name="phone_numbers">Números de teléfonos</string>
-    <string name="select_your_country">Selecciona tu país</string>
-    <string name="international_prefix">Prefijo</string>
-    <string name="assistant_choose_country">Selecciona un país</string>
-    <string name="assistant_choose_country_title">Nombre del país o prefijo</string>
-    <string name="quit">Salir</string>
-    <string name="history_calls_list">Llamadas</string>
-    <string name="history_delete_one_dialog">Quieres borrar esta grabación\?</string>
-    <string name="contact_send_sms_invite_text">Hola, únete a mí en &appName;! Puedes descargarlo gratis en%s</string>
-    <string name="username">Nombre de usuario</string>
-    <string name="password">Contraseña</string>
-    <string name="email">Email</string>
-    <string name="domain">Dominio</string>
-    <string name="sip_address">Dirección SIP</string>
-    <string name="sip_addresses">Direcciones SIP</string>
-    <string name="cancel">Cancelar</string>
-    <plurals name="days">
-        <item quantity="one">%d día</item>
-        <item quantity="other">%d días</item>
-    </plurals>
-    <string name="share_uploaded_logs_link">Compartir enlace de registros usando…</string>
-    <string name="today">Hoy</string>
-    <string name="yesterday">Ayer</string>
-    <string name="transport">Transporte</string>
-    <string name="transport_udp">UDP</string>
-    <string name="transport_tcp">TCP</string>
-    <string name="transport_tls">TLS</string>
-    <string name="app_description">El <i>cliente</i> libre</string>
-    <string name="status_connected">Conectado</string>
-    <string name="status_not_connected">No conectado</string>
-    <string name="status_in_progress">Conexión en progreso</string>
-    <string name="status_error">Conexión fallida</string>
-    <string name="no_account_configured">Cuenta no configurada</string>
-    <string name="about">Acerca</string>
-    <string name="assistant">Asistente</string>
-    <string name="recordings">Grabaciones</string>
-    <string name="settings">Configuraciones</string>
-    <string name="no_call_history">No hay llamadas en el historial</string>
-    <string name="no_missed_call_history">No hay llamadas perdidas en el historial</string>
-    <string name="history_delete_many_dialog">Quieres borrar estas grabaciones\?</string>
-    <string name="contact_invite_friend">Invitar</string>
-    <string name="no_contact">No hay contactos en el directorio.</string>
-    <string name="no_sip_contact">No hay contactos SIP en el directorio.</string>
-    <string name="contact_filter_hint">Buscar contacto</string>
-    <string name="contact_last_name">Apellido</string>
-    <string name="contact_first_name">Nombre</string>
-    <string name="contact_organization">Organización</string>
-    <string name="contact_choose_existing_or_new_to_add_number">Selecciona un contacto o crea uno nuevo</string>
-    <string name="contact_editor_write_permission_denied">Permiso de escritura de contactos denegado, no se puede editar el contacto</string>
-    <string name="contact_delete_one_dialog">Quieres eliminar este contacto\?\nTambién se eliminará de la libreta de direcciones de su dispositivo</string>
-    <string name="contact_delete_many_dialog">Estás seguro de que deseas eliminar estos contactos\?\nTambién se eliminarán de la libreta de direcciones de su dispositivo</string>
-    <string name="contact_new_choose_sync_account">Elige dónde guardar tu contacto</string>
-    <string name="contact_local_sync_account">Almacenar localmente</string>
-    <string name="dialer_address_bar_hint">Ingrese un número o una dirección</string>
-    <string name="debug_popup_title">Depurar</string>
-    <string name="debug_popup_enable_logs">Habilitar registros</string>
-    <string name="debug_popup_disable_logs">Deshabilitar registros</string>
-    <string name="debug_popup_send_logs">Enviar registros</string>
-    <string name="no_chat_history">No conversaciones</string>
-    <string name="chat_remote_is_composing">Remoto está escribiendo…</string>
-    <string name="chat_event_conference_created">Te has unido al grupo</string>
-    <string name="chat_event_conference_destroyed">Te has salido del grupo</string>
-    <string name="chat_event_participant_added">%s se ha unido</string>
-    <string name="chat_event_participant_removed">%s se ha ido</string>
-    <string name="chat_event_device_added">nuevo dispositivo para %s</string>
-    <string name="chat_event_device_removed">dispositivo para %s eliminado</string>
-    <string name="chat_event_subject_changed">Nuevo asunto: %s</string>
-    <string name="chat_event_admin_set">%s es administrador</string>
-    <string name="chat_event_admin_unset">%s ha dejado de ser administrador</string>
-    <string name="chat_security_event_lime_identity_key_changed">La clave de identidad LIME cambió para %s</string>
-    <string name="chat_security_event_man_in_the_middle_detected">Ataque man-in-the-middle detectado para %s</string>
-    <string name="chat_security_event_security_level_downgraded">El nivel de seguridad disminuyó debido a %s</string>
-    <string name="chat_security_event_participant_max_count_exceeded">Recuento máximo de participantes superado en %s</string>
-    <string name="incoming_call_notification_answer_action_label">Contestar</string>
-    <string name="received_chat_notification_reply_label">Contestar</string>
-    <string name="missed_call_notification_title">Llamada perdida</string>
-    <string name="missed_call_notification_body">Llamada perdida de %s</string>
-    <string name="missed_calls_notification_body">%d llamadas perdidas</string>
-    <string name="zrtp_dialog_title">Seguridad de comunicación</string>
-    <string name="dialog_zrtp_local_sas">Diga:</string>
-    <string name="dialog_do_not_ask_again">No mostrar de nuevo</string>
-    <string name="dialog_cancel">Cancelar</string>
-    <string name="dialog_delete">Borrar</string>
-    <string name="dialog_ok">OK</string>
-    <string name="dialog_accept">Aceptar</string>
-    <string name="dialog_decline">Denegar</string>
-    <string name="dialog_call">Llamar</string>
-    <string name="operation_in_progress_wait">Operación en progreso, favor de esperar</string>
-    <string name="dialog_default_delete_one">Estás seguro que quieres borrar este tema\?</string>
-    <string name="dialog_default_delete_many">Estás seguro de que quieres borrar tu selección\?</string>
-    <string name="dialog_update_available">Hay una actualización disponible</string>
-    <string name="dialog_try_open_file_as_text_title">No se ha encontrado ninguna aplicación para este tipo de archivo</string>
-    <string name="dialog_try_open_file_as_text_body">Le gustaría intentar abrirlo como un archivo de texto simple\?</string>
-    <string name="content_description_add_sip_address_field">Añadir un campo de dirección SIP</string>
-    <string name="content_description_go_back">Regresar</string>
-    <string name="content_description_phone_number_use">Muestra para qué se usará tu número de teléfono</string>
-    <string name="content_description_clear_field">Vacía el campo de texto que está a su lado</string>
-    <string name="content_description_switch_camera">Cambiar de la cámara delantera a la trasera y viceversa</string>
-    <string name="content_description_pause_call">Pausar la llamada</string>
-    <string name="content_description_toggle_recording">Habilitar o deshabilitar la grabación de la llamada</string>
-    <string name="content_description_terminate_call">Termina la llamada</string>
-    <string name="content_description_answer_call">Contestar la llamada</string>
-    <string name="content_description_enable_mic_mute">Silencie su micrófono</string>
-    <string name="content_description_disable_mic_mute">Activar el micrófono</string>
-    <string name="content_description_enable_speaker">Dirigir el audio al altavoz</string>
-    <string name="content_description_go_back_to_call">Volver a la vista de llamadas</string>
-    <string name="content_description_enable_video">Habilitar el video en la llamada</string>
-    <string name="content_description_disable_video">Deshabilitar el video en la llamada</string>
-    <string name="content_description_toggle_audio_menu">Mostrar u ocultar el menú de salida de audio</string>
-    <string name="content_description_use_earpiece">Usar el auricular como salida de audio</string>
-    <string name="content_description_use_speaker">Usar el altavoz como salida de audio</string>
-    <string name="content_description_add_call">Iniciar nueva llamada</string>
-    <string name="content_description_transfer_call">Transferir la llamada actual a otra persona</string>
-    <string name="content_description_remove_pending_file_transfer">Eliminar la transferencia de archivos pendiente</string>
-    <string name="content_description_downloaded_file_transfer">Archivo adjunto</string>
-    <string name="content_description_delivery_status">Estado de la entrega del mensaje</string>
-    <string name="content_description_ephemeral_message">Mensaje es efímero</string>
-    <string name="content_description_linphone_user">Contacto es un &appName; usuario</string>
-    <string name="content_description_e2e_encryption_disabled">La encriptación de extremo a extremo está desactivada</string>
-    <string name="content_description_e2e_encryption_enabled">Cifrado de extremo a extremo activado</string>
-    <string name="content_description_show_all_contacts">Mostrar una lista de todos los contactos</string>
-    <string name="content_description_continue_chat_room_creation">Ir al paso final de la creación de la sala de chat</string>
-    <string name="content_description_remove_contact_from_selection">Eliminar el contacto de la selección</string>
-    <string name="content_description_start_call">Iniciar una llamada</string>
-    <string name="content_description_show_chat_room_menu">Mostrar menú de sala de chat</string>
-    <string name="content_description_enter_edition_mode">Entrar en modo de edición</string>
-    <string name="content_description_send_message">Enviar mensaje</string>
-    <string name="content_description_toggle_participant_devices_list">Mostrar u ocultar los dispositivos de los participantes</string>
-    <string name="content_description_ephemeral_duration_selected">Duración efímera seleccionada</string>
-    <string name="content_description_create_chat_room">Crear sala de chat</string>
-    <string name="content_description_add_participants">Agregar participantes</string>
-    <string name="content_description_remove_contact_from_chat_room">Eliminar el contacto de la conversación</string>
-    <string name="content_description_contact_is_not_admin">El contacto no es un administrador en esta conversación</string>
-    <string name="content_description_ephemeral_chat_room">Los mensajes son efímeros en esta conversación</string>
-    <string name="content_description_start_chat">Entra en la conversación</string>
-    <string name="content_description_start_encrypted_chat">Entra en una conversación encriptada</string>
-    <string name="content_description_edit_contact">Editar contacto</string>
-    <string name="content_description_delete_contact">Borrar contacto</string>
-    <string name="content_description_discard_changes">Descartar los cambios</string>
-    <string name="content_description_confirm_contact_edit">Guardar los cambios</string>
-    <string name="content_description_change_contact_picture">Cambiar foto de contacto</string>
-    <string name="content_description_change_own_picture">Cambiar mi propia foto</string>
-    <string name="content_description_exit_edition_mode">Salir del modo de edición</string>
-    <string name="content_description_select_all">Seleccionar todos los temas de la lista</string>
-    <string name="content_description_unselect_all">Deseleccionar todos los elementos de la lista</string>
-    <string name="content_description_delete_selection">Borrar los elementos seleccionados de la lista</string>
-    <string name="content_description_numpad_1">1</string>
-    <string name="content_description_numpad_2">2</string>
-    <string name="content_description_numpad_3">3</string>
-    <string name="content_description_numpad_5">5</string>
-    <string name="content_description_numpad_6">6</string>
-    <string name="content_description_numpad_7">7</string>
-    <string name="content_description_numpad_8">8</string>
-    <string name="content_description_numpad_9">9</string>
-    <string name="content_description_numpad_0">0</string>
-    <string name="content_description_numpad_star">*</string>
-    <string name="content_description_numpad_sharp">#</string>
-    <string name="content_description_voice_mail">Correo de voz</string>
-    <string name="content_description_toggle_side_menu">Mostrar u ocultar menú lateral</string>
-    <string name="content_description_menu_history">Historial de llamadas</string>
-    <string name="content_description_menu_contacts">Contactos</string>
-    <string name="content_description_menu_dialer">Marcador telefónico</string>
-    <string name="content_description_menu_chat">Conversaciones</string>
-    <string name="content_description_dialer_erase">Eliminar el último carácter</string>
-    <string name="content_description_add_contact">Crear contacto</string>
-    <string name="content_description_show_all_calls">Mostrar todas las llamadas</string>
-    <string name="content_description_show_missed_calls">Mostrar solo llamadas perdidad</string>
-    <string name="content_description_missed_call">Llamada perdida</string>
-    <string name="content_description_incoming_call">Llamada entrante</string>
-    <string name="content_description_outgoing_call">Llamada saliente</string>
-    <string name="content_description_create_group_chat_room">Crear una conversación de grupo</string>
-    <string name="content_description_security_level_unsafe">Inseguro</string>
-    <string name="content_description_security_level_safe">Seguro</string>
-    <string name="chat_room_ephemeral_messages_desc">Este mensaje se borrará por ambos extremos una vez que haya sido leído y después del tiempo de espera seleccionado.</string>
-    <string name="content_description_add_phone_number_field">Añadir un campo de número telefónico</string>
-    <string name="content_description_security_level_encrypted">Encriptado</string>
-    <string name="content_description_call_quality_0">Muy baja calidad de llamada</string>
-    <string name="content_description_call_quality_2">Calidad de llamada media</string>
-    <string name="content_description_call_quality_3">Buena calidad de llamada</string>
-    <string name="content_description_call_quality_4">Calidad de llamada máxima</string>
-    <string name="content_description_call_not_secured">La llamada no está asegurada</string>
-    <string name="content_description_call_secured">La llamada está asegurada</string>
-    <string name="content_description_chat_message_video_attachment">Video adjunto</string>
-    <string name="chat_room_delete_many_dialog">Estás seguro que quieres borrar estas conversaciones\?</string>
-    <string name="call_outgoing_title">Llamada saliente</string>
-    <string name="call_error_declined">Llamada ha sido declinada</string>
-    <string name="content_description_disable_speaker">Dirigir el audio al auricular</string>
-    <string name="call_video_update_requested_dialog">El corresponsal quisiera encender el video</string>
-    <string name="call_stats_video_resolution_received">Resolución de video recibida:</string>
-    <string name="content_description_use_bluetooth_headset">Usar auriculares bluetooth como salida de audio</string>
-    <string name="assistant_welcome_desc">Este asistente le ayudará a configurar y utilizar su cuenta SIP.</string>
-    <string name="content_description_pending_file_transfer">Pendiente de la transferencia de archivos</string>
-    <string name="content_description_contact_selected">Contacto es seleccionado</string>
-    <string name="content_description_show_sip_contacts">Mostrat una lsita de todos los contactos SIP</string>
-    <string name="content_description_attach_file">Adjunte un archivo al mensaje</string>
-    <string name="content_description_ephemeral_duration_change">Cambiar la duración efímera por el valor seleccionado</string>
-    <string name="content_description_contact_is_admin">El contacto es un administrador en esta conversación</string>
-    <string name="assistant_phone_number_link_info_content_already_account">Sólo puedes usar tu número de teléfono con una cuenta de &appName;.\n\nSi ya habías vinculado tu número a otra cuenta pero prefieres usar esta, simplemente vincúlala ahora y tu número se moverá automáticamente a esta cuenta.</string>
-    <string name="content_description_contact_can_do_encryption">El contacto puede ser invitado en conversaciones cifradas</string>
-    <string name="assistant_error_username_already_exists">Nombre de usuario ya utilizado</string>
-    <string name="assistant_error_phone_number_already_exists">Ya hay una cuenta que utiliza este número</string>
-    <string name="content_description_show_call_details">Ir a los detalles de la llamada</string>
-    <string name="assistant_error_invalid_credentials">La cuenta no existe o la contraseña no coincide</string>
-    <string name="assistant_create_account_part_1">Por favor, confirme el código de su país e introduzca su número de teléfono</string>
-    <string name="assistant_create_account_part_email">Por favor, introduzca un nombre de usuario, correo electrónico y contraseña para su &appName; cuenta</string>
-    <string name="assistant_create_account_part_2">Te hemos enviado un SMS con un código de validación a tu número de teléfono:</string>
-    <string name="assistant_link_phone_number">Vinculará con su número de teléfono el siguiente nombre de usuario:</string>
-    <string name="assistant_remote_provisioning_failure">No se descargó o aplicó el perfil de aprovisionamiento remoto…</string>
-    <string name="content_description_numpad_4">4</string>
-    <string name="settings_video_title">Video</string>
-    <string name="content_description_recording_toggle_play">Reproducir o pausar la grabación</string>
-    <string name="settings_contacts_title">Contactos</string>
-    <string name="audio_settings_echo_canceller_calibration_title">Calibración del cancelador de eco</string>
-    <string name="audio_settings_echo_cancellation_calibration_no_echo">No se ha detectado ningún eco</string>
-    <string name="audio_settings_input_device_title">Dispositivo de audio de entrada predeterminado</string>
-    <string name="content_description_go_to_contact">Ir a los datos de contacto</string>
-    <string name="content_description_create_one_to_one_chat_room">Crear una conversación individual</string>
-    <string name="audio_settings_output_device_summary">Los cambios surtirán efecto a partir de la próxima llamada</string>
-    <string name="video_settings_initiate_call_summary">Siempre envía solicitudes de video</string>
-    <string name="video_settings_bandwidth_limit_title">Límite de ancho de banda</string>
-    <string name="video_settings_bandwidth_limit_summary">en kbits/s</string>
-    <string name="content_description_call_quality_1">Baja calidad de llamada</string>
-    <string name="call_settings_vibrate_title">Vibrar mientras la llamada entrante está sonando</string>
-    <string name="call_settings_sipinfo_dtmf_title">Enviar DTMF de banda ancha (SIP INFO)</string>
-    <string name="content_description_call_security_pending">La seguridad de la llamada está pendiente</string>
-    <string name="call_settings_auto_start_summary">La llamada se iniciará automáticamente si se inicia desde otra aplicación</string>
-    <string name="chat_settings_mark_as_read_notif_dismissal_title">Marcar como leído en la notificación de despido</string>
-    <string name="chat_settings_auto_download_summary">Si descargar los archivos adjuntos en los mensajes de chat recibidos automáticamente o no</string>
-    <string name="chat_settings_downloaded_media_public_summary">Los archivos en los mensajes efímeros no serán, no funciona con la función de descarga automática</string>
-    <string name="chat_settings_hide_notification_content_title">Ocultar el contenido de los mensajes en las notificaciones</string>
-    <string name="chat_settings_hide_notification_content_summary">Sólo se mostrará el nombre del remitente</string>
-    <string name="chat_settings_launcher_shortcuts_title">Crear atajos para las salas de chat en el lanzador</string>
-    <string name="chat_settings_hide_rooms_removed_proxies_title">Esconder las salas de chat de las configuraciones de proxy eliminadas</string>
-    <string name="contacts_settings_native_presence_summary">Insertar atajos de información desde el &appName; contacto en los contactos nativos de Android</string>
-    <string name="contacts_settings_show_new_contact_account_dialog_summary">Si el contacto es deshabilitado se almacena localmente</string>
-    <string name="advanced_settings_device_name_title">Nombre de dispositivo</string>
-    <string name="advanced_settings_device_name_summary">Los cambios se aplicarán en la próxima puesta en marcha</string>
-    <string name="advanced_settings_go_to_power_manager_settings">Ajustes del administrador de energía</string>
-    <string name="tunnel_settings_dual_port_title">Segundo puerto de servidor</string>
-    <string name="account_settings_user_name_summary">Ejemplo: John si tu cuenta es john@sip.example.org</string>
-    <string name="account_settings_password_summary">Tienes que volver a introducir tu contraseña si editas tu nombre de usuario y/o el dominio</string>
-    <string name="account_settings_transport_udp">UDP</string>
-    <string name="account_settings_outbound_proxy_title">Proxy saliente</string>
-    <string name="account_settings_avpf_rr_interval_summary">en segundos (entre 1 y 5)</string>
-    <string name="notification_channel_service_name">&appName; servicio de notifcación</string>
-    <string name="incoming_call_notification_hangup_action_label">Colgar</string>
-    <string name="received_chat_notification_mark_as_read_label">Marcar como leído</string>
-    <string name="chat_event_ephemeral_disabled">Inhabilitaste los mensajes efímeros</string>
-    <string name="chat_event_ephemeral_enabled">Habilitaste los mensajes efímeros: %s</string>
-    <string name="chat_event_ephemeral_lifetime_changed">Fecha de caducidad de los mensajes efímeros: %s</string>
-    <string name="chat_message_download_file">Descargar</string>
-    <string name="chat_message_pick_file_dialog">Seleccione la fuente</string>
-    <string name="chat_room_devices_fragment_title">Conversaciones del dispositivo</string>
-    <string name="dialog_zrtp_remote_sas">Confirma que tu interlocutor diga:</string>
-    <string name="chat_room_group_info_title">Información</string>
-    <string name="chat_room_group_info_participants">Participantes</string>
-    <string name="chat_room_group_info_subject_hint">Nombra el grupo</string>
-    <string name="chat_room_group_info_admin">Administrador</string>
-    <string name="chat_room_group_info_leave">Dejar el grupo</string>
-    <string name="chat_room_group_info_leave_dialog_button">Salir</string>
-    <string name="chat_room_group_info_you_are_now_admin">Ahora eres administrador</string>
-    <string name="chat_room_group_info_you_are_no_longer_admin">Ya no eres administrador</string>
-    <string name="chat_message_imdn_info">Estado de la entrega</string>
-    <string name="chat_message_imdn_displayed">Leído</string>
-    <string name="chat_message_imdn_delivered">Enviado</string>
-    <string name="chat_message_imdn_undelivered">No enviado</string>
-    <string name="chat_message_imdn_sent">Enviado</string>
-    <string name="chat_message_forwarded">Remitido</string>
-    <string name="chat_message_context_menu_resend">Reenviado</string>
-    <string name="chat_message_context_menu_copy_text">Copiar texto</string>
-    <string name="chat_message_context_menu_forward">Remitir</string>
-    <string name="chat_message_context_menu_delete">Borrar</string>
-    <string name="chat_message_context_menu_add_to_contacts">Agregar a contactos</string>
-    <string name="chat_message_forward_confirmation_dialog">Quieres reenviar el mensaje en esta sala\?</string>
-    <string name="chat_room_context_menu_group_info">Inforamción del grupo</string>
-    <string name="chat_room_context_menu_participants_devices">Conversaciones en estos dispositivos</string>
-    <string name="chat_message_context_menu_ephemeral_messages">Mensajes efímeros</string>
-    <string name="chat_message_context_menu_delete_messages">Borrar mensajes</string>
-    <string name="chat_room_ephemeral_fragment_title">Mensajes efímeros</string>
-    <string name="chat_room_ephemeral_message_disabled">Deshabilitar</string>
-    <string name="chat_room_ephemeral_message_one_minute">1 minuto</string>
-    <string name="chat_room_ephemeral_message_one_hour">1 hora</string>
-    <string name="chat_room_ephemeral_message_one_day">1 día</string>
-    <string name="chat_room_ephemeral_message_three_days">3 días</string>
-    <string name="chat_room_ephemeral_message_one_week">1 semana</string>
-    <plurals name="chat_room_remote_composing">
-        <item quantity="one">%s está escribiendo…</item>
-        <item quantity="other">%s están escribiendo…</item>
-    </plurals>
-    <string name="chat_room_creation_failed_snack">La creación del chat room falló</string>
-    <string name="chat_room_removal_failed_snack">La eliminación de la sala de chat falló</string>
-    <string name="chat_room_delete_one_dialog">Estás seguro que quieres borrar esta conversación\?</string>
-    <string name="chat_message_notification_hidden_content">&lt;Redactado&gt;</string>
-    <string name="recordings_empty_list">No hay grabaciones</string>
-    <string name="call_incoming_title">Llamada entrante</string>
-    <string name="call_notification_paused">Llamada pausada</string>
-    <string name="call_notification_outgoing">Llamada saliente</string>
-    <string name="call_notification_active">Llamada en curso</string>
-    <string name="call_error_user_busy">Usuario está ocupado</string>
-    <string name="call_error_user_not_found">El usuario no ha sido encontrado</string>
-    <string name="call_error_incompatible_media_params">Parámetros de medios incompatibles</string>
-    <string name="call_error_network_unreachable">La red es inalcanzable</string>
-    <string name="call_error_io_error">Error de red</string>
-    <string name="call_stats_audio">Audio</string>
-    <string name="call_stats_video">Video</string>
-    <string name="call_stats_codec">Codec:</string>
-    <string name="call_stats_ip">Familia IP:</string>
-    <string name="call_stats_upload">Banda de ancho de subida:</string>
-    <string name="call_stats_download">Banda de ancho de descarga:</string>
-    <string name="call_stats_estimated_download">Estimado de baja de banda de ancho:</string>
-    <string name="call_stats_ice">Conectividad ICE:</string>
-    <string name="call_stats_video_resolution_sent">Resolución de video enviada:</string>
-    <string name="call_stats_video_fps_sent">Fps de video enviado:</string>
-    <string name="call_stats_video_fps_received">Fps de video recibido:</string>
-    <string name="call_stats_sender_loss_rate">Tasa de pérdidas del remitente:</string>
-    <string name="call_stats_receiver_loss_rate">Tasa de pérdida de receptores:</string>
-    <string name="call_stats_jitter_buffer">Jitter buffer:</string>
-    <string name="call_stats_encoder_name">Codificador:</string>
-    <string name="call_stats_decoder_name">Decodificador:</string>
-    <string name="call_stats_player_filter">Filtro de reproducción:</string>
-    <string name="call_stats_capture_filter">Filtro de captura:</string>
-    <string name="assistant_welcome_title">Bienvenido</string>
-    <string name="assistant_create_account">Crear cuenta</string>
-    <string name="assistant_login_linphone">Utilize &appName; cuenta</string>
-    <string name="assistant_login_generic">Utilizar cuenta SIP</string>
-    <string name="assistant_remote_provisioning">Buscar la configuración remota</string>
-    <string name="assistant_ec_calibration">Calibración del cancelador de eco en curso</string>
-    <string name="assistant_phone_number_info_title">Para qué se usará mi número de teléfono\?</string>
-    <string name="assistant_phone_number_link_info_content">\nGracias a tu número de teléfono, tus amigos te encontrarán más fácilmente.\n\n Verás en tu libreta de direcciones quién está usando &appName; y tus amigos sabrán que pueden contactarte en &appName; también.\n</string>
-    <string name="assistant_error_phone_number_invalid_characters">Solo digítos</string>
-    <string name="assistant_error_username_invalid_characters">Caracteres inválidos encontrados</string>
-    <string name="assistant_error_passwords_dont_match">Las contraseñas no coinciden</string>
-    <string name="assistant_error_invalid_email_address">La dirección de correo electrónico es inválida</string>
-    <string name="assistant_error_username_too_long">El nombre de usuario tiene demasiados caracteres</string>
-    <string name="assistant_linphone_account">Use su &appName; cuenta</string>
-    <string name="assistant_linphone_login_desc">Por favor, introduzca su nombre de usuario y contraseña de &appName; cuenta</string>
-    <string name="assistant_login_with_username">Usa tu nombre de usuario y contraseña en lugar de tu número de teléfono</string>
-    <string name="assistant_login_forgotten_password">Olvidaste tu contraseña\?</string>
-    <string name="assistant_login">Ingresar</string>
-    <string name="assistant_finish">Finalizar configuración</string>
-    <string name="assistant_confirmation_code">Confirmar código</string>
-    <string name="assistant_continue_even_if_credentials_invalid">Continuar</string>
-    <string name="assistant_generic_account">Usar cuenta SIP</string>
-    <string name="assistant_login_desc">Por favor, introduzca su nombre de usuario y contraseña con su dominio SIP</string>
-    <string name="assistant_display_name_optional">Mostrar nombre (opcional)</string>
-    <string name="assistant_confirm_password">Confirmación de contraseña</string>
-    <string name="assistant_validate_account_1">Su cuenta está creada. Por favor, comprueba tus correos para validar tu cuenta:</string>
-    <string name="assistant_validate_account_2">Una vez hecho, vuelve aquí y pulsa el botón.</string>
-    <string name="assistant_use_username_instead_or_phone_number">Usar un nombre de usuario (opcional)</string>
-    <string name="assistant_create_account_part_3">Para completar la verificación de su número de teléfono, por favor, introduzca el código de 4 dígitos a continuación:\n</string>
-    <string name="assistant_link_phone_number_skip">Saltar</string>
-    <string name="assistant_link_account">Ligar cuenta</string>
-    <string name="assistant_remote_provisioning_title">Buscar la configuración remota</string>
-    <string name="assistant_remote_provisioning_desc">Por favor, proporcione su URL de configuración</string>
-    <string name="assistant_remote_provisioning_url">URL</string>
-    <string name="assistant_remote_provisioning_wrong_format">Formato URL desconocido, no se puede descargar el aprovisionamiento…</string>
-    <string name="assistant_fetch_apply">Buscar y aplicar</string>
-    <string name="assistant_launch_qrcode">Código QR</string>
-    <string name="settings_accounts_title">Cuentas SIP</string>
-    <string name="settings_default_account_subtitle">Cuenta default</string>
-    <string name="settings_list_title">Preferencias</string>
-    <string name="settings_tunnel_title">Túnel</string>
-    <string name="settings_audio_title">Audio</string>
-    <string name="settings_call_title">Llamar</string>
-    <string name="settings_chat_title">Chatear</string>
-    <string name="settings_network_title">Red</string>
-    <string name="settings_advanced_title">Avanzado</string>
-    <string name="audio_settings_echo_cancellation_summary">Elimina el eco que se escucha por el otro extremo</string>
-    <string name="audio_settings_echo_canceller_calibration_summary">Pulse para iniciar la calibración del cancelador de eco</string>
-    <string name="audio_settings_echo_cancellation_calibration_started">Se inició la calibración del cancelador de eco</string>
-    <string name="audio_settings_echo_cancellation_calibration_value">Calibrado en %s ms</string>
-    <string name="audio_settings_echo_cancellation_calibration_failed">La calibración falló</string>
-    <string name="audio_settings_echo_tester_title">Eco de prueba</string>
-    <string name="audio_settings_echo_tester_summary">Haga clic para iniciar la prueba de eco</string>
-    <string name="audio_settings_echo_tester_summary_is_stopped">El comprobador de eco se ha detenido</string>
-    <string name="audio_settings_echo_tester_summary_is_running">El probador de eco está funcionando</string>
-    <string name="audio_settings_adaptive_rate_control_title">Control de la tasa de adaptación</string>
-    <string name="audio_settings_input_device_summary">Los cambios surtirán efecto a partir de la próxima llamada</string>
-    <string name="audio_settings_output_device_title">Dispositivo de audio de salida por defecto</string>
-    <string name="audio_settings_codec_bitrate_title">Límite de la tasa de bits del codec</string>
-    <string name="audio_settings_microphone_gain_title">Ganancia del micrófono</string>
-    <string name="audio_settings_microphone_gain_summary">(en decibelios)</string>
-    <string name="audio_settings_playback_gain_title">Ganancia de reproducción</string>
-    <string name="audio_settings_playback_gain_summary">(en decibelios)</string>
-    <string name="audio_settings_codecs_title">Codecs</string>
-    <string name="video_settings_enable_title">Habilitar video</string>
-    <string name="video_settings_tablet_preview_title">Mostrar la vista previa de la cámara en el marcador</string>
-    <string name="video_settings_initiate_call_title">Iniciar videollamadas</string>
-    <string name="video_settings_automatically_accept_title">Aceptar las solicitudes de vídeo entrantes</string>
-    <string name="video_settings_automatically_accept_summary">Siempre aceptar las solicitudes de video</string>
-    <string name="video_settings_camera_device_title">Cámara</string>
-    <string name="video_settings_video_size_title">Tamaño de video preferido</string>
-    <string name="video_settings_video_preset_title">Video preestablecido</string>
-    <string name="video_settings_preferred_fps_title">FPS preferido</string>
-    <string name="video_settings_codecs_title">Codecs</string>
-    <string name="call_settings_device_ringtone_title">Usar el tono del dispositivo</string>
-    <string name="call_settings_encryption_title">Cifrado de los medios de comunicación</string>
-    <string name="call_settings_media_encryption_none">Ninguno</string>
-    <string name="call_settings_media_encryption_srtp">SRTP</string>
-    <string name="call_settings_media_encryption_zrtp">ZRTP</string>
-    <string name="call_settings_media_encryption_dtls">DTLS-SRTP</string>
-    <string name="call_settings_encryption_mandatory_title">La encriptación de los medios es obligatoria</string>
-    <string name="call_settings_overlay_title">Notificación de llamada superpuesta</string>
-    <string name="call_settings_system_wide_overlay_summary">Se le pedirá que conceda el permiso de superposición</string>
-    <string name="call_settings_rfc2833_dtmf_title">Enviar DTMF en banda (RFC 2833)</string>
-    <string name="call_settings_auto_start_title">Comienza la llamada inmediatamente</string>
-    <string name="call_settings_auto_answer_title">Respuesta automática a las llamadas entrantes</string>
-    <string name="call_settings_auto_answer_delay_title">Tiempo de respuesta automática</string>
-    <string name="call_settings_auto_answer_delay_summary">en milisegundos</string>
-    <string name="call_settings_incoming_timeout_title">Tiempo de espera de la llamada entrante</string>
-    <string name="call_settings_incoming_timeout_summary">en segundos</string>
-    <string name="call_settings_voice_mail_uri_title">Correo de voz URI</string>
-    <string name="call_settings_accept_early_media_title">Aceptar los primeros medios de comunicación</string>
-    <string name="call_settings_go_to_android_notification_settings">Configuración de notificación de Android</string>
-    <string name="chat_settings_file_sharing_url_title">Compartir la URL del servidor</string>
-    <string name="chat_settings_file_sharing_url_summary">No edites a menos que sepas lo que estás haciendo!</string>
-    <string name="chat_settings_auto_download_title">Política de descarga automática de archivos entrantes</string>
-    <string name="chat_settings_auto_download_always">Siempre</string>
-    <string name="chat_settings_auto_download_never">Nunca</string>
-    <string name="chat_settings_auto_download_under_size">Si es más ligero que el tamaño máximo dado</string>
-    <string name="chat_settings_auto_download_max_size_title">Tamañano máximo</string>
-    <string name="chat_settings_auto_download_max_size_summary">en bytes</string>
-    <string name="chat_settings_downloaded_media_public_title">Hacer públicos los medios de comunicación descargados</string>
-    <string name="chat_room_group_info_leave_dialog_message">Quieres salir de esta conversación\?</string>
-    <string name="chat_settings_launcher_shortcuts_summary">Será reemplazado por atajos de contactos si está habilitado</string>
-    <string name="chat_settings_hide_empty_rooms_title">Ocultar salas de chat vacías</string>
-    <string name="chat_settings_hide_rooms_removed_proxies_summary">Si te pierdes las salas de chat, intenta desmarcar esta opción</string>
-    <string name="chat_settings_go_to_android_notification_settings">Configuración de notificación de Android</string>
-    <string name="network_settings_wifi_only_title">Usar sólo WiFi</string>
-    <string name="network_settings_allow_ipv6_title">Permitir IPv6</string>
-    <string name="network_settings_random_ports_title">Usar puertos aleatorios</string>
-    <string name="network_settings_sip_port_title">Puerto SIP a usar</string>
-    <string name="contacts_settings_friendlist_subscribe_title">Suscribirse a la lista de amigos</string>
-    <string name="contacts_settings_native_presence_title">Información sobre la presencia en contacto nativo</string>
-    <string name="contacts_settings_show_organization_title">Mostrar organización de contacto</string>
-    <string name="contacts_settings_launcher_shortcuts_title">Crear atajos para los contactos en el lanzador</string>
-    <string name="contacts_settings_launcher_shortcuts_summary">Reemplazará los atajos de la sala de chat si los hay</string>
-    <string name="contacts_settings_show_new_contact_account_dialog_title">Siempre pregunte en qué cuenta guardar el contacto recién creado</string>
-    <string name="advanced_settings_debug_mode_title">Registros de depuración</string>
-    <string name="advanced_settings_background_mode_title">Modo de fondo</string>
-    <string name="advanced_settings_background_mode_summary">Muestra una notificación para mantener la aplicación viva</string>
-    <string name="advanced_settings_auto_start_title">Comienza en el momento del arranque</string>
-    <string name="advanced_settings_dark_mode_title">Tema oscuro</string>
-    <string name="advanced_settings_dark_mode_label_auto">Auto</string>
-    <string name="advanced_settings_dark_mode_label_no">No</string>
-    <string name="advanced_settings_dark_mode_label_yes">Sí</string>
-    <string name="advanced_settings_animations_title">Animaciones</string>
-    <string name="advanced_settings_remote_provisioning_url_title">URL de aprovisionamiento remoto</string>
-    <string name="advanced_settings_logs_server_url_title">Registra la URL del servidor de carga</string>
-    <string name="advanced_settings_logs_server_url_summary">No edites a menos que sepas lo que estás haciendo!</string>
-    <string name="advanced_settings_android_title">Android</string>
-    <string name="advanced_settings_go_to_battery_optimization_settings">Ajustes de optimización de la batería</string>
-    <string name="advanced_settings_go_to_android_app_settings">Ajustes de app Android</string>
-    <string name="tunnel_settings_hostname_url_title">Nombre de usuario</string>
-    <string name="tunnel_settings_port_title">Puerto</string>
-    <string name="tunnel_settings_dual_mode_title">Modo dual habilitado</string>
-    <string name="tunnel_settings_dual_mode_summary">Usará un servidor para subir y otro para bajar</string>
-    <string name="tunnel_settings_dual_hostname_url_title">El nombre del segundo servidor</string>
-    <string name="tunnel_settings_dual_hostname_url_summary">Requerido en modo dual</string>
-    <string name="tunnel_settings_dual_port_summary">Requerido en modo dual</string>
-    <string name="tunnel_settings_mode_title">Modo</string>
-    <string name="tunnel_settings_disabled_mode">Deshabilitado</string>
-    <string name="tunnel_settings_always_mode">Siempre</string>
-    <string name="tunnel_settings_auto_mode">Auto</string>
-    <string name="account_settings_user_name_title">Nombre de usuario</string>
-    <string name="account_settings_user_id_title">ID de autorización</string>
-    <string name="account_settings_user_id_summary">Introduzca el id de autenticación si es diferente del nombre de usuario (opcional)</string>
-    <string name="account_settings_password_title">Contraseña</string>
-    <string name="account_settings_domain_title">Dominio</string>
-    <string name="account_settings_domain_summary">Ejemplo: sip.example.org si su cuenta es john@sip.example.org</string>
-    <string name="account_settings_display_name_title">Nombre de la pantalla</string>
-    <string name="account_settings_manage_title">Gestionar</string>
-    <string name="account_settings_disable_title">Deshabilitar</string>
-    <string name="account_settings_default_title">Usado por defecto</string>
-    <string name="account_settings_link_phone_number_title">Ligar tu cuenta</string>
-    <string name="account_settings_delete_title">Borrar</string>
-    <string name="account_settings_advanced_title">Avanzado</string>
-    <string name="account_settings_push_notification_title">Habilitar notificaciones push</string>
-    <string name="account_settings_push_notification_summary">La configuración del proxy no se desregistrará</string>
-    <string name="account_settings_transport_title">Transporte</string>
-    <string name="account_settings_transport_tcp">TCP</string>
-    <string name="account_settings_transport_tls">TLS</string>
-    <string name="account_settings_transport_dtls">DTLS</string>
-    <string name="account_settings_proxy_title">Proxy SIP</string>
-    <string name="account_settings_outbound_proxy_summary">Enruta todas las llamadas a través del proxy SIP de arriba</string>
-    <string name="account_settings_stun_server_title">Servidor STUN / TURN</string>
-    <string name="account_settings_ice_title">Habilitar ICE</string>
-    <string name="account_settings_avpf_title">AVPF</string>
-    <string name="account_settings_avpf_rr_interval_title">AVPF de intervalo regular de RTCP</string>
-    <string name="account_settings_expires_title">Caduce</string>
-    <string name="account_settings_expires_summary">en segundos</string>
-    <string name="account_settings_prefix_title">Prefijo de tu país</string>
-    <string name="account_settings_prefix_summary">sin el +</string>
-    <string name="account_settings_escape_plus_title">Reemplazar + por 00</string>
-    <string name="notification_channel_incoming_call_name">&appName; notificaciones de llamadas entrantes</string>
-    <string name="notification_channel_chat_name">&appName; notificaciones de mensajes</string>
-    <string name="incoming_call_notification_title">Llamada entrante</string>
-    <string name="chat_message_context_menu_imdn_info">Estado de envío</string>
-    <string name="dialog_lime_security_message">Los mensajes instantáneos se cifran de extremo a extremo en conversaciones seguras. Es posible mejorar el nivel de seguridad de una conversación autenticando a los participantes. Para ello, llame al contacto y siga el proceso de autenticación.</string>
-    <string name="advanced_settings_send_debug_logs_title">Enviar registros</string>
-    <string name="advanced_settings_reset_debug_logs_title">Restablecer registros</string>
-    <string name="settings_primary_account_display_name_title">Nombre de la pantalla</string>
-    <string name="settings_primary_account_username_title">Nombre de usuario</string>
-    <string name="advanced_settings_vfs_title">Encriptar todo</string>
-    <string name="advanced_settings_vfs_summary">Una vez habilitado no puede ser deshabilitado!</string>
-    <string name="advanced_settings_debug_title">Configuración de debugs</string>
-    <string name="advanced_settings_other_title">Otros ajustes</string>
-    <string name="account_settings_apply_prefix_for_calls_title">Aplicar prefijo para llamadas salientes y chat</string>
-    <string name="account_settings_apply_prefix_for_calls_summary">Si se ingresa un número, aplique el prefijo al número</string>
-    <string name="content_description_close_bubble">Cerrar notificación</string>
-    <string name="content_description_open_app">Abrir conversación en la aplicación</string>
-    <string name="content_description_export">Abrir archivo en una aplicación de terceros</string>
-    <string name="content_description_cancel_forward">Cancelar reenvío de mensajes</string>
-    <string name="content_description_cancel_sharing">Cancelar compartir</string>
-    <string name="logs_reset_complete">Se borraron los registros</string>
-    <string name="logs_upload_failure">¡No se pudieron cargar los registros!</string>
-    <string name="call_error_server_timeout">Servidor timeout</string>
-    <string name="assistant_general_terms">condiciones de uso</string>
-    <string name="assistant_read_and_agree_terms">Acepto Belledonne Communications\' %1$s and %2$s</string>
-    <string name="call_settings_system_wide_overlay_title">Mostrar overlay fuera de la aplicación</string>
-    <string name="notification_channel_missed_call_name">&appName; notificaciones de llamadas perdidas</string>
-    <string name="content_description_forward_message">Reenviar mensaje en esta conversación</string>
-    <string name="debug_popup_show_config_file">Ver archivo de configuración</string>
-    <string name="chat_room_choose_conversation_for_message_forward">Seleccione o cree una conversación para reenviar el mensaje</string>
-    <string name="chat_room_choose_conversation_for_file_sharing">Seleccione o cree una conversación para compartir los archivos</string>
-    <string name="chat_room_file_not_found">Archivo no encontrado</string>
-    <string name="chat_room_choose_conversation_for_text_sharing">Seleccione o cree una conversación para compartir el texto</string>
-    <string name="chat_message_no_app_found_to_handle_file_mime_type">No hay ninguna aplicación disponible para este tipo de archivo</string>
-    <string name="chat_bubble_cant_open_enrypted_file">No se puede abrir el archivo cifrado en el chat</string>
-    <string name="chat_message_cant_open_file_in_app_dialog_title">Parece que no podemos mostrar el archivo.</string>
-    <string name="chat_message_cant_open_file_in_app_dialog_message">¿Le gustaría abrirlo como texto o exportarlo (sin cifrar) a una aplicación de terceros si disponible\?</string>
-    <string name="chat_message_cant_open_file_in_app_dialog_export_button">Exportar</string>
-    <string name="chat_message_cant_open_file_in_app_dialog_open_as_text_button">Abrir como texto</string>
-    <string name="call_error_temporarily_unavailable">Temporalmente no disponible</string>
-    <string name="assistant_privacy_policy">política de privacidad</string>
-    <string name="settings_primary_account_title">Cuenta principal</string>
-    <string name="call_settings_redirect_to_voice_mail_declined_calls_title">Redirigir las llamadas rechazadas al correo de voz</string>
-    <string name="call_settings_ring_during_early_media_title">Sonar en los primeros entrantes</string>
-    <string name="call_settings_pause_calls_lost_audio_focus_title">Pausar llamadas cuando se pierde el enfoque del audio</string>
-    <string name="chat_settings_use_in_app_file_viewer_title">Siempre abra archivos dentro de esta aplicación</string>
-    <string name="chat_settings_use_in_app_file_viewer_summary">Aún podrá exportarlos en aplicaciones de terceros</string>
-    <string name="about_weblate_translation">Ayúdanos a traducir &appName;</string>
-    <string name="assistant_generic_account_warning_continue_button_text">Comprendo</string>
-    <string name="chat_message_removal_info">El mensaje será eliminado</string>
-    <string name="chat_message_abort_removal">Cancelar</string>
-    <string name="audio_settings_prefer_bluetooth_devices_title">Dirigir el audio al dispositivo bluetooth si existe</string>
-    <string name="content_description_cancel_reply">Cancelar la respuesta</string>
-    <string name="chat_message_replied">Respuesta</string>
-    <string name="chat_message_context_menu_reply">Responder</string>
-    <string name="chat_room_sending_reply_hint">Respuesta</string>
-    <string name="chat_room_sending_message_hint">Mensaje</string>
-    <string name="chat_message_voice_recording_hold_to_record">Mantenga pulsado el botón para grabar un mensaje de voz</string>
-    <string name="chat_message_voice_recording_playback_low_volume">El volumen de los medios de comunicación es bajo, es posible que desee aumentarlo</string>
-    <plurals name="chat_room_unread_messages_event">
-        <item quantity="one">%1$d mensaje no leído</item>
-        <item quantity="other">%1$d mensajes no leídos</item>
-    </plurals>
-    <string name="call_settings_ringtones_title">Tono de llamada</string>
-    <string name="call_settings_use_telecom_manager_summary">Requiere permisos adicionales</string>
-    <string name="content_descripton_scroll_to_bottom">Desplazarse al final o al primer mensaje no leído</string>
-    <string name="call_settings_use_telecom_manager_title">Mejorar las interacciones con los dispositivos bluetooth</string>
-    <string name="chat_room_presence_online">En línea</string>
-    <string name="chat_room_context_menu_go_to_contact">Ir al contacto</string>
-    <string name="chat_message_context_menu_turn_off_notifications">Desactiva notificaciones</string>
-    <string name="chat_message_context_menu_turn_on_notifications">Habilita notificaciones</string>
-    <string name="chat_message_download_already_in_progress">"Por favor esperar que  finalice la bajada antes de comenzar otra"</string>
-    <string name="chat_message_voice_recording_received_notification">Tu has recibido un mensaje de voz</string>
-    <string name="chat_message_voice_recording">Mensaje de voz</string>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
deleted file mode 100644
index 65f1e97a5..000000000
--- a/app/src/main/res/values-fi/strings.xml
+++ /dev/null
@@ -1,429 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE resources [
-<!ENTITY appName "Linphone">
-]>
-<resources xmlns:tools="http://schemas.android.com/tools">
-    <string name="service_description">Tämä vaaditaan, jotta voit vastaanottaa puheluita, kun sovellus on käynnissä taustalla</string>
-    <string name="sync_account_name">&appName; yhteystiedot</string>
-    <string name="about_privacy_policy">Katso tietosuojaselosteemme</string>
-    <string name="about_weblate_translation">Auta kääntämään &appName;</string>
-    <string name="logs_reset_complete">Logit on tyhjennetty</string>
-    <string name="logs_url_copied_to_clipboard">Logien URL-osoite kopioitu leikepöydälle</string>
-    <string name="phone_number">Puhelinnumero</string>
-    <string name="phone_numbers">Puhelinnumerot</string>
-    <string name="select_your_country">Valitse maasi</string>
-    <string name="international_prefix">Etuliite</string>
-    <string name="assistant_choose_country">Valitse maa</string>
-    <string name="username">Käyttäjätunnus</string>
-    <string name="password">Salasana</string>
-    <string name="domain">Verkkotunnus</string>
-    <string name="sip_address">SIP osoite</string>
-    <string name="sip_addresses">SIP osoitteet</string>
-    <string name="cancel">Peruuta</string>
-    <plurals name="days">
-        <item quantity="one">%d päivä</item>
-        <item quantity="other">%d päivät</item>
-    </plurals>
-    <string name="today">Tänään</string>
-    <string name="yesterday">Eilen</string>
-    <string name="transport_udp">UDP</string>
-    <string name="app_description"><i>libre</i> SIP asiakasohjelmisto</string>
-    <string name="status_connected">Yhdistetty</string>
-    <string name="status_not_connected">Ei yhteyttä</string>
-    <string name="status_in_progress">Muodostetaan yhteyttä</string>
-    <string name="status_error">Yhteys epäonnistui</string>
-    <string name="about">Tietoja</string>
-    <string name="assistant">Avustaja</string>
-    <string name="transport_tcp">TCP</string>
-    <string name="transport_tls">TLS</string>
-    <string name="recordings">Tallenteet</string>
-    <string name="settings">Asetukset</string>
-    <string name="assistant_choose_country_title">Maa tai etuliite</string>
-    <string name="history_calls_list">Puhelut</string>
-    <string name="no_call_history">Ei puheluita</string>
-    <string name="no_conference_call_history">Ei ryhmäpuheluita</string>
-    <string name="history_delete_one_dialog">Haluatko poistaa tämän tietueen\?</string>
-    <string name="history_delete_many_dialog">Haluatko poistaa nämä tietueet\?</string>
-    <string name="contact_invite_friend">Kutsu</string>
-    <string name="no_contact">Yhteystietoa ei löydy osoitekirjastasi.</string>
-    <string name="no_sip_contact">SIP yhteystietoa ei löydy osoitekirjastasi.</string>
-    <string name="contact_send_sms_invite_text">Hei, tule mukaan käyttämään &appName;:a! Voit ladata sen ilmaiseksi täältä: %s</string>
-    <string name="contact_last_name">Sukunimi</string>
-    <string name="contact_first_name">Etunimi</string>
-    <string name="contact_organization">Organisaatio</string>
-    <string name="service_name">&appName; palvelu</string>
-    <string name="service_auto_start_description">&appName; on käynnistetty automaattisesti</string>
-    <string name="logs_upload_failure">Logien lähetys epäonnistui!</string>
-    <string name="email">Sähköposti</string>
-    <string name="share_uploaded_logs_link">Jaa linkki logeihin käyttäen…</string>
-    <string name="no_account_configured">Tiliä ei ole asetettu</string>
-    <string name="quit">Lopeta</string>
-    <string name="no_missed_call_history">Ei vastaamattomia puheluita</string>
-    <string name="contact_filter_hint">Hae yhteystietoa</string>
-    <string name="contact_choose_existing_or_new_to_add_number">Valitse yhteystieto tai luo uusi</string>
-    <string name="contact_editor_write_permission_denied">Yhteystietojen muokkausoikeudet puuttuu, muokkaus epäonnistui</string>
-    <string name="contact_delete_one_dialog">Haluatko poistaa valitun yhteystiedon\?
-\nSe poistetaan myös laitteesi osoitekirjasta</string>
-    <string name="debug_popup_send_logs">Lähetä logit</string>
-    <string name="debug_popup_show_config_file">Näytä konfiguraatiotiedosto</string>
-    <string name="dialer_transfer_succeded">Soittoa siirretään</string>
-    <string name="dialer_transfer_failed">Soitonsiirto epäonnistui</string>
-    <string name="no_chat_history">Ei keskusteluja</string>
-    <string name="chat_remote_is_composing">Keskustelukumppani kirjoittaa…</string>
-    <string name="chat_event_conference_created">Liityit ryhmään</string>
-    <string name="chat_event_conference_destroyed">Lähdit ryhmästä</string>
-    <string name="chat_event_participant_added">%s liittyi</string>
-    <string name="chat_event_participant_removed">%s poistui</string>
-    <string name="chat_event_device_added">uusi laite: %s</string>
-    <string name="chat_event_device_removed">laite poistettu: %s</string>
-    <string name="chat_event_subject_changed">uusi aihe: %s</string>
-    <string name="chat_event_admin_set">%s on ylläpitäjä</string>
-    <string name="conference_waiting_room_video_disabled">Video on kytketty pois</string>
-    <string name="conference_too_many_participants_for_mosaic_layout">Osallistujia on liian monta mosaiikkiasetteluun, vaihdetaan aktiivisen puhujan tilaan</string>
-    <string name="contact_delete_many_dialog">Haluatko varmasti poistaa valitut yhteystiedot\?
-\nNe poistetaan myös laitteesi osoitekirjasta</string>
-    <string name="contact_new_choose_sync_account">Valitse mihin yhteystieto tallennetaan</string>
-    <string name="contact_local_sync_account">Tallenna paikallisesti</string>
-    <string name="contact_cant_be_deleted">Tätä yhteystietoa ei voi poistaa</string>
-    <string name="contacts_ldap_query_more_results_available">Lisää tuloksia, tarkenna hakua</string>
-    <string name="dialer_address_bar_hint">Valitse numero tai osoite</string>
-    <string name="debug_popup_title">Ongelmanselvitys</string>
-    <string name="debug_popup_enable_logs">Ota lokit käyttöön</string>
-    <string name="debug_popup_disable_logs">Poista lokit käytöstä</string>
-    <string name="chat_event_admin_unset">%s ei ole enää ylläpitäjä</string>
-    <string name="chat_security_event_lime_identity_key_changed">LIME tunnisteavain vaihtui käyttäjälle %s</string>
-    <string name="chat_security_event_man_in_the_middle_detected">Man-in-the-middle hyökkäys havaittu käyttäjälle %s</string>
-    <string name="chat_security_event_security_level_downgraded">Tietoturvan tasoa on laskettu käyttäjän %s vuoksi</string>
-    <string name="chat_security_event_participant_max_count_exceeded">Osallistujien enimmäismäärä ylitetty %s johdosta</string>
-    <string name="chat_event_ephemeral_disabled">Väliaikaiset viestit poistettu käytöstä</string>
-    <string name="chat_message_download_file">Lataa</string>
-    <string name="chat_message_pick_file_dialog">Valitse lähde</string>
-    <string name="chat_room_devices_fragment_title">Keskustelun laitteet</string>
-    <string name="chat_room_group_info_title">Tietoja</string>
-    <string name="chat_room_group_info_participants">Osallistujat</string>
-    <string name="chat_room_group_info_subject_hint">Ryhmän nimi</string>
-    <string name="chat_room_group_info_admin">Ylläpitäjä</string>
-    <string name="chat_room_group_info_leave">Poistu ryhmästä</string>
-    <string name="chat_room_group_info_leave_dialog_button">Poistu</string>
-    <string name="chat_room_group_info_leave_dialog_message">Haluatko poistua keskustelusta\?</string>
-    <string name="chat_room_group_info_you_are_now_admin">Olet nyt ylläpitäjä</string>
-    <string name="chat_message_imdn_info">Välitystiedot</string>
-    <string name="chat_message_imdn_displayed">Lue</string>
-    <string name="chat_message_imdn_delivered">Toimitettu</string>
-    <string name="chat_message_imdn_undelivered">Ei toimitettu</string>
-    <string name="chat_message_imdn_sent">Lähetetty</string>
-    <string name="chat_message_forwarded">Välitetty</string>
-    <string name="chat_message_replied">Vastaa</string>
-    <string name="chat_message_context_menu_resend">Lähetä uudelleen</string>
-    <string name="chat_message_context_menu_copy_text">Kopioi teksti</string>
-    <string name="chat_message_context_menu_forward">Välitä</string>
-    <string name="chat_message_context_menu_reply">Vastaa</string>
-    <string name="chat_message_context_menu_imdn_info">Välitystiedot</string>
-    <string name="chat_message_context_menu_delete">Poista</string>
-    <string name="chat_message_forward_confirmation_dialog">Haluatko välittää viestin tähän keskusteluryhmään\?</string>
-    <string name="chat_room_choose_conversation_for_message_forward">Valitse keskustelu mihin viesti välitetään</string>
-    <string name="chat_room_choose_conversation_for_text_sharing">Valitse tai luo keskustelu jakaaksesi tekstin</string>
-    <string name="chat_room_file_not_found">Tiedostoa ei löydy</string>
-    <string name="chat_room_context_menu_group_info">Ryhmän tiedot</string>
-    <string name="chat_room_context_menu_participants_devices">Keskustelun laitteet</string>
-    <string name="chat_room_context_menu_go_to_contact">Avaa yhteystieto</string>
-    <string name="chat_message_context_menu_ephemeral_messages">Väliaikaiset viestit</string>
-    <string name="chat_message_context_menu_turn_off_notifications">Poista ilmoitukset käytöstä</string>
-    <string name="chat_message_context_menu_turn_on_notifications">Ota ilmoitukset käyttöön</string>
-    <string name="chat_room_ephemeral_fragment_title">Väliaikaiset viestit</string>
-    <string name="chat_room_ephemeral_message_disabled">Pois käytöstä</string>
-    <string name="chat_room_ephemeral_message_one_minute">1 minuutti</string>
-    <string name="chat_room_ephemeral_message_one_hour">1 tunti</string>
-    <string name="chat_room_ephemeral_message_one_day">1 päivä</string>
-    <string name="chat_room_ephemeral_message_three_days">3 päivää</string>
-    <string name="chat_room_ephemeral_message_one_week">1 viikko</string>
-    <plurals name="chat_room_remote_composing">
-        <item quantity="one">%s kirjoittaa…</item>
-        <item quantity="other">%s kirjoittavat…</item>
-    </plurals>
-    <string name="chat_room_creation_failed_snack">Keskusteluhuoneen luonti epäonnistui</string>
-    <string name="chat_room_removal_failed_snack">Keskusteluhuoneen poisto epäonnistui</string>
-    <string name="chat_room_delete_one_dialog">Haluatko varmasti poistaa tämän keskustelun\?</string>
-    <string name="chat_message_notification_hidden_content">&lt;Poistettu&gt;</string>
-    <string name="chat_message_no_app_found_to_handle_file_mime_type">Tälle tiedostotyypille ei ole saatavilla sovellusta</string>
-    <string name="chat_bubble_cant_open_enrypted_file">Salattua tiedostoa ei voi avata keskustelussa</string>
-    <string name="chat_message_cant_open_file_in_app_dialog_title">Tiedostoa ei voi näyttää.</string>
-    <string name="chat_message_cant_open_file_in_app_dialog_export_button">Vie</string>
-    <string name="chat_message_cant_open_file_in_app_dialog_open_as_text_button">Avaa tekstinä</string>
-    <string name="chat_room_sending_reply_hint">Vastaa</string>
-    <string name="chat_room_sending_message_hint">Viesti</string>
-    <string name="chat_message_voice_recording_hold_to_record">Pidä painike painettuna nauhottaaksesi ääniviestin</string>
-    <string name="chat_message_voice_recording_playback_low_volume">Median äänitaso alhainen, saatat haluta nostaa sitä</string>
-    <plurals name="chat_room_unread_messages_event">
-        <item quantity="one">%1$d lukematon viesti</item>
-        <item quantity="other">%1$d lukematonta viestiä</item>
-    </plurals>
-    <string name="chat_message_removal_info">Viesti poistetaan</string>
-    <string name="chat_message_abort_removal">Peruuta</string>
-    <string name="recordings_empty_list">Ei tallenteita</string>
-    <string name="recordings_export">Vie tallenne käyttäen…</string>
-    <string name="conference">Kokous</string>
-    <string name="conference_schedule_title">Ajasta kokous</string>
-    <string name="conference_group_call_title">Aloita ryhmäpuhelu</string>
-    <string name="conference_schedule_later">Haluatko ajastaa kokouksen toiseen ajankohtaan\?</string>
-    <string name="conference_schedule_mandatory_field">Pakollinen</string>
-    <string name="conference_schedule_subject_title">Aihe</string>
-    <string name="conference_group_call_subject_hint">Ryhmäpuhelun aihe</string>
-    <string name="conference_schedule_address_title">Kokouksen osoite</string>
-    <string name="conference_schedule_description_title">Lisää kuvaus</string>
-    <string name="conference_schedule_description_hint">Kuvaus</string>
-    <string name="conference_schedule_date">Päivämäärä</string>
-    <string name="conference_schedule_time">Aika</string>
-    <string name="conference_schedule_duration">Kesto</string>
-    <string name="conference_schedule_timezone">Aikavyöhyke</string>
-    <string name="conference_schedule_send_updated_invite_chat">Lähetä päivitys käyttäen &appName;</string>
-    <string name="conference_schedule_send_invite_email">Lähetä kutsu sähköpostilla</string>
-    <string name="conference_schedule_send_updated_invite_email">Lähetä päivitys sähköpostilla</string>
-    <string name="conference_schedule_send_invite_chat_summary">Kutsu lähetetään &appName; tililtäni</string>
-    <string name="conference_schedule_participants_list">Osallistujalista</string>
-    <string name="conference_organizer">Järjestäjä</string>
-    <string name="conference_schedule_summary">Kokouksen tiedot</string>
-    <string name="conference_group_call_summary">Ryhmäpuhelun tiedot</string>
-    <string name="conference_schedule_start">Ajasta kokous</string>
-    <string name="conference_schedule_edit">Muokkaa kokousta</string>
-    <string name="conference_group_call_create">Aloita ryhmäpuhelu</string>
-    <string name="conference_schedule_info_not_sent_to_participant">Kokouksen tietojen lähetys osallistujalle epäonnistui</string>
-    <string name="conference_paused_title">Et ole kokouksessa.</string>
-    <string name="conference_default_title">Etäryhmäpuhelu</string>
-    <string name="conference_local_title">Paikallinen ryhmäpuhelu</string>
-    <string name="conference_invite_title">Kokouskutsu:</string>
-    <string name="conference_cancel_title">Kokous on peruttu:</string>
-    <string name="conference_description_title">Kuvaus</string>
-    <string name="conference_invite_join">Liity</string>
-    <string name="conference_invite_participants_count" tools:ignore="PluralsCandidate">%d osallistujaa</string>
-    <string name="conference_display_mode_mosaic">Mosaiikkitila</string>
-    <string name="conference_display_mode_active_speaker">Aktiivinen puhuja-tila</string>
-    <string name="conference_display_mode_audio_only">Vain audio-tila</string>
-    <string name="conference_waiting_room_start_call">Aloita</string>
-    <string name="conference_waiting_room_cancel_call">Peruuta</string>
-    <string name="conference_scheduled">Kokoukset</string>
-    <string name="conference_layout_too_many_participants_for_mosaic">Et voi muuttaa ryhmäpuhelun asettelua, koska osallistujia on liian monta</string>
-    <string name="conference_participant_paused">(tauolla)</string>
-    <string name="conference_no_schedule">Ei ajastettuja kokouksia.</string>
-    <string name="conference_no_terminated_schedule">Ei päättyneitä kokouksia.</string>
-    <string name="conference_schedule_organizer">Järjestäjä:</string>
-    <string name="conference_go_to_chat">Kokouksen keskusteluhuone</string>
-    <string name="conference_creation_failed">Kokouksen luominen epäonnistui</string>
-    <string name="conference_admin_set">%s on nyt ylläpitäjä</string>
-    <string name="conference_admin_unset">%s ei ole enää ylläpitäjä</string>
-    <string name="conference_schedule_info_created">Kokous on ajastettu</string>
-    <string name="chat_event_ephemeral_enabled">Väliaikaiset viestit otettu käyttöön: %s</string>
-    <string name="chat_room_choose_conversation_for_file_sharing">Valitse tai luo keskustelu jakaaksesi tiedostot</string>
-    <string name="chat_event_ephemeral_lifetime_changed">Väliaikaisten viestien vanhenemisaika: %s</string>
-    <string name="chat_message_context_menu_delete_messages">Poista viestit</string>
-    <string name="chat_room_group_info_you_are_no_longer_admin">Et ole enää ylläpitäjä</string>
-    <string name="chat_room_ephemeral_messages_desc">Tämä viesti poistetaan molemmista päistä, kun se on luettu ja valitun ajan jälkeen.</string>
-    <string name="chat_message_context_menu_add_to_contacts">Lisää yhteystietoihin</string>
-    <string name="chat_room_delete_many_dialog">Haluatko varmasti poistaa nämä keskustelut\?</string>
-    <string name="chat_message_cant_open_file_in_app_dialog_message">Haluatko avata tekstinä tai lähettää sen (salaamattomana) kolmannen osapuolen sovellukselle\?</string>
-    <string name="chat_message_download_already_in_progress">Ennen uutta latausta, odota edellisen päättymistä</string>
-    <string name="conference_schedule_subject_hint">Kokouksen aihe</string>
-    <string name="conference_schedule_send_invite_chat">Lähetä kutsu käyttäen &appName;</string>
-    <string name="conference_schedule_encryption">Haluatko salata kokouksen\?</string>
-    <string name="conference_schedule_address_copied_to_clipboard">Kokouksen osoite kopioitu leikepöydälle</string>
-    <string name="conference_paused_subtitle">Paina toistopainiketta liittyäksesi takaisin.</string>
-    <string name="conference_update_title">Kokousta on päivitetty:</string>
-    <string name="conference_info_removed">Kokouksen tiedot ovat poistettu</string>
-    <string name="conference_empty">Olet ainoa osallistuja ryhmäpuhelussa</string>
-    <string name="chat_room_presence_last_seen_online_today">Yhdistetty tänään</string>
-    <string name="call_settings_ringtones_title">Soittoääni</string>
-    <string name="conference_scheduled_delete_many_dialog">Haluatko poistaa valitut kokoukset\?</string>
-    <string name="conference_scheduled_cancelled_by_organizer">Kokous peruttu järjestäjän toimesta</string>
-    <string name="call_error_io_error">Palvelu ei käytettävissä tai yhteysvirhe</string>
-    <string name="call_action_change_conf_layout">Vaihda asettelua</string>
-    <string name="call_context_action_hangup">Lopeta puhelu</string>
-    <string name="call_locally_paused_subtitle">Paina toistopainiketta jatkaaksesi.</string>
-    <string name="call_stats_video_fps_sent">Lähetetyn videon fps:</string>
-    <string name="assistant_welcome_desc">Tämä avustaja auttaa SIP tilisi käyttöönotossa.</string>
-    <string name="call_settings_vibrate_title">Värinä tuleville puheluille</string>
-    <string name="call_settings_auto_start_summary">Puhelu alkaa automaattisesti, mikäli käynnistetty toisesta sovelluksesta</string>
-    <string name="call_settings_remote_recording_title">Saa ilmoitus, kun kumppanisi aloittaa puhelun tallennuksen</string>
-    <string name="chat_message_voice_recording_received_notification">Sait ääniviestin</string>
-    <string name="chat_message_voice_recording">Ääniviesti</string>
-    <string name="conference_invitation_received_notification">Sinut on kutsuttu kokoukseen</string>
-    <string name="conference_invitation">Kokouskutsu</string>
-    <string name="conference_low_bandwidth">Yhteysongelma havaittu, video pois käytöstä</string>
-    <string name="conference_first_to_join">Olet ensimmäinen ryhmäpuhelussa</string>
-    <string name="conference_last_user">Muut osallistujat ovat poistuneet ryhmäpuhelusta</string>
-    <string name="conference_incoming_title">Tuleva ryhmäpuhelu</string>
-    <string name="conference_participants_title">Osallistujat (%d)</string>
-    <string name="conference_start_group_call_dialog_title">Ryhmäpuhelu</string>
-    <string name="conference_start_group_call_dialog_message">Haluatko aloittaa ryhmäpuhelun\?
-\nKaikki ryhmän jäsenet saavat kutsun liittyä kokoukseen.</string>
-    <string name="conference_start_group_call_dialog_ok_button">Aloita</string>
-    <string name="conference_scheduled_terminated_filter">Lopetettu</string>
-    <string name="conference_scheduled_future_filter">Ajastettu</string>
-    <string name="chat_room_presence_online">Yhdistetty</string>
-    <string name="chat_room_presence_last_seen_online_yesterday">Yhdistetty eilen</string>
-    <string name="chat_room_presence_last_seen_online">Yhdistetty</string>
-    <string name="conference_scheduled_delete_one_dialog">Haluatko poistaa kokouksen\?</string>
-    <string name="call_error_declined">Puhelu peruutettiin</string>
-    <string name="call_stats_ip">IP perhe:</string>
-    <string name="conference_scheduled_cancelled_by_me">Peruutit kokouksen</string>
-    <string name="call_incoming_title">Tuleva puhelu</string>
-    <string name="call_outgoing_title">Lähtevä puhelu</string>
-    <string name="call_notification_paused">Puhelu pidossa</string>
-    <string name="call_notification_outgoing">Lähtevä puhelu</string>
-    <string name="call_notification_active">Puhelu käynnissä</string>
-    <string name="call_error_user_busy">Käyttäjä on varattu</string>
-    <string name="call_error_user_not_found">Käyttäjää ei löydy</string>
-    <string name="call_error_incompatible_media_params">Yhteensopimattomat mediaparametrit</string>
-    <string name="call_error_network_unreachable">Verkkoon ei yhteyttä</string>
-    <string name="call_error_server_timeout">Palvelimen aikakatkaisu</string>
-    <string name="call_error_temporarily_unavailable">Väliaikaisesti ei käytettävissä</string>
-    <string name="call_error_generic">Virhe: %s</string>
-    <string name="call_video_update_requested_dialog">Vastaanottaja haluaa laittaa videon päälle</string>
-    <string name="call_action_participants_list">Osallistujalista</string>
-    <string name="call_action_chat">Keskustelu</string>
-    <string name="call_action_calls_list">Puhelulista</string>
-    <string name="call_action_numpad">Numeronäppäimistö</string>
-    <string name="call_action_statistics">Puhelutilastot</string>
-    <string name="call_action_add_call">Aloita uusi puhelu</string>
-    <string name="call_action_transfer_call">Siirrä puhelu</string>
-    <string name="call_context_action_resume">Jatka puhelua</string>
-    <string name="call_context_action_pause">Aseta puhelu pitoon</string>
-    <string name="call_context_action_transfer">Siirrä puhelu</string>
-    <string name="call_context_action_answer">Vastaa puheluun</string>
-    <string name="call_remote_recording">Tämä puhelu tallennetaan.</string>
-    <string name="call_remotely_paused_title">Vastapuoli asetti puhelun pitoon.</string>
-    <string name="call_locally_paused_title">Laitoit puhelun pitoon.</string>
-    <string name="call_screenshot_taken">Snapshot otettu: %s</string>
-    <string name="call_stats_audio">Ääni</string>
-    <string name="call_stats_video">Video</string>
-    <string name="call_stats_codec">Koodekki:</string>
-    <string name="call_stats_download">Vastaanottonopeus:</string>
-    <string name="call_stats_upload">Lähetysnopeus:</string>
-    <string name="call_stats_estimated_download">Arvioitu vastaanottonopeus:</string>
-    <string name="call_stats_ice">ICE yhteys:</string>
-    <string name="call_stats_video_resolution_sent">Lähetetyn videon tarkkuus:</string>
-    <string name="call_stats_video_resolution_received">Vastaanotetun videon tarkkuus:</string>
-    <string name="call_stats_video_fps_received">Vastaanotetun videon fps:</string>
-    <string name="call_stats_sender_loss_rate">Lähettäjän hävikki:</string>
-    <string name="call_stats_receiver_loss_rate">Vastaanottajan hävikki:</string>
-    <string name="call_stats_jitter_buffer">Jitter puskuri:</string>
-    <string name="call_stats_encoder_name">Enkooderi:</string>
-    <string name="call_stats_decoder_name">Dekooderi:</string>
-    <string name="call_stats_player_filter">Toiston suodatin:</string>
-    <string name="assistant_phone_number_link_info_content">"
-\nYstäväsi löytävät sinut helpommin jos yhdistät puhelinnumeron tiliisi
-\n
-\nNäet osoitekirjastasi kuka käyttää &appName; ja ystäväsi tietävät myös, että voivat ottaa yhteyttä käyttäen &appName;.
-\n"</string>
-    <string name="assistant_phone_number_link_info_content_already_account">Voit käyttää puhelinnumeroasi vain yhden &appName; tilin kanssa.
-\n
-\nJos olet jo yhdistänyt puhelinnumerosi toiseen tiliin, mutta haluaisit käyttää tätä sen sijaan, yhdistä se nyt ja numerosi siirretään automaattisesti tähän tiliin.</string>
-    <string name="call_stats_capture_filter">Tallennuksen suodatin:</string>
-    <string name="call_stats_media_encryption">Median salaus:</string>
-    <string name="call_stats_zrtp_cipher_algo">Salausalgoritmi:</string>
-    <string name="call_stats_zrtp_key_agreement_algo">Avainten kättelyn algoritmi:</string>
-    <string name="call_stats_zrtp_hash_algo">Tiivistealgoritmi:</string>
-    <string name="call_stats_zrtp_auth_tag_algo">Tunnistusalgoritmi:</string>
-    <string name="call_stats_zrtp_sas_algo">SAS algoritmi:</string>
-    <string name="assistant_welcome_title">Tervetuloa</string>
-    <string name="assistant_create_account">Luo tili</string>
-    <string name="assistant_login_linphone">Käytä &appName; tiliä</string>
-    <string name="assistant_login_generic">Käytä SIP tiliä</string>
-    <string name="assistant_remote_provisioning">Nouda konfiguraatio palvelimelta</string>
-    <string name="assistant_ec_calibration">Kaiunpoiston kalibrointi käynnissä</string>
-    <string name="assistant_phone_number_info_title">Mihin puhelinnumeroani käytetään\?</string>
-    <string name="assistant_general_terms">käyttöehdot</string>
-    <string name="assistant_read_and_agree_terms">Hyväksyn Belledonne Communications %1$s ja %2$s</string>
-    <string name="assistant_generic_account_warning_continue_button_text">Ymmärrän</string>
-    <string name="assistant_error_phone_number_invalid_characters">Vain numerot ovat sallittuja</string>
-    <string name="assistant_error_username_already_exists">Käyttäjätunnus on jo käytössä</string>
-    <string name="assistant_error_phone_number_already_exists">Tämä numero on jo yhdistetty toiseen tiliin</string>
-    <string name="assistant_error_username_invalid_characters">Ei-hyväksyttyjä merkkejä löytyi</string>
-    <string name="assistant_error_passwords_dont_match">Salasanat eivät täsmää</string>
-    <string name="assistant_error_invalid_email_address">Sähköpostiosoite ei kelpaa</string>
-    <string name="assistant_error_username_too_long">Käyttäjätunnus on liian pitkä</string>
-    <string name="assistant_error_invalid_credentials">Tiliä ei löydy tai salasana on väärin</string>
-    <string name="assistant_linphone_account">Käytä &appName; tiliä</string>
-    <string name="assistant_create_account_part_1">Vahvista maakoodi ja syötä puhelinnumerosi</string>
-    <string name="assistant_privacy_policy">tietosuojaseloste</string>
-    <string name="assistant_linphone_login_desc">Syötä käyttäjätunnus ja salasana &appName; tilillesi</string>
-    <string name="assistant_login_with_username">Käytä käyttäjätunnusta ja salasanaa puhelinnumerosi sijasta</string>
-    <string name="assistant_login_forgotten_password">Unohditko salasanasi\?</string>
-    <string name="assistant_login">Kirjaudu</string>
-    <string name="assistant_finish">Päätä asetukset</string>
-    <string name="assistant_confirmation_code">Vahvistuskoodi</string>
-    <string name="assistant_continue_even_if_credentials_invalid">Jatka</string>
-    <string name="assistant_generic_account">Käytä SIP tiliä</string>
-    <string name="assistant_login_desc">Syötä käyttäjätunnus ja salasana SIP toimialueellesi</string>
-    <string name="assistant_create_account_part_email">Syötä käyttäjätunnus, sähköpostiosoite ja salasana &appName; tilillesi</string>
-    <string name="assistant_confirm_password">Salasanan vahvistus</string>
-    <string name="assistant_validate_account_1">Tilisi on luotu. Tarkista sähköpostisi vahvistaaksesi tilin luonnin:</string>
-    <string name="assistant_validate_account_2">Kun olet valmis, palaa tänne ja paina painiketta.</string>
-    <string name="assistant_use_username_instead_or_phone_number">Käytä käyttäjätunnusta (valinnainen)</string>
-    <string name="assistant_create_account_part_2">Olemme lähettäneet vahvistuskoodin tekstiviestillä antamaasi puhelinnumeroon:</string>
-    <string name="assistant_create_account_part_3">Vahvistaaksesi puhelinnumerosi, syötä nelinumeroinen koodi alle:
-\n</string>
-    <string name="video_settings_camera_device_title">Kamera</string>
-    <string name="call_settings_encryption_title">Median salaus</string>
-    <string name="call_settings_media_encryption_none">Ei mitään</string>
-    <string name="call_settings_media_encryption_srtp">SRTP</string>
-    <string name="call_settings_media_encryption_zrtp">ZRTP</string>
-    <string name="call_settings_media_encryption_dtls">DTLS-SRTP</string>
-    <string name="call_settings_media_encryption_zrtp_post_quantum"/>
-    <string name="call_settings_encryption_mandatory_title">Median salaus pakollinen</string>
-    <string name="call_settings_auto_start_title">Aloita puhelu välittömästi</string>
-    <string name="call_settings_auto_answer_title">Automaattivastaus tuleville puheluille</string>
-    <string name="call_settings_auto_answer_delay_title">Automaattivastauksen aika</string>
-    <string name="call_settings_auto_answer_delay_summary">millisekunneissa</string>
-    <string name="call_settings_incoming_timeout_title">Sisään tulevan puhelun aikakatkaisu</string>
-    <string name="call_settings_incoming_timeout_summary">sekunneissa</string>
-    <string name="call_settings_voice_mail_uri_title">Puhepostin URI</string>
-    <string name="call_settings_go_to_android_notification_settings">Android ilmoitusasetukset</string>
-    <string name="call_settings_auto_start_recording_title">Puhelun tallennus automaattisesti</string>
-    <string name="network_settings_wifi_only_title">Käytä vain WiFi:ä</string>
-    <string name="network_settings_allow_ipv6_title">Salli IPv6</string>
-    <string name="network_settings_random_ports_title">Käytä satunnaisia portteja</string>
-    <string name="network_settings_sip_port_title">Käytettävä SIP portti</string>
-    <string name="contacts_settings_friendlist_subscribe_title">Kaverilistan tilaus</string>
-    <string name="audio_settings_echo_cancellation_calibration_started">Kaiunpoiston kalibrointi aloitettu</string>
-    <string name="chat_room_last_message_sender_format">%s:</string>
-    <string name="assistant_display_name_optional">Näytettävä nimi (valinnainen)</string>
-    <string name="assistant_link_account">Yhdistä tili</string>
-    <string name="assistant_remote_provisioning_title">Hae asetukset palvelimelta</string>
-    <string name="assistant_remote_provisioning_desc">Syötä konfiguraation URL</string>
-    <string name="assistant_link_phone_number">Olet liittämässä puhelinnumerosi seuraavaan käyttäjätunnukseen:</string>
-    <string name="assistant_remote_provisioning_url">URL</string>
-    <string name="assistant_remote_provisioning_wrong_format">Väärinmuotoiltu URL, provisiointiprofiilia ei voida ladata…</string>
-    <string name="assistant_remote_provisioning_failure">Provisiointiprofiilin lataus tai asennus epäonnistui…</string>
-    <string name="assistant_fetch_apply">Nouda ja aseta</string>
-    <string name="assistant_launch_qrcode">QR-koodi</string>
-    <string name="settings_accounts_title">SIP-tilit</string>
-    <string name="settings_default_account_subtitle">Oletustili</string>
-    <string name="settings_list_title">Asetukset</string>
-    <string name="settings_tunnel_title">Tunneli</string>
-    <string name="settings_audio_title">Ääni</string>
-    <string name="settings_video_title">Video</string>
-    <string name="settings_chat_title">Keskustelu</string>
-    <string name="settings_network_title">Verkko</string>
-    <string name="audio_settings_echo_tester_summary">Paina aloittaaksesi kaiun testaus</string>
-    <string name="audio_settings_echo_tester_summary_is_stopped">Kaiun testaus lopetettu</string>
-    <string name="audio_settings_echo_tester_summary_is_running">Kaiun testaus käynnissä</string>
-    <string name="audio_settings_input_device_summary">Muutokset tulevat voimaan seuraavasta puhelusta</string>
-    <string name="call_settings_device_ringtone_title">Käytä laitteen soittoääntä</string>
-    <string name="settings_call_title">Puhelu</string>
-    <string name="video_settings_codecs_title">Koodekit</string>
-    <string name="chat_room_presence_do_not_disturb">Älä häiritse</string>
-    <string name="assistant_link_phone_number_skip">Ohita</string>
-    <string name="settings_contacts_title">Yhteystiedot</string>
-    <string name="settings_advanced_title">Lisäasetukset</string>
-    <string name="settings_conferences_title">Kokoukset</string>
-    <string name="settings_primary_account_title">Päätili</string>
-    <string name="settings_primary_account_display_name_title">Näytettävä nimi</string>
-    <string name="settings_primary_account_username_title">Käyttäjätunnus</string>
-    <string name="audio_settings_echo_cancellation_summary">Poistaa vastaanottajan kuuleman kaiun</string>
-    <string name="audio_settings_echo_canceller_calibration_title">Kaiunpoiston kalibrointi</string>
-    <string name="audio_settings_echo_canceller_calibration_summary">Paina ja aloit kaiunpoiston kalibrointi</string>
-    <string name="audio_settings_echo_cancellation_calibration_value">Kalibroitu %s ms:ssa</string>
-    <string name="audio_settings_echo_cancellation_calibration_failed">Kalibrointi epäonnistui</string>
-    <string name="audio_settings_echo_cancellation_calibration_no_echo">Kaikua ei havaittu</string>
-    <string name="audio_settings_echo_tester_title">Testaa kaikua</string>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-fr-rCA/strings.xml b/app/src/main/res/values-fr-rCA/strings.xml
deleted file mode 100644
index a6b3daec9..000000000
--- a/app/src/main/res/values-fr-rCA/strings.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
deleted file mode 100644
index 538d3c8ec..000000000
--- a/app/src/main/res/values-fr/strings.xml
+++ /dev/null
@@ -1,823 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE resources [
-<!ENTITY appName "Linphone">
-]>
-<resources xmlns:tools="http://schemas.android.com/tools">
-    <string name="call_stats_video">Vidéo</string>
-    <string name="assistant_remote_provisioning_failure">Erreur durant le téléchargement ou l\'application de la configuration distante…</string>
-    <string name="settings_chat_title">Messages</string>
-    <string name="audio_settings_software_echo_cancellation_title">Annulateur d\'écho logiciel</string>
-    <string name="call_stats_codec">Codec :</string>
-    <string name="audio_settings_echo_cancellation_calibration_started">La calibration de l\'annulateur d\'écho est en cours</string>
-    <string name="content_description_terminate_call">Mettre fin à l\'appel</string>
-    <string name="content_description_answer_call">Décrocher</string>
-    <string name="content_description_enable_mic_mute">Couper le micro</string>
-    <string name="content_description_disable_mic_mute">Réactiver le micro</string>
-    <string name="audio_settings_adaptive_rate_control_title">Contrôle qualité adaptatif</string>
-    <string name="video_settings_tablet_preview_title">Afficher la caméra sur la vue d\'accueil</string>
-    <string name="content_description_disable_video">Désactiver la vidéo en appel</string>
-    <string name="content_description_enable_video">Activer la vidéo en appel</string>
-    <string name="content_description_use_bluetooth_headset">Utiliser un casque Bluetooth comme périphérique de sortie</string>
-    <string name="content_description_use_earpiece">Utiliser des écouteurs comme périphérique de sortie</string>
-    <string name="content_description_add_call">Nouvel appel</string>
-    <string name="content_description_transfer_call">Transférer l\'appel</string>
-    <string name="content_description_pending_file_transfer">Transfert d\'appel en attente</string>
-    <string name="content_description_remove_pending_file_transfer">Annuler le transfert d\'appel en attente</string>
-    <string name="content_description_downloaded_file_transfer">Pièce jointe</string>
-    <string name="content_description_delivery_status">Statut du message</string>
-    <string name="content_description_ephemeral_message">Le message est éphémère</string>
-    <string name="content_description_linphone_user">Le contact est un utilisateur &appName;</string>
-    <string name="content_description_contact_selected">Contact sélectionné</string>
-    <string name="content_description_e2e_encryption_disabled">Le chiffrement de bout-en-bout est désactivé</string>
-    <string name="content_description_show_all_contacts">Afficher tous les contacts</string>
-    <string name="content_description_show_sip_contacts">Afficher les contacts SIP uniquement</string>
-    <string name="content_description_continue_chat_room_creation">Aller à l\'étape finale de création de la conversation</string>
-    <string name="content_description_remove_contact_from_selection">Retirer le contact</string>
-    <string name="service_auto_start_description">&appName; a démarré automatiquement</string>
-    <string name="sync_account_name">Contacts &appName;</string>
-    <string name="about_privacy_policy">Consulter notre politique de confidentialité</string>
-    <string name="logs_url_copied_to_clipboard">URL des traces copiée dans le presse-papier</string>
-    <string name="phone_number">Numéro de téléphone</string>
-    <string name="phone_numbers">Numéros de téléphone</string>
-    <string name="international_prefix">Préfixe</string>
-    <string name="assistant_choose_country">Choisir un pays</string>
-    <string name="assistant_choose_country_title">Nom du pays ou préfixe</string>
-    <string name="username">Nom d\'utilisateur</string>
-    <string name="password">Mot de passe</string>
-    <string name="email">Email</string>
-    <string name="domain">Domaine</string>
-    <string name="sip_address">Adresse SIP</string>
-    <string name="video_settings_initiate_call_title">Initier les appels en vidéo</string>
-    <string name="cancel">Annuler</string>
-    <string name="today">Aujourd\'hui</string>
-    <string name="yesterday">Hier</string>
-    <string name="transport">Transport</string>
-    <string name="transport_udp">UDP</string>
-    <string name="video_settings_initiate_call_summary">Toujours envoyer une demande d\'activation de la vidéo</string>
-    <string name="transport_tcp">TCP</string>
-    <string name="transport_tls">TLS</string>
-    <string name="app_description">Le client SIP <i>open source</i></string>
-    <string name="status_connected">Connecté</string>
-    <string name="status_not_connected">Non connecté</string>
-    <string name="status_in_progress">Connexion en cours</string>
-    <string name="status_error">La connexion a échoué</string>
-    <string name="about">A propos</string>
-    <string name="assistant">Assistant</string>
-    <string name="recordings">Enregistrements</string>
-    <string name="settings">Options</string>
-    <string name="quit">Quitter</string>
-    <string name="history_calls_list">Appels</string>
-    <string name="no_call_history">Aucun appel dans votre historique</string>
-    <string name="no_missed_call_history">Aucun appel manqué dans votre historique</string>
-    <string name="history_delete_many_dialog">Voulez-vous supprimer ces enregistrements \?</string>
-    <string name="contact_invite_friend">Inviter</string>
-    <string name="no_contact">Aucun contact dans votre carnet d\'adresses.</string>
-    <string name="no_sip_contact">Aucun contact SIP dans votre carnet d\'adresses.</string>
-    <string name="contact_filter_hint">Rechercher un contact</string>
-    <string name="contact_last_name">Nom de famille</string>
-    <string name="contact_first_name">Prénom</string>
-    <string name="contact_organization">Société</string>
-    <string name="contact_editor_write_permission_denied">Impossible d\'éditer les contacts car la permission a été refusée.</string>
-    <string name="contact_delete_many_dialog">Voulez-vous supprimer ces contacts \?\nIls seront aussi retirés du carnet d\'adresses du téléphone.</string>
-    <string name="contact_new_choose_sync_account">Choisissez où enregistrer le contact</string>
-    <string name="contact_local_sync_account">Enregistrer localement</string>
-    <string name="chat_event_participant_removed">%s a quitté le groupe</string>
-    <string name="debug_popup_title">Débogage</string>
-    <string name="debug_popup_enable_logs">Activer les traces</string>
-    <string name="debug_popup_disable_logs">Désactiver les traces</string>
-    <string name="debug_popup_send_logs">Envoyer les traces</string>
-    <string name="no_chat_history">Aucune conversation</string>
-    <string name="chat_event_conference_created">Vous avez rejoint le groupe</string>
-    <string name="chat_event_conference_destroyed">Vous avez quitté le groupe</string>
-    <string name="chat_event_device_added">Nouvel appareil pour %s</string>
-    <string name="chat_event_device_removed">Appareil retiré pour %s</string>
-    <string name="chat_event_subject_changed">Nouveau sujet : %s</string>
-    <string name="chat_event_admin_set">%s est admin</string>
-    <string name="chat_event_admin_unset">%s n\'est plus admin</string>
-    <string name="chat_security_event_man_in_the_middle_detected">Attaque de l\'homme du milieu détectée pour %s</string>
-    <string name="chat_security_event_security_level_downgraded">Baisse du niveau de sécurité due à %s</string>
-    <string name="chat_security_event_participant_max_count_exceeded">Nombre maximum de terminaux dépassé pour %s</string>
-    <string name="chat_event_ephemeral_enabled">Vous avez activé les messages éphémères : %s</string>
-    <string name="chat_event_ephemeral_lifetime_changed">Délai d’expiration des messages : %s</string>
-    <string name="chat_message_download_file">Télécharger</string>
-    <string name="chat_message_pick_file_dialog">Sélectionner la source</string>
-    <string name="chat_room_devices_fragment_title">Terminaux de la conversation</string>
-    <string name="chat_room_group_info_title">Info</string>
-    <string name="chat_room_group_info_participants">Participants</string>
-    <string name="chat_room_group_info_admin">Admin</string>
-    <string name="chat_room_group_info_leave">Quitter le groupe</string>
-    <string name="chat_room_group_info_leave_dialog_button">Quitter</string>
-    <string name="chat_room_group_info_leave_dialog_message">Souhaitez-vous quitter cette conversation \?</string>
-    <string name="chat_room_group_info_you_are_now_admin">Vous êtes à présent admin</string>
-    <string name="chat_room_group_info_you_are_no_longer_admin">Vous n\'êtes plus admin</string>
-    <string name="chat_message_imdn_info">Statut du message</string>
-    <string name="chat_message_imdn_displayed">Lu</string>
-    <string name="chat_message_imdn_delivered">Délivré</string>
-    <string name="chat_message_imdn_sent">Envoyé</string>
-    <string name="chat_message_forwarded">Transféré</string>
-    <string name="chat_message_context_menu_resend">Renvoyer</string>
-    <string name="chat_message_context_menu_copy_text">Copier le texte</string>
-    <string name="chat_message_context_menu_forward">Transférer</string>
-    <string name="chat_message_context_menu_imdn_info">Statut du message</string>
-    <string name="chat_message_context_menu_delete">Supprimer</string>
-    <string name="video_settings_automatically_accept_summary">Toujours accepter d\'activer la vidéo</string>
-    <string name="video_settings_automatically_accept_title">Accepter d\'activer la vidéo</string>
-    <string name="chat_room_context_menu_group_info">Infos du groupe</string>
-    <string name="chat_room_context_menu_participants_devices">Terminaux de la conversation</string>
-    <string name="chat_message_context_menu_ephemeral_messages">Messages éphémères</string>
-    <string name="chat_message_context_menu_delete_messages">Supprimer les messages</string>
-    <string name="chat_room_ephemeral_fragment_title">Messages éphémères</string>
-    <string name="chat_room_ephemeral_message_disabled">Désactivé</string>
-    <string name="chat_room_ephemeral_message_one_minute">1 minute</string>
-    <string name="chat_room_ephemeral_message_one_hour">1 heure</string>
-    <string name="chat_room_ephemeral_message_one_day">1 jour</string>
-    <string name="chat_room_ephemeral_message_three_days">3 jours</string>
-    <string name="chat_room_ephemeral_message_one_week">1 semaine</string>
-    <string name="chat_room_creation_failed_snack">La conversation n\'a pas pu être créée</string>
-    <string name="chat_room_removal_failed_snack">La conversation n\'a pas pu être supprimée</string>
-    <string name="chat_room_delete_one_dialog">Souhaitez-vous supprimer cette conversation \?</string>
-    <string name="recordings_empty_list">Aucun enregistrement disponible</string>
-    <string name="call_incoming_title">Appel entrant</string>
-    <string name="call_outgoing_title">Appel sortant</string>
-    <string name="call_notification_paused">Appel en pause</string>
-    <string name="call_notification_outgoing">Appel sortant</string>
-    <string name="call_notification_active">Appel en cours</string>
-    <string name="call_error_declined">L\'appel a été refusé</string>
-    <string name="call_error_user_busy">L\'utilisateur est occupé</string>
-    <string name="call_error_user_not_found">L\'utilisateur n\'a pu être trouvé</string>
-    <string name="call_error_network_unreachable">Le réseau n\'est pas joignable</string>
-    <string name="call_error_io_error">Service indisponible ou erreur réseau</string>
-    <string name="call_video_update_requested_dialog">Votre interlocuteur souhaite activer la vidéo</string>
-    <string name="call_stats_audio">Audio</string>
-    <string name="video_settings_camera_device_title">Appareil photo</string>
-    <string name="video_settings_video_size_title">Taille de vidéo par défaut</string>
-    <string name="call_stats_ip">Famille IP :</string>
-    <string name="call_stats_download">Bande passante de réception :</string>
-    <string name="call_stats_estimated_download">Bande passante de réception estimée :</string>
-    <string name="video_settings_video_preset_title">Profil vidéo</string>
-    <string name="content_description_start_call">Appeler</string>
-    <string name="call_stats_video_resolution_received">Résolution vidéo reçue :</string>
-    <string name="call_stats_video_fps_sent">FPS vidéo envoyés :</string>
-    <string name="call_stats_video_fps_received">FPS vidéo reçus :</string>
-    <string name="call_stats_sender_loss_rate">Taux de perte de l\'expéditeur :</string>
-    <string name="call_stats_receiver_loss_rate">Taux de perte du destinataire :</string>
-    <string name="call_stats_jitter_buffer">Tampon de jigue :</string>
-    <string name="call_stats_encoder_name">Encodeur :</string>
-    <string name="call_stats_decoder_name">Décodeur :</string>
-    <string name="call_stats_player_filter">Filtre de lecture :</string>
-    <string name="call_stats_capture_filter">Filtre de capture :</string>
-    <string name="assistant_welcome_title">Bienvenue</string>
-    <string name="assistant_create_account">Créer un compte</string>
-    <string name="assistant_login_linphone">Utiliser un compte &appName;</string>
-    <string name="assistant_login_generic">Utiliser un compte SIP</string>
-    <string name="assistant_remote_provisioning">Télécharger la configuration distante</string>
-    <string name="assistant_ec_calibration">Calibration de l\'annulateur d\'écho en cours</string>
-    <string name="assistant_phone_number_info_title">Comment mon numéro de téléphone sera-t-il utilisé \?</string>
-    <string name="assistant_phone_number_link_info_content_already_account">Vous ne pouvez associer votre numéro qu\'à un seul compte &appName;.\n\nSi vous avez déjà associé votre numéro à un autre compte mais préférez utiliser ce compte-ci, suivez la procédure d\'association et votre numéro sera automatiquement transféré à ce compte.</string>
-    <string name="assistant_error_phone_number_invalid_characters">Entrez uniquement des chiffres</string>
-    <string name="assistant_error_username_already_exists">Ce nom d\'utilisateur est déjà utilisé</string>
-    <string name="assistant_error_phone_number_already_exists">Ce numéro de téléphone est déjà utilisé</string>
-    <string name="assistant_error_username_invalid_characters">Caractères invalides</string>
-    <string name="assistant_error_passwords_dont_match">Les mots de passe ne correspondent pas</string>
-    <string name="assistant_error_invalid_email_address">L\'adresse email est invalide</string>
-    <string name="assistant_error_username_too_long">Le nom d\'utilisateur contient trop de caractères</string>
-    <string name="assistant_link_phone_number_skip">Passer</string>
-    <string name="assistant_link_account">Lier le compte</string>
-    <string name="assistant_remote_provisioning_title">Télécharger la configuration distante</string>
-    <string name="assistant_remote_provisioning_desc">Veuillez saisir l\'URL de configuration</string>
-    <string name="assistant_remote_provisioning_url">URL</string>
-    <string name="assistant_remote_provisioning_wrong_format">Format d\'URL inconnu, le fichier de configuration n\'a pas pu être téléchargé…</string>
-    <string name="assistant_fetch_apply">Télécharger et appliquer</string>
-    <string name="assistant_launch_qrcode">Qr Code</string>
-    <string name="settings_accounts_title">Comptes SIP</string>
-    <string name="settings_default_account_subtitle">Compte par défaut</string>
-    <string name="settings_list_title">Préférences</string>
-    <string name="settings_tunnel_title">Tunnel</string>
-    <string name="settings_audio_title">Audio</string>
-    <string name="settings_video_title">Vidéo</string>
-    <string name="settings_call_title">Appels</string>
-    <string name="call_settings_device_ringtone_title">Utiliser la sonnerie du téléphone</string>
-    <string name="assistant_linphone_account">Utiliser votre compte &appName;</string>
-    <string name="assistant_create_account_part_1">Confirmez l\'indicatif téléphonique de votre pays et saisissez votre numéro de téléphone</string>
-    <string name="assistant_login_with_username">Utiliser votre nom d\'utilisateur et votre mot de passe plutôt que votre numéro</string>
-    <string name="assistant_login_forgotten_password">Mot de passe oublié \?</string>
-    <string name="assistant_login">Connexion</string>
-    <string name="assistant_finish">Terminer la configuration</string>
-    <string name="assistant_confirmation_code">Code de confirmation</string>
-    <string name="assistant_continue_even_if_credentials_invalid">Continuer</string>
-    <string name="assistant_generic_account">Utiliser un compte SIP</string>
-    <string name="assistant_login_desc">Veuillez saisir votre nom d\'utilisateur et votre mot de passe avec le domaine SIP</string>
-    <string name="assistant_create_account_part_email">Veuillez saisir un nom d\'utilisateur, un email et un mot de passe pour votre compte &appName;</string>
-    <string name="assistant_confirm_password">Confirmation du mot de passe</string>
-    <string name="assistant_use_username_instead_or_phone_number">Utiliser un nom d\'utilisateur (optionnel)</string>
-    <string name="assistant_create_account_part_2">Nous avons envoyé un SMS avec un code d\'activation au numéro :</string>
-    <string name="assistant_link_phone_number">Vous allez lier votre numéro de téléphone au nom d\'utilisateur suivant :</string>
-    <string name="settings_network_title">Réseau</string>
-    <string name="settings_contacts_title">Contacts</string>
-    <string name="settings_advanced_title">Paramètres avancés</string>
-    <string name="audio_settings_echo_cancellation_summary">Supprime l\'écho entendu de l\'autre côté</string>
-    <string name="audio_settings_echo_canceller_calibration_title">Calibration de l\'annulateur d\'écho</string>
-    <string name="audio_settings_echo_canceller_calibration_summary">Cliquer pour démarrer la calibration de l\'annulateur d\'écho</string>
-    <string name="audio_settings_echo_cancellation_calibration_value">Calibré en %s ms</string>
-    <string name="audio_settings_echo_cancellation_calibration_failed">La calibration a échoué</string>
-    <string name="audio_settings_echo_cancellation_calibration_no_echo">Pas d\'écho détecté</string>
-    <string name="audio_settings_echo_tester_title">Test d\'écho</string>
-    <string name="audio_settings_echo_tester_summary">Cliquer pour démarrer le testeur d\'écho</string>
-    <string name="audio_settings_echo_tester_summary_is_stopped">Le testeur d\'écho s\'est arrêté</string>
-    <string name="audio_settings_echo_tester_summary_is_running">Testeur d\'écho en cours</string>
-    <string name="audio_settings_input_device_summary">Les changements seront appliqués au prochain appel</string>
-    <string name="audio_settings_input_device_title">Périphérique audio de capture par défaut</string>
-    <string name="audio_settings_output_device_title">Périphérique audio de sortie par défaut</string>
-    <string name="call_settings_encryption_mandatory_title">Chiffrement du média obligatoire</string>
-    <string name="audio_settings_output_device_summary">Les changements seront appliqués au prochain appel</string>
-    <string name="audio_settings_codec_bitrate_title">Limite de débit codec</string>
-    <string name="audio_settings_microphone_gain_title">Gain du microphone</string>
-    <string name="audio_settings_microphone_gain_summary">(en décibels)</string>
-    <string name="audio_settings_playback_gain_title">Volume d\'écoute (en db)</string>
-    <string name="audio_settings_playback_gain_summary">(en décibels)</string>
-    <string name="audio_settings_codecs_title">Codecs</string>
-    <string name="video_settings_enable_title">Activer la vidéo</string>
-    <string name="call_settings_auto_start_summary">L\'appel démarrera automatiquement s\'il est lancé depuis une autre application</string>
-    <string name="call_settings_go_to_android_notification_settings">Paramètres des notifications Android</string>
-    <string name="chat_settings_file_sharing_url_title">URL du serveur de partage</string>
-    <string name="chat_settings_auto_download_summary">Télécharger automatiquement les pièces jointes reçues dans les messages</string>
-    <string name="chat_settings_downloaded_media_public_summary">Les images dans les messages éphémères ne seront jamais publiques</string>
-    <string name="chat_settings_hide_notification_content_title">Masquer le contenu des messages dans les notifications</string>
-    <string name="chat_settings_launcher_shortcuts_title">Créer des raccourcis vers les conversations dans le lanceur d\'application</string>
-    <string name="chat_settings_hide_rooms_removed_proxies_summary">S\'il vous manque des conversations, essayez de décocher ce paramètre</string>
-    <string name="contacts_settings_friendlist_subscribe_title">Souscrire à la liste d\'amis</string>
-    <string name="contacts_settings_native_presence_summary">Ajouter un raccourci vers le contact &appName; dans le carnet d\'adresses natif</string>
-    <string name="tunnel_settings_dual_mode_title">Mode double activé</string>
-    <string name="tunnel_settings_dual_hostname_url_title">Nom d\'hôte du second serveur</string>
-    <string name="tunnel_settings_dual_hostname_url_summary">Requis par le mode double</string>
-    <string name="account_settings_user_name_summary">Exemple : john, si votre compte est john@sip.example.org</string>
-    <string name="account_settings_password_summary">Vous devrez re-saisir votre mot de passe si vous changez votre nom d\'utilisateur ou le domaine</string>
-    <string name="notification_channel_service_name">Notification de service &appName;</string>
-    <string name="notification_channel_chat_name">Notifications de messages entrants &appName;</string>
-    <string name="account_settings_outbound_proxy_summary">Faire passer tous les appels via le serveur mandataire SIP</string>
-    <string name="account_settings_avpf_rr_interval_title">Intervalle AVPF RTCP régulier</string>
-    <string name="dialog_do_not_ask_again">Ne plus afficher</string>
-    <string name="dialog_lime_security_message">Dans les conversations sécurisées, les messages sont chiffrés de bout en bout. Il est possible d\'augmenter le niveau de sécurité en vérifiant l\'identité des participants. Pour ce faire, appelez le contact et suivez la procédure d\'authentification.</string>
-    <string name="content_description_toggle_recording">Activer ou désactiver l\'enregistrement d\'appel</string>
-    <string name="content_description_go_back_to_call">Revenir à la vue d\'appel</string>
-    <string name="content_description_use_speaker">Utiliser une enceinte comme périphérique de sortie</string>
-    <string name="content_description_e2e_encryption_enabled">Le chiffrement de bout-en-bout est activé</string>
-    <string name="content_description_show_chat_room_menu">Menu des conversations</string>
-    <string name="content_description_toggle_participant_devices_list">Afficher ou masquer la liste des appareils</string>
-    <string name="content_description_contact_is_not_admin">Le contact n\'est pas un admin</string>
-    <string name="content_description_contact_can_do_encryption">Ce contact peut être ajouté aux conversations chiffrées</string>
-    <string name="content_description_exit_edition_mode">Sortir du mode édition</string>
-    <string name="content_description_numpad_9">9</string>
-    <string name="video_settings_preferred_fps_title">Nombre d\'images par seconde souhaité</string>
-    <string name="video_settings_bandwidth_limit_title">Bande passante maximale</string>
-    <string name="video_settings_bandwidth_limit_summary">en kbits/s</string>
-    <string name="video_settings_codecs_title">Codecs</string>
-    <string name="call_settings_vibrate_title">Vibrer lors d\'un appel entrant</string>
-    <string name="call_settings_encryption_title">Chiffrement du média</string>
-    <string name="call_settings_media_encryption_none">Aucun</string>
-    <string name="call_settings_media_encryption_srtp">SRTP</string>
-    <string name="call_settings_media_encryption_zrtp">ZRTP</string>
-    <string name="call_settings_media_encryption_zrtp_post_quantum">ZRTP Post Quantique</string>
-    <string name="call_settings_media_encryption_dtls">DTLS-SRTP</string>
-    <string name="content_description_menu_history">Historique</string>
-    <string name="content_description_go_to_contact">Afficher les détails du contact</string>
-    <string name="content_description_call_quality_0">La qualité est très mauvaise</string>
-    <string name="content_description_call_quality_3">La qualité d\'appel est bonne</string>
-    <string name="content_description_call_secured">L\'appel est chiffré</string>
-    <string name="call_settings_sipinfo_dtmf_title">Envoyer les DTMFs hors flux (SIP INFO)</string>
-    <string name="call_settings_rfc2833_dtmf_title">Envoyer les DTMFs dans le flux (RFC2833)</string>
-    <string name="call_settings_auto_start_title">Démarrer l\'appel immédiatement</string>
-    <string name="call_settings_auto_answer_title">Décrochage automatique des appels entrants (auto-answer)</string>
-    <string name="call_settings_auto_answer_delay_title">Délai avant l\'auto-décrochage</string>
-    <string name="call_settings_auto_answer_delay_summary">en millisecondes</string>
-    <string name="call_settings_incoming_timeout_title">Durée de sonnerie des appels entrants</string>
-    <string name="call_settings_incoming_timeout_summary">en secondes</string>
-    <string name="call_settings_voice_mail_uri_title">URI de boîte vocale</string>
-    <string name="call_settings_accept_early_media_title">Accepter l\'early media</string>
-    <string name="chat_settings_file_sharing_url_summary">Ne changez pas cette valeur sans savoir ce que vous faites !</string>
-    <string name="chat_settings_auto_download_title">Téléchargement auto des pièces jointes</string>
-    <string name="chat_settings_auto_download_always">Toujours</string>
-    <string name="chat_settings_auto_download_never">Jamais</string>
-    <string name="chat_settings_auto_download_under_size">Si la taille du fichier est inférieure à</string>
-    <string name="chat_settings_auto_download_max_size_title">Taille maximale</string>
-    <string name="chat_settings_auto_download_max_size_summary">en bytes</string>
-    <string name="chat_settings_downloaded_media_public_title">Rendre visible dans la galerie les images téléchargées</string>
-    <string name="chat_settings_hide_notification_content_summary">Seul le nom de l\'expéditeur sera affiché</string>
-    <string name="chat_settings_hide_empty_rooms_title">Ne pas afficher les conversations vides</string>
-    <string name="chat_settings_hide_rooms_removed_proxies_title">Ne pas afficher les conversations liées aux comptes supprimés</string>
-    <string name="chat_settings_go_to_android_notification_settings">Paramètres de notification Android</string>
-    <string name="network_settings_wifi_only_title">Utiliser uniquement la connexion Wi-Fi</string>
-    <string name="network_settings_allow_ipv6_title">Autoriser IPv6</string>
-    <string name="network_settings_random_ports_title">Utiliser des ports aléatoires</string>
-    <string name="network_settings_sip_port_title">Port SIP à utiliser</string>
-    <string name="contacts_settings_native_presence_title">Information de présence dans le contact natif</string>
-    <string name="contacts_settings_show_organization_title">Afficher l\'entreprise du contact</string>
-    <string name="contacts_settings_launcher_shortcuts_title">Créer des raccourcis vers les contacts dans le lanceur d\'applications</string>
-    <string name="contacts_settings_launcher_shortcuts_summary">Remplacer les raccourcis actuels vers les conversations</string>
-    <string name="contacts_settings_show_new_contact_account_dialog_title">Toujours demander dans quel compte le nouveau contact doit être ajouté</string>
-    <string name="contacts_settings_show_new_contact_account_dialog_summary">Si désactivé, le contact sera enregistré localement</string>
-    <string name="advanced_settings_debug_mode_title">Traces de déboggage</string>
-    <string name="advanced_settings_background_mode_title">Mode arrière-plan</string>
-    <string name="advanced_settings_background_mode_summary">Affiche une notification pour maintenir la connexion avec l\'application</string>
-    <string name="advanced_settings_auto_start_title">Démarrer au lancement du téléphone</string>
-    <string name="advanced_settings_dark_mode_title">Thème sombre</string>
-    <string name="advanced_settings_dark_mode_label_auto">Auto</string>
-    <string name="advanced_settings_dark_mode_label_no">Non</string>
-    <string name="advanced_settings_dark_mode_label_yes">Oui</string>
-    <string name="advanced_settings_animations_title">Animations</string>
-    <string name="advanced_settings_device_name_title">Nom de l\'appareil</string>
-    <string name="advanced_settings_device_name_summary">Les modifications seront appliquées au prochain démarrage</string>
-    <string name="advanced_settings_remote_provisioning_url_title">URL de configuration distante</string>
-    <string name="advanced_settings_logs_server_url_title">URL du serveur de téléchargement des traces</string>
-    <string name="advanced_settings_logs_server_url_summary">Ne changez pas cette valeur sans savoir ce que vous faites !</string>
-    <string name="advanced_settings_android_title">Android</string>
-    <string name="advanced_settings_go_to_battery_optimization_settings">Paramètres d\'optimisation de la batterie</string>
-    <string name="advanced_settings_go_to_power_manager_settings">Paramètres de gestion de l\'énergie</string>
-    <string name="advanced_settings_go_to_android_app_settings">Paramètres de l\'app Android</string>
-    <string name="tunnel_settings_hostname_url_title">Hôte</string>
-    <string name="tunnel_settings_port_title">Port</string>
-    <string name="tunnel_settings_dual_mode_summary">Utilise un serveur pour le télé-versement et un autre pour le téléchargement</string>
-    <string name="tunnel_settings_dual_port_title">Port du second serveur</string>
-    <string name="tunnel_settings_dual_port_summary">Requis par le mode double</string>
-    <string name="tunnel_settings_mode_title">Mode</string>
-    <string name="tunnel_settings_disabled_mode">Désactivé</string>
-    <string name="tunnel_settings_always_mode">Toujours</string>
-    <string name="tunnel_settings_auto_mode">Auto</string>
-    <string name="account_settings_user_name_title">Nom d\'utilisateur</string>
-    <string name="account_settings_user_id_title">Identifiant d\'authentification</string>
-    <string name="account_settings_user_id_summary">Saisir l\'identifiant d\'authentification, si différent du nom d\'utilisateur (optionnel)</string>
-    <string name="account_settings_password_title">Mot de passe</string>
-    <string name="account_settings_domain_title">Domaine</string>
-    <string name="account_settings_domain_summary">Exemple : sip.example.org si votre compte est john@sip.example.org</string>
-    <string name="account_settings_display_name_title">Nom d\'affichage</string>
-    <string name="account_settings_manage_title">Gestion</string>
-    <string name="account_settings_disable_title">Désactiver</string>
-    <string name="account_settings_default_title">Utilisé par défaut</string>
-    <string name="account_settings_link_phone_number_title">Lier le compte</string>
-    <string name="account_settings_delete_title">Supprimer</string>
-    <string name="account_settings_advanced_title">Paramètres avancés</string>
-    <string name="account_settings_push_notification_title">Autoriser les notifications push</string>
-    <string name="account_settings_push_notification_summary">La configuration proxy ne sera pas désenregistrée</string>
-    <string name="account_settings_transport_udp">UDP</string>
-    <string name="account_settings_transport_tcp">TCP</string>
-    <string name="account_settings_transport_tls">TLS</string>
-    <string name="account_settings_transport_dtls">DTLS</string>
-    <string name="account_settings_proxy_title">Proxy SIP</string>
-    <string name="account_settings_outbound_proxy_title">Outbound proxy</string>
-    <string name="account_settings_stun_server_title">Serveur TURN / STUN</string>
-    <string name="account_settings_ice_title">Activer ICE</string>
-    <string name="account_settings_avpf_title">AVPF</string>
-    <string name="account_settings_avpf_rr_interval_summary">en secondes (entre 1 et 5)</string>
-    <string name="account_settings_expires_title">Expiration</string>
-    <string name="account_settings_expires_summary">en secondes</string>
-    <string name="account_settings_prefix_summary">(sans le +)</string>
-    <string name="account_settings_prefix_title">Préfixe de votre pays</string>
-    <string name="account_settings_escape_plus_title">Remplacer + par 00</string>
-    <string name="notification_channel_incoming_call_name">Notifications d\'appels entrants &appName;</string>
-    <string name="incoming_call_notification_title">Appel entrant</string>
-    <string name="incoming_call_notification_hangup_action_label">Raccrocher</string>
-    <string name="incoming_call_notification_answer_action_label">Répondre</string>
-    <string name="received_chat_notification_reply_label">Répondre</string>
-    <string name="received_chat_notification_mark_as_read_label">Marquer comme lu</string>
-    <string name="missed_call_notification_body">Appel manqué de %s</string>
-    <string name="missed_calls_notification_body">%d appels manqués</string>
-    <string name="missed_call_notification_title">Appel manqué</string>
-    <string name="zrtp_dialog_title">Sécurité des communications</string>
-    <string name="zrtp_dialog_explanation">Pour accroitre le niveau de sécurité, vous pouvez confirmer les codes suivants avec votre interlocuteur.</string>
-    <string name="zrtp_dialog_later_button_label">Plus tard</string>
-    <string name="zrtp_dialog_correct_button_label">Correct</string>
-    <string name="dialog_zrtp_local_sas">Dites :</string>
-    <string name="dialog_zrtp_remote_sas">Votre interlocuteur doit dire :</string>
-    <string name="dialog_cancel">Annuler</string>
-    <string name="dialog_delete">Supprimer</string>
-    <string name="dialog_ok">OK</string>
-    <string name="dialog_accept">Accepter</string>
-    <string name="dialog_decline">Refuser</string>
-    <string name="dialog_call">Appel</string>
-    <string name="operation_in_progress_wait">Opération en cours, merci de patienter</string>
-    <string name="dialog_default_delete_one">Souhaitez-vous supprimer cet élément \?</string>
-    <string name="dialog_default_delete_many">Souhaitez-vous supprimer votre sélection \?</string>
-    <string name="dialog_update_available">Une mise à jour est disponible</string>
-    <string name="dialog_try_open_file_as_text_title">Aucune application ne correspond à ce type de fichier</string>
-    <string name="dialog_try_open_file_as_text_body">Souhaitez-vous essayer de l\'ouvrir en tant que fichier texte \?</string>
-    <string name="content_description_add_sip_address_field">Ajouter un champ adresse SIP</string>
-    <string name="content_description_add_phone_number_field">Ajouter un champ numéro de téléphone</string>
-    <string name="content_description_go_back">Revenir en arrière</string>
-    <string name="content_description_phone_number_use">Affiche à quoi le numéro de téléphone va-t-il servir</string>
-    <string name="content_description_switch_camera">Intervertir la source de capture de la vidéo</string>
-    <string name="content_description_pause_call">Mettre l\'appel en pause</string>
-    <string name="content_description_enter_edition_mode">Editer</string>
-    <string name="content_description_attach_file">Ajouter une pièce jointe</string>
-    <string name="content_description_send_message">Envoyer</string>
-    <string name="content_description_ephemeral_duration_selected">Délai d\'expiration des messages sélectionné</string>
-    <string name="content_description_ephemeral_duration_change">Mettre à jour le délai d\'expiration des messages</string>
-    <string name="content_description_create_chat_room">Créer une conversation</string>
-    <string name="content_description_add_participants">Ajouter des participants</string>
-    <string name="content_description_remove_contact_from_chat_room">Retirer le contact de la conversation</string>
-    <string name="content_description_contact_is_admin">Le contact est un admin</string>
-    <string name="content_description_ephemeral_chat_room">Les messages envoyés ici sont éphémères</string>
-    <string name="content_description_start_chat">Rejoindre la conversation</string>
-    <string name="content_description_start_encrypted_chat">Rejoindre la conversation chiffrée</string>
-    <string name="content_description_edit_contact">Editer le contact</string>
-    <string name="content_description_delete_contact">Supprimer le contact</string>
-    <string name="content_description_discard_changes">Annuler les modifications</string>
-    <string name="content_description_confirm_contact_edit">Sauvegarder les modifications</string>
-    <string name="content_description_change_contact_picture">Modifier la photo du contact</string>
-    <string name="content_description_change_own_picture">Modifier ma photo</string>
-    <string name="content_description_show_call_details">Aller à la vue de détails de l\'appel</string>
-    <string name="content_description_select_all">Tout sélectionner</string>
-    <string name="content_description_unselect_all">Tout désélectionner</string>
-    <string name="content_description_delete_selection">Supprimer les éléments sélectionnés</string>
-    <string name="content_description_numpad_1">1</string>
-    <string name="content_description_numpad_2">2</string>
-    <string name="content_description_numpad_3">3</string>
-    <string name="content_description_numpad_4">4</string>
-    <string name="content_description_numpad_5">5</string>
-    <string name="content_description_numpad_6">6</string>
-    <string name="content_description_numpad_7">7</string>
-    <string name="content_description_numpad_8">8</string>
-    <string name="content_description_numpad_0">0</string>
-    <string name="content_description_numpad_star">*</string>
-    <string name="content_description_numpad_sharp">#</string>
-    <string name="content_description_recording_toggle_play">Ecouter l\'enregistrement</string>
-    <string name="content_description_voice_mail">Boîte vocale</string>
-    <string name="content_description_toggle_side_menu">Afficher ou masquer le menu latéral</string>
-    <string name="content_description_menu_contacts">Contacts</string>
-    <string name="content_description_menu_dialer">Pavé numérique</string>
-    <string name="content_description_menu_chat">Conversations</string>
-    <string name="content_description_dialer_erase">Supprimer le dernier caractère</string>
-    <string name="content_description_add_contact">Créer le contact</string>
-    <string name="content_description_show_missed_calls">Appels manqués</string>
-    <string name="content_description_missed_call">Appels manqués</string>
-    <string name="content_description_show_all_calls">Tous les appels</string>
-    <string name="content_description_incoming_call">Appel entrant</string>
-    <string name="content_description_outgoing_call">Appel sortant</string>
-    <string name="content_description_create_one_to_one_chat_room">Créer une conversation 1–1</string>
-    <string name="content_description_create_group_chat_room">Créer une conversation de groupe</string>
-    <string name="content_description_security_level_unsafe">Non sécurisé</string>
-    <string name="content_description_security_level_safe">Sécurisé</string>
-    <string name="content_description_security_level_encrypted">Chiffré</string>
-    <string name="content_description_call_quality_2">La qualité d\'appel est moyenne</string>
-    <string name="content_description_call_quality_1">La qualité d\'appel est mauvaise</string>
-    <string name="content_description_call_quality_4">La qualité d\'appel est très bonne</string>
-    <string name="share_uploaded_logs_link">Partager le fichier de traces avec…</string>
-    <string name="content_description_call_not_secured">L\'appel n\'est pas chiffré</string>
-    <string name="history_delete_one_dialog">Voulez-vous supprimer cet enregistrement \?</string>
-    <string name="content_description_call_security_pending">Le chiffrement est en cours</string>
-    <string name="content_description_chat_message_video_attachment">Vidéo en pièce jointe</string>
-    <string name="no_account_configured">Aucun compte configuré</string>
-    <string name="contact_send_sms_invite_text">Bonjour ! Rejoins-moi sur &appName;! Disponible gratuitement ici : %s</string>
-    <string name="assistant_validate_account_1">Votre compte a été créé. Nous vous avons envoyé un email de confirmation à l\'adresse :</string>
-    <plurals name="chat_room_remote_composing" tools:ignore="MissingQuantity">
-        <item quantity="one">%s écrit…</item>
-        <item quantity="other">%s écrivent…</item>
-    </plurals>
-    <string name="chat_event_participant_added">%s a rejoint le groupe</string>
-    <string name="contact_choose_existing_or_new_to_add_number">Sélectionnez un contact ou créez-en un</string>
-    <string name="service_name">Service &appName;</string>
-    <string name="service_description">Nécessaire pour recevoir les appels lorsque l\'app est en arrière-plan</string>
-    <string name="select_your_country">Choisissez votre pays</string>
-    <string name="sip_addresses">Adresses SIP</string>
-    <plurals name="days" tools:ignore="MissingQuantity">
-        <item quantity="one">%d jour</item>
-        <item quantity="other">%d jours</item>
-    </plurals>
-    <string name="contact_delete_one_dialog">Voulez-vous supprimer ce contact \?\nIl sera aussi retiré du carnet d\'adresses du téléphone.</string>
-    <string name="dialer_address_bar_hint">Entrez un numéro ou une adresse</string>
-    <string name="chat_remote_is_composing">Votre correspondant est en train de taper…</string>
-    <string name="chat_security_event_lime_identity_key_changed">Les clés de sécurité ont changé pour %s</string>
-    <string name="chat_event_ephemeral_disabled">Vous avez désactivé les messages éphémères</string>
-    <string name="chat_room_group_info_subject_hint">Nommer le groupe</string>
-    <string name="chat_message_imdn_undelivered">Non reçu</string>
-    <string name="chat_message_context_menu_add_to_contacts">Ajouter aux contacts</string>
-    <string name="chat_message_forward_confirmation_dialog">Souhaitez-vous transférer ce message dans cette conversation \?</string>
-    <string name="chat_room_ephemeral_messages_desc">Ce message disparaîtra de votre discussion et de celle des destinataires une fois lu et après la durée sélectionnée.</string>
-    <string name="chat_room_delete_many_dialog">Souhaitez-vous supprimer ces conversations \?</string>
-    <string name="call_error_incompatible_media_params">Paramètres média incompatibles</string>
-    <string name="call_stats_upload">Bande passante d\'envoi :</string>
-    <string name="call_stats_ice">Connectivité ICE :</string>
-    <string name="call_stats_video_resolution_sent">Résolution vidéo envoyée :</string>
-    <string name="assistant_welcome_desc">Cet assistant va vous aider à configurer et utiliser votre compte SIP.</string>
-    <string name="assistant_phone_number_link_info_content">\nVos amis pourront vous joindre plus facilement si vous associez votre compte à votre numéro de téléphone.\n\nVous verrez dans votre carnet d\'adresses les contacts qui utilisent &appName; et vos amis sauront qu\'ils peuvent vous contacter.\n</string>
-    <string name="assistant_error_invalid_credentials">Le compte n\'existe pas ou les mots de passe ne correspondent pas</string>
-    <string name="assistant_linphone_login_desc">Veuillez saisir le nom d\'utilisateur et mot de passe de votre compte &appName;</string>
-    <string name="assistant_display_name_optional">Nom d\'affichage (optionnel)</string>
-    <string name="assistant_validate_account_2">Pour valider votre compte, veuillez suivre les instructions reçues par email et cliquer sur le bouton.</string>
-    <string name="assistant_create_account_part_3">Pour valider votre numéro veuillez enter le code à 4 chiffres ci-dessous :\n</string>
-    <string name="content_description_disable_speaker">Envoyer le son vers les écouteurs</string>
-    <string name="content_description_toggle_audio_menu">Afficher ou masquer le menu de sélection du périphérique audio</string>
-    <string name="chat_message_notification_hidden_content">&lt;Censuré&gt;</string>
-    <string name="content_description_enable_speaker">Envoyer le son vers le haut-parleur</string>
-    <string name="call_settings_overlay_title">Notification d\'appel flottante</string>
-    <string name="call_settings_system_wide_overlay_summary">Une autorisation explicite est requise</string>
-    <string name="chat_settings_mark_as_read_notif_dismissal_title">Marquer comme lu lorsque la notification est supprimée</string>
-    <string name="chat_settings_launcher_shortcuts_summary">Seront remplacés par les raccourcis de contacts si activés</string>
-    <string name="account_settings_transport_title">Transport</string>
-    <string name="content_description_clear_field">Vider le champ texte à côté</string>
-    <string name="notification_channel_missed_call_name">Notifications d\'appels manqués &appName;</string>
-    <string name="assistant_general_terms">les conditions d\'utilisation</string>
-    <string name="content_description_close_bubble">Fermer la bulle de notification</string>
-    <string name="assistant_privacy_policy">la politique de confidentialité</string>
-    <string name="assistant_read_and_agree_terms">J\'accepte %1$s et %2$s de Belledonne Communications</string>
-    <string name="content_description_open_app">Ouvrir les conversations dans l\'application au lieu de la bulle</string>
-    <string name="content_description_export">Ouvrir le fichier dans une application tierce</string>
-    <string name="chat_message_no_app_found_to_handle_file_mime_type">Aucune application n\'est disponible pour ouvrir ce type de fichier</string>
-    <string name="chat_bubble_cant_open_enrypted_file">Impossible d\'ouvrir un fichier chiffré dans la bulle de conversation</string>
-    <string name="advanced_settings_vfs_title">Chiffrer tous les fichiers</string>
-    <string name="advanced_settings_vfs_summary">Attention, ne pourra pas être désactivé !</string>
-    <string name="chat_settings_use_in_app_file_viewer_title">Ouvrir les fichiers dans l\'application</string>
-    <string name="chat_settings_use_in_app_file_viewer_summary">Vous pourrez toujours les exporter dans une appli tierce</string>
-    <string name="call_settings_ring_during_early_media_title">Sonner durant un appel entrant avec early-media</string>
-    <string name="debug_popup_show_config_file">Voir le fichier de config</string>
-    <string name="chat_message_cant_open_file_in_app_dialog_title">Il semblerait que l\'on ne puisse pas afficher ce fichier.</string>
-    <string name="chat_message_cant_open_file_in_app_dialog_message">Voulez-vous essayer de l\'ouvrir comme texte ou de l\'exporter (en clair) vers une appli tierce si disponible ?</string>
-    <string name="chat_message_cant_open_file_in_app_dialog_export_button">Exporter</string>
-    <string name="chat_message_cant_open_file_in_app_dialog_open_as_text_button">Ouvrir comme texte</string>
-    <string name="advanced_settings_send_debug_logs_title">Envoyer les traces</string>
-    <string name="advanced_settings_reset_debug_logs_title">Vider les traces</string>
-    <string name="advanced_settings_debug_title">Paramètres de deboggage</string>
-    <string name="advanced_settings_other_title">Autres paramètres</string>
-    <string name="call_settings_system_wide_overlay_title">Afficher la notification flottante en dehors de l\'app</string>
-    <string name="account_settings_apply_prefix_for_calls_summary">Quand un nombre est saisi, applique le préfixe</string>
-    <string name="chat_room_file_not_found">Fichier non trouvé</string>
-    <string name="account_settings_apply_prefix_for_calls_title">Applique le préfixe pour les appels sortants et les messages</string>
-    <string name="settings_primary_account_title">Compte principal</string>
-    <string name="settings_primary_account_display_name_title">Nom d\'affichage</string>
-    <string name="settings_primary_account_username_title">Nom d\'utilisateur</string>
-    <string name="logs_upload_failure">Erreur pendant l\'envoi des journaux !</string>
-    <string name="logs_reset_complete">Les journaux ont été néttoyés</string>
-    <string name="call_settings_redirect_to_voice_mail_declined_calls_title">Rediriger les appels déclinés vers la boîte vocale</string>
-    <string name="call_error_server_timeout">Délai d\'attente serveur expiré</string>
-    <string name="call_error_temporarily_unavailable">Temporairement indisponible</string>
-    <string name="call_error_generic">Erreur : %s</string>
-    <string name="call_settings_pause_calls_lost_audio_focus_title">Mettre en pause les appels quand le focus audio est perdu</string>
-    <string name="content_description_cancel_forward">Annuler le transfert de message</string>
-    <string name="content_description_cancel_sharing">Annuler le partage</string>
-    <string name="content_description_forward_message">Transférer le message dans cette conversation</string>
-    <string name="chat_room_choose_conversation_for_message_forward">Sélectionnez ou créez une conversation pour transférer le message</string>
-    <string name="chat_room_choose_conversation_for_file_sharing">Sélectionnez ou créez une conversation pour partager le(s) fichier(s)</string>
-    <string name="chat_room_choose_conversation_for_text_sharing">Sélectionnez ou créez une conversation pour partager le texte</string>
-    <string name="chat_message_context_menu_reply">Répondre</string>
-    <string name="chat_room_sending_reply_hint">Réponse</string>
-    <string name="chat_room_sending_message_hint">Message</string>
-    <string name="chat_message_replied">Réponse</string>
-    <string name="chat_message_voice_recording_hold_to_record">Gardez le bouton enfoncé pour enregistrer un message vocal</string>
-    <string name="content_description_cancel_reply">Annuler la réponse</string>
-    <string name="content_description_voice_recording">Enregistrer un message vocal</string>
-    <string name="content_description_cancel_voice_recording">Annuler l\'enregistrement du message vocal</string>
-    <string name="content_description_pause_voice_recording_playback">Mettre en pause la lecture du message vocal</string>
-    <string name="content_description_play_voice_recording">Jouer le message vocal</string>
-    <string name="chat_settings_auto_download_voice_recordings">Télécharger automatiquement les messages vocaux reçus</string>
-    <string name="content_description_stop_voice_recording">Arrêter l\'enregistrement du message vocal</string>
-    <string name="chat_message_voice_recording_playback_low_volume">Le volume média est faible, pensez à l\'augmenter si vous n\'entendez pas le message</string>
-    <string name="call_settings_auto_start_recording_title">Enregistrer automatiquement les appels</string>
-    <string name="advanced_settings_disable_fragment_security_title">Désactiver le mode sécurisé de l\'interface</string>
-    <string name="advanced_settings_disable_fragment_security_summary">Autorise l\'écran à être capturé/enregistré sur les vues sensibles</string>
-    <string name="call_settings_use_telecom_manager_title">Améliore les intéractions avec les périphériques bluetooth</string>
-    <string name="call_settings_use_telecom_manager_summary">Nécessite des permissions supplémentaires</string>
-    <plurals name="chat_room_unread_messages_event" tools:ignore="MissingQuantity">
-        <item quantity="one">%1$d message non lu</item>
-        <item quantity="other">%1$d messages non lus</item>
-    </plurals>
-    <string name="content_descripton_scroll_to_bottom">Aller au dernier message reçu ou au premier message non lu</string>
-    <string name="audio_settings_prefer_bluetooth_devices_title">Acheminer l\'audio vers l\'appareil bluetooth, s\'il existe</string>
-    <string name="call_settings_ringtones_title">Sonnerie</string>
-    <string name="chat_message_removal_info">Le message va être supprimé</string>
-    <string name="chat_message_abort_removal">Annuler</string>
-    <string name="about_weblate_translation">Contribuer aux traductions</string>
-    <string name="assistant_generic_account_warning">Certaines fonctionnalités avancées comme les messages de groupe ou les messages éphémères nécessitent un compte &appName;.\n\nElles seront masquées dans l\'application si vous configurez un compte SIP tiers.\n\nSi vous souhaitez les activer pour un projet professionnel, contactez-nous.</string>
-    <string name="assistant_generic_account_warning_continue_button_text">J\'ai compris</string>
-    <string name="contacts_settings_create_new_ldap_config_title">Nouvelle configuration LDAP</string>
-    <string name="contacts_settings_ldap_title">LDAP</string>
-    <string name="contacts_settings_ldap_enable_title">Activer</string>
-    <string name="contacts_settings_ldap_delete_title">Supprimer</string>
-    <string name="contacts_settings_ldap_connection_title">Connexion</string>
-    <string name="contacts_settings_ldap_server_title">URL du serveur</string>
-    <string name="contacts_settings_ldap_bind_dn_title">Bind DN</string>
-    <string name="contacts_settings_ldap_password_title">Mot de passe</string>
-    <string name="contacts_settings_ldap_auth_method_title">Méthode d\'authentification</string>
-    <string name="contacts_settings_ldap_auth_method_anonymous">Anonyme</string>
-    <string name="contacts_settings_ldap_auth_method_simple">Simple</string>
-    <string name="contacts_settings_ldap_tls_title">Utiliser TLS</string>
-    <string name="contacts_settings_ldap_cert_check_title">Vérifier les certificats</string>
-    <string name="contacts_settings_ldap_cert_check_auto">Auto</string>
-    <string name="contacts_settings_ldap_cert_check_disabled">Désactivé</string>
-    <string name="contacts_settings_ldap_cert_check_enabled">Activé</string>
-    <string name="contacts_settings_ldap_search_title">Recherche</string>
-    <string name="contacts_settings_ldap_search_base_title">Base de recherche</string>
-    <string name="contacts_settings_ldap_search_base_subtitle">Ne doit pas être vide !</string>
-    <string name="contacts_settings_ldap_search_filter_title">Filtre</string>
-    <string name="contacts_settings_ldap_search_max_results_title">Résultats maximum</string>
-    <string name="contacts_settings_ldap_search_timeout_title">Durée max</string>
-    <string name="contacts_settings_ldap_search_timeout_subtitle">En secondes</string>
-    <string name="contacts_settings_ldap_request_delay_title">Délai entre 2 requêtes</string>
-    <string name="contacts_settings_ldap_request_delay_subtitle">En millisecondes</string>
-    <string name="contacts_settings_ldap_minimum_characters_title">Nombre minimum de caractères pour lancer la requête</string>
-    <string name="contacts_settings_ldap_parsing_title">Analyse</string>
-    <string name="contacts_settings_ldap_name_attribute_title">Attributs de nom</string>
-    <string name="contacts_settings_ldap_sip_attribute_title">Attributs SIP</string>
-    <string name="contacts_settings_ldap_sip_domain_title">Domaine</string>
-    <string name="contacts_settings_ldap_misc_title">Divers</string>
-    <string name="contacts_settings_ldap_debug_title">Débogage</string>
-    <string name="contact_cant_be_deleted">Ce contact ne peut être supprimé</string>
-    <string name="contacts_ldap_query_more_results_available">Plus de résultats sont disponibles, affinez votre recherche</string>
-    <string name="chat_message_download_already_in_progress">Merci d\'attendre la fin du premier téléchargement avant d\'en lancer un second</string>
-    <string name="content_description_participant_is_paused">Le participant a momentanément quitté l\'appel de groupe</string>
-    <string name="conference_organizer">Organisateur</string>
-    <string name="conference_default_title">Réunion distante</string>
-    <string name="conference_local_title">Réunion locale</string>
-    <string name="conference_invite_title">Invitation à la réunion :</string>
-    <string name="conference_description_title">Description</string>
-    <string name="conference_invite_join">Rejoindre</string>
-    <string name="conference_invite_participants_count" tools:ignore="PluralsCandidate">%d participants</string>
-    <string name="conference_display_mode_mosaic">Mode mosaïque</string>
-    <string name="conference_waiting_room_start_call">Démarrer</string>
-    <string name="conference_waiting_room_cancel_call">Annuler</string>
-    <string name="conference_waiting_room_video_disabled">La vidéo est actuellement désactivée</string>
-    <string name="conference_scheduled">Réunions</string>
-    <string name="conference_no_schedule">Aucune réunion planifiée pour le moment.</string>
-    <string name="conference_scheduled_delete_one_dialog">Voulez-vous supprimer cette réunion ?</string>
-    <string name="conference_scheduled_delete_many_dialog">Voulez-vous supprimer ces réunions ?</string>
-    <string name="conference_empty">Vous êtes actuellement seul dans cet appel de groupe</string>
-    <string name="conference_invitation_received_notification">Vous avez été invité à une réunion</string>
-    <string name="conference_invitation">Invitation à une réunion</string>
-    <string name="call_action_change_conf_layout">Modifier la disposition</string>
-    <string name="call_action_statistics">Statistiques d\'appel</string>
-    <string name="call_action_add_call">Nouvel appel</string>
-    <string name="call_context_action_resume">Reprendre l\'appel</string>
-    <string name="call_context_action_pause">Mettre l\'appel en pause</string>
-    <string name="call_context_action_transfer">Transférer l\'appel</string>
-    <string name="call_context_action_answer">Décrocher l\'appel</string>
-    <string name="call_context_action_hangup">Raccrocher l\'appel</string>
-    <string name="content_description_copy_conference_address">Copier l\'adresse de la réunion</string>
-    <string name="dialer_transfer_failed">Impossible de transférer l\'appel</string>
-    <string name="content_description_edit_conference">Éditer la réunion</string>
-    <string name="content_description_delete_conference">Supprimer la réunion</string>
-    <string name="content_description_share_ics">Enregistrer l\'évènement dans le calendrier</string>
-    <string name="content_description_hide_statistics">Cacher les statistiques d\'appel</string>
-    <string name="content_description_show_numpad">Afficher le pavé numérique</string>
-    <string name="content_description_hide_numpad">Cacher le pavé numérique</string>
-    <string name="conference_schedule_summary">Informations de la réunion</string>
-    <string name="call_action_participants_list">Liste des participants</string>
-    <string name="content_description_call_context_menu">Ouvre le menu contextuel d\'appel</string>
-    <string name="no_conference_call_history">Aucun appel de réunion dans votre historique</string>
-    <string name="dialer_transfer_succeded">L\'appel est en train d\'être transféré</string>
-    <string name="conference_display_mode_active_speaker">Mode intervenant actif</string>
-    <string name="conference_layout_too_many_participants_for_mosaic">Vous ne pouvez pas modifier la disposition de l\'appel de groupe car il y a trop de participants</string>
-    <string name="call_action_transfer_call">Transférer l\'appel</string>
-    <string name="settings_conferences_title">Réunions</string>
-    <string name="call_settings_remote_recording_title">Être notifié quand un appel est enregistré par votre correspondant</string>
-    <string name="content_description_create_conference">Créer une réunion</string>
-    <string name="content_description_encrypted_conference">La réunion sera chiffrée</string>
-    <string name="conference">Réunion</string>
-    <string name="conference_schedule_title">Planifier une réunion</string>
-    <string name="conference_schedule_later">Voulez-vous planifier une réunion pour plus tard ?</string>
-    <string name="conference_schedule_mandatory_field">Obligatoire</string>
-    <string name="conference_schedule_subject_title">Sujet</string>
-    <string name="conference_schedule_subject_hint">Sujet de la réunion</string>
-    <string name="conference_schedule_address_title">Adresse de la réunion</string>
-    <string name="conference_schedule_description_title">Ajouter une description</string>
-    <string name="conference_schedule_description_hint">Description</string>
-    <string name="conference_schedule_date">Date</string>
-    <string name="conference_schedule_time">Heure</string>
-    <string name="conference_schedule_duration">Durée</string>
-    <string name="conference_schedule_timezone">Fuseau horaire</string>
-    <string name="conference_schedule_send_invite_chat">Envoyer l\'invitation par &appName;</string>
-    <string name="conference_schedule_send_invite_email">Envoyer l\'invitation par courriel</string>
-    <string name="conference_schedule_encryption">Voulez-vous chiffrer la réunion \?</string>
-    <string name="conference_schedule_send_invite_chat_summary">L\'invitation va être envoyée depuis mon compte &appName;</string>
-    <string name="conference_schedule_participants_list">Liste des participants</string>
-    <string name="conference_schedule_start">Planifier une réunion</string>
-    <string name="conference_schedule_address_copied_to_clipboard">L\'adresse de la réunion à été copiée dans le presse papier</string>
-    <string name="conference_schedule_info_not_sent_to_participant">Échec de l\'envoi de l\'invitation de réunion à un participant</string>
-    <string name="conference_paused_title">Vous êtes actuellement en dehors de l\'appel de groupe.</string>
-    <string name="conference_paused_subtitle">Cliquez sur le bouton \"play\" pour la rejoindre.</string>
-    <string name="conference_schedule_organizer">Organisateur :</string>
-    <string name="conference_go_to_chat">Conversation de l\'appel de groupe</string>
-    <string name="conference_creation_failed">Échec de la création de la réunion</string>
-    <string name="conference_admin_set">%s est maintenant administrateur</string>
-    <string name="conference_admin_unset">%s n\'est plus administrateur</string>
-    <string name="conference_schedule_info_created">La réunion a été planifiée</string>
-    <string name="conference_info_removed">Informations de réunion supprimées</string>
-    <string name="call_action_chat">Conversation</string>
-    <string name="call_action_calls_list">Liste des appels</string>
-    <string name="call_action_numpad">Pavé numérique</string>
-    <string name="call_remote_recording">Cet appel est en train d\'être enregistré.</string>
-    <string name="call_remotely_paused_title">L\'appel a été mis en pause par le correspondant.</string>
-    <string name="call_locally_paused_title">Vous avez mis l\'appel en pause.</string>
-    <string name="call_locally_paused_subtitle">Cliquez sur le bouton \"play\" pour le reprendre.</string>
-    <string name="conferences_settings_layout_title">Disposition par défaut</string>
-    <string name="content_description_go_to_chat_rooms_list">Aller dans la liste des conversations</string>
-    <string name="content_description_conference_participant_mic_muted">Le participant a coupé son microphone</string>
-    <string name="content_description_toggle_layout_menu">Afficher ou cacher le menu de disposition de l\'appel de groupe</string>
-    <string name="conference_display_mode_audio_only">Mode audio uniquement</string>
-    <string name="conference_too_many_participants_for_mosaic_layout">Il y a trop de participants pour la disposition en mosaïque, passage à l\'intervenant actif</string>
-    <string name="conference_participant_paused">(en pause)</string>
-    <string name="content_description_take_screenshot">Prendre une capture de la vidéo reçue</string>
-    <string name="conference_low_bandwidth">Faible bande passante détectée, vidéo désactivée</string>
-    <string name="content_description_toggle_conference_info_details">Afficher/cacher les détails de la réunion</string>
-    <string name="content_description_conference_participants">Participants de la réunion</string>
-    <string name="conference_first_to_join">Vous êtes le premier à avoir rejoint l\'appel de groupe</string>
-    <string name="conference_last_user">Tous les autres participants ont quitté l\'appel de groupe</string>
-    <string name="conference_incoming_title">Appel de groupe entrant</string>
-    <string name="conference_group_call_title">Démarrer un appel de groupe</string>
-    <string name="conference_group_call_subject_hint">Sujet de l\'appel de groupe</string>
-    <string name="conference_group_call_summary">Informations de l\'appel de groupe</string>
-    <string name="conference_group_call_create">Démarrer l\'appel de groupe</string>
-    <string name="incoming_group_call_notification_title">Appel de groupe entrant</string>
-    <string name="conference_participants_title">Participants (%d)</string>
-    <string name="conference_start_group_call_dialog_title">Appel de groupe</string>
-    <string name="conference_start_group_call_dialog_message">Voulez-vous démarrer un appel de groupe ?\nToutes les personnes dans cette conversation vont recevoir un appel.</string>
-    <string name="conference_start_group_call_dialog_ok_button">Démarrer</string>
-    <string name="chat_message_context_menu_turn_off_notifications">Désactiver les notifications</string>
-    <string name="chat_message_context_menu_turn_on_notifications">Activer les notifications</string>
-    <string name="content_description_muted_chat_room">Les notifications sont désactivées pour cette conversation</string>
-    <string name="chat_room_context_menu_go_to_contact">Voir le contact</string>
-    <string name="recordings_export">Exporter l\'enregistrement avec…</string>
-    <string name="content_description_recording_export">Exporter l\'enregistrement</string>
-    <string name="conference_no_terminated_schedule">Aucune réunion terminée pour le moment.</string>
-    <string name="conference_scheduled_terminated_filter">Terminées</string>
-    <string name="conference_scheduled_future_filter">Programmées</string>
-    <string name="content_description_chat_message_meeting_attachment">Invitation à une réunion</string>
-    <string name="call_stats_media_encryption">Chiffrement du média :</string>
-    <string name="call_stats_zrtp_cipher_algo">Algorithme de chiffrement :</string>
-    <string name="call_stats_zrtp_key_agreement_algo">Algorithme d\'échange de clef :</string>
-    <string name="call_stats_zrtp_hash_algo">Algorithme de hachage :</string>
-    <string name="call_stats_zrtp_auth_tag_algo">Algorithme d\'authentification :</string>
-    <string name="call_stats_zrtp_sas_algo">Algorithme SAS :</string>
-    <string name="conference_schedule_edit">Modifier la réunion</string>
-    <string name="conference_update_title">La réunion a été modifiée : </string>
-    <string name="conference_cancel_title">La réunion a été annulée : </string>
-    <string name="account_setting_conference_factory_address">Adresse du serveur de conversation de groupe/sécurisées</string>
-    <string name="account_setting_audio_video_conference_factory_address">Adresse du serveur de conférence audio/vidéo</string>
-    <string name="account_setting_end_to_end_encryption_keys_server_url">URL du serveur de clés pour le chiffrement de bout en bout</string>
-    <string name="conference_scheduled_cancelled_by_organizer">L\'organisateur a annulé la conférence</string>
-    <string name="conference_scheduled_cancelled_by_me">Vous avez annulé la conférence</string>
-    <string name="conference_schedule_send_updated_invite_chat">Envoyer la mise à jour par &appName;</string>
-    <string name="conference_schedule_send_updated_invite_email">Envoyer la mise à jour par courriel</string>
-    <string name="call_screenshot_taken">Capture sauvegardée : %s</string>
-    <string name="chat_message_voice_recording_received_notification">Vous avez reçu un message vocal</string>
-    <string name="chat_message_voice_recording">Message vocal</string>
-    <string name="content_description_presence_online">La personne est en ligne</string>
-    <string name="content_description_presence_offline">La personne est hors ligne</string>
-    <string name="content_description_presence_do_not_disturb">La personne souhaite ne pas être dérangée</string>
-    <string name="account_setting_publish_presence_title">Publier la présence</string>
-    <string name="chat_room_presence_online">En ligne</string>
-    <string name="chat_room_presence_last_seen_online_today">En ligne aujourd\'hui à</string>
-    <string name="chat_room_presence_last_seen_online_yesterday">En ligne hier à</string>
-    <string name="chat_room_presence_last_seen_online">En ligne le</string>
-    <string name="chat_room_presence_away">Absent</string>
-    <string name="chat_room_presence_do_not_disturb">Ne pas déranger</string>
-    <string name="account_setting_delete_dialog_title">Voulez-vous supprimer votre compte ?</string>
-    <string name="account_setting_delete_generic_confirmation_dialog">Votre compte sera supprimé localement.\nPour le supprimer de manière définitive, rendez-vous sur le site internet de votre fournisseur SIP.</string>
-    <string name="account_setting_delete_sip_linphone_org_confirmation_dialog">Votre compte sera supprimé localement.\nPour le supprimer de manière définitive, rendez-vous sur notre plateforme de gestion des comptes :</string>
-    <string name="call_action_attended_transfer_call">Transfert supervisé</string>
-    <string name="chat_room_last_message_sender_format">%s :</string>
-    <string name="dialog_apply_remote_provisioning_title">Voulez-vous télécharger et appliquer la configuration depuis cette adresse ?</string>
-    <string name="dialog_apply_remote_provisioning_button">Appliquer</string>
-    <string name="error_unexpected">Erreur inattendue…</string>
-    <string name="settings_password_protection_dialog_title">Merci de saisir votre mot de passe ci-dessous pour accéder aux paramètres</string>
-    <string name="settings_password_protection_dialog_input_hint">Mot de passe</string>
-    <string name="settings_password_protection_dialog_ok_label">Valider</string>
-    <string name="settings_password_protection_dialog_invalid_input">Le mot de passe est invalide !</string>
-    <string name="account_setting_disable_bundle_mode_title">Désactiver le mode bundle</string>
-    <string name="assistant_alternative_way_create_account">Pour créer un compte avec votre email :</string>
-    <string name="assistant_no_push_warning">Votre périphérique ne semble pas supporter les notifications \'push\'.\n\nVous ne pourrez donc pas créer des comptes dans l\'application mais vous pouvez toujours le faire sur notre site internet :</string>
-    <string name="assistant_create_email_account_not_validated">Votre compte n\'est pas activé, veuillez cliquer sur le lien que vous avez reçu par courriel</string>
-    <string name="dialog_authentication_required_title">Authentification requise</string>
-    <string name="dialog_authentication_required_message">La connexion a échouée car l\'authentification est manquante ou invalide pour le compte\n%s.\n\nVous pouvez fournir le mot de passe à nouveau ou vérifier la configuration de votre compte dans les paramètres.</string>
-    <string name="dialog_authentication_required_change_password_label">Confirmer</string>
-    <string name="content_description_emoji_picker">Change la visibilité du selectionneur d\'emoji</string>
-    <string name="android_14_full_screen_intent_permission_not_granted">Permission requise pour afficher les appels entrant non accordée</string>
-    <string name="android_14_go_to_full_screen_intent_permission_setting">Afficher</string>
-    <string name="assistant_error_invalid_international_prefix">Préfixe international inconnu</string>
-    <string name="contacts_new_contact_wont_be_visible_warning_dialog">Vous êtes sur le point de créer un nouveau contact sans adresse SIP ni numéro de téléphone, il ne sera donc pas visible dans &appName;.\n\nVoulez-vous le créer quand même ?</string>
-    <string name="yes">Oui</string>
-    <string name="no">Non</string>
-    <string name="chat_message_reaction_received">%s a réagi par %s à : %s</string>
-    <string name="chat_message_one_reaction">%s réaction</string>
-    <string name="chat_message_many_reactions">%s réactions</string>
-    <string name="conference_invitation_notification_short_desc">invitation à une conférence</string>
-    <string name="chat_message_voice_recording_notification_short_desc">message vocal</string>
-    <string name="conference_schedule_mode">Mode</string>
-    <string name="conference_schedule_mode_meeting">Réunion</string>
-    <string name="conference_schedule_mode_broadcast">Webinar</string>
-    <string name="conference_schedule_broadcast_summary">Informations du webinar</string>
-    <string name="conference_schedule_speakers_list">Liste des intervenants</string>
-    <string name="conference_schedule_speakers_list_empty">Choisissez au moins un intervenant</string>
-    <string name="conference_schedule_participants_list_empty">Choisissez au moins un participant</string>
-    <string name="conference_broadcast_start">Planifier un webinar</string>
-    <string name="conference_broadcast_edit">Modifier le webinar</string>
-    <string name="conference_meeting_title">Réunion :</string>
-    <string name="conference_broadcast_title">Webinar :</string>
-    <string name="conference_invite_speakers_list_title">Intervenants</string>
-    <string name="conference_invite_participants_list_title">Participants</string>
-    <string name="conference_broadcast_invite_title">Invitation au webinar :</string>
-    <string name="conference_broadcast_invite_you_are_speaker">(vous êtes un intervenant)</string>
-    <string name="conference_schedule_broadcast_address_title">Adresse du webinar</string>
-    <string name="conference_waiting_room_listener_broadcast">Vous n\'êtes pas un intervenant de ce webinar</string>
-    <string name="conferences_settings_enable_broadcast_title">Autoriser les webinar</string>
-    <string name="conferences_settings_enable_broadcast_summary">Fonctionalité encore en béta !</string>
-    <string name="conference_participants_list_speaker_label">Intervenant</string>
-    <string name="content_description_contact_is_speaker">Contact is a speaker</string>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml
deleted file mode 100644
index d4999c668..000000000
--- a/app/src/main/res/values-he/strings.xml
+++ /dev/null
@@ -1,303 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE resources [
-<!ENTITY appName "Linphone">
-]>
-<resources xmlns:tools="http://schemas.android.com/tools">
-    <string name="sync_account_name">אנשי קשר</string>
-    <string name="about_privacy_policy">קבל מידע אודות הסכם הפרטיות שלנו</string>
-    <string name="logs_upload_failure">נכשל בהעלאת קבצי היומן!</string>
-    <string name="logs_reset_complete">רישומי היומן נמחקו</string>
-    <string name="logs_url_copied_to_clipboard">כתובת היומן הועתקה ללוח</string>
-    <string name="phone_number">מספר טלפון</string>
-    <string name="phone_numbers">מספרי טלפון</string>
-    <string name="international_prefix">קידומת</string>
-    <string name="assistant_choose_country">בחר מדינה</string>
-    <string name="assistant_choose_country_title">שם מדינה או קידומת</string>
-    <string name="username">שם משתמש</string>
-    <string name="password">סיסמה</string>
-    <string name="email">דוא\"ל</string>
-    <string name="domain">תחום (דומיין)</string>
-    <string name="sip_address">כתובת SIP</string>
-    <string name="sip_addresses">כתובות SIP</string>
-    <string name="cancel">בטל</string>
-    <string name="share_uploaded_logs_link">שתף קישור ליומנים באמצעות…</string>
-    <string name="today">היום</string>
-    <string name="yesterday">אתמול</string>
-    <string name="transport">תעבורה</string>
-    <string name="status_connected">מחובר</string>
-    <string name="status_not_connected">לא מחובר</string>
-    <string name="status_error">חיבור נכשל</string>
-    <string name="no_account_configured">חשבון לא מוגדר</string>
-    <string name="about">אודות</string>
-    <string name="assistant">סיוע</string>
-    <string name="recordings">הקלטות</string>
-    <string name="settings">הגדרות</string>
-    <string name="quit">צא</string>
-    <string name="history_calls_list">שיחות</string>
-    <string name="no_call_history">אין שיחות אחרונות</string>
-    <string name="no_conference_call_history">אין שיחות ועידה אחרונות</string>
-    <string name="history_delete_one_dialog">האם למחוק את ההקלטה הנוכחית\?</string>
-    <string name="contact_invite_friend">הזמן</string>
-    <string name="no_contact">אין אנשי קשר בפנקס הכתובות.</string>
-    <string name="no_sip_contact">אין אנשי קשר עם כתובת SIP בפנקס הכתובות.</string>
-    <string name="contact_filter_hint">חפש אנשי קשר</string>
-    <string name="contact_last_name">שם משפחה</string>
-    <string name="contact_first_name">שם פרטי</string>
-    <string name="contact_organization">ארגון</string>
-    <string name="contact_choose_existing_or_new_to_add_number">בחר איש קשר או צור חדש</string>
-    <string name="contact_editor_write_permission_denied">הרשאת עדכון אנשי הקשר נדחתה, לא ניתן לערוך איש קשר</string>
-    <string name="contact_new_choose_sync_account">בחר היכן לשמור את איש הקשר</string>
-    <string name="contact_local_sync_account">שמור מקומית</string>
-    <string name="contacts_ldap_query_more_results_available">ישנן עוד תוצאות אפשריות, עדן את החיפוש</string>
-    <string name="debug_popup_enable_logs">אפשר יומנים</string>
-    <string name="debug_popup_disable_logs">בטל יומנים</string>
-    <string name="debug_popup_send_logs">שלח יומנים</string>
-    <string name="debug_popup_show_config_file">הצג קובץ תצורה</string>
-    <string name="no_chat_history">ללא התכתבויות</string>
-    <string name="chat_remote_is_composing">מקליד…</string>
-    <string name="chat_event_conference_created">הצטרפת לקבוצה</string>
-    <string name="chat_event_conference_destroyed">עזבת את הקבוצה</string>
-    <string name="chat_event_participant_added">%s הצטרף</string>
-    <string name="chat_event_participant_removed">%s עזב</string>
-    <string name="chat_event_device_added">מכשיר חדש עבור %s</string>
-    <string name="chat_event_subject_changed">נושא חדש: %s</string>
-    <string name="chat_event_admin_set">%s הוא המנהל</string>
-    <string name="chat_event_admin_unset">%s אינו המנהל יותר</string>
-    <string name="chat_security_event_lime_identity_key_changed">מפתח ההזדהות של LINE שונה עבור %s</string>
-    <string name="chat_security_event_security_level_downgraded">רמת האבטחה ירדה בעקבות %s</string>
-    <string name="chat_security_event_participant_max_count_exceeded">רף המשתתפים המותר עבור %s נחצה</string>
-    <string name="chat_event_ephemeral_disabled">ביטלת הודעות זמניות</string>
-    <string name="chat_event_ephemeral_enabled">איפשרת הודעות זמניות: %s</string>
-    <string name="chat_message_pick_file_dialog">בחר מקור</string>
-    <string name="chat_room_devices_fragment_title">מכשירים</string>
-    <string name="chat_room_group_info_title">מידע</string>
-    <string name="chat_room_group_info_participants">משתתפים</string>
-    <string name="chat_room_group_info_admin">מנהל</string>
-    <string name="chat_room_group_info_leave">עזב את הקבוצה</string>
-    <string name="chat_room_group_info_leave_dialog_button">עזוב</string>
-    <string name="chat_room_group_info_leave_dialog_message">האם ברצונך לעזוב את ההתכתבות הזו\?</string>
-    <string name="chat_room_group_info_you_are_now_admin">אתה המנהל</string>
-    <string name="chat_message_imdn_info">מצב שליחה</string>
-    <string name="chat_message_imdn_displayed">נקרא</string>
-    <string name="chat_message_imdn_delivered">נשלח</string>
-    <string name="chat_message_imdn_undelivered">לא נשלחה</string>
-    <string name="chat_message_imdn_sent">נשלח</string>
-    <string name="chat_message_forwarded">הועבר</string>
-    <string name="chat_message_replied">השב</string>
-    <string name="chat_message_context_menu_resend">שליחה נוספת</string>
-    <string name="chat_message_context_menu_copy_text">העתק טקסט</string>
-    <string name="chat_message_context_menu_forward">העבר</string>
-    <string name="chat_message_context_menu_reply">השב</string>
-    <string name="chat_message_context_menu_imdn_info">סטטוס שליחה</string>
-    <string name="chat_message_context_menu_delete">מחק</string>
-    <string name="chat_message_forward_confirmation_dialog">האם ברצונך להעביר את ההודעה לחדר זה\?</string>
-    <string name="chat_room_choose_conversation_for_file_sharing">בחר או צור התכתבות לשיתוף הקבצים</string>
-    <string name="chat_room_choose_conversation_for_text_sharing">בחר או צור התכתבות לשיתוף טקסט</string>
-    <string name="chat_room_file_not_found">קובץ לא נמצא</string>
-    <string name="chat_room_context_menu_group_info">אודות הקבוצה</string>
-    <string name="chat_room_context_menu_participants_devices">מכשירים בהתכתבות</string>
-    <string name="chat_message_context_menu_ephemeral_messages">הודעה זמנית</string>
-    <string name="chat_message_context_menu_delete_messages">מחק הודעות</string>
-    <string name="chat_room_ephemeral_fragment_title">הודעות זמניות</string>
-    <string name="chat_room_ephemeral_message_disabled">לא מאופשר</string>
-    <string name="chat_room_ephemeral_message_one_minute">דקה אחת</string>
-    <string name="chat_room_ephemeral_message_one_hour">שעה אחת</string>
-    <string name="chat_room_ephemeral_message_one_day">יום אחד</string>
-    <string name="chat_room_ephemeral_message_three_days">שלושה ימים</string>
-    <string name="chat_room_ephemeral_message_one_week">שבוע אחד</string>
-    <plurals name="chat_room_remote_composing">
-        <item quantity="one">%s מקליד…</item>
-        <item quantity="two">%s מקלידים…</item>
-        <item quantity="many"></item>
-        <item quantity="other"></item>
-    </plurals>
-    <string name="chat_room_creation_failed_snack">כשלון ביצירת חדר התכתבות</string>
-    <string name="chat_room_removal_failed_snack">הסרת חדר התכתבות נכשלה</string>
-    <string name="chat_room_delete_one_dialog">האם אתה בטוח שברצונך למחוק התכתבות זו\?</string>
-    <string name="chat_message_cant_open_file_in_app_dialog_message">להציג כטקסט או לייצא (באופן לא מוצפן) ליישום צד שלישי שזמין\?</string>
-    <string name="chat_message_cant_open_file_in_app_dialog_export_button">ייצא</string>
-    <string name="chat_message_cant_open_file_in_app_dialog_open_as_text_button">פתח כקובץ</string>
-    <string name="chat_room_sending_reply_hint">השב</string>
-    <string name="chat_room_sending_message_hint">הודעה</string>
-    <plurals name="chat_room_unread_messages_event">
-        <item quantity="one">%1$d הודעה שלא נקראה</item>
-        <item quantity="two">%1$d הודעות שלא נקראו</item>
-        <item quantity="many"></item>
-        <item quantity="other"></item>
-    </plurals>
-    <string name="chat_message_removal_info">ההודעה תימחק</string>
-    <string name="chat_message_abort_removal">בטל</string>
-    <string name="recordings_empty_list">אין הקלטות</string>
-    <string name="conference">ועידה</string>
-    <string name="conference_schedule_title">החל בועידה</string>
-    <string name="conference_schedule_later">האם ברצונך לתזמן ועידה זו למועד מאוחר יותר\?</string>
-    <string name="conference_schedule_mandatory_field">חובה</string>
-    <string name="conference_schedule_subject_title">נושא</string>
-    <string name="conference_schedule_subject_hint">נושא ועידה</string>
-    <string name="conference_schedule_address_title">כתובת ועידה</string>
-    <string name="conference_schedule_description_title">הוסף תיאור</string>
-    <string name="conference_schedule_description_hint">תיאור</string>
-    <string name="conference_schedule_date">תאריך</string>
-    <string name="conference_schedule_time">זמן</string>
-    <string name="conference_schedule_duration">משך</string>
-    <string name="conference_schedule_timezone">איזור זמן</string>
-    <string name="conference_schedule_send_invite_chat">שלח הזמנה באמצעות &appName;</string>
-    <string name="conference_schedule_encryption">האם ברצונך להצפין את ההתכתבות\?</string>
-    <string name="conference_schedule_participants_list">רשימת משתתפים</string>
-    <string name="conference_organizer">מארגן</string>
-    <string name="conference_schedule_summary">מידע ועידה</string>
-    <string name="conference_schedule_address_copied_to_clipboard">כתובת הועידה הועתקה ללוח</string>
-    <string name="conference_schedule_info_not_sent_to_participant">נכשל בשליחת מידע אודות הועידה למשתתף</string>
-    <string name="conference_default_title">ועידה מרחוק</string>
-    <string name="conference_local_title">ועידה מקומית</string>
-    <string name="conference_invite_title">הזמנה לועידה;</string>
-    <string name="conference_description_title">תיאור:</string>
-    <string name="conference_invite_join">הצטרף</string>
-    <string name="conference_invite_participants_count" tools:ignore="PluralsCandidate">%d משתתפים</string>
-    <string name="conference_display_mode_mosaic">מצב פסיפס</string>
-    <string name="conference_display_mode_active_speaker">מצב דובר פעיל</string>
-    <string name="conference_display_mode_audio_only">שמע בלבד</string>
-    <string name="conference_waiting_room_start_call">התחל</string>
-    <string name="conference_waiting_room_cancel_call">בטל</string>
-    <string name="conference_scheduled">ועידות</string>
-    <string name="conference_layout_too_many_participants_for_mosaic">לא ניתן לשנות את עיצוב הועידה, יש מספר רב של משתתפים</string>
-    <string name="conference_participant_paused">(נעצר)</string>
-    <string name="conference_no_schedule">אין ועידות מתוזמנות כרגע.</string>
-    <string name="conference_schedule_organizer">מארגן:</string>
-    <string name="conference_go_to_chat">חדר התכתבות לועידה</string>
-    <string name="conference_creation_failed">נכשל ביצירת ועידה</string>
-    <string name="conference_admin_set">%s הוא מנהל</string>
-    <string name="conference_admin_unset">%s כבר לא מנהל</string>
-    <string name="conference_schedule_info_created">ועידה תוזמנה</string>
-    <string name="conference_scheduled_delete_one_dialog">האם ברצונך למחוק ועידה זו\?</string>
-    <string name="conference_info_removed">מידע אודות הועידה נמחק</string>
-    <string name="conference_invitation">הזמנה לועידה</string>
-    <string name="conference_low_bandwidth">רוחב פס נמוך,מבטל וידאו</string>
-    <string name="conference_first_to_join">אתה הראשון להצטרף לועידה</string>
-    <string name="conference_last_user">כל שאר המשתתפים עזבו את הועידה</string>
-    <string name="call_incoming_title">שיחה נכנסת</string>
-    <string name="call_outgoing_title">שיחה יוצאת</string>
-    <string name="call_notification_paused">החזק שיחה</string>
-    <string name="call_notification_outgoing">שיחה יוצאת</string>
-    <string name="call_error_declined">שיחה נדחית</string>
-    <string name="call_error_user_busy">תפוס</string>
-    <string name="call_error_network_unreachable">רשת לא נגישה</string>
-    <string name="call_error_io_error">שרות לא זמין או תקלת רשת</string>
-    <string name="call_error_server_timeout">שרת לא עונה</string>
-    <string name="call_error_temporarily_unavailable">זמנית השרות לא פעיל</string>
-    <string name="call_error_generic">שגיאה: %s</string>
-    <string name="call_action_participants_list">רשימת משתתפים</string>
-    <string name="call_action_chat">התכתבות</string>
-    <string name="call_action_calls_list">רשימת שיחות</string>
-    <string name="call_action_numpad">לוח מקשי מספר</string>
-    <string name="call_action_change_conf_layout">שנה פריסה</string>
-    <string name="call_action_statistics">סטטיסטיקת שיחה</string>
-    <string name="call_action_add_call">התחל שיחה חדשה</string>
-    <string name="call_action_transfer_call">העבר שיחה</string>
-    <string name="call_context_action_resume">חדש שיחה</string>
-    <string name="call_context_action_pause">החזק שיחה</string>
-    <string name="call_context_action_transfer">העבר שיחה</string>
-    <string name="call_context_action_answer">ענה לשיחה</string>
-    <string name="call_remote_recording">שיחה זו מוקלטת.</string>
-    <string name="call_remotely_paused_title">שיחה מוחזקת בצד המרוחק.</string>
-    <string name="call_locally_paused_title">אתה מחזיק את השיחה.</string>
-    <string name="call_stats_audio">מצב שיחה</string>
-    <string name="call_stats_video">וידיאו</string>
-    <string name="call_stats_codec">מקודד:</string>
-    <string name="call_stats_ip">סוג IP:</string>
-    <string name="call_stats_upload">קצב העלאה:</string>
-    <string name="call_stats_download">קצב הורדה:</string>
-    <string name="call_stats_ice">חיבוריות ICE:</string>
-    <string name="call_stats_video_resolution_sent">רזולוצית וידיאו נשלחת:</string>
-    <string name="call_stats_video_resolution_received">רזולוצית וידיאו מתקבלת:</string>
-    <string name="call_stats_video_fps_sent">קצב פריימים לשניה שנשלח:</string>
-    <string name="call_stats_receiver_loss_rate">דרוג איבוד קבלת נתונים:</string>
-    <string name="call_stats_sender_loss_rate">דירוג איבוד שליחת נתונים:</string>
-    <string name="call_stats_jitter_buffer">Jitter buffer:</string>
-    <string name="call_stats_encoder_name">מקודד:</string>
-    <string name="call_stats_decoder_name">מפענח:</string>
-    <string name="call_stats_player_filter">מסנן נגן:</string>
-    <string name="call_stats_capture_filter">סנן לכידה:</string>
-    <string name="assistant_welcome_title">ברוך הבא</string>
-    <string name="assistant_create_account">יצירת חשבון</string>
-    <string name="assistant_login_linphone">השתמש בחשבון &appName;</string>
-    <string name="assistant_login_generic">השתמש בחשבון SIP</string>
-    <string name="assistant_remote_provisioning">קבל הגדרות מרחוק</string>
-    <string name="assistant_ec_calibration">מכייל ביטול הד</string>
-    <string name="assistant_phone_number_info_title">למה מספר הטלפון שלי ישמש\?</string>
-    <string name="assistant_read_and_agree_terms">אני מסכים ל%2$s ו %1$s של \"Belledonne Communications\"</string>
-    <string name="assistant_error_phone_number_invalid_characters">מותר מספרים בלבד</string>
-    <string name="assistant_error_username_already_exists">משתמש בשימוש</string>
-    <string name="assistant_error_phone_number_already_exists">כבר קיים חשבון המשתמש במספר זה</string>
-    <string name="assistant_error_passwords_dont_match">סיסמה לא תואמת</string>
-    <string name="assistant_error_invalid_email_address">כתובת דוא\"ל לא חוקית</string>
-    <string name="assistant_error_username_too_long">יותר מידי תווים בשם המשתמש</string>
-    <string name="assistant_error_invalid_credentials">חשבון לא קיים או סיסמה לא תואמת</string>
-    <string name="notification_channel_incoming_call_name">התראת שיחה נכנסת</string>
-    <string name="service_description">נדרש עבור קבלת שיחות כאשר פועל ברקע</string>
-    <string name="about_weblate_translation">עזור לנו לתרגם את</string>
-    <string name="select_your_country">בחר את המדינה שבה אתה נמצא</string>
-    <plurals name="days">
-        <item quantity="one">יום</item>
-        <item quantity="two">ימים</item>
-        <item quantity="many"></item>
-        <item quantity="other"></item>
-    </plurals>
-    <string name="status_in_progress">בתהליך חיבור</string>
-    <string name="no_missed_call_history">אין שיחות שלא נענו</string>
-    <string name="history_delete_many_dialog">האםנאתה רוצה למחוק את ההקלטה הנוכחית\?</string>
-    <string name="contact_send_sms_invite_text">היי, הצטרף אליי ב&appName;! אתה יכול להוריד בחינם ב %s</string>
-    <string name="contact_delete_one_dialog">האם ברצונך למחוק איש קשר זה\? פעולה זו תסיר את איש הקשר מפנקס הכתובות של מכשירך</string>
-    <string name="contact_delete_many_dialog">האם אתה בטוח שברצונך למחוק את אנשי הקשר שנבחרו\? אנשי הקשר יוסרו מפנקס הכתובות של מכשירך</string>
-    <string name="contact_cant_be_deleted">לא ניתן למחוק איש קשר זה</string>
-    <string name="dialer_address_bar_hint">הקש מספר טלפון או כתובת לחיוג</string>
-    <string name="dialer_transfer_succeded">השיחה מועברת</string>
-    <string name="dialer_transfer_failed">לא ניתן להעביר את השיחה</string>
-    <string name="chat_event_device_removed">המכשיר של %s הוסר</string>
-    <string name="chat_security_event_man_in_the_middle_detected">תקיפת Man-in-the-middle זוהתה עבור משתמש %s</string>
-    <string name="chat_event_ephemeral_lifetime_changed">תאריך פג תוקף להודעה זמנית: %s</string>
-    <string name="chat_message_download_file">הורדה</string>
-    <string name="chat_room_group_info_subject_hint">שם הקבוצה</string>
-    <string name="chat_room_group_info_you_are_no_longer_admin">אתה כבר לא עוד המנהל</string>
-    <string name="chat_message_context_menu_add_to_contacts">הוסף לאנשי הקשר</string>
-    <string name="chat_room_choose_conversation_for_message_forward">בחר או צור התכתבות להעברת ההודעה</string>
-    <string name="chat_room_ephemeral_messages_desc">הודעה זו תמחק אצל כולם לאחר הקריאה ולאחר פגות תוקפה.</string>
-    <string name="chat_room_delete_many_dialog">האם אתה בטוח שברצונך למחוק את ההתכתבויות\?</string>
-    <string name="chat_message_notification_hidden_content">&lt;נערך&gt;</string>
-    <string name="chat_message_no_app_found_to_handle_file_mime_type">אין יישום זמין לסוג קובץ זה</string>
-    <string name="chat_bubble_cant_open_enrypted_file">לא ניתן לפתוח קובץ מוצפן בבועת שיחה</string>
-    <string name="chat_message_cant_open_file_in_app_dialog_title">נראה כי לא ניתן להציג קובץ זה.</string>
-    <string name="chat_message_voice_recording_hold_to_record">החזק להקלטה קולית</string>
-    <string name="chat_message_voice_recording_playback_low_volume">עוצמת השמע נמוכה, יכול להיות שתרצה להגביר</string>
-    <string name="chat_message_download_already_in_progress">אנא המתן לסיום ההורדה הראשונה בטרם תתחיל הורדה חדשה</string>
-    <string name="conference_schedule_send_invite_email">שלח הזמנה באמצעות דוא\"ל</string>
-    <string name="conference_schedule_send_invite_chat_summary">הזמנה תשלח באמצעות חשבון &appName;</string>
-    <string name="conference_paused_title">אתה מחוץ לועידה.</string>
-    <string name="conference_paused_subtitle">לחץ על לחצן הנגן כדי להצטרף בחזרה.</string>
-    <string name="conference_waiting_room_video_disabled">וידיאו לא מאופשר כרגע</string>
-    <string name="conference_too_many_participants_for_mosaic_layout">יש מספר רב של משתתפים בפריסת פסיפס, עובר למצב דובר פעיל</string>
-    <string name="conference_invitation_received_notification">הוזמנת לועידה</string>
-    <string name="call_notification_active">שיחה פעילה</string>
-    <string name="call_error_user_not_found">משתמש לא נמצא</string>
-    <string name="call_error_incompatible_media_params">מדיה לא מתואמת</string>
-    <string name="call_video_update_requested_dialog">מבקש להפעיל את הוידיאו</string>
-    <string name="call_context_action_hangup">סיים שיחה</string>
-    <string name="call_locally_paused_subtitle">לחץ על לחצן הנגן לחידוש.</string>
-    <string name="call_stats_estimated_download">קצב הורדה משוערך:</string>
-    <string name="call_stats_video_fps_received">קצב פריימים לשניה המתקבל:</string>
-    <string name="assistant_welcome_desc">עזר זה יסיע לך להגדיר חשבון SIP.</string>
-    <string name="assistant_phone_number_link_info_content">"
-\nYour friends will find you more easily if you link your account to your phone number
-\n
-\nYou will see in your address book who is using &appName; and your friends will know that they can reach you on &appName; as well.
-\n"</string>
-    <string name="assistant_phone_number_link_info_content_already_account">You can only use your phone number with one &appName; account.
-\n
-\nIf you had already linked your number to an other account but you prefer to use this one, simply link it now and your number will automatically be moved to this account.</string>
-    <string name="assistant_general_terms">תנאי השימוש</string>
-    <string name="assistant_privacy_policy">מדיניות פרטיות</string>
-    <string name="assistant_generic_account_warning_continue_button_text">אני מסכים</string>
-    <string name="assistant_error_username_invalid_characters">נמצאו תווים לא חוקיים</string>
-    <string name="notification_channel_service_name">&appName; service notification</string>
-    <string name="notification_channel_missed_call_name">שיחה שלא נענתה</string>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
deleted file mode 100644
index 386499bc6..000000000
--- a/app/src/main/res/values-hu/strings.xml
+++ /dev/null
@@ -1,610 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE resources [
-<!ENTITY appName "Linphone">
-]>
-<resources xmlns:tools="http://schemas.android.com/tools">
-    <string name="logs_upload_failure">Nem sikerült feltölteni a naplókat!</string>
-    <string name="logs_reset_complete">A naplók törlésre kerültek</string>
-    <string name="logs_url_copied_to_clipboard">A naplók URL-je a vágólapra másolva</string>
-    <string name="about_privacy_policy">Az adatvédelmi szabályzatunkat megtekintése</string>
-    <string name="sync_account_name">&appName; névjegyek</string>
-    <string name="phone_number">Telefonszám</string>
-    <string name="select_your_country">Ország/régió kiválasztása</string>
-    <string name="international_prefix">Nemzetközi előhívószám</string>
-    <string name="assistant_choose_country">Ország/régió kiválasztása</string>
-    <string name="username">Felhasználónév</string>
-    <string name="password">Jelszó</string>
-    <string name="email">E-mail-cím</string>
-    <string name="domain">Tartomány</string>
-    <string name="sip_address">SIP-cím</string>
-    <string name="sip_addresses">SIP-címek</string>
-    <string name="cancel">Mégse</string>
-    <plurals name="days">
-        <item quantity="one">%d nap</item>
-        <item quantity="other">%d nap</item>
-    </plurals>
-    <string name="today">Ma</string>
-    <string name="yesterday">Tegnap</string>
-    <string name="transport">Forgalom</string>
-    <string name="transport_udp">UDP</string>
-    <string name="transport_tcp">TCP</string>
-    <string name="transport_tls">TLS</string>
-    <string name="app_description">a <i>szabad</i> SIP-ügyfél</string>
-    <string name="status_connected">Csatlakoztatva</string>
-    <string name="status_not_connected">Nincs csatlakozva</string>
-    <string name="status_in_progress">A kapcsolódás folyamatban van</string>
-    <string name="no_account_configured">Nincs beállítva fiók</string>
-    <string name="about">Névjegy</string>
-    <string name="assistant">Segéd</string>
-    <string name="recordings">Felvételek</string>
-    <string name="settings">Beállítások</string>
-    <string name="quit">Kilépés</string>
-    <string name="history_calls_list">Hívások</string>
-    <string name="no_missed_call_history">Nem találhatók nem fogadott hívás előzmények</string>
-    <string name="service_description">Erre azért van szükség, hogy háttérben hívásokat fogadjon</string>
-    <string name="history_delete_many_dialog">Törli ezeket a rekordokat\?</string>
-    <string name="contact_invite_friend">Meghívás</string>
-    <string name="no_contact">Nincs névjegy a címjegyzékben.</string>
-    <string name="contact_filter_hint">Névjegyek keresése</string>
-    <string name="contact_last_name">Vezetéknév</string>
-    <string name="contact_first_name">Keresztnév</string>
-    <string name="contact_organization">Szervezet</string>
-    <string name="debug_popup_title">Hibakeresés</string>
-    <string name="debug_popup_enable_logs">Naplók engedélyezése</string>
-    <string name="debug_popup_disable_logs">Naplók letiltása</string>
-    <string name="debug_popup_send_logs">Naplók küldése</string>
-    <string name="debug_popup_show_config_file">Beállítási fájl megtekintése</string>
-    <string name="chat_remote_is_composing">Távoli éppen üzenetet ír…</string>
-    <string name="contact_local_sync_account">Helyi tárolás</string>
-    <string name="dialer_address_bar_hint">Adjon meg egy számot vagy címet</string>
-    <string name="chat_event_conference_destroyed">Kilépett a csoportból</string>
-    <string name="chat_event_participant_added">%s csatlakozott</string>
-    <string name="chat_event_participant_removed">%s kilépett</string>
-    <string name="chat_event_device_added">új eszköz %s számára</string>
-    <string name="chat_message_pick_file_dialog">Forrás kiválasztása</string>
-    <string name="chat_room_devices_fragment_title">Beszélgetés eszközei</string>
-    <string name="chat_room_group_info_title">Adatok</string>
-    <string name="chat_room_group_info_participants">Résztvevők</string>
-    <string name="chat_room_group_info_subject_hint">Csoport elnevezése</string>
-    <string name="chat_message_download_file">Letöltés</string>
-    <string name="chat_event_admin_set">%s felügyelő</string>
-    <string name="chat_room_group_info_admin">Felügyelő</string>
-    <string name="chat_event_admin_unset">%s már nem felügyelő</string>
-    <string name="no_chat_history">Nincs beszélgetési előzmény</string>
-    <string name="contact_choose_existing_or_new_to_add_number">Névjegy kiválasztása vagy új névjegy létrehozása</string>
-    <string name="contact_delete_one_dialog">Törli ezt a névjegyet\?\nEltávolítja az eszköz címjegyzékéből is</string>
-    <string name="contact_new_choose_sync_account">Válassza ki, hová mentse a névjegyet</string>
-    <string name="chat_event_device_removed">%s eszköz eltávolítva</string>
-    <string name="chat_security_event_lime_identity_key_changed">A LIME-azonosító kulcs megváltozott %s számára</string>
-    <string name="chat_security_event_man_in_the_middle_detected">Közbeékelődéses támadás észlelt %s számára</string>
-    <string name="chat_security_event_security_level_downgraded">Biztonsági szint csökkent a(z) %s miatt</string>
-    <string name="chat_security_event_participant_max_count_exceeded">A legtöbb résztvevő száma meghaladja a(z) %s értéket</string>
-    <string name="chat_event_ephemeral_disabled">Elmúló üzeneteket letiltotta</string>
-    <string name="chat_event_ephemeral_enabled">Elmúló üzeneteket engedélyezte: %s</string>
-    <string name="chat_room_group_info_leave_dialog_button">Kilépés</string>
-    <string name="chat_room_group_info_you_are_now_admin">Ön most felügyelő</string>
-    <string name="chat_message_imdn_info">Kézbesítés állapota</string>
-    <string name="chat_message_imdn_displayed">Elolvasott</string>
-    <string name="chat_message_imdn_delivered">Kézbesítve</string>
-    <string name="chat_message_imdn_undelivered">Kézbesítetlen</string>
-    <string name="chat_message_imdn_sent">Elküldve</string>
-    <string name="chat_message_forwarded">Továbbítva</string>
-    <string name="chat_message_context_menu_resend">Újraküldés</string>
-    <string name="chat_message_context_menu_copy_text">Szöveg másolása</string>
-    <string name="chat_message_context_menu_forward">Továbbítás</string>
-    <string name="chat_message_context_menu_imdn_info">Kézbesítés állapota</string>
-    <string name="chat_message_context_menu_delete">Törlés</string>
-    <string name="chat_room_file_not_found">Fájl nem található</string>
-    <string name="chat_room_context_menu_group_info">Csoport adatai</string>
-    <string name="chat_message_context_menu_delete_messages">Üzenetek törlése</string>
-    <string name="chat_room_ephemeral_fragment_title">Elmúló üzenetek</string>
-    <string name="chat_room_ephemeral_message_disabled">Letiltva</string>
-    <string name="chat_room_ephemeral_message_one_minute">1 perc</string>
-    <string name="chat_room_ephemeral_message_one_hour">1 óra</string>
-    <string name="chat_room_ephemeral_message_one_day">1 nap</string>
-    <string name="chat_room_ephemeral_message_three_days">3 nap</string>
-    <string name="chat_room_ephemeral_message_one_week">1 hét</string>
-    <string name="chat_room_creation_failed_snack">A csevegőszoba létrehozása sikertelen</string>
-    <string name="chat_room_group_info_leave_dialog_message">Szeretné kilépni ezt a beszélgetést\?</string>
-    <string name="chat_room_delete_many_dialog">Biztosan törli ezeket a beszélgetéseket\?</string>
-    <string name="chat_message_notification_hidden_content">&lt;Kitakarva&gt;</string>
-    <string name="chat_message_no_app_found_to_handle_file_mime_type">Az ilyen fájlokhoz nem áll rendelkezésre alkalmazás</string>
-    <string name="chat_bubble_cant_open_enrypted_file">Nem lehet megnyitni a titkosított fájlt a csevegésbuborékban</string>
-    <string name="chat_message_cant_open_file_in_app_dialog_export_button">Exportálás</string>
-    <string name="chat_message_cant_open_file_in_app_dialog_open_as_text_button">Megnyitás szövegként</string>
-    <string name="chat_room_removal_failed_snack">A csevegőszoba eltávolítása sikertelen</string>
-    <string name="recordings_empty_list">Nincsenek felvételek</string>
-    <string name="chat_room_context_menu_participants_devices">A beszélgetés eszközei</string>
-    <plurals name="chat_room_remote_composing">
-        <item quantity="one">%s ír…</item>
-        <item quantity="other">%s írnak…</item>
-    </plurals>
-    <string name="chat_message_forward_confirmation_dialog">Szeretné továbbítani az üzenetet ebben a szobában\?</string>
-    <string name="call_outgoing_title">Kimenő hívás</string>
-    <string name="call_notification_outgoing">Kimenő hívás</string>
-    <string name="call_error_user_busy">Felhasználó elfoglalt</string>
-    <string name="call_error_network_unreachable">Hálózat elérhetetlen</string>
-    <string name="call_error_io_error">A szolgáltatás nem érhető el vagy hálózati hiba történt</string>
-    <string name="call_stats_audio">Hang</string>
-    <string name="call_stats_video">Videó</string>
-    <string name="call_stats_codec">Kodek:</string>
-    <string name="call_stats_ip">IP-család:</string>
-    <string name="call_stats_upload">Feltöltési sávszélesség:</string>
-    <string name="call_stats_download">Letöltési sávszélesség:</string>
-    <string name="call_notification_paused">Szüneteltetett hívás</string>
-    <string name="call_notification_active">Hívásfuttatás</string>
-    <string name="call_error_declined">Hívás elutasítva</string>
-    <string name="call_error_user_not_found">Felhasználó nem található</string>
-    <string name="call_error_incompatible_media_params">Nem kompatibilis adathordozó-paraméterek</string>
-    <string name="call_stats_ice">ICE-kapcsolat:</string>
-    <string name="call_stats_video_resolution_sent">Elküldött videó felbontása:</string>
-    <string name="call_stats_video_resolution_received">Fogadott videó felbontása:</string>
-    <string name="call_stats_video_fps_sent">Elküldött videó képkocka/másodperc:</string>
-    <string name="call_stats_video_fps_received">Fogadott videó képkocka/másodperc:</string>
-    <string name="call_stats_sender_loss_rate">Feladó veszteségi aránya:</string>
-    <string name="call_stats_receiver_loss_rate">Címzett veszteségi aránya:</string>
-    <string name="call_stats_jitter_buffer">Vibrálás tartalék:</string>
-    <string name="call_stats_encoder_name">Kódoló:</string>
-    <string name="call_stats_player_filter">Lejátszói szűrő:</string>
-    <string name="call_stats_capture_filter">Rögzítési szűrő:</string>
-    <string name="assistant_welcome_title">Isten hozott!</string>
-    <string name="assistant_create_account">Fiók létrehozása</string>
-    <string name="assistant_login_linphone">&appName;-fiók használata</string>
-    <string name="assistant_login_generic">SIP-fiók használata</string>
-    <string name="assistant_remote_provisioning">Távoli beállítások lekérése</string>
-    <string name="assistant_phone_number_info_title">Hogyan fog a telefonszámom használódni\?</string>
-    <string name="assistant_phone_number_link_info_content_already_account">Telefonszámát csak egy &appName;-fiókjával használhatja.\n\nHa már összekapcsolta telefonszámát egy másik fiókkal, de inkább ezt használja, egyszerűen kapcsolja össze most, és a telefonszám önműködően átkerül erre a fiókra.</string>
-    <string name="assistant_error_username_already_exists">Ez a felhasználónév már foglalt</string>
-    <string name="assistant_linphone_account">Használja a(z) &appName;-fiókját</string>
-    <string name="assistant_read_and_agree_terms">Elfogadom a Belledonne Communications %1$s és %2$s</string>
-    <string name="assistant_error_phone_number_invalid_characters">Itt csak számjegyek megengedettek</string>
-    <string name="assistant_error_phone_number_already_exists">Már van egy fiók, amely ezt a számot használja</string>
-    <string name="assistant_error_username_invalid_characters">Érvénytelen karaktereket talált</string>
-    <string name="assistant_error_passwords_dont_match">Nem egyeznek a jelszavak</string>
-    <string name="assistant_error_username_too_long">A felhasználónév túl sok karaktert tartalmaz</string>
-    <string name="assistant_error_invalid_credentials">Fiók nem létezik, vagy a jelszó nem egyezik</string>
-    <string name="assistant_login_forgotten_password">Elfelejtette a jelszavát\?</string>
-    <string name="assistant_login">Bejelentkezés</string>
-    <string name="assistant_continue_even_if_credentials_invalid">Folytatás</string>
-    <string name="assistant_display_name_optional">Megjelenítendő név (választható)</string>
-    <string name="assistant_confirmation_code">Visszaigazolási kód</string>
-    <string name="assistant_generic_account">SIP-fiók használata</string>
-    <string name="assistant_login_desc">Kérjük, adja meg felhasználónevét és jelszavát a SIP-tartományhoz</string>
-    <string name="assistant_confirm_password">Jelszó megerősítése</string>
-    <string name="assistant_create_account_part_email">Kérjük, adjon meg egy felhasználónevet, e-mail-címet és jelszót a(z) &appName;-fiókhoz</string>
-    <string name="assistant_link_phone_number_skip">Kihagyás</string>
-    <string name="assistant_link_account">Fiók összekapcsolása</string>
-    <string name="assistant_remote_provisioning_title">Távoli beállítások lekérése</string>
-    <string name="assistant_finish">Beállítás befejezése</string>
-    <string name="assistant_remote_provisioning_url">URL-cím</string>
-    <string name="assistant_fetch_apply">Olvassa be és alkalmazza</string>
-    <string name="assistant_launch_qrcode">QR-kód</string>
-    <string name="settings_accounts_title">SIP-fiókok</string>
-    <string name="settings_default_account_subtitle">Alapértelmezett fiók</string>
-    <string name="settings_list_title">Beállítások</string>
-    <string name="audio_settings_echo_cancellation_summary">Eltávolítja a másik fél által hallott visszhangot</string>
-    <string name="audio_settings_echo_canceller_calibration_title">Visszhangkioltás beállítása</string>
-    <string name="audio_settings_echo_cancellation_calibration_started">Visszhangkioltás beállítása elindítva</string>
-    <string name="audio_settings_echo_cancellation_calibration_value">Visszhangkioltás beállítása: %s ms</string>
-    <string name="audio_settings_echo_cancellation_calibration_failed">Visszhangkioltás beállítása sikertelen</string>
-    <string name="audio_settings_echo_cancellation_calibration_no_echo">Nem észlelt visszhang</string>
-    <string name="audio_settings_echo_tester_title">Visszhang ellenőrzése</string>
-    <string name="audio_settings_echo_tester_summary_is_stopped">Visszhang ellenőrzés leállítva</string>
-    <string name="audio_settings_echo_tester_summary_is_running">Visszhang ellenőrzése folyamatban van</string>
-    <string name="settings_tunnel_title">Alagút</string>
-    <string name="settings_audio_title">Audió</string>
-    <string name="settings_video_title">Videó</string>
-    <string name="settings_call_title">Hívás</string>
-    <string name="settings_chat_title">Csevegés</string>
-    <string name="settings_network_title">Hálózat</string>
-    <string name="settings_contacts_title">Névjegyek</string>
-    <string name="settings_advanced_title">Haladó</string>
-    <string name="settings_primary_account_display_name_title">Megjelenítendő név</string>
-    <string name="settings_primary_account_username_title">Felhasználónév</string>
-    <string name="audio_settings_codecs_title">Kodekek</string>
-    <string name="video_settings_enable_title">Videó engedélyezése</string>
-    <string name="video_settings_camera_device_title">Kamera</string>
-    <string name="video_settings_video_size_title">Előnyben részesített videó méret</string>
-    <string name="audio_settings_input_device_title">Alapértelmezett bemeneti audió eszköz</string>
-    <string name="audio_settings_output_device_title">Alapértelmezett kimeneti audió eszköz</string>
-    <string name="audio_settings_codec_bitrate_title">Kodek bitráta korlátja</string>
-    <string name="audio_settings_microphone_gain_title">Mikrofon erősítés</string>
-    <string name="audio_settings_microphone_gain_summary">(decibelben)</string>
-    <string name="audio_settings_playback_gain_summary">(decibelben)</string>
-    <string name="video_settings_initiate_call_title">Videó hívások kezdeményezése</string>
-    <string name="video_settings_initiate_call_summary">Mindig küldjön videó kéréseket</string>
-    <string name="video_settings_automatically_accept_title">Fogadja a beérkező videó kéréseket</string>
-    <string name="video_settings_video_preset_title">Előre beállított videó</string>
-    <string name="call_settings_media_encryption_none">Nincs</string>
-    <string name="chat_settings_auto_download_always">Mindig</string>
-    <string name="video_settings_preferred_fps_title">Előnyben részesített FPS</string>
-    <string name="video_settings_bandwidth_limit_title">Sávszélesség-korlát</string>
-    <string name="video_settings_bandwidth_limit_summary">kbits/s-ban</string>
-    <string name="call_settings_vibrate_title">Rezeg, amíg a bejövő hívás kicseng</string>
-    <string name="call_settings_encryption_title">Média titkosítás</string>
-    <string name="call_settings_media_encryption_srtp">SRTP</string>
-    <string name="call_settings_media_encryption_zrtp">ZRTP</string>
-    <string name="call_settings_media_encryption_dtls">DTLS-SRTP</string>
-    <string name="call_settings_encryption_mandatory_title">Média titkosítása kötelező</string>
-    <string name="call_settings_overlay_title">Hívás értesítés átfedése</string>
-    <string name="call_settings_system_wide_overlay_title">Átfedés megjelenítése az alkalmazáson kívül</string>
-    <string name="call_settings_system_wide_overlay_summary">Megkérjük, hogy adjon átfedési engedélyt</string>
-    <string name="call_settings_auto_start_title">Azonnal indítsa el a hívást</string>
-    <string name="call_settings_auto_answer_delay_title">Önműködő válasz ideje</string>
-    <string name="call_settings_auto_answer_delay_summary">ezredmásodpercekben</string>
-    <string name="call_settings_incoming_timeout_title">Bejövő hívás időkorlátja</string>
-    <string name="call_settings_incoming_timeout_summary">másodpercekben</string>
-    <string name="call_settings_voice_mail_uri_title">Hangposta URI</string>
-    <string name="call_settings_accept_early_media_title">Fogadja el a korai médiát</string>
-    <string name="call_settings_go_to_android_notification_settings">Android értesítési beállításai</string>
-    <string name="chat_settings_file_sharing_url_title">Kiszolgáló URL-címe megosztása</string>
-    <string name="advanced_settings_background_mode_title">Háttér mód</string>
-    <string name="advanced_settings_background_mode_summary">Értesítést mutat az alkalmazás életben tartása érdekében</string>
-    <string name="chat_settings_auto_download_never">Soha</string>
-    <string name="chat_settings_auto_download_max_size_title">Maximális méret</string>
-    <string name="chat_settings_auto_download_max_size_summary">bájtokban</string>
-    <string name="chat_settings_downloaded_media_public_title">Tegye nyilvánossá a letöltött médiát</string>
-    <string name="chat_settings_hide_notification_content_title">Az üzenet tartalmának elrejtése az értesítésekben</string>
-    <string name="chat_settings_hide_notification_content_summary">Csak a feladó neve jelenik meg</string>
-    <string name="chat_settings_go_to_android_notification_settings">Android értesítési beállításai</string>
-    <string name="chat_settings_use_in_app_file_viewer_title">Mindig nyissa meg a fájlokat ezen az alkalmazáson belül</string>
-    <string name="network_settings_wifi_only_title">Csak WiFi-t használjon</string>
-    <string name="network_settings_allow_ipv6_title">IPv6 engedélyezése</string>
-    <string name="network_settings_random_ports_title">Használjon véletlenszerű kikötőket</string>
-    <string name="network_settings_sip_port_title">Használandó SIP-kikötő</string>
-    <string name="contacts_settings_show_organization_title">Kapcsolattartó szervezet megjelenítése</string>
-    <string name="advanced_settings_dark_mode_title">Sötét téma</string>
-    <string name="advanced_settings_dark_mode_label_no">No</string>
-    <string name="advanced_settings_dark_mode_label_yes">Igen</string>
-    <string name="advanced_settings_animations_title">Animációk</string>
-    <string name="advanced_settings_device_name_title">Eszköz neve</string>
-    <string name="advanced_settings_android_title">Android</string>
-    <string name="advanced_settings_go_to_battery_optimization_settings">Az akkumulátor optimalizálásának beállításai</string>
-    <string name="advanced_settings_go_to_power_manager_settings">Energia gazdálkodási beállítások</string>
-    <string name="advanced_settings_go_to_android_app_settings">Android alkalmazás beállításai</string>
-    <string name="advanced_settings_vfs_title">Titkosítson mindent</string>
-    <string name="advanced_settings_send_debug_logs_title">Naplók küldése</string>
-    <string name="advanced_settings_reset_debug_logs_title">Naplók visszaállítása</string>
-    <string name="advanced_settings_other_title">Egyéb beállitások</string>
-    <string name="tunnel_settings_hostname_url_title">Állomásnév</string>
-    <string name="tunnel_settings_port_title">Kikötő</string>
-    <string name="tunnel_settings_dual_hostname_url_title">Második kiszolgáló állomásneve</string>
-    <string name="tunnel_settings_dual_port_title">Második kiszolgáló kikötője</string>
-    <string name="tunnel_settings_dual_hostname_url_summary">Kettős módban szükséges</string>
-    <string name="tunnel_settings_dual_port_summary">Kettős módban szükséges</string>
-    <string name="tunnel_settings_mode_title">Mód</string>
-    <string name="tunnel_settings_disabled_mode">Letiltva</string>
-    <string name="tunnel_settings_always_mode">Mindig</string>
-    <string name="account_settings_user_name_title">Felhasználónév</string>
-    <string name="account_settings_domain_title">Tartomány</string>
-    <string name="account_settings_display_name_title">Megjelenítendő név</string>
-    <string name="account_settings_manage_title">Kezelés</string>
-    <string name="account_settings_disable_title">Letiltás</string>
-    <string name="account_settings_link_phone_number_title">Kapcsolja össze fiókját</string>
-    <string name="account_settings_delete_title">Törlés</string>
-    <string name="account_settings_advanced_title">Haladó</string>
-    <string name="account_settings_push_notification_title">Leküldéses értesítés engedélyezése</string>
-    <string name="account_settings_transport_title">Átvitel</string>
-    <string name="account_settings_transport_udp">UDP</string>
-    <string name="account_settings_transport_tcp">TCP</string>
-    <string name="account_settings_transport_tls">TLS</string>
-    <string name="account_settings_transport_dtls">DTLS</string>
-    <string name="account_settings_ice_title">ICE egedélyezése</string>
-    <string name="account_settings_avpf_title">AVPF</string>
-    <string name="account_settings_avpf_rr_interval_summary">másodpercekben (1 és 5 között)</string>
-    <string name="account_settings_expires_title">Lejár</string>
-    <string name="account_settings_expires_summary">másodpercekben</string>
-    <string name="incoming_call_notification_title">Bejövő hívás</string>
-    <string name="received_chat_notification_reply_label">Válasz</string>
-    <string name="incoming_call_notification_answer_action_label">Hívásfogadás</string>
-    <string name="received_chat_notification_mark_as_read_label">Megjelölés olvasottként</string>
-    <string name="missed_call_notification_title">Nem fogadott hívás</string>
-    <string name="dialog_zrtp_local_sas">Mond:</string>
-    <string name="dialog_do_not_ask_again">Többet ne mutassa</string>
-    <string name="dialog_cancel">Mégse</string>
-    <string name="dialog_delete">Törlés</string>
-    <string name="dialog_ok">Rendben</string>
-    <string name="dialog_accept">Elfogad</string>
-    <string name="dialog_decline">Elutasítás</string>
-    <string name="dialog_call">Hívás</string>
-    <string name="content_description_pause_call">Szüneteltesse a hívást</string>
-    <string name="content_description_terminate_call">Megszakítja a hívást</string>
-    <string name="content_description_answer_call">Fogadja a hívást</string>
-    <string name="content_description_disable_mic_mute">Mikrofonjának némításának feloldása</string>
-    <string name="content_description_go_back_to_call">Menjen vissza a hívás nézethez</string>
-    <string name="content_description_contact_is_not_admin">A kapcsolattartó nem felügyelő ebben a beszélgetésben</string>
-    <string name="content_description_ephemeral_chat_room">Az üzenetek elmúló ebben a beszélgetésben</string>
-    <string name="content_description_ephemeral_duration_selected">Elmúló időtartam kiválasztva</string>
-    <string name="content_description_ephemeral_message">Üzenet elmúlva</string>
-    <string name="content_description_toggle_participant_devices_list">A résztvevő eszközök megjelenítése vagy elrejtése</string>
-    <string name="content_description_add_participants">Résztvevők hozzáadása</string>
-    <string name="content_description_e2e_encryption_disabled">Végpontok közötti titkosítás letiltva</string>
-    <string name="content_description_disable_video">Videó letiltása a hívásban</string>
-    <string name="content_description_toggle_audio_menu">Hangkimeneti menü megjelenítése vagy elrejtése</string>
-    <string name="content_description_use_bluetooth_headset">Használja a Bluetooth-fejbeszélőt hang kimenetként</string>
-    <string name="content_description_use_earpiece">Használja a fülhallgatót hang kimenetként</string>
-    <string name="content_description_add_call">Új hívás indítása</string>
-    <string name="content_description_transfer_call">Az aktuális hívás átadása másnak</string>
-    <string name="content_description_pending_file_transfer">Fájl átvitele függőben van</string>
-    <string name="content_description_downloaded_file_transfer">Csatolt fájl</string>
-    <string name="content_description_delivery_status">Üzenet kézbesítési állapota</string>
-    <string name="content_description_contact_selected">Névjegy kiválasztva</string>
-    <string name="content_description_show_all_contacts">Az összes névjegy listájának megjelenítése</string>
-    <string name="content_description_continue_chat_room_creation">Ugrás a csevegőszoba létrehozásának utolsó lépésére</string>
-    <string name="content_description_remove_contact_from_selection">Távolítsa el a névjegyet a kijelölésből</string>
-    <string name="content_description_start_call">Hívás indítása</string>
-    <string name="content_description_show_chat_room_menu">Csevegőszoba menü megjelenítése</string>
-    <string name="content_description_enter_edition_mode">Belépés kiadás mód</string>
-    <string name="content_description_attach_file">Csatoljon egy fájlt az üzenethez</string>
-    <string name="content_description_create_chat_room">Csevegőszoba létehozása</string>
-    <string name="content_description_remove_contact_from_chat_room">Partner eltávolítása a beszélgetésből</string>
-    <string name="content_description_start_chat">Menjen beszélgetésbe</string>
-    <string name="content_description_edit_contact">Névjegy szerkesztése</string>
-    <string name="content_description_delete_contact">Névjegy törlése</string>
-    <string name="content_description_confirm_contact_edit">Változtatások mentése</string>
-    <string name="content_description_discard_changes">Változtatások elvetése</string>
-    <string name="content_description_change_contact_picture">Névjegyfénykép módosítása</string>
-    <string name="content_description_change_own_picture">Saját névjegyfénykép módosítása</string>
-    <string name="service_name">&appName; szolgáltatás</string>
-    <string name="service_auto_start_description">A(z) &appName; önműködően elindult</string>
-    <string name="phone_numbers">Telefonszámok</string>
-    <string name="assistant_choose_country_title">Ország/régió neve vagy nemzetközi előhívószáma</string>
-    <string name="share_uploaded_logs_link">Naplók hivatkozásának megosztása a következők használatával…</string>
-    <string name="status_error">Sikertelen csatlakozás</string>
-    <string name="no_call_history">Nem találhatók híváselőzmények</string>
-    <string name="history_delete_one_dialog">Törli ezt a rekordot\?</string>
-    <string name="no_sip_contact">Nincs SIP-névjegy a címjegyzékben.</string>
-    <string name="contact_send_sms_invite_text">Üdvözöljük! Csatlakozzon a(z) &appName; alkalmazáshoz! Ingyenesen letöltheti a(z) %s webhelyről</string>
-    <string name="chat_event_conference_created">Csatlakozott a csoporthoz</string>
-    <string name="chat_room_group_info_leave">Kilépés ebből a csoportból</string>
-    <string name="chat_room_group_info_you_are_no_longer_admin">Ön már nem felügyelő</string>
-    <string name="chat_event_subject_changed">új tárgy: %s</string>
-    <string name="chat_message_context_menu_add_to_contacts">Felvétel a névjegyek közé</string>
-    <string name="chat_message_context_menu_ephemeral_messages">Elmúló üzenetek</string>
-    <string name="content_description_contact_is_admin">A kapcsolattartó egyik felügyelő ebben a beszélgetésben</string>
-    <string name="content_description_ephemeral_duration_change">Az elmúló időtartam módosítása a kiválasztott érték szerint</string>
-    <string name="chat_settings_downloaded_media_public_summary">A mulandó üzenetekben lévő fájlok nem lesznek és nem működnek az önműködő letöltési szolgáltatással</string>
-    <string name="chat_room_delete_one_dialog">Biztosan törli ezt a beszélgetést\?</string>
-    <string name="chat_message_cant_open_file_in_app_dialog_title">Úgy tűnik, hogy nem tudjuk megjeleníteni a fájlt.</string>
-    <string name="call_incoming_title">Bejövő hívás</string>
-    <string name="call_stats_estimated_download">Becsült letöltési sávszélesség:</string>
-    <string name="call_video_update_requested_dialog">A hívott fél szeretné bekapcsolni a videót</string>
-    <string name="call_stats_decoder_name">Dekóder:</string>
-    <string name="assistant_welcome_desc">Ez a beállítási segéd segít a SIP-fiók létrehozásában és használatában.</string>
-    <string name="assistant_general_terms">felhasználási feltételeit</string>
-    <string name="assistant_privacy_policy">adatvédelmi irányelveit</string>
-    <string name="contact_editor_write_permission_denied">A névjegy írásának engedélye megtagadva, a névjegy nem szerkeszthető</string>
-    <string name="contact_delete_many_dialog">Biztosan törli ezeket a névjegyeket\?\nEzeket a rendszer eltávolítja az eszköz címjegyzékéből is</string>
-    <string name="dialog_lime_security_message">Az azonnali üzenetek végpontok közötti titkosításra kerülnek a biztonságos beszélgetések során. Lehetőség van a résztvevők hitelesítésével frissíteni a beszélgetés biztonsági szintjét. Ehhez hívja a partneret, és kövesse a hitelesítési folyamatot.</string>
-    <string name="chat_event_ephemeral_lifetime_changed">Elmúló üzenetek lejárati dátuma: %s</string>
-    <string name="chat_room_ephemeral_messages_desc">Ez az üzenet mindkét félnél törlődik, miután elolvasta és a kiválasztott időt túllépte.</string>
-    <string name="chat_message_cant_open_file_in_app_dialog_message">Szeretné megnyitni szövegként, vagy exportálni (titkosítatlanul) egy harmadik fél alkalmazásába, ha elérhető\?</string>
-    <string name="assistant_ec_calibration">Visszhangkioltás beállítása folyamatban van</string>
-    <string name="content_description_e2e_encryption_enabled">Végpontok közötti titkosítás engedélyezve</string>
-    <string name="audio_settings_echo_canceller_calibration_summary">Kattintson a visszhangkioltás beállításának megkezdéséhez</string>
-    <string name="audio_settings_echo_tester_summary">Kattintson a visszhang ellenőrzés indításához</string>
-    <string name="assistant_phone_number_link_info_content">\nAz ismerősei könnyebben megtalálja Önt, ha összekapcsolja fiókját a telefonszámával.\n\nA címjegyzékében látni fogja, hogy ki használja a(z) &appName; és az ismerősök tudni fogják, hogy elérhetik Önt a(z) &appName; is.\n</string>
-    <string name="contacts_settings_friendlist_subscribe_title">Ismerőslista feliratkozása</string>
-    <string name="assistant_linphone_login_desc">Kérjük, adja meg a(z) &appName;-fiókjának felhasználónevét és jelszavát</string>
-    <string name="account_settings_prefix_title">Országának nemzetközi előhívószáma</string>
-    <string name="assistant_create_account_part_1">Kérjük, erősítse meg nemzetközi előhívószámát, és adja meg telefonszámát</string>
-    <string name="account_settings_password_title">Jelszó</string>
-    <string name="assistant_login_with_username">Használja felhasználónevét és jelszavát a telefonszáma helyett</string>
-    <string name="account_settings_password_summary">Újra meg kell adnia a jelszavát, ha módosítja felhasználónevét és/vagy tartományát</string>
-    <string name="assistant_use_username_instead_or_phone_number">Felhasználónév használata (választható)</string>
-    <string name="settings_primary_account_title">Elsődleges fiók</string>
-    <string name="video_settings_codecs_title">Kodekek</string>
-    <string name="audio_settings_adaptive_rate_control_title">Adaptív sebesség szabályozás</string>
-    <string name="audio_settings_playback_gain_title">Lejátszás erősítése</string>
-    <string name="video_settings_automatically_accept_summary">Mindig fogadja el a videó kéréseket</string>
-    <string name="call_settings_device_ringtone_title">Használja az eszköz csengőhangját</string>
-    <string name="call_settings_auto_answer_title">Hívásfogadások önműködően</string>
-    <string name="call_settings_ring_during_early_media_title">Cseng a bejövő korai média közben</string>
-    <string name="chat_settings_hide_empty_rooms_title">Üres csevegő szobák elrejtése</string>
-    <string name="tunnel_settings_dual_mode_title">Kettős mód engedélyezve</string>
-    <string name="tunnel_settings_auto_mode">Önműködő</string>
-    <string name="account_settings_default_title">Alapértelmezésként használja</string>
-    <string name="account_settings_stun_server_title">STUN/TURN kiszolgáló</string>
-    <string name="incoming_call_notification_hangup_action_label">Vonalbontás</string>
-    <string name="content_description_go_back">Vissza</string>
-    <string name="content_description_enable_mic_mute">Mikrofonjának elnémítása</string>
-    <string name="content_description_enable_video">Videó engedélyezése a hívásban</string>
-    <string name="content_description_use_speaker">Használja a hangszórót hang kimenetként</string>
-    <string name="content_description_remove_pending_file_transfer">Távolítsa el a függőben lévő fájl átvitelt</string>
-    <string name="content_description_show_sip_contacts">Csak a SIP-névjegyeket tartalmazó lista megjelenítése</string>
-    <string name="content_description_send_message">Üzenet küldése</string>
-    <string name="content_description_start_encrypted_chat">Menjen titkosított beszélgetésbe</string>
-    <string name="content_description_recording_toggle_play">A felvétel lejátszása vagy szüneteltetése</string>
-    <string name="content_description_add_contact">Névjegy létrehozása</string>
-    <string name="content_description_show_missed_calls">Csak a nem fogadott hívások megjelenítése</string>
-    <string name="content_description_call_quality_2">Közepes hívásminőség</string>
-    <string name="content_description_export">Nyissa meg a fájlt külső alkalmazásokban</string>
-    <string name="assistant_validate_account_1">Fiókja létrejött. Kérjük, ellenőrizze e-mailjeit fiókja érvényesítéséhez:</string>
-    <string name="assistant_create_account_part_3">A telefonszám hitelesítésének befejezéséhez kérjük, hogy adja meg a négyjegyű kódot lent:\n</string>
-    <string name="video_settings_tablet_preview_title">A kamera előnézetének megjelenítése a tárcsázón</string>
-    <string name="call_settings_auto_start_summary">A hívás önműködően elindul, ha egy másik alkalmazásból indul</string>
-    <string name="chat_settings_auto_download_under_size">Ha a megadott maximális méretnél könnyebb</string>
-    <string name="chat_settings_launcher_shortcuts_summary">Ha engedélyezve van, a névjegyek parancsikonjai váltják fel</string>
-    <string name="contacts_settings_show_new_contact_account_dialog_title">Mindig kérdezze meg, hogy melyik fiókba mentse az újonnan létrehozott névjegyet</string>
-    <string name="advanced_settings_device_name_summary">A változásokat a következő indításkor alkalmazzák</string>
-    <string name="advanced_settings_logs_server_url_title">Kiszolgáló feltöltés URL-jének naplói</string>
-    <string name="account_settings_user_id_summary">Adja meg a hitelesítési azonosítót, ha eltér a felhasználónévtől (választható)</string>
-    <string name="account_settings_outbound_proxy_summary">Vezesse át az összes hívást a SIP-meghatalmazás felett</string>
-    <string name="account_settings_apply_prefix_for_calls_summary">Ha beír egy számot, alkalmazza az előhívószámot</string>
-    <string name="dialog_default_delete_one">Biztosan törli ezt az elemet\?</string>
-    <string name="content_description_add_sip_address_field">Egy SIP-cím mező hozzáadása</string>
-    <string name="content_description_disable_speaker">Hang átirányítása a fülhallgatóhoz</string>
-    <string name="contacts_settings_native_presence_summary">Információs parancsikonok beszúrása a &appName; névjegyből a natív Android névjegyekbe</string>
-    <string name="chat_settings_auto_download_summary">Akár fájlok letöltéséhez csatolt beérkezett csevegő üzenetek önműködően vagy sem</string>
-    <string name="call_error_server_timeout">Kiszolgálói időtúllépés</string>
-    <string name="call_error_temporarily_unavailable">Átmenetileg nem érhető el</string>
-    <string name="call_error_generic">Hiba: %s</string>
-    <string name="assistant_validate_account_2">Miután elkészült, jöjjön vissza ide és kattintson a gombra.</string>
-    <string name="assistant_create_account_part_2">Érvényesítési kódot tartalmazó SMS-t küldtünk a telefonszámára:</string>
-    <string name="assistant_link_phone_number">Telefonszámát összekapcsolja a következő felhasználónévvel:</string>
-    <string name="assistant_remote_provisioning_desc">Kérjük, adja meg konfigurációs URL-jét</string>
-    <string name="assistant_remote_provisioning_failure">Nem sikerült letölteni vagy alkalmazni a távoli létesítési profilt…</string>
-    <string name="audio_settings_output_device_summary">A változtatások a következő hívástól lépnek életbe</string>
-    <string name="call_settings_sipinfo_dtmf_title">Sávon kívüli DTMF-ek küldése (SIP INFÓ)</string>
-    <string name="chat_settings_file_sharing_url_summary">Ne szerkessze hacsak nem tudja, mit csinál!</string>
-    <string name="chat_settings_auto_download_title">A bejövő fájlok önműködő letöltésének szabályzata</string>
-    <string name="chat_settings_hide_rooms_removed_proxies_summary">Ha hiányoznak csevegőszobák, próbálja meg törölni ezt a beállítást</string>
-    <string name="contacts_settings_native_presence_title">Jelenléti információk natív névjegyben</string>
-    <string name="contacts_settings_launcher_shortcuts_title">Hozzon létre parancsikonokat a névjegyekhez az indítóban</string>
-    <string name="contacts_settings_launcher_shortcuts_summary">Helyettesíti a csevegőszoba parancsikonjait ha bármilyen</string>
-    <string name="chat_settings_hide_rooms_removed_proxies_title">Csevegőszobák elrejtése eltávolított meghatalmazás beállításokkal</string>
-    <string name="advanced_settings_debug_mode_title">Hibakeresési naplók</string>
-    <string name="advanced_settings_auto_start_title">Indítás rendszertöltéskor</string>
-    <string name="advanced_settings_vfs_summary">Miután engedélyezte, nem lehet letiltani!</string>
-    <string name="advanced_settings_debug_title">Hibakeresési beállítások</string>
-    <string name="account_settings_user_name_summary">Példa: jános, ha a fiókja jános@sip.example.org</string>
-    <string name="account_settings_user_id_title">Hitelesítési azonosító</string>
-    <string name="account_settings_domain_summary">Példa: sip.example.org, ha a fiókja jános@sip.example.org</string>
-    <string name="advanced_settings_remote_provisioning_url_title">Távoli létesítési URL-címe</string>
-    <string name="account_settings_avpf_rr_interval_title">AVPF rendszeres RTCP intervallum</string>
-    <string name="account_settings_escape_plus_title">Cserélje a „+”-ot „00”-ra</string>
-    <string name="notification_channel_service_name">&appName; szolgáltatási értesítés</string>
-    <string name="notification_channel_missed_call_name">&appName; nem fogadott hívások értesítései</string>
-    <string name="notification_channel_incoming_call_name">&appName; bejövő hívásokról szóló értesítései</string>
-    <string name="missed_calls_notification_body" tools:ignore="PluralsCandidate">%d nem fogadott hívás</string>
-    <string name="zrtp_dialog_title">Kommunikációs biztonság</string>
-    <string name="account_settings_prefix_summary">a „+” nélkül</string>
-    <string name="account_settings_proxy_title">SIP-meghatalmazás</string>
-    <string name="account_settings_outbound_proxy_title">Kimenő meghatalmazás</string>
-    <string name="dialog_zrtp_remote_sas">Győződjön meg arról, hogy beszélgetőpartnere ezt mondja:</string>
-    <string name="operation_in_progress_wait">A művelet folyamatban van, kérjük várjon</string>
-    <string name="dialog_default_delete_many">Biztosan törli a kiválasztást\?</string>
-    <string name="dialog_update_available">Frissítés érhető el</string>
-    <string name="dialog_try_open_file_as_text_title">Nem található alkalmazás ehhez a fájlhoz</string>
-    <string name="content_description_add_phone_number_field">Telefonszám mező hozzáadása</string>
-    <string name="content_description_phone_number_use">Mutassa meg, hogy mire fogják használni a telefonszámát</string>
-    <string name="content_description_clear_field">Ürítse ki a mellette lévő szöveg mezőt</string>
-    <string name="content_description_switch_camera">Váltás az elülső kameráról hátra és fordítva</string>
-    <string name="content_description_enable_speaker">Hang átirányítása a hangszóróhoz</string>
-    <string name="content_description_contact_can_do_encryption">Titkosított beszélgetésekbe meghívható partner</string>
-    <string name="content_description_select_all">Összes elem kijelölése a listán</string>
-    <string name="content_description_numpad_2">2</string>
-    <string name="content_description_numpad_3">3</string>
-    <string name="content_description_numpad_4">4</string>
-    <string name="content_description_numpad_5">5</string>
-    <string name="content_description_numpad_6">6</string>
-    <string name="content_description_numpad_7">7</string>
-    <string name="content_description_numpad_8">8</string>
-    <string name="content_description_numpad_0">0</string>
-    <string name="content_description_numpad_star">*</string>
-    <string name="content_description_numpad_sharp">#</string>
-    <string name="content_description_voice_mail">Hangposta</string>
-    <string name="content_description_toggle_side_menu">Az oldalsó menü megjelenítése vagy elrejtése</string>
-    <string name="content_description_menu_contacts">Névjegyek</string>
-    <string name="content_description_menu_dialer">Tárcsázó</string>
-    <string name="content_description_menu_chat">Beszélgetések</string>
-    <string name="content_description_dialer_erase">Az utolsó karakter eltávolítása</string>
-    <string name="content_description_go_to_contact">Kapcsolat részletei ugrása</string>
-    <string name="content_description_missed_call">Nem fogadott hívás</string>
-    <string name="content_description_incoming_call">Bejövő hívás</string>
-    <string name="content_description_outgoing_call">Kimenő hívás</string>
-    <string name="content_description_create_one_to_one_chat_room">Kétszemélyes beszélgetés létrehozása</string>
-    <string name="content_description_create_group_chat_room">Csoportos beszélgetés létrehozása</string>
-    <string name="content_description_security_level_unsafe">Nem biztonságos</string>
-    <string name="content_description_security_level_safe">Biztonságos</string>
-    <string name="content_description_call_quality_0">Nagyon alacsony hívásminőség</string>
-    <string name="content_description_call_quality_1">Alacsony hívásminőség</string>
-    <string name="content_description_call_quality_3">Jó hívásminőség</string>
-    <string name="content_description_call_quality_4">Maximális hívásminőség</string>
-    <string name="content_description_call_secured">A hívás biztosítva</string>
-    <string name="content_description_call_security_pending">A hívásbiztonság függőben van</string>
-    <string name="content_description_chat_message_video_attachment">Videómelléklet</string>
-    <string name="content_description_close_bubble">Az értesítési buborék bezárása</string>
-    <string name="content_description_open_app">A beszélgetés megnyitása az alkalmazásban a buborék helyett</string>
-    <string name="advanced_settings_dark_mode_label_auto">Önműködő</string>
-    <string name="missed_call_notification_body">Nem fogadott hívás %s részéről</string>
-    <string name="content_description_exit_edition_mode">Kilépés a szerkesztési módból</string>
-    <string name="content_description_numpad_1">1</string>
-    <string name="assistant_error_invalid_email_address">Az e-mail-cím érvénytelen</string>
-    <string name="assistant_remote_provisioning_wrong_format">Ismeretlen URL-formátum, nem lehet letölteni a létesítés…</string>
-    <string name="audio_settings_input_device_summary">A változtatások a következő hívástól lépnek életbe</string>
-    <string name="call_settings_rfc2833_dtmf_title">Sávon belüli DTMF-ek küldése (RFC 2833)</string>
-    <string name="chat_settings_mark_as_read_notif_dismissal_title">Jelölés olvasottként az értesítés elbocsátása esetén</string>
-    <string name="chat_settings_launcher_shortcuts_title">Hozzon létre parancsikonokat a csevegőszobákhoz az indítóban</string>
-    <string name="chat_settings_use_in_app_file_viewer_summary">Továbbra is exportálhatja őket külső alkalmazásokban</string>
-    <string name="contacts_settings_show_new_contact_account_dialog_summary">Ha le van tiltva a névjegy helyben lesz tárolva</string>
-    <string name="advanced_settings_logs_server_url_summary">Ne szerkessze hacsak nem tudja, mit csinál!</string>
-    <string name="tunnel_settings_dual_mode_summary">Egy kiszolgálót fog használni a feltöltéshez és egy másikat a letöltéshez</string>
-    <string name="account_settings_push_notification_summary">Meghatalmazás-konfiguráció nem törli a regisztrációt</string>
-    <string name="account_settings_apply_prefix_for_calls_title">Nemzetközi előhívószám alkalmazása a kimenő hívásokhoz és csevegéshez</string>
-    <string name="notification_channel_chat_name">&appName; azonnali üzenetek értesítései</string>
-    <string name="dialog_try_open_file_as_text_body">Szeretné megpróbálni megnyitni egyszerű szöveges fájlként\?</string>
-    <string name="content_description_toggle_recording">Engedélyezze vagy tiltsa le a hívás rögzítését</string>
-    <string name="content_description_linphone_user">Az ismerős egy &appName; felhasználó</string>
-    <string name="content_description_delete_selection">A kijelölt elemek törlése a listából</string>
-    <string name="content_description_numpad_9">9</string>
-    <string name="content_description_menu_history">Híváselőzmények</string>
-    <string name="content_description_show_all_calls">Az összes hívás megjelenítése</string>
-    <string name="content_description_security_level_encrypted">Titkosított</string>
-    <string name="content_description_call_not_secured">A hívás nincs biztosítva</string>
-    <string name="call_settings_redirect_to_voice_mail_declined_calls_title">Az elutasított hívások átirányítása a hangposta URI-ra</string>
-    <string name="content_description_show_call_details">Ugrás a hívás részleteire</string>
-    <string name="content_description_unselect_all">A lista összes elemének kijelölése megszüntetése</string>
-    <string name="call_settings_pause_calls_lost_audio_focus_title">Hívás szüneteltetése, ha a hang bemenet vagy kimenet megszűnése esetén</string>
-    <string name="content_description_cancel_sharing">Megosztás leállítása</string>
-    <string name="chat_room_choose_conversation_for_message_forward">Beszélgetés kiválasztása vagy létrehozása az üzenet továbbításához</string>
-    <string name="chat_room_choose_conversation_for_file_sharing">Beszélgetés kiválasztása vagy létrehozása a fájl(ok) megosztásához</string>
-    <string name="content_description_cancel_forward">Az üzenet továbbításának visszavonása</string>
-    <string name="chat_room_choose_conversation_for_text_sharing">Beszélgetés kiválasztása vagy létrehozása a szöveg megosztásához</string>
-    <string name="content_description_forward_message">Üzenet továbbítása ebben a beszélgetésben</string>
-    <string name="chat_room_sending_reply_hint">Válasz</string>
-    <string name="chat_room_sending_message_hint">Üzenet</string>
-    <string name="chat_message_voice_recording_hold_to_record">Tartsa lenyomva a gombot a hangüzenet felvételéhez</string>
-    <string name="content_description_voice_recording">Hangüzenet felvétele</string>
-    <string name="content_description_stop_voice_recording">Hangfelvétel leállítása</string>
-    <string name="content_description_pause_voice_recording_playback">Hangfelvétel szüneteltetése</string>
-    <string name="content_description_play_voice_recording">Hangfelvétel lejátszása</string>
-    <string name="chat_message_replied">Válasz</string>
-    <string name="chat_message_context_menu_reply">Válasz</string>
-    <string name="chat_settings_auto_download_voice_recordings">A bejövő hangfelvételek önműködő letöltése</string>
-    <string name="content_description_cancel_reply">Válasz visszavonása</string>
-    <string name="content_description_cancel_voice_recording">Hangfelvétel visszavonása</string>
-    <string name="chat_message_voice_recording_playback_low_volume">A média hangereje alacsony, lehet hogy, szeretné növelni</string>
-    <string name="call_settings_auto_start_recording_title">Hívás felvétele önműködő indítása</string>
-    <string name="advanced_settings_disable_fragment_security_title">Felhasználói felület biztonságos üzemmódjának letiltása</string>
-    <string name="advanced_settings_disable_fragment_security_summary">Képernyőfelvétel engedélyezése bizalmas nézetekben</string>
-    <string name="call_settings_use_telecom_manager_summary">További engedélyeket igényel</string>
-    <string name="call_settings_use_telecom_manager_title">Tevékenységek fejlesztése Bluetooth-eszközökkel</string>
-    <plurals name="chat_room_unread_messages_event">
-        <item quantity="one">%1$d olvasatlan üzenet</item>
-        <item quantity="other">%1$d olvasatlan üzenet</item>
-    </plurals>
-    <string name="content_descripton_scroll_to_bottom">Görgetés legalulra vagy az első olvasatlan üzenetre</string>
-    <string name="audio_settings_prefer_bluetooth_devices_title">Hang átirányítása a Bluetooth-eszközre (ha van ilyen)</string>
-    <string name="call_settings_ringtones_title">Csengőhang</string>
-    <string name="chat_message_abort_removal">Megszakítás</string>
-    <string name="chat_message_removal_info">Üzenet törlésre kerül</string>
-    <string name="about_weblate_translation">Segítsen nekünk a &appName; fordításában</string>
-    <string name="assistant_generic_account_warning_continue_button_text">Megértettem</string>
-    <string name="assistant_generic_account_warning">Egyes szolgáltatásokhoz egy &appName; fiók kellene, például csoportos üzeneteket vagy elmúló üzeneteket.\n\nEzek a szolgáltatások el vannak rejtve, ha külső SIP-fiókkal regisztrál.\n\nHa engedélyezni szeretné egy kereskedelmi projektben, vegye fel velünk a kapcsolatot.</string>
-    <string name="contact_cant_be_deleted">Ez a Névjegy nem törölhető</string>
-    <string name="dialer_transfer_succeded">A hívás továbbítva</string>
-    <string name="dialer_transfer_failed">A hívás nem átirányítható</string>
-    <string name="chat_message_context_menu_turn_on_notifications">Értesítések engedélyezése</string>
-    <string name="chat_message_download_already_in_progress">Kérem várjon a letöltéssel amíg az előző befejeződik</string>
-    <string name="chat_message_voice_recording_received_notification">A hangüzenetet rögzítettük</string>
-    <string name="chat_message_voice_recording">Hangüzenet</string>
-    <string name="chat_room_presence_online">Elérhető</string>
-    <string name="chat_room_presence_last_seen_online_today">A mai napon elérhető</string>
-    <string name="chat_room_presence_last_seen_online_yesterday">Tegnap elérhető</string>
-    <string name="chat_room_presence_last_seen_online">Elrhető a</string>
-    <string name="chat_room_presence_away">Elfoglalt</string>
-    <string name="chat_room_presence_do_not_disturb">Ne zavarj</string>
-    <string name="recordings_export">A felvétel exportálása a …</string>
-    <string name="conference">Értekezlet</string>
-    <string name="conference_schedule_title">Értekezlet ütemezése</string>
-    <string name="conference_group_call_title">Csoportos hívás indítása</string>
-    <string name="no_conference_call_history">Nincs értekezlet hívás az ön előzményeiben</string>
-    <string name="contacts_ldap_query_more_results_available">További találatok érhetők el, finomítsa a keresést</string>
-    <string name="chat_room_context_menu_go_to_contact">Menj a Névjegyhez</string>
-    <string name="chat_message_context_menu_turn_off_notifications">Értesítések letiltása</string>
-    <string name="chat_message_voice_recording_notification_short_desc">Hangüzenet</string>
-    <string name="chat_message_reaction_received">Reakciók</string>
-    <string name="chat_message_one_reaction">Reakjció</string>
-    <string name="chat_message_many_reactions">reakciók</string>
-</resources>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
deleted file mode 100644
index e389faf4b..000000000
--- a/app/src/main/res/values-it/strings.xml
+++ /dev/null
@@ -1,825 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE resources [
-<!ENTITY appName "Linphone">
-]>
-<resources xmlns:tools="http://schemas.android.com/tools">
-    <string name="service_description">è richiesto per ricevere chiamate quando l\'app è in background</string>
-    <string name="logs_upload_failure">Impossibile caricare i log!</string>
-    <string name="logs_url_copied_to_clipboard">Url dei log salvato negli appunti</string>
-    <string name="phone_numbers">Numeri di telefono</string>
-    <string name="phone_number">Numero di telefono</string>
-    <string name="username">Nome utente</string>
-    <string name="email">Email</string>
-    <string name="sip_addresses">indirizzi SIP</string>
-    <string name="sip_address">indirizzo SIP</string>
-    <string name="cancel">Annulla</string>
-    <string name="share_uploaded_logs_link">Condividi il link dei log usando…</string>
-    <string name="yesterday">Ieri</string>
-    <string name="transport_udp">UDP</string>
-    <plurals name="days">
-        <item quantity="one">%d giorno</item>
-        <item quantity="other">%d giorni</item>
-    </plurals>
-    <string name="today">Oggi</string>
-    <string name="transport_tcp">TCP</string>
-    <string name="domain">Dominio</string>
-    <string name="password">Password</string>
-    <string name="status_connected">Connesso</string>
-    <string name="status_not_connected">Non connesso</string>
-    <string name="status_in_progress">Connessione in corso</string>
-    <string name="status_error">Connessione fallita</string>
-    <string name="no_account_configured">Nessun account configurato</string>
-    <string name="assistant">Assistente</string>
-    <string name="recordings">Registrazioni</string>
-    <string name="settings">Impostazioni</string>
-    <string name="quit">Esci</string>
-    <string name="history_calls_list">Chiamate</string>
-    <string name="no_call_history">Nessuna chiamata nella cronologia</string>
-    <string name="no_missed_call_history">Nessuna chiamata persa nella cronologia</string>
-    <string name="history_delete_one_dialog">Vuoi eliminare questo record\?</string>
-    <string name="history_delete_many_dialog">Vuoi cancellare questi record\?</string>
-    <string name="contact_invite_friend">Invita</string>
-    <string name="no_contact">Nessun contatto nella tua rubrica.</string>
-    <string name="no_sip_contact">Nessun contatto SIP nella tua rubrica.</string>
-    <string name="contact_filter_hint">Cerca contatti</string>
-    <string name="contact_send_sms_invite_text">Ciao, unisciti a me su &appName;! Puoi scaricarlo gratuitamente da %s</string>
-    <string name="contact_last_name">Cognome</string>
-    <string name="contact_first_name">Nome</string>
-    <string name="contact_organization">Organizzazione</string>
-    <string name="contact_choose_existing_or_new_to_add_number">Seleziona un contatto o creane uno nuovo</string>
-    <string name="contact_editor_write_permission_denied">Permesso di scrittura dei contatti negato, impossibile modificare il contatto</string>
-    <string name="contact_delete_many_dialog">Vuoi cancellare questi contatti\?
-\nI contatti verranno rimossi anche dalla tua rubrica</string>
-    <string name="contact_new_choose_sync_account">Scegli dove salvare il contatto</string>
-    <string name="contact_local_sync_account">Conserva localmente</string>
-    <string name="contact_cant_be_deleted">Questo contatto non può essere eliminato</string>
-    <string name="debug_popup_title">Debug</string>
-    <string name="contacts_ldap_query_more_results_available">Troppi risultati disponibili, affina la tua ricerca</string>
-    <string name="dialer_address_bar_hint">Inserisci un numero o un indirizzo</string>
-    <string name="debug_popup_send_logs">Invia i log</string>
-    <string name="debug_popup_disable_logs">Disabilita i log</string>
-    <string name="debug_popup_enable_logs">Abilita i log</string>
-    <string name="debug_popup_show_config_file">Visualizza file di configurazione</string>
-    <string name="dialer_transfer_succeded">La chiamata è in trasferimento</string>
-    <string name="dialer_transfer_failed">Impossibile trasferire la chiamata</string>
-    <string name="no_chat_history">Nessuna conversazione</string>
-    <string name="chat_event_conference_created">Sei entrato nel gruppo</string>
-    <string name="chat_event_conference_destroyed">Sei uscito dal gruppo</string>
-    <string name="chat_event_participant_added">%s è entrato</string>
-    <string name="chat_event_participant_removed">%s è uscito</string>
-    <string name="chat_event_device_added">nuovo dispositivo per %s</string>
-    <string name="chat_event_device_removed">dispositivo per %s rimosso</string>
-    <string name="chat_event_subject_changed">nuovo oggetto: %s</string>
-    <string name="chat_event_admin_set">%s è amministratore</string>
-    <string name="chat_event_admin_unset">%s non è più amministratore</string>
-    <string name="chat_security_event_lime_identity_key_changed">Chiave di identità LIME modificata per %s</string>
-    <string name="chat_security_event_security_level_downgraded">Livello di sicurezza diminuito a causa di %s</string>
-    <string name="chat_security_event_participant_max_count_exceeded">Numero di partecipanti massimi superato da %s</string>
-    <string name="chat_event_ephemeral_lifetime_changed">Scadenza messaggi effimeri: %s</string>
-    <string name="chat_message_download_file">Download</string>
-    <string name="chat_event_ephemeral_enabled">Hai abilitato i messaggi effimeri: %s</string>
-    <string name="chat_room_group_info_title">Info</string>
-    <string name="chat_room_group_info_participants">Participanti</string>
-    <string name="chat_room_group_info_subject_hint">Assegna un nome al gruppo</string>
-    <string name="chat_room_group_info_admin">Amministratore</string>
-    <string name="chat_room_group_info_leave">Lascia il gruppo</string>
-    <string name="chat_room_group_info_leave_dialog_button">Lascia</string>
-    <string name="chat_room_group_info_leave_dialog_message">Vuoi abbandonare questa conversazione\?</string>
-    <string name="chat_room_group_info_you_are_now_admin">Ora sei amministratore</string>
-    <string name="chat_room_group_info_you_are_no_longer_admin">Non sei più amministratore</string>
-    <string name="chat_message_imdn_delivered">Consegnato</string>
-    <string name="chat_message_imdn_undelivered">Non consegnato</string>
-    <string name="chat_message_imdn_displayed">Letto</string>
-    <string name="chat_message_imdn_sent">Inviato</string>
-    <string name="chat_message_forwarded">Inoltrato</string>
-    <string name="chat_message_replied">Rispondi</string>
-    <string name="chat_message_context_menu_resend">Invia di nuovo</string>
-    <string name="chat_message_context_menu_copy_text">Copia testo</string>
-    <string name="chat_message_context_menu_forward">Inoltra</string>
-    <string name="chat_message_context_menu_reply">Rispondi</string>
-    <string name="chat_message_imdn_info">Stato di consegna</string>
-    <string name="chat_message_context_menu_imdn_info">Stato di consegna</string>
-    <string name="chat_message_context_menu_delete">Elimina</string>
-    <string name="chat_message_context_menu_add_to_contacts">Aggiungi ai contatti</string>
-    <string name="chat_message_forward_confirmation_dialog">Vuoi inoltrare il messaggio in questa stanza\?</string>
-    <string name="chat_room_ephemeral_message_one_minute">1 minuto</string>
-    <string name="chat_room_ephemeral_message_one_hour">1 ora</string>
-    <string name="chat_room_ephemeral_message_one_day">1 giorno</string>
-    <string name="chat_room_ephemeral_message_three_days">3 giorni</string>
-    <string name="chat_room_ephemeral_message_one_week">1 settimana</string>
-    <string name="assistant_error_passwords_dont_match">Le password non sono uguali</string>
-    <string name="contacts_settings_ldap_title">LDAP</string>
-    <string name="conference_schedule_subject_title">Oggetto</string>
-    <string name="assistant_confirm_password">Conferma password</string>
-    <string name="chat_settings_auto_download_always">Sempre</string>
-    <string name="account_settings_password_title">Password</string>
-    <string name="account_settings_transport_tcp">TCP</string>
-    <string name="account_settings_transport_udp">UDP</string>
-    <string name="assistant_linphone_login_desc">Inserisci il tuo nome utente e password di &appName;</string>
-    <string name="assistant_login_with_username">Utilizza il tuo nome utente e password anziché il tuo numero di telefono</string>
-    <string name="assistant_login_forgotten_password">Dimenticato la tua password\?</string>
-    <string name="assistant_login_desc">Inserisci il tuo nome utente e password con il tuo dominio SIP</string>
-    <string name="assistant_create_account_part_email">Inserisci un nome utente, email e password per il tuo account &appName;</string>
-    <string name="service_auto_start_description">&appName; è stato avviato automaticamente</string>
-    <string name="chat_settings_auto_download_never">Mai</string>
-    <string name="chat_settings_auto_download_max_size_summary">in bytes</string>
-    <string name="about_privacy_policy">Visualizza la nostra politica sulla privacy</string>
-    <string name="assistant_choose_country">Seleziona una nazione</string>
-    <string name="network_settings_wifi_only_title">Usa solo WiFi</string>
-    <string name="network_settings_allow_ipv6_title">Permetti IPv6</string>
-    <string name="network_settings_random_ports_title">Usa porte casuali</string>
-    <string name="network_settings_sip_port_title">Porta SIP da utilizzare</string>
-    <string name="transport_tls">TLS</string>
-    <string name="logs_reset_complete">I log sono stati eliminati</string>
-    <string name="chat_security_event_man_in_the_middle_detected">Rilevato attacco man-in-the-middle per %s</string>
-    <string name="chat_event_ephemeral_disabled">Hai disabilitato i messaggi effimeri</string>
-    <string name="contacts_settings_ldap_password_title">Password</string>
-    <plurals name="chat_room_remote_composing">
-        <item quantity="one">%s sta scrivendo…</item>
-        <item quantity="other">%s stanno scrivendo…</item>
-    </plurals>
-    <string name="transport">Protocollo di trasporto</string>
-    <string name="contact_delete_one_dialog">Vuoi cancellare questo contatto\?
-\nIl contatto verrà rimosso anche dalla tua rubrica</string>
-    <string name="assistant_error_invalid_credentials">L\' account non esiste o la password è errata</string>
-    <string name="account_settings_password_summary">Devi inserire nuovamente la tua password se hai editato il tuo nome utente e/o il dominio</string>
-    <string name="sync_account_name">&appName; contatti</string>
-    <string name="about_weblate_translation">Aiutaci a tradurre &appName;</string>
-    <string name="select_your_country">Seleziona la tua nazione</string>
-    <string name="international_prefix">Prefisso</string>
-    <string name="assistant_choose_country_title">Nome della nazione o prefisso</string>
-    <string name="no_conference_call_history">Nessuna chiamata meeting nella cronologia</string>
-    <string name="assistant_create_account_part_2">Ti abbiamo mandato un SMS con un codice validazione al tuo numero:</string>
-    <string name="assistant_create_account_part_3">Per completare la verifica del tuo numero di telefono inserisci il codice di 4 cifre qui sotto:
-\n</string>
-    <string name="assistant_remote_provisioning_title">Provisioning remoto</string>
-    <string name="assistant_remote_provisioning_desc">PInserisci l\'URL del server di configurazione</string>
-    <string name="assistant_launch_qrcode">Codice QR</string>
-    <string name="audio_settings_echo_canceller_calibration_summary">Clicca per iniziare la calibrazione cancellazione eco</string>
-    <string name="conference_waiting_room_video_disabled">Il video è disabilitato</string>
-    <string name="settings_conferences_title">Meeting</string>
-    <string name="settings_primary_account_title">Account principale</string>
-    <string name="audio_settings_echo_cancellation_calibration_started">Calibrazione cancellazione eco iniziata</string>
-    <string name="audio_settings_echo_cancellation_calibration_no_echo">Nessun eco rilevato</string>
-    <string name="audio_settings_echo_tester_title">Test eco</string>
-    <string name="conference_start_group_call_dialog_message">Vuoi iniziare una nuova chiamata di gruppo\?
-\nTutti i partecipanti di questo gruppo verranno invitati nel meeting.</string>
-    <string name="settings_network_title">Rete</string>
-    <string name="audio_settings_echo_cancellation_summary">Rimuove l\'eco riprodotto dagli altri dispositivi</string>
-    <string name="audio_settings_echo_tester_summary">Clicca per iniziare il test eco</string>
-    <string name="settings_list_title">Preferenze</string>
-    <string name="assistant_link_phone_number_skip">Salta</string>
-    <string name="assistant_remote_provisioning_url">URL</string>
-    <string name="settings_call_title">Chiamata</string>
-    <string name="settings_chat_title">Messaggi</string>
-    <string name="settings_contacts_title">Contatti</string>
-    <string name="settings_primary_account_display_name_title">Nome visualizzato</string>
-    <string name="settings_primary_account_username_title">Nome utente</string>
-    <string name="audio_settings_echo_canceller_calibration_title">Calibrazione cancellazione eco</string>
-    <string name="audio_settings_echo_cancellation_calibration_value">Calibrata in %s ms</string>
-    <string name="audio_settings_adaptive_rate_control_title">Controllo adattivo del rateo</string>
-    <string name="audio_settings_input_device_title">Input dispositivo audio di default</string>
-    <string name="audio_settings_input_device_summary">I cambiamenti verranno applicati alla prossima chiamata</string>
-    <string name="conference_schedule_subject_hint">Oggetto meeting</string>
-    <string name="settings_tunnel_title">Tunnel</string>
-    <string name="assistant_fetch_apply">Trova e applica</string>
-    <string name="settings_default_account_subtitle">Account default</string>
-    <string name="audio_settings_echo_cancellation_calibration_failed">Calibrazione fallita</string>
-    <string name="about">Informazioni su</string>
-    <string name="chat_room_context_menu_group_info">Informazioni gruppo</string>
-    <string name="chat_room_removal_failed_snack">Rimozione chat fallita</string>
-    <string name="conference_organizer">Organizzatore</string>
-    <string name="conference_schedule_summary">Informazioni meeting</string>
-    <string name="conference_group_call_summary">Informazioni chiamata di gruppo</string>
-    <string name="conference_schedule_start">Organizza meeting</string>
-    <string name="conference_invite_join">Entra</string>
-    <string name="conference_invite_participants_count" tools:ignore="PluralsCandidate">%d partecipanti</string>
-    <string name="conference_schedule_info_created">Il meeting è stato organizzato</string>
-    <string name="conference_info_removed">Le info del meeting sono state eliminate</string>
-    <string name="call_locally_paused_title">Hai messo in pausa la chiamata.</string>
-    <string name="call_stats_jitter_buffer">Jitter buffer:</string>
-    <string name="assistant_login_linphone">Usa account &appName;</string>
-    <string name="assistant_general_terms">condizioni d\'uso</string>
-    <string name="account_settings_user_id_title">Auth id</string>
-    <string name="content_description_numpad_4">4</string>
-    <string name="content_description_remove_pending_file_transfer">Cancellazione richiesta trasferimento file</string>
-    <string name="content_description_downloaded_file_transfer">Allega file</string>
-    <string name="content_description_contact_selected">Contatto selezionato</string>
-    <string name="content_description_e2e_encryption_disabled">Crittografia end to end disabilitata</string>
-    <string name="content_description_show_sip_contacts">Mostra una lista con solo contatti SIP</string>
-    <string name="content_description_attach_file">Allega un file al messaggio</string>
-    <string name="content_description_ephemeral_duration_selected">Durata messaggio effimero selezionata</string>
-    <string name="content_description_remove_contact_from_chat_room">Rimuovi contatti dalla conversazione</string>
-    <string name="content_description_contact_can_do_encryption">Il contatto può essere invitato in una conversazione criptata</string>
-    <string name="content_description_start_chat">Vai alla conversazione</string>
-    <string name="content_description_discard_changes">Annulla modifiche</string>
-    <string name="service_name">Servizio &appName;</string>
-    <string name="content_description_show_call_details">Vai ai dettagli della chiamata</string>
-    <string name="content_description_select_all">Seleziona tutti gli oggetti in lista</string>
-    <string name="content_description_numpad_5">5</string>
-    <string name="content_description_numpad_9">9</string>
-    <string name="content_description_numpad_0">0</string>
-    <string name="content_description_numpad_star">*</string>
-    <string name="content_description_numpad_sharp">#</string>
-    <string name="content_description_menu_chat">Conversazioni</string>
-    <string name="content_description_dialer_erase">Rimuovi ultimo carattere</string>
-    <string name="content_description_show_all_calls">Mostra tutte le chiamate</string>
-    <string name="content_description_show_missed_calls">Mostra solo le chiamate perse</string>
-    <string name="content_description_missed_call">Chiamate perse</string>
-    <string name="content_description_security_level_safe">Sicura</string>
-    <string name="content_description_security_level_encrypted">Criptata</string>
-    <string name="chat_room_choose_conversation_for_file_sharing">Seleziona o crea una conversazione in cui condividere questo file</string>
-    <string name="contacts_settings_ldap_connection_title">Connessione</string>
-    <string name="chat_message_context_menu_turn_off_notifications">Disabilita notifiche</string>
-    <string name="content_description_toggle_audio_menu">Mostra o nascondi menu output audio</string>
-    <string name="content_description_close_bubble">Chiudi bolla notifica</string>
-    <string name="conference_participant_paused">(in pausa)</string>
-    <string name="call_error_server_timeout">Timeout del server</string>
-    <string name="call_stats_upload">Banda di upload:</string>
-    <string name="call_stats_download">Banda di download:</string>
-    <string name="call_stats_zrtp_key_agreement_algo">Algoritmo di scambio delle chiavi:</string>
-    <string name="call_context_action_transfer">Trasferisci chiamata</string>
-    <string name="call_remote_recording">Questa chiamata è registrata.</string>
-    <string name="call_stats_video">Video</string>
-    <string name="advanced_settings_remote_provisioning_url_title">URL provisioning remoto</string>
-    <string name="call_stats_codec">Codec:</string>
-    <string name="conference_schedule_send_invite_chat_summary">L\'invito sarà inviato tramite il mio account &appName;</string>
-    <string name="assistant_validate_account_1">Il tuo account è stato creato. Controlla la tua email per verificare il tuo account:</string>
-    <string name="contacts_settings_ldap_tls_title">Usa TLS</string>
-    <string name="contacts_settings_ldap_cert_check_disabled">Disabilitato</string>
-    <string name="advanced_settings_disable_fragment_security_summary">Permetti screenshot/recording su contenuti sensibili</string>
-    <string name="chat_message_voice_recording_notification_short_desc">messaggio vocale</string>
-    <string name="yes">Si</string>
-    <string name="no">No</string>
-    <string name="app_description">il client SIP &lt;i&gt;libero&lt;/i&gt;</string>
-    <string name="conference_schedule_edit">Modifica meeting</string>
-    <string name="conference_admin_unset">%s non è più admin</string>
-    <string name="call_error_generic">Errore: %s</string>
-    <string name="call_context_action_hangup">Termina chiamata</string>
-    <string name="call_screenshot_taken">Snapshot acquisito: %s</string>
-    <string name="call_stats_decoder_name">Decoder:</string>
-    <string name="audio_settings_microphone_gain_title">Volume microfono</string>
-    <string name="contacts_settings_ldap_search_timeout_subtitle">In secondi</string>
-    <string name="chat_remote_is_composing">Remoto sta scrivendo…</string>
-    <string name="account_settings_domain_title">Dominio</string>
-    <string name="account_settings_expires_title">Scadenza</string>
-    <string name="account_settings_apply_prefix_for_calls_title">Applica prefisso per le chiamate in uscita e le chat</string>
-    <string name="content_description_go_back_to_call">Torna alla chiamata</string>
-    <string name="content_description_enable_video">Abilita video in chiamata</string>
-    <string name="conference">Riunione</string>
-    <string name="call_stats_player_filter">Filtro di riproduzione:</string>
-    <string name="recordings_export">Esporta registrazione usando…</string>
-    <string name="settings_advanced_title">Avanzate</string>
-    <string name="settings_password_protection_dialog_ok_label">Valida</string>
-    <string name="settings_password_protection_dialog_invalid_input">Password errata!</string>
-    <string name="audio_settings_software_echo_cancellation_title">Cancellazione eco software</string>
-    <string name="call_error_io_error">Servizio non disponibile o errore network</string>
-    <string name="audio_settings_playback_gain_summary">(in decibel)</string>
-    <string name="chat_settings_file_sharing_url_summary">Modifiche solo per utenti esperti!</string>
-    <string name="chat_settings_downloaded_media_public_title">Rendi pubblici i media scaricati</string>
-    <string name="chat_settings_hide_notification_content_title">Nascondi il contenuto del messaggio nelle notifiche</string>
-    <string name="contacts_settings_ldap_parsing_title">Analisi in corso</string>
-    <string name="assistant_welcome_title">Benvenuto</string>
-    <string name="advanced_settings_background_mode_title">Modalità background</string>
-    <string name="assistant_welcome_desc">Questo assistente ti aiuterà a configurare ed utilizzare il tuo account SIP.</string>
-    <string name="assistant_create_account">Crea account &appName;</string>
-    <string name="assistant_remote_provisioning">Provisioning remoto</string>
-    <string name="advanced_settings_vfs_summary">Una volta abilitato non sarà più possibile disabilitare!</string>
-    <string name="assistant_link_account">Collega account</string>
-    <string name="settings_accounts_title">Account SIP</string>
-    <string name="settings_audio_title">Audio</string>
-    <string name="call_settings_sipinfo_dtmf_title">Manda out-band DTMFs (SIP INFO)</string>
-    <string name="account_settings_user_name_summary">Esempio: john se il tuo account è: john@sip.example.org</string>
-    <string name="account_settings_user_id_summary">Inserisci authentication id se differente dal nome utente (opzionale)</string>
-    <plurals name="chat_room_unread_messages_event">
-        <item quantity="one">%1$d messaggio non letto</item>
-        <item quantity="other">%1$d messaggi non letti</item>
-    </plurals>
-    <string name="account_settings_display_name_title">Nome in display</string>
-    <string name="call_settings_redirect_to_voice_mail_declined_calls_title">Ridireziona le chiamate rifiutate alla segreteria telefonica URI</string>
-    <string name="account_settings_avpf_title">AVPF</string>
-    <string name="account_settings_avpf_rr_interval_title">AVPF regular RTCP interval</string>
-    <string name="account_settings_avpf_rr_interval_summary">in secondi (between 1 and 5)</string>
-    <string name="account_settings_escape_plus_title">Rimpiazza + con 00</string>
-    <string name="account_setting_conference_factory_address">Conference factory URI</string>
-    <string name="account_setting_end_to_end_encryption_keys_server_url">E2E encryption keys server URL</string>
-    <string name="account_setting_publish_presence_title">Pubblica informazioni presenza</string>
-    <string name="account_setting_delete_generic_confirmation_dialog">Il tuo account sarà eliminato solo localmente.
-\nPer eliminato permanentemente, vai nel sito web del tuo provider SIP.</string>
-    <string name="chat_settings_auto_download_voice_recordings">Scarica automaticamente le registrazioni vocali in arrivo</string>
-    <string name="conferences_settings_layout_title">Layout di default</string>
-    <string name="received_chat_notification_reply_label">Rispondi</string>
-    <string name="received_chat_notification_mark_as_read_label">Segna come già letto</string>
-    <string name="contacts_settings_native_presence_title">Presence information nei contatti nativi</string>
-    <string name="contacts_settings_ldap_search_max_results_title">Risultati massimi</string>
-    <string name="contacts_settings_ldap_search_timeout_title">Scaduta</string>
-    <string name="advanced_settings_device_name_title">Nome dispositivo</string>
-    <string name="content_description_phone_number_use">Mostra a cosa servirà il tuo numero di telefono</string>
-    <string name="content_description_clear_field">Svuota il campo testo accanto</string>
-    <string name="content_description_confirm_contact_edit">Salva modifiche</string>
-    <string name="content_description_muted_chat_room">Le notifiche di questa conversazione sono disabilitate</string>
-    <string name="assistant_create_account_part_1">Inserisci il tuo numero di telefono e prefisso internazionale</string>
-    <string name="video_settings_initiate_call_summary">Manda sempre richieste video</string>
-    <string name="call_settings_system_wide_overlay_title">Mostra overlay fuori dall\'app</string>
-    <string name="contacts_settings_ldap_name_attribute_title">Nome attributi</string>
-    <string name="advanced_settings_debug_mode_title">Log di debug</string>
-    <string name="advanced_settings_dark_mode_label_auto">Auto</string>
-    <string name="advanced_settings_logs_server_url_title">URL del server di upload dei log</string>
-    <string name="advanced_settings_go_to_battery_optimization_settings">Impostazioni consumo batteria</string>
-    <string name="advanced_settings_send_debug_logs_title">Manda logs</string>
-    <string name="tunnel_settings_dual_hostname_url_summary">Richiesto in dual mode</string>
-    <string name="account_settings_advanced_title">Avanzate</string>
-    <string name="account_settings_push_notification_title">Permetti notifiche push</string>
-    <string name="account_settings_transport_tls">TLS</string>
-    <string name="notification_channel_service_name">&appName; notifica di servizio</string>
-    <string name="notification_channel_missed_call_name">&appName; notifica chiamate perse</string>
-    <string name="dialog_delete">Elimina</string>
-    <string name="conference_low_bandwidth">Connessione lenta, disabilitazione video</string>
-    <string name="conference_scheduled_delete_many_dialog">Vuoi cancellare questi meeting\?</string>
-    <string name="call_stats_zrtp_cipher_algo">Algoritmo di cifratura:</string>
-    <string name="video_settings_preferred_fps_title">FPS preferiti</string>
-    <string name="call_settings_encryption_title">Crittografia media</string>
-    <string name="call_settings_encryption_mandatory_title">Crittografia media obbligatoria</string>
-    <string name="chat_settings_downloaded_media_public_summary">I file nei messaggi effimeri non saranno, non funzioneranno con la funzione di download automatico</string>
-    <string name="chat_settings_hide_rooms_removed_proxies_title">Nascondi chat rooms dagli account rimossi</string>
-    <string name="contacts_settings_launcher_shortcuts_summary">Rimpiazzerà le scorciatoie chat room se presenti</string>
-    <string name="contacts_settings_show_new_contact_account_dialog_title">Chiedi sempre su quale account salvare il nuovo contatto</string>
-    <string name="contacts_settings_ldap_bind_dn_title">Vincola DN</string>
-    <string name="contacts_settings_ldap_misc_title">Miscellanea</string>
-    <string name="contacts_settings_ldap_request_delay_subtitle">In millisecondi</string>
-    <string name="advanced_settings_background_mode_summary">Mostra una notifica per mantenere l\'app attiva</string>
-    <string name="account_settings_transport_dtls">DTLS</string>
-    <string name="account_settings_outbound_proxy_title">Outbound proxy</string>
-    <string name="account_settings_expires_summary">in secondi</string>
-    <string name="account_settings_prefix_title">Prefisso per il tuo Paese</string>
-    <string name="account_settings_prefix_summary">senza il +</string>
-    <string name="dialog_try_open_file_as_text_body">Vuoi provare ad aprirla come un file di testo\?</string>
-    <string name="content_description_ephemeral_chat_room">I messaggi sono effimeri in questa conversazione</string>
-    <string name="content_description_numpad_7">7</string>
-    <string name="content_description_delete_conference">Elimina meeting</string>
-    <string name="conference_no_terminated_schedule">Nessun meeting terminato.</string>
-    <string name="conference_go_to_chat">Gruppo chat del meeting</string>
-    <string name="conference_start_group_call_dialog_ok_button">Inizia</string>
-    <string name="call_action_change_conf_layout">Cambia layout</string>
-    <string name="assistant_validate_account_2">Una volta fatto, torna qui e clicca sul tasto.</string>
-    <string name="audio_settings_echo_tester_summary_is_stopped">Test eco fermato</string>
-    <string name="tunnel_settings_dual_mode_title">Dual mode abilitata</string>
-    <string name="conference_schedule_send_updated_invite_chat">Manda aggiornamento tramite &appName;</string>
-    <string name="conference_schedule_send_updated_invite_email">Manda aggiornamento tramite email</string>
-    <string name="call_action_chat">Chat</string>
-    <string name="call_action_numpad">Tastierino numerico</string>
-    <string name="account_settings_link_phone_number_title">Collega il tuo account</string>
-    <string name="incoming_call_notification_title">Chiamata in arrivo</string>
-    <string name="content_description_delivery_status">Avvisa status consegna</string>
-    <string name="content_description_linphone_user">Il contatto è un utente &appName;</string>
-    <string name="content_description_voice_mail">Segreteria telefonica</string>
-    <string name="content_description_call_security_pending">La sicurezza della chiamata è in attesa</string>
-    <string name="content_description_conference_participant_mic_muted">Il partecipante è mutato</string>
-    <string name="contacts_new_contact_wont_be_visible_warning_dialog">Stai per creare un nuovo contatto senza un SIP URI o un numero di telefono, questo non lo renderà visibile su &appName;.
-\n
-\nVuoi crearlo comunque\?</string>
-    <string name="chat_message_pick_file_dialog">Seleziona sorgente</string>
-    <string name="chat_room_devices_fragment_title">Dispositivi della conversazione</string>
-    <string name="chat_room_choose_conversation_for_text_sharing">Seleziona o crea una conversazione in cui condividere il testo</string>
-    <string name="chat_room_delete_many_dialog">Sei sicuro di voler cancellare queste conversazioni\?</string>
-    <string name="chat_room_context_menu_participants_devices">Dispositivi della conversazione</string>
-    <string name="chat_message_context_menu_ephemeral_messages">Messaggio effimero</string>
-    <string name="chat_message_context_menu_delete_messages">Cancella messaggi</string>
-    <string name="chat_room_creation_failed_snack">Creazione chat fallita</string>
-    <string name="chat_room_delete_one_dialog">Sei sicuro di voler cancellare questa conversazione\?</string>
-    <string name="chat_message_notification_hidden_content">&lt;Redatto&gt;</string>
-    <string name="chat_message_no_app_found_to_handle_file_mime_type">Nessun app disponibile per questo tipo di file</string>
-    <string name="chat_message_cant_open_file_in_app_dialog_title">Impossibile mostrare il file.</string>
-    <string name="chat_message_cant_open_file_in_app_dialog_message">Vuoi aprirlo come testo o esportarlo (non criptato) a un app di terzi se disponibile\?</string>
-    <string name="chat_room_sending_message_hint">Messaggio</string>
-    <string name="chat_message_voice_recording_hold_to_record">Tieni premuto per registrare un messaggio vocale</string>
-    <string name="chat_message_voice_recording_playback_low_volume">Alza il volume</string>
-    <string name="chat_message_download_already_in_progress">Attendi che il download sia finito prima di iniziarne un altro</string>
-    <string name="chat_message_voice_recording_received_notification">Hai ricevuto un messaggio vocale</string>
-    <string name="chat_room_presence_do_not_disturb">Non disturbare</string>
-    <string name="chat_message_reaction_received">%s ha reagito con %s a: %s</string>
-    <string name="chat_message_one_reaction">%s reazione</string>
-    <string name="chat_message_many_reactions">%s reazioni</string>
-    <string name="conference_schedule_title">Organizza un meeting</string>
-    <string name="conference_group_call_title">Inizia chiamata di gruppo</string>
-    <string name="conference_schedule_later">Vuoi organizzare un meeting per dopo\?</string>
-    <string name="conference_schedule_mandatory_field">Obbligatorio</string>
-    <string name="conference_group_call_subject_hint">Oggetto chiamata di gruppo</string>
-    <string name="conference_schedule_address_title">Indirizzo meeting</string>
-    <string name="conference_schedule_date">Data</string>
-    <string name="conference_schedule_time">Orario</string>
-    <string name="conference_schedule_duration">Durata</string>
-    <string name="conference_schedule_timezone">Fuso orario</string>
-    <string name="conference_schedule_send_invite_chat">Manda invito tramite &appName;</string>
-    <string name="conference_schedule_send_invite_email">Manda invito tramite email</string>
-    <string name="conference_schedule_encryption">Vuoi criptare il meeting\?</string>
-    <string name="conference_schedule_participants_list">Lista partecipanti</string>
-    <string name="conference_group_call_create">Inizia chiamata di gruppo</string>
-    <string name="conference_schedule_address_copied_to_clipboard">Indirizzo meeting copiato</string>
-    <string name="conference_schedule_info_not_sent_to_participant">Impossibile mandare info meeting al partecipante</string>
-    <string name="conference_paused_title">Sei attualmente fuori dal meeting.</string>
-    <string name="conference_display_mode_mosaic">Modalità mosaico</string>
-    <string name="conference_display_mode_audio_only">Modalità solo audio</string>
-    <string name="conference_waiting_room_start_call">Inizia</string>
-    <string name="conference_waiting_room_cancel_call">Cancella</string>
-    <string name="conference_scheduled">Meeting</string>
-    <string name="conference_layout_too_many_participants_for_mosaic">Impossibile cambiare il layout del gruppo, ci sono troppi partecipanti</string>
-    <string name="conference_too_many_participants_for_mosaic_layout">Ci sono troppi partecipanti per la modalità mosaico, la modalità verrà cambiata a speaker attivo</string>
-    <string name="conference_no_schedule">Nessun meeting organizzato.</string>
-    <string name="conference_creation_failed">Impossibile creare il meeting</string>
-    <string name="conference_empty">Sei l\'unico partecipante della chiamata al momento</string>
-    <string name="conference_invitation_received_notification">Sei stato invitato in un meeting</string>
-    <string name="conference_invitation_notification_short_desc">invito meeting</string>
-    <string name="conference_invitation">Invito meeting</string>
-    <string name="conference_first_to_join">Sei il primo nella chiamata di gruppo</string>
-    <string name="conference_last_user">Tutti gli altri partecipanti sono usciti dalla chiamata di gruppo</string>
-    <string name="conference_incoming_title">Chiamata di gruppo in arrivo</string>
-    <string name="conference_participants_title">Partecipanti (%d)</string>
-    <string name="conference_scheduled_future_filter">Organizzato</string>
-    <string name="conference_scheduled_delete_one_dialog">Vuoi cancellare questo meeting\?</string>
-    <string name="conference_scheduled_cancelled_by_organizer">La conferenza è stata cancellata dall\'organizzatore</string>
-    <string name="conference_scheduled_cancelled_by_me">Hai cancellato la conferenza</string>
-    <string name="call_incoming_title">Chiamata in arrivo</string>
-    <string name="call_outgoing_title">Chiamata in uscita</string>
-    <string name="call_notification_paused">Chiamata in pausa</string>
-    <string name="call_notification_outgoing">Chiamata in uscita</string>
-    <string name="call_notification_active">Chiamata in corso</string>
-    <string name="call_error_declined">La chiamata è stata rifiutata</string>
-    <string name="call_error_user_busy">L\'utente è occupato</string>
-    <string name="call_error_user_not_found">L\'utente non è stato trovato</string>
-    <string name="call_error_incompatible_media_params">Parametri media non compatibili</string>
-    <string name="call_error_network_unreachable">Il network non è raggiungibile</string>
-    <string name="call_error_temporarily_unavailable">Temporaneamente non disponibile</string>
-    <string name="call_video_update_requested_dialog">Corrispondente vorrebbe avviare il suo video</string>
-    <string name="call_action_participants_list">Lista partecipanti</string>
-    <string name="call_action_calls_list">Lista chiamate</string>
-    <string name="call_action_statistics">Statistiche chiamate</string>
-    <string name="call_action_attended_transfer_call">Attendi trasferimento</string>
-    <string name="call_stats_estimated_download">Banda di download stimata:</string>
-    <string name="call_stats_ice">Connettività ICE:</string>
-    <string name="call_context_action_pause">Metti in pausa la chiamata</string>
-    <string name="call_context_action_answer">Rispondi alla chiamata</string>
-    <string name="call_locally_paused_subtitle">Premi sul tasto play per riprenderla.</string>
-    <string name="call_stats_audio">Audio</string>
-    <string name="call_stats_sender_loss_rate">Sender loss rate:</string>
-    <string name="call_stats_receiver_loss_rate">Receiver loss rate:</string>
-    <string name="call_stats_capture_filter">FIltro di cattura:</string>
-    <string name="call_stats_media_encryption">Crittografia media:</string>
-    <string name="call_stats_zrtp_hash_algo">Algoritmo di hash:</string>
-    <string name="call_stats_zrtp_auth_tag_algo">Algoritmo di autenticazione:</string>
-    <string name="call_stats_zrtp_sas_algo">Algoritmo SAS:</string>
-    <string name="call_stats_encoder_name">Encoder:</string>
-    <string name="assistant_login_generic">Usa account SIP</string>
-    <string name="assistant_ec_calibration">Calibrazione cancellazione eco in corso</string>
-    <string name="assistant_phone_number_info_title">A cosa servirà il mio numero di telefono\?</string>
-    <string name="assistant_phone_number_link_info_content">"
-\nI tuoi amici ti troveranno più facilmente se collegherai il tuo account al tuo numero di telefono
-\n
-\nVedrai nella tua rubrica chi sta utilizzando &appName; ed i tuoi amici sapranno che ti potranno trovare su &appName;.
-\n"</string>
-    <string name="assistant_read_and_agree_terms">Accetto i %1$s and %2$s di Belledonne Communications</string>
-    <string name="assistant_generic_account_warning">Alcune funzioni richiedono un account &appName;, come le chat di gruppo o i messaggi effimeri.
-\n
-\nQueste funzioni verranno nascoste quando ti registri con un SIP account di terze parti.
-\n
-\nPer attivarle a fini commerciali, per favore contattaci.</string>
-    <string name="assistant_error_phone_number_already_exists">Un altro account utilizza già questo numero</string>
-    <string name="assistant_error_username_too_long">Il nome utente è troppo lungo</string>
-    <string name="assistant_error_invalid_international_prefix">Prefisso internazionale errato</string>
-    <string name="assistant_linphone_account">Utilizza il tuo account &appName;</string>
-    <string name="assistant_finish">Fine configurazione</string>
-    <string name="assistant_use_username_instead_or_phone_number">Usa un nome utente (opzionale)</string>
-    <string name="assistant_create_email_account_not_validated">Il tuo account non è stato ancora attivato, clicca sul link che hai ricevuto nella tua email</string>
-    <string name="settings_video_title">Video</string>
-    <string name="audio_settings_echo_tester_summary_is_running">Test eco in corso</string>
-    <string name="audio_settings_prefer_bluetooth_devices_title">Riproduci l\'audio sui dispositivi bluetooth (se connessi)</string>
-    <string name="audio_settings_microphone_gain_summary">(in decibel)</string>
-    <string name="audio_settings_playback_gain_title">Volume playback</string>
-    <string name="video_settings_bandwidth_limit_title">Limite banda</string>
-    <string name="call_settings_device_ringtone_title">Utilizza suoneria dispositivo</string>
-    <string name="call_settings_media_encryption_none">Nessuno</string>
-    <string name="call_settings_media_encryption_srtp">SRTP</string>
-    <string name="call_settings_media_encryption_zrtp">ZRTP</string>
-    <string name="call_settings_media_encryption_zrtp_post_quantum">Post Quantum ZRTP</string>
-    <string name="call_settings_overlay_title">Notifica chiamata in overlay</string>
-    <string name="call_settings_auto_start_summary">La chiamata inizierà automaticamente se avviata da un\'altra applicazione</string>
-    <string name="call_settings_auto_answer_title">Accetta automaticamente le chiamate in entrata</string>
-    <string name="call_settings_incoming_timeout_title">Scadenza chiamata in entrata</string>
-    <string name="call_settings_auto_start_recording_title">Registra le chiamate in automatico</string>
-    <string name="call_settings_remote_recording_title">Ricevi una notifica quando il corrispondente sta registrando la chiamata</string>
-    <string name="audio_settings_codecs_title">Codec</string>
-    <string name="video_settings_video_preset_title">Preset video</string>
-    <string name="video_settings_bandwidth_limit_summary">in kbit/s</string>
-    <string name="video_settings_codecs_title">Codec</string>
-    <string name="chat_settings_mark_as_read_notif_dismissal_title">Segna come letto quando la notifica viene cancellata</string>
-    <string name="chat_settings_auto_download_max_size_title">Dimensione massima</string>
-    <string name="chat_settings_hide_notification_content_summary">Solo il nome del mittente verrà visualizzato</string>
-    <string name="chat_settings_hide_rooms_removed_proxies_summary">Se non visualizzi alcune chat rooms, prova a disabilitare questa funzione</string>
-    <string name="chat_settings_go_to_android_notification_settings">Impostazioni notifiche Android</string>
-    <string name="contacts_settings_show_organization_title">Mostra organizzazione contatti</string>
-    <string name="contacts_settings_launcher_shortcuts_title">Crea scorciatoia ai contatti nel launcher</string>
-    <string name="contacts_settings_show_new_contact_account_dialog_summary">Se disabilitato il contatto sarà salvato localmente</string>
-    <string name="contacts_settings_create_new_ldap_config_title">Nuova configurazione LDAP</string>
-    <string name="contacts_settings_ldap_enable_title">Abilitato</string>
-    <string name="contacts_settings_ldap_auth_method_title">Metodo autenticazione</string>
-    <string name="contacts_settings_ldap_auth_method_anonymous">Anonimo</string>
-    <string name="contacts_settings_ldap_auth_method_simple">Semplice</string>
-    <string name="contacts_settings_ldap_cert_check_title">Controlla certificati</string>
-    <string name="contacts_settings_ldap_cert_check_auto">Auto</string>
-    <string name="contacts_settings_ldap_cert_check_enabled">Abilitato</string>
-    <string name="contacts_settings_ldap_search_title">Cerca</string>
-    <string name="contacts_settings_ldap_search_base_title">Cerca base</string>
-    <string name="contacts_settings_ldap_search_base_subtitle">Non può essere vuoto!</string>
-    <string name="contacts_settings_ldap_search_filter_title">Filtra</string>
-    <string name="contacts_settings_ldap_request_delay_title">Ritardo tra due richieste</string>
-    <string name="contacts_settings_ldap_minimum_characters_title">Caratteri minimi per iniziare una ricerca</string>
-    <string name="contacts_settings_ldap_sip_attribute_title">SIP attributi</string>
-    <string name="contacts_settings_ldap_sip_domain_title">Dominio</string>
-    <string name="contacts_settings_ldap_debug_title">Debug</string>
-    <string name="advanced_settings_auto_start_title">Avvia ad un orario preimpostato</string>
-    <string name="advanced_settings_dark_mode_label_yes">Si</string>
-    <string name="advanced_settings_animations_title">Animazioni</string>
-    <string name="advanced_settings_device_name_summary">I cambiamenti verranno applicati al prossimo avvio</string>
-    <string name="advanced_settings_other_title">Altre impostazioni</string>
-    <string name="advanced_settings_disable_fragment_security_title">Disabilita modalità sicura UI</string>
-    <string name="tunnel_settings_port_title">Port</string>
-    <string name="tunnel_settings_dual_port_title">Secondo server port</string>
-    <string name="tunnel_settings_dual_port_summary">Richiesto in dual mode</string>
-    <string name="tunnel_settings_mode_title">Modalità</string>
-    <string name="tunnel_settings_disabled_mode">Disabilitato</string>
-    <string name="tunnel_settings_always_mode">Sempre</string>
-    <string name="account_settings_user_name_title">Nome utente</string>
-    <string name="account_settings_domain_summary">Esempio: sip.example.org se il tuo account è john@sip.example.org</string>
-    <string name="account_settings_manage_title">Gestisci</string>
-    <string name="account_settings_disable_title">Disabilita</string>
-    <string name="account_settings_default_title">Usa come default</string>
-    <string name="account_settings_delete_title">Elimina</string>
-    <string name="account_settings_transport_title">Trasporto</string>
-    <string name="account_settings_outbound_proxy_summary">Direziona tutte le calls attraverso il proxy SIP</string>
-    <string name="account_settings_stun_server_title">STUN/TURN server</string>
-    <string name="account_settings_ice_title">Abilita ICE</string>
-    <string name="account_settings_apply_prefix_for_calls_summary">Se un numero è inserito, applica il prefisso al numero</string>
-    <string name="account_setting_audio_video_conference_factory_address">Audio/video conference factory URI</string>
-    <string name="account_setting_delete_dialog_title">Vuoi eliminare il tuo account\?</string>
-    <string name="account_setting_delete_sip_linphone_org_confirmation_dialog">Il tuo account sarà eliminato solo localmente.
-\nPer eliminato permanentemente, vai nella tua piattaforma di gestione account:</string>
-    <string name="incoming_call_notification_answer_action_label">Accetta</string>
-    <string name="missed_call_notification_body">Chiamata persa da %s</string>
-    <string name="missed_calls_notification_body" tools:ignore="PluralsCandidate">%d chiamate perse</string>
-    <string name="zrtp_dialog_title">Sicurezza comunicazione</string>
-    <string name="zrtp_dialog_explanation">Per aumentare il tuo livello di sicurezza, puoi controllare il tuo codice con il corrispondente.</string>
-    <string name="zrtp_dialog_later_button_label">Più tardi</string>
-    <string name="zrtp_dialog_correct_button_label">Corretto</string>
-    <string name="dialog_zrtp_remote_sas">Il tuo corrispondente deve dire:</string>
-    <string name="dialog_do_not_ask_again">Non mostrare più</string>
-    <string name="dialog_accept">Accetta</string>
-    <string name="dialog_decline">Declina</string>
-    <string name="dialog_lime_security_message">I messaggi istantanei sono criptati in maniera end-to-end nelle conversazioni sicure. Sarà possibile aumentare il livello di sicurezza autenticando i partecipanti. Per farlo, chiama il contatto e segui il processo di autenticazione.</string>
-    <string name="dialog_apply_remote_provisioning_title">Vuoi scaricare e applicare la configurazione da questo URL\?</string>
-    <string name="dialog_apply_remote_provisioning_button">Applica</string>
-    <string name="dialog_authentication_required_title">Autenticazione necessaria</string>
-    <string name="dialog_authentication_required_message">Connessione fallita, l\'autenticazione è mancante o invalida per l\'account
-\n%s.
-\n
-\nProva a reinserire la password nuovamente, o controlla la configurazione del tuo account nelle impostazioni.</string>
-    <string name="dialog_authentication_required_change_password_label">Conferma</string>
-    <string name="android_14_full_screen_intent_permission_not_granted">Permessi richiesti per mostrare la chiamata in arrivo non ancora garantiti</string>
-    <string name="android_14_go_to_full_screen_intent_permission_setting">Mostra</string>
-    <string name="content_description_add_sip_address_field">Inserisci campo indirizzo SIP</string>
-    <string name="content_description_add_phone_number_field">Inserisci campo numero telefonico</string>
-    <string name="content_description_switch_camera">Alterna tra telecamera frontale e posteriore</string>
-    <string name="content_description_pause_call">Metti in pausa la chiamata</string>
-    <string name="content_description_terminate_call">Termina chiamata</string>
-    <string name="content_description_answer_call">Rispondi alla chiamata</string>
-    <string name="content_description_enable_mic_mute">Disattiva microfono</string>
-    <string name="content_description_disable_mic_mute">Attiva microfono</string>
-    <string name="content_description_disable_speaker">Disattiva vivavoce</string>
-    <string name="content_description_use_bluetooth_headset">Usa cuffie bluetooth come output predefinito</string>
-    <string name="content_description_use_speaker">Use altoparlante come input audio</string>
-    <string name="content_description_add_call">Avvia nuova chiamata</string>
-    <string name="content_description_forward_message">Inoltra messaggio in questa conversazione</string>
-    <string name="content_description_show_chat_room_menu">Mostra menù chat</string>
-    <string name="content_description_enter_edition_mode">Entra in modalità editor</string>
-    <string name="content_description_send_message">Invia messaggio</string>
-    <string name="content_description_toggle_participant_devices_list">Mostra o nascondi i dispositivi dei partecipanti</string>
-    <string name="content_description_create_chat_room">Crea chat room</string>
-    <string name="content_description_add_participants">Agiungi partecipanti</string>
-    <string name="content_description_contact_is_admin">Il contatto è un admin in questa conversazione</string>
-    <string name="content_description_start_encrypted_chat">Vai alla conversazione criptata</string>
-    <string name="content_description_change_contact_picture">Cambia foto contatto</string>
-    <string name="content_description_change_own_picture">Cambia foto profilo</string>
-    <string name="content_description_exit_edition_mode">Esci dalla modalità editor</string>
-    <string name="content_description_delete_selection">Elimina gli oggetti selezionati in lista</string>
-    <string name="content_description_numpad_1">1</string>
-    <string name="content_description_numpad_3">3</string>
-    <string name="content_description_numpad_6">6</string>
-    <string name="content_description_numpad_8">8</string>
-    <string name="content_description_recording_toggle_play">Riproduci o metti in pausa la registrazione</string>
-    <string name="content_description_toggle_side_menu">Mostra o nascondi menù laterale</string>
-    <string name="content_description_menu_history">Cronologia chiamate</string>
-    <string name="content_description_add_contact">Crea contatto</string>
-    <string name="content_description_go_to_contact">Vai ai dettagli contatto</string>
-    <string name="content_description_incoming_call">Chiamate in arrivo</string>
-    <string name="content_description_outgoing_call">Chiamate in uscita</string>
-    <string name="content_description_create_one_to_one_chat_room">Crea una conversazione one-to-one</string>
-    <string name="content_description_create_group_chat_room">Crea una conversazione di gruppo</string>
-    <string name="content_description_security_level_unsafe">Non sicura</string>
-    <string name="content_description_call_quality_0">Qualità chiamata molto bassa</string>
-    <string name="content_description_chat_message_video_attachment">Allegato video</string>
-    <string name="content_description_chat_message_meeting_attachment">Allegato meeting</string>
-    <string name="content_description_take_screenshot">Fai uno screenshot del video ricevuto</string>
-    <string name="content_description_open_app">Apri conversazione in app anziché in bolla</string>
-    <string name="content_description_export">Apri file in app di terzi</string>
-    <string name="content_description_cancel_forward">Cancella inoltro messaggio</string>
-    <string name="content_description_cancel_sharing">Cancella condivisione</string>
-    <string name="content_description_cancel_reply">Cancella risposta</string>
-    <string name="content_description_voice_recording">Registra messaggio vocale</string>
-    <string name="content_description_cancel_voice_recording">Cancella messaggio vocale</string>
-    <string name="content_description_pause_voice_recording_playback">Metti in pausa messaggio vocale</string>
-    <string name="content_description_play_voice_recording">Riproduci messaggio vocale</string>
-    <string name="content_descripton_scroll_to_bottom">Scorri in basso o ai primi messaggi non letti</string>
-    <string name="content_description_call_context_menu">Apri menù chiamate</string>
-    <string name="content_description_create_conference">Crea una chiamata meeting</string>
-    <string name="content_description_copy_conference_address">Copia indirizzo meeting</string>
-    <string name="content_description_edit_conference">Modifica meeting</string>
-    <string name="content_description_encrypted_conference">Il meeting sarà criptato</string>
-    <string name="content_description_share_ics">Esporta evento al calendario</string>
-    <string name="content_description_show_numpad">Mostra tastierino numerico</string>
-    <string name="content_description_hide_numpad">Nascondi tastierino numerico</string>
-    <string name="content_description_go_to_chat_rooms_list">Vai alla lista conversazioni</string>
-    <string name="content_description_toggle_layout_menu">Mostra o nascondi menù layout della chiamata di gruppo</string>
-    <string name="content_description_participant_is_paused">Il partecipante ha lasciato momentaneamente la chiamata di gruppo</string>
-    <string name="content_description_toggle_conference_info_details">Attiva o disattiva informazioni dettagli visibilità</string>
-    <string name="content_description_recording_export">Esporta registrazioni</string>
-    <string name="content_description_presence_do_not_disturb">L\'utente non vuole essere disturbato</string>
-    <string name="content_description_emoji_picker">Attiva o disattiva scelta emoji</string>
-    <string name="error_unexpected">Errore inaspettato…</string>
-    <string name="chat_message_context_menu_turn_on_notifications">Abilita notifiche</string>
-    <string name="chat_room_ephemeral_fragment_title">Messaggi effimeri</string>
-    <string name="chat_room_ephemeral_messages_desc">Questo messaggio sarà cancellato per entrambi gli utenti una volta che è stato letto alla scadenza del timeout.</string>
-    <string name="chat_room_ephemeral_message_disabled">Disabilitato</string>
-    <string name="chat_bubble_cant_open_enrypted_file">Impossibile aprire questo file criptato nella anteprima</string>
-    <string name="chat_message_cant_open_file_in_app_dialog_export_button">Esporta</string>
-    <string name="chat_message_cant_open_file_in_app_dialog_open_as_text_button">Apri come testo</string>
-    <string name="chat_room_sending_reply_hint">Rispondi</string>
-    <string name="chat_message_removal_info">Il messaggio verrà eliminato</string>
-    <string name="chat_message_abort_removal">Annulla</string>
-    <string name="chat_message_voice_recording">Messaggio vocale</string>
-    <string name="call_remotely_paused_title">La chiamata è stata messa in pausa da remoto.</string>
-    <string name="assistant_phone_number_link_info_content_already_account">Puoi utilizzare il tuo numero di telefono solo con un account di &appName;.
-\n
-\nSe hai già collegato il tuo account ad un numero di telefono ma preferisci utilizzare questo, collegalo ora ed il tuo numero sarà automaticamente spostato su questo account.</string>
-    <string name="assistant_error_username_already_exists">Nome utente già in uso</string>
-    <string name="assistant_confirmation_code">Codice di conferma</string>
-    <string name="assistant_continue_even_if_credentials_invalid">Continua</string>
-    <string name="assistant_generic_account">Utilizza account SIP</string>
-    <string name="assistant_remote_provisioning_wrong_format">Formato URL sconosciuto, impossibile eseguire provisioning…</string>
-    <string name="assistant_remote_provisioning_failure">Impossibile scaricare o applicare la configurazione remota…</string>
-    <string name="settings_password_protection_dialog_title">Inserisci la tua password per accedere alle informazioni</string>
-    <string name="settings_password_protection_dialog_input_hint">Password</string>
-    <string name="audio_settings_output_device_title">Output dispositivo audio di default</string>
-    <string name="audio_settings_output_device_summary">I cambiamenti verranno applicati alla prossima chiamata</string>
-    <string name="video_settings_enable_title">Attiva video</string>
-    <string name="video_settings_tablet_preview_title">Mostra anteprima videocamera sul compositore</string>
-    <string name="video_settings_initiate_call_title">Inizia video calls</string>
-    <string name="video_settings_automatically_accept_title">Accetta richieste video in entrata</string>
-    <string name="video_settings_automatically_accept_summary">Accetta sempre richieste video</string>
-    <string name="video_settings_video_size_title">Dimensione video predefinita</string>
-    <string name="call_settings_ringtones_title">Suoneria</string>
-    <string name="call_settings_vibrate_title">Vibra mentre il dispositivo squilla</string>
-    <string name="call_settings_media_encryption_dtls">DTLS-SRTP</string>
-    <string name="call_settings_system_wide_overlay_summary">Ti verrà richiesto il permesso per l\'overlay</string>
-    <string name="chat_settings_use_in_app_file_viewer_title">Apri sempre i file all\'interno di quest\'app</string>
-    <string name="chat_settings_use_in_app_file_viewer_summary">Sarai comunque in grado di esportarle su app terze</string>
-    <string name="incoming_call_notification_hangup_action_label">Rifiuta</string>
-    <string name="content_description_enable_speaker">Attiva vivavoce</string>
-    <string name="content_description_ephemeral_message">Messaggio effimero</string>
-    <string name="content_description_contact_is_not_admin">Il contatto non è un admin in questa conversazione</string>
-    <string name="content_description_delete_contact">Elimina contatto</string>
-    <string name="content_description_call_quality_3">Qualità chiamata alta</string>
-    <string name="contacts_settings_ldap_delete_title">Elimina</string>
-    <string name="contacts_settings_ldap_server_title">Server URL</string>
-    <string name="assistant_alternative_way_create_account">Per creare il tuo account utilizzando la tua email:</string>
-    <string name="assistant_no_push_warning">Il tuo dispositivo sembra non essere in grado di ricevere notifiche push.
-\n
-\nDato che sono richieste per creare il tuo account attraverso la nostra app, ti invitiamo a creare il tuo account utilizzando il nostro sito web:</string>
-    <string name="assistant_error_username_invalid_characters">Caratteri non validi trovati</string>
-    <string name="assistant_login">Login</string>
-    <string name="assistant_display_name_optional">Nome visualizzato (opzionale)</string>
-    <string name="assistant_link_phone_number">Collegherai con il tuo numero di telefono il seguente utente:</string>
-    <string name="call_settings_use_telecom_manager_title">Migliora interazioni con i dispositivi bluetooth</string>
-    <string name="call_settings_use_telecom_manager_summary">Richiede permessi extra</string>
-    <string name="call_settings_rfc2833_dtmf_title">Manda in-band DTMFs (RFC 2833)</string>
-    <string name="call_settings_auto_start_title">Inizia chiamata immediatamente</string>
-    <string name="call_settings_auto_answer_delay_title">Tempo accettazione automatica</string>
-    <string name="call_settings_auto_answer_delay_summary">in millisecondi</string>
-    <string name="call_settings_incoming_timeout_summary">in secondi</string>
-    <string name="contacts_settings_native_presence_summary">Inserimento scorciatoie informazioni contatto da &appName; ai contatti Android nativi</string>
-    <string name="content_description_disable_video">Disabilita video in chiamata</string>
-    <string name="content_description_transfer_call">Trasferisci chiamata ad altro utente</string>
-    <string name="content_description_pending_file_transfer">Richiesta trasferimento file in attesa</string>
-    <string name="content_description_e2e_encryption_enabled">Crittografia end to end abilitata</string>
-    <string name="content_description_show_all_contacts">Mostra una lista di tutti i contatti</string>
-    <string name="content_description_ephemeral_duration_change">Cambia durata messaggio effimero al valore selezionato</string>
-    <string name="content_description_unselect_all">Deseleziona tutti gli oggetti in lista</string>
-    <string name="content_description_menu_contacts">Contatti</string>
-    <string name="content_description_menu_dialer">Tastierino numerico</string>
-    <string name="chat_room_last_message_sender_format">%s:</string>
-    <string name="chat_room_choose_conversation_for_message_forward">Seleziona o crea una conversazione in cui inoltrare il messaggio</string>
-    <string name="chat_room_file_not_found">File non trovato</string>
-    <string name="chat_room_context_menu_go_to_contact">Vai al contatto</string>
-    <string name="conference_schedule_description_title">Aggiungi una descrizione</string>
-    <string name="conference_schedule_description_hint">Descrizione</string>
-    <string name="call_stats_video_resolution_sent">Risoluzione video inviata:</string>
-    <string name="call_stats_video_resolution_received">Risoluzione video ricevuta:</string>
-    <string name="call_stats_video_fps_sent">FPS inviati:</string>
-    <string name="call_stats_video_fps_received">FPS ricevuti:</string>
-    <string name="assistant_privacy_policy">politica sulla privacy</string>
-    <string name="call_settings_voice_mail_uri_title">Segreteria telefonica URI</string>
-    <string name="call_settings_accept_early_media_title">Accetta i media anticipati</string>
-    <string name="call_settings_ring_during_early_media_title">Squilla durante i media anticipati</string>
-    <string name="call_settings_pause_calls_lost_audio_focus_title">Metti in pausa le chiamate quando il focus audio si è interrotto</string>
-    <string name="call_settings_go_to_android_notification_settings">Impostazioni notifiche Android</string>
-    <string name="chat_settings_auto_download_title">Regole download automatici</string>
-    <string name="chat_settings_auto_download_summary">Scarica automaticamente file allegati ai messaggi ricevuti o no</string>
-    <string name="chat_settings_auto_download_under_size">Se più piccolo della dimensione massima impostata</string>
-    <string name="chat_settings_launcher_shortcuts_title">Crea scorciatoia alle chat rooms nel launcher</string>
-    <string name="chat_settings_launcher_shortcuts_summary">Verrà rimpiazzato dalle scorciatoie contatti se abilitato</string>
-    <string name="chat_settings_hide_empty_rooms_title">Nascondi le chat rooms vuote</string>
-    <string name="advanced_settings_reset_debug_logs_title">Elimina i log</string>
-    <string name="advanced_settings_logs_server_url_summary">Modifiche solo per esperti!</string>
-    <string name="advanced_settings_android_title">Android</string>
-    <string name="advanced_settings_go_to_power_manager_settings">Impostazioni power manager</string>
-    <string name="advanced_settings_go_to_android_app_settings">Impostazioni app android</string>
-    <string name="advanced_settings_vfs_title">Cripta tutto</string>
-    <string name="advanced_settings_debug_title">Impostazioni debug</string>
-    <string name="tunnel_settings_dual_mode_summary">Userà un server per upload ed un altro per download</string>
-    <string name="missed_call_notification_title">Chiamata persa</string>
-    <string name="dialog_call">Chiamate</string>
-    <string name="dialog_default_delete_many">Sei sicuro di voler eliminare la selezione\?</string>
-    <string name="dialog_update_available">Un aggiornamento è disponibile</string>
-    <string name="dialog_try_open_file_as_text_title">Nessun app trovata per questo tipo di file</string>
-    <string name="content_description_go_back">Indietro</string>
-    <string name="content_description_toggle_recording">Abilita o disabilita la registrazione della chiamata</string>
-    <string name="content_description_continue_chat_room_creation">Vai alla fase finale della creazione di una chat room</string>
-    <string name="content_description_remove_contact_from_selection">Rimuovi contatto dalla selezione</string>
-    <string name="content_description_start_call">Avvia una chiamata</string>
-    <string name="content_description_call_quality_1">Qualità chiamata bassa</string>
-    <string name="content_description_call_quality_2">Qualità chiamata media</string>
-    <string name="content_description_call_quality_4">Qualità chiamata massima</string>
-    <string name="content_description_call_not_secured">La chiamata non è sicura</string>
-    <string name="content_description_call_secured">La chiamata è sicura</string>
-    <string name="content_description_hide_statistics">Nascondi statistiche chiamata</string>
-    <string name="content_description_conference_participants">Partecipanti chiamata di gruppo</string>
-    <string name="content_description_presence_online">L\'utente è online</string>
-    <string name="content_description_presence_offline">L\'utente è offline</string>
-    <string name="chat_room_presence_online">Online</string>
-    <string name="chat_room_presence_last_seen_online_today">Online oggi alle</string>
-    <string name="chat_room_presence_last_seen_online_yesterday">Online ieri alle</string>
-    <string name="chat_room_presence_last_seen_online">Online alle</string>
-    <string name="conference_start_group_call_dialog_title">Chiamata di gruppo</string>
-    <string name="conference_scheduled_terminated_filter">Termina</string>
-    <string name="call_action_add_call">Avvia nuova chiamata</string>
-    <string name="call_action_transfer_call">Trasferisci chiamata</string>
-    <string name="call_context_action_resume">Riprendi chiamata</string>
-    <string name="video_settings_camera_device_title">Fotocamera</string>
-    <string name="chat_settings_file_sharing_url_title">Condivisione server URL</string>
-    <string name="tunnel_settings_auto_mode">Auto</string>
-    <string name="account_settings_push_notification_summary">Non è stato possibile annullare la registrazione dell\'account</string>
-    <string name="account_settings_proxy_title">proxy SIP</string>
-    <string name="content_description_numpad_2">2</string>
-    <string name="content_description_stop_voice_recording">Ferma messaggio vocale</string>
-    <string name="chat_room_presence_away">Assente</string>
-    <string name="recordings_empty_list">Nessuna reagistrazione</string>
-    <string name="conference_paused_subtitle">Clicca tasto play per rientrare.</string>
-    <string name="conference_default_title">Gruppo chiamata remoto</string>
-    <string name="conference_local_title">Gruppo chiamata locale</string>
-    <string name="conference_invite_title">Invito meeting:</string>
-    <string name="conference_update_title">Il meeting è stato aggiornato:</string>
-    <string name="conference_cancel_title">Il meeting è stato eliminato:</string>
-    <string name="conference_description_title">Descrizione</string>
-    <string name="conference_display_mode_active_speaker">Attiva vivavoce</string>
-    <string name="conference_schedule_organizer">Organizzatore:</string>
-    <string name="conference_admin_set">%s è ora admin</string>
-    <string name="call_stats_ip">Famiglia IP:</string>
-    <string name="assistant_generic_account_warning_continue_button_text">Ho capito</string>
-    <string name="assistant_error_invalid_email_address">L\'indirizzo email non è valido</string>
-    <string name="advanced_settings_dark_mode_title">Modalità notte</string>
-    <string name="advanced_settings_dark_mode_label_no">No</string>
-    <string name="account_setting_disable_bundle_mode_title">Disabilita modalità bundle</string>
-    <string name="dialog_zrtp_local_sas">Dici:</string>
-    <string name="tunnel_settings_hostname_url_title">Hostname</string>
-    <string name="tunnel_settings_dual_hostname_url_title">Secondo server hostname</string>
-    <string name="dialog_cancel">Cancella</string>
-    <string name="operation_in_progress_wait">Operazione in corso, attendere prego</string>
-    <string name="dialog_default_delete_one">Sei sicuro di voler eliminare\?</string>
-    <string name="content_description_use_earpiece">Usa auricolare come output audio</string>
-    <string name="assistant_error_phone_number_invalid_characters">Inserire solo numeri</string>
-    <string name="audio_settings_codec_bitrate_title">Limite di bitrate del codec</string>
-    <string name="contacts_settings_friendlist_subscribe_title">Iscrivi lista amici</string>
-    <string name="notification_channel_incoming_call_name">&appName; notifica chiamata in arrivo</string>
-    <string name="notification_channel_chat_name">&appName; notifica messaggio istantaneo</string>
-    <string name="incoming_group_call_notification_title">Chiamata di gruppo in arrivo</string>
-    <string name="dialog_ok">OK</string>
-    <string name="content_description_edit_contact">Modifica contatto</string>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
deleted file mode 100644
index c256f332f..000000000
--- a/app/src/main/res/values-ja/strings.xml
+++ /dev/null
@@ -1,816 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE resources [
-<!ENTITY appName "Linphone">
-]>
-<resources xmlns:tools="http://schemas.android.com/tools">
-    <string name="service_description">バックグラウンドでの動作が許可されています</string>
-    <string name="sync_account_name">&appName; の連絡先</string>
-    <string name="logs_upload_failure">ログのアップロードに失敗しました！</string>
-    <string name="phone_number">電話番号</string>
-    <string name="assistant_choose_country">国を選択</string>
-    <string name="assistant_choose_country_title">国名またはプレフィックス番号</string>
-    <string name="email">Eメール</string>
-    <string name="domain">ドメイン</string>
-    <string name="cancel">キャンセル</string>
-    <string name="yesterday">昨日</string>
-    <string name="transport_tcp">TCP</string>
-    <string name="transport_tls">TLS</string>
-    <string name="status_in_progress">接続中</string>
-    <string name="quit">閉じる</string>
-    <string name="no_missed_call_history">不在着信の履歴がありません</string>
-    <string name="history_delete_many_dialog">これらの記録を削除しますか？</string>
-    <string name="contact_invite_friend">招待</string>
-    <string name="no_sip_contact">アドレス帳にSIPの連絡先がありません。</string>
-    <string name="contact_filter_hint">連絡先を検索</string>
-    <string name="contact_last_name">名字</string>
-    <string name="contact_organization">組織</string>
-    <string name="contact_local_sync_account">ローカルに保存</string>
-    <string name="contact_cant_be_deleted">この連絡先は削除できません</string>
-    <string name="dialer_address_bar_hint">番号またはアドレスを入力</string>
-    <string name="debug_popup_title">デバッグ</string>
-    <string name="debug_popup_enable_logs">ログを有効にする</string>
-    <string name="debug_popup_send_logs">ログを送信</string>
-    <string name="dialer_transfer_failed">通話の転送不可</string>
-    <string name="no_chat_history">会話がありません</string>
-    <string name="service_name">&appName; サービス</string>
-    <string name="service_auto_start_description">&appName; が自動的に起動されました</string>
-    <string name="about_privacy_policy">プライバシーポリシー</string>
-    <string name="about_weblate_translation">&appName; の翻訳に協力する</string>
-    <string name="logs_reset_complete">ログが削除されました</string>
-    <string name="logs_url_copied_to_clipboard">ログのURLをクリップボードにコピーしました</string>
-    <string name="phone_numbers">電話番号</string>
-    <string name="select_your_country">国を選択</string>
-    <string name="international_prefix">プレフィックス</string>
-    <string name="username">ユーザー名</string>
-    <string name="password">パスワード</string>
-    <string name="sip_address">SIPアドレス</string>
-    <string name="sip_addresses">SIPアドレス</string>
-    <plurals name="days">
-        <item quantity="other">%d 日</item>
-    </plurals>
-    <string name="share_uploaded_logs_link">ログのリンクを共有…</string>
-    <string name="today">今日</string>
-    <string name="transport">トランスポート</string>
-    <string name="app_description"><i>フリー</i>なSIPクライアント</string>
-    <string name="status_connected">接続済み</string>
-    <string name="status_not_connected">未接続</string>
-    <string name="status_error">接続失敗</string>
-    <string name="no_account_configured">アカウント未設定</string>
-    <string name="about">このアプリについて</string>
-    <string name="assistant">アシスタント</string>
-    <string name="recordings">録音</string>
-    <string name="settings">設定</string>
-    <string name="history_calls_list">履歴</string>
-    <string name="no_call_history">着信の履歴がありません</string>
-    <string name="no_conference_call_history">会議の履歴がありません</string>
-    <string name="history_delete_one_dialog">この記録を削除しますか？</string>
-    <string name="no_contact">アドレス帳に連絡先がありません。</string>
-    <string name="contact_send_sms_invite_text">こんにちは！&appName; で参加しましょう！%s から無料でダウンロードできます</string>
-    <string name="contact_first_name">名前</string>
-    <string name="contact_choose_existing_or_new_to_add_number">連絡先を選択、または新規作成</string>
-    <string name="contact_editor_write_permission_denied">連絡先への書き込み権限が拒否されたため、連絡先を編集できません</string>
-    <string name="contact_delete_one_dialog">この連絡先を削除しますか？
-\nお使いの端末のアドレス帳からも削除されます</string>
-    <string name="contact_delete_many_dialog">これらの連絡先を本当に削除してもよろしいですか？
-\nお使いの端末のアドレス帳からも削除されます</string>
-    <string name="contact_new_choose_sync_account">連絡先を保存する場所を選択</string>
-    <string name="contacts_ldap_query_more_results_available">より多くの検索結果が利用可能です</string>
-    <string name="debug_popup_disable_logs">ログを無効にする</string>
-    <string name="debug_popup_show_config_file">設定ファイルを表示</string>
-    <string name="dialer_transfer_succeded">通話の転送中</string>
-    <string name="transport_udp">UDP</string>
-    <string name="chat_event_conference_created">グループに参加しました</string>
-    <string name="chat_event_conference_destroyed">グループから退出しました</string>
-    <string name="chat_event_participant_added">%s が参加しました</string>
-    <string name="chat_event_participant_removed">%s が退出しました</string>
-    <string name="chat_event_device_added">新しいデバイス（ %s ）</string>
-    <string name="chat_event_device_removed">デバイス（ %s ）を削除しました</string>
-    <string name="chat_event_admin_set">%s は管理者です</string>
-    <string name="chat_security_event_security_level_downgraded">セキュリティレベルは %s のため低下しました</string>
-    <string name="chat_event_ephemeral_disabled">期限付きメッセージを無効にしました</string>
-    <string name="chat_event_ephemeral_enabled">期限付きメッセージを有効にしました: %s</string>
-    <string name="chat_event_ephemeral_lifetime_changed">期限付きメッセージの有効期限: %s</string>
-    <string name="chat_message_download_file">ダウンロード</string>
-    <string name="chat_message_pick_file_dialog">ソースを選択</string>
-    <string name="chat_room_group_info_subject_hint">グループ名</string>
-    <string name="chat_room_group_info_participants">参加者</string>
-    <string name="chat_room_group_info_admin">管理者</string>
-    <string name="chat_room_group_info_leave">グループから退出</string>
-    <string name="chat_room_group_info_leave_dialog_button">退出</string>
-    <string name="chat_room_group_info_leave_dialog_message">この会話から退出しますか？</string>
-    <string name="chat_room_group_info_you_are_now_admin">あなたは現在管理者です</string>
-    <string name="chat_room_group_info_you_are_no_longer_admin">あなたは管理者ではありません</string>
-    <string name="chat_message_imdn_info">送信状況</string>
-    <string name="chat_message_imdn_delivered">送信済み</string>
-    <string name="chat_message_imdn_sent">送信</string>
-    <string name="chat_message_imdn_undelivered">未送信</string>
-    <string name="chat_message_forwarded">転送済み</string>
-    <string name="chat_message_context_menu_copy_text">テキストをコピー</string>
-    <string name="chat_message_context_menu_forward">転送</string>
-    <string name="chat_message_context_menu_reply">返信</string>
-    <string name="chat_message_context_menu_imdn_info">送信状況</string>
-    <string name="chat_message_context_menu_delete">削除</string>
-    <string name="chat_message_context_menu_add_to_contacts">連絡先に追加</string>
-    <string name="chat_message_forward_confirmation_dialog">このルームにメッセージを転送しますか？</string>
-    <string name="chat_room_choose_conversation_for_message_forward">メッセージの転送先の会話を選択または作成する</string>
-    <string name="chat_room_file_not_found">ファイルが見つかりませんでした</string>
-    <string name="chat_room_choose_conversation_for_file_sharing">ファイルの共有先の会話を選択または作成する</string>
-    <string name="chat_room_choose_conversation_for_text_sharing">テキストの共有先の会話を選択または作成する</string>
-    <string name="chat_message_context_menu_delete_messages">メッセージを削除</string>
-    <string name="chat_room_context_menu_group_info">グループ情報</string>
-    <string name="chat_room_context_menu_go_to_contact">連絡先を開く</string>
-    <string name="chat_message_context_menu_ephemeral_messages">期限付きメッセージ</string>
-    <string name="chat_message_context_menu_turn_off_notifications">通知を無効にする</string>
-    <string name="chat_message_context_menu_turn_on_notifications">通知を有効にする</string>
-    <string name="chat_room_ephemeral_fragment_title">期限付きメッセージ</string>
-    <string name="chat_room_ephemeral_message_one_minute">1分</string>
-    <string name="chat_room_ephemeral_message_one_hour">1時間</string>
-    <string name="chat_room_ephemeral_message_one_day">1日</string>
-    <string name="chat_room_ephemeral_message_three_days">3日</string>
-    <string name="chat_room_ephemeral_message_one_week">1週間</string>
-    <plurals name="chat_room_remote_composing">
-        <item quantity="other">%s が入力中…</item>
-    </plurals>
-    <string name="chat_room_creation_failed_snack">チャットルームの作成に失敗しました</string>
-    <string name="chat_room_removal_failed_snack">チャットルームの削除に失敗しました</string>
-    <string name="chat_room_delete_one_dialog">この会話を本当に削除してもよろしいでしょうか？</string>
-    <string name="chat_room_delete_many_dialog">これらの会話を本当に削除してもよろしいですか？</string>
-    <string name="chat_message_notification_hidden_content">&lt;編集済み&gt;</string>
-    <string name="chat_message_no_app_found_to_handle_file_mime_type">この種類のファイルで使用できるアプリがありません</string>
-    <string name="chat_bubble_cant_open_enrypted_file">暗号化されたファイルをチャットバブルで開くことができません</string>
-    <string name="chat_message_cant_open_file_in_app_dialog_export_button">エクスポート</string>
-    <string name="chat_room_sending_reply_hint">返信</string>
-    <string name="chat_room_sending_message_hint">メッセージ</string>
-    <string name="chat_message_voice_recording_hold_to_record">ボタンを長押しして音声メッセージを録音</string>
-    <string name="chat_message_cant_open_file_in_app_dialog_open_as_text_button">テキストとして開く</string>
-    <string name="chat_message_voice_recording_playback_low_volume">メディアボリュームが低いため、高くする必要があります</string>
-    <plurals name="chat_room_unread_messages_event">
-        <item quantity="other">%1$d件のメッセージを読んでいません</item>
-    </plurals>
-    <string name="chat_message_removal_info">メッセージは削除されます</string>
-    <string name="chat_message_abort_removal">中止</string>
-    <string name="recordings_empty_list">録音がありません</string>
-    <string name="conference">会議</string>
-    <string name="recordings_export">録音をエクスポート…</string>
-    <string name="conference_schedule_title">会議を予約する</string>
-    <string name="conference_group_call_title">グループ通話を開始</string>
-    <string name="conference_schedule_subject_title">件名</string>
-    <string name="conference_schedule_mandatory_field">必須</string>
-    <string name="conference_schedule_description_title">概要を追加</string>
-    <string name="conference_schedule_description_hint">概要</string>
-    <string name="conference_schedule_date">日付</string>
-    <string name="conference_schedule_time">時間</string>
-    <string name="conference_schedule_timezone">タイムゾーン</string>
-    <string name="conference_schedule_duration">期間</string>
-    <string name="conference_schedule_send_invite_email">Eメールで招待状を送信</string>
-    <string name="conference_schedule_send_updated_invite_email">Eメールで更新を送信</string>
-    <string name="conference_schedule_send_updated_invite_chat">&appName; 経由で更新を送信</string>
-    <string name="conference_schedule_send_invite_chat">&appName; 経由で招待状を送る</string>
-    <string name="conference_schedule_participants_list">参加者リスト</string>
-    <string name="conference_organizer">主催者</string>
-    <string name="conference_schedule_summary">会議情報</string>
-    <string name="conference_group_call_summary">グループ通話情報</string>
-    <string name="conference_schedule_start">会議を予約</string>
-    <string name="conference_schedule_edit">会議を編集</string>
-    <string name="conference_group_call_create">グループ通話を開始</string>
-    <string name="conference_schedule_address_copied_to_clipboard">会議のアドレスをクリップボードにコピーしました</string>
-    <string name="conference_schedule_info_not_sent_to_participant">参加者への会議の情報の送信に失敗しました</string>
-    <string name="conference_update_title">会議が更新されました:</string>
-    <string name="conference_invite_join">参加</string>
-    <string name="conference_invite_participants_count" tools:ignore="PluralsCandidate">%d 人の参加者</string>
-    <string name="conference_cancel_title">会議がキャンセルされました:</string>
-    <string name="conference_description_title">概要</string>
-    <string name="conference_display_mode_mosaic">モザイクモード</string>
-    <string name="conference_display_mode_audio_only">音声のみモード</string>
-    <string name="conference_waiting_room_start_call">開始</string>
-    <string name="conference_waiting_room_cancel_call">キャンセル</string>
-    <string name="conference_display_mode_active_speaker">アクティブスピーカーモード</string>
-    <string name="conference_waiting_room_video_disabled">映像は現在無効です</string>
-    <string name="conference_schedule_address_title">会議のアドレス</string>
-    <string name="chat_message_replied">返信</string>
-    <string name="chat_message_context_menu_resend">再送信</string>
-    <string name="chat_message_voice_recording">音声メッセージ</string>
-    <string name="chat_message_cant_open_file_in_app_dialog_title">このファイルを表示することができません。</string>
-    <string name="chat_message_voice_recording_received_notification">音声メッセージを受信しました</string>
-    <string name="chat_remote_is_composing">リモートで入力中…</string>
-    <string name="chat_event_subject_changed">新しい議題: %s</string>
-    <string name="chat_event_admin_unset">%s は管理者ではありません</string>
-    <string name="chat_security_event_lime_identity_key_changed">LIME 識別キーが %s で変更されました</string>
-    <string name="chat_security_event_man_in_the_middle_detected">中間者攻撃が %s で検出されました</string>
-    <string name="chat_security_event_participant_max_count_exceeded">最大参加者数が %s を超えました</string>
-    <string name="chat_room_devices_fragment_title">会話で利用中のデバイス</string>
-    <string name="chat_room_group_info_title">情報</string>
-    <string name="chat_message_imdn_displayed">既読</string>
-    <string name="chat_room_context_menu_participants_devices">会話で利用中のデバイス</string>
-    <string name="chat_room_ephemeral_messages_desc">このメッセージは双方が開封した後、指定された時間が経過すると削除されます。</string>
-    <string name="chat_room_ephemeral_message_disabled">無効</string>
-    <string name="chat_message_cant_open_file_in_app_dialog_message">テキストとして開く、もしくはサードパーティーのアプリにエクスポート（暗号化されません）しますか？</string>
-    <string name="chat_message_download_already_in_progress">新しいダウンロードを開始する前に、最初のダウンロードが完了するまでお待ちください</string>
-    <string name="conference_schedule_later">後で会議を予約しますか？</string>
-    <string name="conference_schedule_subject_hint">会議の主題</string>
-    <string name="conference_group_call_subject_hint">グループ通話の主題</string>
-    <string name="conference_schedule_send_invite_chat_summary">招待状は &appName; アカウントから送信されます</string>
-    <string name="conference_schedule_encryption">この会議を暗号化しますか？</string>
-    <string name="conference_paused_subtitle">再生ボタンをクリックすると、再び会議に参加できます。</string>
-    <string name="conference_default_title">リモートグループ通話</string>
-    <string name="conference_paused_title">あなたは現在会議から外れています。</string>
-    <string name="conference_local_title">ローカルグループ通話</string>
-    <string name="conference_invite_title">会議への招待:</string>
-    <string name="conference_scheduled">会議</string>
-    <string name="conference_layout_too_many_participants_for_mosaic">参加者が多すぎるため、グループ通話のレイアウトを変更できません</string>
-    <string name="conference_too_many_participants_for_mosaic_layout">モザイクレイアウトでは参加者が多すぎるため、アクティブスピーカーに切り替えます</string>
-    <string name="conference_participant_paused">(一時停止中)</string>
-    <string name="conference_no_schedule">予定されている会議はまだありません。</string>
-    <string name="conference_no_terminated_schedule">会議はまだ終了していません。</string>
-    <string name="conference_schedule_organizer">主催者:</string>
-    <string name="conference_go_to_chat">会議用チャットルーム</string>
-    <string name="conference_creation_failed">会議の作成に失敗しました</string>
-    <string name="conference_schedule_info_created">会議が予定されています</string>
-    <string name="conference_admin_set">%s は現在管理者です</string>
-    <string name="conference_admin_unset">%s は管理者ではありません</string>
-    <string name="conference_info_removed">会議の情報が削除されています</string>
-    <string name="conference_empty">このグループ通話は現在、あなた1人です</string>
-    <string name="conference_invitation_received_notification">会議に招待されました</string>
-    <string name="conference_invitation">会議の招待状</string>
-    <string name="conference_low_bandwidth">低帯域幅が検出されたため、映像は無効となっています</string>
-    <string name="conference_first_to_join">最初にグループ通話に参加しました</string>
-    <string name="conference_last_user">他の参加者は全員、このグループ通話から退出しました</string>
-    <string name="conference_incoming_title">グループ通話の着信</string>
-    <string name="conference_participants_title">参加者 (%d)</string>
-    <string name="conference_start_group_call_dialog_title">グループ通話</string>
-    <string name="conference_start_group_call_dialog_message">グループ通話を開始しますか？
-\nこのグループの全員が会議の電話を受け取ります。</string>
-    <string name="conference_start_group_call_dialog_ok_button">開始</string>
-    <string name="conference_scheduled_terminated_filter">終了済み</string>
-    <string name="conference_scheduled_future_filter">予定済み</string>
-    <string name="conference_scheduled_delete_one_dialog">この会議を削除しますか？</string>
-    <string name="conference_scheduled_delete_many_dialog">これらの会議を削除しますか？</string>
-    <string name="conference_scheduled_cancelled_by_organizer">会議が主催者によってキャンセルされました</string>
-    <string name="call_incoming_title">着信</string>
-    <string name="call_outgoing_title">発信</string>
-    <string name="call_notification_paused">一時停止した通話</string>
-    <string name="call_notification_outgoing">発信</string>
-    <string name="call_notification_active">通話中</string>
-    <string name="call_error_declined">通話が拒否されました</string>
-    <string name="call_error_user_not_found">ユーザーが見つかりませんでした</string>
-    <string name="call_error_user_busy">ユーザーが操作中です</string>
-    <string name="call_error_incompatible_media_params">互換性のないメディアパラメーター</string>
-    <string name="call_error_io_error">サービスが利用できない、もしくはネットワークエラーです</string>
-    <string name="call_error_server_timeout">サーバーのタイムアウト</string>
-    <string name="call_error_temporarily_unavailable">一時的に利用できません</string>
-    <string name="call_error_generic">エラー: %s</string>
-    <string name="call_action_chat">チャット</string>
-    <string name="call_action_calls_list">通話リスト</string>
-    <string name="call_action_numpad">数字パッド</string>
-    <string name="call_action_change_conf_layout">レイアウトを変更</string>
-    <string name="call_action_statistics">通話統計</string>
-    <string name="call_action_add_call">新規で通話を開始</string>
-    <string name="call_action_transfer_call">通話を転送</string>
-    <string name="call_context_action_transfer">通話を転送</string>
-    <string name="call_context_action_pause">通話を一時停止</string>
-    <string name="call_context_action_answer">通話に応える</string>
-    <string name="call_context_action_hangup">通話を終了する</string>
-    <string name="call_remote_recording">この通話は録音されています。</string>
-    <string name="call_remotely_paused_title">リモートで通話が一時停止されました。</string>
-    <string name="call_context_action_resume">通話を再開</string>
-    <string name="call_locally_paused_title">通話を一時停止しました。</string>
-    <string name="call_locally_paused_subtitle">再生ボタンをクリックして再開します。</string>
-    <string name="call_screenshot_taken">スナップショットを取得: %s</string>
-    <string name="call_stats_audio">音声</string>
-    <string name="call_stats_video">映像</string>
-    <string name="call_stats_codec">コーデック:</string>
-    <string name="call_stats_ip">IPファミリー:</string>
-    <string name="call_stats_upload">アップロードの帯域幅:</string>
-    <string name="call_stats_download">ダウンロードの帯域幅:</string>
-    <string name="call_stats_ice">ICEコネクティビティ:</string>
-    <string name="call_stats_video_resolution_sent">送信した映像の解像度:</string>
-    <string name="call_stats_estimated_download">推定ダウンロード帯域幅:</string>
-    <string name="call_stats_video_resolution_received">受信した映像の解像度:</string>
-    <string name="call_stats_video_fps_sent">送信した映像のFPS:</string>
-    <string name="call_stats_video_fps_received">受信した映像のFPS:</string>
-    <string name="call_stats_sender_loss_rate">送信側の損失率:</string>
-    <string name="call_stats_receiver_loss_rate">受信側の損失率:</string>
-    <string name="call_stats_jitter_buffer">ジッターバッファー:</string>
-    <string name="call_stats_encoder_name">エンコーダー:</string>
-    <string name="call_stats_decoder_name">デコーダー:</string>
-    <string name="call_stats_player_filter">プレーヤーのフィルター:</string>
-    <string name="call_stats_capture_filter">キャプチャーのフィルター:</string>
-    <string name="call_stats_media_encryption">メディアの暗号化:</string>
-    <string name="call_stats_zrtp_cipher_algo">暗号化のアルゴリズム:</string>
-    <string name="call_stats_zrtp_key_agreement_algo">鍵合意アルゴリズム:</string>
-    <string name="call_stats_zrtp_hash_algo">ハッシュアルゴリズム:</string>
-    <string name="call_stats_zrtp_auth_tag_algo">認証アルゴリズム:</string>
-    <string name="call_stats_zrtp_sas_algo">SASアルゴリズム:</string>
-    <string name="assistant_welcome_title">ようこそ</string>
-    <string name="assistant_welcome_desc">このアシスタントはSIPアカウントの設定と使用を支援します。</string>
-    <string name="assistant_create_account">アカウントを作成</string>
-    <string name="assistant_login_linphone">&appName; を使用する</string>
-    <string name="assistant_login_generic">SIPアカウントを使用する</string>
-    <string name="assistant_remote_provisioning">リモート設定を取得する</string>
-    <string name="assistant_ec_calibration">エコーキャンセラーの調整中</string>
-    <string name="assistant_phone_number_info_title">電話番号の使用目的について</string>
-    <string name="assistant_phone_number_link_info_content">"
-\nアカウントを電話番号に紐付けることで、あなたの友人があなたを見つけやすくなります
-\n
-\nアドレス帳に &appName; を使用している人が表示され、あなたの友人も &appName; であなたと連絡を取れることがわかります。
-\n"</string>
-    <string name="assistant_privacy_policy">プライバシーポリシー</string>
-    <string name="assistant_read_and_agree_terms">Belledonne Communicationの%1$sと%2$sに同意します</string>
-    <string name="assistant_generic_account_warning">グループ会議や暗号化メッセージなどの一部の機能は &appName; アカウントを要求します。
-\n
-\n これらの機能は、サードパーティのSIPアカウントに登録すると非表示になります。
-\n
-\n 商業用プロジェクトで有効にするには、お問い合わせください。</string>
-    <string name="assistant_generic_account_warning_continue_button_text">理解しました</string>
-    <string name="assistant_error_phone_number_invalid_characters">数字のみを入力してください</string>
-    <string name="assistant_error_username_already_exists">ユーザー名は既に使用されています</string>
-    <string name="assistant_error_phone_number_already_exists">この番号は既に他のアカウントで使用されています</string>
-    <string name="assistant_error_username_invalid_characters">無効な文字が見つかりました</string>
-    <string name="assistant_error_passwords_dont_match">パスワードが一致しません</string>
-    <string name="assistant_error_invalid_email_address">Eメールアドレスが無効です</string>
-    <string name="assistant_error_username_too_long">ユーザー名が長すぎます</string>
-    <string name="assistant_error_invalid_credentials">アカウントが存在しないかパスワードが一致しません</string>
-    <string name="assistant_linphone_account">&appName; アカウントを使用する</string>
-    <string name="assistant_create_account_part_1">国番号を確認し、電話番号を入力してください</string>
-    <string name="assistant_login_with_username">電話番号の代わりにユーザー名とパスワードを使用する</string>
-    <string name="assistant_login_forgotten_password">パスワードを忘れた場合</string>
-    <string name="assistant_login">ログイン</string>
-    <string name="assistant_confirmation_code">認証コード</string>
-    <string name="assistant_continue_even_if_credentials_invalid">続ける</string>
-    <string name="assistant_generic_account">SIPアカウントを使用する</string>
-    <string name="assistant_finish">設定完了</string>
-    <string name="assistant_create_account_part_email">&appName; アカウントのユーザー名とEメール、パスワードを入力してください</string>
-    <string name="assistant_display_name_optional">表示名（オプション）</string>
-    <string name="assistant_validate_account_1">アカウントが作成されました。メールを確認してアカウントを検証してください:</string>
-    <string name="assistant_login_desc">ユーザー名とパスワード、SIPドメインを入力してください</string>
-    <string name="assistant_confirm_password">パスワードを確認</string>
-    <string name="assistant_create_account_part_2">あなたの電話番号宛に認証コードを記載したSMSを送信しました:</string>
-    <string name="assistant_use_username_instead_or_phone_number">ユーザー名を使用する（オプション）</string>
-    <string name="assistant_validate_account_2">確認後、ここに戻ってボタンをクリックしてください。</string>
-    <string name="assistant_create_account_part_3">電話番号の認証を完了するには、以下に4桁のコードを入力してください:
-\n</string>
-    <string name="assistant_link_phone_number">電話番号と次のユーザー名を紐付けます:</string>
-    <string name="assistant_link_phone_number_skip">スキップ</string>
-    <string name="assistant_remote_provisioning_title">リモート設定を取得する</string>
-    <string name="assistant_remote_provisioning_failure">リモートで提供されるプロファイルのダウンロードもしくは適用に失敗しました…</string>
-    <string name="assistant_launch_qrcode">QRコード</string>
-    <string name="audio_settings_echo_tester_title">エコーでテスト</string>
-    <string name="audio_settings_echo_tester_summary">クリックしてエコーテストを開始</string>
-    <string name="audio_settings_echo_tester_summary_is_stopped">エコーテストを停止しました</string>
-    <string name="audio_settings_echo_tester_summary_is_running">エコーテストを実行中です</string>
-    <string name="audio_settings_adaptive_rate_control_title">適応型レート制御</string>
-    <string name="audio_settings_output_device_title">デフォルトの音声出力デバイス</string>
-    <string name="audio_settings_output_device_summary">変更は次回の通話から適用されます</string>
-    <string name="audio_settings_prefer_bluetooth_devices_title">Bluetoothデバイスがある場合はそのデバイスに音声を接続する</string>
-    <string name="audio_settings_codec_bitrate_title">コーデックのビットレート制限</string>
-    <string name="audio_settings_playback_gain_summary">(デシベル)</string>
-    <string name="audio_settings_codecs_title">コーデック</string>
-    <string name="video_settings_enable_title">映像を有効にする</string>
-    <string name="video_settings_tablet_preview_title">ダイヤラーにカメラのプレビューを表示</string>
-    <string name="video_settings_initiate_call_title">ビデオ通話で開始する</string>
-    <string name="video_settings_initiate_call_summary">常に映像の要求を送信します</string>
-    <string name="video_settings_automatically_accept_title">映像の要求を受け付ける</string>
-    <string name="video_settings_automatically_accept_summary">常に映像の要求を許可します</string>
-    <string name="video_settings_camera_device_title">カメラ</string>
-    <string name="video_settings_video_size_title">映像のサイズを優先する</string>
-    <string name="video_settings_video_preset_title">映像のプリセット</string>
-    <string name="video_settings_preferred_fps_title">FPSを優先する</string>
-    <string name="assistant_remote_provisioning_url">URL</string>
-    <string name="audio_settings_microphone_gain_title">マイクゲイン</string>
-    <string name="audio_settings_microphone_gain_summary">(デシベル)</string>
-    <string name="audio_settings_playback_gain_title">プレイバックゲイン</string>
-    <string name="audio_settings_input_device_title">デフォルトの音声入力デバイス</string>
-    <string name="assistant_general_terms">利用規約</string>
-    <string name="conference_scheduled_cancelled_by_me">会議をキャンセルしました</string>
-    <string name="call_error_network_unreachable">ネットワークに接続できません</string>
-    <string name="call_video_update_requested_dialog">通信相手が映像を次のように切り替えようとしています</string>
-    <string name="call_action_participants_list">参加者リスト</string>
-    <string name="assistant_linphone_login_desc">&appName; アカウントのユーザー名とパスワードを入力してください</string>
-    <string name="content_description_recording_export">録音をエクスポート</string>
-    <string name="audio_settings_input_device_summary">変更は次回の通話から適用されます</string>
-    <string name="assistant_phone_number_link_info_content_already_account">電話番号は1つの &appName; アカウントでのみ使用できます。
-\n
-\n既に他のアカウントに番号を紐付けているものの、このアカウントを使用したい場合、今すぐ紐付けることで番号が自動的にこのアカウントに移動されます。</string>
-    <string name="chat_settings_downloaded_media_public_summary">期限付きメッセージのファイルは、自動ダウンロード機能ではダウンロードしません</string>
-    <string name="contacts_settings_friendlist_subscribe_title">友達リストを定期購読</string>
-    <string name="contacts_settings_launcher_shortcuts_title">ホーム画面に連絡先へのショートカットを作成</string>
-    <string name="contacts_settings_show_new_contact_account_dialog_title">新しく作成された連絡先を保存するアカウントを常に尋ねる</string>
-    <string name="advanced_settings_go_to_power_manager_settings">電源管理設定</string>
-    <string name="tunnel_settings_dual_hostname_url_title">第二サーバーのホスト名</string>
-    <string name="tunnel_settings_dual_port_title">第二サーバーのポート</string>
-    <string name="account_settings_push_notification_summary">プロキシ構成は登録を解除しません</string>
-    <string name="dialog_accept">許可</string>
-    <string name="zrtp_dialog_title">通信セキュリティ</string>
-    <string name="dialog_lime_security_message">インスタントメッセージは、安全な会話でエンドツーエンドで暗号化されます。参加者を認証することにより、会話のセキュリティレベルをアップグレードすることができます。これを行うには、連絡先を呼び出し、認証プロセスに従ってください。</string>
-    <string name="content_description_add_sip_address_field">SIPアドレス欄を追加</string>
-    <string name="content_description_switch_camera">前面カメラと背面カメラの切り替え</string>
-    <string name="content_description_enable_mic_mute">マイクをミュートにする</string>
-    <string name="chat_settings_launcher_shortcuts_title">ホーム画面にチャットルームのショートカットを作成</string>
-    <string name="chat_settings_hide_rooms_removed_proxies_title">削除されたアカウントからチャットルームを非表示にする</string>
-    <string name="assistant_link_account">アカウントを紐付ける</string>
-    <string name="assistant_remote_provisioning_wrong_format">URLの形式が不明なため、設定をダウンロードできません…</string>
-    <string name="assistant_fetch_apply">取得して適用</string>
-    <string name="settings_accounts_title">SIPアカウント</string>
-    <string name="settings_default_account_subtitle">デフォルトアカウント</string>
-    <string name="settings_list_title">設定</string>
-    <string name="settings_tunnel_title">トンネル</string>
-    <string name="settings_audio_title">音声</string>
-    <string name="settings_video_title">映像</string>
-    <string name="settings_call_title">通話</string>
-    <string name="settings_chat_title">チャット</string>
-    <string name="settings_network_title">ネットワーク</string>
-    <string name="settings_contacts_title">連絡先</string>
-    <string name="settings_advanced_title">詳細設定</string>
-    <string name="settings_conferences_title">会議</string>
-    <string name="settings_primary_account_title">プライマリーアカウント</string>
-    <string name="settings_primary_account_display_name_title">表示名</string>
-    <string name="settings_primary_account_username_title">ユーザー名</string>
-    <string name="audio_settings_echo_cancellation_summary">相手側に聞こえるエコーを除去します</string>
-    <string name="audio_settings_echo_canceller_calibration_title">エコーキャンセラーの調整</string>
-    <string name="audio_settings_echo_canceller_calibration_summary">クリックしてエコーキャンセラーの調整を開始</string>
-    <string name="audio_settings_echo_cancellation_calibration_started">エコーキャンセラーの調整を開始しました</string>
-    <string name="audio_settings_echo_cancellation_calibration_value">%s ミリ秒で調整済み</string>
-    <string name="audio_settings_echo_cancellation_calibration_failed">調整に失敗しました</string>
-    <string name="audio_settings_echo_cancellation_calibration_no_echo">エコーが検出されませんでした</string>
-    <string name="video_settings_bandwidth_limit_title">帯域幅制限</string>
-    <string name="video_settings_codecs_title">コーデック</string>
-    <string name="video_settings_bandwidth_limit_summary">キロビット/秒</string>
-    <string name="call_settings_vibrate_title">着信時にバイブレーションを鳴らす</string>
-    <string name="call_settings_encryption_title">メディアの暗号化</string>
-    <string name="call_settings_media_encryption_none">なし</string>
-    <string name="call_settings_media_encryption_srtp">SRTP</string>
-    <string name="call_settings_media_encryption_zrtp">ZRTP</string>
-    <string name="call_settings_media_encryption_dtls">DTLS-SRTP</string>
-    <string name="call_settings_encryption_mandatory_title">メディアの暗号化を必須にする</string>
-    <string name="call_settings_use_telecom_manager_title">Bluetoothデバイスとの連携を改善</string>
-    <string name="call_settings_auto_start_title">すぐに通話を開始する</string>
-    <string name="call_settings_system_wide_overlay_summary">オーバーレイの許可を求める画面が表示されます</string>
-    <string name="call_settings_auto_start_summary">他のアプリケーションから起動した場合、自動的に通話が開始されます</string>
-    <string name="call_settings_auto_answer_title">着信に自動で応答する</string>
-    <string name="call_settings_auto_answer_delay_title">自動応答の時間</string>
-    <string name="call_settings_incoming_timeout_title">着信のタイムアウト</string>
-    <string name="call_settings_auto_answer_delay_summary">ミリ秒</string>
-    <string name="call_settings_incoming_timeout_summary">秒</string>
-    <string name="call_settings_voice_mail_uri_title">音声メールURI</string>
-    <string name="call_settings_redirect_to_voice_mail_declined_calls_title">断られた電話をボイスメールURIにリダイレクトする</string>
-    <string name="call_settings_ring_during_early_media_title">アーリーメディアの着信時に通知する</string>
-    <string name="call_settings_remote_recording_title">通信相手との通話が録音されるときに通知されます</string>
-    <string name="chat_settings_mark_as_read_notif_dismissal_title">通知の却下時に既読としてマークする</string>
-    <string name="chat_settings_auto_download_under_size">指定された最大サイズよりも小さい場合</string>
-    <string name="chat_settings_auto_download_max_size_title">最大サイズ</string>
-    <string name="chat_settings_auto_download_max_size_summary">バイト</string>
-    <string name="chat_settings_use_in_app_file_viewer_summary">サードパーティのアプリでのエクスポートは引き続き可能です</string>
-    <string name="chat_settings_auto_download_voice_recordings">受信した録音音声を自動でダウンロードする</string>
-    <string name="network_settings_wifi_only_title">WiFiのみを使用する</string>
-    <string name="network_settings_allow_ipv6_title">IPv6を許可する</string>
-    <string name="network_settings_random_ports_title">ランダムなポートを使用する</string>
-    <string name="network_settings_sip_port_title">SIPで使用するポート</string>
-    <string name="contacts_settings_ldap_delete_title">削除</string>
-    <string name="contacts_settings_ldap_connection_title">接続</string>
-    <string name="contacts_settings_ldap_server_title">サーバーURL</string>
-    <string name="contacts_settings_ldap_password_title">パスワード</string>
-    <string name="contacts_settings_ldap_cert_check_disabled">無効</string>
-    <string name="contacts_settings_ldap_cert_check_enabled">有効</string>
-    <string name="contacts_settings_ldap_search_title">検索</string>
-    <string name="contacts_settings_ldap_search_base_title">検索元</string>
-    <string name="contacts_settings_ldap_search_base_subtitle">空にしないでください！</string>
-    <string name="contacts_settings_ldap_search_filter_title">フィルター</string>
-    <string name="contacts_settings_ldap_search_max_results_title">最大検索数</string>
-    <string name="contacts_settings_ldap_sip_attribute_title">SIP属性</string>
-    <string name="contacts_settings_ldap_sip_domain_title">ドメイン</string>
-    <string name="contacts_settings_ldap_misc_title">その他</string>
-    <string name="contacts_settings_ldap_debug_title">デバッグ</string>
-    <string name="advanced_settings_dark_mode_label_yes">使用する</string>
-    <string name="advanced_settings_animations_title">アニメーション</string>
-    <string name="advanced_settings_device_name_title">デバイス名</string>
-    <string name="advanced_settings_device_name_summary">変更は次回起動時に適用されます</string>
-    <string name="advanced_settings_remote_provisioning_url_title">外部接続用URL</string>
-    <string name="advanced_settings_logs_server_url_title">ログのアップロード先URL</string>
-    <string name="advanced_settings_logs_server_url_summary">何をしているのかわからない場合は編集しないでください！</string>
-    <string name="advanced_settings_android_title">Android</string>
-    <string name="advanced_settings_go_to_battery_optimization_settings">バッテリーの最適化設定</string>
-    <string name="advanced_settings_go_to_android_app_settings">Androidのアプリ設定</string>
-    <string name="advanced_settings_vfs_title">すべてを暗号化</string>
-    <string name="advanced_settings_vfs_summary">一度有効にすると無効にすることができなくなります！</string>
-    <string name="advanced_settings_send_debug_logs_title">ログを送信</string>
-    <string name="advanced_settings_reset_debug_logs_title">ログをリセット</string>
-    <string name="advanced_settings_debug_title">デバッグ設定</string>
-    <string name="advanced_settings_other_title">その他の設定</string>
-    <string name="advanced_settings_disable_fragment_security_summary">機密性の高い内容の画面撮影・録画を許可する</string>
-    <string name="tunnel_settings_hostname_url_title">ホスト名</string>
-    <string name="tunnel_settings_port_title">ポート</string>
-    <string name="tunnel_settings_dual_mode_summary">アップロード用のサーバーとダウンロード用のサーバーに使い分けます</string>
-    <string name="tunnel_settings_dual_port_summary">デュアルモード時に要求する</string>
-    <string name="tunnel_settings_mode_title">モード</string>
-    <string name="tunnel_settings_disabled_mode">無効</string>
-    <string name="tunnel_settings_always_mode">常時</string>
-    <string name="tunnel_settings_auto_mode">自動</string>
-    <string name="account_settings_user_name_title">ユーザー名</string>
-    <string name="account_settings_user_name_summary">例: アカウントが john@sip.example.org の場合は john になります</string>
-    <string name="account_settings_user_id_title">認証ID</string>
-    <string name="account_settings_user_id_summary">認証IDとユーザー名が異なる場合に入力（オプション）</string>
-    <string name="account_settings_password_title">パスワード</string>
-    <string name="account_settings_password_summary">ユーザー名とドメインの一方または両方を編集した場合は再度パスワードを入力してください</string>
-    <string name="account_settings_domain_title">ドメイン</string>
-    <string name="account_settings_domain_summary">例: アカウントが john@sip.example.org の場合は sip.example.org になります</string>
-    <string name="account_settings_display_name_title">表示名</string>
-    <string name="account_settings_manage_title">管理</string>
-    <string name="account_settings_disable_title">無効にする</string>
-    <string name="account_settings_default_title">デフォルトとして使用する</string>
-    <string name="account_settings_transport_dtls">DTLS</string>
-    <string name="account_settings_proxy_title">SIPプロキシ</string>
-    <string name="account_settings_prefix_title">国別プレフィックス</string>
-    <string name="account_settings_escape_plus_title">+を00に置き換える</string>
-    <string name="account_setting_conference_factory_address">会議室URI</string>
-    <string name="account_settings_prefix_summary">+ を入力しないでください</string>
-    <string name="account_settings_apply_prefix_for_calls_title">通話の発信とチャットにプレフィックスを適用する</string>
-    <string name="account_settings_apply_prefix_for_calls_summary">数値が入力されている場合は、プレフィックスが番号に適用されます</string>
-    <string name="account_setting_audio_video_conference_factory_address">音声・映像会議室URI</string>
-    <string name="conferences_settings_layout_title">標準のレイアウト</string>
-    <string name="notification_channel_service_name">&appName; サービス通知</string>
-    <string name="notification_channel_missed_call_name">&appName; 不在着信通知</string>
-    <string name="notification_channel_incoming_call_name">&appName; 着信通知</string>
-    <string name="notification_channel_chat_name">&appName; インスタントメッセージ通知</string>
-    <string name="incoming_call_notification_title">着信</string>
-    <string name="incoming_group_call_notification_title">グループ通話の着信</string>
-    <string name="incoming_call_notification_hangup_action_label">電話を切る</string>
-    <string name="received_chat_notification_reply_label">返信</string>
-    <string name="received_chat_notification_mark_as_read_label">既読にする</string>
-    <string name="missed_call_notification_title">不在着信</string>
-    <string name="dialog_call">通話</string>
-    <string name="call_settings_accept_early_media_title">アーリーメディアを許可</string>
-    <string name="call_settings_device_ringtone_title">デバイスの着信音を利用する</string>
-    <string name="call_settings_ringtones_title">着信音</string>
-    <string name="call_settings_use_telecom_manager_summary">特別な権限が必要です</string>
-    <string name="call_settings_overlay_title">オーバーレイでの着信通知</string>
-    <string name="call_settings_system_wide_overlay_title">アプリ外でオーバーレイ表示する</string>
-    <string name="assistant_remote_provisioning_desc">設定用URLを入力してください</string>
-    <string name="chat_settings_auto_download_title">受信したファイルの自動ダウンロードポリシー</string>
-    <string name="chat_settings_auto_download_summary">受信したチャットメッセージに添付されたファイルをダウンロードするかどうかについて</string>
-    <string name="call_settings_media_encryption_zrtp_post_quantum">Post Quantum ZRTP</string>
-    <string name="call_settings_pause_calls_lost_audio_focus_title">音声のフォーカスが失われたときに通話を一時停止する</string>
-    <string name="call_settings_go_to_android_notification_settings">Androidの通知設定</string>
-    <string name="call_settings_auto_start_recording_title">通話の録音を自動で開始</string>
-    <string name="chat_settings_downloaded_media_public_title">ダウンロードしたメディアを公開する</string>
-    <string name="chat_settings_auto_download_always">常にダウンロード</string>
-    <string name="chat_settings_auto_download_never">ダウンロードしない</string>
-    <string name="chat_settings_hide_notification_content_title">通知上ではメッセージの内容を隠す</string>
-    <string name="chat_settings_hide_notification_content_summary">送信者の名前のみ表示する</string>
-    <string name="chat_settings_file_sharing_url_title">共有サーバーURL</string>
-    <string name="chat_settings_file_sharing_url_summary">何をしているのかわからない場合は編集しないでください！</string>
-    <string name="contacts_settings_native_presence_summary">&appName; の連絡先からAndroid標準の連絡先に情報のショートカットを挿入します</string>
-    <string name="contacts_settings_show_organization_title">連絡先の組織を表示</string>
-    <string name="contacts_settings_launcher_shortcuts_summary">チャットルームのショートカットがある場合は置き換えられます</string>
-    <string name="contacts_settings_show_new_contact_account_dialog_summary">ローカルへの連絡先の保存が無効な場合</string>
-    <string name="contacts_settings_create_new_ldap_config_title">新規LDAP設定</string>
-    <string name="chat_settings_launcher_shortcuts_summary">有効にすると連絡先ショートカットに置き換えられます</string>
-    <string name="chat_settings_hide_empty_rooms_title">空のチャットルームを非表示にする</string>
-    <string name="chat_settings_hide_rooms_removed_proxies_summary">チャットルームが表示されない場合は、この設定のチェックを外してみてください</string>
-    <string name="chat_settings_go_to_android_notification_settings">Androidの通知設定</string>
-    <string name="chat_settings_use_in_app_file_viewer_title">ファイルを常にこのアプリ内で開く</string>
-    <string name="contacts_settings_ldap_title">LDAP</string>
-    <string name="contacts_settings_ldap_enable_title">有効</string>
-    <string name="contacts_settings_ldap_auth_method_title">認証方式</string>
-    <string name="contacts_settings_ldap_auth_method_anonymous">匿名</string>
-    <string name="contacts_settings_ldap_auth_method_simple">シンプル</string>
-    <string name="contacts_settings_ldap_tls_title">TLSを使用する</string>
-    <string name="contacts_settings_ldap_cert_check_title">証明書の確認</string>
-    <string name="contacts_settings_ldap_cert_check_auto">自動</string>
-    <string name="contacts_settings_ldap_search_timeout_title">タイムアウト</string>
-    <string name="contacts_settings_ldap_search_timeout_subtitle">秒</string>
-    <string name="advanced_settings_debug_mode_title">デバッグログ</string>
-    <string name="advanced_settings_background_mode_title">バックグラウンドモード</string>
-    <string name="advanced_settings_background_mode_summary">アプリの起動状態を保つため通知を表示します</string>
-    <string name="advanced_settings_auto_start_title">起動時に開始する</string>
-    <string name="advanced_settings_dark_mode_title">ダークテーマ</string>
-    <string name="advanced_settings_dark_mode_label_no">使用しない</string>
-    <string name="advanced_settings_dark_mode_label_auto">自動で切り替える</string>
-    <string name="advanced_settings_disable_fragment_security_title">UIのセキュアモードを無効にする</string>
-    <string name="tunnel_settings_dual_mode_title">デュアルモードを有効にする</string>
-    <string name="tunnel_settings_dual_hostname_url_summary">デュアルモード時に要求する</string>
-    <string name="account_settings_delete_title">削除</string>
-    <string name="account_settings_advanced_title">高度な設定</string>
-    <string name="account_settings_push_notification_title">プッシュ通知を許可する</string>
-    <string name="account_settings_transport_udp">UDP</string>
-    <string name="account_settings_transport_tcp">TCP</string>
-    <string name="account_settings_transport_tls">TLS</string>
-    <string name="account_settings_outbound_proxy_summary">上記のSIPプロキシを介してすべての通話を転送する</string>
-    <string name="account_settings_stun_server_title">STUN/TURNサーバー</string>
-    <string name="account_settings_ice_title">ICEを有効にする</string>
-    <string name="account_settings_avpf_title">AVPF</string>
-    <string name="account_settings_avpf_rr_interval_summary">秒（1から5の間）</string>
-    <string name="account_settings_expires_summary">秒</string>
-    <string name="account_settings_expires_title">期限切れ</string>
-    <string name="account_setting_end_to_end_encryption_keys_server_url">E2E暗号化キーサーバーURL</string>
-    <string name="incoming_call_notification_answer_action_label">応答</string>
-    <string name="dialog_do_not_ask_again">次からは表示しない</string>
-    <string name="dialog_cancel">キャンセル</string>
-    <string name="dialog_delete">削除</string>
-    <string name="dialog_ok">OK</string>
-    <string name="dialog_decline">辞退</string>
-    <string name="account_settings_transport_title">トランスポート</string>
-    <string name="missed_call_notification_body">%s からの不在着信</string>
-    <string name="missed_calls_notification_body" tools:ignore="PluralsCandidate">%d の不在着信</string>
-    <string name="operation_in_progress_wait">操作が進行中です、しばらくお待ちください</string>
-    <string name="dialog_default_delete_many">選択した項目を削除してもよろしいですか？</string>
-    <string name="dialog_default_delete_one">このアイテムを削除してもよろしいですか？</string>
-    <string name="dialog_update_available">アップデートが利用可能です</string>
-    <string name="dialog_try_open_file_as_text_title">この種類のファイルを開くことができるアプリが見つかりませんでした</string>
-    <string name="dialog_try_open_file_as_text_body">プレーンなテキストファイルとして開くことができるか試してみますか？</string>
-    <string name="content_description_add_phone_number_field">電話番号欄を追加</string>
-    <string name="content_description_go_back">戻る</string>
-    <string name="content_description_phone_number_use">電話番号の使用目的を表示する</string>
-    <string name="content_description_clear_field">隣のテキストフィールドを空にする</string>
-    <string name="content_description_pause_call">通話を一時停止する</string>
-    <string name="content_description_toggle_recording">通話で録音するかを変更する</string>
-    <string name="content_description_terminate_call">通話を終了する</string>
-    <string name="content_description_answer_call">通話に応答する</string>
-    <string name="content_description_disable_mic_mute">マイクのミュートを解除する</string>
-    <string name="content_description_show_all_contacts">すべての連絡先を表示</string>
-    <string name="content_description_continue_chat_room_creation">チャットルーム作成の最後のステップに移動する</string>
-    <string name="content_description_ephemeral_chat_room">メッセージはこの会話内での一時的なものです</string>
-    <string name="content_description_muted_chat_room">この会話の通知は無効になっています</string>
-    <string name="content_description_confirm_contact_edit">変更を保存</string>
-    <string name="content_description_delete_selection">選択したアイテムを削除</string>
-    <string name="content_description_toggle_side_menu">サイドメニュー表示の切り替え</string>
-    <string name="content_description_missed_call">不在着信</string>
-    <string name="content_description_create_one_to_one_chat_room">1対1の会話を作成する</string>
-    <string name="content_description_call_quality_2">そこそこ</string>
-    <string name="content_description_call_secured">通話は保護されています</string>
-    <string name="contacts_settings_ldap_name_attribute_title">名前要素</string>
-    <string name="content_description_numpad_5">5</string>
-    <string name="contacts_settings_ldap_request_delay_title">2つのリクエスト間の遅延</string>
-    <string name="contacts_settings_ldap_request_delay_subtitle">ミリ秒</string>
-    <string name="contacts_settings_ldap_parsing_title">解析</string>
-    <string name="zrtp_dialog_later_button_label">後で</string>
-    <string name="content_description_go_back_to_call">通話画面に戻る</string>
-    <string name="content_description_enable_video">映像を有効にする</string>
-    <string name="content_description_disable_video">通話を無効にする</string>
-    <string name="content_description_toggle_audio_menu">音声出力メニューの切り替え</string>
-    <string name="content_description_use_bluetooth_headset">音声出力にBluetoothヘッドセットを使用する</string>
-    <string name="content_description_use_earpiece">音声出力にイヤホンを使用する</string>
-    <string name="content_description_use_speaker">音声出力にスピーカーを使用する</string>
-    <string name="content_description_add_call">新規通話を開始</string>
-    <string name="content_description_remove_pending_file_transfer">保留中の転送ファイルを削除</string>
-    <string name="content_description_pending_file_transfer">保留中の転送ファイル</string>
-    <string name="content_description_downloaded_file_transfer">添付ファイル</string>
-    <string name="content_description_delivery_status">メッセージの送信状況</string>
-    <string name="content_description_forward_message">この会話のメッセージを転送する</string>
-    <string name="content_description_ephemeral_message">メッセージは一時的なものです</string>
-    <string name="content_description_linphone_user">連絡先は &appName; ユーザーです</string>
-    <string name="content_description_contact_selected">連絡先が選択されています</string>
-    <string name="content_description_e2e_encryption_disabled">エンドツーエンドの暗号化が無効になっています</string>
-    <string name="content_description_e2e_encryption_enabled">エンドツーエンドの暗号化が有効になっています</string>
-    <string name="content_description_show_sip_contacts">SIPの連絡先のみを表示</string>
-    <string name="content_description_start_call">通話を開始</string>
-    <string name="content_description_show_chat_room_menu">チャットルームメニューを表示</string>
-    <string name="content_description_attach_file">メッセージにファイルを添付する</string>
-    <string name="content_description_send_message">メッセージを送信</string>
-    <string name="content_description_remove_contact_from_chat_room">会話から連絡先を削除</string>
-    <string name="content_description_contact_is_admin">連絡先はこの会話の管理者です</string>
-    <string name="content_description_contact_is_not_admin">連絡先はこの会議の管理者ではありません</string>
-    <string name="content_description_enable_speaker">音声をスピーカーに切り替える</string>
-    <string name="content_description_disable_speaker">音声をイヤホンに切り替える</string>
-    <string name="content_description_edit_contact">連絡先を編集</string>
-    <string name="content_description_delete_contact">連絡先を削除</string>
-    <string name="content_description_discard_changes">変更を破棄</string>
-    <string name="content_description_change_contact_picture">連絡先の画像を変更</string>
-    <string name="content_description_change_own_picture">自分の画像を変更</string>
-    <string name="content_description_show_call_details">通話の詳細に移動</string>
-    <string name="content_description_select_all">すべてのアイテムを選択</string>
-    <string name="content_description_unselect_all">すべてのアイテムの選択を解除</string>
-    <string name="content_description_numpad_1">1</string>
-    <string name="content_description_numpad_2">2</string>
-    <string name="content_description_numpad_3">3</string>
-    <string name="content_description_numpad_4">4</string>
-    <string name="content_description_numpad_6">6</string>
-    <string name="content_description_numpad_7">7</string>
-    <string name="content_description_numpad_8">8</string>
-    <string name="content_description_numpad_9">9</string>
-    <string name="content_description_numpad_0">0</string>
-    <string name="content_description_numpad_star">*</string>
-    <string name="content_description_numpad_sharp">#</string>
-    <string name="content_description_recording_toggle_play">録音の再生または一時停止</string>
-    <string name="content_description_voice_mail">音声メール</string>
-    <string name="content_description_menu_history">通話履歴</string>
-    <string name="content_description_menu_contacts">連絡先</string>
-    <string name="content_description_menu_chat">会話</string>
-    <string name="content_description_add_contact">連絡先を作成</string>
-    <string name="content_description_go_to_contact">連絡先の詳細に移動</string>
-    <string name="content_description_show_all_calls">すべての通話を表示</string>
-    <string name="content_description_show_missed_calls">不在着信のみ表示</string>
-    <string name="content_description_create_group_chat_room">グループでの会話を作成する</string>
-    <string name="content_description_security_level_encrypted">暗号化済み</string>
-    <string name="content_description_call_quality_0">とても低い</string>
-    <string name="content_description_call_quality_1">低い</string>
-    <string name="content_description_incoming_call">着信</string>
-    <string name="content_description_outgoing_call">発信</string>
-    <string name="content_description_call_quality_3">良い</string>
-    <string name="content_description_call_quality_4">とても良い</string>
-    <string name="content_description_call_not_secured">通話は保護されていません</string>
-    <string name="content_description_call_security_pending">通話のセキュリティは保留されています</string>
-    <string name="content_description_contact_can_do_encryption">連絡先は暗号化された会話で招待できます</string>
-    <string name="content_description_start_chat">会話に参加する</string>
-    <string name="content_description_start_encrypted_chat">暗号化された会話に参加する</string>
-    <string name="content_description_menu_dialer">ダイヤラ</string>
-    <string name="content_description_dialer_erase">最後の文字を削除</string>
-    <string name="call_settings_sipinfo_dtmf_title">帯域外のDTMFを送信（SIP INFO）</string>
-    <string name="call_settings_rfc2833_dtmf_title">帯域内のDTMFを送信（RFC 2833）</string>
-    <string name="contacts_settings_ldap_bind_dn_title">バインドDN</string>
-    <string name="account_settings_outbound_proxy_title">アウトバウンドプロキシ</string>
-    <string name="content_description_open_app">バブルの代わりにアプリで会話を開く</string>
-    <string name="content_description_edit_conference">会議を編集</string>
-    <string name="content_description_share_ics">イベントをカレンダーにエクスポート</string>
-    <string name="content_description_hide_statistics">通話の統計情報を非表示にする</string>
-    <string name="content_description_show_numpad">数字パッドを表示</string>
-    <string name="contacts_settings_ldap_minimum_characters_title">クエリ開始時の最小文字数</string>
-    <string name="zrtp_dialog_correct_button_label">修整</string>
-    <string name="zrtp_dialog_explanation">セキュリティレベルを上げるには、次のコードを通信事業者に確認するとよいでしょう。</string>
-    <string name="account_settings_link_phone_number_title">アカウントを紐付ける</string>
-    <string name="account_settings_avpf_rr_interval_title">AVPFの定期的なRTCP間隔</string>
-    <string name="content_description_transfer_call">現在の通話を他人に転送する</string>
-    <string name="content_description_remove_contact_from_selection">選択した項目から連絡先を削除</string>
-    <string name="content_description_toggle_participant_devices_list">参加者のデバイスの表示を切り替える</string>
-    <string name="content_description_ephemeral_duration_selected">期限付きメッセージの期間を選択しました</string>
-    <string name="content_description_ephemeral_duration_change">選択した値から期限付きメッセージの期間を変更しました</string>
-    <string name="content_description_create_chat_room">チャットルームを作成</string>
-    <string name="content_description_add_participants">参加者を追加</string>
-    <string name="content_description_security_level_unsafe">安全ではありません</string>
-    <string name="content_description_security_level_safe">安全です</string>
-    <string name="content_description_chat_message_video_attachment">添付ビデオ</string>
-    <string name="content_description_chat_message_meeting_attachment">添付会議</string>
-    <string name="content_description_take_screenshot">受信した映像のスクリーンショットを撮る</string>
-    <string name="content_description_close_bubble">通知バブルを閉じる</string>
-    <string name="content_description_cancel_sharing">共有を取り消す</string>
-    <string name="content_description_cancel_reply">返信を取り消す</string>
-    <string name="content_description_voice_recording">音声メッセージを録音する</string>
-    <string name="content_description_stop_voice_recording">音声の録音を停止</string>
-    <string name="content_description_pause_voice_recording_playback">音声の録音を一時停止</string>
-    <string name="content_description_play_voice_recording">音声の録音を再生</string>
-    <string name="content_description_cancel_forward">メッセージの転送を取り消す</string>
-    <string name="content_description_create_conference">通話会議を作成</string>
-    <string name="content_description_copy_conference_address">会議アドレスをコピー</string>
-    <string name="content_description_delete_conference">会議を削除</string>
-    <string name="content_description_encrypted_conference">会議は暗号化されます</string>
-    <string name="content_description_hide_numpad">数字パッドを非表示</string>
-    <string name="content_description_export">サードパーティのアプリでファイルを開く</string>
-    <string name="content_description_cancel_voice_recording">音声の録音を取り消す</string>
-    <string name="content_descripton_scroll_to_bottom">下部もしくは未読メッセージの先頭に移動する</string>
-    <string name="content_description_enter_edition_mode">エディションモードへ移行</string>
-    <string name="content_description_exit_edition_mode">エディションモードを終了</string>
-    <string name="content_description_call_context_menu">通話メニューを開く</string>
-    <string name="content_description_go_to_chat_rooms_list">会話一覧へ移動</string>
-    <string name="content_description_conference_participant_mic_muted">参加者のマイクはミュートされています</string>
-    <string name="content_description_participant_is_paused">参加者が一時的にグループ通話から退出しました</string>
-    <string name="content_description_toggle_conference_info_details">会議情報の詳細の可視性をトグルする</string>
-    <string name="content_description_conference_participants">グループ通話の参加者</string>
-    <string name="content_description_toggle_layout_menu">グループ通話のレイアウトメニュー表示の切り替え</string>
-    <string name="chat_room_presence_online">オンライン</string>
-    <string name="account_setting_publish_presence_title">プレゼンス情報を公開する</string>
-    <string name="dialog_zrtp_local_sas">次のように入力:</string>
-    <string name="content_description_presence_online">ユーザーはオンラインです</string>
-    <string name="content_description_presence_offline">ユーザーはオフラインです</string>
-    <string name="account_setting_delete_generic_confirmation_dialog">アカウントはローカルでのみ削除されます。
-\n永久に削除するには、SIPプロバイダーのウェブサイトから行ってください。</string>
-    <string name="account_setting_delete_sip_linphone_org_confirmation_dialog">アカウントは、ローカルでのみ削除されます。
-\n永久に削除するには、アカウント管理プラットフォームへアクセスしてください:</string>
-    <string name="account_setting_delete_dialog_title">アカウントを削除しますか？</string>
-    <string name="contacts_settings_native_presence_title">標準の連絡先に情報を追加する</string>
-    <string name="dialog_apply_remote_provisioning_button">適用</string>
-    <string name="error_unexpected">予期せぬエラー…</string>
-    <string name="settings_password_protection_dialog_title">設定にアクセスするにはパスワードを入力してください</string>
-    <string name="settings_password_protection_dialog_input_hint">パスワード</string>
-    <string name="settings_password_protection_dialog_ok_label">確認</string>
-    <string name="settings_password_protection_dialog_invalid_input">無効なパスワードです！</string>
-    <string name="audio_settings_software_echo_cancellation_title">ソフトウェアエコーキャンセラー</string>
-    <string name="dialog_apply_remote_provisioning_title">このURLから設定をダウンロードして適用しますか？</string>
-    <string name="chat_room_last_message_sender_format">%s:</string>
-    <string name="chat_room_presence_last_seen_online_today">今日オンラインでした -</string>
-    <string name="chat_room_presence_last_seen_online_yesterday">昨日オンラインでした -</string>
-    <string name="chat_room_presence_last_seen_online">オンラインでした -</string>
-    <string name="assistant_alternative_way_create_account">Eメールを使用してアカウントを作成:</string>
-    <string name="assistant_no_push_warning">このデバイスではプッシュ通知を受信することができません。
-\n
-\nアカウント作成時にプッシュ通知の受信が必須となったため、このアプリ内ではアカウントを作成することができませんが、当社のWebサイト上で作成することができます:</string>
-    <string name="dialog_authentication_required_title">認証が必要です</string>
-    <string name="dialog_authentication_required_change_password_label">認証</string>
-    <string name="dialog_authentication_required_message">認証の失敗、もしくは無効なアカウントのため
-\n%s の接続に失敗しました。
-\n
-\n再度パスワードを入力するか、設定からアカウントの構成を確認することができます。</string>
-    <string name="assistant_create_email_account_not_validated">アカウントがアクティベートされていません。受信したEメールのリンクを開いてください</string>
-    <string name="assistant_error_invalid_international_prefix">間違った国際プレフィックス</string>
-    <string name="android_14_full_screen_intent_permission_not_granted">着信を表示するために必要な権限がまだ付与されていません</string>
-    <string name="android_14_go_to_full_screen_intent_permission_setting">表示</string>
-    <string name="content_description_emoji_picker">絵文字ピッカーの表示を切り替える</string>
-    <string name="yes">Yes</string>
-    <string name="no">No</string>
-    <string name="contacts_new_contact_wont_be_visible_warning_dialog">SIP URIも電話番号もない新しい連絡先を作成しようとしており、&appName;には表示されません。
-\n
-\n本当に作成しますか？</string>
-    <string name="chat_message_voice_recording_notification_short_desc">音声メッセージ</string>
-    <string name="chat_message_reaction_received">%sは%sにより反応しました: %s</string>
-    <string name="chat_message_many_reactions">%s リアクション</string>
-    <string name="chat_message_one_reaction">%s リアクション</string>
-    <string name="conference_invitation_notification_short_desc">会議の招待状</string>
-</resources>
diff --git a/app/src/main/res/values-ka/strings.xml b/app/src/main/res/values-ka/strings.xml
deleted file mode 100644
index 2ce23ece6..000000000
--- a/app/src/main/res/values-ka/strings.xml
+++ /dev/null
@@ -1,787 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE resources [
-<!ENTITY appName "Linphone">
-]>
-<resources xmlns:tools="http://schemas.android.com/tools">
-    <string name="audio_settings_input_device_title">ნაგულისხმები შემავალი ხმის მოწყობილობა</string>
-    <string name="audio_settings_input_device_summary">ცვლილებები შევა ძალაში შემდეგი ზარის დაწყებისას</string>
-    <string name="audio_settings_prefer_bluetooth_devices_title">ხმის გადამისამართება Bluetooth მოწყობილობაზე, თუ ასეთი არსებობს</string>
-    <string name="audio_settings_microphone_gain_title">მიკროფონის გაძლიერება</string>
-    <string name="audio_settings_microphone_gain_summary">(დეციბელებში)</string>
-    <string name="video_settings_tablet_preview_title">კამერის წინასწარი ნახვის ჩვენება ნომრის ამკრეფზე</string>
-    <string name="video_settings_initiate_call_summary">ვიდეო მოთხოვნების ყოველთვის გაგზავნა</string>
-    <string name="video_settings_automatically_accept_title">შემომავალი ვიდეო მოთხოვნების მიღება</string>
-    <string name="video_settings_preferred_fps_title">უპირატესობის მქონე FPS</string>
-    <string name="call_settings_device_ringtone_title">მოწყობილობის ზარის ხმის გამოყენება</string>
-    <string name="call_settings_encryption_title">მედია დაშიფრვა</string>
-    <string name="call_settings_encryption_mandatory_title">მედია დაშიფრვა აუცილებელია</string>
-    <string name="call_settings_use_telecom_manager_summary">საჭიროებს ზოგ დამატებით უფლებებს</string>
-    <string name="call_settings_system_wide_overlay_summary">თქვენ მიიღებთ ზემოდან დახატვის უფლების მოთხოვნას</string>
-    <string name="call_settings_auto_start_title">ზარის დაუყონებლივ დაწყება</string>
-    <string name="call_settings_auto_start_summary">ზარი დაუყონებლივ დაიწყება, თუ დაიწყება სხვა აპლიკაციიდან</string>
-    <string name="call_settings_redirect_to_voice_mail_declined_calls_title">უარყოფილი ზარების გადამისამართება ხმოვანი ფოსტის URI-ზე</string>
-    <string name="call_settings_pause_calls_lost_audio_focus_title">ზარების შეჩერება, როდესაც ხმის ფოკუსი იკარგება</string>
-    <string name="call_settings_remote_recording_title">მიიღეთ შეტყობინება, როდესაც ზარი იწერება თქვენი მოსაუბრის მიერ</string>
-    <string name="chat_settings_mark_as_read_notif_dismissal_title">წაკითხულად მონიშვნა შეტყობინების გაუქმებისას</string>
-    <string name="chat_settings_auto_download_title">შემომავალი ფაილების ავტომატური გადმოწერის პოლიტიკა</string>
-    <string name="chat_settings_auto_download_summary">გსურთ თუ არა ავტომატურად გადმოიწეროს მიღებული საუბრის შეტყობინებებზე მიბმული ფაილები</string>
-    <string name="chat_settings_auto_download_never">არასდროს</string>
-    <string name="chat_settings_auto_download_under_size">თუ უფრო პატარაა, ვიდრე მოცემული მაქსიმალური ზომა</string>
-    <string name="chat_settings_downloaded_media_public_summary">ფაილები ეფემერულ შეტყობინებებში არ იქნება, არ მუშაობს ავტო გადმოწერის ფუნქციასთან</string>
-    <string name="chat_settings_hide_notification_content_title">შეტყობინებებში შეტყობინების შიგთავსის დამალვა</string>
-    <string name="chat_settings_hide_notification_content_summary">მხოლოდ გამგზავნის სახელი იქნება ნაჩვენები</string>
-    <string name="chat_settings_launcher_shortcuts_summary">ჩანაცვლდება კონტაქტების იარლიყებით, თუ ჩართულია</string>
-    <string name="chat_settings_hide_rooms_removed_proxies_summary">თუ არ ჩანს საუბრის ოთახები, სცადეთ ამ პარამეტრის მონიშვნის მოხსნა</string>
-    <string name="network_settings_random_ports_title">შემთხვევითი პორტების გამოყენება</string>
-    <string name="contacts_settings_friendlist_subscribe_title">მეგობართა სიის გამოწერა</string>
-    <string name="contacts_settings_native_presence_summary">ინფორმაციის იარლიყების ჩასმა &appName;-ის კონტაქტიდან Adnroid-ის მშობლიურ კონტაქტებში</string>
-    <string name="contacts_settings_show_new_contact_account_dialog_title">ყოველთვის იკითხოს, რომელ ანგარიშში შეინახოს ახლად შექმნილი კონტაქტი</string>
-    <string name="contacts_settings_create_new_ldap_config_title">ახალი LDAP-ის კონფიგურაცია</string>
-    <string name="contacts_settings_ldap_auth_method_title">აუთენტიფიკაციის მეთოდი</string>
-    <string name="contacts_settings_ldap_cert_check_title">სერთიფიკატების შემოწმება</string>
-    <string name="contacts_settings_ldap_server_title">სერვერის URL</string>
-    <string name="chat_settings_auto_download_voice_recordings">შემომავალი ხმოვანი ჩანაწერების ავტომატური გადმოტვირთვა</string>
-    <string name="contacts_settings_launcher_shortcuts_summary">ჩაანაცვლებს საუბრის ოთახების იარლიყებს, თუ ასეთი არსებობს</string>
-    <string name="contacts_settings_show_new_contact_account_dialog_summary">თუ გათიშულია, კონტაქტები შეინახება ადგილობრივად</string>
-    <string name="contacts_settings_ldap_search_timeout_subtitle">წამებში</string>
-    <string name="contacts_settings_ldap_request_delay_title">დაყოვნება ორი მოთხოვნის შორის</string>
-    <string name="contacts_settings_ldap_minimum_characters_title">მინიმალური სიმბოლო მოთხოვნის დასაწყებად</string>
-    <string name="advanced_settings_debug_mode_title">დებაგის ჟურნალები</string>
-    <string name="advanced_settings_background_mode_title">ფონური რეჟიმი</string>
-    <string name="advanced_settings_background_mode_summary">აჩვენებს შეტყობინებას აპის ცოცხლად შესანარჩუნებლად</string>
-    <string name="advanced_settings_remote_provisioning_url_title">დაშორებული კონფიგურაციის URL</string>
-    <string name="advanced_settings_logs_server_url_title">ჟურნალების ატვირთვის სერვერის URL</string>
-    <string name="advanced_settings_go_to_battery_optimization_settings">კვების ელემენტის ოპტიმიზაციის პარამეტრები</string>
-    <string name="service_auto_start_description">&appName; იქნა ავტომატურად გაშვებული</string>
-    <string name="sync_account_name">&appName; კონტაქტები</string>
-    <string name="about_weblate_translation">დაგვეხმარეთ &appName;-ის თარგმნაში</string>
-    <string name="logs_reset_complete">ჟურნალები გასუფთავდა</string>
-    <string name="logs_url_copied_to_clipboard">ჟურნალების URL დაკოპირდა გაცვლის ბუფერში</string>
-    <string name="international_prefix">პრეფიქსი</string>
-    <string name="assistant_choose_country">აირჩიეთ ქვეყანა</string>
-    <string name="username">მომხმარებლის სახელი</string>
-    <string name="password">პაროლი</string>
-    <string name="email">ელ. ფოსტა</string>
-    <string name="domain">დომენი</string>
-    <string name="cancel">გაუქმება</string>
-    <plurals name="days">
-        <item quantity="one">%d დღე</item>
-        <item quantity="other">%d დღე</item>
-    </plurals>
-    <string name="today">დღეს</string>
-    <string name="yesterday">გუშინ</string>
-    <string name="transport">ტრანსპორტი</string>
-    <string name="transport_udp">UDP</string>
-    <string name="transport_tcp">TCP</string>
-    <string name="transport_tls">TLS</string>
-    <string name="app_description"><i>თავისუფალი</i> SIP კლიენტი</string>
-    <string name="status_connected">დაკავშირებული</string>
-    <string name="status_not_connected">კავშირის გარეშე</string>
-    <string name="status_error">დაკავშირება ვერ მოხერხდა</string>
-    <string name="no_account_configured">ანგარიში არ არის კონფიგურირებული</string>
-    <string name="about">შესახებ</string>
-    <string name="recordings">ჩანაწერები</string>
-    <string name="settings">პარამეტრები</string>
-    <string name="quit">გასვლა</string>
-    <string name="history_calls_list">ზარები</string>
-    <string name="no_missed_call_history">ისტორიაში გამოტოვებული ზარები არ არის</string>
-    <string name="history_delete_one_dialog">გსურთ ამ ჩანაწერის წაშლა\?</string>
-    <string name="history_delete_many_dialog">გსურთ ამ ჩანაწერების წაშლა\?</string>
-    <string name="no_sip_contact">თქვენს მისამართების წიგნაკში SIP კონტაქტი არ არის.</string>
-    <string name="contact_filter_hint">კონტაქტების ძიება</string>
-    <string name="contact_last_name">გვარი</string>
-    <string name="contact_first_name">სახელი</string>
-    <string name="contact_organization">ორგანიზაცია</string>
-    <string name="contact_editor_write_permission_denied">კონტაქტების ჩაწერის უფლება იქნა უარყოფილი, კონტაქტის რედაქტირება ვერ ხერხდება</string>
-    <string name="contact_new_choose_sync_account">აირჩიეთ, სად გსურთ კონტაქტის შენახვა</string>
-    <string name="dialer_address_bar_hint">შეიყვანეთ ნომერი ან მისამართი</string>
-    <string name="debug_popup_title">დებაგი</string>
-    <string name="debug_popup_enable_logs">ჟურნალების გააქტიურება</string>
-    <string name="debug_popup_disable_logs">ჟურნალების გათიშვა</string>
-    <string name="debug_popup_send_logs">ჟურნალების გაგზავნა</string>
-    <string name="debug_popup_show_config_file">კონფიგურაციის ფაილის ნახვა</string>
-    <string name="no_chat_history">საუბარი არ არის</string>
-    <string name="chat_remote_is_composing">დისტანციური წერს…</string>
-    <string name="chat_event_conference_created">თქვენ შეუერთდით ჯგუფს</string>
-    <string name="chat_event_participant_added">%s შემოუერთდა</string>
-    <string name="chat_event_participant_removed">%s-მა დატოვა</string>
-    <string name="chat_event_subject_changed">ახალი თემა: %s</string>
-    <string name="chat_event_admin_set">%s ადმინისტრატორია</string>
-    <string name="chat_event_admin_unset">%s აღარ არის ადმინისტრატორი</string>
-    <string name="chat_security_event_man_in_the_middle_detected">კაცი-შუაში თავდასხმა აღმოჩენილია %s-ისთვის</string>
-    <string name="chat_security_event_participant_max_count_exceeded">წევრთა მაქსიმალური რაოდენობა გადაჭარბებულია %s-ის გამო</string>
-    <string name="chat_message_download_file">გადმოწერა</string>
-    <string name="chat_message_pick_file_dialog">აირჩიეთ წყარო</string>
-    <string name="chat_room_devices_fragment_title">საუბრის მოწყობილობები</string>
-    <string name="chat_room_group_info_title">ინფორმაცია</string>
-    <string name="chat_room_group_info_participants">წევრები</string>
-    <string name="chat_room_group_info_admin">ადმინისტრატორი</string>
-    <string name="chat_room_group_info_leave_dialog_button">დატოვება</string>
-    <string name="chat_room_group_info_leave_dialog_message">გსურთ ამ საუბრის დატოვება\?</string>
-    <string name="chat_room_group_info_you_are_no_longer_admin">თქვენ აღარ ხართ ადმინისტრატორი</string>
-    <string name="chat_message_imdn_info">მიწოდების სტატუსი</string>
-    <string name="chat_message_imdn_displayed">წაკითხული</string>
-    <string name="chat_message_imdn_delivered">მიწოდებული</string>
-    <string name="chat_message_forwarded">გადამისამართებული</string>
-    <string name="chat_message_replied">პასუხი</string>
-    <string name="chat_message_context_menu_copy_text">ტექსტის კოპირება</string>
-    <string name="chat_message_context_menu_forward">გადაგზავნა</string>
-    <string name="chat_message_context_menu_reply">პასუხი</string>
-    <string name="chat_message_context_menu_delete">წაშლა</string>
-    <string name="chat_message_context_menu_add_to_contacts">კონტაქტებში დამატება</string>
-    <string name="chat_room_choose_conversation_for_file_sharing">აირჩიეთ ან შექმენით საუბარი ფაილ(-ებ-)ის გასაზიარებლად</string>
-    <string name="chat_room_file_not_found">ფაილი ვერ მოიძებნა</string>
-    <string name="chat_room_context_menu_group_info">ჯგუფის ინფორმაცია</string>
-    <string name="chat_room_context_menu_participants_devices">საუბრის მოწყობილობები</string>
-    <string name="chat_room_context_menu_go_to_contact">კონტაქტზე გადასვლა</string>
-    <string name="chat_message_context_menu_ephemeral_messages">ეფემერული შეტყობინებები</string>
-    <string name="chat_message_context_menu_turn_on_notifications">შეტყობინებების ჩართვა</string>
-    <string name="chat_room_ephemeral_fragment_title">ეფემერული შეტყობინებები</string>
-    <string name="chat_room_ephemeral_message_disabled">გათიშული</string>
-    <string name="chat_room_ephemeral_message_one_hour">1 საათი</string>
-    <string name="chat_room_ephemeral_message_one_day">1 დღე</string>
-    <string name="chat_room_ephemeral_message_three_days">3 დღე</string>
-    <string name="chat_room_ephemeral_message_one_week">1 კვირა</string>
-    <plurals name="chat_room_remote_composing">
-        <item quantity="one">%s წერს…</item>
-        <item quantity="other">%s წერენ…</item>
-    </plurals>
-    <string name="chat_room_delete_many_dialog">დარწმუნებული ხართ, რომ გსურთ ამ საუბრების წაშლა\?</string>
-    <string name="chat_message_notification_hidden_content">&lt;დაფარული&gt;</string>
-    <string name="chat_message_cant_open_file_in_app_dialog_export_button">ექსპორტირება</string>
-    <string name="chat_message_cant_open_file_in_app_dialog_open_as_text_button">ტექსტად გახსნა</string>
-    <string name="chat_room_sending_reply_hint">პასუხი</string>
-    <string name="chat_room_sending_message_hint">შეტყობინება</string>
-    <string name="chat_bubble_cant_open_enrypted_file">საუბრის ბუშტში დაშიფრული ფაილის გახსნა ვერ ხერხდება</string>
-    <string name="chat_message_abort_removal">შეწყვეტა</string>
-    <string name="chat_message_removal_info">შეტყობინება იქნება წაშლილი</string>
-    <string name="chat_message_download_already_in_progress">გთხოვთ, ჯერ დაელოდოთ გადმოტვირთვის დასრულებას,, სანამ დაიწყებთ ახალს</string>
-    <string name="recordings_empty_list">ჩანაწერი არ არის</string>
-    <string name="conference">შეხვედრა</string>
-    <string name="conference_schedule_title">შეხვედრის დაგეგმვა</string>
-    <string name="conference_group_call_title">ჯგუფური ზარის დაწყება</string>
-    <string name="conference_schedule_mandatory_field">სავალდებულო</string>
-    <string name="conference_schedule_subject_title">თემა</string>
-    <string name="conference_schedule_subject_hint">შეხვედრის თემა</string>
-    <string name="conference_group_call_subject_hint">ჯგუფური ზარის თემა</string>
-    <string name="conference_schedule_description_title">აღწერის დამატება</string>
-    <string name="conference_schedule_description_hint">აღწერა</string>
-    <string name="conference_schedule_date">თარიღი</string>
-    <string name="conference_schedule_time">დრო</string>
-    <string name="conference_schedule_duration">ხანგრძლიობა</string>
-    <string name="conference_schedule_timezone">საათის სარტყელი</string>
-    <string name="conference_schedule_send_invite_chat_summary">მოსაწვევი გაიგზავნება ჩემი &appName;-ის ანგარიშიდან</string>
-    <string name="conference_schedule_participants_list">მონაწილეების სია</string>
-    <string name="conference_organizer">ორგანიზატორი</string>
-    <string name="conference_group_call_summary">ჯგუფური ზარის ინფორმაცია</string>
-    <string name="conference_group_call_create">ჯგუფური ზარის დაწყება</string>
-    <string name="conference_paused_title">თქვენ ამ მომენტისთვის იმყოფებით შეხვედრის გარეთ.</string>
-    <string name="conference_paused_subtitle">დააჭირეთ დაკვრის ღილაკს ისევ მასზე მისაერთებლად.</string>
-    <string name="conference_default_title">დაშორებული ჯგუფური ზარი</string>
-    <string name="conference_description_title">აღწერა</string>
-    <string name="conference_invite_join">მიერთება</string>
-    <string name="conference_invite_participants_count" tools:ignore="PluralsCandidate">%d მონაწილე</string>
-    <string name="conference_display_mode_mosaic">მოზაიკის რეჟიმი</string>
-    <string name="conference_display_mode_audio_only">რეჟიმი მხოლოდ ხმა</string>
-    <string name="conference_waiting_room_video_disabled">ვიდეო ამ მომენტისთვის გათიშულია</string>
-    <string name="conference_scheduled">შეხვედრები</string>
-    <string name="conference_no_schedule">დაგეგმილი შეხვედრა ჯერ არ არის.</string>
-    <string name="conference_schedule_organizer">ორგანიზატორი:</string>
-    <string name="conference_admin_set">%s აწი ადმინისტრატორია</string>
-    <string name="conference_admin_unset">%s აღარ არის ადმინისტრატორი</string>
-    <string name="conference_scheduled_delete_one_dialog">დარწმუნებული ხართ, რომ გსურთ ამ შეხვედრის წაშლა\?</string>
-    <string name="conference_empty">თქვენ ამ მომენტისთვის მარტო ხართ ამ ჯგუფურ ზარში</string>
-    <string name="conference_invitation">შეხვედრის მოწვევა</string>
-    <string name="conference_first_to_join">თქვენ პირველი შეუერთდით ჯგუფურ ზარს</string>
-    <string name="conference_incoming_title">შემომავალი ჯგუფური ზარი</string>
-    <string name="conference_participants_title">მონაწილეები (%d)</string>
-    <string name="conference_start_group_call_dialog_title">ჯგუფური ზარი</string>
-    <string name="conference_scheduled_future_filter">დაგეგმილი</string>
-    <string name="call_outgoing_title">გამავალი ზარი</string>
-    <string name="conference_scheduled_terminated_filter">შეწყვეტილი</string>
-    <string name="call_incoming_title">შემომავალი ზარი</string>
-    <string name="call_notification_paused">შეჩერებული ზარი</string>
-    <string name="call_error_network_unreachable">ქსელი მიუწვდომელია</string>
-    <string name="call_notification_active">მიმდინარე ზარი</string>
-    <string name="call_error_user_busy">მომხმარებელი დაკავებულია</string>
-    <string name="call_error_io_error">სერვერი მიუწვდომელია ან ქსელის შეცდომა</string>
-    <string name="call_error_generic">შეცდომა: %s</string>
-    <string name="call_action_calls_list">ზარების სია</string>
-    <string name="call_error_temporarily_unavailable">დროებით მიუწვდომელი</string>
-    <string name="call_action_chat">საუბარი</string>
-    <string name="call_context_action_resume">ზარის გაგრძელება</string>
-    <string name="call_action_numpad">ციფრული კლავიატურა</string>
-    <string name="call_action_statistics">ზარის სტატისტიკა</string>
-    <string name="call_context_action_pause">ზარის შეჩერება</string>
-    <string name="call_remotely_paused_title">ზარის იქნა შეჩერებული დაშორებულის მიერ.</string>
-    <string name="call_context_action_answer">ზარზე პასუხი</string>
-    <string name="call_remote_recording">ეს ზარი იწერება.</string>
-    <string name="call_locally_paused_title">თქვენ შეაჩერეთ ზარი.</string>
-    <string name="call_stats_audio">ხმა</string>
-    <string name="call_stats_video">ვიდეო</string>
-    <string name="call_stats_codec">კოდეკი:</string>
-    <string name="call_stats_ip">IP ოჯახი:</string>
-    <string name="call_stats_download">გადმოტვირთვის გამტარი უნარი:</string>
-    <string name="call_stats_ice">ICE კავშირი:</string>
-    <string name="call_stats_video_resolution_sent">გაგზავნილი ვიდეოს გაფართოება:</string>
-    <string name="call_stats_video_resolution_received">მიღებული ვიდეოს გაფართოება:</string>
-    <string name="call_stats_sender_loss_rate">გამგზავნის დაკარგვის კოეფიციენტი:</string>
-    <string name="call_stats_receiver_loss_rate">მიმღების დაკარგვის კოეფიციენტი:</string>
-    <string name="call_stats_decoder_name">განმშიფრავი:</string>
-    <string name="call_stats_player_filter">დამკვრელის ფილტრი:</string>
-    <string name="call_stats_media_encryption">მედია დაშიფრვა:</string>
-    <string name="call_stats_zrtp_cipher_algo">შიფრის ალგორითმი:</string>
-    <string name="call_stats_zrtp_hash_algo">ჰეშირების ალგორითმი:</string>
-    <string name="call_stats_zrtp_sas_algo">SAS ალგორითმი:</string>
-    <string name="assistant_create_account">ანგარიშის შექმნა</string>
-    <string name="assistant_login_linphone">&appName;-ანგარიშის გამოყენება</string>
-    <string name="assistant_login_generic">SIP ანგარიშის გამოყენება</string>
-    <string name="assistant_remote_provisioning">დაშორებული კონფიგურაციის გადმოტვირთვა</string>
-    <string name="assistant_privacy_policy">კონფიდენციალურობის პოლიტიკა</string>
-    <string name="assistant_error_username_already_exists">მომხმარებლის სახელი უკვე გამოიყენება</string>
-    <string name="assistant_error_username_invalid_characters">მოიძებნა არასწორი სიმბოლოები</string>
-    <string name="assistant_error_passwords_dont_match">პაროლები არ ემთხვევა</string>
-    <string name="assistant_error_invalid_email_address">ელექტრონული ფოსტის მისამართი არასწორია</string>
-    <string name="assistant_error_invalid_credentials">ანგარიში არ არსებობს ან პაროლი არ ემთხვევა</string>
-    <string name="assistant_linphone_account">გამოიყენეთ თქვენი &appName;-ის ანგარიში</string>
-    <string name="assistant_login_forgotten_password">დაგავიწყდათ პაროლი\?</string>
-    <string name="assistant_login">შესვლა</string>
-    <string name="assistant_finish">კონფიგურირების დასრულება</string>
-    <string name="assistant_confirmation_code">დასტურის კოდი</string>
-    <string name="assistant_display_name_optional">ნაჩვენები სახელი (არ არის აუცილებელი)</string>
-    <string name="assistant_confirm_password">პაროლის დასტური</string>
-    <string name="assistant_validate_account_1">თქვენი ანგარიში შეიქმნა. გთხოვთ, შეამოწმოთ თქვენი ელ. ფოსტა ანგარიშის დასადასტურებლად:</string>
-    <string name="assistant_use_username_instead_or_phone_number">გამოიყენეთ მომხმარებლის სახელი (არ არის აუცილებელი)</string>
-    <string name="assistant_link_phone_number">თქვენ მიაბამთ თქვენ ტელეფონის ნომერს შემდეგ მომხმარებლის სახელზე:</string>
-    <string name="assistant_link_phone_number_skip">გამოტოვება</string>
-    <string name="assistant_link_account">ანგარიშის მიბმა</string>
-    <string name="assistant_remote_provisioning_title">დაშორებული კონფიგურაციის გადმოწერა</string>
-    <string name="assistant_remote_provisioning_url">URL</string>
-    <string name="assistant_fetch_apply">გადმოწერა და მიღება</string>
-    <string name="assistant_launch_qrcode">QR კოდი</string>
-    <string name="settings_accounts_title">SIP ანგარიშები</string>
-    <string name="settings_default_account_subtitle">ნაგულისხმევი ანგარიში</string>
-    <string name="settings_audio_title">ხმა</string>
-    <string name="settings_video_title">ვიდეო</string>
-    <string name="settings_call_title">ზარი</string>
-    <string name="settings_chat_title">საუბარი</string>
-    <string name="settings_network_title">ქსელი</string>
-    <string name="settings_contacts_title">კონტაქტები</string>
-    <string name="settings_advanced_title">გაფართოებული</string>
-    <string name="settings_conferences_title">შეხვედრები</string>
-    <string name="settings_primary_account_display_name_title">ნაჩვენები სახელი</string>
-    <string name="settings_primary_account_username_title">მომხმარებლის სახელი</string>
-    <string name="audio_settings_echo_cancellation_summary">აუქმებს ექოს, რომელიც ესმის მეორე მხარეს</string>
-    <string name="audio_settings_echo_canceller_calibration_title">ექოს გაუქმების კალიბრირება</string>
-    <string name="audio_settings_echo_cancellation_calibration_value">კალიბრირებულია %s მწმ-ში</string>
-    <string name="audio_settings_echo_cancellation_calibration_no_echo">ექო არ იყო აღმოჩენილი</string>
-    <string name="audio_settings_echo_tester_title">ექოს ტესტირება</string>
-    <string name="audio_settings_echo_tester_summary">დააჭირეთ ექოს ტესტირებისთვის</string>
-    <string name="audio_settings_echo_tester_summary_is_running">ექოს ტესტირება მიმდინარეობს</string>
-    <string name="audio_settings_adaptive_rate_control_title">ადაპტირებადი სიჩქარის მართვა</string>
-    <string name="audio_settings_output_device_title">ნაგულისხმევი გამავალი ხმის მოწყობილობა</string>
-    <string name="audio_settings_output_device_summary">ცვლილებები შევა ძალაში შემდეგი ზარის დაწყებისას</string>
-    <string name="audio_settings_codec_bitrate_title">კოდეკის ბიტრეიტის შეზღუდვა</string>
-    <string name="audio_settings_playback_gain_title">დაკვრის გაძლიერება</string>
-    <string name="audio_settings_playback_gain_summary">(დეციბელებში)</string>
-    <string name="audio_settings_codecs_title">კოდეკები</string>
-    <string name="video_settings_enable_title">ვიდეოს ჩართვა</string>
-    <string name="video_settings_initiate_call_title">ვიდეო ზარების ინიცირება</string>
-    <string name="video_settings_automatically_accept_summary">ვიდეო მოთხოვნების ყოველთვის მიღება</string>
-    <string name="video_settings_camera_device_title">კამერა</string>
-    <string name="video_settings_video_size_title">უპირატესობის მქონე ვიდეოს ზომა</string>
-    <string name="video_settings_video_preset_title">ვიდეოს წინასაწარი დაყენება</string>
-    <string name="video_settings_bandwidth_limit_title">გამტარი უნარის შეზღუდვა</string>
-    <string name="video_settings_bandwidth_limit_summary">კბიტ/წმ-ში</string>
-    <string name="video_settings_codecs_title">კოდეკები</string>
-    <string name="call_settings_ringtones_title">ზარის ხმა</string>
-    <string name="call_settings_vibrate_title">ვიბრირება შემომავალი ზარის რეკვის დროს</string>
-    <string name="call_settings_media_encryption_none">არავითარი</string>
-    <string name="call_settings_media_encryption_srtp">SRTP</string>
-    <string name="call_settings_media_encryption_zrtp">ZRTP</string>
-    <string name="call_settings_media_encryption_zrtp_post_quantum">პოსტ კვანტური ZRTP</string>
-    <string name="call_settings_media_encryption_dtls">DTLS-SRTP</string>
-    <string name="call_settings_use_telecom_manager_title">Bluetooth მოწყობილობებთან ურთიერთკავშირის გაუმჯობესება</string>
-    <string name="call_settings_overlay_title">აპლიკაციის ზემოთ ზარის შეტყობინება</string>
-    <string name="call_settings_system_wide_overlay_title">შეტყობინების ჩვენება აპის გარეთ</string>
-    <string name="call_settings_sipinfo_dtmf_title">დიაპაზონის გარე DTMF-ების გაგზავნა (SIP INFO)</string>
-    <string name="call_settings_rfc2833_dtmf_title">დიაპაზონის შიდა DTMF-ების გაგზავნა (RFC 2833)</string>
-    <string name="call_settings_auto_answer_title">შემომავალ ზარებზე ავტო პასუხი</string>
-    <string name="call_settings_auto_answer_delay_title">ავტო პასუხის დრო</string>
-    <string name="call_settings_auto_answer_delay_summary">მილიწამებში</string>
-    <string name="call_settings_incoming_timeout_title">შემომავალი ზარის ვადა</string>
-    <string name="call_settings_incoming_timeout_summary">წამებში</string>
-    <string name="call_settings_voice_mail_uri_title">ხმოვანი ფოსტის URI</string>
-    <string name="call_settings_accept_early_media_title">ადრინდელი მედიას მიღება</string>
-    <string name="call_settings_ring_during_early_media_title">შემომავალი ადრინდელი მედიას დროს რეკვა</string>
-    <string name="call_settings_go_to_android_notification_settings">Android-ის შეტყობინებების პარამეტრები</string>
-    <string name="call_settings_auto_start_recording_title">ზარების ჩაწერის ავტომატური დაწყება</string>
-    <string name="chat_settings_file_sharing_url_title">გაზიარების სერვერის URL</string>
-    <string name="chat_settings_file_sharing_url_summary">არ შეცვალოთ, თუ არ იცით, რას აკეთებთ!</string>
-    <string name="chat_settings_auto_download_always">ყოველთვის</string>
-    <string name="chat_settings_auto_download_max_size_title">მაქსიმალური ზომა</string>
-    <string name="chat_settings_auto_download_max_size_summary">ბაიტებში</string>
-    <string name="chat_settings_downloaded_media_public_title">გადმოტვირთული მედიას გასაჯაროება</string>
-    <string name="chat_settings_launcher_shortcuts_title">საუბრის ოთახებისთვის იარლიყების შექმნა გამშვებში</string>
-    <string name="chat_settings_hide_empty_rooms_title">ცარიელი საუბრის ოთახების დამალვა</string>
-    <string name="chat_settings_hide_rooms_removed_proxies_title">წაშლილი პროქსის კონფიგურაციის საუბრის ოთახების დამალვა</string>
-    <string name="chat_settings_go_to_android_notification_settings">Android-ის შეტყობინებების პარამეტრები</string>
-    <string name="chat_settings_use_in_app_file_viewer_summary">კვლავ შეძლებთ მათ ექსპორტირებას მესამე პირის აპებში</string>
-    <string name="network_settings_wifi_only_title">მხოლოდ WiFi-ს გამოყენება</string>
-    <string name="chat_settings_use_in_app_file_viewer_title">ფაილების ყოველთვის გახსნა ამ აპის შიგნით</string>
-    <string name="network_settings_allow_ipv6_title">IPv6-ის დაშვება</string>
-    <string name="contacts_settings_launcher_shortcuts_title">კონტაქტებისთვის იარლიყების შექმნა გამშვებში</string>
-    <string name="network_settings_sip_port_title">გამოსაყენებელი SIP პორტი</string>
-    <string name="contacts_settings_native_presence_title">დასწრების ინფორმაცია მშობლიურ კონტაქტში</string>
-    <string name="contacts_settings_show_organization_title">კონტაქტის ორგანიზაციის ჩვენება</string>
-    <string name="contacts_settings_ldap_enable_title">ჩართვა</string>
-    <string name="contacts_settings_ldap_connection_title">კავშირი</string>
-    <string name="contacts_settings_ldap_bind_dn_title">დომენური სახელის მიბმა</string>
-    <string name="contacts_settings_ldap_title">LDAP</string>
-    <string name="contacts_settings_ldap_delete_title">წაშლა</string>
-    <string name="contacts_settings_ldap_auth_method_simple">მარტივი</string>
-    <string name="contacts_settings_ldap_cert_check_disabled">გათიშული</string>
-    <string name="contacts_settings_ldap_cert_check_auto">ავტო</string>
-    <string name="contacts_settings_ldap_password_title">პაროლი</string>
-    <string name="contacts_settings_ldap_auth_method_anonymous">ანონიმური</string>
-    <string name="contacts_settings_ldap_tls_title">TLS-ის გამოყენება</string>
-    <string name="contacts_settings_ldap_search_title">ძიება</string>
-    <string name="contacts_settings_ldap_cert_check_enabled">ჩართული</string>
-    <string name="contacts_settings_ldap_search_base_title">ძიების ბაზა</string>
-    <string name="contacts_settings_ldap_search_base_subtitle">არ უნდა იყოს ცარიელი!</string>
-    <string name="contacts_settings_ldap_search_filter_title">ფილტრი</string>
-    <string name="contacts_settings_ldap_search_max_results_title">მაქსიმალური შედეგი</string>
-    <string name="contacts_settings_ldap_search_timeout_title">ვადა</string>
-    <string name="contacts_settings_ldap_request_delay_subtitle">მილიწამებში</string>
-    <string name="contacts_settings_ldap_parsing_title">დამუშავება</string>
-    <string name="contacts_settings_ldap_name_attribute_title">ატრიბუტების სახელები</string>
-    <string name="contacts_settings_ldap_sip_attribute_title">SIP ატრიბუტები</string>
-    <string name="contacts_settings_ldap_sip_domain_title">დომენი</string>
-    <string name="contacts_settings_ldap_misc_title">სხვა და სხვა</string>
-    <string name="contacts_settings_ldap_debug_title">დებაგი</string>
-    <string name="advanced_settings_auto_start_title">გაშვებისას დაწყება</string>
-    <string name="advanced_settings_dark_mode_title">მუქი თემა</string>
-    <string name="advanced_settings_dark_mode_label_auto">ავტო</string>
-    <string name="advanced_settings_dark_mode_label_no">არა</string>
-    <string name="advanced_settings_dark_mode_label_yes">დიახ</string>
-    <string name="advanced_settings_animations_title">ანიმაციები</string>
-    <string name="advanced_settings_device_name_title">მოწყობილობის დასახელება</string>
-    <string name="advanced_settings_device_name_summary">ცვლილებები შევა ძალაში შემდეგი გაშვებისას</string>
-    <string name="advanced_settings_logs_server_url_summary">არ შეცვალოთ, თუ არ იცით, რას აკეთებთ!</string>
-    <string name="advanced_settings_go_to_android_app_settings">Android აპის პარამეტრები</string>
-    <string name="service_name">&appName; სერვისი</string>
-    <string name="service_description">ეს საჭიროა ფონურ რეჟიმში ზარების მისაღებად</string>
-    <string name="about_privacy_policy">ეწვიეთ ჩვენს კონფიდენციალურობის პოლიტიკას</string>
-    <string name="logs_upload_failure">ჟურნალების ატვირთვა ვერ მოხერხდა!</string>
-    <string name="phone_number">ტელეფონის ნომერი</string>
-    <string name="phone_numbers">ტელეფონის ნომრები</string>
-    <string name="select_your_country">აირჩიეთ თქვენი ქვეყანა</string>
-    <string name="assistant_choose_country_title">ქვეყნის სახელი ან პრეფიქსი</string>
-    <string name="sip_address">SIP მისამართი</string>
-    <string name="sip_addresses">SIP მისამართები</string>
-    <string name="share_uploaded_logs_link">ჟურნალების გაზიარება შემდეგის გამოყენებით…</string>
-    <string name="status_in_progress">მიმდინარეობს დაკავშირება</string>
-    <string name="assistant">ასისტენტი</string>
-    <string name="no_call_history">ისტორიაში ზარები არ არის</string>
-    <string name="no_conference_call_history">ისტორიაში შეხვედრა არ არის</string>
-    <string name="contact_invite_friend">მოწვევა</string>
-    <string name="no_contact">თქვენს მისამართების წიგნაკში კონტაქტი არ არის.</string>
-    <string name="contact_send_sms_invite_text">გამარჯობა, შემომიერთდით &appName;-ში! შეგიძლიათ იგი უფასოდ გადმოიწეროთ აქედან: %s</string>
-    <string name="contact_choose_existing_or_new_to_add_number">აირჩიეთ კონტაქტი ან შექმენით ახალი</string>
-    <string name="contact_delete_one_dialog">გსურთ ამ კონტაქტის წაშლა\?
-\nიგი ასევე იქნება წაშლილი თქვენი მოწყობილობის მისამართების წიგნაკიდან</string>
-    <string name="contact_delete_many_dialog">გსურთ ამ კონტაქტების წაშლა\?
-\nისინი ასევე იქნება წაშლილი თქვენი მოწყობილობის მისამართების წიგნაკიდან</string>
-    <string name="contact_local_sync_account">ადგილობრივად შენახვა</string>
-    <string name="contact_cant_be_deleted">ამ კონტაქტის წაშლა შეუძლებელია</string>
-    <string name="contacts_ldap_query_more_results_available">ხელმისაწვდომია მეტი შედეგი, დააზუსტეთ თქვენი ძიების პარამეტრები</string>
-    <string name="dialer_transfer_succeded">ზარი გადამისამართების პროცესშია</string>
-    <string name="dialer_transfer_failed">ზარის გადამისამართება ვერ ხერხდება</string>
-    <string name="chat_event_conference_destroyed">თქვენ დატოვეთ ჯგუფი</string>
-    <string name="chat_event_device_added">ახალი მოწყობილობა %s-სთვის</string>
-    <string name="chat_event_device_removed">მოწყობილობა %s-ისთვის წაშლილია</string>
-    <string name="chat_security_event_lime_identity_key_changed">LIME საიდენტიფიკაციო გასაღები შეიცვალა %s-ისთვის</string>
-    <string name="chat_security_event_security_level_downgraded">უსაფრთხოების დონე დაიწია %s-iს გამო</string>
-    <string name="chat_event_ephemeral_enabled">თქვენ ჩართეთ ეფემერული შეტყობინებები: %s</string>
-    <string name="chat_event_ephemeral_disabled">თქვენ გათიშეთ ეფემერული შეტყობინებები</string>
-    <string name="chat_event_ephemeral_lifetime_changed">ეფემერული შეტყობინებების ვადის გასვლის თარიღი: %s</string>
-    <string name="chat_room_group_info_subject_hint">დაასახელეთ ჯგუფი</string>
-    <string name="chat_room_group_info_leave">ჯგუფის დატოვება</string>
-    <string name="chat_room_group_info_you_are_now_admin">თქვენ აწი ხართ ადმინისტრატორი</string>
-    <string name="chat_message_imdn_undelivered">მიუწოდებელი</string>
-    <string name="chat_message_imdn_sent">გაგზავნილი</string>
-    <string name="chat_message_context_menu_resend">თავიდან გაგზავნა</string>
-    <string name="chat_message_context_menu_imdn_info">მიწოდების სტატუსი</string>
-    <string name="chat_message_forward_confirmation_dialog">გსურთ შეტყობინების გადამისამართება ამ ოთახში\?</string>
-    <string name="chat_room_choose_conversation_for_message_forward">აირჩიეთ ან შექმენით საუბარის შეტყობინების გადამისამართებლად</string>
-    <string name="chat_room_choose_conversation_for_text_sharing">აირჩიეთ ან შექმენით საუბარი ტექსტის გასაზიარებლად</string>
-    <string name="chat_message_context_menu_delete_messages">შეტყობინებების წაშლა</string>
-    <string name="chat_message_context_menu_turn_off_notifications">შეტყობინებების გათიშვა</string>
-    <string name="chat_room_ephemeral_messages_desc">ეს შეტყობინება იქნება წაშლილი ორივე მხარეს, როდესაც იგი იქნება წაკითხული და არჩეული ვადის შემდეგ.</string>
-    <string name="chat_room_ephemeral_message_one_minute">1 წუთი</string>
-    <string name="chat_room_creation_failed_snack">საუბრის ოთახის შექმნა ვერ მოხერხდა</string>
-    <string name="chat_room_removal_failed_snack">საუბრის ოთახის წაშლა ვერ მოხერხდა</string>
-    <string name="chat_room_delete_one_dialog">დარწმუნებული ხართ, რომ გსურთ ამ საუბრის წაშლა\?</string>
-    <string name="chat_message_no_app_found_to_handle_file_mime_type">ამ ფაილის ტიპისთვის არ არის ხელმისაწვდომი არცერთი აპი</string>
-    <string name="chat_message_cant_open_file_in_app_dialog_title">თითქოს ფაილის გახსნას ვერ ვახერხებთ.</string>
-    <plurals name="chat_room_unread_messages_event">
-        <item quantity="one">%1$d წაუკითხავი შეტყობინება</item>
-        <item quantity="other">%1$d წაუკითხავი შეტყობინება</item>
-    </plurals>
-    <string name="chat_message_cant_open_file_in_app_dialog_message">გსურთ მისი გახსნა, როგორც ტექსტი, თუ მისი ექსპორტირება (არა-დაშიფრულად) მესამე პირის აპში, თუ ხელმისაწვდდომია\?</string>
-    <string name="chat_message_voice_recording_hold_to_record">გეჭიროთ ღილაკი ხმოვანი შეტყობინების ჩასაწერად</string>
-    <string name="chat_message_voice_recording_playback_low_volume">თქვენი მედიას ხმა დაბალია, ალბათ, გსურთ მისი მომატება</string>
-    <string name="recordings_export">ჩანაწერის ექსპორტირება შემდეგის გამოყენებით…</string>
-    <string name="conference_schedule_later">გსურთ შეხვედრის დაგეგმვა მოგვიანებით\?</string>
-    <string name="conference_schedule_address_title">შეხვედრის მისამართი</string>
-    <string name="conference_schedule_send_invite_chat">&appName;-ის მეშვეობით მოწვევის გაგზავნა</string>
-    <string name="conference_schedule_send_invite_email">ელ. ფოსტით მოწვევის გაგზავნა</string>
-    <string name="conference_schedule_encryption">გსურთ შეხვედრის დაშიფრვა\?</string>
-    <string name="conference_schedule_summary">შეხვედრის ინფორმაცია</string>
-    <string name="conference_schedule_start">შეხვედრის დაგეგმვა</string>
-    <string name="conference_schedule_address_copied_to_clipboard">შეხვედრის მისამართი დაკოპირებულია გაცვლის ბუფერში</string>
-    <string name="conference_schedule_info_not_sent_to_participant">შეხვედრის ინფორმაციის გაგზავნა მონაწილესათვის ვერ მოხერხდა</string>
-    <string name="conference_local_title">ადგილობრივი ჯგუფური ზარი</string>
-    <string name="conference_invite_title">შეხვედრის მოსაწვევი:</string>
-    <string name="conference_display_mode_active_speaker">აქტიური მოსაუბრის რეჟიმი</string>
-    <string name="conference_waiting_room_start_call">დაწყება</string>
-    <string name="conference_waiting_room_cancel_call">გაუქმება</string>
-    <string name="conference_layout_too_many_participants_for_mosaic">თქვენ არ შეგიძლიათ შეცვალოთ ჯგუფის განლაგება, რადგან ძალიან ბევრი მონაწილეა</string>
-    <string name="conference_too_many_participants_for_mosaic_layout">მოზაიკის განლაგებისთვის ძალიან ბევრი მონაწილეა, გადართვა აქტიურ მოსაუბრეზე</string>
-    <string name="conference_participant_paused">(შეჩერებული)</string>
-    <string name="conference_no_terminated_schedule">დასრულებული შეხვედრა ჯერ არ არის.</string>
-    <string name="conference_go_to_chat">შეხვედრის საუბრის ოთახი</string>
-    <string name="conference_creation_failed">შეხვედრის შექმნა ვერ მოხერხდა</string>
-    <string name="conference_schedule_info_created">შეხვედრა დაიგეგმა</string>
-    <string name="conference_info_removed">შეხვედრის ინფორმაცია წაიშალა</string>
-    <string name="conference_invitation_received_notification">თქვენ მოგიწვიეს შეხვედრაზე</string>
-    <string name="conference_low_bandwidth">დაბალი გამტარი უნარი იქნა აღმოჩენილი, ვიდეო ითიშება</string>
-    <string name="conference_last_user">ყველა სხვა მონაწილემ დატოვა ჯგუფური ზარი</string>
-    <string name="conference_start_group_call_dialog_message">გსურთ ჯგუფური ზარის დაწყება\?
-\nყველა ამ ჯგუფში მიიღებს ზარს ამ შეხვედრაზე შესაერთებლად.</string>
-    <string name="conference_start_group_call_dialog_ok_button">დაწყება</string>
-    <string name="call_notification_outgoing">გამავალი ზარი</string>
-    <string name="call_error_declined">ზარი იქნა უარყოფილი</string>
-    <string name="call_error_user_not_found">მომხმარებელი ვერ მოიძებნა</string>
-    <string name="call_error_server_timeout">სერვერის დროის გასვლა</string>
-    <string name="call_action_participants_list">მონაწილეთა სია</string>
-    <string name="call_action_change_conf_layout">განლაგების შეცვლა</string>
-    <string name="call_action_add_call">ახალი ზარის დაწყება</string>
-    <string name="call_context_action_transfer">ზარის გადამისამართება</string>
-    <string name="call_context_action_hangup">ზარის შეწყვეტა</string>
-    <string name="call_locally_paused_subtitle">დააჭირეთ დაკვრის ღილაკს მისი გაგრძელებისთვის.</string>
-    <string name="call_error_incompatible_media_params">შეუთავსებელი მედია პარამეტრები</string>
-    <string name="call_video_update_requested_dialog">მოსაუბრეს სურს ვიდეოს ჩართვა</string>
-    <string name="call_action_transfer_call">ზარის გადამისამართება</string>
-    <string name="call_stats_upload">ატვირთვის გამტარი უნარი:</string>
-    <string name="call_stats_estimated_download">ნავარაუდები გადმოტვირთვის გამტარი უნარი:</string>
-    <string name="call_stats_video_fps_sent">გაგზავნილი ვიდეოს კადრები წამში:</string>
-    <string name="call_stats_video_fps_received">მიღებული ვიდეოს კადრები წამში:</string>
-    <string name="call_stats_jitter_buffer">ჯიტერის ბუფერი:</string>
-    <string name="call_stats_encoder_name">დამშიფრავი:</string>
-    <string name="call_stats_capture_filter">ჩაწერის ფილტრი:</string>
-    <string name="call_stats_zrtp_key_agreement_algo">გასაღების გაცვლის ალგორითმი:</string>
-    <string name="call_stats_zrtp_auth_tag_algo">აუთენტიფიკაციის ალგორითმი:</string>
-    <string name="assistant_welcome_title">კეთილი იყოს თქვენი მობრძანება</string>
-    <string name="assistant_welcome_desc">ეს ასისტენტი დაგეხმარებათ დააყენოთ და გამოიყენოთ თქვენი SIP ანგარიში.</string>
-    <string name="assistant_ec_calibration">ექოს გაუქმების კალიბრაცია პროცესშია</string>
-    <string name="assistant_phone_number_info_title">რისთვის იქნება გამოყენებული ჩემი ტელეფონის ნომერი\?</string>
-    <string name="assistant_phone_number_link_info_content">"
-\nთქვენი მეგობრები შეძლებენ თქვენს პოვნას უფრო მარტივად, თუ მიაბამთ თქვენს ანგარიშს თქვენ ტელეფონის ნომერზე
-\n
-\nთქვენ დაინახავთ თქვენს მისამართების წიგნაკში, თუ ვინ იყენებს &appName;-ს და თქვენ მეგობრებს ეცოდინებათ, რომ შეუძლიათ ასევე დაგიკავშირდნენ &appName;-ზე.
-\n"</string>
-    <string name="assistant_phone_number_link_info_content_already_account">თქვენი ტელეფონის ნომრის გამოყენება მხოლოდ ერთ &appName;-ის ანგარიშთან შეგიძლიათ.
-\n
-\nთუ უკვე მიაბით თქვენი ნომერი სხვა ანგარიშს, მაგრამ გირჩევნიათ ამის გამოყენება, უბრალოდ მიაბით იგი ახლა, და თქვენი ნომერი ავტომატურად იქნება გადმოტანილი ამ ანგარიშზე.</string>
-    <string name="assistant_general_terms">გამოყენების პირობები</string>
-    <string name="assistant_read_and_agree_terms">მე ვეთანხმები Belledonne Communications-ს %1$s-ს და %2$s-ს</string>
-    <string name="assistant_generic_account_warning">ზოგი ფუნქცია ითხოვს &appName;-ის ანგარიშს, მაგ., ჯგუფური მიწერ-მოწერა ან დროებით მიწერ-მოწერა.
-\n
-\nეს ფუნქციები დამალულია, როდესაც რეგისტრირდებით მესამე პირის SIP ანგარიშით.
-\n
-\nკომერციულ პროექტებში მათ ჩასართავად, გთხოვთ, დაგვიკავშირდეთ.</string>
-    <string name="assistant_generic_account_warning_continue_button_text">მესმის</string>
-    <string name="assistant_error_phone_number_invalid_characters">აქ მიიღება მხოლოდ ციფრები</string>
-    <string name="assistant_error_phone_number_already_exists">უკვე არსებობს ანგარიში, რომელიც იყენებს ამ ნომერს</string>
-    <string name="assistant_error_username_too_long">მომხმარებლის სახელში ზედმეტი სიმბოლოებია</string>
-    <string name="assistant_create_account_part_1">გთხოვთ, დაადასტუროთ თქვენი ქვეყნის კოდი და შეიყვანოთ თქვენი ტელეფონის ნომერი</string>
-    <string name="assistant_linphone_login_desc">გთხოვთ, შეიყვანოთ თქვენი &appName;-ის ანგარიშის მომხმარებლის სახელი და პაროლი</string>
-    <string name="assistant_login_with_username">გამოიყენეთ თქვენი მომხმარებლის სახელი და პაროლი თქვენი ტელეფონის ნომრის მაგივრად</string>
-    <string name="assistant_continue_even_if_credentials_invalid">გაგრძელება</string>
-    <string name="assistant_generic_account">გამოიყენეთ SIP ანგარიში</string>
-    <string name="assistant_login_desc">გთხოვთ, შეიყვანოთ თქვენი მომხმარებლის სახელი და პაროლი თქვენ SIP დომენთან ერთად</string>
-    <string name="assistant_create_account_part_email">გთხოვთ, შეიყვანოთ მომხმარებლის სახელი, ელ. ფოსტა და პაროლი თქვენი &appName;-ის ანგარიშისთვის</string>
-    <string name="assistant_validate_account_2">ამის შემდეგ, დაბრუნდით აქ და დააჭირეთ ღილაკს.</string>
-    <string name="assistant_create_account_part_2">ჩვენ გამოგიგზავნეთ SMS დასტურის კოდით თქვენს ტელეფონის ნომერზე:</string>
-    <string name="assistant_create_account_part_3">თქვენი ტელეფონის ნომრის შემოწმების დასასრულებლად, გთხოვთ, შეიყვანოთ 4-ციფრიანი კოდი ქვემოთ:
-\n</string>
-    <string name="assistant_remote_provisioning_desc">გთხოვთ, მიუთითოთ თქვენი კონფიგურაციის URL</string>
-    <string name="assistant_remote_provisioning_wrong_format">უცნობი URL-ის ფორმატი, კონფიგურაციის გადმოტვირთვა ვერ ხერხდება…</string>
-    <string name="assistant_remote_provisioning_failure">დაშორებული კონფიგურაციის პროფილის გადმოწერა ან მიღება ვერ მოხერხდა…</string>
-    <string name="settings_list_title">პარამეტრები</string>
-    <string name="settings_tunnel_title">გვირაბი</string>
-    <string name="settings_primary_account_title">მთავარი ანგარიში</string>
-    <string name="audio_settings_echo_canceller_calibration_summary">დააჭირეთ ექოს გაუქმების კალიბრირებისთვის</string>
-    <string name="audio_settings_echo_cancellation_calibration_started">ექოს გაუქმების კალიბრირება დაიწყო</string>
-    <string name="audio_settings_echo_cancellation_calibration_failed">კალიბრირება ვერ მოხერხდა</string>
-    <string name="audio_settings_echo_tester_summary_is_stopped">ექოს ტესტირება გაჩერებულია</string>
-    <string name="advanced_settings_android_title">Android</string>
-    <string name="advanced_settings_go_to_power_manager_settings">კვების მმართველის პარამეტრები</string>
-    <string name="advanced_settings_vfs_title">ყველაფრის დაშიფრვა</string>
-    <string name="advanced_settings_vfs_summary">ჩართვის შემდეგ გათიშვა აღარ შეიძლება!</string>
-    <string name="advanced_settings_debug_title">დებაგის პარამეტრები</string>
-    <string name="advanced_settings_other_title">სხვა პარამეტრები</string>
-    <string name="advanced_settings_disable_fragment_security_summary">ეკრანის გადაღების/ჩაწერის დაშვება მგრძნობიარე ხედებზე</string>
-    <string name="tunnel_settings_port_title">პორტი</string>
-    <string name="tunnel_settings_dual_mode_title">ორმაგი რეჟიმი ჩართულია</string>
-    <string name="tunnel_settings_dual_hostname_url_title">მეორე სერვერის ჰოსტის სახელი</string>
-    <string name="tunnel_settings_dual_hostname_url_summary">საჭიროა ორმაგ რეჟიმში</string>
-    <string name="tunnel_settings_mode_title">რეჟიმი</string>
-    <string name="tunnel_settings_disabled_mode">გათიშული</string>
-    <string name="tunnel_settings_always_mode">ყოველთვის</string>
-    <string name="tunnel_settings_auto_mode">ავტო</string>
-    <string name="account_settings_user_name_title">მომხმარებლის სახელი</string>
-    <string name="account_settings_user_id_title">აუთენტიფიკაციის იდენტიფიკატორი</string>
-    <string name="account_settings_password_title">პაროლი</string>
-    <string name="account_settings_domain_title">დომენი</string>
-    <string name="account_settings_display_name_title">ჩვენების სახელი</string>
-    <string name="account_settings_manage_title">მართვა</string>
-    <string name="account_settings_disable_title">გათიშვა</string>
-    <string name="account_settings_link_phone_number_title">ანგარიშის მიბმა</string>
-    <string name="account_settings_push_notification_title">Push-შეტყობინებების დაშვება</string>
-    <string name="account_settings_transport_title">ტრანსპორტი</string>
-    <string name="account_settings_transport_udp">UDP</string>
-    <string name="account_settings_transport_tcp">TCP</string>
-    <string name="account_settings_transport_dtls">DTLS</string>
-    <string name="account_settings_proxy_title">SIP პროქსი</string>
-    <string name="account_settings_outbound_proxy_summary">ყველა ზარის მარშრუტიზაცია ზემოთ აღნიშნული SIP პროქსით</string>
-    <string name="account_settings_stun_server_title">STUN/TURN სერვერი</string>
-    <string name="account_settings_avpf_title">AVPF</string>
-    <string name="account_settings_avpf_rr_interval_title">AVPF რეგულარული RTCP ინტერვალი</string>
-    <string name="account_settings_avpf_rr_interval_summary">წამებში (1-დან 5-მდე)</string>
-    <string name="account_settings_expires_title">ვადა</string>
-    <string name="account_settings_expires_summary">წამებში</string>
-    <string name="account_settings_prefix_summary">\"+\"-ის გარეშე</string>
-    <string name="account_settings_escape_plus_title">\"+\"-ის \"00\"-ით ჩანაცვლება</string>
-    <string name="account_setting_conference_factory_address">კონფერენციის ქარხნის URI</string>
-    <string name="notification_channel_incoming_call_name">&appName; შემომავალი ზარების შეტყობინება</string>
-    <string name="incoming_call_notification_title">შემომავალი ზარი</string>
-    <string name="incoming_group_call_notification_title">შემომავალი ჯგუფური ზარი</string>
-    <string name="incoming_call_notification_hangup_action_label">დაკიდება</string>
-    <string name="incoming_call_notification_answer_action_label">პასუხი</string>
-    <string name="received_chat_notification_reply_label">პასუხი</string>
-    <string name="received_chat_notification_mark_as_read_label">წაკითხულად მონიშვნა</string>
-    <string name="missed_call_notification_title">გამოტოვებული ზარი</string>
-    <string name="dialog_zrtp_local_sas">თქვით:</string>
-    <string name="dialog_zrtp_remote_sas">დაადასტურეთ, რომ მოსაუბრე ამბობს:</string>
-    <string name="dialog_do_not_ask_again">აღარ აჩვენოთ</string>
-    <string name="dialog_cancel">გაუქმება</string>
-    <string name="dialog_delete">წაშლა</string>
-    <string name="dialog_ok">OK</string>
-    <string name="dialog_accept">მიღება</string>
-    <string name="dialog_decline">უარყოფა</string>
-    <string name="dialog_call">ზარი</string>
-    <string name="operation_in_progress_wait">ოპერაცია მიმდინარეობს, გთხოვთ, დაელოდოთ</string>
-    <string name="dialog_default_delete_one">დარწმუნებული ხართ, რომ გსურთ ამ ელემენტის წაშლა\?</string>
-    <string name="dialog_default_delete_many">დარწმუნებული ხართ, რომ გსურთ თქვენი არჩევანის წაშლა\?</string>
-    <string name="dialog_try_open_file_as_text_title">ამ ფაილის ტიპისთვის აპი ვერ მოიძებნა</string>
-    <string name="content_description_add_sip_address_field">SIP მისამართის ველის დამატება</string>
-    <string name="content_description_add_phone_number_field">ტელეფონის ნომრის ველის დამატება</string>
-    <string name="content_description_go_back">უკან</string>
-    <string name="content_description_clear_field">გაასუფთავეთ ტექსტური ველი მის გვერდზე</string>
-    <string name="content_description_pause_call">ზარის შეჩერება</string>
-    <string name="content_description_toggle_recording">ზარის ჩაწერის ჩართვა ან გათიშვა</string>
-    <string name="content_description_answer_call">ზარზე პასუხის გაცემა</string>
-    <string name="content_description_enable_mic_mute">მიკროფონის გამორთვა</string>
-    <string name="content_description_enable_speaker">ხმის გადამისამართება დინამიკზე</string>
-    <string name="content_description_go_back_to_call">ზარის ხედზე დაბრუნება</string>
-    <string name="content_description_enable_video">ზარში ვიდეოს ჩართვა</string>
-    <string name="content_description_use_bluetooth_headset">Bluetooth ყურსასმენის გამოყენება გამავალი ხმისთვის</string>
-    <string name="content_description_use_speaker">დინამიკის გამოყენება გამავალი ხმისთვის</string>
-    <string name="content_description_add_call">ახალი ზარის დაწყება</string>
-    <string name="content_description_pending_file_transfer">მომლოდინი ფაილის გადაცემა</string>
-    <string name="content_description_remove_pending_file_transfer">მომლოდინე ფაილის გადაცემის წაშლა</string>
-    <string name="content_description_delivery_status">შეტყობინების მიწოდების სტატუსი</string>
-    <string name="content_description_ephemeral_message">შეტყობინება ეფემერულია</string>
-    <string name="content_description_linphone_user">კონტაქტი &appName;-ის მომხმარებელია</string>
-    <string name="content_description_e2e_encryption_disabled">ბოლოდან ბოლომდე დაშიფრვა გათიშულია</string>
-    <string name="content_description_e2e_encryption_enabled">ბოლოდან ბოლომდე დაშიფრვა ჩართულია</string>
-    <string name="content_description_show_sip_contacts">მხოლოდ SIP კონტაქტების სიის ჩვენება</string>
-    <string name="content_description_start_call">ზარის დაწყება</string>
-    <string name="content_description_show_chat_room_menu">საუბრის ოთახის მენიუს ჩვენება</string>
-    <string name="content_description_enter_edition_mode">რედაქტირების რეჟიმში შესვლა</string>
-    <string name="content_description_toggle_participant_devices_list">მონაწილეთა მოწყობილობების ჩვენება ან დამალვა</string>
-    <string name="content_description_ephemeral_duration_change">ეფემერულის ხანგრძლიობის შეცვლა არჩეული მნიშვნელობით</string>
-    <string name="content_description_create_chat_room">საუბრის ოთახის შექმნა</string>
-    <string name="content_description_remove_contact_from_chat_room">საუბრიდან კონტაქტის ამოღება</string>
-    <string name="content_description_muted_chat_room">შეტყობინებები გათიშულია ამ საუბრისთვის</string>
-    <string name="content_description_contact_can_do_encryption">დაშიფრულ საუბრებში შესაძლებელია კონტაქტის მოწვევა</string>
-    <string name="content_description_start_chat">საუბარში გადასვლა</string>
-    <string name="content_description_edit_contact">კონტაქტის რედაქტირება</string>
-    <string name="content_description_delete_contact">კონტაქტის წაშლა</string>
-    <string name="content_description_discard_changes">ცვლილებების გაუქმება</string>
-    <string name="content_description_confirm_contact_edit">ცვლილებების შენახვა</string>
-    <string name="content_description_change_own_picture">საკუთარი სურათის შეცვლა</string>
-    <string name="content_description_show_call_details">ზარის დეტალებზე გადასვლა</string>
-    <string name="content_description_select_all">სიაში ყველა ელემენტის არჩევა</string>
-    <string name="content_description_numpad_1">1</string>
-    <string name="content_description_numpad_2">2</string>
-    <string name="content_description_numpad_3">3</string>
-    <string name="content_description_numpad_4">4</string>
-    <string name="content_description_numpad_6">6</string>
-    <string name="content_description_numpad_7">7</string>
-    <string name="content_description_numpad_8">8</string>
-    <string name="content_description_numpad_9">9</string>
-    <string name="content_description_numpad_0">0</string>
-    <string name="content_description_numpad_star">*</string>
-    <string name="content_description_numpad_sharp">#</string>
-    <string name="content_description_voice_mail">ხმოვანი ფოსტა</string>
-    <string name="content_description_toggle_side_menu">გვერდული მენიუს ჩვენება ან დამალვა</string>
-    <string name="content_description_menu_history">ზარების ისტორია</string>
-    <string name="content_description_menu_chat">საუბრები</string>
-    <string name="content_description_add_contact">კონტაქტის შექმნა</string>
-    <string name="content_description_go_to_contact">კონტაქტის დეტალებზე გადასვლა</string>
-    <string name="content_description_show_missed_calls">მხოლოდ გამოტოვებული ზარების ჩვენება</string>
-    <string name="content_description_missed_call">გამოტოვებული ზარი</string>
-    <string name="content_description_incoming_call">შემომავალი ზარი</string>
-    <string name="content_description_create_group_chat_room">ჯგუფური საუბრის შექმნა</string>
-    <string name="content_description_security_level_unsafe">სახიფათო</string>
-    <string name="content_description_security_level_safe">უსაფრთხო</string>
-    <string name="content_description_security_level_encrypted">დაშიფრული</string>
-    <string name="content_description_call_quality_1">დაბალი ზარის ხარისხი</string>
-    <string name="content_description_call_quality_3">კარგი ზარის ხარისხი</string>
-    <string name="content_description_call_quality_4">მაქსიმალური ზარის ხარისხი</string>
-    <string name="content_description_call_secured">ზარი დაცულია</string>
-    <string name="content_description_call_security_pending">ზარის უსაფრთხოება მოლოდინშია</string>
-    <string name="content_description_chat_message_meeting_attachment">მიბმული შეხვედრის მოსაწვევი</string>
-    <string name="content_description_close_bubble">შეტყობინებათა ბუშტის დახურვა</string>
-    <string name="content_description_open_app">საუბრის გახსნა აპში ბუშტის მაგივრად</string>
-    <string name="content_description_cancel_forward">შეტყობინების გადამისამართების გაუქმება</string>
-    <string name="content_description_stop_voice_recording">ხმის ჩაწერის გაჩერება</string>
-    <string name="content_description_cancel_voice_recording">ხმის ჩაწერის გაუქმება</string>
-    <string name="content_description_call_context_menu">ზარის კონტექსტური მენიუს გახსნა</string>
-    <string name="content_description_create_conference">ზარი-შეხვედრის შექმნა</string>
-    <string name="content_description_copy_conference_address">შეხვედრის მისამართის კოპირება</string>
-    <string name="content_description_edit_conference">შეხვედრის რედაქტირება</string>
-    <string name="content_description_share_ics">ღონისძიების ექსპორტირება კალენდარში</string>
-    <string name="content_description_show_numpad">ციფრული კლავიატურის ჩვენება</string>
-    <string name="content_description_go_to_chat_rooms_list">საუბრების სიაზე გადასვლა</string>
-    <string name="content_description_toggle_layout_menu">ჯგუფური ზარის განლაგების მენიუს ჩვენება ან დამალვა</string>
-    <string name="content_description_participant_is_paused">მონაწილემ დროებით დატოვა ჯგუფური ზარი</string>
-    <string name="content_description_conference_participants">ჯგუფური ზარის მონაწილეები</string>
-    <string name="advanced_settings_send_debug_logs_title">ჟურნალების გაგზავნა</string>
-    <string name="advanced_settings_reset_debug_logs_title">ჟურნალების ჩამოყრა</string>
-    <string name="advanced_settings_disable_fragment_security_title">მომხმარებლის ინტერფეისის უსაფრთხო რეჟიმის გათიშვა</string>
-    <string name="tunnel_settings_hostname_url_title">ჰოსტის სახელი</string>
-    <string name="tunnel_settings_dual_mode_summary">გამოიყენებს ერთ სერვერს ასატვირთად და მეორეს გადმოსატვირთად</string>
-    <string name="tunnel_settings_dual_port_title">მეორე სერვერის პორტი</string>
-    <string name="tunnel_settings_dual_port_summary">საჭიროა ორმაგ რეჟიმში</string>
-    <string name="account_settings_user_name_summary">მაგალითად, john, თუ თქვენი ანგარიშია john@sip.example.org</string>
-    <string name="account_settings_user_id_summary">შეიყვანეთ აუთენტიფიკაციის იდენტიფიკატორი, თუ განსხვავდება მომხმარებლის სახელისგან (არააუცილებელი)</string>
-    <string name="account_settings_password_summary">პაროლი უნდა შეიყვანოთ თავიდან, თუ ცვლით მომხმარებლის სახელს და/ან დომენს</string>
-    <string name="account_settings_domain_summary">მაგალითად, sip.example.org, თუ თქვენი ანგარიშია john@sip.example.org</string>
-    <string name="account_settings_default_title">ნაგულისხმევად გამოყენება</string>
-    <string name="account_settings_delete_title">წაშლა</string>
-    <string name="account_settings_advanced_title">გაფართოებული</string>
-    <string name="account_settings_push_notification_summary">პროქსი კონფიგურაცია არ აუქმებს რეგისტრირებას</string>
-    <string name="account_settings_transport_tls">TLS</string>
-    <string name="account_settings_outbound_proxy_title">გამავალი პროქსი</string>
-    <string name="account_settings_ice_title">ICE-ის ჩართვა</string>
-    <string name="account_settings_prefix_title">თქვენი ქვეყნის პრეფიქსი</string>
-    <string name="account_settings_apply_prefix_for_calls_title">პრეფიქსის გამოყენება გამავალი ზარებისათვის და საუბრისთვის</string>
-    <string name="account_settings_apply_prefix_for_calls_summary">თუ ნომერი შეყვანილია, პრეფიქსის გამოყენება ნომრისთვის</string>
-    <string name="account_setting_audio_video_conference_factory_address">აუდიო/ვიდეო კონფერენციის ქარხნის URI</string>
-    <string name="conferences_settings_layout_title">ნაგულისხმევი განლაგება</string>
-    <string name="notification_channel_service_name">&appName; სერვისის შეტყობინება</string>
-    <string name="notification_channel_missed_call_name">&appName; გამოტოვებული ზარების შეტყობინება</string>
-    <string name="notification_channel_chat_name">&appName; შეტყობინების შეტყობინება</string>
-    <string name="missed_call_notification_body">გამოტოვებული ზარი %s-სგან</string>
-    <string name="missed_calls_notification_body" tools:ignore="PluralsCandidate">%d გამოტოვებული ზარი</string>
-    <string name="zrtp_dialog_title">კავშირის უსაფრთხოება</string>
-    <string name="dialog_lime_security_message">დაუყოვნებლივი შეტყობინებები არის ბოლოდან ბოლომდე დაშიფრული დაცულ საუბრებში. შესაძლებელია საუბრის უსაფრთხოების დონის ამაღლების მონაწილეთა აუთენტიფიკაციის მეშვეობით. ამისათვის, დაურეკეთ კონტაქტს და მიჰყევით აუთენტიფიკაციის პროცესს.</string>
-    <string name="dialog_update_available">ხელმისაწვდომია განახლება</string>
-    <string name="dialog_try_open_file_as_text_body">გსურთ, სცადოთ მისი გახსნა უბრალო ტექსტურ ფაილად\?</string>
-    <string name="content_description_phone_number_use">თქვენი ტელეფონის ნომრის გამოყენების ჩვენება</string>
-    <string name="content_description_switch_camera">წინა კამერიდან უკანაზე გადართვა და პირიქით</string>
-    <string name="content_description_terminate_call">ზარის შეწყვეტა</string>
-    <string name="content_description_disable_mic_mute">მიკროფონის ჩართვა</string>
-    <string name="content_description_disable_speaker">ხმის გადამისამართება ყურსასმენზე</string>
-    <string name="content_description_disable_video">ზარში ვიდეოს გათიშვა</string>
-    <string name="content_description_toggle_audio_menu">ხმის გასვლის მენიუს ჩვენება ან დამალვა</string>
-    <string name="content_description_use_earpiece">ყურსასმენის გამოყენება გამავალი ხმისთვის</string>
-    <string name="content_description_transfer_call">მიმდინარე ზარის გადამისამართება სხვაზე</string>
-    <string name="content_description_downloaded_file_transfer">მიბმული ფაილი</string>
-    <string name="content_description_forward_message">ამ საუბარში შეტყობინების გადამისამართება</string>
-    <string name="content_description_contact_selected">კონტაქტი არჩეულია</string>
-    <string name="content_description_show_all_contacts">ყველა კონტაქტის სიის ჩვენება</string>
-    <string name="content_description_continue_chat_room_creation">საუბრის შექმნის ბოლო ეტაპზე გადასვლა</string>
-    <string name="content_description_remove_contact_from_selection">არჩევანიდან კონტაქტის ამოღება</string>
-    <string name="content_description_attach_file">შეტყობინებაზე ფაილის მიბმა</string>
-    <string name="content_description_send_message">შეტყობინების გაგზავნა</string>
-    <string name="content_description_ephemeral_duration_selected">ეფემერულის ხანგრძლიობა არჩეულია</string>
-    <string name="content_description_add_participants">მონაწილეების დამატება</string>
-    <string name="content_description_contact_is_admin">კონტაქტი ადმინისტრატორია ამ საუბარში</string>
-    <string name="content_description_contact_is_not_admin">კონტაქტი არ არის ადმინისტრატორი ამ საუბარში</string>
-    <string name="content_description_ephemeral_chat_room">შეტყობინებები ეფემერულია ამ საუბარში</string>
-    <string name="content_description_start_encrypted_chat">დაშიფრულ საუბარში გადასვლა</string>
-    <string name="content_description_change_contact_picture">კონტაქტის სურათის შეცვლა</string>
-    <string name="content_description_exit_edition_mode">რედაქტირების რეჟიმიდან გასვლა</string>
-    <string name="content_description_unselect_all">სიაში ყველა ელემენტის არჩევის გაუქმება</string>
-    <string name="content_description_delete_selection">სიიდან არჩეული ელემენტების წაშლა</string>
-    <string name="content_description_numpad_5">5</string>
-    <string name="content_description_recording_toggle_play">ჩანაწერის დაკვრა ან შეჩერება</string>
-    <string name="content_description_menu_contacts">კონტაქტები</string>
-    <string name="content_description_menu_dialer">ამკრეფი</string>
-    <string name="content_description_dialer_erase">ბოლო სიმბოლოს წაშლა</string>
-    <string name="content_description_show_all_calls">ყველა ზარის ჩვენება</string>
-    <string name="content_description_outgoing_call">გამავალი ზარი</string>
-    <string name="content_description_create_one_to_one_chat_room">ერთი ერთზე საუბრის შექმნა</string>
-    <string name="content_description_call_quality_0">ძალიან დაბალი ზარის ხარისხი</string>
-    <string name="content_description_call_quality_2">საშუალო ზარის ხარისხი</string>
-    <string name="content_description_call_not_secured">ზარი არ არის დაცული</string>
-    <string name="content_description_chat_message_video_attachment">მიბმული ვიდეო</string>
-    <string name="content_description_take_screenshot">მიღებული ვიდეოს ეკრანის ანაბეჭდის გადაღება</string>
-    <string name="content_description_export">ფაილის გახსნა მესამე პირის აპში</string>
-    <string name="content_description_cancel_sharing">გაზიარების გაუქმება</string>
-    <string name="content_description_cancel_reply">პასუხის გაუქმება</string>
-    <string name="content_description_voice_recording">ხმოვანი შეტყობინების ჩაწერა</string>
-    <string name="content_description_pause_voice_recording_playback">ხმის ჩაწერის შეჩერება</string>
-    <string name="content_description_play_voice_recording">ხმოვანი ჩანაწერის დაკვრა</string>
-    <string name="content_descripton_scroll_to_bottom">ქვემოთ ან პირველ წაუკითხავ შეტყობინებაზე გადასვლა</string>
-    <string name="content_description_delete_conference">შეხვედრის წაშლა</string>
-    <string name="content_description_encrypted_conference">შეხვედრა იქნება დაშიფრული</string>
-    <string name="content_description_hide_statistics">ზარის სტატისტიკის დამალვა</string>
-    <string name="content_description_hide_numpad">ციფრული კლავიატურის დამალვა</string>
-    <string name="content_description_conference_participant_mic_muted">მონაწილეს მიკროფონი აქვს გათიშული</string>
-    <string name="content_description_toggle_conference_info_details">შეხვედრის ინფორმაციის დეტალების ჩვენების გადართვა</string>
-    <string name="content_description_recording_export">ჩანაწერის ექსპორტირება</string>
-    <string name="call_screenshot_taken">ეკრანის ანაბეჭდი იქნა გადაღებული: %s</string>
-    <string name="conference_schedule_edit">შეხვედრის რედაქტირება</string>
-    <string name="conference_update_title">შეხვედრა განახლდა:</string>
-    <string name="conference_cancel_title">შეხვედრა გაუქმდა:</string>
-    <string name="conference_schedule_send_updated_invite_chat">&appName;-ს მეშვეობით განახლების გაგზავნა</string>
-    <string name="account_setting_delete_dialog_title">გსურთ თქვენი ანგარიშის წაშლა\?</string>
-    <string name="account_setting_delete_generic_confirmation_dialog">თქვენი ანგარიში წაიშლება მხოლოდ ლოკალურად.
-\nმისი მუდმივად წასაშლელად, გადადით თქვენი SIP მიმწოდებლის ვებსაიტზე.</string>
-    <string name="account_setting_delete_sip_linphone_org_confirmation_dialog">თქვენი ანგარიში წაიშლება მხოლოდ ლოკალურად.
-\nმისი მუდმივად წასაშლელად, გადადით თქვენი ანგარიშის მართვის პლატფორმაზე:</string>
-    <string name="chat_message_voice_recording_received_notification">თქვენ მიიღეთ ხმოვანი შეტყობინება</string>
-    <string name="chat_message_voice_recording">ხმოვანი შეტყობინება</string>
-    <string name="conference_schedule_send_updated_invite_email">განახლების გაგზავნა ელ. ფოსტის მეშვეობით</string>
-    <string name="account_setting_publish_presence_title">დასწრების ინფორმაციის გამოქვეყნება</string>
-    <string name="content_description_presence_online">მომხმარებელი ქსელშია</string>
-    <string name="call_action_attended_transfer_call">დასწრებით გადამისამართება</string>
-    <string name="account_setting_end_to_end_encryption_keys_server_url">E2E დაშიფრვის გასაღებების სერვერის URL</string>
-    <string name="content_description_presence_offline">მომხმარებელი არ არის ქსელში</string>
-    <string name="chat_room_presence_online">ქსელში</string>
-    <string name="chat_room_presence_last_seen_online_today">ქსელში დღეს</string>
-    <string name="chat_room_presence_last_seen_online_yesterday">ქსელში გუშინ</string>
-    <string name="chat_room_presence_last_seen_online">ქსელში</string>
-    <string name="conference_scheduled_delete_many_dialog">გსურთ ამ შეხვედრების წაშლა\?</string>
-    <string name="conference_scheduled_cancelled_by_organizer">კონფერენცია გაუქმდა შემქმნელის მიერ</string>
-    <string name="conference_scheduled_cancelled_by_me">თქვენ გააუქმეთ კონფერენცია</string>
-    <string name="zrtp_dialog_explanation">უსაფრთხოების დონის გასაზრდელად, შეგიძლიათ თქვენს მოკავშირესთან შეამოწმოთ შემდეგი კოდები.</string>
-    <string name="zrtp_dialog_later_button_label">მოგვიანებით</string>
-    <string name="zrtp_dialog_correct_button_label">შესწორება</string>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-land/dimen.xml b/app/src/main/res/values-land/dimen.xml
deleted file mode 100644
index 3f0923567..000000000
--- a/app/src/main/res/values-land/dimen.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <dimen name="chat_room_emoji_picker_height">200dp</dimen>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-lv/strings.xml b/app/src/main/res/values-lv/strings.xml
deleted file mode 100644
index 377eae7af..000000000
--- a/app/src/main/res/values-lv/strings.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE resources [
-<!ENTITY appName "Linphone">
-]>
-<resources>
-    <string name="service_auto_start_description">&appName; tika palaists automātiski</string>
-    <string name="service_name">&appName; pakalpojums</string>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-night-v27/styles.xml b/app/src/main/res/values-night-v27/styles.xml
deleted file mode 100644
index 1bba957ec..000000000
--- a/app/src/main/res/values-night-v27/styles.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <style name="AppTheme" parent="BaseAppTheme">
-        <!-- https://developer.android.com/guide/topics/display-cutout#best_practices_for_display_cutout_support -->
-        <item name="android:windowLayoutInDisplayCutoutMode">
-            shortEdges
-        </item>
-    </style>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-night/styles.xml b/app/src/main/res/values-night/styles.xml
deleted file mode 100644
index f791f2928..000000000
--- a/app/src/main/res/values-night/styles.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!-- Base application theme. -->
-    <style name="BaseAppTheme" parent="Theme.MaterialComponents.DayNight.NoActionBar">
-        <!-- Disable animations between activities -->
-        <item name="android:windowAnimationStyle">@null</item>
-        <item name="android:windowBackground">@color/transparent_color</item>
-
-        <!-- Android theme override -->
-        <item name="colorAccent">@color/primary_color</item>
-        <item name="colorPrimary">@color/primary_color</item>
-        <item name="android:colorPrimary">@color/primary_color</item>
-        <!-- Comment out the following line to disable system's status bar coloring -->
-        <item name="android:colorPrimaryDark">@color/primary_dark_color</item>
-        <item name="android:navigationBarColor">@color/voip_dark_color</item>
-
-        <item name="android:textColorPrimary">@color/dark_primary_text_color</item>
-        <item name="android:textColorSecondary">@color/header_background_color</item>
-        <item name="android:textColorHint">@color/toolbar_color</item>
-        <item name="android:textColorPrimaryInverse">@color/voip_dark_gray</item>
-
-        <item name="accentColor">@color/primary_color</item>
-        <item name="accentColorLight30">@color/primary_light_color</item>
-        <item name="accentTextColor">@color/white_color</item>
-        <item name="primaryTextColor">@color/dark_primary_text_color</item>
-        <item name="secondaryTextColor">@color/voip_dark_gray</item>
-        <item name="primarySubtextDarkColor">@color/header_background_color</item>
-        <item name="primarySubtextLightColor">@color/toolbar_color</item>
-
-        <item name="backgroundColor">@color/voip_dark_color4</item>
-        <item name="backgroundColor2">@color/voip_gray</item>
-        <item name="backgroundColor3">@color/voip_dark_color5</item>
-        <item name="backgroundColor4">@color/voip_dark_color5</item>
-        <item name="backgroundContrastColor">@color/white_color</item>
-        <item name="dividerColor">@color/voip_light_gray</item>
-
-        <item name="drawableTintColor">@color/white_color</item>
-        <item name="drawableBackgroundColor">@color/dark_grey_color</item>
-        <item name="drawableTintDisabledColor">@color/voip_light_gray</item>
-        <item name="drawableTintOverColor">@color/primary_color</item>
-        <item name="drawableTintColor2">@color/voip_dark_gray</item>
-        <item name="drawableTintColor3">@color/voip_gray</item>
-
-        <item name="lightToolbarBackgroundColor">@color/voip_dark_color</item>
-        <item name="lightToolbarTextColor">@color/white_color</item>
-        <item name="darkToolbarBackgroundColor">@color/voip_dark_color4</item>
-        <item name="darkToolbarTextColor">@color/white_color</item>
-
-        <item name="button_background_drawable">@drawable/button_background_dark</item>
-
-        <item name="voipBackgroundColor">@color/voip_dark_color</item>
-        <item name="voipBackgroundBWColor">@color/voip_dark_color</item>
-        <item name="voipParticipantBackgroundColor">@color/voip_dark_color2</item>
-        <item name="voipMeParticipantBackgroundColor">@color/voip_dark_color3</item>
-        <item name="voipExtraButtonsBackgroundColor">@color/voip_dark_color3</item>
-        <item name="voipToolbarBackgroundColor">@color/voip_dark_color4</item>
-        <item name="voipDrawableColor">@color/white_color</item>
-        <item name="voipDrawableColor2">@color/white_color</item>
-        <item name="voipDrawablePressedColor">@color/voip_text_dark_color</item>
-        <item name="voipDrawableDisabledColor">@color/voip_dark_color4</item>
-        <item name="voipTextColor">@color/white_color</item>
-        <item name="voipTextColor2">@color/voip_text_dark_color</item>
-        <item name="voipFormBackgroundColor">@color/voip_dark_color</item>
-        <item name="voipFormFieldBackgroundColor">@color/voip_dark_color5</item>
-        <item name="voipFormDisabledFieldBackgroundColor">@color/voip_dark_color4</item>
-        <item name="voipCancelledMeetingBackgroundColor">@color/voip_conference_cancelled_bg_color_dark</item>
-    </style>
-
-    <style name="AppTheme" parent="BaseAppTheme" />
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
deleted file mode 100644
index a4a628afe..000000000
--- a/app/src/main/res/values-nl/strings.xml
+++ /dev/null
@@ -1,151 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE resources [
-<!ENTITY appName "Linphone">
-]>
-<resources>
-    <string name="service_auto_start_description">&appName; is automatisch gestart</string>
-    <string name="service_description">Dit is vereist om oproepen te ontvangen in de achtergrond</string>
-    <string name="sync_account_name">&appName; contacten</string>
-    <string name="about_privacy_policy">Bekijk onze privacyverklaring</string>
-    <string name="logs_url_copied_to_clipboard">Logs URL gekopieerd naar klembord</string>
-    <string name="phone_number">Telefoonnummer</string>
-    <string name="phone_numbers">Telefoonnummers</string>
-    <string name="select_your_country">Selecteer uw land</string>
-    <string name="international_prefix">Prefix</string>
-    <string name="assistant_choose_country">Kies een land</string>
-    <string name="assistant_choose_country_title">Landscode of prefix</string>
-    <string name="username">Gebruikersnaam</string>
-    <string name="password">Wachtwoord</string>
-    <string name="domain">Domein</string>
-    <string name="sip_address">SIP adres</string>
-    <string name="cancel">Annuleer</string>
-    <plurals name="days">
-        <item quantity="one">%d dag</item>
-        <item quantity="other">%d dagen</item>
-    </plurals>
-    <string name="share_uploaded_logs_link">Link naar logbestand delen met…</string>
-    <string name="today">Vandaag</string>
-    <string name="yesterday">Gisteren</string>
-    <string name="transport">Transport</string>
-    <string name="app_description">de <i>vrije</i> SIP client</string>
-    <string name="status_connected">Verbonden</string>
-    <string name="status_not_connected">Niet verbonden</string>
-    <string name="status_in_progress">Bezig met verbinden</string>
-    <string name="status_error">Verbinding mislukt</string>
-    <string name="no_account_configured">Geen account geconfigureerd</string>
-    <string name="about">Over</string>
-    <string name="assistant">Assistent</string>
-    <string name="recordings">Opnames</string>
-    <string name="settings">Instellingen</string>
-    <string name="quit">Afsluiten</string>
-    <string name="history_calls_list">Oproepen</string>
-    <string name="no_call_history">Geen oproepen in geschiedenis</string>
-    <string name="no_missed_call_history">Geen gemiste oproep in uw geschiedenis</string>
-    <string name="history_delete_one_dialog">Weet u zeker dat u dit record wil verwijderen\?</string>
-    <string name="history_delete_many_dialog">Weet u zeker dat u deze records wil verwijderen\?</string>
-    <string name="contact_invite_friend">Uitnodigen</string>
-    <string name="no_contact">Geen contacten in uw adresboek.</string>
-    <string name="no_sip_contact">Geen SIP contact in uw adresboek.</string>
-    <string name="contact_filter_hint">Contacten zoeken</string>
-    <string name="contact_last_name">Achternaam</string>
-    <string name="contact_first_name">Voornaam</string>
-    <string name="contact_organization">Organisatie</string>
-    <string name="contact_choose_existing_or_new_to_add_number">Selecteer een contactpersoon of maak een nieuwe aan</string>
-    <string name="contact_editor_write_permission_denied">Machtiging schrijven contacten geweigerd, kan deze contactpersoon niet editeren</string>
-    <string name="contact_delete_one_dialog">Wil u deze contactpersoon verwijderen\?\nDeze wordt ook verwijderd uit het adresboek van uw toestel</string>
-    <string name="contact_delete_many_dialog">Weet u zeker dat u deze contactpersonen wil verwijderen\?\nDeze worden ook verwijderd uit het adresboek van uw toestel</string>
-    <string name="contact_new_choose_sync_account">Selecteer waar de contactpersoon moet worden opgeslagen</string>
-    <string name="contact_local_sync_account">Lokaal opslaan</string>
-    <string name="dialer_address_bar_hint">Vul een nummer of adres in</string>
-    <string name="debug_popup_title">Foutopsporing</string>
-    <string name="debug_popup_enable_logs">Logs inschakelen</string>
-    <string name="debug_popup_disable_logs">Logs uitschakelen</string>
-    <string name="debug_popup_send_logs">Logs verzenden</string>
-    <string name="debug_popup_show_config_file">Bekijk configuratiebestand</string>
-    <string name="no_chat_history">Geen conversaties</string>
-    <string name="chat_remote_is_composing">Tegenpartij is aan het schrijven…</string>
-    <string name="chat_event_conference_created">U hebt deelgenomen aan de groep</string>
-    <string name="chat_event_conference_destroyed">U hebt de groep verlaten</string>
-    <string name="chat_event_participant_added">%s heeft deelgenomen</string>
-    <string name="chat_event_participant_removed">%s heeft verlaten</string>
-    <string name="chat_event_device_added">nieuw toestel voor %s</string>
-    <string name="chat_event_device_removed">toestel voor %s verwijderd</string>
-    <string name="chat_event_subject_changed">nieuw onderwerp: %s</string>
-    <string name="chat_event_admin_set">%s is beheerder</string>
-    <string name="chat_event_admin_unset">%s is niet langer beheerder</string>
-    <string name="chat_security_event_participant_max_count_exceeded">Maximaal aantal deelnemers overschreden met %s</string>
-    <string name="chat_message_pick_file_dialog">Selecteer bron</string>
-    <string name="chat_room_group_info_title">Info</string>
-    <string name="chat_room_group_info_participants">Deelnemers</string>
-    <string name="chat_room_group_info_admin">Beheerder</string>
-    <string name="chat_room_group_info_leave">Groep verlaten</string>
-    <string name="chat_room_group_info_leave_dialog_button">Verlaten</string>
-    <string name="chat_room_group_info_leave_dialog_message">Wil u dit gesprek verlaten\?</string>
-    <string name="chat_room_group_info_you_are_now_admin">U bent nu beheerder</string>
-    <string name="chat_room_group_info_you_are_no_longer_admin">U bent niet langer beheerder</string>
-    <string name="chat_message_imdn_info">Afleverstatus</string>
-    <string name="chat_message_imdn_displayed">Gelezen</string>
-    <string name="chat_message_imdn_delivered">Afgeleverd</string>
-    <string name="chat_message_imdn_undelivered">Onafgeleverd</string>
-    <string name="chat_message_imdn_sent">Verstuurd</string>
-    <string name="chat_message_forwarded">Doorgestuurd</string>
-    <string name="chat_message_context_menu_resend">Opnieuw versturen</string>
-    <string name="chat_message_context_menu_copy_text">Kopieer tekst</string>
-    <string name="chat_message_context_menu_add_to_contacts">Toevoegen aan contacten</string>
-    <string name="chat_message_forward_confirmation_dialog">Wil u het bericht in deze chatroom doorsturen\?</string>
-    <string name="chat_room_file_not_found">Bestand niet gevonden</string>
-    <string name="chat_room_ephemeral_message_one_minute">1 minuut</string>
-    <string name="chat_room_ephemeral_message_one_hour">1 uur</string>
-    <string name="chat_room_ephemeral_message_one_day">1 dag</string>
-    <string name="chat_room_ephemeral_message_three_days">3 dagen</string>
-    <string name="chat_room_ephemeral_message_one_week">1 week</string>
-    <plurals name="chat_room_remote_composing">
-        <item quantity="one">%s is aan het schrijven…</item>
-        <item quantity="other">%s zijn aan het schrijven…</item>
-    </plurals>
-    <string name="call_incoming_title">Inkomende oproep</string>
-    <string name="call_outgoing_title">Uitgaande oproep</string>
-    <string name="call_notification_paused">Gepauzeerde oproep</string>
-    <string name="call_notification_outgoing">Uitgaande oproep</string>
-    <string name="call_notification_active">In gesprek</string>
-    <string name="call_error_declined">Oproep werd geweigerd</string>
-    <string name="call_error_user_busy">Gebruiker is bezet</string>
-    <string name="call_error_user_not_found">Gebruiker niet gevonden</string>
-    <string name="call_error_incompatible_media_params">Incompatibele media parameters</string>
-    <string name="call_error_network_unreachable">Netwerk is onbereikbaar</string>
-    <string name="call_error_io_error">Netwerkfout</string>
-    <string name="call_video_update_requested_dialog">Tegenpartij wenst dat u video inschakelt</string>
-    <string name="call_stats_audio">Audio</string>
-    <string name="call_stats_video">Video</string>
-    <string name="content_description_menu_history">Gespreksgeschiedenis</string>
-    <string name="content_description_show_all_calls">Toon alle oproepen</string>
-    <string name="content_description_missed_call">Gemiste oproep</string>
-    <string name="content_description_incoming_call">Inkomende oproep</string>
-    <string name="content_description_outgoing_call">Uitgaande oproep</string>
-    <string name="content_description_security_level_encrypted">Versleuteld</string>
-    <string name="service_name">&appName; Service</string>
-    <string name="transport_tls">TLS</string>
-    <string name="dialer_transfer_succeded">Oproep wordt doorgeschakeld</string>
-    <string name="logs_reset_complete">Logs werden gewist</string>
-    <string name="dialer_transfer_failed">Kan oproep niet doorschakelen</string>
-    <string name="chat_security_event_lime_identity_key_changed">LIME identiteitssleutel gewijzigd voor %s</string>
-    <string name="chat_security_event_man_in_the_middle_detected">Man-in-the-middle aanval gedetecteerd voor %s</string>
-    <string name="transport_tcp">TCP</string>
-    <string name="logs_upload_failure">Uploaden van logs mislukt!</string>
-    <string name="about_weblate_translation">Help ons &appName; vertalen</string>
-    <string name="no_conference_call_history">Geen vergaderoproep in jouw historiek</string>
-    <string name="contact_cant_be_deleted">Deze contact kan niet verwijderd worden</string>
-    <string name="contacts_ldap_query_more_results_available">Meer resultaten zijn beschikbaar, verfijn jouw zoekopdracht</string>
-    <string name="chat_security_event_security_level_downgraded">Beveiligingsniveau verminderd door %s</string>
-    <string name="sip_addresses">SIP adressen</string>
-    <string name="email">E-mail</string>
-    <string name="transport_udp">UDP</string>
-    <string name="contact_send_sms_invite_text">Hallo, doe mee met &appName;! Je kan gratis downloaden op %s</string>
-    <string name="assistant_create_account">Account aanmaken</string>
-    <string name="chat_message_replied">Antwoord</string>
-    <string name="chat_message_context_menu_forward">Doorsturen</string>
-    <string name="chat_message_context_menu_delete">Verwijderen</string>
-    <string name="chat_room_last_message_sender_format">%s:</string>
-    <string name="chat_message_download_file">Downloaden</string>
-    <string name="assistant_display_name_optional">Gebruikersnaam (optioneel)</string>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
deleted file mode 100644
index 4d63dc0ca..000000000
--- a/app/src/main/res/values-pl/strings.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:tools="http://schemas.android.com/tools">
-    <string name="dialog_decline">Odrzuć</string>
-    <string name="dialog_cancel">Anuluj</string>
-    <string name="dialog_delete">Usuń</string>
-    <string name="dialog_ok">OK</string>
-    <string name="missed_call_notification_title">Nieodebrane połączenie</string>
-    <string name="missed_call_notification_body">Nieodebrane połączenie od %s</string>
-    <string name="missed_calls_notification_body" tools:ignore="PluralsCandidate">%d nieodebranych połączeń</string>
-    <string name="dialog_do_not_ask_again">Nie pokazuj ponownie</string>
-    <string name="dialog_accept">Akceptuj</string>
-</resources>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
deleted file mode 100644
index 1494bfbf2..000000000
--- a/app/src/main/res/values-pt/strings.xml
+++ /dev/null
@@ -1,588 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE resources [
-<!ENTITY appName "Linphone">
-]>
-<resources xmlns:tools="http://schemas.android.com/tools">
-    <string name="service_description">Isso é necessário para receber chamadas em segundo plano</string>
-    <string name="sync_account_name">contactos</string>
-    <string name="about_privacy_policy">Visite a nossa política de privacidade</string>
-    <string name="logs_upload_failure">Falhado para carregar logs!</string>
-    <string name="logs_reset_complete">Os registros foram limpos</string>
-    <string name="phone_number">Número de telefone</string>
-    <string name="phone_numbers">Números de telefone</string>
-    <string name="select_your_country">Selecione seu país</string>
-    <string name="international_prefix">Prefixação</string>
-    <string name="assistant_choose_country">Escolha um país</string>
-    <string name="assistant_choose_country_title">Nome ou prefixo do país</string>
-    <string name="username">Nome do usuário</string>
-    <string name="password">Senha</string>
-    <string name="email">E-mail</string>
-    <string name="domain">Domínio</string>
-    <string name="sip_address">Endereço SIP</string>
-    <string name="cancel">Cancelar</string>
-    <plurals name="days">
-        <item quantity="one">%d dia</item>
-        <item quantity="other">%d dias</item>
-    </plurals>
-    <string name="share_uploaded_logs_link">Compartilhe logs link usando…</string>
-    <string name="today">Hoje</string>
-    <string name="yesterday">Ontem</string>
-    <string name="transport">Transportes</string>
-    <string name="transport_udp">UDP</string>
-    <string name="transport_tcp">TCP</string>
-    <string name="transport_tls">TLS</string>
-    <string name="app_description">o <i>libre</i> Cliente SIP</string>
-    <string name="status_connected">Conectado</string>
-    <string name="status_not_connected">Não conectado</string>
-    <string name="status_in_progress">Conexão em andamento</string>
-    <string name="no_account_configured">Nenhuma conta configurada</string>
-    <string name="about">Sobre</string>
-    <string name="assistant">Assistente</string>
-    <string name="settings">Configurações</string>
-    <string name="history_calls_list">Chamadas</string>
-    <string name="no_missed_call_history">Nenhuma chamada perdida em sua história</string>
-    <string name="history_delete_one_dialog">Você quer excluir este registro\?</string>
-    <string name="history_delete_many_dialog">Você quer excluir esses registros\?</string>
-    <string name="quit">Pára</string>
-    <string name="no_contact">Não há contato no seu livro de endereços.</string>
-    <string name="contact_filter_hint">Pesquisar contatos</string>
-    <string name="contact_send_sms_invite_text">Olá, junte-se a mim no &appName;! Você pode baixá-lo gratuitamente em %s</string>
-    <string name="contact_last_name">Último nome</string>
-    <string name="contact_first_name">Primeiro nome</string>
-    <string name="contact_organization">Organização</string>
-    <string name="contact_editor_write_permission_denied">Escreva a permissão de Contatos negada, não pode editar contato</string>
-    <string name="contact_delete_many_dialog">Tem certeza de que deseja excluir esses contatos\?\nEles também serão removidos do seu livro de endereços do dispositivo</string>
-    <string name="contact_new_choose_sync_account">Escolha onde salvar o contato</string>
-    <string name="contact_local_sync_account">Armazenar localmente</string>
-    <string name="dialer_address_bar_hint">Digite um número ou um endereço</string>
-    <string name="debug_popup_title">Depurar</string>
-    <string name="debug_popup_enable_logs">Ativar logs</string>
-    <string name="debug_popup_disable_logs">Desativar logs</string>
-    <string name="debug_popup_send_logs">Enviar logs</string>
-    <string name="debug_popup_show_config_file">Ver arquivo de configuração</string>
-    <string name="no_chat_history">Sem conversas</string>
-    <string name="chat_remote_is_composing">Remoto está escrevendo…</string>
-    <string name="chat_event_conference_created">Você se juntou ao grupo</string>
-    <string name="chat_event_participant_added">%s aderiram</string>
-    <string name="chat_event_participant_removed">%s deixou</string>
-    <string name="chat_event_device_added">novo dispositivo para %s</string>
-    <string name="chat_event_device_removed">dispositivo para %s removido</string>
-    <string name="chat_event_subject_changed">novo assunto: %s</string>
-    <string name="chat_event_admin_set">%s é admin</string>
-    <string name="chat_event_admin_unset">%s não é mais administrador</string>
-    <string name="chat_security_event_man_in_the_middle_detected">Ataque de homem no meio detectado por %s</string>
-    <string name="chat_security_event_security_level_downgraded">Nível de segurança diminuiu devido a %s</string>
-    <string name="chat_security_event_participant_max_count_exceeded">Contagem de participante máxima excedida por %s</string>
-    <string name="chat_event_ephemeral_disabled">Desativar mensagens efémeros</string>
-    <string name="chat_event_ephemeral_lifetime_changed">As mensagens efêmeras expiram data: %s</string>
-    <string name="chat_message_download_file">Baixar</string>
-    <string name="chat_message_pick_file_dialog">Selecione a fonte</string>
-    <string name="chat_room_devices_fragment_title">Dispositivos de conversação</string>
-    <string name="chat_room_group_info_title">Informações</string>
-    <string name="chat_room_group_info_participants">Participantes</string>
-    <string name="chat_room_group_info_subject_hint">Nomeie o grupo</string>
-    <string name="chat_room_group_info_admin">Admin</string>
-    <string name="chat_room_group_info_leave">Deixe o grupo</string>
-    <string name="chat_room_group_info_leave_dialog_button">Deixa-me ir</string>
-    <string name="chat_room_group_info_you_are_now_admin">Agora é admin</string>
-    <string name="chat_room_group_info_you_are_no_longer_admin">Você não é mais admin</string>
-    <string name="chat_message_imdn_info">Estado de entrega</string>
-    <string name="chat_message_imdn_displayed">Ler</string>
-    <string name="chat_message_imdn_delivered">Entregado</string>
-    <string name="chat_message_imdn_undelivered">Não entregue</string>
-    <string name="chat_message_imdn_sent">Enviado</string>
-    <string name="chat_message_forwarded">Encaminhado</string>
-    <string name="chat_message_replied">Resposta</string>
-    <string name="chat_message_context_menu_resend">Reenviar</string>
-    <string name="chat_message_context_menu_copy_text">Copiar texto</string>
-    <string name="chat_message_context_menu_forward">Avançar</string>
-    <string name="chat_message_context_menu_reply">Resposta</string>
-    <string name="chat_message_context_menu_delete">Excluir</string>
-    <string name="chat_message_forward_confirmation_dialog">Você quer transmitir a mensagem nesta sala\?</string>
-    <string name="chat_room_choose_conversation_for_file_sharing">Seleccionar ou criar uma conversa para partilhar o(s) ficheiro(s)</string>
-    <string name="chat_room_choose_conversation_for_text_sharing">Seleccionar ou criar uma conversa para partilhar o texto</string>
-    <string name="chat_room_file_not_found">Arquivo não encontrado</string>
-    <string name="chat_room_context_menu_group_info">Informações do grupo</string>
-    <string name="chat_message_context_menu_ephemeral_messages">Mensagens efêmeras</string>
-    <string name="chat_message_context_menu_delete_messages">Excluir mensagens</string>
-    <string name="chat_room_ephemeral_fragment_title">Mensagens efêmeras</string>
-    <string name="chat_room_ephemeral_message_disabled">Deficientes</string>
-    <string name="chat_room_ephemeral_message_one_minute">1 minuto</string>
-    <string name="chat_room_ephemeral_message_one_hour">1 hora</string>
-    <string name="chat_room_ephemeral_message_one_day">1 dia</string>
-    <string name="chat_room_ephemeral_message_three_days">3 dias</string>
-    <string name="chat_room_ephemeral_message_one_week">1 semana</string>
-    <plurals name="chat_room_remote_composing">
-        <item quantity="one">%s está escrevendo…</item>
-        <item quantity="other">%s estão escrevendo…</item>
-    </plurals>
-    <string name="chat_room_creation_failed_snack">A criação da sala de chat falhou</string>
-    <string name="chat_room_removal_failed_snack">A remoção da sala de chat falhou</string>
-    <string name="chat_room_delete_one_dialog">Tens a certeza que queres apagar esta conversa\?</string>
-    <string name="chat_room_delete_many_dialog">Tens a certeza que queres apagar estas conversas\?</string>
-    <string name="chat_message_notification_hidden_content">&lt;Rasurado&gt;</string>
-    <string name="chat_bubble_cant_open_enrypted_file">Não é possível abrir ficheiro encriptado na bolha do chat</string>
-    <string name="chat_message_cant_open_file_in_app_dialog_title">Parece que não podemos exibir o arquivo.</string>
-    <string name="chat_message_cant_open_file_in_app_dialog_open_as_text_button">Abrir como texto</string>
-    <string name="chat_room_sending_reply_hint">Responde</string>
-    <string name="chat_room_sending_message_hint">Mensagem</string>
-    <string name="chat_message_voice_recording_playback_low_volume">Seu volume de mídia é baixo, você pode querer aumentá-lo</string>
-    <plurals name="chat_room_unread_messages_event">
-        <item quantity="one">%1$d mensagem não lida</item>
-        <item quantity="other">%1$d mensagem não lidas</item>
-    </plurals>
-    <string name="chat_message_removal_info">A mensagem será excluída</string>
-    <string name="chat_message_abort_removal">Abortar</string>
-    <string name="recordings_empty_list">Sem gravações</string>
-    <string name="call_incoming_title">Chamada recebida</string>
-    <string name="call_outgoing_title">Chamada de saída</string>
-    <string name="call_notification_paused">Chamada pausada</string>
-    <string name="call_notification_outgoing">Chamada de saída</string>
-    <string name="call_notification_active">Chamada em curso</string>
-    <string name="call_error_declined">A chamada foi recusada</string>
-    <string name="call_error_user_busy">O usuário está ocupado</string>
-    <string name="call_error_user_not_found">O usuário não foi encontrado</string>
-    <string name="call_error_network_unreachable">A rede é inacessível</string>
-    <string name="call_error_io_error">Serviço indisponível ou erro de rede</string>
-    <string name="call_error_server_timeout">Tempo limite do servidor</string>
-    <string name="call_error_temporarily_unavailable">Temporariamente indisponível</string>
-    <string name="call_error_generic">Erro: %s</string>
-    <string name="call_stats_audio">Áudio</string>
-    <string name="call_stats_video">Vídeo</string>
-    <string name="call_stats_codec">Codec:</string>
-    <string name="call_stats_ip">Família IP:</string>
-    <string name="call_stats_upload">Largura de banda de upload:</string>
-    <string name="call_stats_estimated_download">Largura de banda de download estimada:</string>
-    <string name="call_stats_ice">ICE conectividade:</string>
-    <string name="call_stats_video_resolution_received">Resolução de vídeo recebida:</string>
-    <string name="call_stats_video_fps_sent">fps vídeo enviados:</string>
-    <string name="call_stats_video_fps_received">Recebido vídeo fps:</string>
-    <string name="call_stats_sender_loss_rate">Taxa de perda do remetente:</string>
-    <string name="call_stats_receiver_loss_rate">Taxa de perda de receptor:</string>
-    <string name="call_stats_jitter_buffer">buffer de jitter:</string>
-    <string name="call_stats_encoder_name">Codificador:</string>
-    <string name="call_stats_decoder_name">Decodificador:</string>
-    <string name="call_stats_player_filter">Filtro do tocador:</string>
-    <string name="call_stats_capture_filter">Filtro de captura:</string>
-    <string name="assistant_welcome_title">Bem-vindo</string>
-    <string name="assistant_welcome_desc">Este assistente irá ajudá-lo a configurar e usar a sua conta SIP.</string>
-    <string name="assistant_create_account">Criar conta</string>
-    <string name="assistant_login_linphone">Usar &appName; conta</string>
-    <string name="assistant_login_generic">Usar conta SIP</string>
-    <string name="assistant_ec_calibration">Calibração do cancelador de eco em progresso</string>
-    <string name="assistant_phone_number_info_title">Para que será utilizado o meu número de telefone\?</string>
-    <string name="assistant_phone_number_link_info_content_already_account">Você só pode usar seu número de telefone com um &appName; conta.\n\nSe você já tiver ligado seu número a uma outra conta, mas você preferir usar esta, basta ligar agora e seu número será automaticamente movido para esta conta.</string>
-    <string name="assistant_general_terms">termos de uso</string>
-    <string name="assistant_privacy_policy">política de privacidade</string>
-    <string name="assistant_read_and_agree_terms">Eu aceito Belledonne Communications\' %1$s e %2$s</string>
-    <string name="assistant_error_phone_number_invalid_characters">Apenas os dígitos são esperados aqui</string>
-    <string name="assistant_error_username_already_exists">Nome de usuário já em uso</string>
-    <string name="assistant_error_phone_number_already_exists">Já existe uma conta usando este número</string>
-    <string name="assistant_error_username_invalid_characters">Caracteres inválidos encontrados</string>
-    <string name="assistant_error_passwords_dont_match">As senhas não coincidem</string>
-    <string name="assistant_error_username_too_long">O nome de usuário tem muitos caracteres</string>
-    <string name="assistant_linphone_account">Usar a sua &appName; conta</string>
-    <string name="assistant_create_account_part_1">Por favor, confirme seu código de país e insira seu número de telefone</string>
-    <string name="assistant_linphone_login_desc">Por favor, digite seu nome de usuário e senha do &appName; conta</string>
-    <string name="assistant_login_forgotten_password">Esqueceu sua senha\?</string>
-    <string name="assistant_login">Login</string>
-    <string name="assistant_finish">Concluir configuração</string>
-    <string name="assistant_confirmation_code">Código de confirmação</string>
-    <string name="assistant_continue_even_if_credentials_invalid">Continuar</string>
-    <string name="assistant_generic_account">Usar conta SIP</string>
-    <string name="assistant_login_desc">Digite seu nome de usuário e senha com seu domínio SIP</string>
-    <string name="assistant_display_name_optional">Nome de exibição (opcional)</string>
-    <string name="assistant_validate_account_2">Feito isso, volte aqui e clique no botão.</string>
-    <string name="assistant_use_username_instead_or_phone_number">Use um nome de usuário (opcional)</string>
-    <string name="assistant_create_account_part_2">Enviamos um SMS com um código de validação para o seu número de telefone:</string>
-    <string name="assistant_link_phone_number">Você irá ligar com seu número de telefone o seguinte nome de usuário:</string>
-    <string name="assistant_link_phone_number_skip">Saltar</string>
-    <string name="assistant_link_account">Ligar a conta</string>
-    <string name="assistant_remote_provisioning_title">Buscar configuração remota</string>
-    <string name="assistant_remote_provisioning_desc">Por favor, forneça sua URL de configuração</string>
-    <string name="assistant_remote_provisioning_url">URL</string>
-    <string name="assistant_remote_provisioning_wrong_format">Formato URL desconhecido, não pode baixar o provisionamento…</string>
-    <string name="assistant_fetch_apply">Buscar e aplicar</string>
-    <string name="assistant_launch_qrcode">Código QR</string>
-    <string name="settings_accounts_title">Contas SIP</string>
-    <string name="settings_default_account_subtitle">Conta padrão</string>
-    <string name="settings_list_title">Preferências</string>
-    <string name="settings_tunnel_title">Túnel</string>
-    <string name="settings_audio_title">Áudio</string>
-    <string name="settings_video_title">Vídeo</string>
-    <string name="settings_call_title">Chamada</string>
-    <string name="settings_chat_title">Chat</string>
-    <string name="settings_network_title">Rede</string>
-    <string name="settings_contacts_title">Contactos</string>
-    <string name="settings_advanced_title">Avançado</string>
-    <string name="settings_primary_account_title">Conta principal</string>
-    <string name="settings_primary_account_display_name_title">Nome de exibição</string>
-    <string name="settings_primary_account_username_title">Nome de utilizador</string>
-    <string name="audio_settings_echo_cancellation_summary">Remove o eco ouvido pelo outro lado</string>
-    <string name="audio_settings_echo_canceller_calibration_summary">Clique para iniciar a calibração do cancelador de eco</string>
-    <string name="audio_settings_echo_cancellation_calibration_value">Calibrado em %s ms</string>
-    <string name="audio_settings_echo_cancellation_calibration_no_echo">Nenhum eco detectado</string>
-    <string name="audio_settings_echo_tester_title">Teste de eco</string>
-    <string name="audio_settings_echo_tester_summary">Clique para iniciar o teste de eco</string>
-    <string name="audio_settings_echo_tester_summary_is_stopped">Testador de eco é parado</string>
-    <string name="audio_settings_echo_tester_summary_is_running">O testador de eco está em execução</string>
-    <string name="audio_settings_adaptive_rate_control_title">Controle de taxa adaptativa</string>
-    <string name="audio_settings_input_device_summary">As alterações entrarão em vigor a partir da próxima chamada</string>
-    <string name="audio_settings_output_device_title">Dispositivo de áudio de saída padrão</string>
-    <string name="audio_settings_prefer_bluetooth_devices_title">Enviar áudio para o dispositivo bluetooth, se houver</string>
-    <string name="audio_settings_codec_bitrate_title">Limite de taxa de bits do codec</string>
-    <string name="audio_settings_microphone_gain_title">Ganho de microfone</string>
-    <string name="audio_settings_microphone_gain_summary">(em decibéis)</string>
-    <string name="audio_settings_playback_gain_title">Ganho de reprodução</string>
-    <string name="audio_settings_playback_gain_summary">(em decibéis)</string>
-    <string name="audio_settings_codecs_title">Codecs</string>
-    <string name="video_settings_enable_title">Ativar vídeo</string>
-    <string name="video_settings_initiate_call_title">Iniciar chamadas de vídeo</string>
-    <string name="video_settings_initiate_call_summary">Sempre envie pedidos de vídeo</string>
-    <string name="video_settings_automatically_accept_title">Aceitar solicitações de vídeo recebidas</string>
-    <string name="video_settings_automatically_accept_summary">Sempre aceite pedidos de vídeo</string>
-    <string name="video_settings_camera_device_title">Câmara</string>
-    <string name="video_settings_video_size_title">Tamanho de vídeo preferido</string>
-    <string name="video_settings_video_preset_title">Predefinição de vídeo</string>
-    <string name="video_settings_preferred_fps_title">FPS preferido</string>
-    <string name="video_settings_bandwidth_limit_title">Limite de largura de banda</string>
-    <string name="video_settings_bandwidth_limit_summary">em kbits/s</string>
-    <string name="video_settings_codecs_title">Codecs</string>
-    <string name="call_settings_ringtones_title">Toque de chamada</string>
-    <string name="call_settings_encryption_title">Criptografia de mídia</string>
-    <string name="call_settings_media_encryption_none">Nenhuma</string>
-    <string name="call_settings_media_encryption_srtp">SRTP</string>
-    <string name="call_settings_media_encryption_zrtp">ZRTP</string>
-    <string name="call_settings_media_encryption_dtls">DTLS-SRTP</string>
-    <string name="call_settings_use_telecom_manager_title">Melhore as interações com dispositivos bluetooth</string>
-    <string name="call_settings_use_telecom_manager_summary">Requer algumas permissões extras</string>
-    <string name="call_settings_system_wide_overlay_title">Mostrar sobreposição fora do aplicativo</string>
-    <string name="call_settings_system_wide_overlay_summary">Você será solicitado a conceder permissão de sobreposição</string>
-    <string name="call_settings_sipinfo_dtmf_title">Enviar DTMFs de banda (SIP INFO)</string>
-    <string name="call_settings_rfc2833_dtmf_title">Enviar DTMFs em banda (RFC 2833)</string>
-    <string name="call_settings_auto_start_summary">A chamada será iniciada automaticamente se iniciada a partir de outro aplicativo</string>
-    <string name="call_settings_auto_answer_title">Atendimento automático de chamadas recebidas</string>
-    <string name="call_settings_auto_answer_delay_summary">em milissegundos</string>
-    <string name="call_settings_incoming_timeout_title">Tempo limite de chamada recebida</string>
-    <string name="call_settings_incoming_timeout_summary">em segundos</string>
-    <string name="call_settings_voice_mail_uri_title">Correio de voz URI</string>
-    <string name="call_settings_accept_early_media_title">Aceitar mídia precoce</string>
-    <string name="call_settings_ring_during_early_media_title">Toque durante a entrada de mídia inicial</string>
-    <string name="call_settings_pause_calls_lost_audio_focus_title">Pausar chamadas quando o foco do áudio é perdido</string>
-    <string name="call_settings_go_to_android_notification_settings">Configurações de notificação Android</string>
-    <string name="call_settings_auto_start_recording_title">Iniciar automaticamente a gravação de chamadas</string>
-    <string name="chat_settings_file_sharing_url_title">Partilha de URL de servidor</string>
-    <string name="chat_settings_file_sharing_url_summary">Não edite a menos que você saiba o que está fazendo!</string>
-    <string name="chat_settings_auto_download_always">Sempre</string>
-    <string name="chat_settings_auto_download_never">Nunca</string>
-    <string name="chat_settings_auto_download_under_size">Se for mais leve do que o tamanho máximo indicado</string>
-    <string name="chat_settings_auto_download_max_size_title">Tamanho máximo</string>
-    <string name="chat_settings_auto_download_max_size_summary">em bytes</string>
-    <string name="chat_settings_downloaded_media_public_title">Faça público a mídia baixado</string>
-    <string name="chat_settings_downloaded_media_public_summary">Arquivos em mensagens efémeras não serão, não funciona com recurso de download automático</string>
-    <string name="chat_settings_hide_notification_content_title">Ocultar conteúdo de mensagem em notificações</string>
-    <string name="chat_settings_hide_notification_content_summary">Apenas o nome do remetente será exibido</string>
-    <string name="chat_settings_launcher_shortcuts_summary">Será substituído por atalhos de contatos se ativado</string>
-    <string name="chat_settings_hide_empty_rooms_title">Ocultar salas de chat vazias</string>
-    <string name="chat_settings_hide_rooms_removed_proxies_title">Ocultar salas de chat de configurações proxy removidas</string>
-    <string name="chat_settings_go_to_android_notification_settings">Configurações de notificação Android</string>
-    <string name="chat_settings_use_in_app_file_viewer_title">Sempre abra arquivos dentro deste aplicativo</string>
-    <string name="chat_settings_use_in_app_file_viewer_summary">Você ainda poderá exportá-los em aplicativos de terceiros</string>
-    <string name="chat_settings_auto_download_voice_recordings">Descarregar automaticamente as gravações de voz recebidas</string>
-    <string name="network_settings_wifi_only_title">Usar apenas WiFi</string>
-    <string name="network_settings_allow_ipv6_title">Permitir IPv6</string>
-    <string name="network_settings_random_ports_title">Usar portas aleatórias</string>
-    <string name="network_settings_sip_port_title">Porta SIP para usar</string>
-    <string name="contacts_settings_friendlist_subscribe_title">Porta SIP para usar</string>
-    <string name="contacts_settings_native_presence_title">Informações de presença no contato nativo</string>
-    <string name="contacts_settings_show_organization_title">Exibir organização de contato</string>
-    <string name="contacts_settings_launcher_shortcuts_title">Criar atalhos para contactos no lançador</string>
-    <string name="contacts_settings_launcher_shortcuts_summary">Substituirá atalhos de sala de chat se houver</string>
-    <string name="contacts_settings_show_new_contact_account_dialog_title">Pergunte sempre em que conta guardar o contacto recém-criado</string>
-    <string name="advanced_settings_debug_mode_title">Registos de depuração</string>
-    <string name="advanced_settings_background_mode_title">Modo de fundo</string>
-    <string name="advanced_settings_background_mode_summary">Mostra uma notificação para manter o aplicativo vivo</string>
-    <string name="advanced_settings_auto_start_title">Iniciar no momento da inicialização</string>
-    <string name="advanced_settings_dark_mode_title">Tema escuro</string>
-    <string name="advanced_settings_dark_mode_label_auto">Automática</string>
-    <string name="advanced_settings_dark_mode_label_no">Não</string>
-    <string name="advanced_settings_dark_mode_label_yes">Sim</string>
-    <string name="advanced_settings_animations_title">Animações</string>
-    <string name="advanced_settings_device_name_title">Nome do dispositivo</string>
-    <string name="advanced_settings_device_name_summary">As alterações serão aplicadas no próximo início</string>
-    <string name="advanced_settings_logs_server_url_title">URL do servidor de upload de registros</string>
-    <string name="advanced_settings_logs_server_url_summary">Não edite a menos que você saiba o que está fazendo!</string>
-    <string name="advanced_settings_android_title">Android</string>
-    <string name="advanced_settings_go_to_battery_optimization_settings">Configurações de otimização da bateria</string>
-    <string name="advanced_settings_go_to_android_app_settings">Configurações do aplicativo Android</string>
-    <string name="advanced_settings_vfs_title">Criptografar tudo</string>
-    <string name="advanced_settings_vfs_summary">Uma vez ativado, não pode ser desativado!</string>
-    <string name="advanced_settings_send_debug_logs_title">Enviar registros</string>
-    <string name="advanced_settings_reset_debug_logs_title">Redefinir registros</string>
-    <string name="advanced_settings_debug_title">Configurações de depuração</string>
-    <string name="advanced_settings_other_title">Outras definições</string>
-    <string name="advanced_settings_disable_fragment_security_summary">Permitir a captura/gravação de ecrã em vistas sensíveis</string>
-    <string name="tunnel_settings_hostname_url_title">Nome do anfitrião</string>
-    <string name="tunnel_settings_port_title">Porto</string>
-    <string name="tunnel_settings_dual_mode_title">Modo duplo habilitado</string>
-    <string name="tunnel_settings_dual_hostname_url_title">Nome do segundo servidor anfitriã</string>
-    <string name="tunnel_settings_dual_hostname_url_summary">Necessário no modo duplo</string>
-    <string name="tunnel_settings_dual_port_title">Porto do segundo servidor</string>
-    <string name="tunnel_settings_dual_port_summary">Necessário no modo duplo</string>
-    <string name="tunnel_settings_disabled_mode">Deficiente</string>
-    <string name="tunnel_settings_always_mode">Sempre</string>
-    <string name="tunnel_settings_auto_mode">Automático</string>
-    <string name="account_settings_user_name_title">Nome de utilizador</string>
-    <string name="account_settings_user_id_title">ID de autenticação</string>
-    <string name="service_name">Serviço</string>
-    <string name="service_auto_start_description">foi iniciado automaticamente</string>
-    <string name="logs_url_copied_to_clipboard">Logs URL copiado para prancheta</string>
-    <string name="sip_addresses">Endereços SIP</string>
-    <string name="status_error">A conexão falhou</string>
-    <string name="recordings">Gravações</string>
-    <string name="no_call_history">Sem chamada na sua história</string>
-    <string name="contact_invite_friend">Convidar</string>
-    <string name="no_sip_contact">Nenhum contato SIP no seu livro de endereços.</string>
-    <string name="contact_choose_existing_or_new_to_add_number">Selecione um contato ou crie um novo</string>
-    <string name="contact_delete_one_dialog">Você quer excluir este contato\?\nEle também será removido do seu livro de endereços do dispositivo</string>
-    <string name="chat_event_conference_destroyed">Você deixou o grupo</string>
-    <string name="chat_security_event_lime_identity_key_changed">Chave de identidade LIME alterada para %s</string>
-    <string name="chat_event_ephemeral_enabled">Você ativou mensagens efêmeras: %s</string>
-    <string name="chat_room_group_info_leave_dialog_message">Queres deixar esta conversa\?</string>
-    <string name="chat_message_context_menu_imdn_info">Estado da entrega</string>
-    <string name="chat_message_context_menu_add_to_contacts">Adicionar aos contatos</string>
-    <string name="chat_room_choose_conversation_for_message_forward">Selecione ou crie uma conversa para encaminhar a mensagem</string>
-    <string name="chat_room_context_menu_participants_devices">Dispositivos de conversação</string>
-    <string name="chat_room_ephemeral_messages_desc">Esta mensagem será excluída em ambas as extremidades uma vez que tenha sido lida e após o tempo limite selecionado.</string>
-    <string name="chat_message_no_app_found_to_handle_file_mime_type">Nenhum aplicativo disponível para este tipo de arquivo</string>
-    <string name="chat_message_cant_open_file_in_app_dialog_message">Você gostaria de abri-lo como texto ou exportá-lo (não criptografado) para um aplicativo de terceiros, se disponível\?</string>
-    <string name="chat_message_cant_open_file_in_app_dialog_export_button">Exportação</string>
-    <string name="chat_message_voice_recording_hold_to_record">Segure o botão para gravar a mensagem de voz</string>
-    <string name="call_error_incompatible_media_params">Parâmetros de mídia incompatíveis</string>
-    <string name="call_video_update_requested_dialog">O correspondente deseja ativar o vídeo</string>
-    <string name="call_stats_download">Baixar largura de banda:</string>
-    <string name="call_stats_video_resolution_sent">Resolução de vídeo enviada:</string>
-    <string name="assistant_remote_provisioning">Buscar configuração remota</string>
-    <string name="assistant_phone_number_link_info_content">\nSeus amigos irão encontrá-lo mais facilmente se você ligar sua conta ao seu número de telefone\n\nVocê verá em seu livro de endereços que está usando &appName; e seus amigos saberão que eles podem alcançá-lo em &appName;
-        bem.\n</string>
-    <string name="assistant_error_invalid_email_address">O endereço de e-mail é inválido</string>
-    <string name="assistant_error_invalid_credentials">A conta não existe ou a senha não corresponde</string>
-    <string name="assistant_login_with_username">Use seu nome de usuário e senha em vez de seu número de telefone</string>
-    <string name="assistant_create_account_part_email">Por favor, digite um nome de usuário, e-mail e senha para o seu &appName; conta</string>
-    <string name="assistant_confirm_password">Confirmação de senha</string>
-    <string name="assistant_validate_account_1">Sua conta está criada. Por favor, verifique seus e-mails para validar sua conta:</string>
-    <string name="assistant_create_account_part_3">Para concluir a verificação do número de telefone, digite o código de 4 dígitos abaixo:\n</string>
-    <string name="assistant_remote_provisioning_failure">Falhado para baixar ou aplicar perfil de provisionamento remoto…</string>
-    <string name="audio_settings_echo_canceller_calibration_title">Calibração de canceladores de eco</string>
-    <string name="audio_settings_echo_cancellation_calibration_started">A calibração do cancelador de eco começou</string>
-    <string name="audio_settings_echo_cancellation_calibration_failed">A calibração falhou</string>
-    <string name="audio_settings_input_device_title">Dispositivo de áudio de entrada padrão</string>
-    <string name="audio_settings_output_device_summary">As alterações entrarão em vigor a partir da próxima chamada</string>
-    <string name="video_settings_tablet_preview_title">Exibir visualização da câmera no discador</string>
-    <string name="call_settings_device_ringtone_title">Use o toque do dispositivo</string>
-    <string name="call_settings_vibrate_title">Vibrar enquanto a chamada está tocando</string>
-    <string name="call_settings_encryption_mandatory_title">Criptografia de mídia obrigatória</string>
-    <string name="call_settings_overlay_title">Notificação de chamada de sobreposição</string>
-    <string name="call_settings_auto_start_title">Iniciar chamada imediatamente</string>
-    <string name="call_settings_auto_answer_delay_title">Tempo de resposta automática</string>
-    <string name="call_settings_redirect_to_voice_mail_declined_calls_title">Redirecionar chamadas recusadas para o URI do correio de voz</string>
-    <string name="chat_settings_mark_as_read_notif_dismissal_title">Marcar como lido após notificação demissão</string>
-    <string name="chat_settings_auto_download_title">Política de ficheiros recebidos descarregados automaticamente</string>
-    <string name="chat_settings_auto_download_summary">Se deve baixar arquivos anexados em mensagens de chat recebidas automaticamente ou não</string>
-    <string name="chat_settings_launcher_shortcuts_title">Criar atalhos para salas de chat no lançador</string>
-    <string name="chat_settings_hide_rooms_removed_proxies_summary">Se você está faltando salas de chat, tente desmarcar esta configuração</string>
-    <string name="contacts_settings_native_presence_summary">Inserindo atalhos de informação do &appName; contacto em contactos nativos Android</string>
-    <string name="contacts_settings_show_new_contact_account_dialog_summary">Se o contacto com deficientes for armazenado localmente</string>
-    <string name="advanced_settings_remote_provisioning_url_title">URL de provisionamento remoto</string>
-    <string name="advanced_settings_go_to_power_manager_settings">Configurações do gerenciador de energia</string>
-    <string name="advanced_settings_disable_fragment_security_title">Desabilitar o modo seguro da UI</string>
-    <string name="tunnel_settings_dual_mode_summary">Utilizar um servidor para carregar e outro para baixar</string>
-    <string name="tunnel_settings_mode_title">Modo</string>
-    <string name="account_settings_user_name_summary">Exemplo: joao se sua conta for joao@sip.example.org</string>
-    <string name="account_settings_user_id_summary">Digite ID de autenticação se diferente do nome de usuário (opcional)</string>
-
-    <string name="notification_channel_incoming_call_name">&appName; notificações de chamadas recebidas</string>
-    <string name="dialog_lime_security_message">As mensagens instantâneas são criptografadas de ponta a ponta em conversas seguras. É possível atualizar o nível de segurança de uma conversa autenticando os participantes. Para isso, ligue para o contato e siga o processo de autenticação.</string>
-    <string name="content_description_add_phone_number_field">Adicionar um campo de número de telefone</string>
-    <string name="content_description_pause_call">Pausar a chamada</string>
-    <string name="content_description_toggle_recording">Habilitar ou desabilitar a gravação da chamada</string>
-    <string name="content_description_disable_speaker">Rotear áudio para o fone de ouvido</string>
-    <string name="account_settings_password_title">Senha</string>
-    <string name="account_settings_password_summary">Você deve redigitar sua senha se editar seu nome de usuário e/ou o domínio</string>
-    <string name="about_weblate_translation">Ajude-nos a traduzir Linphone</string>
-    <string name="assistant_generic_account_warning">Alguns recursos exigem um &appName; conta, como mensagens de grupo ou mensagens efêmeras.\n\nEsses recursos estão ocultos quando você se registra com uma conta SIP de terceiros.\n\nPara habilitar em um projeto comercial, entre em contato conosco.</string>
-    <string name="account_settings_domain_summary">Exemplo: sip.example.org se sua conta é joao@sip.example.org</string>
-    <string name="account_settings_outbound_proxy_summary">Encaminhe todas as chamadas através do proxy SIP acima</string>
-    <string name="account_settings_apply_prefix_for_calls_summary">Se um número for inserido, aplique o prefixo ao número</string>
-    <string name="notification_channel_service_name">&appName; notificação de serviço</string>
-    <string name="content_description_show_numpad">Mostrar ou ocultar os dígitos para enviar DTMFs</string>
-    <string name="content_description_use_earpiece">Use o fone de ouvido como saída de áudio</string>
-    <string name="content_description_pending_file_transfer">Transferência de ficheiros pendente</string>
-    <string name="content_description_forward_message">Encaminhar mensagem nesta conversa</string>
-    <string name="content_description_e2e_encryption_enabled">Encriptação de ponta a ponta activada</string>
-    <string name="content_description_enter_edition_mode">Entre no modo de edição</string>
-    <string name="content_description_toggle_participant_devices_list">Mostrar ou esconder os dispositivos participantes</string>
-    <string name="account_settings_ice_title">Habilitar ICE</string>
-    <string name="content_description_go_back">Voltar</string>
-    <string name="assistant_generic_account_warning_continue_button_text">Compreendo</string>
-    <string name="account_settings_domain_title">Domínio</string>
-    <string name="account_settings_display_name_title">Nome de exibição</string>
-    <string name="account_settings_manage_title">Gerir</string>
-    <string name="account_settings_disable_title">Desactivar</string>
-    <string name="account_settings_default_title">Usado como padrão</string>
-    <string name="account_settings_link_phone_number_title">Ligue a sua conta</string>
-    <string name="account_settings_delete_title">Eliminar</string>
-    <string name="account_settings_advanced_title">Avançado</string>
-    <string name="account_settings_push_notification_title">Permitir notificação push</string>
-    <string name="account_settings_push_notification_summary">A configuração do proxy não cancelará o registro</string>
-    <string name="account_settings_transport_title">Transporte</string>
-    <string name="account_settings_transport_udp">UDP</string>
-    <string name="account_settings_transport_tcp">TCP</string>
-    <string name="account_settings_transport_tls">TLS</string>
-    <string name="account_settings_transport_dtls">DTLS</string>
-    <string name="account_settings_proxy_title">SIP proxy</string>
-    <string name="account_settings_outbound_proxy_title">Proxy de saída</string>
-    <string name="account_settings_stun_server_title">STUN/TURN servidor</string>
-    <string name="account_settings_avpf_title">AVPF</string>
-    <string name="account_settings_avpf_rr_interval_title">AVPF regular RTCP intervalo</string>
-    <string name="account_settings_avpf_rr_interval_summary">em segundos (entre 1 e 5)</string>
-    <string name="account_settings_expires_title">Expirar</string>
-    <string name="account_settings_expires_summary">em segundos</string>
-    <string name="account_settings_prefix_title">Prefixo para o seu país</string>
-    <string name="account_settings_prefix_summary">sem o +</string>
-    <string name="account_settings_apply_prefix_for_calls_title">Aplicar prefixo para chamadas de saída e chat</string>
-    <string name="account_settings_escape_plus_title">Substituir + por 00</string>
-    <string name="notification_channel_missed_call_name">&appName; notificações de chamadas perdidas</string>
-    <string name="notification_channel_chat_name">&appName; notificações de mensagens instantâneas</string>
-    <string name="incoming_call_notification_title">Chamada recebida</string>
-    <string name="incoming_call_notification_hangup_action_label">Desligar</string>
-    <string name="incoming_call_notification_answer_action_label">Atender</string>
-    <string name="received_chat_notification_reply_label">Responder</string>
-    <string name="received_chat_notification_mark_as_read_label">Marcar como lido</string>
-    <string name="missed_call_notification_title">Chamada Perdida</string>
-    <string name="missed_call_notification_body">Chamada perdida de %s</string>
-    <string name="missed_calls_notification_body" tools:ignore="PluralsCandidate">%d chamadas perdidas</string>
-    <string name="zrtp_dialog_title">Segurança de comunicação</string>
-    <string name="dialog_zrtp_local_sas">Diz:</string>
-    <string name="dialog_zrtp_remote_sas">Confirme se o seu interlocutor diz:</string>
-    <string name="dialog_do_not_ask_again">Não mostre novamente</string>
-    <string name="dialog_cancel">Cancelar</string>
-    <string name="dialog_delete">Eliminar</string>
-    <string name="dialog_ok">OK</string>
-    <string name="dialog_accept">Aceitar</string>
-    <string name="dialog_decline">Declínio</string>
-    <string name="dialog_call">Ligar</string>
-    <string name="operation_in_progress_wait">Operação em andamento, aguarde</string>
-    <string name="dialog_default_delete_one">Tem a certeza de que quer apagar este artigo\?</string>
-    <string name="dialog_default_delete_many">Tem a certeza de que quer eliminar a sua selecção\?</string>
-    <string name="dialog_update_available">Está disponível uma actualização</string>
-    <string name="dialog_try_open_file_as_text_title">Nenhum aplicativo encontrado para este tipo de arquivo</string>
-    <string name="dialog_try_open_file_as_text_body">Você gostaria de tentar abri-lo como um arquivo de texto simples\?</string>
-    <string name="content_description_add_sip_address_field">Adicionar um campo de endereço SIP</string>
-    <string name="content_description_phone_number_use">Mostrar para que seu número de telefone será usado</string>
-    <string name="content_description_clear_field">Esvaziar o campo de texto junto a ele</string>
-    <string name="content_description_switch_camera">Mudar da câmara da frente para trás e vice-versa</string>
-    <string name="content_description_terminate_call">Terminar a chamada</string>
-    <string name="content_description_answer_call">Atender a chamada</string>
-    <string name="content_description_enable_mic_mute">Silencie seu microfone</string>
-    <string name="content_description_disable_mic_mute">Desactive o seu microfone</string>
-    <string name="content_description_enable_speaker">Rotear áudio para o alto-falante</string>
-    <string name="content_description_go_back_to_call">Voltar para a visualização da chamada</string>
-    <string name="content_description_enable_video">Ativar vídeo na chamada</string>
-    <string name="content_description_disable_video">Desativar vídeo na chamada</string>
-    <string name="content_description_toggle_audio_menu">Mostrar ou ocultar o menu de saída de áudio</string>
-    <string name="content_description_use_bluetooth_headset">Usar auscultadores bluetooth como saída de áudio</string>
-    <string name="content_description_use_speaker">Usar altifalante como saída de áudio</string>
-    <string name="content_description_add_call">Iniciar uma nova chamada</string>
-    <string name="content_description_transfer_call">Transferir a chamada atual para outra pessoa</string>
-    <string name="content_description_remove_pending_file_transfer">Remover transferência de ficheiros pendentes</string>
-    <string name="content_description_downloaded_file_transfer">Ficheiro anexo</string>
-    <string name="content_description_delivery_status">Estado de entrega de mensagens</string>
-    <string name="content_description_ephemeral_message">A mensagem é efémera</string>
-    <string name="content_description_linphone_user">O contacto é um &appName; utilizador</string>
-    <string name="content_description_contact_selected">O contacto é seleccionado</string>
-    <string name="content_description_e2e_encryption_disabled">Encriptação de ponta a ponta desactivada</string>
-    <string name="content_description_show_all_contacts">Mostrar uma lista de todos os contactos</string>
-    <string name="content_description_show_sip_contacts">Mostrar uma lista apenas com contactos SIP</string>
-    <string name="content_description_continue_chat_room_creation">Ir para a etapa final de criação da sala de chat</string>
-    <string name="content_description_remove_contact_from_selection">Remover contato da seleção</string>
-    <string name="content_description_start_call">Iniciar uma chamada</string>
-    <string name="content_description_show_chat_room_menu">Mostrar menu da sala de chat</string>
-    <string name="content_description_attach_file">Anexar um ficheiro à mensagem</string>
-    <string name="content_description_send_message">Enviar mensagem</string>
-    <string name="content_description_ephemeral_duration_selected">Duração efémera seleccionada</string>
-    <string name="content_description_ephemeral_duration_change">Alterar a duração efêmera pelo valor selecionado</string>
-    <string name="content_description_contact_can_do_encryption">O contato pode ser convidado em conversas criptografadas</string>
-    <string name="content_description_numpad_5">5</string>
-    <string name="content_description_numpad_8">8</string>
-    <string name="content_description_toggle_side_menu">Mostrar ou ocultar o menu lateral</string>
-    <string name="content_description_dialer_erase">Remover o último caractere</string>
-    <string name="content_description_go_to_contact">Ir para detalhes de contato</string>
-    <string name="content_description_create_group_chat_room">Criar uma conversa em grupo</string>
-    <string name="content_description_call_not_secured">A chamada não está assegurada</string>
-    <string name="content_description_call_security_pending">Chamada de segurança pendente</string>
-    <string name="content_description_open_app">Conversa aberta em aplicação em vez de bolha</string>
-    <string name="content_description_contact_is_admin">O contato é um administrador nesta conversa</string>
-    <string name="content_description_stop_voice_recording">Parar a gravação de voz</string>
-    <string name="content_description_cancel_voice_recording">Cancelar gravação de voz</string>
-    <string name="content_description_pause_voice_recording_playback">Pausar gravação de voz</string>
-    <string name="content_description_play_voice_recording">Reproduzir gravação de voz</string>
-    <string name="content_descripton_scroll_to_bottom">Role para baixo ou para a primeira mensagem não lida</string>
-    <string name="content_description_start_chat">Entre na conversa</string>
-    <string name="content_description_start_encrypted_chat">Entre na conversa criptografada</string>
-    <string name="content_description_edit_contact">Editar contato</string>
-    <string name="content_description_delete_contact">Eliminar contacto</string>
-    <string name="content_description_discard_changes">Descartar mudanças</string>
-    <string name="content_description_confirm_contact_edit">Guardar alterações</string>
-    <string name="content_description_change_contact_picture">Alterar imagem do contato</string>
-    <string name="content_description_change_own_picture">Mudar a própria imagem</string>
-    <string name="content_description_show_call_details">Ir para detalhes da chamada</string>
-    <string name="content_description_exit_edition_mode">Sair do modo de edição</string>
-    <string name="content_description_select_all">Seleccione todos os itens da lista</string>
-    <string name="content_description_unselect_all">Desseleccionar todos os itens da lista</string>
-    <string name="content_description_delete_selection">Eliminar itens seleccionados na lista</string>
-    <string name="content_description_numpad_1">1</string>
-    <string name="content_description_numpad_2">2</string>
-    <string name="content_description_numpad_3">3</string>
-    <string name="content_description_numpad_4">4</string>
-    <string name="content_description_create_chat_room">Criar sala de chat</string>
-    <string name="content_description_add_participants">Adicionar participantes</string>
-    <string name="content_description_contact_is_not_admin">O contato não é um administrador nesta conversa</string>
-    <string name="content_description_ephemeral_chat_room">As mensagens são efêmeros nesta conversa</string>
-    <string name="content_description_remove_contact_from_chat_room">Remover contato da conversa</string>
-    <string name="content_description_numpad_6">6</string>
-    <string name="content_description_numpad_7">7</string>
-    <string name="content_description_numpad_9">9</string>
-    <string name="content_description_numpad_0">0</string>
-    <string name="content_description_numpad_star">*</string>
-    <string name="content_description_numpad_sharp">#</string>
-    <string name="content_description_recording_toggle_play">Reproduzir ou pausar a gravação</string>
-    <string name="content_description_voice_mail">Correio de voz</string>
-    <string name="content_description_menu_history">Histórico de chamadas</string>
-    <string name="content_description_menu_contacts">Contactos</string>
-    <string name="content_description_menu_dialer">Discador</string>
-    <string name="content_description_menu_chat">Conversas</string>
-    <string name="content_description_add_contact">Criar contato</string>
-    <string name="content_description_show_all_calls">Mostrar todas as chamadas</string>
-    <string name="content_description_show_missed_calls">Apenas mostrar chamadas perdidas</string>
-    <string name="content_description_missed_call">Chamada perdida</string>
-    <string name="content_description_incoming_call">Chamada recebida</string>
-    <string name="content_description_outgoing_call">Chamada de saída</string>
-    <string name="content_description_create_one_to_one_chat_room">Criar uma conversa um-a-um</string>
-    <string name="content_description_security_level_unsafe">Inseguro</string>
-    <string name="content_description_security_level_safe">Seguro</string>
-    <string name="content_description_security_level_encrypted">Criptografado</string>
-    <string name="content_description_call_quality_0">Qualidade de chamada muito baixa</string>
-    <string name="content_description_call_quality_1">Qualidade de chamada muito baixa</string>
-    <string name="content_description_call_quality_2">Qualidade de chamada média</string>
-    <string name="content_description_call_quality_3">Boa qualidade de chamada</string>
-    <string name="content_description_call_quality_4">Qualidade máxima da chamada</string>
-    <string name="content_description_call_secured">A chamada está assegurada</string>
-    <string name="content_description_chat_message_video_attachment">Vídeo anexo</string>
-    <string name="content_description_close_bubble">Fechar a bolha de notificação</string>
-    <string name="content_description_export">Abrir ficheiro em aplicação de terceiros</string>
-    <string name="content_description_cancel_forward">Cancelar encaminhamento de mensagem</string>
-    <string name="content_description_cancel_sharing">Cancelar a partilha</string>
-    <string name="content_description_cancel_reply">Cancelar resposta</string>
-    <string name="content_description_voice_recording">Gravar uma mensagem de voz</string>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
deleted file mode 100644
index 59f2da0f5..000000000
--- a/app/src/main/res/values-ro/strings.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE resources [
-<!ENTITY appName "Linphone">
-]>
-<resources>
-    <string name="service_auto_start_description">&appName; a fost pornit automat</string>
-    <string name="sync_account_name">&appName; contacte</string>
-    <string name="logs_upload_failure">Nu s-a reușit încărcarea logurilor!</string>
-    <string name="logs_reset_complete">Jurnalele au fost șterse</string>
-    <string name="logs_url_copied_to_clipboard">Jurnale URL copiat în clipboard</string>
-    <string name="phone_number">Număr de telefon</string>
-    <string name="phone_numbers">Numere de telefon</string>
-    <string name="select_your_country">Selectați țara dumneavoastră</string>
-    <string name="international_prefix">Prefix</string>
-    <string name="assistant_choose_country">Selectați o țară</string>
-    <string name="username">Nume utilizator</string>
-    <string name="password">Parolă</string>
-    <string name="email">Email</string>
-    <string name="domain">Domeniu</string>
-    <string name="sip_address">Adresă SIP</string>
-    <string name="cancel">Anulează</string>
-    <plurals name="days">
-        <item quantity="one">%d zi</item>
-        <item quantity="few">%d zile</item>
-        <item quantity="other">%d de zile</item>
-    </plurals>
-    <string name="yes">Da</string>
-    <string name="no">Nu</string>
-    <string name="error_unexpected">Eroare neașteptată…</string>
-    <string name="today">Azi</string>
-    <string name="yesterday">Ieri</string>
-    <string name="transport">Transport</string>
-    <string name="transport_udp">UDP</string>
-    <string name="transport_tcp">TCP</string>
-    <string name="transport_tls">TLS</string>
-    <string name="app_description"><i>libre</i> clientul SIP</string>
-    <string name="status_connected">Conectat</string>
-    <string name="status_not_connected">Nu este conectat</string>
-    <string name="status_in_progress">Conexiune în curs de realizare</string>
-    <string name="status_error">Conexiunea a eșuat</string>
-    <string name="about">Despre</string>
-    <string name="assistant">Asistent</string>
-    <string name="recordings">Înregistrări</string>
-    <string name="settings">Setări</string>
-    <string name="quit">Renunță la</string>
-    <string name="history_calls_list">Apeluri</string>
-    <string name="no_call_history">Nici un apel în istoricul tău</string>
-    <string name="no_conference_call_history">Nici un apel de întâlnire în istoricul dumneavoastră</string>
-    <string name="history_delete_one_dialog">Doriți să ștergeți această înregistrare\?</string>
-    <string name="history_delete_many_dialog">Doriți să ștergeți aceste înregistrări\?</string>
-    <string name="contact_invite_friend">Invitați</string>
-    <string name="no_sip_contact">Nu există niciun contact SIP în agenda dumneavoastră.</string>
-    <string name="contact_filter_hint">Căutați contacte</string>
-    <string name="contact_last_name">Numele de familie</string>
-    <string name="contact_first_name">Nume și prenume</string>
-    <string name="contact_organization">Organizația</string>
-    <string name="contact_choose_existing_or_new_to_add_number">Selectați un contact sau creați unul nou</string>
-    <string name="contact_editor_write_permission_denied">Permisiune de scriere a contactelor refuzată, nu se poate edita contactul</string>
-    <string name="contact_new_choose_sync_account">Alegeți unde să salvați contactul</string>
-    <string name="contact_local_sync_account">Stocați local</string>
-    <string name="contact_cant_be_deleted">Acest contact nu poate fi șters</string>
-    <string name="dialer_address_bar_hint">Introduceți un număr sau o adresă</string>
-    <string name="debug_popup_title">Depanare</string>
-    <string name="debug_popup_enable_logs">Activați jurnalele</string>
-    <string name="debug_popup_disable_logs">Dezactivați jurnalele</string>
-    <string name="debug_popup_send_logs">Trimiteți jurnalele</string>
-    <string name="debug_popup_show_config_file">Vizualizați fișierul de configurare</string>
-    <string name="dialer_transfer_succeded">Apelul este în curs de transfer</string>
-    <string name="dialer_transfer_failed">Nu se poate transfera apelul</string>
-    <string name="no_chat_history">Fără conversații</string>
-    <string name="chat_room_last_message_sender_format">%s:</string>
-    <string name="chat_remote_is_composing">Remote scrie…</string>
-    <string name="chat_event_conference_created">V-ați alăturat grupului</string>
-    <string name="chat_event_conference_destroyed">Ați părăsit grupul</string>
-    <string name="chat_event_participant_removed">%s a plecat</string>
-    <string name="chat_event_device_added">dispozitiv nou pentru %s</string>
-    <string name="chat_event_device_removed">dispozitiv pentru %s eliminat</string>
-    <string name="service_name">&appName; Servici</string>
-    <string name="service_description">Acest lucru este necesar pentru a primi apeluri în timp ce se află în fundal</string>
-    <string name="about_privacy_policy">Vizitați politica noastră de confidențialitate</string>
-    <string name="about_weblate_translation">Ajutați-ne să traducem &appName;</string>
-    <string name="assistant_choose_country_title">Numele sau prefixul țării</string>
-    <string name="sip_addresses">Adrese SIP</string>
-    <string name="share_uploaded_logs_link">Partajați linkul jurnalelor folosind…</string>
-    <string name="no_account_configured">Nici un cont configurat</string>
-    <string name="no_missed_call_history">Nici un apel ratat în istoricul dumneavoastră</string>
-    <string name="no_contact">Nu aveți niciun contact în agendă.</string>
-    <string name="contact_send_sms_invite_text">Bună ziua, alăturați-vă mie pe &appName;! O puteți descărca gratuit la %s</string>
-    <string name="contact_delete_one_dialog">Doriți să ștergeți acest contact\?
-\nAcesta va fi, de asemenea, eliminat din agenda dispozitivului dumneavoastră</string>
-    <string name="contact_delete_many_dialog">Sunteți sigur că doriți să ștergeți aceste contacte\?
-\nAcestea vor fi, de asemenea, eliminate din agenda dispozitivului dumneavoastră</string>
-    <string name="contacts_ldap_query_more_results_available">Sunt disponibile mai multe rezultate, rafinați căutarea</string>
-    <string name="contacts_new_contact_wont_be_visible_warning_dialog">Sunteți pe cale să creați un nou contact fără un SIP URI sau un număr de telefon, astfel încât acesta nu va fi vizibil în &appName;.
-\n
-\nDoriți să îl creați oricum\?</string>
-    <string name="chat_event_participant_added">%s s-a alăturat</string>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ru-rUA/strings.xml b/app/src/main/res/values-ru-rUA/strings.xml
deleted file mode 100644
index 9f6142cc4..000000000
--- a/app/src/main/res/values-ru-rUA/strings.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="status_connected">Подключено</string>
-    <string name="no_account_configured">Не настроен аккаунт</string>
-    <string name="status_not_connected">Не подключено</string>
-    <string name="status_in_progress">Подключение</string>
-    <string name="status_error">Неудачное соединение</string>
-    <string name="about">О</string>
-    <string name="assistant">Помощник</string>
-    <string name="recordings">Записи</string>
-    <string name="settings">Установки</string>
-    <string name="quit">Выход</string>
-    <string name="history_calls_list">Звонки</string>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
deleted file mode 100644
index 0ba877631..000000000
--- a/app/src/main/res/values-ru/strings.xml
+++ /dev/null
@@ -1,830 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE resources [
-<!ENTITY appName "Linphone">
-]>
-<resources xmlns:tools="http://schemas.android.com/tools">
-    <string name="service_description">Необходимо для приема звонков в фоновом режиме</string>
-    <string name="sync_account_name">&appName;-контакты</string>
-    <string name="logs_upload_failure">Не удалось загрузить журналы!</string>
-    <string name="logs_reset_complete">Журналы очищены</string>
-    <string name="logs_url_copied_to_clipboard">URL-адрес журналов скопирован в буфер обмена</string>
-    <string name="phone_number">Номер телефона</string>
-    <string name="phone_numbers">Телефонные номера</string>
-    <string name="international_prefix">Префикс</string>
-    <string name="assistant_choose_country">Выберите вашу страну</string>
-    <string name="assistant_choose_country_title">Название страны или префикс</string>
-    <string name="username">Имя пользователя</string>
-    <string name="password">Пароль</string>
-    <string name="domain">Домен</string>
-    <string name="sip_addresses">SIP-адреса</string>
-    <string name="cancel">Отмена</string>
-    <plurals name="days">
-        <item quantity="one">%d день</item>
-        <item quantity="few">%d дня</item>
-        <item quantity="many">%d дней</item>
-        <item quantity="other">%d дней</item>
-    </plurals>
-    <string name="today">Сегодня</string>
-    <string name="yesterday">Вчера</string>
-    <string name="transport">Транспорт</string>
-    <string name="transport_udp">UDP</string>
-    <string name="transport_tls">TLS</string>
-    <string name="status_connected">Подключено</string>
-    <string name="status_not_connected">Не подключено</string>
-    <string name="status_in_progress">Идёт подключение</string>
-    <string name="status_error">Ошибка подключения</string>
-    <string name="no_account_configured">Аккаунт не настроен</string>
-    <string name="about">О нас</string>
-    <string name="assistant">Помощник</string>
-    <string name="recordings">Записи</string>
-    <string name="email">Эл. почта</string>
-    <string name="transport_tcp">TCP</string>
-    <string name="history_calls_list">Звонки</string>
-    <string name="no_call_history">В вашей истории нет звонков</string>
-    <string name="history_delete_one_dialog">Вы хотите удалить эту запись\?</string>
-    <string name="history_delete_many_dialog">Вы хотите удалить эти записи\?</string>
-    <string name="contact_invite_friend">Пригласить</string>
-    <string name="no_sip_contact">В адресной книге нет SIP-контактов.</string>
-    <string name="contact_filter_hint">Поиск контактов</string>
-    <string name="contact_last_name">Фамилия</string>
-    <string name="contact_first_name">Имя</string>
-    <string name="contact_organization">Огранизация</string>
-    <string name="contact_choose_existing_or_new_to_add_number">Выберите контакт или создайте новый</string>
-    <string name="contact_editor_write_permission_denied">Отказано в разрешении записать контакт, невозможно редактировать контакт</string>
-    <string name="contact_delete_many_dialog">Вы уверены, что хотите удалить эти контакты\?
-\nОни также будут удалены из адресной книги вашего устройства</string>
-    <string name="contact_new_choose_sync_account">Выберите где сохранить контакт</string>
-    <string name="contact_local_sync_account">Сохранить локально</string>
-    <string name="debug_popup_title">Отладка</string>
-    <string name="debug_popup_enable_logs">Включить журналы</string>
-    <string name="debug_popup_disable_logs">Отключить журналы</string>
-    <string name="debug_popup_send_logs">Отправить журналы</string>
-    <string name="debug_popup_show_config_file">Посмотреть файл настройки</string>
-    <string name="chat_remote_is_composing">Собеседник пишет…</string>
-    <string name="chat_event_conference_created">Вы присоединились к группе</string>
-    <string name="chat_event_participant_added">%s присоединился(-лась)</string>
-    <string name="chat_event_participant_removed">%s покинул(-а)</string>
-    <string name="chat_event_device_added">новое устройство для %s</string>
-    <string name="chat_event_device_removed">устройство для %s удалено</string>
-    <string name="chat_event_subject_changed">новая тема: %s</string>
-    <string name="chat_event_admin_set">%s - администратор</string>
-    <string name="chat_security_event_lime_identity_key_changed">Идентификационный ключ LIME изменён для %s</string>
-    <string name="chat_security_event_man_in_the_middle_detected">Обнаружена MITM атака на %s</string>
-    <string name="chat_security_event_participant_max_count_exceeded">Превышено максимальное количество участников на %s</string>
-    <string name="chat_event_ephemeral_disabled">Вы отключили недолговечные сообщения</string>
-    <string name="chat_event_ephemeral_enabled">Вы включили недолговечные сообщения: %s</string>
-    <string name="chat_message_download_file">Скачать</string>
-    <string name="chat_room_group_info_title">Информация</string>
-    <string name="chat_room_group_info_participants">Участники</string>
-    <string name="chat_room_group_info_admin">Администратор</string>
-    <string name="chat_room_group_info_leave_dialog_button">Покинуть</string>
-    <string name="chat_room_group_info_leave_dialog_message">Вы хотите покинуть этот разговор\?</string>
-    <string name="chat_room_group_info_you_are_now_admin">Теперь вы администратор</string>
-    <string name="chat_message_imdn_info">Статус доставки</string>
-    <string name="chat_message_imdn_displayed">Прочитано</string>
-    <string name="chat_message_imdn_delivered">Доставлено</string>
-    <string name="chat_message_imdn_undelivered">Не доставлено</string>
-    <string name="chat_message_imdn_sent">Отправлено</string>
-    <string name="chat_message_forwarded">Переслано</string>
-    <string name="chat_message_replied">Ответить</string>
-    <string name="chat_message_context_menu_resend">Отправить повторно</string>
-    <string name="chat_message_context_menu_forward">Переслать</string>
-    <string name="chat_message_context_menu_reply">Ответить</string>
-    <string name="chat_message_context_menu_imdn_info">Статус доставки</string>
-    <string name="chat_message_context_menu_delete">Удалить</string>
-    <string name="chat_message_context_menu_add_to_contacts">Добавить в контакты</string>
-    <string name="chat_room_choose_conversation_for_file_sharing">Выберите или создайте беседу, чтобы поделиться файлом(-ами)</string>
-    <string name="chat_room_group_info_subject_hint">Назовите группу</string>
-    <string name="chat_room_devices_fragment_title">Устройства разговоров</string>
-    <string name="chat_room_file_not_found">Файл не найден</string>
-    <string name="chat_room_context_menu_group_info">Информация о группе</string>
-    <string name="chat_room_context_menu_participants_devices">Устройства разговоров</string>
-    <string name="chat_message_context_menu_delete_messages">Удалить сообщения</string>
-    <string name="chat_room_ephemeral_fragment_title">Недолговечные сообщения</string>
-    <string name="chat_room_ephemeral_message_disabled">Отключено</string>
-    <string name="chat_room_ephemeral_message_one_minute">1 минута</string>
-    <string name="chat_room_ephemeral_message_one_hour">1 час</string>
-    <string name="chat_room_ephemeral_message_one_day">1 день</string>
-    <string name="chat_room_ephemeral_message_three_days">3 дня</string>
-    <string name="chat_room_ephemeral_message_one_week">1 неделя</string>
-    <plurals name="chat_room_remote_composing">
-        <item quantity="one">%s пишет…</item>
-        <item quantity="few">%s пишут…</item>
-        <item quantity="many">%s пишут…</item>
-        <item quantity="other">%s пишут…</item>
-    </plurals>
-    <string name="chat_room_creation_failed_snack">Не удалось создать чат-комнату</string>
-    <string name="chat_room_removal_failed_snack">Не удалось удалить чат-комнату</string>
-    <string name="call_incoming_title">Входящий звонок</string>
-    <string name="call_outgoing_title">Исходящий звонок</string>
-    <string name="call_notification_paused">Приостановленный звонок</string>
-    <string name="call_notification_outgoing">Исходящий звонок</string>
-    <string name="call_error_declined">Звонок отклонён</string>
-    <string name="call_error_user_busy">Пользователь занят</string>
-    <string name="call_error_incompatible_media_params">Несовместимые параметры потока</string>
-    <string name="call_error_network_unreachable">Сеть недоступна</string>
-    <string name="call_error_io_error">Служба недоступна или ошибка сети</string>
-    <string name="call_error_server_timeout">Тайм-аут сервера</string>
-    <string name="call_error_generic">Ошибка: %s</string>
-    <string name="call_video_update_requested_dialog">Собеседник хочет включить видео</string>
-    <string name="call_stats_audio">Аудио</string>
-    <string name="call_stats_video">Видео</string>
-    <string name="call_stats_codec">Кодек:</string>
-    <string name="call_stats_ip">Семейство IP:</string>
-    <string name="call_stats_upload">Пропускная способность передачи:</string>
-    <string name="call_stats_estimated_download">Предполагаемая пропускная способность на приём:</string>
-    <string name="call_stats_video_resolution_received">Разрешение полученного видео:</string>
-    <string name="call_stats_video_fps_sent">fps отправленного видео:</string>
-    <string name="call_stats_video_fps_received">fps полученного видео:</string>
-    <string name="call_stats_receiver_loss_rate">Коэффициент потерь получателя:</string>
-    <string name="chat_room_delete_one_dialog">Вы уверены, что хотите удалить этот разговор\?</string>
-    <string name="chat_message_notification_hidden_content">&lt;Отредактировано&gt;</string>
-    <string name="chat_message_no_app_found_to_handle_file_mime_type">Нет приложений для этого типа файлов</string>
-    <string name="chat_bubble_cant_open_enrypted_file">Не удаётся открыть зашифрованный файл во всплывающем чате</string>
-    <string name="chat_message_cant_open_file_in_app_dialog_export_button">Экспорт</string>
-    <string name="chat_message_cant_open_file_in_app_dialog_open_as_text_button">Открыть как текст</string>
-    <string name="chat_room_sending_reply_hint">Ответить</string>
-    <string name="chat_room_sending_message_hint">Сообщение</string>
-    <string name="chat_message_voice_recording_hold_to_record">Удерживайте кнопку для записи голосового сообщения</string>
-    <string name="call_stats_ice">ICE-соединение:</string>
-    <string name="call_stats_jitter_buffer">Буфер джиттера:</string>
-    <string name="call_stats_decoder_name">Декодер:</string>
-    <string name="call_stats_encoder_name">Кодировщик:</string>
-    <string name="call_stats_player_filter">Фильтр плеера:</string>
-    <string name="call_notification_active">Активный звонок</string>
-    <string name="assistant_welcome_title">Добро пожаловать</string>
-    <string name="assistant_create_account">Создать аккаунт</string>
-    <string name="assistant_login_linphone">Использовать &appName;-аккаунт</string>
-    <string name="assistant_login_generic">Использовать SIP-аккаунт</string>
-    <string name="assistant_remote_provisioning">Загрузить удалённую конфигурацию</string>
-    <string name="assistant_ec_calibration">Выполняется калибровка эхоподавления</string>
-    <string name="assistant_phone_number_link_info_content">"
-\nВашим друзьям будет проще связаться с вами, если вы свяжете свой аккаунт со своим номером телефона.
-\n
-\nВ вашей адресной книге вы увидите, кто использует &appName;, а ваши друзья смогут узнать, что вы также зарегистрированы в &appName;.
-\n"</string>
-    <string name="assistant_general_terms">условия использования</string>
-    <string name="assistant_privacy_policy">политику конфиденциальности</string>
-    <string name="assistant_read_and_agree_terms">Я принимаю %1$s и %2$s от Belledonne Communications</string>
-    <string name="assistant_error_phone_number_invalid_characters">Разрешены только цифры</string>
-    <string name="assistant_error_username_already_exists">Имя пользователя уже используется</string>
-    <string name="assistant_error_phone_number_already_exists">Аккаунт с этим номером уже существует</string>
-    <string name="assistant_error_username_invalid_characters">Обнаружены недопустимые символы</string>
-    <string name="assistant_error_passwords_dont_match">Пароли не совпадают</string>
-    <string name="assistant_error_invalid_email_address">Адрес электронной почты недействительный</string>
-    <string name="assistant_error_username_too_long">В имени пользователя слишком много символов</string>
-    <string name="assistant_error_invalid_credentials">Аккаунт не существует или пароль не совпадает</string>
-    <string name="assistant_create_account_part_1">Подтвердите код страны и введите свой номер телефона</string>
-    <string name="assistant_linphone_login_desc">Введите имя пользователя и пароль &appName;-аккаунта</string>
-    <string name="assistant_login_forgotten_password">Забыли пароль\?</string>
-    <string name="assistant_login">Вход</string>
-    <string name="assistant_finish">Завершить настройку</string>
-    <string name="assistant_confirmation_code">Код подтверждения</string>
-    <string name="assistant_continue_even_if_credentials_invalid">Продолжить</string>
-    <string name="assistant_generic_account">Используйте SIP-аккаунт</string>
-    <string name="assistant_display_name_optional">Отображаемое имя (необязательно)</string>
-    <string name="call_stats_capture_filter">Фильтр захвата:</string>
-    <string name="assistant_confirm_password">Подтверждение пароля</string>
-    <string name="assistant_validate_account_1">Ваш аккаунт создан. Для подтверждения аккаунта проверьте свою эл. почту:</string>
-    <string name="assistant_validate_account_2">После этого вернитесь и нажмите кнопку.</string>
-    <string name="assistant_use_username_instead_or_phone_number">Используйте имя пользователя (необязательно)</string>
-    <string name="assistant_create_account_part_3">Чтобы завершить проверку номера телефона, введите 4-значный код ниже:\n</string>
-    <string name="assistant_link_phone_number">Вы свяжете номер телефона с данным логином:</string>
-    <string name="assistant_link_phone_number_skip">Пропустить</string>
-    <string name="assistant_link_account">Связать аккаунт</string>
-    <string name="assistant_remote_provisioning_desc">Укажите URL-адрес конфигурации</string>
-    <string name="assistant_remote_provisioning_url">URL-адрес</string>
-    <string name="assistant_remote_provisioning_failure">Не удалось загрузить или применить профиль удалённой конфигурации…</string>
-    <string name="assistant_fetch_apply">Загрузить и применить</string>
-    <string name="assistant_launch_qrcode">QR-код</string>
-    <string name="settings_accounts_title">SIP-аккаунты</string>
-    <string name="settings_default_account_subtitle">Аккаунт по умолчанию</string>
-    <string name="settings_list_title">Предпочтения</string>
-    <string name="settings_tunnel_title">Туннель</string>
-    <string name="settings_audio_title">Аудио</string>
-    <string name="settings_video_title">Видео</string>
-    <string name="settings_call_title">Звонок</string>
-    <string name="settings_chat_title">Чат</string>
-    <string name="settings_network_title">Сеть</string>
-    <string name="settings_contacts_title">Контакты</string>
-    <string name="settings_advanced_title">Дополнительно</string>
-    <string name="settings_primary_account_display_name_title">Отображаемое имя</string>
-    <string name="settings_primary_account_username_title">Имя пользователя</string>
-    <string name="audio_settings_echo_canceller_calibration_title">Калибровка эхоподавления</string>
-    <string name="audio_settings_echo_cancellation_calibration_started">Калибровка эхоподавления началась</string>
-    <string name="audio_settings_echo_cancellation_calibration_failed">Калибровка не удалась</string>
-    <string name="audio_settings_echo_cancellation_calibration_no_echo">Эхо не обнаружено</string>
-    <string name="audio_settings_echo_tester_title">Тест эхо</string>
-    <string name="audio_settings_echo_canceller_calibration_summary">Нажмите, чтобы начать калибровку эхоподавления</string>
-    <string name="audio_settings_echo_tester_summary_is_stopped">Тестирование эха остановлено</string>
-    <string name="audio_settings_echo_tester_summary_is_running">Идёт тест эха</string>
-    <string name="audio_settings_input_device_title">Аудиоустройство ввода по умолчанию</string>
-    <string name="audio_settings_output_device_title">Выходное аудиоустройство по умолчанию</string>
-    <string name="audio_settings_output_device_summary">Изменения вступят в силу начиная со следующего звонка</string>
-    <string name="audio_settings_codec_bitrate_title">Ограничение битрейта кодека</string>
-    <string name="audio_settings_microphone_gain_summary">(в децибелах)</string>
-    <string name="audio_settings_playback_gain_title">Усиление воспроизведения</string>
-    <string name="audio_settings_playback_gain_summary">(в децибелах)</string>
-    <string name="audio_settings_codecs_title">Кодеки</string>
-    <string name="video_settings_enable_title">Включить видео</string>
-    <string name="video_settings_initiate_call_title">Начать видеозвонки</string>
-    <string name="video_settings_initiate_call_summary">Всегда отправлять запросы на видео</string>
-    <string name="video_settings_automatically_accept_summary">Всегда принимать запросы на видео</string>
-    <string name="video_settings_camera_device_title">Камера</string>
-    <string name="video_settings_video_size_title">Предпочитаемый размер видео</string>
-    <string name="video_settings_preferred_fps_title">Предпочитаемый FPS</string>
-    <string name="video_settings_bandwidth_limit_title">Ограничение пропускной способности</string>
-    <string name="video_settings_bandwidth_limit_summary">в Кбит/c</string>
-    <string name="video_settings_video_preset_title">Предварительные настройки видео</string>
-    <string name="call_settings_vibrate_title">Вибрация при входящем звонке</string>
-    <string name="call_settings_encryption_title">Шифрование потока</string>
-    <string name="call_settings_media_encryption_none">Ничего</string>
-    <string name="call_settings_encryption_mandatory_title">Шифрование потока обязательно</string>
-    <string name="call_settings_overlay_title">Уведомление о звонке поверх приложения</string>
-    <string name="call_settings_system_wide_overlay_title">Показывать уведомления вне приложения</string>
-    <string name="call_settings_sipinfo_dtmf_title">Отправка внеполосных DTMF (SIP INFO)</string>
-    <string name="call_settings_rfc2833_dtmf_title">Отправка внутриполосных DTMF (RFC 2833)</string>
-    <string name="call_settings_auto_start_title">Начните звонить прямо сейчас</string>
-    <string name="call_settings_auto_answer_title">Автоматический ответ на входящие звонки</string>
-    <string name="call_settings_auto_answer_delay_title">Время автоответа</string>
-    <string name="call_settings_auto_answer_delay_summary">в миллисекундах</string>
-    <string name="call_settings_incoming_timeout_title">Тайм-аут входящего звонка</string>
-    <string name="call_settings_incoming_timeout_summary">в секундах</string>
-    <string name="call_settings_voice_mail_uri_title">URI голосовой почты</string>
-    <string name="call_settings_pause_calls_lost_audio_focus_title">Приостановить звонки при потере звукового фокуса</string>
-    <string name="call_settings_go_to_android_notification_settings">Настройки уведомлений Android</string>
-    <string name="call_settings_media_encryption_srtp">SRTP</string>
-    <string name="call_settings_media_encryption_zrtp">ZRTP</string>
-    <string name="call_settings_media_encryption_dtls">DTLS-SRTP</string>
-    <string name="call_settings_auto_start_recording_title">Автоматически начинать запись разговоров</string>
-    <string name="chat_settings_file_sharing_url_title">URL сервера обмена</string>
-    <string name="chat_settings_file_sharing_url_summary">Не изменяйте, если вы не знаете, что делаете!</string>
-    <string name="chat_settings_auto_download_title">Политика автоматической загрузки входящих файлов</string>
-    <string name="chat_settings_auto_download_always">Всегда</string>
-    <string name="chat_settings_auto_download_never">Никогда</string>
-    <string name="chat_settings_auto_download_under_size">Если меньше указанного размера</string>
-    <string name="chat_settings_auto_download_max_size_title">Максимальный размер</string>
-    <string name="chat_settings_auto_download_max_size_summary">в байтах</string>
-    <string name="chat_settings_downloaded_media_public_title">Сделать скачанные медиафайлы общедоступными</string>
-    <string name="chat_settings_hide_notification_content_title">Скрыть содержимое сообщения в уведомлениях</string>
-    <string name="chat_settings_launcher_shortcuts_summary">Будут заменены ярлыками контактов, если они включены</string>
-    <string name="chat_settings_hide_empty_rooms_title">Скрывать пустые чат-комнаты</string>
-    <string name="chat_settings_hide_rooms_removed_proxies_title">Скрыть чат-комнаты из настроек удалённого прокси</string>
-    <string name="chat_settings_go_to_android_notification_settings">Настройки уведомлений Android</string>
-    <string name="chat_settings_use_in_app_file_viewer_title">Всегда открывать файлы внутри этого приложения</string>
-    <string name="chat_settings_use_in_app_file_viewer_summary">Вы по-прежнему сможете экспортировать их в сторонние приложения</string>
-    <string name="chat_settings_auto_download_voice_recordings">Автоматическая загрузка входящих голосовых записей</string>
-    <string name="network_settings_wifi_only_title">Использовать только Wi-Fi</string>
-    <string name="network_settings_allow_ipv6_title">Разрешить IPv6</string>
-    <string name="network_settings_random_ports_title">Использовать случайные порты</string>
-    <string name="network_settings_sip_port_title">SIP-порт для использования</string>
-    <string name="contacts_settings_friendlist_subscribe_title">Подписка на список друзей</string>
-    <string name="contacts_settings_native_presence_summary">Вставка информационных ярлыков из контакта &appName; в родные контакты Android</string>
-    <string name="contacts_settings_show_organization_title">Отображать контактную организацию</string>
-    <string name="contacts_settings_launcher_shortcuts_summary">Заменяет ярлыки чат-комнаты, если таковые имеются</string>
-    <string name="contacts_settings_show_new_contact_account_dialog_title">Всегда спрашивать, в каком аккаунте сохранять вновь созданный контакт</string>
-    <string name="advanced_settings_debug_mode_title">Отладочные логи</string>
-    <string name="advanced_settings_background_mode_title">Фоновый режим</string>
-    <string name="advanced_settings_background_mode_summary">Показывает уведомление, чтобы приложение работало</string>
-    <string name="advanced_settings_auto_start_title">Запуск во время загрузки</string>
-    <string name="advanced_settings_dark_mode_title">Тёмная тема</string>
-    <string name="advanced_settings_dark_mode_label_auto">Авто</string>
-    <string name="advanced_settings_dark_mode_label_yes">Да</string>
-    <string name="advanced_settings_animations_title">Анимации</string>
-    <string name="advanced_settings_device_name_title">Имя устройства</string>
-    <string name="advanced_settings_remote_provisioning_url_title">URL удалённого конфигурирования</string>
-    <string name="advanced_settings_logs_server_url_title">URL-адрес сервера выгрузки логов</string>
-    <string name="advanced_settings_android_title">Android</string>
-    <string name="advanced_settings_go_to_battery_optimization_settings">Настройки оптимизации батареи</string>
-    <string name="advanced_settings_go_to_power_manager_settings">Настройки менеджера питания</string>
-    <string name="advanced_settings_go_to_android_app_settings">Параметры приложения в Android</string>
-    <string name="advanced_settings_vfs_title">Зашифровать все</string>
-    <string name="advanced_settings_vfs_summary">После включения его нельзя отключить!</string>
-    <string name="advanced_settings_send_debug_logs_title">Отправить журналы</string>
-    <string name="advanced_settings_reset_debug_logs_title">Сбросить журналы</string>
-    <string name="advanced_settings_debug_title">Настройки отладки</string>
-    <string name="advanced_settings_other_title">Другие настройки</string>
-    <string name="advanced_settings_disable_fragment_security_summary">Разрешить снимок экрана/запись в конфиденциальных представлениях</string>
-    <string name="tunnel_settings_hostname_url_title">Сервер</string>
-    <string name="tunnel_settings_port_title">Порт</string>
-    <string name="tunnel_settings_dual_mode_title">Двойной режим включен</string>
-    <string name="tunnel_settings_dual_hostname_url_title">Имя второго сервера</string>
-    <string name="tunnel_settings_dual_hostname_url_summary">Требуется в двойном режиме</string>
-    <string name="tunnel_settings_dual_port_title">Порт второго сервера</string>
-    <string name="tunnel_settings_mode_title">Режим</string>
-    <string name="tunnel_settings_dual_port_summary">Требуется в двойном режиме</string>
-    <string name="tunnel_settings_disabled_mode">Отключено</string>
-    <string name="tunnel_settings_always_mode">Всегда</string>
-    <string name="tunnel_settings_auto_mode">Авто</string>
-    <string name="account_settings_user_name_title">Имя пользователя</string>
-    <string name="account_settings_user_name_summary">Пример: john, если ваш аккаунт - john@sip.example.org</string>
-    <string name="account_settings_user_id_title">Идентификатор аутентификации</string>
-    <string name="account_settings_password_title">Пароль</string>
-    <string name="account_settings_password_summary">Необходимо повторно ввести пароль, если вы измените имя пользователя и/или домен</string>
-    <string name="account_settings_domain_title">Домен</string>
-    <string name="account_settings_domain_summary">Пример: sip.example.org, если ваш аккаунт - john@sip.example.org</string>
-    <string name="account_settings_display_name_title">Отображаемое имя</string>
-    <string name="account_settings_manage_title">Управление</string>
-    <string name="account_settings_default_title">Использовать по умолчанию</string>
-    <string name="account_settings_link_phone_number_title">Связать ваш аккаунт</string>
-    <string name="account_settings_delete_title">Удалить</string>
-    <string name="account_settings_advanced_title">Дополнительно</string>
-    <string name="account_settings_push_notification_summary">Конфигурация прокси не отменяет регистрацию</string>
-    <string name="account_settings_transport_title">Транспорт</string>
-    <string name="account_settings_transport_udp">UDP</string>
-    <string name="account_settings_transport_tcp">TCP</string>
-    <string name="account_settings_transport_tls">TLS</string>
-    <string name="account_settings_transport_dtls">DTLS</string>
-    <string name="account_settings_proxy_title">SIP-прокси</string>
-    <string name="account_settings_outbound_proxy_title">Исходящий прокси</string>
-    <string name="account_settings_outbound_proxy_summary">Маршрутизация всех звонков через SIP-прокси</string>
-    <string name="account_settings_stun_server_title">STUN/TURN-сервер</string>
-    <string name="account_settings_ice_title">Включить ICE</string>
-    <string name="account_settings_avpf_title">AVPF</string>
-    <string name="account_settings_avpf_rr_interval_summary">в секундах (от 1 до 5)</string>
-    <string name="account_settings_expires_title">Истекает</string>
-    <string name="account_settings_expires_summary">в секундах</string>
-    <string name="account_settings_prefix_title">Префикс для вашей страны</string>
-    <string name="account_settings_prefix_summary">без +</string>
-    <string name="account_settings_escape_plus_title">Заменить + на 00</string>
-    <string name="notification_channel_missed_call_name">Уведомления о пропущенных звонках &appName;</string>
-    <string name="notification_channel_incoming_call_name">Уведомления о входящих звонках &appName;</string>
-    <string name="incoming_call_notification_title">Входящий звонок</string>
-    <string name="incoming_call_notification_hangup_action_label">Отбой</string>
-    <string name="incoming_call_notification_answer_action_label">Ответ</string>
-    <string name="received_chat_notification_mark_as_read_label">Пометить как прочитанное</string>
-    <string name="missed_call_notification_title">Пропущенный звонок</string>
-    <string name="missed_call_notification_body">Пропущен звонок от %s</string>
-    <string name="zrtp_dialog_title">Безопасность связи</string>
-    <string name="dialog_zrtp_local_sas">Говорит:</string>
-    <string name="dialog_zrtp_remote_sas">Подтвердите, что ваш собеседник говорит:</string>
-    <string name="dialog_do_not_ask_again">Не показывать снова</string>
-    <string name="dialog_cancel">Отмена</string>
-    <string name="dialog_delete">Удалить</string>
-    <string name="dialog_ok">ОК</string>
-    <string name="dialog_accept">Принять</string>
-    <string name="dialog_decline">Отклонить</string>
-    <string name="dialog_call">Звонок</string>
-    <string name="operation_in_progress_wait">Выполняется операция, пожалуйста, подождите</string>
-    <string name="dialog_default_delete_one">Вы уверены, что хотите удалить этот элемент\?</string>
-    <string name="dialog_default_delete_many">Вы действительно хотите удалить выбранное\?</string>
-    <string name="dialog_update_available">Доступно обновление</string>
-    <string name="dialog_try_open_file_as_text_title">Нет приложений для этого типа файлов</string>
-    <string name="content_description_add_sip_address_field">Добавьте поле для SIP-адреса</string>
-    <string name="content_description_add_phone_number_field">Добавьте поле для номера телефона</string>
-    <string name="content_description_go_back">Назад</string>
-    <string name="content_description_phone_number_use">Покажите, для чего будет использоваться ваш номер телефона</string>
-    <string name="content_description_clear_field">Очистите текстовое поле рядом с ним</string>
-    <string name="content_description_pause_call">Приостановить звонок</string>
-    <string name="content_description_toggle_recording">Включение или отключение записи разговора</string>
-    <string name="content_description_terminate_call">Прервать звонок</string>
-    <string name="content_description_answer_call">Ответить на звонок</string>
-    <string name="content_description_disable_mic_mute">Включить микрофон</string>
-    <string name="content_description_disable_speaker">Направить звук в наушники</string>
-    <string name="content_description_go_back_to_call">Вернуться к просмотру звонков</string>
-    <string name="content_description_enable_video">Включить видео во время разговора</string>
-    <string name="content_description_disable_video">Отключить видео во время разговора</string>
-    <string name="content_description_toggle_audio_menu">Показать или скрыть меню вывода звука</string>
-    <string name="content_description_use_earpiece">Использовать наушник в качестве аудиовыхода</string>
-    <string name="content_description_use_speaker">Использовать динамик в качестве аудиовыхода</string>
-    <string name="content_description_add_call">Начать новый звонок</string>
-    <string name="content_description_transfer_call">Перевести текущий звонок</string>
-    <string name="content_description_pending_file_transfer">Ожидание передачи файла</string>
-    <string name="content_description_remove_pending_file_transfer">Удалить ожидающую передачу файла</string>
-    <string name="content_description_downloaded_file_transfer">Прикреплённый файл</string>
-    <string name="content_description_delivery_status">Статус доставки сообщения</string>
-    <string name="content_description_forward_message">Переслать сообщение в этой беседе</string>
-    <string name="content_description_ephemeral_message">Сообщение - это недолговечное сообщение</string>
-    <string name="content_description_contact_selected">Контакт выбран</string>
-    <string name="content_description_e2e_encryption_disabled">Сквозное шифрование отключено</string>
-    <string name="content_description_e2e_encryption_enabled">Сквозное шифрование включено</string>
-    <string name="content_description_show_sip_contacts">Показать список только с SIP-контактами</string>
-    <string name="content_description_remove_contact_from_selection">Удалить контакт из выбора</string>
-    <string name="content_description_start_call">Начать звонок</string>
-    <string name="content_description_enter_edition_mode">Войти в режим редактирования</string>
-    <string name="content_description_send_message">Отправить сообщение</string>
-    <string name="content_description_ephemeral_duration_selected">Выбрана недолговечная продолжительность</string>
-    <string name="content_description_ephemeral_duration_change">Изменить недолговечную продолжительность на выбранное значение</string>
-    <string name="content_description_create_chat_room">Создать чат-комнату</string>
-    <string name="content_description_add_participants">Добавить участников</string>
-    <string name="content_description_contact_is_admin">Контакт является администратором в этом разговоре</string>
-    <string name="content_description_contact_is_not_admin">Контакт не является администратором в этом разговоре</string>
-    <string name="content_description_ephemeral_chat_room">Сообщения в этом чате недолговечны</string>
-    <string name="content_description_start_chat">Вступить в разговор</string>
-    <string name="content_description_start_encrypted_chat">Вступить в зашифрованный разговор</string>
-    <string name="content_description_edit_contact">Изменить контакт</string>
-    <string name="content_description_delete_contact">Удалить контакт</string>
-    <string name="content_description_discard_changes">Отменить изменения</string>
-    <string name="content_description_confirm_contact_edit">Сохранить изменения</string>
-    <string name="content_description_change_own_picture">Изменить свою картинку</string>
-    <string name="content_description_show_call_details">Перейти к деталям звонка</string>
-    <string name="content_description_exit_edition_mode">Выйти из режима редактирования</string>
-    <string name="content_description_select_all">Выбрать все элементы в списке</string>
-    <string name="content_description_delete_selection">Удалить выбранные элементы из списка</string>
-    <string name="content_description_numpad_1">1</string>
-    <string name="content_description_numpad_2">2</string>
-    <string name="content_description_numpad_3">3</string>
-    <string name="content_description_numpad_4">4</string>
-    <string name="content_description_numpad_5">5</string>
-    <string name="content_description_numpad_6">6</string>
-    <string name="content_description_numpad_7">7</string>
-    <string name="content_description_numpad_8">8</string>
-    <string name="content_description_numpad_9">9</string>
-    <string name="content_description_numpad_0">0</string>
-    <string name="content_description_numpad_star">*</string>
-    <string name="content_description_numpad_sharp">#</string>
-    <string name="content_description_voice_mail">Голосовая почта</string>
-    <string name="content_description_menu_history">История звонков</string>
-    <string name="content_description_dialer_erase">Удалить последний символ</string>
-    <string name="content_description_add_contact">Создать контакт</string>
-    <string name="content_description_go_to_contact">Перейти к деталям контакта</string>
-    <string name="content_description_show_all_calls">Показать все звонки</string>
-    <string name="content_description_missed_call">Пропущенный звонок</string>
-    <string name="content_description_incoming_call">Входящий звонок</string>
-    <string name="content_description_outgoing_call">Исходящий звонок</string>
-    <string name="content_description_create_one_to_one_chat_room">Создать разговор один на один</string>
-    <string name="content_description_create_group_chat_room">Создать групповой разговор</string>
-    <string name="content_description_security_level_unsafe">Небезопасно</string>
-    <string name="content_description_security_level_safe">Безопасно</string>
-    <string name="content_description_security_level_encrypted">Зашифрованно</string>
-    <string name="content_description_call_quality_1">Низкое качество связи</string>
-    <string name="content_description_call_quality_2">Среднее качество связи</string>
-    <string name="content_description_call_quality_3">Хорошее качество связи</string>
-    <string name="content_description_call_quality_4">Максимальное качество звонка</string>
-    <string name="content_description_call_secured">Звонок защищён</string>
-    <string name="content_description_call_security_pending">Ожидание безопасности звонка</string>
-    <string name="content_description_close_bubble">Закрывать всплывающее окно уведомлений</string>
-    <string name="content_description_open_app">Открывать беседу в приложении вместо всплывания</string>
-    <string name="content_description_cancel_forward">Отменить пересылку сообщения</string>
-    <string name="content_description_cancel_sharing">Отменить совместное использование</string>
-    <string name="content_description_cancel_reply">Отменить ответ</string>
-    <string name="content_description_voice_recording">Записать голосовое сообщение</string>
-    <string name="content_description_stop_voice_recording">Остановить запись голоса</string>
-    <string name="content_description_cancel_voice_recording">Отменить запись голоса</string>
-    <string name="content_description_pause_voice_recording_playback">Приостановить запись голоса</string>
-    <string name="content_description_play_voice_recording">Воспроизвести запись голоса</string>
-    <string name="service_name">&appName;-служба</string>
-    <string name="service_auto_start_description">&appName; был запущен автоматически</string>
-    <string name="about_privacy_policy">Ознакомьтесь с нашей политикой конфиденциальности</string>
-    <string name="select_your_country">Выберите вашу страну</string>
-    <string name="sip_address">SIP-адрес</string>
-    <string name="share_uploaded_logs_link">Поделиться ссылкой на журналы с помощью…</string>
-    <string name="app_description">это &lt;i&gt;бесплатный&lt;/i&gt; SIP-клиент</string>
-    <string name="settings">Настройки</string>
-    <string name="quit">Выход</string>
-    <string name="no_missed_call_history">В вашей истории нет пропущенных звонков</string>
-    <string name="no_contact">В адресной книге нет контактов.</string>
-    <string name="contact_send_sms_invite_text">Здравствуйте! Присоединяйтесь ко мне в &appName;! Вы можете загрузить его бесплатно отсюда: %s</string>
-    <string name="contact_delete_one_dialog">Вы хотите удалить этот контакт\?
-\nОн также будет удалён из адресной книги вашего устройства</string>
-    <string name="dialer_address_bar_hint">Введите номер или адрес</string>
-    <string name="no_chat_history">Нет разговоров</string>
-    <string name="chat_event_conference_destroyed">Вы покинули группу</string>
-    <string name="chat_event_admin_unset">%s больше не администратор</string>
-    <string name="chat_security_event_security_level_downgraded">Уровень безопасности снизился из-за %s</string>
-    <string name="recordings_empty_list">Нет записей</string>
-    <string name="call_error_user_not_found">Пользователь не найден</string>
-    <string name="call_error_temporarily_unavailable">Временно недоступно</string>
-    <string name="call_stats_download">Пропускная способность приёма:</string>
-    <string name="call_stats_video_resolution_sent">Разрешение отправленного видео:</string>
-    <string name="call_stats_sender_loss_rate">Коэффициент потерь отправителя:</string>
-    <string name="assistant_welcome_desc">Этот помощник поможет вам настроить и использовать свой SIP-аккаунт.</string>
-    <string name="assistant_phone_number_info_title">Для чего будет использоваться мой номер телефона\?</string>
-    <string name="assistant_phone_number_link_info_content_already_account">Номер телефона можно использовать только с одним аккаунтом &appName;.
-\n
-\nЕсли ваш номер уже был связан с другим аккаунтом, но вы предпочитаете использовать его, просто свяжите его сейчас, и ваш номер будет автоматически перенесён в этот аккаунт.</string>
-    <string name="assistant_linphone_account">Использовать &appName;-аккаунт</string>
-    <string name="assistant_login_with_username">Используйте своё имя пользователя и пароль вместо номера телефона</string>
-    <string name="assistant_login_desc">Введите имя пользователя и пароль с вашим доменом SIP</string>
-    <string name="assistant_create_account_part_email">Введите имя пользователя, адрес электронной почты и пароль для вашего &appName;-аккаунта</string>
-    <string name="chat_event_ephemeral_lifetime_changed">Срок действия недолговечных сообщений: %s</string>
-    <string name="chat_message_pick_file_dialog">Выбрать источник</string>
-    <string name="chat_room_group_info_leave">Покинуть группу</string>
-    <string name="chat_room_group_info_you_are_no_longer_admin">Вы больше не администратор</string>
-    <string name="chat_message_context_menu_copy_text">Скопировать текст</string>
-    <string name="chat_message_forward_confirmation_dialog">Вы хотите переслать сообщение в эту комнату\?</string>
-    <string name="chat_room_choose_conversation_for_message_forward">Выберите или создайте беседу для пересылки сообщения</string>
-    <string name="chat_room_choose_conversation_for_text_sharing">Выберите или создайте беседу, чтобы поделиться текстом</string>
-    <string name="chat_message_context_menu_ephemeral_messages">Недолговечные сообщения</string>
-    <string name="chat_room_ephemeral_messages_desc">Это сообщение будет удалено с обеих сторон после прочтения и по истечении выбранного времени ожидания.</string>
-    <string name="chat_room_delete_many_dialog">Вы уверены, что хотите удалить эти разговоры\?</string>
-    <string name="chat_message_cant_open_file_in_app_dialog_title">Кажется, мы не можем отобразить файл.</string>
-    <string name="chat_message_cant_open_file_in_app_dialog_message">Вы хотите открыть его как текст или экспортировать (в незашифрованном виде) в стороннее приложение\?</string>
-    <string name="chat_message_voice_recording_playback_low_volume">Низкая громкость мультимедиа, возможно, вы захотите её увеличить</string>
-    <string name="assistant_create_account_part_2">Мы отправили SMS-сообщение с кодом подтверждения на ваш номер телефона:</string>
-    <string name="assistant_remote_provisioning_title">Загрузить удалённую конфигурацию</string>
-    <string name="assistant_remote_provisioning_wrong_format">Неизвестный формат URL-адреса, не удаётся загрузить конфигурацию…</string>
-    <string name="settings_primary_account_title">Основной аккаунт</string>
-    <string name="audio_settings_echo_cancellation_summary">Устраняет эхо, слышимое другой стороной</string>
-    <string name="audio_settings_echo_cancellation_calibration_value">Откалибровано за %s мс</string>
-    <string name="audio_settings_echo_tester_summary">Нажмите, чтобы запустить тест эха</string>
-    <string name="audio_settings_adaptive_rate_control_title">Адаптивный контроль скорости</string>
-    <string name="audio_settings_input_device_summary">Изменения вступят в силу начиная со следующего звонка</string>
-    <string name="audio_settings_microphone_gain_title">Усиление микрофона</string>
-    <string name="video_settings_tablet_preview_title">Отображать предпросмотр камеры на номеронабирателе</string>
-    <string name="video_settings_automatically_accept_title">Принимать входящие запросы на видео</string>
-    <string name="video_settings_codecs_title">Кодеки</string>
-    <string name="call_settings_device_ringtone_title">Использовать рингтон устройства</string>
-    <string name="call_settings_system_wide_overlay_summary">Вам будет предложено предоставить разрешение на показ уведомлений поверх окон</string>
-    <string name="call_settings_auto_start_summary">Звонок начнётся автоматически, если запущен из другого приложения</string>
-    <string name="call_settings_redirect_to_voice_mail_declined_calls_title">Перенаправить отклонённые звонки на URI голосовой почты</string>
-    <string name="chat_settings_mark_as_read_notif_dismissal_title">Отметить как прочитанное при закрытии уведомления</string>
-    <string name="chat_settings_auto_download_summary">Загружать или нет прикреплённые файлы в чатах автоматически</string>
-    <string name="chat_settings_downloaded_media_public_summary">Файлов в недолговечных сообщениях не будет, не работает функция автоматической загрузки</string>
-    <string name="chat_settings_hide_notification_content_summary">Будет отображаться только имя отправителя</string>
-    <string name="chat_settings_launcher_shortcuts_title">Создавать ярлыки для чат-комнат в лаунчере</string>
-    <string name="chat_settings_hide_rooms_removed_proxies_summary">Если у вас есть отсутствующие чат-комнаты, попробуйте снять флажок с этого параметра</string>
-    <string name="contacts_settings_native_presence_title">Информация о присутствии в родном контакте</string>
-    <string name="contacts_settings_launcher_shortcuts_title">Создавать ярлыки для контактов в лаунчере</string>
-    <string name="contacts_settings_show_new_contact_account_dialog_summary">Если отключено, контакт будет храниться локально</string>
-    <string name="advanced_settings_dark_mode_label_no">Нет</string>
-    <string name="advanced_settings_device_name_summary">Изменения применятся при следующем запуске</string>
-    <string name="advanced_settings_logs_server_url_summary">Не редактируйте, если не знаете, что делаете!</string>
-    <string name="advanced_settings_disable_fragment_security_title">Отключить безопасный режим пользовательского интерфейса</string>
-    <string name="tunnel_settings_dual_mode_summary">Будет использовать один сервер для выгрузки, а другой - для загрузки</string>
-    <string name="account_settings_user_id_summary">Введите идентификатор аутентификации, если он отличается от имени пользователя (необязательно)</string>
-    <string name="account_settings_disable_title">Отключить</string>
-    <string name="account_settings_push_notification_title">Разрешить push-уведомление</string>
-    <string name="account_settings_avpf_rr_interval_title">AVPF регулярный интервал RTCP</string>
-    <string name="account_settings_apply_prefix_for_calls_title">Применить префикс для исходящих звонков и чата</string>
-    <string name="account_settings_apply_prefix_for_calls_summary">Если введён номер, примените префикс к номеру</string>
-    <string name="notification_channel_service_name">Сервисное уведомление &appName;</string>
-    <string name="notification_channel_chat_name">Уведомления о мгновенных сообщениях &appName;</string>
-    <string name="received_chat_notification_reply_label">Ответить</string>
-    <string name="missed_calls_notification_body" tools:ignore="PluralsCandidate">%d пропущенных звонков</string>
-    <string name="dialog_lime_security_message">Мгновенные сообщения шифруются сквозным шифрованием в защищенных разговорах. Можно повысить уровень безопасности разговора путем аутентификации участников. Для этого позвоните контакту и выполните процедуру аутентификации.</string>
-    <string name="dialog_try_open_file_as_text_body">Хотите попробовать открыть его как обычный текстовый файл\?</string>
-    <string name="content_description_switch_camera">Переключение с передней камеры на заднюю и наоборот</string>
-    <string name="content_description_enable_mic_mute">Выключить микрофон</string>
-    <string name="content_description_enable_speaker">Направить звук на динамик</string>
-    <string name="content_description_show_numpad">Показать цифр. клавиатуру</string>
-    <string name="content_description_use_bluetooth_headset">Использовать bluetooth-гарнитуру в качестве аудиовыхода</string>
-    <string name="content_description_linphone_user">Контакт - это &appName;-пользователь</string>
-    <string name="content_description_show_all_contacts">Показать список всех контактов</string>
-    <string name="content_description_continue_chat_room_creation">Перейти к завершающему этапу создания чат-комнаты</string>
-    <string name="content_description_show_chat_room_menu">Показать меню чат-комнаты</string>
-    <string name="content_description_attach_file">Прикрепить файл к сообщению</string>
-    <string name="content_description_toggle_participant_devices_list">Показать или скрыть устройства участников</string>
-    <string name="content_description_remove_contact_from_chat_room">Удалить контакт из беседы</string>
-    <string name="content_description_contact_can_do_encryption">Контакт может быть приглашён в зашифрованные разговоры</string>
-    <string name="content_description_change_contact_picture">Изменить картинку контакта</string>
-    <string name="content_description_unselect_all">Отменить выбор всех элементов в списке</string>
-    <string name="content_description_recording_toggle_play">Воспроизвести или приостановить запись</string>
-    <string name="content_description_toggle_side_menu">Показать или скрыть боковое меню</string>
-    <string name="content_description_menu_contacts">Контакты</string>
-    <string name="content_description_menu_dialer">Номеронабиратель</string>
-    <string name="content_description_menu_chat">Разговоры</string>
-    <string name="content_description_show_missed_calls">Показывать только пропущенные звонки</string>
-    <string name="content_description_call_quality_0">Очень низкое качество связи</string>
-    <string name="content_description_call_not_secured">Звонок не защищён</string>
-    <string name="content_description_chat_message_video_attachment">Вложение видео</string>
-    <string name="content_description_export">Открыть файл в стороннем приложении</string>
-    <string name="call_settings_accept_early_media_title">Принимать ранний поток</string>
-    <string name="call_settings_ring_during_early_media_title">Звонок во время входящего раннего потока</string>
-    <string name="call_settings_use_telecom_manager_title">Улучшение взаимодействия с устройствами bluetooth</string>
-    <string name="call_settings_use_telecom_manager_summary">Требуются некоторые дополнительные разрешения</string>
-    <string name="no_conference_call_history">В вашей истории нет звонков встреч</string>
-    <string name="contact_cant_be_deleted">Этот контакт нельзя удалить</string>
-    <string name="contacts_ldap_query_more_results_available">Доступно больше результатов, уточните параметры поиска</string>
-    <string name="dialer_transfer_succeded">Звонок переводится</string>
-    <string name="dialer_transfer_failed">Не могу перевести звонок</string>
-    <string name="chat_message_removal_info">Сообщение будет удалено</string>
-    <string name="chat_message_abort_removal">Прервать</string>
-    <string name="conference_schedule_participants_list">Список участников</string>
-    <string name="conference_schedule_summary">Информация встречи</string>
-    <string name="conference_schedule_start">Запланировать конференцию</string>
-    <string name="conference_schedule_address_copied_to_clipboard">Адрес встречи скопирован в буфер обмена</string>
-    <string name="conference_schedule_info_not_sent_to_participant">Не удалось отправить информацию о встречи участнику</string>
-    <string name="conference_paused_title">В настоящее время вы вне встречи.</string>
-    <string name="conference_paused_subtitle">Нажмите на кнопку воспроизведения, чтобы присоединиться к ней обратно.</string>
-    <string name="conference_local_title">Местный групповой звонок</string>
-    <string name="conference_invite_title">Приглашение на встречу:</string>
-    <string name="conference_description_title">Описание</string>
-    <string name="conference_too_many_participants_for_mosaic_layout">Слишком много участников для мозаичной раскладки, переключение на активный динамик</string>
-    <string name="conference_invitation">Приглашение на встречу</string>
-    <string name="conference_low_bandwidth">Обнаружена низкая пропускная способность, отключение видео</string>
-    <string name="call_action_participants_list">Список участников</string>
-    <string name="call_action_calls_list">Список звонков</string>
-    <string name="call_remote_recording">Этот звонок записывается.</string>
-    <string name="call_remotely_paused_title">Звонок был приостановлен удалённо.</string>
-    <string name="audio_settings_prefer_bluetooth_devices_title">Направить звук на устройство Bluetooth, если таковое имеется</string>
-    <string name="call_settings_remote_recording_title">Получать уведомления, когда звонок записывается вашим собеседником</string>
-    <string name="contacts_settings_ldap_auth_method_title">Метод аутентификации</string>
-    <string name="contacts_settings_ldap_auth_method_anonymous">Анонимный</string>
-    <string name="contacts_settings_ldap_cert_check_auto">Авто</string>
-    <string name="contacts_settings_ldap_cert_check_disabled">Отключено</string>
-    <string name="contacts_settings_ldap_cert_check_enabled">Включено</string>
-    <string name="contacts_settings_ldap_search_title">Поиск</string>
-    <string name="contacts_settings_ldap_search_base_title">База поиска</string>
-    <string name="contacts_settings_ldap_search_filter_title">Фильтр</string>
-    <string name="contacts_settings_ldap_search_max_results_title">Максимальные результаты</string>
-    <string name="contacts_settings_ldap_request_delay_title">Задержка между двумя запросами</string>
-    <string name="contacts_settings_ldap_request_delay_subtitle">В миллисекундах</string>
-    <string name="contacts_settings_ldap_minimum_characters_title">Минимум символов для начала запроса</string>
-    <string name="contacts_settings_ldap_parsing_title">Парсинг</string>
-    <string name="contacts_settings_ldap_name_attribute_title">Атрибуты имени</string>
-    <string name="content_description_go_to_chat_rooms_list">Перейти к списку разговоров</string>
-    <string name="content_description_conference_participant_mic_muted">У участника отключен микрофон</string>
-    <string name="content_description_toggle_layout_menu">Показать или скрыть меню макета группового звонка</string>
-    <string name="content_description_participant_is_paused">Участник на мгновение покинул групповой звонок</string>
-    <string name="chat_message_download_already_in_progress">Пожалуйста, дождитесь завершения первой загрузки, прежде чем начинать новую</string>
-    <string name="conference_organizer">Организатор</string>
-    <string name="conference_default_title">Удалённый групповой звонок</string>
-    <string name="call_action_chat">Чат</string>
-    <string name="contacts_settings_create_new_ldap_config_title">Новая конфигурация LDAP</string>
-    <string name="contacts_settings_ldap_title">LDAP</string>
-    <string name="contacts_settings_ldap_enable_title">Включить</string>
-    <string name="contacts_settings_ldap_delete_title">Удалить</string>
-    <string name="contacts_settings_ldap_connection_title">Подключение</string>
-    <string name="contacts_settings_ldap_server_title">URL-сервера</string>
-    <string name="contacts_settings_ldap_bind_dn_title">Имя для подключения</string>
-    <string name="contacts_settings_ldap_password_title">Пароль</string>
-    <string name="account_setting_conference_factory_address">URI фабрики конференции</string>
-    <string name="account_setting_audio_video_conference_factory_address">URI фабрики аудио/видео конференции</string>
-    <string name="conferences_settings_layout_title">Макет по умолчанию</string>
-    <string name="content_description_delete_conference">Удалить встречу</string>
-    <string name="conference">Встреча</string>
-    <string name="conference_schedule_mandatory_field">Обязательно</string>
-    <string name="conference_schedule_subject_title">Тема</string>
-    <string name="conference_schedule_subject_hint">Тема встречи</string>
-    <string name="conference_schedule_address_title">Адрес встречи</string>
-    <string name="conference_schedule_description_title">Добавить описание</string>
-    <string name="conference_schedule_description_hint">Описание</string>
-    <string name="conference_schedule_date">Дата</string>
-    <string name="conference_schedule_time">Время</string>
-    <string name="conference_schedule_duration">Продолжительность</string>
-    <string name="conference_schedule_timezone">Часовой пояс</string>
-    <string name="conference_schedule_send_invite_chat">Отправить приглашение через &appName;</string>
-    <string name="conference_schedule_send_invite_email">Отправить приглашение через эл. почту</string>
-    <string name="conference_schedule_encryption">Хотите зашифровать встречу\?</string>
-    <string name="conference_schedule_send_invite_chat_summary">Приглашение будет отправлено из моего &appName;-аккаунта</string>
-    <string name="conference_participant_paused">(пауза)</string>
-    <string name="conference_no_schedule">Пока нет запланированной встречи.</string>
-    <string name="conference_schedule_organizer">Организатор:</string>
-    <string name="conference_go_to_chat">Чат-комната встречи</string>
-    <string name="conference_creation_failed">Не удалось создать встречу</string>
-    <string name="conference_admin_set">%s - сейчас администратор</string>
-    <string name="conference_admin_unset">%s больше не администратор</string>
-    <string name="conference_schedule_info_created">Встреча была запланирована</string>
-    <string name="conference_scheduled_delete_one_dialog">Вы действительно хотите удалить эту встречу\?</string>
-    <string name="conference_info_removed">Информация о встречи удалена</string>
-    <string name="contacts_settings_ldap_auth_method_simple">Простой</string>
-    <string name="contacts_settings_ldap_tls_title">Использовать TLS</string>
-    <string name="contacts_settings_ldap_cert_check_title">Проверить сертификаты</string>
-    <string name="content_description_take_screenshot">Сделать скриншот полученного видео</string>
-    <string name="content_description_create_conference">Создать встречу-звонок</string>
-    <string name="content_description_copy_conference_address">Скопировать адрес встречи</string>
-    <string name="content_description_edit_conference">Редактировать встречу</string>
-    <string name="content_description_encrypted_conference">Встреча будет зашифрована</string>
-    <string name="content_description_share_ics">Экспорт события в календарь</string>
-    <string name="content_description_hide_statistics">Скрыть статистику звонков</string>
-    <string name="content_description_hide_numpad">Скрыть цифр. клавиатуру</string>
-    <string name="call_context_action_answer">Ответить на звонок</string>
-    <string name="assistant_generic_account_warning">Для некоторых функций требуется аккаунт &appName;, таких как групповой обмен сообщениями или недолговечные сообщения.
-\n
-\nЭти функции скрыты, когда вы регистрируетесь со сторонним SIP-аккаунтом.
-\n
-\nЧтобы включить их в коммерческом проекте, свяжитесь с нами.</string>
-    <string name="assistant_generic_account_warning_continue_button_text">Я понимаю</string>
-    <string name="about_weblate_translation">Помогите нам перевести &appName;</string>
-    <string name="call_action_numpad">Цифр. клавиатура</string>
-    <string name="call_action_change_conf_layout">Изменить макет</string>
-    <string name="call_action_statistics">Статистика звонков</string>
-    <string name="call_action_transfer_call">Перевод звонка</string>
-    <string name="call_context_action_resume">Возобновить звонок</string>
-    <string name="call_context_action_pause">Приостановить звонок</string>
-    <string name="call_context_action_transfer">Перевод звонка</string>
-    <string name="call_context_action_hangup">Прервать звонок</string>
-    <string name="call_locally_paused_title">Вы приостановили звонок.</string>
-    <string name="call_locally_paused_subtitle">Нажмите на кнопку воспроизведения, чтобы возобновить его.</string>
-    <string name="settings_conferences_title">Встречи</string>
-    <string name="contacts_settings_ldap_search_timeout_title">Тайм-аут</string>
-    <string name="contacts_settings_ldap_search_timeout_subtitle">В секундах</string>
-    <string name="contacts_settings_ldap_sip_attribute_title">SIP-атрибуты</string>
-    <plurals name="chat_room_unread_messages_event">
-        <item quantity="one">%1$d непрочитанное сообщение</item>
-        <item quantity="few">%1$d непрочитанных сообщения</item>
-        <item quantity="many">%1$d непрочитанных сообщений</item>
-        <item quantity="other">%1$d непрочитанных сообщений</item>
-    </plurals>
-    <string name="conference_invite_join">Присоединиться</string>
-    <string name="conference_invite_participants_count" tools:ignore="PluralsCandidate">%d участников</string>
-    <string name="conference_display_mode_mosaic">Мозаичный режим</string>
-    <string name="conference_display_mode_active_speaker">Режим активного динамика</string>
-    <string name="conference_empty">В настоящее время вы один на этом групповом звонке</string>
-    <string name="conference_invitation_received_notification">Вас пригласили на встречу</string>
-    <string name="call_settings_ringtones_title">Рингтон</string>
-    <string name="contacts_settings_ldap_search_base_subtitle">Не должно быть пусто!</string>
-    <string name="contacts_settings_ldap_sip_domain_title">Домен</string>
-    <string name="contacts_settings_ldap_misc_title">Разное</string>
-    <string name="contacts_settings_ldap_debug_title">Отладка</string>
-    <string name="content_descripton_scroll_to_bottom">Прокрутить вниз или к первому непрочитанному сообщению</string>
-    <string name="content_description_call_context_menu">Открыть контекстное меню звонка</string>
-    <string name="conference_display_mode_audio_only">Режим только аудио</string>
-    <string name="conference_waiting_room_start_call">Начать</string>
-    <string name="conference_waiting_room_cancel_call">Отмена</string>
-    <string name="conference_waiting_room_video_disabled">Видео сейчас отключено</string>
-    <string name="conference_scheduled">Встречи</string>
-    <string name="conference_layout_too_many_participants_for_mosaic">Вы не можете изменить макет группового звонка, так как слишком много участников</string>
-    <string name="call_action_add_call">Начать новый звонок</string>
-    <string name="conference_last_user">Все другие участники покинули групповой звонок</string>
-    <string name="content_description_conference_participants">Участники группового звонка</string>
-    <string name="conference_first_to_join">Вы первый, кто присоединился к групповому звонку</string>
-    <string name="content_description_toggle_conference_info_details">Переключить видимость сведений о встречи</string>
-    <string name="conference_incoming_title">Входящий групповой звонок</string>
-    <string name="conference_schedule_title">Запланировать встречу</string>
-    <string name="conference_schedule_later">Вы хотите запланировать встречу на потом\?</string>
-    <string name="conference_group_call_subject_hint">Предмет группового звонка</string>
-    <string name="conference_group_call_create">Начать групповой звонок</string>
-    <string name="conference_group_call_summary">Информация группового звонка</string>
-    <string name="conference_participants_title">Участники (%d)</string>
-    <string name="conference_group_call_title">Начать групповой звонок</string>
-    <string name="incoming_group_call_notification_title">Входящий групповой звонок</string>
-    <string name="chat_room_context_menu_go_to_contact">Перейти к контакту</string>
-    <string name="chat_message_context_menu_turn_off_notifications">Отключить уведомления</string>
-    <string name="conference_schedule_send_updated_invite_chat">Отправить обновление через &appName;</string>
-    <string name="conference_schedule_send_updated_invite_email">Отправить обновление по электронной почте</string>
-    <string name="call_stats_media_encryption">Шифрование медиа:</string>
-    <string name="call_stats_zrtp_key_agreement_algo">Алгоритм согласования ключей:</string>
-    <string name="assistant_create_email_account_not_validated">Ваша учетная запись еще не активирована, пожалуйста, перейдите по ссылке, которую вы получили по электронной почте</string>
-    <string name="settings_password_protection_dialog_title">Пожалуйста, введите свой пароль ниже, чтобы получить доступ к настройкам</string>
-    <string name="settings_password_protection_dialog_invalid_input">Неверный пароль!</string>
-    <string name="account_setting_end_to_end_encryption_keys_server_url">URL сервера ключей шифрования E2E</string>
-    <string name="account_setting_delete_generic_confirmation_dialog">Ваша учетная запись будет удалена только локально.
-\nЧтобы удалить её навсегда, перейдите на веб-сайт вашего SIP-провайдера.</string>
-    <string name="dialog_apply_remote_provisioning_title">Вы хотите загрузить и применить конфигурацию с этого URL-адреса\?</string>
-    <string name="dialog_authentication_required_title">Требуется аутентификация</string>
-    <string name="dialog_authentication_required_change_password_label">Подтвердить</string>
-    <string name="android_14_full_screen_intent_permission_not_granted">Разрешение, необходимое для отображения входящих вызовов, еще не предоставлено</string>
-    <string name="content_description_muted_chat_room">Уведомления для этого разговора отключены</string>
-    <string name="content_description_presence_online">Пользователь в сети</string>
-    <string name="conference_no_terminated_schedule">Завершенных встреч пока нет.</string>
-    <string name="conference_start_group_call_dialog_message">Хотите начать групповой звонок\?
-\nВсе участники этой группы получат приглашение присоединиться к встрече.</string>
-    <string name="assistant_no_push_warning">Похоже, ваше устройство не может получать push-уведомления.
-\n
-\nПоскольку теперь они требуются для процесса создания учетной записи, вы не сможете создать учетную запись внутри приложения, но вы можете создать ее на нашем веб-сайте:</string>
-    <string name="dialog_authentication_required_message">Ошибка подключения, так как аутентификация отсутствует или недействительна для учетной записи
-\n%s.
-\n
-\nВы можете ввести пароль еще раз или проверить конфигурацию своей учетной записи в настройках.</string>
-    <string name="call_action_attended_transfer_call">Сопровождаемый перевод</string>
-    <string name="call_settings_media_encryption_zrtp_post_quantum">Постквантовый ZRTP</string>
-    <string name="account_setting_disable_bundle_mode_title">Отключить режим объединения</string>
-    <string name="assistant_alternative_way_create_account">Чтобы создать учетную запись с помощью электронной почты:</string>
-    <string name="zrtp_dialog_explanation">Для повышения уровня безопасности вы можете уточнить следующие коды у своего собеседника.</string>
-    <string name="chat_room_last_message_sender_format">%s:</string>
-    <string name="content_description_emoji_picker">Переключить видимость выбора эмодзи</string>
-    <string name="zrtp_dialog_later_button_label">Позже</string>
-    <string name="zrtp_dialog_correct_button_label">Верно</string>
-    <string name="content_description_recording_export">Экспорт записи</string>
-    <string name="android_14_go_to_full_screen_intent_permission_setting">Показать</string>
-    <string name="content_description_chat_message_meeting_attachment">Приложение к собранию</string>
-    <string name="content_description_presence_offline">Пользователь не в сети</string>
-    <string name="content_description_presence_do_not_disturb">Пользователь просит не беспокоить</string>
-    <string name="error_unexpected">Непредвиденная ошибка…</string>
-    <string name="chat_message_context_menu_turn_on_notifications">Включить уведомления</string>
-    <string name="chat_message_voice_recording_received_notification">Вы получили голосовое сообщение</string>
-    <string name="chat_message_voice_recording">Голосовое сообщение</string>
-    <string name="chat_room_presence_online">Онлайн</string>
-    <string name="chat_room_presence_last_seen_online_today">Онлайн сегодня в</string>
-    <string name="chat_room_presence_last_seen_online_yesterday">Онлайн вчера в</string>
-    <string name="chat_room_presence_last_seen_online">Онлайн в</string>
-    <string name="chat_room_presence_away">Далеко</string>
-    <string name="chat_room_presence_do_not_disturb">Не беспокоить</string>
-    <string name="recordings_export">Экспорт записи с помощью…</string>
-    <string name="conference_schedule_edit">Редактировать встречу</string>
-    <string name="conference_update_title">Встреча обновлена:</string>
-    <string name="conference_cancel_title">Встреча отменена:</string>
-    <string name="conference_start_group_call_dialog_ok_button">Начать</string>
-    <string name="conference_scheduled_terminated_filter">Завершенный</string>
-    <string name="conference_scheduled_future_filter">Запланированный</string>
-    <string name="conference_scheduled_delete_many_dialog">Вы хотите удалить эти встречи\?</string>
-    <string name="conference_scheduled_cancelled_by_organizer">Конференция отменена организатором</string>
-    <string name="conference_scheduled_cancelled_by_me">Вы отменили конференцию</string>
-    <string name="conference_start_group_call_dialog_title">Групповой звонок</string>
-    <string name="call_screenshot_taken">Снимок сделан: %s</string>
-    <string name="call_stats_zrtp_cipher_algo">Алгоритм шифрования:</string>
-    <string name="call_stats_zrtp_hash_algo">Алгоритм хэширования:</string>
-    <string name="call_stats_zrtp_auth_tag_algo">Алгоритм аутентификации:</string>
-    <string name="call_stats_zrtp_sas_algo">Алгоритм SAS:</string>
-    <string name="settings_password_protection_dialog_input_hint">Пароль</string>
-    <string name="audio_settings_software_echo_cancellation_title">Программное подавление эха</string>
-    <string name="settings_password_protection_dialog_ok_label">Подтвердить</string>
-    <string name="account_setting_delete_dialog_title">Вы хотите удалить свою учетную запись\?</string>
-    <string name="account_setting_delete_sip_linphone_org_confirmation_dialog">Ваша учетная запись будет удалена только локально.
-\nЧтобы удалить её навсегда, перейдите на нашу платформу управления учетными записями:</string>
-    <string name="account_setting_publish_presence_title">Опубликовать информацию о присутствии</string>
-    <string name="dialog_apply_remote_provisioning_button">Применить</string>
-    <string name="assistant_error_invalid_international_prefix">Неправильный международный префикс</string>
-    <string name="yes">Да</string>
-    <string name="no">Нет</string>
-    <string name="contacts_new_contact_wont_be_visible_warning_dialog">Вы собираетесь создать новый контакт без SIP URI и номера телефона, поэтому он не будет отображаться в &appName;.
-\n
-\nВы все равно хотите его создать\?</string>
-    <string name="chat_message_voice_recording_notification_short_desc">голосовое сообщение</string>
-    <string name="chat_message_reaction_received">Реакции в чате</string>
-    <string name="chat_message_one_reaction">%s реакция</string>
-    <string name="chat_message_many_reactions">%s реакции</string>
-    <string name="conference_invitation_notification_short_desc">приглашение на встречу</string>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-sw533dp/bools.xml b/app/src/main/res/values-sw533dp/bools.xml
deleted file mode 100644
index 8e66f10e8..000000000
--- a/app/src/main/res/values-sw533dp/bools.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <bool name="isTablet">true</bool>
-</resources>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
deleted file mode 100644
index 7ab3e9979..000000000
--- a/app/src/main/res/values-uk/strings.xml
+++ /dev/null
@@ -1,366 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE resources [
-<!ENTITY appName "Linphone">
-]>
-<resources xmlns:tools="http://schemas.android.com/tools">
-    <string name="service_description">Це потрібно для отримання дзвінків у фоновому режимі</string>
-    <string name="sync_account_name">&appName; контакти</string>
-    <string name="logs_upload_failure">Не вдалося завантажити журнали!</string>
-    <string name="logs_reset_complete">Журнали очищено</string>
-    <string name="phone_number">Телефонний номер</string>
-    <string name="phone_numbers">Номери телефонів</string>
-    <string name="select_your_country">Виберіть вашу країну</string>
-    <string name="assistant_choose_country_title">Назва або префікс країни</string>
-    <string name="username">Ім\'я користувача</string>
-    <string name="password">Пароль</string>
-    <string name="email">Email</string>
-    <string name="domain">Домен</string>
-    <string name="sip_address">SIP адреса</string>
-    <string name="sip_addresses">SIP адреси</string>
-    <string name="cancel">Скасувати</string>
-    <string name="share_uploaded_logs_link">Поділитися посиланням на журнали за допомогою…</string>
-    <string name="today">Сьогодні</string>
-    <string name="yesterday">Вчора</string>
-    <string name="transport_tcp">TCP</string>
-    <string name="transport_tls">TLS</string>
-    <string name="no_account_configured">Обліковий запис не налаштовано</string>
-    <string name="about">Про</string>
-    <string name="settings">Налаштування</string>
-    <string name="history_calls_list">Дзвінки</string>
-    <string name="no_missed_call_history">Немає пропущених дзвінків у вашій історії</string>
-    <string name="history_delete_many_dialog">Ви бажаєте видалити ці записи\?</string>
-    <string name="contact_invite_friend">Запросити</string>
-    <string name="no_sip_contact">У вашій адресній книзі немає SIP-контактів.</string>
-    <string name="contact_filter_hint">Пошук контактів</string>
-    <string name="contact_first_name">Ім\'я</string>
-    <string name="contact_organization">Організація</string>
-    <string name="contact_delete_many_dialog">Ви впевнені, що хочете видалити ці контакти\?
-\n Їх також буде видалено з адресної книги вашого пристрою</string>
-    <string name="contact_local_sync_account">Зберігати локально</string>
-    <string name="contact_cant_be_deleted">Цей контакт не можна видалити</string>
-    <string name="dialer_address_bar_hint">Введіть номер або адресу</string>
-    <string name="debug_popup_title">Налагодження</string>
-    <string name="debug_popup_enable_logs">Увімкнути журнали</string>
-    <string name="debug_popup_show_config_file">Переглянути конфігураційний файл</string>
-    <string name="dialer_transfer_failed">Не вдається перевести виклик</string>
-    <string name="chat_remote_is_composing">Віддалено записується…</string>
-    <string name="chat_event_conference_created">Ви приєдналися до групи</string>
-    <string name="chat_event_conference_destroyed">Ви залишили групу</string>
-    <string name="chat_event_participant_added">%s приєднався</string>
-    <string name="chat_event_device_added">новий пристрій для %s</string>
-    <string name="chat_event_device_removed">пристрій для %s видалено</string>
-    <string name="chat_event_subject_changed">нова тема: %s</string>
-    <string name="chat_event_admin_set">%s адміністратор</string>
-    <string name="chat_security_event_lime_identity_key_changed">Ключ ідентифікації LIME змінено для %s</string>
-    <string name="chat_security_event_man_in_the_middle_detected">Виявлено \"MITM\" атаку для %s</string>
-    <string name="chat_security_event_participant_max_count_exceeded">Максимальна кількість учасників перевищена на %s</string>
-    <string name="chat_event_ephemeral_disabled">Ви вимкнули ефемерні повідомлення</string>
-    <string name="chat_message_download_file">Завантажити</string>
-    <string name="chat_message_pick_file_dialog">Виберіть джерело</string>
-    <string name="chat_room_devices_fragment_title">Комунікативні пристрої</string>
-    <string name="chat_room_group_info_title">Інформація</string>
-    <string name="chat_room_group_info_participants">Учасники</string>
-    <string name="chat_room_group_info_subject_hint">Назвіть групу</string>
-    <string name="chat_room_group_info_leave">Вийти з групи</string>
-    <string name="chat_room_group_info_leave_dialog_button">Залишати</string>
-    <string name="chat_room_group_info_you_are_now_admin">Ви тепер адмін</string>
-    <string name="chat_message_imdn_info">Статус доставки</string>
-    <string name="chat_message_imdn_delivered">Доставлено</string>
-    <string name="chat_message_imdn_undelivered">Не доставлено</string>
-    <string name="chat_message_forwarded">Переслано</string>
-    <string name="chat_message_replied">Відповісти</string>
-    <string name="chat_message_context_menu_reply">Відповісти</string>
-    <string name="chat_message_context_menu_imdn_info">Статус доставки</string>
-    <string name="chat_message_forward_confirmation_dialog">Ви бажаєте переслати повідомлення в цій кімнаті\?</string>
-    <string name="chat_room_choose_conversation_for_text_sharing">Виберіть або створіть бесіду, щоб поділитися текстом</string>
-    <string name="chat_room_context_menu_group_info">Інформація про групу</string>
-    <string name="chat_room_context_menu_go_to_contact">Перейти до контакту</string>
-    <string name="chat_message_context_menu_delete_messages">Видалити повідомлення</string>
-    <string name="chat_message_context_menu_turn_off_notifications">Вимкнути сповіщення</string>
-    <string name="chat_message_context_menu_turn_on_notifications">Увімкнути сповіщення</string>
-    <string name="chat_room_ephemeral_fragment_title">Тимчасові повідомлення</string>
-    <string name="chat_room_ephemeral_message_one_day">1 день</string>
-    <string name="chat_room_ephemeral_message_three_days">3 дні</string>
-    <plurals name="chat_room_remote_composing">
-        <item quantity="one">%s пише…</item>
-        <item quantity="few">%s пишуть…</item>
-        <item quantity="many"></item>
-        <item quantity="other"></item>
-    </plurals>
-    <string name="chat_room_creation_failed_snack">Не вдалося створити чат-кімнату</string>
-    <string name="chat_room_delete_one_dialog">Ви впевнені, що хочете видалити цю розмову\?</string>
-    <string name="chat_room_delete_many_dialog">Ви впевнені, що хочете видалити ці розмови\?</string>
-    <string name="chat_message_notification_hidden_content">&lt;Відредаговано&gt;</string>
-    <string name="chat_bubble_cant_open_enrypted_file">Не вдається відкрити зашифрований файл у вікні чату</string>
-    <string name="chat_message_cant_open_file_in_app_dialog_title">Здається, ми не можемо відобразити файл.</string>
-    <string name="chat_message_cant_open_file_in_app_dialog_export_button">Експорт</string>
-    <string name="chat_message_cant_open_file_in_app_dialog_open_as_text_button">Відкрити як текст</string>
-    <string name="chat_room_sending_reply_hint">Відповісти</string>
-    <string name="chat_room_sending_message_hint">Повідомлення</string>
-    <plurals name="chat_room_unread_messages_event">
-        <item quantity="one">%1$d непрочитане повідомлення</item>
-        <item quantity="few">%1$d непрочитаних повідомлень</item>
-        <item quantity="many">%1$d непрочитаних повідомлень</item>
-        <item quantity="other">%1$d непрочитаних повідомлень</item>
-    </plurals>
-    <string name="chat_message_removal_info">Повідомлення буде видалено</string>
-    <string name="chat_message_abort_removal">Перервати</string>
-    <string name="recordings_empty_list">Немає записів</string>
-    <string name="recordings_export">Експортувати запис за допомогою…</string>
-    <string name="conference">Зустріч</string>
-    <string name="conference_schedule_title">Запланувати зустріч</string>
-    <string name="conference_group_call_title">Розпочати груповий виклик</string>
-    <string name="conference_schedule_subject_title">Тема</string>
-    <string name="conference_schedule_subject_hint">Тема зустрічі</string>
-    <string name="conference_group_call_subject_hint">Тема групового дзвінка</string>
-    <string name="conference_schedule_address_title">Адреса зустрічі</string>
-    <string name="conference_schedule_description_hint">Опис</string>
-    <string name="conference_schedule_date">Дата</string>
-    <string name="conference_schedule_time">Час</string>
-    <string name="conference_schedule_timezone">Часовий пояс</string>
-    <string name="conference_schedule_send_invite_chat_summary">Запрошення буде надіслано з мого &appName; акаунту</string>
-    <string name="conference_group_call_summary">Інформація про груповий дзвінок</string>
-    <string name="conference_schedule_start">Призначити зустріч</string>
-    <string name="conference_group_call_create">Розпочати груповий виклик</string>
-    <string name="conference_schedule_info_not_sent_to_participant">Не вдалося надіслати інформацію про зустріч учаснику</string>
-    <string name="conference_paused_title">Зараз ви поза зустріччю.</string>
-    <string name="conference_default_title">Віддалений груповий виклик</string>
-    <string name="conference_invite_title">Запрошення на зустріч:</string>
-    <string name="conference_description_title">Опис</string>
-    <string name="conference_invite_join">Приєднатися</string>
-    <string name="conference_invite_participants_count" tools:ignore="PluralsCandidate">%d учасників</string>
-    <string name="conference_display_mode_audio_only">Режим лише аудіо</string>
-    <string name="conference_waiting_room_start_call">Старт</string>
-    <string name="conference_waiting_room_cancel_call">Скасувати</string>
-    <string name="conference_waiting_room_video_disabled">Відео наразі вимкнено</string>
-    <string name="conference_too_many_participants_for_mosaic_layout">Забагато учасників для мозаїчної розкладки, перехід до активного доповідача</string>
-    <string name="conference_participant_paused">(пауза)</string>
-    <string name="conference_no_schedule">Ще немає запланованої зустрічі.</string>
-    <string name="conference_schedule_organizer">Організатор:</string>
-    <string name="conference_go_to_chat">Чат-кімната зустрічі</string>
-    <string name="conference_creation_failed">Не вдалося створити зустріч</string>
-    <string name="conference_admin_set">%s тепер адміністратор</string>
-    <string name="conference_admin_unset">%s більше не адміністратор</string>
-    <string name="conference_empty">Наразі ви один у цьому груповому виклику</string>
-    <string name="conference_invitation_received_notification">Вас запросили на зустріч</string>
-    <string name="conference_invitation">Запрошення на зустріч</string>
-    <string name="conference_first_to_join">Ви перший, хто приєднався до групового виклику</string>
-    <string name="conference_last_user">Усі інші учасники залишили груповий виклик</string>
-    <string name="conference_participants_title">Учасники (%d)</string>
-    <string name="conference_start_group_call_dialog_ok_button">Старт</string>
-    <string name="conference_scheduled_terminated_filter">Припинено</string>
-    <string name="conference_scheduled_future_filter">За розкладом</string>
-    <string name="call_incoming_title">Вхідний виклик</string>
-    <string name="call_outgoing_title">Вихідний дзвінок</string>
-    <string name="call_notification_outgoing">Вихідний дзвінок</string>
-    <string name="call_error_user_not_found">Користувача не знайдено</string>
-    <string name="call_error_network_unreachable">Мережа недоступна</string>
-    <string name="call_error_io_error">Служба недоступна або помилка мережі</string>
-    <string name="call_error_server_timeout">Час очікування сервера</string>
-    <string name="call_error_generic">Помилка: %s</string>
-    <string name="call_video_update_requested_dialog">Співрозмовник хоче увімкнути відео</string>
-    <string name="call_action_chat">Чат</string>
-    <string name="call_action_calls_list">Список дзвінків</string>
-    <string name="call_action_numpad">цифрова клавіатура</string>
-    <string name="call_action_change_conf_layout">Змінити макет</string>
-    <string name="call_action_add_call">Розпочати новий виклик</string>
-    <string name="call_action_transfer_call">Перевести дзвінок</string>
-    <string name="call_context_action_pause">Призупинити виклик</string>
-    <string name="call_context_action_transfer">Перевести дзвінок</string>
-    <string name="call_context_action_answer">Відповісти на дзвінок</string>
-    <string name="call_context_action_hangup">Завершити виклик</string>
-    <string name="call_remotely_paused_title">Дзвінок віддалено призупинено.</string>
-    <string name="call_locally_paused_title">Ви призупинили виклик.</string>
-    <string name="call_stats_audio">Аудіо</string>
-    <string name="call_stats_video">Відео</string>
-    <string name="call_stats_ip">Родина IP:</string>
-    <string name="call_stats_download">Пропускна здатність завантаження:</string>
-    <string name="call_stats_ice">Підключення ICE:</string>
-    <string name="call_stats_video_resolution_sent">Роздільна здатність надісланого відео:</string>
-    <string name="call_stats_video_resolution_received">Роздільна здатність отриманого відео:</string>
-    <string name="call_stats_video_fps_sent">FPS надісланого відео:</string>
-    <string name="call_stats_sender_loss_rate">Втрати відправника:</string>
-    <string name="call_stats_jitter_buffer">Буфер джиттера:</string>
-    <string name="call_stats_encoder_name">Кодер:</string>
-    <string name="call_stats_decoder_name">Декодер:</string>
-    <string name="call_stats_capture_filter">Фільтр захоплення:</string>
-    <string name="call_stats_media_encryption">Шифрування медіа:</string>
-    <string name="call_stats_zrtp_cipher_algo">Алгоритм шифрування:</string>
-    <string name="call_stats_zrtp_hash_algo">Алгоритм хешування:</string>
-    <string name="call_stats_zrtp_sas_algo">Алгоритм SAS:</string>
-    <string name="assistant_create_account">Створити акаунт</string>
-    <string name="assistant_login_linphone">Використовуйте &appName; акаунт</string>
-    <string name="assistant_login_generic">Використовуйте обліковий запис SIP</string>
-    <string name="assistant_remote_provisioning">Отримати віддалену конфігурацію</string>
-    <string name="assistant_ec_calibration">Виконується калібрування ехокомпенсатора</string>
-    <string name="assistant_general_terms">умови використання</string>
-    <string name="assistant_read_and_agree_terms">Я приймаю %1$s і %2$s Belledonne Communications</string>
-    <string name="assistant_generic_account_warning_continue_button_text">Я розумію</string>
-    <string name="assistant_error_username_already_exists">Ім\'я користувача вже використовується</string>
-    <string name="assistant_error_username_invalid_characters">Знайдено недійсні символи</string>
-    <string name="assistant_error_passwords_dont_match">Паролі не співпадають</string>
-    <string name="assistant_error_invalid_email_address">Адреса електронної пошти недійсна</string>
-    <string name="assistant_error_username_too_long">Ім\'я користувача містить забагато символів</string>
-    <string name="assistant_linphone_login_desc">Введіть своє ім’я користувача та пароль для &appName; акаунту</string>
-    <string name="assistant_login_forgotten_password">Забули свій пароль\?</string>
-    <string name="assistant_login">Логін</string>
-    <string name="assistant_confirmation_code">Код підтвердження</string>
-    <string name="assistant_continue_even_if_credentials_invalid">Продовжити</string>
-    <string name="assistant_login_desc">Будь ласка, введіть своє ім’я користувача та пароль із доменом SIP</string>
-    <string name="assistant_display_name_optional">Відображуване ім\'я (необов\'язково)</string>
-    <string name="assistant_confirm_password">Підтвердження паролю</string>
-    <string name="assistant_validate_account_2">Після завершення, поверніться сюди та натисніть кнопку.</string>
-    <string name="assistant_use_username_instead_or_phone_number">Використовуйте ім\'я користувача (необов\'язково)</string>
-    <string name="assistant_create_account_part_3">Щоб підтвердити номер телефону, введіть 4-значний код нижче:
-\n</string>
-    <string name="assistant_link_phone_number_skip">Пропустити</string>
-    <string name="assistant_link_account">Пов’язати обліковий запис</string>
-    <string name="assistant_remote_provisioning_title">Отримати віддалену конфігурацію</string>
-    <string name="assistant_remote_provisioning_url">URL</string>
-    <string name="assistant_remote_provisioning_failure">Не вдалося завантажити або застосувати профіль віддаленої конфігурації…</string>
-    <string name="content_description_recording_export">Експорт запису</string>
-    <string name="content_description_conference_participants">Учасники групового дзвінка</string>
-    <string name="service_name">&appName; Сервіс</string>
-    <string name="service_auto_start_description">&appName; було запущено автоматично</string>
-    <string name="about_privacy_policy">Ознайомтесь з нашою політикою конфіденційності</string>
-    <string name="about_weblate_translation">Допоможіть нам перекласти &appName;</string>
-    <string name="logs_url_copied_to_clipboard">URL-адресу журналу, скопійовану в буфер обміну</string>
-    <string name="international_prefix">Префікс</string>
-    <string name="assistant_choose_country">Виберіть країну</string>
-    <plurals name="days">
-        <item quantity="one">%d день</item>
-        <item quantity="few">%d днів</item>
-        <item quantity="many"></item>
-        <item quantity="other"></item>
-    </plurals>
-    <string name="transport">Транспорт</string>
-    <string name="transport_udp">UDP</string>
-    <string name="app_description">Клієнт SIP клієнт з &lt;i&gt;відкритим кодом&lt;/i&gt;</string>
-    <string name="status_connected">Підключений</string>
-    <string name="status_not_connected">Не під\'єднано</string>
-    <string name="status_in_progress">Виконується підключення</string>
-    <string name="status_error">З\'єднання втрачено</string>
-    <string name="assistant">Помічник</string>
-    <string name="recordings">Записи</string>
-    <string name="quit">Вийти</string>
-    <string name="no_call_history">Відсутні дзвінки у вашій історії</string>
-    <string name="history_delete_one_dialog">Ви бажаєте видалити цей запис\?</string>
-    <string name="no_contact">Немає контактів у вашій адресній книзі.</string>
-    <string name="contact_send_sms_invite_text">Привіт, приєднуйтесь до мене в &appName;! Ви можете завантажити його безкоштовно на %s</string>
-    <string name="contact_last_name">Прізвище</string>
-    <string name="contact_choose_existing_or_new_to_add_number">Виберіть контакт або створіть новий</string>
-    <string name="contact_editor_write_permission_denied">Відмовлено в дозволі на запис контактів, неможливо редагувати контакт</string>
-    <string name="contact_delete_one_dialog">Ви бажаєте видалити цей контакт\?
-\n Його також буде видалено з адресної книги вашого пристрою</string>
-    <string name="contact_new_choose_sync_account">Виберіть місце для збереження контакту</string>
-    <string name="contacts_ldap_query_more_results_available">Доступно більше результатів, уточніть параметри пошуку</string>
-    <string name="debug_popup_disable_logs">Вимкнути журнали</string>
-    <string name="debug_popup_send_logs">Надіслати журнали</string>
-    <string name="dialer_transfer_succeded">Дзвінок переводиться</string>
-    <string name="no_chat_history">Жодних розмов</string>
-    <string name="chat_event_participant_removed">%s пішов</string>
-    <string name="chat_event_admin_unset">%s більше не адміністратор</string>
-    <string name="chat_security_event_security_level_downgraded">Рівень безпеки знижено через %s</string>
-    <string name="chat_event_ephemeral_enabled">Ви ввімкнули тимчасові повідомлення: %s</string>
-    <string name="chat_event_ephemeral_lifetime_changed">Термін дії тимчасових повідомлень: %s</string>
-    <string name="chat_room_group_info_admin">Адміністратор</string>
-    <string name="chat_room_group_info_leave_dialog_message">Ви хочете залишити цю розмову\?</string>
-    <string name="chat_room_group_info_you_are_no_longer_admin">Ви більше не адмін</string>
-    <string name="chat_message_imdn_displayed">Прочитано</string>
-    <string name="chat_message_imdn_sent">Надіслано</string>
-    <string name="chat_message_context_menu_resend">Надіслати повторно</string>
-    <string name="chat_message_context_menu_copy_text">Скопіюйте текст</string>
-    <string name="chat_message_context_menu_delete">Видалити</string>
-    <string name="chat_message_context_menu_add_to_contacts">Додати до контактів</string>
-    <string name="chat_room_choose_conversation_for_message_forward">Виберіть або створіть розмову, щоб переслати повідомлення</string>
-    <string name="chat_room_choose_conversation_for_file_sharing">Виберіть або створіть бесіду, щоб поділитися файлами</string>
-    <string name="chat_room_file_not_found">Файл не знайдено</string>
-    <string name="chat_room_context_menu_participants_devices">Комунікативні пристрої</string>
-    <string name="chat_message_context_menu_ephemeral_messages">Тимчасові повідомлення</string>
-    <string name="chat_room_ephemeral_messages_desc">Це повідомлення буде видалено з обох сторін після того, як воно буде прочитано та після вибраного часу очікування.</string>
-    <string name="chat_room_ephemeral_message_disabled">Вимкнено</string>
-    <string name="chat_room_ephemeral_message_one_minute">1 хвилина</string>
-    <string name="chat_room_ephemeral_message_one_hour">1 година</string>
-    <string name="chat_room_ephemeral_message_one_week">1 тиждень</string>
-    <string name="chat_room_removal_failed_snack">Не вдалося видалити чат-кімнату</string>
-    <string name="chat_message_no_app_found_to_handle_file_mime_type">Немає доступної програми для такого типу файлу</string>
-    <string name="chat_message_cant_open_file_in_app_dialog_message">Чи бажаєте ви відкрити його як текст чи експортувати (без шифрування) у сторонню програму, якщо вона доступна\?</string>
-    <string name="chat_message_voice_recording_hold_to_record">Утримуйте кнопку, щоб записати голосове повідомлення</string>
-    <string name="chat_message_voice_recording_playback_low_volume">У вас низька гучність медіа, можливо, ви захочете її збільшити</string>
-    <string name="chat_message_download_already_in_progress">Зачекайте, поки закінчиться перше завантаження, перш ніж починати нове</string>
-    <string name="conference_schedule_later">Ви хочете призначити зустріч на пізніше\?</string>
-    <string name="conference_schedule_mandatory_field">Обов\'язковий</string>
-    <string name="conference_schedule_description_title">Додати опис</string>
-    <string name="conference_schedule_duration">Тривалість</string>
-    <string name="conference_schedule_send_invite_chat">Надіслати запрошення через &appName;</string>
-    <string name="conference_schedule_send_invite_email">Надіслати запрошення електронною поштою</string>
-    <string name="conference_schedule_encryption">Бажаєте зашифрувати зустріч\?</string>
-    <string name="conference_schedule_participants_list">Список учасників</string>
-    <string name="conference_organizer">Організатор</string>
-    <string name="conference_schedule_summary">Інформація про зустріч</string>
-    <string name="conference_schedule_address_copied_to_clipboard">Адресу зустрічі скопійовано в буфер обміну</string>
-    <string name="conference_paused_subtitle">Натисніть кнопку відтворення, щоб знову приєднатися.</string>
-    <string name="conference_local_title">Локальний груповий дзвінок</string>
-    <string name="conference_display_mode_mosaic">Режим мозаїки</string>
-    <string name="conference_display_mode_active_speaker">Режим активного динаміка</string>
-    <string name="conference_scheduled">Зустрічі</string>
-    <string name="conference_layout_too_many_participants_for_mosaic">Ви не можете змінити схему групового виклику, оскільки забагато учасників</string>
-    <string name="conference_no_terminated_schedule">Припинених зустрічей ще немає.</string>
-    <string name="conference_schedule_info_created">Зустріч була призначена</string>
-    <string name="conference_scheduled_delete_one_dialog">Ви справді хочете видалити цю зустріч\?</string>
-    <string name="conference_info_removed">Інформацію про зустріч видалено</string>
-    <string name="conference_low_bandwidth">Виявлено низьку пропускну здатність, відео вимикається</string>
-    <string name="conference_incoming_title">Вхідний груповий виклик</string>
-    <string name="conference_start_group_call_dialog_title">Груповий виклик</string>
-    <string name="conference_start_group_call_dialog_message">Ви хочете почати груповий дзвінок\?
-\n Усі учасники цієї групи отримають дзвінок, щоб приєднатися до зустрічі.</string>
-    <string name="call_notification_paused">Виклик призупинено</string>
-    <string name="call_notification_active">Дзвінок виконується</string>
-    <string name="call_error_declined">Дзвінок відхилено</string>
-    <string name="call_error_user_busy">Користувач зайнятий</string>
-    <string name="call_error_incompatible_media_params">Несумісні параметри носія</string>
-    <string name="call_error_temporarily_unavailable">тимчасово недоступний</string>
-    <string name="call_action_participants_list">Список учасників</string>
-    <string name="call_action_statistics">Статистика дзвінків</string>
-    <string name="call_context_action_resume">Відновити виклик</string>
-    <string name="call_remote_recording">Цей дзвінок записується.</string>
-    <string name="call_locally_paused_subtitle">Щоб відновити, натисніть кнопку відтворення.</string>
-    <string name="call_stats_codec">Кодек:</string>
-    <string name="call_stats_upload">Пропускна здатність відправки:</string>
-    <string name="call_stats_estimated_download">Приблизна пропускна здатність завантаження:</string>
-    <string name="call_stats_video_fps_received">FPS отриманого відео:</string>
-    <string name="call_stats_receiver_loss_rate">Втрати отримувача:</string>
-    <string name="call_stats_zrtp_key_agreement_algo">Ключовий алгоритм узгодження:</string>
-    <string name="call_stats_zrtp_auth_tag_algo">Алгоритм автентифікації:</string>
-    <string name="assistant_welcome_title">Ласкаво просимо</string>
-    <string name="assistant_welcome_desc">Цей помічник допоможе вам налаштувати та використовувати обліковий запис SIP.</string>
-    <string name="assistant_phone_number_info_title">Для чого використовуватиметься мій номер телефону\?</string>
-    <string name="assistant_phone_number_link_info_content">"
-\nВаші друзі знайдуть вас легше, якщо ви прив’яжете обліковий запис до свого номера телефону
-\n
-\n Ви побачите у своїй адресній книзі, хто використовує &appName;  і ваші друзі знатимуть, що вони можуть зв’язатися з вами на &appName; так само.
-\n"</string>
-    <string name="assistant_phone_number_link_info_content_already_account">Ви можете використовувати свій номер телефону лише з одним &appName; акаунтом.
-\n
-\n Якщо ви вже прив’язали свій номер до іншого облікового запису, але бажаєте використовувати цей, просто прив’яжіть його зараз, і ваш номер буде автоматично переміщено до цього облікового запису.</string>
-    <string name="assistant_privacy_policy">політика конфіденційності</string>
-    <string name="assistant_generic_account_warning">Деякі функції потребують &appName; облікового запису, як-от групові або тимчасові повідомлення.
-\n
-\n Ці функції приховані, коли ви реєструєтеся за допомогою стороннього облікового запису SIP.
-\n
-\n Щоб включити його в комерційний проект, зв\'яжіться з нами.</string>
-    <string name="assistant_error_phone_number_invalid_characters">Тільки цифри</string>
-    <string name="assistant_error_phone_number_already_exists">Уже існує обліковий запис із цим номером</string>
-    <string name="assistant_error_invalid_credentials">Обліковий запис не існує або пароль не збігається</string>
-    <string name="assistant_linphone_account">Використовуйте свій &appName; акаунт</string>
-    <string name="assistant_create_account_part_1">Підтвердьте код країни та введіть номер телефону</string>
-    <string name="assistant_login_with_username">Використовуйте своє ім\'я користувача та пароль замість свого номера телефону</string>
-    <string name="assistant_finish">Завершіть налаштування</string>
-    <string name="assistant_generic_account">Використовуйте обліковий запис SIP</string>
-    <string name="assistant_create_account_part_email">Введіть ім’я користувача, електронну адресу та пароль для &appName; акаунт</string>
-    <string name="assistant_validate_account_1">Ваш обліковий запис створено. Перевірте свою електронну пошту, щоб підтвердити обліковий запис:</string>
-    <string name="assistant_create_account_part_2">Ми надіслали вам SMS із кодом підтвердження на ваш номер телефону:</string>
-    <string name="assistant_link_phone_number">Ви пов’яжете зі своїм номером телефону таке ім’я користувача:</string>
-    <string name="assistant_remote_provisioning_desc">Вкажіть URL-адресу конфігурації</string>
-    <string name="assistant_remote_provisioning_wrong_format">Невідомий формат URL-адреси, неможливо завантажити налаштування…</string>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-v27/styles.xml b/app/src/main/res/values-v27/styles.xml
deleted file mode 100644
index 1bba957ec..000000000
--- a/app/src/main/res/values-v27/styles.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <style name="AppTheme" parent="BaseAppTheme">
-        <!-- https://developer.android.com/guide/topics/display-cutout#best_practices_for_display_cutout_support -->
-        <item name="android:windowLayoutInDisplayCutoutMode">
-            shortEdges
-        </item>
-    </style>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-v31/styles.xml b/app/src/main/res/values-v31/styles.xml
deleted file mode 100644
index ce80fa78b..000000000
--- a/app/src/main/res/values-v31/styles.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-    <style name="AppSplashScreenTheme" parent="Theme.SplashScreen">
-        <item name="windowSplashScreenBackground">@color/dark_grey_color</item>
-        <item name="windowSplashScreenAnimatedIcon">@drawable/vector_linphone_logo</item>
-        <item name="postSplashScreenTheme">@style/AppTheme</item>
-        <item name="android:windowSplashScreenBrandingImage">@drawable/splashscreen_branding</item>
-    </style>
-</resources>
diff --git a/app/src/main/res/values-w1280dp/dimen.xml b/app/src/main/res/values-w1280dp/dimen.xml
deleted file mode 100644
index 13cfd12f7..000000000
--- a/app/src/main/res/values-w1280dp/dimen.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <dimen name="master_fragment_width">500dp</dimen>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-w600dp/dimen.xml b/app/src/main/res/values-w600dp/dimen.xml
deleted file mode 100644
index da9bea704..000000000
--- a/app/src/main/res/values-w600dp/dimen.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <dimen name="master_fragment_width">300dp</dimen>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-yo/strings.xml b/app/src/main/res/values-yo/strings.xml
deleted file mode 100644
index a6b3daec9..000000000
--- a/app/src/main/res/values-yo/strings.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
deleted file mode 100644
index fdb67c706..000000000
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ /dev/null
@@ -1,756 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE resources [
-<!ENTITY appName "Linphone">
-]>
-<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="UnusedQuantity">
-    <string name="transport">传输</string>
-    <string name="transport_udp">UDP 用户数据报协议</string>
-    <string name="transport_tls">TLS安全传输层协议</string>
-    <string name="status_connected">已连接</string>
-    <string name="status_not_connected">未连接</string>
-    <string name="status_in_progress">正在进行连接</string>
-    <string name="status_error">连接失败</string>
-    <string name="no_account_configured">没有配置的帐户</string>
-    <string name="about">关于</string>
-    <string name="assistant">助手</string>
-    <string name="recordings">录音</string>
-    <string name="settings">设置</string>
-    <string name="audio_settings_microphone_gain_summary">（分贝）</string>
-    <string name="audio_settings_playback_gain_title">播放增益调节</string>
-    <string name="audio_settings_playback_gain_summary">（分贝）</string>
-    <string name="audio_settings_echo_tester_summary_is_running">回声测试正在运行</string>
-    <string name="audio_settings_adaptive_rate_control_title">自适应速率控制</string>
-    <string name="settings_contacts_title">联系人</string>
-    <string name="settings_advanced_title">高级设置</string>
-    <string name="audio_settings_echo_cancellation_summary">删除其他端听到的回声</string>
-    <string name="audio_settings_echo_canceller_calibration_title">回声消除器校准</string>
-    <string name="audio_settings_echo_canceller_calibration_summary">单击以开始回声消除器校准</string>
-    <string name="audio_settings_echo_cancellation_calibration_started">回声消除器校准已开始</string>
-    <string name="audio_settings_echo_cancellation_calibration_failed">校准失败</string>
-    <string name="audio_settings_echo_cancellation_calibration_no_echo">未检测到回声</string>
-    <string name="audio_settings_echo_tester_title">检测回声</string>
-    <string name="audio_settings_echo_tester_summary">单击以启动回声测试</string>
-    <string name="audio_settings_echo_tester_summary_is_stopped">回声测试已停止</string>
-    <string name="settings_chat_title">聊天</string>
-    <string name="settings_network_title">网络</string>
-    <string name="assistant_remote_provisioning_url">URL网址</string>
-    <string name="assistant_remote_provisioning_failure">无法下载或应用远程配置文件…</string>
-    <string name="assistant_fetch_apply">获取与应用</string>
-    <string name="assistant_launch_qrcode">二维码</string>
-    <string name="settings_accounts_title">SIP账户</string>
-    <string name="settings_default_account_subtitle">默认账户</string>
-    <string name="settings_list_title">偏好设置</string>
-    <string name="settings_tunnel_title">隧道协议</string>
-    <string name="settings_audio_title">音频</string>
-    <string name="settings_video_title">视频</string>
-    <string name="settings_call_title">通话</string>
-    <string name="audio_settings_input_device_title">默认音频输入设备</string>
-    <string name="audio_settings_output_device_title">默认输出音频设备</string>
-    <string name="audio_settings_output_device_summary">更改将从下一次通话开始生效</string>
-    <string name="audio_settings_codec_bitrate_title">编解码器比特率限制</string>
-    <string name="call_settings_auto_answer_title">自动接听来电</string>
-    <string name="call_settings_media_encryption_none">无</string>
-    <string name="call_settings_media_encryption_srtp">SRTP 安全实时传输协议</string>
-    <string name="call_settings_media_encryption_zrtp">ZRTP密钥</string>
-    <string name="call_settings_media_encryption_dtls">DTLS数据包传输层安全性协议</string>
-    <string name="call_settings_encryption_mandatory_title">强制媒体加密</string>
-    <string name="video_settings_bandwidth_limit_title">带宽限制</string>
-    <string name="video_settings_bandwidth_limit_summary">kbits/s 单位</string>
-    <string name="video_settings_codecs_title">编解码器</string>
-    <string name="call_settings_device_ringtone_title">使用手机铃声</string>
-    <string name="video_settings_initiate_call_summary">总是发送视频请求</string>
-    <string name="video_settings_automatically_accept_summary">总是接受视频请求</string>
-    <string name="video_settings_camera_device_title">摄像头</string>
-    <string name="video_settings_enable_title">启用视频</string>
-    <string name="video_settings_tablet_preview_title">在拨号器上显示摄像头预览</string>
-    <string name="video_settings_initiate_call_title">发起视频通话</string>
-    <string name="video_settings_video_size_title">视频大小的偏好</string>
-    <string name="video_settings_video_preset_title">视频预设</string>
-    <string name="video_settings_preferred_fps_title">每秒帧数（FPS）偏好设置</string>
-    <string name="call_settings_encryption_title">媒体加密</string>
-    <string name="call_settings_overlay_title">重叠来电通知</string>
-    <string name="call_settings_system_wide_overlay_summary">系统将要求您授予重叠权限</string>
-    <string name="call_settings_sipinfo_dtmf_title">发送带外DTMFs（SIP INFO）</string>
-    <string name="call_settings_rfc2833_dtmf_title">发送带内DTMFs（RFC 2833）</string>
-    <string name="call_settings_auto_answer_delay_summary">毫秒</string>
-    <string name="call_settings_incoming_timeout_title">来电超时</string>
-    <string name="call_settings_incoming_timeout_summary">秒</string>
-    <string name="call_settings_voice_mail_uri_title">语音留言URI</string>
-    <string name="call_settings_accept_early_media_title">在通话之前建立媒体流</string>
-    <string name="call_settings_go_to_android_notification_settings">安卓通知设置</string>
-    <string name="chat_settings_file_sharing_url_title">共享服务器网址</string>
-    <string name="contacts_settings_show_new_contact_account_dialog_title">总是问在哪个帐户中保存新创建的联系人</string>
-    <string name="contacts_settings_show_new_contact_account_dialog_summary">如果禁用的联系人将存储在本地</string>
-    <string name="advanced_settings_debug_mode_title">排错日志</string>
-    <string name="network_settings_random_ports_title">使用随机端口</string>
-    <string name="chat_settings_hide_empty_rooms_title">隐藏空的聊天室</string>
-    <string name="chat_settings_file_sharing_url_summary">请勿随意编辑！</string>
-    <string name="chat_settings_auto_download_title">自动下载传入文件政策</string>
-    <string name="chat_settings_auto_download_always">总是</string>
-    <string name="chat_settings_auto_download_never">永不</string>
-    <string name="chat_settings_auto_download_under_size">如果比预设文件最大限制小</string>
-    <string name="chat_settings_auto_download_max_size_title">最大</string>
-    <string name="chat_settings_auto_download_max_size_summary">以字节为单位</string>
-    <string name="chat_settings_downloaded_media_public_title">公开下载的媒体</string>
-    <string name="chat_settings_downloaded_media_public_summary">「阅后即焚」信息中的文件将不可用，无法使用自动下载功能</string>
-    <string name="chat_settings_hide_notification_content_title">在通知中隐藏短信内容</string>
-    <string name="chat_settings_hide_notification_content_summary">仅显示发件人姓名</string>
-    <string name="chat_settings_hide_rooms_removed_proxies_title">从已删除的代理配置中隐藏聊天室</string>
-    <string name="chat_settings_hide_rooms_removed_proxies_summary">如果您有缺失的聊天室，请尝试取消选中此设置</string>
-    <string name="chat_settings_go_to_android_notification_settings">安卓通知设置</string>
-    <string name="network_settings_wifi_only_title">只使用WiFi</string>
-    <string name="network_settings_allow_ipv6_title">允许IPv6</string>
-    <string name="network_settings_sip_port_title">要使用的SIP端口</string>
-    <string name="contacts_settings_friendlist_subscribe_title">订阅好友列表</string>
-    <string name="contacts_settings_native_presence_title">本机联系人中的状态信息</string>
-    <string name="contacts_settings_show_organization_title">显示联络人组织</string>
-    <string name="contacts_settings_launcher_shortcuts_title">在启动器中创建联系人的快捷方式</string>
-    <string name="advanced_settings_background_mode_title">后台模式</string>
-    <string name="advanced_settings_background_mode_summary">显示通知以使应用程序保持活动状态</string>
-    <string name="advanced_settings_auto_start_title">在启动时开始</string>
-    <string name="account_settings_default_title">默认使用</string>
-    <string name="tunnel_settings_auto_mode">自动</string>
-    <string name="account_settings_user_name_summary">例如:某人的帐户为某人@sip.example.org</string>
-    <string name="account_settings_user_id_title">验证用户名</string>
-    <string name="account_settings_password_title">密码</string>
-    <string name="account_settings_password_summary">如果您编辑了您的用户名或域名，您必须重新输入密码</string>
-    <string name="account_settings_domain_title">域名</string>
-    <string name="account_settings_domain_summary">例如:某人的帐户为某人@sip.example.org</string>
-    <string name="account_settings_display_name_title">显示名</string>
-    <string name="tunnel_settings_dual_port_summary">双模式下需要</string>
-    <string name="tunnel_settings_mode_title">模式</string>
-    <string name="advanced_settings_android_title">安卓</string>
-    <string name="advanced_settings_go_to_battery_optimization_settings">电池优化设置</string>
-    <string name="advanced_settings_go_to_power_manager_settings">电源管理设置</string>
-    <string name="tunnel_settings_hostname_url_title">主机名</string>
-    <string name="advanced_settings_dark_mode_label_no">否</string>
-    <string name="advanced_settings_dark_mode_label_yes">是</string>
-    <string name="advanced_settings_animations_title">动画</string>
-    <string name="advanced_settings_dark_mode_label_auto">自动</string>
-    <string name="advanced_settings_device_name_title">设备名称</string>
-    <string name="advanced_settings_device_name_summary">更改将在下次启动时应用</string>
-    <string name="advanced_settings_remote_provisioning_url_title">远程配置网址</string>
-    <string name="advanced_settings_logs_server_url_title">日志上传服务器网址</string>
-    <string name="tunnel_settings_port_title">端口</string>
-    <string name="tunnel_settings_dual_mode_title">启用双模式</string>
-    <string name="tunnel_settings_dual_mode_summary">将使用一台服务器进行上传，另一台服务器进行下载</string>
-    <string name="tunnel_settings_dual_hostname_url_title">第二台服务器主机名</string>
-    <string name="tunnel_settings_dual_hostname_url_summary">双模式下需要</string>
-    <string name="tunnel_settings_dual_port_title">第二服务器端口</string>
-    <string name="tunnel_settings_disabled_mode">已禁用</string>
-    <string name="tunnel_settings_always_mode">总是</string>
-    <string name="account_settings_manage_title">管理</string>
-    <string name="account_settings_disable_title">禁用</string>
-    <string name="account_settings_delete_title">删除</string>
-    <string name="account_settings_advanced_title">高级设置</string>
-    <string name="account_settings_push_notification_title">允许推送通知</string>
-    <string name="account_settings_push_notification_summary">代理配置不取消注册</string>
-    <string name="account_settings_transport_title">传输</string>
-    <string name="account_settings_transport_udp">UDP用户数据报协议</string>
-    <string name="account_settings_transport_tcp">TCP传输控制协议</string>
-    <string name="account_settings_transport_tls">TLS安全传输层协议</string>
-    <string name="account_settings_outbound_proxy_summary">通过上述SIP代理路由所有呼叫</string>
-    <string name="account_settings_stun_server_title">STUN / TURN 服务器</string>
-    <string name="account_settings_ice_title">开启ICE交互式连通建立</string>
-    <string name="account_settings_avpf_title">AVPF带有反馈的音视频配置文件</string>
-    <string name="account_settings_avpf_rr_interval_summary">以秒为单位（1到5之间）</string>
-    <string name="account_settings_expires_title">到期</string>
-    <string name="account_settings_expires_summary">以秒为单位</string>
-    <string name="account_settings_prefix_title">您所在国家的前缀</string>
-    <string name="account_settings_prefix_summary">不包含 +</string>
-    <string name="account_settings_escape_plus_title">用00代替+</string>
-    <string name="notification_channel_service_name">&appName; 服务通知</string>
-    <string name="notification_channel_chat_name">&appName; 即时通讯通知</string>
-    <string name="incoming_call_notification_title">来电</string>
-    <string name="incoming_call_notification_hangup_action_label">挂断</string>
-    <string name="incoming_call_notification_answer_action_label">接听</string>
-    <string name="received_chat_notification_reply_label">回复</string>
-    <string name="received_chat_notification_mark_as_read_label">标记为已读</string>
-    <string name="missed_call_notification_title">未接来电</string>
-    <string name="missed_call_notification_body">来自%s 的未接来电</string>
-    <string name="missed_calls_notification_body">%d 未接来电</string>
-    <string name="zrtp_dialog_title">通讯安全</string>
-    <string name="dialog_default_delete_one">你确定要删除这个项目吗？</string>
-    <string name="dialog_update_available">有可用的更新</string>
-    <string name="dialog_try_open_file_as_text_title">找不到此类文件的应用</string>
-    <string name="dialog_try_open_file_as_text_body">您想尝试将其作为纯文本文件打开吗？</string>
-    <string name="content_description_add_sip_address_field">添加一个SIP地址字段</string>
-    <string name="content_description_add_phone_number_field">添加一个电话号码字段</string>
-    <string name="content_description_go_back">返回</string>
-    <string name="content_description_clear_field">清空旁边的文本字段</string>
-    <string name="content_description_switch_camera">从前置摄像头切换到后置摄像头，反之亦然</string>
-    <string name="content_description_toggle_recording">启用或禁用通话录音</string>
-    <string name="content_description_terminate_call">终止通话</string>
-    <string name="content_description_answer_call">接听来电</string>
-    <string name="content_description_enable_mic_mute">使麦克风静音</string>
-    <string name="content_description_enable_speaker">将音频传到扬声器</string>
-    <string name="content_description_disable_speaker">将音频传到耳机</string>
-    <string name="content_description_go_back_to_call">返回通话视图</string>
-    <string name="content_description_disable_video">禁用通话视频</string>
-    <string name="content_description_enable_video">启用通话视频</string>
-    <string name="content_description_toggle_audio_menu">显示或隐藏音频输出菜单</string>
-    <string name="content_description_use_bluetooth_headset">使用蓝牙耳机为音频输出</string>
-    <string name="content_description_use_earpiece">使用耳机为音频输出</string>
-    <string name="content_description_add_call">发起新通话</string>
-    <string name="content_description_transfer_call">将当前通话转接给其他人</string>
-    <string name="content_description_pending_file_transfer">待传输文件</string>
-    <string name="content_description_remove_pending_file_transfer">删除待传输文件</string>
-    <string name="content_description_downloaded_file_transfer">附加档案</string>
-    <string name="content_description_delivery_status">信息传递状态</string>
-    <string name="content_description_linphone_user">联系人是&appName; 用户</string>
-    <string name="content_description_contact_selected">已选择联系人</string>
-    <string name="content_description_e2e_encryption_enabled">端到端加密已启用</string>
-    <string name="content_description_show_all_contacts">显示所有联系人列表</string>
-    <string name="content_description_show_sip_contacts">只显示SIP联系人列表</string>
-    <string name="content_description_continue_chat_room_creation">去聊天室创建的最后一步</string>
-    <string name="content_description_remove_contact_from_selection">从选择中删除联系人</string>
-    <string name="content_description_start_call">发起通话</string>
-    <string name="content_description_show_chat_room_menu">显示聊天室菜单</string>
-    <string name="content_description_attach_file">附加文件至信息</string>
-    <string name="content_description_send_message">发送信息</string>
-    <string name="content_description_toggle_participant_devices_list">显示或隐藏参与者设备</string>
-    <string name="content_description_ephemeral_duration_selected">已选「阅后即焚」信息时效</string>
-    <string name="content_description_create_chat_room">建立聊天室</string>
-    <string name="content_description_add_participants">添加参与者</string>
-    <string name="content_description_remove_contact_from_chat_room">从对话中删除联系人</string>
-    <string name="content_description_contact_is_admin">联系人是这个对话的管理者</string>
-    <string name="content_description_contact_is_not_admin">联系人不是这个对话的管理者</string>
-    <string name="content_description_ephemeral_chat_room">这个对话中的信息属「阅后即焚」</string>
-    <string name="content_description_start_chat">进入对话</string>
-    <string name="content_description_start_encrypted_chat">进入加密对话</string>
-    <string name="content_description_edit_contact">编辑联系人</string>
-    <string name="content_description_delete_contact">删除联系人</string>
-    <string name="content_description_discard_changes">放弃更改</string>
-    <string name="content_description_confirm_contact_edit">保存更改</string>
-    <string name="content_description_change_contact_picture">更改联系人图片</string>
-    <string name="content_description_change_own_picture">更改自己的图像</string>
-    <string name="content_description_show_call_details">前往通话记录</string>
-    <string name="content_description_exit_edition_mode">退出编辑模式</string>
-    <string name="content_description_select_all">选择列表中的所有项目</string>
-    <string name="content_description_delete_selection">删除列表中选择的所有项目</string>
-    <string name="content_description_numpad_1">1</string>
-    <string name="content_description_numpad_2">2</string>
-    <string name="content_description_numpad_3">3</string>
-    <string name="content_description_numpad_4">4</string>
-    <string name="content_description_numpad_5">5</string>
-    <string name="content_description_numpad_6">6</string>
-    <string name="content_description_numpad_7">7</string>
-    <string name="content_description_numpad_8">8</string>
-    <string name="content_description_numpad_9">9</string>
-    <string name="content_description_numpad_0">0</string>
-    <string name="content_description_numpad_star">*</string>
-    <string name="content_description_numpad_sharp">#</string>
-    <string name="advanced_settings_dark_mode_title">暗黑模式</string>
-    <string name="account_settings_proxy_title">SIP proxy 代理服务器</string>
-    <string name="account_settings_user_name_title">用户名</string>
-    <string name="account_settings_user_id_summary">如果与用户名不同，请输入身份验证ID（可选）</string>
-    <string name="advanced_settings_go_to_android_app_settings">安卓应用设置</string>
-    <string name="contacts_settings_launcher_shortcuts_summary">将替换聊天室快捷方式（若有）</string>
-    <string name="chat_settings_launcher_shortcuts_summary">如果启用，将由联系人快捷方式代替</string>
-    <string name="call_settings_auto_start_title">立即开始通话</string>
-    <string name="call_settings_auto_start_summary">如果从其他应用程序开始，则通话将自动开始</string>
-    <string name="video_settings_automatically_accept_title">接受视频通话请求</string>
-    <string name="audio_settings_microphone_gain_title">麦克风增益调节</string>
-    <string name="audio_settings_codecs_title">编解码器</string>
-    <string name="audio_settings_echo_cancellation_calibration_value">在%s毫秒内校准</string>
-    <string name="assistant_remote_provisioning_wrong_format">不明的URL网址格式，无法下载配置资源…</string>
-    <string name="audio_settings_input_device_summary">更改将从下一次通话开始生效</string>
-    <string name="content_description_voice_mail">语音留言</string>
-    <string name="content_description_toggle_side_menu">显示或隐藏侧面菜单</string>
-    <string name="content_description_menu_history">通话记录</string>
-    <string name="content_description_menu_contacts">联系人</string>
-    <string name="content_description_menu_dialer">拨号器</string>
-    <string name="content_description_menu_chat">对话</string>
-    <string name="content_description_dialer_erase">删除最后一个字符</string>
-    <string name="content_description_add_contact">创建联系人</string>
-    <string name="content_description_show_all_calls">显示所有通话</string>
-    <string name="content_description_show_missed_calls">只显示未接来电</string>
-    <string name="content_description_missed_call">未接来电</string>
-    <string name="content_description_incoming_call">来电</string>
-    <string name="content_description_outgoing_call">去電</string>
-    <string name="content_description_create_one_to_one_chat_room">创建一对一对话</string>
-    <string name="content_description_create_group_chat_room">创建群组对话</string>
-    <string name="content_description_security_level_unsafe">不安全</string>
-    <string name="content_description_security_level_safe">安全</string>
-    <string name="content_description_call_quality_0">通话质量很差</string>
-    <string name="content_description_call_quality_1">通话质量欠佳</string>
-    <string name="content_description_call_quality_2">中等通话质量</string>
-    <string name="content_description_call_quality_3">通话质量佳</string>
-    <string name="content_description_call_quality_4">最佳通话质量</string>
-    <string name="content_description_call_not_secured">通话不安全</string>
-    <string name="content_description_call_secured">安全通话</string>
-    <string name="content_description_chat_message_video_attachment">视频附件</string>
-    <string name="call_settings_vibrate_title">来电时振动</string>
-    <string name="call_settings_auto_answer_delay_title">自动接听时间</string>
-    <string name="chat_settings_auto_download_summary">是否自动下载接收到的聊天信息中附加的文件</string>
-    <string name="chat_settings_launcher_shortcuts_title">在启动器中创建至聊天室的快捷方式</string>
-    <string name="contacts_settings_native_presence_summary">从＆appName;联系人信息快捷方式插入Android本机通讯录</string>
-    <string name="advanced_settings_logs_server_url_summary">请勿随意编辑！</string>
-    <string name="account_settings_link_phone_number_title">关联您的帐户</string>
-    <string name="account_settings_outbound_proxy_title">外出代理服务器</string>
-    <string name="account_settings_avpf_rr_interval_title">AVPF常规RTCP间隔</string>
-    <string name="notification_channel_incoming_call_name">&appName; 来电通知</string>
-    <string name="yesterday">昨日</string>
-    <string name="transport_tcp">TCP传输控制协议</string>
-    <string name="app_description"><i>自由</i>的 SIP 客户端</string>
-    <string name="operation_in_progress_wait">操作正在进行中，请稍候</string>
-    <string name="dialog_default_delete_many">您确定要删除所选项吗？</string>
-    <string name="content_description_phone_number_use">显示您的电话号码将用于什么</string>
-    <string name="content_description_pause_call">暂停通话</string>
-    <string name="content_description_disable_mic_mute">取消麦克风静音</string>
-    <string name="content_description_use_speaker">使用扬声器作为音频输出</string>
-    <string name="content_description_ephemeral_message">信息是「阅后即焚」</string>
-    <string name="content_description_e2e_encryption_disabled">端到端加密已禁用</string>
-    <string name="content_description_enter_edition_mode">进入编辑模式</string>
-    <string name="content_description_ephemeral_duration_change">通过选定的值更改短暂信息的时效</string>
-    <string name="content_description_contact_can_do_encryption">可在加密的对话中邀请联系人</string>
-    <string name="content_description_unselect_all">取消选择所有项目</string>
-    <string name="content_description_recording_toggle_play">播放或暂停录音</string>
-    <string name="content_description_go_to_contact">前往联络人信息</string>
-    <string name="content_description_security_level_encrypted">已加密</string>
-    <string name="content_description_call_security_pending">通话安全性待定</string>
-    <string name="service_name">&appName; 服务</string>
-    <string name="service_auto_start_description">&appName; 已自动启动</string>
-    <string name="service_description">若要在后台可接听电话这是必要的</string>
-    <string name="sync_account_name">&appName; 联系人</string>
-    <string name="about_privacy_policy">查看我们的隐私策略</string>
-    <string name="logs_url_copied_to_clipboard">日志链接已复制到剪贴板</string>
-    <string name="phone_number">电话号码</string>
-    <string name="phone_numbers">电话号码</string>
-    <string name="select_your_country">选择您的国家</string>
-    <string name="international_prefix">前缀</string>
-    <string name="assistant_choose_country">选择国家</string>
-    <string name="assistant_choose_country_title">国家名称或前缀</string>
-    <string name="username">用户名</string>
-    <string name="password">密码</string>
-    <string name="email">电子邮件</string>
-    <string name="domain">域名</string>
-    <string name="sip_address">SIP地址</string>
-    <string name="sip_addresses">SIP 地址</string>
-    <string name="cancel">取消</string>
-    <plurals name="days">
-        <item quantity="other">%d 天</item>
-    </plurals>
-    <string name="share_uploaded_logs_link">共享日志链接使用…</string>
-    <string name="today">今日</string>
-    <string name="quit">退出</string>
-    <string name="history_calls_list">通话</string>
-    <string name="no_call_history">您的历史记录中没有通话</string>
-    <string name="no_missed_call_history">您的历史记录中没有未接来电</string>
-    <string name="history_delete_one_dialog">您要删除这项记录吗？</string>
-    <string name="history_delete_many_dialog">您要删除这些记录吗？</string>
-    <string name="contact_invite_friend">邀请</string>
-    <string name="no_contact">无联系人。</string>
-    <string name="no_sip_contact">无SIP联系人。</string>
-    <string name="contact_filter_hint">搜索联系人</string>
-    <string name="contact_send_sms_invite_text">您好，和我一起加入 &appName;通讯APP吧！您可以免费在%s下载</string>
-    <string name="contact_last_name">姓式</string>
-    <string name="contact_first_name">名字</string>
-    <string name="contact_organization">机构</string>
-    <string name="contact_choose_existing_or_new_to_add_number">选择一个联系人或创建一个新联系人</string>
-    <string name="contact_editor_write_permission_denied">写入联系人权限被拒绝，无法编辑联系人</string>
-    <string name="contact_delete_one_dialog">您要删除这个联系人吗？\n它也将会从您的设备通讯录中删除</string>
-    <string name="contact_delete_many_dialog">您确定要删除这些联系人吗？\n他们将会从您的设备通讯录中删除</string>
-    <string name="contact_new_choose_sync_account">选择保存联系人的位置</string>
-    <string name="contact_local_sync_account">本地存储</string>
-    <string name="dialer_address_bar_hint">输入电话号码或地址</string>
-    <string name="debug_popup_title">排错</string>
-    <string name="debug_popup_enable_logs">启用日志</string>
-    <string name="debug_popup_send_logs">发送日志</string>
-    <string name="no_chat_history">无对话</string>
-    <string name="chat_remote_is_composing">远程正在写入…</string>
-    <string name="chat_event_conference_created">您已加入群组</string>
-    <string name="chat_event_conference_destroyed">您已离开群组</string>
-    <string name="chat_event_participant_added">%s 已加入</string>
-    <string name="chat_event_participant_removed">%s 以离开</string>
-    <string name="chat_event_device_added">%s 的新设备</string>
-    <string name="chat_event_subject_changed">新主题： %s</string>
-    <string name="chat_event_admin_set">%s 是管理者</string>
-    <string name="chat_event_admin_unset">%s 不再是管理者</string>
-    <string name="chat_security_event_lime_identity_key_changed">%s 的加密身份密钥已更改</string>
-    <string name="chat_security_event_security_level_downgraded">%s 造成安全级别下降</string>
-    <string name="chat_security_event_participant_max_count_exceeded">参加人数上限超过 %s 人</string>
-    <string name="chat_event_ephemeral_disabled">您禁用了「阅后即焚」信息</string>
-    <string name="chat_event_ephemeral_enabled">您启用了「阅后即焚」信息：%s</string>
-    <string name="chat_event_ephemeral_lifetime_changed">「阅后即焚」到期日：%s</string>
-    <string name="chat_message_download_file">下载</string>
-    <string name="chat_message_pick_file_dialog">选择源</string>
-    <string name="chat_room_devices_fragment_title">对话设备</string>
-    <string name="chat_room_group_info_title">信息</string>
-    <string name="chat_room_group_info_participants">参与者</string>
-    <string name="chat_room_group_info_subject_hint">为组命名</string>
-    <string name="chat_room_group_info_admin">管理者</string>
-    <string name="chat_room_group_info_leave_dialog_button">离开</string>
-    <string name="chat_room_group_info_leave_dialog_message">您要离开这个对话吗？</string>
-    <string name="chat_room_group_info_you_are_now_admin">您现在是管理者</string>
-    <string name="chat_room_group_info_you_are_no_longer_admin">您已不再是管理者</string>
-    <string name="chat_message_imdn_displayed">已读</string>
-    <string name="chat_message_imdn_delivered">已送达</string>
-    <string name="chat_message_imdn_undelivered">未送达</string>
-    <string name="chat_message_imdn_sent">已发送</string>
-    <string name="chat_message_context_menu_resend">重发</string>
-    <string name="chat_message_context_menu_copy_text">复制文本</string>
-    <string name="chat_message_context_menu_forward">转发</string>
-    <string name="chat_message_context_menu_delete">删除</string>
-    <string name="chat_message_context_menu_imdn_info">发送状态</string>
-    <string name="chat_message_imdn_info">发送状态</string>
-    <string name="chat_message_context_menu_add_to_contacts">添加联系人</string>
-    <string name="chat_room_context_menu_group_info">组信息</string>
-    <string name="chat_room_context_menu_participants_devices">对话中的设备</string>
-    <string name="chat_message_context_menu_ephemeral_messages">「阅后即焚」信息</string>
-    <string name="chat_message_context_menu_delete_messages">删除信息</string>
-    <string name="chat_room_ephemeral_messages_desc">该信息已阅读后，区别的信息将在扩展的超时时间被删除。</string>
-    <string name="chat_room_ephemeral_message_disabled">已禁用</string>
-    <string name="chat_room_ephemeral_message_one_minute">1分钟</string>
-    <string name="chat_room_ephemeral_message_one_hour">1小时</string>
-    <string name="chat_room_ephemeral_message_one_day">1天</string>
-    <string name="chat_room_ephemeral_message_three_days">3天</string>
-    <string name="chat_room_ephemeral_message_one_week">1周</string>
-    <plurals name="chat_room_remote_composing">
-        <item quantity="other">%s 正在写入…</item>
-    </plurals>
-    <string name="chat_room_removal_failed_snack">群组删除失败</string>
-    <string name="chat_room_delete_one_dialog">您确认要删除这对话吗？</string>
-    <string name="chat_room_delete_many_dialog">您确认要删除这些对话吗？</string>
-    <string name="chat_message_notification_hidden_content">&lt;已编辑&gt;</string>
-    <string name="recordings_empty_list">无录音</string>
-    <string name="call_incoming_title">来电</string>
-    <string name="call_outgoing_title">去电</string>
-    <string name="call_notification_paused">暂停通话</string>
-    <string name="call_notification_outgoing">去电</string>
-    <string name="call_notification_active">通话中</string>
-    <string name="call_error_declined">通话已被拒绝</string>
-    <string name="call_error_user_busy">用户忙线中</string>
-    <string name="call_error_user_not_found">找不到用户</string>
-    <string name="call_error_incompatible_media_params">不兼容的媒体参数</string>
-    <string name="call_error_network_unreachable">无法获取网络</string>
-    <string name="call_error_io_error">服务不可用或网络错误</string>
-    <string name="call_stats_audio">音频</string>
-    <string name="call_stats_video">视频</string>
-    <string name="call_stats_codec">编解码器：</string>
-    <string name="call_stats_upload">上传带宽：</string>
-    <string name="call_stats_estimated_download">估计下载带宽：</string>
-    <string name="call_stats_video_resolution_sent">发送视频分辨率：</string>
-    <string name="call_stats_video_fps_sent">已发送视频 fps：</string>
-    <string name="call_stats_ip">IP协议族：</string>
-    <string name="call_stats_download">下载带宽：</string>
-    <string name="call_stats_ice">ICE互动式连接建立：</string>
-    <string name="call_stats_video_fps_received">接收视频fps:</string>
-    <string name="call_stats_sender_loss_rate">发送方丢失率：</string>
-    <string name="call_stats_jitter_buffer">抖动缓冲：</string>
-    <string name="call_stats_decoder_name">解码器:</string>
-    <string name="assistant_welcome_title">欢迎</string>
-    <string name="assistant_create_account">创建帐户</string>
-    <string name="assistant_ec_calibration">正在进行回音消除校正</string>
-    <string name="assistant_phone_number_link_info_content_already_account">您的电话号码只能关联一个&appName;账户。\n\n如果您已经把您的号码关联了其他账户，但是您更想使用这个。只需关联您现在的账户，你的号码就会自动转移到这个账户。</string>
-    <string name="assistant_error_phone_number_invalid_characters">只能输入数字</string>
-    <string name="assistant_error_username_already_exists">用户名已被使用</string>
-    <string name="assistant_error_phone_number_already_exists">已有账户关联这个电话号码</string>
-    <string name="assistant_error_username_invalid_characters">找到无效字符</string>
-    <string name="assistant_error_passwords_dont_match">密码错误</string>
-    <string name="assistant_error_invalid_email_address">电子邮件地址无效</string>
-    <string name="assistant_error_username_too_long">用户名过长</string>
-    <string name="assistant_error_invalid_credentials">账户不存在或密码不匹配</string>
-    <string name="assistant_linphone_account">使用您的&appName;账户</string>
-    <string name="assistant_create_account_part_1">请确认您的国家码再输入您的电话号码</string>
-    <string name="assistant_linphone_login_desc">请输入您的&appName;用户名与密码</string>
-    <string name="assistant_login_with_username">用您的用户名和密码来代替电话号码</string>
-    <string name="assistant_login_forgotten_password">忘记密码？</string>
-    <string name="assistant_login">登入</string>
-    <string name="assistant_finish">完成配置</string>
-    <string name="assistant_confirmation_code">确认码</string>
-    <string name="assistant_continue_even_if_credentials_invalid">继续</string>
-    <string name="assistant_generic_account">使用SIP账户</string>
-    <string name="assistant_display_name_optional">显示名（可选）</string>
-    <string name="assistant_create_account_part_email">请为您的&appName;帐户输入用户名和密码</string>
-    <string name="assistant_confirm_password">密码确认</string>
-    <string name="call_stats_receiver_loss_rate">接收方丢失率:</string>
-    <string name="call_stats_encoder_name">编码器：</string>
-    <string name="call_stats_player_filter">播放过滤器：</string>
-    <string name="call_stats_capture_filter">捕捉过滤器：</string>
-    <string name="assistant_welcome_desc">助手将会帮助您配置和使用您的SIP帐户。</string>
-    <string name="assistant_login_linphone">使用&appName;账户</string>
-    <string name="assistant_login_generic">使用SIP 账户</string>
-    <string name="assistant_remote_provisioning">获取远程配置</string>
-    <string name="assistant_phone_number_info_title">我的电话号码将用于？</string>
-    <string name="assistant_validate_account_2">一旦完成，请返回并点击此处。</string>
-    <string name="assistant_use_username_instead_or_phone_number">使用一个用户名(可选)</string>
-    <string name="assistant_create_account_part_2">我们已向您的手机发送了验证码短信：</string>
-    <string name="assistant_create_account_part_3">请输入4位数字码以完成验证：\n</string>
-    <string name="assistant_link_phone_number">您将用您的电话号码关联以下用户名：</string>
-    <string name="assistant_link_phone_number_skip">跳过</string>
-    <string name="assistant_link_account">关联账户</string>
-    <string name="assistant_remote_provisioning_title">获取远程配置</string>
-    <string name="assistant_remote_provisioning_desc">请提供您的配置网址</string>
-    <string name="dialog_zrtp_local_sas">说：</string>
-    <string name="dialog_zrtp_remote_sas">您的对话者必须说：</string>
-    <string name="dialog_do_not_ask_again">不再显示</string>
-    <string name="dialog_cancel">取消</string>
-    <string name="dialog_delete">删除</string>
-    <string name="dialog_ok">OK</string>
-    <string name="dialog_accept">接受</string>
-    <string name="dialog_decline">拒绝</string>
-    <string name="dialog_call">打电话</string>
-    <string name="dialog_lime_security_message">安全的对话中的即时短信是被端到端加密的。 通过验证参与者可以提高对话的安全级别。 为此，请致电联系人并遵循身份验证过程。</string>
-    <string name="debug_popup_disable_logs">禁用日志</string>
-    <string name="chat_event_device_removed">%s的设备已删除</string>
-    <string name="chat_security_event_man_in_the_middle_detected">%s 监测到中间人攻击</string>
-    <string name="chat_room_group_info_leave">离开群组</string>
-    <string name="chat_message_forwarded">已转发</string>
-    <string name="chat_message_forward_confirmation_dialog">是否要在此聊天室转发信息？</string>
-    <string name="chat_room_ephemeral_fragment_title">短暂信息</string>
-    <string name="chat_room_creation_failed_snack">群组创建失败</string>
-    <string name="call_video_update_requested_dialog">对方要求启用视讯</string>
-    <string name="assistant_phone_number_link_info_content">\n如果将您的帐户关联您的电话号码，您的朋友们可以更容易的找到你。\n\n您在通讯录里可以查看谁在使用&appName;，他们也同样可以通过&appName;联系您。\n</string>
-    <string name="assistant_login_desc">请输入您的用户名与密码和您的SIP域名</string>
-    <string name="assistant_validate_account_1">您的帐户已经创建。请检查邮件以驗證您的帐户：</string>
-    <string name="call_stats_video_resolution_received">接收视频分辨率：</string>
-    <string name="chat_settings_mark_as_read_notif_dismissal_title">撤消通知后标记为已读</string>
-    <string name="advanced_settings_send_debug_logs_title">发送日志</string>
-    <string name="advanced_settings_reset_debug_logs_title">重启日志</string>
-    <string name="settings_primary_account_display_name_title">显示名</string>
-    <string name="settings_primary_account_username_title">用户名</string>
-    <string name="logs_upload_failure">上传日志失败！</string>
-    <string name="debug_popup_show_config_file">查看配置文件</string>
-    <string name="chat_message_context_menu_reply">回复</string>
-    <string name="chat_room_choose_conversation_for_message_forward">选择或创建对话以转发消息</string>
-    <string name="chat_message_cant_open_file_in_app_dialog_title">似乎我们无法显示该文件。</string>
-    <string name="chat_message_cant_open_file_in_app_dialog_message">您想以文本形式打开它还是将其（未加密）导出到第三方应用程序（如果有）？</string>
-    <string name="call_error_server_timeout">服务器超时</string>
-    <string name="settings_primary_account_title">主账户</string>
-    <string name="call_settings_use_telecom_manager_title">改善与蓝牙设备的交互</string>
-    <string name="call_settings_redirect_to_voice_mail_declined_calls_title">将拒绝的呼叫重定向到语音邮件 URI</string>
-    <string name="chat_settings_use_in_app_file_viewer_title">始终在此应用内打开文件</string>
-    <string name="chat_settings_use_in_app_file_viewer_summary">您仍然可以在第三方应用程序中导出它们</string>
-    <string name="advanced_settings_vfs_title">加密一切</string>
-    <string name="advanced_settings_disable_fragment_security_summary">允许对敏感视图进行屏幕捕获/录制</string>
-    <string name="account_settings_transport_dtls">DTLS</string>
-    <string name="account_settings_apply_prefix_for_calls_summary">如果输入了数字，则将前缀应用于数字</string>
-    <string name="content_description_open_app">在应用程序中打开对话而不是气泡</string>
-    <string name="logs_reset_complete">日志已清除</string>
-    <string name="chat_message_replied">回复</string>
-    <string name="chat_room_choose_conversation_for_file_sharing">选择或创建对话以共享文件</string>
-    <string name="chat_room_file_not_found">文件未找到</string>
-    <string name="chat_message_no_app_found_to_handle_file_mime_type">没有可用于此类文件的应用</string>
-    <string name="chat_bubble_cant_open_enrypted_file">无法在聊天气泡中打开加密文件</string>
-    <string name="chat_room_choose_conversation_for_text_sharing">选择或创建对话以共享文本</string>
-    <string name="chat_message_cant_open_file_in_app_dialog_export_button">导出</string>
-    <string name="chat_message_cant_open_file_in_app_dialog_open_as_text_button">作为文本打开</string>
-    <string name="chat_room_sending_reply_hint">回复</string>
-    <string name="chat_room_sending_message_hint">信息</string>
-    <string name="chat_message_voice_recording_hold_to_record">按住按钮录制语音信息</string>
-    <string name="chat_message_voice_recording_playback_low_volume">您的媒体音量很低，您可能需要提高音量</string>
-    <plurals name="chat_room_unread_messages_event" tools:ignore="UnusedQuantity">
-        <item quantity="one">%1$d 未读消息</item>
-        <item quantity="other">%1$d 未读消息</item>
-    </plurals>
-    <string name="call_error_temporarily_unavailable">暂时不可用</string>
-    <string name="call_error_generic">错误：%s</string>
-    <string name="assistant_general_terms">使用条款</string>
-    <string name="assistant_privacy_policy">隐私政策</string>
-    <string name="assistant_read_and_agree_terms">我接受 Belledonne Communications 的 %1$s 和 %2$s</string>
-    <string name="call_settings_use_telecom_manager_summary">需要一些额外的权限</string>
-    <string name="call_settings_system_wide_overlay_title">在应用程序外显示叠加层</string>
-    <string name="call_settings_pause_calls_lost_audio_focus_title">音频焦点丢失时暂停通话</string>
-    <string name="call_settings_auto_start_recording_title">自动开始通话录音</string>
-    <string name="call_settings_ring_during_early_media_title">在传入的早期媒体流期间响铃</string>
-    <string name="chat_settings_auto_download_voice_recordings">自动下载传入的录音</string>
-    <string name="advanced_settings_vfs_summary">一旦启用就无法禁用！</string>
-    <string name="advanced_settings_debug_title">调试设置</string>
-    <string name="advanced_settings_other_title">其他设置</string>
-    <string name="advanced_settings_disable_fragment_security_title">禁用 UI 的安全模式</string>
-    <string name="notification_channel_missed_call_name">&appName; 未接来电通知</string>
-    <string name="account_settings_apply_prefix_for_calls_title">应用前缀于拨出的电话和聊天</string>
-    <string name="content_description_forward_message">在此对话中转发消息</string>
-    <string name="content_description_close_bubble">关闭通知气泡</string>
-    <string name="content_description_export">在第三方应用程序中打开文件</string>
-    <string name="content_description_cancel_forward">取消消息转发</string>
-    <string name="content_description_cancel_sharing">取消分享</string>
-    <string name="content_description_cancel_reply">取消回复</string>
-    <string name="content_description_voice_recording">录制语音留言</string>
-    <string name="content_description_stop_voice_recording">停止录音</string>
-    <string name="content_description_cancel_voice_recording">取消录音</string>
-    <string name="content_description_pause_voice_recording_playback">暂停录音</string>
-    <string name="content_description_play_voice_recording">播放录音</string>
-    <string name="about_weblate_translation">帮助我们翻译 &appName;</string>
-    <string name="assistant_generic_account_warning">某些功能需要 1&appName; 帐户，例如群组消息或临时消息。\n\n当您注册第三方 SIP 帐户时，这些功能会被隐藏。\n\n要在商业项目中启用它，请联系我们。</string>
-    <string name="audio_settings_prefer_bluetooth_devices_title">将音频转到蓝牙设备（如果有）</string>
-    <string name="content_descripton_scroll_to_bottom">滚动到底部或第一条未读消息</string>
-    <string name="call_settings_ringtones_title">铃声</string>
-    <string name="chat_message_removal_info">消息将被删除</string>
-    <string name="chat_message_abort_removal">中止</string>
-    <string name="assistant_generic_account_warning_continue_button_text">我明白</string>
-    <string name="no_conference_call_history">历史记录中没有电话会议</string>
-    <string name="contacts_ldap_query_more_results_available">有更多的搜索结果，请尝试输入更多的条件限制搜索结果</string>
-    <string name="conference_schedule_encryption">您想加密会议吗？</string>
-    <string name="conference_schedule_send_invite_chat_summary">将从我的 &appName; 帐户发出邀请</string>
-    <string name="conference_local_title">本地群组通话</string>
-    <string name="conference_display_mode_audio_only">纯音频模式</string>
-    <string name="conference_layout_too_many_participants_for_mosaic">您无法更改群组通话布局，因为参与者太多</string>
-    <string name="conference_creation_failed">创建会议失败</string>
-    <string name="conference_info_removed">会议信息已删除</string>
-    <string name="conference_first_to_join">你是第一个加入群组通话的人</string>
-    <string name="conference_start_group_call_dialog_message">您要发起群组通话吗？
-\n该组中的每个人都会收到加入会议的电话。</string>
-    <string name="call_context_action_answer">接听电话</string>
-    <string name="call_context_action_hangup">挂断电话</string>
-    <string name="call_remotely_paused_title">对方已暂停通话。</string>
-    <string name="settings_conferences_title">会议</string>
-    <string name="call_settings_media_encryption_zrtp_post_quantum">后量子 ZRTP</string>
-    <string name="call_settings_remote_recording_title">当通话中的其他人开始录音时，接收通知</string>
-    <string name="contacts_settings_create_new_ldap_config_title">新增 LDAP 配置</string>
-    <string name="contacts_settings_ldap_delete_title">删除</string>
-    <string name="contacts_settings_ldap_connection_title">连接</string>
-    <string name="contacts_settings_ldap_search_title">搜索</string>
-    <string name="contacts_settings_ldap_minimum_characters_title">开始查询的最少字符数</string>
-    <string name="content_description_muted_chat_room">此对话已禁用通知</string>
-    <string name="content_description_chat_message_meeting_attachment">会议附件</string>
-    <string name="content_description_encrypted_conference">会议将被加密</string>
-    <string name="content_description_go_to_chat_rooms_list">转到对话列表</string>
-    <string name="content_description_toggle_conference_info_details">切换显示会议详细信息</string>
-    <string name="chat_message_download_already_in_progress">请稍候，第一次下载完成后，再进行新的下载</string>
-    <string name="conference_group_call_title">发起群组通话</string>
-    <string name="conference_schedule_send_invite_chat">通过 &appName; 发送邀请</string>
-    <string name="content_description_take_screenshot">对收到的视频进行截图</string>
-    <string name="contact_cant_be_deleted">无法删除此联系人</string>
-    <string name="dialer_transfer_succeded">正在转接电话</string>
-    <string name="dialer_transfer_failed">无法转接电话</string>
-    <string name="chat_room_context_menu_go_to_contact">转到联系人</string>
-    <string name="chat_message_context_menu_turn_off_notifications">禁用通知</string>
-    <string name="conference">会议</string>
-    <string name="chat_message_context_menu_turn_on_notifications">启用通知</string>
-    <string name="recordings_export">导出录音到…</string>
-    <string name="conference_schedule_title">安排会议</string>
-    <string name="conference_schedule_participants_list">参会名单</string>
-    <string name="conference_organizer">发起人</string>
-    <string name="conference_schedule_summary">会议信息</string>
-    <string name="conference_group_call_summary">群组通话信息</string>
-    <string name="conference_schedule_start">安排会议</string>
-    <string name="conference_schedule_edit">编辑会议</string>
-    <string name="conference_group_call_create">发起群组通话</string>
-    <string name="conference_schedule_address_copied_to_clipboard">会议地址已复制到剪贴板</string>
-    <string name="conference_schedule_info_not_sent_to_participant">无法向参与者发送会议信息</string>
-    <string name="conference_paused_title">您目前不在会议中。</string>
-    <string name="conference_paused_subtitle">点击播放按钮加入回来。</string>
-    <string name="conference_default_title">远程群组通话</string>
-    <string name="conference_invite_title">会议邀请：</string>
-    <string name="conference_update_title">会议已更新：</string>
-    <string name="conference_cancel_title">会议已取消：</string>
-    <string name="conference_description_title">描述</string>
-    <string name="conference_invite_join">加入</string>
-    <string name="conference_invite_participants_count" tools:ignore="PluralsCandidate">%d 参与者</string>
-    <string name="conference_display_mode_mosaic">拼接模式</string>
-    <string name="conference_display_mode_active_speaker">有源扬声器模式</string>
-    <string name="conference_waiting_room_start_call">开始</string>
-    <string name="conference_waiting_room_cancel_call">取消</string>
-    <string name="conference_waiting_room_video_disabled">视频目前已停用</string>
-    <string name="conference_scheduled">会议</string>
-    <string name="conference_too_many_participants_for_mosaic_layout">马赛克布局与会者过多，切换到主动发言者</string>
-    <string name="conference_participant_paused">（已暂停）</string>
-    <string name="conference_no_schedule">还没有预定的会议。</string>
-    <string name="conference_no_terminated_schedule">还没有终止的会议。</string>
-    <string name="conference_schedule_organizer">发起人：</string>
-    <string name="conference_go_to_chat">会议聊天室</string>
-    <string name="conference_schedule_mandatory_field">强制开启</string>
-    <string name="conference_schedule_subject_title">主题</string>
-    <string name="conference_group_call_subject_hint">群组通话主题</string>
-    <string name="conference_schedule_address_title">会议地址</string>
-    <string name="conference_schedule_description_title">添加描述</string>
-    <string name="conference_schedule_date">日期</string>
-    <string name="conference_schedule_time">时间</string>
-    <string name="conference_schedule_duration">时长</string>
-    <string name="conference_schedule_send_invite_email">通过电子邮件发送邀请</string>
-    <string name="conference_schedule_later">你想安排一个稍后的会议吗？</string>
-    <string name="conference_schedule_subject_hint">会议主题</string>
-    <string name="conference_schedule_timezone">时区</string>
-    <string name="conference_schedule_send_updated_invite_email">通过电子邮件发送更新</string>
-    <string name="conference_schedule_send_updated_invite_chat">通过 &appName; 发送更新</string>
-    <string name="conference_schedule_description_hint">描述</string>
-    <string name="conference_admin_set">%s 已成为主持人</string>
-    <string name="conference_admin_unset">%s 已不是主持人</string>
-    <string name="conference_schedule_info_created">会议已安排</string>
-    <string name="conference_empty">您目前独自一人参与此群组通话</string>
-    <string name="conference_invitation_received_notification">你被邀请参加会议</string>
-    <string name="conference_invitation">会议邀请</string>
-    <string name="conference_low_bandwidth">检测到低带宽，禁用视频</string>
-    <string name="conference_last_user">所有其他参与者都已离开群组通话</string>
-    <string name="conference_incoming_title">呼入组呼</string>
-    <string name="conference_participants_title">参与者 (%d)</string>
-    <string name="conference_start_group_call_dialog_title">群组通话</string>
-    <string name="conference_start_group_call_dialog_ok_button">开始</string>
-    <string name="conference_scheduled_terminated_filter">已终止</string>
-    <string name="conference_scheduled_future_filter">已安排</string>
-    <string name="conference_scheduled_delete_one_dialog">你想删除这个会议吗？</string>
-    <string name="conference_scheduled_delete_many_dialog">要删除这些会议吗？</string>
-    <string name="conference_scheduled_cancelled_by_organizer">会议已被发起者取消</string>
-    <string name="conference_scheduled_cancelled_by_me">您已取消会议</string>
-    <string name="call_action_participants_list">参会名单</string>
-    <string name="call_action_chat">聊天</string>
-    <string name="call_action_calls_list">通话清单</string>
-    <string name="call_action_numpad">数字键</string>
-    <string name="call_action_change_conf_layout">更改布局</string>
-    <string name="call_action_statistics">通话统计</string>
-    <string name="call_action_add_call">建立新通话</string>
-    <string name="call_action_transfer_call">转接电话</string>
-    <string name="call_context_action_resume">恢复通话</string>
-    <string name="call_context_action_pause">暂停通话</string>
-    <string name="call_context_action_transfer">转接电话</string>
-    <string name="call_remote_recording">此通话正在录音中。</string>
-    <string name="call_locally_paused_title">您已暂停通话。</string>
-    <string name="call_locally_paused_subtitle">点击播放按钮继续。</string>
-    <string name="call_stats_media_encryption">媒体加密：</string>
-    <string name="call_stats_zrtp_cipher_algo">密码算法：</string>
-    <string name="call_stats_zrtp_key_agreement_algo">密钥协商算法：</string>
-    <string name="call_stats_zrtp_hash_algo">哈希算法：</string>
-    <string name="call_stats_zrtp_auth_tag_algo">认证算法：</string>
-    <string name="call_stats_zrtp_sas_algo">SAS算法：</string>
-    <string name="contacts_settings_ldap_title">LDAP</string>
-    <string name="contacts_settings_ldap_enable_title">启用</string>
-    <string name="contacts_settings_ldap_server_title">服务器网址</string>
-    <string name="contacts_settings_ldap_bind_dn_title">绑定 DN</string>
-    <string name="contacts_settings_ldap_password_title">密码</string>
-    <string name="contacts_settings_ldap_auth_method_title">身份验证方法</string>
-    <string name="contacts_settings_ldap_auth_method_anonymous">匿名</string>
-    <string name="contacts_settings_ldap_auth_method_simple">简单</string>
-    <string name="contacts_settings_ldap_tls_title">使用 TLS</string>
-    <string name="contacts_settings_ldap_cert_check_title">检查证书</string>
-    <string name="contacts_settings_ldap_cert_check_auto">自动</string>
-    <string name="contacts_settings_ldap_cert_check_disabled">禁用</string>
-    <string name="contacts_settings_ldap_cert_check_enabled">启用</string>
-    <string name="contacts_settings_ldap_search_base_subtitle">不能为空！</string>
-    <string name="contacts_settings_ldap_search_filter_title">筛选</string>
-    <string name="contacts_settings_ldap_search_max_results_title">最大结果</string>
-    <string name="contacts_settings_ldap_search_timeout_title">超时</string>
-    <string name="contacts_settings_ldap_search_timeout_subtitle">秒数</string>
-    <string name="contacts_settings_ldap_request_delay_title">两次请求间的间隔时间</string>
-    <string name="contacts_settings_ldap_request_delay_subtitle">毫秒</string>
-    <string name="contacts_settings_ldap_parsing_title">分析中</string>
-    <string name="contacts_settings_ldap_name_attribute_title">名称属性</string>
-    <string name="contacts_settings_ldap_sip_attribute_title">SIP 属性</string>
-    <string name="contacts_settings_ldap_sip_domain_title">域名</string>
-    <string name="contacts_settings_ldap_misc_title">杂项</string>
-    <string name="contacts_settings_ldap_debug_title">调试</string>
-    <string name="contacts_settings_ldap_search_base_title">搜寻基本</string>
-    <string name="account_setting_audio_video_conference_factory_address">音频/视频会议工厂 URI</string>
-    <string name="account_setting_end_to_end_encryption_keys_server_url">E2E 加密密钥服务器 URL</string>
-    <string name="conferences_settings_layout_title">默认布局</string>
-    <string name="incoming_group_call_notification_title">收到群组通话</string>
-    <string name="account_setting_conference_factory_address">会议工厂URI</string>
-    <string name="content_description_call_context_menu">开启通话菜单</string>
-    <string name="content_description_create_conference">创建电话会议</string>
-    <string name="content_description_copy_conference_address">复制会议地址</string>
-    <string name="content_description_edit_conference">编辑会议</string>
-    <string name="content_description_delete_conference">删除会议</string>
-    <string name="content_description_share_ics">将事件导出到日历</string>
-    <string name="content_description_hide_statistics">隐藏通话统计</string>
-    <string name="content_description_show_numpad">显示数字键</string>
-    <string name="content_description_hide_numpad">隐藏数字键</string>
-    <string name="content_description_conference_participant_mic_muted">静音中的参会者</string>
-    <string name="content_description_toggle_layout_menu">显示或隐藏群组通话布局菜单</string>
-    <string name="content_description_participant_is_paused">参会者暂时离开了群组通话</string>
-    <string name="content_description_conference_participants">群组通话参与者</string>
-    <string name="content_description_recording_export">导出录音</string>
-    <string name="zrtp_dialog_explanation">为了增加安全性，您可以与对方确认下列代码是否相符。</string>
-    <string name="zrtp_dialog_later_button_label">稍后</string>
-    <string name="zrtp_dialog_correct_button_label">确认正确</string>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
deleted file mode 100644
index 3d0f9dd07..000000000
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ /dev/null
@@ -1,843 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE resources [
-<!ENTITY appName "Linphone">
-]>
-<resources xmlns:tools="http://schemas.android.com/tools">
-    <string name="service_name">&appName; 服務</string>
-    <string name="service_description">必須開啟此服務，才可於背景中接收來電</string>
-    <string name="sync_account_name">&appName; 聯絡人</string>
-    <string name="about_privacy_policy">了解我們的隱私權保護政策</string>
-    <string name="logs_url_copied_to_clipboard">已將記錄檔網址複製到剪貼簿</string>
-    <string name="phone_number">電話號碼</string>
-    <string name="phone_numbers">電話號碼</string>
-    <string name="international_prefix">前綴</string>
-    <string name="assistant_choose_country">選擇國家</string>
-    <string name="assistant_choose_country_title">國家名稱或電話國碼</string>
-    <string name="username">使用者名稱</string>
-    <string name="password">密碼</string>
-    <string name="email">電子郵件地址</string>
-    <string name="domain">網域</string>
-    <string name="sip_address">SIP 地址</string>
-    <string name="sip_addresses">SIP 地址</string>
-    <string name="cancel">取消</string>
-    <plurals name="days">
-        <item quantity="other">%d 天</item>
-    </plurals>
-    <string name="today">今天</string>
-    <string name="yesterday">昨天</string>
-    <string name="transport">傳輸方式</string>
-    <string name="transport_udp">UDP</string>
-    <string name="transport_tcp">TCP</string>
-    <string name="transport_tls">TLS</string>
-    <string name="status_connected">已連線</string>
-    <string name="status_not_connected">未連線</string>
-    <string name="status_in_progress">連線中</string>
-    <string name="status_error">連線失敗</string>
-    <string name="no_account_configured">未設定帳號</string>
-    <string name="about">關於</string>
-    <string name="assistant">助理</string>
-    <string name="recordings">錄音</string>
-    <string name="settings">設定</string>
-    <string name="quit">離開</string>
-    <string name="history_calls_list">通話</string>
-    <string name="no_missed_call_history">通話紀錄中沒有未接來電</string>
-    <string name="history_delete_many_dialog">您要刪除這些紀錄嗎？</string>
-    <string name="contact_invite_friend">邀請</string>
-    <string name="no_contact">您的通訊錄中沒有聯絡人。</string>
-    <string name="contact_filter_hint">搜尋聯絡人</string>
-    <string name="contact_send_sms_invite_text">您好，和我一起加入 &appName; 吧！可以在 %s 免費下載</string>
-    <string name="contact_last_name">姓氏</string>
-    <string name="contact_first_name">名字</string>
-    <string name="contact_organization">機構</string>
-    <string name="contact_editor_write_permission_denied">寫入聯絡人權限被拒，無法編輯聯絡人</string>
-    <string name="contact_delete_one_dialog">您要刪除這個聯絡人嗎？
-\n它也將會從您的裝置通訊錄中刪除</string>
-    <string name="contact_new_choose_sync_account">選擇儲存聯絡人的位置</string>
-    <string name="contact_local_sync_account">儲存在本機</string>
-    <string name="dialer_address_bar_hint">輸入電話號碼或地址</string>
-    <string name="debug_popup_title">除錯</string>
-    <string name="debug_popup_enable_logs">啟用記錄</string>
-    <string name="debug_popup_disable_logs">停用記錄</string>
-    <string name="debug_popup_send_logs">傳送記錄檔</string>
-    <string name="no_chat_history">無對話</string>
-    <string name="chat_remote_is_composing">對方正在寫訊息…</string>
-    <string name="chat_event_conference_created">您已加入群組</string>
-    <string name="chat_event_conference_destroyed">您已離開群組</string>
-    <string name="chat_event_participant_added">%s 已加入</string>
-    <string name="chat_event_participant_removed">%s 已離開</string>
-    <string name="chat_event_device_added">%s 的新裝置</string>
-    <string name="chat_event_device_removed">已刪除 %s 的裝置</string>
-    <string name="chat_event_subject_changed">新主旨：%s</string>
-    <string name="chat_event_admin_set">%s 是管理者</string>
-    <string name="chat_event_admin_unset">%s 已不再是管理者</string>
-    <string name="chat_security_event_lime_identity_key_changed">%s 的 LIME 加密密鑰已變更</string>
-    <string name="chat_security_event_security_level_downgraded">因 %s，造成安全層級降低</string>
-    <string name="chat_security_event_participant_max_count_exceeded">參加人數上限超過 %s 人</string>
-    <string name="chat_event_ephemeral_disabled">您停用了「閱後即焚」訊息</string>
-    <string name="chat_event_ephemeral_lifetime_changed">「閱後即焚」訊息到期日：%s</string>
-    <string name="chat_message_download_file">下載</string>
-    <string name="chat_message_pick_file_dialog">選擇來源</string>
-    <string name="chat_room_devices_fragment_title">對話裝置</string>
-    <string name="service_auto_start_description">&appName; 已自動啟動</string>
-    <string name="select_your_country">選擇您的國家</string>
-    <string name="share_uploaded_logs_link">透過下列方式分享記錄檔連結…</string>
-    <string name="app_description"><i>自由</i>的 SIP 軟體</string>
-    <string name="history_delete_one_dialog">您要刪除這筆紀錄嗎？</string>
-    <string name="no_call_history">通話紀錄中沒有通話</string>
-    <string name="no_sip_contact">通訊錄中沒有 SIP 聯絡人。</string>
-    <string name="contact_choose_existing_or_new_to_add_number">選擇聯絡人或建立新的聯絡人</string>
-    <string name="contact_delete_many_dialog">您要刪除這些聯絡人嗎？
-\n它們也將會從您的裝置通訊錄中刪除</string>
-    <string name="chat_security_event_man_in_the_middle_detected">偵測到 %s 的中間人攻擊</string>
-    <string name="chat_room_ephemeral_messages_desc">此訊息將於被閱讀過後，經指定的時間於兩端裝置刪除。</string>
-    <string name="call_error_declined">通話被拒接</string>
-    <string name="call_video_update_requested_dialog">對方要求開啟視訊</string>
-    <string name="call_stats_receiver_loss_rate">接收端封包遺失率：</string>
-    <string name="chat_room_group_info_title">訊息</string>
-    <string name="chat_room_group_info_participants">參與者</string>
-    <string name="chat_room_group_info_subject_hint">為群組命名</string>
-    <string name="chat_room_group_info_leave">離開群組</string>
-    <string name="chat_room_group_info_leave_dialog_button">離開</string>
-    <string name="chat_room_group_info_you_are_now_admin">您現在是管理者</string>
-    <string name="chat_room_group_info_you_are_no_longer_admin">您已不再是管理者</string>
-    <string name="chat_message_imdn_info">傳遞狀態</string>
-    <string name="chat_message_imdn_displayed">已讀</string>
-    <string name="chat_message_imdn_sent">已傳送</string>
-    <string name="chat_message_imdn_delivered">已送達</string>
-    <string name="chat_message_imdn_undelivered">未送達</string>
-    <string name="chat_message_forwarded">已轉寄</string>
-    <string name="chat_message_context_menu_resend">重寄</string>
-    <string name="chat_message_context_menu_copy_text">複製文字</string>
-    <string name="chat_message_context_menu_forward">轉寄</string>
-    <string name="chat_message_context_menu_imdn_info">傳遞狀態</string>
-    <string name="chat_message_context_menu_delete">刪除</string>
-    <string name="chat_message_context_menu_add_to_contacts">加入通訊錄</string>
-    <string name="chat_room_context_menu_group_info">群組訊息</string>
-    <string name="chat_room_context_menu_participants_devices">對話中的裝置</string>
-    <string name="chat_message_context_menu_ephemeral_messages">「閱後即焚」訊息</string>
-    <string name="chat_message_context_menu_delete_messages">刪除訊息</string>
-    <string name="chat_room_ephemeral_fragment_title">「閱後即焚」訊息</string>
-    <string name="chat_room_ephemeral_message_disabled">已停用</string>
-    <string name="chat_room_ephemeral_message_one_minute">1 分鐘</string>
-    <string name="chat_room_ephemeral_message_one_hour">1 小時</string>
-    <string name="chat_room_ephemeral_message_one_day">1 天</string>
-    <string name="chat_room_ephemeral_message_three_days">3 天</string>
-    <string name="chat_room_ephemeral_message_one_week">1 週</string>
-    <plurals name="chat_room_remote_composing">
-        <item quantity="other">%s 正在寫訊息…</item>
-    </plurals>
-    <string name="chat_room_creation_failed_snack">聊天室建立失敗</string>
-    <string name="chat_room_removal_failed_snack">聊天室刪除失敗</string>
-    <string name="chat_room_delete_one_dialog">您確定要刪除此對話嗎？</string>
-    <string name="chat_room_delete_many_dialog">您確定要刪除這些對話嗎？</string>
-    <string name="chat_message_notification_hidden_content">&lt;已隱藏&gt;</string>
-    <string name="recordings_empty_list">無錄音</string>
-    <string name="call_incoming_title">來電</string>
-    <string name="call_outgoing_title">去電</string>
-    <string name="call_notification_paused">通話已暫停</string>
-    <string name="call_notification_outgoing">去電</string>
-    <string name="call_notification_active">通話中</string>
-    <string name="call_error_user_busy">使用者忙線中</string>
-    <string name="call_error_user_not_found">找不到使用者</string>
-    <string name="call_error_incompatible_media_params">不相容的媒體參數</string>
-    <string name="call_error_network_unreachable">無法連線到網路</string>
-    <string name="call_error_io_error">服務無法使用或網路錯誤</string>
-    <string name="call_stats_audio">音訊</string>
-    <string name="call_stats_video">視訊</string>
-    <string name="call_stats_codec">編解碼器：</string>
-    <string name="call_stats_ip">IP Family：</string>
-    <string name="call_stats_upload">上傳頻寬：</string>
-    <string name="call_stats_download">下載頻寬：</string>
-    <string name="call_stats_estimated_download">估計下載頻寬：</string>
-    <string name="call_stats_ice">ICE 連線狀態：</string>
-    <string name="call_stats_video_resolution_sent">發送視訊解析度：</string>
-    <string name="call_stats_video_resolution_received">接收視訊解析度：</string>
-    <string name="call_stats_video_fps_sent">發送視訊影格率：</string>
-    <string name="call_stats_video_fps_received">接收視訊影格率：</string>
-    <string name="call_stats_sender_loss_rate">發送端封包遺失率：</string>
-    <string name="call_stats_jitter_buffer">抖動緩衝：</string>
-    <string name="call_stats_encoder_name">編碼器：</string>
-    <string name="call_stats_decoder_name">解碼器：</string>
-    <string name="call_stats_player_filter">播放過濾器：</string>
-    <string name="call_stats_capture_filter">擷取過濾器：</string>
-    <string name="assistant_welcome_title">歡迎</string>
-    <string name="assistant_create_account">註冊帳號</string>
-    <string name="assistant_login_linphone">使用 &appName; 帳號</string>
-    <string name="assistant_login_generic">使用 SIP 帳號</string>
-    <string name="assistant_remote_provisioning">取得遠端設定</string>
-    <string name="assistant_ec_calibration">正在進行回音消除校正</string>
-    <string name="assistant_phone_number_info_title">我的電話號碼將用於什麼地方？</string>
-    <string name="assistant_phone_number_link_info_content">
-\n如果將您的帳號與電話號碼連結起來，您的朋友們可更容易找到你。
-\n
-\n您可在通訊錄裡直接看到有哪些朋友使用 &appName;，他們也同樣可以透過 &appName; 聯絡您。
-\n</string>
-    <string name="assistant_error_phone_number_invalid_characters">只能輸入數字</string>
-    <string name="assistant_error_username_already_exists">使用者名稱已被使用</string>
-    <string name="assistant_error_phone_number_already_exists">已有帳號使用這組號碼</string>
-    <string name="assistant_error_username_invalid_characters">找到無效文字</string>
-    <string name="assistant_error_passwords_dont_match">密碼錯誤</string>
-    <string name="assistant_error_invalid_email_address">電子郵件地址無效</string>
-    <string name="assistant_error_username_too_long">使用者名稱太長</string>
-    <string name="assistant_linphone_account">使用您的 &appName; 帳號</string>
-    <string name="assistant_create_account_part_1">請確認您的國碼，並輸入電話號碼</string>
-    <string name="assistant_linphone_login_desc">請輸入您 &appName; 帳號的使用者名稱和密碼</string>
-    <string name="assistant_login_with_username">使用使用者名稱和密碼，不使用電話號碼</string>
-    <string name="assistant_login_forgotten_password">忘記密碼？</string>
-    <string name="assistant_login">登入</string>
-    <string name="assistant_finish">完成設定</string>
-    <string name="assistant_confirmation_code">確認碼</string>
-    <string name="assistant_generic_account">使用 SIP 帳號</string>
-    <string name="assistant_login_desc">請輸入您的使用者名稱、密碼和 SIP 網域</string>
-    <string name="assistant_display_name_optional">顯示名字（選填）</string>
-    <string name="assistant_confirm_password">確認密碼</string>
-    <string name="assistant_validate_account_1">已建立您的帳號。請收信以驗證您的帳號：</string>
-    <string name="assistant_validate_account_2">完成後，請返回並點擊此處。</string>
-    <string name="assistant_use_username_instead_or_phone_number">使用帳號名稱（選填）</string>
-    <string name="assistant_create_account_part_3">請輸入 4 位數驗證碼以完成驗證：
-\n</string>
-    <string name="assistant_link_phone_number">將會把您的電話號碼綁定到下列使用者名稱：</string>
-    <string name="assistant_link_phone_number_skip">跳過</string>
-    <string name="assistant_link_account">連結帳號</string>
-    <string name="assistant_remote_provisioning_title">取得遠端設定</string>
-    <string name="assistant_remote_provisioning_desc">請提供您的設定網址</string>
-    <string name="assistant_remote_provisioning_url">網址</string>
-    <string name="assistant_remote_provisioning_wrong_format">網址格式不正確，無法下載開通設定…</string>
-    <string name="assistant_welcome_desc">設定助理將會協助您設定使用您的 SIP 帳號。</string>
-    <string name="assistant_phone_number_link_info_content_already_account">您只能將電話號碼與一組 &appName; 綁定起來。
-\n
-\n如果您已經將號碼連結到其他帳號，但是您更想使用這個，只需連結您現在的帳號，號碼就會自動轉移到這個帳號。</string>
-    <string name="assistant_error_invalid_credentials">帳號不存在或密碼不正確</string>
-    <string name="assistant_continue_even_if_credentials_invalid">繼續</string>
-    <string name="assistant_create_account_part_email">請輸入您的 &appName; 帳號使用者名稱、電子郵件信箱與密碼</string>
-    <string name="assistant_create_account_part_2">我們已發送驗證簡訊到您的手機號碼：</string>
-    <string name="chat_room_group_info_admin">管理者</string>
-    <string name="chat_room_group_info_leave_dialog_message">您要離開這個對話嗎？</string>
-    <string name="chat_message_forward_confirmation_dialog">是否要將訊息轉寄到此聊天室？</string>
-    <string name="assistant_remote_provisioning_failure">無法下載或套用遠端開通設定…</string>
-    <string name="assistant_fetch_apply">取得並套用</string>
-    <string name="assistant_launch_qrcode">QR Code</string>
-    <string name="settings_accounts_title">SIP 帳號</string>
-    <string name="settings_default_account_subtitle">預設帳號</string>
-    <string name="settings_list_title">偏好設定</string>
-    <string name="settings_tunnel_title">隧道協定</string>
-    <string name="settings_audio_title">音訊</string>
-    <string name="settings_video_title">視訊</string>
-    <string name="settings_call_title">通話</string>
-    <string name="settings_chat_title">聊天</string>
-    <string name="settings_network_title">網路</string>
-    <string name="settings_contacts_title">聯絡人</string>
-    <string name="settings_advanced_title">進階</string>
-    <string name="call_settings_sipinfo_dtmf_title">傳送帶外撥號音（SIP INFO）</string>
-    <string name="call_settings_incoming_timeout_title">來電超時</string>
-    <string name="audio_settings_output_device_summary">變更將在下次通話時生效</string>
-    <string name="video_settings_initiate_call_summary">總是發送視訊請求</string>
-    <string name="video_settings_bandwidth_limit_summary">kbits/s</string>
-    <string name="call_settings_encryption_mandatory_title">強制加密媒體</string>
-    <string name="audio_settings_echo_cancellation_summary">刪除另一端聽到的回音</string>
-    <string name="audio_settings_echo_canceller_calibration_title">校正回音消除功能</string>
-    <string name="audio_settings_echo_canceller_calibration_summary">點擊此處即可校正回音消除功能</string>
-    <string name="audio_settings_echo_cancellation_calibration_value">花費 %s 毫秒完成校正</string>
-    <string name="audio_settings_echo_cancellation_calibration_failed">校正失敗</string>
-    <string name="audio_settings_echo_cancellation_calibration_no_echo">未偵測到回音</string>
-    <string name="audio_settings_echo_tester_title">通話語音測試</string>
-    <string name="audio_settings_echo_tester_summary">點擊此處即可啟動通話語音測試</string>
-    <string name="audio_settings_echo_tester_summary_is_running">通話語音測試執行中</string>
-    <string name="audio_settings_adaptive_rate_control_title">自動調整傳輸率</string>
-    <string name="audio_settings_input_device_title">預設音訊輸入裝置</string>
-    <string name="audio_settings_input_device_summary">變更將在下次通話時生效</string>
-    <string name="audio_settings_output_device_title">預設音訊輸出裝置</string>
-    <string name="audio_settings_codec_bitrate_title">編解碼器位元速率限制</string>
-    <string name="audio_settings_microphone_gain_title">麥克風增益</string>
-    <string name="audio_settings_microphone_gain_summary">（分貝）</string>
-    <string name="audio_settings_playback_gain_title">播放增益</string>
-    <string name="audio_settings_playback_gain_summary">（分貝）</string>
-    <string name="audio_settings_codecs_title">編解碼器</string>
-    <string name="video_settings_enable_title">啟用視訊</string>
-    <string name="video_settings_tablet_preview_title">在撥號器顯示攝影機畫面預覽</string>
-    <string name="video_settings_initiate_call_title">發起視訊通話</string>
-    <string name="video_settings_automatically_accept_title">接受收到的視訊通話請求</string>
-    <string name="video_settings_automatically_accept_summary">總是接受收到的視訊通話請求</string>
-    <string name="video_settings_camera_device_title">攝影機</string>
-    <string name="video_settings_video_preset_title">視訊預設設定</string>
-    <string name="video_settings_preferred_fps_title">偏好的畫框數</string>
-    <string name="video_settings_video_size_title">偏好的視訊畫面大小</string>
-    <string name="video_settings_bandwidth_limit_title">頻寬限制</string>
-    <string name="video_settings_codecs_title">編解碼器</string>
-    <string name="call_settings_device_ringtone_title">使用裝置鈴聲</string>
-    <string name="call_settings_vibrate_title">來電時震動</string>
-    <string name="call_settings_encryption_title">媒體加密</string>
-    <string name="call_settings_media_encryption_none">無</string>
-    <string name="call_settings_media_encryption_srtp">SRTP</string>
-    <string name="call_settings_media_encryption_zrtp">ZRTP</string>
-    <string name="call_settings_media_encryption_dtls">DTLS-SRTP</string>
-    <string name="call_settings_system_wide_overlay_summary">系統將請您授權「顯示在其他應用程式上層」權限</string>
-    <string name="call_settings_rfc2833_dtmf_title">傳送帶内撥號音（RFC 2833）</string>
-    <string name="call_settings_auto_start_title">立即開始通話</string>
-    <string name="call_settings_auto_start_summary">如果從其他應用程式啟動，則通話將自動開始</string>
-    <string name="call_settings_auto_answer_title">自動接聽來電</string>
-    <string name="call_settings_auto_answer_delay_title">自動接聽時間</string>
-    <string name="call_settings_auto_answer_delay_summary">毫秒</string>
-    <string name="call_settings_incoming_timeout_summary">秒</string>
-    <string name="call_settings_voice_mail_uri_title">語音信箱 URI</string>
-    <string name="call_settings_accept_early_media_title">在通話之前建立媒體串流</string>
-    <string name="call_settings_go_to_android_notification_settings">Android 通知設定</string>
-    <string name="call_settings_overlay_title">將來電通知覆蓋於畫面上</string>
-    <string name="audio_settings_echo_cancellation_calibration_started">已開始校正回音消除功能</string>
-    <string name="audio_settings_echo_tester_summary_is_stopped">通話語音測試已停止</string>
-    <string name="contacts_settings_friendlist_subscribe_title">訂閱好友列表</string>
-    <string name="contacts_settings_launcher_shortcuts_title">在主畫面放置聯絡人捷徑</string>
-    <string name="advanced_settings_background_mode_summary">顯示通知，使應用程式保持運作</string>
-    <string name="advanced_settings_logs_server_url_summary">除非你知道在做什麼，請勿隨意編輯！</string>
-    <string name="tunnel_settings_dual_port_title">第二台伺服器通訊埠</string>
-    <string name="tunnel_settings_mode_title">模式</string>
-    <string name="account_settings_user_name_title">使用者名稱</string>
-    <string name="account_settings_user_id_summary">若驗證用 ID 與使用者名稱不同，請填寫驗證用 ID（選填）</string>
-    <string name="account_settings_push_notification_title">允許推送通知</string>
-    <string name="account_settings_outbound_proxy_title">外連代理伺服器</string>
-    <string name="account_settings_avpf_rr_interval_title">AVPF regular RTCP 間隔</string>
-    <string name="notification_channel_service_name">&appName; 服務通知</string>
-    <string name="received_chat_notification_mark_as_read_label">標記為已讀</string>
-    <string name="dialog_zrtp_remote_sas">您的對話者必須說：</string>
-    <string name="dialog_lime_security_message">在加密對話中，即時訊息是被端到端加密的。透過驗證參與者的身份，可以再增加提高對話的安全等級。若要這麼做，請打電話給聯絡人，並進行身份驗證。</string>
-    <string name="content_description_switch_camera">切換前後攝影機</string>
-    <string name="content_description_disable_mic_mute">取消麥克風靜音</string>
-    <string name="content_description_toggle_audio_menu">顯示或隱藏音訊輸出選單</string>
-    <string name="content_description_transfer_call">將目前的通話轉接給別人</string>
-    <string name="content_description_e2e_encryption_disabled">已停用端到端加密</string>
-    <string name="content_description_attach_file">附加檔案到訊息</string>
-    <string name="content_description_ephemeral_duration_change">將「閱後即焚」訊息的時效調整為選擇的值</string>
-    <string name="content_description_contact_can_do_encryption">可將聯絡人邀請至加密的對話中</string>
-    <string name="content_description_start_encrypted_chat">進入加密對話</string>
-    <string name="content_description_discard_changes">放棄變更</string>
-    <string name="content_description_unselect_all">取消選擇清單中的所有項目</string>
-    <string name="content_description_recording_toggle_play">播放或暫停錄音</string>
-    <string name="content_description_show_missed_calls">只顯示未接來電</string>
-    <string name="content_description_call_quality_0">通話品質極差</string>
-    <string name="chat_settings_file_sharing_url_title">共享伺服器網址</string>
-    <string name="chat_settings_file_sharing_url_summary">除非你知道要修改什麼，請勿隨意編輯！</string>
-    <string name="chat_settings_auto_download_title">自動下載收到的檔案政策</string>
-    <string name="chat_settings_auto_download_summary">是否自動下載收到的聊天訊息中附加的檔案</string>
-    <string name="chat_settings_auto_download_always">總是</string>
-    <string name="chat_settings_auto_download_never">永不</string>
-    <string name="chat_settings_auto_download_under_size">若小於指定的最大大小</string>
-    <string name="chat_settings_auto_download_max_size_title">最大大小</string>
-    <string name="chat_settings_auto_download_max_size_summary">位元組</string>
-    <string name="chat_settings_downloaded_media_public_title">將下載的媒體檔案公開</string>
-    <string name="chat_settings_downloaded_media_public_summary">將不會自動下載「閱後即焚」訊息中的檔案</string>
-    <string name="chat_settings_hide_notification_content_title">在通知中隱藏訊息內容</string>
-    <string name="chat_settings_hide_notification_content_summary">僅顯示寄件者姓名</string>
-    <string name="chat_settings_launcher_shortcuts_title">在主畫面中放置聊天室捷徑</string>
-    <string name="chat_settings_launcher_shortcuts_summary">如果啟用，將取代為聯絡人捷徑</string>
-    <string name="chat_settings_hide_empty_rooms_title">隱藏空的聊天室</string>
-    <string name="chat_settings_hide_rooms_removed_proxies_title">於移除的帳號中隱藏聊天室</string>
-    <string name="chat_settings_hide_rooms_removed_proxies_summary">若您有一些聊天室不見了，可嘗試取消此選項</string>
-    <string name="chat_settings_go_to_android_notification_settings">Android 通知設定</string>
-    <string name="network_settings_wifi_only_title">只使用 Wi-Fi</string>
-    <string name="network_settings_allow_ipv6_title">允許 IPv6</string>
-    <string name="network_settings_random_ports_title">使用隨機通訊埠</string>
-    <string name="network_settings_sip_port_title">要使用的 SIP 通訊埠</string>
-    <string name="contacts_settings_native_presence_title">內建通訊錄中的狀態資訊</string>
-    <string name="contacts_settings_native_presence_summary">插入 &appName; 連絡人資訊捷徑到 Android 內建通訊錄</string>
-    <string name="contacts_settings_show_organization_title">顯示聯絡人的公司資訊</string>
-    <string name="contacts_settings_launcher_shortcuts_summary">將取代聊天室捷徑（若有）</string>
-    <string name="contacts_settings_show_new_contact_account_dialog_title">總是詢問要在哪個帳號中儲存新建立的聯絡人</string>
-    <string name="contacts_settings_show_new_contact_account_dialog_summary">若停用，聯絡人將儲存在本機</string>
-    <string name="advanced_settings_debug_mode_title">除錯記錄</string>
-    <string name="advanced_settings_background_mode_title">背景模式</string>
-    <string name="advanced_settings_auto_start_title">開機時啟動</string>
-    <string name="advanced_settings_dark_mode_title">暗色模式</string>
-    <string name="advanced_settings_dark_mode_label_auto">自動</string>
-    <string name="advanced_settings_dark_mode_label_no">否</string>
-    <string name="advanced_settings_dark_mode_label_yes">是</string>
-    <string name="advanced_settings_animations_title">動畫</string>
-    <string name="advanced_settings_device_name_title">裝置名稱</string>
-    <string name="advanced_settings_device_name_summary">變更將在下次啟動時生效</string>
-    <string name="advanced_settings_remote_provisioning_url_title">遠端開通網址</string>
-    <string name="advanced_settings_logs_server_url_title">記錄上傳伺服器網址</string>
-    <string name="advanced_settings_android_title">Android</string>
-    <string name="advanced_settings_go_to_power_manager_settings">電源管理設定</string>
-    <string name="advanced_settings_go_to_android_app_settings">Android 應用程式設定</string>
-    <string name="advanced_settings_send_debug_logs_title">傳送記錄</string>
-    <string name="advanced_settings_reset_debug_logs_title">重設記錄</string>
-    <string name="tunnel_settings_hostname_url_title">主機名稱</string>
-    <string name="tunnel_settings_port_title">通訊埠</string>
-    <string name="tunnel_settings_dual_mode_title">已啟用雙模式</string>
-    <string name="tunnel_settings_dual_mode_summary">將使用一台伺服器進行上傳，另一台伺服器進行下載</string>
-    <string name="tunnel_settings_dual_hostname_url_title">第二台伺服器主機名</string>
-    <string name="tunnel_settings_dual_hostname_url_summary">雙模式下必需</string>
-    <string name="tunnel_settings_dual_port_summary">雙模式下必填</string>
-    <string name="tunnel_settings_disabled_mode">停用</string>
-    <string name="tunnel_settings_always_mode">總是</string>
-    <string name="tunnel_settings_auto_mode">自動</string>
-    <string name="account_settings_user_name_summary">範例：若您的帳號是 john@sip.example.org，請輸入 john</string>
-    <string name="account_settings_user_id_title">Auth ID</string>
-    <string name="account_settings_password_title">密碼</string>
-    <string name="account_settings_password_summary">如果您編輯了您的使用者名稱或網域名稱，您必須重新輸入密碼</string>
-    <string name="account_settings_domain_title">網域</string>
-    <string name="account_settings_domain_summary">舉例：若您的帳號是 john@sip.example.org，請輸入 sip.example.org</string>
-    <string name="account_settings_display_name_title">顯示名稱</string>
-    <string name="account_settings_manage_title">管理</string>
-    <string name="account_settings_disable_title">停用</string>
-    <string name="account_settings_default_title">預設使用</string>
-    <string name="account_settings_link_phone_number_title">連結您的帳號</string>
-    <string name="account_settings_delete_title">刪除</string>
-    <string name="account_settings_advanced_title">進階</string>
-    <string name="account_settings_push_notification_summary">帳號不取消註冊</string>
-    <string name="account_settings_transport_title">傳輸方式</string>
-    <string name="account_settings_transport_udp">UDP</string>
-    <string name="account_settings_transport_tcp">TCP</string>
-    <string name="account_settings_transport_tls">TLS</string>
-    <string name="account_settings_proxy_title">SIP 代理伺服器</string>
-    <string name="account_settings_outbound_proxy_summary">將所有通話透過以上 SIP Proxy 傳輸</string>
-    <string name="account_settings_stun_server_title">STUN / TURN 伺服器</string>
-    <string name="account_settings_ice_title">開啟 ICE</string>
-    <string name="account_settings_avpf_title">AVPF</string>
-    <string name="account_settings_avpf_rr_interval_summary">以秒為單位（1 到 5 之間）</string>
-    <string name="account_settings_expires_title">到期</string>
-    <string name="account_settings_expires_summary">秒</string>
-    <string name="account_settings_prefix_title">您所在國家的前綴</string>
-    <string name="account_settings_prefix_summary">不含 +</string>
-    <string name="account_settings_escape_plus_title">將 + 取代為 00</string>
-    <string name="notification_channel_incoming_call_name">&appName; 來電通知</string>
-    <string name="notification_channel_chat_name">&appName; 即時訊息通知</string>
-    <string name="incoming_call_notification_title">有來電</string>
-    <string name="incoming_call_notification_hangup_action_label">掛斷</string>
-    <string name="incoming_call_notification_answer_action_label">接聽</string>
-    <string name="received_chat_notification_reply_label">回覆</string>
-    <string name="missed_call_notification_title">未接來電</string>
-    <string name="missed_call_notification_body">來自 %s 的未接來電</string>
-    <string name="missed_calls_notification_body">%d 通未接來電</string>
-    <string name="zrtp_dialog_title">通訊安全性</string>
-    <string name="dialog_zrtp_local_sas">說：</string>
-    <string name="dialog_do_not_ask_again">不再顯示</string>
-    <string name="dialog_cancel">取消</string>
-    <string name="dialog_delete">刪除</string>
-    <string name="dialog_ok">確定</string>
-    <string name="dialog_accept">接聽</string>
-    <string name="dialog_decline">拒絕</string>
-    <string name="dialog_call">打電話</string>
-    <string name="operation_in_progress_wait">操作正在進行中，請稍候</string>
-    <string name="dialog_default_delete_one">您確定要刪除這個項目嗎？</string>
-    <string name="dialog_default_delete_many">您確定要刪除選擇的項目嗎？</string>
-    <string name="dialog_update_available">有可用的更新</string>
-    <string name="dialog_try_open_file_as_text_title">找不到能開啟此類檔案的應用程式</string>
-    <string name="dialog_try_open_file_as_text_body">您想嘗試將其當作純文字文件開啟嗎？</string>
-    <string name="content_description_add_sip_address_field">加入 SIP 地址欄位</string>
-    <string name="content_description_add_phone_number_field">加入電話號碼欄位</string>
-    <string name="content_description_go_back">返回</string>
-    <string name="content_description_phone_number_use">顯示您的電話號碼的用途</string>
-    <string name="content_description_clear_field">清除旁邊的文字欄位</string>
-    <string name="content_description_pause_call">暫停通話</string>
-    <string name="content_description_toggle_recording">啟用或停用通話錄音</string>
-    <string name="content_description_terminate_call">中斷通話</string>
-    <string name="content_description_answer_call">接聽來電</string>
-    <string name="content_description_enable_mic_mute">麥克風靜音</string>
-    <string name="content_description_enable_speaker">將音訊傳到喇叭</string>
-    <string name="content_description_disable_speaker">將音訊傳到耳機</string>
-    <string name="content_description_go_back_to_call">返回通話畫面</string>
-    <string name="content_description_enable_video">啟用通話中的視訊</string>
-    <string name="content_description_disable_video">關閉通話中的視訊</string>
-    <string name="content_description_use_bluetooth_headset">將音訊輸出到藍牙耳機</string>
-    <string name="content_description_use_earpiece">將音訊輸出到耳機</string>
-    <string name="content_description_use_speaker">將音訊輸出到喇叭</string>
-    <string name="content_description_add_call">發起新通話</string>
-    <string name="content_description_pending_file_transfer">待傳輸檔案</string>
-    <string name="content_description_remove_pending_file_transfer">刪除待傳輸檔案</string>
-    <string name="content_description_downloaded_file_transfer">附加檔案</string>
-    <string name="content_description_delivery_status">訊息傳遞狀態</string>
-    <string name="content_description_ephemeral_message">是「閱後即焚」訊息</string>
-    <string name="content_description_linphone_user">聯絡人是 &appName; 使用者</string>
-    <string name="content_description_contact_selected">已選擇聯絡人</string>
-    <string name="content_description_e2e_encryption_enabled">已啟用端到端加密</string>
-    <string name="content_description_show_all_contacts">顯示所有聯絡人清單</string>
-    <string name="content_description_show_sip_contacts">只顯示 SIP 聯絡人清單</string>
-    <string name="content_description_continue_chat_room_creation">前往建立聊天室的最後一步</string>
-    <string name="content_description_remove_contact_from_selection">從選擇中刪除聯絡人</string>
-    <string name="content_description_start_call">發起通話</string>
-    <string name="content_description_show_chat_room_menu">顯示聊天室選單</string>
-    <string name="content_description_enter_edition_mode">進入編輯模式</string>
-    <string name="content_description_send_message">發送訊息</string>
-    <string name="content_description_toggle_participant_devices_list">顯示或隱藏參與者裝置</string>
-    <string name="content_description_ephemeral_duration_selected">已選擇「閱後即焚」訊息效期</string>
-    <string name="content_description_create_chat_room">建立聊天室</string>
-    <string name="content_description_add_participants">加入參與者</string>
-    <string name="content_description_remove_contact_from_chat_room">從對話中刪除聯絡人</string>
-    <string name="content_description_contact_is_admin">聯絡人是這個對話的管理者</string>
-    <string name="content_description_contact_is_not_admin">聯絡人不是這個對話的管理者</string>
-    <string name="content_description_ephemeral_chat_room">此對話中的訊息將在閱讀後的一段時間自動刪除</string>
-    <string name="content_description_start_chat">進入對話</string>
-    <string name="content_description_edit_contact">編輯聯絡人</string>
-    <string name="content_description_delete_contact">刪除聯絡人</string>
-    <string name="content_description_confirm_contact_edit">儲存變更</string>
-    <string name="content_description_change_contact_picture">更改聯絡人圖片</string>
-    <string name="content_description_change_own_picture">更改自己的圖片</string>
-    <string name="content_description_show_call_details">前往通話詳細資訊</string>
-    <string name="content_description_exit_edition_mode">離開編輯模式</string>
-    <string name="content_description_select_all">選擇清單中的所有項目</string>
-    <string name="content_description_delete_selection">刪除清單中選擇的項目</string>
-    <string name="content_description_numpad_1">1</string>
-    <string name="content_description_numpad_2">2</string>
-    <string name="content_description_numpad_3">3</string>
-    <string name="content_description_numpad_4">4</string>
-    <string name="content_description_numpad_5">5</string>
-    <string name="content_description_numpad_6">6</string>
-    <string name="content_description_numpad_7">7</string>
-    <string name="content_description_numpad_8">8</string>
-    <string name="content_description_numpad_9">9</string>
-    <string name="content_description_numpad_0">0</string>
-    <string name="content_description_numpad_star">*</string>
-    <string name="content_description_numpad_sharp">#</string>
-    <string name="content_description_voice_mail">語音信箱</string>
-    <string name="content_description_toggle_side_menu">顯示或隱藏側邊選單</string>
-    <string name="content_description_menu_history">通話紀錄</string>
-    <string name="content_description_menu_contacts">聯絡人</string>
-    <string name="content_description_menu_dialer">撥號器</string>
-    <string name="content_description_menu_chat">對話</string>
-    <string name="content_description_dialer_erase">刪除最後一個文字</string>
-    <string name="content_description_add_contact">建立聯絡人</string>
-    <string name="content_description_go_to_contact">前往聯絡人詳細資訊</string>
-    <string name="content_description_show_all_calls">顯示所有通話</string>
-    <string name="content_description_missed_call">未接來電</string>
-    <string name="content_description_incoming_call">來電</string>
-    <string name="content_description_outgoing_call">去電</string>
-    <string name="content_description_create_one_to_one_chat_room">建立一對一對話</string>
-    <string name="content_description_create_group_chat_room">建立群組對話</string>
-    <string name="content_description_security_level_unsafe">不安全</string>
-    <string name="content_description_security_level_safe">安全</string>
-    <string name="content_description_security_level_encrypted">已加密</string>
-    <string name="content_description_call_quality_1">通話品質差</string>
-    <string name="content_description_call_quality_2">通話品質一般</string>
-    <string name="content_description_call_quality_3">通話品質佳</string>
-    <string name="content_description_call_quality_4">通話品質極佳</string>
-    <string name="content_description_call_not_secured">通話未加密</string>
-    <string name="content_description_call_secured">通話已加密</string>
-    <string name="content_description_call_security_pending">無法確定通話安全性</string>
-    <string name="content_description_chat_message_video_attachment">視訊附件</string>
-    <string name="settings_primary_account_display_name_title">顯示名稱</string>
-    <string name="settings_primary_account_username_title">使用者名稱</string>
-    <string name="about_weblate_translation">協助我們翻譯 &appName;</string>
-    <string name="logs_upload_failure">記錄檔上傳失敗！</string>
-    <string name="logs_reset_complete">已清除記錄</string>
-    <string name="contact_cant_be_deleted">無法刪除此聯絡人</string>
-    <string name="contacts_ldap_query_more_results_available">有更多搜尋結果，請嘗試輸入更多條件限制搜尋結果</string>
-    <string name="chat_message_context_menu_reply">回覆</string>
-    <string name="chat_room_choose_conversation_for_message_forward">請選擇要將訊息轉寄到哪個對話，或建立新對話</string>
-    <string name="no_conference_call_history">通話紀錄中沒有會議通話</string>
-    <string name="debug_popup_show_config_file">檢視設定檔</string>
-    <string name="dialer_transfer_succeded">正在轉接通話</string>
-    <string name="dialer_transfer_failed">無法轉接通話</string>
-    <string name="chat_message_replied">回覆</string>
-    <string name="chat_room_file_not_found">找不到檔案</string>
-    <string name="chat_message_context_menu_turn_off_notifications">關閉通知</string>
-    <string name="chat_message_context_menu_turn_on_notifications">開啟通知</string>
-    <string name="chat_message_cant_open_file_in_app_dialog_message">您想用純文字格式開啟，還是以未加密格式匯出到其他應用程式？</string>
-    <string name="chat_room_choose_conversation_for_text_sharing">請選擇聊天室或建立新聊天室來分享訊息</string>
-    <string name="chat_room_context_menu_go_to_contact">開啟聯絡人</string>
-    <string name="chat_message_no_app_found_to_handle_file_mime_type">沒有可開啟此類型檔案的應用程式</string>
-    <string name="chat_bubble_cant_open_enrypted_file">無法於聊天泡泡中開啟加密檔案</string>
-    <string name="chat_message_cant_open_file_in_app_dialog_title">看來無法顯示檔案。</string>
-    <string name="content_description_pause_voice_recording_playback">暫停錄音</string>
-    <string name="content_descripton_scroll_to_bottom">滑動到畫面底部或第一則未讀訊息</string>
-    <string name="content_description_copy_conference_address">複製會議地址</string>
-    <string name="content_description_toggle_conference_info_details">切換顯示會議詳細資訊</string>
-    <string name="chat_settings_use_in_app_file_viewer_title">總是在此程式中開啟</string>
-    <string name="chat_settings_use_in_app_file_viewer_summary">還是可以匯出到第三方應用程式</string>
-    <string name="chat_settings_auto_download_voice_recordings">自動下載收到的錄音檔</string>
-    <string name="content_description_play_voice_recording">播放錄音</string>
-    <string name="assistant_generic_account_warning">某些功能，例如收發群組訊息，或是「閱後即焚」訊息需要註冊 &appName; 帳號才可使用。
-\n
-\n若您使用其他第三方 SIP 帳號註冊時，將隱藏這些功能。
-\n
-\n若要在商業專案中使用這些功能，請聯絡我們。</string>
-    <string name="audio_settings_prefer_bluetooth_devices_title">若有連接，就將音訊傳送到藍牙裝置</string>
-    <string name="call_settings_ringtones_title">鈴聲</string>
-    <string name="conference_invite_title">會議邀請：</string>
-    <string name="conference_description_title">描述</string>
-    <string name="conference_invite_join">加入</string>
-    <string name="conference_display_mode_mosaic">方塊圖模式</string>
-    <string name="conference_display_mode_active_speaker">說話者模式</string>
-    <string name="conference_waiting_room_start_call">開始</string>
-    <string name="content_description_create_conference">建立會議通話</string>
-    <string name="content_description_edit_conference">編輯會議</string>
-    <string name="content_description_hide_statistics">隱藏通話統計資訊</string>
-    <string name="contacts_settings_ldap_bind_dn_title">Bind DN</string>
-    <string name="contacts_settings_ldap_cert_check_enabled">啟用</string>
-    <string name="contacts_settings_ldap_search_title">搜尋</string>
-    <string name="contacts_settings_ldap_search_max_results_title">最大結果</string>
-    <string name="contacts_settings_ldap_request_delay_title">兩次請求間的間隔時間</string>
-    <string name="contacts_settings_ldap_request_delay_subtitle">毫秒</string>
-    <string name="contacts_settings_ldap_debug_title">除錯</string>
-    <string name="content_description_conference_participants">群組通話與會者</string>
-    <string name="conference_group_call_summary">群組通話資訊</string>
-    <string name="recordings_export">匯出錄音透過…</string>
-    <string name="content_description_chat_message_meeting_attachment">會議附件</string>
-    <plurals name="chat_room_unread_messages_event">
-        <item quantity="other">%1$d 封未讀訊息</item>
-    </plurals>
-    <string name="advanced_settings_vfs_summary">開啟後就無法停用！</string>
-    <string name="conference_start_group_call_dialog_title">群組通話</string>
-    <string name="conference_start_group_call_dialog_ok_button">開始</string>
-    <string name="call_settings_pause_calls_lost_audio_focus_title">當遺失音訊焦點時，暫停通話</string>
-    <string name="call_settings_ring_during_early_media_title">在收到早期媒體資料時就響鈴</string>
-    <string name="content_description_cancel_reply">取消回覆</string>
-    <string name="content_description_hide_numpad">隱藏數字鍵</string>
-    <string name="call_error_generic">錯誤：%s</string>
-    <string name="call_action_participants_list">與會者清單</string>
-    <string name="conference_organizer">主辦人</string>
-    <string name="call_context_action_pause">暫停通話</string>
-    <string name="call_context_action_transfer">轉接通話</string>
-    <string name="call_context_action_answer">接聽電話</string>
-    <string name="call_context_action_hangup">掛斷電話</string>
-    <string name="assistant_general_terms">使用條款</string>
-    <string name="assistant_generic_account_warning_continue_button_text">知道了</string>
-    <string name="settings_primary_account_title">主要帳號</string>
-    <string name="settings_conferences_title">會議</string>
-    <string name="conference_incoming_title">收到群組通話</string>
-    <string name="assistant_privacy_policy">隱私權保護政策</string>
-    <string name="contacts_settings_ldap_server_title">伺服器網址</string>
-    <string name="contacts_settings_ldap_auth_method_title">驗證方法</string>
-    <string name="contacts_settings_ldap_auth_method_anonymous">匿名</string>
-    <string name="contacts_settings_ldap_cert_check_title">檢查憑證</string>
-    <string name="contacts_settings_ldap_cert_check_auto">自動</string>
-    <string name="contacts_settings_ldap_cert_check_disabled">停用</string>
-    <string name="content_description_export">用第三方應用程式開啟檔案</string>
-    <string name="content_description_open_app">在應用程式，而非泡泡中開啟對話</string>
-    <string name="chat_room_choose_conversation_for_file_sharing">選擇或建立對話來分享檔案</string>
-    <string name="content_description_take_screenshot">對收到的視訊畫面拍攝擷圖</string>
-    <string name="contacts_settings_ldap_search_timeout_title">逾時時限</string>
-    <string name="content_description_delete_conference">刪除會議</string>
-    <string name="content_description_encrypted_conference">將加密會議</string>
-    <string name="content_description_share_ics">將事件匯出到行事曆</string>
-    <string name="account_settings_apply_prefix_for_calls_title">套用前綴到外播的通話與聊天</string>
-    <string name="conference_group_call_title">建立新群組通話</string>
-    <string name="conference_participants_title">參與者（%d）</string>
-    <string name="conference_first_to_join">您是第一個加入通話的與會者</string>
-    <string name="conference_last_user">其他與會者皆已離開群組通話</string>
-    <string name="assistant_read_and_agree_terms">我接受 Belledonne Communications 的%1$s及%2$s</string>
-    <string name="call_settings_redirect_to_voice_mail_declined_calls_title">將拒接的通話重新導向至語音信箱 URI</string>
-    <string name="call_action_calls_list">通話清單</string>
-    <string name="call_action_numpad">數字鍵</string>
-    <string name="conference_group_call_subject_hint">群組通話主旨</string>
-    <string name="conference_start_group_call_dialog_message">您想要開始群組通話嗎？
-\n群組中的每個人都會收到來電，以加入會議。</string>
-    <string name="chat_settings_mark_as_read_notif_dismissal_title">在關閉訊息通知時，將訊息標示為已讀</string>
-    <string name="call_settings_auto_start_recording_title">自動開啟通話錄音</string>
-    <string name="call_settings_remote_recording_title">當通話中的其他人開始錄音時，接收通知</string>
-    <string name="contacts_settings_ldap_search_timeout_subtitle">秒數</string>
-    <string name="contacts_settings_create_new_ldap_config_title">新增 LDAP 設定</string>
-    <string name="contacts_settings_ldap_search_base_subtitle">不得空白！</string>
-    <string name="contacts_settings_ldap_search_filter_title">過濾條件</string>
-    <string name="contacts_settings_ldap_parsing_title">分析中</string>
-    <string name="contacts_settings_ldap_name_attribute_title">名稱屬性</string>
-    <string name="contacts_settings_ldap_sip_attribute_title">SIP 屬性</string>
-    <string name="contacts_settings_ldap_sip_domain_title">網域</string>
-    <string name="contacts_settings_ldap_misc_title">其他</string>
-    <string name="content_description_cancel_forward">取消轉寄訊息</string>
-    <string name="content_description_show_numpad">顯示數字鍵</string>
-    <string name="content_description_recording_export">匯出錄音檔</string>
-    <string name="content_description_go_to_chat_rooms_list">前往對話清單</string>
-    <string name="content_description_participant_is_paused">與會者已暫時離開群組通話</string>
-    <string name="content_description_close_bubble">關閉通知泡泡</string>
-    <string name="content_description_call_context_menu">開啟通話選單</string>
-    <string name="chat_message_cant_open_file_in_app_dialog_export_button">匯出</string>
-    <string name="chat_room_sending_reply_hint">回覆</string>
-    <string name="chat_room_sending_message_hint">訊息</string>
-    <string name="chat_message_removal_info">將刪除訊息</string>
-    <string name="call_action_chat">聊天</string>
-    <string name="call_action_change_conf_layout">修改版面</string>
-    <string name="call_action_statistics">通話統計</string>
-    <string name="call_settings_system_wide_overlay_title">在其他應用程式頂部顯示圖示</string>
-    <string name="contacts_settings_ldap_password_title">密碼</string>
-    <string name="contacts_settings_ldap_search_base_title">要搜尋的 base</string>
-    <string name="contacts_settings_ldap_minimum_characters_title">要開始查詢的最小輸入字元數</string>
-    <string name="account_settings_transport_dtls">DTLS</string>
-    <string name="account_settings_apply_prefix_for_calls_summary">輸入號碼時要套用的前綴</string>
-    <string name="account_setting_conference_factory_address">Conference factory URI</string>
-    <string name="chat_message_voice_recording_playback_low_volume">音量太小，您可能會想要放大聲一點</string>
-    <string name="content_description_muted_chat_room">已停用此對話的通知</string>
-    <string name="content_description_conference_participant_mic_muted">靜音中的與會者</string>
-    <string name="content_description_toggle_layout_menu">顯示或隱藏群組通話版面選單</string>
-    <string name="conference_invite_participants_count" tools:ignore="PluralsCandidate">%d 與會者</string>
-    <string name="conference_creation_failed">會議建立失敗</string>
-    <string name="conference_admin_set">%s 已成為主持人</string>
-    <string name="conference_admin_unset">%s 已不是主持人</string>
-    <string name="conference_schedule_info_created">已安排會議</string>
-    <string name="conference_schedule_address_copied_to_clipboard">已將會議地址複製到剪貼簿</string>
-    <string name="conference_schedule_info_not_sent_to_participant">將會議資訊傳送給與會者失敗</string>
-    <string name="conference_paused_title">您目前不在會議中。</string>
-    <string name="conference_paused_subtitle">點擊播放按鈕重新加入。</string>
-    <string name="conference_default_title">遠端群組通話</string>
-    <string name="conference_local_title">本地群組通話</string>
-    <string name="call_error_server_timeout">伺服器逾時</string>
-    <string name="conference_low_bandwidth">偵測到頻寬不足，自動關閉視訊</string>
-    <string name="advanced_settings_disable_fragment_security_title">關閉畫面的安全性模式</string>
-    <string name="call_action_add_call">建立新通話</string>
-    <string name="call_action_transfer_call">轉接電話</string>
-    <string name="conference_no_terminated_schedule">還沒有已中斷的會議。</string>
-    <string name="conference_scheduled_terminated_filter">已中斷</string>
-    <string name="conference_scheduled_future_filter">已安排</string>
-    <string name="call_context_action_resume">恢復通話</string>
-    <string name="call_remote_recording">正在記錄此通話。</string>
-    <string name="call_remotely_paused_title">對方已暫停通話。</string>
-    <string name="call_settings_use_telecom_manager_title">改善與藍牙裝置間的互動</string>
-    <string name="advanced_settings_go_to_battery_optimization_settings">電力最佳化設定</string>
-    <string name="advanced_settings_debug_title">除錯選項</string>
-    <string name="advanced_settings_other_title">其他設定</string>
-    <string name="advanced_settings_disable_fragment_security_summary">允許對含有敏感資料的畫面拍攝螢幕擷圖</string>
-    <string name="notification_channel_missed_call_name">&appName; 未接來電通知</string>
-    <string name="content_description_cancel_sharing">取消分享</string>
-    <string name="content_description_stop_voice_recording">停止錄音</string>
-    <string name="content_description_cancel_voice_recording">取消通話錄音</string>
-    <string name="content_description_forward_message">轉寄訊息到這個對話中</string>
-    <string name="content_description_voice_recording">錄下語音訊息</string>
-    <string name="conference_display_mode_audio_only">純聲音模式</string>
-    <string name="conference_info_removed">會議資訊已刪除</string>
-    <string name="call_locally_paused_title">您已暫停通話。</string>
-    <string name="conference_scheduled">會議</string>
-    <string name="advanced_settings_vfs_title">加密所有資料</string>
-    <string name="chat_message_cant_open_file_in_app_dialog_open_as_text_button">以純文字開啟</string>
-    <string name="chat_message_abort_removal">中斷</string>
-    <string name="chat_message_voice_recording_hold_to_record">按住按鈕即可錄下語音訊息</string>
-    <string name="conference">會議</string>
-    <string name="conference_schedule_title">安排會議</string>
-    <string name="conference_schedule_later">您想要稍後再安排會議嗎？</string>
-    <string name="conference_schedule_mandatory_field">強制開啟</string>
-    <string name="chat_message_download_already_in_progress">請稍候第一筆下載完成後，再進行新的下載</string>
-    <string name="conference_schedule_subject_title">主旨</string>
-    <string name="conference_schedule_subject_hint">會議主旨</string>
-    <string name="conference_schedule_address_title">會議地址</string>
-    <string name="conference_schedule_description_title">新增描述</string>
-    <string name="conference_schedule_description_hint">描述</string>
-    <string name="conference_schedule_date">日期</string>
-    <string name="conference_schedule_time">時間</string>
-    <string name="conference_schedule_duration">持續時間</string>
-    <string name="conference_schedule_timezone">時區</string>
-    <string name="conference_schedule_send_invite_chat">透過 &appName; 邀請</string>
-    <string name="conference_schedule_send_invite_email">透過電子郵件邀請</string>
-    <string name="conference_schedule_encryption">是否要加密會議？</string>
-    <string name="conference_schedule_participants_list">與會者清單</string>
-    <string name="conference_schedule_summary">會議資訊</string>
-    <string name="conference_waiting_room_cancel_call">取消</string>
-    <string name="conference_waiting_room_video_disabled">目前視訊已關閉</string>
-    <string name="conference_layout_too_many_participants_for_mosaic">因為有太多參與者，無法變更群組通話畫面</string>
-    <string name="conference_too_many_participants_for_mosaic_layout">會議有太多參與者，無法以方塊圖模式顯示，切換為說話者模式</string>
-    <string name="conference_participant_paused">（已暫停）</string>
-    <string name="conference_schedule_start">安排會議</string>
-    <string name="conference_group_call_create">建立群組通話</string>
-    <string name="conference_schedule_send_invite_chat_summary">將從我的 &appName; 帳號寄出邀請</string>
-    <string name="call_error_temporarily_unavailable">暫時無法使用</string>
-    <string name="conference_no_schedule">未安排會議。</string>
-    <string name="conference_schedule_organizer">主辦人：</string>
-    <string name="conference_go_to_chat">會議聊天室</string>
-    <string name="conference_scheduled_delete_one_dialog">您真的要刪除這場會議嗎？</string>
-    <string name="conference_empty">您是目前通話中唯一的與會者</string>
-    <string name="conference_invitation_received_notification">您已受邀加入會議</string>
-    <string name="conference_invitation">會議邀請</string>
-    <string name="call_locally_paused_subtitle">點擊播放按鈕繼續。</string>
-    <string name="call_settings_use_telecom_manager_summary">需要授權其他權限</string>
-    <string name="contacts_settings_ldap_title">LDAP</string>
-    <string name="contacts_settings_ldap_enable_title">啟用</string>
-    <string name="contacts_settings_ldap_delete_title">刪除</string>
-    <string name="contacts_settings_ldap_connection_title">連線</string>
-    <string name="contacts_settings_ldap_auth_method_simple">簡單</string>
-    <string name="contacts_settings_ldap_tls_title">使用 TLS</string>
-    <string name="conferences_settings_layout_title">預設版面</string>
-    <string name="account_setting_audio_video_conference_factory_address">影音 Conference factory URI</string>
-    <string name="incoming_group_call_notification_title">收到群組通話</string>
-    <string name="call_stats_media_encryption">媒體加密：</string>
-    <string name="call_settings_media_encryption_zrtp_post_quantum">後量子 ZRTP</string>
-    <string name="call_stats_zrtp_cipher_algo">加密演算法：</string>
-    <string name="call_stats_zrtp_key_agreement_algo">金鑰合意演算法：</string>
-    <string name="call_stats_zrtp_hash_algo">雜湊演算法：</string>
-    <string name="call_stats_zrtp_auth_tag_algo">驗證演算法：</string>
-    <string name="call_stats_zrtp_sas_algo">SAS 演算法：</string>
-    <string name="account_setting_end_to_end_encryption_keys_server_url">E2E 加密金鑰伺服器網址</string>
-    <string name="conference_update_title">已更新會議：</string>
-    <string name="conference_schedule_edit">編輯會議</string>
-    <string name="conference_cancel_title">已取消會議：</string>
-    <string name="conference_scheduled_delete_many_dialog">您要刪除這些會議嗎？</string>
-    <string name="conference_scheduled_cancelled_by_organizer">會議主辦者已取消會議</string>
-    <string name="conference_scheduled_cancelled_by_me">您已取消此會議</string>
-    <string name="conference_schedule_send_updated_invite_chat">透過 &appName; 更新活動資訊</string>
-    <string name="conference_schedule_send_updated_invite_email">透過電子郵件更新活動資訊</string>
-    <string name="zrtp_dialog_explanation">為了增加安全性，您可以與對方確認下列代碼是否相符。</string>
-    <string name="zrtp_dialog_later_button_label">稍後</string>
-    <string name="zrtp_dialog_correct_button_label">確認正確</string>
-    <string name="call_screenshot_taken">已拍攝擷圖：%s</string>
-    <string name="chat_message_voice_recording">語音訊息</string>
-    <string name="chat_message_voice_recording_received_notification">您收到一通語音訊息</string>
-    <string name="chat_room_presence_online">線上</string>
-    <string name="chat_room_presence_last_seen_online_today">上線時間：今天</string>
-    <string name="content_description_presence_online">使用者在線上</string>
-    <string name="content_description_presence_offline">使用者離線</string>
-    <string name="chat_room_presence_last_seen_online_yesterday">上線時間：昨天</string>
-    <string name="chat_room_presence_last_seen_online">上線時間：</string>
-    <string name="account_setting_publish_presence_title">發布上線資訊</string>
-    <string name="account_setting_delete_dialog_title">您確定要刪除帳號嗎？</string>
-    <string name="account_setting_delete_generic_confirmation_dialog">將只會刪除您本機上的帳號。
-\n若要永久刪除，請到您的 SIP 服務業者網站刪除。</string>
-    <string name="account_setting_delete_sip_linphone_org_confirmation_dialog">將只會刪除您本機上的帳號。
-\n若要永久刪除，請到帳號管理平台刪除：</string>
-    <string name="call_action_attended_transfer_call">保留轉接</string>
-    <string name="chat_room_presence_do_not_disturb">勿干擾</string>
-    <string name="content_description_presence_do_not_disturb">使用者要求勿干擾</string>
-    <string name="dialog_apply_remote_provisioning_button">套用</string>
-    <string name="dialog_apply_remote_provisioning_title">您確認要從這個網址下載套用設定資訊嗎？</string>
-    <string name="chat_room_last_message_sender_format">%s：</string>
-    <string name="settings_password_protection_dialog_input_hint">密碼</string>
-    <string name="settings_password_protection_dialog_ok_label">驗證</string>
-    <string name="settings_password_protection_dialog_invalid_input">密碼不正確！</string>
-    <string name="error_unexpected">發生未預期的錯誤…</string>
-    <string name="settings_password_protection_dialog_title">請在下方輸入密碼，來存取設定內容</string>
-    <string name="audio_settings_software_echo_cancellation_title">軟體迴音消除</string>
-    <string name="chat_room_presence_away">離開</string>
-    <string name="account_setting_disable_bundle_mode_title">關閉 bundle mode</string>
-    <string name="assistant_alternative_way_create_account">若要使用電子郵件地址來註冊帳號：</string>
-    <string name="assistant_no_push_warning">您的裝置看來無法接收推送通知。
-\n
-\n現在起註冊帳號時就必須使用此功能，您無法直接於程式中註冊帳號，但還是可以在網頁中註冊：</string>
-    <string name="assistant_create_email_account_not_validated">您的帳號尚未啟用，請點擊收到的確認信件中的連結</string>
-    <string name="dialog_authentication_required_title">需要驗證</string>
-    <string name="dialog_authentication_required_message">由於缺少帳號 %s 的驗證資訊，或是驗證資訊無效，連線失敗。
-\n
-\n
-\n您可以再次輸入密碼，或是到設定畫面中確認帳號設定。</string>
-    <string name="dialog_authentication_required_change_password_label">確認</string>
-    <string name="chat_event_ephemeral_enabled">您開啟了「閱後即焚」訊息：%s</string>
-    <string name="content_description_emoji_picker">切換顯示表情符號選取器</string>
-    <string name="android_14_full_screen_intent_permission_not_granted">尚未授予顯示來電的必要權限</string>
-    <string name="android_14_go_to_full_screen_intent_permission_setting">顯示</string>
-    <string name="assistant_error_invalid_international_prefix">國際冠碼錯誤</string>
-    <string name="yes">是</string>
-    <string name="no">否</string>
-    <string name="contacts_new_contact_wont_be_visible_warning_dialog">您要建立的聯絡人不含 SIP URI 或電話號碼，不會在 &appName; 出現。
-\n
-\n還是要建立這位聯絡人嗎？</string>
-    <string name="chat_message_one_reaction">%s 反應</string>
-    <string name="chat_message_many_reactions">%s 反應</string>
-    <string name="chat_message_voice_recording_notification_short_desc">語音訊息</string>
-    <string name="chat_message_reaction_received">%s 已由 %s 回覆給：%s</string>
-    <string name="conference_invitation_notification_short_desc">會議邀請</string>
-    <string name="conference_schedule_mode">模式</string>
-    <string name="conference_schedule_mode_meeting">會議</string>
-    <string name="conference_schedule_mode_broadcast">廣播</string>
-    <string name="conference_schedule_speakers_list">發言者清單</string>
-    <string name="conference_schedule_participants_list_empty">請選擇至少一位與會者</string>
-    <string name="conference_schedule_broadcast_summary">廣播資訊</string>
-    <string name="conference_broadcast_start">排程廣播</string>
-    <string name="conference_broadcast_edit">編輯廣播</string>
-    <string name="conference_broadcast_invite_title">廣播邀請：</string>
-    <string name="conference_broadcast_invite_you_are_speaker">（您是發言者）</string>
-    <string name="conference_broadcast_title">廣播：</string>
-    <string name="conference_invite_participants_list_title">參與者</string>
-    <string name="conference_participants_list_speaker_label">發言者</string>
-    <string name="conferences_settings_enable_broadcast_summary">功能目前正在 Beta 測試中！</string>
-    <string name="conference_schedule_broadcast_address_title">廣播地址</string>
-    <string name="conference_schedule_speakers_list_empty">請選擇至少一位發言者</string>
-    <string name="conference_waiting_room_listener_broadcast">您不是此廣播的發言者</string>
-    <string name="conference_meeting_title">會議：</string>
-    <string name="conference_invite_speakers_list_title">發言者</string>
-    <string name="conferences_settings_enable_broadcast_title">允許廣播</string>
-    <string name="content_description_contact_is_speaker">聯絡人是發言者</string>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
deleted file mode 100644
index 5882fc52c..000000000
--- a/app/src/main/res/values/attrs.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <declare-styleable name="LinphoneAppTheme">
-        <attr name="accentColor" format="color"/>
-        <attr name="colorPrimary" format="color"/>
-        <attr name="accentColorLight30" format="color"/>
-
-        <attr name="accentTextColor" format="color"/>
-        <attr name="primaryTextColor" format="color"/>
-        <attr name="secondaryTextColor" format="color"/>
-        <attr name="primarySubtextDarkColor" format="color"/>
-        <attr name="primarySubtextLightColor" format="color"/>
-
-        <attr name="backgroundColor" format="color"/>
-        <attr name="backgroundColor2" format="color"/>
-        <attr name="backgroundColor3" format="color"/>
-        <attr name="backgroundColor4" format="color"/>
-        <attr name="backgroundContrastColor" format="color"/>
-        <attr name="dividerColor" format="color"/>
-
-        <attr name="drawableTintColor" format="color"/>
-        <attr name="drawableBackgroundColor" format="color" />
-        <attr name="drawableTintDisabledColor" format="color"/>
-        <attr name="drawableTintOverColor" format="color"/>
-        <attr name="drawableTintColor2" format="color"/>
-        <attr name="drawableTintColor3" format="color"/>
-
-        <attr name="lightToolbarBackgroundColor" format="color"/>
-        <attr name="lightToolbarTextColor" format="color"/>
-        <attr name="darkToolbarBackgroundColor" format="color"/>
-        <attr name="darkToolbarTextColor" format="color"/>
-
-        <attr name="button_background_drawable" format="reference" />
-
-        <attr name="voipBackgroundColor" format="color" />
-        <attr name="voipBackgroundBWColor" format="color" />
-        <attr name="voipMeParticipantBackgroundColor" format="color" />
-        <attr name="voipParticipantBackgroundColor" format="color" />
-        <attr name="voipExtraButtonsBackgroundColor" format="color" />
-        <attr name="voipToolbarBackgroundColor" format="color" />
-        <attr name="voipDrawableColor" format="color" />
-        <attr name="voipDrawableColor2" format="color" />
-        <attr name="voipDrawablePressedColor" format="color" />
-        <attr name="voipDrawableDisabledColor" format="color" />
-        <attr name="voipTextColor" format="color" />
-        <attr name="voipTextColor2" format="color" />
-        <attr name="voipFormBackgroundColor" format="color" />
-        <attr name="voipFormFieldBackgroundColor" format="color" />
-        <attr name="voipFormDisabledFieldBackgroundColor" format="color" />
-        <attr name="voipCancelledMeetingBackgroundColor" format="color" />
-    </declare-styleable>
-
-    <declare-styleable name="Settings">
-        <attr name="title" format="string" />
-        <attr name="subtitle" format="string" />
-        <attr name="hint" format="string" />
-        <attr name="list_items_names" format="reference" />
-        <attr name="list_items_values" format="reference" />
-        <attr name="checked" format="boolean" />
-        <attr name="value" format="string" />
-        <attr name="image" format="reference" />
-    </declare-styleable>
-
-    <declare-styleable name="VoiceRecordProgressBar">
-        <attr name="max" format="integer" />
-        <attr name="progressDrawable" format="reference" />
-        <attr name="secondaryProgressTint" format="color" />
-        <attr name="primaryLeftMargin" format="dimension" />
-        <attr name="primaryRightMargin" format="dimension" />
-    </declare-styleable>
-
-    <declare-styleable name="RoundCornersTextureView">
-        <attr name="alignTopRight" format="boolean" />
-        <attr name="displayMode" format="enum">
-            <enum name="black_bars" value="0"/>
-            <enum name="occupy_all_space" value="1"/>
-            <enum name="hybrid" value="2"/>
-        </attr>
-        <attr name="radius" format="float" />
-    </declare-styleable>
-
-    <declare-styleable name="ScrollDot">
-        <attr name="dotCount" format="integer" />
-        <attr name="itemCount" format="integer" />
-        <attr name="dotColor" format="color" />
-        <attr name="selectedDotColor" format="color" />
-        <attr name="selectedDot" format="integer" />
-        <attr name="dotRadius" format="dimension" />
-        <attr name="scrollView" format="reference" />
-    </declare-styleable>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/bools.xml b/app/src/main/res/values/bools.xml
deleted file mode 100644
index c2dcd8baf..000000000
--- a/app/src/main/res/values/bools.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <bool name="isTablet">false</bool>
-</resources>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
deleted file mode 100644
index 679b72f0f..000000000
--- a/app/src/main/res/values/colors.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="transparent_color">#00000000</color>
-
-    <color name="primary_color">#ff5e00</color> <!-- Try to have a color that renders well on both light & dark theme -->
-    <!-- You can use https://material.io/design/color/#tools-for-picking-colors to get dark color value from primary -->
-    <color name="primary_dark_color">#e65000</color>
-    <color name="primary_light_color">#ffab4d</color>
-    <color name="primary_color_disabled">#4DFE5E00</color> <!-- Try to have a color that renders well on both light & dark theme -->
-    <color name="notification_led_color">#ff8000</color>
-
-    <color name="black_color">#000000</color>
-    <color name="dark_grey_color">#444444</color>
-    <color name="grey_color">#808080</color>
-    <color name="light_grey_color">#c4c4c4</color>
-    <color name="white_color">#ffffff</color>
-    <color name="red_color">#ff0000</color>
-    <color name="green_color">#96c11f</color>
-    <color name="dark_green_color">#7d9f21</color>
-
-    <color name="voip_gray_blue_color">#798791</color>
-    <color name="voip_light_gray">#D0D8DE</color>
-    <color name="voip_dark_gray">#4B5964</color>
-    <color name="voip_gray">#96A5B1</color>
-    <color name="voip_gray_background">#AFAFAF</color>
-    <color name="voip_gray_dots">#D8D8D8</color>
-    <color name="voip_call_record_background">#EBEBEB</color>
-    <color name="voip_calls_list_inactive_background">#F0F1F2</color>
-    <color name="voip_translucent_popup_background">#A64B5964</color>
-    <color name="voip_translucent_popup_alt_background">#E64B5964</color>
-    <color name="voip_numpad_background">#E4E4E4</color>
-    <color name="voip_conference_participant_paused_background">#303030</color>
-    <color name="voip_dark_color">#252E35</color>  <!-- Background -->
-    <color name="voip_dark_color2">#3F464B</color>  <!-- Light gray -->
-    <color name="voip_dark_color3">#475663</color> <!-- Extra buttons -->
-    <color name="voip_dark_color4">#2D3841</color> <!-- Top bars -->
-    <color name="voip_dark_color5">#353B3F</color> <!-- Scheduled conference background dark mode -->
-    <color name="voip_text_dark_color">#6E8596</color> <!-- Text color above voip_dark_color5 -->
-    <color name="voip_conf_address_text_color">#A2A2A2</color>
-    <color name="voip_conference_updated_color">#EFAE00</color>
-    <color name="voip_conference_cancelled_title_color">#FF0000</color>
-    <color name="voip_conference_cancelled_bg_color_light">#FFE6E6</color>
-    <color name="voip_conference_cancelled_bg_color_dark">#3D3434</color>
-
-    <color name="form_field_gray_background">#F7F7F7</color>
-
-    <color name="imdn_read_color">#3eb5c0</color>
-    <color name="toolbar_color">#e1e1e1</color>
-    <color name="header_background_color">#f3f3f3</color>
-
-    <color name="chat_bubble_text_color">#a1a1a1</color>
-    <color name="chat_bubble_incoming_color">#f3f3f3</color>
-    <color name="chat_bubble_incoming_color_dark">#9b9b9b</color>
-    <!-- Do not use a color with transparency here, it will look bad when in dark mode!
-    We use a solid color representation of the primary color but with 10% transparency.
-    For each RGB value of the color, the math to get is:
-    C' = C * (A / 255) + 255 * (1 - (A / 255)) so for 10% transparency: C' = C * 0.1 + 229.5 -->
-    <color name="chat_bubble_outgoing_color">#ffeee5</color>
-    <color name="chat_bubble_outgoing_color_dark">#ff9e67</color>
-    <color name="chat_bubble_file_background_color">#f4f4f4</color>
-    <color name="chat_bubble_file_background_border_color">#dedede</color>
-
-    <color name="disabled_color">#808080</color>
-    <color name="contact_disabled_color">#99ffffff</color>
-
-    <color name="led_registered">#96c11f</color>
-    <color name="led_registration_in_progress">#ffa645</color>
-    <color name="led_not_registered">#e1e1e1</color>
-    <color name="led_error">#ff0000</color>
-</resources>
diff --git a/app/src/main/res/values/dimen.xml b/app/src/main/res/values/dimen.xml
deleted file mode 100644
index 7c7b7fa34..000000000
--- a/app/src/main/res/values/dimen.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <dimen name="edit_chat_message_bubble_left_margin">10dp</dimen>
-    <dimen name="incoming_chat_message_bubble_left_margin">0dp</dimen>
-    <dimen name="outgoing_chat_message_bubble_left_margin">45dp</dimen>
-    <dimen name="incoming_chat_message_bubble_right_margin">10dp</dimen>
-    <dimen name="outgoing_chat_message_bubble_right_margin">3dp</dimen>
-    <dimen name="chat_message_bubble_image_height_big">200dp</dimen>
-    <dimen name="chat_message_bubble_image_height_small">100dp</dimen>
-    <dimen name="chat_message_bubble_file_size">120dp</dimen>
-    <dimen name="chat_message_small_bubble_file_size">50dp</dimen>
-    <dimen name="chat_message_bubble_desired_height">600dp</dimen>
-    <dimen name="video_preview_max_size">200dp</dimen>
-    <dimen name="video_preview_pip_max_size">45dp</dimen>
-    <dimen name="main_activity_tabs_fragment_size">60dp</dimen>
-    <dimen name="main_activity_top_bar_size">60dp</dimen>
-    <dimen name="status_fragment_size">40dp</dimen>
-    <dimen name="tabs_fragment_selector_size">5dp</dimen>
-    <dimen name="tabs_fragment_unread_count_bounce_offset">5dp</dimen>
-    <dimen name="contact_avatar_size">35dp</dimen>
-    <dimen name="contact_avatar_text_size">21sp</dimen>
-    <dimen name="contact_avatar_big_size">100dp</dimen>
-    <dimen name="contact_avatar_text_big_size">60sp</dimen>
-    <dimen name="field_button_size">20dp</dimen>
-    <dimen name="field_shape_margin">3dp</dimen>
-    <dimen name="call_overlay_size">60dp</dimen>
-    <dimen name="chat_message_popup_width">250dp</dimen>
-    <dimen name="chat_room_popup_width">250dp</dimen>
-    <dimen name="chat_message_popup_item_height">50dp</dimen>
-    <dimen name="chat_room_popup_item_height">50dp</dimen>
-    <dimen name="chat_message_round_corner_radius">6.7dp</dimen>
-    <dimen name="play_pause_button_size">30dp</dimen>
-    <dimen name="progress_bar_height">40dp</dimen>
-    <dimen name="settings_margin">10dp</dimen>
-    <dimen name="setting_title_min_size">10sp</dimen>
-    <dimen name="setting_title_max_size">18sp</dimen>
-    <dimen name="setting_subtitle_min_size">8sp</dimen>
-    <dimen name="setting_subtitle_max_size">14sp</dimen>
-    <dimen name="settings_granularity_step">1sp</dimen>
-    <dimen name="voip_buttons_fragment_size">50dp</dimen>
-    <dimen name="voip_buttons_fragment_margin_size">55dp</dimen>
-    <dimen name="voip_remote_margin">10dp</dimen>
-    <dimen name="voip_top_bar_size">60dp</dimen>
-    <dimen name="voip_call_list_size">80dp</dimen>
-    <dimen name="voip_call_context_menu_item_height">50dp</dimen>
-    <dimen name="voip_call_context_menu_width">250dp</dimen>
-    <dimen name="voip_floating_button_size">60dp</dimen>
-    <dimen name="voip_call_extra_buttons_height">200dp</dimen>
-    <dimen name="voip_call_extra_buttons_translate_y">210dp</dimen>
-    <dimen name="conference_scheduling_participant_cell_height">60dp</dimen>
-    <dimen name="voip_call_button_size">50dp</dimen>
-    <dimen name="voip_audio_routes_menu_translate_y">260dp</dimen>
-    <dimen name="voip_buttons_max_width">350dp</dimen>
-    <dimen name="voip_views_max_width">400dp</dimen>
-    <dimen name="voip_extra_menu_max_width">390dp</dimen>
-    <dimen name="voip_round_corners_texture_view_radius">20dp</dimen>
-    <dimen name="voip_counter_bounce_offset">5dp</dimen>
-    <dimen name="voip_active_speaker_miniature_size">100dp</dimen>
-    <dimen name="voip_active_speaker_miniature_margin">10dp</dimen>
-    <dimen name="voip_conference_active_speaker_miniature_avatar_size">50dp</dimen>
-    <dimen name="voip_conference_participant_mic_muted_icon_size_grid">30dp</dimen>
-    <dimen name="voip_conference_participant_joining_icon_size_grid">30dp</dimen>
-    <dimen name="voip_conference_participant_mic_muted_icon_size_active_speaker">30dp</dimen>
-    <dimen name="voip_conference_participant_joining_icon_size_active_speaker">35dp</dimen>
-    <dimen name="voip_dialog_button_max_width">137dp</dimen>
-    <dimen name="voip_contact_avatar_max_size">180dp</dimen>
-    <dimen name="voip_contact_avatar_text_size">80sp</dimen>
-    <dimen name="voip_numpad_button_max_size">60dp</dimen>
-    <dimen name="voip_conference_audio_only_participant_cell_height">80dp</dimen>
-    <dimen name="voip_conference_audio_only_participant_avatar_size">40dp</dimen>
-    <dimen name="conference_schedule_form_field_border_thickness">1dp</dimen>
-    <dimen name="master_fragment_width">280dp</dimen>
-    <dimen name="voip_active_speaker_top_margin">5dp</dimen>
-    <dimen name="margin_0dp">0dp</dimen>
-    <dimen name="voip_single_call_header_size">50dp</dimen>
-    <dimen name="voip_single_call_header_size_with_record_info">85dp</dimen>
-    <dimen name="voip_conference_header_folded_top_margin">30dp</dimen>
-    <dimen name="chat_message_content_preview_max_width">120dp</dimen>
-    <dimen name="voip_conference_active_speaker_dots_margin">5dp</dimen>
-    <dimen name="conference_waiting_room_buttons_max_width">250dp</dimen>
-    <dimen name="mute_mic_miniature_margin">5dp</dimen>
-    <dimen name="mute_mic_grid_margin">10dp</dimen>
-    <dimen name="chat_message_sending_icons_size">35dp</dimen>
-    <dimen name="chat_message_sending_icons_margin">5dp</dimen>
-    <dimen name="contact_presence_badge_size">12dp</dimen>
-    <dimen name="contact_presence_big_badge_size">25dp</dimen>
-    <dimen name="contact_presence_badge_padding">1dp</dimen>
-    <dimen name="contact_presence_big_badge_padding">2dp</dimen>
-    <dimen name="chat_room_emoji_picker_height">290dp</dimen>
-    <dimen name="chat_message_text_font_size">15sp</dimen>
-    <dimen name="chat_message_emoji_font_size">45sp</dimen>
-    <dimen name="chat_message_emoji_reaction_font_size">20sp</dimen>
-    <dimen name="chat_message_emoji_reactions_count_font_size">14sp</dimen>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
deleted file mode 100644
index c21b13a67..000000000
--- a/app/src/main/res/values/strings.xml
+++ /dev/null
@@ -1,967 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-
-<!DOCTYPE resources [
-    <!ENTITY appName "Linphone">
-]>
-
-<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
-    <string name="app_name" translatable="false">&appName;</string>
-    <string name="app_name_debug" translatable="false">&appName; (debug)</string>
-    <string name="user_agent_app_name" translatable="false">&appName;Android</string>
-    <string name="service_name">&appName; Service</string>
-    <string name="service_auto_start_description">&appName; has been started automatically</string>
-    <string name="service_description">This is required to receive calls while in background</string>
-    <string name="sync_account_name">&appName; contacts</string>
-
-    <!-- About screen -->
-    <string name="about_link" translatable="false">https://linphone.org</string>
-    <string name="about_privacy_policy_link" translatable="false">https://www.linphone.org/privacy-policy</string>
-    <string name="about_license_link" translatable="false">https://www.gnu.org/licenses/gpl-3.0.html</string>
-    <string name="about_version" translatable="false">&appName; Android %s</string>
-    <string name="about_liblinphone_sdk_version" translatable="false">&appName; SDK %s</string>
-    <string name="about_privacy_policy">Visit our privacy policy</string>
-    <string name="about_text" translatable="false">GNU General Public License v3.0\n © 2010–2023 Belledonne Communications</string>
-    <string name="about_weblate_link" translatable="false">https://weblate.linphone.org/projects/linphone/</string>
-    <string name="about_weblate_translation">Help us translate &appName;</string>
-
-    <!-- Logs -->
-    <string name="logs_upload_failure">Failed to upload logs!</string>
-    <string name="logs_reset_complete">Logs have been cleared</string>
-    <string name="logs_url_copied_to_clipboard">Logs URL copied into clipboard</string>
-    <string name="about_bugreport_email" translatable="false">linphone-android@belledonne-communications.com</string>
-
-    <!-- Common -->
-    <string name="phone_number">Phone number</string>
-    <string name="phone_numbers">Phone numbers</string>
-    <string name="select_your_country">Select your country</string>
-    <string name="international_prefix">Prefix</string>
-    <string name="assistant_choose_country">Choose a country</string>
-    <string name="assistant_choose_country_title">Country name or prefix</string>
-    <string name="username">Username</string>
-    <string name="password">Password</string>
-    <string name="email">Email</string>
-    <string name="domain">Domain</string>
-    <string name="sip_address">SIP address</string>
-    <string name="sip_addresses">SIP addresses</string>
-    <string name="cancel">Cancel</string>
-    <plurals name="days">
-        <item quantity="one">%d day</item>
-        <item quantity="other">%d days</item>
-    </plurals>
-    <string name="share_uploaded_logs_link">Share logs link using…</string>
-    <string name="yes">Yes</string>
-    <string name="no">No</string>
-
-    <!-- Errors -->
-    <string name="error_unexpected">Unexpected error…</string>
-
-    <!-- Date & Time -->
-    <string name="today">Today</string>
-    <string name="yesterday">Yesterday</string>
-
-    <!-- Technical terms -->
-    <string name="transport">Transport</string>
-    <string name="transport_udp">UDP</string>
-    <string name="transport_tcp">TCP</string>
-    <string name="transport_tls">TLS</string>
-
-    <!-- Launch screen -->
-    <string name="app_description">the <i>libre</i> SIP client</string>
-
-    <!-- Status fragment -->
-    <string name="status_connected">Connected</string>
-    <string name="status_not_connected">Not connected</string>
-    <string name="status_in_progress">Connection in progress</string>
-    <string name="status_error">Connection failed</string>
-
-    <!-- Side menu -->
-    <string name="no_account_configured">No account configured</string>
-    <string name="about">About</string>
-    <string name="assistant">Assistant</string>
-    <string name="recordings">Recordings</string>
-    <string name="settings">Settings</string>
-    <string name="quit">Quit</string>
-
-    <!-- History -->
-    <string name="history_calls_list">Calls</string>
-    <string name="no_call_history">No call in your history</string>
-    <string name="no_missed_call_history">No missed call in your history</string>
-    <string name="no_conference_call_history">No meeting call in your history</string>
-    <string name="history_delete_one_dialog">Do you want to delete this record?</string>
-    <string name="history_delete_many_dialog">Do you want to delete these records?</string>
-    <plurals name="history_delete_dialog" translatable="false">
-        <item quantity="one">@string/history_delete_one_dialog</item>
-        <item quantity="other">@string/history_delete_many_dialog</item>
-    </plurals>
-
-    <!-- Contacts -->
-    <string name="contact_invite_friend">Invite</string>
-    <string name="no_contact">No contact in your address book.</string>
-    <string name="no_sip_contact">No SIP contact in your address book.</string>
-    <string name="contact_filter_hint">Search contacts</string>
-    <string name="contact_send_sms_invite_text">Hello, join me on &appName;! You can download it for free at %s</string>
-    <string name="contact_send_sms_invite_download_link" translatable="false">https://linphone.org/download</string>
-    <string name="contact_last_name">Last name</string>
-    <string name="contact_first_name">First name</string>
-    <string name="contact_organization">Organization</string>
-    <string name="contact_choose_existing_or_new_to_add_number">Select a contact or create a new one</string>
-    <string name="contact_editor_write_permission_denied">Write Contacts permission denied, can\'t edit contact</string>
-    <string name="contact_delete_one_dialog">Do you want to delete this contact?\nIt will also be removed from your device addressbook</string>
-    <string name="contact_delete_many_dialog">Are you sure you want to delete these contacts?\nThey will also be removed from your device addressbook</string>
-    <plurals name="contact_delete_dialog" translatable="false">
-        <item quantity="one">@string/contact_delete_one_dialog</item>
-        <item quantity="other">@string/contact_delete_many_dialog</item>
-    </plurals>
-    <string name="contact_new_choose_sync_account">Choose where to save the contact</string>
-    <string name="contact_local_sync_account">Store locally</string>
-    <string name="contact_cant_be_deleted">This contact can\'t be deleted</string>
-    <string name="contacts_ldap_query_more_results_available">More results are available, refine your search</string>
-    <string name="contacts_new_contact_wont_be_visible_warning_dialog">You are about to create a new contact without a SIP URI nor a phone number, thus it won\'t be visible in &appName;.\n\nDo you want to create it anyway?</string>
-
-    <!-- Dialer -->
-    <string name="dialer_address_bar_hint">Enter a number or an address</string>
-    <string name="debug_popup_title">Debug</string>
-    <string name="debug_popup_enable_logs">Enable logs</string>
-    <string name="debug_popup_disable_logs">Disable logs</string>
-    <string name="debug_popup_send_logs">Send logs</string>
-    <string name="debug_popup_show_config_file">View config file</string>
-    <string-array name="popup_send_log" translatable="false">
-        <item>@string/debug_popup_disable_logs</item>
-        <item>@string/debug_popup_send_logs</item>
-        <item>@string/debug_popup_show_config_file</item>
-        <item>@string/cancel</item>
-    </string-array>
-    <string-array name="popup_enable_log" translatable="false">
-        <item>@string/debug_popup_enable_logs</item>
-        <item>@string/debug_popup_show_config_file</item>
-        <item>@string/cancel</item>
-    </string-array>
-    <string name="dialer_transfer_succeded">Call is being transferred</string>
-    <string name="dialer_transfer_failed">Can\'t transfer call</string>
-
-    <!-- Chat -->
-    <string name="no_chat_history">No conversations</string>
-    <string name="chat_room_last_message_sender_format">%s:</string>
-    <string name="chat_remote_is_composing">Remote is writing&#8230;</string>
-    <string name="chat_event_conference_created">You have joined the group</string>
-    <string name="chat_event_conference_destroyed">You have left the group</string>
-    <string name="chat_event_participant_added">%s has joined</string>
-    <string name="chat_event_participant_removed">%s has left</string>
-    <string name="chat_event_device_added">new device for %s</string>
-    <string name="chat_event_device_removed">device for %s removed</string>
-    <string name="chat_event_subject_changed">new subject: %s</string>
-    <string name="chat_event_admin_set">%s is admin</string>
-    <string name="chat_event_admin_unset">%s is no longer admin</string>
-    <string name="chat_security_event_lime_identity_key_changed">LIME identity key changed for %s</string>
-    <string name="chat_security_event_man_in_the_middle_detected">Man-in-the-middle attack detected for %s</string>
-    <string name="chat_security_event_security_level_downgraded">Security level decreased because of %s</string>
-    <string name="chat_security_event_participant_max_count_exceeded">Max participant count exceeded by %s</string>
-    <string name="chat_event_ephemeral_disabled">You disabled ephemeral messages</string>
-    <string name="chat_event_ephemeral_enabled">You enabled ephemeral messages: %s</string>
-    <string name="chat_event_ephemeral_lifetime_changed">Ephemeral messages expiry date: %s</string>
-    <string name="chat_message_download_file">Download</string>
-    <string name="chat_message_pick_file_dialog">Select source</string>
-    <string name="chat_room_devices_fragment_title">Conversation\'s devices</string>
-    <string name="chat_room_group_info_title">Info</string>
-    <string name="chat_room_group_info_participants">Participants</string>
-    <string name="chat_room_group_info_subject_hint">Name the group</string>
-    <string name="chat_room_group_info_admin">Admin</string>
-    <string name="chat_room_group_info_leave">Leave the group</string>
-    <string name="chat_room_group_info_leave_dialog_button">Leave</string>
-    <string name="chat_room_group_info_leave_dialog_message">Do you want to leave this conversation?</string>
-    <string name="chat_room_group_info_you_are_now_admin">You are now admin</string>
-    <string name="chat_room_group_info_you_are_no_longer_admin">You are no longer admin</string>
-    <string name="chat_message_imdn_info">Delivery status</string>
-    <string name="chat_message_imdn_displayed">Read</string>
-    <string name="chat_message_imdn_delivered">Delivered</string>
-    <string name="chat_message_imdn_undelivered">Undelivered</string>
-    <string name="chat_message_imdn_sent">Sent</string>
-    <string name="chat_message_forwarded">Forwarded</string>
-    <string name="chat_message_replied">Reply</string>
-    <string name="chat_message_context_menu_resend">Resend</string>
-    <string name="chat_message_context_menu_copy_text">Copy text</string>
-    <string name="chat_message_context_menu_forward">Forward</string>
-    <string name="chat_message_context_menu_reply">Reply</string>
-    <string name="chat_message_context_menu_imdn_info">Delivery status</string>
-    <string name="chat_message_context_menu_delete">Delete</string>
-    <string name="chat_message_context_menu_add_to_contacts">Add to contacts</string>
-    <string name="chat_message_forward_confirmation_dialog">Do you want to forward the message in this room?</string>
-    <string name="chat_room_dummy_subject" translatable="false">dummy subject</string>
-    <string name="chat_room_choose_conversation_for_message_forward">Select or create a conversation to forward the message</string>
-    <string name="chat_room_choose_conversation_for_file_sharing">Select or create a conversation to share the file(s)</string>
-    <string name="chat_room_choose_conversation_for_text_sharing">Select or create a conversation to share the text</string>
-    <string name="chat_room_file_not_found">File not found</string>
-    <string name="chat_room_context_menu_group_info">Group info</string>
-    <string name="chat_room_context_menu_participants_devices">Conversation\'s devices</string>
-    <string name="chat_room_context_menu_go_to_contact">Go to contact</string>
-    <string name="chat_message_context_menu_ephemeral_messages">Ephemeral messages</string>
-    <string name="chat_message_context_menu_delete_messages">Delete messages</string>
-    <string name="chat_message_context_menu_turn_off_notifications">Disable notifications</string>
-    <string name="chat_message_context_menu_turn_on_notifications">Enable notifications</string>
-    <string name="chat_room_ephemeral_fragment_title">Ephemeral messages</string>
-    <string name="chat_room_ephemeral_messages_desc">This message will be deleted on both ends once it has been read and after the selected timeout.</string>
-    <string name="chat_room_ephemeral_message_disabled">Disabled</string>
-    <string name="chat_room_ephemeral_message_one_minute">1 minute</string>
-    <string name="chat_room_ephemeral_message_one_hour">1 hour</string>
-    <string name="chat_room_ephemeral_message_one_day">1 day</string>
-    <string name="chat_room_ephemeral_message_three_days">3 days</string>
-    <string name="chat_room_ephemeral_message_one_week">1 week</string>
-    <plurals name="chat_room_remote_composing">
-        <item quantity="one">%s is writing…</item>
-        <item quantity="other">%s are writing…</item>
-    </plurals>
-    <string name="chat_room_creation_failed_snack">Chat room creation failed</string>
-    <string name="chat_room_removal_failed_snack">Chat room removal failed</string>
-    <string name="chat_room_delete_one_dialog">Are you sure you want to delete this conversation?</string>
-    <string name="chat_room_delete_many_dialog">Are you sure you want to delete these conversations?</string>
-    <plurals name="chat_room_delete_dialog" translatable="false">
-        <item quantity="one">@string/chat_room_delete_one_dialog</item>
-        <item quantity="other">@string/chat_room_delete_many_dialog</item>
-    </plurals>
-    <string name="chat_message_notification_hidden_content">&lt;Redacted&gt;</string>
-    <string name="chat_message_no_app_found_to_handle_file_mime_type">No app available for this kind of file</string>
-    <string name="chat_bubble_cant_open_enrypted_file">Can\'t open encrypted file in chat bubble</string>
-    <string name="chat_message_cant_open_file_in_app_dialog_title">It seems we can\'t display the file.</string>
-    <string name="chat_message_cant_open_file_in_app_dialog_message">Would you like to open it as text or export it (unencrypted) to a third party app if available?</string>
-    <string name="chat_message_cant_open_file_in_app_dialog_export_button">Export</string>
-    <string name="chat_message_cant_open_file_in_app_dialog_open_as_text_button">Open as text</string>
-    <string name="chat_room_sending_reply_hint">Reply</string>
-    <string name="chat_room_sending_message_hint">Message</string>
-    <string name="chat_message_voice_recording_hold_to_record">Hold button to record voice message</string>
-    <string name="chat_message_voice_recording_playback_low_volume">Your media volume is low, you may want to increase it</string>
-    <plurals name="chat_room_unread_messages_event">
-        <item quantity="one">%1$d unread message</item>
-        <item quantity="other">%1$d unread messages</item>
-    </plurals>
-    <string name="chat_message_removal_info">Message will be deleted</string>
-    <string name="chat_message_abort_removal">Abort</string>
-    <string name="chat_message_download_already_in_progress">Please wait for first download to finish before starting a new one</string>
-    <string name="chat_message_voice_recording_received_notification">You have received a voice message</string>
-    <string name="chat_message_voice_recording_notification_short_desc">voice message</string>
-    <string name="chat_message_voice_recording">Voice message</string>
-    <string name="chat_room_presence_online">Online</string>
-    <string name="chat_room_presence_last_seen_online_today">Online today at</string>
-    <string name="chat_room_presence_last_seen_online_yesterday">Online yesterday at</string>
-    <string name="chat_room_presence_last_seen_online">Online on</string>
-    <string name="chat_room_presence_away">Away</string>
-    <string name="chat_room_presence_do_not_disturb">Do not disturb</string>
-
-    <!-- Chat reactions -->
-    <string name="chat_message_reaction_received">%s has reacted by %s to: %s</string>
-    <string name="emoji_love" translatable="false">❤️</string>
-    <string name="emoji_thumbs_up" translatable="false">👍</string>
-    <string name="emoji_laughing" translatable="false">😂</string>
-    <string name="emoji_surprised" translatable="false">😮</string>
-    <string name="emoji_tear" translatable="false">😢</string>
-    <plurals name="chat_message_reactions_count" translatable="false">
-        <item quantity="one">@string/chat_message_one_reaction</item>
-        <item quantity="other">@string/chat_message_many_reactions</item>
-    </plurals>
-    <string name="chat_message_one_reaction">%s reaction</string>
-    <string name="chat_message_many_reactions">%s reactions</string>
-
-    <!-- Recordings -->
-    <string name="recordings_empty_list">No recordings</string>
-    <string name="recordings_export">Export recording using…</string>
-
-    <!-- Conferencing -->
-    <string name="conference">Meeting</string>
-    <string name="conference_schedule_title">Schedule a meeting</string>
-    <string name="conference_group_call_title">Start a group call</string>
-    <string name="conference_schedule_later">Do you want to schedule a meeting for later?</string>
-    <string name="conference_schedule_mandatory_field">Mandatory</string>
-    <string name="conference_schedule_subject_title">Subject</string>
-    <string name="conference_schedule_subject_hint">Meeting subject</string>
-    <string name="conference_group_call_subject_hint">Group call subject</string>
-    <string name="conference_schedule_address_title">Meeting address</string>
-    <string name="conference_schedule_broadcast_address_title">Broadcast address</string>
-    <string name="conference_schedule_description_title">Add a description</string>
-    <string name="conference_schedule_description_hint">Description</string>
-    <string name="conference_schedule_date">Date</string>
-    <string name="conference_schedule_time">Time</string>
-    <string name="conference_schedule_duration">Duration</string>
-    <string name="conference_schedule_mode">Mode</string>
-    <string name="conference_schedule_mode_meeting">Meeting</string>
-    <string name="conference_schedule_mode_broadcast">Broadcast</string>
-    <string name="conference_schedule_timezone">Timezone</string>
-    <string name="conference_schedule_send_invite_chat">Send invite via &appName;</string>
-    <string name="conference_schedule_send_updated_invite_chat">Send update via &appName;</string>
-    <string name="conference_schedule_send_invite_email">Send invite via email</string>
-    <string name="conference_schedule_send_updated_invite_email">Send update via email</string>
-    <string name="conference_schedule_encryption">Would you like to encrypt the meeting?</string>
-    <string name="conference_schedule_send_invite_chat_summary">Invite will be sent out from my &appName; account</string>
-    <string name="conference_schedule_participants_list">Participants list</string>
-    <string name="conference_schedule_speakers_list">Speakers list</string>
-    <string name="conference_schedule_speakers_list_empty">Select at least one speaker</string>
-    <string name="conference_schedule_participants_list_empty">Select at least one participant</string>
-    <string name="conference_organizer">Organizer</string>
-    <string name="conference_schedule_summary">Meeting info</string>
-    <string name="conference_group_call_summary">Group call info</string>
-    <string name="conference_schedule_broadcast_summary">Broadcast info</string>
-    <string name="conference_schedule_start">Schedule meeting</string>
-    <string name="conference_schedule_edit">Edit meeting</string>
-    <string name="conference_broadcast_start">Schedule broadcast</string>
-    <string name="conference_broadcast_edit">Edit broadcast</string>
-    <string name="conference_group_call_create">Start group call</string>
-    <string name="conference_schedule_address_copied_to_clipboard">Meeting address copied into clipboard</string>
-    <string name="conference_schedule_info_not_sent_to_participant">Failed to send meeting info to a participant</string>
-    <string name="conference_paused_title">You are currently out of the meeting.</string>
-    <string name="conference_paused_subtitle">Click on play button to join it back.</string>
-    <string name="conference_default_title">Remote group call</string>
-    <string name="conference_local_title">Local group call</string>
-    <string name="conference_invite_title">Meeting invite:</string>
-    <string name="conference_broadcast_invite_title">Broadcast invite:</string>
-    <string name="conference_broadcast_invite_you_are_speaker">(you are a speaker)</string>
-    <string name="conference_update_title">Meeting has been updated:</string>
-    <string name="conference_cancel_title">Meeting has been cancelled:</string>
-    <string name="conference_description_title">Description</string>
-    <string name="conference_invite_join">Join</string>
-    <string name="conference_invite_participants_count" tools:ignore="PluralsCandidate">%d participants</string>
-    <string name="conference_display_mode_mosaic">Mosaic mode</string>
-    <string name="conference_display_mode_active_speaker">Active speaker mode</string>
-    <string name="conference_display_mode_audio_only">Audio only mode</string>
-    <string name="conference_waiting_room_start_call">Start</string>
-    <string name="conference_waiting_room_cancel_call">Cancel</string>
-    <string name="conference_waiting_room_video_disabled">Video is currently disabled</string>
-    <string name="conference_waiting_room_listener_broadcast">You aren\'t a speaker in this broadcast</string>
-    <string name="conference_scheduled">Meetings</string>
-    <string name="conference_layout_too_many_participants_for_mosaic">You can\'t change group call layout as there is too many participants</string>
-    <string name="conference_too_many_participants_for_mosaic_layout">There is too many participants for mosaic layout, switching to active speaker</string>
-    <string name="conference_participant_paused">(paused)</string>
-    <string name="conference_no_schedule">No scheduled meeting yet.</string>
-    <string name="conference_no_terminated_schedule">No terminated meeting yet.</string>
-    <string name="conference_schedule_organizer">Organizer:</string>
-    <string name="conference_go_to_chat">Meeting\'s chat room</string>
-    <string name="conference_creation_failed">Failed to create meeting</string>
-    <string name="conference_admin_set">%s is now admin</string>
-    <string name="conference_admin_unset">%s is no longer admin</string>
-    <string name="conference_schedule_info_created">Meeting has been scheduled</string>
-    <string name="conference_info_removed">Meeting info has been deleted</string>
-    <string name="conference_empty">You are currently alone in this group call</string>
-    <string name="conference_invitation_received_notification">You have been invited to a meeting</string>
-    <string name="conference_invitation_notification_short_desc">meeting invitation</string>
-    <string name="conference_invitation">Meeting invitation</string>
-    <string name="conference_low_bandwidth">Low bandwidth detected, disabling video</string>
-    <string name="conference_first_to_join">You\'re the first to join the group call</string>
-    <string name="conference_last_user">All other participants have left the group call</string>
-    <string name="conference_incoming_title">Incoming group call</string>
-    <string name="conference_participants_title">Participants (%d)</string>
-    <string name="conference_start_group_call_dialog_title">Group call</string>
-    <string name="conference_start_group_call_dialog_message">Do you want to start a group call?\nEveryone in this group will receive a call to join the meeting.</string>
-    <string name="conference_start_group_call_dialog_ok_button">Start</string>
-    <string name="conference_scheduled_terminated_filter">Terminated</string>
-    <string name="conference_scheduled_future_filter">Scheduled</string>
-    <string name="conference_scheduled_delete_one_dialog">Do you want to delete this meeting?</string>
-    <string name="conference_scheduled_delete_many_dialog">Do you want to delete these meetings?</string>
-    <plurals name="conference_scheduled_delete_dialog" translatable="false">
-        <item quantity="one">@string/conference_scheduled_delete_one_dialog</item>
-        <item quantity="other">@string/conference_scheduled_delete_many_dialog</item>
-    </plurals>
-    <string name="conference_scheduled_cancelled_by_organizer">Conference has been cancelled by organizer</string>
-    <string name="conference_scheduled_cancelled_by_me">You have cancelled the conference</string>
-    <string name="conference_meeting_title">Meeting:</string>
-    <string name="conference_broadcast_title">Broadcast:</string>
-    <string name="conference_invite_speakers_list_title">Speakers</string>
-    <string name="conference_invite_participants_list_title">Participants</string>
-    <string name="conference_participants_list_speaker_label">Speaker</string>
-
-    <!-- Call -->
-    <string name="call_incoming_title">Incoming Call</string>
-    <string name="call_outgoing_title">Outgoing Call</string>
-    <string name="call_notification_paused">Paused call</string>
-    <string name="call_notification_outgoing">Outgoing call</string>
-    <string name="call_notification_active">Call running</string>
-    <string name="call_error_declined">Call has been declined</string>
-    <string name="call_error_user_busy">User is busy</string>
-    <string name="call_error_user_not_found">User hasn\'t been found</string>
-    <string name="call_error_incompatible_media_params">Incompatible media parameters</string>
-    <string name="call_error_network_unreachable">Network is unreachable</string>
-    <string name="call_error_io_error">Service unavailable or network error</string>
-    <string name="call_error_server_timeout">Server timeout</string>
-    <string name="call_error_temporarily_unavailable">Temporarily unavailable</string>
-    <string name="call_error_generic">Error: %s</string>
-    <string name="call_video_update_requested_dialog">Correspondent would like to turn the video on</string>
-    <string name="call_action_participants_list">Participants list</string>
-    <string name="call_action_chat">Chat</string>
-    <string name="call_action_calls_list">Calls list</string>
-    <string name="call_action_numpad">Numpad</string>
-    <string name="call_action_change_conf_layout">Change layout</string>
-    <string name="call_action_statistics">Call statistics</string>
-    <string name="call_action_add_call">Start new call</string>
-    <string name="call_action_transfer_call">Transfer call</string>
-    <string name="call_action_attended_transfer_call">Attended transfer</string>
-    <string name="call_context_action_resume">Resume call</string>
-    <string name="call_context_action_pause">Pause call</string>
-    <string name="call_context_action_transfer">Transfer call</string>
-    <string name="call_context_action_answer">Answer call</string>
-    <string name="call_context_action_hangup">Terminate call</string>
-    <string name="call_remote_recording">This call is being recorded.</string>
-    <string name="call_remotely_paused_title">Call has been paused by remote.</string>
-    <string name="call_locally_paused_title">You have paused the call.</string>
-    <string name="call_locally_paused_subtitle">Click on play button to resume it.</string>
-    <string name="call_screenshot_taken">Snapshot taken: %s</string>
-
-    <!-- Call stats -->
-    <string name="call_stats_audio">Audio</string>
-    <string name="call_stats_video">Video</string>
-    <string name="call_stats_codec">Codec:</string>
-    <string name="call_stats_ip">IP Family:</string>
-    <string name="call_stats_upload">Upload bandwidth:</string>
-    <string name="call_stats_download">Download bandwidth:</string>
-    <string name="call_stats_estimated_download">Estimated download bandwidth:</string>
-    <string name="call_stats_ice">ICE connectivity:</string>
-    <string name="call_stats_video_resolution_sent">Sent video resolution:</string>
-    <string name="call_stats_video_resolution_received">Received video resolution:</string>
-    <string name="call_stats_video_fps_sent">Sent video fps:</string>
-    <string name="call_stats_video_fps_received">Received video fps:</string>
-    <string name="call_stats_sender_loss_rate">Sender loss rate:</string>
-    <string name="call_stats_receiver_loss_rate">Receiver loss rate:</string>
-    <string name="call_stats_jitter_buffer">Jitter buffer:</string>
-    <string name="call_stats_encoder_name">Encoder:</string>
-    <string name="call_stats_decoder_name">Decoder:</string>
-    <string name="call_stats_player_filter">Player filter:</string>
-    <string name="call_stats_capture_filter">Capture filter:</string>
-    <string name="call_stats_media_encryption">Media encryption:</string>
-    <string name="call_stats_zrtp_cipher_algo">Cipher algorithm:</string>
-    <string name="call_stats_zrtp_key_agreement_algo">Key agreement algorithm:</string>
-    <string name="call_stats_zrtp_hash_algo">Hash algorithm:</string>
-    <string name="call_stats_zrtp_auth_tag_algo">Authentication algorithm:</string>
-    <string name="call_stats_zrtp_sas_algo">SAS algorithm:</string>
-
-    <!-- Assistant -->
-    <string name="assistant_welcome_title">Welcome</string>
-    <string name="assistant_welcome_desc">This assistant will help you configure and use your SIP account.</string>
-    <string name="assistant_create_account">Create account</string>
-    <string name="assistant_login_linphone">Use &appName; account</string>
-    <string name="assistant_login_generic">Use SIP account</string>
-    <string name="assistant_remote_provisioning">Fetch remote configuration</string>
-    <string name="assistant_ec_calibration">Echo canceler calibration in progress</string>
-    <string name="assistant_phone_number_info_title">What will my phone number be used for?</string>
-    <string name="assistant_phone_number_link_info_content">\nYour friends will find you more easily if you link your account to your phone number\n\nYou will see in your address book who is using &appName; and your friends will know that they can reach you on &appName; as well.\n</string>
-    <string name="assistant_phone_number_link_info_content_already_account">You can only use your phone number with one &appName; account.\n\nIf you had already linked your number to an other account but you prefer to use this one, simply link it now and your number will automatically be moved to this account.</string>
-    <string name="assistant_general_terms_link" translatable="false">https://www.linphone.org/general-terms</string>
-    <string name="assistant_privacy_policy_link" translatable="false">https://www.linphone.org/privacy-policy</string>
-    <string name="assistant_general_terms">terms of use</string>
-    <string name="assistant_privacy_policy">privacy policy</string>
-    <string name="assistant_read_and_agree_terms">I accept Belledonne Communications\' %1$s and %2$s</string>
-    <string name="assistant_generic_account_warning">Some features require a &appName; account, such as group messaging or ephemeral messaging.\n\nThese features are hidden when you register with a third party SIP account.\n\nTo enable it in a commercial project, please contact us.</string>
-    <string name="assistant_generic_account_warning_contact_link" translatable="false">https://www.linphone.org/contact</string>
-    <string name="assistant_generic_account_warning_continue_button_text">I understand</string>
-    <string name="assistant_alternative_way_create_account">To create an account using your email:</string>
-    <string name="assistant_no_push_warning">Your device doesn\'t seem to be able to receive push notifications.\n\nAs we now require them for the account creation process, you won\'t be able to create an account inside the app, but you can create it on our website:</string>
-
-    <!-- Assistant errors -->
-    <string name="assistant_error_phone_number_invalid_characters">Only digits are expected here</string>
-    <string name="assistant_error_username_already_exists">Username already in use</string>
-    <string name="assistant_error_phone_number_already_exists">There is already an account using this number</string>
-    <string name="assistant_error_username_invalid_characters">Invalid characters found</string>
-    <string name="assistant_error_passwords_dont_match">Passwords do not match</string>
-    <string name="assistant_error_invalid_email_address">Email address is invalid</string>
-    <string name="assistant_error_username_too_long">Username has too many characters</string>
-    <string name="assistant_error_invalid_credentials">Account does not exist or password does not match</string>
-    <string name="assistant_error_invalid_international_prefix">Wrong international prefix</string>
-
-    <!-- Assistant login -->
-    <string name="assistant_linphone_account">Use your &appName; account</string>
-    <string name="assistant_create_account_part_1">Please confirm your country code and enter your phone number</string>
-    <string name="assistant_linphone_login_desc">Please enter your &appName; account username and password</string>
-    <string name="assistant_login_with_username">Use your username and password instead of your phone number</string>
-    <string name="assistant_login_forgotten_password">Forgot your password?</string>
-    <string name="assistant_forgotten_password_link" translatable="false">https://subscribe.linphone.org/</string>
-    <string name="assistant_login">Login</string>
-    <string name="assistant_finish">Finish configuration</string>
-    <string name="assistant_confirmation_code">Confirmation code</string>
-    <string name="assistant_continue_even_if_credentials_invalid">Continue</string>
-
-    <!-- Assistant generic login -->
-    <string name="assistant_generic_account">Use SIP account</string>
-    <string name="assistant_login_desc">Please enter your username and password with your SIP domain</string>
-    <string name="assistant_display_name_optional">Display name (optional)</string>
-
-    <!-- Assistant create -->
-    <string name="assistant_create_account_part_email">Please enter a username, email and password for your &appName; account</string>
-    <string name="assistant_confirm_password">Password confirmation</string>
-    <string name="assistant_validate_account_1">Your account is created. Please check your emails to validate your account:</string>
-    <string name="assistant_validate_account_2">Once it is done, come back here and click on the button.</string>
-    <string name="assistant_use_username_instead_or_phone_number">Use a username (optional)</string>
-    <string name="assistant_create_account_part_2">We have sent you an SMS with a validation code to your phone number:</string>
-    <string name="assistant_create_account_part_3">To complete your phone number verification, please enter the 4 digit code below:\n</string>
-    <string name="assistant_link_phone_number">You will link with your phone number the following username:</string>
-    <string name="assistant_link_phone_number_skip">Skip</string>
-    <string name="assistant_create_email_account_not_validated">Your account has not been activated yet, please click on the link you received by email</string>
-
-    <!-- Assistant link -->
-    <string name="assistant_link_account">Link account</string>
-
-    <!-- Assistant remote provisioning -->
-    <string name="assistant_remote_provisioning_title">Fetch remote configuration</string>
-    <string name="assistant_remote_provisioning_desc">Please provide your configuration URL</string>
-    <string name="assistant_remote_provisioning_url">URL</string>
-    <string name="assistant_remote_provisioning_wrong_format">Unknown URL format, can\'t download provisioning…</string>
-    <string name="assistant_remote_provisioning_failure">Failed to download or apply remote provisioning profile…</string>
-    <string name="assistant_fetch_apply">Fetch and apply</string>
-    <string name="assistant_launch_qrcode">QRCode</string>
-
-    <!-- Settings -->
-    <string name="settings_accounts_title">SIP Accounts</string>
-    <string name="settings_default_account_subtitle">Default account</string>
-    <string name="settings_list_title">Preferences</string>
-    <string name="settings_tunnel_title">Tunnel</string>
-    <string name="settings_audio_title">Audio</string>
-    <string name="settings_video_title">Video</string>
-    <string name="settings_call_title">Call</string>
-    <string name="settings_chat_title">Chat</string>
-    <string name="settings_network_title">Network</string>
-    <string name="settings_contacts_title">Contacts</string>
-    <string name="settings_advanced_title">Advanced</string>
-    <string name="settings_conferences_title">Meetings</string>
-    <string name="settings_primary_account_title">Primary Account</string>
-    <string name="settings_primary_account_display_name_title">Display Name</string>
-    <string name="settings_primary_account_username_title">Username</string>
-    <string name="settings_password_protection_dialog_title">Please input your password below to access the settings</string>
-    <string name="settings_password_protection_dialog_input_hint">Password</string>
-    <string name="settings_password_protection_dialog_ok_label">Validate</string>
-    <string name="settings_password_protection_dialog_invalid_input">Invalid password!</string>
-
-    <!-- Audio settings -->
-    <string name="audio_settings_software_echo_cancellation_title">Software echo cancellation</string>
-    <string name="audio_settings_echo_cancellation_summary">Removes the echo heard by other end</string>
-    <string name="audio_settings_echo_canceller_calibration_title">Echo canceller calibration</string>
-    <string name="audio_settings_echo_canceller_calibration_summary">Click to start echo canceller calibration</string>
-    <string name="audio_settings_echo_cancellation_calibration_started">Echo canceller calibration started</string>
-    <string name="audio_settings_echo_cancellation_calibration_value">Calibrated in %s ms</string>
-    <string name="audio_settings_echo_cancellation_calibration_failed">Calibration failed</string>
-    <string name="audio_settings_echo_cancellation_calibration_no_echo">No echo detected</string>
-    <string name="audio_settings_echo_tester_title">Test echo</string>
-    <string name="audio_settings_echo_tester_summary">Click to start echo tester</string>
-    <string name="audio_settings_echo_tester_summary_is_stopped">Echo tester is stopped</string>
-    <string name="audio_settings_echo_tester_summary_is_running">Echo tester is running</string>
-    <string name="audio_settings_adaptive_rate_control_title">Adaptive rate control</string>
-    <string name="audio_settings_input_device_title">Default input audio device</string>
-    <string name="audio_settings_input_device_summary">Changes will take effect starting next call</string>
-    <string name="audio_settings_output_device_title">Default output audio device</string>
-    <string name="audio_settings_output_device_summary">Changes will take effect starting next call</string>
-    <string name="audio_settings_prefer_bluetooth_devices_title">Route audio to the bluetooth device if any</string>
-    <string name="audio_settings_codec_bitrate_title">Codec bitrate limit</string>
-    <string name="audio_settings_microphone_gain_title">Microphone gain</string>
-    <string name="audio_settings_microphone_gain_summary">(in decibels)</string>
-    <string name="audio_settings_playback_gain_title">Playback gain</string>
-    <string name="audio_settings_playback_gain_summary">(in decibels)</string>
-    <string name="audio_settings_codecs_title">Codecs</string>
-
-    <!-- Video settings -->
-    <string name="video_settings_enable_title">Enable video</string>
-    <string name="video_settings_tablet_preview_title">Display camera preview on dialer</string>
-    <string name="video_settings_initiate_call_title">Initiate video calls</string>
-    <string name="video_settings_initiate_call_summary">Always send video requests</string>
-    <string name="video_settings_automatically_accept_title">Accept incoming video requests</string>
-    <string name="video_settings_automatically_accept_summary">Always accept video requests</string>
-    <string name="video_settings_camera_device_title">Camera</string>
-    <string name="video_settings_video_size_title">Preferred video size</string>
-    <string name="video_settings_video_preset_title">Video preset</string>
-    <string name="video_settings_preferred_fps_title">Preferred FPS</string>
-    <string name="video_settings_bandwidth_limit_title">Bandwidth limit</string>
-    <string name="video_settings_bandwidth_limit_summary">in kbits/s</string>
-    <string name="video_settings_codecs_title">Codecs</string>
-
-    <!-- Call settings -->
-    <string name="call_settings_device_ringtone_title">Use device ringtone</string>
-    <string name="call_settings_ringtones_title">Ringtone</string>
-    <string name="call_settings_vibrate_title">Vibrate while incoming call is ringing</string>
-    <string name="call_settings_encryption_title">Media encryption</string>
-    <string name="call_settings_media_encryption_none">None</string>
-    <string name="call_settings_media_encryption_srtp">SRTP</string>
-    <string name="call_settings_media_encryption_zrtp">ZRTP</string>
-    <string name="call_settings_media_encryption_zrtp_post_quantum">Post Quantum ZRTP</string>
-    <string name="call_settings_media_encryption_dtls">DTLS-SRTP</string>
-    <string name="call_settings_encryption_mandatory_title">Media encryption mandatory</string>
-    <string name="call_settings_use_telecom_manager_title">Improve interactions with bluetooth devices</string>
-    <string name="call_settings_use_telecom_manager_summary">Requires some extra permissions</string>
-    <string name="call_settings_overlay_title">Overlay call notification</string>
-    <string name="call_settings_system_wide_overlay_title">Show overlay outside of app</string>
-    <string name="call_settings_system_wide_overlay_summary">You will be asked to grant overlay permission</string>
-    <string name="call_settings_sipinfo_dtmf_title">Send out-band DTMFs (SIP INFO)</string>
-    <string name="call_settings_rfc2833_dtmf_title">Send in-band DTMFs (RFC 2833)</string>
-    <string name="call_settings_auto_start_title">Start call immediately</string>
-    <string name="call_settings_auto_start_summary">The call will start automatically if started from another application</string>
-    <string name="call_settings_auto_answer_title">Auto answer incoming calls</string>
-    <string name="call_settings_auto_answer_delay_title">Auto answer time</string>
-    <string name="call_settings_auto_answer_delay_summary">in milliseconds</string>
-    <string name="call_settings_incoming_timeout_title">Incoming call timeout</string>
-    <string name="call_settings_incoming_timeout_summary">in seconds</string>
-    <string name="call_settings_voice_mail_uri_title">Voice mail URI</string>
-    <string name="call_settings_redirect_to_voice_mail_declined_calls_title">Redirect declined calls to voice mail URI</string>
-    <string name="call_settings_accept_early_media_title">Accept early media</string>
-    <string name="call_settings_ring_during_early_media_title">Ring during incoming early media</string>
-    <string name="call_settings_pause_calls_lost_audio_focus_title">Pause calls when audio focus is lost</string>
-    <string name="call_settings_go_to_android_notification_settings">Android notification settings</string>
-    <string name="call_settings_auto_start_recording_title">Automatically start call recording</string>
-    <string name="call_settings_remote_recording_title">Get notified when call is being recorded by your correspondent</string>
-
-    <!-- Chat settings -->
-    <string name="chat_settings_mark_as_read_notif_dismissal_title">Mark as read upon notification dismissal</string>
-    <string name="chat_settings_file_sharing_url_title">Sharing server URL</string>
-    <string name="chat_settings_file_sharing_url_summary">Do not edit unless you know what you are doing!</string>
-    <string name="chat_settings_auto_download_title">Auto download incoming files policy</string>
-    <string name="chat_settings_auto_download_summary">Whether to download files attached in received chat messages automatically or not</string>
-    <string name="chat_settings_auto_download_always">Always</string>
-    <string name="chat_settings_auto_download_never">Never</string>
-    <string name="chat_settings_auto_download_under_size">If lighter than given maximum size</string>
-    <string name="chat_settings_auto_download_max_size_title">Max size</string>
-    <string name="chat_settings_auto_download_max_size_summary">in bytes</string>
-    <string name="chat_settings_downloaded_media_public_title">Make downloaded media public</string>
-    <string name="chat_settings_downloaded_media_public_summary">Files in ephemeral messages won\'t be, doesn\'t work with auto download feature</string>
-    <string name="chat_settings_hide_notification_content_title">Hide message content in notifications</string>
-    <string name="chat_settings_hide_notification_content_summary">Only sender name will be displayed</string>
-    <string name="chat_settings_launcher_shortcuts_title">Create shortcuts to chat rooms in launcher</string>
-    <string name="chat_settings_launcher_shortcuts_summary">Will be replaced by contacts shortcuts if enabled</string>
-    <string name="chat_settings_hide_empty_rooms_title">Hide empty chat rooms</string>
-    <string name="chat_settings_hide_rooms_removed_proxies_title">Hide chat rooms from removed accounts</string>
-    <string name="chat_settings_hide_rooms_removed_proxies_summary">If you are missing chat rooms, try to uncheck this setting</string>
-    <string name="chat_settings_go_to_android_notification_settings">Android notification settings</string>
-    <string name="chat_settings_use_in_app_file_viewer_title">Always open files inside this app</string>
-    <string name="chat_settings_use_in_app_file_viewer_summary">You\'ll still be able to export them in third-party apps</string>
-    <string name="chat_settings_auto_download_voice_recordings">Auto download incoming voice recordings</string>
-
-    <!-- Network settings -->
-    <string name="network_settings_wifi_only_title">Use WiFi only</string>
-    <string name="network_settings_allow_ipv6_title">Allow IPv6</string>
-    <string name="network_settings_random_ports_title">Use random ports</string>
-    <string name="network_settings_sip_port_title">SIP port to use</string>
-
-    <!-- Contacts settings -->
-    <string name="contacts_settings_friendlist_subscribe_title">Friendlist subscribe</string>
-    <string name="contacts_settings_native_presence_title">Presence information in native contact</string>
-    <string name="contacts_settings_native_presence_summary">Inserting information shortcuts from the &appName; contact into native Android contacts</string>
-    <string name="contacts_settings_show_organization_title">Display contact organization</string>
-    <string name="contacts_settings_launcher_shortcuts_title">Create shortcuts to contacts in launcher</string>
-    <string name="contacts_settings_launcher_shortcuts_summary">Will replace chat room shortcuts if any</string>
-    <string name="contacts_settings_show_new_contact_account_dialog_title">Always ask in which account save newly created contact</string>
-    <string name="contacts_settings_show_new_contact_account_dialog_summary">If disabled contact will be stored locally</string>
-    <string name="contacts_settings_create_new_ldap_config_title">New LDAP configuration</string>
-
-    <!-- LDAP Contacts settings -->
-    <string name="contacts_settings_ldap_title">LDAP</string>
-    <string name="contacts_settings_ldap_enable_title">Enable</string>
-    <string name="contacts_settings_ldap_delete_title">Delete</string>
-    <string name="contacts_settings_ldap_connection_title">Connection</string>
-    <string name="contacts_settings_ldap_server_title">Server URL</string>
-    <string name="contacts_settings_ldap_bind_dn_title">Bind DN</string>
-    <string name="contacts_settings_ldap_password_title">Password</string>
-    <string name="contacts_settings_ldap_auth_method_title">Authentication method</string>
-    <string name="contacts_settings_ldap_auth_method_anonymous">Anonymous</string>
-    <string name="contacts_settings_ldap_auth_method_simple">Simple</string>
-    <string name="contacts_settings_ldap_tls_title">Use TLS</string>
-    <string name="contacts_settings_ldap_cert_check_title">Check certificates</string>
-    <string name="contacts_settings_ldap_cert_check_auto">Auto</string>
-    <string name="contacts_settings_ldap_cert_check_disabled">Disabled</string>
-    <string name="contacts_settings_ldap_cert_check_enabled">Enabled</string>
-    <string name="contacts_settings_ldap_search_title">Search</string>
-    <string name="contacts_settings_ldap_search_base_title">Search base</string>
-    <string name="contacts_settings_ldap_search_base_subtitle">Must not be empty!</string>
-    <string name="contacts_settings_ldap_search_filter_title">Filter</string>
-    <string name="contacts_settings_ldap_search_max_results_title">Max results</string>
-    <string name="contacts_settings_ldap_search_timeout_title">Timeout</string>
-    <string name="contacts_settings_ldap_search_timeout_subtitle">In seconds</string>
-    <string name="contacts_settings_ldap_request_delay_title">Delay between two requests</string>
-    <string name="contacts_settings_ldap_request_delay_subtitle">In milliseconds</string>
-    <string name="contacts_settings_ldap_minimum_characters_title">Minimum characters to start query</string>
-    <string name="contacts_settings_ldap_parsing_title">Parsing</string>
-    <string name="contacts_settings_ldap_name_attribute_title">Name attributes</string>
-    <string name="contacts_settings_ldap_sip_attribute_title">SIP attributes</string>
-    <string name="contacts_settings_ldap_sip_domain_title">Domain</string>
-    <string name="contacts_settings_ldap_misc_title">Misc</string>
-    <string name="contacts_settings_ldap_debug_title">Debug</string>
-
-    <!-- Advanced settings -->
-    <string name="advanced_settings_debug_mode_title">Debug logs</string>
-    <string name="advanced_settings_background_mode_title">Background mode</string>
-    <string name="advanced_settings_background_mode_summary">Shows a notification to keep the app alive</string>
-    <string name="advanced_settings_auto_start_title">Start at boot time</string>
-    <string name="advanced_settings_dark_mode_title">Dark theme</string>
-    <string name="advanced_settings_dark_mode_label_auto">Auto</string>
-    <string name="advanced_settings_dark_mode_label_no">No</string>
-    <string name="advanced_settings_dark_mode_label_yes">Yes</string>
-    <string name="advanced_settings_animations_title">Animations</string>
-    <string name="advanced_settings_device_name_title">Device name</string>
-    <string name="advanced_settings_device_name_summary">Changes will be applied at next start up</string>
-    <string name="advanced_settings_remote_provisioning_url_title">Remote provisioning URL</string>
-    <string name="advanced_settings_logs_server_url_title">Logs upload server URL</string>
-    <string name="advanced_settings_logs_server_url_summary">Do not edit unless you know what you are doing!</string>
-    <string name="advanced_settings_android_title">Android</string>
-    <string name="advanced_settings_go_to_battery_optimization_settings">Battery optimization settings</string>
-    <string name="advanced_settings_go_to_power_manager_settings">Power manager settings</string>
-    <string name="advanced_settings_go_to_android_app_settings">Android app settings</string>
-    <string name="advanced_settings_vfs_title">Encrypt everything</string>
-    <string name="advanced_settings_vfs_summary">Once enabled it can\'t be disabled!</string>
-    <string name="advanced_settings_send_debug_logs_title">Send logs</string>
-    <string name="advanced_settings_reset_debug_logs_title">Reset logs</string>
-    <string name="advanced_settings_debug_title">Debug settings</string>
-    <string name="advanced_settings_other_title">Other settings</string>
-    <string name="advanced_settings_disable_fragment_security_title">Disable UI\'s secure mode</string>
-    <string name="advanced_settings_disable_fragment_security_summary">Allow screen capture/recording on sensitive views</string>
-
-    <!-- Tunnel settings -->
-    <string name="tunnel_settings_hostname_url_title">Hostname</string>
-    <string name="tunnel_settings_port_title">Port</string>
-    <string name="tunnel_settings_dual_mode_title">Dual mode enabled</string>
-    <string name="tunnel_settings_dual_mode_summary">Will use one server for upload and another one for download</string>
-    <string name="tunnel_settings_dual_hostname_url_title">Second server hostname</string>
-    <string name="tunnel_settings_dual_hostname_url_summary">Required in dual mode</string>
-    <string name="tunnel_settings_dual_port_title">Second server port</string>
-    <string name="tunnel_settings_dual_port_summary">Required in dual mode</string>
-    <string name="tunnel_settings_mode_title">Mode</string>
-    <string name="tunnel_settings_disabled_mode">Disabled</string>
-    <string name="tunnel_settings_always_mode">Always</string>
-    <string name="tunnel_settings_auto_mode">Auto</string>
-
-    <!-- Account settings -->
-    <string name="account_settings_user_name_title">Username</string>
-    <string name="account_settings_user_name_summary">Example: john if your account is john@sip.example.org</string>
-    <string name="account_settings_user_id_title">Auth id</string>
-    <string name="account_settings_user_id_summary">Enter authentication id if different from username (optional)</string>
-    <string name="account_settings_password_title">Password</string>
-    <string name="account_settings_password_summary">You have to re-enter your password if you edit your username and/or the domain</string>
-    <string name="account_settings_domain_title">Domain</string>
-    <string name="account_settings_domain_summary">Example: sip.example.org if your account is john@sip.example.org</string>
-    <string name="account_settings_display_name_title">Display name</string>
-    <string name="account_settings_manage_title">Manage</string>
-    <string name="account_settings_disable_title">Disable</string>
-    <string name="account_settings_default_title">Used as default</string>
-    <string name="account_settings_link_phone_number_title">Link your account</string>
-    <string name="account_settings_delete_title">Delete</string>
-    <string name="account_settings_advanced_title">Advanced</string>
-    <string name="account_settings_push_notification_title">Allow push notification</string>
-    <string name="account_settings_push_notification_summary">Account won\'t unregister</string>
-    <string name="account_settings_transport_title">Transport</string>
-    <string name="account_settings_transport_udp">UDP</string>
-    <string name="account_settings_transport_tcp">TCP</string>
-    <string name="account_settings_transport_tls">TLS</string>
-    <string name="account_settings_transport_dtls">DTLS</string>
-    <string name="account_settings_proxy_title">SIP proxy</string>
-    <string name="account_settings_outbound_proxy_title">Outbound proxy</string>
-    <string name="account_settings_outbound_proxy_summary">Route all calls through above SIP proxy</string>
-    <string name="account_settings_stun_server_title">STUN/TURN server</string>
-    <string name="account_settings_ice_title">Enable ICE</string>
-    <string name="account_settings_avpf_title">AVPF</string>
-    <string name="account_settings_avpf_rr_interval_title">AVPF regular RTCP interval</string>
-    <string name="account_settings_avpf_rr_interval_summary">in seconds (between 1 and 5)</string>
-    <string name="account_settings_expires_title">Expire</string>
-    <string name="account_settings_expires_summary">in seconds</string>
-    <string name="account_settings_prefix_title">Prefix for your country</string>
-    <string name="account_settings_prefix_summary">without the +</string>
-    <string name="account_settings_apply_prefix_for_calls_title">Apply prefix for outgoing calls and chat</string>
-    <string name="account_settings_apply_prefix_for_calls_summary">If a number is entered, apply prefix to number</string>
-    <string name="account_settings_escape_plus_title">Replace + by 00</string>
-    <string name="account_setting_conference_factory_address">Conference factory URI</string>
-    <string name="account_setting_audio_video_conference_factory_address">Audio/video conference factory URI</string>
-    <string name="account_setting_end_to_end_encryption_keys_server_url">E2E encryption keys server URL</string>
-    <string name="account_setting_publish_presence_title">Publish presence information</string>
-    <string name="account_setting_delete_dialog_title">Do you want to delete your account?</string>
-    <string name="account_setting_delete_generic_confirmation_dialog">Your account will only be deleted locally.\nTo delete it permanently, go on your SIP provider website.</string>
-    <string name="account_setting_delete_sip_linphone_org_confirmation_dialog">Your account will only be deleted locally.\nTo delete it permanently, go to our account management platform:</string>
-    <string name="account_setting_disable_bundle_mode_title">Disable bundle mode</string>
-
-    <!-- Conferences settings -->
-    <string name="conferences_settings_layout_title">Default layout</string>
-    <string name="conferences_settings_enable_broadcast_title">Allow broadcasts</string>
-    <string name="conferences_settings_enable_broadcast_summary">Feature currently in beta!</string>
-
-    <!-- Notifications -->
-    <string name="notification_channel_service_id" translatable="false">linphone_notification_service_id</string>
-    <string name="notification_channel_missed_call_id" translatable="false">linphone_notification_missed_call_id</string>
-    <string name="notification_channel_incoming_call_id" translatable="false">linphone_notification_call_id</string>
-    <string name="notification_channel_chat_id" translatable="false">linphone_notification_chat_id</string>
-    <string name="notification_channel_service_name">&appName; service notification</string>
-    <string name="notification_channel_missed_call_name">&appName; missed calls notifications</string>
-    <string name="notification_channel_incoming_call_name">&appName; incoming calls notifications</string>
-    <string name="notification_channel_chat_name">&appName; instant messages notifications</string>
-    <string name="incoming_call_notification_title">Incoming call</string>
-    <string name="incoming_group_call_notification_title">Incoming group call</string>
-    <string name="incoming_call_notification_hangup_action_label">Hangup</string>
-    <string name="incoming_call_notification_answer_action_label">Answer</string>
-    <string name="received_chat_notification_reply_label">Reply</string>
-    <string name="received_chat_notification_mark_as_read_label">Mark as read</string>
-    <string name="missed_call_notification_title">Missed call</string>
-    <string name="missed_call_notification_body">Missed call from %s</string>
-    <string name="missed_calls_notification_body" tools:ignore="PluralsCandidate">%d missed calls</string>
-
-    <!-- Dialog -->
-    <string name="zrtp_dialog_title">Communication security</string>
-    <string name="zrtp_dialog_explanation">To raise the security level, you can check the following codes with your correspondent.</string>
-    <string name="zrtp_dialog_later_button_label">Later</string>
-    <string name="zrtp_dialog_correct_button_label">Correct</string>
-    <string name="dialog_zrtp_local_sas">Say:</string>
-    <string name="dialog_zrtp_remote_sas">Your correspondent must say:</string>
-    <string name="dialog_do_not_ask_again">Do not show again</string>
-    <string name="dialog_cancel">Cancel</string>
-    <string name="dialog_delete">Delete</string>
-    <string name="dialog_ok">OK</string>
-    <string name="dialog_accept">Accept</string>
-    <string name="dialog_decline">Decline</string>
-    <string name="dialog_call">Call</string>
-    <string name="dialog_lime_security_message">Instant messages are end-to-end encrypted in secured conversations. It is possible to upgrade the security level of a conversation by authenticating participants. To do so, call the contact and follow the authentication process.</string>
-    <string name="operation_in_progress_wait">Operation in progress, please wait</string>
-    <string name="dialog_default_delete_one">Are you sure you want to delete this item?</string>
-    <string name="dialog_default_delete_many">Are you sure you want to delete your selection?</string>
-    <plurals name="dialog_default_delete" translatable="false">
-        <item quantity="one">@string/dialog_default_delete_one</item>
-        <item quantity="other">@string/dialog_default_delete_many</item>
-    </plurals>
-    <string name="dialog_update_available">An update is available</string>
-    <string name="dialog_try_open_file_as_text_title">No app found for this kind of file</string>
-    <string name="dialog_try_open_file_as_text_body">Would you like to try opening it as a plain text file?</string>
-    <string name="dialog_apply_remote_provisioning_title">Do you want to download and apply configuration from this URL?</string>
-    <string name="dialog_apply_remote_provisioning_button">Apply</string>
-    <string name="dialog_authentication_required_title">Authentication needed</string>
-    <string name="dialog_authentication_required_message">Connection failed because authentication is missing or invalid for account \n%s.\n\nYou can provide password again, or check your account configuration in the settings.</string>
-    <string name="dialog_authentication_required_change_password_label">Confirm</string>
-
-    <string name="android_14_full_screen_intent_permission_not_granted">Permission required to show incoming calls not granted yet</string>
-    <string name="android_14_go_to_full_screen_intent_permission_setting">Show</string>
-
-    <!-- Content description -->
-    <string name="content_description_add_sip_address_field">Add a SIP address field</string>
-    <string name="content_description_add_phone_number_field">Add a phone number field</string>
-    <string name="content_description_go_back">Go back</string>
-    <string name="content_description_phone_number_use">Show what your phone number will be used for</string>
-    <string name="content_description_clear_field">Empty the text field next to it</string>
-    <string name="content_description_switch_camera">Switch from front camera to back and vice versa</string>
-    <string name="content_description_pause_call">Pause the call</string>
-    <string name="content_description_toggle_recording">Enable or disable the recording of the call</string>
-    <string name="content_description_terminate_call">Terminate the call</string>
-    <string name="content_description_answer_call">Answer the call</string>
-    <string name="content_description_enable_mic_mute">Mute your microphone</string>
-    <string name="content_description_disable_mic_mute">Un-mute your microphone</string>
-    <string name="content_description_enable_speaker">Route audio to the speaker</string>
-    <string name="content_description_disable_speaker">Route audio to the earpiece</string>
-    <string name="content_description_go_back_to_call">Go back to the call view</string>
-    <string name="content_description_enable_video">Enable video in call</string>
-    <string name="content_description_disable_video">Disable video in call</string>
-    <string name="content_description_toggle_audio_menu">Show or hide audio output menu</string>
-    <string name="content_description_use_bluetooth_headset">Use bluetooth headset as audio output</string>
-    <string name="content_description_use_earpiece">Use earpiece as audio output</string>
-    <string name="content_description_use_speaker">Use speaker as audio output</string>
-    <string name="content_description_add_call">Start a new call</string>
-    <string name="content_description_transfer_call">Transfer current call to someone else</string>
-    <string name="content_description_pending_file_transfer">Pending file transfer</string>
-    <string name="content_description_remove_pending_file_transfer">Remove pending file transfer</string>
-    <string name="content_description_downloaded_file_transfer">Attached file</string>
-    <string name="content_description_delivery_status">Message delivery status</string>
-    <string name="content_description_forward_message">Forward message in this conversation</string>
-    <string name="content_description_ephemeral_message">Message is ephemeral</string>
-    <string name="content_description_linphone_user">Contact is a &appName; user</string>
-    <string name="content_description_contact_selected">Contact is selected</string>
-    <string name="content_description_e2e_encryption_disabled">End to end encryption disabled</string>
-    <string name="content_description_e2e_encryption_enabled">End to end encryption enabled</string>
-    <string name="content_description_show_all_contacts">Show a list of all contacts</string>
-    <string name="content_description_show_sip_contacts">Show a list with only SIP contacts</string>
-    <string name="content_description_continue_chat_room_creation">Go to chat room creation final step</string>
-    <string name="content_description_remove_contact_from_selection">Remove contact from selection</string>
-    <string name="content_description_start_call">Start a call</string>
-    <string name="content_description_show_chat_room_menu">Show chat room menu</string>
-    <string name="content_description_enter_edition_mode">Enter edition mode</string>
-    <string name="content_description_attach_file">Attach a file to the message</string>
-    <string name="content_description_send_message">Send message</string>
-    <string name="content_description_toggle_participant_devices_list">Show or hide the participant devices</string>
-    <string name="content_description_ephemeral_duration_selected">Ephemeral duration selected</string>
-    <string name="content_description_ephemeral_duration_change">Change ephemeral duration by selected value</string>
-    <string name="content_description_create_chat_room">Create chat room</string>
-    <string name="content_description_add_participants">Add participants</string>
-    <string name="content_description_remove_contact_from_chat_room">Remove contact from conversation</string>
-    <string name="content_description_contact_is_admin">Contact is an admin in this conversation</string>
-    <string name="content_description_contact_is_not_admin">Contact isn\'t an admin in this conversation</string>
-    <string name="content_description_contact_is_speaker">Contact is a speaker</string>
-    <string name="content_description_ephemeral_chat_room">Messages are ephemeral in this conversation</string>
-    <string name="content_description_muted_chat_room">Notifications are disabled for this conversation</string>
-    <string name="content_description_contact_can_do_encryption">Contact can be invited in encrypted conversations</string>
-    <string name="content_description_start_chat">Go into conversation</string>
-    <string name="content_description_start_encrypted_chat">Go into encrypted conversation</string>
-    <string name="content_description_edit_contact">Edit contact</string>
-    <string name="content_description_delete_contact">Delete contact</string>
-    <string name="content_description_discard_changes">Discard changes</string>
-    <string name="content_description_confirm_contact_edit">Save changes</string>
-    <string name="content_description_change_contact_picture">Change contact picture</string>
-    <string name="content_description_change_own_picture">Change own picture</string>
-    <string name="content_description_show_call_details">Go to call details</string>
-    <string name="content_description_exit_edition_mode">Quit edition mode</string>
-    <string name="content_description_select_all">Select all items in list</string>
-    <string name="content_description_unselect_all">Unselect all items in list</string>
-    <string name="content_description_delete_selection">Delete selected items in list</string>
-    <string name="content_description_numpad_1">1</string>
-    <string name="content_description_numpad_2">2</string>
-    <string name="content_description_numpad_3">3</string>
-    <string name="content_description_numpad_4">4</string>
-    <string name="content_description_numpad_5">5</string>
-    <string name="content_description_numpad_6">6</string>
-    <string name="content_description_numpad_7">7</string>
-    <string name="content_description_numpad_8">8</string>
-    <string name="content_description_numpad_9">9</string>
-    <string name="content_description_numpad_0">0</string>
-    <string name="content_description_numpad_star">*</string>
-    <string name="content_description_numpad_sharp">#</string>
-    <string name="content_description_recording_toggle_play">Play or pause recording</string>
-    <string name="content_description_voice_mail">Voice mail</string>
-    <string name="content_description_toggle_side_menu">Show or hide side menu</string>
-    <string name="content_description_menu_history">Call history</string>
-    <string name="content_description_menu_contacts">Contacts</string>
-    <string name="content_description_menu_dialer">Dialer</string>
-    <string name="content_description_menu_chat">Conversations</string>
-    <string name="content_description_dialer_erase">Remove last character</string>
-    <string name="content_description_add_contact">Create contact</string>
-    <string name="content_description_go_to_contact">Go to contact details</string>
-    <string name="content_description_show_all_calls">Show all calls</string>
-    <string name="content_description_show_missed_calls">Only show missed calls</string>
-    <string name="content_description_missed_call">Missed call</string>
-    <string name="content_description_incoming_call">Incoming call</string>
-    <string name="content_description_outgoing_call">Outgoing call</string>
-    <string name="content_description_create_one_to_one_chat_room">Create a one-to-one conversation</string>
-    <string name="content_description_create_group_chat_room">Create a group conversation</string>
-    <string name="content_description_security_level_unsafe">Unsafe</string>
-    <string name="content_description_security_level_safe">Safe</string>
-    <string name="content_description_security_level_encrypted">Encrypted</string>
-    <string name="content_description_call_quality_0">Very low call quality</string>
-    <string name="content_description_call_quality_1">Low call quality</string>
-    <string name="content_description_call_quality_2">Medium call quality</string>
-    <string name="content_description_call_quality_3">Good call quality</string>
-    <string name="content_description_call_quality_4">Maximum call quality</string>
-    <string name="content_description_call_not_secured">Call is not secured</string>
-    <string name="content_description_call_secured">Call is secured</string>
-    <string name="content_description_call_security_pending">Call security is pending</string>
-    <string name="content_description_chat_message_video_attachment">Video attachment</string>
-    <string name="content_description_chat_message_meeting_attachment">Meeting attachment</string>
-    <string name="content_description_take_screenshot">Take a screenshot of received video</string>
-    <string name="content_description_close_bubble">Close notification bubble</string>
-    <string name="content_description_open_app">Open conversation in app instead of bubble</string>
-    <string name="content_description_export">Open file in third-party app</string>
-    <string name="content_description_cancel_forward">Cancel message forward</string>
-    <string name="content_description_cancel_sharing">Cancel sharing</string>
-    <string name="content_description_cancel_reply">Cancel reply</string>
-    <string name="content_description_voice_recording">Record a voice message</string>
-    <string name="content_description_stop_voice_recording">Stop voice recording</string>
-    <string name="content_description_cancel_voice_recording">Cancel voice recording</string>
-    <string name="content_description_pause_voice_recording_playback">Pause voice recording</string>
-    <string name="content_description_play_voice_recording">Play voice recording</string>
-    <string name="content_descripton_scroll_to_bottom">Scroll to bottom or first unread message</string>
-    <string name="content_description_call_context_menu">Open call context menu</string>
-    <string name="content_description_create_conference">Create a meeting call</string>
-    <string name="content_description_copy_conference_address">Copy meeting address</string>
-    <string name="content_description_edit_conference">Edit meeting</string>
-    <string name="content_description_delete_conference">Delete meeting</string>
-    <string name="content_description_encrypted_conference">Meeting will be encrypted</string>
-    <string name="content_description_share_ics">Export event to calendar</string>
-    <string name="content_description_hide_statistics">Hide call statistics</string>
-    <string name="content_description_show_numpad">Show numpad</string>
-    <string name="content_description_hide_numpad">Hide numpad</string>
-    <string name="content_description_go_to_chat_rooms_list">Go to conversations list</string>
-    <string name="content_description_conference_participant_mic_muted">Participant has it\'s microphone muted</string>
-    <string name="content_description_toggle_layout_menu">Show or hide group call layout menu</string>
-    <string name="content_description_participant_is_paused">Participant has momentarily left the group call</string>
-    <string name="content_description_toggle_conference_info_details">Toggle meeting information details visibility</string>
-    <string name="content_description_conference_participants">Group call participants</string>
-    <string name="content_description_recording_export">Export recording</string>
-    <string name="content_description_presence_online">User is online</string>
-    <string name="content_description_presence_offline">User is offline</string>
-    <string name="content_description_presence_do_not_disturb">User is asking not to be disturbed</string>
-    <string name="content_description_emoji_picker">Toggle emoji picker visibility</string>
-</resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
deleted file mode 100644
index 3de16f3fc..000000000
--- a/app/src/main/res/values/styles.xml
+++ /dev/null
@@ -1,509 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-    <style name="AppSplashScreenTheme" parent="Theme.SplashScreen">
-        <item name="windowSplashScreenBackground">@color/dark_grey_color</item>
-        <item name="windowSplashScreenAnimatedIcon">@drawable/vector_linphone_logo</item>
-        <item name="postSplashScreenTheme">@style/AppTheme</item>
-    </style>
-
-    <!-- Base application theme. -->
-    <style name="BaseAppTheme" parent="Theme.MaterialComponents.DayNight.NoActionBar">
-        <!-- Disable animations between activities -->
-        <item name="android:windowAnimationStyle">@null</item>
-        <item name="android:windowBackground">@color/transparent_color</item>
-
-        <!-- Android theme override -->
-        <item name="android:scrollbarThumbVertical">@color/light_grey_color</item>
-        <item name="colorAccent">@color/primary_color</item>
-        <item name="colorPrimary">@color/primary_color</item>
-        <item name="android:colorPrimary">@color/primary_color</item>
-        <!-- Comment out the following line to disable system's status bar coloring -->
-        <item name="android:colorPrimaryDark">@color/primary_dark_color</item>
-        <item name="android:navigationBarColor">@color/voip_dark_color</item>
-
-        <item name="android:textColorPrimary">@color/light_primary_text_color</item>
-        <item name="android:textColorSecondary">@color/grey_color</item>
-        <item name="android:textColorHint">@color/light_grey_color</item>
-        <item name="android:textColorPrimaryInverse">@color/white_color</item>
-
-        <item name="accentColor">@color/primary_color</item>
-        <item name="accentColorLight30">@color/primary_light_color</item>
-        <item name="accentTextColor">@color/white_color</item>
-        <item name="primaryTextColor">@color/light_primary_text_color</item>
-        <item name="secondaryTextColor">@color/white_color</item>
-        <item name="primarySubtextDarkColor">@color/grey_color</item>
-        <item name="primarySubtextLightColor">@color/light_grey_color</item>
-
-        <item name="backgroundColor">@color/white_color</item>
-        <item name="backgroundColor2">@color/header_background_color</item>
-        <item name="backgroundColor3">@color/voip_light_gray</item>
-        <item name="backgroundColor4">@color/header_background_color</item>
-        <item name="backgroundContrastColor">@color/dark_grey_color</item>
-        <item name="dividerColor">@color/light_grey_color</item>
-
-        <item name="drawableTintColor">@color/dark_grey_color</item>
-        <item name="drawableBackgroundColor">@color/chat_bubble_file_background_color</item>
-        <item name="drawableTintDisabledColor">@color/disabled_color</item>
-        <item name="drawableTintOverColor">@color/primary_color</item>
-        <item name="drawableTintColor2">@color/white_color</item>
-        <item name="drawableTintColor3">@color/light_grey_color</item>
-
-        <item name="lightToolbarBackgroundColor">@color/toolbar_color</item>
-        <item name="lightToolbarTextColor">@color/dark_grey_color</item>
-        <item name="darkToolbarBackgroundColor">@color/dark_grey_color</item>
-        <item name="darkToolbarTextColor">@color/white_color</item>
-
-        <item name="button_background_drawable">@drawable/button_background_light</item>
-
-        <item name="voipBackgroundColor">@color/voip_gray_blue_color</item>
-        <item name="voipBackgroundBWColor">@color/white_color</item>
-        <item name="voipParticipantBackgroundColor">@color/voip_gray_background</item>
-        <item name="voipMeParticipantBackgroundColor">@color/voip_dark_color3</item>
-        <item name="voipExtraButtonsBackgroundColor">@color/voip_gray</item>
-        <item name="voipToolbarBackgroundColor">@color/toolbar_color</item>
-        <item name="voipDrawableColor">@color/voip_dark_gray</item>
-        <item name="voipDrawableColor2">@color/white_color</item>
-        <item name="voipDrawablePressedColor">@color/voip_dark_gray</item>
-        <item name="voipDrawableDisabledColor">@color/light_grey_color</item>
-        <item name="voipTextColor">@color/voip_dark_gray</item>
-        <item name="voipTextColor2">@color/voip_dark_gray</item>
-        <item name="voipFormBackgroundColor">@color/form_field_gray_background</item>
-        <item name="voipFormFieldBackgroundColor">@color/light_grey_color</item>
-        <item name="voipFormDisabledFieldBackgroundColor">@color/header_background_color</item>
-        <item name="voipCancelledMeetingBackgroundColor">@color/voip_conference_cancelled_bg_color_light</item>
-    </style>
-
-    <style name="AppTheme" parent="BaseAppTheme" />
-
-    <!-- Numpad -->
-
-    <style name="numpad_digit" parent="@android:style/TextAppearance.Medium">
-        <item name="android:textColor">@android:color/transparent</item>
-        <item name="android:layout_width">wrap_content</item>
-        <item name="android:layout_height">wrap_content</item>
-        <item name="layout_maxWidth">50dp</item>
-        <item name="layout_maxHeight">50dp</item>
-    </style>
-
-    <style name="call_numpad_digit" parent="@android:style/TextAppearance.Medium">
-        <item name="android:textColor">@android:color/transparent</item>
-        <item name="android:layout_width">0dp</item>
-        <item name="android:layout_height">0dp</item>
-        <item name="android:layout_margin">5dp</item>
-        <item name="android:padding">15dp</item>
-        <item name="android:background">@drawable/button_call_numpad_background</item>
-    </style>
-
-    <!-- Assistant related -->
-
-    <style name="assistant_input_field_header_font" parent="@android:style/TextAppearance.Medium">
-        <item name="android:textColor">?attr/primaryTextColor</item>
-        <item name="android:textSize">13sp</item>
-    </style>
-
-    <style name="assistant_country_dialog_style" parent="Base.Theme.AppCompat.Dialog">
-        <item name="colorPrimary">@color/primary_color</item>
-        <item name="android:textColorPrimary">@color/light_primary_text_color</item>
-        <item name="android:windowMinWidthMajor">97%</item>
-        <item name="android:windowMinWidthMinor">97%</item>
-    </style>
-
-    <!-- About related -->
-
-    <style name="about_license_font" parent="@android:style/TextAppearance.Medium">
-        <item name="android:textColor">?attr/primaryTextColor</item>
-        <item name="android:textSize">18sp</item>
-        <item name="android:textStyle">italic</item>
-    </style>
-
-    <style name="about_version_font" parent="@android:style/TextAppearance.Small">
-        <item name="android:textColor">@color/light_grey_color</item>
-        <item name="android:textSize">16sp</item>
-    </style>
-
-    <!-- Conference scheduling related -->
-
-    <style name="conference_scheduling_address_font" parent="@android:style/TextAppearance.Medium">
-        <item name="android:textColor">@color/voip_conf_address_text_color</item>
-        <item name="android:textSize">16sp</item>
-    </style>
-
-    <style name="conference_scheduling_font" parent="@android:style/TextAppearance.Medium">
-        <item name="android:textColor">?attr/voipTextColor</item>
-        <item name="android:textSize">16sp</item>
-    </style>
-
-    <style name="conference_scheduling_font_alt" parent="@android:style/TextAppearance.Medium">
-        <item name="android:textColor">?attr/voipTextColor2</item>
-        <item name="android:textSize">16sp</item>
-    </style>
-
-    <style name="conference_scheduling_participant_sip_uri_font" parent="@android:style/TextAppearance.Medium">
-        <item name="android:textColor">?attr/accentColor</item>
-        <item name="android:textSize">14sp</item>
-    </style>
-
-    <style name="conference_invite_title_font" parent="@android:style/TextAppearance.Medium">
-        <item name="android:textColor">?attr/lightToolbarTextColor</item>
-        <item name="android:textStyle">bold</item>
-        <item name="android:textSize">16sp</item>
-    </style>
-
-    <style name="conference_update_title_font" parent="@android:style/TextAppearance.Medium">
-        <item name="android:textColor">@color/voip_conference_updated_color</item>
-        <item name="android:textStyle">bold</item>
-        <item name="android:textSize">16sp</item>
-    </style>
-
-    <style name="conference_cancel_title_font" parent="@android:style/TextAppearance.Medium">
-        <item name="android:textColor">@color/voip_conference_cancelled_title_color</item>
-        <item name="android:textStyle">bold</item>
-        <item name="android:textSize">16sp</item>
-    </style>
-
-    <style name="conference_invite_subject_font" parent="@android:style/TextAppearance.Medium">
-        <item name="android:textColor">?attr/voipTextColor2</item>
-        <item name="android:textSize">16sp</item>
-        <item name="android:textStyle">bold</item>
-    </style>
-
-    <style name="conference_invite_desc_title_font" parent="@android:style/TextAppearance.Medium">
-        <item name="android:textColor">?attr/lightToolbarTextColor</item>
-        <item name="android:textSize">16sp</item>
-    </style>
-
-    <style name="conference_invite_desc_font" parent="@android:style/TextAppearance.Medium">
-        <item name="android:textColor">?attr/lightToolbarTextColor</item>
-        <item name="android:textSize">14sp</item>
-    </style>
-
-    <style name="conference_invite_dat_time_font" parent="@android:style/TextAppearance.Small">
-        <item name="android:textColor">?attr/lightToolbarTextColor</item>
-        <item name="android:textSize">13sp</item>
-    </style>
-
-    <style name="conference_invite_join_font" parent="@android:style/TextAppearance.Medium">
-        <item name="android:textColor">@color/white_color</item>
-        <item name="android:textAllCaps">true</item>
-        <item name="android:textSize">18sp</item>
-    </style>
-
-    <style name="conference_waiting_room_no_video_font" parent="@android:style/TextAppearance.Medium">
-        <item name="android:textColor">@color/white_color</item>
-        <item name="android:textSize">16sp</item>
-    </style>
-
-    <style name="conference_waiting_room_subject_font" parent="@android:style/TextAppearance.Large">
-        <item name="android:textColor">@color/white_color</item>
-        <item name="android:textSize">20sp</item>
-    </style>
-
-    <!-- Call related -->
-
-    <style name="call_remote_name_font" parent="@android:style/TextAppearance.Medium">
-        <item name="android:textColor">@color/white_color</item>
-        <item name="android:textSize">18sp</item>
-        <item name="android:singleLine">true</item>
-        <item name="android:ellipsize">end</item>
-        <item name="autoSizeTextType">uniform</item>
-        <item name="autoSizeMinTextSize">12sp</item>
-        <item name="autoSizeMaxTextSize">18sp</item>
-        <item name="autoSizeStepGranularity">@dimen/settings_granularity_step</item>
-    </style>
-
-    <style name="call_remote_name_small_font" parent="@android:style/TextAppearance.Medium">
-        <item name="android:textColor">@color/white_color</item>
-        <item name="android:textSize">16sp</item>
-        <item name="autoSizeTextType">uniform</item>
-        <item name="autoSizeMinTextSize">12sp</item>
-        <item name="autoSizeMaxTextSize">16sp</item>
-        <item name="autoSizeStepGranularity">@dimen/settings_granularity_step</item>
-    </style>
-
-    <style name="call_options_font" parent="@android:style/TextAppearance.Medium">
-        <item name="android:textColor">@color/voip_extra_button_text_color</item>
-        <item name="android:textSize">12sp</item>
-    </style>
-
-    <style name="calls_list_header_font" parent="@android:style/TextAppearance.Large">
-        <item name="android:textColor">?attr/voipTextColor</item>
-        <item name="android:textSize">20sp</item>
-    </style>
-
-    <style name="call_list_active_name_font" parent="@android:style/TextAppearance.Medium">
-        <item name="android:textColor">@color/white_color</item>
-        <item name="android:textSize">18sp</item>
-    </style>
-
-    <style name="call_list_name_font" parent="@android:style/TextAppearance.Medium">
-        <item name="android:textColor">?attr/voipTextColor</item>
-        <item name="android:textSize">18sp</item>
-    </style>
-
-    <style name="call_list_active_sip_uri_font" parent="@android:style/TextAppearance.Medium">
-        <item name="android:textColor">@color/white_color</item>
-        <item name="android:textSize">12sp</item>
-    </style>
-
-    <style name="call_list_sip_uri_font" parent="@android:style/TextAppearance.Medium">
-        <item name="android:textColor">?attr/voipTextColor</item>
-        <item name="android:textSize">12sp</item>
-    </style>
-
-    <style name="call_context_menu_item_font" parent="@android:style/TextAppearance.Medium">
-        <item name="android:textColor">@color/white_color</item>
-        <item name="android:textSize">16sp</item>
-        <item name="android:gravity">center_vertical</item>
-        <item name="android:textAllCaps">true</item>
-        <item name="android:paddingLeft">20dp</item>
-        <item name="android:paddingRight">20dp</item>
-    </style>
-
-    <style name="conference_paused_title_font" parent="@android:style/TextAppearance.Medium">
-        <item name="android:textColor">@color/white_color</item>
-        <item name="android:textSize">30sp</item>
-        <item name="android:textStyle">bold</item>
-    </style>
-
-    <style name="conference_paused_subtitle_font" parent="@android:style/TextAppearance.Medium">
-        <item name="android:textColor">@color/white_color</item>
-        <item name="android:textSize">20sp</item>
-    </style>
-
-    <style name="call_header_title" parent="@android:style/TextAppearance.Medium">
-        <item name="android:textColor">@color/white_color</item>
-        <item name="android:textSize">18sp</item>
-    </style>
-
-    <style name="call_header_subtitle" parent="@android:style/TextAppearance.Medium">
-        <item name="android:textColor">@color/white_color</item>
-        <item name="android:textSize">14sp</item>
-    </style>
-
-    <style name="call_remote_recording_font" parent="@android:style/TextAppearance.Medium">
-        <item name="android:textColor">@color/white_color</item>
-        <item name="android:textSize">16sp</item>
-    </style>
-
-    <style name="call_stats_title_font" parent="@android:style/TextAppearance.Medium">
-        <item name="android:textColor">@color/white_color</item>
-        <item name="android:textSize">18sp</item>
-    </style>
-
-    <style name="call_stats_font" parent="@android:style/TextAppearance.Medium">
-        <item name="android:textColor">@color/white_color</item>
-        <item name="android:textSize">12sp</item>
-    </style>
-
-    <style name="call_dtmf_history_font" parent="@android:style/TextAppearance.Medium">
-        <item name="android:textColor">@color/white_color</item>
-        <item name="android:textSize">35sp</item>
-    </style>
-
-    <!-- Contact related -->
-
-    <style name="contact_organization_font" parent="@android:style/TextAppearance.Small">
-        <item name="android:textColor">?attr/primaryTextColor</item>
-        <item name="android:textSize">13sp</item>
-    </style>
-
-    <style name="contact_name_list_cell_font" parent="@android:style/TextAppearance.Medium">
-        <item name="android:textColor">?attr/primaryTextColor</item>
-        <item name="android:textSize">18sp</item>
-    </style>
-
-    <style name="big_contact_name_font" parent="@android:style/TextAppearance.Medium">
-        <item name="android:textColor">?attr/primaryTextColor</item>
-        <item name="android:textSize">30sp</item>
-    </style>
-
-    <style name="contact_edit_form_label_font" parent="@android:style/TextAppearance.Medium">
-        <item name="android:textColor">@color/light_grey_color</item>
-        <item name="android:textSize">13sp</item>
-    </style>
-
-    <!-- Chat related -->
-
-    <style name="chat_room_last_updated_time_font" parent="@android:style/TextAppearance.Medium">
-        <item name="android:textColor">@color/primary_color</item>
-        <item name="android:textSize">16sp</item>
-        <item name="autoSizeTextType">uniform</item>
-        <item name="autoSizeMinTextSize">8sp</item>
-        <item name="autoSizeMaxTextSize">16sp</item>
-        <item name="autoSizeStepGranularity">@dimen/settings_granularity_step</item>
-    </style>
-
-    <style name="chat_message_reply_sender_font">
-        <item name="android:textColor">@color/light_primary_text_color</item>
-        <item name="android:textSize">13sp</item>
-        <item name="android:fontFamily">sans-serif-medium</item>
-    </style>
-
-    <style name="chat_message_reply_font">
-        <item name="android:textColor">@color/light_primary_text_color</item>
-        <item name="android:textSize">15sp</item>
-        <item name="android:fontFamily">sans-serif</item>
-    </style>
-
-    <style name="chat_message_reply_forward_indicator_font">
-        <item name="android:textColor">@color/chat_bubble_text_color</item>
-        <item name="android:textSize">10sp</item>
-        <item name="android:textStyle">normal</item>
-        <item name="android:lineSpacingExtra">3.3sp</item>
-        <item name="android:fontFamily">sans-serif</item>
-    </style>
-
-    <style name="chat_message_emoji_reaction_font">
-        <item name="android:textSize">@dimen/chat_message_emoji_reaction_font_size</item>
-        <item name="android:textColor">?attr/primaryTextColor</item>
-    </style>
-
-    <!-- Dialog related -->
-
-    <style name="dialog_title_font" parent="@android:style/TextAppearance.Medium">
-        <item name="android:textColor">@color/white_color</item>
-        <item name="android:textSize">20sp</item>
-        <item name="android:textStyle">bold</item>
-        <item name="android:fontFamily">sans-serif</item>
-        <item name="android:lineSpacingExtra">6.7sp</item>
-    </style>
-
-    <style name="dialog_message_font" parent="@android:style/TextAppearance.Small">
-        <item name="android:textColor">@color/white_color</item>
-        <item name="android:textSize">18sp</item>
-    </style>
-
-    <style name="dialog_cancel_button_font" parent="@android:style/TextAppearance.Medium">
-        <item name="android:textColor">@color/dark_grey_color</item>
-        <item name="android:textAllCaps">true</item>
-        <item name="android:textSize">16sp</item>
-    </style>
-
-    <style name="dialog_action_button_font" parent="@android:style/TextAppearance.Medium">
-        <item name="android:textColor">@color/white_color</item>
-        <item name="android:textAllCaps">true</item>
-        <item name="android:textSize">16sp</item>
-    </style>
-
-    <style name="dialog_zrtp_colored_font" parent="@android:style/TextAppearance.Medium">
-        <item name="android:textColor">@color/green_color</item>
-        <item name="android:textSize">20sp</item>
-        <item name="android:textStyle">bold</item>
-        <item name="android:fontFamily">sans-serif</item>
-        <item name="android:lineSpacingExtra">8.3sp</item>
-    </style>
-
-    <style name="dialog_zrtp_white_font" parent="@android:style/TextAppearance.Medium">
-        <item name="android:textColor">@color/white_color</item>
-        <item name="android:textSize">18sp</item>
-        <item name="android:fontFamily">sans-serif</item>
-        <item name="android:lineSpacingExtra">8.3sp</item>
-    </style>
-
-    <style name="popup_item_font" parent="@android:style/TextAppearance.Medium">
-        <item name="android:textColor">?attr/primaryTextColor</item>
-        <item name="android:textSize">16sp</item>
-        <item name="android:gravity">center_vertical</item>
-        <item name="android:paddingLeft">20dp</item>
-        <item name="android:paddingRight">20dp</item>
-    </style>
-
-    <!-- Settings -->
-
-    <style name="settings_category_font" parent="@android:style/TextAppearance.Medium">
-        <item name="android:textColor">?attr/accentColor</item>
-        <item name="android:textAllCaps">true</item>
-        <item name="android:textStyle">bold</item>
-        <item name="android:textSize">12sp</item>
-    </style>
-
-    <style name="settings_item_font" parent="@android:style/TextAppearance.Medium">
-        <item name="android:textColor">?attr/primaryTextColor</item>
-        <item name="android:textSize">18sp</item>
-    </style>
-
-    <style name="settings_item_subtitle_font" parent="@android:style/TextAppearance.Medium">
-        <item name="android:textColor">?attr/primarySubtextLightColor</item>
-        <item name="android:textSize">12sp</item>
-    </style>
-
-    <!-- UI various fonts -->
-
-    <style name="chat_last_seen_at_font" parent="@android:style/TextAppearance.Medium">
-        <item name="android:textColor">?attr/primaryTextColor</item>
-        <item name="android:textSize">12sp</item>
-    </style>
-
-    <style name="accent_colored_title_font" parent="@android:style/TextAppearance.Medium">
-        <item name="android:textColor">?attr/accentColor</item>
-        <item name="android:textAllCaps">true</item>
-        <item name="android:textStyle">bold</item>
-        <item name="android:textSize">24sp</item>
-    </style>
-
-    <style name="sip_uri_font" parent="@android:style/TextAppearance.Medium">
-        <item name="android:textColor">?attr/accentColor</item>
-        <item name="android:textSize">14sp</item>
-    </style>
-
-    <style name="sip_uri_small_font" parent="@android:style/TextAppearance.Medium">
-        <item name="android:textColor">?attr/accentColor</item>
-        <item name="android:textSize">12sp</item>
-    </style>
-
-    <style name="toolbar_small_title_font" parent="@android:style/TextAppearance.Medium">
-        <item name="android:textColor">?attr/primaryTextColor</item>
-        <item name="android:textSize">18sp</item>
-    </style>
-
-    <style name="empty_list_font" parent="@android:style/TextAppearance.Medium">
-        <item name="android:textColor">?attr/primaryTextColor</item>
-        <item name="android:textSize">18sp</item>
-    </style>
-
-    <style name="chat_file_attachment_font" parent="@android:style/TextAppearance.Medium">
-        <item name="android:textColor">?attr/primaryTextColor</item>
-        <item name="android:textSize">12sp</item>
-        <item name="android:fontFamily">sans-serif</item>
-    </style>
-
-    <style name="standard_text_font" parent="@android:style/TextAppearance.Medium">
-        <item name="android:textColor">?attr/primaryTextColor</item>
-        <item name="android:textSize">18sp</item>
-    </style>
-
-    <style name="button_font" parent="@android:style/TextAppearance.Medium">
-        <item name="android:textColor">?attr/primaryTextColor</item>
-        <item name="android:textAllCaps">true</item>
-        <item name="android:textSize">16sp</item>
-    </style>
-
-    <style name="standard_small_text_font" parent="@android:style/TextAppearance.Medium">
-        <item name="android:textColor">?attr/primarySubtextDarkColor</item>
-        <item name="android:textSize">15sp</item>
-    </style>
-
-    <style name="unread_count_font" parent="@android:style/TextAppearance.Small">
-        <item name="android:textColor">@color/white_color</item>
-        <item name="android:textSize">10sp</item>
-    </style>
-
-    <style name="file_transfer_progress_font" parent="@android:style/TextAppearance.Medium">
-        <item name="android:textColor">?attr/accentTextColor</item>
-        <item name="android:textSize">12sp</item>
-    </style>
-
-    <style name="big_orange_button_bold_font" parent="@android:style/TextAppearance.Large">
-        <item name="android:textColor">@color/white_color</item>
-        <item name="android:textAllCaps">true</item>
-        <item name="android:textSize">15sp</item>
-        <item name="android:textStyle">bold</item>
-    </style>
-
-    <style name="big_orange_button_font" parent="@android:style/TextAppearance.Large">
-        <item name="android:textColor">@color/white_color</item>
-        <item name="android:textAllCaps">true</item>
-        <item name="android:textSize">15sp</item>
-        <item name="android:textStyle">bold</item>
-    </style>
-</resources>
diff --git a/app/src/main/res/xml/authenticator.xml b/app/src/main/res/xml/authenticator.xml
deleted file mode 100644
index 2680ec3e5..000000000
--- a/app/src/main/res/xml/authenticator.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<account-authenticator xmlns:android="http://schemas.android.com/apk/res/android"
-    android:accountType="@string/sync_account_type"
-    android:icon="@mipmap/ic_launcher_round"
-    android:smallIcon="@mipmap/ic_launcher_round"
-    android:label="@string/app_name" />
\ No newline at end of file
diff --git a/app/src/main/res/xml/automotive_app_desc.xml b/app/src/main/res/xml/automotive_app_desc.xml
deleted file mode 100644
index 66dd335d1..000000000
--- a/app/src/main/res/xml/automotive_app_desc.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<automotiveApp>
-    <uses name="notification" />
-</automotiveApp>
diff --git a/app/src/main/res/xml/locales_config.xml b/app/src/main/res/xml/locales_config.xml
deleted file mode 100644
index 43cb1e034..000000000
--- a/app/src/main/res/xml/locales_config.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<locale-config xmlns:android="http://schemas.android.com/apk/res/android">
-    <locale android:name="bg"/>
-    <locale android:name="bn-rBD"/>
-    <locale android:name="cs"/>
-    <locale android:name="de"/>
-    <locale android:name="en"/>
-    <locale android:name="es"/>
-    <locale android:name="fi"/>
-    <locale android:name="fr"/>
-    <locale android:name="fr-CA"/>
-    <locale android:name="he"/>
-    <locale android:name="hu"/>
-    <locale android:name="it"/>
-    <locale android:name="ja"/>
-    <locale android:name="ka"/>
-    <locale android:name="nl"/>
-    <locale android:name="pl"/>
-    <locale android:name="pt"/>
-    <locale android:name="ru"/>
-    <locale android:name="ru-rUA"/>
-    <locale android:name="uk"/>
-    <locale android:name="zh-rCN"/>
-    <locale android:name="zh-rTW"/>
-</locale-config>
\ No newline at end of file
diff --git a/app/src/main/res/xml/motion_main_activity_tabs_selector.xml b/app/src/main/res/xml/motion_main_activity_tabs_selector.xml
deleted file mode 100644
index c782307de..000000000
--- a/app/src/main/res/xml/motion_main_activity_tabs_selector.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<MotionScene xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:motion="http://schemas.android.com/apk/res-auto">
-
-    <Transition
-        motion:constraintSetStart="@+id/dialer"
-        motion:constraintSetEnd="@+id/chat_rooms"/>
-
-    <Transition
-        motion:constraintSetStart="@+id/call_history"
-        motion:constraintSetEnd="@+id/contacts"/>
-
-    <Transition
-        motion:constraintSetStart="@+id/call_history"
-        motion:constraintSetEnd="@+id/dialer"/>
-
-    <Transition
-        motion:constraintSetStart="@+id/call_history"
-        motion:constraintSetEnd="@+id/chat_rooms"/>
-
-    <Transition
-        motion:constraintSetStart="@+id/contacts"
-        motion:constraintSetEnd="@+id/dialer"/>
-
-    <Transition
-        motion:constraintSetStart="@+id/contacts"
-        motion:constraintSetEnd="@+id/chat_rooms"/>
-
-    <ConstraintSet android:id="@+id/call_history">
-
-        <Constraint
-            android:id="@id/selector"
-            android:layout_height="@dimen/tabs_fragment_selector_size"
-            motion:layout_constraintBottom_toBottomOf="parent"
-            motion:layout_constraintLeft_toLeftOf="parent"
-            motion:layout_constraintRight_toLeftOf="@id/guidelineLeft" />
-
-    </ConstraintSet>
-
-    <ConstraintSet android:id="@+id/contacts">
-
-        <Constraint
-            android:id="@id/selector"
-            android:layout_height="@dimen/tabs_fragment_selector_size"
-            motion:layout_constraintBottom_toBottomOf="parent"
-            motion:layout_constraintLeft_toLeftOf="@id/guidelineLeft"
-            motion:layout_constraintRight_toLeftOf="@id/guidelineMiddle" />
-
-    </ConstraintSet>
-
-    <ConstraintSet android:id="@+id/dialer">
-
-        <Constraint
-            android:id="@id/selector"
-            android:layout_height="@dimen/tabs_fragment_selector_size"
-            motion:layout_constraintBottom_toBottomOf="parent"
-            motion:layout_constraintLeft_toLeftOf="@id/guidelineMiddle"
-            motion:layout_constraintRight_toLeftOf="@id/guidelineRight" />
-
-    </ConstraintSet>
-
-    <ConstraintSet android:id="@+id/chat_rooms">
-
-        <Constraint
-            android:id="@id/selector"
-            android:layout_height="@dimen/tabs_fragment_selector_size"
-            motion:layout_constraintBottom_toBottomOf="parent"
-            motion:layout_constraintLeft_toLeftOf="@id/guidelineRight"
-            motion:layout_constraintRight_toRightOf="parent" />
-
-    </ConstraintSet>
-
-</MotionScene>
diff --git a/app/src/main/res/xml/motion_main_activity_tabs_selector_land.xml b/app/src/main/res/xml/motion_main_activity_tabs_selector_land.xml
deleted file mode 100644
index 8f587ab09..000000000
--- a/app/src/main/res/xml/motion_main_activity_tabs_selector_land.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<MotionScene xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:motion="http://schemas.android.com/apk/res-auto">
-
-    <Transition
-        motion:constraintSetStart="@+id/dialer"
-        motion:constraintSetEnd="@+id/chat_rooms"/>
-
-    <Transition
-        motion:constraintSetStart="@+id/call_history"
-        motion:constraintSetEnd="@+id/contacts"/>
-
-    <Transition
-        motion:constraintSetStart="@+id/call_history"
-        motion:constraintSetEnd="@+id/dialer"/>
-
-    <Transition
-        motion:constraintSetStart="@+id/call_history"
-        motion:constraintSetEnd="@+id/chat_rooms"/>
-
-    <Transition
-        motion:constraintSetStart="@+id/contacts"
-        motion:constraintSetEnd="@+id/dialer"/>
-
-    <Transition
-        motion:constraintSetStart="@+id/contacts"
-        motion:constraintSetEnd="@+id/chat_rooms"/>
-
-    <ConstraintSet android:id="@+id/call_history">
-
-        <Constraint
-            android:id="@id/selector"
-            android:layout_width="@dimen/tabs_fragment_selector_size"
-            motion:layout_constraintLeft_toLeftOf="parent"
-            motion:layout_constraintTop_toTopOf="parent"
-            motion:layout_constraintBottom_toBottomOf="@id/guidelineTop" />
-
-    </ConstraintSet>
-
-    <ConstraintSet android:id="@+id/contacts">
-
-        <Constraint
-            android:id="@id/selector"
-            android:layout_width="@dimen/tabs_fragment_selector_size"
-            motion:layout_constraintLeft_toLeftOf="parent"
-            motion:layout_constraintTop_toTopOf="@id/guidelineTop"
-            motion:layout_constraintBottom_toBottomOf="@id/guidelineMiddle" />
-
-    </ConstraintSet>
-
-    <ConstraintSet android:id="@+id/dialer">
-
-        <Constraint
-            android:id="@id/selector"
-            android:layout_width="@dimen/tabs_fragment_selector_size"
-            motion:layout_constraintLeft_toLeftOf="parent"
-            motion:layout_constraintTop_toTopOf="@id/guidelineMiddle"
-            motion:layout_constraintBottom_toBottomOf="@id/guidelineBottom" />
-
-    </ConstraintSet>
-
-    <ConstraintSet android:id="@+id/chat_rooms">
-
-        <Constraint
-            android:id="@id/selector"
-            android:layout_width="@dimen/tabs_fragment_selector_size"
-            motion:layout_constraintLeft_toLeftOf="parent"
-            motion:layout_constraintTop_toTopOf="@id/guidelineBottom"
-            motion:layout_constraintBottom_toBottomOf="parent" />
-
-    </ConstraintSet>
-
-</MotionScene>
diff --git a/app/src/main/res/xml/provider_paths.xml b/app/src/main/res/xml/provider_paths.xml
deleted file mode 100644
index a40f5cad7..000000000
--- a/app/src/main/res/xml/provider_paths.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<paths>
-    <files-path name="internal_files" path="." />
-    <files-path name="internal_recordings" path="Download/" />
-    <external-files-path name="pictures" path="Pictures/" />
-    <external-files-path name="downloads" path="Download/" />
-    <external-files-path name="files" path="." />
-    <cache-path name="cache" path="."/>
-</paths>
\ No newline at end of file
diff --git a/app/src/main/res/xml/shortcuts.xml b/app/src/main/res/xml/shortcuts.xml
deleted file mode 100644
index e0cd5dad9..000000000
--- a/app/src/main/res/xml/shortcuts.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shortcuts xmlns:android="http://schemas.android.com/apk/res/android">
-    <share-target android:targetClass="org.linphone.activities.main.MainActivity">
-        <data android:mimeType="text/*" />
-        <data android:mimeType="image/*" />
-        <data android:mimeType="audio/*" />
-        <data android:mimeType="video/*" />
-        <category android:name="android.shortcut.conversation" />
-    </share-target>
-</shortcuts>
diff --git a/app/src/main/res/xml/sync_adapter.xml b/app/src/main/res/xml/sync_adapter.xml
deleted file mode 100644
index 2be6acf4d..000000000
--- a/app/src/main/res/xml/sync_adapter.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<sync-adapter xmlns:android="http://schemas.android.com/apk/res/android"
-    android:accountType="@string/sync_account_type"
-    android:contentAuthority="com.android.contacts"
-    android:supportsUploading="false"
-    android:userVisible="true"
-    android:allowParallelSyncs="false"
-    android:isAlwaysSyncable="false" />
diff --git a/build.gradle b/build.gradle
deleted file mode 100644
index 59157d871..000000000
--- a/build.gradle
+++ /dev/null
@@ -1,23 +0,0 @@
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
-
-buildscript {
-    repositories {
-        google()
-        maven {
-            url "https://plugins.gradle.org/m2/"
-        }
-        maven {
-            url "https://www.jitpack.io"
-        } // for com.github.chrisbanes:PhotoView
-    }
-    dependencies {
-        classpath 'com.android.tools.build:gradle:8.1.4'
-        classpath 'com.google.gms:google-services:4.3.15'
-        classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.21'
-        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.6'
-    }
-}
-
-task clean(type: Delete) {
-    delete rootProject.buildDir
-}
diff --git a/gradle.properties b/gradle.properties
deleted file mode 100644
index 6d3fe9034..000000000
--- a/gradle.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-# Project-wide Gradle settings.
-# IDE (e.g. Android Studio) users:
-# Gradle settings configured through the IDE *will override*
-# any settings specified in this file.
-# For more details on how to configure your build environment visit
-# http://www.gradle.org/docs/current/userguide/build_environment.html
-# Specifies the JVM arguments used for the daemon process.
-# The setting is particularly useful for tweaking memory settings.
-org.gradle.jvmargs=-Xmx8192m
-# When configured, Gradle will run in incubating parallel mode.
-# This option should only be used with decoupled projects. More details, visit
-# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
-# org.gradle.parallel=true
-# AndroidX package structure to make it clearer which packages are bundled with the
-# Android operating system, and which are packaged with your app's APK
-# https://developer.android.com/topic/libraries/support-library/androidx-rn
-android.useAndroidX=true
-# Kotlin code style for this project: "official" or "obsolete":
-kotlin.code.style=official
-LinphoneSdkBuildDir=
-android.defaults.buildfeatures.buildconfig=true
-android.nonTransitiveRClass=true
-android.nonFinalResIds=true
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
deleted file mode 100644
index 5c2d1cf01..000000000
Binary files a/gradle/wrapper/gradle-wrapper.jar and /dev/null differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
deleted file mode 100644
index 9b985ba37..000000000
--- a/gradle/wrapper/gradle-wrapper.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-#Thu Feb 03 11:43:32 CET 2022
-distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
-distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
deleted file mode 100755
index b0d6d0ab5..000000000
--- a/gradlew
+++ /dev/null
@@ -1,188 +0,0 @@
-#!/usr/bin/env sh
-
-#
-# Copyright 2015 the original author or authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-##############################################################################
-##
-##  Gradle start up script for UN*X
-##
-##############################################################################
-
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
-
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
-
-# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
-
-warn () {
-    echo "$*"
-}
-
-die () {
-    echo
-    echo "$*"
-    echo
-    exit 1
-}
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false
-msys=false
-darwin=false
-nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
-esac
-
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
-
-# Determine the Java command to use to start the JVM.
-if [ -n "$JAVA_HOME" ] ; then
-    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
-        # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
-    else
-        JAVACMD="$JAVA_HOME/bin/java"
-    fi
-    if [ ! -x "$JAVACMD" ] ; then
-        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-    fi
-else
-    JAVACMD="java"
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-fi
-
-# Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=$((i+1))
-    done
-    case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
-    esac
-fi
-
-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=$(save "$@")
-
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
-
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
-fi
-
-exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
deleted file mode 100644
index 15e1ee37a..000000000
--- a/gradlew.bat
+++ /dev/null
@@ -1,100 +0,0 @@
-@rem
-@rem Copyright 2015 the original author or authors.
-@rem
-@rem Licensed under the Apache License, Version 2.0 (the "License");
-@rem you may not use this file except in compliance with the License.
-@rem You may obtain a copy of the License at
-@rem
-@rem      http://www.apache.org/licenses/LICENSE-2.0
-@rem
-@rem Unless required by applicable law or agreed to in writing, software
-@rem distributed under the License is distributed on an "AS IS" BASIS,
-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@rem See the License for the specific language governing permissions and
-@rem limitations under the License.
-@rem
-
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto init
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
diff --git a/keystore.properties b/keystore.properties
deleted file mode 100644
index 999734166..000000000
--- a/keystore.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-storePassword=
-keyPassword=
-keyAlias=
-storeFile=bc-android.keystore
diff --git a/settings.gradle b/settings.gradle
deleted file mode 100644
index c60bbf4f7..000000000
--- a/settings.gradle
+++ /dev/null
@@ -1,29 +0,0 @@
-dependencyResolutionManagement {
-    repositoriesMode.set(RepositoriesMode.PREFER_SETTINGS)
-    repositories {
-        google()
-        maven { url "https://plugins.gradle.org/m2/" }
-        maven { url "https://www.jitpack.io" } // for com.github.chrisbanes:PhotoView
-
-        maven {
-            name "local linphone-sdk maven repository"
-            url file(LinphoneSdkBuildDir + '/maven_repository/')
-            content {
-                includeGroup "org.linphone"
-            }
-        }
-
-        maven {
-            name "linphone.org maven repository"
-            url "https://linphone.org/maven_repository"
-            content {
-                includeGroup "org.linphone"
-            }
-        }
-
-        // For "org.jlleitschuh.gradle:ktlint-gradle"
-        mavenCentral()
-    }
-}
-include ':app'
-rootProject.name='Linphone'