From 208d4cdb4b39348e0d80b7da29c264f165fde159 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcel=20M=C3=BCller?= <marcel-mueller@gmx.de>
Date: Wed, 2 Oct 2024 18:29:25 +0200
Subject: [PATCH] Narrow down nil-tokens
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Marcel Müller <marcel-mueller@gmx.de>
---
 NextcloudTalk/ChatViewController.swift | 50 ++++++++++++++++++--------
 1 file changed, 36 insertions(+), 14 deletions(-)

diff --git a/NextcloudTalk/ChatViewController.swift b/NextcloudTalk/ChatViewController.swift
index b33204ab5..fbee95c9a 100644
--- a/NextcloudTalk/ChatViewController.swift
+++ b/NextcloudTalk/ChatViewController.swift
@@ -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
 
@@ -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) {
@@ -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)
         }
 
@@ -667,8 +691,6 @@ import UIKit
             return
         }
 
-        self.roomWasUpdated = true
-
         self.room = room
         self.setTitleView()