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

Privacy: IS Settings: Manage invalid IS

Browse Source
This commit is contained in:
manuroe
2019-09-26 09:28:34 +02:00
parent 109810d2eb
commit 8805a03a9b
5 changed files with 44 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
Riot/Modules/Settings/IdentityServer/SettingsIdentityServerViewController.swift
View File

@@ -244,6 +244,13 @@ final class SettingsIdentityServerViewController: UIViewController {
cancelButtonTitle: VectorL10n.cancel,
onContinue: onContinue)
case .addActionAlert(.invalidIdentityServer(let newHost)):
self.showAlert(title: nil,
message: VectorL10n.identityServerSettingsAlertErrorInvalidIdentityServer(newHost),
continueButtonTitle: nil,
cancelButtonTitle: VectorL10n.cancel,
onContinue: onContinue)
case .disconnectActionAlert(.stillSharing3Pids(let oldHost)):
self.showAlert(title: VectorL10n.identityServerSettingsAlertDisconnectTitle,
message: VectorL10n.identityServerSettingsAlertDisconnectStillSharing3pid(oldHost.hostname()),
@@ -313,9 +320,9 @@ final class SettingsIdentityServerViewController: UIViewController {
switch displayMode {
case .noIdentityServer:
viewAction = .add(identityServer: identityServer)
viewAction = .add(identityServer: identityServer.makeURLValid())
case .identityServer:
viewAction = .change(identityServer: identityServer)
viewAction = .change(identityServer: identityServer.makeURLValid())
}
if let viewAction = viewAction {
@@ -339,12 +346,8 @@ extension SettingsIdentityServerViewController: SettingsIdentityServerViewModelV
}
}
fileprivate extension String {
func hostname() -> String {
return URL(string: self)?.host ?? self
}
}
// MARK: - ServiceTermsModalCoordinatorBridgePresenterDelegate
extension SettingsIdentityServerViewController: ServiceTermsModalCoordinatorBridgePresenterDelegate {
func serviceTermsModalCoordinatorBridgePresenterDelegateDidAccept(_ coordinatorBridgePresenter: ServiceTermsModalCoordinatorBridgePresenter) {
self.hideTerms(accepted: true)
@@ -354,3 +357,19 @@ extension SettingsIdentityServerViewController: ServiceTermsModalCoordinatorBrid
self.hideTerms(accepted: false)
}
}
// MARK: - Private extension
fileprivate extension String {
func hostname() -> String {
return URL(string: self)?.host ?? self
}
func makeURLValid() -> String {
if self.hasPrefix("http://") || self.hasPrefix("https://") {
return self
} else {
return "https://" + self
}
}
}