From d2b034e2e36c051df9b5419631bf32c8a5470c4a Mon Sep 17 00:00:00 2001
From: Arnfried Griesert <arnfried.griesert.ext@bwi.de>
Date: Wed, 11 May 2022 11:42:46 +0200
Subject: [PATCH] patched bwm 1.19.0 into develop

---
 CHANGES_BWI.md                                | 41 +++++++++++++++++++
 Config/BuildSettings.swift                    |  4 +-
 .../MXKAuthenticationViewController.m         | 39 +++++++++++-------
 bwi/BwiBuildSettings.swift                    |  7 +++-
 4 files changed, 73 insertions(+), 18 deletions(-)

diff --git a/CHANGES_BWI.md b/CHANGES_BWI.md
index 8db2a7557..b944995be 100644
--- a/CHANGES_BWI.md
+++ b/CHANGES_BWI.md
@@ -1,3 +1,44 @@
+Changes in BWI project 1.19.0 (2022-04-20)
+===================================================
+
+Upstream merge ✨:
+
+- v1.18.0
+
+Features ✨:
+
+Improvements 🙌:
+
+Bugfix 🐛:
+
+Translations 🗣 :
+
+SDK API changes ⚠️:
+
+Build 🧱:
+
+Changes in BWI project 1.18.0 (2022-03-16)
+===================================================
+
+Upstream merge ✨:
+
+- v1.18.0
+
+Features ✨:
+- Polling feature enabled
+
+Improvements 🙌:
+
+Bugfix 🐛:
+- Display of private notes room
+
+Translations 🗣:
+- German texts for poll feature
+
+SDK API changes ⚠️:
+
+Build 🧱:
+
 Changes in BWI project 1.17.0 (2022-02-14)
 ===================================================
 
diff --git a/Config/BuildSettings.swift b/Config/BuildSettings.swift
index 198641510..c65ed2a40 100644
--- a/Config/BuildSettings.swift
+++ b/Config/BuildSettings.swift
@@ -395,7 +395,7 @@ final class BuildSettings: NSObject {
 
     // MARK: - Message
     static let messageDetailsAllowShare: Bool = false
-    static let messageDetailsAllowPermalink: Bool = true
+    static let messageDetailsAllowPermalink: Bool = false
     static let messageDetailsAllowViewSource: Bool = false
     static let messageDetailsAllowSave: Bool = false
     static let messageDetailsAllowCopyMedia: Bool = false
@@ -496,7 +496,7 @@ final class BuildSettings: NSObject {
     static let forgotPasswordInformationAlert : Bool = true
     
     // MARK: Promote new feature within a banner below the navigation view
-    static let showTopBanner : Bool = true
+    static let showTopBanner : Bool = false
 
     static let showCustomServerDisplayName : Bool = true
     static let customServerDisplayName : String = ""
diff --git a/Riot/Modules/MatrixKit/Controllers/MXKAuthenticationViewController.m b/Riot/Modules/MatrixKit/Controllers/MXKAuthenticationViewController.m
index dd9df9371..598fa0fe9 100644
--- a/Riot/Modules/MatrixKit/Controllers/MXKAuthenticationViewController.m
+++ b/Riot/Modules/MatrixKit/Controllers/MXKAuthenticationViewController.m
@@ -470,24 +470,35 @@
     }
 }
 
-- (void)setHomeServerTextFieldText:(ServerSetting *)serverSetting
+//- (void)setHomeServerTextFieldText:(ServerSetting *)serverSetting
+//{
+//    NSString *serverUrl;
+//    NSUInteger index = [ServerURLHelper.shared.serverSettings indexOfObject:serverSetting];
+//    if (index != NSNotFound) {
+//        ServerURLHelper.shared.selectedIndex = index;
+//        serverUrl = serverSetting.serverUrl;
+//
+//        MXSDKOptions *option = MXSDKOptions.sharedInstance;
+//
+//        option.clientPermalinkBaseUrl = [ServerURLHelper.shared httpsPermalink];
+//    } else {
+//        serverUrl = @"";
+//    }
+//
+//    _homeServerTextField.text = serverUrl;
+//
+//    if (!mxRestClient || ![mxRestClient.homeserver isEqualToString:serverUrl])
+- (void)setHomeServerTextFieldText:(NSString *)homeServerUrl
 {
-    NSString *serverUrl;
-    NSUInteger index = [ServerURLHelper.shared.serverSettings indexOfObject:serverSetting];
-    if (index != NSNotFound) {
-        ServerURLHelper.shared.selectedIndex = index;
-        serverUrl = serverSetting.serverUrl;
-        
-        MXSDKOptions *option = MXSDKOptions.sharedInstance;
-        
-        option.clientPermalinkBaseUrl = [ServerURLHelper.shared httpsPermalink];
-    } else {
-        serverUrl = @"";
+    if (!homeServerUrl.length)
+    {
+        // Force refresh with default value
+        homeServerUrl = _defaultHomeServerUrl;
     }
     
-    _homeServerTextField.text = serverUrl;
+    _homeServerTextField.text = homeServerUrl;
     
-    if (!mxRestClient || ![mxRestClient.homeserver isEqualToString:serverUrl])
+    if (!mxRestClient || ![mxRestClient.homeserver isEqualToString:homeServerUrl])
     {
         [self updateRESTClient];
         
diff --git a/bwi/BwiBuildSettings.swift b/bwi/BwiBuildSettings.swift
index f4497610d..fcef7dadb 100644
--- a/bwi/BwiBuildSettings.swift
+++ b/bwi/BwiBuildSettings.swift
@@ -44,9 +44,12 @@ final class BwiBuildSettings: NSObject {
     
     static let bwiShowRoomSearch: Bool = false
     
-    static let bwiAllowRoomPermalink: Bool = true
+    static let bwiAllowRoomPermalink: Bool = false
     
-    static let bwiAllowUserPermalink: Bool = true
+    static let bwiAllowUserPermalink: Bool = false
     
     static let bwiCheckAppVersion = true
+    
+    static let bwiSettingsShowSecureBackupSection = false
+    static let bwiSettingsShowCrossSigningSection = false
 }