Merge branch 'develop' into feature/ons/device_manager_filter

# Conflicts:
#	library/ui-strings/src/main/res/values/strings.xml
#	vector/src/main/AndroidManifest.xml
#	vector/src/main/java/im/vector/app/core/di/MavericksViewModelModule.kt
#	vector/src/main/java/im/vector/app/features/settings/devices/v2/list/SessionsListHeaderView.kt
#	vector/src/main/res/layout/fragment_settings_devices.xml

changelog.d/6776.bugfix

@@ -0,0 +1 @@
+[App Layout] Recents carousel now scrolled to first position when new item added to or moved to this position

changelog.d/6779.misc

@@ -0,0 +1 @@
+[Modules] Lifts the application variants to the app module

changelog.d/7077.wip

@@ -0,0 +1 @@
+[Device management] Session details screen

changelog.d/7102.bugfix

@@ -0,0 +1 @@
+Fixes crash when quickly double clicking FABs in the new app layout

changelog.d/7103.bugfix

@@ -0,0 +1 @@
+Fixes space list and new chat bottom sheets showing too small in New App Layout (especially evident in landscape)

changelog.d/7121.wip

@@ -0,0 +1 @@
+Create DM room only on first message - Fix glitch in the room list

changelog.d/7122.bugfix

@@ -0,0 +1 @@
+[App Layout] Room leaving prompt dialog now waits user to confirm leaving before do so

changelog.d/7142.misc

@@ -0,0 +1 @@
+Pulling no longer hosted im.dlg:android-dialer directly into the repository and removing legacy support library usages

coverage.gradle

@@ -81,11 +81,11 @@ task generateCoverageReport(type: JacocoReport) {
 task unitTestsWithCoverage(type: GradleBuild) {
     // the 7.1.3 android gradle plugin has a bug where enableTestCoverage generates invalid coverage
     startParameter.projectProperties.coverage = [enableTestCoverage: false]
-    tasks = [':vector:testGplayDebugUnitTest', ':matrix-sdk-android:testDebugUnitTest']
+    tasks = ['testDebugUnitTest']
 }
 
 task instrumentationTestsWithCoverage(type: GradleBuild) {
     startParameter.projectProperties.coverage = [enableTestCoverage: true]
     startParameter.projectProperties['android.testInstrumentationRunnerArguments.notPackage'] = 'im.vector.app.ui'
-    tasks = [':vector-app:connectedGplayDebugAndroidTest', ':vector:connectedGplayDebugAndroidTest', 'matrix-sdk-android:connectedDebugAndroidTest']
+    tasks = [':vector-app:connectedGplayDebugAndroidTest', ':vector:connectedDebugAndroidTest', 'matrix-sdk-android:connectedDebugAndroidTest']
 }

dependencies.gradle

@@ -15,7 +15,7 @@ def gradle = "7.1.3"
 def kotlin = "1.6.21"
 def kotlinCoroutines = "1.6.4"
 def dagger = "2.42"
-def appDistribution = "16.0.0-beta03"
+def appDistribution = "16.0.0-beta04"
 def retrofit = "2.9.0"
 def arrow = "0.8.2"
 def markwon = "4.6.2"

gradle.properties

@@ -12,6 +12,7 @@ org.gradle.jvmargs=-Xmx4g -Xms512M -XX:MaxPermSize=2048m -XX:MaxMetaspaceSize=1g
 org.gradle.configureondemand=true
 org.gradle.parallel=true
 org.gradle.vfs.watch=true
+org.gradle.caching=true
 
 # Android Settings
 android.enableJetifier=true

library/ui-strings/src/main/res/values-ar/strings.xml

@@ -320,7 +320,7 @@
     <string name="settings_theme">السمة</string>
     <string name="encryption_information_decryption_error">خطأ في فكّ التعمية</string>
     <string name="encryption_information_device_name">اسم الجهاز</string>
-    <string name="encryption_information_device_id">معرّف الجهاز</string>
+    <string name="device_manager_session_details_session_id">معرّف الجهاز</string>
     <string name="encryption_information_device_key">مفتاح الجهاز</string>
     <string name="encryption_export_room_keys">صدّر مفاتيح الغرفة</string>
     <string name="encryption_export_room_keys_summary">صدّر المفاتيح إلى ملف محلي</string>

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

@@ -396,7 +396,7 @@
     <string name="settings_theme">Тема</string>
     <string name="encryption_information_decryption_error">Грешка при разшифроване</string>
     <string name="encryption_information_device_name">Публично име</string>
-    <string name="encryption_information_device_id">Сесийно ID</string>
+    <string name="device_manager_session_details_session_id">Сесийно ID</string>
     <string name="encryption_information_device_key">Ключ на устройство</string>
     <string name="encryption_export_e2e_room_keys">Експортирай E2E ключове за стая</string>
     <string name="encryption_export_room_keys">Експортиране на ключове за стая</string>

library/ui-strings/src/main/res/values-bn-rBD/strings.xml

@@ -789,7 +789,7 @@
     <string name="encryption_export_room_keys">রুমের কুঞ্জিগুলি এক্সপোর্ট করুন</string>
     <string name="encryption_export_e2e_room_keys">শেষ থেকে শেষ রুমের কুঞ্জিগুলি এক্সপোর্ট করুন</string>
     <string name="encryption_information_device_key">সেশানের কুঞ্জি</string>
-    <string name="encryption_information_device_id">আইডি</string>
+    <string name="device_manager_session_details_session_id">আইডি</string>
     <string name="encryption_information_device_name">সর্বজনীন নাম</string>
     <string name="encryption_information_decryption_error">ডিক্রিপশন সমস্যা</string>
     <string name="settings_theme">থিম</string>

library/ui-strings/src/main/res/values-bn-rIN/strings.xml

@@ -693,7 +693,7 @@
     <string name="encryption_information_decryption_error">ডিক্রিপশন সমস্যা</string>
 
     <string name="encryption_information_device_name">সর্বজনীন নাম</string>
-    <string name="encryption_information_device_id">আইডি</string>
+    <string name="device_manager_session_details_session_id">আইডি</string>
     <string name="encryption_information_device_key">সেশানের কুঞ্জি</string>
 
     <string name="encryption_export_e2e_room_keys">শেষ থেকে শেষ রুমের কুঞ্জিগুলি এক্সপোর্ট করুন</string>

library/ui-strings/src/main/res/values-ca/strings.xml

@@ -448,7 +448,7 @@
     <string name="settings_theme">Tema</string>
     <string name="encryption_information_decryption_error">Error al desxifrar</string>
     <string name="encryption_information_device_name">Nom públic</string>
-    <string name="encryption_information_device_id">ID de sessió</string>
+    <string name="device_manager_session_details_session_id">ID de sessió</string>
     <string name="encryption_information_device_key">Clau de sessió</string>
     <string name="encryption_export_e2e_room_keys">Exporta les claus de la sala E2E</string>
     <string name="encryption_export_room_keys">Exporta les claus de la sala</string>

library/ui-strings/src/main/res/values-cs/strings.xml

@@ -635,7 +635,7 @@
     <string name="settings_theme">Motiv vzhledu</string>
     <string name="encryption_information_decryption_error">Chyba dešifrování</string>
     <string name="encryption_information_device_name">Veřejné jméno</string>
-    <string name="encryption_information_device_id">ID relace</string>
+    <string name="device_manager_session_details_session_id">ID relace</string>
     <string name="encryption_information_device_key">Klíč relace</string>
     <string name="encryption_export_e2e_room_keys">Export E2E klíčů místností</string>
     <string name="encryption_export_room_keys">Export klíčů místností</string>

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

@@ -418,7 +418,7 @@
     <string name="room_settings_unset_main_address">Als Hauptadresse aufheben</string>
     <string name="encryption_information_decryption_error">Entschlüsselungsfehler</string>
     <string name="encryption_information_device_name">Öffentlicher Name</string>
-    <string name="encryption_information_device_id">Sitzungs-ID</string>
+    <string name="device_manager_session_details_session_id">Sitzungs-ID</string>
     <string name="encryption_information_device_key">Sitzungsschlüssel</string>
     <string name="encryption_export_e2e_room_keys">Ende-zu-Ende-Raumschlüssel exportieren</string>
     <string name="encryption_export_room_keys">Raumschlüssel exportieren</string>

library/ui-strings/src/main/res/values-el/strings.xml

@@ -172,7 +172,7 @@
     <string name="settings_theme">Θέμα</string>
     <string name="encryption_information_decryption_error">Σφάλμα αποκρυπτογράφησης</string>
     <string name="encryption_information_device_name">Όνομα συσκευής</string>
-    <string name="encryption_information_device_id">Αναγνωριστικό συσκευής</string>
+    <string name="device_manager_session_details_session_id">Αναγνωριστικό συσκευής</string>
     <string name="encryption_export_export">Εξαγωγή</string>
     <string name="encryption_import_import">Εισαγωγή</string>
     <string name="select_room_directory">Επιλέξτε ένα ευρετήριο δωματίων</string>

library/ui-strings/src/main/res/values-eo/strings.xml

@@ -1084,7 +1084,7 @@
     <string name="encryption_export_room_keys">Elporti ŝlosilojn de ĉambroj</string>
     <string name="encryption_export_e2e_room_keys">Elporti tutvoje ĉifrajn ŝlosilojn de ĉambroj</string>
     <string name="encryption_information_device_key">Ŝlosilo de salutaĵo</string>
-    <string name="encryption_information_device_id">Identigilo de salutaĵo</string>
+    <string name="device_manager_session_details_session_id">Identigilo de salutaĵo</string>
     <string name="encryption_information_device_name">Publika nomo</string>
     <string name="encryption_information_decryption_error">Eraris malĉifrado</string>
     <string name="settings_theme">Haŭto</string>

library/ui-strings/src/main/res/values-es-rMX/strings.xml

@@ -249,7 +249,7 @@
     <string name="room_settings_unset_main_address">Desescojer como Dirección Principal</string>
     <string name="encryption_information_decryption_error">Error en descifrar</string>
     <string name="encryption_information_device_name">Nombre del dispositivo</string>
-    <string name="encryption_information_device_id">Identificación del dispositivo</string>
+    <string name="device_manager_session_details_session_id">Identificación del dispositivo</string>
     <string name="encryption_information_device_key">Clave del dispositivo</string>
     <string name="encryption_export_e2e_room_keys">Exportar claves de cifrado de extremo-a-extremo de salas</string>
     <string name="encryption_export_room_keys">Exportar claves de salas</string>

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

@@ -415,7 +415,7 @@
     <string name="room_settings_unset_main_address">Dejar de Establecer como dirección principal</string>
     <string name="encryption_information_decryption_error">Error de descifrado</string>
     <string name="encryption_information_device_name">Nombre público</string>
-    <string name="encryption_information_device_id">ID de sesión</string>
+    <string name="device_manager_session_details_session_id">ID de sesión</string>
     <string name="encryption_information_device_key">Clave de sesión</string>
     <string name="encryption_export_e2e_room_keys">Exportar claves de salas con cifrado Extremo-a-Extremo</string>
     <string name="encryption_export_room_keys">Exportar claves de sala</string>

library/ui-strings/src/main/res/values-et/strings.xml

@@ -612,7 +612,7 @@
     <string name="room_settings_labs_warning_message">Need on alles katsejärgus olevad funktsionaalsused. Ole kasutamisel ettevaatlik.</string>
     <string name="encryption_information_decryption_error">Dekrüptimise viga</string>
     <string name="encryption_information_device_name">Avalik nimi</string>
-    <string name="encryption_information_device_id">Sessiooni tunnus</string>
+    <string name="device_manager_session_details_session_id">Sessiooni tunnus</string>
     <string name="encryption_information_device_key">Sessiooni võti</string>
     <string name="encryption_export_e2e_room_keys">Ekspordi jututubade läbiva krüptimise võtmed</string>
     <string name="encryption_export_room_keys">Ekspordi jututoa võtmed</string>

library/ui-strings/src/main/res/values-eu/strings.xml

@@ -406,7 +406,7 @@ Kontuan izan ekintza honek aplikazioa berrabiaraziko duela eta denbora bat behar
     <string name="encryption_information_decryption_error">Deszifratze errorea</string>
 
     <string name="encryption_information_device_name">Izen publikoa</string>
-    <string name="encryption_information_device_id">IDa</string>
+    <string name="device_manager_session_details_session_id">IDa</string>
     <string name="encryption_information_device_key">Saioaren gakoa</string>
 
     <string name="encryption_export_e2e_room_keys">Esportatu E2E geletako gakoak</string>

library/ui-strings/src/main/res/values-fa/strings.xml

@@ -678,7 +678,7 @@
     <string name="room_settings_labs_warning_message">این‌ها ویژگی‌های آزمایشی‌ای هستند که ممکن است به روش‌های نامنتظره‌ای حراب شوندا. با احتیاط استفاده کنید.</string>
     <string name="room_settings_set_main_address">تنظیم به عنوان نشانی اصلی</string>
     <string name="encryption_information_device_name">نام عمومی</string>
-    <string name="encryption_information_device_id">شناسهٔ نشست</string>
+    <string name="device_manager_session_details_session_id">شناسهٔ نشست</string>
     <string name="encryption_information_device_key">کلید نشست</string>
     <string name="encryption_export_e2e_room_keys">برون‌ریزی کلید‌های اتاق‌های سرتاسری</string>
     <string name="encryption_export_room_keys">برون‌ریزی کلید‌های اتاق‌ها</string>

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

@@ -366,7 +366,7 @@
     <string name="room_settings_unset_main_address">Kumoa pääosoitteeksi asettaminen</string>
     <string name="encryption_information_decryption_error">Salauksenpurkuvirhe</string>
     <string name="encryption_information_device_name">Julkinen nimi</string>
-    <string name="encryption_information_device_id">Istunnon tunnus</string>
+    <string name="device_manager_session_details_session_id">Istunnon tunnus</string>
     <string name="encryption_information_device_key">Istunnon avain</string>
     <string name="encryption_export_e2e_room_keys">Vie salatun huoneen avaimet</string>
     <string name="encryption_export_room_keys">Vie huoneen avaimet</string>

library/ui-strings/src/main/res/values-fr-rCA/strings.xml

@@ -778,7 +778,7 @@
     <string name="encryption_export_room_keys">Exporter les clés des salons</string>
     <string name="encryption_export_e2e_room_keys">Exporter les clés E2E des salons</string>
     <string name="encryption_information_device_key">Clé de la session</string>
-    <string name="encryption_information_device_id">Identifiant de session</string>
+    <string name="device_manager_session_details_session_id">Identifiant de session</string>
     <string name="encryption_information_device_name">Nom public</string>
     <string name="encryption_information_decryption_error">Erreur de déchiffrement</string>
     <string name="settings_theme">Thème</string>

library/ui-strings/src/main/res/values-fr/strings.xml

@@ -346,7 +346,7 @@
     <string name="room_settings_unset_main_address">Désactiver comme adresse principale</string>
     <string name="encryption_information_decryption_error">Erreur de déchiffrement</string>
     <string name="encryption_information_device_name">Nom public</string>
-    <string name="encryption_information_device_id">Identifiant de session</string>
+    <string name="device_manager_session_details_session_id">Identifiant de session</string>
     <string name="encryption_information_device_key">Clé de la session</string>
     <string name="encryption_export_e2e_room_keys">Exporter les clés E2E des salons</string>
     <string name="encryption_export_room_keys">Exporter les clés des salons</string>

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

@@ -380,7 +380,7 @@
     <string name="settings_theme">Tema</string>
     <string name="encryption_information_decryption_error">Fallo ao descifrar</string>
     <string name="encryption_information_device_name">Nome do dispositivo</string>
-    <string name="encryption_information_device_id">ID de sesión</string>
+    <string name="device_manager_session_details_session_id">ID de sesión</string>
     <string name="encryption_information_device_key">Chave do dispositivo</string>
     <string name="encryption_export_e2e_room_keys">Exportar chaves E2E da sala</string>
     <string name="encryption_export_room_keys">Exportar chaves da sala</string>

library/ui-strings/src/main/res/values-hr/strings.xml

@@ -572,7 +572,7 @@
     <string name="settings_theme">Tema</string>
     <string name="encryption_information_decryption_error">Greška u dešifriranju</string>
     <string name="encryption_information_device_name">Javni naziv</string>
-    <string name="encryption_information_device_id">Identitet</string>
+    <string name="device_manager_session_details_session_id">Identitet</string>
     <string name="encryption_information_device_key">Ključ sesije</string>
     <string name="encryption_export_e2e_room_keys">Izvezi sobne ključeve za E2E</string>
     <string name="encryption_export_room_keys">Izvezi sobne ključeve</string>

library/ui-strings/src/main/res/values-hu/strings.xml

@@ -351,7 +351,7 @@
     <string name="room_settings_unset_main_address">Kiszedés fő címek közül</string>
     <string name="encryption_information_decryption_error">Visszafejtés hiba</string>
     <string name="encryption_information_device_name">Nyilvános név</string>
-    <string name="encryption_information_device_id">Munkamenet-azonosító</string>
+    <string name="device_manager_session_details_session_id">Munkamenet-azonosító</string>
     <string name="encryption_information_device_key">Munkamenet kulcs</string>
     <string name="encryption_export_e2e_room_keys">E2E szoba kulcsok exportálása</string>
     <string name="encryption_export_room_keys">Szoba kulcsok exportálása</string>

library/ui-strings/src/main/res/values-in/strings.xml

@@ -301,7 +301,7 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="settings_theme">Tema</string>
     <string name="encryption_information_decryption_error">Kesalahan dekripsi</string>
     <string name="encryption_information_device_name">Nama perangkat</string>
-    <string name="encryption_information_device_id">ID Sesi</string>
+    <string name="device_manager_session_details_session_id">ID Sesi</string>
     <string name="encryption_information_device_key">Kunci perangkat</string>
     <string name="encryption_export_e2e_room_keys">Ekspor kunci ruangan terenkripsi</string>
     <string name="encryption_export_room_keys">Ekspor ruangan kunci</string>

library/ui-strings/src/main/res/values-is/strings.xml

@@ -193,7 +193,7 @@
     <string name="settings_theme">Þema</string>
     <string name="encryption_information_decryption_error">Afkóðunarvilla</string>
     <string name="encryption_information_device_name">Heiti tækis</string>
-    <string name="encryption_information_device_id">Auðkenni setu</string>
+    <string name="device_manager_session_details_session_id">Auðkenni setu</string>
     <string name="encryption_information_device_key">Dulritunarlykill setu</string>
     <string name="encryption_export_export">Flytja út</string>
     <string name="passphrase_enter_passphrase">Settu inn lykilsetningu</string>

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

@@ -430,7 +430,7 @@
     <string name="settings_theme">Tema</string>
     <string name="encryption_information_decryption_error">Errore di decriptazione</string>
     <string name="encryption_information_device_name">Nome pubblico</string>
-    <string name="encryption_information_device_id">ID sessione</string>
+    <string name="device_manager_session_details_session_id">ID sessione</string>
     <string name="encryption_information_device_key">Chiave sessione</string>
     <string name="encryption_export_e2e_room_keys">Esporta le chiavi di crittografia E2E delle stanze</string>
     <string name="encryption_export_room_keys">Esporta le chiavi delle stanze</string>

library/ui-strings/src/main/res/values-iw/strings.xml

@@ -542,7 +542,7 @@
     <string name="encryption_export_room_keys">יצא מפתחות חדר</string>
     <string name="encryption_export_e2e_room_keys">ייצא מפתחות חדר E2E</string>
     <string name="encryption_information_device_key">מזהה מפתח</string>
-    <string name="encryption_information_device_id">מזהה מושב</string>
+    <string name="device_manager_session_details_session_id">מזהה מושב</string>
     <string name="encryption_information_device_name">שם ציבורי</string>
     <string name="encryption_information_decryption_error">שגיאת פענוח</string>
     <string name="settings_theme">ערכת נושא</string>

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

@@ -197,7 +197,7 @@
     <string name="room_settings_labs_warning_message">これらは予期しない不具合が生じるかもしれない実験的機能です。慎重に使用してください。</string>
     <string name="room_settings_set_main_address">メインアドレスとして設定</string>
     <string name="room_settings_unset_main_address">メインアドレスとしての設定を解除</string>
-    <string name="encryption_information_device_id">セッションID</string>
+    <string name="device_manager_session_details_session_id">セッションID</string>
     <string name="font_size">文字の大きさ</string>
     <string name="tiny">とても小さい</string>
     <string name="small">小さい</string>

library/ui-strings/src/main/res/values-kab/strings.xml

@@ -291,7 +291,7 @@
     <string name="room_settings_category_advanced_title">Talqayt</string>
     <string name="room_settings_labs_pref_title">Tinarimin</string>
     <string name="settings_theme">Asentel</string>
-    <string name="encryption_information_device_id">Asulay n tqimit</string>
+    <string name="device_manager_session_details_session_id">Asulay n tqimit</string>
     <string name="encryption_information_device_key">Tasarut n tɣimit</string>
     <string name="encryption_export_e2e_room_keys">Sifeḍ tisura n texxamt E2E</string>
     <string name="encryption_export_room_keys">Sifeḍ tisura n texxamt</string>

library/ui-strings/src/main/res/values-ko/strings.xml

@@ -431,7 +431,7 @@
     <string name="settings_theme">테마</string>
     <string name="encryption_information_decryption_error">암호 복호화 오류</string>
     <string name="encryption_information_device_name">공개 이름</string>
-    <string name="encryption_information_device_id">ID</string>
+    <string name="device_manager_session_details_session_id">ID</string>
     <string name="encryption_information_device_key">기기 키</string>
     <string name="encryption_export_e2e_room_keys">종단간 암호화 방 키 내보내기</string>
     <string name="encryption_export_room_keys">방 키 내보내기</string>

library/ui-strings/src/main/res/values-lo/strings.xml

@@ -909,7 +909,7 @@
     <string name="encryption_export_room_keys">ສົ່ງອອກກະແຈຫ້ອງ</string>
     <string name="encryption_export_e2e_room_keys">ສົ່ງອອກກະແຈຫ້ອງ E2E</string>
     <string name="encryption_information_device_key">ລະຫັດລະບົບ</string>
-    <string name="encryption_information_device_id">ID ລະບົບ</string>
+    <string name="device_manager_session_details_session_id">ID ລະບົບ</string>
     <string name="encryption_information_device_name">ຊື່ສາທາລະນະ</string>
     <string name="encryption_information_decryption_error">ການຖອດລະຫັດຜິດພາດ</string>
     <string name="settings_theme">ຫົວຂໍ້</string>

library/ui-strings/src/main/res/values-lv/strings.xml

@@ -469,7 +469,7 @@
     <string name="settings_theme">Tēma</string>
     <string name="encryption_information_decryption_error">Atšifrēšanas kļūda</string>
     <string name="encryption_information_device_name">Ierīces nosaukums</string>
-    <string name="encryption_information_device_id">Sesijas ID</string>
+    <string name="device_manager_session_details_session_id">Sesijas ID</string>
     <string name="encryption_information_device_key">Sesijas atslēga</string>
     <string name="encryption_export_e2e_room_keys">Eksportēt istabas šifrēšanas atslēgas</string>
     <string name="encryption_export_room_keys">Eksportēt istabas atslēgas</string>

library/ui-strings/src/main/res/values-nb-rNO/strings.xml

@@ -119,7 +119,7 @@
     <string name="room_settings_banned_users_title">Bannlyste brukere</string>
     <string name="room_settings_category_advanced_title">Avansert</string>
     <string name="settings_theme">Tema</string>
-    <string name="encryption_information_device_id">Økt-ID</string>
+    <string name="device_manager_session_details_session_id">Økt-ID</string>
     <string name="encryption_information_device_key">Øktnøkkel</string>
     <string name="encryption_export_export">Eksporter</string>
     <string name="encryption_import_import">Importer</string>

library/ui-strings/src/main/res/values-nl/strings.xml

@@ -275,7 +275,7 @@
     <string name="room_settings_unset_main_address">Niet instellen als hoofdadres</string>
     <string name="encryption_information_decryption_error">Ontsleutelingsfout</string>
     <string name="encryption_information_device_name">Publieke naam</string>
-    <string name="encryption_information_device_id">Sessie ID</string>
+    <string name="device_manager_session_details_session_id">Sessie ID</string>
     <string name="encryption_information_device_key">Sessiesleutel</string>
     <string name="encryption_export_e2e_room_keys">E2E-gesprekssleutels exporteren</string>
     <string name="encryption_export_room_keys">Gesprekssleutels exporteren</string>

library/ui-strings/src/main/res/values-nn/strings.xml

@@ -310,7 +310,7 @@
     <string name="settings_theme">Preg</string>
     <string name="encryption_information_decryption_error">Noko gjekk gale med dekrypteringa</string>
     <string name="encryption_information_device_name">Offentleg namn</string>
-    <string name="encryption_information_device_id">Økt-ID</string>
+    <string name="device_manager_session_details_session_id">Økt-ID</string>
     <string name="encryption_information_device_key">Sesjonsnøkkel</string>
     <string name="encryption_export_e2e_room_keys">Eksporter E2E-romnøkklar</string>
     <string name="encryption_export_room_keys">Eksporter romnøkklar</string>

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

@@ -231,7 +231,7 @@
     <string name="room_settings_set_main_address">Ustaw jako główny adres</string>
     <string name="settings_theme">Motyw</string>
     <string name="encryption_information_device_name">Nazwa publiczna</string>
-    <string name="encryption_information_device_id">ID sesji</string>
+    <string name="device_manager_session_details_session_id">ID sesji</string>
     <string name="encryption_export_export">Eksportuj</string>
     <string name="passphrase_enter_passphrase">Wprowadź hasło</string>
     <string name="passphrase_confirm_passphrase">Potwierdź hasło</string>

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

@@ -418,7 +418,7 @@
     <string name="room_settings_unset_main_address">Des-definir como endereço principal</string>
     <string name="encryption_information_decryption_error">Erro de decriptação</string>
     <string name="encryption_information_device_name">Nome público</string>
-    <string name="encryption_information_device_id">ID de sessão</string>
+    <string name="device_manager_session_details_session_id">ID de sessão</string>
     <string name="encryption_information_device_key">Chave de sessão</string>
     <string name="encryption_export_e2e_room_keys">Exportar chaves de sala E2E</string>
     <string name="encryption_export_room_keys">Exportar chaves de sala</string>

library/ui-strings/src/main/res/values-pt/strings.xml

@@ -246,7 +246,7 @@ Note que esta acção irá reiniciar a aplicação e poderá levar algum tempo.<
 
     <string name="encryption_information_decryption_error">Erro de decifragem</string>
     <string name="encryption_information_device_name">Nome do dispositivo</string>
-    <string name="encryption_information_device_id">ID do dispositivo</string>
+    <string name="device_manager_session_details_session_id">ID do dispositivo</string>
     <string name="encryption_information_device_key">Chave do dispositivo</string>
     <string name="encryption_export_e2e_room_keys">Exportar chaves E2E da sala</string>
     <string name="encryption_export_room_keys">Exportar chaves de sala</string>

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

@@ -432,7 +432,7 @@
     <string name="room_settings_unset_main_address">Сбросить основной адрес</string>
     <string name="encryption_information_decryption_error">Ошибка дешифровки</string>
     <string name="encryption_information_device_name">Публичное имя</string>
-    <string name="encryption_information_device_id">ID сессии</string>
+    <string name="device_manager_session_details_session_id">ID сессии</string>
     <string name="encryption_information_device_key">Ключ сессии</string>
     <string name="encryption_export_e2e_room_keys">Экспорт E2E ключей комнаты</string>
     <string name="encryption_export_room_keys">Экспорт ключей комнаты</string>

library/ui-strings/src/main/res/values-sk/strings.xml

@@ -388,7 +388,7 @@
     <string name="settings_theme">Vzhľad</string>
     <string name="encryption_information_decryption_error">Chyba dešifrovania</string>
     <string name="encryption_information_device_name">Verejné meno</string>
-    <string name="encryption_information_device_id">ID relácie</string>
+    <string name="device_manager_session_details_session_id">ID relácie</string>
     <string name="encryption_information_device_key">Kľúč relácie</string>
     <string name="encryption_export_e2e_room_keys">Exportovať šifrovacie kľúče miestnosti</string>
     <string name="encryption_export_room_keys">Exportovať kľúče miestnosti</string>

library/ui-strings/src/main/res/values-sq/strings.xml

@@ -431,7 +431,7 @@
     <string name="settings_theme">Temë</string>
     <string name="encryption_information_decryption_error">Gabim shfshehtëzimi</string>
     <string name="encryption_information_device_name">Emër publik</string>
-    <string name="encryption_information_device_id">ID Sesioni</string>
+    <string name="device_manager_session_details_session_id">ID Sesioni</string>
     <string name="encryption_information_device_key">Kyç sesioni</string>
     <string name="encryption_export_e2e_room_keys">Eksporto kyçe dhome E2E</string>
     <string name="encryption_export_room_keys">Eksporto kyçe dhome</string>

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

@@ -918,7 +918,7 @@
     <string name="settings_secure_backup_enter_to_setup">Sätt upp på den här enheten</string>
     <string name="reset_secure_backup_title">Generera en ny säkerhetskopia eller sätt en ny lösenfras för din existerande säkerhetskopia.</string>
     <string name="room_settings_labs_warning_message">Detta är experimentella funktioner som kan gå sönder på oväntade sätt. Använd varsamt.</string>
-    <string name="encryption_information_device_id">Sessions-ID</string>
+    <string name="device_manager_session_details_session_id">Sessions-ID</string>
     <string name="encryption_information_device_key">Sessionsnyckel</string>
     <string name="encryption_export_e2e_room_keys">Exportera krypteringsnycklar</string>
     <string name="encryption_export_room_keys">Exportera rumsnycklar</string>

library/ui-strings/src/main/res/values-te/strings.xml

@@ -260,7 +260,7 @@
     <string name="room_settings_set_main_address">ప్రధాన చిరునామాగా సెట్ చేయండి</string>
 
     <string name="encryption_information_device_name">పరికరం పేరు</string>
-    <string name="encryption_information_device_id">పరికరం ID</string>
+    <string name="device_manager_session_details_session_id">పరికరం ID</string>
     <string name="encryption_information_device_key">పరికరం కీ</string>
 
     <string name="encryption_export_e2e_room_keys">E2E గది కీలను ఎగుమతి చేయండి</string>

library/ui-strings/src/main/res/values-tr/strings.xml

@@ -376,7 +376,7 @@
     <string name="settings_theme">Tema</string>
     <string name="encryption_information_decryption_error">Çözme hatası</string>
     <string name="encryption_information_device_name">Görünür Ad</string>
-    <string name="encryption_information_device_id">Oturum kimliği</string>
+    <string name="device_manager_session_details_session_id">Oturum kimliği</string>
     <string name="encryption_information_device_key">Oturum anahtarı</string>
     <string name="encryption_export_e2e_room_keys">E2E Oda anahtarlarını dışa aktar</string>
     <string name="encryption_export_room_keys">Oda anahtarlarını dışa aktar</string>

library/ui-strings/src/main/res/values-uk/strings.xml

@@ -354,7 +354,7 @@
     <string name="room_settings_unset_main_address">Зробити не основною адресою</string>
     <string name="encryption_information_decryption_error">Помилка розшифрування</string>
     <string name="encryption_information_device_name">Загальнодоступна назва</string>
-    <string name="encryption_information_device_id">ID сеансу</string>
+    <string name="device_manager_session_details_session_id">ID сеансу</string>
     <string name="encryption_information_device_key">Ключ сеансу</string>
     <string name="encryption_export_e2e_room_keys">Експортувати E2E ключі кімнати</string>
     <string name="encryption_export_room_keys">Експортувати ключі кімнати</string>

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

@@ -594,7 +594,7 @@
     <string name="deactivate_account_title">Hủy tài khoản</string>
     <string name="dialog_user_consent_submit">Xem lại ngay</string>
     <string name="encryption_information_device_key">Chìa khóa phiên</string>
-    <string name="encryption_information_device_id">Mã phiên</string>
+    <string name="device_manager_session_details_session_id">Mã phiên</string>
     <string name="encryption_information_device_name">Tên công khai</string>
     <string name="encryption_information_decryption_error">Lỗi giải mã</string>
     <string name="room_settings_labs_warning_message">Những chức năng này mang tính thí nghiệm có thể còn nhiều lỗi. Lưu ý khi dùng.</string>

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

@@ -242,7 +242,7 @@
     <string name="settings_password_updated">你的密码已更新</string>
     <string name="encryption_information_decryption_error">解密错误</string>
     <string name="encryption_information_device_name">公开名称</string>
-    <string name="encryption_information_device_id">会话 ID</string>
+    <string name="device_manager_session_details_session_id">会话 ID</string>
     <string name="encryption_information_device_key">会话密钥</string>
     <string name="encryption_import_import">导入</string>
     <string name="encryption_information_verified">已验证</string>

library/ui-strings/src/main/res/values-zh-rTW/strings.xml

@@ -469,7 +469,7 @@
     <string name="settings_theme">主題</string>
     <string name="encryption_information_decryption_error">解密錯誤</string>
     <string name="encryption_information_device_name">公開名稱</string>
-    <string name="encryption_information_device_id">工作階段 ID</string>
+    <string name="device_manager_session_details_session_id">工作階段 ID</string>
     <string name="encryption_information_device_key">工作階段金鑰</string>
     <string name="encryption_export_e2e_room_keys">匯出聊天室的端到端加密金鑰</string>
     <string name="encryption_export_room_keys">匯出聊天室的加密金鑰</string>

library/ui-strings/src/main/res/values/strings.xml

@@ -1212,7 +1212,6 @@
     <string name="encryption_information_decryption_error">Decryption error</string>
 
     <string name="encryption_information_device_name">Public name</string>
-    <string name="encryption_information_device_id">Session ID</string>
     <string name="encryption_information_device_key">Session key</string>
 
     <string name="encryption_export_e2e_room_keys">Export E2E room keys</string>
@@ -3263,6 +3262,7 @@
     </plurals>
     <string name="device_manager_current_session_title">Current Session</string>
     <string name="device_manager_session_title">Session</string>
+    <string name="device_manager_device_title">Device</string>
     <!--  Examples: Last activity Yesterday at 6PM, Last activity Aug 31 at 5:47PM -->
     <string name="device_manager_session_last_activity">Last activity %1$s</string>
     <string name="device_manager_filter_bottom_sheet_title">Filter</string>
@@ -3290,6 +3290,12 @@
     <string name="device_manager_other_sessions_no_unverified_sessions_found">No unverified sessions found.</string>
     <string name="device_manager_other_sessions_no_inactive_sessions_found">No inactive sessions found.</string>
     <string name="device_manager_other_sessions_clear_filter">Clear Filter</string>
+    <string name="device_manager_session_details_title">Session details</string>
+    <string name="device_manager_session_details_description">Application, device, and activity information.</string>
+    <string name="device_manager_session_details_session_name">Session name</string>
+    <string name="device_manager_session_details_session_id">Session ID</string>
+    <string name="device_manager_session_details_session_last_activity">Last activity</string>
+    <string name="device_manager_session_details_device_ip_address">IP address</string>
 
     <!-- Note to translators: %s will be replaces with selected space name -->
     <string name="home_empty_space_no_rooms_title">%s\nis looking a little empty.</string>

library/ui-styles/src/main/res/values/stylable_session_overview_entry_view.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <declare-styleable name="SessionOverviewEntryView">
+        <attr name="sessionOverviewEntryTitle" format="string" />
+        <attr name="sessionOverviewEntryDescription" format="string" />
+    </declare-styleable>
+
+</resources>

library/ui-styles/src/main/res/values/stylable_sessions_list_header_view.xml

@@ -2,8 +2,8 @@
 <resources>
 
     <declare-styleable name="SessionsListHeaderView">
-        <attr name="devicesListHeaderTitle" format="string" />
-        <attr name="devicesListHeaderDescription" format="string" />
+        <attr name="sessionsListHeaderTitle" format="string" />
+        <attr name="sessionsListHeaderDescription" format="string" />
     </declare-styleable>
 
 </resources>

library/ui-styles/src/main/res/values/styles_devices_management.xml

@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
+    <style name="TextAppearance.Vector.Subtitle.DevicesManagement">
+        <item name="android:textColor">?vctr_content_primary</item>
+    </style>
+
     <style name="TextAppearance.Vector.Subtitle.Medium.DevicesManagement">
         <item name="android:textColor">?vctr_content_primary</item>
     </style>

matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/query/QueryStringValue.kt

@@ -68,6 +68,11 @@ sealed interface QueryStringValue {
      */
     data class Contains(override val string: String, override val case: Case = Case.SENSITIVE) : ContentQueryStringValue
 
+    /**
+     * The tested field must not contain the [string].
+     */
+    data class NotContains(override val string: String, override val case: Case = Case.SENSITIVE) : ContentQueryStringValue
+
     /**
      * Case enum for [ContentQueryStringValue].
      */

matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomSummaryQueryParams.kt

@@ -20,8 +20,10 @@ import org.matrix.android.sdk.api.query.QueryStringValue
 import org.matrix.android.sdk.api.query.RoomCategoryFilter
 import org.matrix.android.sdk.api.query.RoomTagQueryFilter
 import org.matrix.android.sdk.api.query.SpaceFilter
+import org.matrix.android.sdk.api.session.room.RoomSummaryQueryParams.Builder
 import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.api.session.room.model.RoomType
+import org.matrix.android.sdk.api.session.room.model.localecho.RoomLocalEcho
 import org.matrix.android.sdk.api.session.space.SpaceSummaryQueryParams
 
 /**
@@ -52,6 +54,10 @@ fun spaceSummaryQueryParams(init: (RoomSummaryQueryParams.Builder.() -> Unit) =
  * [roomSummaryQueryParams] and [spaceSummaryQueryParams] can also be used to build an instance of this class.
  */
 data class RoomSummaryQueryParams(
+        /**
+         * Query for the roomId.
+         */
+        val roomId: QueryStringValue,
         /**
          * Query for the displayName of the room. The display name can be the value of the state event,
          * or a value returned by [org.matrix.android.sdk.api.RoomDisplayNameFallbackProvider].
@@ -94,6 +100,7 @@ data class RoomSummaryQueryParams(
      * [roomSummaryQueryParams] and [spaceSummaryQueryParams] can also be used to build an instance of [RoomSummaryQueryParams].
      */
     class Builder {
+        var roomId: QueryStringValue = QueryStringValue.NotContains(RoomLocalEcho.PREFIX)
         var displayName: QueryStringValue = QueryStringValue.NoCondition
         var canonicalAlias: QueryStringValue = QueryStringValue.NoCondition
         var memberships: List<Membership> = Membership.all()
@@ -104,6 +111,7 @@ data class RoomSummaryQueryParams(
         var spaceFilter: SpaceFilter = SpaceFilter.NoFilter
 
         fun build() = RoomSummaryQueryParams(
+                roomId = roomId,
                 displayName = displayName,
                 canonicalAlias = canonicalAlias,
                 memberships = memberships,

matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/localecho/RoomLocalEcho.kt

@@ -20,7 +20,7 @@ import java.util.UUID
 
 object RoomLocalEcho {
 
-    private const val PREFIX = "!local."
+    const val PREFIX = "!local."
 
     /**
      * Tell whether the provider room id is a local id.

matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/query/QueryStringValueProcessor.kt

@@ -38,6 +38,7 @@ internal class QueryStringValueProcessor @Inject constructor(
             is ContentQueryStringValue -> when (queryStringValue) {
                 is QueryStringValue.Equals -> equalTo(field, queryStringValue.toRealmValue(), queryStringValue.case.toRealmCase())
                 is QueryStringValue.Contains -> contains(field, queryStringValue.toRealmValue(), queryStringValue.case.toRealmCase())
+                is QueryStringValue.NotContains -> not().process(field, QueryStringValue.Contains(queryStringValue.string, queryStringValue.case))
             }
         }
     }

matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt

@@ -272,6 +272,7 @@ internal class RoomSummaryDataSource @Inject constructor(
         val query = with(queryStringValueProcessor) {
             RoomSummaryEntity.where(realm)
                     .process(RoomSummaryEntityFields.ROOM_ID, QueryStringValue.IsNotEmpty)
+                    .process(RoomSummaryEntityFields.ROOM_ID, queryParams.roomId)
                     .process(queryParams.displayName.toDisplayNameField(), queryParams.displayName)
                     .process(RoomSummaryEntityFields.CANONICAL_ALIAS, queryParams.canonicalAlias)
                     .process(RoomSummaryEntityFields.MEMBERSHIP_STR, queryParams.memberships)

vector-app/build.gradle

@@ -291,6 +291,12 @@ android {
         }
     }
 
+    sourceSets {
+        nightly {
+            java.srcDirs += "src/release/java"
+        }
+    }
+
     flavorDimensions "store"
 
     productFlavors {
@@ -340,16 +346,48 @@ android {
                 "-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi",
         ]
     }
+
+    buildFeatures {
+        viewBinding true
+    }
 }
 
 dependencies {
     implementation project(':vector')
     implementation project(':vector-config')
+    debugImplementation project(':library:ui-styles')
     implementation libs.dagger.hilt
     implementation 'androidx.multidex:multidex:2.0.1'
     implementation "androidx.sharetarget:sharetarget:1.1.0"
 
+    // Flipper, debug builds only
+    debugImplementation(libs.flipper.flipper) {
+        exclude group: 'com.facebook.fbjni', module: 'fbjni'
+    }
+    debugImplementation(libs.flipper.flipperNetworkPlugin) {
+        exclude group: 'com.facebook.fbjni', module: 'fbjni'
+    }
+    debugImplementation 'com.facebook.soloader:soloader:0.10.4'
+    debugImplementation "com.kgurgul.flipper:flipper-realm-android:2.2.0"
+
+    gplayImplementation "com.google.android.gms:play-services-location:16.0.0"
+    // UnifiedPush gplay flavor only
+    gplayImplementation('com.github.UnifiedPush:android-embedded_fcm_distributor:2.1.2') {
+        exclude group: 'com.google.firebase', module: 'firebase-core'
+        exclude group: 'com.google.firebase', module: 'firebase-analytics'
+        exclude group: 'com.google.firebase', module: 'firebase-measurement-connector'
+    }
+
+    // Nightly
+    // API-only library
+    gplayImplementation libs.google.appdistributionApi
+    // Full SDK implementation
+    gplayImplementation libs.google.appdistribution
+
+    // OSS License, gplay flavor only
+    gplayImplementation 'com.google.android.gms:play-services-oss-licenses:17.0.0'
     kapt libs.dagger.hiltCompiler
+    kapt libs.airbnb.epoxyProcessor
 
     androidTestImplementation libs.androidx.testCore
     androidTestImplementation libs.androidx.testRunner
@@ -374,5 +412,6 @@ dependencies {
     androidTestImplementation libs.androidx.fragmentTesting
     androidTestImplementation "org.jetbrains.kotlin:kotlin-reflect:1.7.10"
     debugImplementation libs.androidx.fragmentTesting
+    debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.9.1'
 }
 

vector-app/src/debug/AndroidManifest.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <application>
+        <activity android:name="im.vector.app.features.debug.TestLinkifyActivity" />
+        <activity android:name="im.vector.app.features.debug.DebugPermissionActivity" />
+        <activity android:name="im.vector.app.features.debug.analytics.DebugAnalyticsActivity" />
+        <activity android:name="im.vector.app.features.debug.settings.DebugPrivateSettingsActivity" />
+        <activity android:name="im.vector.app.features.debug.sas.DebugSasEmojiActivity" />
+        <activity android:name="im.vector.app.features.debug.features.DebugFeaturesSettingsActivity" />
+        <activity android:name="im.vector.app.features.debug.DebugMenuActivity" />
+        <activity android:name="im.vector.app.features.debug.leak.DebugMemoryLeaksActivity" />
+
+        <activity
+            android:name="com.facebook.flipper.android.diagnostics.FlipperDiagnosticActivity"
+            android:exported="true" />
+
+    </application>
+
+</manifest>

vector-app/src/debug/java/im/vector/app/features/debug/DebugMenuActivity.kt

@@ -34,13 +34,13 @@ import im.vector.app.core.utils.PERMISSIONS_FOR_TAKING_PHOTO
 import im.vector.app.core.utils.checkPermissions
 import im.vector.app.core.utils.registerForPermissionsResult
 import im.vector.app.core.utils.toast
-import im.vector.app.databinding.ActivityDebugMenuBinding
 import im.vector.app.features.debug.analytics.DebugAnalyticsActivity
 import im.vector.app.features.debug.features.DebugFeaturesSettingsActivity
 import im.vector.app.features.debug.leak.DebugMemoryLeaksActivity
 import im.vector.app.features.debug.sas.DebugSasEmojiActivity
 import im.vector.app.features.debug.settings.DebugPrivateSettingsActivity
 import im.vector.app.features.qrcode.QrCodeScannerActivity
+import im.vector.application.databinding.ActivityDebugMenuBinding
 import im.vector.lib.ui.styles.debug.DebugMaterialThemeDarkDefaultActivity
 import im.vector.lib.ui.styles.debug.DebugMaterialThemeDarkTestActivity
 import im.vector.lib.ui.styles.debug.DebugMaterialThemeDarkVectorActivity

vector-app/src/debug/java/im/vector/app/features/debug/DebugPermissionActivity.kt

@@ -23,13 +23,13 @@ import android.widget.Toast
 import androidx.core.app.ActivityCompat
 import androidx.core.content.ContextCompat
 import dagger.hilt.android.AndroidEntryPoint
-import im.vector.app.R
 import im.vector.app.core.platform.VectorBaseActivity
 import im.vector.app.core.utils.checkPermissions
 import im.vector.app.core.utils.onPermissionDeniedDialog
 import im.vector.app.core.utils.onPermissionDeniedSnackbar
 import im.vector.app.core.utils.registerForPermissionsResult
-import im.vector.app.databinding.ActivityDebugPermissionBinding
+import im.vector.application.R
+import im.vector.application.databinding.ActivityDebugPermissionBinding
 import timber.log.Timber
 
 @AndroidEntryPoint

vector-app/src/debug/java/im/vector/app/features/debug/TestLinkifyActivity.kt

@@ -20,9 +20,9 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.appcompat.app.AppCompatActivity
-import im.vector.app.R
-import im.vector.app.databinding.ActivityTestLinkifyBinding
-import im.vector.app.databinding.ItemTestLinkifyBinding
+import im.vector.application.R
+import im.vector.application.databinding.ActivityTestLinkifyBinding
+import im.vector.application.databinding.ItemTestLinkifyBinding
 
 class TestLinkifyActivity : AppCompatActivity() {
 

vector-app/src/debug/java/im/vector/app/features/debug/analytics/DebugAnalyticsFragment.kt

@@ -25,7 +25,7 @@ import com.airbnb.mvrx.withState
 import im.vector.app.core.epoxy.onClick
 import im.vector.app.core.extensions.toOnOff
 import im.vector.app.core.platform.VectorBaseFragment
-import im.vector.app.databinding.FragmentDebugAnalyticsBinding
+import im.vector.application.databinding.FragmentDebugAnalyticsBinding
 import me.gujun.android.span.span
 
 class DebugAnalyticsFragment : VectorBaseFragment<FragmentDebugAnalyticsBinding>() {

vector-app/src/debug/java/im/vector/app/features/debug/features/BooleanFeatureItem.kt

@@ -23,9 +23,9 @@ import android.widget.Spinner
 import android.widget.TextView
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
-import im.vector.app.R
 import im.vector.app.core.epoxy.VectorEpoxyHolder
 import im.vector.app.core.epoxy.VectorEpoxyModel
+import im.vector.application.R
 
 @EpoxyModelClass
 abstract class BooleanFeatureItem : VectorEpoxyModel<BooleanFeatureItem.Holder>(R.layout.item_feature) {
@@ -70,8 +70,8 @@ abstract class BooleanFeatureItem : VectorEpoxyModel<BooleanFeatureItem.Holder>(
     }
 
     class Holder : VectorEpoxyHolder() {
-        val label by bind<TextView>(im.vector.app.R.id.feature_label)
-        val optionsSpinner by bind<Spinner>(im.vector.app.R.id.feature_options)
+        val label by bind<TextView>(R.id.feature_label)
+        val optionsSpinner by bind<Spinner>(R.id.feature_options)
     }
 
     interface Listener {

vector-app/src/debug/java/im/vector/app/features/debug/features/DebugVectorOverrides.kt

@@ -66,13 +66,13 @@ class DebugVectorOverrides(private val context: Context) : VectorOverrides {
     suspend fun setHomeserverCapabilities(block: HomeserverCapabilitiesOverride.() -> HomeserverCapabilitiesOverride) {
         val capabilitiesOverride = block(forceHomeserverCapabilities.firstOrNull() ?: HomeserverCapabilitiesOverride(null, null))
         context.dataStore.edit { settings ->
-            when (capabilitiesOverride.canChangeDisplayName) {
+            when (val canChangeDisplayName = capabilitiesOverride.canChangeDisplayName) {
                 null -> settings.remove(forceCanChangeDisplayName)
-                else -> settings[forceCanChangeDisplayName] = capabilitiesOverride.canChangeDisplayName
+                else -> settings[forceCanChangeDisplayName] = canChangeDisplayName
             }
-            when (capabilitiesOverride.canChangeAvatar) {
+            when (val canChangeAvatar = capabilitiesOverride.canChangeAvatar) {
                 null -> settings.remove(forceCanChangeAvatar)
-                else -> settings[forceCanChangeAvatar] = capabilitiesOverride.canChangeAvatar
+                else -> settings[forceCanChangeAvatar] = canChangeAvatar
             }
         }
     }

vector-app/src/debug/java/im/vector/app/features/debug/features/EnumFeatureItem.kt

@@ -23,9 +23,9 @@ import android.widget.Spinner
 import android.widget.TextView
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
-import im.vector.app.R
 import im.vector.app.core.epoxy.VectorEpoxyHolder
 import im.vector.app.core.epoxy.VectorEpoxyModel
+import im.vector.application.R
 
 @EpoxyModelClass
 abstract class EnumFeatureItem : VectorEpoxyModel<EnumFeatureItem.Holder>(R.layout.item_feature) {
@@ -70,8 +70,8 @@ abstract class EnumFeatureItem : VectorEpoxyModel<EnumFeatureItem.Holder>(R.layo
     }
 
     class Holder : VectorEpoxyHolder() {
-        val label by bind<TextView>(im.vector.app.R.id.feature_label)
-        val optionsSpinner by bind<Spinner>(im.vector.app.R.id.feature_options)
+        val label by bind<TextView>(R.id.feature_label)
+        val optionsSpinner by bind<Spinner>(R.id.feature_options)
     }
 
     interface Listener {

vector-app/src/debug/java/im/vector/app/features/debug/leak/DebugMemoryLeaksFragment.kt

@@ -25,7 +25,7 @@ import com.airbnb.mvrx.withState
 import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.core.epoxy.onClick
 import im.vector.app.core.platform.VectorBaseFragment
-import im.vector.app.databinding.FragmentDebugMemoryLeaksBinding
+import im.vector.application.databinding.FragmentDebugMemoryLeaksBinding
 
 @AndroidEntryPoint
 class DebugMemoryLeaksFragment :

vector-app/src/debug/java/im/vector/app/features/debug/leak/DebugMemoryLeaksViewModel.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 New Vector Ltd
+ * Copyright (c) 2022 New Vector Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

vector-app/src/debug/java/im/vector/app/features/debug/sas/SasEmojiItem.kt

@@ -21,9 +21,9 @@ import android.widget.TextView
 import androidx.core.content.ContextCompat
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
-import im.vector.app.R
 import im.vector.app.core.epoxy.VectorEpoxyHolder
 import im.vector.app.core.epoxy.VectorEpoxyModel
+import im.vector.application.R
 import me.gujun.android.span.image
 import me.gujun.android.span.span
 import org.matrix.android.sdk.api.session.crypto.verification.EmojiRepresentation

vector-app/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsFragment.kt

@@ -25,8 +25,8 @@ import android.view.ViewGroup
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
 import im.vector.app.core.platform.VectorBaseFragment
-import im.vector.app.databinding.FragmentDebugPrivateSettingsBinding
 import im.vector.app.features.home.room.list.home.release.ReleaseNotesActivity
+import im.vector.application.databinding.FragmentDebugPrivateSettingsBinding
 
 class DebugPrivateSettingsFragment : VectorBaseFragment<FragmentDebugPrivateSettingsBinding>() {
 

vector-app/src/debug/java/im/vector/app/features/debug/settings/OverrideDropdownView.kt

@@ -24,7 +24,7 @@ import android.view.View
 import android.widget.AdapterView
 import android.widget.ArrayAdapter
 import android.widget.LinearLayout
-import im.vector.app.databinding.ViewBooleanDropdownBinding
+import im.vector.application.databinding.ViewBooleanDropdownBinding
 
 class OverrideDropdownView @JvmOverloads constructor(
         context: Context,