felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-04-18 15:38:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

patched bwm 1.19.0 into develop

Browse Source
This commit is contained in:
Arnfried Griesert
2022-05-11 11:42:46 +02:00
parent 7ff40f95c7
commit d2b034e2e3
4 changed files with 73 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
Riot/Modules/MatrixKit/Controllers/MXKAuthenticationViewController.m
View File

@@ -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];