From cad4dbc694f53db7dea94312070572dbc6e54198 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sava=20Rado=C5=A1?= <sava@bitsfactory.com>
Date: Wed, 9 Oct 2019 15:24:22 +0000
Subject: [PATCH 01/77] Added translation using Weblate (Serbian (latin))

---
 vector/src/main/res/values-b+sr+Latn/strings.xml | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 vector/src/main/res/values-b+sr+Latn/strings.xml

diff --git a/vector/src/main/res/values-b+sr+Latn/strings.xml b/vector/src/main/res/values-b+sr+Latn/strings.xml
new file mode 100644
index 0000000000..a6b3daec93
--- /dev/null
+++ b/vector/src/main/res/values-b+sr+Latn/strings.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
\ No newline at end of file

From 1420f43fdcbc9ba8d93d8e75675a825b2f2cdd45 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Wed, 9 Oct 2019 19:38:07 +0200
Subject: [PATCH 02/77] version ++

---
 CHANGES.rst  | 25 +++++++++++++++++++++++++
 build.gradle |  4 ++--
 2 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index e82f433b49..cf7977cf35 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,28 @@
+Changes in Riot 0.9.9 (2019-XX-XX)
+===================================================
+
+MatrixSdk 🚀:
+ - Upgrade to version 0.X.Y.
+
+Features ✨:
+ -
+
+Improvementss 🙌:
+ -
+
+Other changes:
+ -
+
+Bugfix 🐛:
+ -
+
+Translations 🗣:
+ -
+
+Build 🧱:
+ -
+
+
 Changes in Riot 0.9.8 (2019-10-09)
 ===================================================
 
diff --git a/build.gradle b/build.gradle
index 2b84392915..b5f5ff08e1 100755
--- a/build.gradle
+++ b/build.gradle
@@ -23,8 +23,8 @@ buildscript {
 
 // global properties used in sub modules
 ext {
-    versionCodeProp = 90800
-    versionNameProp = "0.9.8"
+    versionCodeProp = 90900
+    versionNameProp = "0.9.9-dev"
     versionBuild = System.getenv("BUILD_NUMBER") as Integer ?: 0
     buildNumberProp = "${versionBuild}"
 }

From 395cc5ff00733fc47529e604f715e2b37c0050c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sava=20Rado=C5=A1?= <sava@bitsfactory.com>
Date: Wed, 9 Oct 2019 22:22:25 +0000
Subject: [PATCH 03/77] Translated using Weblate (Serbian)

Currently translated at 7.9% (95 of 1208 strings)

Translation: Riot Android/Riot Android
Translate-URL: https://translate.riot.im/projects/riot-android/riot-android/sr/
---
 vector/src/main/res/values-sr/strings.xml | 110 +++++++++++++++++++++-
 1 file changed, 108 insertions(+), 2 deletions(-)

diff --git a/vector/src/main/res/values-sr/strings.xml b/vector/src/main/res/values-sr/strings.xml
index a6b3daec93..5d5fb3e9f2 100644
--- a/vector/src/main/res/values-sr/strings.xml
+++ b/vector/src/main/res/values-sr/strings.xml
@@ -1,2 +1,108 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
\ No newline at end of file
+<?xml version='1.0' encoding='UTF-8'?>
+<resources><string name="light_theme">Светла тема</string>
+    <string name="dark_theme">Тамна тема</string>
+    <string name="black_them">Црна тема</string>
+    <string name="status_theme">Status.im тема</string>
+
+    <string name="notification_sync_init">Иницијализација сервиса</string>
+    <string name="notification_sync_in_progress">Синхронизација у току…</string>
+    <string name="notification_noisy_notifications">Бучна обавештења</string>
+    <string name="notification_silent_notifications">Тиха обавештења</string>
+
+    <string name="title_activity_home">Поруке</string>
+    <string name="title_activity_room">Соба</string>
+    <string name="title_activity_settings">Подешавања</string>
+    <string name="title_activity_member_details">Подаци о члану</string>
+    <string name="title_activity_historical">Историјски</string>
+    <string name="title_activity_bug_report">Пријава грешке</string>
+    <string name="title_activity_choose_sticker">Пошаљи налепницу</string>
+    <string name="title_activity_keys_backup_setup">Резервна копија кључева</string>
+    <string name="title_activity_keys_backup_restore">Користи резервну копију кључева</string>
+    <string name="title_activity_verify_device">Верификуј уређај</string>
+
+    <string name="keys_backup_is_not_finished_please_wait">Креирање резервне копије кључева се није завршило, молим сачекајте…</string>
+    <string name="sign_out_bottom_sheet_warning_no_backup">Изгубићете ваше шифроване поруке ако се сад одјавите</string>
+    <string name="sign_out_bottom_sheet_warning_backing_up">Креирање резервне копије кључева је у току. Ако се одјавите сад, изгубићете приступ вашим шифрованим порукама.</string>
+    <string name="sign_out_bottom_sheet_warning_backup_not_active">Сигурносна копија кључева би требало да буде активна на свим вашим уређајима како би избегли губитак приступа вашим шифрованим порукама.</string>
+    <string name="sign_out_bottom_sheet_dont_want_secure_messages">Не желим моје шифроване поруке</string>
+    <string name="sign_out_bottom_sheet_backing_up_keys">Прављење резервне копије кључева у току…</string>
+    <string name="keys_backup_activate">Користи резервну копију кључева</string>
+    <string name="are_you_sure">Да ли сте сигурни\?</string>
+    <string name="sign_out_bottom_sheet_will_lose_secure_messages">Изгубићете приступ вашим шифрованим порукама уколико не направите резервну копију кључева пре него што се одјавите.</string>
+
+    <string name="loading">Учитавање…</string>
+
+    <string name="ok">У реду</string>
+    <string name="cancel">Откажи</string>
+    <string name="save">Сачувај</string>
+    <string name="leave">Напусти</string>
+    <string name="stay">Остани</string>
+    <string name="send">Пошаљи</string>
+    <string name="copy">Копирај</string>
+    <string name="resend">Пошаљи поново</string>
+    <string name="redact">Уклони</string>
+    <string name="share">Подели</string>
+    <string name="accept">Прихвати</string>
+    <string name="skip">Прескочи</string>
+    <string name="done">Готово</string>
+    <string name="abort">Обустави</string>
+    <string name="ignore">Игнориши</string>
+    <string name="review">Прегледај</string>
+    <string name="decline">Одбаци</string>
+
+    <string name="action_exit">Изађи</string>
+    <string name="actions">Акције</string>
+    <string name="action_sign_out">Одјави се</string>
+    <string name="action_sign_out_confirmation_simple">Да ли сте сигурни да желите да се одјавите\?</string>
+    <string name="action_voice_call">Гласовни позив</string>
+    <string name="action_video_call">Видео позив</string>
+    <string name="action_global_search">Глобална претрага</string>
+    <string name="action_mark_all_as_read">Означи све као прочитано</string>
+    <string name="action_quick_reply">Брзи одговор</string>
+    <string name="action_mark_room_read">Означи као прочитано</string>
+    <string name="action_open">Отвори</string>
+    <string name="action_close">Затвори</string>
+    <string name="disable">Онемогући</string>
+
+    <string name="dialog_title_confirmation">Потврда</string>
+    <string name="dialog_title_warning">Упозорење</string>
+    <string name="dialog_title_error">Грешка</string>
+
+    <string name="bottom_action_favourites">Омиљено</string>
+    <string name="bottom_action_people">Људи</string>
+    <string name="bottom_action_rooms">Собе</string>
+    <string name="invitations_header">Позивнице</string>
+    <string name="low_priority_header">Низак приоритет</string>
+    <string name="direct_chats_header">Разговори</string>
+    <string name="local_address_book_header">Локални адресар</string>
+    <string name="user_directory_header">Листа корисника</string>
+    <string name="matrix_only_filter">Само Matrix контакти</string>
+    <string name="no_result_placeholder">Нема резултата</string>
+    <string name="people_no_identity_server">Нема подешених сервера идентитета.</string>
+
+    <string name="rooms_header">Собе</string>
+    <string name="rooms_directory_header">Листа соба</string>
+    <string name="no_room_placeholder">Нема соба</string>
+    <string name="groups_invite_header">Пошаљи позивницу</string>
+    <string name="send_bug_report_placeholder">Опишите ваш проблем овде</string>
+    <string name="read_receipt">Прочитај</string>
+
+    <string name="join_room">Придружи се соби</string>
+    <string name="username">Корисничко име</string>
+    <string name="create_account">Направи налог</string>
+    <string name="login">Пријави се</string>
+    <string name="logout">Одјави се</string>
+    <string name="option_send_sticker">Пошаљи налепницу</string>
+    <string name="option_take_photo_video">Направи фотографију или видео снимак</string>
+    <string name="option_take_photo">Направи фотографију</string>
+    <string name="option_take_video">Направи видео снимак</string>
+
+    <string name="auth_login">Пријави се</string>
+    <string name="auth_login_sso">Пријави се помоћу single sign-on</string>
+    <string name="auth_register">Направи налог</string>
+    <string name="auth_skip">Прескочи</string>
+    <string name="auth_user_id_placeholder">Адреса електронске поште или корисничко име</string>
+    <string name="auth_password_placeholder">Лозинка</string>
+    <string name="auth_new_password_placeholder">Нова лозинка</string>
+    <string name="auth_user_name_placeholder">Корисничко име</string>
+    </resources>

From e9622b3139cfea4de0149befeba2ed06aea54e82 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sava=20Rado=C5=A1?= <sava@bitsfactory.com>
Date: Wed, 9 Oct 2019 15:24:51 +0000
Subject: [PATCH 04/77] Translated using Weblate (Serbian (latin))

Currently translated at 9.8% (118 of 1208 strings)

Translation: Riot Android/Riot Android
Translate-URL: https://translate.riot.im/projects/riot-android/riot-android/sr_Latn/
---
 .../src/main/res/values-b+sr+Latn/strings.xml | 136 +++++++++++++++++-
 1 file changed, 134 insertions(+), 2 deletions(-)

diff --git a/vector/src/main/res/values-b+sr+Latn/strings.xml b/vector/src/main/res/values-b+sr+Latn/strings.xml
index a6b3daec93..fddc801282 100644
--- a/vector/src/main/res/values-b+sr+Latn/strings.xml
+++ b/vector/src/main/res/values-b+sr+Latn/strings.xml
@@ -1,2 +1,134 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
\ No newline at end of file
+<?xml version='1.0' encoding='UTF-8'?>
+<resources><string name="resources_language">en</string>
+    <string name="resources_country_code">US</string>
+
+    <string name="light_theme">Svetla Tema</string>
+    <string name="dark_theme">Tamna Tema</string>
+    <string name="black_them">Crna Tema</string>
+    <string name="status_theme">Status.im Tema</string>
+
+    <string name="notification_sync_init">Inicijalizacija servisa</string>
+    <string name="notification_sync_in_progress">Sinhronizacija u toku…</string>
+    <string name="notification_noisy_notifications">Bučna obaveštenja</string>
+    <string name="notification_silent_notifications">Tiha obaveštenja</string>
+
+    <string name="title_activity_home">Poruke</string>
+    <string name="title_activity_room">Soba</string>
+    <string name="title_activity_settings">Podešavanja</string>
+    <string name="title_activity_member_details">Podaci o članu</string>
+    <string name="title_activity_historical">Istorijski</string>
+    <string name="title_activity_bug_report">Prijava bug-a</string>
+    <string name="title_activity_choose_sticker">Pošalji nalepnicu</string>
+    <string name="title_activity_keys_backup_setup">Rezervna kopija ključeva</string>
+    <string name="title_activity_keys_backup_restore">Koristi rezervnu kopiju ključeva</string>
+    <string name="title_activity_verify_device">Verifikuj uređaj</string>
+
+    <string name="keys_backup_is_not_finished_please_wait">Kreiranje rezervne kopije ključeva se nije završilo, molim sačekajte…</string>
+    <string name="sign_out_bottom_sheet_warning_no_backup">Izgubićete vaše šifrovane poruke ukoliko se sada odjavite</string>
+    <string name="sign_out_bottom_sheet_warning_backing_up">Kreiranje rezervne kopije ključeva je u toku. Ako se odjavite sada, izgubićete pristup vašim šifrovanim porukama.</string>
+    <string name="sign_out_bottom_sheet_warning_backup_not_active">Sigurnosna kopija ključeva bi trebalo da bude aktivna na svim vašim uređajima kako bi izbegli gubitak pristupa vašim šifrovanim porukama.</string>
+    <string name="sign_out_bottom_sheet_dont_want_secure_messages">Ne želim moje šifrovane poruke</string>
+    <string name="sign_out_bottom_sheet_backing_up_keys">Pravljenje rezervne kopije ključeva u toku…</string>
+    <string name="keys_backup_activate">Koristi rezervnu kopiju ključeva</string>
+    <string name="are_you_sure">Da li ste sigurni\?</string>
+    <string name="sign_out_bottom_sheet_will_lose_secure_messages">Izgubićete pristup vašim šifrovanim porukama ukoliko ne napravite rezervu kopiju ključeva pre nego što se odjavite.</string>
+
+    <string name="loading">Učitavanje…</string>
+
+    <string name="ok">U redu</string>
+    <string name="cancel">Otkaži</string>
+    <string name="save">Sačuvaj</string>
+    <string name="leave">Napusti</string>
+    <string name="stay">Ostani</string>
+    <string name="send">Pošalji</string>
+    <string name="copy">Kopiraj</string>
+    <string name="resend">Pošalji ponovo</string>
+    <string name="redact">Ukloni</string>
+    <string name="share">Podeli</string>
+    <string name="later">Kasnije</string>
+    <string name="forward">Prosledi</string>
+    <string name="delete">Obriši</string>
+    <string name="rename">Preimenuj</string>
+    <string name="ongoing_conference_call">Konferencijski poziv u toku.
+\nPriključi se kao %1$s ili %2$s</string>
+    <string name="ongoing_conference_call_voice">Glas</string>
+    <string name="ongoing_conference_call_video">Video</string>
+    <string name="cannot_start_call">Nemoguća uspostava poziva, molim probajte kasnije</string>
+    <string name="missing_permissions_warning">Neke opcije mogu nedostajati usled manjka dozvola…</string>
+    <string name="missing_permissions_error">Ova akcija nije moguća zbog nedosatka dozvola.</string>
+    <string name="missing_permissions_to_start_conf_call">Treba vam dozvola da pozovete kako bi započeli konferencijski poziv u ovoj sobi</string>
+    <string name="missing_permissions_title_to_start_conf_call">Nemoguća uspostava poziva</string>
+    <string name="device_information">Informacije o uređaju</string>
+    <string name="room_no_conference_call_in_encrypted_rooms">Konferencijski pozivi nisu podržani u šifrovanim sobama</string>
+    <string name="call_anyway">Ipak zovi</string>
+    <string name="send_anyway">Ipak pošalji</string>
+    <string name="or">ili</string>
+    <string name="invite">Pošalji pozivnicu</string>
+    <string name="accept">Prihvati</string>
+    <string name="skip">Preskoči</string>
+    <string name="done">Gotovo</string>
+    <string name="abort">Obustavi</string>
+    <string name="ignore">Ignoriši</string>
+    <string name="review">Pregledaj</string>
+    <string name="decline">Odbaci</string>
+
+    <string name="action_exit">Izađi</string>
+    <string name="actions">Akcije</string>
+    <string name="action_sign_out">Odjavi se</string>
+    <string name="action_sign_out_confirmation_simple">Da li ste sigurni da želite da se odjavite\?</string>
+    <string name="action_voice_call">Glasovni poziv</string>
+    <string name="action_video_call">Video poziv</string>
+    <string name="action_global_search">Globalna pretraga</string>
+    <string name="action_mark_all_as_read">Označi sve kao pročitano</string>
+    <string name="action_quick_reply">Brzi odgovor</string>
+    <string name="action_mark_room_read">Označi kao pročitano</string>
+    <string name="action_open">Otvori</string>
+    <string name="action_close">Zatvori</string>
+    <string name="disable">Onemogući</string>
+
+    <string name="dialog_title_confirmation">Potvrda</string>
+    <string name="dialog_title_warning">Upozorenje</string>
+    <string name="dialog_title_error">Greška</string>
+
+    <string name="bottom_action_people">Ljudi</string>
+    <string name="bottom_action_rooms">Sobe</string>
+    <string name="invitations_header">Pozivnice</string>
+    <string name="low_priority_header">Nizak prioritet</string>
+    <string name="local_address_book_header">Lokalni adresar</string>
+    <string name="user_directory_header">Lista korisnika</string>
+    <string name="matrix_only_filter">Samo Matrix kontakti</string>
+    <string name="rooms_header">Sobe</string>
+    <string name="rooms_directory_header">Lista soba</string>
+    <string name="no_room_placeholder">Nema soba</string>
+    <string name="no_public_room_placeholder">Nema javnih soba</string>
+    <string name="no_group_placeholder">Nema grupa</string>
+
+    <string name="send_bug_report_description_in_english">Ako je moguće, molim opišite na engleskom.</string>
+    <string name="send_bug_report_placeholder">Opišite vaš problem ovde</string>
+    <string name="username">Korisničko ime</string>
+    <string name="create_account">Napravi nalog</string>
+    <string name="login">Prijavi se</string>
+    <string name="logout">Odjavi se</string>
+    <string name="start_new_chat">Započni novo ćaskanje</string>
+    <string name="start_voice_call">Započni glasovni poziv</string>
+    <string name="start_video_call">Započni video poziv</string>
+
+    <string name="call_failed_dont_ask_again">Ne pitaj ponovo</string>
+
+    <string name="option_send_sticker">Pošalji nalepnicu</string>
+    <string name="option_take_photo_video">Napravi fotografiju ili video snimak</string>
+    <string name="option_take_photo">Napravi fotografiju</string>
+    <string name="option_take_video">Napravi video snimak</string>
+
+    <string name="auth_login">Prijavi se</string>
+    <string name="auth_register">Napravi nalog</string>
+    <string name="auth_skip">Preskoči</string>
+    <string name="auth_password_placeholder">Lozinka</string>
+    <string name="auth_new_password_placeholder">Nova lozinka</string>
+    <string name="auth_user_name_placeholder">Korisničko ime</string>
+    <string name="auth_phone_number_placeholder">Broj telefona</string>
+    <string name="auth_opt_phone_number_placeholder">Broj telefona (opciono)</string>
+    <string name="auth_repeat_password_placeholder">Ponovi lozinku</string>
+    <string name="auth_repeat_new_password_placeholder">Potvrdite vašu novu lozinku</string>
+    <string name="auth_invalid_login_param">Pogrešno korisničko ime i/ili lozinka</string>
+    </resources>

From e6aa25b764d9e25f6c0ed742621bc3de7f46b476 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EC=86=A1=ED=83=9C=EC=84=AD?= <xotjq237@gmail.com>
Date: Fri, 11 Oct 2019 09:57:00 +0000
Subject: [PATCH 05/77] Translated using Weblate (Korean)

Currently translated at 100.0% (1208 of 1208 strings)

Translation: Riot Android/Riot Android
Translate-URL: https://translate.riot.im/projects/riot-android/riot-android/ko/
---
 vector/src/main/res/values-ko/strings.xml | 26 +++++++++++------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/vector/src/main/res/values-ko/strings.xml b/vector/src/main/res/values-ko/strings.xml
index 523bc83d14..2e574e4015 100644
--- a/vector/src/main/res/values-ko/strings.xml
+++ b/vector/src/main/res/values-ko/strings.xml
@@ -19,7 +19,7 @@
 
     <string name="loading">불러오는 중…</string>
 
-    <string name="ok">예</string>
+    <string name="ok">네</string>
     <string name="cancel">취소</string>
     <string name="save">저장</string>
     <string name="leave">떠나기</string>
@@ -235,7 +235,7 @@
     <string name="auth_missing_phone">전화번호가 누락되었습니다</string>
     <string name="auth_missing_email_or_phone">이메일 주소나 전화번호가 누락되었습니다</string>
     <string name="auth_invalid_token">옳지 않은 토큰</string>
-    <string name="auth_use_server_options">맞춤 서버 옵션을 사용하기 (고급)</string>
+    <string name="auth_use_server_options">맞춤 서버 설정을 사용하기 (고급)</string>
     <string name="auth_email_validation_message">등록을 계속하려면 이메일을 확인하세요</string>
     <string name="auth_threepid_warning_message">API가 존재하기 전까지는 이메일과 전화번호로 한 번에 등록할 수 없습니다. 오직 전화번호만 고려됩니다.
 \n
@@ -336,7 +336,7 @@
     <string name="permissions_rationale_msg_record_audio">음성 통화를 하려면 Riot은 마이크에 접근하는 권한이 필요합니다.</string>
     <string name="permissions_rationale_msg_record_audio_explanation">"
 \n
-\n전화를 하려면 다은 팝업에서 접근을 허용해주세요."</string>
+\n전화를 하려면 다음 팝업에서 접근을 허용해주세요."</string>
     <string name="permissions_rationale_msg_camera_and_audio">영상 통화를 하려면 Riot은 카메라와 마이크에 접근하는 권한이 필요합니다.
 \n
 \n전화를 하려면 다음 팝업에서 접근을 허용해주세요.</string>
@@ -545,7 +545,7 @@
     <string name="room_sliding_menu_version">버전</string>
     <string name="room_sliding_menu_version_x">버전 %s</string>
     <string name="room_sliding_menu_term_and_conditions">이용 약관</string>
-    <string name="room_sliding_menu_third_party_notices">제 3자 공지</string>
+    <string name="room_sliding_menu_third_party_notices">제 3자 고지</string>
     <string name="room_sliding_menu_copyright">저작권</string>
     <string name="room_sliding_menu_privacy_policy">개인 정보 정책</string>
 
@@ -661,7 +661,7 @@
     <string name="settings_notification_ringtone">알림 소리</string>
     <string name="settings_enable_all_notif">이 계정에서 알림 켜기</string>
     <string name="settings_enable_this_device">이 기기에서 알림 켜기</string>
-    <string name="settings_turn_screen_on">3초 동안 화면을 켬</string>
+    <string name="settings_turn_screen_on">3초 동안 화면을 켜기</string>
     <string name="settings_noisy_notifications_preferences">소리 알림 설정</string>
     <string name="settings_call_notifications_preferences">전화 알림 설정</string>
     <string name="settings_silent_notifications_preferences">조용한 알림 설정</string>
@@ -687,7 +687,7 @@
     <string name="settings_version">버전</string>
     <string name="settings_olm_version">olm 버전</string>
     <string name="settings_app_term_conditions">이용 약관</string>
-    <string name="settings_third_party_notices">제 3자 공지</string>
+    <string name="settings_third_party_notices">제 3자 고지</string>
     <string name="settings_copyright">저작권</string>
     <string name="settings_privacy_policy">개인 정보 정책</string>
     <string name="settings_keep_media">미디어 유지</string>
@@ -734,7 +734,7 @@
     <string name="startup_notification_privacy_title">알림 개인 정보</string>
     <string name="startup_notification_privacy_message">Riot은 백그라운드에서 실행되어 알림을 안전하고 은밀하게 관리할 수 있습니다. 이것은 배터리 사용량에 영향을 줄 수 있습니다.</string>
     <string name="startup_notification_privacy_button_grant">권한 부여</string>
-    <string name="startup_notification_privacy_button_other">다른 옵션을 선택하세요</string>
+    <string name="startup_notification_privacy_button_other">다른 설정을 선택하세요</string>
 
     <string name="startup_notification_fdroid_battery_optim_title">백그라운드 연결</string>
     <string name="startup_notification_fdroid_battery_optim_message">Riot은 신뢰가 있는 알림을 위해 낮은 영향의 백그라운드 연결을 유지해야 합니다.
@@ -845,7 +845,7 @@
     <string name="room_settings_room_access_rules_pref_dialog_title">누가 이 방에 접근할 수 있나요\?</string>
 
     <string name="room_settings_read_history_entry_anyone">누구나</string>
-    <string name="room_settings_read_history_entry_members_only_option_time_shared">(이 옵션을 선택한 시점부터) 구성원만</string>
+    <string name="room_settings_read_history_entry_members_only_option_time_shared">(이 설정을 선택한 시점부터) 구성원만</string>
     <string name="room_settings_read_history_entry_members_only_invited">(초대받은 시점부터) 구성원만</string>
     <string name="room_settings_read_history_entry_members_only_joined">(참가한 시점부터) 구성원만</string>
 
@@ -931,7 +931,7 @@
     <string name="encryption_import_room_keys_summary">로컬 파일에서 키 가져오기</string>
     <string name="encryption_import_import">가져오기</string>
     <string name="encryption_never_send_to_unverified_devices_title">확인된 기기로만 암호화</string>
-    <string name="encryption_never_send_to_unverified_devices_summary">이 기기에서 확인되지 않은 기기로 절대 암호화된 메시지를 보내지 않기.</string>
+    <string name="encryption_never_send_to_unverified_devices_summary">이 기기에서 확인되지 않은 기기로 절대 암호화된 메시지를 보내지 않습니다.</string>
     <string name="encryption_import_room_keys_success">%1$d/%2$d 키를 성공적으로 가져왔습니다.</string>
 
     <string name="encryption_information_not_verified">확인되지 않음</string>
@@ -1036,7 +1036,7 @@
     <string name="settings_labs_native_camera_summary">맞춤 카메라 화면 대신 시스템 카메라를 실행합니다.</string>
     <string name="settings_labs_keyboard_options_to_send_message">키보드 엔터 키로 메시지 보내기</string>
     <string name="settings_labs_enable_send_voice">음성 메시지 보내기</string>
-    <string name="settings_labs_enable_send_voice_summary">이 옵션은 메시지를 기록하기 위한 제 3자 애플리케이션이 필요합니다.</string>
+    <string name="settings_labs_enable_send_voice_summary">이 설정은 메시지를 기록하기 위한 제 3자 애플리케이션이 필요합니다.</string>
 
     <string name="you_added_a_new_device">새 기기 \'%s\'을(를) 추가했습니다, 여기에는 암호화 키가 필요합니다.</string>
     <string name="you_added_a_new_device_with_info">새 기기에는 암호화 키가 필요합니다.
@@ -1453,7 +1453,7 @@
     <string name="import_e2e_keys_from_file">파일 \"%1$s\"에서 종단간 암호화 키 가져옴.</string>
 
     <string name="settings_sdk_version">Matrix SDK 버전</string>
-    <string name="settings_other_third_party_notices">다른 제 3자 공지</string>
+    <string name="settings_other_third_party_notices">다른 제 3자 고지</string>
     <string name="navigate_to_room_when_already_in_the_room">이 방을 이미 봤습니다!</string>
 
     <string name="quick_reactions">빠른 리액션</string>
@@ -1574,7 +1574,7 @@
     <string name="auth_add_email_and_phone_message_2">계정 복구 용 이메일을 설정합니다. 이메일이나 전화로 이후 알고 있는 사람들이 당신을 찾을 수 있는지 여부를 선택하는데 사용됩니다.</string>
     <string name="login_error_homeserver_not_found">이 URL로는 홈서버에 접근할 수 없습니다, 확인해주세요</string>
     <string name="settings_call_ringtone_use_default_stun">대체 전화 지원 서버 허용</string>
-    <string name="settings_call_ringtone_use_default_stun_sum">홈서버가 전화를 지원하지 않는다면 %s을(를) 지원 서버롤 사용합니다 (전화하는 동안 IP 주소가 공유될 것입니다)</string>
+    <string name="settings_call_ringtone_use_default_stun_sum">홈서버가 전화를 지원하지 않는다면 %s을(를) 지원 서버로 사용합니다 (전화하는 동안 IP 주소가 공유됩니다)</string>
     <string name="invite_no_identity_server_error">이 작업을 하려면 설정에서 ID 서버를 추가하세요.</string>
     <string name="settings_background_fdroid_sync_mode">백그라운드 동기화 모드 (실험적)</string>
     <string name="settings_background_fdroid_sync_mode_battery">배터리에 최적화됨</string>
@@ -1592,7 +1592,7 @@
     <string name="settings_set_workmanager_delay_summary">%s
 \n동기화는 자원 (배터리)이나 기기의 상태 (수면)에 따라 지연됩니다.</string>
     <string name="settings_discovery_category">탐색</string>
-    <string name="settings_discovery_manage">탐색 설정 관리하기.</string>
+    <string name="settings_discovery_manage">탐색 설정을 관리합니다.</string>
     <string name="encryption_information_device_name_with_warning">공개 이름 (대화하는 사람들에게 보여집니다)</string>
     <string name="device_name_warning">기기의 공개 이름은 대화하는 사람들에게 보여집니다</string>
     <string name="identity_server_not_defined">ID 서버를 사용하고 있지 않습니다</string>

From 570c7173b5eff0ae4afe653593631cb5181ffd48 Mon Sep 17 00:00:00 2001
From: Osoitz <oelkoro@gmail.com>
Date: Sun, 13 Oct 2019 14:09:04 +0000
Subject: [PATCH 06/77] Translated using Weblate (Basque)

Currently translated at 100.0% (1208 of 1208 strings)

Translation: Riot Android/Riot Android
Translate-URL: https://translate.riot.im/projects/riot-android/riot-android/eu/
---
 vector/src/main/res/values-eu/strings.xml | 103 ++++++++++++++++++++--
 1 file changed, 94 insertions(+), 9 deletions(-)

diff --git a/vector/src/main/res/values-eu/strings.xml b/vector/src/main/res/values-eu/strings.xml
index 598b8907cc..e76f3b826c 100644
--- a/vector/src/main/res/values-eu/strings.xml
+++ b/vector/src/main/res/values-eu/strings.xml
@@ -414,7 +414,7 @@ Kontuan izan ekintza honek aplikazioa berrabiaraziko duela eta denbora bat behar
     <string name="settings_background_sync">Bigarren planoko sinkronizazioa</string>
     <string name="settings_enable_background_sync">Gaitu bigarren planoko sinkronizazioa</string>
     <string name="settings_set_sync_timeout">Sinkronizazio eskaerak debora-muga gainditu du</string>
-    <string name="settings_set_sync_delay">Eskaeren arteko itxaronaldia</string>
+    <string name="settings_set_sync_delay">Sinkronizazioen arteko itxaronaldia</string>
     <string name="settings_second">segundo</string>
     <string name="settings_seconds">segundo</string>
 
@@ -441,10 +441,10 @@ Kontuan izan ekintza honek aplikazioa berrabiaraziko duela eta denbora bat behar
     <string name="settings_pin_unread_messages">Finkatu irakurri gabeko mezuak dituzten gelak</string>
     <string name="settings_devices_list">Gailuak</string>
     <string name="settings_always_show_timestamps">Erakutsi mezu guztien denbora-zigilua</string>
-    <string name="devices_details_dialog_title">Gailuaren xehetasunak</string>
+    <string name="devices_details_dialog_title">Gailuaren informazioa</string>
     <string name="devices_details_id_title">ID</string>
-    <string name="devices_details_name_title">Izena</string>
-    <string name="devices_details_device_name">Gailuaren izena</string>
+    <string name="devices_details_name_title">Izen publikoa</string>
+    <string name="devices_details_device_name">Aldatu izen publikoa</string>
     <string name="devices_details_last_seen_title">Azkenekoz ikusia</string>
     <string name="devices_details_last_seen_format">%1$s @ %2$s</string>
     <string name="devices_delete_dialog_text">Eragiketa honek autentifikazio gehigarria behar du.
@@ -574,9 +574,9 @@ Kontuan izan ekintza honek aplikazioa berrabiaraziko duela eta denbora bat behar
     <string name="encryption_information_decryption_error">Deszifratze errorea</string>
 
     <string name="encryption_information_sender_device_information">Igorlearen gailuaren informazioa</string>
-    <string name="encryption_information_device_name">Gailuaren izena</string>
-    <string name="encryption_information_name">Izena</string>
-    <string name="encryption_information_device_id">Gailuaren IDa</string>
+    <string name="encryption_information_device_name">Izen publikoa</string>
+    <string name="encryption_information_name">Izen publikoa</string>
+    <string name="encryption_information_device_id">IDa</string>
     <string name="encryption_information_device_key">Gailuaren gakoa</string>
     <string name="encryption_information_verification">Egiaztaketa</string>
     <string name="encryption_information_ed25519_fingerprint">Ed25519 hatz-marka</string>
@@ -870,7 +870,7 @@ Baten bat gehitu orain?</string>
     <string name="deactivate_account_submit">Desaktibatu kontua</string>
 
     <string name="dialog_user_consent_content">%1$s hasiera-zerbitzaria erabiltzen jarraitzeko erabilera baldintzak irakurri eta onartu behar dituzu.</string>
-    <string name="dialog_user_consent_submit">Irakurri orain</string>
+    <string name="dialog_user_consent_submit">Berrikusi orain</string>
 
     <string name="deactivate_account_title">Desaktibatu kontua</string>
     <string name="deactivate_account_content">Honek kontua behin betirako erabilgaitza bihurtuko du. Ezin izango duzu saioa hasi, eta ezin izango du beste inork ID hori erabili. Kontua dagoen gela guztietatik aterako da, eta kontuaren xehetasunak identitate-zerbitzaritik ezabatuko dira. <b>Ekintza hau ezin da desegin</b>.
@@ -1048,7 +1048,7 @@ Kontuan izan ekintza honek aplikazioa berrabiaraziko duela eta denbora bat behar
 
     <string name="accept">Onartu</string>
 
-    <string name="auth_accept_policies">Berrikusi eta onartu hasiera-zerbitzari honen politikak:</string>
+    <string name="auth_accept_policies">Irakurri eta onartu hasiera-zerbitzari honen baldintzak:</string>
 
     <string name="encryption_import_room_keys_success">%1$d/%2$d gako ongi inportatu dira.</string>
 
@@ -1612,4 +1612,89 @@ Abisua: Fitxategi hau ezabatu daiteke aplikazioa desinstalatzen bada.</string>
 
     <string name="message_view_edit_history">Ikusi edizioen historiala</string>
 
+<string name="none">Bat ere ez</string>
+    <string name="revoke">Indargabetu</string>
+    <string name="disconnect">Deskonektatu</string>
+    <string name="review">Berrikusi</string>
+    <string name="decline">Ukatu</string>
+
+    <string name="people_no_identity_server">Ez da identitate-zerbitzaririk konfiguratu.</string>
+
+    <string name="call_failed_no_ice_title">Deiak huts egin du zerbitzaria gaizki konfiguratuta dagoelako</string>
+    <string name="call_failed_no_ice_description">Eskatu zure hasiera-zerbitzariko administratzaileari (%1$s) TURN zerbitzari bat konfiguratu dezala deiak ondo funtzionatu dezaten.
+\n
+\nBestela, %2$s zerbitzari publikoa erabili dezakezu, baina hau ez da hain fidagarria izango, eta zure IP-a partekatuko du zerbitzari horrekin. Hau ezarpenetan aldatu dezakezu.</string>
+    <string name="call_failed_no_ice_use_alt">Saiatu %s erabiltzen</string>
+    <string name="call_failed_dont_ask_again">Ez galdetu berriro</string>
+
+    <string name="auth_add_email_message_2">Ezarri E-mail bat kontua berreskuratzeko, eta gero aukeran zure ezagunek aurkitu zaitzaten.</string>
+    <string name="auth_add_phone_message_2">Ezarri telefono bat gero aukeran zure ezagunek aurkitu zaitzaten.</string>
+    <string name="auth_add_email_phone_message_2">Ezarri E-mail bat kontua berreskuratzeko. Erabili geroo aukeran e-maila edo telefonoa zure ezagunek aurkitu zaitzaten.</string>
+    <string name="auth_add_email_and_phone_message_2">Ezarri E-mail bat kontua berreskuratzeko. Erabili geroo aukeran e-maila edo telefonoa zure ezagunek aurkitu zaitzaten.</string>
+    <string name="login_error_homeserver_not_found">Ezin izan da hasiera-zerbitzari bat atzitu URL honetan, egiaztatu ezazu</string>
+    <string name="settings_call_ringtone_use_default_stun">Baimendu lehenetsitako deien laguntzarako zerbitzaria</string>
+    <string name="settings_call_ringtone_use_default_stun_sum">%s erabiliko da laguntzarako zure hasiera-zerbitzariak ez badu bat eskaintzen (Zure IP helbidea deian partekatuko da)</string>
+    <string name="invite_no_identity_server_error">Gehitu identitate-zerbitzari bat zure ezarpenetan ekintza hau burutzeko.</string>
+    <string name="settings_background_fdroid_sync_mode">Bigarren planoko sinkronizazio modua (Esperimentala)</string>
+    <string name="settings_background_fdroid_sync_mode_battery">Bateria erabilerarako optimizatua</string>
+    <string name="settings_background_fdroid_sync_mode_battery_description">Riot bigarren planoan sinkronizatuko da gailuaren baliabide mugatuen erabilera ahal beste murriztuz (bateria).
+\nZure gailuaren baliabideen egoeraren arabera, sistema eragileak sinkronizazioa atzeratu dezake.</string>
+    <string name="settings_background_fdroid_sync_mode_real_time">Denbora errealerako optimizatua</string>
+    <string name="settings_background_fdroid_sync_mode_real_time_description">Riot bigarren planoan sinkronizatuko da maiztasun finkoarekin (konfiguragarria).
+\nHonek irrati eta bateriaren erabileran eragina izango du, eta Riot gertaerei adi dagoela dion jakinarazpen bat bistaratuko da etengabe.</string>
+    <string name="settings_background_fdroid_sync_mode_disabled">Ez sinkronizatu bigarren planoan</string>
+    <string name="settings_background_fdroid_sync_mode_disabled_description">Ez zaizu jasotako mezuei buruz jakinaraziko aplikazioa bigarren planoan dagoenean.</string>
+    <string name="settings_background_sync_update_error">Huts egin du ezarpenak eguneratzean.</string>
+
+
+    <string name="settings_set_workmanager_delay">Hobetsitako sinkronizazio tartea</string>
+    <string name="settings_set_workmanager_delay_summary">%s
+\nSinkronizazioa atzeratu daiteke zure baliabideen arabera (bateria) edo gailuaren egoeraren arabera (lo).</string>
+    <string name="settings_discovery_category">Aurkitzea</string>
+    <string name="settings_discovery_manage">Kudeatu aurkitzeko ezarpenak.</string>
+    <string name="encryption_information_device_name_with_warning">Izen publikoa (Zurekin komunikatzen den jendeak ikusi dezake)</string>
+    <string name="device_name_warning">Gailu baten izen publikoa zurekin komunikatzen den jendeak ikusi dezake</string>
+    <string name="widget_integration_review_terms">Jarraitzeko erabilera baldintzak onartu behar dituzu.</string>
+
+    <string name="identity_server_not_defined">Ez duzu identitate zerbitzaririk erabiltzen</string>
+    <string name="identity_server_not_defined_for_password_reset">Ez da identitate zerbitzaririk konfiguratu, zure pasahitza berrezartzeko beharrezkoa da.</string>
+
+    <string name="security_warning_identity_server">Riot bertsio zaharrek segurtasun akats bat zuten eta zure identitate zerbitzariak (%1$s) zure kontua atzitu zezakeen. %2$s fidagarritzat jotzen baduzu hau ezikusi dezakezu, bestela maiatu saioa eta hasi berriro.
+\n
+\nXehetasun gehiago hemen:
+\nhttps://medium.com/@RiotChat/36b4792ea0d6</string>
+
+    <string name="error_user_already_logged_in">Badirudi beste hasiera-zerbitzari batera konektatzen saiatzen ari zarela. Saioa amaitu nahi duzu\?</string>
+
+    <string name="terms_of_service">Erabilera baldintzak</string>
+    <string name="review_terms">Irakurri baldintzak</string>
+    <string name="terms_description_for_identity_server">Izan besteentzat aurkigarria</string>
+    <string name="terms_description_for_integration_manager">Erabili botak, zubiak, trepetak eta eranskailu multzoak</string>
+
+    <string name="read_at">Irakurri hemen</string>
+
+
+    <string name="identity_server">Identitate-zerbitzaria</string>
+    <string name="disconnect_identity_server">Deskonektatu identitate-zerbitzaria</string>
+    <string name="add_identity_server">Konfiguratu identitate-zerbitzaria</string>
+    <string name="change_identity_server">Aldatu identitate-zerbitzaria</string>
+    <string name="settings_discovery_identity_server_info">Orain %1$s erabiltzen ari zara ezagunak aurkitzeko eta ezagunek zu aurkitzeko.</string>
+    <string name="settings_discovery_identity_server_info_none">Orain ez duzu identitate-zerbitzaririk erabiltzen. Kontaktuak aurkitzeko eta aurkigarria izateko, gehitu bat azpian.</string>
+    <string name="settings_discovery_emails_title">E-mail helbide aurkigarria</string>
+    <string name="settings_discovery_no_mails">Aurkitze aukerak behin e-mail bat gehitu duzunean agertuko dira.</string>
+    <string name="settings_discovery_no_msisdn">Aurkitze aukerak behin telefono zenbaki bat gehitu duzunean agertuko dira.</string>
+    <string name="settings_discovery_disconnect_identity_server_info">Identitate-zerbitzaritik deskonektatzean beste erabiltzaileek ezin izango zaituzte e-mail edo telefonoa erabilita aurkitu, eta zuk ezin izango dituzu e-mail edo telefonoa erabilita aurkitu.</string>
+    <string name="settings_discovery_msisdn_title">Telefono zenbaki aurkigarriak</string>
+    <string name="settings_discovery_confirm_mail">Berrespen e-mail bat bidali dizugu %s helbidera, begiratu zure e-maila eta sakatu baieztapen esteka</string>
+    <string name="settings_discovery_mail_pending">Egiteke</string>
+
+    <string name="settings_discovery_enter_identity_server">Sartu identitate-zerbitzari berria</string>
+    <string name="settings_discovery_bad_identity_server">Ezin izan da identitate-zerbitzarira konektatu</string>
+    <string name="settings_discovery_please_enter_server">Sartu identitate-zerbitzariaren URL-a</string>
+    <string name="settings_discovery_no_terms_title">Identitate-zerbitzariak ez du erabilera baldintzarik</string>
+    <string name="settings_discovery_no_terms">Hautatu duzun identitate-zerbitzariak ez du erabilera baldintzarik. Jarraitu soilik zerbitzuaren jabea fidagarritzat jotzen baduzu</string>
+    <string name="settings_text_message_sent">SMS mezu bat bidali zaizu %s zenbakira. Sartu hemen mezu horrek daukan egiaztatze-kodea.</string>
+
+    <string name="settings_discovery_disconnect_with_bound_pid">Orain e-mail helbideak edo telefono zenbakiak partekatzen dituzu %s zerbitzarian. %s zerbitzarira konektatu beharko zara partekatzeari uzteko.</string>
+    <string name="settings_agree_to_terms">Onartu %s identitate-zerbitzariaren erabilera baldintzak besteek zu e-mail helbidea edo telefonoa erabiliz aurkitzea ahalbidetzeko.</string>
 </resources>

From c290c87dc5d769853c03b030e491ca2dfcf4655a Mon Sep 17 00:00:00 2001
From: Walter <studinsky@gmail.com>
Date: Mon, 14 Oct 2019 12:35:44 +0000
Subject: [PATCH 07/77] Translated using Weblate (Russian)

Currently translated at 96.1% (1161 of 1208 strings)

Translation: Riot Android/Riot Android
Translate-URL: https://translate.riot.im/projects/riot-android/riot-android/ru/
---
 vector/src/main/res/values-ru/strings.xml | 66 ++++++++++++++++-------
 1 file changed, 46 insertions(+), 20 deletions(-)

diff --git a/vector/src/main/res/values-ru/strings.xml b/vector/src/main/res/values-ru/strings.xml
index 00ef36dc34..385e51bf6f 100644
--- a/vector/src/main/res/values-ru/strings.xml
+++ b/vector/src/main/res/values-ru/strings.xml
@@ -96,7 +96,7 @@
         <item quantity="one">%d пользователь</item>
         <item quantity="few">%d пользователя</item>
         <item quantity="many">%d пользователей</item>
-        <item quantity="other" />
+        <item quantity="other"/>
     </plurals>
 
     <string name="send_bug_report_include_logs">Отправить логи</string>
@@ -611,7 +611,7 @@
     <string name="encryption_information_decryption_error">Ошибка дешифровки</string>
 
     <string name="encryption_information_sender_device_information">Информация об устройстве отправителя</string>
-    <string name="encryption_information_device_name">Имя устройства</string>
+    <string name="encryption_information_device_name">Публичное имя</string>
     <string name="encryption_information_name">Имя</string>
     <string name="encryption_information_device_id">ID устройства</string>
     <string name="encryption_information_device_key">Ключ устройства</string>
@@ -843,13 +843,13 @@
         <item quantity="one">%d комната</item>
         <item quantity="few">%d комнаты</item>
         <item quantity="many">%d комнат</item>
-        <item quantity="other" />
+        <item quantity="other"/>
     </plurals>
     <plurals name="notification_unread_notified_messages_in_room_rooms">
         <item quantity="one">%d комната</item>
         <item quantity="few">%d комнаты</item>
         <item quantity="many">%d комнат</item>
-        <item quantity="other" />
+        <item quantity="other"/>
     </plurals>
     <string name="notification_unread_notified_messages_in_room">%1$s в %2$s</string>
 
@@ -857,7 +857,7 @@
         <item quantity="one">%d активный виджет</item>
         <item quantity="few">%d активных виджета</item>
         <item quantity="many">%d активных виджетов</item>
-        <item quantity="other" />
+        <item quantity="other"/>
     </plurals>
 
     <!-- Widget Integration Manager -->
@@ -867,45 +867,45 @@
         <item quantity="one">%d активный участник</item>
         <item quantity="few">%d активных участника</item>
         <item quantity="many">%d активных участников</item>
-        <item quantity="other" />
+        <item quantity="other"/>
     </plurals>
     <plurals name="room_title_members">
         <item quantity="one">%d участник</item>
         <item quantity="few">%d участника</item>
         <item quantity="many">%d участников</item>
-        <item quantity="other" />
+        <item quantity="other"/>
     </plurals>
     <plurals name="room_new_messages_notification">
         <item quantity="one">%d новое сообщение</item>
         <item quantity="few">%d новых сообщения</item>
         <item quantity="many">%d новых сообщений</item>
-        <item quantity="other" />
+        <item quantity="other"/>
     </plurals>
 
     <plurals name="directory_search_rooms_for">
         <item quantity="one">%1$s комната найдена для %2$s</item>
         <item quantity="few">%1$s комнаты найдено для %2$s</item>
         <item quantity="many">%1$s комнат найдено для %2$s</item>
-        <item quantity="other" />
+        <item quantity="other"/>
     </plurals>
     <plurals name="membership_changes">
         <item quantity="one">%d изменение членства</item>
         <item quantity="few">%d изменения членства</item>
         <item quantity="many">%d изменений членства</item>
-        <item quantity="other" />
+        <item quantity="other"/>
     </plurals>
 
     <plurals name="notification_unread_notified_messages">
         <item quantity="one">%d непрочитанное уведомление</item>
         <item quantity="few">%d непрочитанных уведомления</item>
         <item quantity="many">%d непрочитанных уведомлений</item>
-        <item quantity="other" />
+        <item quantity="other"/>
     </plurals>
     <plurals name="notification_unread_notified_messages_in_room_msgs">
         <item quantity="one">%d непрочитанное уведомление</item>
         <item quantity="few">%d непрочитанных уведомления</item>
         <item quantity="many">%d непрочитанных уведомлений</item>
-        <item quantity="other" />
+        <item quantity="other"/>
     </plurals>
     <string name="receipt_avatar">Получить аватар</string>
     <string name="notice_avatar">Заметка аватара</string>
@@ -1020,13 +1020,13 @@
         <item quantity="one">%dm</item>
         <item quantity="few">%dm</item>
         <item quantity="many">%dm</item>
-        <item quantity="other" />
+        <item quantity="other"/>
     </plurals>
     <plurals name="format_time_h">
         <item quantity="one">%dh</item>
         <item quantity="few">%dh</item>
         <item quantity="many">%dh</item>
-        <item quantity="other" />
+        <item quantity="other"/>
     </plurals>
     <plurals name="format_time_d">
         <item quantity="one">%d день</item>
@@ -1045,20 +1045,20 @@
         <item quantity="one">%d выбран</item>
         <item quantity="few">%d выбрано</item>
         <item quantity="many">%d выбраны</item>
-        <item quantity="other" />
+        <item quantity="other"/>
     </plurals>
     <plurals name="group_members">
         <item quantity="one">%d участник</item>
         <item quantity="few">%d участника</item>
         <item quantity="many">%d участников</item>
-        <item quantity="other" />
+        <item quantity="other"/>
     </plurals>
 
     <plurals name="group_rooms">
         <item quantity="one">%d комната</item>
         <item quantity="few">%d комнаты</item>
         <item quantity="many">%d комнат</item>
-        <item quantity="other" />
+        <item quantity="other"/>
     </plurals>
     <string name="system_alerts_header">Системные оповещения</string>
 
@@ -1346,7 +1346,7 @@
         <item quantity="one">%d новый ключ был добавлен к этому устройству.</item>
         <item quantity="few">%d новых ключа были добавлены к этому устройству.</item>
         <item quantity="many">%d новых ключей были добавлены к этому устройству.</item>
-        <item quantity="other" />
+        <item quantity="other"/>
     </plurals>
 
     <plurals name="keys_backup_restore_success_description_part1">
@@ -1398,7 +1398,7 @@
         <item quantity="one">Резервное копирование %d ключа…</item>
         <item quantity="few">Резервное копирование %d ключей…</item>
         <item quantity="many">Резервное копирование %d ключей…</item>
-        <item quantity="other" />
+        <item quantity="other"/>
     </plurals>
 
     <string name="keys_backup_info_keys_all_backup_up">Все ключи сохранены</string>
@@ -1725,4 +1725,30 @@
 
     <string name="read_at">Читать в</string>
 
-</resources>
+<string name="none">Никто</string>
+    <string name="revoke">Отмена</string>
+    <string name="disconnect">Отключить</string>
+    <string name="people_no_identity_server">Сервер идентификации не настроен.</string>
+
+    <string name="call_failed_no_ice_title">Звонок не состоялся из-за неправильно настроенного сервера</string>
+    <string name="call_failed_no_ice_description">Попросите администратора вашего домашнего сервера (%1$s) настроить TURN сервер, чтобы звонки работали надежно.
+\n
+\nКроме того, вы можете попробовать использовать публичный сервер по %2$s, но это будет не так надежно, и он предоставит ваш IP-адрес этому серверу. Вы также можете управлять этим в настройках.</string>
+    <string name="call_failed_no_ice_use_alt">Попробуйте использовать %s</string>
+    <string name="call_failed_dont_ask_again">Не спрашивай меня больше</string>
+
+    <string name="auth_add_email_message_2">Установите адрес электронной почты для восстановления учетной записи, и позже она может будет найдена участниками, которые вас знают.</string>
+    <string name="auth_add_phone_message_2">Установите телефон, и позже его могут опционально обнаруживать люди, которые вас знают.</string>
+    <string name="auth_add_email_phone_message_2">Установите адрес электронной почты для восстановления аккаунта. Позже используйте электронную почту или телефон, чтобы их могли найти люди, которые вас знают.</string>
+    <string name="auth_add_email_and_phone_message_2">Установите адрес электронной почты для восстановления аккаунта. Позже используйте электронную почту или телефон, чтобы их могли найти люди, которые вас знают.</string>
+    <string name="login_error_homeserver_not_found">Не удается связаться с домашним сервером по этому URL, пожалуйста, проверьте его</string>
+    <string name="settings_call_ringtone_use_default_stun">Разрешить резервный сервер помощи при вызове</string>
+    <string name="settings_background_fdroid_sync_mode_battery">Оптимизирован для батареи</string>
+    <string name="settings_background_fdroid_sync_mode_real_time">Оптимизирован для работы в реальном времени</string>
+    <string name="settings_background_fdroid_sync_mode_disabled">Без фоновой синхронизации</string>
+    <string name="settings_background_sync_update_error">Не удалось обновить настройки.</string>
+
+
+    <string name="settings_set_workmanager_delay">Предпочтительный интервал синхронизации</string>
+    <string name="settings_discovery_category">Обнаружение</string>
+    </resources>

From d61b869e98f292563c1036504e7c00378849ba64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sava=20Rado=C5=A1?= <sava@bitsfactory.com>
Date: Sun, 13 Oct 2019 18:55:00 +0000
Subject: [PATCH 08/77] Translated using Weblate (Serbian (latin))

Currently translated at 28.7% (347 of 1208 strings)

Translation: Riot Android/Riot Android
Translate-URL: https://translate.riot.im/projects/riot-android/riot-android/sr_Latn/
---
 .../src/main/res/values-b+sr+Latn/strings.xml | 269 ++++++++++++++++++
 1 file changed, 269 insertions(+)

diff --git a/vector/src/main/res/values-b+sr+Latn/strings.xml b/vector/src/main/res/values-b+sr+Latn/strings.xml
index fddc801282..ea3532296b 100644
--- a/vector/src/main/res/values-b+sr+Latn/strings.xml
+++ b/vector/src/main/res/values-b+sr+Latn/strings.xml
@@ -131,4 +131,273 @@
     <string name="auth_repeat_password_placeholder">Ponovi lozinku</string>
     <string name="auth_repeat_new_password_placeholder">Potvrdite vašu novu lozinku</string>
     <string name="auth_invalid_login_param">Pogrešno korisničko ime i/ili lozinka</string>
+    <string name="clear">Obriši</string>
+    <string name="view_source">Vidi izvor</string>
+    <string name="report_content">Prijavi sadržaj</string>
+    <string name="send_bug_report_progress">Napredak (%s%%)</string>
+
+    <string name="send_files_in">Pošalji u</string>
+    <string name="join_room">Priključi se sobi</string>
+    <string name="search">Pretraži</string>
+
+    <string name="option_send_files">Pošalji datoteke</string>
+    <string name="auth_email_placeholder">Adresa elektronske pošte</string>
+    <string name="auth_opt_email_placeholder">Adresa elektronske pošte (opciono)</string>
+    <string name="auth_invalid_password">Lozinka je prekratka (minimum 6)</string>
+    <string name="auth_missing_password">Lozinka nedostaje</string>
+    <string name="auth_invalid_email">Ovo ne izgleda kao validna adresa elektronske pošte</string>
+    <string name="auth_invalid_phone">Ovo ne izgleda kao validan broj telefona</string>
+    <string name="auth_email_already_defined">Ova adresa elektronske pošte je već definisana.</string>
+    <string name="auth_missing_email">Adresa elektronske pošte nedostaje</string>
+    <string name="auth_missing_phone">Broj telefona nedostaje</string>
+    <string name="auth_missing_email_or_phone">Nedostaje adresa elektronske pošte ili broj telefona</string>
+    <string name="auth_password_dont_match">Lozinke nisu iste</string>
+    <string name="auth_forgot_password">Zaboravili ste lozinku\?</string>
+    <string name="auth_use_server_options">Koristi prilagođene opcije servera (napredno)</string>
+    <string name="auth_email_validation_message">Molim proverite vašu elektronsku poštu kako bi nastavili registraciju</string>
+    <string name="auth_username_in_use">Korisničko ime je već u upotrebi</string>
+    <string name="auth_reset_password_next_step_button">Verifikovao sam adresu elektronske pošte</string>
+    <string name="auth_reset_password_message">Kako bi resetovali vašu lozinku, unesite adresu elektronske pošte povezanu sa vašim nalogom:</string>
+    <string name="auth_reset_password_missing_email">Morate uneti adresu elektronske pošte povezane sa vašim nalogom.</string>
+    <string name="auth_reset_password_missing_password">Morate uneti novu lozinku.</string>
+    <string name="login_mobile_device">Mobilni</string>
+
+    <string name="login_error_limit_exceeded">Poslato je previše zahteva</string>
+    <string name="login_error_user_in_use">Ovo korisničko ime je već korišćeno</string>
+    <string name="login_error_login_email_not_yet">Link u elektronskoj pošti još uvek nije kliknut</string>
+
+    <string name="e2e_re_request_encryption_key_sent">Zahtev za ključ poslat.</string>
+
+    <string name="e2e_re_request_encryption_key_dialog_title">Zahtev poslat</string>
+    <string name="compression_options">Pošalji kao</string>
+    <string name="compression_opt_list_original">Original</string>
+    <string name="compression_opt_list_large">Veliko</string>
+    <string name="compression_opt_list_medium">Srednje</string>
+    <string name="compression_opt_list_small">Malo</string>
+
+    <string name="yesterday">Juče</string>
+    <string name="today">Danas</string>
+
+    <string name="room_info_room_name">Ime sobe</string>
+    <string name="room_info_room_topic">Tema sobe</string>
+
+    <string name="settings_call_category">Pozivi</string>
+    <string name="settings_call_ringtone_use_riot_ringtone">Koristi podrazumevani Riot zvuk zvona za dolazeće pozive</string>
+    <string name="settings_call_ringtone_title">Zvuk zvona dolazećeg poziva</string>
+    <string name="settings_call_ringtone_dialog_title">Izaberite zvuk zvona za pozive:</string>
+
+    <string name="call">Poziv</string>
+    <string name="call_connected">Poziv uspostavljen</string>
+    <string name="call_connecting">Poziv se uspostavlja…</string>
+    <string name="call_ended">Poziv završen</string>
+    <string name="call_ring">Pozivam…</string>
+    <string name="incoming_call">Dolazeći poziv</string>
+    <string name="incoming_video_call">Dolazeći video poziv</string>
+    <string name="incoming_voice_call">Dolazeći glasovni poziv</string>
+    <string name="call_in_progress">Poziv u toku…</string>
+    <string name="video_call_in_progress">Video poziv u toku..</string>
+
+    <string name="room_participants_action_remove">Izbaci iz ove sobe</string>
+    <string name="room_participants_action_kick">Izbaci</string>
+    <string name="room_participants_action_mention">Pomeni</string>
+    <string name="settings_troubleshoot_test_foreground_service_started_title">Servis Obaveštenja</string>
+    <string name="settings_troubleshoot_test_foreground_service_startedt_success">Servis obaveštenja radi.</string>
+    <string name="settings_troubleshoot_test_foreground_service_started_failed">Servis obaveštenja ne radi.
+\nPokušajte da ponovo pokrenete aplikaciju.</string>
+    <string name="settings_troubleshoot_test_foreground_service_started_quickfix">Pokreni servis</string>
+
+    <string name="settings_troubleshoot_test_service_restart_title">Servis obaveštenja, automatsko ponovno pokretanje</string>
+    <string name="settings_troubleshoot_test_service_restart_success">Servis je eliminisan i pokrenut ponovo automatski.</string>
+    <string name="settings_troubleshoot_test_service_restart_failed">Servis nije uspeo da se ponovo pokrene</string>
+
+    <string name="settings_troubleshoot_test_service_boot_success">Servis će se početi sa radom prilikom ponovnog pokretanja uređaja.</string>
+    <string name="settings_troubleshoot_test_battery_title">Optimizacija potrošnje baterije</string>
+    <string name="settings_troubleshoot_test_battery_success">Optimizacija potrošnje baterije ne utiče na Riot.</string>
+    <string name="settings_troubleshoot_test_battery_quickfix">Ignoriši optimizacije</string>
+
+    <string name="settings_notification_privacy_normal">Normalno</string>
+    <string name="settings_notification_privacy_reduced">Smanjena privatnost</string>
+    <string name="settings_notification_privacy_need_permission">Aplikaciji treba dozvola za rad u pozadini</string>
+    <string name="settings_notification_privacy_metadata">• Obaveštenja sadrže samo meta podatke</string>
+    <string name="settings_notification_privacy_nosecure_message_content">• Obaveštenja sadrže <b>meta podatke i poruku</b></string>
+    <string name="settings_notification_privacy_message_content_not_shown">"•  Obaveštenja "<b>neće prikazivati sadržaj poruke</b></string>
+
+    <string name="settings_notification_ringtone">Zvuk obaveštenja</string>
+    <string name="settings_enable_all_notif">Omogući obaveštenja za ovaj nalog</string>
+    <string name="settings_enable_this_device">Omogući obaveštenja za ovaj uređaj</string>
+    <string name="settings_turn_screen_on">Upali ekran na 3 sekunde</string>
+    <string name="settings_noisy_notifications_preferences">Podesi bučna obaveštenja</string>
+    <string name="settings_call_notifications_preferences">Podesi obaveštenja o pozivima</string>
+    <string name="settings_silent_notifications_preferences">Podesi tiha obaveštenja</string>
+    <string name="settings_system_preferences_summary">Izabeti LED boju, vibraciju, zvuk…</string>
+
+
+    <string name="settings_invited_to_room">Kada sam pozvan u sobu</string>
+    <string name="settings_messages_sent_by_bot">Poruke koje je poslao bot</string>
+
+    <string name="settings_background_sync">Sinhronizacija u pozadini</string>
+    <string name="settings_background_fdroid_sync_mode_battery">Optimizovano za potrošnju baterije</string>
+    <string name="settings_background_fdroid_sync_mode_disabled">Bez sinhronizacije u pozadini</string>
+    <string name="settings_second">sekundu</string>
+    <string name="settings_seconds">sekundi</string>
+
+    <string name="settings_version">Verzija</string>
+    <string name="settings_olm_version">olm verzija</string>
+    <string name="settings_other">Drugo</string>
+    <string name="settings_advanced">Napredno</string>
+    <string name="settings_cryptography">Kriptografija</string>
+    <string name="settings_cryptography_manage_keys">Rukovanje kriptografskim ključevima</string>
+    <string name="settings_contact">Učitaj kontakte</string>
+    <string name="settings_contacts_app_permission">Dozvola za kontakte</string>
+    <string name="settings_contacts_phonebook_country">Zemlja telefonskog imenika</string>
+    <string name="settings_home_display">Glavni prikaz</string>
+    <string name="settings_devices_list">Uređaji</string>
+    <string name="settings_send_typing_notifs">Šalji obaveštenja o pisanju</string>
+    <string name="settings_send_typing_notifs_summary">Dozvoli da drugi korisnici znaju da pisete.</string>
+    <string name="settings_show_read_receipts">Prikaži obaveštenja o pročitanim porukama</string>
+    <string name="settings_show_read_receipts_summary">Klikni na obaveštenja o pročitanim porukama za detaljan prikaz.</string>
+    <string name="settings_show_join_leave_messages">Pokaži obaveštenja o priključivanjima i napuštanjima</string>
+    <string name="settings_show_join_leave_messages_summary">Ne odnosi se na pozivnice, izbacivanja i zabrane.</string>
+    <string name="settings_show_avatar_display_name_changes_messages">Prikaži obaveštenja o nalogu</string>
+    <string name="settings_show_avatar_display_name_changes_messages_summary">Uključuje obaveštenja o promeni avatara i imena.</string>
+    <string name="settings_vibrate_on_mention">Vibriraj kad neko pomene korisnika</string>
+    <string name="settings_send_message_with_enter">Pošalji poruku pritiskom na enter</string>
+    <string name="settings_send_message_with_enter_summary">Dugme enter na softverskoj tastaturi će poslati poruku umesto da napravi novu liniju</string>
+
+    <string name="settings_deactivate_account_section">Deaktiviraj nalog</string>
+    <string name="settings_deactivate_my_account">Deaktiviraj moj nalog</string>
+    <string name="settings_discovery_category">Pronalaženje</string>
+    <string name="settings_discovery_manage">Upravljajte vašim podešavanjima za pronalaženje.</string>
+    <string name="startup_notification_privacy_title">Privatnost obaveštenja</string>
+    <string name="startup_notification_privacy_message">Riot može da radi u pozadini kako bi upravljao vašim obaveštenjima sigurno i privatno. Ovo može da utiče na potrošnju baterije.</string>
+    <string name="startup_notification_privacy_button_grant">Dozvoli</string>
+    <string name="startup_notification_privacy_button_other">Izaberi drugu opciju</string>
+
+    <string name="startup_notification_fdroid_battery_optim_title">Pozadinska veza</string>
+    <string name="settings_opt_in_of_analytics_ok">Da, želim da pomognem!</string>
+
+    <string name="settings_data_save_mode">Režim uštede podataka</string>
+    <string name="settings_data_save_mode_summary">Režim uštede podataka primenjuje poseban filter tako da se obaveštenja o prisutnosti i pisanju filtriraju.</string>
+
+    <string name="devices_details_dialog_title">Podaci o uređaju</string>
+    <string name="devices_details_id_title">ID</string>
+    <string name="devices_details_name_title">Javno ime</string>
+    <string name="devices_details_device_name">Promeni javno ime</string>
+    <string name="devices_details_last_seen_title">Poslednji put viđen</string>
+    <string name="devices_delete_dialog_text">Ova operacija zahteva dodatnu autentifikaciju.
+\nMolim unesite vašu lozinku, kako bi nastavili.</string>
+    <string name="devices_delete_dialog_title">Autentifikacija</string>
+    <string name="devices_delete_pswd">Lozinka:</string>
+    <string name="devices_delete_submit_button_label">Pošalji</string>
+
+    <string name="settings_logged_in">Prijavljen kao</string>
+    <string name="settings_interface_language">Jezik</string>
+    <string name="settings_select_language">Izaberi jezik</string>
+
+    <string name="account_email_validation_title">Čeka se verifikacija</string>
+    <string name="account_email_validation_message">Molim proverite vašu elektronsku poštu i kliknite na link u njoj. Kad ovo uradite, kliknite na nastavi.</string>
+    <string name="settings_password">Lozinka</string>
+    <string name="settings_change_password">Promeni lozinku</string>
+    <string name="settings_old_password">Trenutna lozinka</string>
+    <string name="settings_new_password">Nova lozinka</string>
+    <string name="settings_confirm_password">Potvrdite novu lozinku</string>
+    <string name="settings_change_password_submit">Promeni lozinku</string>
+    <string name="settings_fail_to_update_password">Promena lozinke nije uspela</string>
+    <string name="settings_fail_to_update_password_invalid_current_password">Lozinka nije tačna</string>
+    <string name="settings_password_updated">Vaša lozinka je promenjena</string>
+    <string name="settings_select_country">Izaberi zemlju</string>
+
+    <string name="settings_phone_number_country_label">Zemlja</string>
+    <string name="settings_phone_number_country_error">Molim izaberite zemlju</string>
+    <string name="settings_phone_number_label">Broj telefona</string>
+    <string name="settings_phone_number_error">Pogrešan broj telefona za izabranu zemlju</string>
+    <string name="settings_phone_number_verification">Verifikacija putem telefona</string>
+    <string name="settings_phone_number_verification_instruction">Poslali smo vam SMS sa aktivacionim kodom. Molimo unesite ovaj kod ispod.</string>
+    <string name="settings_phone_number_verification_error_empty_code">Unesi aktivacioni kod</string>
+    <string name="settings_phone_number_verification_error">Desila se greška prilikom validacije vašeg broja telefona</string>
+    <string name="settings_phone_number_code">Kod</string>
+    <string name="account_phone_number_error">Desila se greška prilikom verifikacije vašeg broja telefona.</string>
+    <string name="account_additional_info">Dodatne informacije: %s</string>
+
+    <string name="compression_opt_list_choose">Izaberi</string>
+    <string name="media_source_choose">Izaberi</string>
+    <string name="media_saving_period_3_days">3 dana</string>
+    <string name="media_saving_period_1_week">1 nedelja</string>
+    <string name="media_saving_period_1_month">1 mesec</string>
+    <string name="media_saving_period_forever">Zauvek</string>
+
+    <string name="room_settings_tag_pref_entry_favourite">Omiljeno</string>
+    <string name="room_settings_tag_pref_entry_low_priority">Nizak prioritet</string>
+    <string name="room_settings_tag_pref_entry_none">Ništa</string>
+
+    <string name="room_settings_room_access_rules_pref_title">Pristup sobi</string>
+    <string name="room_settings_room_read_history_rules_pref_dialog_title">Ko može čitati istoriju\?</string>
+    <string name="room_settings_room_access_rules_pref_dialog_title">Ko može pristupiti ovoj sobi\?</string>
+
+    <string name="room_settings_read_history_entry_anyone">BIlo ko</string>
+    <string name="room_settings_read_history_entry_members_only_option_time_shared">Samo članovi (od trenutka kad je ova opcija izabrana)</string>
+    <string name="room_settings_read_history_entry_members_only_invited">Samo članovi (od trenutka kad su pozvani)</string>
+    <string name="room_settings_read_history_entry_members_only_joined">Samo članovi (od trenutka kad su se pridružili)</string>
+
+    <string name="room_settings_room_access_entry_only_invited">Samo ljudi koji su pozvani</string>
+    <string name="room_settings_room_access_entry_anyone_with_link_apart_guest">Bilo ko, ko zna link sobe, sem gostiju</string>
+    <string name="room_settings_room_access_entry_anyone_with_link_including_guest">Bilo ko, ko zna link sobe, uključujući goste</string>
+
+    <string name="room_settings_banned_users_title">Izbačeni korisnici</string>
+
+    <string name="room_settings_category_advanced_title">Napredno</string>
+    <string name="room_settings_room_internal_id">Interni ID ove sobe</string>
+    <string name="room_settings_addresses_pref_title">Adrese</string>
+    <string name="room_settings_labs_pref_title">Laboratorije</string>
+    <string name="room_settings_labs_warning_message">Ovo su eksperimentalne karakteristike koje se mogu pokvariti na neočekivane načine. Koristiti sa pažnjom.</string>
+    <string name="room_settings_addresses_add_new_address">Nova adresa (npr. #foo:matrix.org)</string>
+
+    <string name="encryption_information_algorithm">Algoritam</string>
+    <string name="encryption_information_session_id">ID sesije</string>
+    <string name="encryption_information_decryption_error">Greška prilikom dešifrovanja</string>
+
+    <string name="encryption_information_sender_device_information">Informacije o uređaju pošiljaoca</string>
+    <string name="encryption_information_device_name">Javno ime</string>
+    <string name="encryption_information_verification">Verifikacija</string>
+    <string name="encryption_import_room_keys">Uvezi ključeve za sobu</string>
+    <string name="encryption_import_room_keys_summary">Uvezi ključeve iz datoteke</string>
+    <string name="encryption_import_import">Uvezi</string>
+    <string name="encryption_never_send_to_unverified_devices_title">Šifruj samo ka verifikovanim uređajima</string>
+    <string name="encryption_never_send_to_unverified_devices_summary">Nikad ne šalji šifrovane poruke ka neverifikovanim uređajima sa ovog uređaja.</string>
+    <string name="encryption_information_verified">Verifikovan</string>
+    <string name="encryption_information_blocked">Na crnoj listi</string>
+
+    <string name="encryption_information_unknown_device">nepoznat uređaj</string>
+    <string name="encryption_information_unknown_ip">nepoznata IP adresa</string>
+    <string name="encryption_information_none">ništa</string>
+
+    <string name="encryption_information_verify">Verifikuj</string>
+    <string name="encryption_information_unverify">Ukloni verifikaciju</string>
+    <string name="encryption_information_block">Stavi na crnu listu</string>
+    <string name="encryption_information_unblock">Ukloni sa crne liste</string>
+
+    <string name="encryption_information_verify_device">Verifikuj uređaj</string>
+    <string name="unknown_devices_alert_title">Soba sadrži nepoznate uređaje</string>
+    <string name="notification_unknown_room_name">Soba</string>
+    <string name="notification_new_messages">Nove poruke</string>
+    <string name="notification_new_invitation">Nova pozivnica</string>
+    <string name="notification_sender_me">Ja</string>
+    <string name="font_size">Veličina fonta</string>
+    <string name="tiny">Najmanji</string>
+    <string name="small">Mali</string>
+    <string name="normal">Normalni</string>
+    <string name="large">Veliki</string>
+    <string name="larger">Veći</string>
+    <string name="largest">Najveći</string>
+    <string name="huge">Ogroman</string>
+
+    <string name="widget_integration_failed_to_send_request">Slanje zahteva nije uspelo.</string>
+    <string name="widget_integration_must_be_in_room">Niste u ovoj sobi.</string>
+    <string name="widget_integration_no_permission_in_room">Nemate dozvolu da uradite to u ovoj sobi.</string>
+    <string name="widget_integration_missing_room_id">Nedostajući room_id u zahtevu.</string>
+    <string name="widget_integration_missing_user_id">Nedostajući user_id u zahtevu.</string>
+    <string name="widget_integration_room_not_visible">Soba %s nije vidljiva.</string>
+    <string name="widget_integration_missing_parameter">Nedostaje parametar koji je obavezan.</string>
+    <string name="widget_integration_invalid_parameter">Parametar nije ispravan.</string>
+    <string name="settings_labs_enable_send_voice">Šalji glasovne poruke</string>
     </resources>

From df191b78f0dd852388e41e566025f81858666660 Mon Sep 17 00:00:00 2001
From: Besnik Bleta <besnik@programeshqip.org>
Date: Sat, 19 Oct 2019 08:44:41 +0000
Subject: [PATCH 09/77] Translated using Weblate (Albanian)

Currently translated at 99.4% (1201 of 1208 strings)

Translation: Riot Android/Riot Android
Translate-URL: https://translate.riot.im/projects/riot-android/riot-android/sq/
---
 vector/src/main/res/values-sq/strings.xml | 81 +++++++++++++++++++++--
 1 file changed, 74 insertions(+), 7 deletions(-)

diff --git a/vector/src/main/res/values-sq/strings.xml b/vector/src/main/res/values-sq/strings.xml
index 8e439a41fe..7d7faa061e 100644
--- a/vector/src/main/res/values-sq/strings.xml
+++ b/vector/src/main/res/values-sq/strings.xml
@@ -408,7 +408,7 @@
     <string name="settings_background_sync">Njëkohësim në prapaskenë</string>
     <string name="settings_enable_background_sync">Aktivizo njëkohësim në prapaskenë</string>
     <string name="settings_set_sync_timeout">Mbarim kohe për kërkesë njëkohësimi</string>
-    <string name="settings_set_sync_delay">Vonesë mes çdo kërkese</string>
+    <string name="settings_set_sync_delay">Vonesë mes çdo Njëkohësimi</string>
     <string name="settings_second">sekondë</string>
     <string name="settings_seconds">sekonda</string>
 
@@ -459,10 +459,10 @@
 
     <string name="settings_data_save_mode">Mënyrë ruajtjeje të dhënash</string>
 
-    <string name="devices_details_dialog_title">Hollësi pajisjeje</string>
+    <string name="devices_details_dialog_title">Të dhëna pajisjeje</string>
     <string name="devices_details_id_title">ID</string>
-    <string name="devices_details_name_title">Emër</string>
-    <string name="devices_details_device_name">Emër Pajisjeje</string>
+    <string name="devices_details_name_title">Emër Publik</string>
+    <string name="devices_details_device_name">Përditësoni Emër Publik</string>
     <string name="devices_details_last_seen_title">Parë së fundi më</string>
     <string name="devices_details_last_seen_format">%1$s @ %2$s</string>
     <string name="devices_delete_dialog_title">Mirëfilltësim</string>
@@ -572,9 +572,9 @@
     <string name="encryption_information_decryption_error">Gabim shfshehtëzimi</string>
 
     <string name="encryption_information_sender_device_information">Të dhëna pajisjeje dërguesi</string>
-    <string name="encryption_information_device_name">Emër pajisjeje</string>
-    <string name="encryption_information_name">Emër</string>
-    <string name="encryption_information_device_id">ID Pajisjeje</string>
+    <string name="encryption_information_device_name">Emër publik</string>
+    <string name="encryption_information_name">Emër publik</string>
+    <string name="encryption_information_device_id">ID</string>
     <string name="encryption_information_device_key">Kyç pajisjeje</string>
     <string name="encryption_information_verification">Verifikim</string>
     <string name="encryption_information_ed25519_fingerprint">Shenja gishtash Ed25519</string>
@@ -1587,4 +1587,71 @@ Që të garantoni se s’ju shpëton gjë, thjesht mbajeni të aktivizuar mekani
 
     <string name="read_at">Lexoni te</string>
 
+<string name="none">Asnjë</string>
+    <string name="revoke">Shfuqizoje</string>
+    <string name="disconnect">Shkëputu</string>
+    <string name="people_no_identity_server">S’ka shërbyes identitetesh të formësuar.</string>
+
+    <string name="call_failed_no_ice_title">Thirrja dështoi për shkak shërbyesi të keqformësuar</string>
+    <string name="call_failed_no_ice_description">Që thirrjet të funksionojnë në mënyrë të qëndrueshme, ju lutemi, kërkojini përgjegjësit të shërbyesit tuaj Home (%1$s) të formësojë një shërbyes TURN.
+\n
+\nNdryshe, mund të provoni të përdorni shërbyesin publik te %2$s, por kjo s’do të jetë edhe aq e qëndrueshme, dhe adresa juaj IP do të jetë e ditur për atë shërbyes. Këtë mund ta administroni edhe që nga Rregullimet.</string>
+    <string name="call_failed_no_ice_use_alt">Provoni të përdorni %s</string>
+    <string name="call_failed_dont_ask_again">Mos më pyet sërish</string>
+
+    <string name="auth_add_email_message_2">Caktoni një email për rimarrje llogarie, dhe më vonë të jetë i zbulueshëm (opsionale) nga persona që ju njohin.</string>
+    <string name="auth_add_phone_message_2">Caktoni një telefon, dhe më vonë të jetë i zbulueshëm (opsionale) nga persona që ju njohin.</string>
+    <string name="auth_add_email_phone_message_2">Caktoni një email për rimarrje llogarie. Përdoni email ose telefon që të jeni i zbulueshëm (opsionale) nga persona që ju njohin.</string>
+    <string name="auth_add_email_and_phone_message_2">Caktoni një email për rimarrje llogarie. Përdorni email ose telefon që të jeni i zbulueshëm (opsionale) nga persona që ju njohin.</string>
+    <string name="login_error_homeserver_not_found">S’kapet dot shërbyes Home te kjo URL, ju lutemi, kontrollojeni</string>
+    <string name="settings_call_ringtone_use_default_stun_sum">Do të përdoret %s si ndihmë kur shërbyesi juaj Home nuk ofron të tillë (gjatë thirrjes, adresa juaj IP do të ndahet me të tjerë)</string>
+    <string name="invite_no_identity_server_error">Që të kryhet ky veprim, shtoni një shërbyes identitetesh, që nga rregullimet tuaja.</string>
+    <string name="settings_background_fdroid_sync_mode">Mënyrë Njëkohësimi Në Prapaskenë (Eksperimentale)</string>
+    <string name="settings_background_fdroid_sync_mode_battery">E optimizuar për baterinë</string>
+    <string name="settings_background_fdroid_sync_mode_battery_description">Riot-i do të bëjë njëkohësim në prapaskenë, në një mënyrë që kursen burimet e kufizuara të pajisjes (baterinë).
+\nNë varësi të gjendjes së burimeve tuaja, njëkohësimi mund të shtyhet për më vonë nga sistemi operativ.</string>
+    <string name="settings_background_fdroid_sync_mode_real_time">I optimizuar për kohë të njëmendtë</string>
+    <string name="settings_background_fdroid_sync_mode_real_time_description">Riot0-i do të bëjë njëkohësim në prapaskenë periodikisht në një kohë të caktuar (e formësueshme).
+\nKjo do të ketë ndikim mbi përdorimin e baterisë dhe të transmetimit, do të shfaqet një njoftim i pandërprerë që pohon se Riot-i po përgjon për akte.</string>
+    <string name="settings_background_fdroid_sync_mode_disabled">Pa njëkohësim në prapraskenë</string>
+    <string name="settings_background_fdroid_sync_mode_disabled_description">S’do të njoftoheni për mesazhe ardhës, kur aplikacioni gjendet në prapaskenë.</string>
+    <string name="settings_background_sync_update_error">S’u arrit të përditësohen rregullime.</string>
+
+
+    <string name="settings_set_workmanager_delay">Interval i Parapëlqyer Njëkohësimesh</string>
+    <string name="settings_set_workmanager_delay_summary">%s
+\nNjëkohësimi mund të shtyhet për më vonë, në varësi të burimeve (baterisë) ose gjendjes së pajisjes (dremitje).</string>
+    <string name="settings_discovery_manage">Administroni rregullimet tuaja për zbulime.</string>
+    <string name="encryption_information_device_name_with_warning">Emër publik (i dukshëm për persona me të cilët komunikoni)</string>
+    <string name="device_name_warning">Emri publik i një pajisjeje është i dukshëm për persona me të cilët komunikoni</string>
+    <string name="identity_server_not_defined">S’po përdorni ndonjë Shërbyes Identitetesh</string>
+    <string name="identity_server_not_defined_for_password_reset">S’ka shërbyes identitetesh të formësuar, kjo është e domosdoshme për ricaktimin e fjalëkalimit tuaj.</string>
+
+    <string name="error_user_already_logged_in">Duket se po rrekeni të lidheni me një tjetër shërbyes Home. Doni të bëhet dalja\?</string>
+
+    <string name="labs_swipe_to_reply_in_timeline">Që të përgjigjeni te rrjedha kohore, aktivizoni fërkimin</string>
+
+    <string name="identity_server">Shërbyes identitetesh</string>
+    <string name="disconnect_identity_server">Shkëpute shërbyesin e identiteteve</string>
+    <string name="add_identity_server">Formësoni shërbyes identitetesh</string>
+    <string name="change_identity_server">Ndryshoni shërbyes identitetesh</string>
+    <string name="settings_discovery_identity_server_info">Po përdorni %1$s për të zbuluar dhe për të qenë i zbulueshëm nga kontakte ekzistues që njihni.</string>
+    <string name="settings_discovery_identity_server_info_none">S’po përdorni ndonjë shërbyes identitetesh. Që të zbuloni dhe të jini i zbulueshëm nga kontakte ekzistuese që njihni, formësoni një të tillë më poshtë.</string>
+    <string name="settings_discovery_emails_title">Adresa email të zbulueshme</string>
+    <string name="settings_discovery_no_mails">Mundësitë rreth zbulimesh do të shfaqen sapo të keni shtuar një email.</string>
+    <string name="settings_discovery_no_msisdn">Mundësi zbulimesh do të shfaqen sapo të keni shtuar një numër telefoni.</string>
+    <string name="settings_discovery_disconnect_identity_server_info">Shkëputja prej shërbyesit tuaj të identiteteve do të thotë se s’do të jeni i zbulueshëm prej përdoruesish të tjerë dhe s’do të jeni në gjendje të ftoni të tjerë me email ose telefon.</string>
+    <string name="settings_discovery_msisdn_title">Numra telefoni të zbulueshëm</string>
+    <string name="settings_discovery_confirm_mail">Ju dërguam një email ripohimi te %s, hapeni dhe klikoni mbi lidhjen e ripohimit</string>
+    <string name="settings_discovery_mail_pending">Pezull</string>
+
+    <string name="settings_discovery_enter_identity_server">Jepni një shërbyes të ri identitetesh</string>
+    <string name="settings_discovery_bad_identity_server">S’u lidh dot te shërbyes identitetesh</string>
+    <string name="settings_discovery_please_enter_server">Ju lutemi, jepni URL-në e shërbyesit të identiteteve</string>
+    <string name="settings_discovery_no_terms_title">Shërbyesi i identiteteve s’ka kushte shërbimi</string>
+    <string name="settings_discovery_no_terms">Shërbyesi i identiteteve që keni zgjedhur nuk ka ndonjë kusht shërbimi. Vazhdoni vetëm nëse i zini besë të zotit të shërbimit</string>
+    <string name="settings_text_message_sent">Te %s u dërgua një mesazh tekst. Ju lutemi, jepni kodin e verifikimit që përmban ai.</string>
+
+    <string name="settings_discovery_disconnect_with_bound_pid">Hëpërhë, ndani me të tjerë adresa email ose numra telefoni te shërbyesi i identiteteve %s. Do të duhet të rilidheni me %s që të ndalni ndarjen e tyre.</string>
+    <string name="settings_agree_to_terms">Që të lejoni veten të jetë e zbulueshme nga adresë email apo numër telefoni, pajtohuni me Kushtet e Shërbimit të shërbyesit të identiteteve (%s).</string>
 </resources>

From 3b7bc9565d06a5bd7903dd59d3cd27b1a67fe7bb Mon Sep 17 00:00:00 2001
From: Walter <studinsky@gmail.com>
Date: Fri, 18 Oct 2019 11:10:17 +0000
Subject: [PATCH 10/77] Translated using Weblate (Russian)

Currently translated at 98.3% (1187 of 1208 strings)

Translation: Riot Android/Riot Android
Translate-URL: https://translate.riot.im/projects/riot-android/riot-android/ru/
---
 vector/src/main/res/values-ru/strings.xml | 32 +++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/vector/src/main/res/values-ru/strings.xml b/vector/src/main/res/values-ru/strings.xml
index 385e51bf6f..f516f4b4cd 100644
--- a/vector/src/main/res/values-ru/strings.xml
+++ b/vector/src/main/res/values-ru/strings.xml
@@ -1751,4 +1751,36 @@
 
     <string name="settings_set_workmanager_delay">Предпочтительный интервал синхронизации</string>
     <string name="settings_discovery_category">Обнаружение</string>
+    <string name="settings_call_ringtone_use_default_stun_sum">Будет использовать%s в качестве помощника, если ваш домашний сервер не предлагает его (ваш IP-адрес будет доступен во время разговора)</string>
+    <string name="invite_no_identity_server_error">Добавьте идентификационный сервер в свои настройки, чтобы выполнить это действие.</string>
+    <string name="settings_background_fdroid_sync_mode">Режим фоновой синхронизации (Экспериментальный)</string>
+    <string name="settings_background_fdroid_sync_mode_battery_description">Riot будет синхронизироваться в фоновом режиме таким образом, чтобы сохранить ограниченные ресурсы устройства (батарея).
+\nВ зависимости от состояния ресурса вашего устройства, синхронизация может быть отложена операционной системой.</string>
+    <string name="settings_background_fdroid_sync_mode_real_time_description">Riot будет синхронизироваться в фоновом режиме периодически в точное время (настраивается).
+\nЭто повлияет на использование радио и батареи, появится постоянное уведомление о том, что Riot прислушивается к событиям.</string>
+    <string name="settings_background_fdroid_sync_mode_disabled_description">Вы не будете уведомлены о входящих сообщениях, когда приложение находится в фоновом режиме.</string>
+    <string name="settings_set_workmanager_delay_summary">%s
+\nСинхронизация может быть отложена в зависимости от ресурсов (батареи) или состояния устройства (спящий режим).</string>
+    <string name="settings_discovery_manage">Управляйте настройками обнаружения.</string>
+    <string name="encryption_information_device_name_with_warning">Публичное имя (видимое для людей, с которыми вы общаетесь)</string>
+    <string name="device_name_warning">Публичное имя устройства видны людям, с которыми вы общаетесь</string>
+    <string name="identity_server_not_defined">Вы не используете какой-либо сервер идентификации</string>
+    <string name="identity_server_not_defined_for_password_reset">Идентификационный сервер не настроен, требуется сброс пароля.</string>
+
+    <string name="error_user_already_logged_in">Похоже, вы пытаетесь подключиться к другому домашнему серверу. Вы хотите выйти\?</string>
+
+    <string name="identity_server">Сервер идентификации</string>
+    <string name="disconnect_identity_server">Отключить идентификационный сервер</string>
+    <string name="add_identity_server">Настроить идентификационный сервер</string>
+    <string name="change_identity_server">Изменить идентификационный сервер</string>
+    <string name="settings_discovery_identity_server_info">В настоящее время вы используете %1$s для обнаружения и быть найденным вашими контактами.</string>
+    <string name="settings_discovery_identity_server_info_none">"Вы в настоящее время не используете идентификационный сервер. Чтобы обнаружить и быть найденным  вашими существующими контактами, настройте один из них ниже."</string>
+    <string name="settings_discovery_emails_title">Видимые адреса электронной почты</string>
+    <string name="settings_discovery_msisdn_title">Доступные номера телефонов</string>
+    <string name="settings_discovery_mail_pending">В ожидании</string>
+
+    <string name="settings_discovery_enter_identity_server">Введите новый сервер идентификации</string>
+    <string name="settings_discovery_bad_identity_server">Не удалось подключиться к серверу идентификации</string>
+    <string name="settings_discovery_please_enter_server">Пожалуйста, введите URL сервера идентификации</string>
+    <string name="settings_discovery_no_terms_title">Сервер идентификации не имеет условий предоставления услуг</string>
     </resources>

From 36d53fdfe4e4fe98a760c0cff3ed6c8d68562071 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EC=86=A1=ED=83=9C=EC=84=AD?= <xotjq237@gmail.com>
Date: Mon, 21 Oct 2019 03:31:29 +0000
Subject: [PATCH 11/77] Translated using Weblate (Korean)

Currently translated at 100.0% (1208 of 1208 strings)

Translation: Riot Android/Riot Android
Translate-URL: https://translate.riot.im/projects/riot-android/riot-android/ko/
---
 vector/src/main/res/values-ko/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/vector/src/main/res/values-ko/strings.xml b/vector/src/main/res/values-ko/strings.xml
index 2e574e4015..763d51978e 100644
--- a/vector/src/main/res/values-ko/strings.xml
+++ b/vector/src/main/res/values-ko/strings.xml
@@ -31,8 +31,8 @@
     <string name="download">다운로드</string>
     <string name="share">공유</string>
     <string name="permalink">고유 주소</string>
-    <string name="view_source">출처 보기</string>
-    <string name="view_decrypted_source">해독된 출처 보기</string>
+    <string name="view_source">소스 보기</string>
+    <string name="view_decrypted_source">해독된 소스 보기</string>
     <string name="delete">삭제</string>
     <string name="rename">다시 이름 짓기</string>
     <string name="report_content">내용 신고하기</string>

From dbb9b1cb4de4a73c161b53a71e149b25b7dd5adc Mon Sep 17 00:00:00 2001
From: Walter <studinsky@gmail.com>
Date: Mon, 21 Oct 2019 10:12:30 +0000
Subject: [PATCH 12/77] Translated using Weblate (Russian)

Currently translated at 99.8% (1206 of 1208 strings)

Translation: Riot Android/Riot Android
Translate-URL: https://translate.riot.im/projects/riot-android/riot-android/ru/
---
 vector/src/main/res/values-ru/strings.xml | 43 ++++++++++++++---------
 1 file changed, 26 insertions(+), 17 deletions(-)

diff --git a/vector/src/main/res/values-ru/strings.xml b/vector/src/main/res/values-ru/strings.xml
index f516f4b4cd..95da308c7d 100644
--- a/vector/src/main/res/values-ru/strings.xml
+++ b/vector/src/main/res/values-ru/strings.xml
@@ -446,7 +446,7 @@
     <string name="settings_background_sync">Синхронизация</string>
     <string name="settings_enable_background_sync">Включить фоновую синхронизацию</string>
     <string name="settings_set_sync_timeout">Таймаут синхронизации</string>
-    <string name="settings_set_sync_delay">Задержка между запросами</string>
+    <string name="settings_set_sync_delay">Задержка между каждой синхронизацией</string>
     <string name="settings_second">секунда</string>
     <string name="settings_seconds">секунд</string>
 
@@ -474,10 +474,10 @@
     <string name="settings_pin_missed_notifications">Прикрепить комнаты с отключенными уведомлениями</string>
     <string name="settings_pin_unread_messages">Прикрепить комнаты с непрочитанными сообщениями</string>
     <string name="settings_devices_list">Устройства</string>
-    <string name="devices_details_dialog_title">Подробности о устройстве</string>
+    <string name="devices_details_dialog_title">Информация об устройстве</string>
     <string name="devices_details_id_title">ID</string>
-    <string name="devices_details_name_title">Имя</string>
-    <string name="devices_details_device_name">Имя устройства</string>
+    <string name="devices_details_name_title">Общеизвестное имя</string>
+    <string name="devices_details_device_name">Обновить публичное имя</string>
     <string name="devices_details_last_seen_title">Последнее подключение</string>
     <string name="devices_details_last_seen_format">%1$s @ %2$s</string>
     <string name="devices_delete_dialog_text">Для этой операции требуется дополнительная проверка подлинности.
@@ -612,8 +612,8 @@
 
     <string name="encryption_information_sender_device_information">Информация об устройстве отправителя</string>
     <string name="encryption_information_device_name">Публичное имя</string>
-    <string name="encryption_information_name">Имя</string>
-    <string name="encryption_information_device_id">ID устройства</string>
+    <string name="encryption_information_name">Публичное имя</string>
+    <string name="encryption_information_device_id">ID</string>
     <string name="encryption_information_device_key">Ключ устройства</string>
     <string name="encryption_information_verification">Проверка</string>
     <string name="encryption_information_ed25519_fingerprint">Ed25519 отпечаток</string>
@@ -1653,15 +1653,15 @@
 
     <string name="store_riotx_title">RiotX - Matrix клиент следующего поколения</string>
     <string name="store_riotx_short_description">Быстрый и легкий клиент для Matrix с новейшими фреймворками Android</string>
-    <string name="store_riotx_full_description">RiotX - это новый клиент для матричного протокола (Matrix.org): открытой сети для безопасной децентрализованной связи. RiotX - это полная перезапись Riot Android клиента, основанная на полной перезаписи Matrix Android SDK.
-\n
-\nОговорка: Это бета-версия. В настоящее время RiotX находится в активной разработке и содержит ограничения и (надеемся, не слишком много) ошибки. Мы будем рады любым отзывам!
-\n
-\nПоддержка RiotX: - Войти в существующую учетную запись - Создать комнату и присоединиться к общей комнате - Принять и отклонить приглашения - Список комнат пользователей - Просмотр сведений о комнате - Отправить текстовые сообщения - Отправить вложение - Читать и писать сообщения в зашифрованных комнатах - Криптографически: Резервное копирование клавиш E2E, предварительная проверка устройства, запрос и ответ на общий доступ к ключам - Нажмите уведомление - Светлые, темные и черные темы
-\n
-\nНе все функции RiotX пока реализованы в RiotX. Основные отсутствующие (и скоро появятся!) особенности: - Создание учетной записи - Настройки комнат (список членов комнат и т.д.) - Создание прямых чатов - Вызовы - Виджеты - .…</string>
+    <string name="store_riotx_full_description">RiotX - это новый клиент для матричного протокола (Matrix.org): открытой сети для безопасной децентрализованной связи. RiotX - это полная перезапись Riot Android клиента, основанная на полной перезаписи Matrix Android SDK. 
+\n 
+\nОговорка: Это бета-версия. В настоящее время RiotX находится в активной разработке и содержит ограничения и (надеемся, не слишком много) ошибки. Мы будем рады любым отзывам! 
+\n 
+\nПоддержка RiotX: - Войти в существующую учетную запись - Создать комнату и присоединиться к общедоступным комнатам - Принять и отклонить приглашения - Список комнат пользователей - Просмотр сведений о комнате - Отправить текстовые сообщения - Отправить вложение - Читать и писать сообщения в зашифрованных комнатах - Криптография: Резервное копирование клавиш E2E, предварительная проверка устройства, запрос и ответ на общий доступ к ключам - Нажмите уведомление - Светлые и черные темы 
+\n 
+\nНе все функции Riot пока реализованы в RiotX. Основные отсутствующие (и скоро появятся!) свойства: - Создание учетной записи - Настройки комнат (список членов комнат и т.д.) - Создание прямых чатов - Вызовы - Виджеты - .…</string>
 
-    <string name="room_preview_world_readable_room_not_supported_yet">Предварительный просмотр открытой комнаты в RiotX пока не поддерживается.</string>
+    <string name="room_preview_world_readable_room_not_supported_yet">Предварительный просмотр открытой комнаты в RiotX пока не поддерживается</string>
 
     <string name="bottom_action_people_x">Прямые сообщения</string>
 
@@ -1695,7 +1695,7 @@
 
     <string name="link_copied_to_clipboard">Ссылка скопирована в буфер обмена</string>
 
-    <string name="add_by_matrix_id">Добавить по matrix ID</string>
+    <string name="add_by_matrix_id">Добавить по Matrix ID</string>
     <string name="creating_direct_room">Создание комнаты…</string>
     <string name="direct_room_no_known_users">"Результат не найден, используйте добавить matrix ID  для поиска на сервере."</string>
     <string name="direct_room_start_search">Начните печатать, чтобы получить результат</string>
@@ -1715,7 +1715,7 @@
 \nПодробнее об этом читайте здесь:
 \nhttps://medium.com/@RiotChat/36b4792ea0d6</string>
 
-    <string name="settings_push_rules_no_rules">Правила пуш не определены</string>
+    <string name="settings_push_rules_no_rules">Пуш-правила не определены</string>
     <string name="settings_push_gateway_no_pushers">Нет зарегистрированных пуш-шлюзов</string>
 
     <string name="terms_of_service">Условия предоставления услуг</string>
@@ -1783,4 +1783,13 @@
     <string name="settings_discovery_bad_identity_server">Не удалось подключиться к серверу идентификации</string>
     <string name="settings_discovery_please_enter_server">Пожалуйста, введите URL сервера идентификации</string>
     <string name="settings_discovery_no_terms_title">Сервер идентификации не имеет условий предоставления услуг</string>
-    </resources>
+    <string name="settings_discovery_no_mails">Параметры обнаружения появятся после добавления электронной почты.</string>
+    <string name="settings_discovery_no_msisdn">Параметры поиска появятся после добавления номера телефона.</string>
+    <string name="settings_discovery_disconnect_identity_server_info">Отключение от сервера идентификации будет означать, что другие пользователи не смогут обнаружить вас, и вы не сможете приглашать других по электронной почте или по телефону.</string>
+    <string name="settings_discovery_confirm_mail">Мы отправили вам электронное письмо с подтверждением на %s, проверьте вашу электронную почту и нажмите на ссылку для подтверждения</string>
+    <string name="settings_discovery_no_terms">Выбранный сервер идентификации не имеет условий обслуживания. Продолжить, только если вы доверяете владельцу службы</string>
+    <string name="settings_text_message_sent">Текстовое сообщение отправлено %s. Введите код проверки, который он содержит.</string>
+
+    <string name="settings_discovery_disconnect_with_bound_pid">В настоящее время вы делитесь адресами электронной почты или телефонными номерами на сервере идентификации %s. Вам нужно повторно подключиться к %s, чтобы прекратить делиться ими.</string>
+    <string name="settings_agree_to_terms">Примите Условия обслуживания сервера идентификации (%s), чтобы разрешить обнаружение по адресу электронной почты или номеру телефона.</string>
+</resources>

From a559129afe2d36fdc3ad9d367e7c363da4f2de5f Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoitm@matrix.org>
Date: Wed, 23 Oct 2019 10:53:08 +0200
Subject: [PATCH 13/77] Format resources

---
 .../layout/dialog_background_sync_mode.xml    |  5 +--
 .../src/main/res/values-b+sr+Latn/strings.xml |  5 ++-
 vector/src/main/res/values-eu/strings.xml     |  2 +-
 vector/src/main/res/values-fi/strings.xml     |  2 +-
 vector/src/main/res/values-fr/strings.xml     |  2 +-
 vector/src/main/res/values-hu/strings.xml     | 10 ++---
 vector/src/main/res/values-it/strings.xml     |  2 +-
 vector/src/main/res/values-ko/strings.xml     |  2 +-
 vector/src/main/res/values-nl/strings.xml     |  4 +-
 vector/src/main/res/values-ru/strings.xml     | 38 +++++++++----------
 vector/src/main/res/values-sq/strings.xml     |  2 +-
 vector/src/main/res/values-sr/strings.xml     |  5 ++-
 vector/src/main/res/values-zh-rTW/strings.xml |  2 +-
 .../res/xml/vector_settings_preferences.xml   |  4 +-
 14 files changed, 43 insertions(+), 42 deletions(-)

diff --git a/vector/src/main/res/layout/dialog_background_sync_mode.xml b/vector/src/main/res/layout/dialog_background_sync_mode.xml
index 03603ba30f..89b2aaefde 100644
--- a/vector/src/main/res/layout/dialog_background_sync_mode.xml
+++ b/vector/src/main/res/layout/dialog_background_sync_mode.xml
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
     xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
     android:layout_height="match_parent">
 
     <ListView
         android:id="@+id/dialog_background_sync_list"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        tools:listitem="@layout/item_custom_dialog_radio_line"
-        ></ListView>
+        tools:listitem="@layout/item_custom_dialog_radio_line" />
 
 </LinearLayout>
diff --git a/vector/src/main/res/values-b+sr+Latn/strings.xml b/vector/src/main/res/values-b+sr+Latn/strings.xml
index ea3532296b..605af19db6 100644
--- a/vector/src/main/res/values-b+sr+Latn/strings.xml
+++ b/vector/src/main/res/values-b+sr+Latn/strings.xml
@@ -1,5 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<resources><string name="resources_language">en</string>
+<resources>
+    <string name="resources_language">en</string>
     <string name="resources_country_code">US</string>
 
     <string name="light_theme">Svetla Tema</string>
@@ -400,4 +401,4 @@
     <string name="widget_integration_missing_parameter">Nedostaje parametar koji je obavezan.</string>
     <string name="widget_integration_invalid_parameter">Parametar nije ispravan.</string>
     <string name="settings_labs_enable_send_voice">Šalji glasovne poruke</string>
-    </resources>
+</resources>
diff --git a/vector/src/main/res/values-eu/strings.xml b/vector/src/main/res/values-eu/strings.xml
index e76f3b826c..632522c518 100644
--- a/vector/src/main/res/values-eu/strings.xml
+++ b/vector/src/main/res/values-eu/strings.xml
@@ -1612,7 +1612,7 @@ Abisua: Fitxategi hau ezabatu daiteke aplikazioa desinstalatzen bada.</string>
 
     <string name="message_view_edit_history">Ikusi edizioen historiala</string>
 
-<string name="none">Bat ere ez</string>
+    <string name="none">Bat ere ez</string>
     <string name="revoke">Indargabetu</string>
     <string name="disconnect">Deskonektatu</string>
     <string name="review">Berrikusi</string>
diff --git a/vector/src/main/res/values-fi/strings.xml b/vector/src/main/res/values-fi/strings.xml
index 3eb5e6ff9d..74680e0fb2 100644
--- a/vector/src/main/res/values-fi/strings.xml
+++ b/vector/src/main/res/values-fi/strings.xml
@@ -1604,7 +1604,7 @@ Jotta et menetä mitään, automaattiset päivitykset kannattaa pitää käytös
     <string name="alpha_disclaimer_content_line_2_gplay_colored_part">Play Storen kuvaus</string>
     <string name="settings_push_rules">Push-säännöt</string>
     <string name="riotx_no_registration_notice">%1$s luodaksesi tilin.</string>
-<string name="disconnect">Katkaise yhteys</string>
+    <string name="disconnect">Katkaise yhteys</string>
     <string name="decline">Kieltäydy</string>
 
     <string name="people_no_identity_server">Identiteettipalvelinta ei ole määritetty.</string>
diff --git a/vector/src/main/res/values-fr/strings.xml b/vector/src/main/res/values-fr/strings.xml
index 6e3841867e..79234af764 100644
--- a/vector/src/main/res/values-fr/strings.xml
+++ b/vector/src/main/res/values-fr/strings.xml
@@ -1634,7 +1634,7 @@ Si vous n’avez pas configuré de nouvelle méthode de récupération, un attaq
 
     <string name="read_at">Lu à</string>
 
-<string name="none">Aucun</string>
+    <string name="none">Aucun</string>
     <string name="revoke">Révoquer</string>
     <string name="disconnect">Déconnecter</string>
     <string name="people_no_identity_server">Aucun serveur d’identité configuré.</string>
diff --git a/vector/src/main/res/values-hu/strings.xml b/vector/src/main/res/values-hu/strings.xml
index a3d72189ba..870e02fbad 100644
--- a/vector/src/main/res/values-hu/strings.xml
+++ b/vector/src/main/res/values-hu/strings.xml
@@ -1021,7 +1021,7 @@ Vedd figyelembe, hogy az alkalmazás újraindul ami sok időt vehet igénybe.</s
     <string name="room_participants_action_kick">Elküld</string>
     <plurals name="room_participants_kick_prompt_msg">
         <item quantity="one">Ezeket az embereket biztosan kirúgod?</item>
-        <item quantity="other"/>
+        <item quantity="other" />
     </plurals>
     <string name="reason_hint">Ok</string>
 
@@ -1249,11 +1249,11 @@ Figyelmeztetés: ez a fájl törlésre kerülhet, ha az alkalmazást törlik.</s
     <string name="keys_backup_restore_success_description">Visszaállítva: %1$d kapcsolati kulcs, és %2$d kulcs, ami(k) ismeretlenek voltak az eszköz számára, hozzáadva</string>
     <plurals name="keys_backup_restore_success_description_part1">
         <item quantity="one">Visszaállított mentés %d kulccsal.</item>
-        <item quantity="other"/>
+        <item quantity="other" />
     </plurals>
     <plurals name="keys_backup_restore_success_description_part2">
         <item quantity="one">%d új kulcs lett hozzáadva ehhez az eszközhöz.</item>
-        <item quantity="other"/>
+        <item quantity="other" />
     </plurals>
 
     <string name="keys_backup_get_version_error">"Nem sikerült beszerezni a legfrissebb verziójú visszaállítási  kulcsot (%s)."</string>
@@ -1332,7 +1332,7 @@ A Visszaállítási Kulcsot tartsd biztonságos helyen, mint pl. egy jelszókeze
     <string name="keys_backup_info_keys_all_backup_up">Minden kulcs elmentve</string>
     <plurals name="keys_backup_info_keys_backing_up">
         <item quantity="one">%d kulcs mentése…</item>
-        <item quantity="other"/>
+        <item quantity="other" />
     </plurals>
 
     <string name="keys_backup_info_title_version">Verzió</string>
@@ -1633,7 +1633,7 @@ Ha nem te állítottad be a visszaállítási metódust, akkor egy támadó pró
 
     <string name="read_at">Olvasd itt</string>
 
-<string name="none">Nincs</string>
+    <string name="none">Nincs</string>
     <string name="revoke">Visszavon</string>
     <string name="disconnect">Lecsatlakozik</string>
     <string name="people_no_identity_server">Azonosítási szerver nincs beállítva.</string>
diff --git a/vector/src/main/res/values-it/strings.xml b/vector/src/main/res/values-it/strings.xml
index 0e497c8eb0..9697c084d5 100644
--- a/vector/src/main/res/values-it/strings.xml
+++ b/vector/src/main/res/values-it/strings.xml
@@ -1678,7 +1678,7 @@ Per essere certo di non perdere nulla, mantieni gli aggiornamenti attivi."</stri
 
     <string name="read_at">Leggi su</string>
 
-<string name="none">Nessuno</string>
+    <string name="none">Nessuno</string>
     <string name="revoke">Revoca</string>
     <string name="disconnect">Disconnetti</string>
     <string name="people_no_identity_server">Nessun server di identità configurato.</string>
diff --git a/vector/src/main/res/values-ko/strings.xml b/vector/src/main/res/values-ko/strings.xml
index 763d51978e..2b97d0ff8a 100644
--- a/vector/src/main/res/values-ko/strings.xml
+++ b/vector/src/main/res/values-ko/strings.xml
@@ -1556,7 +1556,7 @@
 
     <string name="read_at">읽은 시간</string>
 
-<string name="none">없음</string>
+    <string name="none">없음</string>
     <string name="revoke">취소</string>
     <string name="disconnect">연결 해제</string>
     <string name="people_no_identity_server">설정된 ID 서버가 없습니다.</string>
diff --git a/vector/src/main/res/values-nl/strings.xml b/vector/src/main/res/values-nl/strings.xml
index f099593898..bacc675f86 100644
--- a/vector/src/main/res/values-nl/strings.xml
+++ b/vector/src/main/res/values-nl/strings.xml
@@ -1510,7 +1510,7 @@
     <string name="sas_error_m_user_error">Gebruikers komen niet overeen</string>
     <string name="sas_error_unknown">Onbekende fout</string>
 
-<string name="none">Geen</string>
+    <string name="none">Geen</string>
     <string name="revoke">Intrekken</string>
     <string name="disconnect">Verbinding verbreken</string>
     <string name="review">Nakijken</string>
@@ -1519,4 +1519,4 @@
     <string name="people_no_identity_server">Geen identiteitsserver geconfigureerd.</string>
 
     <string name="call_failed_no_ice_title">Oproep mislukt door verkeerd geconfigureerde server</string>
-    </resources>
+</resources>
diff --git a/vector/src/main/res/values-ru/strings.xml b/vector/src/main/res/values-ru/strings.xml
index 95da308c7d..b26ec299fb 100644
--- a/vector/src/main/res/values-ru/strings.xml
+++ b/vector/src/main/res/values-ru/strings.xml
@@ -96,7 +96,7 @@
         <item quantity="one">%d пользователь</item>
         <item quantity="few">%d пользователя</item>
         <item quantity="many">%d пользователей</item>
-        <item quantity="other"/>
+        <item quantity="other" />
     </plurals>
 
     <string name="send_bug_report_include_logs">Отправить логи</string>
@@ -843,13 +843,13 @@
         <item quantity="one">%d комната</item>
         <item quantity="few">%d комнаты</item>
         <item quantity="many">%d комнат</item>
-        <item quantity="other"/>
+        <item quantity="other" />
     </plurals>
     <plurals name="notification_unread_notified_messages_in_room_rooms">
         <item quantity="one">%d комната</item>
         <item quantity="few">%d комнаты</item>
         <item quantity="many">%d комнат</item>
-        <item quantity="other"/>
+        <item quantity="other" />
     </plurals>
     <string name="notification_unread_notified_messages_in_room">%1$s в %2$s</string>
 
@@ -857,7 +857,7 @@
         <item quantity="one">%d активный виджет</item>
         <item quantity="few">%d активных виджета</item>
         <item quantity="many">%d активных виджетов</item>
-        <item quantity="other"/>
+        <item quantity="other" />
     </plurals>
 
     <!-- Widget Integration Manager -->
@@ -867,45 +867,45 @@
         <item quantity="one">%d активный участник</item>
         <item quantity="few">%d активных участника</item>
         <item quantity="many">%d активных участников</item>
-        <item quantity="other"/>
+        <item quantity="other" />
     </plurals>
     <plurals name="room_title_members">
         <item quantity="one">%d участник</item>
         <item quantity="few">%d участника</item>
         <item quantity="many">%d участников</item>
-        <item quantity="other"/>
+        <item quantity="other" />
     </plurals>
     <plurals name="room_new_messages_notification">
         <item quantity="one">%d новое сообщение</item>
         <item quantity="few">%d новых сообщения</item>
         <item quantity="many">%d новых сообщений</item>
-        <item quantity="other"/>
+        <item quantity="other" />
     </plurals>
 
     <plurals name="directory_search_rooms_for">
         <item quantity="one">%1$s комната найдена для %2$s</item>
         <item quantity="few">%1$s комнаты найдено для %2$s</item>
         <item quantity="many">%1$s комнат найдено для %2$s</item>
-        <item quantity="other"/>
+        <item quantity="other" />
     </plurals>
     <plurals name="membership_changes">
         <item quantity="one">%d изменение членства</item>
         <item quantity="few">%d изменения членства</item>
         <item quantity="many">%d изменений членства</item>
-        <item quantity="other"/>
+        <item quantity="other" />
     </plurals>
 
     <plurals name="notification_unread_notified_messages">
         <item quantity="one">%d непрочитанное уведомление</item>
         <item quantity="few">%d непрочитанных уведомления</item>
         <item quantity="many">%d непрочитанных уведомлений</item>
-        <item quantity="other"/>
+        <item quantity="other" />
     </plurals>
     <plurals name="notification_unread_notified_messages_in_room_msgs">
         <item quantity="one">%d непрочитанное уведомление</item>
         <item quantity="few">%d непрочитанных уведомления</item>
         <item quantity="many">%d непрочитанных уведомлений</item>
-        <item quantity="other"/>
+        <item quantity="other" />
     </plurals>
     <string name="receipt_avatar">Получить аватар</string>
     <string name="notice_avatar">Заметка аватара</string>
@@ -1020,13 +1020,13 @@
         <item quantity="one">%dm</item>
         <item quantity="few">%dm</item>
         <item quantity="many">%dm</item>
-        <item quantity="other"/>
+        <item quantity="other" />
     </plurals>
     <plurals name="format_time_h">
         <item quantity="one">%dh</item>
         <item quantity="few">%dh</item>
         <item quantity="many">%dh</item>
-        <item quantity="other"/>
+        <item quantity="other" />
     </plurals>
     <plurals name="format_time_d">
         <item quantity="one">%d день</item>
@@ -1045,20 +1045,20 @@
         <item quantity="one">%d выбран</item>
         <item quantity="few">%d выбрано</item>
         <item quantity="many">%d выбраны</item>
-        <item quantity="other"/>
+        <item quantity="other" />
     </plurals>
     <plurals name="group_members">
         <item quantity="one">%d участник</item>
         <item quantity="few">%d участника</item>
         <item quantity="many">%d участников</item>
-        <item quantity="other"/>
+        <item quantity="other" />
     </plurals>
 
     <plurals name="group_rooms">
         <item quantity="one">%d комната</item>
         <item quantity="few">%d комнаты</item>
         <item quantity="many">%d комнат</item>
-        <item quantity="other"/>
+        <item quantity="other" />
     </plurals>
     <string name="system_alerts_header">Системные оповещения</string>
 
@@ -1346,7 +1346,7 @@
         <item quantity="one">%d новый ключ был добавлен к этому устройству.</item>
         <item quantity="few">%d новых ключа были добавлены к этому устройству.</item>
         <item quantity="many">%d новых ключей были добавлены к этому устройству.</item>
-        <item quantity="other"/>
+        <item quantity="other" />
     </plurals>
 
     <plurals name="keys_backup_restore_success_description_part1">
@@ -1398,7 +1398,7 @@
         <item quantity="one">Резервное копирование %d ключа…</item>
         <item quantity="few">Резервное копирование %d ключей…</item>
         <item quantity="many">Резервное копирование %d ключей…</item>
-        <item quantity="other"/>
+        <item quantity="other" />
     </plurals>
 
     <string name="keys_backup_info_keys_all_backup_up">Все ключи сохранены</string>
@@ -1725,7 +1725,7 @@
 
     <string name="read_at">Читать в</string>
 
-<string name="none">Никто</string>
+    <string name="none">Никто</string>
     <string name="revoke">Отмена</string>
     <string name="disconnect">Отключить</string>
     <string name="people_no_identity_server">Сервер идентификации не настроен.</string>
diff --git a/vector/src/main/res/values-sq/strings.xml b/vector/src/main/res/values-sq/strings.xml
index 7d7faa061e..b9f3b5d6ff 100644
--- a/vector/src/main/res/values-sq/strings.xml
+++ b/vector/src/main/res/values-sq/strings.xml
@@ -1587,7 +1587,7 @@ Që të garantoni se s’ju shpëton gjë, thjesht mbajeni të aktivizuar mekani
 
     <string name="read_at">Lexoni te</string>
 
-<string name="none">Asnjë</string>
+    <string name="none">Asnjë</string>
     <string name="revoke">Shfuqizoje</string>
     <string name="disconnect">Shkëputu</string>
     <string name="people_no_identity_server">S’ka shërbyes identitetesh të formësuar.</string>
diff --git a/vector/src/main/res/values-sr/strings.xml b/vector/src/main/res/values-sr/strings.xml
index 5d5fb3e9f2..b4d735f8c5 100644
--- a/vector/src/main/res/values-sr/strings.xml
+++ b/vector/src/main/res/values-sr/strings.xml
@@ -1,5 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<resources><string name="light_theme">Светла тема</string>
+<resources>
+    <string name="light_theme">Светла тема</string>
     <string name="dark_theme">Тамна тема</string>
     <string name="black_them">Црна тема</string>
     <string name="status_theme">Status.im тема</string>
@@ -105,4 +106,4 @@
     <string name="auth_password_placeholder">Лозинка</string>
     <string name="auth_new_password_placeholder">Нова лозинка</string>
     <string name="auth_user_name_placeholder">Корисничко име</string>
-    </resources>
+</resources>
diff --git a/vector/src/main/res/values-zh-rTW/strings.xml b/vector/src/main/res/values-zh-rTW/strings.xml
index 9af87fd740..f8e06673be 100644
--- a/vector/src/main/res/values-zh-rTW/strings.xml
+++ b/vector/src/main/res/values-zh-rTW/strings.xml
@@ -1586,7 +1586,7 @@ Matrix 中的消息可見度類似于電子郵件。我們忘記您的郵件意
 
     <string name="read_at">閱讀於</string>
 
-<string name="none">無</string>
+    <string name="none">無</string>
     <string name="revoke">撤銷</string>
     <string name="disconnect">斷線</string>
     <string name="people_no_identity_server">未設定身份識別伺服器。</string>
diff --git a/vector/src/main/res/xml/vector_settings_preferences.xml b/vector/src/main/res/xml/vector_settings_preferences.xml
index 9465ab6254..ed239ad014 100755
--- a/vector/src/main/res/xml/vector_settings_preferences.xml
+++ b/vector/src/main/res/xml/vector_settings_preferences.xml
@@ -48,7 +48,7 @@
             android:persistent="false"
             android:title="@string/settings_discovery_category"
             android:summary="@string/settings_discovery_manage"
-            app:fragment="im.vector.fragments.discovery.VectorSettingsDiscoveryFragment"  />
+            app:fragment="im.vector.fragments.discovery.VectorSettingsDiscoveryFragment" />
 
     </im.vector.preference.VectorPreferenceCategory>
 
@@ -444,7 +444,7 @@
             android:key="SETTINGS_IDENTITY_SERVER_PREFERENCE_KEY"
             android:title="@string/settings_identity_server"
             tools:summary="@string/default_identity_server_url"
-            app:fragment="im.vector.fragments.discovery.VectorSettingsDiscoveryFragment"/>
+            app:fragment="im.vector.fragments.discovery.VectorSettingsDiscoveryFragment" />
 
 
         <im.vector.preference.VectorPreference

From 37740124634357f804634dbca0ac72821c27c35e Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoitm@matrix.org>
Date: Wed, 23 Oct 2019 11:44:57 +0200
Subject: [PATCH 14/77] Fix bad resources values

---
 vector/src/main/res/values-ar/strings.xml        | 2 +-
 vector/src/main/res/values-b+sr+Latn/strings.xml | 4 ++--
 vector/src/main/res/values-el/strings.xml        | 2 +-
 vector/src/main/res/values-sr/strings.xml        | 2 ++
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/vector/src/main/res/values-ar/strings.xml b/vector/src/main/res/values-ar/strings.xml
index 8730af8a90..3b5b373d0b 100644
--- a/vector/src/main/res/values-ar/strings.xml
+++ b/vector/src/main/res/values-ar/strings.xml
@@ -1,6 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
     <string name="resources_language">ar</string>
+    <string name="resources_country_code">SA</string>
 
     <string name="light_theme">السمة الفاتحة</string>
     <string name="dark_theme">السمة الداكنة</string>
@@ -371,7 +372,6 @@
 
     <!-- share keys -->
     <string name="conference_call_warning_title">تحذير!</string>
-    <string name="resources_country_code">العربية</string>
 
     <string name="room_unknown_devices_messages_notification">لم تُرسل الرسائل بسبب وجود أجهزة مجهولة. ماذا أفعل؟ %1$s. ‏%2$s.</string>
     <string name="room_settings_addresses_invalid_format_dialog_body">ليس ’⁨%s⁩‘ تنسيقا صالحا لاختصار</string>
diff --git a/vector/src/main/res/values-b+sr+Latn/strings.xml b/vector/src/main/res/values-b+sr+Latn/strings.xml
index 605af19db6..07f02a0e81 100644
--- a/vector/src/main/res/values-b+sr+Latn/strings.xml
+++ b/vector/src/main/res/values-b+sr+Latn/strings.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-    <string name="resources_language">en</string>
-    <string name="resources_country_code">US</string>
+    <string name="resources_language">sr</string>
+    <string name="resources_country_code">RS</string>
 
     <string name="light_theme">Svetla Tema</string>
     <string name="dark_theme">Tamna Tema</string>
diff --git a/vector/src/main/res/values-el/strings.xml b/vector/src/main/res/values-el/strings.xml
index 6e4706bc63..4b70066fe4 100644
--- a/vector/src/main/res/values-el/strings.xml
+++ b/vector/src/main/res/values-el/strings.xml
@@ -3,7 +3,7 @@
     <!-- use to retrieve the supported languages list -->
     <!-- should the same value as the file name -->
     <string name="resources_language">el</string>
-    <string name="resources_country_code">ΕL</string>
+    <string name="resources_country_code">GR</string>
 
 
     <string name="cancel">Ακύρωση</string>
diff --git a/vector/src/main/res/values-sr/strings.xml b/vector/src/main/res/values-sr/strings.xml
index b4d735f8c5..f8dc41af7b 100644
--- a/vector/src/main/res/values-sr/strings.xml
+++ b/vector/src/main/res/values-sr/strings.xml
@@ -1,5 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+    <string name="resources_language">sr</string>
+    <string name="resources_country_code">RS</string>
     <string name="light_theme">Светла тема</string>
     <string name="dark_theme">Тамна тема</string>
     <string name="black_them">Црна тема</string>

From 5af31c405366b62f498efe88658a165055a0b6fb Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoitm@matrix.org>
Date: Wed, 23 Oct 2019 11:48:51 +0200
Subject: [PATCH 15/77] Support Cyrillic languages variant

---
 .../java/im/vector/settings/VectorLocale.kt   | 46 ++++++++++++++++---
 .../src/main/res/values-b+sr+Latn/strings.xml |  1 +
 vector/src/main/res/values-sr/strings.xml     |  2 +
 vector/src/main/res/values/strings.xml        |  2 +
 4 files changed, 45 insertions(+), 6 deletions(-)

diff --git a/vector/src/main/java/im/vector/settings/VectorLocale.kt b/vector/src/main/java/im/vector/settings/VectorLocale.kt
index 139f6246eb..eb318a3464 100644
--- a/vector/src/main/java/im/vector/settings/VectorLocale.kt
+++ b/vector/src/main/java/im/vector/settings/VectorLocale.kt
@@ -21,7 +21,6 @@ import android.content.res.Configuration
 import android.os.Build
 import android.preference.PreferenceManager
 import android.text.TextUtils
-import android.util.Pair
 import androidx.core.content.edit
 import im.vector.R
 import kotlinx.coroutines.GlobalScope
@@ -38,6 +37,7 @@ object VectorLocale {
     private const val APPLICATION_LOCALE_COUNTRY_KEY = "APPLICATION_LOCALE_COUNTRY_KEY"
     private const val APPLICATION_LOCALE_VARIANT_KEY = "APPLICATION_LOCALE_VARIANT_KEY"
     private const val APPLICATION_LOCALE_LANGUAGE_KEY = "APPLICATION_LOCALE_LANGUAGE_KEY"
+    private const val APPLICATION_LOCALE_SCRIPT_KEY = "APPLICATION_LOCALE_SCRIPT_KEY"
 
     private val defaultLocale = Locale("en", "US")
 
@@ -109,6 +109,15 @@ object VectorLocale {
             } else {
                 putString(APPLICATION_LOCALE_VARIANT_KEY, variant)
             }
+
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+                val script = locale.script
+                if (TextUtils.isEmpty(script)) {
+                    remove(APPLICATION_LOCALE_SCRIPT_KEY)
+                } else {
+                    putString(APPLICATION_LOCALE_SCRIPT_KEY, script)
+                }
+            }
         }
     }
 
@@ -157,24 +166,43 @@ object VectorLocale {
      * @param context the context
      */
     private fun initApplicationLocales(context: Context) {
-        val knownLocalesSet = HashSet<Pair<String, String>>()
+        val knownLocalesSet = HashSet<Triple<String, String, String>>()
 
         try {
             val availableLocales = Locale.getAvailableLocales()
 
             for (locale in availableLocales) {
-                knownLocalesSet.add(Pair(getString(context, locale, R.string.resources_language),
-                        getString(context, locale, R.string.resources_country_code)))
+                knownLocalesSet.add(
+                        Triple(
+                                getString(context, locale, R.string.resources_language),
+                                getString(context, locale, R.string.resources_country_code),
+                                getString(context, locale, R.string.resources_script)
+                        ))
             }
         } catch (e: Exception) {
             Log.e(LOG_TAG, "## getApplicationLocales() : failed " + e.message, e)
-            knownLocalesSet.add(Pair(context.getString(R.string.resources_language), context.getString(R.string.resources_country_code)))
+            knownLocalesSet.add(
+                    Triple(
+                            context.getString(R.string.resources_language),
+                            context.getString(R.string.resources_country_code),
+                            context.getString(R.string.resources_script)
+                    ))
         }
 
         supportedLocales.clear()
 
         for (knownLocale in knownLocalesSet) {
-            supportedLocales.add(Locale(knownLocale.first, knownLocale.second))
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+                supportedLocales.add(
+                        Locale.Builder()
+                                .setLanguage(knownLocale.first)
+                                .setRegion(knownLocale.second)
+                                .setScript(knownLocale.third)
+                                .build()
+                )
+            } else {
+                supportedLocales.add(Locale(knownLocale.first, knownLocale.second))
+            }
         }
 
         // sort by human display names
@@ -190,6 +218,12 @@ object VectorLocale {
     fun localeToLocalisedString(locale: Locale): String {
         var res = locale.getDisplayLanguage(locale)
 
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            if (locale.script != "Latn" && !TextUtils.isEmpty(locale.getDisplayScript(locale))) {
+                res += " - " + locale.getDisplayScript(locale)
+            }
+        }
+
         if (!TextUtils.isEmpty(locale.getDisplayCountry(locale))) {
             res += " (" + locale.getDisplayCountry(locale) + ")"
         }
diff --git a/vector/src/main/res/values-b+sr+Latn/strings.xml b/vector/src/main/res/values-b+sr+Latn/strings.xml
index 07f02a0e81..8bce8a32ff 100644
--- a/vector/src/main/res/values-b+sr+Latn/strings.xml
+++ b/vector/src/main/res/values-b+sr+Latn/strings.xml
@@ -2,6 +2,7 @@
 <resources>
     <string name="resources_language">sr</string>
     <string name="resources_country_code">RS</string>
+    <string name="resources_script">Latn</string>
 
     <string name="light_theme">Svetla Tema</string>
     <string name="dark_theme">Tamna Tema</string>
diff --git a/vector/src/main/res/values-sr/strings.xml b/vector/src/main/res/values-sr/strings.xml
index f8dc41af7b..121589a6cd 100644
--- a/vector/src/main/res/values-sr/strings.xml
+++ b/vector/src/main/res/values-sr/strings.xml
@@ -2,6 +2,8 @@
 <resources>
     <string name="resources_language">sr</string>
     <string name="resources_country_code">RS</string>
+    <string name="resources_script">Cyrl</string>
+
     <string name="light_theme">Светла тема</string>
     <string name="dark_theme">Тамна тема</string>
     <string name="black_them">Црна тема</string>
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index de8d1d9e22..9134124b67 100755
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -5,6 +5,8 @@
 
     <string name="resources_language">en</string>
     <string name="resources_country_code">US</string>
+    <!-- Note to translators: Possible values: Latn or Cyrl -->
+    <string name="resources_script">Latn</string>
 
     <!-- theme -->
     <string name="light_theme">Light Theme</string>

From c060aa8dfce6192c6344e59de37d265bcd88d683 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoitm@matrix.org>
Date: Wed, 23 Oct 2019 11:58:40 +0200
Subject: [PATCH 16/77] Display locales in the current locale in debug mode

---
 .../java/im/vector/settings/VectorLocale.kt   | 49 +++++++++++++------
 vector/src/main/res/layout/item_locale.xml    |  9 ++--
 2 files changed, 38 insertions(+), 20 deletions(-)

diff --git a/vector/src/main/java/im/vector/settings/VectorLocale.kt b/vector/src/main/java/im/vector/settings/VectorLocale.kt
index eb318a3464..3ba74c1945 100644
--- a/vector/src/main/java/im/vector/settings/VectorLocale.kt
+++ b/vector/src/main/java/im/vector/settings/VectorLocale.kt
@@ -20,8 +20,8 @@ import android.content.Context
 import android.content.res.Configuration
 import android.os.Build
 import android.preference.PreferenceManager
-import android.text.TextUtils
 import androidx.core.content.edit
+import im.vector.BuildConfig
 import im.vector.R
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
@@ -69,7 +69,7 @@ object VectorLocale {
 
             // detect if the default language is used
             val defaultStringValue = getString(context, defaultLocale, R.string.resources_country_code)
-            if (TextUtils.equals(defaultStringValue, getString(context, applicationLocale, R.string.resources_country_code))) {
+            if (defaultStringValue == getString(context, applicationLocale, R.string.resources_country_code)) {
                 applicationLocale = defaultLocale
             }
 
@@ -90,21 +90,21 @@ object VectorLocale {
 
         PreferenceManager.getDefaultSharedPreferences(context).edit {
             val language = locale.language
-            if (TextUtils.isEmpty(language)) {
+            if (language.isEmpty()) {
                 remove(APPLICATION_LOCALE_LANGUAGE_KEY)
             } else {
                 putString(APPLICATION_LOCALE_LANGUAGE_KEY, language)
             }
 
             val country = locale.country
-            if (TextUtils.isEmpty(country)) {
+            if (country.isEmpty()) {
                 remove(APPLICATION_LOCALE_COUNTRY_KEY)
             } else {
                 putString(APPLICATION_LOCALE_COUNTRY_KEY, country)
             }
 
             val variant = locale.variant
-            if (TextUtils.isEmpty(variant)) {
+            if (variant.isEmpty()) {
                 remove(APPLICATION_LOCALE_VARIANT_KEY)
             } else {
                 putString(APPLICATION_LOCALE_VARIANT_KEY, variant)
@@ -112,7 +112,7 @@ object VectorLocale {
 
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
                 val script = locale.script
-                if (TextUtils.isEmpty(script)) {
+                if (script.isEmpty()) {
                     remove(APPLICATION_LOCALE_SCRIPT_KEY)
                 } else {
                     putString(APPLICATION_LOCALE_SCRIPT_KEY, script)
@@ -216,19 +216,38 @@ object VectorLocale {
      * @return the string
      */
     fun localeToLocalisedString(locale: Locale): String {
-        var res = locale.getDisplayLanguage(locale)
+        return buildString {
+            append(locale.getDisplayLanguage(locale))
+
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP
+                    && locale.script != "Latn"
+                    && locale.getDisplayScript(locale).isNotEmpty()) {
+                append(" - ")
+                append(locale.getDisplayScript(locale))
+            }
 
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            if (locale.script != "Latn" && !TextUtils.isEmpty(locale.getDisplayScript(locale))) {
-                res += " - " + locale.getDisplayScript(locale)
+            if (locale.getDisplayCountry(locale).isNotEmpty()) {
+                append(" (")
+                append(locale.getDisplayCountry(locale))
+                append(")")
             }
-        }
 
-        if (!TextUtils.isEmpty(locale.getDisplayCountry(locale))) {
-            res += " (" + locale.getDisplayCountry(locale) + ")"
+            // In debug mode, also display information about the locale in the current locale.
+            if (BuildConfig.DEBUG) {
+                append("\n[")
+                append(locale.displayLanguage)
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP && locale.script != "Latn") {
+                    append(" - ")
+                    append(locale.displayScript)
+                }
+                if (locale.displayCountry.isNotEmpty()) {
+                    append(" (")
+                    append(locale.displayCountry)
+                    append(")")
+                }
+                append("]")
+            }
         }
-
-        return res
     }
 }
 
diff --git a/vector/src/main/res/layout/item_locale.xml b/vector/src/main/res/layout/item_locale.xml
index a418f9beba..fb58b84c01 100644
--- a/vector/src/main/res/layout/item_locale.xml
+++ b/vector/src/main/res/layout/item_locale.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -15,8 +15,7 @@
         android:id="@+id/locale_text_view"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:ellipsize="end"
-        android:maxLines="1"
         android:textSize="16sp"
-        tools:text="A locale here" />
-</RelativeLayout>
\ No newline at end of file
+        tools:text="English (United States)" />
+
+</FrameLayout>
\ No newline at end of file

From d22f5f70fbb14335215e70d8fb755bda980bc6f9 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoitm@matrix.org>
Date: Wed, 23 Oct 2019 13:44:28 +0200
Subject: [PATCH 17/77] Remove country code for Arabic

---
 vector/src/main/res/values-ar/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vector/src/main/res/values-ar/strings.xml b/vector/src/main/res/values-ar/strings.xml
index 3b5b373d0b..35e8f246aa 100644
--- a/vector/src/main/res/values-ar/strings.xml
+++ b/vector/src/main/res/values-ar/strings.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
     <string name="resources_language">ar</string>
-    <string name="resources_country_code">SA</string>
+    <string name="resources_country_code">""</string>
 
     <string name="light_theme">السمة الفاتحة</string>
     <string name="dark_theme">السمة الداكنة</string>

From 1d95859b23ebf2542d6620904e0caff0456dcace Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoitm@matrix.org>
Date: Wed, 23 Oct 2019 14:11:23 +0200
Subject: [PATCH 18/77] Add strings for RiotX

---
 vector/src/main/res/values/strings.xml | 61 ++++++++++++++++++++++++++
 1 file changed, 61 insertions(+)

diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index 9134124b67..3d20bdf5c3 100755
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -1709,4 +1709,65 @@ Not all features in Riot are implemented in RiotX yet. Main missing (and coming
 
     <string name="settings_discovery_disconnect_with_bound_pid">You are currently sharing email addresses or phone numbers on the identity server %s. You will need to reconnect to %s to stop sharing them.</string>
     <string name="settings_agree_to_terms">Agree to the identity server (%s) Terms of Service to allow yourself to be discoverable by email address or phone number.</string>
+
+    <string name="labs_allow_extended_logging">Enable verbose logs.</string>
+    <string name="labs_allow_extended_logging_summary">Verbose logs will help developers by providing more logs when you send a RageShake. Even when enabled, the application does not log message contents or any other private data.</string>
+
+
+    <string name="error_terms_not_accepted">Please retry once you have accepted the terms and conditions of your homeserver.</string>
+
+    <string name="error_network_timeout">Looks like the server is taking to long to respond, this can be caused by either poor connectivity or an error with our servers. Please try again in a while.</string>
+
+    <string name="send_attachment">Send attachment</string>
+
+    <string name="a11y_open_drawer">Open the navigation drawer</string>
+    <string name="a11y_create_menu_open">Open the create room menu</string>
+    <string name="a11y_create_menu_close">Close the create room menu…</string>
+    <string name="a11y_create_direct_message">Create a new direct conversation</string>
+    <string name="a11y_create_room">Create a new room</string>
+    <string name="a11y_close_keys_backup_banner">Close keys backup banner</string>
+    <string name="a11y_show_password">Show password</string>
+    <string name="a11y_hide_password">Hide password</string>
+    <string name="a11y_jump_to_bottom">Jump to bottom</string>
+
+    <!-- Read receipts list a11y -->
+    <string name="two_and_some_others_read">%1$s, %2$s and %3$d others read</string>
+    <string name="three_users_read">%1$s, %2$s and %3$s read</string>
+    <string name="two_users_read">%1$s and %2$s read</string>
+    <string name="one_user_read">%s read</string>
+    <plurals name="fallback_users_read">
+        <item quantity="one">1 user read</item>
+        <item quantity="other">%d users read</item>
+    </plurals>
+
+    <string name="error_file_too_big">"The file '%1$s' (%2$s) is too large to upload. The limit is %3$s."</string>
+
+    <string name="error_attachment">"An error occurred while retrieving the attachment."</string>
+    <string name="attachment_type_file">"File"</string>
+    <string name="attachment_type_contact">"Contact"</string>
+    <string name="attachment_type_camera">"Camera"</string>
+    <string name="attachment_type_audio">"Audio"</string>
+    <string name="attachment_type_gallery">"Gallery"</string>
+    <string name="attachment_type_sticker">"Sticker"</string>
+    <string name="error_handling_incoming_share">Couldn\'t handle share data</string>
+
+    <string name="report_content_spam">"It's spam"</string>
+    <string name="report_content_inappropriate">"It's inappropriate"</string>
+    <string name="report_content_custom">"Custom report"</string>
+    <string name="report_content_custom_title">"Report this content"</string>
+    <string name="report_content_custom_hint">"Reason for reporting this content"</string>
+    <string name="report_content_custom_submit">"REPORT"</string>
+    <string name="block_user">"BLOCK USER"</string>
+
+    <string name="content_reported_title">"Content reported"</string>
+    <string name="content_reported_content">"This content was reported.\n\nIf you don't want to see any more content from this user, you can block him to hide his messages"</string>
+    <string name="content_reported_as_spam_title">"Reported as spam"</string>
+    <string name="content_reported_as_spam_content">"This content was reported as spam.\n\nIf you don't want to see any more content from this user, you can block him to hide his messages"</string>
+    <string name="content_reported_as_inappropriate_title">"Reported as inappropriate"</string>
+    <string name="content_reported_as_inappropriate_content">"This content was reported as inappropriate.\n\nIf you don't want to see any more content from this user, you can block him to hide his messages"</string>
+
+    <string name="permissions_rationale_msg_keys_backup_export">Riot needs permission to save your E2E keys on disk.\n\nPlease allow access on the next pop-up to be able to export your keys manually.</string>
+
+    <string name="no_network_indicator">There is no network connection right now</string>
+
 </resources>

From b132d691a64eae4aa67630065aa5ad8a10b677b8 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoitm@matrix.org>
Date: Wed, 23 Oct 2019 14:14:01 +0200
Subject: [PATCH 19/77] Creation of direct chat room is supported now

---
 vector/src/main/res/values-bg/strings.xml     | 2 +-
 vector/src/main/res/values-eu/strings.xml     | 2 +-
 vector/src/main/res/values-fr/strings.xml     | 2 +-
 vector/src/main/res/values-hu/strings.xml     | 2 +-
 vector/src/main/res/values-it/strings.xml     | 2 +-
 vector/src/main/res/values-ko/strings.xml     | 2 +-
 vector/src/main/res/values-ru/strings.xml     | 2 +-
 vector/src/main/res/values-sq/strings.xml     | 2 +-
 vector/src/main/res/values-zh-rTW/strings.xml | 2 +-
 vector/src/main/res/values/strings.xml        | 1 -
 10 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/vector/src/main/res/values-bg/strings.xml b/vector/src/main/res/values-bg/strings.xml
index 077da3b3d0..e03e174e54 100644
--- a/vector/src/main/res/values-bg/strings.xml
+++ b/vector/src/main/res/values-bg/strings.xml
@@ -1558,7 +1558,7 @@
 \n
 \nRiotX поддържа: • Вход в съществуващ акаунт • Създаване на стая и влизане в публични стаи • Приемане и отхвърляне на покани • Показване на списък със стаите • Преглеждане на информация за стая • Изпращане на текстови съобщения • Изпращане на прикачени файлове • Четене и писане на съобщения в шифровани стаи • Шифроване: резервни копия на E2E ключове, потвърждение на устройства, заявяване и отговаряне на заявки за споделяне на ключове • Уведомления • Светла, Тъмна и Черна тема
 \n
-\nЗасега не всички функции на Riot са налични в RiotX. Основни липсващи (и скоро пристигащи!) функции са: • Създаване на нов профил • Настройки на стаи (показване на членове и т.н.) • Създаване на директни чатове • Обаждания • Приспособления • …</string>
+\nЗасега не всички функции на Riot са налични в RiotX. Основни липсващи (и скоро пристигащи!) функции са: • Създаване на нов профил • Настройки на стаи (показване на членове и т.н.) • Обаждания • Приспособления • …</string>
 
     <string name="bottom_action_people_x">Директни съобщения</string>
 
diff --git a/vector/src/main/res/values-eu/strings.xml b/vector/src/main/res/values-eu/strings.xml
index 632522c518..71b5a6ab30 100644
--- a/vector/src/main/res/values-eu/strings.xml
+++ b/vector/src/main/res/values-eu/strings.xml
@@ -1564,7 +1564,7 @@ Abisua: Fitxategi hau ezabatu daiteke aplikazioa desinstalatzen bada.</string>
 \n
 \nRiotX bezeroak honakoa ahalbidetzen du: • Badagoen kontu batean saioa hasi • Gelak sortu eta gela publikoetara elkartu • Gonbidapenak onartu edo ukatu • Erabiltzailearen gelak zerrendatu • Gelaren xehetasunak ikusi • Testuzko mezuak bidali • Eranskinak bidali • Zifratutako geletan mezuak irakurri eta idatzi • Zifratzea: E2Egakoen babeskopia, gailuaren egiaztaketa aurreratua, gakoa partekatzeko eskaria eta erantzuna • Push jakinarazpena • Gai argia, iluna eta beltza
 \n
-\nEz dira oraindik Riot bezeroaren ezaugarri guztiak ezarri RiotX bezeroan. Falta diren (eta laster etorriko direnen) artean nabarmenak dira: • Kontua sortzea • Gelaren ezarpenak (gelako kideak zerrendatzea, eta abar.) • Txat zuzenerako gelak sortzea • Deiak • Trepetak • …</string>
+\nEz dira oraindik Riot bezeroaren ezaugarri guztiak ezarri RiotX bezeroan. Falta diren (eta laster etorriko direnen) artean nabarmenak dira: • Kontua sortzea • Gelaren ezarpenak (gelako kideak zerrendatzea, eta abar.) • Deiak • Trepetak • …</string>
 
     <string name="push_gateway_item_app_display_name">app_display_name:</string>
     <string name="bottom_action_people_x">Mezu zuzenak</string>
diff --git a/vector/src/main/res/values-fr/strings.xml b/vector/src/main/res/values-fr/strings.xml
index 79234af764..3ca4f03934 100644
--- a/vector/src/main/res/values-fr/strings.xml
+++ b/vector/src/main/res/values-fr/strings.xml
@@ -1570,7 +1570,7 @@ Si vous n’avez pas configuré de nouvelle méthode de récupération, un attaq
 \n
 \nRiotX prend en charge : • Se connecter à un compte existant • Créer de salons et rejoindre des salons publics • Accepter et refuser des invitations • Lister les salons des utilisateurs • Voir les informations des salons • Envoyer des messages texte • Envoyer des pièces jointes • Lire et écrire des messages dans les salons chiffrés • Chiffrement : sauvegarde des clés de chiffrement, vérification avancée des appareils, demande et réponse de partage de clé • Notifications • Thèmes clair, sombre et noir
 \n
-\nToutes les fonctionnalités de Riot ne sont pas encore implémentées dans RiotX. Principales fonctionnalités manquantes (et qui arrivent bientôt !) : • Création de compte • Réglages des salons (lister les membres du salon etc.) • Création de salons de discussion directe • Appels • Widgets • …</string>
+\nToutes les fonctionnalités de Riot ne sont pas encore implémentées dans RiotX. Principales fonctionnalités manquantes (et qui arrivent bientôt !) : • Création de compte • Réglages des salons (lister les membres du salon etc.) • Appels • Widgets • …</string>
 
     <string name="bottom_action_people_x">Messages directs</string>
 
diff --git a/vector/src/main/res/values-hu/strings.xml b/vector/src/main/res/values-hu/strings.xml
index 870e02fbad..255887c340 100644
--- a/vector/src/main/res/values-hu/strings.xml
+++ b/vector/src/main/res/values-hu/strings.xml
@@ -1569,7 +1569,7 @@ Ha nem te állítottad be a visszaállítási metódust, akkor egy támadó pró
 \n
 \nRiotX ezeket támogatja: • Bejelentkezés létező fiókba • Szoba készítés és nyilvános szobába való belépés • Meghívók fogadása és elutasítás • Felhasználók szobáinak listázása • Szoba adatainak megtekintése • Szöveges üzenet küldése • Csatolmány küldése • Titkosított szobákban üzenetek olvasása és írása • Titkosítás: Végponttól végpontig titkosító kulcsok mentése, fejlett eszköz ellenőrzés, kulcs megosztás kérése és válasz • „Push” értesítések • Világos, sötét és fekete téma
 \n
-\nNem minden Riot funkció támogatott a RiotX-ben jelenleg. A fő hiányzó (és hamarosan elérhető!) funkciók: • Felhasználói fiók létrehozása • Szoba beállítások (szoba tagság mutatása, stb…) • Közvetlen beszélgetések indítása • Hívások • Kisalkalmazások • …</string>
+\nNem minden Riot funkció támogatott a RiotX-ben jelenleg. A fő hiányzó (és hamarosan elérhető!) funkciók: • Felhasználói fiók létrehozása • Szoba beállítások (szoba tagság mutatása, stb…) • Hívások • Kisalkalmazások • …</string>
 
     <string name="bottom_action_people_x">Közvetlen beszélgetés</string>
 
diff --git a/vector/src/main/res/values-it/strings.xml b/vector/src/main/res/values-it/strings.xml
index 9697c084d5..4e41ad0a6c 100644
--- a/vector/src/main/res/values-it/strings.xml
+++ b/vector/src/main/res/values-it/strings.xml
@@ -1613,7 +1613,7 @@ Per essere certo di non perdere nulla, mantieni gli aggiornamenti attivi."</stri
 \n
 \nRiotX supporta: • Accesso ad account esistente • Crea stanze ed entra in stanze pubbliche • Accetta e rifiuta inviti • Elenca stanze utenti • Vedi dettagli stanza • Invia messaggi di testo • Invia allegati • Leggi e scrivi messaggi in stanze cifrate • Crypto: backup chiavi E2E, verifica avanzata dispositivi, richiesta e risposta condivisione chiavi • Notifiche push • Tema chiaro, scuro e nero
 \n
-\nNon tutte le funzioni di Riot sono già implementate in RiotX. Principali funzioni mancanti (prossimamente!): • Creazione account • Impostazioni stanza (elenca membri stanza, ecc.) • Creazione di stanze di chat diretta • Chiamate • Widget • …</string>
+\nNon tutte le funzioni di Riot sono già implementate in RiotX. Principali funzioni mancanti (prossimamente!): • Creazione account • Impostazioni stanza (elenca membri stanza, ecc.) • Chiamate • Widget • …</string>
 
     <string name="room_list_catchup_empty_title">Non hai nulla di nuovo da vedere!</string>
     <string name="bottom_action_people_x">Messaggi diretti</string>
diff --git a/vector/src/main/res/values-ko/strings.xml b/vector/src/main/res/values-ko/strings.xml
index 2b97d0ff8a..ad1716f70b 100644
--- a/vector/src/main/res/values-ko/strings.xml
+++ b/vector/src/main/res/values-ko/strings.xml
@@ -1495,7 +1495,7 @@
 \n 
 \nRiotX 지원: • 존재하는 계정으로 로그인 • 방을 만들고 공공 방에 참가 • 초대를 수락하거나 거절 • 사용자 방 목록 • 방 세부 정보 보기 • 문자 메시지 보내기 • 첨부 파일 보내기 • 암호화된 방에서 메시지 읽고 쓰기 • 암호화: 종단간 암호화 키 백업, 고급 기기 확인, 키 공유 요청과 답장 • 푸시 알림 • 밝은 테마, 어두운 테마 그리고 검정 테마 
 \n 
-\n아직 Riot의 모든 기능이 RiotX에 구현되지 않았습니다. 주요 없는 (그리고 곧 나올!) 기능: • 계정 만들기 • 방 설정 (방 구성원 목록 등) • 다이렉트 대화 방 만들기 • 전화 • 위젯 • …</string>
+\n아직 Riot의 모든 기능이 RiotX에 구현되지 않았습니다. 주요 없는 (그리고 곧 나올!) 기능: • 계정 만들기 • 방 설정 (방 구성원 목록 등) • 전화 • 위젯 • …</string>
 
     <string name="bottom_action_people_x">다이렉트 메시지</string>
 
diff --git a/vector/src/main/res/values-ru/strings.xml b/vector/src/main/res/values-ru/strings.xml
index b26ec299fb..145bb548c8 100644
--- a/vector/src/main/res/values-ru/strings.xml
+++ b/vector/src/main/res/values-ru/strings.xml
@@ -1659,7 +1659,7 @@
 \n 
 \nПоддержка RiotX: - Войти в существующую учетную запись - Создать комнату и присоединиться к общедоступным комнатам - Принять и отклонить приглашения - Список комнат пользователей - Просмотр сведений о комнате - Отправить текстовые сообщения - Отправить вложение - Читать и писать сообщения в зашифрованных комнатах - Криптография: Резервное копирование клавиш E2E, предварительная проверка устройства, запрос и ответ на общий доступ к ключам - Нажмите уведомление - Светлые и черные темы 
 \n 
-\nНе все функции Riot пока реализованы в RiotX. Основные отсутствующие (и скоро появятся!) свойства: - Создание учетной записи - Настройки комнат (список членов комнат и т.д.) - Создание прямых чатов - Вызовы - Виджеты - .…</string>
+\nНе все функции Riot пока реализованы в RiotX. Основные отсутствующие (и скоро появятся!) свойства: - Создание учетной записи - Настройки комнат (список членов комнат и т.д.) - Вызовы - Виджеты - .…</string>
 
     <string name="room_preview_world_readable_room_not_supported_yet">Предварительный просмотр открытой комнаты в RiotX пока не поддерживается</string>
 
diff --git a/vector/src/main/res/values-sq/strings.xml b/vector/src/main/res/values-sq/strings.xml
index b9f3b5d6ff..ea8a599718 100644
--- a/vector/src/main/res/values-sq/strings.xml
+++ b/vector/src/main/res/values-sq/strings.xml
@@ -1521,7 +1521,7 @@ Që të garantoni se s’ju shpëton gjë, thjesht mbajeni të aktivizuar mekani
 \n
 \nRiotX-i mbulon: • Hyrje në një llogari ekzistuese • Krijim dhome dhe pjesëmarrje në dhoma publike • Pranim dhe hedhje poshtë ftesash • Njohje të dhomave të përdoruesve • Parje hollësish dhome • Dërgim mesazhesh tekst • Dërgim bashkëngjitjesh • Lexim dhe shkrim mesazhesh në dhoma të fshehtëzuara • Kriptografi: kopjeruajtje kyçesh E2E, verifikim i thelluar pajisjesh, kërkesa dhe përgjigje për ndarje kyçesh • Njoftime push • Tema të Çelëta, të Errëta dhe të Zeza
 \n
-\nNë RiotX s’janë sendërtuar ende krejt veçoritë e Riot-it. Veçori kryesore që mungojnë (dhe që do të vijnë së shpejti!): • Krijim llogarish • Rregullime dhome (shfaqje anëtarësh dhome, etj.) • Krijim dhomash fjalosjeje të drejtpërdrejtë • Thirrje • Widget-es • …</string>
+\nNë RiotX s’janë sendërtuar ende krejt veçoritë e Riot-it. Veçori kryesore që mungojnë (dhe që do të vijnë së shpejti!): • Krijim llogarish • Rregullime dhome (shfaqje anëtarësh dhome, etj.) • Thirrje • Widget-es • …</string>
 
     <string name="settings_integration_manager">Përgjegjës Integrimesh</string>
 
diff --git a/vector/src/main/res/values-zh-rTW/strings.xml b/vector/src/main/res/values-zh-rTW/strings.xml
index f8e06673be..cd81aea785 100644
--- a/vector/src/main/res/values-zh-rTW/strings.xml
+++ b/vector/src/main/res/values-zh-rTW/strings.xml
@@ -1522,7 +1522,7 @@ Matrix 中的消息可見度類似于電子郵件。我們忘記您的郵件意
 \n
 \nRiotX 支援：• 登入到既有的帳號 • 建立聊天室與加入公開聊天室 • 接受與回絕邀請 • 列出使用者聊天室 • 檢視聊天室詳細資訊 • 傳送文字訊息 • 傳送附件 • 讀取與編寫已加密的聊天室 • 加密：E2E 金鑰備份、進階裝置驗證、金鑰分享請求與回應 • 推送通知 • 亮、暗與黑色主題
 \n
-\n不是所有 Riot 的功能都已在 RiotX 中實作。主要缺少（會在稍後到來！）的功能：• 建立帳號 • 聊天室設定（列出聊天室成員等） • 直接聊天室建立 • 通話 • 小工具 • …</string>
+\n不是所有 Riot 的功能都已在 RiotX 中實作。主要缺少（會在稍後到來！）的功能：• 建立帳號 • 聊天室設定（列出聊天室成員等） • 通話 • 小工具 • …</string>
 
     <string name="bottom_action_people_x">直接訊息</string>
 
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index 3d20bdf5c3..8d5e211fbd 100755
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -1628,7 +1628,6 @@ RiotX supports:
 Not all features in Riot are implemented in RiotX yet. Main missing (and coming soon!) features:
 • Account creation
 • Room settings (list room members, etc.)
-• Creation of direct chat rooms
 • Calls
 • Widgets
 • …"</string>

From 8e73b4e0a109947451bf46bbff95aacc81171005 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoitm@matrix.org>
Date: Wed, 23 Oct 2019 15:16:22 +0200
Subject: [PATCH 20/77] Fix warning

---
 vector/src/main/res/values-eu/strings.xml     | 2 +-
 vector/src/main/res/values-fi/strings.xml     | 2 +-
 vector/src/main/res/values-fr/strings.xml     | 2 +-
 vector/src/main/res/values-hu/strings.xml     | 2 +-
 vector/src/main/res/values-it/strings.xml     | 2 +-
 vector/src/main/res/values-ko/strings.xml     | 2 +-
 vector/src/main/res/values-ru/strings.xml     | 2 +-
 vector/src/main/res/values-sq/strings.xml     | 2 +-
 vector/src/main/res/values-zh-rTW/strings.xml | 2 +-
 vector/src/main/res/values/strings.xml        | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/vector/src/main/res/values-eu/strings.xml b/vector/src/main/res/values-eu/strings.xml
index 71b5a6ab30..9e02bf8103 100644
--- a/vector/src/main/res/values-eu/strings.xml
+++ b/vector/src/main/res/values-eu/strings.xml
@@ -1695,6 +1695,6 @@ Abisua: Fitxategi hau ezabatu daiteke aplikazioa desinstalatzen bada.</string>
     <string name="settings_discovery_no_terms">Hautatu duzun identitate-zerbitzariak ez du erabilera baldintzarik. Jarraitu soilik zerbitzuaren jabea fidagarritzat jotzen baduzu</string>
     <string name="settings_text_message_sent">SMS mezu bat bidali zaizu %s zenbakira. Sartu hemen mezu horrek daukan egiaztatze-kodea.</string>
 
-    <string name="settings_discovery_disconnect_with_bound_pid">Orain e-mail helbideak edo telefono zenbakiak partekatzen dituzu %s zerbitzarian. %s zerbitzarira konektatu beharko zara partekatzeari uzteko.</string>
+    <string name="settings_discovery_disconnect_with_bound_pid">Orain e-mail helbideak edo telefono zenbakiak partekatzen dituzu %1$s zerbitzarian. %2$s zerbitzarira konektatu beharko zara partekatzeari uzteko.</string>
     <string name="settings_agree_to_terms">Onartu %s identitate-zerbitzariaren erabilera baldintzak besteek zu e-mail helbidea edo telefonoa erabiliz aurkitzea ahalbidetzeko.</string>
 </resources>
diff --git a/vector/src/main/res/values-fi/strings.xml b/vector/src/main/res/values-fi/strings.xml
index 74680e0fb2..3b037a9ead 100644
--- a/vector/src/main/res/values-fi/strings.xml
+++ b/vector/src/main/res/values-fi/strings.xml
@@ -1655,6 +1655,6 @@ Jotta et menetä mitään, automaattiset päivitykset kannattaa pitää käytös
     <string name="settings_discovery_please_enter_server">Syötä identiteettipalvelimen URL-osoite</string>
     <string name="settings_discovery_no_terms_title">Identiteettipalvelimella ei ole käyttöehtoja</string>
     <string name="settings_discovery_no_terms">Valitsemallasi identiteettipalvelimella ei ole käyttöehtoja. Jatka vain, jos luotat palvelun omistajaan</string>
-    <string name="settings_discovery_disconnect_with_bound_pid">Jaat sähköpostiosoitteita tai puhelinnumeroita identiteettipalvelimella %s. Sinun täytyy yhdistää uudelleen palvelimeen %s, jotta voit lopettaa niiden jakamisen.</string>
+    <string name="settings_discovery_disconnect_with_bound_pid">Jaat sähköpostiosoitteita tai puhelinnumeroita identiteettipalvelimella %1$s. Sinun täytyy yhdistää uudelleen palvelimeen %2$s, jotta voit lopettaa niiden jakamisen.</string>
     <string name="settings_agree_to_terms">Hyväksy identiteettipalvelimen (%s) käyttöehdot salliaksesi, että sinut voi löytää sähköpostiosoitteen tai puhelinnumeron perusteella.</string>
 </resources>
diff --git a/vector/src/main/res/values-fr/strings.xml b/vector/src/main/res/values-fr/strings.xml
index 3ca4f03934..1fe493d9d4 100644
--- a/vector/src/main/res/values-fr/strings.xml
+++ b/vector/src/main/res/values-fr/strings.xml
@@ -1699,6 +1699,6 @@ Si vous n’avez pas configuré de nouvelle méthode de récupération, un attaq
     <string name="settings_discovery_no_terms">Le serveur d’identité qui vous avez choisi n’a pas de conditions de service. Continuez uniquement si vous faites confiance au propriétaire de ce service</string>
     <string name="settings_text_message_sent">Un SMS a été envoyé à %s. Saisissez le code de vérification qu’il contient.</string>
 
-    <string name="settings_discovery_disconnect_with_bound_pid">Vous partagez actuellement des adresse e-mails et des numéros de téléphone sur le serveur d’identité %s. Vous devrez vous reconnecter à %s pour arrêter de les partager.</string>
+    <string name="settings_discovery_disconnect_with_bound_pid">Vous partagez actuellement des adresse e-mails et des numéros de téléphone sur le serveur d’identité %1$s. Vous devrez vous reconnecter à %2$s pour arrêter de les partager.</string>
     <string name="settings_agree_to_terms">Acceptez les conditions de service du serveur d’identité (%s) pour vous permettre d’être découvrable avec une adresse e-mail ou un numéro de téléphone.</string>
 </resources>
diff --git a/vector/src/main/res/values-hu/strings.xml b/vector/src/main/res/values-hu/strings.xml
index 255887c340..2e13eb7531 100644
--- a/vector/src/main/res/values-hu/strings.xml
+++ b/vector/src/main/res/values-hu/strings.xml
@@ -1698,6 +1698,6 @@ Ha nem te állítottad be a visszaállítási metódust, akkor egy támadó pró
     <string name="settings_discovery_no_terms">Az általad választott azonosítási szervernek nincs felhasználási feltétele. Csak akkor lépj tovább ha megbízol a szolgáltatás tulajdonosában</string>
     <string name="settings_text_message_sent">Szöveges üzenetet küldtünk ide: %s. Kérlek add meg az ellenőrző kódot amit az üzenet tartalmaz.</string>
 
-    <string name="settings_discovery_disconnect_with_bound_pid">Az azonosítási szerverrel (%s) megosztod az e-mail címeket és telefonszámokat. Újra kell csatlakoznod ehhez: %s, hogy megállítsd a megosztást.</string>
+    <string name="settings_discovery_disconnect_with_bound_pid">Az azonosítási szerverrel (%1$s) megosztod az e-mail címeket és telefonszámokat. Újra kell csatlakoznod ehhez: %2$s, hogy megállítsd a megosztást.</string>
     <string name="settings_agree_to_terms">Egyetértek az azonosítási szerver (%s) Felhasználási feltételeivel ahhoz, hogy megtalálható legyek e-mail címmel vagy telefonszámmal.</string>
 </resources>
diff --git a/vector/src/main/res/values-it/strings.xml b/vector/src/main/res/values-it/strings.xml
index 4e41ad0a6c..1c879ad794 100644
--- a/vector/src/main/res/values-it/strings.xml
+++ b/vector/src/main/res/values-it/strings.xml
@@ -1743,6 +1743,6 @@ Per essere certo di non perdere nulla, mantieni gli aggiornamenti attivi."</stri
     <string name="settings_discovery_no_terms">Il server di identità che hai scelto non ha alcuna condizione di servizio. Continua solo se ti fidi del proprietario del servizio</string>
     <string name="settings_text_message_sent">È stato inviato un messaggio a %s. Inserisci il codice di verifica contenuto.</string>
 
-    <string name="settings_discovery_disconnect_with_bound_pid">Attualmente stai condividendo indirizzi email o numeri di telefono sul server di identità %s. Dovrai riconnetterti a %s per fermarne la condivisione.</string>
+    <string name="settings_discovery_disconnect_with_bound_pid">Attualmente stai condividendo indirizzi email o numeri di telefono sul server di identità %1$s. Dovrai riconnetterti a %2$s per fermarne la condivisione.</string>
     <string name="settings_agree_to_terms">Accetta le condizioni di servizio del server di identità (%s) per consentire di essere trovabile per email o numero di telefono.</string>
 </resources>
diff --git a/vector/src/main/res/values-ko/strings.xml b/vector/src/main/res/values-ko/strings.xml
index ad1716f70b..7f76e47ea7 100644
--- a/vector/src/main/res/values-ko/strings.xml
+++ b/vector/src/main/res/values-ko/strings.xml
@@ -1621,6 +1621,6 @@
     <string name="settings_discovery_no_terms">선택한 ID 서버가 서비스 약관이 없습니다. 서비스의 소유자를 신뢰하는 경우에만 계속하세요</string>
     <string name="settings_text_message_sent">%s(으)로 문자 메시지를 보냈습니다. 문자에 있는 확인 코드를 입력해주세요.</string>
 
-    <string name="settings_discovery_disconnect_with_bound_pid">현재 이메일 주소나 전화번호를 ID 서버 %s와 공유하고 있습니다. 공유하기를 중지하려면 %s(으)로 다시 연결해야 합니다.</string>
+    <string name="settings_discovery_disconnect_with_bound_pid">현재 이메일 주소나 전화번호를 ID 서버 %1$s와 공유하고 있습니다. 공유하기를 중지하려면 %2$s(으)로 다시 연결해야 합니다.</string>
     <string name="settings_agree_to_terms">ID 서버 (%s)의 서비스 약관에 동의하면 다른 사용자가 당신을 이메일 주소나 전화번호로 찾을 수 있게 됩니다.</string>
 </resources>
diff --git a/vector/src/main/res/values-ru/strings.xml b/vector/src/main/res/values-ru/strings.xml
index 145bb548c8..eaad9bf4aa 100644
--- a/vector/src/main/res/values-ru/strings.xml
+++ b/vector/src/main/res/values-ru/strings.xml
@@ -1790,6 +1790,6 @@
     <string name="settings_discovery_no_terms">Выбранный сервер идентификации не имеет условий обслуживания. Продолжить, только если вы доверяете владельцу службы</string>
     <string name="settings_text_message_sent">Текстовое сообщение отправлено %s. Введите код проверки, который он содержит.</string>
 
-    <string name="settings_discovery_disconnect_with_bound_pid">В настоящее время вы делитесь адресами электронной почты или телефонными номерами на сервере идентификации %s. Вам нужно повторно подключиться к %s, чтобы прекратить делиться ими.</string>
+    <string name="settings_discovery_disconnect_with_bound_pid">В настоящее время вы делитесь адресами электронной почты или телефонными номерами на сервере идентификации %1$s. Вам нужно повторно подключиться к %2$s, чтобы прекратить делиться ими.</string>
     <string name="settings_agree_to_terms">Примите Условия обслуживания сервера идентификации (%s), чтобы разрешить обнаружение по адресу электронной почты или номеру телефона.</string>
 </resources>
diff --git a/vector/src/main/res/values-sq/strings.xml b/vector/src/main/res/values-sq/strings.xml
index ea8a599718..f299ad4385 100644
--- a/vector/src/main/res/values-sq/strings.xml
+++ b/vector/src/main/res/values-sq/strings.xml
@@ -1652,6 +1652,6 @@ Që të garantoni se s’ju shpëton gjë, thjesht mbajeni të aktivizuar mekani
     <string name="settings_discovery_no_terms">Shërbyesi i identiteteve që keni zgjedhur nuk ka ndonjë kusht shërbimi. Vazhdoni vetëm nëse i zini besë të zotit të shërbimit</string>
     <string name="settings_text_message_sent">Te %s u dërgua një mesazh tekst. Ju lutemi, jepni kodin e verifikimit që përmban ai.</string>
 
-    <string name="settings_discovery_disconnect_with_bound_pid">Hëpërhë, ndani me të tjerë adresa email ose numra telefoni te shërbyesi i identiteteve %s. Do të duhet të rilidheni me %s që të ndalni ndarjen e tyre.</string>
+    <string name="settings_discovery_disconnect_with_bound_pid">Hëpërhë, ndani me të tjerë adresa email ose numra telefoni te shërbyesi i identiteteve %1$s. Do të duhet të rilidheni me %2$s që të ndalni ndarjen e tyre.</string>
     <string name="settings_agree_to_terms">Që të lejoni veten të jetë e zbulueshme nga adresë email apo numër telefoni, pajtohuni me Kushtet e Shërbimit të shërbyesit të identiteteve (%s).</string>
 </resources>
diff --git a/vector/src/main/res/values-zh-rTW/strings.xml b/vector/src/main/res/values-zh-rTW/strings.xml
index cd81aea785..b54c05b784 100644
--- a/vector/src/main/res/values-zh-rTW/strings.xml
+++ b/vector/src/main/res/values-zh-rTW/strings.xml
@@ -1651,6 +1651,6 @@ Matrix 中的消息可見度類似于電子郵件。我們忘記您的郵件意
     <string name="settings_discovery_no_terms">您選擇的身份識別伺服器沒有任何服務條款。僅在您信任服務擁有者時才繼續</string>
     <string name="settings_text_message_sent">文字訊息已傳送給 %s。請輸入其中包含的驗證碼。</string>
 
-    <string name="settings_discovery_disconnect_with_bound_pid">您目前正在身份識別伺服器 %s 上分享電子郵件地址或電話號碼。您將必須重新連線到 %s 以停止分享它們。</string>
+    <string name="settings_discovery_disconnect_with_bound_pid">您目前正在身份識別伺服器 %1$s 上分享電子郵件地址或電話號碼。您將必須重新連線到 %2$s 以停止分享它們。</string>
     <string name="settings_agree_to_terms">同意身份識別伺服器 (%s) 的服務條款以允許您被透過電子郵件地址或電話號碼探索。</string>
 </resources>
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index 8d5e211fbd..83ce65783f 100755
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -1706,7 +1706,7 @@ Not all features in Riot are implemented in RiotX yet. Main missing (and coming
     <string name="settings_discovery_no_terms">The identity server you have chosen does not have any terms of services. Only continue if you trust the owner of the service</string>
     <string name="settings_text_message_sent">A text message has been sent to %s. Please enter the verification code it contains.</string>
 
-    <string name="settings_discovery_disconnect_with_bound_pid">You are currently sharing email addresses or phone numbers on the identity server %s. You will need to reconnect to %s to stop sharing them.</string>
+    <string name="settings_discovery_disconnect_with_bound_pid">You are currently sharing email addresses or phone numbers on the identity server %1$s. You will need to reconnect to %2$s to stop sharing them.</string>
     <string name="settings_agree_to_terms">Agree to the identity server (%s) Terms of Service to allow yourself to be discoverable by email address or phone number.</string>
 
     <string name="labs_allow_extended_logging">Enable verbose logs.</string>

From e2da74a752b59ebe3029e640f8baa546964e8102 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Fri, 25 Oct 2019 11:39:53 +0200
Subject: [PATCH 21/77] Fix potential NPE on logout

---
 CHANGES.rst                                           |  2 +-
 .../java/im/vector/activity/CommonActivityUtils.java  | 11 ++++-------
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index cf7977cf35..e1c54b6854 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -14,7 +14,7 @@ Other changes:
  -
 
 Bugfix 🐛:
- -
+ - Crash / potential NPE after logout (#3367)
 
 Translations 🗣:
  -
diff --git a/vector/src/main/java/im/vector/activity/CommonActivityUtils.java b/vector/src/main/java/im/vector/activity/CommonActivityUtils.java
index 600be07ba3..c35210e830 100755
--- a/vector/src/main/java/im/vector/activity/CommonActivityUtils.java
+++ b/vector/src/main/java/im/vector/activity/CommonActivityUtils.java
@@ -436,15 +436,12 @@ public void onSuccess(Void info) {
                 if (goToLoginPage) {
                     Activity activeActivity = VectorApp.getCurrentActivity();
 
+                    final Context activeContext = (null == activeActivity) ? VectorApp.getInstance().getApplicationContext() : activeActivity;
+
                     // go to login page
-                    Intent intent = new Intent(activeActivity, LoginActivity.class);
+                    Intent intent = new Intent(activeContext, LoginActivity.class);
                     intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
-
-                    if (null != activeActivity) {
-                        activeActivity.startActivity(intent);
-                    } else {
-                        context.startActivity(intent);
-                    }
+                    activeContext.startActivity(intent);
                 }
             }
         });

From 5b1d295e4f07c32bf1da203c544599a598cd31b4 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit.marty@gmail.com>
Date: Thu, 24 Oct 2019 15:55:30 +0000
Subject: [PATCH 22/77] Translated using Weblate (Catalan)

Currently translated at 86.6% (1084 of 1252 strings)

Translation: Riot Android/Riot Android
Translate-URL: https://translate.riot.im/projects/riot-android/riot-android/ca/
---
 vector/src/main/res/values-ca/strings.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/vector/src/main/res/values-ca/strings.xml b/vector/src/main/res/values-ca/strings.xml
index d9af5deb46..9be9a0c077 100644
--- a/vector/src/main/res/values-ca/strings.xml
+++ b/vector/src/main/res/values-ca/strings.xml
@@ -1430,13 +1430,13 @@ Per què triar Riot.im?
     <string name="error_jitsi_not_supported_on_old_device">Ho sentim, els dispositius amb SO Android inferior a 5.0 no suporten trucades multi-usuari amb Jitsi</string>
 
     <string name="integration_manager_not_configured">No heu configurat cap administrador d\'integracions.</string>
-    <string name="you_added_a_new_device_with_info">Un nou dispositiu està sol·licitant claus d\'encriptació.
-\nNom del dispositiu: %1$s
-\nVist per última vegada: %s$s
+    <string name="you_added_a_new_device_with_info">Un nou dispositiu està sol·licitant claus d\'encriptació. 
+\nNom del dispositiu: %1$s 
+\nVist per última vegada: %2$s 
 \nSi no heu iniciat sessió en un altre dispositiu, ignoreu la sol·licitud.</string>
-    <string name="your_unverified_device_requesting_with_info">Un dispositiu no verificat està sol·licitant claus d\'encriptació.
-\nNom del dispositiu: %1$s
-\nVist per última vegada: %s$s
+    <string name="your_unverified_device_requesting_with_info">Un dispositiu no verificat està sol·licitant claus d\'encriptació. 
+\nNom del dispositiu: %1$s 
+\nVist per última vegada: %2$s 
 \nSi no heu iniciat sessió en un altre dispositiu, ignoreu la sol·licitud.</string>
 
     <string name="start_verification_short_label">Verificar</string>

From 5151c9108279da9de9f74f75c07595cbb29832a0 Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Fri, 25 Oct 2019 03:01:17 +0000
Subject: [PATCH 23/77] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (1252 of 1252 strings)

Translation: Riot Android/Riot Android
Translate-URL: https://translate.riot.im/projects/riot-android/riot-android/zh_Hant/
---
 vector/src/main/res/values-zh-rTW/strings.xml | 68 +++++++++++++++++++
 1 file changed, 68 insertions(+)

diff --git a/vector/src/main/res/values-zh-rTW/strings.xml b/vector/src/main/res/values-zh-rTW/strings.xml
index b54c05b784..1bee9de8f8 100644
--- a/vector/src/main/res/values-zh-rTW/strings.xml
+++ b/vector/src/main/res/values-zh-rTW/strings.xml
@@ -1653,4 +1653,72 @@ Matrix 中的消息可見度類似于電子郵件。我們忘記您的郵件意
 
     <string name="settings_discovery_disconnect_with_bound_pid">您目前正在身份識別伺服器 %1$s 上分享電子郵件地址或電話號碼。您將必須重新連線到 %2$s 以停止分享它們。</string>
     <string name="settings_agree_to_terms">同意身份識別伺服器 (%s) 的服務條款以允許您被透過電子郵件地址或電話號碼探索。</string>
+<string name="resources_script">緯度</string>
+
+    <string name="labs_allow_extended_logging">啟用詳細紀錄。</string>
+    <string name="labs_allow_extended_logging_summary">詳細紀錄可以協助開發者在您傳送憤怒搖晃時取得更多紀錄。即使啟用這個設定，應用程式依然不會紀錄訊息內容或任何個人資料。</string>
+
+
+    <string name="error_terms_not_accepted">請在您接受您家伺服器的條款與條件前繼續重試。</string>
+
+    <string name="error_network_timeout">看起來伺服器回應時間似乎太久了，這可能是不良的網路連線或我們的伺服器錯誤所造成。請稍後再試。</string>
+
+    <string name="send_attachment">傳送附件</string>
+
+    <string name="a11y_open_drawer">開啟導航選單</string>
+    <string name="a11y_create_menu_open">開啟建立聊天室選單</string>
+    <string name="a11y_create_menu_close">關閉建立聊天室選單……</string>
+    <string name="a11y_create_direct_message">建立新的直接對話</string>
+    <string name="a11y_create_room">建立新的聊天室</string>
+    <string name="a11y_close_keys_backup_banner">關閉金鑰備份橫幅</string>
+    <string name="a11y_show_password">顯示密碼</string>
+    <string name="a11y_hide_password">隱藏密碼</string>
+    <string name="a11y_jump_to_bottom">跳到底部</string>
+
+    <string name="two_and_some_others_read">%1$s、%2$s 與 %3$d 個其他人已閱讀</string>
+    <string name="three_users_read">%1$s、%2$s 與 %3$d 已閱讀</string>
+    <string name="two_users_read">%1$s 與 %2$s 已閱讀</string>
+    <string name="one_user_read">%s 已閱讀</string>
+    <plurals name="fallback_users_read">
+	<item quantity="other">%d 個使用者已閱讀</item>
+</plurals>
+
+    <string name="error_file_too_big">檔案「%1$s」(%2$s) 太大無法上傳。限制為 %3$s。</string>
+
+    <string name="error_attachment">在擷取附件時遇到錯誤。</string>
+    <string name="attachment_type_file">檔案</string>
+    <string name="attachment_type_contact">聯絡人</string>
+    <string name="attachment_type_camera">相機</string>
+    <string name="attachment_type_audio">音訊</string>
+    <string name="attachment_type_gallery">相簿</string>
+    <string name="attachment_type_sticker">貼圖</string>
+    <string name="error_handling_incoming_share">無法處理分享資料</string>
+
+    <string name="report_content_spam">垃圾訊息</string>
+    <string name="report_content_inappropriate">不合適</string>
+    <string name="report_content_custom">自訂回報</string>
+    <string name="report_content_custom_title">回報此內容</string>
+    <string name="report_content_custom_hint">回報此內容的理由</string>
+    <string name="report_content_custom_submit">回報</string>
+    <string name="block_user">封鎖使用者</string>
+
+    <string name="content_reported_title">內容已回報</string>
+    <string name="content_reported_content">此內容已回報。
+\n
+\n如果您不想要看到從此使用者而來的更多內容，您可以封鎖他以隱藏他的訊息</string>
+    <string name="content_reported_as_spam_title">回報為垃圾訊息</string>
+    <string name="content_reported_as_spam_content">此內容已被回報為垃圾訊息。
+\n
+\n如果您不想要看到從此使用者而來的更多內容，您可以封鎖他以隱藏他的訊息</string>
+    <string name="content_reported_as_inappropriate_title">回報為不合適</string>
+    <string name="content_reported_as_inappropriate_content">此內容已被回報為不合適。
+\n
+\n如果您不想要看到從此使用者而來的更多內容，您可以封鎖他以隱藏他的訊息</string>
+
+    <string name="permissions_rationale_msg_keys_backup_export">Riot 需要權限以在磁碟上儲存您的 E2E 金鑰。
+\n
+\n請在下個彈出視窗中允許存取以讓您可以手動匯出您的金鑰。</string>
+
+    <string name="no_network_indicator">目前沒有網路連線</string>
+
 </resources>

From 214fddf9e4ca1e11ee5cd401213700d8bd496051 Mon Sep 17 00:00:00 2001
From: Tuomas Hietala <tuomas.hietala@iki.fi>
Date: Thu, 24 Oct 2019 17:55:56 +0000
Subject: [PATCH 24/77] Translated using Weblate (Finnish)

Currently translated at 93.5% (1171 of 1252 strings)

Translation: Riot Android/Riot Android
Translate-URL: https://translate.riot.im/projects/riot-android/riot-android/fi/
---
 vector/src/main/res/values-fi/strings.xml | 72 +++++++++++++++++------
 1 file changed, 53 insertions(+), 19 deletions(-)

diff --git a/vector/src/main/res/values-fi/strings.xml b/vector/src/main/res/values-fi/strings.xml
index 3b037a9ead..78856d0309 100644
--- a/vector/src/main/res/values-fi/strings.xml
+++ b/vector/src/main/res/values-fi/strings.xml
@@ -175,8 +175,8 @@
     <string name="auth_home_server">Kotipalvelin:</string>
     <string name="auth_identity_server">Identiteettipalvelin:</string> <!-- ??? -->
     <string name="auth_reset_password_next_step_button">Olen varmistanut sähköpostiosoitteeni</string>
-    <string name="auth_reset_password_message">Nollataksesi salasanasi, anna tilisi sähköpostiosoite:</string>
-    <string name="auth_reset_password_missing_email">Anna tilisi sähköpostiosoite.</string>
+    <string name="auth_reset_password_message">Palauttaaksesi salasanasi, anna tiliisi liitetty sähköpostiosoite:</string>
+    <string name="auth_reset_password_missing_email">Anna tiliisi liitetty sähköpostiosoite.</string>
     <string name="auth_reset_password_missing_password">Anna uusi salasana.</string>
     <string name="auth_reset_password_email_validation_message">Osoitteeseen %s on lähetetty sähköposti. Kun olet avannut siinä olevan linkin, paina alla olevaa nappia.</string> <!-- ???? -->
     <string name="auth_reset_password_error_unauthorized">Sähköpostiosoitteesi vahvistaminen epäonnistui. Varmista, että klikkasit sähköpostissa olevaa linkkiä</string>
@@ -1190,12 +1190,12 @@ Haluatko lisätä paketteja?</string>
     <string name="dialog_user_consent_content">Jatkaaksesi kotipalvelimen %1$s käyttöä, sinun täytyy hyväksyä palvelun käyttöehdot.</string>
     <string name="dialog_user_consent_submit">Näytä ehdot</string>
 
-    <string name="deactivate_account_content">Tämä tekee tunnuksestasi lopullisesti käyttökelvottoman. Et voi kirjautua sisään eikä kukaan pysty rekisteröimään tunnusta samalla käyttäjä-ID:llä. Tämä saa tunnuksesi lähtemään kaikista huoneista, joissa se on osallisena, ja se poistaa tunnuksen tiedot identiteettipalvelimelta. <b>Tämä toiminto on peruuttamaton</b>.
+    <string name="deactivate_account_content">Tämä tekee tilistäsi lopullisesti käyttökelvottoman. Et voi kirjautua sisään eikä kukaan pysty rekisteröitymään samalla käyttäjätunnuksella. Tämä saa tilisi poistumaan kaikista huoneista, joissa se on osallisena, ja poistaa tilin tiedot identiteettipalvelimelta. <b>Tämä toiminto on peruuttamaton</b>. 
 \n
-\nTunnuksen otto pois käytöstä <b>ei oletuksena saa meitä unohtamaan lähettämiäsi viestejä</b>. Jos haluat meidän unohtavan viestisi, merkitse alapuolella oleva laatikko.
+\nTilin deaktivointi <b>ei oletuksena saa meitä unohtamaan lähettämiäsi viestejä</b>. Jos haluat meidän unohtavan viestisi, merkitse alapuolella oleva valintaruutu.
 \n
-\nViestin näkyvyys Matrixissa on samanlainen kuin sähköpostissa. Vaikka unohdamme viestisi, kaikki tahot, joilla viestisi jo on, tulevat pääsemään omaan kopioonsa viesteistäsi.</string>
-    <string name="deactivate_account_delete_checkbox">Unohda kaikki viestit, jotka olen lähittänyt, kun tunnuksesi on deaktivoitu (varoitus: tämä aiheuttaa tulevien käyttäjien näkevän vanhat keskustelusi epätäydellisinä)</string>
+\nViestien näkyvyys Matrixissa on samantapainen kuin sähköpostissa. Viestiesi unohtaminen tarkoittaa, että lähettämiäsi viestejä ei näytetä uusille tai rekisteröitymättömille käyttäjille. Ne rekisteröityneet käyttäjät, joilla viestisi jo on, pääsevät kuitenkin näkemään oman kopionsa niistä jatkossakin.</string>
+    <string name="deactivate_account_delete_checkbox">Unohda kaikki viestit, jotka olen lähettänyt, kun tilini on deaktivoitu (Varoitus: tästä seuraa, että tulevat käyttäjät näkevät vanhat keskustelut epätäydellisinä)</string>
     <string name="error_empty_field_enter_user_name">Syötä käyttäjätunnus.</string>
     <string name="room_tombstone_versioned_description">Tämä huone on korvattu toisella huoneella</string>
     <string name="room_tombstone_continuation_link">Keskustelu jatkuu täällä</string>
@@ -1258,9 +1258,9 @@ Jotta et menetä mitään, automaattiset päivitykset kannattaa pitää käytös
     <string name="keys_backup_setup_step1_manual_export">Tallenna avaimet käsin</string>
 
     <string name="keys_backup_setup_step2_text_title">Turvaa varmuuskopiosi salalauseella.</string>
-    <string name="keys_backup_setup_step2_text_description">Tallennamme salatun kopion avaimistasi kotipalvelimellesi. Suojaa varmuuskopiosi salalauseella pitääksesi sen turvattuna.
-\n
-\nTurvallisuuden takia tämän salalauseen tulisi olla eri tunnuksesi salasanasta.</string>
+    <string name="keys_backup_setup_step2_text_description">Tallennamme salatun kopion avaimistasi kotipalvelimellesi. Suojaa varmuuskopiosi salalauseella pitääksesi sen turvattuna. 
+\n 
+\nParhaan turvallisuuden takaamiseksi salalauseen tulisi olla eri kuin tilisi salasana.</string>
     <string name="keys_backup_setup_step2_button_title">Aseta salalause</string>
     <string name="keys_backup_setup_creating_backup">Luodaan varmuuskopiota</string>
     <string name="keys_backup_setup_step1_recovery_key_alternative">Tai, turvaa varmuuskopio palautusavaimella, tallentamalla palautusavain johonkin turvalliseen paikkaan.</string>
@@ -1387,25 +1387,25 @@ Jotta et menetä mitään, automaattiset päivitykset kannattaa pitää käytös
 
     <string name="notification_unread_notified_messages_in_room">%1$s -&gt; %2$s</string>
 
-    <string name="store_full_description">Keskusteluohjelma, joka on täysin hallinnoitavissasi ja erittäin joustava. Riot sallii sinun kommunikoivan juuri sillä tavalla kuin haluat. [matrix]-sovellus — avoimen ja hajautetun kommunikaation standardi.
+    <string name="store_full_description">Keskustelusovellus, joka on sinun hallinnassasi ja erittäin joustava. Riot antaa sinun viestiä juuri sillä tavalla kuin haluat. Taustalla [matrix] – avoimen ja hajautetun viestinnän standardi. 
 \n
-\nKäytä ilmaista matrix.org-tunnusta, hanki oma palvelimesi osoitteesta https://modular.im tai käytä muuta Matrix-palvelinta.
+\nHanki ilmainen matrix.org-tili, hanki oma palvelimesi osoitteesta https://modular.im tai käytä muuta Matrix-palvelinta. 
 \n
 \nMiksi valita Riot.im\?
 \n
-\n• Täydellinen kommunikaatio: rakenna huoneita tiimeillesi, ystävillesi ja yhteisöllesi — juuri niin kuin haluat! Keskustele, jaa tiedostoja, lisää sovelmia ja tee ääni‐ ja videopuheluita — kaikki tämä ilmaiseksi.
-\n
-\n• Tehokkaat integraatiot: Käytä Riotia juuri niillä työkaluilla, jotka tiedät ja joita rakastat. Riot.im jopa mahdollistaa keskustelun henkilöiden kanssa, jotka käyttävät eri keskusteluohjelmia.
+\n• Kattavat mahdollisuudet viestintään: rakenna huoneita tiimeillesi, ystävillesi ja yhteisöllesi – juuri niin kuin haluat! Keskustele, jaa tiedostoja, lisää sovelmia ja soita ääni‐ ja videopuheluita – kaikki tämä ilmaiseksi.
+\n 
+\n• Tehokkaat integraatiot: Käytä Riotia tuntemiesi työkalujen kanssa. Riot.im mahdollistaa keskustelut jopa eri keskusteluohjelmia käyttävien ihmisten ja ryhmien kanssa.
 \n
-\n• Yksityinen ja turvallinen: Pidä keskustelusi salaisina. Nykyaikainen osapuolten välinen salaus pitää huolen, että yksityiset keskustelut pysyvät yksityisenä.
+\n• Yksityinen ja turvallinen: Pidä keskustelusi salaisina. Nykyaikainen osapuolten välinen salaus pitää huolen, että yksityiset keskustelut pysyvät yksityisinä. 
 \n
-\n• Avoin, ei suljettu: Avointa koodia, ja rakennettu käyttämään Matrixia. Voit omistaa oman datasi ylläpitämällä omaa palvelintasi, tai käyttämällä palvelinta, johon luotat.
+\n• Avoin, ei suljettu: Avointa lähdekoodia ja rakennettu käyttämään Matrixia. Voit omistaa oman datasi ylläpitämällä omaa palvelintasi, tai käyttämällä palvelinta, johon luotat. 
 \n
-\n• Kaikkialla, missä olet: pysy yhteydessä siellä, missä ikinä oletkin täysin synkronoidulla viestihistorialla kaikkien laitteidesi ja sivun https://riot.im välillä.</string>
+\n• Kaikkialla, missä olet: pysy yhteydessä missä ikinä oletkin, täysin synkronoidulla viestihistorialla kaikkien laitteidesi ja https://riot.im-verkkopalvelun välillä.</string>
 
-    <string name="new_recovery_method_popup_description">Uusi avainvarmuuskopio on löydetty.
+    <string name="new_recovery_method_popup_description">Uusi avainvarmuuskopio löydetty.
 \n
-\nJos et asettanut uutta palautustapaa, hyökkääjä saattaa yrittää päästä käsiksi tunnukseesi. Vaihda tunnuksesi salasana ja aseta uusi palautustapa asetuksissa välittömästi.</string>
+\nJos et asettanut uutta palautustapaa, hyökkääjä saattaa yrittää päästä käsiksi tiliisi. Vaihda tilisi salasana ja aseta uusi palautustapa asetuksissa välittömästi.</string>
     <string name="autodiscover_invalid_response">Epäkelpo kotipalvelimen löytövastaus</string>
     <string name="autodiscover_well_known_autofill_dialog_title">Automaattitäydennyksen palvelinasetukset</string>
     <string name="autodiscover_well_known_autofill_dialog_message">Riot löysi mukautetun palvelinasetuksen userId:si domainille ”%1$s”:
@@ -1657,4 +1657,38 @@ Jotta et menetä mitään, automaattiset päivitykset kannattaa pitää käytös
     <string name="settings_discovery_no_terms">Valitsemallasi identiteettipalvelimella ei ole käyttöehtoja. Jatka vain, jos luotat palvelun omistajaan</string>
     <string name="settings_discovery_disconnect_with_bound_pid">Jaat sähköpostiosoitteita tai puhelinnumeroita identiteettipalvelimella %1$s. Sinun täytyy yhdistää uudelleen palvelimeen %2$s, jotta voit lopettaa niiden jakamisen.</string>
     <string name="settings_agree_to_terms">Hyväksy identiteettipalvelimen (%s) käyttöehdot salliaksesi, että sinut voi löytää sähköpostiosoitteen tai puhelinnumeron perusteella.</string>
+<string name="auth_add_email_message_2">Aseta sähköposti tilin palauttamista varten. Myöhemmin voit halutessasi antaa ihmisten etsiä sinua sen perusteella.</string>
+    <string name="settings_call_ringtone_use_default_stun">Salli varalla oleva puhelun apupalvelin</string>
+    <string name="settings_discovery_disconnect_identity_server_info">Yhteyden katkaiseminen identiteettipalvelimeesi tarkoittaa, että muut käyttäjät eivät voi etsiä sinua etkä voi kutsua muita sähköpostin tai puhelinnumeron perusteella.</string>
+    <string name="settings_discovery_confirm_mail">Lähetimme sinulle vahvistussähköpostin osoitteeseen %s, tarkista sähköpostisi ja klikkaa vahvistuslinkkiä</string>
+    <string name="labs_allow_extended_logging">Ota yksityiskohtaiset lokit käyttöön.</string>
+    <string name="error_terms_not_accepted">Yritä uudelleen, kun olet hyväksynyt kotipalvelimesi käyttöehdot.</string>
+
+    <string name="error_network_timeout">Palvelimen vastaus näyttää viipyvän. Tämä voi johtua kehnosta yhteydestä tai palvelimillamme tapahtuneesta virheestä. Yritä hetken kuluttua uudelleen.</string>
+
+    <string name="send_attachment">Lähetä liite</string>
+
+    <string name="a11y_create_room">Luo uusi huone</string>
+    <string name="a11y_show_password">Näytä salasana</string>
+    <string name="a11y_hide_password">Piilota salasana</string>
+    <string name="a11y_jump_to_bottom">Siirry loppuun</string>
+
+    <string name="two_and_some_others_read">%1$s, %2$s ja %3$d muuta lukivat</string>
+    <string name="three_users_read">%1$s, %2$s ja %3$s lukivat</string>
+    <string name="two_users_read">%1$s ja %2$s lukivat</string>
+    <string name="one_user_read">%s luki</string>
+    <plurals name="fallback_users_read">
+	<item quantity="one">1 käyttäjä luki</item>
+	<item quantity="other">%d käyttäjää luki</item>
+</plurals>
+
+    <string name="error_attachment">Liitettä noudettaessa tapahtui virhe.</string>
+    <string name="attachment_type_file">Tiedosto</string>
+    <string name="attachment_type_camera">Kamera</string>
+    <string name="attachment_type_gallery">Galleria</string>
+    <string name="attachment_type_sticker">Tarra</string>
+    <string name="report_content_spam">Se on roskapostia</string>
+    <string name="report_content_inappropriate">Se on sopimaton</string>
+    <string name="no_network_indicator">Verkkoyhteyttä ei ole juuri nyt</string>
+
 </resources>

From a90c2fe56dc78e2851b28853499b68b1fb72006e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?= <zecakeh@pm.me>
Date: Fri, 25 Oct 2019 07:56:09 +0000
Subject: [PATCH 25/77] Translated using Weblate (French)

Currently translated at 100.0% (1252 of 1252 strings)

Translation: Riot Android/Riot Android
Translate-URL: https://translate.riot.im/projects/riot-android/riot-android/fr/
---
 vector/src/main/res/values-fr/strings.xml | 71 ++++++++++++++++++++++-
 1 file changed, 70 insertions(+), 1 deletion(-)

diff --git a/vector/src/main/res/values-fr/strings.xml b/vector/src/main/res/values-fr/strings.xml
index 1fe493d9d4..d65e0f3756 100644
--- a/vector/src/main/res/values-fr/strings.xml
+++ b/vector/src/main/res/values-fr/strings.xml
@@ -783,7 +783,7 @@ Appareils inconnus :</string>
     <string name="forget_room">Abandonner le salon</string>
     <string name="settings_flair">Badge</string>
 
-    <string name="send_bug_report_rage_shake">Secouer avec frustration pour signaler un bug</string>
+    <string name="send_bug_report_rage_shake">Secouer avec frustration pour signaler une anomalie</string>
 
     <string name="actions">Actions</string>
     <string name="room_sync_in_progress">Synchronisation…</string>
@@ -1701,4 +1701,73 @@ Si vous n’avez pas configuré de nouvelle méthode de récupération, un attaq
 
     <string name="settings_discovery_disconnect_with_bound_pid">Vous partagez actuellement des adresse e-mails et des numéros de téléphone sur le serveur d’identité %1$s. Vous devrez vous reconnecter à %2$s pour arrêter de les partager.</string>
     <string name="settings_agree_to_terms">Acceptez les conditions de service du serveur d’identité (%s) pour vous permettre d’être découvrable avec une adresse e-mail ou un numéro de téléphone.</string>
+<string name="resources_script">Latn</string>
+
+    <string name="labs_allow_extended_logging">Activer les journaux verbeux.</string>
+    <string name="labs_allow_extended_logging_summary">Les journaux verbeux aideront les développeurs en fournissant plus de journaux quand vous envoyez un rapport d’anomalie. Même si cette option est activée, l’application n’envoie pas le contenu des messages ou toute autre donnée personnelle.</string>
+
+
+    <string name="error_terms_not_accepted">Réessayez quand vous aurez accepté les termes et conditions de votre serveur d’accueil.</string>
+
+    <string name="error_network_timeout">On dirait que le serveur mette trop de temps à répondre. Ça peut être dû à une mauvaise connexion ou à une erreur avec nos serveurs. Réessayez plus tard.</string>
+
+    <string name="send_attachment">Envoyer une pièce jointe</string>
+
+    <string name="a11y_open_drawer">Ouvrir le menu de navigation</string>
+    <string name="a11y_create_menu_open">Ouvrir le menu de création de salon</string>
+    <string name="a11y_create_menu_close">Fermer le menu de création de salon…</string>
+    <string name="a11y_create_direct_message">Créer une nouvelle conversation directe</string>
+    <string name="a11y_create_room">Créer un nouveau salon</string>
+    <string name="a11y_close_keys_backup_banner">Fermer la bannière de sauvegarde des clés</string>
+    <string name="a11y_show_password">Afficher le mot de passe</string>
+    <string name="a11y_hide_password">Masquer le mot de passe</string>
+    <string name="a11y_jump_to_bottom">Sauter en bas de page</string>
+
+    <string name="two_and_some_others_read">%1$s, %2$s et %3$d autres ont lu</string>
+    <string name="three_users_read">%1$s, %2$s et %3$s ont lu</string>
+    <string name="two_users_read">%1$s et %2$s ont lu</string>
+    <string name="one_user_read">%s a lu</string>
+    <plurals name="fallback_users_read">
+	<item quantity="one">1 utilisateur a lu</item>
+	<item quantity="other">%d utilisateurs ont lu</item>
+</plurals>
+
+    <string name="error_file_too_big">Le fichier « %1$s » (%2$s) est trop gros pour être envoyé. La limite est %3$s.</string>
+
+    <string name="error_attachment">Une erreur est survenue pendant la récupération de la pièce jointe.</string>
+    <string name="attachment_type_file">Fichier</string>
+    <string name="attachment_type_contact">Contact</string>
+    <string name="attachment_type_camera">Appareil photo</string>
+    <string name="attachment_type_audio">Audio</string>
+    <string name="attachment_type_gallery">Galerie</string>
+    <string name="attachment_type_sticker">Sticker</string>
+    <string name="error_handling_incoming_share">Impossible de traiter les données de partage</string>
+
+    <string name="report_content_spam">C’est du pourriel</string>
+    <string name="report_content_inappropriate">C’est inapproprié</string>
+    <string name="report_content_custom">Signalement personnalisé</string>
+    <string name="report_content_custom_title">Signaler ce contenu</string>
+    <string name="report_content_custom_hint">Motif de signalement de ce contenu</string>
+    <string name="report_content_custom_submit">SIGNALER</string>
+    <string name="block_user">BLOQUER L’UTILISATEUR</string>
+
+    <string name="content_reported_title">Contenu signalé</string>
+    <string name="content_reported_content">Ce contenu a été signalé.
+\n
+\nSi vous ne voulez plus voir de contenu de cet utilisateur, vous pouvez le bloquer pour masquer ses messages</string>
+    <string name="content_reported_as_spam_title">Signalé comme pourriel</string>
+    <string name="content_reported_as_spam_content">Ce contenu a été signalé comme pourriel.
+\n
+\nSi vous ne voulez plus voir de contenu de cet utilisateur, vous pouvez le bloquer pour masquer ses messages</string>
+    <string name="content_reported_as_inappropriate_title">Signalé comme inapproprié</string>
+    <string name="content_reported_as_inappropriate_content">Ce contenu a été signalé comme inapproprié.
+\n
+\nSi vous ne voulez plus voir de contenu de cet utilisateur, vous pouvez le bloquer pour masquer ses messages</string>
+
+    <string name="permissions_rationale_msg_keys_backup_export">Riot a besoin de votre permission pour sauvegarder vos clés de chiffrement sur le disque.
+\n
+\nAutorisez l’accès dans le prochaine fenêtre pour pouvoir exporter vos clés manuellement.</string>
+
+    <string name="no_network_indicator">Il n’y a aucune connexion au réseau pour le moment</string>
+
 </resources>

From d51d00691007003b8c26e29fda9f6cb4b5d44930 Mon Sep 17 00:00:00 2001
From: dccs <christoph.dehmer@t-online.de>
Date: Fri, 25 Oct 2019 12:33:37 +0000
Subject: [PATCH 26/77] Translated using Weblate (German)

Currently translated at 91.2% (1142 of 1252 strings)

Translation: Riot Android/Riot Android
Translate-URL: https://translate.riot.im/projects/riot-android/riot-android/de/
---
 vector/src/main/res/values-de/strings.xml | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/vector/src/main/res/values-de/strings.xml b/vector/src/main/res/values-de/strings.xml
index b8b86b5081..c31eb7c2a2 100644
--- a/vector/src/main/res/values-de/strings.xml
+++ b/vector/src/main/res/values-de/strings.xml
@@ -1656,4 +1656,16 @@ Wenn du diese neue Wiederherstellungsmethode nicht eingerichtet hast, kann ein A
 
     <string name="push_gateway_item_app_id">app_id:</string>
     <string name="review">Überprüfung</string>
-</resources>
+<string name="none">Keine</string>
+    <string name="revoke">Widerrufen</string>
+    <string name="disconnect">Trennen</string>
+    <string name="people_no_identity_server">Kein Integrationsserver konfiguriert.</string>
+
+    <string name="call_failed_no_ice_title">Anruf aufgrund eines falsch konfigurierten Servers fehlgeschlagen</string>
+    <string name="call_failed_no_ice_use_alt">Versuchen Sie es mit %@</string>
+    <string name="call_failed_dont_ask_again">Nicht erneut fragen</string>
+
+    <string name="auth_add_email_message_2">Richten Sie eine E-Mail für die Kontowiederherstellung ein, die später von Personen, die Sie kennen, optional gefunden werden kann.</string>
+    <string name="auth_add_phone_message_2">Richten Sie ein Telefon ein und lassen Sie es später optional von Personen erkennen, die Sie kennen.</string>
+    <string name="auth_add_email_phone_message_2">Legen Sie eine E-Mail für die Kontowiederherstellung fest. Verwenden Sie eine spätere E-Mail oder ein späteres Telefon, um von Personen, die Sie kennen, optional gefunden zu werden.</string>
+    </resources>

From ec8cd1971b6213ed5cb00b88da80dd26f25df2dc Mon Sep 17 00:00:00 2001
From: Szimszon <github@oregpreshaz.eu>
Date: Fri, 25 Oct 2019 10:01:15 +0000
Subject: [PATCH 27/77] Translated using Weblate (Hungarian)

Currently translated at 100.0% (1252 of 1252 strings)

Translation: Riot Android/Riot Android
Translate-URL: https://translate.riot.im/projects/riot-android/riot-android/hu/
---
 vector/src/main/res/values-hu/strings.xml | 77 +++++++++++++++++++++--
 1 file changed, 73 insertions(+), 4 deletions(-)

diff --git a/vector/src/main/res/values-hu/strings.xml b/vector/src/main/res/values-hu/strings.xml
index 2e13eb7531..7a3a05eedf 100644
--- a/vector/src/main/res/values-hu/strings.xml
+++ b/vector/src/main/res/values-hu/strings.xml
@@ -1021,7 +1021,7 @@ Vedd figyelembe, hogy az alkalmazás újraindul ami sok időt vehet igénybe.</s
     <string name="room_participants_action_kick">Elküld</string>
     <plurals name="room_participants_kick_prompt_msg">
         <item quantity="one">Ezeket az embereket biztosan kirúgod?</item>
-        <item quantity="other" />
+        <item quantity="other"/>
     </plurals>
     <string name="reason_hint">Ok</string>
 
@@ -1249,11 +1249,11 @@ Figyelmeztetés: ez a fájl törlésre kerülhet, ha az alkalmazást törlik.</s
     <string name="keys_backup_restore_success_description">Visszaállítva: %1$d kapcsolati kulcs, és %2$d kulcs, ami(k) ismeretlenek voltak az eszköz számára, hozzáadva</string>
     <plurals name="keys_backup_restore_success_description_part1">
         <item quantity="one">Visszaállított mentés %d kulccsal.</item>
-        <item quantity="other" />
+        <item quantity="other"/>
     </plurals>
     <plurals name="keys_backup_restore_success_description_part2">
         <item quantity="one">%d új kulcs lett hozzáadva ehhez az eszközhöz.</item>
-        <item quantity="other" />
+        <item quantity="other"/>
     </plurals>
 
     <string name="keys_backup_get_version_error">"Nem sikerült beszerezni a legfrissebb verziójú visszaállítási  kulcsot (%s)."</string>
@@ -1332,7 +1332,7 @@ A Visszaállítási Kulcsot tartsd biztonságos helyen, mint pl. egy jelszókeze
     <string name="keys_backup_info_keys_all_backup_up">Minden kulcs elmentve</string>
     <plurals name="keys_backup_info_keys_backing_up">
         <item quantity="one">%d kulcs mentése…</item>
-        <item quantity="other" />
+        <item quantity="other"/>
     </plurals>
 
     <string name="keys_backup_info_title_version">Verzió</string>
@@ -1700,4 +1700,73 @@ Ha nem te állítottad be a visszaállítási metódust, akkor egy támadó pró
 
     <string name="settings_discovery_disconnect_with_bound_pid">Az azonosítási szerverrel (%1$s) megosztod az e-mail címeket és telefonszámokat. Újra kell csatlakoznod ehhez: %2$s, hogy megállítsd a megosztást.</string>
     <string name="settings_agree_to_terms">Egyetértek az azonosítási szerver (%s) Felhasználási feltételeivel ahhoz, hogy megtalálható legyek e-mail címmel vagy telefonszámmal.</string>
+<string name="resources_script">Latn</string>
+
+    <string name="labs_allow_extended_logging">Kibővített naplózás engedélyezése.</string>
+    <string name="labs_allow_extended_logging_summary">A kiterjesztett naplózás a fejlesztőknek nyújt több információt amikor hibajegyet küldesz. Még bekapcsolva sem naplóz üzenet tartalmat vagy más személyes adatot.</string>
+
+
+    <string name="error_terms_not_accepted">Kérlek ismételd meg miután elfogadtad a matrix szervered felhasználási feltételeit.</string>
+
+    <string name="error_network_timeout">Úgy tűnik a szerver sokáig nem válaszol, ennek a bizonytalan kapcsolat vagy egy hiba a szerverünkben lehet az oka. Kicsit később próbáld újra.</string>
+
+    <string name="send_attachment">Csatolmány küldése</string>
+
+    <string name="a11y_open_drawer">Navigációs panel megnyitása</string>
+    <string name="a11y_create_menu_open">Szoba készítés menü megnyitása</string>
+    <string name="a11y_create_menu_close">Szoba készítés menü bezárása…</string>
+    <string name="a11y_create_direct_message">Új közvetlen beszélgetés indítása</string>
+    <string name="a11y_create_room">Új szoba készítése</string>
+    <string name="a11y_close_keys_backup_banner">Kulcs mentés csík bezárása</string>
+    <string name="a11y_show_password">Jelszó mutatása</string>
+    <string name="a11y_hide_password">Jelszó elrejtése</string>
+    <string name="a11y_jump_to_bottom">Végére ugrás</string>
+
+    <string name="two_and_some_others_read">%1$s, %2$s és %3$d olvasták</string>
+    <string name="three_users_read">%1$s, %2$s és %3$s olvasták</string>
+    <string name="two_users_read">%1$s és %2$s olvasták</string>
+    <string name="one_user_read">%s olvasta</string>
+    <plurals name="fallback_users_read">
+	<item quantity="one">1 felhasználó olvasta</item>
+	<item quantity="other">%d felhasználó olvasta</item>
+</plurals>
+
+    <string name="error_file_too_big">\'%1$s\' (%2$s) fájl túl nagy a feltöltéshez. A korlát: %3$s.</string>
+
+    <string name="error_attachment">A csatolmány letöltésénél hiba történt.</string>
+    <string name="attachment_type_file">Fájl</string>
+    <string name="attachment_type_contact">Kapcsolat</string>
+    <string name="attachment_type_camera">Kamera</string>
+    <string name="attachment_type_audio">Hang</string>
+    <string name="attachment_type_gallery">Galéria</string>
+    <string name="attachment_type_sticker">Matrica</string>
+    <string name="error_handling_incoming_share">Az adatmegosztást nem sikerül kezelni</string>
+
+    <string name="report_content_spam">Ez nemkívánt (spam)</string>
+    <string name="report_content_inappropriate">Ez nem idevaló</string>
+    <string name="report_content_custom">Egyedi jelentés</string>
+    <string name="report_content_custom_title">Tartalom bejelentése</string>
+    <string name="report_content_custom_hint">A tartalom bejelentésének oka</string>
+    <string name="report_content_custom_submit">JELENTÉS</string>
+    <string name="block_user">FELHASZNÁLÓ BLOKKOLÁSA</string>
+
+    <string name="content_reported_title">Tartalom bejelentve</string>
+    <string name="content_reported_content">Ez a tartalom bejelentve.
+\n
+\nHa nem akarsz ettől a felhasználótól több üzenetet látni akkor blokkolhatod, hogy az üzenetei ne jelenjenek meg számodra</string>
+    <string name="content_reported_as_spam_title">Bejelentve nem kívántként (spam)</string>
+    <string name="content_reported_as_spam_content">Ez a tartalom nem kívántnak (spam) lett bejelentve.
+\n
+\n Ha nem akarsz ettől a felhasználótól több üzenetet látni akkor blokkolhatod, hogy az üzenetei ne jelenjenek meg számodra</string>
+    <string name="content_reported_as_inappropriate_title">Nem idevalónak bejelentve</string>
+    <string name="content_reported_as_inappropriate_content">Ez a tartalom nem idevalónak lett bejelentve.
+\n
+\n Ha nem akarsz ettől a felhasználótól több üzenetet látni akkor blokkolhatod, hogy az üzenetei ne jelenjenek meg számodra</string>
+
+    <string name="permissions_rationale_msg_keys_backup_export">Riotnak engedélyre van szüksége ahhoz, hogy a végponttól végpontig titkosító kulcsokat a lemezre menthesse.
+\n
+\nKérlek a következő felugró ablakban engedélyezd a hozzáférést, hogy a kulcsokat kézzel kimenthesd.</string>
+
+    <string name="no_network_indicator">Jelenleg nincs hálózati kapcsolat</string>
+
 </resources>

From 9fc1e588a88919527cf7d87e0e5bac3bc37c9da4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EC=86=A1=ED=83=9C=EC=84=AD?= <xotjq237@gmail.com>
Date: Fri, 25 Oct 2019 09:59:05 +0000
Subject: [PATCH 28/77] Translated using Weblate (Korean)

Currently translated at 100.0% (1252 of 1252 strings)

Translation: Riot Android/Riot Android
Translate-URL: https://translate.riot.im/projects/riot-android/riot-android/ko/
---
 vector/src/main/res/values-ko/strings.xml | 84 ++++++++++++++++++++---
 1 file changed, 76 insertions(+), 8 deletions(-)

diff --git a/vector/src/main/res/values-ko/strings.xml b/vector/src/main/res/values-ko/strings.xml
index 7f76e47ea7..24abda3fad 100644
--- a/vector/src/main/res/values-ko/strings.xml
+++ b/vector/src/main/res/values-ko/strings.xml
@@ -412,8 +412,8 @@
     <string name="room_participants_action_invite">초대</string>
     <string name="room_participants_action_leave">이 방 떠나기</string>
     <string name="room_participants_action_remove">이 방에서 삭제하기</string>
-    <string name="room_participants_action_ban">차단</string>
-    <string name="room_participants_action_unban">차단 해제</string>
+    <string name="room_participants_action_ban">출입 금지</string>
+    <string name="room_participants_action_unban">출입 금지 풀기</string>
     <string name="room_participants_action_kick">추방</string>
     <string name="room_participants_action_set_default_power_level">일반 사용자로 재 설정</string>
     <string name="room_participants_action_set_moderator">중재자로 하기</string>
@@ -432,7 +432,7 @@
     <plurals name="room_participants_kick_prompt_msg">
         <item quantity="other">이 사용자들을 이 대화에서 추방하겠습니까\?</item>
     </plurals>
-    <string name="room_participants_ban_prompt_msg">이 사용자를 이 대화에서 차단하겠습니까\?</string>
+    <string name="room_participants_ban_prompt_msg">이 사용자를 이 대화에서 출입 금지하겠습니까\?</string>
     <string name="reason_hint">이유</string>
 
     <string name="room_participants_invite_prompt_msg">%s님을 이 대화에 초대하겠습니까\?</string>
@@ -720,7 +720,7 @@
     <string name="settings_show_read_receipts">읽은 기록 보이기</string>
     <string name="settings_show_read_receipts_summary">세부적인 목록으로 읽은 목록을 클릭하세요.</string>
     <string name="settings_show_join_leave_messages">참가 및 떠남 이벤트 보이기</string>
-    <string name="settings_show_join_leave_messages_summary">초대, 추방, 그리고 차단은 영향이 없습니다.</string>
+    <string name="settings_show_join_leave_messages_summary">초대, 추방, 그리고 출입 금지은 영향이 없습니다.</string>
     <string name="settings_show_avatar_display_name_changes_messages">계정 이벤트 보이기</string>
     <string name="settings_show_avatar_display_name_changes_messages_summary">아바타와 표시 이름 변경도 포함합니다.</string>
     <string name="settings_vibrate_on_mention">사용자가 언급할 때 진동</string>
@@ -854,7 +854,7 @@
     <string name="room_settings_room_access_entry_anyone_with_link_apart_guest">방의 링크를 아는 누구나, 손님 제외</string>
     <string name="room_settings_room_access_entry_anyone_with_link_including_guest">방의 링크를 아는 누구나, 손님 포함</string>
 
-    <string name="room_settings_banned_users_title">차단한 사용자</string>
+    <string name="room_settings_banned_users_title">출입 금지한 사용자</string>
 
     <string name="room_settings_category_advanced_title">고급</string>
     <string name="room_settings_room_internal_id">이 방의 내부 ID</string>
@@ -1064,8 +1064,8 @@
     <string name="unrecognized_command">인식할 수 없는 명령어: %s</string>
     <string name="command_problem_with_parameters">\"%s\" 명령어는 더 많은 매개 변수가 필요하거나, 일부 매개 변수가 옳지 않습니다.</string>
     <string name="command_description_emote">활동 표시하기</string>
-    <string name="command_description_ban_user">주어진 ID로 사용자 차단하기</string>
-    <string name="command_description_unban_user">주어진 ID로 사용자 차단 풀기</string>
+    <string name="command_description_ban_user">주어진 ID로 사용자 출입 금지하기</string>
+    <string name="command_description_unban_user">주어진 ID로 사용자 출입 금지 풀기</string>
     <string name="command_description_op_user">사용자의 권한 등급 정의하기</string>
     <string name="command_description_deop_user">주어진 ID로 사용자 강등하기</string>
     <string name="command_description_invite_user">주어진 ID 현재 방에 사용자 초대하기</string>
@@ -1114,7 +1114,7 @@
     <string name="group_no_long_description">커뮤니티 관리자가 이 커뮤니티에 대한 자세한 설명을 제공하지 않았습니다.</string>
 
     <string name="has_been_kicked">%2$s님에 의해 %1$s 방에서 추방당했습니다</string>
-    <string name="has_been_banned">%2$s님에 의해 %1$s 방에서 차단당했습니다</string>
+    <string name="has_been_banned">%2$s님에 의해 %1$s 방에서 출입 금지당했습니다</string>
     <string name="reason_colon">이유: %1$s</string>
     <string name="rejoin">다시 참가하기</string>
     <string name="forget_room">방 잊어버리기</string>
@@ -1623,4 +1623,72 @@
 
     <string name="settings_discovery_disconnect_with_bound_pid">현재 이메일 주소나 전화번호를 ID 서버 %1$s와 공유하고 있습니다. 공유하기를 중지하려면 %2$s(으)로 다시 연결해야 합니다.</string>
     <string name="settings_agree_to_terms">ID 서버 (%s)의 서비스 약관에 동의하면 다른 사용자가 당신을 이메일 주소나 전화번호로 찾을 수 있게 됩니다.</string>
+<string name="resources_script">Latn</string>
+
+    <string name="labs_allow_extended_logging">상세 로그 켜기.</string>
+    <string name="labs_allow_extended_logging_summary">상세 로그는 분노의 흔들기를 보낼 때 더 많은 로그를 제공해서 개발자에게 도움을 줍니다. 이 설정을 켜도 애플리케이션은 메시지 내용이나 다른 개인 정보를 기록하지 않습니다.</string>
+
+
+    <string name="error_terms_not_accepted">홈서버의 이용 약관에 동의한 후 다시 시도해주세요.</string>
+
+    <string name="error_network_timeout">서버의 응답 시간이 지연되고 있습니다. 연결 상태가 좋지 않거나 서버에서 오류가 발생했을지도 모릅니다. 나중에 다시 시도해주세요.</string>
+
+    <string name="send_attachment">첨부 파일 보내기</string>
+
+    <string name="a11y_open_drawer">내비게이션 서랍 열기</string>
+    <string name="a11y_create_menu_open">방 만들기 메뉴 열기</string>
+    <string name="a11y_create_menu_close">방 만들기 메뉴 닫기…</string>
+    <string name="a11y_create_direct_message">새 다이렉트 대화 만들기</string>
+    <string name="a11y_create_room">새 방 만들기</string>
+    <string name="a11y_close_keys_backup_banner">키 백업 배너 닫기</string>
+    <string name="a11y_show_password">비밀번호 보이기</string>
+    <string name="a11y_hide_password">비밀번호 감추기</string>
+    <string name="a11y_jump_to_bottom">맨 아래로 건너뛰기</string>
+
+    <string name="two_and_some_others_read">%1$s님, %2$s님 외 %3$d명이 읽음</string>
+    <string name="three_users_read">%1$s님, %2$s님 그리고 %3$s님이 읽음</string>
+    <string name="two_users_read">%1$s님 그리고 %2$s님이 읽음</string>
+    <string name="one_user_read">%s님이 읽음</string>
+    <plurals name="fallback_users_read">
+	<item quantity="other">%d명이 읽음</item>
+</plurals>
+
+    <string name="error_file_too_big">파일 \'%1$s\' (%2$s)이(가) 업로드하기에 너무 큽니다. 제한은 %3$s입니다.</string>
+
+    <string name="error_attachment">첨부 파일을 검색하는 중 오류가 발생했습니다.</string>
+    <string name="attachment_type_file">파일</string>
+    <string name="attachment_type_contact">연락처</string>
+    <string name="attachment_type_camera">카메라</string>
+    <string name="attachment_type_audio">소리</string>
+    <string name="attachment_type_gallery">갤러리</string>
+    <string name="attachment_type_sticker">스티커</string>
+    <string name="error_handling_incoming_share">공유 데이터를 처리할 수 없음</string>
+
+    <string name="report_content_spam">스팸 문자입니다</string>
+    <string name="report_content_inappropriate">부적절한 문자입니다</string>
+    <string name="report_content_custom">맞춤 신고</string>
+    <string name="report_content_custom_title">이 내용 신고하기</string>
+    <string name="report_content_custom_hint">이 내용을 신고하는 이유</string>
+    <string name="report_content_custom_submit">신고</string>
+    <string name="block_user">사용자 출입 금지</string>
+
+    <string name="content_reported_title">내용 신고됨</string>
+    <string name="content_reported_content">이 내용을 신고했습니다.
+\n
+\n이 사용자의 내용을 더 이상 보고 싶지 않다면, 사용자를 차단하거나 메시지를 감출 수 있습니다</string>
+    <string name="content_reported_as_spam_title">스팸 문자로 신고됨</string>
+    <string name="content_reported_as_spam_content">이 내용을 스팸 메일로 신고했습니다.
+\n
+\n이 사용자의 내용을 더 이상 보고 싶지 않다면, 사용자를 차단하거나 메시지를 감출 수 있습니다</string>
+    <string name="content_reported_as_inappropriate_title">부적절한 문자로 신고됨</string>
+    <string name="content_reported_as_inappropriate_content">이 내용을 부적절한 문자로 신고했습니다.
+\n
+\n이 사용자의 내용을 더 이상 보고 싶지 않다면, 사용자를 차단하거나 메시지를 감출 수 있습니다</string>
+
+    <string name="permissions_rationale_msg_keys_backup_export">Riot은 종단간 키를 디스크에 저장하려면 권한이 필요합니다.
+\n
+\n키를 수동으로 내보내려면 다음 팝업에서 접근을 허용해주세요.</string>
+
+    <string name="no_network_indicator">현재 네트워크 연결이 없습니다</string>
+
 </resources>

From 0f504d9ae70777015e47e1ae46f40f9c2be4d2f5 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit.marty@gmail.com>
Date: Thu, 24 Oct 2019 15:54:55 +0000
Subject: [PATCH 29/77] Translated using Weblate (Spanish)

Currently translated at 85.8% (1074 of 1252 strings)

Translation: Riot Android/Riot Android
Translate-URL: https://translate.riot.im/projects/riot-android/riot-android/es/
---
 vector/src/main/res/values-es/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/vector/src/main/res/values-es/strings.xml b/vector/src/main/res/values-es/strings.xml
index 894f7e3d47..252acefabc 100644
--- a/vector/src/main/res/values-es/strings.xml
+++ b/vector/src/main/res/values-es/strings.xml
@@ -1420,8 +1420,8 @@ Ten en cuenta que esta acción reiniciará la aplicación y puede tardar algo de
     <string name="keys_backup_info_title_signature">Firma</string>
 
     <string name="autodiscover_well_known_autofill_dialog_title">autocompletar opciones del servidor</string>
-    <string name="autodiscover_well_known_autofill_dialog_message">Riot ha detectado una configuración personalizada del servidor para el dominio de su ID de usuario \"%s\":
-\n%s</string>
+    <string name="autodiscover_well_known_autofill_dialog_message">Riot ha detectado una configuración personalizada del servidor para el dominio de su ID de usuario \"%1$s\": 
+\n%2$s</string>
     <string name="autodiscover_well_known_autofill_confirm">Configuración de uso</string>
 
     <string name="settings_default_media_source">Origen predeterminado de medios</string>

From ffe700b392092a548704f7d0f00991f9464483c2 Mon Sep 17 00:00:00 2001
From: Tiffany Thuy Kim Nguyen <tiffanytkn@hotmail.com>
Date: Fri, 25 Oct 2019 23:38:45 +0000
Subject: [PATCH 30/77] Translated using Weblate (Spanish (Mexico))

Currently translated at 43.2% (541 of 1252 strings)

Translation: Riot Android/Riot Android
Translate-URL: https://translate.riot.im/projects/riot-android/riot-android/es_MX/
---
 vector/src/main/res/values-es-rMX/strings.xml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/vector/src/main/res/values-es-rMX/strings.xml b/vector/src/main/res/values-es-rMX/strings.xml
index 423ecb5438..9ae9d36794 100644
--- a/vector/src/main/res/values-es-rMX/strings.xml
+++ b/vector/src/main/res/values-es-rMX/strings.xml
@@ -779,4 +779,9 @@ Dispositivos desconocidos:</string>
 
     <string name="room_message_placeholder_reply_to_encrypted">Enviar una respuesta cifrada…</string>
     <string name="room_message_placeholder_reply_to_not_encrypted">Enviar una respuesta (sin cifrar)…</string>
-</resources>
+<string name="resources_script">Latn</string>
+
+    <string name="notification_sync_init">Iniciando servicio</string>
+    <string name="title_activity_keys_backup_setup">Copia de seguridad de la clave</string>
+    <string name="title_activity_keys_backup_restore">Usar copia de seguridad de la clave</string>
+    </resources>

From 5d03d10b05f2683c8448b54a36a127bdfdd82b2c Mon Sep 17 00:00:00 2001
From: Tuomas Hietala <tuomas.hietala@iki.fi>
Date: Wed, 30 Oct 2019 14:24:00 +0000
Subject: [PATCH 31/77] Translated using Weblate (Finnish)

Currently translated at 94.4% (1182 of 1252 strings)

Translation: Riot Android/Riot Android
Translate-URL: https://translate.riot.im/projects/riot-android/riot-android/fi/
---
 vector/src/main/res/values-fi/strings.xml | 76 ++++++++++++++---------
 1 file changed, 46 insertions(+), 30 deletions(-)

diff --git a/vector/src/main/res/values-fi/strings.xml b/vector/src/main/res/values-fi/strings.xml
index 78856d0309..6f5973ea7f 100644
--- a/vector/src/main/res/values-fi/strings.xml
+++ b/vector/src/main/res/values-fi/strings.xml
@@ -6,7 +6,7 @@
     <string name="resources_country_code">FI</string>
 
     <!-- titles -->
-    <string name="title_activity_home">Keskustelut</string>
+    <string name="title_activity_home">Viestit</string>
     <string name="title_activity_room">Huone</string>
     <string name="title_activity_settings">Asetukset</string>
     <string name="title_activity_member_details">Jäsenen tiedot</string>
@@ -155,7 +155,7 @@
     <string name="auth_repeat_password_placeholder">Toista salasana</string>
     <string name="auth_repeat_new_password_placeholder">Vahvista uusi salasanasi</string>
     <string name="auth_invalid_login_param">Väärä käyttäjätunnus ja/tai salasana</string>
-    <string name="auth_invalid_user_name">Käyttäjätunnus saa koostua vain kirjaimista a-z, numeroista, pisteistä, väliviivoista ja alaviivoista</string>
+    <string name="auth_invalid_user_name">Käyttäjätunnus saa koostua vain kirjaimista a-z, numeroista, pisteistä, yhdysviivoista ja alaviivoista</string>
     <string name="auth_invalid_password">Liian lyhyt salasana (vähintään 6 merkkiä)</string>
     <string name="auth_missing_password">Salasana puuttuu</string>
     <string name="auth_invalid_email">Tämä ei näytä oikealta sähköpostiosoitteelta</string>
@@ -183,7 +183,7 @@
     <string name="auth_reset_password_success_message">Salasanasi on vaihdettu.\n\nSinut on kirjauduttu ulos kaikista laitteistasi, etkä enää saa viesti-ilmoituksia. Ottaaksesi käyttöön ilmoitukset uudelleen, kirjaudu sisään uudelleen kaikilla laitteillasi.</string>
 
     <!-- Login Screen -->
-    <string name="login_error_must_start_http">URL:n on alettava seuraavasti: http[s]://</string>
+    <string name="login_error_must_start_http">URL-osoitteen on alettava seuraavasti: http[s]://</string>
     <string name="login_error_network_error">Kirjautuminen epäonnistui: Verkkovirhe</string>
     <string name="login_error_unable_login">Kirjautuminen epäonnistui</string>
     <string name="login_error_registration_network_error">Rekisteröityminen epäonnistui: Verkkovirhe</string>
@@ -232,7 +232,7 @@
     <!-- call string -->
     <string name="call_connected">Yhdistetty</string>
     <string name="call_connecting">Yhdistetään…</string>
-    <string name="call_ended">Puhelu loppu</string>
+    <string name="call_ended">Puhelu loppui</string>
     <string name="call_ring">Soitetaan…</string>
     <string name="incoming_call">Saapuva puhelu</string>
     <string name="incoming_video_call">Saapuva videopuhelu</string>
@@ -285,7 +285,7 @@
     <string name="reject">Hylkää</string>
 
     <!-- Room -->
-    <string name="room_jump_to_first_unread">Hyppää ensimmäiseen lukemattomaan viestiin.</string>
+    <string name="room_jump_to_first_unread">Siirry ensimmäiseen lukemattomaan viestiin.</string>
 
     <!-- Room Preview -->
     <string name="room_preview_invitation_format">%s on kutsunut sinut huoneeseen</string>
@@ -298,7 +298,7 @@
     <!-- Chat creation -->
     <string name="room_creation_title">Uusi keskustelu</string>
     <string name="room_creation_add_member">Lisää jäsen</string>
-    <string name="room_title_one_member">1 jäsen</string>
+    <string name="room_title_one_member">yksi jäsen</string>
 
     <!--  Chat participants -->
     <string name="room_participants_leave_prompt_title">Poistu huoneesta</string>
@@ -349,7 +349,7 @@
     <string name="room_message_placeholder_encrypted">Lähetä salattu viesti…</string>
     <string name="room_message_placeholder_not_encrypted">Lähetä viesti (salaamaton)…</string>
     <string name="room_offline_notification">Yhteys palvelimeen katkesi.</string>
-    <string name="room_unsent_messages_notification">Viesteja ei lähetetty. %1$s vai %2$s\?</string>
+    <string name="room_unsent_messages_notification">Viestejä ei lähetetty. %1$s vai %2$s\?</string>
     <string name="room_unknown_devices_messages_notification">Viestejä ei lähetetty koska huoneessa on tuntemattomia laitteita. %1$s vai %2$s\?</string>
     <string name="room_prompt_resend">Lähetä kaikki uudelleen</string>
     <string name="room_prompt_cancel">Peruuta kaikki</string>
@@ -423,7 +423,7 @@
     <string name="room_settings_forget">Unohda</string>
 
     <!-- home sliding menu -->
-    <string name="room_sliding_menu_messages">Keskustelut</string>
+    <string name="room_sliding_menu_messages">Viestit</string>
     <string name="room_sliding_menu_settings">Asetukset</string>
     <string name="room_sliding_menu_version">Versio</string>
     <string name="room_sliding_menu_term_and_conditions">Käyttöehdot</string>
@@ -785,9 +785,9 @@
     <string name="groups_header">Yhteisöt</string>
     <string name="no_group_placeholder">Ei ryhmiä</string>
 
-    <string name="start_new_chat_prompt_msg">Oletko varma, että haluat aloittaa uuden keskustelun käyttäjän %s kanssa\?</string>
-    <string name="start_voice_call_prompt_msg">Oletko varma että haluat aloittaa äänipuhelun?</string>
-    <string name="start_video_call_prompt_msg">Oletko varma, että haluat aloittaa videopuhelun?</string>
+    <string name="start_new_chat_prompt_msg">Haluatko varmasti aloittaa uuden keskustelun käyttäjän %s kanssa\?</string>
+    <string name="start_voice_call_prompt_msg">Haluatko varmasti aloittaa äänipuhelun\?</string>
+    <string name="start_video_call_prompt_msg">Haluatko varmasti aloittaa videopuhelun\?</string>
 
     <string name="groups_list">Ryhmälistaus</string>
 
@@ -933,13 +933,13 @@ Haluatko lisätä paketteja?</string>
     <string name="open_chat_header">Avaa otsikko</string>
     <string name="room_sync_in_progress">Synkronoidaan…</string>
     <plurals name="room_header_active_members_count">
-        <item quantity="one">yksi aktiivinen käyttäjä</item>
-        <item quantity="other">%d aktiivista käyttäjää</item>
-    </plurals>
+	<item quantity="one">yksi aktiivinen jäsen</item>
+	<item quantity="other">%d aktiivista jäsentä</item>
+</plurals>
     <plurals name="room_title_members">
-        <item quantity="one">yksi käyttäjä</item>
-        <item quantity="other">%d käyttäjää</item>
-    </plurals>
+	<item quantity="one">yksi jäsen</item>
+	<item quantity="other">%d jäsentä</item>
+</plurals>
     <plurals name="format_time_s">
         <item quantity="one">1 s</item>
         <item quantity="other">%d s</item>
@@ -1136,13 +1136,13 @@ Haluatko lisätä paketteja?</string>
     <string name="lock_screen_hint">Kirjoita tähän…</string>
 
     <plurals name="notification_unread_notified_messages">
-        <item quantity="one">yksi lukematon viesti</item>
-        <item quantity="other">%d lukematonta viestiä</item>
-    </plurals>
+	<item quantity="one">yksi lukematon ilmoitettu viesti</item>
+	<item quantity="other">%d lukematonta ilmoitettua viestiä</item>
+</plurals>
     <plurals name="notification_unread_notified_messages_in_room_msgs">
-        <item quantity="one">1 lukematon viesti</item>
-        <item quantity="other">%d lukematonta viestiä</item>
-    </plurals>
+	<item quantity="one">yksi lukematon ilmoitettu viesti</item>
+	<item quantity="other">%d lukematonta ilmoitettua viestiä</item>
+</plurals>
     <plurals name="notification_unread_notified_messages_in_room_rooms">
         <item quantity="one">yksi huone</item>
         <item quantity="other">%d huonetta</item>
@@ -1156,7 +1156,7 @@ Haluatko lisätä paketteja?</string>
     <string name="widget_integration_invalid_parameter">Parametri ei ole kelvollinen.</string>
     <string name="settings_labs_native_camera_summary">Käynnistä järjestelmän kamera Riotin kameraruudun sijaan.</string>
     <string name="settings_labs_keyboard_options_to_send_message">Käytä näppäimistön rivinvaihtopainiketta viestin lähettämiseen</string>
-    <string name="settings_labs_enable_send_voice_summary">Tämä vaihtoehto vaatii kolmannen osapuolen sovelluksen viestien tallennukseen.</string>
+    <string name="settings_labs_enable_send_voice_summary">Tämä valinta vaatii kolmannen osapuolen sovelluksen viestien tallennukseen.</string>
 
     <string name="command_problem_with_parameters">Komento ”%s” vaatii enemmän parametreja, tai jotkin parametrit ovat virheellisiä.</string>
     <string name="command_description_emote">Näyttää toiminnon</string>
@@ -1200,7 +1200,7 @@ Haluatko lisätä paketteja?</string>
     <string name="room_tombstone_versioned_description">Tämä huone on korvattu toisella huoneella</string>
     <string name="room_tombstone_continuation_link">Keskustelu jatkuu täällä</string>
     <string name="room_tombstone_continuation_description">Tämä huone on jatkoa toiselle keskustelulle</string>
-    <string name="room_tombstone_predecessor_link">Täppää tästä nähdäksesi vanhat viestit</string>
+    <string name="room_tombstone_predecessor_link">Paina tästä nähdäksesi vanhemmat viestit</string>
 
     <string name="resource_limit_exceeded_title">Resurssiraja saavutettu</string>
     <string name="resource_limit_contact_action">Ota yhteys ylläpitäjään</string>
@@ -1227,7 +1227,7 @@ Haluatko lisätä paketteja?</string>
 
     <string name="settings_info_area_show">Näytä infoalue</string>
     <string name="show_info_area_always">Aina</string>
-    <string name="show_info_area_messages_and_errors">Tiedotuksille ja virheille</string>
+    <string name="show_info_area_messages_and_errors">Viesteille ja virheille</string>
     <string name="show_info_area_only_errors">Vain virheille</string>
 
     <string name="generic_label">%1$s:</string>
@@ -1249,7 +1249,7 @@ Jotta et menetä mitään, automaattiset päivitykset kannattaa pitää käytös
     <string name="keys_backup_passphrase_not_empty_error_message">Poista salalause, jos haluat Riotin generoivan palautusavaimen.</string>
     <string name="keys_backup_no_session_error">Matrix-istuntoa ei ole saatavilla</string>
 
-    <string name="keys_backup_setup_step1_title">Älä ikinä menetä salattuja viestejä</string>
+    <string name="keys_backup_setup_step1_title">Älä koskaan menetä salattuja viestejä</string>
     <string name="keys_backup_setup_step1_description">Salatuissa huoneissa viestit ovat suojattuna osapuolten välisellä salauksella. Vain sinä ja vastaanottaja(t) omistavat avaimet näiden viestien lukemiseen.
 \n
 \nVarmuuskopioi avaimesi, jotta et menetä niitä.</string>
@@ -1377,7 +1377,7 @@ Jotta et menetä mitään, automaattiset päivitykset kannattaa pitää käytös
 
     <string name="auth_login_sso">Kirjaudu sisään kertakirjautumisella</string>
     <string name="login_error_unknown_host">Tämä osoite ei ole saavutettavissa. Tarkistathan osoitteen</string>
-    <string name="login_error_ssl_handshake">Laitteesi käyttää vanhentunutta, haavoittuvaista TLS-protokollan versiota. Turvallisuutesi vuoksi et pysty yhdistämään</string>
+    <string name="login_error_ssl_handshake">Laitteesi käyttää vanhentunutta, haavoittuvaista TLS-protokollan versiota. Turvallisuutesi tähden et voi muodostaa yhteyttä</string>
     <string name="settings_send_message_with_enter">Lähetä viesti enter-näppäimellä</string>
     <string name="settings_send_message_with_enter_summary">Näppäimistön enter-näppäin lähettää viestin sen sijaan, että se lisäisi rivinvaihdon</string>
 
@@ -1646,7 +1646,7 @@ Jotta et menetä mitään, automaattiset päivitykset kannattaa pitää käytös
     <string name="disconnect_identity_server">Katkaise yhteys identiteettipalvelimeen</string>
     <string name="add_identity_server">Määritä identiteettipalvelin</string>
     <string name="change_identity_server">Vaihda identiteettipalvelinta</string>
-    <string name="settings_discovery_identity_server_info">Käytät palvelinta %1$s löytääksesi tuntemiasi ihmisiä ja jotta he löytäisivät sinut.</string>
+    <string name="settings_discovery_identity_server_info">Käytät palvelinta %1$s löytääksesi tuntemiasi ihmisiä ja ollaksesi heidän löydettävissään.</string>
     <string name="settings_discovery_identity_server_info_none">Et käytä tällä hetkellä identiteettipalvelinta. Jotta voit löytää tuntemiasi ihmisiä ja jotta he löytävät sinut, määritä identiteettipalvelin alla.</string>
     <string name="settings_discovery_mail_pending">Odottaa</string>
 
@@ -1691,4 +1691,20 @@ Jotta et menetä mitään, automaattiset päivitykset kannattaa pitää käytös
     <string name="report_content_inappropriate">Se on sopimaton</string>
     <string name="no_network_indicator">Verkkoyhteyttä ei ole juuri nyt</string>
 
-</resources>
+<string name="none">Ei mitään</string>
+    <string name="call_failed_no_ice_description">Pyydä kotipalvelimesi (%1$s) ylläpitäjää määrittämään TURN-palvelin, jotta puhelut toimivat luotettavasti.
+\n
+\nVaihtoehtoisesti voit yrittää käyttää julkista palvelinta osoitteessa %2$s, mutta tämä ei ole yhtä luotettava vaihtoehto ja antaa IP-osoitteesi kyseisen palvelimen tietoon. Voit myös hallita tätä asetuksista.</string>
+    <string name="call_failed_no_ice_use_alt">Kokeile käyttää palvelinta %s</string>
+    <string name="settings_call_ringtone_use_default_stun_sum">Käyttää palvelinta %s apupalvelimena, jos kotipalvelimesi ei tarjoa sellaista (IP-osoitteesi näkyy palvelimelle puhelun aikana)</string>
+    <string name="settings_background_fdroid_sync_mode_battery">Optimoitu akunkestoa varten</string>
+    <string name="settings_background_fdroid_sync_mode_battery_description">Riot synkronoi taustalla laitteen rajallisia resursseja (akkua) säästäen.
+\nLaitteesi resurssien tilasta riippuen käyttöjärjestelmä saattaa lykätä synkronointia.</string>
+    <string name="settings_background_fdroid_sync_mode_real_time">Optimoitu reaaliaikaa varten</string>
+    <string name="settings_background_fdroid_sync_mode_real_time_description">Riot synkronoi taustalla täsmällisin aikavälein (säädettävä).
+\nTämä vaikuttaa radion ja akun käyttöön. Näet pysyvän ilmoituksen, joka kertoo, että Riot kuuntelee tapahtumia.</string>
+    <string name="message_edits">Viestimuokkaukset</string>
+    <string name="terms_description_for_identity_server">Ole löydettävissä</string>
+    <string name="settings_text_message_sent">Tekstiviesti on lähetetty numeroon %s. Syötä sen sisältämä varmistuskoodi.</string>
+
+    </resources>

From 6d64e820dbd995dcb80cad6db7a355b8edb525b3 Mon Sep 17 00:00:00 2001
From: dccs <christoph.dehmer@t-online.de>
Date: Mon, 28 Oct 2019 09:29:46 +0000
Subject: [PATCH 32/77] Translated using Weblate (German)

Currently translated at 93.9% (1176 of 1252 strings)

Translation: Riot Android/Riot Android
Translate-URL: https://translate.riot.im/projects/riot-android/riot-android/de/
---
 vector/src/main/res/values-de/strings.xml | 60 +++++++++++++++++++----
 1 file changed, 50 insertions(+), 10 deletions(-)

diff --git a/vector/src/main/res/values-de/strings.xml b/vector/src/main/res/values-de/strings.xml
index c31eb7c2a2..790cc432c7 100644
--- a/vector/src/main/res/values-de/strings.xml
+++ b/vector/src/main/res/values-de/strings.xml
@@ -343,7 +343,7 @@ Bist du sicher?</string>
     <string name="room_unsent_messages_notification">Nachrichten konnten nicht gesendet werden. %1$s oder %2$s?</string>
     <string name="room_unknown_devices_messages_notification">Nachrichten wurden nicht gesendet, da unbekannte Geräte anwesend sind. %1$s oder %2$s?</string>
     <string name="room_prompt_resend">Alles erneut senden</string>
-    <string name="room_prompt_cancel">Senden abbrechen</string>
+    <string name="room_prompt_cancel">alles abbrechen</string>
     <string name="room_resend_unsent_messages">Nicht gesendete Nachrichten erneut senden</string>
     <string name="room_delete_unsent_messages">Nicht gesendete Nachrichten löschen</string>
     <string name="room_message_file_not_found">Datei nicht gefunden</string>
@@ -445,7 +445,7 @@ Beachte: Diese Aktion wird die App neu starten und einige Zeit brauchen.</string
     <string name="settings_background_sync">Hintergrundsynchronisierung</string>
     <string name="settings_enable_background_sync">Hintergrundsynchronisierung aktivieren</string>
     <string name="settings_set_sync_timeout">Timeout für Synchronisierungsanfragen</string>
-    <string name="settings_set_sync_delay">Verzögerung zwischen jeder Anfrage</string>
+    <string name="settings_set_sync_delay">Verzögerung zwischen jeder Synchronisierung</string>
     <string name="settings_second">Sekunde</string>
     <string name="settings_seconds">Sekunden</string>
 
@@ -473,10 +473,10 @@ Beachte: Diese Aktion wird die App neu starten und einige Zeit brauchen.</string
     <string name="settings_pin_missed_notifications">Räume mit ungelesenen Benachrichtigungen anheften</string>
     <string name="settings_pin_unread_messages">Räume mit ungelesenen Nachrichten anheften</string>
     <string name="settings_devices_list">Geräte</string>
-    <string name="devices_details_dialog_title">Geräte-Details</string>
+    <string name="devices_details_dialog_title">Geräte Information</string>
     <string name="devices_details_id_title">ID</string>
-    <string name="devices_details_name_title">Name</string>
-    <string name="devices_details_device_name">Gerätename</string>
+    <string name="devices_details_name_title">Öffentlicher Name</string>
+    <string name="devices_details_device_name">Öffentlichen Namen aktualisieren</string>
     <string name="devices_details_last_seen_title">Zuletzt gesehen</string>
     <string name="devices_details_last_seen_format">%1$s @ %2$s</string>
     <string name="devices_delete_dialog_text">Diese Operation benötigt weitere Authentifizierung.
@@ -607,9 +607,9 @@ Beachte: Diese Aktion wird die App neu starten und einige Zeit brauchen.</string
     <string name="encryption_information_decryption_error">Entschlüsselungsfehler</string>
 
     <string name="encryption_information_sender_device_information">Absendergeräteinformationen</string>
-    <string name="encryption_information_device_name">Gerätename</string>
-    <string name="encryption_information_name">Name</string>
-    <string name="encryption_information_device_id">Geräte-ID</string>
+    <string name="encryption_information_device_name">Öffentlicher Name</string>
+    <string name="encryption_information_name">Öffentlicher Name</string>
+    <string name="encryption_information_device_id">ID</string>
     <string name="encryption_information_device_key">Geräte-Schlüssel</string>
     <string name="encryption_information_verification">Verifizierungsstatus</string>
     <string name="encryption_information_ed25519_fingerprint">Ed25519-Fingerabdruck</string>
@@ -1552,8 +1552,8 @@ Wenn du diese neue Wiederherstellungsmethode nicht eingerichtet hast, kann ein A
     <string name="sas_incoming_request_description">Überprüfen Sie dieses Gerät, um es als vertrauenswürdig zu markieren. Das Vertrauen auf Geräte von Partnern gibt Ihnen zusätzliche Sicherheit, wenn Sie verschlüsselte End-to-End-Nachrichten verwenden.</string>
     <string name="sas_incoming_request_description_2">Das Verifizieren dieses Benutzers wird seine Geräte als \"vertraut\" markieren und dein Gerät bei ihnen als \"vertraut\" markieren.</string>
 
-    <string name="sas_emoji_description">Verifizieren Sie diesen Benutzer, indem Sie bestätigen, dass folgendes Emoji auf dessen Bildschirm erscheint.</string>
-    <string name="sas_decimal_description">Verifizieren Sie diesen Benutzer, indem Sie bestätigen, dass die folgende Nummer auf dessen Bildschirm erscheint.</string>
+    <string name="sas_emoji_description">Überprüfen Sie dieses Gerät, indem Sie bestätigen, dass das folgende Emoji auf dem Bildschirm des Partners angezeigt wird</string>
+    <string name="sas_decimal_description">Überprüfen Sie dieses Gerät, indem Sie bestätigen, dass die folgenden Zahlen auf dem Bildschirm des Partners angezeigt werden</string>
 
     <string name="sas_verifying_keys">Es ist nichts aufgetaucht\? Noch nicht alle Clients unterstützen die interaktive Verifikation. <button>Nutze alte Verifikation</button>.</string>
     <string name="sas_legacy_verification_button_title">Verwenden Sie die Alte-Überprüfung</string>
@@ -1668,4 +1668,44 @@ Wenn du diese neue Wiederherstellungsmethode nicht eingerichtet hast, kann ein A
     <string name="auth_add_email_message_2">Richten Sie eine E-Mail für die Kontowiederherstellung ein, die später von Personen, die Sie kennen, optional gefunden werden kann.</string>
     <string name="auth_add_phone_message_2">Richten Sie ein Telefon ein und lassen Sie es später optional von Personen erkennen, die Sie kennen.</string>
     <string name="auth_add_email_phone_message_2">Legen Sie eine E-Mail für die Kontowiederherstellung fest. Verwenden Sie eine spätere E-Mail oder ein späteres Telefon, um von Personen, die Sie kennen, optional gefunden zu werden.</string>
+    <string name="auth_add_email_and_phone_message_2">Legen Sie eine E-Mail für die Kontowiederherstellung fest. Verwenden Sie eine spätere E-Mail oder ein späteres Telefon, um von Personen, die Sie kennen, optional gefunden zu werden.</string>
+    <string name="settings_call_ringtone_use_default_stun">Fallback-Call-Assist-Server zulassen</string>
+    <string name="settings_background_fdroid_sync_mode_battery">Optimiert für die Batterie</string>
+    <string name="settings_background_fdroid_sync_mode_real_time">Optimiert für die Echtzeit</string>
+    <string name="settings_background_fdroid_sync_mode_disabled">Keine Hintergrundsynchronisation</string>
+    <string name="settings_background_sync_update_error">Fehler beim Aktualisieren der Einstellungen.</string>
+
+
+    <string name="settings_set_workmanager_delay">Bevorzugtes Synchronisationsintervall</string>
+    <string name="settings_discovery_category">Discovery</string>
+    <string name="encryption_information_device_name_with_warning">Öffentlicher Name (sichtbar für Personen, mit denen Sie kommunizieren)</string>
+    <string name="device_name_warning">Der öffentliche Name eines Geräts ist für Personen sichtbar, mit denen Sie kommunizieren</string>
+    <string name="widget_integration_review_terms">Um fortzufahren, müssen Sie die Bedingungen dieses Dienstes akzeptieren.</string>
+
+    <string name="identity_server_not_defined">Sie verwenden keinen Identity Server</string>
+    <string name="identity_server_not_defined_for_password_reset">Es ist kein Identitätsserver konfiguriert. Sie müssen Ihr Kennwort zurücksetzen.</string>
+
+    <string name="error_user_already_logged_in">Sie versuchen anscheinend, eine Verbindung zu einem anderen Homeserver herzustellen. Möchten Sie sich abmelden\?</string>
+
+    <string name="push_gateway_item_push_key">push_key:</string>
+    <string name="push_gateway_item_app_display_name">app_display_name:</string>
+    <string name="push_gateway_item_url">Url:</string>
+    <string name="terms_of_service">Nutzungsbedingungen</string>
+    <string name="review_terms">Nutzungsbedingungen überprüfen</string>
+    <string name="terms_description_for_identity_server">Für andere auffindbar sein</string>
+    <string name="terms_description_for_integration_manager">Verwenden Sie Bots, Bridges, Widgets und Sticker-Packs</string>
+
+    <string name="read_at">Lesen Sie bei</string>
+
+
+    <string name="identity_server">Identitätsserver</string>
+    <string name="disconnect_identity_server">Trennen Sie den Identitätsserver</string>
+    <string name="add_identity_server">Konfigurieren Sie den Identitätsserver</string>
+    <string name="change_identity_server">Identitätsserver ändern</string>
+    <string name="settings_discovery_emails_title">Erkennbare E-Mail-Adressen</string>
+    <string name="settings_discovery_no_mails">Erkennungsoptionen werden angezeigt, sobald Sie eine E-Mail hinzugefügt haben.</string>
+    <string name="settings_discovery_mail_pending">ausstehend</string>
+
+    <string name="settings_discovery_enter_identity_server">Gib einen neuen Identitätsserver ein</string>
+    <string name="settings_discovery_bad_identity_server">Konnte keine Verbindung zum Heimserver herstellen.</string>
     </resources>

From f97547cf32712067fc1416c802bb4bb3cf9374f1 Mon Sep 17 00:00:00 2001
From: random <dictionary@tutamail.com>
Date: Tue, 29 Oct 2019 13:16:14 +0000
Subject: [PATCH 33/77] Translated using Weblate (Italian)

Currently translated at 100.0% (1252 of 1252 strings)

Translation: Riot Android/Riot Android
Translate-URL: https://translate.riot.im/projects/riot-android/riot-android/it/
---
 vector/src/main/res/values-it/strings.xml | 69 +++++++++++++++++++++++
 1 file changed, 69 insertions(+)

diff --git a/vector/src/main/res/values-it/strings.xml b/vector/src/main/res/values-it/strings.xml
index 1c879ad794..74035998ab 100644
--- a/vector/src/main/res/values-it/strings.xml
+++ b/vector/src/main/res/values-it/strings.xml
@@ -1745,4 +1745,73 @@ Per essere certo di non perdere nulla, mantieni gli aggiornamenti attivi."</stri
 
     <string name="settings_discovery_disconnect_with_bound_pid">Attualmente stai condividendo indirizzi email o numeri di telefono sul server di identità %1$s. Dovrai riconnetterti a %2$s per fermarne la condivisione.</string>
     <string name="settings_agree_to_terms">Accetta le condizioni di servizio del server di identità (%s) per consentire di essere trovabile per email o numero di telefono.</string>
+<string name="resources_script">Latn</string>
+
+    <string name="labs_allow_extended_logging">Attiva log dettagliati.</string>
+    <string name="labs_allow_extended_logging_summary">I log dettagliati aiuteranno gli sviluppatori fornendo loro più informazioni quando invii una segnalazione. Anche quando attivi, l\'applicazione non registra i contenuti dei messaggi o altri dati personali.</string>
+
+
+    <string name="error_terms_not_accepted">Riprova dopo avere accettato i termini e condizioni del tuo homeserver.</string>
+
+    <string name="error_network_timeout">Sembra che il server stia impiegando troppo tempo a rispondere, ciò può essere causato da scarsa connettività o un errore con i nostri server. Riprova fra qualche minuto.</string>
+
+    <string name="send_attachment">Invia allegato</string>
+
+    <string name="a11y_open_drawer">Apri il pannello di navigazione</string>
+    <string name="a11y_create_menu_open">Apri il menu di creazione stanza</string>
+    <string name="a11y_create_menu_close">Chiudi il menu di creazione stanza…</string>
+    <string name="a11y_create_direct_message">Crea una nuova conversazione diretta</string>
+    <string name="a11y_create_room">Crea una nuova stanza</string>
+    <string name="a11y_close_keys_backup_banner">Chiudi il banner di backup chiavi</string>
+    <string name="a11y_show_password">Mostra password</string>
+    <string name="a11y_hide_password">Nascondi password</string>
+    <string name="a11y_jump_to_bottom">Salta in fondo</string>
+
+    <string name="two_and_some_others_read">%1$s, %2$s ed altri %3$d hanno letto</string>
+    <string name="three_users_read">%1$s, %2$s e %3$s hanno letto</string>
+    <string name="two_users_read">%1$s e %2$s hanno letto</string>
+    <string name="one_user_read">%s ha letto</string>
+    <plurals name="fallback_users_read">
+	<item quantity="one">1 utente ha letto</item>
+	<item quantity="other">%d utenti hanno letto</item>
+</plurals>
+
+    <string name="error_file_too_big">Il file \'%1$s\' (%2$s) è troppo grande da inviare. Il limite è %3$s.</string>
+
+    <string name="error_attachment">Si è verificato un errore ricevendo l\'allegato.</string>
+    <string name="attachment_type_file">File</string>
+    <string name="attachment_type_contact">Contatto</string>
+    <string name="attachment_type_camera">Fotocamera</string>
+    <string name="attachment_type_audio">Audio</string>
+    <string name="attachment_type_gallery">Galleria</string>
+    <string name="attachment_type_sticker">Adesivo</string>
+    <string name="error_handling_incoming_share">Errore di gestione dati condivisi</string>
+
+    <string name="report_content_spam">È spam</string>
+    <string name="report_content_inappropriate">È inappropriato</string>
+    <string name="report_content_custom">Segnalazione personalizzata</string>
+    <string name="report_content_custom_title">Segnala questo contenuto</string>
+    <string name="report_content_custom_hint">Motivo della segnalazione</string>
+    <string name="report_content_custom_submit">SEGNALA</string>
+    <string name="block_user">BLOCCA UTENTE</string>
+
+    <string name="content_reported_title">Contenuto segnalato</string>
+    <string name="content_reported_content">Questo contenuto è stato segnalato.
+\n
+\nSe non vuoi più vedere contenuti da questo utente, puoi bloccarlo per nascondere i suoi messaggi</string>
+    <string name="content_reported_as_spam_title">Segnalato come spam</string>
+    <string name="content_reported_as_spam_content">Questo contenuto è stato segnalato come spam.
+\n
+\nSe non vuoi più vedere contenuti da questo utente, puoi bloccarlo per nascondere i suoi messaggi</string>
+    <string name="content_reported_as_inappropriate_title">Segnalato come inappropriato</string>
+    <string name="content_reported_as_inappropriate_content">Questo contenuto è stato segnalato come inappropriato.
+\n
+\nSe non vuoi più vedere contenuti da questo utente, puoi bloccarlo per nascondere i suoi messaggi</string>
+
+    <string name="permissions_rationale_msg_keys_backup_export">Riot richiede l\'autorizzazione per salvare le tue chiavi E2E su disco.
+\n
+\nPermetti l\'accesso nel prossimo pop-up per poter esportare le chiavi manualmente.</string>
+
+    <string name="no_network_indicator">Non c\'è nessuna connessione di rete al momento</string>
+
 </resources>

From 7f68718df1086bfeac408ac1079fc8c2c2199a41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EC=86=A1=ED=83=9C=EC=84=AD?= <xotjq237@gmail.com>
Date: Tue, 29 Oct 2019 06:59:47 +0000
Subject: [PATCH 34/77] Translated using Weblate (Korean)

Currently translated at 100.0% (1252 of 1252 strings)

Translation: Riot Android/Riot Android
Translate-URL: https://translate.riot.im/projects/riot-android/riot-android/ko/
---
 vector/src/main/res/values-ko/strings.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/vector/src/main/res/values-ko/strings.xml b/vector/src/main/res/values-ko/strings.xml
index 24abda3fad..2a01a279e0 100644
--- a/vector/src/main/res/values-ko/strings.xml
+++ b/vector/src/main/res/values-ko/strings.xml
@@ -302,8 +302,8 @@
     <string name="room_info_room_topic">방 주제</string>
 
     <string name="settings_call_category">전화</string>
-    <string name="settings_call_ringtone_use_riot_ringtone">오는 전화에 Riot 기본 벨소리를 사용합니다</string>
-    <string name="settings_call_ringtone_title">오는 전화 벨소리</string>
+    <string name="settings_call_ringtone_use_riot_ringtone">수신 전화에 Riot 기본 벨소리를 사용합니다</string>
+    <string name="settings_call_ringtone_title">수신 전화 벨소리</string>
     <string name="settings_call_ringtone_dialog_title">전화에 사용할 벨소리를 선택하세요:</string>
 
     <string name="call">전화</string>
@@ -311,9 +311,9 @@
     <string name="call_connecting">전화 연결 중…</string>
     <string name="call_ended">전화 종료됨</string>
     <string name="call_ring">전화 중…</string>
-    <string name="incoming_call">오는 전화</string>
-    <string name="incoming_video_call">오는 영상 통화</string>
-    <string name="incoming_voice_call">오는 음성 통화</string>
+    <string name="incoming_call">수신 전화</string>
+    <string name="incoming_video_call">수신 영상 통화</string>
+    <string name="incoming_voice_call">수신 음성 통화</string>
     <string name="call_in_progress">전화 진행 중…</string>
     <string name="video_call_in_progress">영상 통화 진행 중…</string>
 
@@ -1584,7 +1584,7 @@
     <string name="settings_background_fdroid_sync_mode_real_time_description">Riot은 (설정할 수 있는) 특정 시간에 주기적으로 백그라운드에거 동기화됩니다.
 \n이는 라디오와 배터리 사용에 영향을 주며 Riot이 이벤트를 수신하고 있는 상태라는 알림이 영구적으로 표시됩니다.</string>
     <string name="settings_background_fdroid_sync_mode_disabled">백그라운드 동기화 없음</string>
-    <string name="settings_background_fdroid_sync_mode_disabled_description">앱이 백그라운드에 있을 때 오는 메시지의 알림을 받지 않습니다.</string>
+    <string name="settings_background_fdroid_sync_mode_disabled_description">앱이 백그라운드에 있을 때 수신 메시지의 알림을 받지 않습니다.</string>
     <string name="settings_background_sync_update_error">설정을 업데이트하는데 실패했습니다.</string>
 
 

From 7c0e671dedc9d0957bd62964ac48dccb62a8d209 Mon Sep 17 00:00:00 2001
From: Walter <studinsky@gmail.com>
Date: Tue, 29 Oct 2019 14:39:15 +0000
Subject: [PATCH 35/77] Translated using Weblate (Russian)

Currently translated at 96.6% (1209 of 1252 strings)

Translation: Riot Android/Riot Android
Translate-URL: https://translate.riot.im/projects/riot-android/riot-android/ru/
---
 vector/src/main/res/values-ru/strings.xml | 43 +++++++++++++----------
 1 file changed, 24 insertions(+), 19 deletions(-)

diff --git a/vector/src/main/res/values-ru/strings.xml b/vector/src/main/res/values-ru/strings.xml
index eaad9bf4aa..c2c8e30378 100644
--- a/vector/src/main/res/values-ru/strings.xml
+++ b/vector/src/main/res/values-ru/strings.xml
@@ -96,7 +96,7 @@
         <item quantity="one">%d пользователь</item>
         <item quantity="few">%d пользователя</item>
         <item quantity="many">%d пользователей</item>
-        <item quantity="other" />
+        <item quantity="other"/>
     </plurals>
 
     <string name="send_bug_report_include_logs">Отправить логи</string>
@@ -843,13 +843,13 @@
         <item quantity="one">%d комната</item>
         <item quantity="few">%d комнаты</item>
         <item quantity="many">%d комнат</item>
-        <item quantity="other" />
+        <item quantity="other"/>
     </plurals>
     <plurals name="notification_unread_notified_messages_in_room_rooms">
         <item quantity="one">%d комната</item>
         <item quantity="few">%d комнаты</item>
         <item quantity="many">%d комнат</item>
-        <item quantity="other" />
+        <item quantity="other"/>
     </plurals>
     <string name="notification_unread_notified_messages_in_room">%1$s в %2$s</string>
 
@@ -857,7 +857,7 @@
         <item quantity="one">%d активный виджет</item>
         <item quantity="few">%d активных виджета</item>
         <item quantity="many">%d активных виджетов</item>
-        <item quantity="other" />
+        <item quantity="other"/>
     </plurals>
 
     <!-- Widget Integration Manager -->
@@ -867,45 +867,45 @@
         <item quantity="one">%d активный участник</item>
         <item quantity="few">%d активных участника</item>
         <item quantity="many">%d активных участников</item>
-        <item quantity="other" />
+        <item quantity="other"/>
     </plurals>
     <plurals name="room_title_members">
         <item quantity="one">%d участник</item>
         <item quantity="few">%d участника</item>
         <item quantity="many">%d участников</item>
-        <item quantity="other" />
+        <item quantity="other"/>
     </plurals>
     <plurals name="room_new_messages_notification">
         <item quantity="one">%d новое сообщение</item>
         <item quantity="few">%d новых сообщения</item>
         <item quantity="many">%d новых сообщений</item>
-        <item quantity="other" />
+        <item quantity="other"/>
     </plurals>
 
     <plurals name="directory_search_rooms_for">
         <item quantity="one">%1$s комната найдена для %2$s</item>
         <item quantity="few">%1$s комнаты найдено для %2$s</item>
         <item quantity="many">%1$s комнат найдено для %2$s</item>
-        <item quantity="other" />
+        <item quantity="other"/>
     </plurals>
     <plurals name="membership_changes">
         <item quantity="one">%d изменение членства</item>
         <item quantity="few">%d изменения членства</item>
         <item quantity="many">%d изменений членства</item>
-        <item quantity="other" />
+        <item quantity="other"/>
     </plurals>
 
     <plurals name="notification_unread_notified_messages">
         <item quantity="one">%d непрочитанное уведомление</item>
         <item quantity="few">%d непрочитанных уведомления</item>
         <item quantity="many">%d непрочитанных уведомлений</item>
-        <item quantity="other" />
+        <item quantity="other"/>
     </plurals>
     <plurals name="notification_unread_notified_messages_in_room_msgs">
         <item quantity="one">%d непрочитанное уведомление</item>
         <item quantity="few">%d непрочитанных уведомления</item>
         <item quantity="many">%d непрочитанных уведомлений</item>
-        <item quantity="other" />
+        <item quantity="other"/>
     </plurals>
     <string name="receipt_avatar">Получить аватар</string>
     <string name="notice_avatar">Заметка аватара</string>
@@ -1020,13 +1020,13 @@
         <item quantity="one">%dm</item>
         <item quantity="few">%dm</item>
         <item quantity="many">%dm</item>
-        <item quantity="other" />
+        <item quantity="other"/>
     </plurals>
     <plurals name="format_time_h">
         <item quantity="one">%dh</item>
         <item quantity="few">%dh</item>
         <item quantity="many">%dh</item>
-        <item quantity="other" />
+        <item quantity="other"/>
     </plurals>
     <plurals name="format_time_d">
         <item quantity="one">%d день</item>
@@ -1045,20 +1045,20 @@
         <item quantity="one">%d выбран</item>
         <item quantity="few">%d выбрано</item>
         <item quantity="many">%d выбраны</item>
-        <item quantity="other" />
+        <item quantity="other"/>
     </plurals>
     <plurals name="group_members">
         <item quantity="one">%d участник</item>
         <item quantity="few">%d участника</item>
         <item quantity="many">%d участников</item>
-        <item quantity="other" />
+        <item quantity="other"/>
     </plurals>
 
     <plurals name="group_rooms">
         <item quantity="one">%d комната</item>
         <item quantity="few">%d комнаты</item>
         <item quantity="many">%d комнат</item>
-        <item quantity="other" />
+        <item quantity="other"/>
     </plurals>
     <string name="system_alerts_header">Системные оповещения</string>
 
@@ -1346,7 +1346,7 @@
         <item quantity="one">%d новый ключ был добавлен к этому устройству.</item>
         <item quantity="few">%d новых ключа были добавлены к этому устройству.</item>
         <item quantity="many">%d новых ключей были добавлены к этому устройству.</item>
-        <item quantity="other" />
+        <item quantity="other"/>
     </plurals>
 
     <plurals name="keys_backup_restore_success_description_part1">
@@ -1398,7 +1398,7 @@
         <item quantity="one">Резервное копирование %d ключа…</item>
         <item quantity="few">Резервное копирование %d ключей…</item>
         <item quantity="many">Резервное копирование %d ключей…</item>
-        <item quantity="other" />
+        <item quantity="other"/>
     </plurals>
 
     <string name="keys_backup_info_keys_all_backup_up">Все ключи сохранены</string>
@@ -1792,4 +1792,9 @@
 
     <string name="settings_discovery_disconnect_with_bound_pid">В настоящее время вы делитесь адресами электронной почты или телефонными номерами на сервере идентификации %1$s. Вам нужно повторно подключиться к %2$s, чтобы прекратить делиться ими.</string>
     <string name="settings_agree_to_terms">Примите Условия обслуживания сервера идентификации (%s), чтобы разрешить обнаружение по адресу электронной почты или номеру телефона.</string>
-</resources>
+<string name="labs_allow_extended_logging">Включить подробное журнал.</string>
+    <string name="send_attachment">Отправить вложенное</string>
+
+    <string name="a11y_open_drawer">Откройте навигационный ящик</string>
+    <string name="a11y_create_menu_open">Откройте меню «Создать комнату»</string>
+    </resources>

From 471f8442c2bf373dfcbf90ed2ac1a082a76dd9d8 Mon Sep 17 00:00:00 2001
From: Osoitz <oelkoro@gmail.com>
Date: Fri, 1 Nov 2019 09:08:06 +0000
Subject: [PATCH 36/77] Translated using Weblate (Basque)

Currently translated at 100.0% (1252 of 1252 strings)

Translation: Riot Android/Riot Android
Translate-URL: https://translate.riot.im/projects/riot-android/riot-android/eu/
---
 vector/src/main/res/values-eu/strings.xml | 69 +++++++++++++++++++++++
 1 file changed, 69 insertions(+)

diff --git a/vector/src/main/res/values-eu/strings.xml b/vector/src/main/res/values-eu/strings.xml
index 9e02bf8103..675bc74932 100644
--- a/vector/src/main/res/values-eu/strings.xml
+++ b/vector/src/main/res/values-eu/strings.xml
@@ -1697,4 +1697,73 @@ Abisua: Fitxategi hau ezabatu daiteke aplikazioa desinstalatzen bada.</string>
 
     <string name="settings_discovery_disconnect_with_bound_pid">Orain e-mail helbideak edo telefono zenbakiak partekatzen dituzu %1$s zerbitzarian. %2$s zerbitzarira konektatu beharko zara partekatzeari uzteko.</string>
     <string name="settings_agree_to_terms">Onartu %s identitate-zerbitzariaren erabilera baldintzak besteek zu e-mail helbidea edo telefonoa erabiliz aurkitzea ahalbidetzeko.</string>
+<string name="resources_script">Latn</string>
+
+    <string name="labs_allow_extended_logging">Gaitu egunkari xehetsuak.</string>
+    <string name="labs_allow_extended_logging_summary">Amorruz astintzean egunkari xehetsuak bidaltzeak garatzaileei laguntzen diete. Gaituta badago ere, aplikazioak ez ditu mezuen edukiak edo beste datu probaturik gordetzen egunkarian.</string>
+
+
+    <string name="error_terms_not_accepted">Saiatu berriro zure hasiera-zerbitzariaren erabilera baldintzak onartu eta gero.</string>
+
+    <string name="error_network_timeout">Badirudi zerbitzariak luze hartu duela erantzuteko, hau konexio kaxkar baten ondorioz izan daiteke edo zerbitzarian errore bat dagoelako. Saiatu berriro geroago.</string>
+
+    <string name="send_attachment">Bidali eranskina</string>
+
+    <string name="a11y_open_drawer">Ireki nabigazio-tiradera</string>
+    <string name="a11y_create_menu_open">Ireki gela sortzeko menua</string>
+    <string name="a11y_create_menu_close">Itxi gela sortzeko menua…</string>
+    <string name="a11y_create_direct_message">Sortu elkarrizketa zuzen berria</string>
+    <string name="a11y_create_room">Sortu gela berria</string>
+    <string name="a11y_close_keys_backup_banner">Itxi gakoen babes-kopiaren banda</string>
+    <string name="a11y_show_password">Erakutsi pasahitza</string>
+    <string name="a11y_hide_password">Ezkutatu pasahitza</string>
+    <string name="a11y_jump_to_bottom">Jauzi behera</string>
+
+    <string name="two_and_some_others_read">%1$s, %2$s eta beste %3$d erabiltzailek irakurria</string>
+    <string name="three_users_read">%1$s, %2$s eta%3$s erabiltzaileek irakurria</string>
+    <string name="two_users_read">%1$s eta %2$s erabiltzaileek irakurria</string>
+    <string name="one_user_read">%s erabiltzaileak irakurria</string>
+    <plurals name="fallback_users_read">
+	<item quantity="one">Erabiltzaile batek irakurria</item>
+	<item quantity="other">%d erabiltzailek irakurria</item>
+</plurals>
+
+    <string name="error_file_too_big">\'%1$s\' fitxategia (%2$s) handiegia da igotzeko. Muga %3$s da.</string>
+
+    <string name="error_attachment">Errore bat gertatu da eranskina eskuratzean.</string>
+    <string name="attachment_type_file">Fitxategia</string>
+    <string name="attachment_type_contact">Kontaktua</string>
+    <string name="attachment_type_camera">Kamera</string>
+    <string name="attachment_type_audio">Audioa</string>
+    <string name="attachment_type_gallery">Galeria</string>
+    <string name="attachment_type_sticker">Eranskailua</string>
+    <string name="error_handling_incoming_share">Ezin izan dira partekatutako datuak kudeatu</string>
+
+    <string name="report_content_spam">Spama da</string>
+    <string name="report_content_inappropriate">Desegokia da</string>
+    <string name="report_content_custom">Salaketa pertsonalizatua</string>
+    <string name="report_content_custom_title">Salatu eduki hau</string>
+    <string name="report_content_custom_hint">Eduki hau salatzeko arrazoia</string>
+    <string name="report_content_custom_submit">SALATU</string>
+    <string name="block_user">BLOKEATU ERABILTZAILEA</string>
+
+    <string name="content_reported_title">Edukia salatuta</string>
+    <string name="content_reported_content">Eduki hau salatu da.
+\n
+\nEz baduzu erabiltzaile honen eduki gehiago ikusi nahi, bere mezuak ezkutatzeko blokeatu dezakezu</string>
+    <string name="content_reported_as_spam_title">Spam gisa salatua</string>
+    <string name="content_reported_as_spam_content">Eduki hau spam gisa salatu da.
+\n
+\nEz baduzu erabiltzaile honen eduki gehiago ikusi nahi, bere mezuak ezkutatzeko blokeatu dezakezu</string>
+    <string name="content_reported_as_inappropriate_title">Desegoki gisa salatua</string>
+    <string name="content_reported_as_inappropriate_content">Eduki hau desegoki gisa salatu da.
+\n
+\nEz baduzu erabiltzaile honen eduki gehiago ikusi nahi, bere mezuak ezkutatzeko blokeatu dezakezu</string>
+
+    <string name="permissions_rationale_msg_keys_backup_export">Riot-ek zure E2E gakoak diskoan gordetzeko baimena behar du.
+\n
+\nBaimendu sarbidea hurrengo laster-leihoan zure gakoak eskuz esportatu ahal izateko.</string>
+
+    <string name="no_network_indicator">Ez dago sare konexiorik orain</string>
+
 </resources>

From 3a9c845837cf4ba851e6fea3adfbeb828f7cda1b Mon Sep 17 00:00:00 2001
From: Elwyn Malethan <elwyn@malethan.com>
Date: Sun, 3 Nov 2019 11:31:37 +0000
Subject: [PATCH 37/77] Added translation using Weblate (Welsh)

---
 vector/src/main/res/values-cy/strings.xml | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 vector/src/main/res/values-cy/strings.xml

diff --git a/vector/src/main/res/values-cy/strings.xml b/vector/src/main/res/values-cy/strings.xml
new file mode 100644
index 0000000000..a6b3daec93
--- /dev/null
+++ b/vector/src/main/res/values-cy/strings.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
\ No newline at end of file

From 38c57f9bae23554bfb8268242c2c866f316702b8 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Wed, 23 Oct 2019 10:35:37 +0200
Subject: [PATCH 38/77] WidgetManagerProvider no more singleton, but attached
 to session

---
 vector/src/main/java/im/vector/Matrix.java    | 33 ++++++--
 .../vector/activity/AbstractWidgetActivity.kt |  8 +-
 .../im/vector/activity/JitsiCallActivity.java | 22 ++++--
 .../vector/activity/VectorRoomActivity.java   | 37 +++++----
 .../java/im/vector/activity/WidgetActivity.kt | 16 ++--
 .../im/vector/util/PreferencesManager.java    |  6 ++
 .../im/vector/util/SlashCommandsParser.java   | 15 +++-
 .../im/vector/view/ActiveWidgetsBanner.java   | 19 ++++-
 .../view/VectorOngoingConferenceCallView.java | 18 ++++-
 .../vector/widgets/WidgetManagerProvider.kt   | 77 +++++++++++++++----
 vector/src/main/res/values/strings.xml        |  1 +
 .../res/xml/vector_settings_preferences.xml   |  6 ++
 12 files changed, 198 insertions(+), 60 deletions(-)

diff --git a/vector/src/main/java/im/vector/Matrix.java b/vector/src/main/java/im/vector/Matrix.java
index 8ba21131d7..60701b1c26 100755
--- a/vector/src/main/java/im/vector/Matrix.java
+++ b/vector/src/main/java/im/vector/Matrix.java
@@ -117,6 +117,8 @@ public class Matrix {
     @Nullable
     private KeyRequestHandler mKeyRequestHandler;
 
+    private HashMap<String, WidgetManagerProvider> mWidgetManagerProviders = new HashMap<>();
+
     // i.e the event has been read from another client
     private static final MXEventListener mLiveEventListener = new MXEventListener() {
         boolean mClearCacheRequired = false;
@@ -133,10 +135,12 @@ public void onIgnoredUsersListUpdate() {
         public void onLiveEvent(Event event, RoomState roomState) {
             mRefreshUnreadCounter |= Event.EVENT_TYPE_MESSAGE.equals(event.getType()) || Event.EVENT_TYPE_RECEIPT.equals(event.getType());
 
-            // TODO update to manage multisessions
-            WidgetsManager wm = WidgetManagerProvider.INSTANCE.getWidgetManager(VectorApp.getInstance().getApplicationContext());
-            if (wm != null) {
-                wm.onLiveEvent(instance.getDefaultSession(), event);
+            WidgetManagerProvider wp = instance.mWidgetManagerProviders.get(instance.getDefaultSession().getMyUserId());
+            if (wp != null) {
+                WidgetsManager wm = wp.getWidgetManager(VectorApp.getInstance().getApplicationContext());
+                if (wm != null) {
+                    wm.onLiveEvent(instance.getDefaultSession(), event);
+                }
             }
         }
 
@@ -306,6 +310,23 @@ public List<MXSession> getSessions() {
         return sessions;
     }
 
+    @Nullable
+    public WidgetManagerProvider getWidgetManagerProvider(MXSession session) {
+        if (session == null) {
+            return null;
+        }
+        return mWidgetManagerProviders.get(session.getMyUserId());
+    }
+
+    @Nullable
+    public static WidgetsManager getWidgetManager(Context activity) {
+        if (Matrix.getInstance(activity) == null) return null;
+        MXSession session = Matrix.getInstance(activity).getDefaultSession();
+        if (session == null) return null;
+        WidgetManagerProvider widgetManagerProvider = Matrix.getInstance(activity).getWidgetManagerProvider(session);
+        if (widgetManagerProvider == null) return null;
+        return widgetManagerProvider.getWidgetManager(activity);
+    }
     /**
      * Retrieve the default session if one exists.
      * <p>
@@ -648,7 +669,9 @@ public synchronized void addSession(MXSession session) {
      * @return The session.
      */
     public MXSession createSession(HomeServerConnectionConfig hsConfig) {
-        return createSession(mAppContext, hsConfig);
+        MXSession session = createSession(mAppContext, hsConfig);
+        mWidgetManagerProviders.put(session.getMyUserId(), new WidgetManagerProvider(session));
+        return session;
     }
 
     /**
diff --git a/vector/src/main/java/im/vector/activity/AbstractWidgetActivity.kt b/vector/src/main/java/im/vector/activity/AbstractWidgetActivity.kt
index a4905a2152..68ed3582e7 100755
--- a/vector/src/main/java/im/vector/activity/AbstractWidgetActivity.kt
+++ b/vector/src/main/java/im/vector/activity/AbstractWidgetActivity.kt
@@ -35,7 +35,6 @@ import im.vector.types.JsonDict
 import im.vector.types.WidgetEventData
 import im.vector.util.AssetReader
 import im.vector.util.toJsonMap
-import im.vector.widgets.WidgetManagerProvider
 import im.vector.widgets.WidgetsManager
 import org.jetbrains.anko.toast
 import org.matrix.androidsdk.MXSession
@@ -88,7 +87,8 @@ abstract class AbstractWidgetActivity : VectorAppCompatActivity() {
 
     @CallSuper
     override fun initUiAndData() {
-        mSession = Matrix.getInstance(this).getSession(intent.getStringExtra(EXTRA_MATRIX_ID))
+        val matrix = Matrix.getInstance(this)
+        mSession = matrix.getSession(intent.getStringExtra(EXTRA_MATRIX_ID))
 
         if (null == mSession || !mSession!!.isAlive) {
             Log.e(LOG_TAG, "## onCreate() : invalid session")
@@ -100,7 +100,7 @@ abstract class AbstractWidgetActivity : VectorAppCompatActivity() {
 
         mRoom = mSession!!.dataHandler.getRoom(intent.getStringExtra(EXTRA_ROOM_ID))
 
-        widgetManager = WidgetManagerProvider.getWidgetManager(this) ?: run {
+        widgetManager = matrix.getWidgetManagerProvider(mSession)?.getWidgetManager(this) ?: run {
             finish()
             return
         }
@@ -149,7 +149,7 @@ abstract class AbstractWidgetActivity : VectorAppCompatActivity() {
     }
 
     private fun presentTermsForServices(token: String) {
-        val wm = WidgetManagerProvider.getWidgetManager(this)
+        val wm = Matrix.getInstance(this).getWidgetManagerProvider(mSession)?.getWidgetManager(this)//WidgetManagerProvider.getWidgetManagerProvider(this)
         if (wm == null) {  // should not happen
             finish()
             return
diff --git a/vector/src/main/java/im/vector/activity/JitsiCallActivity.java b/vector/src/main/java/im/vector/activity/JitsiCallActivity.java
index 7a9ec345e2..6113f75c6f 100755
--- a/vector/src/main/java/im/vector/activity/JitsiCallActivity.java
+++ b/vector/src/main/java/im/vector/activity/JitsiCallActivity.java
@@ -27,6 +27,7 @@
 import com.facebook.react.modules.core.PermissionListener;
 
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 import org.jitsi.meet.sdk.JitsiMeetActivityDelegate;
 import org.jitsi.meet.sdk.JitsiMeetActivityInterface;
 import org.jitsi.meet.sdk.JitsiMeetConferenceOptions;
@@ -109,10 +110,7 @@ public int getLayoutRes() {
     @Override
     @SuppressLint("NewApi")
     public void initUiAndData() {
-        if (WidgetManagerProvider.INSTANCE.getWidgetManager(this) == null) {
-            finish();
-            return;
-        }
+
         // Waiting View
         setWaitingView(findViewById(R.id.jitsi_progress_layout));
 
@@ -136,6 +134,10 @@ public void initUiAndData() {
             return;
         }
 
+        if (getWidgetManager() == null) {
+            finish();
+            return;
+        }
 
         mRoom = mSession.getDataHandler().getRoom(mWidget.getRoomId());
         if (null == mRoom) {
@@ -237,7 +239,7 @@ public void onNewIntent(Intent intent) {
     protected void onStop() {
         super.onStop();
         JitsiMeetActivityDelegate.onHostPause(this);
-        WidgetsManager wm = WidgetManagerProvider.INSTANCE.getWidgetManager(this);
+        WidgetsManager wm = getWidgetManager();
         if (wm != null) {
             wm.removeListener(mWidgetListener);
         }
@@ -253,12 +255,20 @@ protected void onResume() {
         super.onResume();
 
         JitsiMeetActivityDelegate.onHostResume(this);
-        WidgetsManager wm = WidgetManagerProvider.INSTANCE.getWidgetManager(this);
+        WidgetsManager wm = getWidgetManager();
         if (wm != null) {
             wm.addListener(mWidgetListener);
         }
     }
 
+    @Nullable
+    private WidgetsManager getWidgetManager() {
+        if (mSession == null) return null;
+        WidgetManagerProvider widgetManagerProvider = Matrix.getInstance(this).getWidgetManagerProvider(mSession);
+        if (widgetManagerProvider == null) return null;
+        return widgetManagerProvider.getWidgetManager(this);
+    }
+
     @Override
     public void onBackPressed() {
         JitsiMeetActivityDelegate.onBackPressed();
diff --git a/vector/src/main/java/im/vector/activity/VectorRoomActivity.java b/vector/src/main/java/im/vector/activity/VectorRoomActivity.java
index a76802317a..539db45a0c 100755
--- a/vector/src/main/java/im/vector/activity/VectorRoomActivity.java
+++ b/vector/src/main/java/im/vector/activity/VectorRoomActivity.java
@@ -864,7 +864,7 @@ public void onCloseWidgetClick(final Widget widget) {
                         .setPositiveButton(R.string.remove, new DialogInterface.OnClickListener() {
                             @Override
                             public void onClick(DialogInterface dialog, int which) {
-                                WidgetsManager wm = WidgetManagerProvider.INSTANCE.getWidgetManager(VectorRoomActivity.this);
+                                WidgetsManager wm = Matrix.getWidgetManager(VectorRoomActivity.this);
                                 if (wm != null) {
                                     showWaitingView();
 
@@ -969,7 +969,7 @@ public void onVideoCallClick(Widget widget) {
 
             @Override
             public void onCloseWidgetClick(Widget widget) {
-                WidgetsManager wm = WidgetManagerProvider.INSTANCE.getWidgetManager(VectorRoomActivity.this);
+                WidgetsManager wm = Matrix.getWidgetManager(VectorRoomActivity.this);
                 if (wm != null) {
                     showWaitingView();
 
@@ -1493,7 +1493,7 @@ public boolean onPrepareOptionsMenu(Menu menu) {
             return true;
         }
 
-        boolean hasIntegrationManager = WidgetManagerProvider.INSTANCE.getWidgetManager(this) != null;
+        boolean hasIntegrationManager = Matrix.getWidgetManager(this) != null;
 
         // the menu is only displayed when the current activity does not display a timeline search
         if (TextUtils.isEmpty(mEventId) && (null == sRoomPreviewData)) {
@@ -1637,7 +1637,7 @@ private void openIntegrationManagerActivity(@Nullable String screenId) {
             return;
         }
 
-        WidgetsManager wm = WidgetManagerProvider.INSTANCE.getWidgetManager(this);
+        WidgetsManager wm = Matrix.getWidgetManager(this);
         if (wm == null) {
             //Should not happen this action is not activated if no wm
             return;
@@ -1779,7 +1779,7 @@ private void launchJitsiActivity(Widget widget, boolean aIsVideoCall) {
      * @param aIsVideoCall true if the call is a video one
      */
     private void startJitsiCall(final boolean aIsVideoCall) {
-        WidgetsManager wm = WidgetManagerProvider.INSTANCE.getWidgetManager(this);
+        WidgetsManager wm = Matrix.getWidgetManager(this);
         if (wm != null) {
             enableActionBarHeader(HIDE_ACTION_BAR_HEADER);
             showWaitingView();
@@ -3871,7 +3871,7 @@ private void chooseMediaSource(boolean useNativeCamera, boolean isVoiceFeatureEn
         }
 
         // Send sticker
-        if (WidgetManagerProvider.INSTANCE.getWidgetManager(this) != null) {
+        if (Matrix.getWidgetManager(this) != null) {
             items.add(DialogListItem.SendSticker.INSTANCE);
         }
 
@@ -4009,13 +4009,13 @@ void onStartCallClick() {
                     .setIcon(android.R.drawable.ic_dialog_alert)
                     .setPositiveButton(R.string.ok, null)
                     .show();
-        } else if (WidgetManagerProvider.INSTANCE.getWidgetManager(this) == null) {
-            // display the dialog with the info text
-            new AlertDialog.Builder(this)
-                    .setMessage(R.string.integration_manager_not_configured)
-                    .setIcon(android.R.drawable.ic_dialog_alert)
-                    .setPositiveButton(R.string.ok, null)
-                    .show();
+//        } else if (Matrix.getWidgetManager(this) == null) {
+//            // display the dialog with the info text
+//            new AlertDialog.Builder(this)
+//                    .setMessage(R.string.integration_manager_not_configured)
+//                    .setIcon(android.R.drawable.ic_dialog_alert)
+//                    .setPositiveButton(R.string.ok, null)
+//                    .show();
         } else if (isUserAllowedToStartConfCall()) {
             if (mRoom.getNumberOfMembers() > 2) {
                 new AlertDialog.Builder(this)
@@ -4026,7 +4026,16 @@ void onStartCallClick() {
                             @Override
                             public void onClick(DialogInterface dialog, int which) {
                                 if (PreferencesManager.useJitsiConfCall(VectorRoomActivity.this)) {
-                                    startJitsiCall(true);
+                                    if (Matrix.getWidgetManager(VectorRoomActivity.this) == null) {
+                                        // display the dialog with the info text
+                                        new AlertDialog.Builder(VectorRoomActivity.this)
+                                                .setMessage(R.string.integration_manager_not_configured)
+                                                .setIcon(android.R.drawable.ic_dialog_alert)
+                                                .setPositiveButton(R.string.ok, null)
+                                                .show();
+                                    } else {
+                                        startJitsiCall(true);
+                                    }
                                 } else {
                                     displayVideoCallIpDialog();
                                 }
diff --git a/vector/src/main/java/im/vector/activity/WidgetActivity.kt b/vector/src/main/java/im/vector/activity/WidgetActivity.kt
index a74d8e537f..ecb17db300 100755
--- a/vector/src/main/java/im/vector/activity/WidgetActivity.kt
+++ b/vector/src/main/java/im/vector/activity/WidgetActivity.kt
@@ -37,7 +37,6 @@ import butterknife.OnClick
 import im.vector.Matrix
 import im.vector.R
 import im.vector.widgets.Widget
-import im.vector.widgets.WidgetManagerProvider
 import im.vector.widgets.WidgetsManager
 import org.jetbrains.anko.toast
 import org.matrix.androidsdk.MXSession
@@ -104,14 +103,17 @@ class WidgetActivity : VectorAppCompatActivity() {
             return
         }
 
-        widgetsManager = WidgetManagerProvider.getWidgetManager(this) ?: run {
-            Log.e(LOG_TAG, "## onCreate() : No widget manager ")
-            finish()
-            return
-        }
-
         mSession = Matrix.getMXSession(this, mWidget!!.sessionId)
 
+
+        widgetsManager = Matrix.getInstance(this).getWidgetManagerProvider(mSession)?.getWidgetManager(this)
+                ?: run {
+                    Log.e(LOG_TAG, "## onCreate() : No widget manager ")
+                    finish()
+                    return
+                }
+
+
         if (null == mSession) {
             Log.e(LOG_TAG, "## onCreate() : invalid session")
             finish()
diff --git a/vector/src/main/java/im/vector/util/PreferencesManager.java b/vector/src/main/java/im/vector/util/PreferencesManager.java
index e6ee643bec..b626a146ed 100755
--- a/vector/src/main/java/im/vector/util/PreferencesManager.java
+++ b/vector/src/main/java/im/vector/util/PreferencesManager.java
@@ -170,6 +170,7 @@ public class PreferencesManager {
     public static final String SETTINGS_USE_RAGE_SHAKE_KEY = "SETTINGS_USE_RAGE_SHAKE_KEY";
 
     //Integrations
+    public static final String SETTINGS_INTEGRATION_ALLOW = "SETTINGS_INTEGRATION_ALLOW";
     public static final String SETTINGS_INTEGRATION_MANAGER_UI_URL = "SETTINGS_INTEGRATION_MANAGER_UI_URL";
     public static final String SETTINGS_INTEGRATION_MANAGER_API_URL = "SETTINGS_INTEGRATION_MANAGER_API_URL";
     public static final String SETTINGS_INTEGRATION_MANAGER_JITSI_URL = "SETTINGS_INTEGRATION_MANAGER_JITSI_URL";
@@ -289,6 +290,11 @@ public static void setDidAskUserToIgnoreBatteryOptimizations(Context context) {
                 .apply();
     }
 
+    public static Boolean areIntegrationAllowed(Context context) {
+        return PreferenceManager.getDefaultSharedPreferences(context).getBoolean(SETTINGS_INTEGRATION_ALLOW,
+                true);
+    }
+
     public static String getIntegrationManagerUiUrl(Context context) {
         return PreferenceManager.getDefaultSharedPreferences(context).getString(SETTINGS_INTEGRATION_MANAGER_UI_URL,
                 context.getString(R.string.integrations_ui_url));
diff --git a/vector/src/main/java/im/vector/util/SlashCommandsParser.java b/vector/src/main/java/im/vector/util/SlashCommandsParser.java
index c16ee5d827..710ca5342e 100755
--- a/vector/src/main/java/im/vector/util/SlashCommandsParser.java
+++ b/vector/src/main/java/im/vector/util/SlashCommandsParser.java
@@ -18,12 +18,14 @@
 
 package im.vector.util;
 
+import android.app.Activity;
 import android.text.TextUtils;
 import android.widget.Toast;
 
 import androidx.annotation.StringRes;
 import androidx.appcompat.app.AlertDialog;
 
+import org.jetbrains.annotations.Nullable;
 import org.matrix.androidsdk.MXSession;
 import org.matrix.androidsdk.core.Log;
 import org.matrix.androidsdk.core.callback.ApiCallback;
@@ -38,6 +40,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import im.vector.Matrix;
 import im.vector.R;
 import im.vector.VectorApp;
 import im.vector.activity.CommonActivityUtils;
@@ -353,7 +356,7 @@ public void onMatrixError(final MatrixError e) {
                 isIRCCmd = true;
                 isIRCCmdValid = true;
 
-                WidgetsManager wm = WidgetManagerProvider.INSTANCE.getWidgetManager(activity);
+                WidgetsManager wm = getWidgetManager(activity);
                 if (wm != null) {
                     wm.clearScalarToken(activity, session);
                     Toast.makeText(activity, "Scalar token cleared", Toast.LENGTH_SHORT).show();
@@ -384,4 +387,14 @@ public void onMatrixError(final MatrixError e) {
 
         return isIRCCmd;
     }
+
+    @Nullable
+    private static WidgetsManager getWidgetManager(Activity activity) {
+        if (Matrix.getInstance(activity) == null) return null;
+        MXSession session = Matrix.getInstance(activity).getDefaultSession();
+        if (session == null) return null;
+        WidgetManagerProvider widgetManagerProvider = Matrix.getInstance(activity).getWidgetManagerProvider(session);
+        if (widgetManagerProvider == null) return null;
+        return widgetManagerProvider.getWidgetManager(activity);
+    }
 }
diff --git a/vector/src/main/java/im/vector/view/ActiveWidgetsBanner.java b/vector/src/main/java/im/vector/view/ActiveWidgetsBanner.java
index f833a2d3df..171fd7f528 100755
--- a/vector/src/main/java/im/vector/view/ActiveWidgetsBanner.java
+++ b/vector/src/main/java/im/vector/view/ActiveWidgetsBanner.java
@@ -18,12 +18,14 @@
 
 package im.vector.view;
 
+import android.app.Activity;
 import android.content.Context;
 import android.util.AttributeSet;
 import android.view.View;
 import android.widget.FrameLayout;
 import android.widget.TextView;
 
+import org.jetbrains.annotations.Nullable;
 import org.matrix.androidsdk.MXSession;
 import org.matrix.androidsdk.core.Log;
 import org.matrix.androidsdk.data.Room;
@@ -31,6 +33,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import im.vector.Matrix;
 import im.vector.R;
 import im.vector.widgets.Widget;
 import im.vector.widgets.WidgetManagerProvider;
@@ -168,7 +171,7 @@ public void setOnUpdateListener(onUpdateListener listener) {
      * Refresh the view visibility
      */
     private void refresh() {
-        WidgetsManager wm = WidgetManagerProvider.INSTANCE.getWidgetManager(getContext());
+        WidgetsManager wm = getWidgetManager(getContext());
         if (wm == null) {
             return;
         }
@@ -209,7 +212,7 @@ private void refresh() {
      */
     public void onActivityResume() {
         refresh();
-        WidgetsManager wm = WidgetManagerProvider.INSTANCE.getWidgetManager(getContext());
+        WidgetsManager wm = getWidgetManager(getContext());
         if (wm != null) {
             wm.addListener(mWidgetListener);
         }
@@ -219,9 +222,19 @@ public void onActivityResume() {
      * The parent activity is suspended
      */
     public void onActivityPause() {
-        WidgetsManager wm = WidgetManagerProvider.INSTANCE.getWidgetManager(getContext());
+        WidgetsManager wm = getWidgetManager(getContext());
         if (wm != null) {
             wm.removeListener(mWidgetListener);
         }
     }
+
+    @Nullable
+    private WidgetsManager getWidgetManager(Context activity) {
+        if (Matrix.getInstance(activity) == null) return null;
+        MXSession session = Matrix.getInstance(activity).getDefaultSession();
+        if (session == null) return null;
+        WidgetManagerProvider widgetManagerProvider = Matrix.getInstance(activity).getWidgetManagerProvider(session);
+        if (widgetManagerProvider == null) return null;
+        return widgetManagerProvider.getWidgetManager(activity);
+    }
 }
diff --git a/vector/src/main/java/im/vector/view/VectorOngoingConferenceCallView.java b/vector/src/main/java/im/vector/view/VectorOngoingConferenceCallView.java
index 517b52e3c0..86e1caec02 100755
--- a/vector/src/main/java/im/vector/view/VectorOngoingConferenceCallView.java
+++ b/vector/src/main/java/im/vector/view/VectorOngoingConferenceCallView.java
@@ -31,6 +31,7 @@
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
+import org.jetbrains.annotations.Nullable;
 import org.matrix.androidsdk.MXSession;
 import org.matrix.androidsdk.call.IMXCall;
 import org.matrix.androidsdk.call.IMXCallsManagerListener;
@@ -44,6 +45,7 @@
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
+import im.vector.Matrix;
 import im.vector.R;
 import im.vector.widgets.Widget;
 import im.vector.widgets.WidgetManagerProvider;
@@ -241,7 +243,7 @@ public void setCallClickListener(ICallClickListener callClickListener) {
      * Refresh the view visibility
      */
     public void refresh() {
-        WidgetsManager wm = WidgetManagerProvider.INSTANCE.getWidgetManager(getContext());
+        WidgetsManager wm = getWidgetManager(getContext());
         if (wm == null) {
             return;
         }
@@ -278,7 +280,7 @@ public void onActivityResume() {
         if (null != mSession) {
             mSession.mCallsManager.addListener(mCallsListener);
         }
-        WidgetsManager wm = WidgetManagerProvider.INSTANCE.getWidgetManager(getContext());
+        WidgetsManager wm = getWidgetManager(getContext());
         if (wm != null) {
             wm.addListener(mWidgetListener);
         }
@@ -291,7 +293,7 @@ public void onActivityPause() {
         if (null != mSession) {
             mSession.mCallsManager.removeListener(mCallsListener);
         }
-        WidgetsManager wm = WidgetManagerProvider.INSTANCE.getWidgetManager(getContext());
+        WidgetsManager wm = getWidgetManager(getContext());
         if (wm != null) {
             wm.removeListener(mWidgetListener);
         }
@@ -303,4 +305,14 @@ public void onActivityPause() {
     public Widget getActiveWidget() {
         return mActiveWidget;
     }
+
+    @Nullable
+    private WidgetsManager getWidgetManager(Context activity) {
+        if (Matrix.getInstance(activity) == null) return null;
+        MXSession session = Matrix.getInstance(activity).getDefaultSession();
+        if (session == null) return null;
+        WidgetManagerProvider widgetManagerProvider = Matrix.getInstance(activity).getWidgetManagerProvider(session);
+        if (widgetManagerProvider == null) return null;
+        return widgetManagerProvider.getWidgetManager(activity);
+    }
 }
diff --git a/vector/src/main/java/im/vector/widgets/WidgetManagerProvider.kt b/vector/src/main/java/im/vector/widgets/WidgetManagerProvider.kt
index 8839b1af4b..1376d8da90 100644
--- a/vector/src/main/java/im/vector/widgets/WidgetManagerProvider.kt
+++ b/vector/src/main/java/im/vector/widgets/WidgetManagerProvider.kt
@@ -16,36 +16,79 @@
 package im.vector.widgets
 
 import android.content.Context
+import im.vector.R
 import im.vector.util.PreferencesManager
+import org.matrix.androidsdk.MXSession
+import org.matrix.androidsdk.features.integrationmanager.IntegrationManager
+import org.matrix.androidsdk.features.integrationmanager.isEmptyConfig
 import java.net.MalformedURLException
 import java.net.URL
 
-object WidgetManagerProvider {
+class WidgetManagerProvider(val session: MXSession) : IntegrationManager.IntegrationManagerManagerListener {
+
+
+    override fun onIntegrationManagerChange(managerConfig: IntegrationManager) {
+        //Clear caches
+        currentConfig = null
+        widgetsManager = null
+    }
+
+    init {
+        session.integrationManager.addListener(this)
+    }
 
     private var widgetsManager: WidgetsManager? = null
+    private var currentConfig: IntegrationManagerConfig? = null
 
     fun getWidgetManager(context: Context): WidgetsManager? {
-        if (widgetsManager != null) {
+        val userDefinedConfig = session.integrationManager.integrationServerConfig
+        var sdkConfig: IntegrationManagerConfig? = null
+
+        if (userDefinedConfig != null) {
+            if (userDefinedConfig.isEmptyConfig()) {
+                //The user forced a null config so we don't use the default one
+                currentConfig = null
+                widgetsManager = null
+                return null
+            }
+            val defaultWhitelist = ArrayList(PreferencesManager.getIntegrationWhiteListedUrl(context))
+            defaultWhitelist.add(0, userDefinedConfig.apiUrl)
+            sdkConfig = IntegrationManagerConfig(
+                    uiUrl = userDefinedConfig.uiUrl,
+                    apiUrl = userDefinedConfig.apiUrl,
+                    jitsiUrl = "${userDefinedConfig.apiUrl}/widgets/jitsi.html",
+                    whiteListedUrls = defaultWhitelist)
+        } else {
+            //Use the default IM
+            // TODO we should try to get the one suggested by the HS well-known
+            sdkConfig = IntegrationManagerConfig(
+                    uiUrl = context.getString(R.string.integrations_ui_url),
+                    apiUrl = context.getString(R.string.integrations_rest_url),
+                    jitsiUrl = context.getString(R.string.integrations_jitsi_widget_url),
+                    whiteListedUrls = ArrayList(PreferencesManager.getIntegrationWhiteListedUrl(context)))
+        }
+
+
+
+        if (currentConfig == sdkConfig && widgetsManager != null) {
             return widgetsManager
         }
-        val uiURl = PreferencesManager.getIntegrationManagerUiUrl(context)
-        val apiURL = PreferencesManager.getIntegrationManagerApiUrl(context)
-        val jitsiUrl = PreferencesManager.getIntegrationManagerJitsiUrl(context)
-        if (uiURl.isNullOrBlank() || apiURL.isNullOrBlank() || jitsiUrl.isNullOrBlank()) return null
+
+        if (sdkConfig.uiUrl.isBlank() || sdkConfig.apiUrl.isBlank() || sdkConfig.jitsiUrl.isBlank()) {
+            currentConfig = null
+            widgetsManager = null
+            return null
+        }
+
         return try {
             //Very basic validity check (well formed url)
-            URL(uiURl)
-            URL(apiURL)
-            URL(jitsiUrl)
-            val defaultWhitelist = ArrayList(PreferencesManager.getIntegrationWhiteListedUrl(context))
-            defaultWhitelist.add(0, apiURL)
+            URL(sdkConfig.uiUrl)
+            URL(sdkConfig.apiUrl)
+            URL(sdkConfig.jitsiUrl)
 
-            val config = IntegrationManagerConfig(
-                    uiUrl = uiURl,
-                    apiUrl = apiURL,
-                    jitsiUrl = jitsiUrl,
-                    whiteListedUrls = defaultWhitelist)
-            WidgetsManager(config).also {
+            currentConfig = sdkConfig
+
+            WidgetsManager(sdkConfig).also {
                 this.widgetsManager = it
             }
         } catch (e: MalformedURLException) {
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index de8d1d9e22..caf620cb7e 100755
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -834,6 +834,7 @@
     <string name="settings_logged_in">Logged in as</string>
     <string name="settings_home_server">Home Server</string>
     <string name="settings_identity_server">Identity Server</string>
+    <string name="settings_integration_allow">Allow Integrations</string>
     <string name="settings_integration_manager">Integration Manager</string>
 
     <string name="settings_user_interface">User interface</string>
diff --git a/vector/src/main/res/xml/vector_settings_preferences.xml b/vector/src/main/res/xml/vector_settings_preferences.xml
index 9465ab6254..35e84e933a 100755
--- a/vector/src/main/res/xml/vector_settings_preferences.xml
+++ b/vector/src/main/res/xml/vector_settings_preferences.xml
@@ -447,7 +447,13 @@
             app:fragment="im.vector.fragments.discovery.VectorSettingsDiscoveryFragment"/>
 
 
+        <im.vector.preference.VectorSwitchPreference
+            android:key="SETTINGS_INTEGRATION_ALLOW"
+            android:defaultValue="true"
+            android:title="@string/settings_integration_allow" />
+
         <im.vector.preference.VectorPreference
+            android:dependency="SETTINGS_INTEGRATION_ALLOW"
             android:defaultValue="@string/integrations_ui_url"
             android:key="SETTINGS_INTEGRATION_MANAGER_UI_URL"
             android:title="@string/settings_integration_manager" />

From 54545004e7eb49d336922e68ffc8b73683af6a14 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Wed, 6 Nov 2019 10:08:36 +0100
Subject: [PATCH 39/77] Use IM wellknown if needed + enable/disable integration
 setting

---
 vector/src/main/java/im/vector/VectorApp.java |  5 --
 .../PhoneNumberVerificationActivity.java      |  2 +-
 .../VectorSettingsPreferencesFragment.kt      | 83 +++++++++++++++----
 .../im/vector/util/PreferencesManager.java    | 53 ------------
 .../vector/widgets/WidgetManagerProvider.kt   | 40 +++++----
 .../res/xml/vector_settings_preferences.xml   |  5 +-
 6 files changed, 97 insertions(+), 91 deletions(-)

diff --git a/vector/src/main/java/im/vector/VectorApp.java b/vector/src/main/java/im/vector/VectorApp.java
index 187961c131..b8eabc13c9 100755
--- a/vector/src/main/java/im/vector/VectorApp.java
+++ b/vector/src/main/java/im/vector/VectorApp.java
@@ -197,11 +197,6 @@ public void onCreate() {
         Log.d(LOG_TAG, "onCreate");
         super.onCreate();
 
-        PreferencesManager.setIntegrationManagerUrls(this,
-                getString(R.string.integrations_ui_url),
-                getString(R.string.integrations_rest_url),
-                getString(R.string.integrations_jitsi_widget_url));
-
         mLifeCycleListener = new VectorLifeCycleObserver();
         ProcessLifecycleOwner.get().getLifecycle().addObserver(mLifeCycleListener);
 
diff --git a/vector/src/main/java/im/vector/activity/PhoneNumberVerificationActivity.java b/vector/src/main/java/im/vector/activity/PhoneNumberVerificationActivity.java
index d4f0ef6aed..a4f05bc56e 100644
--- a/vector/src/main/java/im/vector/activity/PhoneNumberVerificationActivity.java
+++ b/vector/src/main/java/im/vector/activity/PhoneNumberVerificationActivity.java
@@ -184,7 +184,7 @@ public void onUnexpectedError(Exception e) {
     }
 
     private void registerAfterPhoneNumberValidation(final ThreePid pid) {
-        mSession.getIdentityServerManager().finalizeAddSessionForEmail(pid, new ApiCallback<Void>() {
+        mSession.getIdentityServerManager().finalize3pidAddSession(pid, null, new ApiCallback<Void>() {
             @Override
             public void onSuccess(Void info) {
                 Intent intent = new Intent();
diff --git a/vector/src/main/java/im/vector/fragments/VectorSettingsPreferencesFragment.kt b/vector/src/main/java/im/vector/fragments/VectorSettingsPreferencesFragment.kt
index aff7df47d1..9c9cc3ffbb 100755
--- a/vector/src/main/java/im/vector/fragments/VectorSettingsPreferencesFragment.kt
+++ b/vector/src/main/java/im/vector/fragments/VectorSettingsPreferencesFragment.kt
@@ -60,11 +60,7 @@ import im.vector.dialogs.ExportKeysDialog
 import im.vector.extensions.getFingerprintHumanReadable
 import im.vector.extensions.showPassword
 import im.vector.extensions.withArgs
-import im.vector.fragments.troubleshoot.NotificationTroubleshootTestManager
-import im.vector.preference.ProgressBarPreference
-import im.vector.preference.UserAvatarPreference
-import im.vector.preference.VectorGroupPreference
-import im.vector.preference.VectorPreference
+import im.vector.preference.*
 import im.vector.settings.FontScale
 import im.vector.settings.VectorLocale
 import im.vector.ui.themes.ThemeUtils
@@ -88,6 +84,7 @@ import org.matrix.androidsdk.data.MyUser
 import org.matrix.androidsdk.data.Pusher
 import org.matrix.androidsdk.data.RoomMediaMessage
 import org.matrix.androidsdk.db.MXMediaCache
+import org.matrix.androidsdk.features.integrationmanager.IntegrationManager
 import org.matrix.androidsdk.listeners.MXEventListener
 import org.matrix.androidsdk.listeners.MXMediaUploadListener
 import org.matrix.androidsdk.rest.model.bingrules.BingRule
@@ -126,7 +123,7 @@ class VectorSettingsPreferencesFragment : PreferenceFragmentCompat(), SharedPref
 
         override fun onAccountDataUpdated(accountDataElement: AccountDataElement) {
             if (accountDataElement.type == AccountDataElement.ACCOUNT_DATA_TYPE_IDENTITY_SERVER) {
-                (findPreference(PreferencesManager.SETTINGS_IDENTITY_SERVER_PREFERENCE_KEY) as EditTextPreference).let {
+                (findPreference(PreferencesManager.SETTINGS_IDENTITY_SERVER_PREFERENCE_KEY) as VectorPreference).let {
                     updateIdentityServerPref()
                 }
             }
@@ -152,6 +149,12 @@ class VectorSettingsPreferencesFragment : PreferenceFragmentCompat(), SharedPref
     // current publicised group list
     private var mPublicisedGroups: MutableSet<String>? = null
 
+    private var integrationManagerManagerListener = object : IntegrationManager.IntegrationManagerManagerListener {
+        override fun onIntegrationManagerChange(managerConfig: IntegrationManager) {
+            refreshIntegrationManagerSettings()
+        }
+    }
+
     /* ==========================================================================================
      * Preferences
      * ========================================================================================== */
@@ -621,8 +624,33 @@ class VectorSettingsPreferencesFragment : PreferenceFragmentCompat(), SharedPref
         // identity server
         updateIdentityServerPref()
 
-        findPreference(PreferencesManager.SETTINGS_INTEGRATION_MANAGER_UI_URL)
-                .summary = PreferencesManager.getIntegrationManagerUiUrl(context)
+
+        (findPreference(PreferencesManager.SETTINGS_INTEGRATION_ALLOW) as? VectorSwitchPreference)?.let {
+            it.onPreferenceChangeListener = Preference.OnPreferenceChangeListener { _, newValue ->
+
+                //Disable it while updating the state, will be re-enabled by the account data listener.
+                it.isEnabled = false
+                mSession.enableIntegrationManagerUsage(newValue as Boolean, object : ApiCallback<Void> {
+                    override fun onSuccess(info: Void?) {
+                        //nop
+                    }
+
+                    override fun onUnexpectedError(e: java.lang.Exception?) {
+                        refreshIntegrationManagerSettings()
+                    }
+
+                    override fun onNetworkError(e: java.lang.Exception?) {
+                        refreshIntegrationManagerSettings()
+                    }
+
+                    override fun onMatrixError(e: MatrixError?) {
+                        refreshIntegrationManagerSettings()
+                    }
+
+                })
+                true
+            }
+        }
 
         // Analytics
 
@@ -789,7 +817,7 @@ class VectorSettingsPreferencesFragment : PreferenceFragmentCompat(), SharedPref
                     } else {
                         MXCallsManager.defaultStunServerUri = null
                     }
-                    PreferencesManager.setUseDefaultTurnServer(activity,mUseDefaultStunPreference.isChecked)
+                    PreferencesManager.setUseDefaultTurnServer(activity, mUseDefaultStunPreference.isChecked)
                     false
                 }
             }
@@ -831,6 +859,29 @@ class VectorSettingsPreferencesFragment : PreferenceFragmentCompat(), SharedPref
         }
     }
 
+
+    private fun refreshIntegrationManagerSettings() {
+        val integrationAllowed = mSession.integrationManager.integrationAllowed
+        (findPreference(PreferencesManager.SETTINGS_INTEGRATION_ALLOW) as SwitchPreference).let {
+            val savedListener = it.onPreferenceChangeListener
+            it.onPreferenceChangeListener = null
+            it.isChecked = integrationAllowed
+            it.isEnabled = true
+            it.onPreferenceChangeListener = savedListener
+        }
+
+        findPreference(PreferencesManager.SETTINGS_INTEGRATION_MANAGER_UI_URL).let {
+            if (integrationAllowed) {
+                it.summary = Matrix.getWidgetManager(context)?.uiUrl ?: getString(R.string.none)
+                it.isVisible = true
+            } else {
+                it.isVisible = false
+            }
+        }
+
+
+    }
+
     private fun refreshBackgroundSyncSection(appContext: Context?) {
         // background sync tuning settings
         // these settings are useless and hidden if the app is registered to the FCM push service
@@ -896,7 +947,7 @@ class VectorSettingsPreferencesFragment : PreferenceFragmentCompat(), SharedPref
                                             // Even if using foreground service with foreground notif, it stops to work
                                             // in doze mode for certain devices :/
 
-                                            if ( !isIgnoringBatteryOptimizations(requireContext())) {
+                                            if (!isIgnoringBatteryOptimizations(requireContext())) {
                                                 requestDisablingBatteryOptimization(requireActivity(),
                                                         this@VectorSettingsPreferencesFragment,
                                                         REQUEST_BATTERY_OPTIMIZATION)
@@ -905,11 +956,11 @@ class VectorSettingsPreferencesFragment : PreferenceFragmentCompat(), SharedPref
 
                                             pushManager.setFdroidSyncModeOptimizedForRealTime();
                                         }
-                                        PreferencesManager.FDROID_BACKGROUND_SYNC_MODE_FOR_BATTERY -> {
+                                        PreferencesManager.FDROID_BACKGROUND_SYNC_MODE_FOR_BATTERY  -> {
 
                                             pushManager.setFdroidSyncModeOptimizedForBattery();
                                         }
-                                        PreferencesManager.FDROID_BACKGROUND_SYNC_MODE_DISABLED -> {
+                                        PreferencesManager.FDROID_BACKGROUND_SYNC_MODE_DISABLED     -> {
                                             pushManager.setFdroidSyncModeDisabled()
                                         }
                                     }
@@ -1031,6 +1082,9 @@ class VectorSettingsPreferencesFragment : PreferenceFragmentCompat(), SharedPref
 
             PreferenceManager.getDefaultSharedPreferences(context).registerOnSharedPreferenceChangeListener(this)
 
+            mSession.integrationManager.addListener(integrationManagerManagerListener)
+            refreshIntegrationManagerSettings()
+
             // refresh anything else
             refreshPreferences()
             refreshNotificationPrivacy()
@@ -1055,6 +1109,7 @@ class VectorSettingsPreferencesFragment : PreferenceFragmentCompat(), SharedPref
         if (mSession.isAlive) {
             mSession.dataHandler.removeListener(mEventsListener)
             Matrix.getInstance(context)?.removeNetworkEventListener(mNetworkListener)
+            mSession.integrationManager.removeListener(integrationManagerManagerListener)
         }
 
         PreferenceManager.getDefaultSharedPreferences(context).unregisterOnSharedPreferenceChangeListener(this)
@@ -2049,11 +2104,11 @@ class VectorSettingsPreferencesFragment : PreferenceFragmentCompat(), SharedPref
                     .setTitle(R.string.account_email_validation_title)
                     .setMessage(R.string.account_email_validation_message)
                     .setPositiveButton(R.string._continue) { _, _ ->
-                        mSession.identityServerManager.finalizeAddSessionForEmail(pid, object : ApiCallback<Void?> {
+                        mSession.identityServerManager.finalize3pidAddSession(pid, null, object : ApiCallback<Void?> {
                             override fun onSuccess(info: Void?) {
                                 it.runOnUiThread {
                                     hideLoadingView()
-                                    mSession.myUser.refreshThirdPartyIdentifiers(object : SimpleApiCallback<Void?>(){
+                                    mSession.myUser.refreshThirdPartyIdentifiers(object : SimpleApiCallback<Void?>() {
                                         override fun onSuccess(info: Void?) {
                                             refreshEmailsList()
                                         }
diff --git a/vector/src/main/java/im/vector/util/PreferencesManager.java b/vector/src/main/java/im/vector/util/PreferencesManager.java
index b626a146ed..fb4c7aea07 100755
--- a/vector/src/main/java/im/vector/util/PreferencesManager.java
+++ b/vector/src/main/java/im/vector/util/PreferencesManager.java
@@ -172,9 +172,6 @@ public class PreferencesManager {
     //Integrations
     public static final String SETTINGS_INTEGRATION_ALLOW = "SETTINGS_INTEGRATION_ALLOW";
     public static final String SETTINGS_INTEGRATION_MANAGER_UI_URL = "SETTINGS_INTEGRATION_MANAGER_UI_URL";
-    public static final String SETTINGS_INTEGRATION_MANAGER_API_URL = "SETTINGS_INTEGRATION_MANAGER_API_URL";
-    public static final String SETTINGS_INTEGRATION_MANAGER_JITSI_URL = "SETTINGS_INTEGRATION_MANAGER_JITSI_URL";
-    public static final String SETTINGS_INTEGRATION_WHITELIST_URL = "SETTINGS_INTEGRATION_WHITELIST_URL";
 
     // other
     public static final String SETTINGS_MEDIA_SAVING_PERIOD_KEY = "SETTINGS_MEDIA_SAVING_PERIOD_KEY";
@@ -290,56 +287,6 @@ public static void setDidAskUserToIgnoreBatteryOptimizations(Context context) {
                 .apply();
     }
 
-    public static Boolean areIntegrationAllowed(Context context) {
-        return PreferenceManager.getDefaultSharedPreferences(context).getBoolean(SETTINGS_INTEGRATION_ALLOW,
-                true);
-    }
-
-    public static String getIntegrationManagerUiUrl(Context context) {
-        return PreferenceManager.getDefaultSharedPreferences(context).getString(SETTINGS_INTEGRATION_MANAGER_UI_URL,
-                context.getString(R.string.integrations_ui_url));
-    }
-
-    public static String getIntegrationManagerApiUrl(Context context) {
-        return PreferenceManager.getDefaultSharedPreferences(context).getString(SETTINGS_INTEGRATION_MANAGER_API_URL,
-                context.getString(R.string.integrations_rest_url));
-    }
-
-    public static String getIntegrationManagerJitsiUrl(Context context) {
-        return PreferenceManager.getDefaultSharedPreferences(context).getString(SETTINGS_INTEGRATION_MANAGER_JITSI_URL,
-                context.getString(R.string.integrations_jitsi_widget_url));
-    }
-
-
-    public static void setIntegrationManagerUrls(Context context, String uiURl, String apiURl, String jitsiUrl) {
-        if (uiURl != null) {
-            PreferenceManager.getDefaultSharedPreferences(context)
-                    .edit()
-                    .putString(SETTINGS_INTEGRATION_MANAGER_UI_URL, uiURl)
-                    .apply();
-        }
-        if (apiURl != null) {
-            PreferenceManager.getDefaultSharedPreferences(context)
-                    .edit()
-                    .putString(SETTINGS_INTEGRATION_MANAGER_API_URL, apiURl)
-                    .apply();
-        }
-
-        if (jitsiUrl != null) {
-            PreferenceManager.getDefaultSharedPreferences(context)
-                    .edit()
-                    .putString(SETTINGS_INTEGRATION_MANAGER_JITSI_URL, jitsiUrl)
-                    .apply();
-        }
-    }
-
-    public static List<String> getIntegrationWhiteListedUrl(Context context) {
-        Set<String> defaultSet = new HashSet<>(Arrays.asList(context.getResources().getStringArray(R.array.integrations_widgets_urls)));
-        Set<String> set = PreferenceManager.getDefaultSharedPreferences(context).getStringSet(SETTINGS_INTEGRATION_WHITELIST_URL, defaultSet);
-        return new ArrayList<>(set);
-    }
-
-
     public static boolean didMigrateToNotificationRework(Context context) {
         return PreferenceManager.getDefaultSharedPreferences(context).getBoolean(DID_MIGRATE_TO_NOTIFICATION_REWORK, false);
     }
diff --git a/vector/src/main/java/im/vector/widgets/WidgetManagerProvider.kt b/vector/src/main/java/im/vector/widgets/WidgetManagerProvider.kt
index 1376d8da90..30725bec03 100644
--- a/vector/src/main/java/im/vector/widgets/WidgetManagerProvider.kt
+++ b/vector/src/main/java/im/vector/widgets/WidgetManagerProvider.kt
@@ -20,9 +20,10 @@ import im.vector.R
 import im.vector.util.PreferencesManager
 import org.matrix.androidsdk.MXSession
 import org.matrix.androidsdk.features.integrationmanager.IntegrationManager
-import org.matrix.androidsdk.features.integrationmanager.isEmptyConfig
 import java.net.MalformedURLException
 import java.net.URL
+import java.util.*
+import kotlin.collections.ArrayList
 
 class WidgetManagerProvider(val session: MXSession) : IntegrationManager.IntegrationManagerManagerListener {
 
@@ -41,31 +42,38 @@ class WidgetManagerProvider(val session: MXSession) : IntegrationManager.Integra
     private var currentConfig: IntegrationManagerConfig? = null
 
     fun getWidgetManager(context: Context): WidgetsManager? {
+        if (!session.integrationManager.integrationAllowed) return null
+
         val userDefinedConfig = session.integrationManager.integrationServerConfig
         var sdkConfig: IntegrationManagerConfig? = null
+        val defaultWhitelist = context.resources.getStringArray(R.array.integrations_widgets_urls).asList()
 
         if (userDefinedConfig != null) {
-            if (userDefinedConfig.isEmptyConfig()) {
-                //The user forced a null config so we don't use the default one
-                currentConfig = null
-                widgetsManager = null
-                return null
-            }
-            val defaultWhitelist = ArrayList(PreferencesManager.getIntegrationWhiteListedUrl(context))
-            defaultWhitelist.add(0, userDefinedConfig.apiUrl)
+
+            val whiteList = defaultWhitelist + userDefinedConfig.apiUrl
             sdkConfig = IntegrationManagerConfig(
                     uiUrl = userDefinedConfig.uiUrl,
                     apiUrl = userDefinedConfig.apiUrl,
                     jitsiUrl = "${userDefinedConfig.apiUrl}/widgets/jitsi.html",
-                    whiteListedUrls = defaultWhitelist)
+                    whiteListedUrls = whiteList)
         } else {
             //Use the default IM
-            // TODO we should try to get the one suggested by the HS well-known
-            sdkConfig = IntegrationManagerConfig(
-                    uiUrl = context.getString(R.string.integrations_ui_url),
-                    apiUrl = context.getString(R.string.integrations_rest_url),
-                    jitsiUrl = context.getString(R.string.integrations_jitsi_widget_url),
-                    whiteListedUrls = ArrayList(PreferencesManager.getIntegrationWhiteListedUrl(context)))
+            // Check if a config is defined in wellknown
+            val wellKnownIM = session.integrationManager.getWellKnownIntegrationManagerConfigs().firstOrNull()
+            sdkConfig = if (wellKnownIM != null) {
+                IntegrationManagerConfig(
+                        uiUrl = wellKnownIM.uiUrl,
+                        apiUrl = wellKnownIM.apiUrl,
+                        jitsiUrl = "${wellKnownIM.apiUrl}/widgets/jitsi.html",
+                        whiteListedUrls = listOf(wellKnownIM.apiUrl)
+                )
+            } else {
+                IntegrationManagerConfig(
+                        uiUrl = context.getString(R.string.integrations_ui_url),
+                        apiUrl = context.getString(R.string.integrations_rest_url),
+                        jitsiUrl = context.getString(R.string.integrations_jitsi_widget_url),
+                        whiteListedUrls = defaultWhitelist)
+            }
         }
 
 
diff --git a/vector/src/main/res/xml/vector_settings_preferences.xml b/vector/src/main/res/xml/vector_settings_preferences.xml
index 35e84e933a..b01cc64444 100755
--- a/vector/src/main/res/xml/vector_settings_preferences.xml
+++ b/vector/src/main/res/xml/vector_settings_preferences.xml
@@ -449,12 +449,13 @@
 
         <im.vector.preference.VectorSwitchPreference
             android:key="SETTINGS_INTEGRATION_ALLOW"
-            android:defaultValue="true"
+            android:enabled="true"
+            android:persistent="false"
             android:title="@string/settings_integration_allow" />
 
         <im.vector.preference.VectorPreference
             android:dependency="SETTINGS_INTEGRATION_ALLOW"
-            android:defaultValue="@string/integrations_ui_url"
+            android:persistent="false"
             android:key="SETTINGS_INTEGRATION_MANAGER_UI_URL"
             android:title="@string/settings_integration_manager" />
 

From d8a7e954888033bd9eeb31bc07c18f978e80665d Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoitm@matrix.org>
Date: Wed, 6 Nov 2019 17:38:10 +0100
Subject: [PATCH 40/77] Format strings

---
 vector/src/main/res/values-de/strings.xml     |  4 +-
 vector/src/main/res/values-es-rMX/strings.xml |  4 +-
 vector/src/main/res/values-eu/strings.xml     |  8 ++--
 vector/src/main/res/values-fi/strings.xml     | 36 ++++++++---------
 vector/src/main/res/values-fr/strings.xml     |  8 ++--
 vector/src/main/res/values-hu/strings.xml     | 16 ++++----
 vector/src/main/res/values-it/strings.xml     |  8 ++--
 vector/src/main/res/values-ko/strings.xml     |  6 +--
 vector/src/main/res/values-ru/strings.xml     | 40 +++++++++----------
 vector/src/main/res/values-zh-rTW/strings.xml |  6 +--
 10 files changed, 68 insertions(+), 68 deletions(-)

diff --git a/vector/src/main/res/values-de/strings.xml b/vector/src/main/res/values-de/strings.xml
index 790cc432c7..356e3fdaaa 100644
--- a/vector/src/main/res/values-de/strings.xml
+++ b/vector/src/main/res/values-de/strings.xml
@@ -1656,7 +1656,7 @@ Wenn du diese neue Wiederherstellungsmethode nicht eingerichtet hast, kann ein A
 
     <string name="push_gateway_item_app_id">app_id:</string>
     <string name="review">Überprüfung</string>
-<string name="none">Keine</string>
+    <string name="none">Keine</string>
     <string name="revoke">Widerrufen</string>
     <string name="disconnect">Trennen</string>
     <string name="people_no_identity_server">Kein Integrationsserver konfiguriert.</string>
@@ -1708,4 +1708,4 @@ Wenn du diese neue Wiederherstellungsmethode nicht eingerichtet hast, kann ein A
 
     <string name="settings_discovery_enter_identity_server">Gib einen neuen Identitätsserver ein</string>
     <string name="settings_discovery_bad_identity_server">Konnte keine Verbindung zum Heimserver herstellen.</string>
-    </resources>
+</resources>
diff --git a/vector/src/main/res/values-es-rMX/strings.xml b/vector/src/main/res/values-es-rMX/strings.xml
index 9ae9d36794..313e7737d1 100644
--- a/vector/src/main/res/values-es-rMX/strings.xml
+++ b/vector/src/main/res/values-es-rMX/strings.xml
@@ -779,9 +779,9 @@ Dispositivos desconocidos:</string>
 
     <string name="room_message_placeholder_reply_to_encrypted">Enviar una respuesta cifrada…</string>
     <string name="room_message_placeholder_reply_to_not_encrypted">Enviar una respuesta (sin cifrar)…</string>
-<string name="resources_script">Latn</string>
+    <string name="resources_script">Latn</string>
 
     <string name="notification_sync_init">Iniciando servicio</string>
     <string name="title_activity_keys_backup_setup">Copia de seguridad de la clave</string>
     <string name="title_activity_keys_backup_restore">Usar copia de seguridad de la clave</string>
-    </resources>
+</resources>
diff --git a/vector/src/main/res/values-eu/strings.xml b/vector/src/main/res/values-eu/strings.xml
index 675bc74932..57eed05cca 100644
--- a/vector/src/main/res/values-eu/strings.xml
+++ b/vector/src/main/res/values-eu/strings.xml
@@ -1697,7 +1697,7 @@ Abisua: Fitxategi hau ezabatu daiteke aplikazioa desinstalatzen bada.</string>
 
     <string name="settings_discovery_disconnect_with_bound_pid">Orain e-mail helbideak edo telefono zenbakiak partekatzen dituzu %1$s zerbitzarian. %2$s zerbitzarira konektatu beharko zara partekatzeari uzteko.</string>
     <string name="settings_agree_to_terms">Onartu %s identitate-zerbitzariaren erabilera baldintzak besteek zu e-mail helbidea edo telefonoa erabiliz aurkitzea ahalbidetzeko.</string>
-<string name="resources_script">Latn</string>
+    <string name="resources_script">Latn</string>
 
     <string name="labs_allow_extended_logging">Gaitu egunkari xehetsuak.</string>
     <string name="labs_allow_extended_logging_summary">Amorruz astintzean egunkari xehetsuak bidaltzeak garatzaileei laguntzen diete. Gaituta badago ere, aplikazioak ez ditu mezuen edukiak edo beste datu probaturik gordetzen egunkarian.</string>
@@ -1724,9 +1724,9 @@ Abisua: Fitxategi hau ezabatu daiteke aplikazioa desinstalatzen bada.</string>
     <string name="two_users_read">%1$s eta %2$s erabiltzaileek irakurria</string>
     <string name="one_user_read">%s erabiltzaileak irakurria</string>
     <plurals name="fallback_users_read">
-	<item quantity="one">Erabiltzaile batek irakurria</item>
-	<item quantity="other">%d erabiltzailek irakurria</item>
-</plurals>
+        <item quantity="one">Erabiltzaile batek irakurria</item>
+        <item quantity="other">%d erabiltzailek irakurria</item>
+    </plurals>
 
     <string name="error_file_too_big">\'%1$s\' fitxategia (%2$s) handiegia da igotzeko. Muga %3$s da.</string>
 
diff --git a/vector/src/main/res/values-fi/strings.xml b/vector/src/main/res/values-fi/strings.xml
index 6f5973ea7f..651978f92f 100644
--- a/vector/src/main/res/values-fi/strings.xml
+++ b/vector/src/main/res/values-fi/strings.xml
@@ -933,13 +933,13 @@ Haluatko lisätä paketteja?</string>
     <string name="open_chat_header">Avaa otsikko</string>
     <string name="room_sync_in_progress">Synkronoidaan…</string>
     <plurals name="room_header_active_members_count">
-	<item quantity="one">yksi aktiivinen jäsen</item>
-	<item quantity="other">%d aktiivista jäsentä</item>
-</plurals>
+        <item quantity="one">yksi aktiivinen jäsen</item>
+        <item quantity="other">%d aktiivista jäsentä</item>
+    </plurals>
     <plurals name="room_title_members">
-	<item quantity="one">yksi jäsen</item>
-	<item quantity="other">%d jäsentä</item>
-</plurals>
+        <item quantity="one">yksi jäsen</item>
+        <item quantity="other">%d jäsentä</item>
+    </plurals>
     <plurals name="format_time_s">
         <item quantity="one">1 s</item>
         <item quantity="other">%d s</item>
@@ -1136,13 +1136,13 @@ Haluatko lisätä paketteja?</string>
     <string name="lock_screen_hint">Kirjoita tähän…</string>
 
     <plurals name="notification_unread_notified_messages">
-	<item quantity="one">yksi lukematon ilmoitettu viesti</item>
-	<item quantity="other">%d lukematonta ilmoitettua viestiä</item>
-</plurals>
+        <item quantity="one">yksi lukematon ilmoitettu viesti</item>
+        <item quantity="other">%d lukematonta ilmoitettua viestiä</item>
+    </plurals>
     <plurals name="notification_unread_notified_messages_in_room_msgs">
-	<item quantity="one">yksi lukematon ilmoitettu viesti</item>
-	<item quantity="other">%d lukematonta ilmoitettua viestiä</item>
-</plurals>
+        <item quantity="one">yksi lukematon ilmoitettu viesti</item>
+        <item quantity="other">%d lukematonta ilmoitettua viestiä</item>
+    </plurals>
     <plurals name="notification_unread_notified_messages_in_room_rooms">
         <item quantity="one">yksi huone</item>
         <item quantity="other">%d huonetta</item>
@@ -1657,7 +1657,7 @@ Jotta et menetä mitään, automaattiset päivitykset kannattaa pitää käytös
     <string name="settings_discovery_no_terms">Valitsemallasi identiteettipalvelimella ei ole käyttöehtoja. Jatka vain, jos luotat palvelun omistajaan</string>
     <string name="settings_discovery_disconnect_with_bound_pid">Jaat sähköpostiosoitteita tai puhelinnumeroita identiteettipalvelimella %1$s. Sinun täytyy yhdistää uudelleen palvelimeen %2$s, jotta voit lopettaa niiden jakamisen.</string>
     <string name="settings_agree_to_terms">Hyväksy identiteettipalvelimen (%s) käyttöehdot salliaksesi, että sinut voi löytää sähköpostiosoitteen tai puhelinnumeron perusteella.</string>
-<string name="auth_add_email_message_2">Aseta sähköposti tilin palauttamista varten. Myöhemmin voit halutessasi antaa ihmisten etsiä sinua sen perusteella.</string>
+    <string name="auth_add_email_message_2">Aseta sähköposti tilin palauttamista varten. Myöhemmin voit halutessasi antaa ihmisten etsiä sinua sen perusteella.</string>
     <string name="settings_call_ringtone_use_default_stun">Salli varalla oleva puhelun apupalvelin</string>
     <string name="settings_discovery_disconnect_identity_server_info">Yhteyden katkaiseminen identiteettipalvelimeesi tarkoittaa, että muut käyttäjät eivät voi etsiä sinua etkä voi kutsua muita sähköpostin tai puhelinnumeron perusteella.</string>
     <string name="settings_discovery_confirm_mail">Lähetimme sinulle vahvistussähköpostin osoitteeseen %s, tarkista sähköpostisi ja klikkaa vahvistuslinkkiä</string>
@@ -1678,9 +1678,9 @@ Jotta et menetä mitään, automaattiset päivitykset kannattaa pitää käytös
     <string name="two_users_read">%1$s ja %2$s lukivat</string>
     <string name="one_user_read">%s luki</string>
     <plurals name="fallback_users_read">
-	<item quantity="one">1 käyttäjä luki</item>
-	<item quantity="other">%d käyttäjää luki</item>
-</plurals>
+        <item quantity="one">1 käyttäjä luki</item>
+        <item quantity="other">%d käyttäjää luki</item>
+    </plurals>
 
     <string name="error_attachment">Liitettä noudettaessa tapahtui virhe.</string>
     <string name="attachment_type_file">Tiedosto</string>
@@ -1691,7 +1691,7 @@ Jotta et menetä mitään, automaattiset päivitykset kannattaa pitää käytös
     <string name="report_content_inappropriate">Se on sopimaton</string>
     <string name="no_network_indicator">Verkkoyhteyttä ei ole juuri nyt</string>
 
-<string name="none">Ei mitään</string>
+    <string name="none">Ei mitään</string>
     <string name="call_failed_no_ice_description">Pyydä kotipalvelimesi (%1$s) ylläpitäjää määrittämään TURN-palvelin, jotta puhelut toimivat luotettavasti.
 \n
 \nVaihtoehtoisesti voit yrittää käyttää julkista palvelinta osoitteessa %2$s, mutta tämä ei ole yhtä luotettava vaihtoehto ja antaa IP-osoitteesi kyseisen palvelimen tietoon. Voit myös hallita tätä asetuksista.</string>
@@ -1707,4 +1707,4 @@ Jotta et menetä mitään, automaattiset päivitykset kannattaa pitää käytös
     <string name="terms_description_for_identity_server">Ole löydettävissä</string>
     <string name="settings_text_message_sent">Tekstiviesti on lähetetty numeroon %s. Syötä sen sisältämä varmistuskoodi.</string>
 
-    </resources>
+</resources>
diff --git a/vector/src/main/res/values-fr/strings.xml b/vector/src/main/res/values-fr/strings.xml
index d65e0f3756..6057627163 100644
--- a/vector/src/main/res/values-fr/strings.xml
+++ b/vector/src/main/res/values-fr/strings.xml
@@ -1701,7 +1701,7 @@ Si vous n’avez pas configuré de nouvelle méthode de récupération, un attaq
 
     <string name="settings_discovery_disconnect_with_bound_pid">Vous partagez actuellement des adresse e-mails et des numéros de téléphone sur le serveur d’identité %1$s. Vous devrez vous reconnecter à %2$s pour arrêter de les partager.</string>
     <string name="settings_agree_to_terms">Acceptez les conditions de service du serveur d’identité (%s) pour vous permettre d’être découvrable avec une adresse e-mail ou un numéro de téléphone.</string>
-<string name="resources_script">Latn</string>
+    <string name="resources_script">Latn</string>
 
     <string name="labs_allow_extended_logging">Activer les journaux verbeux.</string>
     <string name="labs_allow_extended_logging_summary">Les journaux verbeux aideront les développeurs en fournissant plus de journaux quand vous envoyez un rapport d’anomalie. Même si cette option est activée, l’application n’envoie pas le contenu des messages ou toute autre donnée personnelle.</string>
@@ -1728,9 +1728,9 @@ Si vous n’avez pas configuré de nouvelle méthode de récupération, un attaq
     <string name="two_users_read">%1$s et %2$s ont lu</string>
     <string name="one_user_read">%s a lu</string>
     <plurals name="fallback_users_read">
-	<item quantity="one">1 utilisateur a lu</item>
-	<item quantity="other">%d utilisateurs ont lu</item>
-</plurals>
+        <item quantity="one">1 utilisateur a lu</item>
+        <item quantity="other">%d utilisateurs ont lu</item>
+    </plurals>
 
     <string name="error_file_too_big">Le fichier « %1$s » (%2$s) est trop gros pour être envoyé. La limite est %3$s.</string>
 
diff --git a/vector/src/main/res/values-hu/strings.xml b/vector/src/main/res/values-hu/strings.xml
index 7a3a05eedf..caca6bd7c8 100644
--- a/vector/src/main/res/values-hu/strings.xml
+++ b/vector/src/main/res/values-hu/strings.xml
@@ -1021,7 +1021,7 @@ Vedd figyelembe, hogy az alkalmazás újraindul ami sok időt vehet igénybe.</s
     <string name="room_participants_action_kick">Elküld</string>
     <plurals name="room_participants_kick_prompt_msg">
         <item quantity="one">Ezeket az embereket biztosan kirúgod?</item>
-        <item quantity="other"/>
+        <item quantity="other" />
     </plurals>
     <string name="reason_hint">Ok</string>
 
@@ -1249,11 +1249,11 @@ Figyelmeztetés: ez a fájl törlésre kerülhet, ha az alkalmazást törlik.</s
     <string name="keys_backup_restore_success_description">Visszaállítva: %1$d kapcsolati kulcs, és %2$d kulcs, ami(k) ismeretlenek voltak az eszköz számára, hozzáadva</string>
     <plurals name="keys_backup_restore_success_description_part1">
         <item quantity="one">Visszaállított mentés %d kulccsal.</item>
-        <item quantity="other"/>
+        <item quantity="other" />
     </plurals>
     <plurals name="keys_backup_restore_success_description_part2">
         <item quantity="one">%d új kulcs lett hozzáadva ehhez az eszközhöz.</item>
-        <item quantity="other"/>
+        <item quantity="other" />
     </plurals>
 
     <string name="keys_backup_get_version_error">"Nem sikerült beszerezni a legfrissebb verziójú visszaállítási  kulcsot (%s)."</string>
@@ -1332,7 +1332,7 @@ A Visszaállítási Kulcsot tartsd biztonságos helyen, mint pl. egy jelszókeze
     <string name="keys_backup_info_keys_all_backup_up">Minden kulcs elmentve</string>
     <plurals name="keys_backup_info_keys_backing_up">
         <item quantity="one">%d kulcs mentése…</item>
-        <item quantity="other"/>
+        <item quantity="other" />
     </plurals>
 
     <string name="keys_backup_info_title_version">Verzió</string>
@@ -1700,7 +1700,7 @@ Ha nem te állítottad be a visszaállítási metódust, akkor egy támadó pró
 
     <string name="settings_discovery_disconnect_with_bound_pid">Az azonosítási szerverrel (%1$s) megosztod az e-mail címeket és telefonszámokat. Újra kell csatlakoznod ehhez: %2$s, hogy megállítsd a megosztást.</string>
     <string name="settings_agree_to_terms">Egyetértek az azonosítási szerver (%s) Felhasználási feltételeivel ahhoz, hogy megtalálható legyek e-mail címmel vagy telefonszámmal.</string>
-<string name="resources_script">Latn</string>
+    <string name="resources_script">Latn</string>
 
     <string name="labs_allow_extended_logging">Kibővített naplózás engedélyezése.</string>
     <string name="labs_allow_extended_logging_summary">A kiterjesztett naplózás a fejlesztőknek nyújt több információt amikor hibajegyet küldesz. Még bekapcsolva sem naplóz üzenet tartalmat vagy más személyes adatot.</string>
@@ -1727,9 +1727,9 @@ Ha nem te állítottad be a visszaállítási metódust, akkor egy támadó pró
     <string name="two_users_read">%1$s és %2$s olvasták</string>
     <string name="one_user_read">%s olvasta</string>
     <plurals name="fallback_users_read">
-	<item quantity="one">1 felhasználó olvasta</item>
-	<item quantity="other">%d felhasználó olvasta</item>
-</plurals>
+        <item quantity="one">1 felhasználó olvasta</item>
+        <item quantity="other">%d felhasználó olvasta</item>
+    </plurals>
 
     <string name="error_file_too_big">\'%1$s\' (%2$s) fájl túl nagy a feltöltéshez. A korlát: %3$s.</string>
 
diff --git a/vector/src/main/res/values-it/strings.xml b/vector/src/main/res/values-it/strings.xml
index 74035998ab..d46eaa987b 100644
--- a/vector/src/main/res/values-it/strings.xml
+++ b/vector/src/main/res/values-it/strings.xml
@@ -1745,7 +1745,7 @@ Per essere certo di non perdere nulla, mantieni gli aggiornamenti attivi."</stri
 
     <string name="settings_discovery_disconnect_with_bound_pid">Attualmente stai condividendo indirizzi email o numeri di telefono sul server di identità %1$s. Dovrai riconnetterti a %2$s per fermarne la condivisione.</string>
     <string name="settings_agree_to_terms">Accetta le condizioni di servizio del server di identità (%s) per consentire di essere trovabile per email o numero di telefono.</string>
-<string name="resources_script">Latn</string>
+    <string name="resources_script">Latn</string>
 
     <string name="labs_allow_extended_logging">Attiva log dettagliati.</string>
     <string name="labs_allow_extended_logging_summary">I log dettagliati aiuteranno gli sviluppatori fornendo loro più informazioni quando invii una segnalazione. Anche quando attivi, l\'applicazione non registra i contenuti dei messaggi o altri dati personali.</string>
@@ -1772,9 +1772,9 @@ Per essere certo di non perdere nulla, mantieni gli aggiornamenti attivi."</stri
     <string name="two_users_read">%1$s e %2$s hanno letto</string>
     <string name="one_user_read">%s ha letto</string>
     <plurals name="fallback_users_read">
-	<item quantity="one">1 utente ha letto</item>
-	<item quantity="other">%d utenti hanno letto</item>
-</plurals>
+        <item quantity="one">1 utente ha letto</item>
+        <item quantity="other">%d utenti hanno letto</item>
+    </plurals>
 
     <string name="error_file_too_big">Il file \'%1$s\' (%2$s) è troppo grande da inviare. Il limite è %3$s.</string>
 
diff --git a/vector/src/main/res/values-ko/strings.xml b/vector/src/main/res/values-ko/strings.xml
index 2a01a279e0..3f2469d766 100644
--- a/vector/src/main/res/values-ko/strings.xml
+++ b/vector/src/main/res/values-ko/strings.xml
@@ -1623,7 +1623,7 @@
 
     <string name="settings_discovery_disconnect_with_bound_pid">현재 이메일 주소나 전화번호를 ID 서버 %1$s와 공유하고 있습니다. 공유하기를 중지하려면 %2$s(으)로 다시 연결해야 합니다.</string>
     <string name="settings_agree_to_terms">ID 서버 (%s)의 서비스 약관에 동의하면 다른 사용자가 당신을 이메일 주소나 전화번호로 찾을 수 있게 됩니다.</string>
-<string name="resources_script">Latn</string>
+    <string name="resources_script">Latn</string>
 
     <string name="labs_allow_extended_logging">상세 로그 켜기.</string>
     <string name="labs_allow_extended_logging_summary">상세 로그는 분노의 흔들기를 보낼 때 더 많은 로그를 제공해서 개발자에게 도움을 줍니다. 이 설정을 켜도 애플리케이션은 메시지 내용이나 다른 개인 정보를 기록하지 않습니다.</string>
@@ -1650,8 +1650,8 @@
     <string name="two_users_read">%1$s님 그리고 %2$s님이 읽음</string>
     <string name="one_user_read">%s님이 읽음</string>
     <plurals name="fallback_users_read">
-	<item quantity="other">%d명이 읽음</item>
-</plurals>
+        <item quantity="other">%d명이 읽음</item>
+    </plurals>
 
     <string name="error_file_too_big">파일 \'%1$s\' (%2$s)이(가) 업로드하기에 너무 큽니다. 제한은 %3$s입니다.</string>
 
diff --git a/vector/src/main/res/values-ru/strings.xml b/vector/src/main/res/values-ru/strings.xml
index c2c8e30378..e815f01b9f 100644
--- a/vector/src/main/res/values-ru/strings.xml
+++ b/vector/src/main/res/values-ru/strings.xml
@@ -96,7 +96,7 @@
         <item quantity="one">%d пользователь</item>
         <item quantity="few">%d пользователя</item>
         <item quantity="many">%d пользователей</item>
-        <item quantity="other"/>
+        <item quantity="other" />
     </plurals>
 
     <string name="send_bug_report_include_logs">Отправить логи</string>
@@ -843,13 +843,13 @@
         <item quantity="one">%d комната</item>
         <item quantity="few">%d комнаты</item>
         <item quantity="many">%d комнат</item>
-        <item quantity="other"/>
+        <item quantity="other" />
     </plurals>
     <plurals name="notification_unread_notified_messages_in_room_rooms">
         <item quantity="one">%d комната</item>
         <item quantity="few">%d комнаты</item>
         <item quantity="many">%d комнат</item>
-        <item quantity="other"/>
+        <item quantity="other" />
     </plurals>
     <string name="notification_unread_notified_messages_in_room">%1$s в %2$s</string>
 
@@ -857,7 +857,7 @@
         <item quantity="one">%d активный виджет</item>
         <item quantity="few">%d активных виджета</item>
         <item quantity="many">%d активных виджетов</item>
-        <item quantity="other"/>
+        <item quantity="other" />
     </plurals>
 
     <!-- Widget Integration Manager -->
@@ -867,45 +867,45 @@
         <item quantity="one">%d активный участник</item>
         <item quantity="few">%d активных участника</item>
         <item quantity="many">%d активных участников</item>
-        <item quantity="other"/>
+        <item quantity="other" />
     </plurals>
     <plurals name="room_title_members">
         <item quantity="one">%d участник</item>
         <item quantity="few">%d участника</item>
         <item quantity="many">%d участников</item>
-        <item quantity="other"/>
+        <item quantity="other" />
     </plurals>
     <plurals name="room_new_messages_notification">
         <item quantity="one">%d новое сообщение</item>
         <item quantity="few">%d новых сообщения</item>
         <item quantity="many">%d новых сообщений</item>
-        <item quantity="other"/>
+        <item quantity="other" />
     </plurals>
 
     <plurals name="directory_search_rooms_for">
         <item quantity="one">%1$s комната найдена для %2$s</item>
         <item quantity="few">%1$s комнаты найдено для %2$s</item>
         <item quantity="many">%1$s комнат найдено для %2$s</item>
-        <item quantity="other"/>
+        <item quantity="other" />
     </plurals>
     <plurals name="membership_changes">
         <item quantity="one">%d изменение членства</item>
         <item quantity="few">%d изменения членства</item>
         <item quantity="many">%d изменений членства</item>
-        <item quantity="other"/>
+        <item quantity="other" />
     </plurals>
 
     <plurals name="notification_unread_notified_messages">
         <item quantity="one">%d непрочитанное уведомление</item>
         <item quantity="few">%d непрочитанных уведомления</item>
         <item quantity="many">%d непрочитанных уведомлений</item>
-        <item quantity="other"/>
+        <item quantity="other" />
     </plurals>
     <plurals name="notification_unread_notified_messages_in_room_msgs">
         <item quantity="one">%d непрочитанное уведомление</item>
         <item quantity="few">%d непрочитанных уведомления</item>
         <item quantity="many">%d непрочитанных уведомлений</item>
-        <item quantity="other"/>
+        <item quantity="other" />
     </plurals>
     <string name="receipt_avatar">Получить аватар</string>
     <string name="notice_avatar">Заметка аватара</string>
@@ -1020,13 +1020,13 @@
         <item quantity="one">%dm</item>
         <item quantity="few">%dm</item>
         <item quantity="many">%dm</item>
-        <item quantity="other"/>
+        <item quantity="other" />
     </plurals>
     <plurals name="format_time_h">
         <item quantity="one">%dh</item>
         <item quantity="few">%dh</item>
         <item quantity="many">%dh</item>
-        <item quantity="other"/>
+        <item quantity="other" />
     </plurals>
     <plurals name="format_time_d">
         <item quantity="one">%d день</item>
@@ -1045,20 +1045,20 @@
         <item quantity="one">%d выбран</item>
         <item quantity="few">%d выбрано</item>
         <item quantity="many">%d выбраны</item>
-        <item quantity="other"/>
+        <item quantity="other" />
     </plurals>
     <plurals name="group_members">
         <item quantity="one">%d участник</item>
         <item quantity="few">%d участника</item>
         <item quantity="many">%d участников</item>
-        <item quantity="other"/>
+        <item quantity="other" />
     </plurals>
 
     <plurals name="group_rooms">
         <item quantity="one">%d комната</item>
         <item quantity="few">%d комнаты</item>
         <item quantity="many">%d комнат</item>
-        <item quantity="other"/>
+        <item quantity="other" />
     </plurals>
     <string name="system_alerts_header">Системные оповещения</string>
 
@@ -1346,7 +1346,7 @@
         <item quantity="one">%d новый ключ был добавлен к этому устройству.</item>
         <item quantity="few">%d новых ключа были добавлены к этому устройству.</item>
         <item quantity="many">%d новых ключей были добавлены к этому устройству.</item>
-        <item quantity="other"/>
+        <item quantity="other" />
     </plurals>
 
     <plurals name="keys_backup_restore_success_description_part1">
@@ -1398,7 +1398,7 @@
         <item quantity="one">Резервное копирование %d ключа…</item>
         <item quantity="few">Резервное копирование %d ключей…</item>
         <item quantity="many">Резервное копирование %d ключей…</item>
-        <item quantity="other"/>
+        <item quantity="other" />
     </plurals>
 
     <string name="keys_backup_info_keys_all_backup_up">Все ключи сохранены</string>
@@ -1792,9 +1792,9 @@
 
     <string name="settings_discovery_disconnect_with_bound_pid">В настоящее время вы делитесь адресами электронной почты или телефонными номерами на сервере идентификации %1$s. Вам нужно повторно подключиться к %2$s, чтобы прекратить делиться ими.</string>
     <string name="settings_agree_to_terms">Примите Условия обслуживания сервера идентификации (%s), чтобы разрешить обнаружение по адресу электронной почты или номеру телефона.</string>
-<string name="labs_allow_extended_logging">Включить подробное журнал.</string>
+    <string name="labs_allow_extended_logging">Включить подробное журнал.</string>
     <string name="send_attachment">Отправить вложенное</string>
 
     <string name="a11y_open_drawer">Откройте навигационный ящик</string>
     <string name="a11y_create_menu_open">Откройте меню «Создать комнату»</string>
-    </resources>
+</resources>
diff --git a/vector/src/main/res/values-zh-rTW/strings.xml b/vector/src/main/res/values-zh-rTW/strings.xml
index 1bee9de8f8..f7ed5500ea 100644
--- a/vector/src/main/res/values-zh-rTW/strings.xml
+++ b/vector/src/main/res/values-zh-rTW/strings.xml
@@ -1653,7 +1653,7 @@ Matrix 中的消息可見度類似于電子郵件。我們忘記您的郵件意
 
     <string name="settings_discovery_disconnect_with_bound_pid">您目前正在身份識別伺服器 %1$s 上分享電子郵件地址或電話號碼。您將必須重新連線到 %2$s 以停止分享它們。</string>
     <string name="settings_agree_to_terms">同意身份識別伺服器 (%s) 的服務條款以允許您被透過電子郵件地址或電話號碼探索。</string>
-<string name="resources_script">緯度</string>
+    <string name="resources_script">緯度</string>
 
     <string name="labs_allow_extended_logging">啟用詳細紀錄。</string>
     <string name="labs_allow_extended_logging_summary">詳細紀錄可以協助開發者在您傳送憤怒搖晃時取得更多紀錄。即使啟用這個設定，應用程式依然不會紀錄訊息內容或任何個人資料。</string>
@@ -1680,8 +1680,8 @@ Matrix 中的消息可見度類似于電子郵件。我們忘記您的郵件意
     <string name="two_users_read">%1$s 與 %2$s 已閱讀</string>
     <string name="one_user_read">%s 已閱讀</string>
     <plurals name="fallback_users_read">
-	<item quantity="other">%d 個使用者已閱讀</item>
-</plurals>
+        <item quantity="other">%d 個使用者已閱讀</item>
+    </plurals>
 
     <string name="error_file_too_big">檔案「%1$s」(%2$s) 太大無法上傳。限制為 %3$s。</string>
 

From 8870c91d10095e3a39e2e0daec37a2eebc6f0329 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoitm@matrix.org>
Date: Wed, 6 Nov 2019 18:24:12 +0100
Subject: [PATCH 41/77] Fix bad script

---
 vector/src/main/res/values-zh-rTW/strings.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/vector/src/main/res/values-zh-rTW/strings.xml b/vector/src/main/res/values-zh-rTW/strings.xml
index f7ed5500ea..837e75583a 100644
--- a/vector/src/main/res/values-zh-rTW/strings.xml
+++ b/vector/src/main/res/values-zh-rTW/strings.xml
@@ -1653,7 +1653,6 @@ Matrix 中的消息可見度類似于電子郵件。我們忘記您的郵件意
 
     <string name="settings_discovery_disconnect_with_bound_pid">您目前正在身份識別伺服器 %1$s 上分享電子郵件地址或電話號碼。您將必須重新連線到 %2$s 以停止分享它們。</string>
     <string name="settings_agree_to_terms">同意身份識別伺服器 (%s) 的服務條款以允許您被透過電子郵件地址或電話號碼探索。</string>
-    <string name="resources_script">緯度</string>
 
     <string name="labs_allow_extended_logging">啟用詳細紀錄。</string>
     <string name="labs_allow_extended_logging_summary">詳細紀錄可以協助開發者在您傳送憤怒搖晃時取得更多紀錄。即使啟用這個設定，應用程式依然不會紀錄訊息內容或任何個人資料。</string>

From aaa29cf19363133f99b5683f54aab6e70c5c0346 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Fri, 8 Nov 2019 11:58:29 +0100
Subject: [PATCH 42/77] Code review

---
 vector/src/main/java/im/vector/Matrix.java        |  2 +-
 .../view/VectorOngoingConferenceCallView.java     | 15 +++------------
 .../im/vector/widgets/WidgetManagerProvider.kt    |  7 ++-----
 3 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/vector/src/main/java/im/vector/Matrix.java b/vector/src/main/java/im/vector/Matrix.java
index 60701b1c26..6a7d75caaf 100755
--- a/vector/src/main/java/im/vector/Matrix.java
+++ b/vector/src/main/java/im/vector/Matrix.java
@@ -117,7 +117,7 @@ public class Matrix {
     @Nullable
     private KeyRequestHandler mKeyRequestHandler;
 
-    private HashMap<String, WidgetManagerProvider> mWidgetManagerProviders = new HashMap<>();
+    private Map<String, WidgetManagerProvider> mWidgetManagerProviders = new HashMap<>();
 
     // i.e the event has been read from another client
     private static final MXEventListener mLiveEventListener = new MXEventListener() {
diff --git a/vector/src/main/java/im/vector/view/VectorOngoingConferenceCallView.java b/vector/src/main/java/im/vector/view/VectorOngoingConferenceCallView.java
index 86e1caec02..fbb135fc26 100755
--- a/vector/src/main/java/im/vector/view/VectorOngoingConferenceCallView.java
+++ b/vector/src/main/java/im/vector/view/VectorOngoingConferenceCallView.java
@@ -243,7 +243,7 @@ public void setCallClickListener(ICallClickListener callClickListener) {
      * Refresh the view visibility
      */
     public void refresh() {
-        WidgetsManager wm = getWidgetManager(getContext());
+        WidgetsManager wm = Matrix.getWidgetManager(getContext());
         if (wm == null) {
             return;
         }
@@ -280,7 +280,7 @@ public void onActivityResume() {
         if (null != mSession) {
             mSession.mCallsManager.addListener(mCallsListener);
         }
-        WidgetsManager wm = getWidgetManager(getContext());
+        WidgetsManager wm = Matrix.getWidgetManager(getContext());
         if (wm != null) {
             wm.addListener(mWidgetListener);
         }
@@ -293,7 +293,7 @@ public void onActivityPause() {
         if (null != mSession) {
             mSession.mCallsManager.removeListener(mCallsListener);
         }
-        WidgetsManager wm = getWidgetManager(getContext());
+        WidgetsManager wm = Matrix.getWidgetManager(getContext());
         if (wm != null) {
             wm.removeListener(mWidgetListener);
         }
@@ -306,13 +306,4 @@ public Widget getActiveWidget() {
         return mActiveWidget;
     }
 
-    @Nullable
-    private WidgetsManager getWidgetManager(Context activity) {
-        if (Matrix.getInstance(activity) == null) return null;
-        MXSession session = Matrix.getInstance(activity).getDefaultSession();
-        if (session == null) return null;
-        WidgetManagerProvider widgetManagerProvider = Matrix.getInstance(activity).getWidgetManagerProvider(session);
-        if (widgetManagerProvider == null) return null;
-        return widgetManagerProvider.getWidgetManager(activity);
-    }
 }
diff --git a/vector/src/main/java/im/vector/widgets/WidgetManagerProvider.kt b/vector/src/main/java/im/vector/widgets/WidgetManagerProvider.kt
index 30725bec03..ea24f173b8 100644
--- a/vector/src/main/java/im/vector/widgets/WidgetManagerProvider.kt
+++ b/vector/src/main/java/im/vector/widgets/WidgetManagerProvider.kt
@@ -17,15 +17,12 @@ package im.vector.widgets
 
 import android.content.Context
 import im.vector.R
-import im.vector.util.PreferencesManager
 import org.matrix.androidsdk.MXSession
 import org.matrix.androidsdk.features.integrationmanager.IntegrationManager
 import java.net.MalformedURLException
 import java.net.URL
-import java.util.*
-import kotlin.collections.ArrayList
 
-class WidgetManagerProvider(val session: MXSession) : IntegrationManager.IntegrationManagerManagerListener {
+class WidgetManagerProvider(private val session: MXSession) : IntegrationManager.IntegrationManagerManagerListener {
 
 
     override fun onIntegrationManagerChange(managerConfig: IntegrationManager) {
@@ -45,7 +42,7 @@ class WidgetManagerProvider(val session: MXSession) : IntegrationManager.Integra
         if (!session.integrationManager.integrationAllowed) return null
 
         val userDefinedConfig = session.integrationManager.integrationServerConfig
-        var sdkConfig: IntegrationManagerConfig? = null
+        val sdkConfig: IntegrationManagerConfig?
         val defaultWhitelist = context.resources.getStringArray(R.array.integrations_widgets_urls).asList()
 
         if (userDefinedConfig != null) {

From 54db4f07d97bb126b6129c12d85f6c2a4998fa46 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoitm@matrix.org>
Date: Tue, 12 Nov 2019 10:16:40 +0100
Subject: [PATCH 43/77] Fix error in translation (already changed on Weblate)

---
 vector/src/main/res/values-zh-rTW/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vector/src/main/res/values-zh-rTW/strings.xml b/vector/src/main/res/values-zh-rTW/strings.xml
index 837e75583a..a1d6ceb32b 100644
--- a/vector/src/main/res/values-zh-rTW/strings.xml
+++ b/vector/src/main/res/values-zh-rTW/strings.xml
@@ -1675,7 +1675,7 @@ Matrix 中的消息可見度類似于電子郵件。我們忘記您的郵件意
     <string name="a11y_jump_to_bottom">跳到底部</string>
 
     <string name="two_and_some_others_read">%1$s、%2$s 與 %3$d 個其他人已閱讀</string>
-    <string name="three_users_read">%1$s、%2$s 與 %3$d 已閱讀</string>
+    <string name="three_users_read">%1$s、%2$s 與 %3$s 已閱讀</string>
     <string name="two_users_read">%1$s 與 %2$s 已閱讀</string>
     <string name="one_user_read">%s 已閱讀</string>
     <plurals name="fallback_users_read">

From c88142fb55f6fcee043d778ad52c6d6f1ddff50d Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoitm@matrix.org>
Date: Tue, 12 Nov 2019 10:38:28 +0100
Subject: [PATCH 44/77] Once again...

---
 vector/src/main/res/values-de/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vector/src/main/res/values-de/strings.xml b/vector/src/main/res/values-de/strings.xml
index 356e3fdaaa..251c42c00c 100644
--- a/vector/src/main/res/values-de/strings.xml
+++ b/vector/src/main/res/values-de/strings.xml
@@ -1662,7 +1662,7 @@ Wenn du diese neue Wiederherstellungsmethode nicht eingerichtet hast, kann ein A
     <string name="people_no_identity_server">Kein Integrationsserver konfiguriert.</string>
 
     <string name="call_failed_no_ice_title">Anruf aufgrund eines falsch konfigurierten Servers fehlgeschlagen</string>
-    <string name="call_failed_no_ice_use_alt">Versuchen Sie es mit %@</string>
+    <string name="call_failed_no_ice_use_alt">Versuchen Sie es mit %s</string>
     <string name="call_failed_dont_ask_again">Nicht erneut fragen</string>
 
     <string name="auth_add_email_message_2">Richten Sie eine E-Mail für die Kontowiederherstellung ein, die später von Personen, die Sie kennen, optional gefunden werden kann.</string>

From 8c9dfa18d5ab7eb50ee60fd4ce2d35391531fc5e Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Thu, 24 Oct 2019 19:08:59 +0200
Subject: [PATCH 45/77] Prompt for password to add 3pid

---
 .../java/im/vector/activity/DialogUtils.kt    |  60 ++++
 .../activity/PhoneNumberAdditionActivity.java |   2 +-
 .../PhoneNumberVerificationActivity.java      | 250 ----------------
 .../PhoneNumberVerificationActivity.kt        | 277 ++++++++++++++++++
 .../VectorSettingsPreferencesFragment.kt      | 179 ++++++++---
 .../res/layout/dialog_confirm_password.xml    |  52 ++++
 vector/src/main/res/values/strings.xml        |   2 +
 7 files changed, 536 insertions(+), 286 deletions(-)
 create mode 100644 vector/src/main/java/im/vector/activity/DialogUtils.kt
 delete mode 100644 vector/src/main/java/im/vector/activity/PhoneNumberVerificationActivity.java
 create mode 100644 vector/src/main/java/im/vector/activity/PhoneNumberVerificationActivity.kt
 create mode 100644 vector/src/main/res/layout/dialog_confirm_password.xml

diff --git a/vector/src/main/java/im/vector/activity/DialogUtils.kt b/vector/src/main/java/im/vector/activity/DialogUtils.kt
new file mode 100644
index 0000000000..c15e5bdf8f
--- /dev/null
+++ b/vector/src/main/java/im/vector/activity/DialogUtils.kt
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2019 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.
+ * 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.
+ */
+
+package im.vector.activity
+
+import android.content.Context
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.ImageView
+import androidx.appcompat.app.AlertDialog
+import com.google.android.material.textfield.TextInputEditText
+import com.google.android.material.textfield.TextInputLayout
+import im.vector.R
+import im.vector.extensions.showPassword
+
+object DialogUtils {
+
+    fun promptPassword(context: Context, errorText: String? = null, defaultPwd: String? = null, done: (String) -> Unit) {
+        val view: ViewGroup = LayoutInflater.from(context).inflate(R.layout.dialog_confirm_password, null) as ViewGroup
+
+        val showPassword: ImageView = view.findViewById(R.id.confirm_password_show_passwords)
+        val passwordTil: TextInputLayout = view.findViewById(R.id.confirm_password_til)
+        val passwordText: TextInputEditText = view.findViewById(R.id.password_label)
+        passwordText.setText(defaultPwd)
+
+        var passwordShown = false
+
+        showPassword.setOnClickListener(object : View.OnClickListener {
+            override fun onClick(v: View?) {
+                passwordShown = !passwordShown
+                passwordText.showPassword(passwordShown)
+                showPassword.setImageResource(if (passwordShown) R.drawable.ic_eye_closed_black else R.drawable.ic_eye_black)
+            }
+        })
+
+        passwordTil.error = errorText
+
+        AlertDialog.Builder(context)
+                .setView(view)
+                .setPositiveButton(R.string._continue) { tv, _ ->
+                    done(passwordText.text.toString())
+                }
+                .show()
+
+    }
+}
\ No newline at end of file
diff --git a/vector/src/main/java/im/vector/activity/PhoneNumberAdditionActivity.java b/vector/src/main/java/im/vector/activity/PhoneNumberAdditionActivity.java
index bd49371e9c..1d04b1969d 100644
--- a/vector/src/main/java/im/vector/activity/PhoneNumberAdditionActivity.java
+++ b/vector/src/main/java/im/vector/activity/PhoneNumberAdditionActivity.java
@@ -267,7 +267,7 @@ private void addPhoneNumber(final Phonenumber.PhoneNumber phoneNumber) {
                 @Override
                 public void onSuccess(ThreePid pid) {
                     hideWaitingView();
-                    Intent intent = PhoneNumberVerificationActivity.getIntent(PhoneNumberAdditionActivity.this,
+                    Intent intent = PhoneNumberVerificationActivity.Companion.getIntent(PhoneNumberAdditionActivity.this,
                             mSession.getCredentials().userId, pid);
                     startActivityForResult(intent, REQUEST_VERIFICATION);
                 }
diff --git a/vector/src/main/java/im/vector/activity/PhoneNumberVerificationActivity.java b/vector/src/main/java/im/vector/activity/PhoneNumberVerificationActivity.java
deleted file mode 100644
index a4f05bc56e..0000000000
--- a/vector/src/main/java/im/vector/activity/PhoneNumberVerificationActivity.java
+++ /dev/null
@@ -1,250 +0,0 @@
-/*
- * Copyright 2017 Vector Creations Ltd
- * Copyright 2018 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.
- * 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.
- */
-
-package im.vector.activity;
-
-import android.content.Context;
-import android.content.Intent;
-import android.text.Editable;
-import android.text.TextUtils;
-import android.text.TextWatcher;
-import android.view.KeyEvent;
-import android.view.MenuItem;
-import android.view.inputmethod.EditorInfo;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import com.google.android.material.textfield.TextInputEditText;
-import com.google.android.material.textfield.TextInputLayout;
-
-import org.matrix.androidsdk.MXSession;
-import org.matrix.androidsdk.core.Log;
-import org.matrix.androidsdk.core.callback.ApiCallback;
-import org.matrix.androidsdk.core.model.MatrixError;
-import org.matrix.androidsdk.rest.model.SuccessResult;
-import org.matrix.androidsdk.rest.model.pid.ThreePid;
-
-import im.vector.Matrix;
-import im.vector.R;
-
-public class PhoneNumberVerificationActivity extends VectorAppCompatActivity implements TextView.OnEditorActionListener, TextWatcher {
-
-    private static final String LOG_TAG = PhoneNumberVerificationActivity.class.getSimpleName();
-
-    private static final String EXTRA_MATRIX_ID = "EXTRA_MATRIX_ID";
-    private static final String EXTRA_PID = "EXTRA_PID";
-
-    private TextInputEditText mPhoneNumberCode;
-    private TextInputLayout mPhoneNumberCodeLayout;
-
-    private MXSession mSession;
-    private ThreePid mThreePid;
-
-    // True when a phone number token is submitted
-    // Used to prevent user to submit several times in a row
-    private boolean mIsSubmittingToken;
-
-    /*
-     * *********************************************************************************************
-     * Static methods
-     * *********************************************************************************************
-     */
-
-    public static Intent getIntent(final Context context, final String sessionId, final ThreePid pid) {
-        final Intent intent = new Intent(context, PhoneNumberVerificationActivity.class);
-        intent.putExtra(EXTRA_MATRIX_ID, sessionId);
-        intent.putExtra(EXTRA_PID, pid);
-        return intent;
-    }
-
-    /*
-     * *********************************************************************************************
-     * Activity lifecycle
-     * *********************************************************************************************
-     */
-
-    @Override
-    public int getLayoutRes() {
-        return R.layout.activity_phone_number_verification;
-    }
-
-    @Override
-    public int getTitleRes() {
-        return R.string.settings_phone_number_verification;
-    }
-
-    @Override
-    public void initUiAndData() {
-        configureToolbar();
-
-        mPhoneNumberCode = findViewById(R.id.phone_number_code_value);
-        mPhoneNumberCodeLayout = findViewById(R.id.phone_number_code);
-        setWaitingView(findViewById(R.id.loading_view));
-
-        final Intent intent = getIntent();
-        mSession = Matrix.getInstance(this).getSession(intent.getStringExtra(EXTRA_MATRIX_ID));
-
-        if ((null == mSession) || !mSession.isAlive()) {
-            finish();
-            return;
-        }
-
-        mThreePid = intent.getParcelableExtra(EXTRA_PID);
-
-        mPhoneNumberCode.addTextChangedListener(this);
-        mPhoneNumberCode.setOnEditorActionListener(this);
-    }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-        mIsSubmittingToken = false;
-    }
-
-    @Override
-    public int getMenuRes() {
-        return R.menu.menu_phone_number_verification;
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-            case R.id.action_verify_phone_number:
-                submitCode();
-                return true;
-            default:
-                return super.onOptionsItemSelected(item);
-        }
-    }
-
-    /*
-     * *********************************************************************************************
-     * Utils
-     * *********************************************************************************************
-     */
-
-    /**
-     * Submit code (token) to attach phone number to account
-     */
-    private void submitCode() {
-        if (!mIsSubmittingToken) {
-            mIsSubmittingToken = true;
-            if (TextUtils.isEmpty(mPhoneNumberCode.getText())) {
-                mPhoneNumberCodeLayout.setErrorEnabled(true);
-                mPhoneNumberCodeLayout.setError(getString(R.string.settings_phone_number_verification_error_empty_code));
-            } else {
-                showWaitingView();
-                mSession.getIdentityServerManager().submitValidationToken(mThreePid, mPhoneNumberCode.getText().toString(),
-                        new ApiCallback<SuccessResult>() {
-                            @Override
-                            public void onSuccess(SuccessResult result) {
-                                if (result.success) {
-                                    // the validation of mail ownership succeed, just resume the registration flow
-                                    // next step: just register
-                                    Log.e(LOG_TAG, "## submitPhoneNumberValidationToken(): onSuccess() - registerAfterEmailValidations() started");
-                                    registerAfterPhoneNumberValidation(mThreePid);
-                                } else {
-                                    Log.e(LOG_TAG, "## submitPhoneNumberValidationToken(): onSuccess() - failed (success=false)");
-                                    onSubmitCodeError(getString(R.string.settings_phone_number_verification_error));
-                                }
-                            }
-
-                            @Override
-                            public void onNetworkError(Exception e) {
-                                onSubmitCodeError(e.getLocalizedMessage());
-                            }
-
-                            @Override
-                            public void onMatrixError(MatrixError e) {
-                                onSubmitCodeError(e.getLocalizedMessage());
-                            }
-
-                            @Override
-                            public void onUnexpectedError(Exception e) {
-                                onSubmitCodeError(e.getLocalizedMessage());
-                            }
-                        });
-            }
-
-        }
-    }
-
-    private void registerAfterPhoneNumberValidation(final ThreePid pid) {
-        mSession.getIdentityServerManager().finalize3pidAddSession(pid, null, new ApiCallback<Void>() {
-            @Override
-            public void onSuccess(Void info) {
-                Intent intent = new Intent();
-                setResult(RESULT_OK, intent);
-                finish();
-            }
-
-            @Override
-            public void onNetworkError(Exception e) {
-                onSubmitCodeError(e.getLocalizedMessage());
-            }
-
-            @Override
-            public void onMatrixError(MatrixError e) {
-                onSubmitCodeError(e.getLocalizedMessage());
-            }
-
-            @Override
-            public void onUnexpectedError(Exception e) {
-                onSubmitCodeError(e.getLocalizedMessage());
-            }
-        });
-    }
-
-    private void onSubmitCodeError(final String errorMessage) {
-        mIsSubmittingToken = false;
-        hideWaitingView();
-        Toast.makeText(this, errorMessage, Toast.LENGTH_SHORT).show();
-    }
-
-    /*
-     * *********************************************************************************************
-     * Listeners
-     * *********************************************************************************************
-     */
-
-    @Override
-    public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
-        if (actionId == EditorInfo.IME_ACTION_DONE && !isFinishing()) {
-            submitCode();
-            return true;
-        }
-        return false;
-    }
-
-    @Override
-    public void beforeTextChanged(CharSequence s, int start, int count, int after) {
-
-    }
-
-    @Override
-    public void onTextChanged(CharSequence s, int start, int before, int count) {
-
-    }
-
-    @Override
-    public void afterTextChanged(Editable s) {
-        if (mPhoneNumberCodeLayout.getError() != null) {
-            mPhoneNumberCodeLayout.setError(null);
-            mPhoneNumberCodeLayout.setErrorEnabled(false);
-        }
-    }
-}
diff --git a/vector/src/main/java/im/vector/activity/PhoneNumberVerificationActivity.kt b/vector/src/main/java/im/vector/activity/PhoneNumberVerificationActivity.kt
new file mode 100644
index 0000000000..b5da7fbde1
--- /dev/null
+++ b/vector/src/main/java/im/vector/activity/PhoneNumberVerificationActivity.kt
@@ -0,0 +1,277 @@
+/*
+ * Copyright 2017 Vector Creations Ltd
+ * Copyright 2018 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.
+ * 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.
+ */
+
+package im.vector.activity
+
+import android.app.Activity
+import android.app.AlertDialog
+import android.content.Context
+import android.content.Intent
+import android.text.Editable
+import android.text.TextUtils
+import android.text.TextWatcher
+import android.view.KeyEvent
+import android.view.MenuItem
+import android.view.inputmethod.EditorInfo
+import android.widget.EditText
+import android.widget.TextView
+import android.widget.Toast
+import com.google.android.material.textfield.TextInputEditText
+import com.google.android.material.textfield.TextInputLayout
+import im.vector.Matrix
+import im.vector.R
+import org.matrix.androidsdk.MXSession
+import org.matrix.androidsdk.core.JsonUtils
+import org.matrix.androidsdk.core.Log
+import org.matrix.androidsdk.core.callback.ApiCallback
+import org.matrix.androidsdk.core.model.MatrixError
+import org.matrix.androidsdk.rest.model.SuccessResult
+import org.matrix.androidsdk.rest.model.login.AuthParams
+import org.matrix.androidsdk.rest.model.login.AuthParamsLoginPassword
+import org.matrix.androidsdk.rest.model.login.LoginParams
+import org.matrix.androidsdk.rest.model.pid.ThreePid
+
+class PhoneNumberVerificationActivity : VectorAppCompatActivity(), TextView.OnEditorActionListener, TextWatcher {
+
+    private var mPhoneNumberCode: TextInputEditText? = null
+    private var mPhoneNumberCodeLayout: TextInputLayout? = null
+
+    private var mSession: MXSession? = null
+    private var mThreePid: ThreePid? = null
+
+    // True when a phone number token is submitted
+    // Used to prevent user to submit several times in a row
+    private var mIsSubmittingToken: Boolean = false
+
+    /*
+     * *********************************************************************************************
+     * Activity lifecycle
+     * *********************************************************************************************
+     */
+
+    override fun getLayoutRes(): Int {
+        return R.layout.activity_phone_number_verification
+    }
+
+    override fun getTitleRes(): Int {
+        return R.string.settings_phone_number_verification
+    }
+
+    override fun initUiAndData() {
+        configureToolbar()
+
+        mPhoneNumberCode = findViewById(R.id.phone_number_code_value)
+        mPhoneNumberCodeLayout = findViewById(R.id.phone_number_code)
+        waitingView = findViewById(R.id.loading_view)
+
+        val intent = intent
+        mSession = Matrix.getInstance(this)!!.getSession(intent.getStringExtra(EXTRA_MATRIX_ID))
+
+        if (null == mSession || !mSession!!.isAlive) {
+            finish()
+            return
+        }
+
+        mThreePid = intent.getParcelableExtra(EXTRA_PID)
+
+        mPhoneNumberCode!!.addTextChangedListener(this)
+        mPhoneNumberCode!!.setOnEditorActionListener(this)
+    }
+
+    override fun onResume() {
+        super.onResume()
+        mIsSubmittingToken = false
+    }
+
+    override fun getMenuRes(): Int {
+        return R.menu.menu_phone_number_verification
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        when (item.itemId) {
+            R.id.action_verify_phone_number -> {
+                submitCode()
+                return true
+            }
+            else                            -> return super.onOptionsItemSelected(item)
+        }
+    }
+
+    /*
+     * *********************************************************************************************
+     * Utils
+     * *********************************************************************************************
+     */
+
+    /**
+     * Submit code (token) to attach phone number to account
+     */
+    private fun submitCode() {
+        if (!mIsSubmittingToken) {
+            mIsSubmittingToken = true
+            if (TextUtils.isEmpty(mPhoneNumberCode!!.text)) {
+                mPhoneNumberCodeLayout!!.isErrorEnabled = true
+                mPhoneNumberCodeLayout!!.error = getString(R.string.settings_phone_number_verification_error_empty_code)
+            } else {
+                showWaitingView()
+                mSession!!.identityServerManager.submitValidationToken(mThreePid!!, mPhoneNumberCode!!.text!!.toString(),
+                        object : ApiCallback<SuccessResult> {
+                            override fun onSuccess(result: SuccessResult) {
+                                if (result.success) {
+                                    // the validation of mail ownership succeed, just resume the registration flow
+                                    // next step: just register
+                                    Log.e(LOG_TAG, "## submitPhoneNumberValidationToken(): onSuccess() - registerAfterEmailValidations() started")
+                                    registerAfterPhoneNumberValidation(mThreePid, null)
+                                } else {
+                                    Log.e(LOG_TAG, "## submitPhoneNumberValidationToken(): onSuccess() - failed (success=false)")
+                                    onSubmitCodeError(getString(R.string.settings_phone_number_verification_error))
+                                }
+                            }
+
+                            override fun onNetworkError(e: Exception) {
+                                onSubmitCodeError(e.localizedMessage)
+                            }
+
+                            override fun onMatrixError(e: MatrixError) {
+                                onSubmitCodeError(e.localizedMessage)
+                            }
+
+                            override fun onUnexpectedError(e: Exception) {
+                                onSubmitCodeError(e.localizedMessage)
+                            }
+                        })
+            }
+
+        }
+    }
+
+    private fun registerAfterPhoneNumberValidation(pid: ThreePid?, auth: AuthParams?) {
+        mSession!!.identityServerManager.finalize3pidAddSession(pid!!, auth, object : ApiCallback<Void?> {
+            override fun onSuccess(info: Void?) {
+                val intent = Intent()
+                setResult(Activity.RESULT_OK, intent)
+                finish()
+            }
+
+            override fun onNetworkError(e: Exception) {
+                onSubmitCodeError(e.localizedMessage)
+            }
+
+            override fun onMatrixError(e: MatrixError) {
+                if (e.mStatus == 401 && e.mErrorBodyAsString.isNullOrBlank().not()) {
+                    val flow = JsonUtils.toRegistrationFlowResponse(e.mErrorBodyAsString)
+                    if (flow != null) {
+                        val supportsLoginPassword = flow.flows.any { it.stages == listOf("m.login.password") }
+                        if (supportsLoginPassword) {
+                            //we prompt for it
+
+                            val invalidPassError = getString(R.string.login_error_forbidden)
+                                    .takeIf { e.errcode == MatrixError.FORBIDDEN }
+
+                            DialogUtils.promptPassword(this@PhoneNumberVerificationActivity,
+                                    invalidPassError,
+                                    (auth as? AuthParamsLoginPassword)?.let { auth.password }
+                            ) { password ->
+                                val authParams = AuthParamsLoginPassword().apply {
+                                    this.user = mSession?.myUserId
+                                    this.password = password
+                                }
+                                registerAfterPhoneNumberValidation(pid, authParams)
+                            }
+                        } else {
+                            //you can only do that on mobile
+                            AlertDialog.Builder(this@PhoneNumberVerificationActivity)
+                                    .setTitle(R.string.dialog_title_error)
+                                    .setMessage(R.string.settings_add_3pid_flow_not_supported)
+                                    .setPositiveButton(R.string._continue) { _, _ ->
+                                        registerAfterPhoneNumberValidation(pid, auth)
+                                    }
+                                    .show()
+
+                        }
+
+                    } else {
+                        onSubmitCodeError(e.localizedMessage)
+                    }
+                } else {
+                    onSubmitCodeError(e.localizedMessage)
+                }
+
+            }
+
+            override fun onUnexpectedError(e: Exception) {
+                onSubmitCodeError(e.localizedMessage)
+            }
+        })
+    }
+
+    private fun onSubmitCodeError(errorMessage: String) {
+        mIsSubmittingToken = false
+        hideWaitingView()
+        Toast.makeText(this, errorMessage, Toast.LENGTH_SHORT).show()
+    }
+
+    /*
+     * *********************************************************************************************
+     * Listeners
+     * *********************************************************************************************
+     */
+
+    override fun onEditorAction(v: TextView, actionId: Int, event: KeyEvent): Boolean {
+        if (actionId == EditorInfo.IME_ACTION_DONE && !isFinishing) {
+            submitCode()
+            return true
+        }
+        return false
+    }
+
+    override fun beforeTextChanged(s: CharSequence, start: Int, count: Int, after: Int) {
+
+    }
+
+    override fun onTextChanged(s: CharSequence, start: Int, before: Int, count: Int) {
+
+    }
+
+    override fun afterTextChanged(s: Editable) {
+        if (mPhoneNumberCodeLayout!!.error != null) {
+            mPhoneNumberCodeLayout!!.error = null
+            mPhoneNumberCodeLayout!!.isErrorEnabled = false
+        }
+    }
+
+    companion object {
+
+        private val LOG_TAG = PhoneNumberVerificationActivity::class.java.simpleName
+
+        private val EXTRA_MATRIX_ID = "EXTRA_MATRIX_ID"
+        private val EXTRA_PID = "EXTRA_PID"
+
+        /*
+     * *********************************************************************************************
+     * Static methods
+     * *********************************************************************************************
+     */
+
+        fun getIntent(context: Context, sessionId: String, pid: ThreePid): Intent {
+            val intent = Intent(context, PhoneNumberVerificationActivity::class.java)
+            intent.putExtra(EXTRA_MATRIX_ID, sessionId)
+            intent.putExtra(EXTRA_PID, pid)
+            return intent
+        }
+    }
+}
diff --git a/vector/src/main/java/im/vector/fragments/VectorSettingsPreferencesFragment.kt b/vector/src/main/java/im/vector/fragments/VectorSettingsPreferencesFragment.kt
index 9c9cc3ffbb..d4c26b35ca 100755
--- a/vector/src/main/java/im/vector/fragments/VectorSettingsPreferencesFragment.kt
+++ b/vector/src/main/java/im/vector/fragments/VectorSettingsPreferencesFragment.kt
@@ -44,6 +44,7 @@ import androidx.appcompat.app.AlertDialog
 import androidx.core.content.ContextCompat
 import androidx.core.content.edit
 import androidx.core.view.isVisible
+import androidx.fragment.app.FragmentActivity
 import androidx.preference.*
 import com.bumptech.glide.Glide
 import com.google.android.material.textfield.TextInputEditText
@@ -60,7 +61,10 @@ import im.vector.dialogs.ExportKeysDialog
 import im.vector.extensions.getFingerprintHumanReadable
 import im.vector.extensions.showPassword
 import im.vector.extensions.withArgs
-import im.vector.preference.*
+import im.vector.preference.ProgressBarPreference
+import im.vector.preference.UserAvatarPreference
+import im.vector.preference.VectorGroupPreference
+import im.vector.preference.VectorPreference
 import im.vector.settings.FontScale
 import im.vector.settings.VectorLocale
 import im.vector.ui.themes.ThemeUtils
@@ -70,6 +74,7 @@ import org.jetbrains.anko.toast
 import org.matrix.androidsdk.MXSession
 import org.matrix.androidsdk.call.MXCallsManager
 import org.matrix.androidsdk.core.BingRulesManager
+import org.matrix.androidsdk.core.JsonUtils
 import org.matrix.androidsdk.core.Log
 import org.matrix.androidsdk.core.ResourceUtils
 import org.matrix.androidsdk.core.callback.ApiCallback
@@ -87,8 +92,10 @@ import org.matrix.androidsdk.db.MXMediaCache
 import org.matrix.androidsdk.features.integrationmanager.IntegrationManager
 import org.matrix.androidsdk.listeners.MXEventListener
 import org.matrix.androidsdk.listeners.MXMediaUploadListener
+import org.matrix.androidsdk.rest.client.LoginRestClient
 import org.matrix.androidsdk.rest.model.bingrules.BingRule
 import org.matrix.androidsdk.rest.model.group.Group
+import org.matrix.androidsdk.rest.model.login.AuthParamsLoginPassword
 import org.matrix.androidsdk.rest.model.pid.ThirdPartyIdentifier
 import org.matrix.androidsdk.rest.model.pid.ThreePid
 import org.matrix.androidsdk.rest.model.sync.AccountDataElement
@@ -2028,6 +2035,30 @@ class VectorSettingsPreferencesFragment : PreferenceFragmentCompat(), SharedPref
 
             addEmailBtn.order = order
             addEmailBtn.isVisible = true
+            addEmailBtn.isEnabled = false
+            //We need to check if the password flow is available
+            mSession.identityServerManager.checkAdd3pidInteractiveFlow(listOf(LoginRestClient.LOGIN_FLOW_TYPE_PASSWORD),
+                    object : ApiCallback<Boolean?> {
+                        override fun onSuccess(info: Boolean?) {
+                            addEmailBtn.isEnabled = info == null || info == true
+                        }
+
+                        override fun onUnexpectedError(e: java.lang.Exception?) {
+                            //In doubt enable
+                            addEmailBtn.isEnabled = true
+                        }
+
+                        override fun onNetworkError(e: java.lang.Exception?) {
+                            //In doubt enable
+                            addEmailBtn.isEnabled = true
+                        }
+
+                        override fun onMatrixError(e: MatrixError?) {
+                            //In doubt enable
+                            addEmailBtn.isEnabled = true
+                        }
+
+                    })
         }
     }
 
@@ -2072,7 +2103,7 @@ class VectorSettingsPreferencesFragment : PreferenceFragmentCompat(), SharedPref
         mSession.identityServerManager.startAddSessionForEmail(pid, null,
                 object : ApiCallback<ThreePid> {
                     override fun onSuccess(info: ThreePid) {
-                        activity?.runOnUiThread { showEmailValidationDialog(pid) }
+                        activity?.runOnUiThread { showEmailValidationDialog(pid, null) }
                     }
 
                     override fun onNetworkError(e: Exception) {
@@ -2098,50 +2129,104 @@ class VectorSettingsPreferencesFragment : PreferenceFragmentCompat(), SharedPref
      *
      * @param pid the used pid.
      */
-    private fun showEmailValidationDialog(pid: ThreePid) {
-        activity?.let {
-            AlertDialog.Builder(it)
+    private fun showEmailValidationDialog(pid: ThreePid, password: String?) {
+        activity?.let { fragmentActivity ->
+            val auth = password?.let {
+                AuthParamsLoginPassword().apply {
+                    this.user = mSession.myUserId
+                    this.password = password
+                }
+            }
+            AlertDialog.Builder(fragmentActivity)
                     .setTitle(R.string.account_email_validation_title)
                     .setMessage(R.string.account_email_validation_message)
                     .setPositiveButton(R.string._continue) { _, _ ->
-                        mSession.identityServerManager.finalize3pidAddSession(pid, null, object : ApiCallback<Void?> {
-                            override fun onSuccess(info: Void?) {
-                                it.runOnUiThread {
-                                    hideLoadingView()
-                                    mSession.myUser.refreshThirdPartyIdentifiers(object : SimpleApiCallback<Void?>() {
-                                        override fun onSuccess(info: Void?) {
-                                            refreshEmailsList()
-                                        }
-                                    })
-                                }
-                            }
+                        finalizeAdd(pid, auth, fragmentActivity)
+                    }
+                    .setNegativeButton(R.string.cancel) { _, _ ->
+                        hideLoadingView()
+                    }
+                    .show()
+        }
+    }
 
-                            override fun onNetworkError(e: Exception) {
-                                onCommonDone(e.localizedMessage)
-                            }
+    private fun finalizeAdd(pid: ThreePid, auth: AuthParamsLoginPassword?, fragmentActivity: FragmentActivity) {
+        mSession.identityServerManager.finalize3pidAddSession(pid, auth, object : ApiCallback<Void?> {
+            override fun onSuccess(info: Void?) {
+                fragmentActivity.runOnUiThread {
+                    hideLoadingView()
+                    mSession.myUser.refreshThirdPartyIdentifiers(object : SimpleApiCallback<Void?>() {
+                        override fun onSuccess(info: Void?) {
+                            refreshEmailsList()
+                        }
+                    })
+                }
+            }
 
-                            override fun onMatrixError(e: MatrixError) {
-                                if (TextUtils.equals(e.errcode, MatrixError.THREEPID_AUTH_FAILED)) {
-                                    it.runOnUiThread {
-                                        hideLoadingView()
-                                        it.toast(R.string.account_email_validation_error)
-                                    }
-                                } else {
-                                    onCommonDone(e.localizedMessage)
+            override fun onNetworkError(e: Exception) {
+                onCommonDone(e.localizedMessage)
+            }
+
+            override fun onMatrixError(e: MatrixError) {
+                if (e.mStatus == 401 && e.mErrorBodyAsString.isNullOrBlank().not()) {
+                    val flow = JsonUtils.toRegistrationFlowResponse(e.mErrorBodyAsString)
+                    if (flow != null) {
+                        val supportsLoginPassword = flow.flows.any { it.stages == listOf("m.login.password") }
+                        if (supportsLoginPassword) {
+                            //we prompt for it
+                            val invalidPassError = requireContext().getString(R.string.login_error_forbidden)
+                                    .takeIf { e.errcode == MatrixError.FORBIDDEN }
+                            DialogUtils.promptPassword(requireContext(),
+                                    invalidPassError,
+                                    auth?.let { auth.password }) { password ->
+                                val authParams = AuthParamsLoginPassword().apply {
+                                    this.user = mSession.myUserId
+                                    this.password = password
                                 }
+                                finalizeAdd(pid, authParams, fragmentActivity)
                             }
+                        } else {
+                            //you can only do that on mobile
+                            AlertDialog.Builder(fragmentActivity)
+                                    .setMessage(R.string.settings_add_3pid_flow_not_supported)
+                                    .setPositiveButton(R.string._continue) { _, _ ->
+                                        finalizeAdd(pid, auth, fragmentActivity)
+                                    }
+                                    .setNegativeButton(R.string.cancel) { _, _ ->
+                                        onCommonDone(null)
+                                    }
+                                    .show()
 
-                            override fun onUnexpectedError(e: Exception) {
-                                onCommonDone(e.localizedMessage)
-                            }
-                        })
+                        }
 
+                    } else {
+                        onCommonDone(e.localizedMessage)
                     }
-                    .setNegativeButton(R.string.cancel) { _, _ ->
-                        hideLoadingView()
+                } else if (TextUtils.equals(e.errcode, MatrixError.THREEPID_AUTH_FAILED)) {
+                    fragmentActivity.runOnUiThread {
+                        fragmentActivity.toast(R.string.account_email_validation_error)
+                        //Re-display the popup so that not everything is lost
+                        AlertDialog.Builder(fragmentActivity)
+                                .setTitle(R.string.account_email_validation_title)
+                                .setMessage(R.string.account_email_validation_message)
+                                .setPositiveButton(R.string._continue) { _, _ ->
+                                    finalizeAdd(pid, auth, fragmentActivity)
+                                }
+                                .setNegativeButton(R.string.cancel) { _, _ ->
+                                    hideLoadingView()
+                                }
+                                .show()
+
                     }
-                    .show()
-        }
+                } else {
+                    onCommonDone(e.localizedMessage)
+                }
+            }
+
+            override fun onUnexpectedError(e: Exception) {
+                onCommonDone(e.localizedMessage)
+            }
+        })
     }
 
     //==============================================================================================================
@@ -2274,6 +2359,30 @@ class VectorSettingsPreferencesFragment : PreferenceFragmentCompat(), SharedPref
 
             addPhoneBtn.order = order
             addPhoneBtn.isVisible = true
+            addPhoneBtn.isEnabled = false
+            //We need to check if the password flow is available
+            mSession.identityServerManager.checkAdd3pidInteractiveFlow(listOf(LoginRestClient.LOGIN_FLOW_TYPE_PASSWORD),
+                    object : ApiCallback<Boolean?> {
+                        override fun onSuccess(info: Boolean?) {
+                            addPhoneBtn.isEnabled = info == null || info == true
+                        }
+
+                        override fun onUnexpectedError(e: java.lang.Exception?) {
+                            //In doubt enable
+                            addPhoneBtn.isEnabled = true
+                        }
+
+                        override fun onNetworkError(e: java.lang.Exception?) {
+                            //In doubt enable
+                            addPhoneBtn.isEnabled = true
+                        }
+
+                        override fun onMatrixError(e: MatrixError?) {
+                            //In doubt enable
+                            addPhoneBtn.isEnabled = true
+                        }
+
+                    })
         }
 
     }
diff --git a/vector/src/main/res/layout/dialog_confirm_password.xml b/vector/src/main/res/layout/dialog_confirm_password.xml
new file mode 100644
index 0000000000..b457bd7089
--- /dev/null
+++ b/vector/src/main/res/layout/dialog_confirm_password.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout 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="wrap_content"
+    android:orientation="vertical"
+    android:paddingStart="?dialogPreferredPadding"
+    android:paddingLeft="?dialogPreferredPadding"
+    android:paddingTop="12dp"
+    android:paddingEnd="?dialogPreferredPadding"
+    android:paddingRight="?dialogPreferredPadding">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="horizontal">
+
+        <TextView
+            style="@style/Base.DialogWindowTitle.AppCompat"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:layout_weight="1"
+            android:text="@string/settings_add_3pid_confirm_password_title" />
+
+        <ImageView
+            android:id="@+id/confirm_password_show_passwords"
+            android:layout_width="@dimen/layout_touch_size"
+            android:layout_height="@dimen/layout_touch_size"
+            android:background="?attr/selectableItemBackground"
+            android:scaleType="center"
+            android:src="@drawable/ic_eye_black"
+            android:tint="?attr/colorAccent" />
+
+    </LinearLayout>
+
+    <com.google.android.material.textfield.TextInputLayout
+        android:id="@+id/confirm_password_til"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:errorEnabled="true">
+
+        <com.google.android.material.textfield.TextInputEditText
+            android:id="@+id/password_label"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:inputType="textPassword" />
+
+    </com.google.android.material.textfield.TextInputLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index c9adaa19fb..705f949690 100755
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -630,6 +630,8 @@
     <string name="settings_add_phone_number">Add phone number</string>
     <string name="settings_app_info_link_title">Application info</string>
     <string name="settings_app_info_link_summary">Show the application info in the system settings.</string>
+    <string name="settings_add_3pid_confirm_password_title">Confirm your password</string>
+    <string name="settings_add_3pid_flow_not_supported">You can\'t do this from Riot mobile</string>
 
 
     <string name="settings_notification_advanced">Advanced Notification Settings</string>

From 6f83299e9674fb5b71cb1c06feea7c2b4300b4a7 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Fri, 25 Oct 2019 10:07:32 +0200
Subject: [PATCH 46/77] Update changes

---
 CHANGES.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index e1c54b6854..2d448a16ab 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -11,7 +11,7 @@ Improvementss 🙌:
  -
 
 Other changes:
- -
+ - Add User-Interactive Auth to /account/3pid/add (#3333)
 
 Bugfix 🐛:
  - Crash / potential NPE after logout (#3367)

From 07cda8237fe86cdf43bc3bddeec74a3d7e1136f1 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Fri, 25 Oct 2019 12:20:20 +0200
Subject: [PATCH 47/77] Fix / code quality

---
 .../im/vector/activity/PhoneNumberVerificationActivity.kt     | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/vector/src/main/java/im/vector/activity/PhoneNumberVerificationActivity.kt b/vector/src/main/java/im/vector/activity/PhoneNumberVerificationActivity.kt
index b5da7fbde1..86c6ffaacd 100644
--- a/vector/src/main/java/im/vector/activity/PhoneNumberVerificationActivity.kt
+++ b/vector/src/main/java/im/vector/activity/PhoneNumberVerificationActivity.kt
@@ -18,7 +18,6 @@
 package im.vector.activity
 
 import android.app.Activity
-import android.app.AlertDialog
 import android.content.Context
 import android.content.Intent
 import android.text.Editable
@@ -27,9 +26,9 @@ import android.text.TextWatcher
 import android.view.KeyEvent
 import android.view.MenuItem
 import android.view.inputmethod.EditorInfo
-import android.widget.EditText
 import android.widget.TextView
 import android.widget.Toast
+import androidx.appcompat.app.AlertDialog
 import com.google.android.material.textfield.TextInputEditText
 import com.google.android.material.textfield.TextInputLayout
 import im.vector.Matrix
@@ -42,7 +41,6 @@ import org.matrix.androidsdk.core.model.MatrixError
 import org.matrix.androidsdk.rest.model.SuccessResult
 import org.matrix.androidsdk.rest.model.login.AuthParams
 import org.matrix.androidsdk.rest.model.login.AuthParamsLoginPassword
-import org.matrix.androidsdk.rest.model.login.LoginParams
 import org.matrix.androidsdk.rest.model.pid.ThreePid
 
 class PhoneNumberVerificationActivity : VectorAppCompatActivity(), TextView.OnEditorActionListener, TextWatcher {

From a3ec358c6c0bc6c85d08ff1869ad5ac7fe7d6533 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Wed, 30 Oct 2019 11:25:21 +0100
Subject: [PATCH 48/77] Code review

---
 .../java/im/vector/activity/DialogUtils.kt    | 13 ++---
 .../PhoneNumberVerificationActivity.kt        |  5 +-
 .../VectorSettingsPreferencesFragment.kt      | 57 +++++++++----------
 3 files changed, 34 insertions(+), 41 deletions(-)

diff --git a/vector/src/main/java/im/vector/activity/DialogUtils.kt b/vector/src/main/java/im/vector/activity/DialogUtils.kt
index c15e5bdf8f..3d7f331696 100644
--- a/vector/src/main/java/im/vector/activity/DialogUtils.kt
+++ b/vector/src/main/java/im/vector/activity/DialogUtils.kt
@@ -18,7 +18,6 @@ package im.vector.activity
 
 import android.content.Context
 import android.view.LayoutInflater
-import android.view.View
 import android.view.ViewGroup
 import android.widget.ImageView
 import androidx.appcompat.app.AlertDialog
@@ -39,13 +38,11 @@ object DialogUtils {
 
         var passwordShown = false
 
-        showPassword.setOnClickListener(object : View.OnClickListener {
-            override fun onClick(v: View?) {
-                passwordShown = !passwordShown
-                passwordText.showPassword(passwordShown)
-                showPassword.setImageResource(if (passwordShown) R.drawable.ic_eye_closed_black else R.drawable.ic_eye_black)
-            }
-        })
+        showPassword.setOnClickListener {
+            passwordShown = !passwordShown
+            passwordText.showPassword(passwordShown)
+            showPassword.setImageResource(if (passwordShown) R.drawable.ic_eye_closed_black else R.drawable.ic_eye_black)
+        }
 
         passwordTil.error = errorText
 
diff --git a/vector/src/main/java/im/vector/activity/PhoneNumberVerificationActivity.kt b/vector/src/main/java/im/vector/activity/PhoneNumberVerificationActivity.kt
index 86c6ffaacd..8dbd381ccb 100644
--- a/vector/src/main/java/im/vector/activity/PhoneNumberVerificationActivity.kt
+++ b/vector/src/main/java/im/vector/activity/PhoneNumberVerificationActivity.kt
@@ -38,6 +38,7 @@ import org.matrix.androidsdk.core.JsonUtils
 import org.matrix.androidsdk.core.Log
 import org.matrix.androidsdk.core.callback.ApiCallback
 import org.matrix.androidsdk.core.model.MatrixError
+import org.matrix.androidsdk.rest.client.LoginRestClient
 import org.matrix.androidsdk.rest.model.SuccessResult
 import org.matrix.androidsdk.rest.model.login.AuthParams
 import org.matrix.androidsdk.rest.model.login.AuthParamsLoginPassword
@@ -173,7 +174,7 @@ class PhoneNumberVerificationActivity : VectorAppCompatActivity(), TextView.OnEd
                 if (e.mStatus == 401 && e.mErrorBodyAsString.isNullOrBlank().not()) {
                     val flow = JsonUtils.toRegistrationFlowResponse(e.mErrorBodyAsString)
                     if (flow != null) {
-                        val supportsLoginPassword = flow.flows.any { it.stages == listOf("m.login.password") }
+                        val supportsLoginPassword = flow.flows.any { it.stages == listOf(LoginRestClient.LOGIN_FLOW_TYPE_PASSWORD) }
                         if (supportsLoginPassword) {
                             //we prompt for it
 
@@ -196,7 +197,7 @@ class PhoneNumberVerificationActivity : VectorAppCompatActivity(), TextView.OnEd
                                     .setTitle(R.string.dialog_title_error)
                                     .setMessage(R.string.settings_add_3pid_flow_not_supported)
                                     .setPositiveButton(R.string._continue) { _, _ ->
-                                        registerAfterPhoneNumberValidation(pid, auth)
+                                        hideWaitingView()
                                     }
                                     .show()
 
diff --git a/vector/src/main/java/im/vector/fragments/VectorSettingsPreferencesFragment.kt b/vector/src/main/java/im/vector/fragments/VectorSettingsPreferencesFragment.kt
index d4c26b35ca..3efe6a9fef 100755
--- a/vector/src/main/java/im/vector/fragments/VectorSettingsPreferencesFragment.kt
+++ b/vector/src/main/java/im/vector/fragments/VectorSettingsPreferencesFragment.kt
@@ -89,6 +89,7 @@ import org.matrix.androidsdk.data.MyUser
 import org.matrix.androidsdk.data.Pusher
 import org.matrix.androidsdk.data.RoomMediaMessage
 import org.matrix.androidsdk.db.MXMediaCache
+import org.matrix.androidsdk.features.identityserver.IdentityServerManager
 import org.matrix.androidsdk.features.integrationmanager.IntegrationManager
 import org.matrix.androidsdk.listeners.MXEventListener
 import org.matrix.androidsdk.listeners.MXMediaUploadListener
@@ -2038,9 +2039,9 @@ class VectorSettingsPreferencesFragment : PreferenceFragmentCompat(), SharedPref
             addEmailBtn.isEnabled = false
             //We need to check if the password flow is available
             mSession.identityServerManager.checkAdd3pidInteractiveFlow(listOf(LoginRestClient.LOGIN_FLOW_TYPE_PASSWORD),
-                    object : ApiCallback<Boolean?> {
-                        override fun onSuccess(info: Boolean?) {
-                            addEmailBtn.isEnabled = info == null || info == true
+                    object : ApiCallback<IdentityServerManager.SupportedFlowResult> {
+                        override fun onSuccess(info: IdentityServerManager.SupportedFlowResult) {
+                            addEmailBtn.isEnabled = info == IdentityServerManager.SupportedFlowResult.SUPPORTED
                         }
 
                         override fun onUnexpectedError(e: java.lang.Exception?) {
@@ -2069,6 +2070,7 @@ class VectorSettingsPreferencesFragment : PreferenceFragmentCompat(), SharedPref
      * @param errorMessage the error message
      */
     private fun onCommonDone(errorMessage: String?) {
+        if (!isAdded) return
         activity?.runOnUiThread {
             if (!TextUtils.isEmpty(errorMessage) && errorMessage != null) {
                 VectorApp.getInstance().toast(errorMessage)
@@ -2137,22 +2139,27 @@ class VectorSettingsPreferencesFragment : PreferenceFragmentCompat(), SharedPref
                     this.password = password
                 }
             }
-            AlertDialog.Builder(fragmentActivity)
-                    .setTitle(R.string.account_email_validation_title)
-                    .setMessage(R.string.account_email_validation_message)
-                    .setPositiveButton(R.string._continue) { _, _ ->
-                        finalizeAdd(pid, auth, fragmentActivity)
-                    }
-                    .setNegativeButton(R.string.cancel) { _, _ ->
-                        hideLoadingView()
-                    }
-                    .show()
+            showEmailValidationDialog(fragmentActivity, pid, auth)
         }
     }
 
+    private fun showEmailValidationDialog(fragmentActivity: FragmentActivity, pid: ThreePid, auth: AuthParamsLoginPassword?) {
+        AlertDialog.Builder(fragmentActivity)
+                .setTitle(R.string.account_email_validation_title)
+                .setMessage(R.string.account_email_validation_message)
+                .setPositiveButton(R.string._continue) { _, _ ->
+                    finalizeAdd(pid, auth, fragmentActivity)
+                }
+                .setNegativeButton(R.string.cancel) { _, _ ->
+                    hideLoadingView()
+                }
+                .show()
+    }
+
     private fun finalizeAdd(pid: ThreePid, auth: AuthParamsLoginPassword?, fragmentActivity: FragmentActivity) {
         mSession.identityServerManager.finalize3pidAddSession(pid, auth, object : ApiCallback<Void?> {
             override fun onSuccess(info: Void?) {
+                if (!isAdded) return
                 fragmentActivity.runOnUiThread {
                     hideLoadingView()
                     mSession.myUser.refreshThirdPartyIdentifiers(object : SimpleApiCallback<Void?>() {
@@ -2168,10 +2175,11 @@ class VectorSettingsPreferencesFragment : PreferenceFragmentCompat(), SharedPref
             }
 
             override fun onMatrixError(e: MatrixError) {
+                if (!isAdded) return
                 if (e.mStatus == 401 && e.mErrorBodyAsString.isNullOrBlank().not()) {
                     val flow = JsonUtils.toRegistrationFlowResponse(e.mErrorBodyAsString)
                     if (flow != null) {
-                        val supportsLoginPassword = flow.flows.any { it.stages == listOf("m.login.password") }
+                        val supportsLoginPassword = flow.flows.any { it.stages == listOf(LoginRestClient.LOGIN_FLOW_TYPE_PASSWORD) }
                         if (supportsLoginPassword) {
                             //we prompt for it
                             val invalidPassError = requireContext().getString(R.string.login_error_forbidden)
@@ -2190,9 +2198,6 @@ class VectorSettingsPreferencesFragment : PreferenceFragmentCompat(), SharedPref
                             AlertDialog.Builder(fragmentActivity)
                                     .setMessage(R.string.settings_add_3pid_flow_not_supported)
                                     .setPositiveButton(R.string._continue) { _, _ ->
-                                        finalizeAdd(pid, auth, fragmentActivity)
-                                    }
-                                    .setNegativeButton(R.string.cancel) { _, _ ->
                                         onCommonDone(null)
                                     }
                                     .show()
@@ -2206,17 +2211,7 @@ class VectorSettingsPreferencesFragment : PreferenceFragmentCompat(), SharedPref
                     fragmentActivity.runOnUiThread {
                         fragmentActivity.toast(R.string.account_email_validation_error)
                         //Re-display the popup so that not everything is lost
-                        AlertDialog.Builder(fragmentActivity)
-                                .setTitle(R.string.account_email_validation_title)
-                                .setMessage(R.string.account_email_validation_message)
-                                .setPositiveButton(R.string._continue) { _, _ ->
-                                    finalizeAdd(pid, auth, fragmentActivity)
-                                }
-                                .setNegativeButton(R.string.cancel) { _, _ ->
-                                    hideLoadingView()
-                                }
-                                .show()
-
+                        showEmailValidationDialog(requireActivity(), pid, auth)
                     }
                 } else {
                     onCommonDone(e.localizedMessage)
@@ -2362,9 +2357,9 @@ class VectorSettingsPreferencesFragment : PreferenceFragmentCompat(), SharedPref
             addPhoneBtn.isEnabled = false
             //We need to check if the password flow is available
             mSession.identityServerManager.checkAdd3pidInteractiveFlow(listOf(LoginRestClient.LOGIN_FLOW_TYPE_PASSWORD),
-                    object : ApiCallback<Boolean?> {
-                        override fun onSuccess(info: Boolean?) {
-                            addPhoneBtn.isEnabled = info == null || info == true
+                    object : ApiCallback<IdentityServerManager.SupportedFlowResult> {
+                        override fun onSuccess(info: IdentityServerManager.SupportedFlowResult) {
+                            addPhoneBtn.isEnabled = info == IdentityServerManager.SupportedFlowResult.SUPPORTED
                         }
 
                         override fun onUnexpectedError(e: java.lang.Exception?) {

From aa4d03d459451da88944b4dbd8041f09a02dc302 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Mon, 4 Nov 2019 14:38:32 +0100
Subject: [PATCH 49/77] Add cancel option to prompt password

---
 .../java/im/vector/activity/DialogUtils.kt    | 12 +++++++-
 .../PhoneNumberVerificationActivity.kt        | 19 +++++++------
 .../VectorSettingsPreferencesFragment.kt      | 28 +++++++++++--------
 vector/src/main/res/values/strings.xml        |  1 +
 4 files changed, 39 insertions(+), 21 deletions(-)

diff --git a/vector/src/main/java/im/vector/activity/DialogUtils.kt b/vector/src/main/java/im/vector/activity/DialogUtils.kt
index 3d7f331696..5c87db890d 100644
--- a/vector/src/main/java/im/vector/activity/DialogUtils.kt
+++ b/vector/src/main/java/im/vector/activity/DialogUtils.kt
@@ -28,7 +28,9 @@ import im.vector.extensions.showPassword
 
 object DialogUtils {
 
-    fun promptPassword(context: Context, errorText: String? = null, defaultPwd: String? = null, done: (String) -> Unit) {
+    fun promptPassword(context: Context, errorText: String? = null, defaultPwd: String? = null,
+                       done: (String) -> Unit,
+                       cancel: (() -> Unit)? = null) {
         val view: ViewGroup = LayoutInflater.from(context).inflate(R.layout.dialog_confirm_password, null) as ViewGroup
 
         val showPassword: ImageView = view.findViewById(R.id.confirm_password_show_passwords)
@@ -51,6 +53,14 @@ object DialogUtils {
                 .setPositiveButton(R.string._continue) { tv, _ ->
                     done(passwordText.text.toString())
                 }
+                .apply {
+                    if (cancel != null) {
+                        setNegativeButton(R.string.cancel) { _, _ ->
+                            cancel()
+                        }
+                    }
+                }
+
                 .show()
 
     }
diff --git a/vector/src/main/java/im/vector/activity/PhoneNumberVerificationActivity.kt b/vector/src/main/java/im/vector/activity/PhoneNumberVerificationActivity.kt
index 8dbd381ccb..c08eb3e81b 100644
--- a/vector/src/main/java/im/vector/activity/PhoneNumberVerificationActivity.kt
+++ b/vector/src/main/java/im/vector/activity/PhoneNumberVerificationActivity.kt
@@ -183,14 +183,17 @@ class PhoneNumberVerificationActivity : VectorAppCompatActivity(), TextView.OnEd
 
                             DialogUtils.promptPassword(this@PhoneNumberVerificationActivity,
                                     invalidPassError,
-                                    (auth as? AuthParamsLoginPassword)?.let { auth.password }
-                            ) { password ->
-                                val authParams = AuthParamsLoginPassword().apply {
-                                    this.user = mSession?.myUserId
-                                    this.password = password
-                                }
-                                registerAfterPhoneNumberValidation(pid, authParams)
-                            }
+                                    (auth as? AuthParamsLoginPassword)?.let { auth.password },
+                                    { password ->
+                                        val authParams = AuthParamsLoginPassword().apply {
+                                            this.user = mSession?.myUserId
+                                            this.password = password
+                                        }
+                                        registerAfterPhoneNumberValidation(pid, authParams)
+                                    },
+                                    {
+                                        onSubmitCodeError(getString(R.string.settings_add_3pid_authentication_needed))
+                                    })
                         } else {
                             //you can only do that on mobile
                             AlertDialog.Builder(this@PhoneNumberVerificationActivity)
diff --git a/vector/src/main/java/im/vector/fragments/VectorSettingsPreferencesFragment.kt b/vector/src/main/java/im/vector/fragments/VectorSettingsPreferencesFragment.kt
index 3efe6a9fef..c53d8169f5 100755
--- a/vector/src/main/java/im/vector/fragments/VectorSettingsPreferencesFragment.kt
+++ b/vector/src/main/java/im/vector/fragments/VectorSettingsPreferencesFragment.kt
@@ -61,10 +61,7 @@ import im.vector.dialogs.ExportKeysDialog
 import im.vector.extensions.getFingerprintHumanReadable
 import im.vector.extensions.showPassword
 import im.vector.extensions.withArgs
-import im.vector.preference.ProgressBarPreference
-import im.vector.preference.UserAvatarPreference
-import im.vector.preference.VectorGroupPreference
-import im.vector.preference.VectorPreference
+import im.vector.preference.*
 import im.vector.settings.FontScale
 import im.vector.settings.VectorLocale
 import im.vector.ui.themes.ThemeUtils
@@ -2041,7 +2038,8 @@ class VectorSettingsPreferencesFragment : PreferenceFragmentCompat(), SharedPref
             mSession.identityServerManager.checkAdd3pidInteractiveFlow(listOf(LoginRestClient.LOGIN_FLOW_TYPE_PASSWORD),
                     object : ApiCallback<IdentityServerManager.SupportedFlowResult> {
                         override fun onSuccess(info: IdentityServerManager.SupportedFlowResult) {
-                            addEmailBtn.isEnabled = info == IdentityServerManager.SupportedFlowResult.SUPPORTED
+                            addEmailBtn.isEnabled =  info == IdentityServerManager.SupportedFlowResult.SUPPORTED
+                                    || info == IdentityServerManager.SupportedFlowResult.INTERACTIVE_AUTH_NOT_SUPPORTED
                         }
 
                         override fun onUnexpectedError(e: java.lang.Exception?) {
@@ -2186,13 +2184,18 @@ class VectorSettingsPreferencesFragment : PreferenceFragmentCompat(), SharedPref
                                     .takeIf { e.errcode == MatrixError.FORBIDDEN }
                             DialogUtils.promptPassword(requireContext(),
                                     invalidPassError,
-                                    auth?.let { auth.password }) { password ->
-                                val authParams = AuthParamsLoginPassword().apply {
-                                    this.user = mSession.myUserId
-                                    this.password = password
-                                }
-                                finalizeAdd(pid, authParams, fragmentActivity)
-                            }
+                                    auth?.let { auth.password },
+                                    { password ->
+                                        val authParams = AuthParamsLoginPassword().apply {
+                                            this.user = mSession.myUserId
+                                            this.password = password
+                                        }
+                                        finalizeAdd(pid, authParams, fragmentActivity)
+                                    },
+                                    {
+                                        onCommonDone(getString(R.string.settings_add_3pid_authentication_needed))
+                                    }
+                            )
                         } else {
                             //you can only do that on mobile
                             AlertDialog.Builder(fragmentActivity)
@@ -2360,6 +2363,7 @@ class VectorSettingsPreferencesFragment : PreferenceFragmentCompat(), SharedPref
                     object : ApiCallback<IdentityServerManager.SupportedFlowResult> {
                         override fun onSuccess(info: IdentityServerManager.SupportedFlowResult) {
                             addPhoneBtn.isEnabled = info == IdentityServerManager.SupportedFlowResult.SUPPORTED
+                                    || info == IdentityServerManager.SupportedFlowResult.INTERACTIVE_AUTH_NOT_SUPPORTED
                         }
 
                         override fun onUnexpectedError(e: java.lang.Exception?) {
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index 705f949690..856b637b40 100755
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -632,6 +632,7 @@
     <string name="settings_app_info_link_summary">Show the application info in the system settings.</string>
     <string name="settings_add_3pid_confirm_password_title">Confirm your password</string>
     <string name="settings_add_3pid_flow_not_supported">You can\'t do this from Riot mobile</string>
+    <string name="settings_add_3pid_authentication_needed">Authentication is required</string>
 
 
     <string name="settings_notification_advanced">Advanced Notification Settings</string>

From 92c0e71780e3edaf57dcd9195c693fec2136bf66 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Wed, 13 Nov 2019 14:16:10 +0100
Subject: [PATCH 50/77] Allow room widget flow

---
 vector/src/main/java/im/vector/VectorApp.java |   1 -
 .../vector/activity/StickerPickerActivity.kt  |   2 +-
 .../activity/VectorAppCompatActivity.kt       |   3 +-
 .../vector/activity/VectorRoomActivity.java   |   1 -
 .../java/im/vector/activity/WidgetActivity.kt | 364 +++---------------
 .../roomwidgets/RoomWidgetFragment.kt         | 328 ++++++++++++++++
 .../RoomWidgetPermissionBottomSheet.kt        | 115 ++++++
 .../RoomWidgetPermissionViewModel.kt          | 126 ++++++
 .../roomwidgets/RoomWidgetViewModel.kt        | 286 ++++++++++++++
 .../widgets/IntegrationManagerConfig.kt       |   1 -
 .../im/vector/widgets/WidgetsManager.java     |   9 +-
 .../main/res/drawable-hdpi/ic_widget_bin.png  | Bin 0 -> 756 bytes
 .../drawable-hdpi/ic_widget_external_link.png | Bin 0 -> 583 bytes
 .../res/drawable-hdpi/ic_widget_refresh.png   | Bin 0 -> 1036 bytes
 .../main/res/drawable-mdpi/ic_widget_bin.png  | Bin 0 -> 503 bytes
 .../drawable-mdpi/ic_widget_external_link.png | Bin 0 -> 423 bytes
 .../res/drawable-mdpi/ic_widget_refresh.png   | Bin 0 -> 670 bytes
 .../main/res/drawable-xhdpi/ic_widget_bin.png | Bin 0 -> 946 bytes
 .../ic_widget_external_link.png               | Bin 0 -> 717 bytes
 .../res/drawable-xhdpi/ic_widget_refresh.png  | Bin 0 -> 1338 bytes
 .../res/drawable-xxhdpi/ic_widget_bin.png     | Bin 0 -> 1342 bytes
 .../ic_widget_external_link.png               | Bin 0 -> 1014 bytes
 .../res/drawable-xxhdpi/ic_widget_refresh.png | Bin 0 -> 2155 bytes
 .../res/drawable-xxxhdpi/ic_widget_bin.png    | Bin 0 -> 1646 bytes
 .../ic_widget_external_link.png               | Bin 0 -> 1400 bytes
 .../drawable-xxxhdpi/ic_widget_refresh.png    | Bin 0 -> 2802 bytes
 .../src/main/res/layout/activity_widget.xml   |  71 +---
 .../bottom_sheet_room_widget_permission.xml   | 114 ++++++
 .../main/res/layout/fragment_room_widget.xml  |  54 +++
 vector/src/main/res/menu/menu_room_widget.xml |  26 ++
 vector/src/main/res/values/strings.xml        |  18 +-
 31 files changed, 1144 insertions(+), 375 deletions(-)
 create mode 100644 vector/src/main/java/im/vector/fragments/roomwidgets/RoomWidgetFragment.kt
 create mode 100644 vector/src/main/java/im/vector/fragments/roomwidgets/RoomWidgetPermissionBottomSheet.kt
 create mode 100644 vector/src/main/java/im/vector/fragments/roomwidgets/RoomWidgetPermissionViewModel.kt
 create mode 100644 vector/src/main/java/im/vector/fragments/roomwidgets/RoomWidgetViewModel.kt
 create mode 100644 vector/src/main/res/drawable-hdpi/ic_widget_bin.png
 create mode 100644 vector/src/main/res/drawable-hdpi/ic_widget_external_link.png
 create mode 100644 vector/src/main/res/drawable-hdpi/ic_widget_refresh.png
 create mode 100644 vector/src/main/res/drawable-mdpi/ic_widget_bin.png
 create mode 100644 vector/src/main/res/drawable-mdpi/ic_widget_external_link.png
 create mode 100644 vector/src/main/res/drawable-mdpi/ic_widget_refresh.png
 create mode 100644 vector/src/main/res/drawable-xhdpi/ic_widget_bin.png
 create mode 100644 vector/src/main/res/drawable-xhdpi/ic_widget_external_link.png
 create mode 100644 vector/src/main/res/drawable-xhdpi/ic_widget_refresh.png
 create mode 100644 vector/src/main/res/drawable-xxhdpi/ic_widget_bin.png
 create mode 100644 vector/src/main/res/drawable-xxhdpi/ic_widget_external_link.png
 create mode 100644 vector/src/main/res/drawable-xxhdpi/ic_widget_refresh.png
 create mode 100644 vector/src/main/res/drawable-xxxhdpi/ic_widget_bin.png
 create mode 100644 vector/src/main/res/drawable-xxxhdpi/ic_widget_external_link.png
 create mode 100644 vector/src/main/res/drawable-xxxhdpi/ic_widget_refresh.png
 create mode 100644 vector/src/main/res/layout/bottom_sheet_room_widget_permission.xml
 create mode 100644 vector/src/main/res/layout/fragment_room_widget.xml
 create mode 100644 vector/src/main/res/menu/menu_room_widget.xml

diff --git a/vector/src/main/java/im/vector/VectorApp.java b/vector/src/main/java/im/vector/VectorApp.java
index b8eabc13c9..5e798fb0df 100755
--- a/vector/src/main/java/im/vector/VectorApp.java
+++ b/vector/src/main/java/im/vector/VectorApp.java
@@ -28,7 +28,6 @@
 import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.graphics.Bitmap;
-import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
diff --git a/vector/src/main/java/im/vector/activity/StickerPickerActivity.kt b/vector/src/main/java/im/vector/activity/StickerPickerActivity.kt
index a1ed6c3237..f83c623198 100755
--- a/vector/src/main/java/im/vector/activity/StickerPickerActivity.kt
+++ b/vector/src/main/java/im/vector/activity/StickerPickerActivity.kt
@@ -55,7 +55,7 @@ class StickerPickerActivity : AbstractWidgetActivity() {
     }
 
     override fun canScalarTokenBeProvided(): Boolean {
-        return widgetManager.isScalarUrl(this, mWidgetUrl)
+        return widgetManager.isScalarUrl( mWidgetUrl)
     }
 
     /**
diff --git a/vector/src/main/java/im/vector/activity/VectorAppCompatActivity.kt b/vector/src/main/java/im/vector/activity/VectorAppCompatActivity.kt
index 5c867ae13b..373829942b 100755
--- a/vector/src/main/java/im/vector/activity/VectorAppCompatActivity.kt
+++ b/vector/src/main/java/im/vector/activity/VectorAppCompatActivity.kt
@@ -30,6 +30,7 @@ import androidx.core.view.isVisible
 import butterknife.BindView
 import butterknife.ButterKnife
 import butterknife.Unbinder
+import com.airbnb.mvrx.BaseMvRxActivity
 import im.vector.BuildConfig
 import im.vector.R
 import im.vector.VectorApp
@@ -45,7 +46,7 @@ import org.matrix.androidsdk.core.Log
 /**
  * Parent class for all Activities in Vector application
  */
-abstract class VectorAppCompatActivity : AppCompatActivity() {
+abstract class VectorAppCompatActivity : BaseMvRxActivity() {
 
     private var LOG_TAG = VectorAppCompatActivity::class.java.simpleName
 
diff --git a/vector/src/main/java/im/vector/activity/VectorRoomActivity.java b/vector/src/main/java/im/vector/activity/VectorRoomActivity.java
index 539db45a0c..e774279cfc 100755
--- a/vector/src/main/java/im/vector/activity/VectorRoomActivity.java
+++ b/vector/src/main/java/im/vector/activity/VectorRoomActivity.java
@@ -137,7 +137,6 @@
 import im.vector.view.VectorOngoingConferenceCallView;
 import im.vector.view.VectorPendingCallView;
 import im.vector.widgets.Widget;
-import im.vector.widgets.WidgetManagerProvider;
 import im.vector.widgets.WidgetsManager;
 
 /**
diff --git a/vector/src/main/java/im/vector/activity/WidgetActivity.kt b/vector/src/main/java/im/vector/activity/WidgetActivity.kt
index ecb17db300..6f0f1a3bad 100755
--- a/vector/src/main/java/im/vector/activity/WidgetActivity.kt
+++ b/vector/src/main/java/im/vector/activity/WidgetActivity.kt
@@ -20,70 +20,22 @@ package im.vector.activity
 import android.annotation.SuppressLint
 import android.content.Context
 import android.content.Intent
-import android.graphics.Bitmap
-import android.os.Build
-import android.os.Handler
-import android.os.Looper
-import android.text.TextUtils
-import android.view.View
-import android.view.ViewGroup
-import android.webkit.*
-import android.widget.TextView
-import androidx.appcompat.app.AlertDialog
-import androidx.core.view.isInvisible
-import androidx.core.view.isVisible
-import butterknife.BindView
-import butterknife.OnClick
-import im.vector.Matrix
+import android.graphics.Color
+import android.widget.Toast
+import androidx.core.content.ContextCompat
+import androidx.lifecycle.Observer
+import com.airbnb.mvrx.viewModel
 import im.vector.R
+import im.vector.fragments.roomwidgets.*
+import im.vector.ui.themes.ThemeUtils
 import im.vector.widgets.Widget
-import im.vector.widgets.WidgetsManager
-import org.jetbrains.anko.toast
-import org.matrix.androidsdk.MXSession
-import org.matrix.androidsdk.core.Log
-import org.matrix.androidsdk.core.callback.ApiCallback
-import org.matrix.androidsdk.core.model.MatrixError
-import org.matrix.androidsdk.data.Room
-import javax.net.ssl.HttpsURLConnection
 
 /*
  * This class displays a widget
  */
 class WidgetActivity : VectorAppCompatActivity() {
 
-    // the linked widget
-    private var mWidget: Widget? = null
-
-    // the session
-    private var mSession: MXSession? = null
-
-    // the room
-    private var mRoom: Room? = null
-
-    @BindView(R.id.widget_close_icon)
-    lateinit var mCloseWidgetIcon: View
-
-    @BindView(R.id.widget_web_view)
-    lateinit var mWidgetWebView: WebView
-
-    @BindView(R.id.widget_title)
-    lateinit var mWidgetTypeTextView: TextView
-
-    private var mIsRefreshingToken = false
-    private var mTokenAlreadyRefreshed = false
-    private var mHistoryAlreadyCleared = false
-
-    private lateinit var widgetsManager: WidgetsManager
-    /**
-     * Widget events listener
-     */
-    private val mWidgetListener = WidgetsManager.onWidgetUpdateListener { widget ->
-        if (TextUtils.equals(widget.widgetId, mWidget!!.widgetId)) {
-            if (!widget.isActive) {
-                finish()
-            }
-        }
-    }
+    val viewModel: RoomWidgetViewModel by viewModel()
 
     /* ==========================================================================================
      * LIFE CYCLE
@@ -91,284 +43,92 @@ class WidgetActivity : VectorAppCompatActivity() {
 
     override fun getLayoutRes() = R.layout.activity_widget
 
-    @SuppressLint("NewApi")
-    override fun initUiAndData() {
-        waitingView = findViewById(R.id.widget_progress_layout)
-
-        mWidget = intent.getSerializableExtra(EXTRA_WIDGET_ID) as Widget
-
-        if (null == mWidget || null == mWidget!!.url) {
-            Log.e(LOG_TAG, "## onCreate() : invalid widget")
-            finish()
-            return
-        }
-
-        mSession = Matrix.getMXSession(this, mWidget!!.sessionId)
-
-
-        widgetsManager = Matrix.getInstance(this).getWidgetManagerProvider(mSession)?.getWidgetManager(this)
-                ?: run {
-                    Log.e(LOG_TAG, "## onCreate() : No widget manager ")
-                    finish()
-                    return
-                }
-
-
-        if (null == mSession) {
-            Log.e(LOG_TAG, "## onCreate() : invalid session")
-            finish()
-            return
-        }
-
-        mRoom = mSession!!.dataHandler.getRoom(mWidget!!.roomId)
-
-        if (null == mRoom) {
-            Log.e(LOG_TAG, "## onCreate() : invalid room")
-            finish()
-            return
-        }
-
-        mWidgetTypeTextView.text = mWidget!!.humanName
+    override fun getMenuRes() = R.menu.menu_room_widget
 
-        configureWebView()
+    override fun getTitleRes() = R.string.room_widget_activity_title
 
-        loadUrl()
-    }
-
-    override fun onDestroy() {
-        mWidgetWebView.let {
-            (it.parent as ViewGroup).removeView(it)
-            it.removeAllViews()
-            it.destroy()
-        }
-
-        super.onDestroy()
-    }
-
-    override fun onResume() {
-        super.onResume()
-
-        widgetsManager.addListener(mWidgetListener)
-
-        mWidgetWebView.let {
-            it.resumeTimers()
-            it.onResume()
-        }
-
-        refreshStatusBar()
-    }
-
-    override fun onPause() {
-        super.onPause()
-
-        mWidgetWebView.let {
-            it.pauseTimers()
-            it.onPause()
-        }
-
-        widgetsManager.removeListener(mWidgetListener)
-    }
-
-    /* ==========================================================================================
-     * UI EVENTS
-     * ========================================================================================== */
-
-    @OnClick(R.id.widget_close_icon)
-    internal fun onCloseClick() {
-        AlertDialog.Builder(this)
-                .setMessage(R.string.widget_delete_message_confirmation)
-                .setPositiveButton(R.string.remove) { _, _ ->
-                    showWaitingView()
-                    widgetsManager.closeWidget(mSession, mRoom, mWidget!!.widgetId, object : ApiCallback<Void> {
-                        override fun onSuccess(info: Void?) {
-                            hideWaitingView()
-                            finish()
-                        }
-
-                        private fun onError(errorMessage: String) {
-                            hideWaitingView()
-                            toast(errorMessage)
-                        }
-
-                        override fun onNetworkError(e: Exception) {
-                            onError(e.localizedMessage)
-                        }
-
-                        override fun onMatrixError(e: MatrixError) {
-                            onError(e.localizedMessage)
-                        }
-
-                        override fun onUnexpectedError(e: Exception) {
-                            onError(e.localizedMessage)
-                        }
-                    })
-                }
-                .setNegativeButton(R.string.cancel, null)
-                .show()
-    }
-
-    @OnClick(R.id.widget_back_icon)
-    internal fun onBackClicked() {
-        if (mWidgetWebView.canGoBack()) {
-            mWidgetWebView.goBack()
-        } else {
-            finish()
-        }
-    }
-
-    /* ==========================================================================================
-     * PRIVATE
-     * ========================================================================================== */
-
-    /**
-     * Refresh the status bar
-     */
-    private fun refreshStatusBar() {
-        val canCloseWidget = null == widgetsManager.checkWidgetPermission(mSession, mRoom)
-
-        // close widget button
-        mCloseWidgetIcon.isInvisible = !canCloseWidget
-    }
-
-    /**
-     * Load the widget call
-     */
     @SuppressLint("NewApi")
-    private fun configureWebView() {
-        mWidgetWebView.let {
-            // xml value seems ignored
-            it.setBackgroundColor(0)
-
-            // clear caches
-            it.clearHistory()
-            it.clearFormData()
-            it.clearCache(true)
-
-            it.settings.let {
-                // does not cache the data
-                it.cacheMode = WebSettings.LOAD_NO_CACHE
-
-                // Enable Javascript
-                it.javaScriptEnabled = true
-
-                // Use WideViewport and Zoom out if there is no viewport defined
-                it.useWideViewPort = true
-                it.loadWithOverviewMode = true
-
-                // Enable pinch to zoom without the zoom buttons
-                it.builtInZoomControls = true
-
-                // Allow use of Local Storage
-                it.domStorageEnabled = true
-
-                it.allowFileAccessFromFileURLs = true
-                it.allowUniversalAccessFromFileURLs = true
-
-                it.displayZoomControls = false
-            }
+    override fun initUiAndData() {
+        configureToolbar()
 
-            // Permission requests
-            it.webChromeClient = object : WebChromeClient() {
-                override fun onPermissionRequest(request: PermissionRequest) {
-                    Handler(Looper.getMainLooper()).post { request.grant(request.resources) }
-                }
-            }
+        supportActionBar?.setHomeAsUpIndicator(ContextCompat.getDrawable(this, R.drawable.ic_material_leave)?.let {
+            ThemeUtils.tintDrawableWithColor(it, Color.WHITE)
+        })
 
-            it.webViewClient = object : WebViewClient() {
-                override fun onPageStarted(view: WebView?, url: String?, favicon: Bitmap?) {
-                    showWaitingView()
+        viewModel.selectSubscribe(this, RoomWidgetViewModelState::status) { ws ->
+            when (ws) {
+                WidgetState.UNKWNOWN           -> {
                 }
-
-                override fun onReceivedHttpError(view: WebView?, request: WebResourceRequest?, errorResponse: WebResourceResponse?) {
-                    // In case of 403, try to refresh the scalar token
-                    if (errorResponse?.statusCode == HttpsURLConnection.HTTP_FORBIDDEN
-                            && !mTokenAlreadyRefreshed
-                            && widgetsManager.isScalarUrl(this@WidgetActivity, mWidget!!.url)) {
-                        mTokenAlreadyRefreshed = true
-                        mIsRefreshingToken = true
-
-                        // Hide the webview because it's displaying an error message we try to fix by refreshing the token
-                        mWidgetWebView.isVisible = false
-
-                        widgetsManager.clearScalarToken(this@WidgetActivity, mSession)
-                        loadUrl()
+                WidgetState.WIDGET_NOT_ALLOWED -> {
+                    val dFrag = supportFragmentManager.findFragmentByTag(FRAGMENT_TAG_PERMISSION) as? RoomWidgetPermissionBottomSheet
+                    if (dFrag != null && dFrag.dialog?.isShowing == true && !dFrag.isRemoving) {
+                        //already there
+                    } else {
+                        RoomWidgetPermissionBottomSheet.newInstance(viewModel.session!!.myUserId, viewModel.widget).show(supportFragmentManager, FRAGMENT_TAG_PERMISSION)
                     }
                 }
-
-                override fun onPageFinished(view: WebView?, url: String?) {
-                    // Check that the Activity is still alive
-                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1 && isDestroyed) {
-                        return
+                WidgetState.WIDGET_ALLOWED     -> {
+                    //mount the webview fragment if needed
+                    if (supportFragmentManager.findFragmentByTag(FRAGMENT_TAG_WEBVIEW) == null) {
+                        supportFragmentManager.beginTransaction()
+                                .replace(R.id.fragment_container, RoomWidgetFragment(), FRAGMENT_TAG_WEBVIEW)
+                                .commit()
                     }
-
-                    if (mIsRefreshingToken) {
-                        // We are waiting for a scalar token refresh
-                        return
-                    }
-
-                    hideWaitingView()
-
-                    // Ensure the webview is visible, it may have been hidden during token refresh
-                    mWidgetWebView.isVisible = true
-
-                    if (mTokenAlreadyRefreshed && !mHistoryAlreadyCleared) {
-                        // Also clear WebView history, for the scenario when the scalar token was invalid, to avoid loading again the url with the invalid token
-                        // It has to be done when page has finished to be loaded
-                        mHistoryAlreadyCleared = true
-                        mWidgetWebView.clearHistory()
-                    }
-
                 }
-            }
+                WidgetState.CLOSING_WIDGET     -> {
 
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-                val cookieManager = android.webkit.CookieManager.getInstance()
-                cookieManager.setAcceptThirdPartyCookies(mWidgetWebView, true)
+                }
             }
         }
-    }
 
-    private fun loadUrl() {
-        showWaitingView()
-        widgetsManager.getFormattedWidgetUrl(this, mWidget!!, object : ApiCallback<String> {
-            override fun onSuccess(url: String) {
-                mIsRefreshingToken = false
+        viewModel.selectSubscribe(this, RoomWidgetViewModelState::widgetName) { name ->
+            supportActionBar?.title = name
+        }
 
-                hideWaitingView()
-                mWidgetWebView.loadUrl(url)
-            }
+        viewModel.selectSubscribe(this, RoomWidgetViewModelState::canManageWidgets) {
+            invalidateOptionsMenu()
+        }
 
-            private fun onError(errorMessage: String) {
-                hideWaitingView()
-                toast(errorMessage)
-                finish()
+        viewModel.navigateEvent.observe(this, Observer { uxStateEvent ->
+            when (uxStateEvent?.getContentIfNotHandled()) {
+                RoomWidgetViewModel.NAVIGATE_FINISH -> {
+                    finish()
+                }
             }
+        })
 
-            override fun onNetworkError(e: Exception) {
-                onError(e.localizedMessage)
+        viewModel.toastMessageEvent.observe(this, Observer {
+            it?.getContentIfNotHandled()?.let {
+                Toast.makeText(this, it, Toast.LENGTH_LONG).show()
             }
+        })
+    }
 
-            override fun onMatrixError(e: MatrixError) {
-                onError(e.localizedMessage)
-            }
+    /* ==========================================================================================
+     * UI EVENTS
+     * ========================================================================================== */
 
-            override fun onUnexpectedError(e: Exception) {
-                onError(e.localizedMessage)
-            }
-        })
+    override fun onBackPressed() {
+        //Hugly i know
+        (supportFragmentManager.findFragmentByTag(FRAGMENT_TAG_WEBVIEW) as? RoomWidgetFragment)?.let { widgetFragment ->
+            if (widgetFragment.onBackPressed()) return
+        }
+        super.onBackPressed()
     }
 
+
     /* ==========================================================================================
      * companion
      * ========================================================================================== */
 
     companion object {
-        private val LOG_TAG = WidgetActivity::class.java.simpleName
 
+        private const val FRAGMENT_TAG_PERMISSION = "FRAGMENT_TAG_PERMISSION"
+        private const val FRAGMENT_TAG_WEBVIEW = "WebView"
         /**
          * The linked widget
          */
-        private const val EXTRA_WIDGET_ID = "EXTRA_WIDGET_ID"
+        const val EXTRA_WIDGET_ID = "EXTRA_WIDGET_ID"
 
         fun getIntent(context: Context, widget: Widget): Intent {
             return Intent(context, WidgetActivity::class.java)
diff --git a/vector/src/main/java/im/vector/fragments/roomwidgets/RoomWidgetFragment.kt b/vector/src/main/java/im/vector/fragments/roomwidgets/RoomWidgetFragment.kt
new file mode 100644
index 0000000000..baf27397da
--- /dev/null
+++ b/vector/src/main/java/im/vector/fragments/roomwidgets/RoomWidgetFragment.kt
@@ -0,0 +1,328 @@
+/*
+ * Copyright 2019 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.
+ * 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.
+ */
+package im.vector.fragments.roomwidgets
+
+import android.annotation.SuppressLint
+import android.graphics.Bitmap
+import android.os.Build
+import android.os.Bundle
+import android.os.Handler
+import android.os.Looper
+import android.view.Menu
+import android.view.MenuItem
+import android.view.View
+import android.view.ViewGroup
+import android.webkit.*
+import android.widget.ProgressBar
+import android.widget.TextView
+import androidx.annotation.RequiresApi
+import androidx.core.view.isInvisible
+import androidx.core.view.isVisible
+import androidx.lifecycle.Observer
+import butterknife.BindView
+import com.airbnb.mvrx.*
+import im.vector.R
+import im.vector.fragments.VectorBaseMvRxFragment
+import im.vector.ui.themes.ThemeUtils
+import im.vector.util.openUrlInExternalBrowser
+
+class RoomWidgetFragment : VectorBaseMvRxFragment() {
+
+    var mWidgetWebView: WebView? = null
+
+    @BindView(R.id.webview_error_layout)
+    lateinit var errorContainer: ViewGroup
+
+    @BindView(R.id.webview_error_text)
+    lateinit var errorText: TextView
+
+
+    @BindView(R.id.widget_progress_bar)
+    lateinit var webProgressBar: ProgressBar
+
+    val viewModel: RoomWidgetViewModel by activityViewModel()
+
+    override fun getLayoutResId(): Int = R.layout.fragment_room_widget
+
+    override fun onActivityCreated(savedInstanceState: Bundle?) {
+        super.onActivityCreated(savedInstanceState)
+        configureWebView()
+        setHasOptionsMenu(true)
+        viewModel.loadWebURLEvent.observe(this, Observer {
+            it?.getContentIfNotHandled()?.let {
+                mWidgetWebView?.clearHistory()
+                mWidgetWebView?.loadUrl(it)
+                mWidgetWebView?.isVisible = true
+            }
+        })
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        mWidgetWebView = view.findViewById(R.id.widget_web_view)
+    }
+
+    override fun onDestroy() {
+        //Looks like WebView creates memory leaks (?) according to legacy code
+        //We have to take additional steps to clear memory
+        destroyWebView()
+        super.onDestroy()
+    }
+
+    private fun destroyWebView() {
+
+        val webview = mWidgetWebView ?: return
+        // Make sure you remove the WebView from its parent view before doing anything.
+        (webview.parent as? ViewGroup)?.removeAllViews()
+
+        webview.webViewClient = null
+        webview.clearHistory()
+
+        // NOTE: clears RAM cache, if you pass true, it will also clear the disk cache.
+        webview.clearCache(true)
+
+        // Loading a blank page is optional, but will ensure that the WebView isn't doing anything when you destroy it.
+        webview.loadUrl("about:blank")
+
+        webview.onPause()
+        webview.removeAllViews()
+
+        // NOTE: This pauses JavaScript execution for ALL WebViews,
+        // do not use if you have other WebViews still alive.
+        // If you create another WebView after calling this,
+        // make sure to call mWebView.resumeTimers().
+        webview.pauseTimers()
+
+        // NOTE: This can occasionally cause a segfault below API 17 (4.2)
+        webview.destroy()
+
+        // Null out the reference so that you don't end up re-using it.
+        mWidgetWebView = null
+    }
+
+    private var webViewClient = object : WebViewClient() {
+
+        var isInError = false
+        var currentPage: String? = null
+
+        override fun onPageStarted(view: WebView?, url: String?, favicon: Bitmap?) {
+//            Log.d("WEBVIEW", "onPageStarted $url")
+            isInError = false
+            currentPage = url
+            viewModel.webviewStartedToLoad(url)
+        }
+
+        @RequiresApi(Build.VERSION_CODES.LOLLIPOP)
+        override fun onReceivedHttpError(view: WebView?, request: WebResourceRequest?, errorResponse: WebResourceResponse?) {
+//            Log.d("WEBVIEW", "onReceivedHttpError ${request?.url}")
+            if (request?.url.toString() != currentPage) {
+                // Ignore this error
+                return
+            }
+            isInError = true
+            viewModel.webviewLoadingError(request?.url?.toString(),
+                    errorResponse?.reasonPhrase?.takeIf { it.isNotBlank() }
+                            ?: errorResponse?.statusCode.toString())
+        }
+
+        override fun onReceivedError(view: WebView, errorCode: Int, description: String, failingUrl: String) {
+            isInError = true
+            viewModel.webviewLoadingError(failingUrl, description)
+        }
+
+        override fun onPageFinished(view: WebView?, url: String?) {
+//            Log.d("WEBVIEW", "onPageFinished ${url}")
+            if (!isInError) {
+                viewModel.webviewLoadSuccess(url)
+            }
+        }
+    }
+
+
+    override fun invalidate() = withState(viewModel) { state ->
+        //            mWidgetTypeTextView.text = it.widgetName
+        when (state.status) {
+            WidgetState.UNKWNOWN           -> {
+                //Hide all?
+                mWidgetWebView?.isVisible = false
+            }
+            WidgetState.WIDGET_NOT_ALLOWED -> {
+                mWidgetWebView?.isVisible = false
+            }
+            WidgetState.WIDGET_ALLOWED     -> {
+                mWidgetWebView?.isVisible = true
+                when (state.formattedURL) {
+                    Uninitialized -> {
+                    }
+                    is Loading    -> {
+                        setError(null)
+                        webProgressBar.isIndeterminate = true
+                        webProgressBar.isVisible = true
+                    }
+                    is Success    -> {
+                        setError(null)
+                        when (state.webviewLoadedUrl) {
+                            Uninitialized -> {
+                                mWidgetWebView?.isInvisible = true
+                            }
+                            is Loading    -> {
+                                setError(null)
+                                mWidgetWebView?.isInvisible = false
+                                webProgressBar.isIndeterminate = true
+                                webProgressBar.isVisible = true
+                            }
+                            is Success    -> {
+                                mWidgetWebView?.isInvisible = false
+                                webProgressBar.isVisible = false
+                                setError(null)
+                            }
+                            is Fail       -> {
+                                webProgressBar.isInvisible = true
+                                setError(state.webviewLoadedUrl.error.message)
+                            }
+                        }
+                    }
+                    is Fail       -> {
+                        //we need to show Error
+                        mWidgetWebView?.isInvisible = true
+                        webProgressBar.isVisible = false
+                        setError(state.formattedURL.error.message)
+                    }
+                }
+            }
+            WidgetState.CLOSING_WIDGET     -> {
+//                    showWaitingView()
+            }
+        }
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean = withState(viewModel) { state ->
+        when (item.itemId) {
+            R.id.action_close           -> {
+                viewModel.doCloseWidget(requireContext())
+                return@withState true
+            }
+            R.id.action_refresh         -> if (state.formattedURL.complete) {
+                mWidgetWebView?.reload()
+                return@withState true
+            }
+            R.id.action_widget_open_ext -> if (state.formattedURL.complete) {
+                openUrlInExternalBrowser(requireContext(), state.formattedURL.invoke())
+                return@withState true
+            }
+        }
+        return@withState super.onOptionsItemSelected(item)
+    }
+
+    override fun onPrepareOptionsMenu(menu: Menu?) = withState(viewModel) { state ->
+        menu?.findItem(R.id.action_close)?.let {
+            it.isVisible = state.canManageWidgets
+        }
+        super.onPrepareOptionsMenu(menu)
+    }
+
+    fun onBackPressed(): Boolean = withState(viewModel) { state ->
+        if (state.formattedURL.complete) {
+            if (mWidgetWebView?.canGoBack() == true) {
+                mWidgetWebView?.goBack()
+                return@withState true
+            }
+        }
+        return@withState false
+    }
+
+    private fun setError(message: String?) {
+        if (message == null) {
+            errorContainer.isVisible = false
+            errorText.text = null
+        } else {
+            webProgressBar.isVisible = false
+            errorContainer.isVisible = true
+            mWidgetWebView?.isInvisible = true
+            errorText.text = getString(R.string.room_widget_failed_to_load, message)
+        }
+    }
+
+    /**
+     * Load the widget call
+     */
+    @SuppressLint("NewApi")
+    private fun configureWebView() {
+        mWidgetWebView?.let {
+            // xml value seems ignored
+            it.setBackgroundColor(ThemeUtils.getColor(requireContext(), R.attr.vctr_bottom_nav_background_color))
+
+            // clear caches
+            it.clearHistory()
+            it.clearFormData()
+            it.clearCache(true)
+
+            it.settings.let { settings ->
+                // does not cache the data
+                settings.cacheMode = WebSettings.LOAD_NO_CACHE
+
+                // Enable Javascript
+                settings.javaScriptEnabled = true
+
+                // Use WideViewport and Zoom out if there is no viewport defined
+                settings.useWideViewPort = true
+                settings.loadWithOverviewMode = true
+
+                // Enable pinch to zoom without the zoom buttons
+                settings.builtInZoomControls = true
+
+                // Allow use of Local Storage
+                settings.domStorageEnabled = true
+
+                settings.allowFileAccessFromFileURLs = true
+                settings.allowUniversalAccessFromFileURLs = true
+
+                settings.displayZoomControls = false
+            }
+
+            // Permission requests
+            it.webChromeClient = object : WebChromeClient() {
+                override fun onPermissionRequest(request: PermissionRequest) {
+                    Handler(Looper.getMainLooper()).post { request.grant(request.resources) }
+                }
+            }
+
+            it.webViewClient = webViewClient
+
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+                val cookieManager = CookieManager.getInstance()
+                cookieManager.setAcceptThirdPartyCookies(mWidgetWebView, true)
+            }
+        }
+    }
+
+    override fun onResume() {
+        super.onResume()
+        mWidgetWebView?.let {
+            it.resumeTimers()
+            it.onResume()
+        }
+    }
+
+    override fun onPause() {
+        super.onPause()
+        mWidgetWebView?.let {
+            it.pauseTimers()
+            it.onPause()
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/vector/src/main/java/im/vector/fragments/roomwidgets/RoomWidgetPermissionBottomSheet.kt b/vector/src/main/java/im/vector/fragments/roomwidgets/RoomWidgetPermissionBottomSheet.kt
new file mode 100644
index 0000000000..3f083b6f1f
--- /dev/null
+++ b/vector/src/main/java/im/vector/fragments/roomwidgets/RoomWidgetPermissionBottomSheet.kt
@@ -0,0 +1,115 @@
+/*
+ * Copyright 2019 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.
+ * 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.
+ */
+package im.vector.fragments.roomwidgets
+
+import android.os.Build
+import android.os.Parcelable
+import android.text.Spannable
+import android.text.SpannableStringBuilder
+import android.text.style.BulletSpan
+import android.widget.ImageView
+import android.widget.TextView
+import butterknife.BindView
+import butterknife.OnClick
+import com.airbnb.mvrx.MvRx
+import com.airbnb.mvrx.activityViewModel
+import com.airbnb.mvrx.fragmentViewModel
+import com.airbnb.mvrx.withState
+import im.vector.R
+import im.vector.extensions.withArgs
+import im.vector.fragments.VectorBaseBottomSheetDialogFragment
+import im.vector.util.VectorUtils
+import im.vector.widgets.Widget
+import kotlinx.android.parcel.Parcelize
+
+class RoomWidgetPermissionBottomSheet : VectorBaseBottomSheetDialogFragment() {
+
+    override fun getLayoutResId(): Int = R.layout.bottom_sheet_room_widget_permission
+
+    private val viewModel: RoomWidgetPermissionViewModel by fragmentViewModel()
+
+    @BindView(R.id.bottom_sheet_widget_permission_shared_info)
+    lateinit var sharedInfoTextView: TextView
+
+    @BindView(R.id.bottom_sheet_widget_permission_owner_id)
+    lateinit var authorIdText: TextView
+
+    @BindView(R.id.bottom_sheet_widget_permission_owner_display_name)
+    lateinit var authorNameText: TextView
+
+    @BindView(R.id.bottom_sheet_widget_permission_owner_avatar)
+    lateinit var authorAvatarView: ImageView
+
+    private val sharedActivityViewModel: RoomWidgetViewModel by activityViewModel()
+
+    override fun invalidate() = withState(viewModel) { state ->
+
+        authorIdText.text = state.authorId
+        authorNameText.text = state.authorName ?: ""
+        VectorUtils.loadUserAvatar(requireContext(), viewModel.session, authorAvatarView,
+                state.authorAvatarUrl, state.authorId, state.authorName)
+
+        val infoBuilder = SpannableStringBuilder()
+                .append(getString(R.string.room_widget_permission_shared_info_title, "'${state.widgetDomain
+                        ?: ""}'"))
+        infoBuilder.append("\n")
+
+        state.permissionsList?.forEach {
+            infoBuilder.append("\n")
+            val bulletPoint = getString(it)
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+                infoBuilder.append(bulletPoint, BulletSpan(resources.getDimension(R.dimen.quote_gap).toInt()), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
+            } else {
+                val start = infoBuilder.length
+                infoBuilder.append(bulletPoint)
+                infoBuilder.setSpan(BulletSpan(resources.getDimension(R.dimen.quote_gap).toInt()), start, bulletPoint.length, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
+            }
+        }
+        infoBuilder.append("\n")
+
+        sharedInfoTextView.text = infoBuilder
+    }
+
+    @OnClick(R.id.bottom_sheet_widget_permission_decline_button)
+    fun doDecline() {
+        viewModel.blockWidget {
+            dismiss()
+            sharedActivityViewModel.doFinish()
+        }
+    }
+
+    @OnClick(R.id.bottom_sheet_widget_permission_continue_button)
+    fun doAccept() {
+        viewModel.allowWidget {
+            dismiss()
+        }
+    }
+
+    @Parcelize
+    data class FragArgs(
+            val widget: Widget,
+            val mxId: String
+    ) : Parcelable
+
+
+    companion object {
+
+        fun newInstance(matrixId: String, widget: Widget) = RoomWidgetPermissionBottomSheet().withArgs {
+            putParcelable(MvRx.KEY_ARG, FragArgs(widget, matrixId))
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/vector/src/main/java/im/vector/fragments/roomwidgets/RoomWidgetPermissionViewModel.kt b/vector/src/main/java/im/vector/fragments/roomwidgets/RoomWidgetPermissionViewModel.kt
new file mode 100644
index 0000000000..929317ed41
--- /dev/null
+++ b/vector/src/main/java/im/vector/fragments/roomwidgets/RoomWidgetPermissionViewModel.kt
@@ -0,0 +1,126 @@
+/*
+ * Copyright 2019 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.
+ * 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.
+ */
+package im.vector.fragments.roomwidgets
+
+import com.airbnb.mvrx.BaseMvRxViewModel
+import com.airbnb.mvrx.MvRxState
+import com.airbnb.mvrx.MvRxViewModelFactory
+import com.airbnb.mvrx.ViewModelContext
+import im.vector.Matrix
+import im.vector.R
+import im.vector.widgets.Widget
+import org.matrix.androidsdk.MXSession
+import org.matrix.androidsdk.core.callback.ApiCallback
+import org.matrix.androidsdk.core.model.MatrixError
+import java.net.URL
+
+data class RoomWidgetPermissionViewState(
+        val authorId: String = "",
+        val authorAvatarUrl: String? = null,
+        val authorName: String? = null,
+        val widgetDomain: String? = null,
+        //List of @StringRes
+        val permissionsList: List<Int>? = null
+) : MvRxState
+
+class RoomWidgetPermissionViewModel(val session: MXSession, val widget: Widget, initialState: RoomWidgetPermissionViewState)
+    : BaseMvRxViewModel<RoomWidgetPermissionViewState>(initialState, false) {
+
+    init {
+        val room = session.dataHandler.getRoom(widget.roomId)
+        val creator = room.getMember(widget.widgetEvent.sender)
+
+        var domain: String?
+        try {
+            domain = URL(widget.url).host
+        } catch (e: Throwable) {
+            domain = null
+        }
+
+        //TODO check from widget urls the perms that should be shown?
+        //For now put all
+        val infoShared = listOf<Int>(
+                R.string.room_widget_permission_ip_address,
+                R.string.room_widget_permission_useragent,
+                R.string.room_widget_permission_widget_id,
+                R.string.room_widget_permission_room_id,
+                R.string.room_widget_permission_matrix_profile
+        )
+        setState {
+            copy(
+                    authorName = creator?.displayname,
+                    authorId = widget.widgetEvent.sender,
+                    authorAvatarUrl = creator?.getAvatarUrl(),
+                    widgetDomain = domain,
+                    permissionsList = infoShared
+            )
+        }
+    }
+
+    fun allowWidget(onFinished: (() -> Unit)) {
+        session.integrationManager.setWidgetAllowed(widget.widgetEvent?.eventId
+                ?: "", true, object : ApiCallback<Void?> {
+            override fun onSuccess(info: Void?) {
+                onFinished()
+            }
+
+            override fun onUnexpectedError(e: Exception?) {
+                //TODO.. make the button with a loading state?
+            }
+
+            override fun onNetworkError(e: Exception?) {
+                //TODO.. make the button with a loading state?
+            }
+
+            override fun onMatrixError(e: MatrixError?) {
+                //TODO.. make the button with a loading state?
+            }
+
+        })
+    }
+
+    fun blockWidget(onFinished: (() -> Unit)) {
+        session.integrationManager.setWidgetAllowed(widget.widgetEvent?.eventId
+                ?: "", false, object : ApiCallback<Void?> {
+            override fun onSuccess(info: Void?) {
+                onFinished()
+            }
+
+            override fun onUnexpectedError(e: Exception?) {
+                //TODO.. make the button with a loading state?
+            }
+
+            override fun onNetworkError(e: Exception?) {
+                //TODO.. make the button with a loading state?
+            }
+
+            override fun onMatrixError(e: MatrixError?) {
+                //TODO.. make the button with a loading state?
+            }
+
+        })
+    }
+
+    companion object : MvRxViewModelFactory<RoomWidgetPermissionViewModel, RoomWidgetPermissionViewState> {
+
+        override fun create(viewModelContext: ViewModelContext, state: RoomWidgetPermissionViewState): RoomWidgetPermissionViewModel? {
+            val args = viewModelContext.args<RoomWidgetPermissionBottomSheet.FragArgs>()
+            val session = Matrix.getMXSession(viewModelContext.activity, args.mxId)
+            return RoomWidgetPermissionViewModel(session, args.widget, state)
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/vector/src/main/java/im/vector/fragments/roomwidgets/RoomWidgetViewModel.kt b/vector/src/main/java/im/vector/fragments/roomwidgets/RoomWidgetViewModel.kt
new file mode 100644
index 0000000000..a11aa38029
--- /dev/null
+++ b/vector/src/main/java/im/vector/fragments/roomwidgets/RoomWidgetViewModel.kt
@@ -0,0 +1,286 @@
+/*
+ * Copyright 2019 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.
+ * 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.
+ */
+package im.vector.fragments.roomwidgets
+
+import android.content.Context
+import android.text.TextUtils
+import androidx.appcompat.app.AlertDialog
+import androidx.lifecycle.MutableLiveData
+import com.airbnb.mvrx.*
+import im.vector.Matrix
+import im.vector.R
+import im.vector.VectorApp
+import im.vector.activity.WidgetActivity
+import im.vector.ui.arch.LiveEvent
+import im.vector.widgets.Widget
+import im.vector.widgets.WidgetsManager
+import org.matrix.androidsdk.MXSession
+import org.matrix.androidsdk.core.callback.ApiCallback
+import org.matrix.androidsdk.core.model.MatrixError
+import org.matrix.androidsdk.data.Room
+import org.matrix.androidsdk.features.integrationmanager.IntegrationManager
+
+enum class WidgetState {
+    UNKWNOWN,
+    WIDGET_NOT_ALLOWED,
+    WIDGET_ALLOWED,
+    CLOSING_WIDGET
+}
+
+data class RoomWidgetViewModelState(
+        val status: WidgetState = WidgetState.UNKWNOWN,
+        val formattedURL: Async<String> = Uninitialized,
+        val webviewLoadedUrl: Async<String> = Uninitialized,
+        val widgetName: String = "",
+        val authorName: String? = null,
+        val authorId: String? = null,
+        val canManageWidgets: Boolean = false
+) : MvRxState
+
+class RoomWidgetViewModel(initialState: RoomWidgetViewModelState, val widget: Widget)
+    : BaseMvRxViewModel<RoomWidgetViewModelState>(initialState, false) {
+
+    companion object : MvRxViewModelFactory<RoomWidgetViewModel, RoomWidgetViewModelState> {
+        const val NAVIGATE_FINISH = "NAVIGATE_FINISH"
+        //private val LOG_TAG = KeysBackupSetupSharedViewModel::class.java.name
+
+
+        override fun create(viewModelContext: ViewModelContext, state: RoomWidgetViewModelState): RoomWidgetViewModel? {
+            return (viewModelContext.activity.intent?.extras?.getSerializable(WidgetActivity.EXTRA_WIDGET_ID) as? Widget)?.let {
+                RoomWidgetViewModel(state, it)
+            } ?: super.create(viewModelContext, state)
+        }
+
+    }
+
+    var navigateEvent: MutableLiveData<LiveEvent<String>> = MutableLiveData()
+    var loadWebURLEvent: MutableLiveData<LiveEvent<String>> = MutableLiveData()
+    var toastMessageEvent: MutableLiveData<LiveEvent<String>> = MutableLiveData()
+
+    private var room: Room? = null
+
+    var session: MXSession? = null
+
+    var widgetsManager: WidgetsManager? = null
+
+    /**
+     * Widget events listener
+     */
+    private val mWidgetListener = WidgetsManager.onWidgetUpdateListener { widget ->
+        if (TextUtils.equals(widget.widgetId, widget.widgetId)) {
+            if (!widget.isActive) {
+                doFinish()
+            }
+        }
+    }
+
+    init {
+        setState {
+            copy(widgetName = widget.humanName)
+        }
+        configure()
+
+        session?.integrationManager?.addListener(object : IntegrationManager.IntegrationManagerManagerListener {
+            override fun onIntegrationManagerChange(managerConfig: IntegrationManager) {
+                refreshPermissionStatus()
+            }
+
+        })
+    }
+
+    fun webviewStartedToLoad(url: String?) = withState {
+        //Only do it for first load
+        setState {
+            copy(webviewLoadedUrl = Loading())
+        }
+    }
+
+    fun webviewLoadingError(url: String?, reason: String?) = withState {
+        setState {
+            copy(webviewLoadedUrl = Fail(Throwable(reason)))
+        }
+    }
+
+    fun webviewLoadSuccess(url: String?) = withState {
+        setState {
+            copy(webviewLoadedUrl = Success(url ?: ""))
+        }
+    }
+
+    private fun configure() {
+
+        val applicationContext = VectorApp.getInstance().applicationContext
+        val matrix = Matrix.getInstance(applicationContext)
+
+        session = matrix.getSession(widget.sessionId)
+
+        if (session == null) {
+            //defensive code
+            doFinish()
+            return
+        }
+
+        room = session?.dataHandler?.getRoom(widget.roomId)
+
+        if (room == null) {
+            //defensive code
+            doFinish()
+            return
+        }
+
+        widgetsManager = matrix
+                .getWidgetManagerProvider(session)?.getWidgetManager(applicationContext)
+
+        setState {
+            copy(canManageWidgets = WidgetsManager.checkWidgetPermission(session, room) == null)
+        }
+
+
+        widgetsManager?.addListener(mWidgetListener)
+
+        refreshPermissionStatus(applicationContext)
+    }
+
+    private fun refreshPermissionStatus(applicationContext: Context = VectorApp.getInstance().applicationContext) {
+
+        //If it was added by me, consider it as allowed
+        if (widget.widgetEvent.getSender() == session?.myUserId) {
+            onWidgetAllowed(applicationContext)
+            return
+        }
+
+        val isAllowed = session
+                ?.integrationManager
+                ?.getKnownWidgetPermissions()
+                ?.findLast { it.stateEventId == widget.widgetEvent.eventId }
+                ?.allowed
+                ?: false
+
+        if (!isAllowed) {
+            setState {
+                copy(status = WidgetState.WIDGET_NOT_ALLOWED)
+            }
+        } else {
+            //we can start loading the widget then
+            onWidgetAllowed(applicationContext)
+        }
+    }
+
+
+    fun doCloseWidget(context: Context) {
+        AlertDialog.Builder(context)
+                .setMessage(R.string.widget_delete_message_confirmation)
+                .setPositiveButton(R.string.remove) { _, _ ->
+                    //                    showWaitingView()
+
+                    setState {
+                        copy(status = WidgetState.CLOSING_WIDGET)
+                    }
+
+                    widgetsManager?.closeWidget(session, room, widget.widgetId, object : ApiCallback<Void> {
+                        override fun onSuccess(info: Void?) {
+                            doFinish()
+                        }
+
+                        private fun onError(errorMessage: String) {
+                            toastMessageEvent.postValue(LiveEvent(errorMessage))
+                            //TODO should not be handled with this state
+                            setState {
+                                copy(status = WidgetState.WIDGET_ALLOWED)
+                            }
+                        }
+
+                        override fun onNetworkError(e: Exception) {
+                            onError(e.localizedMessage)
+                        }
+
+                        override fun onMatrixError(e: MatrixError) {
+                            onError(e.localizedMessage)
+                        }
+
+                        override fun onUnexpectedError(e: Exception) {
+                            onError(e.localizedMessage)
+                        }
+                    })
+                }
+                .setNegativeButton(R.string.cancel, null)
+                .show()
+    }
+
+    fun doFinish() {
+        navigateEvent.postValue(LiveEvent(NAVIGATE_FINISH))
+    }
+
+    private fun onWidgetAllowed(applicationContext: Context = VectorApp.getInstance().applicationContext) {
+
+        setState {
+            copy(
+                    status = WidgetState.WIDGET_ALLOWED,
+                    formattedURL = Loading()
+            )
+        }
+        if (widgetsManager != null) {
+            widgetsManager!!.getFormattedWidgetUrl(applicationContext, widget, object : ApiCallback<String> {
+                override fun onSuccess(url: String) {
+                    loadWebURLEvent.postValue(LiveEvent(url))
+                    setState {
+                        //We use a live event to trigger the webview load
+                        copy(
+                                status = WidgetState.WIDGET_ALLOWED,
+                                formattedURL = Success(url)
+                        )
+                    }
+                }
+
+                private fun onError(errorMessage: String) {
+                    setState {
+                        copy(
+                                status = WidgetState.WIDGET_ALLOWED,
+                                formattedURL = Fail(Throwable(errorMessage))
+                        )
+                    }
+                }
+
+                override fun onNetworkError(e: Exception) {
+                    onError(e.localizedMessage)
+                }
+
+                override fun onMatrixError(e: MatrixError) {
+                    onError(e.localizedMessage)
+                }
+
+                override fun onUnexpectedError(e: Exception) {
+                    onError(e.localizedMessage)
+                }
+            })
+        } else {
+            setState {
+                copy(
+                        status = WidgetState.WIDGET_ALLOWED,
+                        formattedURL = Success(widget.url)
+                )
+            }
+            loadWebURLEvent.postValue(LiveEvent(widget.url))
+        }
+    }
+
+    override fun onCleared() {
+        super.onCleared()
+        widgetsManager?.removeListener(mWidgetListener)
+    }
+
+
+}
\ No newline at end of file
diff --git a/vector/src/main/java/im/vector/widgets/IntegrationManagerConfig.kt b/vector/src/main/java/im/vector/widgets/IntegrationManagerConfig.kt
index d38aeba552..0eda53b71b 100644
--- a/vector/src/main/java/im/vector/widgets/IntegrationManagerConfig.kt
+++ b/vector/src/main/java/im/vector/widgets/IntegrationManagerConfig.kt
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package im.vector.widgets
 
 /**
diff --git a/vector/src/main/java/im/vector/widgets/WidgetsManager.java b/vector/src/main/java/im/vector/widgets/WidgetsManager.java
index 174e892fac..f6822832c1 100755
--- a/vector/src/main/java/im/vector/widgets/WidgetsManager.java
+++ b/vector/src/main/java/im/vector/widgets/WidgetsManager.java
@@ -85,7 +85,7 @@ public String getUIUrl() {
     /**
      * Widget error code
      */
-    public class WidgetError extends MatrixError {
+    public static class WidgetError extends MatrixError {
         public static final String WIDGET_NOT_ENOUGH_POWER_ERROR_CODE = "WIDGET_NOT_ENOUGH_POWER_ERROR_CODE";
         public static final String WIDGET_CREATION_FAILED_ERROR_CODE = "WIDGET_CREATION_FAILED_ERROR_CODE";
 
@@ -236,7 +236,7 @@ public List<Widget> getActiveWebviewWidgets(final MXSession session, final Room
      * @return an error if the user cannot act on widgets in this room. Else, null.
      */
 
-    public WidgetError checkWidgetPermission(MXSession session, Room room) {
+    public static WidgetError checkWidgetPermission(MXSession session, Room room) {
         WidgetError error = null;
 
         if ((null != room) && (null != room.getState()) && (null != room.getState().getPowerLevels())) {
@@ -489,7 +489,7 @@ public void onLiveEvent(MXSession session, Event event) {
      * @param callback the callback
      */
     public void getFormattedWidgetUrl(final Context context, final Widget widget, final ApiCallback<String> callback) {
-        if (isScalarUrl(context, widget.getUrl())) {
+        if (isScalarUrl(widget.getUrl())) {
             getScalarToken(context, Matrix.getInstance(context).getSession(widget.getSessionId()), new SimpleApiCallback<String>(callback) {
                 @Override
                 public void onSuccess(String token) {
@@ -509,11 +509,10 @@ public void onSuccess(String token) {
     /**
      * Return true if the url is allowed to receive the scalar token in parameter
      *
-     * @param context
      * @param url
      * @return true if the url is allowed to receive the scalar token in parameter
      */
-    public boolean isScalarUrl(Context context, String url) {
+    public boolean isScalarUrl(String url) {
         List<String> allowed = config.getWhiteListedUrls();
         for (String allowedUrl : allowed) {
             if (url.startsWith(allowedUrl)) {
diff --git a/vector/src/main/res/drawable-hdpi/ic_widget_bin.png b/vector/src/main/res/drawable-hdpi/ic_widget_bin.png
new file mode 100644
index 0000000000000000000000000000000000000000..69d9ef5efacfcfd0ad2009bb0c46006580ad1cd4
GIT binary patch
literal 756
zcmV<Q0t@|#P)<h;3K|Lk000e1NJLTq0015U001Ni1^@s6p3#bF00004XF*Lt006O%
z3;baP00083Nkl<ZSPAV|J8Tm{5S`ic--ZGNGL(Q6ib#lp4k1BHlPU!rjYEQhC}=Q_
zbP`6ifhaN1&>)IbX=o|v69l9n5~Rfnf(HN1?J#TDi@kUc`y3QS@-?^f-kUc!dwcfn
zAq;qs>n3Vn+LHn?(=SC5RZ=ISo9McYe!PjH379d>KaSU1<@-Q%n*gFF-yO4A8xR+h
zvFrja-D-Ao<~U*kX546&9|2Gf0iOtfS0qH$)TkJxO!I|ZC89f=bC{tU{d5`&?6{FD
zoc6%`1SpE>rw<l%QqZ|NbB||7794QSB%T#N+qB$-{g6UlP^=^Hg<aLlXsyoeWp|^%
z!bEsPN#hak`)*3`NNaVjO&wU+mb4c*)@Jg{0Y;O&SS|s=b6#Ba0G&?}P!b5PBjOtd
zH+{kwU^SQDQ5Yg5xk!eKd;>yh=tc{X1YgWizL*LTbQ<tiHLu1wUX9DCI2^~NhhIml
z)SFH7caPPYu)|NsO@2C76uWQtcwD&m=KRO#U`%ym);&e5tByGl3R9ek2gL(-Oml8V
z%GOrn^}B1Pp~4iWG$v<@2QCawQ~kh1B*7umOks*s8k4idgBP|rgv7^%Lr&cAY2&FL
ze$GN>9Du3z;&pz5_$d&6m`y57aljgrv&92<j4N(Mh}cBp%DI=OnZgvOG$v<@|GAUs
zPE3^CZ76jkzsEQ|?eS>)Z^n)c+_Bvv9JBw01yM^~d%Z1U;d-!VX-{24DgBNKoDZE;
zf{S*Gkjx)X68K&__=S@voppY#-yo2S^<4fk|G)b0+*&;BS$TB4*poL3>&a|%Lwod?
zH)abH(vxev4LQq1l>lp680L&XDc&=udHeHGIASVMDsE|?p27-LpB(Dt))YuQ56D}Z
mQ4Yci2zr~$#@5VF6u$sLjOzg+^1z<}0000<MNUMnLSTYrUQy@(

literal 0
HcmV?d00001

diff --git a/vector/src/main/res/drawable-hdpi/ic_widget_external_link.png b/vector/src/main/res/drawable-hdpi/ic_widget_external_link.png
new file mode 100644
index 0000000000000000000000000000000000000000..9d966bc5fb12170b5898b81150de7a6968bcfe96
GIT binary patch
literal 583
zcmV-N0=WH&P)<h;3K|Lk000e1NJLTq001EX001Ef1^@s6SLDKP00004XF*Lt006O%
z3;baP00060Nkl<ZSPAWzF;2rk5Jh8@h6V}lKtn;1)I_;L4nPkQAVisx10*O_dirn&
z8VV#N8VWcAAVEQcFmE7Zd4<=Wu@i|RBaJq@^XJd^th2F`w3c9Lns%VwFi^iGNphDM
zfG!9Ewn=z&Bz4;kunEeQJt3qExU3WB#P{ZeWjIq!Hwb|vT<rRHNc(P*CJ7W(0W$Vg
zM6ew!%6tdkG8Fp)b4&X_4A>UjV{oVVn4B{a5#+Iu;K%qo?y+G&6q!Ico|BFg!u(Gs
zjtEZhEBq3F#jEV66ICD)04D1|As$d0mk!Jd0Sy*K04|nwK<QY^Iw5<tD=2KBfJKb(
zMFj{y@l3=TbG->ITVT>h0lD(>Eyy$F73J6Key-|(@`CH&Vx6EZ3aC3mn4JR_4)Ais
zhkIj5jA6V20v?jH8zcxgCXED0ou(oh3ur0=0i|C<b2IC9!Xp6eIzE)KP#6LCJwcAE
z1K@kOSg%Ng99Axa=zs({h%V&U(3q@sbPUphpYk9QpWF~SM8Gr-@kQJsD1J`~@r7Ao
zdltrSBwC5kMy)#W?>g}^SG1|hmN4qm+jAi|C*aZ^bhRKgX1F{|7oJOP4xdkg^8PRp
zFr)R6Uu%?&(%pT0fS*XMD461PUw%lfH0gl6SVjK<2m$~-uYu8v$_3<pdnoMyfN%QT
VND1S7bA|u_002ovPDHLkV1j6-?)?A&

literal 0
HcmV?d00001

diff --git a/vector/src/main/res/drawable-hdpi/ic_widget_refresh.png b/vector/src/main/res/drawable-hdpi/ic_widget_refresh.png
new file mode 100644
index 0000000000000000000000000000000000000000..1c9f1c69b168992175aeaef8e4cb66bba4dd0168
GIT binary patch
literal 1036
zcmV+n1oQieP)<h;3K|Lk000e1NJLTq001EX000{Z1^@s6@&)Fk00004XF*Lt006O%
z3;baP000BSNkl<ZNDb|mOGuPa6vvwx9YIAMp;SVAn}ZG&lu?TqL8FJ2AcmV}6FrFv
zR~7^!Sw@Hyn9zfusDu<m!jz<RRry#An)%EK6k3=Iof=>LjyS_@<{Nb!+jZe^?&F;Q
z`QLLN-~9}m)>*7pYmm`sjEjnjN;jEI;kmiFQ+<7Xi|c{Y`Qx;WGB-DOa&d977)i$0
z?XT16oU{j#Hl$``WJKy~DsGUKtW#1_QWq8$9%5r9*c`eA{fWMD^aO-Vdc8h_b{6e}
zw2kOD*p))Yu7#bRp1yT<cD5lnIJhuK%Ruc*PEI}#_#OIw0eppEFNTJOeyBETJvB9T
zGbGL;7m<&&&td;ewUIiQX{bG-^`3)j8v@k;-6wc^XlQ5_v%0$y0r8db;o;#MkhS3V
zVSax8DL6GnMMVY`Tdn&ff#YQe$jqw<p5NQsJE1zRRu?iho9zHZD#5wX)6-LznVD(S
z^3&WCNl8h07`Gtx5GV#{UAx{DaCt)2v|FR2qYEK4!!lXP(tCr!kmD;8w{aN6z!oS0
zAtK8N&MB&SlarIJkcyOkSMegjNhn}&Cr;(0^ta0}Pz{kMU=$<S$UDSM#EXQi9|oUU
z&pPymmeJACdiK~cVq~xs_gvs!dxBK$X7DG>*L>Nyz*L=<mS!f<P5Oe>{^hy}oeh~F
zO1{@ULGUgOC%?Nm|DgnlVOh0E2;LVYh6`)hZ}9&P|1twh8#6I6@i-e~%2y!P))^lk
z-`U>YE+4NAFFGN>=4o65a*-UdHQ4!WB1dG3qqO7*nYTzKvY;ZlG64y-+wVHZzZ9n}
zoWK&*Sv{f;2zCZ>a9yA9ye;`Ms(yag<^8~es0_!)p3d$YlfW;@fZUe(obhJ9c;TML
zfwUoTRs6XzZ+YUlNyq?cs)dM+>i(ITnKp~XA~##Wg)in_Ku#l%$nbYhz`sbyAVi+S
zwh%Hqrl+Sn$VjZGlRxd{r(qMzJQ5Zbc3sQYi-Z`#wh0o4sU|rbj;`gIX!)<$$3EE3
z(zaqW9}*IB$Zoe!YB^|<5JNVid~Ww44uCq?*(Hz(k+Ic^Jmq*8U1J|~G8uXF9_jDz
z|LV(6FUL;?U0O9{Y3wY`F8W?GUIm$NfR{^(%gV~UCcw-y7^~>+?v|refxL={h_EoB
z9u?QKu9Kgbv9Ym&goK2~m2O19b0BgFISPn8S{=v$A}Nk#wsDL_qL+RN=&NNC&FEE&
z*Lz|$53|{v;B-2LPzGYgK7zpGXn6<^khuo-l+RxRE&M;6G^PTx&#e&v0000<MNUMn
GLSTX{_2oPO

literal 0
HcmV?d00001

diff --git a/vector/src/main/res/drawable-mdpi/ic_widget_bin.png b/vector/src/main/res/drawable-mdpi/ic_widget_bin.png
new file mode 100644
index 0000000000000000000000000000000000000000..10fc50d87c9912a4bb41a0541711dc749bf26074
GIT binary patch
literal 503
zcmV<T0SNwyP)<h;3K|Lk000e1NJLTq000yK000;W1^@s6`b*t*00004XF*Lt006O%
z3;baP00055Nkl<ZI1%ktJ4*vW5T4oOl3aYGln4g=0T$YemG~(A5s5aILV}V5H42u3
z7z^!FXsd`tEUnZ^h?PoW8KQZd_ZasM7dDp%iAAamEZ^)m-wbneu!GRS^!Uz<#mp5V
zHX=(9?J8rz%g~ATD)Yi;!jZAQk(@Wdd<KFEMr6we2xFG17r16Y&JjKeM<8ihpjOm%
zWNa;bx_>2j85@c1RSWE+a5ONBn)V~dT02aq4M41@Ou3bXvL76a<dJ9!9IeNY;)f9r
z2X&|vRb?~=1~a`e_paFfy7~34QY7k)`)gQv1EO&^z&mr1C|ozbKM0}eb3`&45Fmh%
zo9mF?{Kk4}sTxn-h=hKznn+#qxh^|-tuySmnnyn@*gOz<*iNLEpEsOg^9=uU8|)1E
zJ9y6kOQKUozE9pkUfkQEza1$!_3R)cd<O&B-6syt>1c!f<c@803Ai2Fwy%tc(_M63
zLwt`c^2JkjMD9-EdxX_W`U4Uc7_bY@_BILv+Xico*O^nZ8HG2+-{e1|T+Ua!dpzf_
t?<C(Tmf*W05%K~rYB0Km$D6vN{RIq?pA6YdZ`J?+002ovPDHLkV1l_E+ur~H

literal 0
HcmV?d00001

diff --git a/vector/src/main/res/drawable-mdpi/ic_widget_external_link.png b/vector/src/main/res/drawable-mdpi/ic_widget_external_link.png
new file mode 100644
index 0000000000000000000000000000000000000000..abeb028e2441e7413f2c8be569228b8240037103
GIT binary patch
literal 423
zcmV;Y0a*TtP)<h;3K|Lk000e1NJLTq000&M000&U1^@s6#I$TX00004XF*Lt006O%
z3;baP0004ANkl<ZI1$yAy-EX75QTH2mV%W(rHz$f;R7Usm6pMGu=N2XMk}AgR!ch@
zA0VZTU@eM;sGtya{mzn=aR|F}(>ZXm^Ly^yxwAK^HKi0qu}A6pr1F$fe|AzJ=qt$k
zcDWtwEf(!07ns@<8O0ai47~gj6IjNv2)=-q5wCaaot14!d-%GbUABV20md=719QO3
zJ&tYflx;~_{2IGk=ArBY$wKMK_@Sl)p7gBB(EDJ}#<2-bSnatAMxJ9b^|Ys*`Wm%D
zebxzwrGfMYqLe*u4Wuo0f36*>6=7*2wM1d!98xV1BF-fZ5l2YLxdLmp6}5*)@;u3J
zV3k98wS`V!!T$4M)e?`%hK?j;hI$-ga!LP_SiAmoZ<1?{D44NDB7Fcm)|sO-Il2`$
zz@x281T-e^-~*h3+DRd9MHkp1IAVeZKA_85JKqOO!2gfge6Q<P971~O13w{Djv_q6
Rb0+`*002ovPDHLkV1mBzx8DE&

literal 0
HcmV?d00001

diff --git a/vector/src/main/res/drawable-mdpi/ic_widget_refresh.png b/vector/src/main/res/drawable-mdpi/ic_widget_refresh.png
new file mode 100644
index 0000000000000000000000000000000000000000..6f8d0dfd951b5ad43be01941784d77f99642a9d6
GIT binary patch
literal 670
zcmV;P0%84$P)<h;3K|Lk000e1NJLTq000&M000sQ1^@s6UnMRr00004XF*Lt006O%
z3;baP00072Nkl<ZI1$y9O^8xa6vurJ&9Pz%nX*M7K1COj14>X-V69qIo7qKBi>T$$
z2Mo5Du|+K=CTLd_G1Q_!h=LXqv=E|^mIV(#@S|L`DUwQ16Mg;eqx*Oc=)75W;BvnI
z@7#0Gd5UWS8HS-~nzmO})#HTiLEnk2yWQ?jrBdnhgjAO@&KVAeQvfaF7ko`ol<&xG
z&H?l!`~zpD(P+GbTa-v7b_m67S!@DTE|7c;(|jNhI8`VVIySc}9*=M9cDomdc}DDF
zy<UGT{q1)9I<hKtixYS?6bc!UNMyfd93$|7eZ&^H-NS4)Yl4x##JM@r3Jh~#+@_BQ
ztJUhSF?b_pQGKV=S)=-Ie!u@*tJS(efV#2d491L8Q1Jy_*Z=r@zLSVkfWG7{%=TIp
zN25_~Fc=)I)oM>ff)nC~ySUwqh#d}xDplV>JOuay3)l(J#u)m05u3QBoivnLyW#(k
z%~o)wRr>P9UNZU{`n_(qZADgjfF%;nbHbdVJOCTWj)}RSmRl#1<mNp>J_Fcms(kJk
z?O!0pMVX5Cy<Sf|oJr;!1NfD(Ie~M9ExII~Ti}a~+Wm65{9ERjz(QdubdSe#4DbvU
zT#*5rao*=1F`-~Ec*`CuTVdKNl}bGpiyi6r`>y~`vQhJF)(?AvlvAnHb~f!Nl?sgA
z`Fy@BeS#}A{V-0&J^|@;daBuM-o<~GHa*3^POCnmPje%&X>-_4V_QuolMA_AZh&os
zCT<>UK121F$(ZE>ak%&&i~sUluh;vcSS*f=D0Ykf0w2BE@%qa~t^fc407*qoM6N<$
Ef)J}RivR!s

literal 0
HcmV?d00001

diff --git a/vector/src/main/res/drawable-xhdpi/ic_widget_bin.png b/vector/src/main/res/drawable-xhdpi/ic_widget_bin.png
new file mode 100644
index 0000000000000000000000000000000000000000..f3c9cb9188bf1ba8c5413156c6af5da7040a96e6
GIT binary patch
literal 946
zcmV;j15NyiP)<h;3K|Lk000e1NJLTq001Ze001xu1^@s6V|zH800004XF*Lt006O%
z3;baP000ANNkl<ZSPAV}OK1~O6uoycnS82ML5nGh3pav7C`!eGKkUYZn=ZO_*LG8(
zMK`U5Ky4M2R;)tXojd8G8`pwbu_}J33c3-LN~2QzRGZH<$@RW8uQ6#RGnt8{lzE%?
z=G}A8J##X7d3gh{&Kp*$k2)i@ab3U2dB*`LOa#7i90-^Igx8FD5YV(sI1*VXhcAv*
zByh34_YeY264CBrA}iO3I7@&nHDd$Mt>6X5vOqe2wI;ssV}^kCBEo$DwI`tMc!?wD
zlI4m~B;t=p(+vQrL3aBDJNh9|yDf~@E-aSIlQC5e%=*N__f7&3;-&+q8k(`SHEot7
z;uwh}xSOVliRSpdS5xf%5y8cCS47;bDP{l}C&VT(CQvS06(@5=FLFrnWJO7?f8$1D
z%K};10YRd8@vRY=*}UR`H(5-M%M35#)&&B2MFOF^Bzik7pS#Rug`)z2R_Lma!B}Tx
zmlaw{>d)A}5U6S+dOT4pImH-Cr$dlRF%L%3r!^MGOI@p!OwN`H7|wA4N~H|L)&dl=
zT36+T@bd~O;#OV;Hu3c@p8vfvzXk(d!Zvf6Exefj0ivI>WWhomYwH=}g}4h9><*3&
z4olEl^s$bfF3QjlFXY3)@xg9cbKQSQT!HeVvfH~3+I3FmxeiJv?Dp&4LCYJ~Vh3Vv
zeTR9MJV~f@@D~1Vaa>&UUxYJAnNi+-w*<%gpO(Uy&DnQQNjLG&Q#}%$G%6xu0t1XS
z!kEq57ih*@rMN55sgbUOu7ge;aGLKvgRX;49dMezai2lVz}Kuh3VktjDHmJ88Ul?2
zwzpgUdhJg9+tSBCo!9WRG_ccmoiUI6b>1h&63Rzx3*>{z3{yWYN6#4D3{x&&#5V3T
zXm;n-in|Uvb+XVw#JMaXQN2^*it}YnsUb&DAdt`IvP%ZP&p6HRH*9~yD-|bdiJBr$
zYLFZS0{z~)X@<Px;Qqv%ev>+Hlzq)5Nu2beMl7n|5;aBbWes`8f&)x39qZ_AgbYpb
zL8iusiJ$mf`XMLI=ToXVqV3FmjBD-TS~@6rG&nlIXW03+N}veo?S0`TNZsalBjG&s
zKaLP)yr7=d#`<T9tCSQdK>S=NdNjE&gUUg^L%!4MH+F4aq09>{<a?j{Wm;9_FXNX9
U@t{;=xBvhE07*qoM6N<$f|#haoB#j-

literal 0
HcmV?d00001

diff --git a/vector/src/main/res/drawable-xhdpi/ic_widget_external_link.png b/vector/src/main/res/drawable-xhdpi/ic_widget_external_link.png
new file mode 100644
index 0000000000000000000000000000000000000000..3e990b2891589df96308d58ee41b63acd3a77412
GIT binary patch
literal 717
zcmV;;0y6!HP)<h;3K|Lk000e1NJLTq001li001lq1^@s69)wx}00004XF*Lt006O%
z3;baP0007nNkl<ZSPAWzzfK%65QjM+Jrslzp_B;)JraT<ktk^b4}y3G($nw+fS{nD
zL_9(YNEs<5h)5|DB?_DGXFPj*VsG(!*W41_NWZh!p7DG;_s{EziLni@K$c~T=my2u
zxmKPWzI^9qHabUC1mZ22Ls!MOqB!5FzK6Z`usL+6APvUD8l+lP+L`%uriH5bF>tVg
z^Sqh*(|RcylRd8Apm*q1aW0_$7oW>sulFOscff_buNk;N%6pC0S?7*+xDm9CZc!6E
z8lItihGeCcHE)B_bzWfxKXJX|oxajup+EjQw7JLeAk<lYf~C1cZ&7e%R|&jFKhYL}
z&tl}NtgJ!c=gh8kmnVK~Hy=#gAzu)zFg%<4(m5;!zWKq0#GIBd7*+vgz;3LIup<Sg
zDzz$W1sq9*J#6vsR=*BGMyz&tH@WkpJIH6+=`?{A0rA?FF6J~Tfj#WN-XKpL+ernS
z1Xeeh0yr6L3gD!$Z38EVZ4=nTM*Vb&BiKmfEI6RVkp=Xp5DiQ0IyyqLCCd*E;pA*^
zH2jL-BCMc;{}e0>F^3K!%QkJStZn?5Pm&oHw*BlE`fE=<DU^})j~u4TryoWe1GCHr
zq|J8|*aw<`*EWF9$nz1cL{>Hcv+t5WBK3#r^?>|E#Bsf-c<(kU9G^WRats_%v|1tK
z3fC%Eg!8z<5k;#N@?tCO&d}Hw)IF`NRh=iCEqCR4o>f@;0GW<DM`cSsu?_^Qjmqx(
zt=(z0XPQ}ZZ~6Q>>ecylwc#|6zWbn4+GS*KQFU;GS#m6(U8GY}*>>=9IKM{*t>EW0
z9rf-7!<r*Os<b{HpV4oW+H`8Fquy0x`0v_(%RN3-)&o2z00000NkvXXu0mjfr%Op2

literal 0
HcmV?d00001

diff --git a/vector/src/main/res/drawable-xhdpi/ic_widget_refresh.png b/vector/src/main/res/drawable-xhdpi/ic_widget_refresh.png
new file mode 100644
index 0000000000000000000000000000000000000000..4f5f4545f514cd6e18315c142c4426250a363d2e
GIT binary patch
literal 1338
zcmV-A1;zS_P)<h;3K|Lk000e1NJLTq001li001Ni1^@s6^4HjG00004XF*Lt006O%
z3;baP000E>Nkl<ZSPAWze`wTY9LK%et~GJi)=)&-u^;Bv8cZgJk~pZXMnWYCsj<+M
zh)@(Q1q&xA4ehVA7HceALBT+X^bf1mS!(&mrbO#*x9x_jv`{y0p10fVcD_Exec^lG
zJ$L)wFCo|iAD-v?c|Jeh&*%9(KfceLIsda_NfmEtY3TxNG=xH-wb0`hi=~8mF13yN
zCiQjbGVP02tM&B2z`%`Ed?pRJxVX3uAiDt4002{VkpB<aZ>c{R931@7Eby9|nz<s|
z-QDds<w$QBpbK%>2GDgn{v~){!s~(OE+{Ct?e%(tM6@s%4BFwZgr1|X9@2a|Y&P4Q
zZnxW|v!iU5l$7*IhsWbtrYS20jZDD446qiQ7t(hNYT^5H47rW6s&5=WhWrlnUxV_H
z2{5RAMEgUPyvD<CNZLa~Ll)D3arOyL-VjBcp2^M4-PYUN`;UAlTB@t7A08VUYscP8
zqANjQ+IMtzb_P|p5(dn|Iy^NsbpXRYoa|<#Z7Rcw^050hcHc)Y3)`m%!bXBHX|$sU
zY&CWozcIQ!0`@L_FQyBu_#qXJWo2bOO>>k$toQr<-)IX=`c)+^VA9|j41Fw$L|{9)
z+NCm*3Xg5>9Qw7`|ChRcbaeDP{5}-RW=z1fwY3idwiU|8*dd~EGM154`OMmH*jNKy
z#oubk5!v6TnT`o~czAdh(#6nFet!OuX_{$fFnj%^$5WV<Ev%X}{0Y#H8r>)XlSgt&
z?G$06dzcMd@;Bp!^!N+V66q_@GBBJcJ(lVnD*=y;jL0Ux2(W`iMMWKYg-o~Q=*F+)
z^aTJH;qPa?&usmN)@GC*PN*wv>iZoIha9JAFI81l`97a-g~~8MWoDb{J4ic9#`M9V
zGMoyJz4cf0pG?3;h{b7DMmPZ@NsAIe*@3*&W`ZU+z(109Hmf)rf!PQoAA#@+Ws8xE
zhy0tFDlF{JI7+vg5>B&_cG8&!n`Zw?bFnTyBCJI?{0kChSS){Y($)3%_dAu=GR)-e
zu#Y{rnOUr37QZ*T(;}?#9SASxSeBbojmErRb!BB`0lp51KduFLRDPoX+wJxSMs^y|
zh0qV=w%nZVTL}aLd+?hFh8`|Kzo;BX0p_9;;O@H~g|ASYkHT3ZE$<E)FXiRskKi+W
zrNvpy`*##zK_z$J#>U3YG+UuujC@U`H%MQm3V%1*6B83(;A<Yi>LPbf#q|ZCkdRRb
z-qA>3kot9Ff4aVz#ZM!Cu2)o4*yGuq7Gb?G*SUB2mPH_PZLHu!O-)U4b@cjX+JJqJ
z-=S^D-eIAwb2^<@<LO0hYXA&?8x<J+Tkzy{M!=rU$;sL5a=GN?C+Q+NOB%FbK+-Kp
zD!f1{oSDg>sc12fk1!~P1JJXRlaoEN7|A*10B3T_Og#_S-;vvZT`&9oCNp5guBixX
z0LseBmNR`F0DU6DbK&qfFE$;#*!VO#RUL`wE66vZzfxpqcR^ctLikgqqvC}DGvapX
zWRzP~LV6yX`vc?S<Fa4wg)bYuIKEAF9=Ze#(|416l;@{B4xy#gatPJIw^57y81ycC
z?Fs5>i(O=5m87Orj1lemM0*R(R{;|BqZrE>{L275$unzvUtgaLGU1XmV7({6FCmhv
w0J9waBB&6Ow+ugn@xXTi@*E(q!Aq&!19NK)MN7j@qyPW_07*qoM6N<$f{2ZS?*IS*

literal 0
HcmV?d00001

diff --git a/vector/src/main/res/drawable-xxhdpi/ic_widget_bin.png b/vector/src/main/res/drawable-xxhdpi/ic_widget_bin.png
new file mode 100644
index 0000000000000000000000000000000000000000..a8d8947488d97b721ebfab35f4ef89fe287c2542
GIT binary patch
literal 1342
zcmV-E1;P4>P)<h;3K|Lk000e1NJLTq002Ay002k`1^@s6s!x`s00004XF*Lt006O%
z3;baP000E_Nkl<ZcmeHOON$&;6uzf!Pj|W}!59ZoLBtpcCYn`@E=2qR5?6voaUnA8
z10-Y;#0~=mL)t|$V+g)_7A^#XL^lSrQbELpFHqD`1dWK2MVP3=JSzRDI-XP0x2L+(
zk9yv2nX1jbRdvq!zVDn{-SxOvh)uRZ+<I}cGIkaIc)$^`+Yru#17HNfFc2L_7>kC$
zU$)?FpTT^w9>jl;ZES+^=*jW5m4A*22M-hIb%TI?o?j9MoGxs={v@0_w(8TTuURaD
zuRd$;wC(D7LfYFGE&Ry^DRT$6ykTApA7b4zvS56^e1p|k{t8j-RAd0)PwIb3$9@(x
zuGMj0EsbXYaVOc{i-@->A3An1pV@W*UMpQu$HKIkFiu_{tG@CoigmF>swxns^EYQ_
z!8C&j^#-Lrnx<i0s!a*N8A@D^6Utb0>ah;fK)aDDTz#f=m+j#9B-o8(2zWd{Up^a%
z!2n}xvUJE1_zs&92ucI?<=!m+IKZvv=|I1rolzPHk0`N3=R(|K8E-u%T;M)qF(&uJ
zZjl5F;T&iI1MrVlGFw}04`v9oXo3-LQkZo8ey93zw{5XKm|<|D2?mi>pc0)G)sMSv
zi|xS-gA+|~7{np_q=JWBfW+aUT6}3wSQH!KJPN$S^_TMDjAQ>AHda5sh9P$e+x~!U
zK)`Pj@L)gte&;d`6bt<f`k$kJMzs;4hU&-N+IA}<CpZe{O?M4v1i(+N^ffy`S>*dy
z-sK^Le2@G;*nsc3o0k~h*CTQ7q}}yidbL<u5Qy%zodK~oS9$rGq;v)vg?;`#Y7KWP
z<anig&Ex8(8`7!ZQ5c#@a!4zjWOhd(c3R<4s6vt)(h4V;-BF00R(KSukR*pqSK-KC
z9(q+{^||SLz_IVo%dKzw{XF7+wy{^9L_>Z){`$<<y<$f>o=Ao9u(=%?_NVCJoK;_b
z%P&E;Wgpj<V)*q7VwZ^EnpM4po=Xc%1OayWC8TWGmt*+#3u2du;2;Ea+opnbXIwX4
zT4CK8*NvA}Sa-&C<E0hWopIfGX@zxXTsK}?Vci+mjh9wfcgA(&r4`nlaou=ng>`3K
zH(nwY&gOHMXl}?FivdL6Q<;=4`*MsVl97mDIBoum8TlX>a3nvr?J2*+*_M4=Uy9+^
zFNj@Y@1>jXl>@z7Zoa>MC5V8awuw|YC<&eRsbHPi9tKug;bCN5CuUk<o!K4+R@VyC
z9nZ2NL*Hr>`HH9F$Ju(hdNp`4x(cQ##k_XV-O#r8tNy6BZCpJXyu7;#M!=7i5zRS%
z8YfNnTdz7ciY;?wu8JG=KT>^f+f{HOpL>stme`OdT(3d>44ykDy^f>QXKpUX=HzhV
zwp1vLz2A*v*9qcmxK=!VgcfVhDkoYZ`-PA&mA`T98(KM9Q^$wd(hAh9b-BJ@*f>i|
zZ|_rFXi@r9p>kqQ?R(pvf++x4#p7qG!jHB)K#kS~{7%a|HdbDE4K($MxTN8CJMn9+
zj$>$gw0t*TIdO;z<XM5TL8|A|5<AdPdBXbS+rKCbRU6&m?*gFMy%AzKy-qd6m)0xe
z9Iah`v6on8+Oxu58P&<@yBlC1rHnpAL3eo14Zjb6lZp>BC{N|)XMPyO$CqFggon9!
zp)^sm<peF93goL|#MVlQS!pkdGv&p8745|P4?2W~m;n501poj507*qoM6N<$f`8F_
A`~Uy|

literal 0
HcmV?d00001

diff --git a/vector/src/main/res/drawable-xxhdpi/ic_widget_external_link.png b/vector/src/main/res/drawable-xxhdpi/ic_widget_external_link.png
new file mode 100644
index 0000000000000000000000000000000000000000..e5c2a2acf8fecca1d07657feb5b7c0943f8c51e1
GIT binary patch
literal 1014
zcmV<S0}1?zP)<h;3K|Lk000e1NJLTq002S&002S=1^@s6<5U3X00004XF*Lt006O%
z3;baP000B6Nkl<ZcmeI3J#W-N5QbwQ6d<ICB8VSAmxcm*I_i{^fgmCABk~&%h$0s%
zk~S?pT~g4HiW(syAt9nPNa*su)=o6*k2`<t+T&wK8hO`Vk7pjwew@!<TT7A?$fm$y
zKA+RiXV3?M{rv`eM_HE5Zv-|R%N!wmjAa~l53fZuJ{8k>mQ5uijvUoKU4z~0HS})P
z9hw9P_F*`GSQS8%eQu1|N83sWw6XGCLqT}1p#4(iytvXJY9JgS@^}9Yhy@UK0fAl3
zla<VfMG)M0<3V6$<v?_SKoARO4H(@*n@7<5(3{Xu@(+eS;qIJ<GDtfP!VJY7Wta7r
zb(x^rm5VUA4LyU#lnWT&C||wX9@xsDvx39>++VbaeS50i9*=t&frIPV_a3UJ8n!bn
zF4$rwaCT^%2_6WXScGtneJ9W_&<kiNk*@K(ufZA!y}N_TnE5d(n|&RPc|IXPi`{|s
zQg_gP;CQKPTph<jJtiDq9WYv8u+Y{J7)~t+9N2=2{6S#~nQ$NuyY13Ukb8>urHqhu
z1gA)m6HGNfrDAQ1Aei?20i~x%4vf2<rbri{43=Cch;U#uDGox_?9dAWgO!ZXi=~jW
zLolGRGC>>^5K=d}RS@+0rgwMH!I}p#1Ox(+F+#&JQ;s+$@aeTkUN#FNA_M}EXP|x=
z7cI@Jf@_Q|AwWAVmb&_DZj5l5z;!~jfw2mfDG*~pAQ&?s#)M!7#Mlr_fUp2zbP!e`
z5X5Nf2nQj`4=4uKRz?{ttwA8P!9m1^0Q(zM(-|=U1U_K;PQ|tK!=|NN2Fr-p5L~2B
zvAyM#<;F4yh#CkV;AQV8ONB_UtGX_$-POfGK;Y7EpgYP1LU_^V8Kbflq!=9pvVjBF
zE9I>@2=pyF2;6o4oAnvWf4AO3O=SZ7$z_lQ6<|DJW;iHvZByIm86nYHhCm+&10g`H
zZW9Q1XA+16!tbOhBT`1BjPMDhjPQA+F(PF|$_Sr8$_SrF8Y2oB@mKM=t;$m?YTtEC
zOXHA?_@P=pROP7^weLEnW^v%5$)sL5t%?dUY(meWBK*Xnz2NLgy@Fhf5dQPsagnp)
z@y2yn;5Qmt%)gY*;Nb8*sD{88wi^fT8hUTB!vO!3)vxTt`b?p%pH=NSFmg<I485Zo
z%<x!{AFy>7fLJFC=v0Ni^W&Q^0%Jpb$`led$G6tqLDTZOhCaYDjK})8t$3*}b*>XQ
kMV_K7eC=W&ol`;J5*yP`xj6}(djJ3c07*qoM6N<$f-_CQmH+?%

literal 0
HcmV?d00001

diff --git a/vector/src/main/res/drawable-xxhdpi/ic_widget_refresh.png b/vector/src/main/res/drawable-xxhdpi/ic_widget_refresh.png
new file mode 100644
index 0000000000000000000000000000000000000000..561810122ae8e41d08d5a14402e1fc095d8084d0
GIT binary patch
literal 2155
zcmV-x2$c7UP)<h;3K|Lk000e1NJLTq002S&001@!1^@s6bLUS#00004XF*Lt006O%
z3;baP000OgNkl<ZXa((?drX#99LKp|1QcR5D<n}s83QqEZkb7`nbOL%X*I;O=6#l1
zT4^TbrRkcQ{ZX!(1g1Gx-fNW?6w8&hF2oSI8LMHMKysH`pWoB_ynB=fp69*szODCc
zhjah^zVG+^&h0q|A0Mw%81U_D9^&KU`*(D74EOc*O+a@9KE&d$5?&<#qQAfYdE8&5
z`^>qVh_tk{$ol&FNu8aY8T`omySln!%=|j)mQweOpP%2cfPjE~B_$>GX4=_X$7Mte
z9XfOjKV%ue9wiL07oeqGGsGOgzgJ#fe%wJ>y3L(VL|k0lL;!E#$KR!^(Z{ES^7E9R
zBfLVL7JMr{5<d`sJ3f{2V8U*WHU;=K5OShhp~;LPLxv1M{x+$Otfdtd6@NS0Q&!bj
zz#xQg!B59q^NC2}J52mAN{?h_X8xR=o!zOeaAQ0<IXURswQD08PUG-TQ9eSggY2>R
z;}Cv;y!n-tm4B*bHiUDjn`Np06X6!8SOg@@1l;@ha19tS=UgVfw@OP(i#7Q+N10%g
zA!IQPpFu~EM!*#aUW|3@(c~FMv50KstdWXfd<~1p_A_kNONI3G^Z<lz2IR*Y61ot+
z1Av23u)t9gM15IVSrM`p5luk$2ZXB0MT>5%V-xxv>QuXl5c937s@e|#nGjW1f(48L
z^jv!BlA7tP5V=+OXCZk!GB0T4F2^c&VL7_<il$zVQM-r`5}KQvKY@e{RWd#GX;4tm
z-SplWHP2O{OqA$KMdv<M2UwoKIz9uNc6h4AhM`?VK*C2Tepn-Y9X&PO)oZ;*pO5Iu
z%F242JZ1KmGB7>R)YNn|B_$<FTh~n7W+E`b6(|${s$0v<y;@E5Whko;x}U=`Uef3t
z-PqW863dXK*tD~W2*#i+XB$-M0N4tUSJkw;LacEk^Tq=7E6Xw+m4ek4Bqb%?VHT5V
zB3L0pI3wgB*k6Q0LP2b7>~e{Ff@9v;4yH_eyWoM0_}13e(}{_R!_D9`O#~~%3Iq-o
zp(wi?92`6|KR;hlDtVsZu#DZ{cnsencpxLDy}kVumON6@y*X1vuvdshsC66?f4R80
zxVksN?ka<f!wi!tbXJ340PD>R=M(&fdwauViU<VAULjNjq2T-3vuE#+xTiW<ULipC
z8a0BExSTD%z%nNFgxQdY)YQ~48qZM$AaJG8SwXGq&X7r5&Nt)0pjvJ}EaM=%Q0<Cm
zg=k1bLqkKBFluR0jDoMMtvx(~W&FxccPub32vmNDoKxgDkS1xZGbBRWh+*-zw()-<
z&Q7;HFfdT&2le15tKK6wVmCa7hlGS|XlZGYC8&g*+;)b=jWYT?E!$`?O{0_gnNiNl
zA=TutwiF+W?{+}zmO&+tcdP*WAYrOAfMVr2tTb~BhlVqhIa>xK+~h2oOrXso%W!Bo
zOQAF6Fy`m5%UuK^vZC4SXy=C|BoJN-3k!SRW&z#?UIx4jcp30A;AOzefH0u!ELl%|
z*{yA2ZM~JeGJC0^eIso@<gnxPPx<y@GTTnsP(i{*8oU4@X4~o3v$U7*01xR_@Zd~k
zi%n0;#q0mtsaxz)9TqD2u(6w7Zqq5#%~FSkZlN18`3SQXwTW!W7aKi1QHjul8OMQS
ze0X^H<if(jTD=OMoX2OmS)4~+5sVze<@tf!o%ZOuoj&Q+qng@wU6yFtyDds5Y7bL-
z7JnVKZbVS}HDoL#wEME;It^|}a2qGDb?&sNZsLTQV+2Ew2p>LFybBq#@XDthgesRM
z!*E6dJ)s<HSf}FPH{_Wa+PXxD5XjgC0n><DFH73m+6v5EmZ%`y5rS_9decQWB*;X+
zS>i^nM<S#lU#t)5U6zRH83}erx!i(d4R5NtAz~XHdR|TU7WPVnG?dE{K8a5tS|e$!
zWB|&(g!u<0?I{jizTAT65)QIpk~f>Lo5g2Hgb3pK&$kFoCwfuRIJqo2#Ex|Oze)H1
zrDIk>g8F8oi_V+Rr~IpCk(nYwgkfTZ43q0FOHjOrVe+(;yVJ38T0+Oj=1FmM+9pUi
zsHV+?ril<?43jd;&CxlFaDM>o0LV%+%3M)LNI<Uj;t3LtjT$v-m94sLB0_}2^zV>y
zAJHE*%GLvDI{*STc`l90J1&OiJ1EhTa5^+Jbn4!{dpm4ZZZi?005UE^Mmp?kccJrY
zYHH3xNUE(MY^@IgiM*9M#n4=!wgt;KkTAKZs7QGZpyrzm?IJ>i%S03v6*Yxuu147i
z0G(ytSTB#!HTh17%FR3^yn(Pn{Ag7uI(LC(qP--D9Dn(PkaPm^vI#j^TU(niaU)k<
zUENt%SGPYpI=YtLNvFOH4S(Wec|yDpxxtZ<k>{u*A8hP)@-QqSB4Rl*cOrWdf)w0f
zZDRso#zg)iSY-2Lw^L4^2y8@wB1Gc0N@Eh;Mo)cCyBy@)Bkc+0DM2=VHN)ko9O-!*
zna@j`-^ep`?B;Ld)R@6!oWaAe$;gu{eX9d!0eMRx;TLPB0}<s@9j1H>3KbIvaF)HF
z+PEqA%gf7~fvh!Pk{fhASIv+3fr3BqvM;G49mJ0c!ABEMA}@(}456O8K;~+8y*u>^
z?agz^ZMYDUo0}^S)#m|BUadH+2ZBx`XDchyetT90BZ3?TXrzE0UkrpiiIq&?$BZVf
zzP>SPDu=yOSm+Vj9bs}VH)`NWxyy;rf`bI#goFe!`(gNjl!@<;mw#MoCa-~IxfIfh
h>G=v*^gMcW-9H5je{22Zd0hYi002ovPDHLkV1ih~`{V!s

literal 0
HcmV?d00001

diff --git a/vector/src/main/res/drawable-xxxhdpi/ic_widget_bin.png b/vector/src/main/res/drawable-xxxhdpi/ic_widget_bin.png
new file mode 100644
index 0000000000000000000000000000000000000000..8cf7db66c5a1f7de6c5400dc25febf26c9b7b535
GIT binary patch
literal 1646
zcmV-!29f!RP)<h;3K|Lk000e1NJLTq002+`003YJ1^@s6ifi=%00004XF*Lt006O%
z3;baP000IhNkl<ZcmeI5U1%It6vywGP4;7ANkv1cG*3eH!H-hW3I!j7U<!Rw5LASk
zqzMrpL`_m*9`d2$LuqK5#DZVwgHNIn#5V;+1xv9CQm7VEj1QuXHM`l(?i|nEWM=P7
zvfItvJG;qx_GQkwGyn7P+q=8T?9N;v_`w94NdOv^9QzzQXBBz{;&DVcBm~|;xjPNz
zUlsy>2f&L0;Ny&&T!48eYbbWjFtGzf$FZ_YYbOYtL(ulutj5?*SR#;)y}$iDIF4&9
z>=uDy1&A-bz9+kU{X>DGcZ=Nd4}n;)JNG^bZ@hdXu4J(RlrPyV<i8?#55!e`U2#GD
zU}Nf$xL(q2brliepqwbY6NX36)|vn@EwJsQjOh3U=3k-rF8v4gz1Eo%D|ZVhK2AA@
zQHXXwDm{TYD7;Pn6aJV%BbFJsI&iAD<d!}S)(Jnhw~1$xGm{sC<7U0W;OL>XqIj3y
zZ|_qhC#=M=^z8V8I%dMQOauwXD4{#0j)8#R?6&05xZ%m1GKb71bE-9jYf|^=*v0`C
z`d_`DK5_5yilQlwkichQ#`)J9i+d|`m2*;VKNr<huFW4XV;Bcm62)VI(&XP|=cc|4
zj5WY1=cL?fs!g@2J0sf00iuAr)LKB`XR6;wJDfXQn~7SC1Eiute=NgQ6NN^Lu_<?`
zwrEjRRU802)C6e3it0Dg-XeFPHWRhP0nkKUyCwz$)O@NKAOqASpeg4Ws0k3VC&wPv
zj1iEdi*Kp_iCC8CL$EFd4r-7C=-%tPV%|>&@Do_@obMYjV5M)Q^6!p;fd97;{1VoD
z#u=a{z%~H*cB>eOB1tDR4tx9P^iY9LhF<XemfoT`i~^~D?*SJ8M8WgaZPgR1*<t4Z
z=JSi*!F1p?dw#0h^ILhF?HgI74~7F?kB~}r+tbc9&sVqn5>{zMuo++kXsUz(sx%_l
z3@`#TRl)#O8WC&;7y+6pVSp-)2sQ(Z08N!JK$S)Wn*m0Erb-x~N+W{J03$$CB@9rd
z5y57F5um9O2B^}AU^Bo7&{PQnRB1%8WBZMCty;1JV-E?}eV=}AcB=*A#mwB~d$o?Q
zwlCK|`m~GUP5K$z-@>w<vS%m0uXb!)<IS0Y=$@ui<_GCJmoED5We$hWq_*3j)JSbP
zhKxlqw;RL6@l66K{O?xi%bRpg{MEJHW~4@HeH~U}`eO|+ngg%_jWsF-1JoqV02!br
z0Zlp2KnAEuKvT{$kO68E(3JBGWPq9kH03-48K5QsO*zj%2B=9uQ_eGx0csM^l=BQ^
zfSLp}<var!pe6xLInO`_s7XLm&NGk!Y7)?t^9<ab0HLJToyivhzPhiPy;&2CSxskp
zyg4%v@EflYx(@eOF*ost=hwX@O<7wJd|fdcXEg<2CYc(byY5cV#ojX(CVFVQ?fW)J
z&4zYH#>%9UCmV;YlBp>_Z-Z&)A1dKgrHp7+dVc&0DTkt|&8V6(1I?7aGomm+&F6su
zGC)lNnsT0j3{aDRrkrOW1Jop-Dd!o;05u6{%B#-6Og<f0gM<EA-J_Xn*T}=YhFPeM
zR0SxPs-Qczsmtng(i$PRtKwF)H+uA!Dv}IpE!$BQ;5r=qS%tJJ3ddEy746ME1{s8V
zt_hINw|$}tXmO%(9GbjM9cv|9_9lB&dkQm9_er}ZK+&G~fbJW(RuSR8T=B-)ir-q+
zdT+ST>#E#4G4TAYwpDMy=pCHxA3cMJ!=Asf{Q}yo6ZXu6e}l%*{$1r}2gkax=$@yd
zd(^_|r0ujlH~G9e7PfB+5MOZi=Cb+k)-O*D$mv7II!D*)63pbHn-Hsky*u2oN+ONL
zLN{Hr+=IfEXS4ke4p};Zxty_6N8q$`y;dtX1t`U<L(aj{T7kZEz?T0MUWWyLCfbun
z(`TK_wcyEpwci6b)H0A|B_AZWDL2&KD5FuEOS0E`;K_pO0w@p6%sN-?j;<pl7$Mil
za%M8_4tgxh-eixm*Lv%!>m?ixhJ(&6xl;a7djEKg0^CWrewQo7RIVNm3wEZzO3Ozs
s(R=$9xpYt_k@~!m3uo<2Bu%L5Kb^RQGm|)`g8%>k07*qoM6N<$g1?jpvH$=8

literal 0
HcmV?d00001

diff --git a/vector/src/main/res/drawable-xxxhdpi/ic_widget_external_link.png b/vector/src/main/res/drawable-xxxhdpi/ic_widget_external_link.png
new file mode 100644
index 0000000000000000000000000000000000000000..03b8c25b477f1e3fdb9e21284ee464f707d60555
GIT binary patch
literal 1400
zcmV-;1&8{HP)<h;3K|Lk000e1NJLTq003A3003AB1^@s6ag{JM00004XF*Lt006O%
z3;baP000FqNkl<ZcmeI5J&09D6vs8IDFSIkT~{muf?~R@6fCw#6{2RbaMg&7jigV#
zAZVwxu$UqtkfgKF#U{lz5iKkPCBXziNC^0Wg%(M4{T+Gpn0xNKU+>M#o4Gp!f9}lO
znRDj+-eKN*ckjEqX;UtlKqe3=f%WzES+s`Upit!rjy{hRiQ8on=#@}Zm7gajk`GL!
zr^odv#kI%y-E1m-Jd#zri0fx`7zItH&6GYe4HgqG-bwVo+8Tz<U<>J^qb9gQxsP!N
zi3xV6kj`A)&Va{xH2^zmTM)R?Unt|)-_UcQR|!|Z6zI~}(6G7&-vl=U?n=}e-v(|5
zYys<1Z3{O8?m~4iwhP=kz+2k*#@P<WeS!9&-RL6}qWp)GTYM?{E`&4VgLqF-{~pbl
zK8|nD8P@Wn)i+rcNAqYEg}fStyHZ)4ERy!K@m%#e_hg+Fz2dsD@{wZ(T}E&9#3{9x
zYZvV3B(aSJSKMnZl}lpahv=rBFva#ud>^P>u%i?BsDiuH#)al%=8W2duX1wK1>?K)
z-$0MiYZRi$9{el&-akH_30&+~?YTcW^Nphu`jw#l44ro7Br-$9R{IUD?Q%7@(mV!i
zMUT|LKWWdE2KS_c*s8XL+BdXO;VW+CugVNKrUuCy+`=ehedr@LCz)$lD0U+OUsHot
z%;dfuiPKr;8a9gENWk~ipk8J#F*?oME`a6D%r4u^<h~pU&I?@OV}p}=iCN=-(u}k^
zh|l@9U=wKM*EqnomROzGyk)LI(a5iHfU%U=F$7#e(#WrIKw@AAL3__!gQbyQ;{anR
zkt6X`!EJSIp=+4<v#&VHrOjgL6W|)Soxh<KDOI=dDK{CKvQ`>t&X{9qKq4KiKWOF}
zEco4p<PxuF*7OgLbQa3+L_!q;sDkS)b6evn(52COVk85jhAWIx1{^)ylmRCJH&wvN
zz)cZwQgBlPoE+Sg04E7I6~M{DO#yJyaAOCYJlvQ8_X2LLfPuS&^bbtl|0Y7#oKzu@
zLYemBSxnW18!y*$?RfEh04*bTcXeW{P;7^x>nx-yb3?$DACSupho+o$62Gx#j!uk@
zVFdqEgDcC$|Ds_qIQ}q37{e(+f4@8QT2T?WoRWa_o#kI~ho!r_94q_}y0@y+x~)#v
zH=_X@3EX;GW1NiwFmR8s_GxGC82Fl}L;;v(UO>~_7Me+oIU*LoFRb;;pS(lvxt449
z)mQ+3O=!QMd+5u6Z)om`DvP6jqoIcQZvyl;ynN>0Q+N-tWN`S%19{AVJ%i4GGhojI
zJe$uMoB?|#;Msi6;0)L^0ng@h24}#Y33xW2GdKhGOu)1GoWU8eX9Awh=M2t(JrnS3
zK4)+S?3sXP^Erb90xmoYje8YBJ)hEZh@H*rxC>mmTC+3wZ#DT7)!ryg9rs_81a1SC
zzwFvYp0>IXi;nwuClJ^Y&Lg`#rBVLXxD#)28X?}(HUR4K3<!C&@8ktTJJBm-m+O;T
zPQwC0&msNftyQP1$H7IL?x231W3Mxr_!f{nM$#_w<imN_fIr6Q1KZ1>F5AU7=u@QM
zWu2}elriGih8EBY5}3MNcCnVyKQzM2UJTzx+g&(F)P`&gN4ce|{Op~M0ok7--cQBo
zA5;#ZhaGM8W%#!QvgiV?04V{M&H?0uR4<{4K4^=*M2aNV60x5{|GHXpX^YT?*)n$0
zcN`r>`;k0PxDWgAbK;OM5qFS$T3Q9HJaIdhOdt~&5_ku|m#n_r<+C0D0000<MNUMn
GLSTZsjHM<3

literal 0
HcmV?d00001

diff --git a/vector/src/main/res/drawable-xxxhdpi/ic_widget_refresh.png b/vector/src/main/res/drawable-xxxhdpi/ic_widget_refresh.png
new file mode 100644
index 0000000000000000000000000000000000000000..87d0743313c4d16bfe92b7a74ec048f946d9e3ad
GIT binary patch
literal 2802
zcmV<O3Jvv%P)<h;3K|Lk000e1NJLTq003A3002k`1^@s6aziq&00004XF*Lt006O%
z3;baP000W9Nkl<ZcmeI43vd<H8OO<62<-@{iKS%>kAMatW2iNbj|>GxX*+<8#m5vJ
z2U{JW?F<E`6-28u9jDd@;P_&!AUYCfaFmy&*h`E=9W#!JF@Zp6pbchP&4f&oNM8MY
z>D@bLPj<=f-Cc6;<?hV6=bZ1H{T~1Q_S<vM?l~hyB#$Hl@r*!9tSO(LpFgdqr>7t#
zCFSz|{{G9+Zz}0R(goBnket*_Iz^u^$t9g2eVmn*RasY8cZzb%9K#N9QBl#Twzjr8
zy}iBj0c<`Xj`xU86MQOCQ&Y<Td~a=S?HP~!Je@vl08gGg`6@vDHQJYw#4Ce1z6R_v
z(zavAj(re>fT4JvQ-JZ#6o6eo{u|QuLn-HHJ0QPLdI+HZ?k8WB7q*p1{piu7A<5-9
zX8=!}IB^#8HUsR{1Cnii0HK{ehseJm)%ErD)n{a6{3|UjtusA6y=(O7(Os>rt)qz3
zxwPfd_flBRq;E0hBFaPE4I#qEgMNGTq)C%DqR(<M3;vtnze37^13Ycov~g$7oOul6
zmx*i<YH>6I(A&^=j~qF&JleQfP*9NB)zvi%Ll?vEXUM$7LY9#FX@8cBwWhkd`oA`P
zT#@tg@`TT*@JSuVj~~yLa-aa?wLe70>lk`*Sg@Y`m8<<Ex752B+^;u!sh5<Lq@O%_
zaxStTApOXS7c!4QU)tE%SYg%fh6cbU{Q-CY+rR(@+%*{X7)qvDD7u4N{$YUq!lKQ0
z61sdJrVpdfEf&oCxX2QlAGK(6Ogd)(bDNIt?Cji%F$*oUtHYS(81tS*Ti_&sz78Q<
z&@EpVhBt4SFk!+kL!nTQ-sYrk2e4gCbi#8`pBXb|WCQLV3vhb@cKz6~V`mN*xT36t
zf}EV3Lcn~Qs_B+S=X+0_IPtbP$RNW!5PS;}0&aVI`yO<;LDdIi{zLr^jQg8PAMUaY
zsdyNc0qjMpF6jG7W@hHR`uh5>RQgcmKs{LgjREd%l+eMgf>so3;0jpbvFfz|Di6BI
z0pPP3^^{MYI`umdqKASnA%bz~3+Qm8rpHHwh1q~B^8_(@pj!hv76bCfs)B%g1t3>2
zFEUZ3M^p9;Fb|IVQRpsJxF}4z8811l(qplVj{jynJR5!YYx?DNcXwA1N(wZ(tEwk}
z!^5AaREa2BL;WVaqfMp9a#{Xt;K@Hm_nn%amoi^+Fl?vR<g6Msz{SPIBk|lFq)bB;
z3Z5n{iYIUl-SOmac$Sn>f5o7M^Ks+{@MJv%YTc}>Q3Kr4(y|tom#J(4cPYcLqbe<)
z%4KC`y*S4`c=IMzZ=C2`c=A3xdA>?_QjQ8><`*tQ=xS8};64qw`Yon*iHkCJ^kaui
z)ad{0WD;p7lRAst7!no0JYk<eh&pR^iW#qUZUo1AU*;0l;mN;M^~9+%7&~tV<oi_m
z*~+c~CKg?VphYTE<`vc)K76=cr6occPyQ1i3z&V1J*j~FJRqCESK3WQ*8mfXR;nDh
zr4BVTG`y<P5~&QxF9PzN*eUM;BL^Tq4#;{KiL@I9R{-O^7bD0NgQ!1BGX1YNm?ugO
z$ZueaOkQ=VHUaYQ0eK^LwC$9GD}eFdWiZP!gaB*<!<&6ZJ&|)p7rP0C^RU?z3ITaJ
zql>@T+3pHpnBS%`+MMX#tJ;e*9i%>+q)!C>T<xcpT>;FA&C1DN6PsRE>gPofPyPf?
zmOmXT7Phvh+qPIV0O<XMi4MGW96}!9;TH3A4Z0Z{Hf%`Uwr$(p+}hJ=vyGkld1@UD
zq$;zA^3P8`im^SS5@5?M4jSaiFAt}nRW;tpxeXCP>lHYE9?~U&3sK&doOb{d-sJOu
zppSnT0?xY-A%-)aznM5Xoo9-l_NQ`pTnYQH__kwpwBL3Z7bck}5lAACL?DSk5`iQF
zNd%GzBoRm=kVGJfz;GcD`K!n*(>ng@ttYvf!gQ)Qa{x7@J9+)`xzlqJp<iUOCrEGw
zDEXgG`eP!1=EepU;6OarjWUVYHv(|b#)U(~+MwkG!Cw~C5JKnia#NO~xjGzqEz^3N
zc;UAakP`a!yd82ZE!atT8(68tm+Y%}TOnUIIXWD9u<>fTw6xS}#gHRG@!APMuQ$LI
z8*nn)H^^2to(<qZucoW2s>)=spB1A7rmawI1MGUWK2+Hj;P9(y)7AhmU&tz=U9#Y1
zD8`A<&YO?#;<2XXXyEd!8{2FFCg#@i#iXn&JFYSW<hd+(*<V;#c-Gg|>N)XRCN!?V
z-pF$bu&cu#pEx$j7GU9U<j9dmmNZ=lV|_(tF?&3Oc(PvNSW=vIWR+1K;F>;kq`uLu
z8D|ApnDJR^Ga%mp$W<EinFxFzkiVzV6Qarjm_K8P`VDk*Zf@>&x5f<#urQQGc?{KN
zQ!G~n0B}C3g7IO#N{{z4BL`VTzCg7D2U}fPS=p)5oRl2_ER2Xfr@4aib>SYBF^Wu}
zUe21bnJPVA%h+)dHf~Y%r~U!oq`CH9;o%ry=`2@p%$PB9Wp_y3H~=|^TPnm;x7eV?
zV=mvVvC+qC*rSF$S&eTRs=2Yv6~Mxnv2gd2B}?u==u4WQ3;CF1KjC7IMvt57)~#C~
z0^GT(!g%lF+`XTwG&g0}01I=jbRW}>%K-TaO_+?2ck$pe#V@T-OjgnPKEPe4DHmex
z+=Cj;RW&Mr4GDm}3Xs<ub;(gOi}B-|D7;ka@o=E)GIV|pT_f}3l;uy>Vp%)q#Rg9R
zi(o+h10es3qB;?jhQcqSxb6{NbPeQObo>RnJ`Zyh+%7`H?M&*lcopgyU{L^&p8@21
zD4MP|ia$b3eo3bLyejJV`7)=1Zku(_1=w%+JG_8VLxmqQeF0b$0pwQz`KJ_3V?{#7
zy-iI`<rp)?4~6~U!BA{`M@Pp&bbCPMC*YD6@=$wMrF$v+2Cygr$Zv7=WorQ0<wQMX
zPqWXs9aoa8x1!o7@UjfUBqT7TtVY;1n!pa~i?Cs@M)y>W7|XvGHHMBbK7o&hd)Qm|
z0_G%(^DFUm*%<CUi?+Z>*mpG-UN*)X^i~48EMS*i0&4tLz*i48lta-5cImqY#jO^H
z7ZdjmV6gl#xzRW$sGN&EhqMd+AKHNX4sEl709R}Z#Dj&gabVnC7$&n&V+@*_a}i{w
z?p1b5eT}VYo7A>w%MxSxNA?rWmrdzpHPN60x$O{TzqF?)o9^C0ojnjD00Tsgp$r0R
zxS}&W@HL$(8w?TmHo@OCd2Q<S|6$&T$d*k!EAjG5r^BQ$|0_68c9N1k9SSwxrYikj
zXRdpd%oLg$0;og)CiqVWfPwE8P+%=r_H)1GaS<i{$qszCI^m5TE%cQE|Cf{{ml29g
zAr2(k#zU8loWBjt$x+Ee_;-vFLQXpS(I*11AIzNcm@;L`516-*SNO6abB5FNqUpy4
z=;6FKk@F;XglTuFX!yB3XIKC>lw`0!mUn!&Q@<Mkt|j+NpI(4H1i#&kShnM_|1@Nt
z>)bDcJnJoSl$}&$qc|Be%U))(@kf>u#`JBYZyk9p{SRbkXYZ@2scCg`ZqR*V24LM#
z`Fq{m+?+!wkxiHf5&+6416`6ROKRm|bvV{G##e3mAJu;}mzl3NUjP6A07*qoM6N<$
Ef_^4JbN~PV

literal 0
HcmV?d00001

diff --git a/vector/src/main/res/layout/activity_widget.xml b/vector/src/main/res/layout/activity_widget.xml
index b6fbce4536..0a4324712c 100755
--- a/vector/src/main/res/layout/activity_widget.xml
+++ b/vector/src/main/res/layout/activity_widget.xml
@@ -1,73 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@android:color/black">
+    android:orientation="vertical">
 
-    <RelativeLayout
-        android:id="@+id/widget_tab_bar"
+    <androidx.appcompat.widget.Toolbar
+        android:id="@+id/toolbar"
+        style="@style/VectorToolbarStyle"
         android:layout_width="match_parent"
-        android:layout_height="40dp"
-        android:background="@android:color/black">
+        android:layout_height="wrap_content" />
 
-        <ImageView
-            android:id="@+id/widget_back_icon"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
-            android:padding="8dp"
-            android:rotationY="@integer/rtl_mirror_flip"
-            android:src="@drawable/ic_material_arrow_back_white"
-            android:tint="@android:color/white" />
-
-        <TextView
-            android:id="@+id/widget_title"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerInParent="true"
-            android:layout_toStartOf="@+id/widget_close_icon"
-            android:layout_toLeftOf="@+id/widget_close_icon"
-            android:layout_toEndOf="@+id/widget_back_icon"
-            android:layout_toRightOf="@+id/widget_back_icon"
-            android:fontFamily="sans-serif-bold"
-            android:gravity="center"
-            android:textColor="@android:color/white"
-            android:textSize="14sp"
-            android:textStyle="bold"
-            tools:text="Title" />
-
-        <ImageView
-            android:id="@+id/widget_close_icon"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
-            android:layout_alignParentEnd="true"
-            android:layout_alignParentRight="true"
-            android:layout_centerInParent="true"
-            android:padding="8dp"
-            android:src="@drawable/ic_material_delete_white" />
-
-    </RelativeLayout>
-
-    <WebView
-        android:id="@+id/widget_web_view"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_below="@+id/widget_tab_bar"
-        android:layout_alignParentBottom="true"
-        android:background="@android:color/black" />
 
     <FrameLayout
-        android:id="@+id/widget_progress_layout"
+        android:id="@+id/fragment_container"
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <ProgressBar
-            android:layout_width="40dp"
-            android:layout_height="40dp"
-            android:layout_gravity="center"
-            android:indeterminate="true" />
-
-    </FrameLayout>
+        android:layout_height="match_parent" />
 
-</RelativeLayout>
\ No newline at end of file
+</LinearLayout>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/bottom_sheet_room_widget_permission.xml b/vector/src/main/res/layout/bottom_sheet_room_widget_permission.xml
new file mode 100644
index 0000000000..6aeb4c9d71
--- /dev/null
+++ b/vector/src/main/res/layout/bottom_sheet_room_widget_permission.xml
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/root_layout"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:paddingTop="8dp"
+    android:paddingBottom="8dp">
+
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/layout_horizontal_margin"
+        android:layout_marginEnd="@dimen/layout_horizontal_margin"
+        android:layout_marginBottom="8dp"
+        android:text="@string/room_widget_permission_title"
+        android:textSize="20sp"
+        android:textStyle="bold" />
+
+    <TextView
+        android:id="@+id/bottom_sheet_widget_permission_h2_text"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/layout_horizontal_margin"
+        android:layout_marginEnd="@dimen/layout_horizontal_margin"
+        android:layout_marginBottom="8dp"
+        android:text="@string/room_widget_permission_added_by"
+        android:textColor="?android:attr/textColorSecondary"
+        android:textSize="16sp" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/layout_horizontal_margin"
+        android:layout_marginTop="@dimen/layout_vertical_margin"
+        android:layout_marginEnd="@dimen/layout_horizontal_margin"
+        android:orientation="horizontal">
+
+        <im.vector.view.VectorCircularImageView
+            android:id="@+id/bottom_sheet_widget_permission_owner_avatar"
+            android:layout_width="40dp"
+            android:layout_height="40dp"
+            android:layout_gravity="center"
+            tools:src="@tools:sample/avatars" />
+
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="8dp"
+            android:layout_marginLeft="8dp"
+            android:layout_weight="1"
+            android:orientation="vertical">
+
+            <TextView
+                android:id="@+id/bottom_sheet_widget_permission_owner_display_name"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textAlignment="center"
+                android:textSize="18sp"
+                android:textStyle="bold"
+                tools:text="User name" />
+
+            <TextView
+                android:id="@+id/bottom_sheet_widget_permission_owner_id"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textAlignment="center"
+                android:textSize="14sp"
+                tools:text="\@foo:matrix.org" />
+        </LinearLayout>
+    </LinearLayout>
+
+    <TextView
+        android:id="@+id/bottom_sheet_widget_permission_shared_info"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/layout_horizontal_margin"
+        android:layout_marginTop="@dimen/layout_vertical_margin_big"
+        android:layout_marginEnd="@dimen/layout_horizontal_margin"
+        android:layout_marginBottom="8dp"
+        android:textColor="?android:attr/textColorSecondary"
+        android:textSize="16sp"
+        tools:text="@string/room_widget_permission_shared_info_title" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/layout_vertical_margin_big"
+        android:gravity="end"
+        android:orientation="horizontal">
+
+        <Button
+            android:id="@+id/bottom_sheet_widget_permission_decline_button"
+            style="@style/VectorButtonStyleFlat"
+            android:layout_marginEnd="@dimen/layout_vertical_margin"
+            android:layout_marginRight="@dimen/layout_vertical_margin"
+            android:text="@string/decline"
+            android:textAllCaps="true"
+            android:textColor="@color/vector_error_color" />
+
+        <Button
+            android:id="@+id/bottom_sheet_widget_permission_continue_button"
+            style="@style/VectorButtonStyleFlat"
+            android:layout_marginEnd="@dimen/layout_vertical_margin"
+            android:layout_marginRight="@dimen/layout_vertical_margin"
+            android:minWidth="160dp"
+            android:text="@string/_continue"
+            android:textAllCaps="true" />
+
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/fragment_room_widget.xml b/vector/src/main/res/layout/fragment_room_widget.xml
new file mode 100644
index 0000000000..b6aadec3b9
--- /dev/null
+++ b/vector/src/main/res/layout/fragment_room_widget.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+
+    <WebView
+        android:id="@+id/widget_web_view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_alignParentBottom="true"
+        android:background="@android:color/transparent" />
+
+    <ProgressBar
+        android:id="@+id/widget_progress_bar"
+        style="@style/Widget.AppCompat.ProgressBar.Horizontal"
+        android:layout_width="match_parent"
+        android:layout_height="6dp"
+        android:layout_alignParentTop="true"
+        android:background="?colorPrimary"
+        android:indeterminate="true" />
+
+    <LinearLayout
+        android:id="@+id/webview_error_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentTop="true"
+        android:background="?vctr_bottom_nav_background_color"
+        android:orientation="horizontal"
+        android:padding="16dp"
+        android:visibility="gone"
+        tools:visibility="visible">
+
+        <ImageView
+            android:layout_width="40dp"
+            android:layout_height="40dp"
+            android:layout_gravity="center"
+            android:src="@drawable/error" />
+
+        <TextView
+            android:id="@+id/webview_error_text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_marginStart="@dimen/layout_horizontal_margin"
+            android:layout_marginEnd="@dimen/layout_horizontal_margin"
+            android:textColor="?android:textColorPrimary"
+            android:textStyle="bold"
+            tools:text="Fail to load widget " />
+    </LinearLayout>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/vector/src/main/res/menu/menu_room_widget.xml b/vector/src/main/res/menu/menu_room_widget.xml
new file mode 100644
index 0000000000..68ae2c2a7a
--- /dev/null
+++ b/vector/src/main/res/menu/menu_room_widget.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <item
+        android:id="@+id/action_refresh"
+        android:icon="@drawable/ic_widget_refresh"
+        android:iconTint="?attr/vctr_icon_tint_on_dark_action_bar_color"
+        android:title="@string/room_widget_reload"
+        app:showAsAction="ifRoom" />
+
+    <item
+        android:id="@+id/action_widget_open_ext"
+        android:icon="@drawable/ic_widget_external_link"
+        android:iconTint="?attr/vctr_icon_tint_on_dark_action_bar_color"
+        android:title="@string/room_widget_open_in_browser"
+        app:showAsAction="ifRoom" />
+
+    <item
+        android:id="@+id/action_close"
+        android:icon="@drawable/ic_widget_bin"
+        android:iconTint="@color/vector_error_color"
+        android:title="@string/delete"
+        app:showAsAction="ifRoom" />
+
+</menu>
\ No newline at end of file
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index 856b637b40..f18f6685b6 100755
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -839,7 +839,7 @@
     <string name="settings_logged_in">Logged in as</string>
     <string name="settings_home_server">Home Server</string>
     <string name="settings_identity_server">Identity Server</string>
-    <string name="settings_integration_allow">Allow Integrations</string>
+    <string name="settings_integration_allow">Enable Integration Manager</string>
     <string name="settings_integration_manager">Integration Manager</string>
 
     <string name="settings_user_interface">User interface</string>
@@ -1112,6 +1112,22 @@
         <item quantity="other">%d active widgets</item>
     </plurals>
 
+
+    <string name="room_widget_activity_title">Widget</string>
+    <string name="room_widget_permission_title">Widget Permission Request</string>
+    <string name="room_widget_permission_added_by">This widget was added by:</string>
+    <string name="room_widget_permission_shared_info_title">Using it will share data with %s:</string>
+    <string name="room_widget_failed_to_load">Failed to load widget.\n%s</string>
+    <string name="room_widget_reload">Reload widget</string>
+    <string name="room_widget_open_in_browser">Open in browser</string>
+
+    <string name="room_widget_permission_ip_address">Your IP address</string>
+    <string name="room_widget_permission_useragent">Your User Agent</string>
+    <string name="room_widget_permission_widget_id">Widget ID</string>
+    <string name="room_widget_permission_room_id">Room ID</string>
+    <string name="room_widget_permission_matrix_profile">Your Profile (ID, Name and/or Avatar)</string>
+
+
     <string name="error_jitsi_not_supported_on_old_device">Sorry, conference calls with Jitsi are not supported on old devices (devices with Android OS below 5.0)</string>
 
     <!-- Widget Integration Manager -->

From 58ca82568ba9e0e39b7eb32619f50cb54790aa35 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Wed, 13 Nov 2019 17:23:17 +0100
Subject: [PATCH 51/77] Use simple list instead of radio for widget banner
 click dialog

---
 vector/src/main/java/im/vector/activity/VectorRoomActivity.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vector/src/main/java/im/vector/activity/VectorRoomActivity.java b/vector/src/main/java/im/vector/activity/VectorRoomActivity.java
index e774279cfc..9dd13f31e0 100755
--- a/vector/src/main/java/im/vector/activity/VectorRoomActivity.java
+++ b/vector/src/main/java/im/vector/activity/VectorRoomActivity.java
@@ -924,7 +924,7 @@ public void onClick(final List<Widget> widgets) {
                     }
 
                     new AlertDialog.Builder(VectorRoomActivity.this)
-                            .setSingleChoiceItems(widgetNames.toArray(CharSequences), 0, new DialogInterface.OnClickListener() {
+                            .setItems(widgetNames.toArray(CharSequences),  new DialogInterface.OnClickListener() {
                                 @Override
                                 public void onClick(DialogInterface d, int n) {
                                     d.cancel();

From dbd26437a0ecdb0502f54a4c48955918fa15b56f Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Wed, 13 Nov 2019 18:35:41 +0100
Subject: [PATCH 52/77] Dismiss allow bottomsheet before accountdata API
 callback

Cleaning
---
 .../java/im/vector/activity/WidgetActivity.kt |  3 --
 .../roomwidgets/RoomWidgetFragment.kt         |  4 ---
 .../RoomWidgetPermissionBottomSheet.kt        | 14 ++++----
 .../RoomWidgetPermissionViewModel.kt          | 36 ++++++++++---------
 .../roomwidgets/RoomWidgetViewModel.kt        | 14 +-------
 5 files changed, 28 insertions(+), 43 deletions(-)

diff --git a/vector/src/main/java/im/vector/activity/WidgetActivity.kt b/vector/src/main/java/im/vector/activity/WidgetActivity.kt
index 6f0f1a3bad..a7acbfe30d 100755
--- a/vector/src/main/java/im/vector/activity/WidgetActivity.kt
+++ b/vector/src/main/java/im/vector/activity/WidgetActivity.kt
@@ -75,9 +75,6 @@ class WidgetActivity : VectorAppCompatActivity() {
                                 .commit()
                     }
                 }
-                WidgetState.CLOSING_WIDGET     -> {
-
-                }
             }
         }
 
diff --git a/vector/src/main/java/im/vector/fragments/roomwidgets/RoomWidgetFragment.kt b/vector/src/main/java/im/vector/fragments/roomwidgets/RoomWidgetFragment.kt
index baf27397da..98dbe3577c 100644
--- a/vector/src/main/java/im/vector/fragments/roomwidgets/RoomWidgetFragment.kt
+++ b/vector/src/main/java/im/vector/fragments/roomwidgets/RoomWidgetFragment.kt
@@ -49,7 +49,6 @@ class RoomWidgetFragment : VectorBaseMvRxFragment() {
     @BindView(R.id.webview_error_text)
     lateinit var errorText: TextView
 
-
     @BindView(R.id.widget_progress_bar)
     lateinit var webProgressBar: ProgressBar
 
@@ -203,9 +202,6 @@ class RoomWidgetFragment : VectorBaseMvRxFragment() {
                     }
                 }
             }
-            WidgetState.CLOSING_WIDGET     -> {
-//                    showWaitingView()
-            }
         }
     }
 
diff --git a/vector/src/main/java/im/vector/fragments/roomwidgets/RoomWidgetPermissionBottomSheet.kt b/vector/src/main/java/im/vector/fragments/roomwidgets/RoomWidgetPermissionBottomSheet.kt
index 3f083b6f1f..3681054512 100644
--- a/vector/src/main/java/im/vector/fragments/roomwidgets/RoomWidgetPermissionBottomSheet.kt
+++ b/vector/src/main/java/im/vector/fragments/roomwidgets/RoomWidgetPermissionBottomSheet.kt
@@ -85,17 +85,17 @@ class RoomWidgetPermissionBottomSheet : VectorBaseBottomSheetDialogFragment() {
 
     @OnClick(R.id.bottom_sheet_widget_permission_decline_button)
     fun doDecline() {
-        viewModel.blockWidget {
-            dismiss()
-            sharedActivityViewModel.doFinish()
-        }
+        viewModel.blockWidget()
+        //optimistic dismiss
+        dismiss()
+        sharedActivityViewModel.doFinish()
     }
 
     @OnClick(R.id.bottom_sheet_widget_permission_continue_button)
     fun doAccept() {
-        viewModel.allowWidget {
-            dismiss()
-        }
+        viewModel.allowWidget()
+        //optimistic dismiss
+        dismiss()
     }
 
     @Parcelize
diff --git a/vector/src/main/java/im/vector/fragments/roomwidgets/RoomWidgetPermissionViewModel.kt b/vector/src/main/java/im/vector/fragments/roomwidgets/RoomWidgetPermissionViewModel.kt
index 929317ed41..cf70b3dd02 100644
--- a/vector/src/main/java/im/vector/fragments/roomwidgets/RoomWidgetPermissionViewModel.kt
+++ b/vector/src/main/java/im/vector/fragments/roomwidgets/RoomWidgetPermissionViewModel.kt
@@ -23,6 +23,7 @@ import im.vector.Matrix
 import im.vector.R
 import im.vector.widgets.Widget
 import org.matrix.androidsdk.MXSession
+import org.matrix.androidsdk.core.Log
 import org.matrix.androidsdk.core.callback.ApiCallback
 import org.matrix.androidsdk.core.model.MatrixError
 import java.net.URL
@@ -70,45 +71,46 @@ class RoomWidgetPermissionViewModel(val session: MXSession, val widget: Widget,
         }
     }
 
-    fun allowWidget(onFinished: (() -> Unit)) {
+    fun allowWidget(onFinished: (() -> Unit)? = null) {
         session.integrationManager.setWidgetAllowed(widget.widgetEvent?.eventId
                 ?: "", true, object : ApiCallback<Void?> {
+
             override fun onSuccess(info: Void?) {
-                onFinished()
+                onFinished?.invoke()
             }
 
-            override fun onUnexpectedError(e: Exception?) {
-                //TODO.. make the button with a loading state?
+            override fun onUnexpectedError(e: Exception) {
+                Log.e(LOG_TAG, e.message)
             }
 
-            override fun onNetworkError(e: Exception?) {
-                //TODO.. make the button with a loading state?
+            override fun onNetworkError(e: Exception) {
+                Log.e(LOG_TAG, e.message)
             }
 
-            override fun onMatrixError(e: MatrixError?) {
-                //TODO.. make the button with a loading state?
+            override fun onMatrixError(e: MatrixError) {
+                Log.e(LOG_TAG, e.message)
             }
 
         })
     }
 
-    fun blockWidget(onFinished: (() -> Unit)) {
+    fun blockWidget(onFinished: (() -> Unit)? = null) {
         session.integrationManager.setWidgetAllowed(widget.widgetEvent?.eventId
                 ?: "", false, object : ApiCallback<Void?> {
             override fun onSuccess(info: Void?) {
-                onFinished()
+                onFinished?.invoke()
             }
 
-            override fun onUnexpectedError(e: Exception?) {
-                //TODO.. make the button with a loading state?
+            override fun onUnexpectedError(e: Exception) {
+                Log.e(LOG_TAG, e.message)
             }
 
-            override fun onNetworkError(e: Exception?) {
-                //TODO.. make the button with a loading state?
+            override fun onNetworkError(e: Exception) {
+                Log.e(LOG_TAG, e.message)
             }
 
-            override fun onMatrixError(e: MatrixError?) {
-                //TODO.. make the button with a loading state?
+            override fun onMatrixError(e: MatrixError) {
+                Log.e(LOG_TAG, e.message)
             }
 
         })
@@ -116,6 +118,8 @@ class RoomWidgetPermissionViewModel(val session: MXSession, val widget: Widget,
 
     companion object : MvRxViewModelFactory<RoomWidgetPermissionViewModel, RoomWidgetPermissionViewState> {
 
+        val LOG_TAG = RoomWidgetPermissionViewModel::class.simpleName
+
         override fun create(viewModelContext: ViewModelContext, state: RoomWidgetPermissionViewState): RoomWidgetPermissionViewModel? {
             val args = viewModelContext.args<RoomWidgetPermissionBottomSheet.FragArgs>()
             val session = Matrix.getMXSession(viewModelContext.activity, args.mxId)
diff --git a/vector/src/main/java/im/vector/fragments/roomwidgets/RoomWidgetViewModel.kt b/vector/src/main/java/im/vector/fragments/roomwidgets/RoomWidgetViewModel.kt
index a11aa38029..c0aa82f8bf 100644
--- a/vector/src/main/java/im/vector/fragments/roomwidgets/RoomWidgetViewModel.kt
+++ b/vector/src/main/java/im/vector/fragments/roomwidgets/RoomWidgetViewModel.kt
@@ -36,8 +36,7 @@ import org.matrix.androidsdk.features.integrationmanager.IntegrationManager
 enum class WidgetState {
     UNKWNOWN,
     WIDGET_NOT_ALLOWED,
-    WIDGET_ALLOWED,
-    CLOSING_WIDGET
+    WIDGET_ALLOWED
 }
 
 data class RoomWidgetViewModelState(
@@ -55,8 +54,6 @@ class RoomWidgetViewModel(initialState: RoomWidgetViewModelState, val widget: Wi
 
     companion object : MvRxViewModelFactory<RoomWidgetViewModel, RoomWidgetViewModelState> {
         const val NAVIGATE_FINISH = "NAVIGATE_FINISH"
-        //private val LOG_TAG = KeysBackupSetupSharedViewModel::class.java.name
-
 
         override fun create(viewModelContext: ViewModelContext, state: RoomWidgetViewModelState): RoomWidgetViewModel? {
             return (viewModelContext.activity.intent?.extras?.getSerializable(WidgetActivity.EXTRA_WIDGET_ID) as? Widget)?.let {
@@ -184,11 +181,6 @@ class RoomWidgetViewModel(initialState: RoomWidgetViewModelState, val widget: Wi
         AlertDialog.Builder(context)
                 .setMessage(R.string.widget_delete_message_confirmation)
                 .setPositiveButton(R.string.remove) { _, _ ->
-                    //                    showWaitingView()
-
-                    setState {
-                        copy(status = WidgetState.CLOSING_WIDGET)
-                    }
 
                     widgetsManager?.closeWidget(session, room, widget.widgetId, object : ApiCallback<Void> {
                         override fun onSuccess(info: Void?) {
@@ -197,10 +189,6 @@ class RoomWidgetViewModel(initialState: RoomWidgetViewModelState, val widget: Wi
 
                         private fun onError(errorMessage: String) {
                             toastMessageEvent.postValue(LiveEvent(errorMessage))
-                            //TODO should not be handled with this state
-                            setState {
-                                copy(status = WidgetState.WIDGET_ALLOWED)
-                            }
                         }
 
                         override fun onNetworkError(e: Exception) {

From 7671163581dfb5b331a69df6a17ff96fee31bc5f Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Wed, 13 Nov 2019 18:48:30 +0100
Subject: [PATCH 53/77] Dismiss widget on permissions cancel

---
 .../roomwidgets/RoomWidgetPermissionBottomSheet.kt          | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/vector/src/main/java/im/vector/fragments/roomwidgets/RoomWidgetPermissionBottomSheet.kt b/vector/src/main/java/im/vector/fragments/roomwidgets/RoomWidgetPermissionBottomSheet.kt
index 3681054512..3d16490ee6 100644
--- a/vector/src/main/java/im/vector/fragments/roomwidgets/RoomWidgetPermissionBottomSheet.kt
+++ b/vector/src/main/java/im/vector/fragments/roomwidgets/RoomWidgetPermissionBottomSheet.kt
@@ -15,6 +15,7 @@
  */
 package im.vector.fragments.roomwidgets
 
+import android.content.DialogInterface
 import android.os.Build
 import android.os.Parcelable
 import android.text.Spannable
@@ -98,6 +99,11 @@ class RoomWidgetPermissionBottomSheet : VectorBaseBottomSheetDialogFragment() {
         dismiss()
     }
 
+    override fun onCancel(dialog: DialogInterface?) {
+        super.onCancel(dialog)
+        sharedActivityViewModel.doFinish()
+    }
+
     @Parcelize
     data class FragArgs(
             val widget: Widget,

From 52dfcfba48fbea9b2a5f8014048ec77614d0c643 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Wed, 13 Nov 2019 18:52:14 +0100
Subject: [PATCH 54/77] cleaning

---
 vector/src/main/java/im/vector/activity/WidgetActivity.kt  | 4 +++-
 .../roomwidgets/RoomWidgetPermissionBottomSheet.kt         | 7 ++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/vector/src/main/java/im/vector/activity/WidgetActivity.kt b/vector/src/main/java/im/vector/activity/WidgetActivity.kt
index a7acbfe30d..11025b96a4 100755
--- a/vector/src/main/java/im/vector/activity/WidgetActivity.kt
+++ b/vector/src/main/java/im/vector/activity/WidgetActivity.kt
@@ -64,7 +64,9 @@ class WidgetActivity : VectorAppCompatActivity() {
                     if (dFrag != null && dFrag.dialog?.isShowing == true && !dFrag.isRemoving) {
                         //already there
                     } else {
-                        RoomWidgetPermissionBottomSheet.newInstance(viewModel.session!!.myUserId, viewModel.widget).show(supportFragmentManager, FRAGMENT_TAG_PERMISSION)
+                        RoomWidgetPermissionBottomSheet
+                                .newInstance(viewModel.session!!.myUserId, viewModel.widget)
+                                .show(supportFragmentManager, FRAGMENT_TAG_PERMISSION)
                     }
                 }
                 WidgetState.WIDGET_ALLOWED     -> {
diff --git a/vector/src/main/java/im/vector/fragments/roomwidgets/RoomWidgetPermissionBottomSheet.kt b/vector/src/main/java/im/vector/fragments/roomwidgets/RoomWidgetPermissionBottomSheet.kt
index 3d16490ee6..e3ed883d5e 100644
--- a/vector/src/main/java/im/vector/fragments/roomwidgets/RoomWidgetPermissionBottomSheet.kt
+++ b/vector/src/main/java/im/vector/fragments/roomwidgets/RoomWidgetPermissionBottomSheet.kt
@@ -76,7 +76,12 @@ class RoomWidgetPermissionBottomSheet : VectorBaseBottomSheetDialogFragment() {
             } else {
                 val start = infoBuilder.length
                 infoBuilder.append(bulletPoint)
-                infoBuilder.setSpan(BulletSpan(resources.getDimension(R.dimen.quote_gap).toInt()), start, bulletPoint.length, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
+                infoBuilder.setSpan(
+                        BulletSpan(resources.getDimension(R.dimen.quote_gap).toInt()),
+                        start,
+                        bulletPoint.length,
+                        Spannable.SPAN_EXCLUSIVE_EXCLUSIVE
+                )
             }
         }
         infoBuilder.append("\n")

From 3c4d628f87b45d37051676c52ee784beba48ca54 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Thu, 14 Nov 2019 09:04:51 +0100
Subject: [PATCH 55/77] Changes update

---
 CHANGES.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 2d448a16ab..f21a53a50b 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -5,7 +5,7 @@ MatrixSdk 🚀:
  - Upgrade to version 0.X.Y.
 
 Features ✨:
- -
+ - Privacy / Room Widget permissions (#3378)
 
 Improvementss 🙌:
  -

From 93d1258cecf3b51c144b3c225322809289c412f6 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Fri, 15 Nov 2019 15:50:58 +0100
Subject: [PATCH 56/77] Updated copy

---
 .../roomwidgets/RoomWidgetPermissionViewModel.kt      |  9 +++++----
 vector/src/main/res/values/strings.xml                | 11 ++++++-----
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/vector/src/main/java/im/vector/fragments/roomwidgets/RoomWidgetPermissionViewModel.kt b/vector/src/main/java/im/vector/fragments/roomwidgets/RoomWidgetPermissionViewModel.kt
index cf70b3dd02..603866acbe 100644
--- a/vector/src/main/java/im/vector/fragments/roomwidgets/RoomWidgetPermissionViewModel.kt
+++ b/vector/src/main/java/im/vector/fragments/roomwidgets/RoomWidgetPermissionViewModel.kt
@@ -54,11 +54,12 @@ class RoomWidgetPermissionViewModel(val session: MXSession, val widget: Widget,
         //TODO check from widget urls the perms that should be shown?
         //For now put all
         val infoShared = listOf<Int>(
-                R.string.room_widget_permission_ip_address,
-                R.string.room_widget_permission_useragent,
+                R.string.room_widget_permission_display_name,
+                R.string.room_widget_permission_avatar_url,
+                R.string.room_widget_permission_user_id,
+                R.string.room_widget_permission_theme,
                 R.string.room_widget_permission_widget_id,
-                R.string.room_widget_permission_room_id,
-                R.string.room_widget_permission_matrix_profile
+                R.string.room_widget_permission_room_id
         )
         setState {
             copy(
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index f18f6685b6..b2dc5eba7e 100755
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -1114,18 +1114,19 @@
 
 
     <string name="room_widget_activity_title">Widget</string>
-    <string name="room_widget_permission_title">Widget Permission Request</string>
+    <string name="room_widget_permission_title">Load Widget</string>
     <string name="room_widget_permission_added_by">This widget was added by:</string>
-    <string name="room_widget_permission_shared_info_title">Using it will share data with %s:</string>
+    <string name="room_widget_permission_shared_info_title">Using it may set cookies and share data with %s:</string>
     <string name="room_widget_failed_to_load">Failed to load widget.\n%s</string>
     <string name="room_widget_reload">Reload widget</string>
     <string name="room_widget_open_in_browser">Open in browser</string>
 
-    <string name="room_widget_permission_ip_address">Your IP address</string>
-    <string name="room_widget_permission_useragent">Your User Agent</string>
+    <string name="room_widget_permission_display_name">Your display name</string>
+    <string name="room_widget_permission_avatar_url">Your avatar URL</string>
+    <string name="room_widget_permission_user_id">Your user ID</string>
+    <string name="room_widget_permission_theme">Your theme</string>
     <string name="room_widget_permission_widget_id">Widget ID</string>
     <string name="room_widget_permission_room_id">Room ID</string>
-    <string name="room_widget_permission_matrix_profile">Your Profile (ID, Name and/or Avatar)</string>
 
 
     <string name="error_jitsi_not_supported_on_old_device">Sorry, conference calls with Jitsi are not supported on old devices (devices with Android OS below 5.0)</string>

From 9060afff8670748fb07e41d8046f3380febb749a Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Fri, 15 Nov 2019 16:30:24 +0100
Subject: [PATCH 57/77] Update preference screen as per design

---
 vector/src/main/res/values/strings.xml              |  4 +++-
 .../main/res/xml/vector_settings_preferences.xml    | 13 +++++++++++--
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index b2dc5eba7e..558a6ab58b 100755
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -773,6 +773,8 @@
     <string name="settings_ignored_users">Ignored users</string>
     <string name="settings_other">Other</string>
     <string name="settings_advanced">Advanced</string>
+    <string name="settings_integrations">Integrations</string>
+    <string name="settings_integrations_summary">Use an Integration Manager to manage bots, bridges, widgets and sticker packs.\nIntegration Managers receive configuration data, and can modify widgets, send room invites and set power levels on your behalf.</string>
     <string name="settings_cryptography">Cryptography</string>
     <string name="settings_cryptography_manage_keys">Cryptography Keys Management</string>
     <string name="settings_notifications_targets">Notification Targets</string>
@@ -839,7 +841,7 @@
     <string name="settings_logged_in">Logged in as</string>
     <string name="settings_home_server">Home Server</string>
     <string name="settings_identity_server">Identity Server</string>
-    <string name="settings_integration_allow">Enable Integration Manager</string>
+    <string name="settings_integration_allow">Allow integrations</string>
     <string name="settings_integration_manager">Integration Manager</string>
 
     <string name="settings_user_interface">User interface</string>
diff --git a/vector/src/main/res/xml/vector_settings_preferences.xml b/vector/src/main/res/xml/vector_settings_preferences.xml
index 12a755512a..33b9471e6c 100755
--- a/vector/src/main/res/xml/vector_settings_preferences.xml
+++ b/vector/src/main/res/xml/vector_settings_preferences.xml
@@ -446,19 +446,28 @@
             tools:summary="@string/default_identity_server_url"
             app:fragment="im.vector.fragments.discovery.VectorSettingsDiscoveryFragment" />
 
+    </im.vector.preference.VectorPreferenceCategory>
+
+    <im.vector.preference.VectorPreferenceDivider />
+
+    <im.vector.preference.VectorPreferenceCategory android:title="@string/settings_integrations">
+
+        <im.vector.preference.VectorPreference
+            android:focusable="false"
+            android:persistent="false"
+            android:summary="@string/settings_integrations_summary" />
 
         <im.vector.preference.VectorSwitchPreference
             android:key="SETTINGS_INTEGRATION_ALLOW"
             android:enabled="true"
             android:persistent="false"
-            android:title="@string/settings_integration_allow" />
+            android:title="@string/settings_integration_allow"/>
 
         <im.vector.preference.VectorPreference
             android:dependency="SETTINGS_INTEGRATION_ALLOW"
             android:persistent="false"
             android:key="SETTINGS_INTEGRATION_MANAGER_UI_URL"
             android:title="@string/settings_integration_manager" />
-
     </im.vector.preference.VectorPreferenceCategory>
 
     <im.vector.preference.VectorPreferenceDivider />

From a7a6595a34231604e01fcafdb3ae2981495532d8 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Fri, 15 Nov 2019 18:25:45 +0100
Subject: [PATCH 58/77] Prompt to accept IM terms if needed

---
 .../java/im/vector/activity/WidgetActivity.kt |  5 ++++
 .../roomwidgets/RoomWidgetFragment.kt         | 25 +++++++++++++++++++
 .../roomwidgets/RoomWidgetViewModel.kt        | 12 ++++++++-
 3 files changed, 41 insertions(+), 1 deletion(-)

diff --git a/vector/src/main/java/im/vector/activity/WidgetActivity.kt b/vector/src/main/java/im/vector/activity/WidgetActivity.kt
index 11025b96a4..583722fb96 100755
--- a/vector/src/main/java/im/vector/activity/WidgetActivity.kt
+++ b/vector/src/main/java/im/vector/activity/WidgetActivity.kt
@@ -18,6 +18,7 @@
 package im.vector.activity
 
 import android.annotation.SuppressLint
+import android.app.Activity
 import android.content.Context
 import android.content.Intent
 import android.graphics.Color
@@ -26,9 +27,13 @@ import androidx.core.content.ContextCompat
 import androidx.lifecycle.Observer
 import com.airbnb.mvrx.viewModel
 import im.vector.R
+import im.vector.activity.util.TERMS_REQUEST_CODE
+import im.vector.contacts.ContactsManager
 import im.vector.fragments.roomwidgets.*
 import im.vector.ui.themes.ThemeUtils
 import im.vector.widgets.Widget
+import org.matrix.androidsdk.core.callback.ApiCallback
+import org.matrix.androidsdk.features.terms.TermsManager
 
 /*
  * This class displays a widget
diff --git a/vector/src/main/java/im/vector/fragments/roomwidgets/RoomWidgetFragment.kt b/vector/src/main/java/im/vector/fragments/roomwidgets/RoomWidgetFragment.kt
index 98dbe3577c..d9bb48bc22 100644
--- a/vector/src/main/java/im/vector/fragments/roomwidgets/RoomWidgetFragment.kt
+++ b/vector/src/main/java/im/vector/fragments/roomwidgets/RoomWidgetFragment.kt
@@ -16,6 +16,8 @@
 package im.vector.fragments.roomwidgets
 
 import android.annotation.SuppressLint
+import android.app.Activity
+import android.content.Intent
 import android.graphics.Bitmap
 import android.os.Build
 import android.os.Bundle
@@ -35,9 +37,12 @@ import androidx.lifecycle.Observer
 import butterknife.BindView
 import com.airbnb.mvrx.*
 import im.vector.R
+import im.vector.activity.ReviewTermsActivity
+import im.vector.activity.util.TERMS_REQUEST_CODE
 import im.vector.fragments.VectorBaseMvRxFragment
 import im.vector.ui.themes.ThemeUtils
 import im.vector.util.openUrlInExternalBrowser
+import org.matrix.androidsdk.features.terms.TermsManager
 
 class RoomWidgetFragment : VectorBaseMvRxFragment() {
 
@@ -67,6 +72,26 @@ class RoomWidgetFragment : VectorBaseMvRxFragment() {
                 mWidgetWebView?.isVisible = true
             }
         })
+
+        viewModel.termsNotSignedEvent.observe(this, Observer { termsEvent ->
+            termsEvent?.getContentIfNotHandled()?.let {
+                viewModel.widgetsManager?.uiUrl?.let { uiUrl ->
+                    startActivityForResult(ReviewTermsActivity.intent(requireContext(),
+                            TermsManager.ServiceType.IntegrationManager, uiUrl, it.token),
+                            TERMS_REQUEST_CODE)
+                }
+            }
+        })
+    }
+
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        if (requestCode == TERMS_REQUEST_CODE) {
+            if (resultCode == Activity.RESULT_OK) {
+                viewModel.refreshAfterTermsAccepted()
+            } else {
+                viewModel.doFinish()
+            }
+        }
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
diff --git a/vector/src/main/java/im/vector/fragments/roomwidgets/RoomWidgetViewModel.kt b/vector/src/main/java/im/vector/fragments/roomwidgets/RoomWidgetViewModel.kt
index c0aa82f8bf..967758faf6 100644
--- a/vector/src/main/java/im/vector/fragments/roomwidgets/RoomWidgetViewModel.kt
+++ b/vector/src/main/java/im/vector/fragments/roomwidgets/RoomWidgetViewModel.kt
@@ -32,6 +32,7 @@ import org.matrix.androidsdk.core.callback.ApiCallback
 import org.matrix.androidsdk.core.model.MatrixError
 import org.matrix.androidsdk.data.Room
 import org.matrix.androidsdk.features.integrationmanager.IntegrationManager
+import org.matrix.androidsdk.features.terms.TermsNotSignedException
 
 enum class WidgetState {
     UNKWNOWN,
@@ -64,6 +65,7 @@ class RoomWidgetViewModel(initialState: RoomWidgetViewModelState, val widget: Wi
     }
 
     var navigateEvent: MutableLiveData<LiveEvent<String>> = MutableLiveData()
+    var termsNotSignedEvent: MutableLiveData<LiveEvent<TermsNotSignedException>> = MutableLiveData()
     var loadWebURLEvent: MutableLiveData<LiveEvent<String>> = MutableLiveData()
     var toastMessageEvent: MutableLiveData<LiveEvent<String>> = MutableLiveData()
 
@@ -212,6 +214,10 @@ class RoomWidgetViewModel(initialState: RoomWidgetViewModelState, val widget: Wi
         navigateEvent.postValue(LiveEvent(NAVIGATE_FINISH))
     }
 
+    fun refreshAfterTermsAccepted() {
+        onWidgetAllowed()
+    }
+
     private fun onWidgetAllowed(applicationContext: Context = VectorApp.getInstance().applicationContext) {
 
         setState {
@@ -251,7 +257,11 @@ class RoomWidgetViewModel(initialState: RoomWidgetViewModelState, val widget: Wi
                 }
 
                 override fun onUnexpectedError(e: Exception) {
-                    onError(e.localizedMessage)
+                    if (e is TermsNotSignedException) {
+                        termsNotSignedEvent.postValue(LiveEvent(e))
+                    } else {
+                        onError(e.localizedMessage)
+                    }
                 }
             })
         } else {

From 295dc1c50988a5e9602439bb6311e640085010ba Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Mon, 18 Nov 2019 14:23:31 +0100
Subject: [PATCH 59/77] Code review

---
 .../roomwidgets/RoomWidgetViewModel.kt        | 13 ++++---
 .../fragments/terms/AcceptTermsFragment.kt    | 23 ++++++++----
 .../java/im/vector/widgets/WidgetError.java   | 37 +++++++++++++++++++
 .../im/vector/widgets/WidgetsManager.java     | 19 ----------
 .../main/res/layout/fragment_accept_terms.xml | 26 ++++++++-----
 5 files changed, 76 insertions(+), 42 deletions(-)
 create mode 100644 vector/src/main/java/im/vector/widgets/WidgetError.java

diff --git a/vector/src/main/java/im/vector/fragments/roomwidgets/RoomWidgetViewModel.kt b/vector/src/main/java/im/vector/fragments/roomwidgets/RoomWidgetViewModel.kt
index 967758faf6..be41d7be19 100644
--- a/vector/src/main/java/im/vector/fragments/roomwidgets/RoomWidgetViewModel.kt
+++ b/vector/src/main/java/im/vector/fragments/roomwidgets/RoomWidgetViewModel.kt
@@ -45,8 +45,6 @@ data class RoomWidgetViewModelState(
         val formattedURL: Async<String> = Uninitialized,
         val webviewLoadedUrl: Async<String> = Uninitialized,
         val widgetName: String = "",
-        val authorName: String? = null,
-        val authorId: String? = null,
         val canManageWidgets: Boolean = false
 ) : MvRxState
 
@@ -62,6 +60,12 @@ class RoomWidgetViewModel(initialState: RoomWidgetViewModelState, val widget: Wi
             } ?: super.create(viewModelContext, state)
         }
 
+        override fun initialState(viewModelContext: ViewModelContext): RoomWidgetViewModelState? {
+            return (viewModelContext.activity.intent?.extras?.getSerializable(WidgetActivity.EXTRA_WIDGET_ID) as? Widget)?.let {
+                RoomWidgetViewModelState(widgetName = it.humanName)
+            }
+        }
+
     }
 
     var navigateEvent: MutableLiveData<LiveEvent<String>> = MutableLiveData()
@@ -87,9 +91,6 @@ class RoomWidgetViewModel(initialState: RoomWidgetViewModelState, val widget: Wi
     }
 
     init {
-        setState {
-            copy(widgetName = widget.humanName)
-        }
         configure()
 
         session?.integrationManager?.addListener(object : IntegrationManager.IntegrationManagerManagerListener {
@@ -164,7 +165,7 @@ class RoomWidgetViewModel(initialState: RoomWidgetViewModelState, val widget: Wi
         val isAllowed = session
                 ?.integrationManager
                 ?.getKnownWidgetPermissions()
-                ?.findLast { it.stateEventId == widget.widgetEvent.eventId }
+                ?.find { it.stateEventId == widget.widgetEvent.eventId  }
                 ?.allowed
                 ?: false
 
diff --git a/vector/src/main/java/im/vector/fragments/terms/AcceptTermsFragment.kt b/vector/src/main/java/im/vector/fragments/terms/AcceptTermsFragment.kt
index 4b244feef5..719d9abe23 100644
--- a/vector/src/main/java/im/vector/fragments/terms/AcceptTermsFragment.kt
+++ b/vector/src/main/java/im/vector/fragments/terms/AcceptTermsFragment.kt
@@ -19,7 +19,6 @@ import android.app.Activity
 import android.os.Bundle
 import android.view.ViewGroup
 import android.widget.Button
-import android.widget.ProgressBar
 import androidx.appcompat.app.AlertDialog
 import androidx.core.view.isVisible
 import androidx.lifecycle.Observer
@@ -48,8 +47,8 @@ class AcceptTermsFragment : VectorBaseFragment(), TermsController.Listener {
     @BindView(R.id.terms_bottom_accept)
     lateinit var acceptButton: Button
 
-    @BindView(R.id.termsLoadingIndicator)
-    lateinit var progressBar: ProgressBar
+    @BindView(R.id.waitOverlay)
+    lateinit var waitingModalOverlay: ViewGroup
 
     @BindView(R.id.termsBottomBar)
     lateinit var bottomBar: ViewGroup
@@ -73,10 +72,10 @@ class AcceptTermsFragment : VectorBaseFragment(), TermsController.Listener {
             when (terms) {
                 is MxAsync.Loading -> {
                     bottomBar.isVisible = false
-                    progressBar.isVisible = true
+                    waitingModalOverlay.isVisible = true
                 }
                 is MxAsync.Error   -> {
-                    progressBar.isVisible = false
+                    waitingModalOverlay.isVisible = false
                     terms.stringResId.let { stringRes ->
                         AlertDialog.Builder(requireActivity())
                                 .setMessage(stringRes)
@@ -88,20 +87,23 @@ class AcceptTermsFragment : VectorBaseFragment(), TermsController.Listener {
                 }
                 is MxAsync.Success -> {
                     updateState(terms.value)
-                    progressBar.isVisible = false
+                    waitingModalOverlay.isVisible = false
                     bottomBar.isVisible = true
                     acceptButton.isEnabled = terms.value.all { it.accepted }
                 }
+                else               -> {
+                    waitingModalOverlay.isVisible = false
+                }
             }
         })
 
         viewModel.acceptTerms.observe(this, Observer { request ->
             when (request) {
                 is MxAsync.Loading -> {
-                    progressBar.isVisible = true
+                    waitingModalOverlay.isVisible = true
                 }
                 is MxAsync.Error   -> {
-                    progressBar.isVisible = false
+                    waitingModalOverlay.isVisible = false
                     request.stringResId.let { stringRes ->
                         AlertDialog.Builder(requireActivity())
                                 .setMessage(stringRes)
@@ -110,9 +112,14 @@ class AcceptTermsFragment : VectorBaseFragment(), TermsController.Listener {
                     }
                 }
                 is MxAsync.Success -> {
+                    waitingModalOverlay.isVisible = false
                     activity?.setResult(Activity.RESULT_OK)
                     activity?.finish()
                 }
+                else               -> {
+                    waitingModalOverlay.isVisible = false
+                }
+
             }
         })
     }
diff --git a/vector/src/main/java/im/vector/widgets/WidgetError.java b/vector/src/main/java/im/vector/widgets/WidgetError.java
new file mode 100644
index 0000000000..cb97410cc2
--- /dev/null
+++ b/vector/src/main/java/im/vector/widgets/WidgetError.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2019 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.
+ * 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.
+ */
+package im.vector.widgets;
+
+import org.matrix.androidsdk.core.model.MatrixError;
+
+/**
+ * Widget error code
+ */
+public class WidgetError extends MatrixError {
+    public static final String WIDGET_NOT_ENOUGH_POWER_ERROR_CODE = "WIDGET_NOT_ENOUGH_POWER_ERROR_CODE";
+    public static final String WIDGET_CREATION_FAILED_ERROR_CODE = "WIDGET_CREATION_FAILED_ERROR_CODE";
+
+    /**
+     * Create a widget error
+     *
+     * @param code                     the error code (see XX_ERROR_CODE)
+     * @param detailedErrorDescription the detailed error description
+     */
+    public WidgetError(String code, String detailedErrorDescription) {
+        errcode = code;
+        error = detailedErrorDescription;
+    }
+}
diff --git a/vector/src/main/java/im/vector/widgets/WidgetsManager.java b/vector/src/main/java/im/vector/widgets/WidgetsManager.java
index f6822832c1..c279238cab 100755
--- a/vector/src/main/java/im/vector/widgets/WidgetsManager.java
+++ b/vector/src/main/java/im/vector/widgets/WidgetsManager.java
@@ -82,25 +82,6 @@ public String getUIUrl() {
         return config.getUiUrl();
     }
 
-    /**
-     * Widget error code
-     */
-    public static class WidgetError extends MatrixError {
-        public static final String WIDGET_NOT_ENOUGH_POWER_ERROR_CODE = "WIDGET_NOT_ENOUGH_POWER_ERROR_CODE";
-        public static final String WIDGET_CREATION_FAILED_ERROR_CODE = "WIDGET_CREATION_FAILED_ERROR_CODE";
-
-        /**
-         * Create a widget error
-         *
-         * @param code                     the error code (see XX_ERROR_CODE)
-         * @param detailedErrorDescription the detailed error description
-         */
-        public WidgetError(String code, String detailedErrorDescription) {
-            errcode = code;
-            error = detailedErrorDescription;
-        }
-    }
-
 
     /**
      * Pending widget creation callback
diff --git a/vector/src/main/res/layout/fragment_accept_terms.xml b/vector/src/main/res/layout/fragment_accept_terms.xml
index e103668696..167085c70b 100644
--- a/vector/src/main/res/layout/fragment_accept_terms.xml
+++ b/vector/src/main/res/layout/fragment_accept_terms.xml
@@ -44,15 +44,23 @@
             android:text="@string/accept" />
     </LinearLayout>
 
-    <ProgressBar
-        android:id="@+id/termsLoadingIndicator"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="20dp"
+    <LinearLayout
+        android:id="@+id/waitOverlay"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:clickable="true"
+        android:focusable="true"
+        android:orientation="vertical"
         android:visibility="gone"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:visibility="visible" />
+        tools:visibility="visible">
+
+        <ProgressBar
+            android:id="@+id/termsLoadingIndicator"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_marginTop="20dp"
+            android:visibility="visible" />
+    </LinearLayout>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

From 8b26ab81d5cbf56500dac775c6869a5f0e80e09d Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Mon, 18 Nov 2019 17:13:46 +0100
Subject: [PATCH 60/77] Code review

---
 .../RoomWidgetPermissionViewModel.kt          | 65 ++++++++++---------
 1 file changed, 33 insertions(+), 32 deletions(-)

diff --git a/vector/src/main/java/im/vector/fragments/roomwidgets/RoomWidgetPermissionViewModel.kt b/vector/src/main/java/im/vector/fragments/roomwidgets/RoomWidgetPermissionViewModel.kt
index 603866acbe..85c61d790b 100644
--- a/vector/src/main/java/im/vector/fragments/roomwidgets/RoomWidgetPermissionViewModel.kt
+++ b/vector/src/main/java/im/vector/fragments/roomwidgets/RoomWidgetPermissionViewModel.kt
@@ -40,38 +40,6 @@ data class RoomWidgetPermissionViewState(
 class RoomWidgetPermissionViewModel(val session: MXSession, val widget: Widget, initialState: RoomWidgetPermissionViewState)
     : BaseMvRxViewModel<RoomWidgetPermissionViewState>(initialState, false) {
 
-    init {
-        val room = session.dataHandler.getRoom(widget.roomId)
-        val creator = room.getMember(widget.widgetEvent.sender)
-
-        var domain: String?
-        try {
-            domain = URL(widget.url).host
-        } catch (e: Throwable) {
-            domain = null
-        }
-
-        //TODO check from widget urls the perms that should be shown?
-        //For now put all
-        val infoShared = listOf<Int>(
-                R.string.room_widget_permission_display_name,
-                R.string.room_widget_permission_avatar_url,
-                R.string.room_widget_permission_user_id,
-                R.string.room_widget_permission_theme,
-                R.string.room_widget_permission_widget_id,
-                R.string.room_widget_permission_room_id
-        )
-        setState {
-            copy(
-                    authorName = creator?.displayname,
-                    authorId = widget.widgetEvent.sender,
-                    authorAvatarUrl = creator?.getAvatarUrl(),
-                    widgetDomain = domain,
-                    permissionsList = infoShared
-            )
-        }
-    }
-
     fun allowWidget(onFinished: (() -> Unit)? = null) {
         session.integrationManager.setWidgetAllowed(widget.widgetEvent?.eventId
                 ?: "", true, object : ApiCallback<Void?> {
@@ -127,5 +95,38 @@ class RoomWidgetPermissionViewModel(val session: MXSession, val widget: Widget,
             return RoomWidgetPermissionViewModel(session, args.widget, state)
         }
 
+        override fun initialState(viewModelContext: ViewModelContext): RoomWidgetPermissionViewState? {
+            val args = viewModelContext.args<RoomWidgetPermissionBottomSheet.FragArgs>()
+            val session = Matrix.getMXSession(viewModelContext.activity, args.mxId)
+            val widget = args.widget
+
+            val room = session.dataHandler.getRoom(widget.roomId)
+            val creator = room.getMember(widget.widgetEvent.sender)
+
+            var domain: String?
+            try {
+                domain = URL(widget.url).host
+            } catch (e: Throwable) {
+                domain = null
+            }
+
+            //TODO check from widget urls the perms that should be shown?
+            //For now put all
+            val infoShared = listOf<Int>(
+                    R.string.room_widget_permission_display_name,
+                    R.string.room_widget_permission_avatar_url,
+                    R.string.room_widget_permission_user_id,
+                    R.string.room_widget_permission_theme,
+                    R.string.room_widget_permission_widget_id,
+                    R.string.room_widget_permission_room_id
+            )
+            return RoomWidgetPermissionViewState(
+                    authorName = creator?.displayname,
+                    authorId = widget.widgetEvent.sender,
+                    authorAvatarUrl = creator?.getAvatarUrl(),
+                    widgetDomain = domain,
+                    permissionsList = infoShared
+            )
+        }
     }
 }
\ No newline at end of file

From 87e18b75c1c014273c87a8bcb7cc214865065821 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Mon, 18 Nov 2019 17:34:26 +0100
Subject: [PATCH 61/77] Refactoring / better support for fragment and
 handleback

---
 .../vector/activity/HandleBackParticipant.kt  | 31 +++++++++++++++++++
 .../activity/VectorAppCompatActivity.kt       | 25 ++++++++++++++-
 .../java/im/vector/activity/WidgetActivity.kt | 13 --------
 .../roomwidgets/RoomWidgetFragment.kt         |  5 +--
 4 files changed, 58 insertions(+), 16 deletions(-)
 create mode 100644 vector/src/main/java/im/vector/activity/HandleBackParticipant.kt

diff --git a/vector/src/main/java/im/vector/activity/HandleBackParticipant.kt b/vector/src/main/java/im/vector/activity/HandleBackParticipant.kt
new file mode 100644
index 0000000000..c976182bcb
--- /dev/null
+++ b/vector/src/main/java/im/vector/activity/HandleBackParticipant.kt
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2019 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.
+ * 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.
+ */
+package im.vector.activity
+
+/**
+ * A fragment should implement this interface if it wants to intercept backPressed events.
+ * Any activity extending VectorAppCompatActivity will propagate back pressed event to child
+ * fragment that implements it.
+ */
+interface HandleBackParticipant {
+
+    /**
+     * Returns true, if the on back pressed event has been handled by this Fragment.
+     * Otherwise return false
+     */
+    fun onBackPressed(): Boolean
+
+}
\ No newline at end of file
diff --git a/vector/src/main/java/im/vector/activity/VectorAppCompatActivity.kt b/vector/src/main/java/im/vector/activity/VectorAppCompatActivity.kt
index 373829942b..c6fcdae99f 100755
--- a/vector/src/main/java/im/vector/activity/VectorAppCompatActivity.kt
+++ b/vector/src/main/java/im/vector/activity/VectorAppCompatActivity.kt
@@ -24,9 +24,9 @@ import android.view.Menu
 import android.view.MenuItem
 import android.view.View
 import androidx.annotation.*
-import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.widget.Toolbar
 import androidx.core.view.isVisible
+import androidx.fragment.app.FragmentManager
 import butterknife.BindView
 import butterknife.ButterKnife
 import butterknife.Unbinder
@@ -36,6 +36,8 @@ import im.vector.R
 import im.vector.VectorApp
 import im.vector.activity.interfaces.Restorable
 import im.vector.dialogs.ConsentNotGivenHelper
+import im.vector.fragments.VectorBaseFragment
+import im.vector.fragments.VectorBaseMvRxFragment
 import im.vector.receiver.DebugReceiver
 import im.vector.ui.themes.ActivityOtherThemes
 import im.vector.ui.themes.ThemeUtils
@@ -152,6 +154,27 @@ abstract class VectorAppCompatActivity : BaseMvRxActivity() {
         }
     }
 
+    override fun onBackPressed() {
+        val handled = recursivelyDispatchOnBackPressed(supportFragmentManager)
+        if (!handled) {
+            super.onBackPressed()
+        }
+    }
+
+    private fun recursivelyDispatchOnBackPressed(fm: FragmentManager): Boolean {
+        val reverseOrder = fm.fragments.filter { it is VectorBaseFragment || it is VectorBaseMvRxFragment }.reversed()
+        for (f in reverseOrder) {
+            val handledByChildFragments = recursivelyDispatchOnBackPressed(f.childFragmentManager)
+            if (handledByChildFragments) {
+                return true
+            }
+            if (f is HandleBackParticipant && f.onBackPressed()) {
+                return true
+            }
+        }
+        return false
+    }
+
     override fun onMultiWindowModeChanged(isInMultiWindowMode: Boolean, newConfig: Configuration?) {
         super.onMultiWindowModeChanged(isInMultiWindowMode, newConfig)
 
diff --git a/vector/src/main/java/im/vector/activity/WidgetActivity.kt b/vector/src/main/java/im/vector/activity/WidgetActivity.kt
index 583722fb96..5a2d02527f 100755
--- a/vector/src/main/java/im/vector/activity/WidgetActivity.kt
+++ b/vector/src/main/java/im/vector/activity/WidgetActivity.kt
@@ -108,19 +108,6 @@ class WidgetActivity : VectorAppCompatActivity() {
         })
     }
 
-    /* ==========================================================================================
-     * UI EVENTS
-     * ========================================================================================== */
-
-    override fun onBackPressed() {
-        //Hugly i know
-        (supportFragmentManager.findFragmentByTag(FRAGMENT_TAG_WEBVIEW) as? RoomWidgetFragment)?.let { widgetFragment ->
-            if (widgetFragment.onBackPressed()) return
-        }
-        super.onBackPressed()
-    }
-
-
     /* ==========================================================================================
      * companion
      * ========================================================================================== */
diff --git a/vector/src/main/java/im/vector/fragments/roomwidgets/RoomWidgetFragment.kt b/vector/src/main/java/im/vector/fragments/roomwidgets/RoomWidgetFragment.kt
index d9bb48bc22..1acfff9821 100644
--- a/vector/src/main/java/im/vector/fragments/roomwidgets/RoomWidgetFragment.kt
+++ b/vector/src/main/java/im/vector/fragments/roomwidgets/RoomWidgetFragment.kt
@@ -37,6 +37,7 @@ import androidx.lifecycle.Observer
 import butterknife.BindView
 import com.airbnb.mvrx.*
 import im.vector.R
+import im.vector.activity.HandleBackParticipant
 import im.vector.activity.ReviewTermsActivity
 import im.vector.activity.util.TERMS_REQUEST_CODE
 import im.vector.fragments.VectorBaseMvRxFragment
@@ -44,7 +45,7 @@ import im.vector.ui.themes.ThemeUtils
 import im.vector.util.openUrlInExternalBrowser
 import org.matrix.androidsdk.features.terms.TermsManager
 
-class RoomWidgetFragment : VectorBaseMvRxFragment() {
+class RoomWidgetFragment : VectorBaseMvRxFragment(), HandleBackParticipant {
 
     var mWidgetWebView: WebView? = null
 
@@ -255,7 +256,7 @@ class RoomWidgetFragment : VectorBaseMvRxFragment() {
         super.onPrepareOptionsMenu(menu)
     }
 
-    fun onBackPressed(): Boolean = withState(viewModel) { state ->
+    override fun onBackPressed(): Boolean = withState(viewModel) { state ->
         if (state.formattedURL.complete) {
             if (mWidgetWebView?.canGoBack() == true) {
                 mWidgetWebView?.goBack()

From 6155f9410a8c137055b70b6b31eb1aac9f3e7896 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Tue, 19 Nov 2019 09:12:46 +0100
Subject: [PATCH 62/77] Cleaning

---
 vector/src/main/java/im/vector/activity/WidgetActivity.kt  | 7 +------
 .../im/vector/fragments/roomwidgets/RoomWidgetFragment.kt  | 2 +-
 .../im/vector/fragments/roomwidgets/RoomWidgetViewModel.kt | 4 ++--
 3 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/vector/src/main/java/im/vector/activity/WidgetActivity.kt b/vector/src/main/java/im/vector/activity/WidgetActivity.kt
index 5a2d02527f..ec23463c5f 100755
--- a/vector/src/main/java/im/vector/activity/WidgetActivity.kt
+++ b/vector/src/main/java/im/vector/activity/WidgetActivity.kt
@@ -18,7 +18,6 @@
 package im.vector.activity
 
 import android.annotation.SuppressLint
-import android.app.Activity
 import android.content.Context
 import android.content.Intent
 import android.graphics.Color
@@ -27,13 +26,9 @@ import androidx.core.content.ContextCompat
 import androidx.lifecycle.Observer
 import com.airbnb.mvrx.viewModel
 import im.vector.R
-import im.vector.activity.util.TERMS_REQUEST_CODE
-import im.vector.contacts.ContactsManager
 import im.vector.fragments.roomwidgets.*
 import im.vector.ui.themes.ThemeUtils
 import im.vector.widgets.Widget
-import org.matrix.androidsdk.core.callback.ApiCallback
-import org.matrix.androidsdk.features.terms.TermsManager
 
 /*
  * This class displays a widget
@@ -62,7 +57,7 @@ class WidgetActivity : VectorAppCompatActivity() {
 
         viewModel.selectSubscribe(this, RoomWidgetViewModelState::status) { ws ->
             when (ws) {
-                WidgetState.UNKWNOWN           -> {
+                WidgetState.UNKNOWN            -> {
                 }
                 WidgetState.WIDGET_NOT_ALLOWED -> {
                     val dFrag = supportFragmentManager.findFragmentByTag(FRAGMENT_TAG_PERMISSION) as? RoomWidgetPermissionBottomSheet
diff --git a/vector/src/main/java/im/vector/fragments/roomwidgets/RoomWidgetFragment.kt b/vector/src/main/java/im/vector/fragments/roomwidgets/RoomWidgetFragment.kt
index 1acfff9821..9d0b1b979d 100644
--- a/vector/src/main/java/im/vector/fragments/roomwidgets/RoomWidgetFragment.kt
+++ b/vector/src/main/java/im/vector/fragments/roomwidgets/RoomWidgetFragment.kt
@@ -180,7 +180,7 @@ class RoomWidgetFragment : VectorBaseMvRxFragment(), HandleBackParticipant {
     override fun invalidate() = withState(viewModel) { state ->
         //            mWidgetTypeTextView.text = it.widgetName
         when (state.status) {
-            WidgetState.UNKWNOWN           -> {
+            WidgetState.UNKNOWN            -> {
                 //Hide all?
                 mWidgetWebView?.isVisible = false
             }
diff --git a/vector/src/main/java/im/vector/fragments/roomwidgets/RoomWidgetViewModel.kt b/vector/src/main/java/im/vector/fragments/roomwidgets/RoomWidgetViewModel.kt
index be41d7be19..46bacd5834 100644
--- a/vector/src/main/java/im/vector/fragments/roomwidgets/RoomWidgetViewModel.kt
+++ b/vector/src/main/java/im/vector/fragments/roomwidgets/RoomWidgetViewModel.kt
@@ -35,13 +35,13 @@ import org.matrix.androidsdk.features.integrationmanager.IntegrationManager
 import org.matrix.androidsdk.features.terms.TermsNotSignedException
 
 enum class WidgetState {
-    UNKWNOWN,
+    UNKNOWN,
     WIDGET_NOT_ALLOWED,
     WIDGET_ALLOWED
 }
 
 data class RoomWidgetViewModelState(
-        val status: WidgetState = WidgetState.UNKWNOWN,
+        val status: WidgetState = WidgetState.UNKNOWN,
         val formattedURL: Async<String> = Uninitialized,
         val webviewLoadedUrl: Async<String> = Uninitialized,
         val widgetName: String = "",

From c80f2cc1616203db9645e47979c443f5d73c298a Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Tue, 19 Nov 2019 11:41:39 +0100
Subject: [PATCH 63/77] Permission UX for webviews

---
 .../vector/activity/AbstractWidgetActivity.kt |  3 +-
 .../roomwidgets/RoomWidgetFragment.kt         | 29 ++++-----
 .../roomwidgets/WebviewPermissionUtils.kt     | 64 +++++++++++++++++++
 vector/src/main/res/values/strings.xml        |  6 ++
 4 files changed, 85 insertions(+), 17 deletions(-)
 create mode 100644 vector/src/main/java/im/vector/fragments/roomwidgets/WebviewPermissionUtils.kt

diff --git a/vector/src/main/java/im/vector/activity/AbstractWidgetActivity.kt b/vector/src/main/java/im/vector/activity/AbstractWidgetActivity.kt
index 68ed3582e7..d0d63ffc33 100755
--- a/vector/src/main/java/im/vector/activity/AbstractWidgetActivity.kt
+++ b/vector/src/main/java/im/vector/activity/AbstractWidgetActivity.kt
@@ -31,6 +31,7 @@ import im.vector.Matrix
 import im.vector.R
 import im.vector.activity.util.INTEGRATION_MANAGER_ACTIVITY_REQUEST_CODE
 import im.vector.activity.util.TERMS_REQUEST_CODE
+import im.vector.fragments.roomwidgets.WebviewPermissionUtils
 import im.vector.types.JsonDict
 import im.vector.types.WidgetEventData
 import im.vector.util.AssetReader
@@ -194,7 +195,7 @@ abstract class AbstractWidgetActivity : VectorAppCompatActivity() {
             // Permission requests
             it.webChromeClient = object : WebChromeClient() {
                 override fun onPermissionRequest(request: PermissionRequest) {
-                    runOnUiThread { request.grant(request.resources) }
+                    WebviewPermissionUtils.promptForPermissions(R.string.room_widget_resource_permission_title, request, this@AbstractWidgetActivity)
                 }
 
                 override fun onConsoleMessage(consoleMessage: ConsoleMessage): Boolean {
diff --git a/vector/src/main/java/im/vector/fragments/roomwidgets/RoomWidgetFragment.kt b/vector/src/main/java/im/vector/fragments/roomwidgets/RoomWidgetFragment.kt
index 9d0b1b979d..79d29cd718 100644
--- a/vector/src/main/java/im/vector/fragments/roomwidgets/RoomWidgetFragment.kt
+++ b/vector/src/main/java/im/vector/fragments/roomwidgets/RoomWidgetFragment.kt
@@ -21,8 +21,6 @@ import android.content.Intent
 import android.graphics.Bitmap
 import android.os.Build
 import android.os.Bundle
-import android.os.Handler
-import android.os.Looper
 import android.view.Menu
 import android.view.MenuItem
 import android.view.View
@@ -250,9 +248,7 @@ class RoomWidgetFragment : VectorBaseMvRxFragment(), HandleBackParticipant {
     }
 
     override fun onPrepareOptionsMenu(menu: Menu?) = withState(viewModel) { state ->
-        menu?.findItem(R.id.action_close)?.let {
-            it.isVisible = state.canManageWidgets
-        }
+        menu?.findItem(R.id.action_close)?.isVisible = state.canManageWidgets
         super.onPrepareOptionsMenu(menu)
     }
 
@@ -283,16 +279,16 @@ class RoomWidgetFragment : VectorBaseMvRxFragment(), HandleBackParticipant {
      */
     @SuppressLint("NewApi")
     private fun configureWebView() {
-        mWidgetWebView?.let {
+        mWidgetWebView?.let { webview ->
             // xml value seems ignored
-            it.setBackgroundColor(ThemeUtils.getColor(requireContext(), R.attr.vctr_bottom_nav_background_color))
+            webview.setBackgroundColor(ThemeUtils.getColor(requireContext(), R.attr.vctr_bottom_nav_background_color))
 
             // clear caches
-            it.clearHistory()
-            it.clearFormData()
-            it.clearCache(true)
+            webview.clearHistory()
+            webview.clearFormData()
+            webview.clearCache(true)
 
-            it.settings.let { settings ->
+            webview.settings.let { settings ->
                 // does not cache the data
                 settings.cacheMode = WebSettings.LOAD_NO_CACHE
 
@@ -316,17 +312,19 @@ class RoomWidgetFragment : VectorBaseMvRxFragment(), HandleBackParticipant {
             }
 
             // Permission requests
-            it.webChromeClient = object : WebChromeClient() {
+            webview.webChromeClient = object : WebChromeClient() {
                 override fun onPermissionRequest(request: PermissionRequest) {
-                    Handler(Looper.getMainLooper()).post { request.grant(request.resources) }
+                    activity?.let {
+                        WebviewPermissionUtils.promptForPermissions(R.string.room_widget_resource_permission_title, request, it)
+                    }
                 }
             }
 
-            it.webViewClient = webViewClient
+            webview.webViewClient = webViewClient
 
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
                 val cookieManager = CookieManager.getInstance()
-                cookieManager.setAcceptThirdPartyCookies(mWidgetWebView, true)
+                cookieManager.setAcceptThirdPartyCookies(mWidgetWebView, false)
             }
         }
     }
@@ -346,5 +344,4 @@ class RoomWidgetFragment : VectorBaseMvRxFragment(), HandleBackParticipant {
             it.onPause()
         }
     }
-
 }
\ No newline at end of file
diff --git a/vector/src/main/java/im/vector/fragments/roomwidgets/WebviewPermissionUtils.kt b/vector/src/main/java/im/vector/fragments/roomwidgets/WebviewPermissionUtils.kt
new file mode 100644
index 0000000000..9e8237ccce
--- /dev/null
+++ b/vector/src/main/java/im/vector/fragments/roomwidgets/WebviewPermissionUtils.kt
@@ -0,0 +1,64 @@
+/*
+ * Copyright 2019 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.
+ * 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.
+ */
+package im.vector.fragments.roomwidgets
+
+import android.annotation.SuppressLint
+import android.app.Activity
+import android.content.Context
+import android.webkit.PermissionRequest
+import androidx.annotation.StringRes
+import androidx.appcompat.app.AlertDialog
+import im.vector.R
+
+object WebviewPermissionUtils {
+
+    @SuppressLint("NewApi")
+    fun promptForPermissions(@StringRes title: Int, request: PermissionRequest, activity: Activity) {
+        if (activity.isFinishing || activity.isDestroyed) return
+        val allowedPermissions = request.resources.map {
+            it to false
+        }.toMutableList()
+        AlertDialog.Builder(activity)
+                .setTitle(title)
+                .setMultiChoiceItems(
+                        request.resources.map { webPermissionToHumanReadable(it, activity) }.toTypedArray()
+                        , null
+                ) { dialog, which, isChecked ->
+                    allowedPermissions[which] = allowedPermissions[which].first to isChecked
+                }
+                .setPositiveButton(R.string.room_widget_resource_grant_permission) { dialog, wich ->
+                    activity.runOnUiThread {
+                        request.grant(allowedPermissions.mapNotNull { perm ->
+                            perm.first.takeIf { perm.second }
+                        }.toTypedArray())
+                    }
+                }
+                .setNegativeButton(R.string.room_widget_resource_decline_permission) { dialog, wich ->
+                    activity.runOnUiThread { request.deny() }
+                }
+                .show()
+    }
+
+    private fun webPermissionToHumanReadable(permission: String, context: Context): String {
+        return when (permission) {
+            PermissionRequest.RESOURCE_AUDIO_CAPTURE      -> context.getString(R.string.room_widget_webview_access_microphone)
+            PermissionRequest.RESOURCE_VIDEO_CAPTURE      -> context.getString(R.string.room_widget_webview_access_camera)
+            PermissionRequest.RESOURCE_PROTECTED_MEDIA_ID -> context.getString(R.string.room_widget_webview_read_protected_media)
+            else                                          -> permission
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index 558a6ab58b..04c414c3a5 100755
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -1132,6 +1132,12 @@
 
 
     <string name="error_jitsi_not_supported_on_old_device">Sorry, conference calls with Jitsi are not supported on old devices (devices with Android OS below 5.0)</string>
+    <string name="room_widget_resource_permission_title">This widget wants to use the following resources:</string>
+    <string name="room_widget_resource_grant_permission">Allow</string>
+    <string name="room_widget_resource_decline_permission">Block All</string>
+    <string name="room_widget_webview_access_camera">Use the camera</string>
+    <string name="room_widget_webview_access_microphone">Use the microphone</string>
+    <string name="room_widget_webview_read_protected_media">Read DRM protected Media</string>
 
     <!-- Widget Integration Manager -->
     <string name="widget_integration_unable_to_create">Unable to create widget.</string>

From 8ca07df98ae71fa4bd11ee96ebfd3fa9d774ad06 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Tue, 19 Nov 2019 14:15:43 +0100
Subject: [PATCH 64/77] Fixes #3379 revoke permission

---
 .../roomwidgets/RoomWidgetFragment.kt         |  6 ++++
 .../roomwidgets/RoomWidgetViewModel.kt        | 30 ++++++++++++++++++-
 vector/src/main/res/menu/menu_room_widget.xml |  5 ++++
 vector/src/main/res/values/strings.xml        |  1 +
 4 files changed, 41 insertions(+), 1 deletion(-)

diff --git a/vector/src/main/java/im/vector/fragments/roomwidgets/RoomWidgetFragment.kt b/vector/src/main/java/im/vector/fragments/roomwidgets/RoomWidgetFragment.kt
index 79d29cd718..9c7c6ba9e3 100644
--- a/vector/src/main/java/im/vector/fragments/roomwidgets/RoomWidgetFragment.kt
+++ b/vector/src/main/java/im/vector/fragments/roomwidgets/RoomWidgetFragment.kt
@@ -243,12 +243,18 @@ class RoomWidgetFragment : VectorBaseMvRxFragment(), HandleBackParticipant {
                 openUrlInExternalBrowser(requireContext(), state.formattedURL.invoke())
                 return@withState true
             }
+            R.id.action_revoke -> if (state.status == WidgetState.WIDGET_ALLOWED) {
+                viewModel.revokeWidget()
+                viewModel.doFinish()
+                return@withState true
+            }
         }
         return@withState super.onOptionsItemSelected(item)
     }
 
     override fun onPrepareOptionsMenu(menu: Menu?) = withState(viewModel) { state ->
         menu?.findItem(R.id.action_close)?.isVisible = state.canManageWidgets
+        menu?.findItem(R.id.action_revoke)?.isVisible = state.status == WidgetState.WIDGET_ALLOWED
         super.onPrepareOptionsMenu(menu)
     }
 
diff --git a/vector/src/main/java/im/vector/fragments/roomwidgets/RoomWidgetViewModel.kt b/vector/src/main/java/im/vector/fragments/roomwidgets/RoomWidgetViewModel.kt
index 46bacd5834..9f85515d71 100644
--- a/vector/src/main/java/im/vector/fragments/roomwidgets/RoomWidgetViewModel.kt
+++ b/vector/src/main/java/im/vector/fragments/roomwidgets/RoomWidgetViewModel.kt
@@ -28,6 +28,7 @@ import im.vector.ui.arch.LiveEvent
 import im.vector.widgets.Widget
 import im.vector.widgets.WidgetsManager
 import org.matrix.androidsdk.MXSession
+import org.matrix.androidsdk.core.Log
 import org.matrix.androidsdk.core.callback.ApiCallback
 import org.matrix.androidsdk.core.model.MatrixError
 import org.matrix.androidsdk.data.Room
@@ -165,7 +166,7 @@ class RoomWidgetViewModel(initialState: RoomWidgetViewModelState, val widget: Wi
         val isAllowed = session
                 ?.integrationManager
                 ?.getKnownWidgetPermissions()
-                ?.find { it.stateEventId == widget.widgetEvent.eventId  }
+                ?.find { it.stateEventId == widget.widgetEvent.eventId }
                 ?.allowed
                 ?: false
 
@@ -276,6 +277,33 @@ class RoomWidgetViewModel(initialState: RoomWidgetViewModelState, val widget: Wi
         }
     }
 
+    fun revokeWidget(onFinished: (() -> Unit)? = null) {
+        setState {
+            copy(
+                    status = WidgetState.UNKNOWN
+            )
+        }
+        session?.integrationManager?.setWidgetAllowed(widget.widgetEvent?.eventId
+                ?: "", false, object : ApiCallback<Void?> {
+            override fun onSuccess(info: Void?) {
+                onFinished?.invoke()
+            }
+
+            override fun onUnexpectedError(e: Exception) {
+                Log.e(this::class.java.name, e.message)
+            }
+
+            override fun onNetworkError(e: Exception) {
+                Log.e(this::class.java.name, e.message)
+            }
+
+            override fun onMatrixError(e: MatrixError) {
+                Log.e(this::class.java.name, e.message)
+            }
+
+        })
+    }
+
     override fun onCleared() {
         super.onCleared()
         widgetsManager?.removeListener(mWidgetListener)
diff --git a/vector/src/main/res/menu/menu_room_widget.xml b/vector/src/main/res/menu/menu_room_widget.xml
index 68ae2c2a7a..67b0fda42f 100644
--- a/vector/src/main/res/menu/menu_room_widget.xml
+++ b/vector/src/main/res/menu/menu_room_widget.xml
@@ -23,4 +23,9 @@
         android:title="@string/delete"
         app:showAsAction="ifRoom" />
 
+    <item
+        android:id="@+id/action_revoke"
+        android:title="@string/room_widget_revoke_access"
+        app:showAsAction="never" />
+
 </menu>
\ No newline at end of file
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index 04c414c3a5..e1592c74b4 100755
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -1122,6 +1122,7 @@
     <string name="room_widget_failed_to_load">Failed to load widget.\n%s</string>
     <string name="room_widget_reload">Reload widget</string>
     <string name="room_widget_open_in_browser">Open in browser</string>
+    <string name="room_widget_revoke_access">Revoke access for me</string>
 
     <string name="room_widget_permission_display_name">Your display name</string>
     <string name="room_widget_permission_avatar_url">Your avatar URL</string>

From a765cdb7f794a75366899e5a1b160d60f1681c12 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Tue, 19 Nov 2019 17:03:13 +0100
Subject: [PATCH 65/77] Remove unneeded runOnUiThread

---
 .../fragments/roomwidgets/WebviewPermissionUtils.kt    | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/vector/src/main/java/im/vector/fragments/roomwidgets/WebviewPermissionUtils.kt b/vector/src/main/java/im/vector/fragments/roomwidgets/WebviewPermissionUtils.kt
index 9e8237ccce..74d79f775f 100644
--- a/vector/src/main/java/im/vector/fragments/roomwidgets/WebviewPermissionUtils.kt
+++ b/vector/src/main/java/im/vector/fragments/roomwidgets/WebviewPermissionUtils.kt
@@ -40,14 +40,12 @@ object WebviewPermissionUtils {
                     allowedPermissions[which] = allowedPermissions[which].first to isChecked
                 }
                 .setPositiveButton(R.string.room_widget_resource_grant_permission) { dialog, wich ->
-                    activity.runOnUiThread {
-                        request.grant(allowedPermissions.mapNotNull { perm ->
-                            perm.first.takeIf { perm.second }
-                        }.toTypedArray())
-                    }
+                    request.grant(allowedPermissions.mapNotNull { perm ->
+                        perm.first.takeIf { perm.second }
+                    }.toTypedArray())
                 }
                 .setNegativeButton(R.string.room_widget_resource_decline_permission) { dialog, wich ->
-                    activity.runOnUiThread { request.deny() }
+                    request.deny()
                 }
                 .show()
     }

From 96305deab5648d6494eca26f160465865732dc5d Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Wed, 20 Nov 2019 15:55:33 +0100
Subject: [PATCH 66/77] Jitsi Widget Permissions

---
 CHANGES.rst                                   |   3 +-
 .../im/vector/activity/JitsiCallActivity.java |  18 ++-
 .../vector/activity/VectorRoomActivity.java   |  34 ++++-
 .../java/im/vector/activity/WidgetActivity.kt |   6 +-
 .../RoomWidgetPermissionBottomSheet.kt        |  19 ++-
 .../RoomWidgetPermissionViewModel.kt          | 125 ++++++++++--------
 .../src/main/java/im/vector/util/UrlUtil.kt   |  11 ++
 .../im/vector/widgets/WidgetsManager.java     |  16 +++
 vector/src/main/res/values/strings.xml        |   3 +-
 9 files changed, 166 insertions(+), 69 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index f21a53a50b..252e0285a1 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -6,9 +6,10 @@ MatrixSdk 🚀:
 
 Features ✨:
  - Privacy / Room Widget permissions (#3378)
+ - Privacy / Widget Permission for jitsi widgets (#3391)
 
 Improvementss 🙌:
- -
+ - Jitsi / Use mx display name in Jitsi conf
 
 Other changes:
  - Add User-Interactive Auth to /account/3pid/add (#3333)
diff --git a/vector/src/main/java/im/vector/activity/JitsiCallActivity.java b/vector/src/main/java/im/vector/activity/JitsiCallActivity.java
index 6113f75c6f..0720e73f37 100755
--- a/vector/src/main/java/im/vector/activity/JitsiCallActivity.java
+++ b/vector/src/main/java/im/vector/activity/JitsiCallActivity.java
@@ -31,12 +31,14 @@
 import org.jitsi.meet.sdk.JitsiMeetActivityDelegate;
 import org.jitsi.meet.sdk.JitsiMeetActivityInterface;
 import org.jitsi.meet.sdk.JitsiMeetConferenceOptions;
+import org.jitsi.meet.sdk.JitsiMeetUserInfo;
 import org.jitsi.meet.sdk.JitsiMeetView;
 import org.jitsi.meet.sdk.JitsiMeetViewListener;
 import org.matrix.androidsdk.MXSession;
 import org.matrix.androidsdk.core.Log;
 import org.matrix.androidsdk.data.Room;
 
+import java.net.URL;
 import java.util.Map;
 
 import butterknife.BindView;
@@ -65,7 +67,7 @@ public class JitsiCallActivity extends VectorAppCompatActivity implements JitsiM
     /**
      * Base server URL
      */
-    private static final String JITSI_SERVER_URL = "https://jitsi.riot.im/";
+    public static final String JITSI_SERVER_URL = "https://jitsi.riot.im/";
 
     // the jitsi view
     private JitsiMeetView mJitsiView;
@@ -156,8 +158,22 @@ public void initUiAndData() {
      */
     private void loadURL() {
         try {
+            JitsiMeetUserInfo userInfo = new JitsiMeetUserInfo();
+            userInfo.setDisplayName(mSession.getMyUser().displayname);
+            try {
+                String avatarUrl = mSession.getMyUser().avatar_url;
+                if (avatarUrl != null) {
+                    String downloadableUrl = mSession.getContentManager().getDownloadableUrl(avatarUrl, false);
+                    if (downloadableUrl != null) {
+                        userInfo.setAvatar(new URL(downloadableUrl));
+                    }
+                }
+            } catch (Exception e) {
+                //nop
+            }
             JitsiMeetConferenceOptions jitsiMeetConferenceOptions = new JitsiMeetConferenceOptions.Builder()
                     .setVideoMuted(!mIsVideoCall)
+                    .setUserInfo(userInfo)
                     // Configure the title of the screen
                     // TODO config.putString("callDisplayName", mRoom.getRoomDisplayName(this));
                     .setRoom(mCallUrl)
diff --git a/vector/src/main/java/im/vector/activity/VectorRoomActivity.java b/vector/src/main/java/im/vector/activity/VectorRoomActivity.java
index 9dd13f31e0..5fefcc4d57 100755
--- a/vector/src/main/java/im/vector/activity/VectorRoomActivity.java
+++ b/vector/src/main/java/im/vector/activity/VectorRoomActivity.java
@@ -118,6 +118,7 @@
 import im.vector.fragments.VectorMessageListFragment;
 import im.vector.fragments.VectorReadReceiptsDialogFragment;
 import im.vector.fragments.VectorUnknownDevicesFragment;
+import im.vector.fragments.roomwidgets.RoomWidgetPermissionBottomSheet;
 import im.vector.listeners.IMessagesAdapterActionsListener;
 import im.vector.ui.themes.ThemeUtils;
 import im.vector.util.CallsManager;
@@ -128,6 +129,7 @@
 import im.vector.util.ReadMarkerManager;
 import im.vector.util.RoomUtils;
 import im.vector.util.SlashCommandsParser;
+import im.vector.util.UrlUtilKt;
 import im.vector.util.VectorMarkdownParser;
 import im.vector.util.VectorRoomMediasSender;
 import im.vector.util.VectorUtils;
@@ -138,6 +140,7 @@
 import im.vector.view.VectorPendingCallView;
 import im.vector.widgets.Widget;
 import im.vector.widgets.WidgetsManager;
+import kotlin.Unit;
 
 /**
  * Displays a single room with messages.
@@ -924,7 +927,7 @@ public void onClick(final List<Widget> widgets) {
                     }
 
                     new AlertDialog.Builder(VectorRoomActivity.this)
-                            .setItems(widgetNames.toArray(CharSequences),  new DialogInterface.OnClickListener() {
+                            .setItems(widgetNames.toArray(CharSequences), new DialogInterface.OnClickListener() {
                                 @Override
                                 public void onClick(DialogInterface d, int n) {
                                     d.cancel();
@@ -1765,10 +1768,31 @@ private void launchJitsiActivity(Widget widget, boolean aIsVideoCall) {
                     .setPositiveButton(R.string.ok, null)
                     .show();
         } else {
-            final Intent intent = new Intent(this, JitsiCallActivity.class);
-            intent.putExtra(JitsiCallActivity.EXTRA_WIDGET_ID, widget);
-            intent.putExtra(JitsiCallActivity.EXTRA_ENABLE_VIDEO, aIsVideoCall);
-            startActivity(intent);
+            //Here check native widget perm
+
+            String domain = UrlUtilKt.extractDomain(JitsiCallActivity.JITSI_SERVER_URL);
+            if (domain == null) return; //display a toast?
+            boolean isAllowed = mSession.getIntegrationManager().isVideoConfDomainAllowed(domain);
+            if (isAllowed) {
+                final Intent intent = new Intent(this, JitsiCallActivity.class);
+                intent.putExtra(JitsiCallActivity.EXTRA_WIDGET_ID, widget);
+                intent.putExtra(JitsiCallActivity.EXTRA_ENABLE_VIDEO, aIsVideoCall);
+                startActivity(intent);
+            } else {
+                //we need to prompt for permissions
+                RoomWidgetPermissionBottomSheet bs = RoomWidgetPermissionBottomSheet.Companion
+                        .newInstance(mSession.getMyUserId(), widget);
+                bs.setOnFinish((accepted) -> {
+                    if (accepted) {
+                        final Intent intent = new Intent(this, JitsiCallActivity.class);
+                        intent.putExtra(JitsiCallActivity.EXTRA_WIDGET_ID, widget);
+                        intent.putExtra(JitsiCallActivity.EXTRA_ENABLE_VIDEO, aIsVideoCall);
+                        startActivity(intent);
+                    }
+                    return Unit.INSTANCE;
+                });
+                bs.show(getSupportFragmentManager(), "JitsyPerm");
+            }
         }
     }
 
diff --git a/vector/src/main/java/im/vector/activity/WidgetActivity.kt b/vector/src/main/java/im/vector/activity/WidgetActivity.kt
index ec23463c5f..388c74d1c4 100755
--- a/vector/src/main/java/im/vector/activity/WidgetActivity.kt
+++ b/vector/src/main/java/im/vector/activity/WidgetActivity.kt
@@ -65,7 +65,11 @@ class WidgetActivity : VectorAppCompatActivity() {
                         //already there
                     } else {
                         RoomWidgetPermissionBottomSheet
-                                .newInstance(viewModel.session!!.myUserId, viewModel.widget)
+                                .newInstance(viewModel.session!!.myUserId, viewModel.widget).apply {
+                                    onFinish = { accepted ->
+                                        if (!accepted) finish()
+                                    }
+                                }
                                 .show(supportFragmentManager, FRAGMENT_TAG_PERMISSION)
                     }
                 }
diff --git a/vector/src/main/java/im/vector/fragments/roomwidgets/RoomWidgetPermissionBottomSheet.kt b/vector/src/main/java/im/vector/fragments/roomwidgets/RoomWidgetPermissionBottomSheet.kt
index e3ed883d5e..b08dc865bf 100644
--- a/vector/src/main/java/im/vector/fragments/roomwidgets/RoomWidgetPermissionBottomSheet.kt
+++ b/vector/src/main/java/im/vector/fragments/roomwidgets/RoomWidgetPermissionBottomSheet.kt
@@ -26,7 +26,6 @@ import android.widget.TextView
 import butterknife.BindView
 import butterknife.OnClick
 import com.airbnb.mvrx.MvRx
-import com.airbnb.mvrx.activityViewModel
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
 import im.vector.R
@@ -53,8 +52,8 @@ class RoomWidgetPermissionBottomSheet : VectorBaseBottomSheetDialogFragment() {
 
     @BindView(R.id.bottom_sheet_widget_permission_owner_avatar)
     lateinit var authorAvatarView: ImageView
-
-    private val sharedActivityViewModel: RoomWidgetViewModel by activityViewModel()
+    
+    var onFinish: ((Boolean) -> Unit)? = null
 
     override fun invalidate() = withState(viewModel) { state ->
 
@@ -63,9 +62,13 @@ class RoomWidgetPermissionBottomSheet : VectorBaseBottomSheetDialogFragment() {
         VectorUtils.loadUserAvatar(requireContext(), viewModel.session, authorAvatarView,
                 state.authorAvatarUrl, state.authorId, state.authorName)
 
+        val domain = state.widgetDomain ?: ""
         val infoBuilder = SpannableStringBuilder()
-                .append(getString(R.string.room_widget_permission_shared_info_title, "'${state.widgetDomain
-                        ?: ""}'"))
+                .append(getString(
+                        R.string.room_widget_permission_webview_shared_info_title
+                                .takeIf { state.isWebviewWidget }
+                                ?: R.string.room_widget_permission_shared_info_title,
+                        "'$domain'"))
         infoBuilder.append("\n")
 
         state.permissionsList?.forEach {
@@ -94,19 +97,21 @@ class RoomWidgetPermissionBottomSheet : VectorBaseBottomSheetDialogFragment() {
         viewModel.blockWidget()
         //optimistic dismiss
         dismiss()
-        sharedActivityViewModel.doFinish()
+        onFinish?.invoke(false)
     }
 
     @OnClick(R.id.bottom_sheet_widget_permission_continue_button)
     fun doAccept() {
         viewModel.allowWidget()
+        onFinish?.invoke(true)
         //optimistic dismiss
         dismiss()
+
     }
 
     override fun onCancel(dialog: DialogInterface?) {
         super.onCancel(dialog)
-        sharedActivityViewModel.doFinish()
+        onFinish?.invoke(false)
     }
 
     @Parcelize
diff --git a/vector/src/main/java/im/vector/fragments/roomwidgets/RoomWidgetPermissionViewModel.kt b/vector/src/main/java/im/vector/fragments/roomwidgets/RoomWidgetPermissionViewModel.kt
index 85c61d790b..39cc586995 100644
--- a/vector/src/main/java/im/vector/fragments/roomwidgets/RoomWidgetPermissionViewModel.kt
+++ b/vector/src/main/java/im/vector/fragments/roomwidgets/RoomWidgetPermissionViewModel.kt
@@ -21,17 +21,19 @@ import com.airbnb.mvrx.MvRxViewModelFactory
 import com.airbnb.mvrx.ViewModelContext
 import im.vector.Matrix
 import im.vector.R
+import im.vector.activity.JitsiCallActivity
+import im.vector.util.extractDomain
 import im.vector.widgets.Widget
+import im.vector.widgets.WidgetsManager
 import org.matrix.androidsdk.MXSession
-import org.matrix.androidsdk.core.Log
-import org.matrix.androidsdk.core.callback.ApiCallback
-import org.matrix.androidsdk.core.model.MatrixError
+import org.matrix.androidsdk.core.callback.SimpleApiCallback
 import java.net.URL
 
 data class RoomWidgetPermissionViewState(
         val authorId: String = "",
         val authorAvatarUrl: String? = null,
         val authorName: String? = null,
+        val isWebviewWidget: Boolean = true,
         val widgetDomain: String? = null,
         //List of @StringRes
         val permissionsList: List<Int>? = null
@@ -40,49 +42,48 @@ data class RoomWidgetPermissionViewState(
 class RoomWidgetPermissionViewModel(val session: MXSession, val widget: Widget, initialState: RoomWidgetPermissionViewState)
     : BaseMvRxViewModel<RoomWidgetPermissionViewState>(initialState, false) {
 
-    fun allowWidget(onFinished: (() -> Unit)? = null) {
-        session.integrationManager.setWidgetAllowed(widget.widgetEvent?.eventId
-                ?: "", true, object : ApiCallback<Void?> {
+    fun allowWidget(onFinished: (() -> Unit)? = null) = withState { state ->
 
-            override fun onSuccess(info: Void?) {
-                onFinished?.invoke()
-            }
+        if (state.isWebviewWidget) {
+            session.integrationManager.setWidgetAllowed(widget.widgetEvent?.eventId
+                    ?: "", true, object : SimpleApiCallback<Void?>() {
 
-            override fun onUnexpectedError(e: Exception) {
-                Log.e(LOG_TAG, e.message)
-            }
+                override fun onSuccess(info: Void?) {
+                    onFinished?.invoke()
+                }
 
-            override fun onNetworkError(e: Exception) {
-                Log.e(LOG_TAG, e.message)
-            }
+            })
+        } else {
+            session.integrationManager.seVideoConfDomainAllowed(state.widgetDomain
+                    ?: "", true, object : SimpleApiCallback<Void?>() {
 
-            override fun onMatrixError(e: MatrixError) {
-                Log.e(LOG_TAG, e.message)
-            }
+                override fun onSuccess(info: Void?) {
+                    onFinished?.invoke()
+                }
 
-        })
+            })
+        }
     }
 
-    fun blockWidget(onFinished: (() -> Unit)? = null) {
-        session.integrationManager.setWidgetAllowed(widget.widgetEvent?.eventId
-                ?: "", false, object : ApiCallback<Void?> {
-            override fun onSuccess(info: Void?) {
-                onFinished?.invoke()
-            }
+    fun blockWidget(onFinished: (() -> Unit)? = null) = withState { state ->
+        if (state.isWebviewWidget) {
+            session.integrationManager.setWidgetAllowed(widget.widgetEvent?.eventId
+                    ?: "", false, object : SimpleApiCallback<Void?>() {
+                override fun onSuccess(info: Void?) {
+                    onFinished?.invoke()
+                }
 
-            override fun onUnexpectedError(e: Exception) {
-                Log.e(LOG_TAG, e.message)
-            }
+            })
+        } else {
+            session.integrationManager.seVideoConfDomainAllowed(state.widgetDomain
+                    ?: "", false, object : SimpleApiCallback<Void?>() {
 
-            override fun onNetworkError(e: Exception) {
-                Log.e(LOG_TAG, e.message)
-            }
-
-            override fun onMatrixError(e: MatrixError) {
-                Log.e(LOG_TAG, e.message)
-            }
+                override fun onSuccess(info: Void?) {
+                    onFinished?.invoke()
+                }
 
-        })
+            })
+        }
     }
 
     companion object : MvRxViewModelFactory<RoomWidgetPermissionViewModel, RoomWidgetPermissionViewState> {
@@ -110,23 +111,41 @@ class RoomWidgetPermissionViewModel(val session: MXSession, val widget: Widget,
                 domain = null
             }
 
-            //TODO check from widget urls the perms that should be shown?
-            //For now put all
-            val infoShared = listOf<Int>(
-                    R.string.room_widget_permission_display_name,
-                    R.string.room_widget_permission_avatar_url,
-                    R.string.room_widget_permission_user_id,
-                    R.string.room_widget_permission_theme,
-                    R.string.room_widget_permission_widget_id,
-                    R.string.room_widget_permission_room_id
-            )
-            return RoomWidgetPermissionViewState(
-                    authorName = creator?.displayname,
-                    authorId = widget.widgetEvent.sender,
-                    authorAvatarUrl = creator?.getAvatarUrl(),
-                    widgetDomain = domain,
-                    permissionsList = infoShared
-            )
+            if (WidgetsManager.isJitsiWidget(widget)) {
+                val infoShared = listOf<Int>(
+                        R.string.room_widget_permission_display_name,
+                        R.string.room_widget_permission_avatar_url
+                )
+                return RoomWidgetPermissionViewState(
+                        isWebviewWidget = false,
+                        authorName = creator?.displayname,
+                        authorId = widget.widgetEvent.sender,
+                        authorAvatarUrl = creator?.getAvatarUrl(),
+                        widgetDomain = extractDomain(JitsiCallActivity.JITSI_SERVER_URL),
+                        permissionsList = infoShared
+                )
+
+            } else {
+
+                //TODO check from widget urls the perms that should be shown?
+                //For now put all
+                val infoShared = listOf<Int>(
+                        R.string.room_widget_permission_display_name,
+                        R.string.room_widget_permission_avatar_url,
+                        R.string.room_widget_permission_user_id,
+                        R.string.room_widget_permission_theme,
+                        R.string.room_widget_permission_widget_id,
+                        R.string.room_widget_permission_room_id
+                )
+                return RoomWidgetPermissionViewState(
+                        authorName = creator?.displayname,
+                        authorId = widget.widgetEvent.sender,
+                        authorAvatarUrl = creator?.getAvatarUrl(),
+                        widgetDomain = domain,
+                        permissionsList = infoShared
+                )
+            }
+
         }
     }
 }
\ No newline at end of file
diff --git a/vector/src/main/java/im/vector/util/UrlUtil.kt b/vector/src/main/java/im/vector/util/UrlUtil.kt
index d40f27e5e8..7eb095cf27 100644
--- a/vector/src/main/java/im/vector/util/UrlUtil.kt
+++ b/vector/src/main/java/im/vector/util/UrlUtil.kt
@@ -16,6 +16,9 @@
 
 package im.vector.util
 
+import java.net.MalformedURLException
+import java.net.URL
+
 /**
  * Schemes
  */
@@ -41,4 +44,12 @@ fun removeUrlScheme(aUrl: String?): String? {
     }
 
     return urlRetValue
+}
+
+fun extractDomain(aUrl: String?): String? {
+    try {
+        return aUrl?.let {  URL(it).host }
+    } catch (e : MalformedURLException) {
+        return null
+    }
 }
\ No newline at end of file
diff --git a/vector/src/main/java/im/vector/widgets/WidgetsManager.java b/vector/src/main/java/im/vector/widgets/WidgetsManager.java
index c279238cab..0139c1f6c3 100755
--- a/vector/src/main/java/im/vector/widgets/WidgetsManager.java
+++ b/vector/src/main/java/im/vector/widgets/WidgetsManager.java
@@ -99,6 +99,22 @@ public List<Widget> getActiveWidgets(MXSession session, Room room) {
         return getActiveWidgets(session, room, null, null);
     }
 
+
+    public static Boolean isJitsiWidget(Widget widget) {
+        Event widgetEvent = widget.getWidgetEvent();
+        if (widgetEvent == null) return false;
+        try {
+            JsonObject jsonObject = widgetEvent.getContentAsJsonObject();
+            if (jsonObject != null && jsonObject.has("type")) {
+                String widgetType = jsonObject.get("type").getAsString();
+                return WIDGET_TYPE_JITSI.equals(widgetType);
+            }
+        } catch (Exception e) {
+            Log.e(LOG_TAG, "## getWidgets() failed : " + e.getMessage(), e);
+        }
+        return false;
+    }
+
     /**
      * List all active widgets in a room.
      *
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index e1592c74b4..f0e7d88a07 100755
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -1118,7 +1118,8 @@
     <string name="room_widget_activity_title">Widget</string>
     <string name="room_widget_permission_title">Load Widget</string>
     <string name="room_widget_permission_added_by">This widget was added by:</string>
-    <string name="room_widget_permission_shared_info_title">Using it may set cookies and share data with %s:</string>
+    <string name="room_widget_permission_webview_shared_info_title">Using it may set cookies and share data with %s:</string>
+    <string name="room_widget_permission_shared_info_title">Using it may share data with %s:</string>
     <string name="room_widget_failed_to_load">Failed to load widget.\n%s</string>
     <string name="room_widget_reload">Reload widget</string>
     <string name="room_widget_open_in_browser">Open in browser</string>

From 874fd637cfada45874a8dc58e26fed5b42e2978c Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Thu, 21 Nov 2019 11:41:23 +0100
Subject: [PATCH 67/77] Infinite restart loop after expired token error

Fixes #3249
---
 .../vector/activity/CommonActivityUtils.java  | 32 ++++++-------------
 .../java/im/vector/store/LoginStorage.java    |  2 +-
 2 files changed, 10 insertions(+), 24 deletions(-)

diff --git a/vector/src/main/java/im/vector/activity/CommonActivityUtils.java b/vector/src/main/java/im/vector/activity/CommonActivityUtils.java
index c35210e830..91f899042f 100755
--- a/vector/src/main/java/im/vector/activity/CommonActivityUtils.java
+++ b/vector/src/main/java/im/vector/activity/CommonActivityUtils.java
@@ -316,39 +316,34 @@ public static void logout(Activity activity) {
     private static boolean isRecoveringFromInvalidatedToken = false;
 
     public static void recoverInvalidatedToken() {
+        Log.e(LOG_TAG, "## recoverInvalidatedToken: Start Recover ");
 
         if (isRecoveringFromInvalidatedToken) {
             //ignore, we are doing it
+            Log.e(LOG_TAG, "## recoverInvalidatedToken: ignore, we are doing it");
             return;
         }
         isRecoveringFromInvalidatedToken = true;
         Context context = VectorApp.getCurrentActivity() != null ? VectorApp.getCurrentActivity() : VectorApp.getInstance();
 
         try {
+
+            // Clear the credentials
+            Matrix.getInstance(context).getLoginStorage().clear() ;
+
+
             VectorApp.getInstance().getNotificationDrawerManager().clearAllEvents();
-            EventStreamServiceX.Companion.onLogout(context);
-            // stopEventStream(context);
+            EventStreamServiceX.Companion.onApplicationStopped(context);
 
             BadgeProxy.INSTANCE.updateBadgeCount(context, 0);
 
             MXSession session = Matrix.getInstance(context).getDefaultSession();
-
-            // Publish to the server that we're now offline
-            MyPresenceManager.getInstance(context, session).advertiseOffline();
-            MyPresenceManager.remove(session);
-
             // clear the preferences
             PreferencesManager.clearPreferences(context);
 
-            // reset the FCM
-            Matrix.getInstance(context).getPushManager().resetFCMRegistration();
-
             // clear the preferences
             Matrix.getInstance(context).getPushManager().clearPreferences();
 
-            // Clear the credentials
-            Matrix.getInstance(context).getLoginStorage().clear();
-
             // clear the tmp store list
             Matrix.getInstance(context).clearTmpStoresList();
 
@@ -358,20 +353,11 @@ public static void recoverInvalidatedToken() {
 
             MXMediaCache.clearThumbnailsCache(context);
 
-            Matrix.getInstance(context).clearSessions(context, true, new SimpleApiCallback<Void>() {
-
-                @Override
-                public void onSuccess(Void info) {
-
-                }
-            });
-            session.clear(context);
         } catch (Exception e) {
             Log.e(LOG_TAG, "## recoverInvalidatedToken: Error while cleaning: ", e);
         } finally {
-            // go to login page
-            CommonActivityUtils.restartApp(context, true);
             isRecoveringFromInvalidatedToken = false;
+            CommonActivityUtils.restartApp(context, true);
         }
     }
 
diff --git a/vector/src/main/java/im/vector/store/LoginStorage.java b/vector/src/main/java/im/vector/store/LoginStorage.java
index 28f7daaa28..51fa3eafa5 100755
--- a/vector/src/main/java/im/vector/store/LoginStorage.java
+++ b/vector/src/main/java/im/vector/store/LoginStorage.java
@@ -199,6 +199,6 @@ public void clear() {
         SharedPreferences prefs = mContext.getSharedPreferences(PREFS_LOGIN, Context.MODE_PRIVATE);
         SharedPreferences.Editor editor = prefs.edit();
         editor.remove(PREFS_KEY_CONNECTION_CONFIGS);
-        editor.apply();
+        editor.commit();
     }
 }
\ No newline at end of file

From fe1ab99b79889a6a8b77d20e3d1fbd0f1734ae70 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Thu, 21 Nov 2019 11:48:17 +0100
Subject: [PATCH 68/77] Update changes

---
 CHANGES.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index f21a53a50b..93037def56 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -15,6 +15,7 @@ Other changes:
 
 Bugfix 🐛:
  - Crash / potential NPE after logout (#3367)
+ - Fix infinite restart loop after token expiration (#3249)
 
 Translations 🗣:
  -

From 0992a16462687e634b20fc389397ac802ae1f332 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Thu, 21 Nov 2019 11:58:25 +0100
Subject: [PATCH 69/77] cleaning

---
 .../vector/fragments/VectorSettingsPreferencesFragment.kt   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/vector/src/main/java/im/vector/fragments/VectorSettingsPreferencesFragment.kt b/vector/src/main/java/im/vector/fragments/VectorSettingsPreferencesFragment.kt
index c53d8169f5..37c96aa7f8 100755
--- a/vector/src/main/java/im/vector/fragments/VectorSettingsPreferencesFragment.kt
+++ b/vector/src/main/java/im/vector/fragments/VectorSettingsPreferencesFragment.kt
@@ -635,9 +635,9 @@ class VectorSettingsPreferencesFragment : PreferenceFragmentCompat(), SharedPref
 
                 //Disable it while updating the state, will be re-enabled by the account data listener.
                 it.isEnabled = false
-                mSession.enableIntegrationManagerUsage(newValue as Boolean, object : ApiCallback<Void> {
+                mSession.integrationManager.enableIntegrationManagerUsage(newValue as Boolean, object : ApiCallback<Void> {
                     override fun onSuccess(info: Void?) {
-                        //nop
+                        refreshIntegrationManagerSettings()
                     }
 
                     override fun onUnexpectedError(e: java.lang.Exception?) {
@@ -2038,7 +2038,7 @@ class VectorSettingsPreferencesFragment : PreferenceFragmentCompat(), SharedPref
             mSession.identityServerManager.checkAdd3pidInteractiveFlow(listOf(LoginRestClient.LOGIN_FLOW_TYPE_PASSWORD),
                     object : ApiCallback<IdentityServerManager.SupportedFlowResult> {
                         override fun onSuccess(info: IdentityServerManager.SupportedFlowResult) {
-                            addEmailBtn.isEnabled =  info == IdentityServerManager.SupportedFlowResult.SUPPORTED
+                            addEmailBtn.isEnabled = info == IdentityServerManager.SupportedFlowResult.SUPPORTED
                                     || info == IdentityServerManager.SupportedFlowResult.INTERACTIVE_AUTH_NOT_SUPPORTED
                         }
 

From 7f4988b374f3ec2b3a3e808cf62f344d0abae35c Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoitm@matrix.org>
Date: Thu, 21 Nov 2019 12:51:48 +0100
Subject: [PATCH 70/77] Advertize more clearly that new feature PRs will rarely
 be considered

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 4e361a3abd..15ac478e50 100755
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@ Riot-Android [![Buildkite](https://badge.buildkite.com/5ae4f24dd485562a5b59a9f84
 Important Announcement
 ======================
 
-The core team is now working mainly on [RiotX](https://github.com/vector-im/riotX-android). New contributions (PR, issues) are still welcome, but be aware that this codebase will be replaced in the future by the RiotX implementation.
+The core team is now working mainly on [RiotX](https://github.com/vector-im/riotX-android). New contributions about security concerns (PR, issues) are still welcome. Other subjects may rarely be addressed, as we do not have time to spend on maintenance on new features. Please contribute to RiotX now!
 
 Contributing
 ============

From 32ad61eae0abfe4174deddea04641c71a9d16d37 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Thu, 21 Nov 2019 17:30:03 +0100
Subject: [PATCH 71/77] Pass all actions in context menu

---
 vector/src/main/res/menu/menu_room_widget.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/vector/src/main/res/menu/menu_room_widget.xml b/vector/src/main/res/menu/menu_room_widget.xml
index 67b0fda42f..c4a3c561bd 100644
--- a/vector/src/main/res/menu/menu_room_widget.xml
+++ b/vector/src/main/res/menu/menu_room_widget.xml
@@ -7,21 +7,21 @@
         android:icon="@drawable/ic_widget_refresh"
         android:iconTint="?attr/vctr_icon_tint_on_dark_action_bar_color"
         android:title="@string/room_widget_reload"
-        app:showAsAction="ifRoom" />
+        app:showAsAction="never" />
 
     <item
         android:id="@+id/action_widget_open_ext"
         android:icon="@drawable/ic_widget_external_link"
         android:iconTint="?attr/vctr_icon_tint_on_dark_action_bar_color"
         android:title="@string/room_widget_open_in_browser"
-        app:showAsAction="ifRoom" />
+        app:showAsAction="never" />
 
     <item
         android:id="@+id/action_close"
         android:icon="@drawable/ic_widget_bin"
         android:iconTint="@color/vector_error_color"
         android:title="@string/delete"
-        app:showAsAction="ifRoom" />
+        app:showAsAction="never" />
 
     <item
         android:id="@+id/action_revoke"

From 20b8eed0f7d0bda99adb8c0f7d384d45f2cf4178 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Thu, 21 Nov 2019 17:30:49 +0100
Subject: [PATCH 72/77] Fix / widgets hidden when no IM in settings

---
 .../main/java/im/vector/activity/JitsiCallActivity.java   | 5 -----
 .../src/main/java/im/vector/view/ActiveWidgetsBanner.java | 8 ++------
 .../im/vector/view/VectorOngoingConferenceCallView.java   | 8 ++------
 .../src/main/java/im/vector/widgets/WidgetsManager.java   | 8 ++++----
 4 files changed, 8 insertions(+), 21 deletions(-)

diff --git a/vector/src/main/java/im/vector/activity/JitsiCallActivity.java b/vector/src/main/java/im/vector/activity/JitsiCallActivity.java
index 0720e73f37..752e678ff1 100755
--- a/vector/src/main/java/im/vector/activity/JitsiCallActivity.java
+++ b/vector/src/main/java/im/vector/activity/JitsiCallActivity.java
@@ -136,11 +136,6 @@ public void initUiAndData() {
             return;
         }
 
-        if (getWidgetManager() == null) {
-            finish();
-            return;
-        }
-
         mRoom = mSession.getDataHandler().getRoom(mWidget.getRoomId());
         if (null == mRoom) {
             Log.e(LOG_TAG, "## onCreate() : undefined room " + mWidget.getRoomId());
diff --git a/vector/src/main/java/im/vector/view/ActiveWidgetsBanner.java b/vector/src/main/java/im/vector/view/ActiveWidgetsBanner.java
index 171fd7f528..22d37f91cf 100755
--- a/vector/src/main/java/im/vector/view/ActiveWidgetsBanner.java
+++ b/vector/src/main/java/im/vector/view/ActiveWidgetsBanner.java
@@ -171,12 +171,8 @@ public void setOnUpdateListener(onUpdateListener listener) {
      * Refresh the view visibility
      */
     private void refresh() {
-        WidgetsManager wm = getWidgetManager(getContext());
-        if (wm == null) {
-            return;
-        }
         if ((null != mRoom) && (null != mSession)) {
-            List<Widget> activeWidgets = wm.getActiveWebviewWidgets(mSession, mRoom);
+            List<Widget> activeWidgets = WidgetsManager.getActiveWebviewWidgets(mSession, mRoom);
             Widget firstWidget = null;
 
             if ((activeWidgets.size() != mActiveWidgets.size()) || !mActiveWidgets.containsAll(activeWidgets)) {
@@ -202,7 +198,7 @@ private void refresh() {
             setVisibility((mActiveWidgets.size() > 0) ? View.VISIBLE : View.GONE);
 
             // show the close widget button if the user is allowed to do it
-            mCloseWidgetIcon.setVisibility(((null != firstWidget) && (null == wm.checkWidgetPermission(mSession, mRoom))) ?
+            mCloseWidgetIcon.setVisibility(((null != firstWidget) && (null == WidgetsManager.checkWidgetPermission(mSession, mRoom))) ?
                     View.VISIBLE : View.GONE);
         }
     }
diff --git a/vector/src/main/java/im/vector/view/VectorOngoingConferenceCallView.java b/vector/src/main/java/im/vector/view/VectorOngoingConferenceCallView.java
index fbb135fc26..5c6852c014 100755
--- a/vector/src/main/java/im/vector/view/VectorOngoingConferenceCallView.java
+++ b/vector/src/main/java/im/vector/view/VectorOngoingConferenceCallView.java
@@ -243,12 +243,8 @@ public void setCallClickListener(ICallClickListener callClickListener) {
      * Refresh the view visibility
      */
     public void refresh() {
-        WidgetsManager wm = Matrix.getWidgetManager(getContext());
-        if (wm == null) {
-            return;
-        }
         if ((null != mRoom) && (null != mSession)) {
-            List<Widget> mActiveWidgets = wm.getActiveJitsiWidgets(mSession, mRoom);
+            List<Widget> mActiveWidgets = WidgetsManager.getActiveJitsiWidgets(mSession, mRoom);
             Widget widget = mActiveWidgets.isEmpty() ? null : mActiveWidgets.get(0);
 
             if (mActiveWidget != widget) {
@@ -266,7 +262,7 @@ public void refresh() {
             setVisibility(((!MXCallsManager.isCallInProgress(call) && mRoom.isOngoingConferenceCall()) || (null != mActiveWidget)) ? View.VISIBLE : View.GONE);
 
             // show the close widget button if the user is allowed to do it
-            mCloseWidgetIcon.setVisibility(((null != mActiveWidget) && (null == wm.checkWidgetPermission(mSession, mRoom))) ?
+            mCloseWidgetIcon.setVisibility(((null != mActiveWidget) && (null == WidgetsManager.checkWidgetPermission(mSession, mRoom))) ?
                     View.VISIBLE : View.GONE);
         }
     }
diff --git a/vector/src/main/java/im/vector/widgets/WidgetsManager.java b/vector/src/main/java/im/vector/widgets/WidgetsManager.java
index 0139c1f6c3..70be4c0626 100755
--- a/vector/src/main/java/im/vector/widgets/WidgetsManager.java
+++ b/vector/src/main/java/im/vector/widgets/WidgetsManager.java
@@ -95,7 +95,7 @@ public String getUIUrl() {
      * @param room    the room to check.
      * @return the active widgets list
      */
-    public List<Widget> getActiveWidgets(MXSession session, Room room) {
+    public static List<Widget> getActiveWidgets(MXSession session, Room room) {
         return getActiveWidgets(session, room, null, null);
     }
 
@@ -124,7 +124,7 @@ public static Boolean isJitsiWidget(Widget widget) {
      * @param excludedTypes the excluded widget types
      * @return the active widgets list
      */
-    private List<Widget> getActiveWidgets(final MXSession session, final Room room, final Set<String> widgetTypes, final Set<String> excludedTypes) {
+    private static List<Widget> getActiveWidgets(final MXSession session, final Room room, final Set<String> widgetTypes, final Set<String> excludedTypes) {
         // Get all im.vector.modular.widgets state events in the room
         List<Event> widgetEvents = room.getState().getStateEvents(new HashSet<>(Arrays.asList(WIDGET_EVENT_TYPE)));
 
@@ -210,7 +210,7 @@ public int compare(Event e1, Event e2) {
      * @param room    the room
      * @return the list of active widgets
      */
-    public List<Widget> getActiveJitsiWidgets(final MXSession session, final Room room) {
+    public static List<Widget> getActiveJitsiWidgets(final MXSession session, final Room room) {
         return getActiveWidgets(session, room, new HashSet<>(Arrays.asList(WidgetsManager.WIDGET_TYPE_JITSI)), null);
     }
 
@@ -221,7 +221,7 @@ public List<Widget> getActiveJitsiWidgets(final MXSession session, final Room ro
      * @param room    the room
      * @return the list of active widgets
      */
-    public List<Widget> getActiveWebviewWidgets(final MXSession session, final Room room) {
+    public static List<Widget> getActiveWebviewWidgets(final MXSession session, final Room room) {
         return getActiveWidgets(session, room, null, new HashSet<>(Arrays.asList(WidgetsManager.WIDGET_TYPE_JITSI)));
     }
 

From 8164374937dcaf677194069e0b30ea58b4cc3a5d Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Thu, 21 Nov 2019 17:33:16 +0100
Subject: [PATCH 73/77] Refactor due to SDK changes for native_widgets

---
 .../java/im/vector/activity/IntegrationManagerActivity.kt     | 2 +-
 .../src/main/java/im/vector/activity/VectorRoomActivity.java  | 2 +-
 .../fragments/roomwidgets/RoomWidgetPermissionViewModel.kt    | 4 ++--
 .../im/vector/fragments/roomwidgets/RoomWidgetViewModel.kt    | 4 +---
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/vector/src/main/java/im/vector/activity/IntegrationManagerActivity.kt b/vector/src/main/java/im/vector/activity/IntegrationManagerActivity.kt
index 1e0b32bee8..057dd99806 100755
--- a/vector/src/main/java/im/vector/activity/IntegrationManagerActivity.kt
+++ b/vector/src/main/java/im/vector/activity/IntegrationManagerActivity.kt
@@ -259,7 +259,7 @@ class IntegrationManagerActivity : AbstractWidgetActivity() {
 
         Log.d(LOG_TAG, "Received request to get widget in room " + mRoom!!.roomId)
 
-        val widgets = widgetManager.getActiveWidgets(mSession, mRoom)
+        val widgets = WidgetsManager.getActiveWidgets(mSession, mRoom)
         val responseData = ArrayList<JsonDict<Any>>()
 
         for (widget in widgets) {
diff --git a/vector/src/main/java/im/vector/activity/VectorRoomActivity.java b/vector/src/main/java/im/vector/activity/VectorRoomActivity.java
index 5fefcc4d57..c7aac0574a 100755
--- a/vector/src/main/java/im/vector/activity/VectorRoomActivity.java
+++ b/vector/src/main/java/im/vector/activity/VectorRoomActivity.java
@@ -1772,7 +1772,7 @@ private void launchJitsiActivity(Widget widget, boolean aIsVideoCall) {
 
             String domain = UrlUtilKt.extractDomain(JitsiCallActivity.JITSI_SERVER_URL);
             if (domain == null) return; //display a toast?
-            boolean isAllowed = mSession.getIntegrationManager().isVideoConfDomainAllowed(domain);
+            boolean isAllowed = mSession.getIntegrationManager().isNativeWidgetAllowed("jitsi", domain);
             if (isAllowed) {
                 final Intent intent = new Intent(this, JitsiCallActivity.class);
                 intent.putExtra(JitsiCallActivity.EXTRA_WIDGET_ID, widget);
diff --git a/vector/src/main/java/im/vector/fragments/roomwidgets/RoomWidgetPermissionViewModel.kt b/vector/src/main/java/im/vector/fragments/roomwidgets/RoomWidgetPermissionViewModel.kt
index 39cc586995..8d5c1c35d5 100644
--- a/vector/src/main/java/im/vector/fragments/roomwidgets/RoomWidgetPermissionViewModel.kt
+++ b/vector/src/main/java/im/vector/fragments/roomwidgets/RoomWidgetPermissionViewModel.kt
@@ -54,7 +54,7 @@ class RoomWidgetPermissionViewModel(val session: MXSession, val widget: Widget,
 
             })
         } else {
-            session.integrationManager.seVideoConfDomainAllowed(state.widgetDomain
+            session.integrationManager.setNativeWidgetDomainAllowed("jitsi", state.widgetDomain
                     ?: "", true, object : SimpleApiCallback<Void?>() {
 
                 override fun onSuccess(info: Void?) {
@@ -75,7 +75,7 @@ class RoomWidgetPermissionViewModel(val session: MXSession, val widget: Widget,
 
             })
         } else {
-            session.integrationManager.seVideoConfDomainAllowed(state.widgetDomain
+            session.integrationManager.setNativeWidgetDomainAllowed("jitsi", state.widgetDomain
                     ?: "", false, object : SimpleApiCallback<Void?>() {
 
                 override fun onSuccess(info: Void?) {
diff --git a/vector/src/main/java/im/vector/fragments/roomwidgets/RoomWidgetViewModel.kt b/vector/src/main/java/im/vector/fragments/roomwidgets/RoomWidgetViewModel.kt
index 9f85515d71..0e822193e8 100644
--- a/vector/src/main/java/im/vector/fragments/roomwidgets/RoomWidgetViewModel.kt
+++ b/vector/src/main/java/im/vector/fragments/roomwidgets/RoomWidgetViewModel.kt
@@ -165,9 +165,7 @@ class RoomWidgetViewModel(initialState: RoomWidgetViewModelState, val widget: Wi
 
         val isAllowed = session
                 ?.integrationManager
-                ?.getKnownWidgetPermissions()
-                ?.find { it.stateEventId == widget.widgetEvent.eventId }
-                ?.allowed
+                ?.isWidgetAllowed( widget.widgetEvent.eventId)
                 ?: false
 
         if (!isAllowed) {

From 99cbe961c41b2f9a7d46b43128cee77c4f8adbf9 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Thu, 21 Nov 2019 17:53:07 +0100
Subject: [PATCH 74/77] Add comment

---
 vector/src/main/java/im/vector/store/LoginStorage.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/vector/src/main/java/im/vector/store/LoginStorage.java b/vector/src/main/java/im/vector/store/LoginStorage.java
index 51fa3eafa5..bfb7c04264 100755
--- a/vector/src/main/java/im/vector/store/LoginStorage.java
+++ b/vector/src/main/java/im/vector/store/LoginStorage.java
@@ -199,6 +199,7 @@ public void clear() {
         SharedPreferences prefs = mContext.getSharedPreferences(PREFS_LOGIN, Context.MODE_PRIVATE);
         SharedPreferences.Editor editor = prefs.edit();
         editor.remove(PREFS_KEY_CONNECTION_CONFIGS);
+        //Need to commit now because called before forcing an app restart
         editor.commit();
     }
 }
\ No newline at end of file

From 80b197e9911bda01a535b38771d548c27896dba1 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Thu, 21 Nov 2019 18:15:10 +0100
Subject: [PATCH 75/77] fix typo

---
 vector/src/main/java/im/vector/activity/VectorRoomActivity.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vector/src/main/java/im/vector/activity/VectorRoomActivity.java b/vector/src/main/java/im/vector/activity/VectorRoomActivity.java
index c7aac0574a..c12ca7b98a 100755
--- a/vector/src/main/java/im/vector/activity/VectorRoomActivity.java
+++ b/vector/src/main/java/im/vector/activity/VectorRoomActivity.java
@@ -1791,7 +1791,7 @@ private void launchJitsiActivity(Widget widget, boolean aIsVideoCall) {
                     }
                     return Unit.INSTANCE;
                 });
-                bs.show(getSupportFragmentManager(), "JitsyPerm");
+                bs.show(getSupportFragmentManager(), "JitsiPerm");
             }
         }
     }

From cdb4123a6c3ed3a042d45d5d308793de4cc75a90 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Sun, 24 Nov 2019 10:41:02 +0100
Subject: [PATCH 76/77] Fix / widget - hide revoke for me for widget owned by
 me

---
 .../fragments/roomwidgets/RoomWidgetFragment.kt   |  2 +-
 .../fragments/roomwidgets/RoomWidgetViewModel.kt  | 15 ++++++++++-----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/vector/src/main/java/im/vector/fragments/roomwidgets/RoomWidgetFragment.kt b/vector/src/main/java/im/vector/fragments/roomwidgets/RoomWidgetFragment.kt
index 9c7c6ba9e3..f7d76e779c 100644
--- a/vector/src/main/java/im/vector/fragments/roomwidgets/RoomWidgetFragment.kt
+++ b/vector/src/main/java/im/vector/fragments/roomwidgets/RoomWidgetFragment.kt
@@ -254,7 +254,7 @@ class RoomWidgetFragment : VectorBaseMvRxFragment(), HandleBackParticipant {
 
     override fun onPrepareOptionsMenu(menu: Menu?) = withState(viewModel) { state ->
         menu?.findItem(R.id.action_close)?.isVisible = state.canManageWidgets
-        menu?.findItem(R.id.action_revoke)?.isVisible = state.status == WidgetState.WIDGET_ALLOWED
+        menu?.findItem(R.id.action_revoke)?.isVisible = state.status == WidgetState.WIDGET_ALLOWED && !state.createdByMe
         super.onPrepareOptionsMenu(menu)
     }
 
diff --git a/vector/src/main/java/im/vector/fragments/roomwidgets/RoomWidgetViewModel.kt b/vector/src/main/java/im/vector/fragments/roomwidgets/RoomWidgetViewModel.kt
index 0e822193e8..8e0f47b265 100644
--- a/vector/src/main/java/im/vector/fragments/roomwidgets/RoomWidgetViewModel.kt
+++ b/vector/src/main/java/im/vector/fragments/roomwidgets/RoomWidgetViewModel.kt
@@ -46,7 +46,8 @@ data class RoomWidgetViewModelState(
         val formattedURL: Async<String> = Uninitialized,
         val webviewLoadedUrl: Async<String> = Uninitialized,
         val widgetName: String = "",
-        val canManageWidgets: Boolean = false
+        val canManageWidgets: Boolean = false,
+        val createdByMe: Boolean = false
 ) : MvRxState
 
 class RoomWidgetViewModel(initialState: RoomWidgetViewModelState, val widget: Widget)
@@ -62,9 +63,13 @@ class RoomWidgetViewModel(initialState: RoomWidgetViewModelState, val widget: Wi
         }
 
         override fun initialState(viewModelContext: ViewModelContext): RoomWidgetViewModelState? {
-            return (viewModelContext.activity.intent?.extras?.getSerializable(WidgetActivity.EXTRA_WIDGET_ID) as? Widget)?.let {
-                RoomWidgetViewModelState(widgetName = it.humanName)
-            }
+            val widget = viewModelContext.activity.intent?.extras?.getSerializable(WidgetActivity.EXTRA_WIDGET_ID) as? Widget
+                    ?: return null
+            val session = Matrix.getInstance(viewModelContext.activity).getSession(widget.sessionId)
+            return RoomWidgetViewModelState(
+                    widgetName = widget.humanName,
+                    createdByMe = widget.widgetEvent.getSender() == session?.myUserId
+            )
         }
 
     }
@@ -165,7 +170,7 @@ class RoomWidgetViewModel(initialState: RoomWidgetViewModelState, val widget: Wi
 
         val isAllowed = session
                 ?.integrationManager
-                ?.isWidgetAllowed( widget.widgetEvent.eventId)
+                ?.isWidgetAllowed(widget.widgetEvent.eventId)
                 ?: false
 
         if (!isAllowed) {

From 673d852334d2e5654edcdffc90a3f9a3dab39433 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Mon, 25 Nov 2019 10:15:40 +0100
Subject: [PATCH 77/77] Prepare release

---
 CHANGES.rst         | 13 ++++---------
 build.gradle        |  2 +-
 vector/build.gradle |  2 +-
 3 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 6f3dca2dbb..e3a2903e96 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,14 +1,15 @@
-Changes in Riot 0.9.9 (2019-XX-XX)
+Changes in Riot 0.9.9 (2019-11-25)
 ===================================================
 
 MatrixSdk 🚀:
- - Upgrade to version 0.X.Y.
+ - Upgrade to version 0.9.32
+ - Changelog: https://github.com/matrix-org/matrix-android-sdk/releases/tag/v0.9.32
 
 Features ✨:
  - Privacy / Room Widget permissions (#3378)
  - Privacy / Widget Permission for jitsi widgets (#3391)
 
-Improvementss 🙌:
+Improvements 🙌:
  - Jitsi / Use mx display name in Jitsi conf
 
 Other changes:
@@ -18,12 +19,6 @@ Bugfix 🐛:
  - Crash / potential NPE after logout (#3367)
  - Fix infinite restart loop after token expiration (#3249)
 
-Translations 🗣:
- -
-
-Build 🧱:
- -
-
 
 Changes in Riot 0.9.8 (2019-10-09)
 ===================================================
diff --git a/build.gradle b/build.gradle
index b5f5ff08e1..109ac0de04 100755
--- a/build.gradle
+++ b/build.gradle
@@ -24,7 +24,7 @@ buildscript {
 // global properties used in sub modules
 ext {
     versionCodeProp = 90900
-    versionNameProp = "0.9.9-dev"
+    versionNameProp = "0.9.9"
     versionBuild = System.getenv("BUILD_NUMBER") as Integer ?: 0
     buildNumberProp = "${versionBuild}"
 }
diff --git a/vector/build.gradle b/vector/build.gradle
index 2c8ab2581b..b0abb11d80 100755
--- a/vector/build.gradle
+++ b/vector/build.gradle
@@ -245,7 +245,7 @@ dependencies {
     /************* Matrix SDK management **************/
     // update settings.gradle
     // use the matrix SDK as external dependency
-    implementation 'com.github.matrix-org:matrix-android-sdk:v0.9.30'
+    implementation 'com.github.matrix-org:matrix-android-sdk:v0.9.32'
     // use the matrix SDK as a sub project
     // you have to uncomment some lines in settings.gradle
     //implementation project(':matrix-sdk')