From 56b1855b67955242a257730f604f480722bbf48b Mon Sep 17 00:00:00 2001 From: manuroe Date: Thu, 8 Mar 2018 15:39:59 +0100 Subject: [PATCH 1/3] Matrix Apps: Enable them by default. Remove the settings from LABS section (#1795) --- Riot/Assets/bg.lproj/Vector.strings | 1 - Riot/Assets/ca.lproj/Vector.strings | 1 - Riot/Assets/de.lproj/Vector.strings | 1 - Riot/Assets/en.lproj/Vector.strings | 1 - Riot/Assets/eu.lproj/Vector.strings | 1 - Riot/Assets/fr.lproj/Vector.strings | 1 - Riot/Assets/nl.lproj/Vector.strings | 1 - Riot/Assets/ru.lproj/Vector.strings | 1 - Riot/Assets/vi.lproj/Vector.strings | 1 - Riot/Assets/zh_Hans.lproj/Vector.strings | 1 - Riot/ViewController/SettingsViewController.m | 29 ++------------------ 11 files changed, 2 insertions(+), 37 deletions(-) diff --git a/Riot/Assets/bg.lproj/Vector.strings b/Riot/Assets/bg.lproj/Vector.strings index 8b37375fe..ed53cbd99 100644 --- a/Riot/Assets/bg.lproj/Vector.strings +++ b/Riot/Assets/bg.lproj/Vector.strings @@ -320,7 +320,6 @@ "settings_contacts_discover_matrix_users" = "Използване на имейл и телефонен номер за откриване на потребители"; "settings_contacts_phonebook_country" = "Държава на телефонния указател"; "settings_labs_e2e_encryption_prompt_message" = "За да завършите настройката на шифроването, трябва да влезете в профила си отново."; -"settings_labs_matrix_apps" = "Matrix приложения"; "settings_labs_create_conference_with_jitsi" = "Създаване на групови разговори с jitsi"; "settings_term_conditions" = "Правила и условия"; "settings_privacy_policy" = "Правила за поверителност"; diff --git a/Riot/Assets/ca.lproj/Vector.strings b/Riot/Assets/ca.lproj/Vector.strings index fdcbe598b..2b5485964 100644 --- a/Riot/Assets/ca.lproj/Vector.strings +++ b/Riot/Assets/ca.lproj/Vector.strings @@ -312,7 +312,6 @@ "settings_contacts_phonebook_country" = "País de la guia telefònica"; "settings_labs_e2e_encryption" = "Xifrat punt a punt"; "settings_labs_e2e_encryption_prompt_message" = "Per acabar de ajustar el xifratge has de Iniciar sessió de nou."; -"settings_labs_matrix_apps" = "Aplicacions Matrix"; "settings_labs_create_conference_with_jitsi" = "Crear trucades amb Jitsi"; "settings_version" = "Versió %@"; "settings_olm_version" = "Versió Olm %@"; diff --git a/Riot/Assets/de.lproj/Vector.strings b/Riot/Assets/de.lproj/Vector.strings index 501f44e6e..580951c73 100644 --- a/Riot/Assets/de.lproj/Vector.strings +++ b/Riot/Assets/de.lproj/Vector.strings @@ -439,7 +439,6 @@ "send_to" = "Sende an %@"; "sending" = "Senden"; "room_event_failed_to_send" = "Senden fehlgeschlagen"; -"settings_labs_matrix_apps" = "Matrix Apps"; "room_details_direct_chat" = "Direkter Chat"; "room_details_fail_to_update_room_direct" = "Setzen der Direkt-Kennzeichnung in diesem Raum fehlgeschlagen"; "event_formatter_widget_added" = "Widget %@ wurde von %@ hinzugefügt"; diff --git a/Riot/Assets/en.lproj/Vector.strings b/Riot/Assets/en.lproj/Vector.strings index bbb4c8301..f8fe3a6a5 100644 --- a/Riot/Assets/en.lproj/Vector.strings +++ b/Riot/Assets/en.lproj/Vector.strings @@ -366,7 +366,6 @@ "settings_labs_e2e_encryption" = "End-to-End Encryption"; "settings_labs_e2e_encryption_prompt_message" = "To finish setting up encryption you must log in again."; -"settings_labs_matrix_apps" = "Matrix Apps"; "settings_labs_create_conference_with_jitsi" = "Create conference calls with jitsi"; "settings_version" = "Version %@"; diff --git a/Riot/Assets/eu.lproj/Vector.strings b/Riot/Assets/eu.lproj/Vector.strings index 4cc05b3eb..21371ecd9 100644 --- a/Riot/Assets/eu.lproj/Vector.strings +++ b/Riot/Assets/eu.lproj/Vector.strings @@ -449,7 +449,6 @@ "settings_ui_theme_black" = "Beltza"; "settings_ui_theme_picker_title" = "Hautatu itxura bat"; "settings_ui_theme_picker_message" = "\"Automatikoa\"-k gailuaren \"alderantzikatu koloreak\" ezarpena erabiltzen du"; -"settings_labs_matrix_apps" = "Matrix aplikazioak"; "settings_enable_rageshake" = "Astindu amorruz akatsaren berri emateko"; "room_details_direct_chat" = "Txat zuzena"; "event_formatter_widget_added" = "%@ trepeta gehitu du %@ erabiltzaileak"; diff --git a/Riot/Assets/fr.lproj/Vector.strings b/Riot/Assets/fr.lproj/Vector.strings index 4f49a12e5..73ae99c36 100644 --- a/Riot/Assets/fr.lproj/Vector.strings +++ b/Riot/Assets/fr.lproj/Vector.strings @@ -481,7 +481,6 @@ "widget_integration_room_not_visible" = "Le salon %@ n'est pas visible."; "auth_share_extension_prompt" = "Se connecter dans l'application principale pour partager du contenu"; "room_event_failed_to_send" = "Échec de l'envoi"; -"settings_labs_matrix_apps" = "Applications Matrix"; "event_formatter_jitsi_widget_added" = "Téléconférence en Voix sur IP ajoutée par %@"; "event_formatter_jitsi_widget_removed" = "Téléconférence en Voix sur IP supprimée par %@"; // Widget Integration Manager diff --git a/Riot/Assets/nl.lproj/Vector.strings b/Riot/Assets/nl.lproj/Vector.strings index 47047d030..e9998ba1c 100644 --- a/Riot/Assets/nl.lproj/Vector.strings +++ b/Riot/Assets/nl.lproj/Vector.strings @@ -473,7 +473,6 @@ "settings_ui_theme_black" = "Zwart"; "settings_ui_theme_picker_title" = "Selecteer een thema"; "settings_ui_theme_picker_message" = "\"Automatisch\" gebruikt de \"Kleurweergave omkeren\" instelling van je apparaat"; -"settings_labs_matrix_apps" = "Matrix Applicaties"; "settings_enable_rageshake" = "Schud de telefoon om een fout te rapporteren"; "room_details_direct_chat" = "Privégesprek"; "room_details_fail_to_update_room_direct" = "Het is niet gelukt om de direct (privé) vlag in deze ruimte te updaten"; diff --git a/Riot/Assets/ru.lproj/Vector.strings b/Riot/Assets/ru.lproj/Vector.strings index f735c5ae5..5193b65dc 100644 --- a/Riot/Assets/ru.lproj/Vector.strings +++ b/Riot/Assets/ru.lproj/Vector.strings @@ -435,7 +435,6 @@ "sending" = "Отправка"; "auth_share_extension_prompt" = "Войти в основное приложение для совместного использования контента"; "room_event_failed_to_send" = "Не удалось отправить"; -"settings_labs_matrix_apps" = "Приложения Matrix"; "room_details_direct_chat" = "Прямой чат"; "room_details_fail_to_update_room_direct" = "Не удается обновить прямой флаг этой комнаты"; "event_formatter_jitsi_widget_added" = "Конференция добавлена %@"; diff --git a/Riot/Assets/vi.lproj/Vector.strings b/Riot/Assets/vi.lproj/Vector.strings index b3e681924..6c0b35805 100644 --- a/Riot/Assets/vi.lproj/Vector.strings +++ b/Riot/Assets/vi.lproj/Vector.strings @@ -306,7 +306,6 @@ "settings_contacts_phonebook_country" = "Quốc gia trong danh bạ"; "settings_labs_e2e_encryption" = "End-to-End Mã Hóa"; "settings_labs_e2e_encryption_prompt_message" = "Để hoàn thành cài đặt mã hóa, bạn phải đăng nhập lại."; -"settings_labs_matrix_apps" = "Ứng dụng Matrix"; "settings_labs_create_conference_with_jitsi" = "Tạo cuộc gọi hội họp bằng jitsi"; "settings_version" = "Phiên bản %@"; "settings_olm_version" = "Phiên bản Olm %@"; diff --git a/Riot/Assets/zh_Hans.lproj/Vector.strings b/Riot/Assets/zh_Hans.lproj/Vector.strings index 69b6d358d..ca449eb88 100644 --- a/Riot/Assets/zh_Hans.lproj/Vector.strings +++ b/Riot/Assets/zh_Hans.lproj/Vector.strings @@ -443,5 +443,4 @@ "settings_ui_theme_black" = "纯黑"; "settings_ui_theme_picker_title" = "选择一个主题"; "settings_ui_theme_picker_message" = "“自动”表示使用设备的“反色”设置"; -"settings_labs_matrix_apps" = "Matrix 应用"; "settings_labs_create_conference_with_jitsi" = "使用 jitsi 创建一个会议通话"; diff --git a/Riot/ViewController/SettingsViewController.m b/Riot/ViewController/SettingsViewController.m index becd42595..d196e052d 100644 --- a/Riot/ViewController/SettingsViewController.m +++ b/Riot/ViewController/SettingsViewController.m @@ -112,8 +112,7 @@ enum enum { - LABS_MATRIX_APPS_INDEX = 0, - LABS_USE_JITSI_WIDGET_INDEX, + LABS_USE_JITSI_WIDGET_INDEX = 0, LABS_CRYPTO_INDEX, LABS_COUNT }; @@ -2024,18 +2023,7 @@ typedef void (^blockSettingsViewController_onReadyToDestroy)(); } else if (section == SETTINGS_SECTION_LABS_INDEX) { - if (row == LABS_MATRIX_APPS_INDEX) - { - MXKTableViewCellWithLabelAndSwitch* labelAndSwitchCell = [self getLabelAndSwitchCell:tableView forIndexPath:indexPath]; - - labelAndSwitchCell.mxkLabel.text = NSLocalizedStringFromTable(@"settings_labs_matrix_apps", @"Vector", nil); - labelAndSwitchCell.mxkSwitch.on = [[NSUserDefaults standardUserDefaults] boolForKey:@"matrixApps"]; - - [labelAndSwitchCell.mxkSwitch addTarget:self action:@selector(toggleLabsMatrixApps:) forControlEvents:UIControlEventTouchUpInside]; - - cell = labelAndSwitchCell; - } - else if (row == LABS_USE_JITSI_WIDGET_INDEX) + if (row == LABS_USE_JITSI_WIDGET_INDEX) { MXKTableViewCellWithLabelAndSwitch* labelAndSwitchCell = [self getLabelAndSwitchCell:tableView forIndexPath:indexPath]; @@ -2881,19 +2869,6 @@ typedef void (^blockSettingsViewController_onReadyToDestroy)(); } } -- (void)toggleLabsMatrixApps:(id)sender -{ - if (sender && [sender isKindOfClass:UISwitch.class]) - { - UISwitch *switchButton = (UISwitch*)sender; - - [[NSUserDefaults standardUserDefaults] setBool:switchButton.isOn forKey:@"matrixApps"]; - [[NSUserDefaults standardUserDefaults] synchronize]; - - [self.tableView reloadData]; - } -} - - (void)toggleJitsiForConference:(id)sender { if (sender && [sender isKindOfClass:UISwitch.class]) From 3f9e7ece6f34543d0077ccc0d266aaddfae49172 Mon Sep 17 00:00:00 2001 From: manuroe Date: Thu, 8 Mar 2018 16:41:00 +0100 Subject: [PATCH 2/3] Matrix Apps: Enable them by default. Remove the settings from LABS section (#1795) Move the setting as an app configuration settings in Riot-Defaults.plist --- Riot/Riot-Defaults.plist | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Riot/Riot-Defaults.plist b/Riot/Riot-Defaults.plist index a8590fe54..36d735430 100644 --- a/Riot/Riot-Defaults.plist +++ b/Riot/Riot-Defaults.plist @@ -26,6 +26,8 @@ https://riot.im/beta webAppUrl https://riot.im/app + matrixApps + integrationsUiUrl https://scalar-staging.riot.im/scalar-web/ integrationsRestUrl From 1451e47cf9bc0584506181364188982ab9211319 Mon Sep 17 00:00:00 2001 From: manuroe Date: Thu, 8 Mar 2018 17:51:30 +0100 Subject: [PATCH 3/3] Matrix apps must be enabled! --- Riot/Riot-Defaults.plist | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Riot/Riot-Defaults.plist b/Riot/Riot-Defaults.plist index 36d735430..ef435a321 100644 --- a/Riot/Riot-Defaults.plist +++ b/Riot/Riot-Defaults.plist @@ -27,7 +27,7 @@ webAppUrl https://riot.im/app matrixApps - + integrationsUiUrl https://scalar-staging.riot.im/scalar-web/ integrationsRestUrl