mirror of
https://github.com/vector-im/element-ios.git
synced 2024-09-28 23:32:41 +00:00
Merge branch 'develop' into steve/4634_alpha_release
This commit is contained in:
commit
b4ca24e5ed
3 changed files with 4 additions and 3 deletions
|
@ -151,7 +151,7 @@ class UserSessionsService: NSObject {
|
|||
let isSessionStateValid: Bool
|
||||
|
||||
switch mxSession.state {
|
||||
case MXSessionStateClosed, MXSessionStateUnknownToken:
|
||||
case .closed, .unknownToken:
|
||||
isSessionStateValid = false
|
||||
default:
|
||||
isSessionStateValid = true
|
||||
|
|
|
@ -90,7 +90,7 @@ final class KeyVerificationSelfVerifyWaitViewModel: KeyVerificationSelfVerifyWai
|
|||
continueLoadData()
|
||||
} else {
|
||||
// be sure that session has completed its first sync
|
||||
if session.state >= MXSessionStateRunning {
|
||||
if session.state >= .running {
|
||||
|
||||
// Always send request instead of waiting for an incoming one as per recent EW changes
|
||||
MXLog.debug("[KeyVerificationSelfVerifyWaitViewModel] loadData: Send a verification request to all devices instead of waiting")
|
||||
|
@ -117,7 +117,7 @@ final class KeyVerificationSelfVerifyWaitViewModel: KeyVerificationSelfVerifyWai
|
|||
|
||||
@objc
|
||||
private func sessionStateChanged() {
|
||||
if session.state >= MXSessionStateRunning {
|
||||
if session.state >= .running {
|
||||
NotificationCenter.default.removeObserver(self, name: .mxSessionStateDidChange, object: session)
|
||||
continueLoadData()
|
||||
}
|
||||
|
|
1
changelog.d/4471.change
Normal file
1
changelog.d/4471.change
Normal file
|
@ -0,0 +1 @@
|
|||
MXSessionState: Use Swifty versions.
|
Loading…
Reference in a new issue