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

Merge branch 'hotfix/v2.9.1' into 'develop'

Browse Source 
Hotfix/v2.9.1

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!210
This commit is contained in:
Frank Rotermund
2023-09-08 08:24:05 +00:00
parent 63f7078771 3b43285b26
commit 5fc2300e28
4 changed files with 46 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
CHANGES_BWI.md
View File

@@ -1,3 +1,21 @@
Changes in BWI project 2.9.1 (2023-09-08)
===================================================
Upstream merge ✨:
Features ✨:
Improvements 🙌:
Bugfix 🐛:
- Maintenance Popup on server selection (#5130)
Translations 🗣 :
SDK API changes ⚠️:
Build 🧱:
Changes in BWI project 2.9.0 (2023-08-31)
===================================================

4
Config/BWIBuildSettings.swift
View File

@@ -200,8 +200,8 @@ class BWIBuildSettings: NSObject {
"00136d830dd2acd5047efcf8419e939ef7ef97a84bef1930df86aace3f855265",
"64cbbeea37237814445b35c941d010b9d5d024e4c584a476864b00c7c9909bce",
"e79f4ce0f3c2772b45fd492a9c11e4e10e869ca21af68f13ff48c9c3bbd446ea",
"5506e467929cc1d2fb348b6887e793ccfc6ecdbb0420853227a3f6db0d9b75a9",
"ca893c8f6f6a40c95cd0174901b2da3b48bfdce4456563ecffd13ee36ac52e81"
"2d582bed323f226a0e18b6b7104c0d28ccc36423833220a7b5fd2854262ab27e",
"c56904235e283557626c327f8013c3b1c654eae86a5e314531e3a6fcb200ff92"
]
// use a different badge color if the user was mentioned in a room

12
Riot/Assets/new_features.html
View File

@@ -26,6 +26,18 @@
</style>
</head>
<body>
<div>
<p>
<b>Version 2.9.1</b>
</p>
<p>
<b>Behobene Bugs</b>
<ul>
<li/>Keine Phantom Maintenance Popups mehr beim Login
</ul>
</p>
</div>
<div>
<p>
<b>Version 2.9.0</b>

23
RiotSwiftUI/Modules/Authentication/ServerSelection/View/AuthenticationServerSelectionScreen.swift
View File

@@ -17,6 +17,10 @@
import SwiftUI
import AVKit
enum AuthenticationServerSelectionScreenAlertType {
case showServerMaintenanceInfoMessageAlert, showServerMaintenanceDefaultAlert, showInvalidAppVersionAlert, showDowntimeTimeAlert, showInvalidServerAlert
}
struct AuthenticationServerSelectionScreen: View {
// MARK: - Properties
@@ -35,7 +39,7 @@ struct AuthenticationServerSelectionScreen: View {
// bwi #4976 show maintenance alert
@State private var isFetchingDowntime = false
@State private var showAlert = false
@State private var activeAlert: OnBoardingSplashScreenAlertType = .showInvalidAppVersionAlert
@State private var activeAlert: AuthenticationServerSelectionScreenAlertType = .showInvalidAppVersionAlert
private var textFieldFooterColor: Color {
viewModel.viewState.hasValidationError ? theme.colors.alert : theme.colors.tertiaryContent
@@ -68,9 +72,7 @@ struct AuthenticationServerSelectionScreen: View {
serverForm
.alert(item: $viewModel.alertInfo) { $0.alert }
.alert(isPresented: $showAlertForInvalidServer) {
invalidServerAlert()
}
if BWIBuildSettings.shared.authScreenShowTestServerOptions {
serverSelectionButton
}
@@ -153,8 +155,10 @@ struct AuthenticationServerSelectionScreen: View {
return Alert(title: Text(BWIL10n.downtimeTitle),
message: Text(BWIL10n.downtimeDefaultMessage),
dismissButton: .destructive(Text(BWIL10n.downtimeAlertDismissButton)) {
self.submit()
})
self.submit()
})
case .showInvalidServerAlert:
return self.invalidServerAlert()
}
})
@@ -270,7 +274,8 @@ struct AuthenticationServerSelectionScreen: View {
if isHomeserverAddressValid(viewModel.homeserverAddress) {
viewModel.send(viewAction: .confirm)
} else {
showAlertForInvalidServer = true
activeAlert = .showInvalidServerAlert
showAlert = true
}
}
@@ -345,8 +350,8 @@ struct AuthenticationServerSelectionScreen: View {
if success {
self.showAlertIfNeeded()
} else {
showAlert = true
activeAlert = .showServerMaintenanceDefaultAlert
// hotfix 2.9.1 if request ist no successful there probably is no maintenance on server -> don't show popup
self.submit()
}
}
}