Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Narrow down nil-tokens #1827

Merged
merged 1 commit into from
Oct 7, 2024
+36 −14
Merged

Narrow down nil-tokens #1827

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 36 additions & 14 deletions NextcloudTalk/ChatViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,6 @@ import UIKit
private var offlineMode = false
private var hasStoredHistory = true
private var hasStopped = false
private var viewWasShown = false
private var roomWasUpdated = false

private var chatViewPresentedTimestamp = Date().timeIntervalSince1970

Expand Down Expand Up @@ -189,23 +187,45 @@ import UIKit
}

if !self.offlineMode {
if self.room == nil {
fatalRoomError("Room should not be nil")
}

if self.room.token == nil {
fatalRoomError("Room token should not be nil")
fatalTokenError()
}

NCRoomsManager.sharedInstance().joinRoom(self.room.token, forCall: false)
}

self.viewWasShown = true
}

private func fatalRoomError(_ message: String) {
let errorMessage = "\(message): WasShown \(self.viewWasShown) | RoomWasUpdated \(self.roomWasUpdated)"
fatalError(errorMessage)
private func fatalTokenError() {
let capabilities = NCDatabaseManager.sharedInstance().serverCapabilities()

switch capabilities.versionMajor {
case 19:
fatalError()
case 20:
fatalError()
case 21:
fatalError()
case 22:
fatalError()
case 23:
fatalError()
case 24:
fatalError()
case 25:
fatalError()
case 26:
fatalError()
case 27:
fatalError()
case 28:
fatalError()
case 29:
fatalError()
case 30:
fatalError()
default:
fatalError()
}
}

public override func viewWillDisappear(_ animated: Bool) {
Expand Down Expand Up @@ -249,6 +269,10 @@ import UIKit
self.checkForNewStoredMessages()

if !self.offlineMode {
if self.room.token == nil {
fatalTokenError()
}

NCRoomsManager.sharedInstance().joinRoom(self.room.token, forCall: false)
}

Expand Down Expand Up @@ -667,8 +691,6 @@ import UIKit
return
}

self.roomWasUpdated = true

self.room = room
self.setTitleView()

Expand Down
Loading