[feature/tca-4.1.1] Minor Version 4.1.1

Campus-iOS/AnalyticsComponent/AnalyticsController.swift

@@ -33,6 +33,7 @@ struct AnalyticsController {
         print("Info: app usage data upload is disabled.")
         return
 
+        /*
         if !didOptIn {
             return
         }
@@ -89,5 +90,6 @@ struct AnalyticsController {
         request.setValue(postToken, forHTTPHeaderField: "Authorization")
 
         let (_, _) = try await URLSession.shared.data(for: request)
+         */
     }
 }

Campus-iOS/App.swift

@@ -11,6 +11,7 @@ import KVKCalendar
 import Firebase
 
 @main
+@MainActor
 struct CampusApp: App {
     @StateObject var model: Model = Model()
 
@@ -46,13 +47,29 @@ struct CampusApp: App {
                 })
                 .environmentObject(model)
                 .environment(\.managedObjectContext, persistenceController.container.viewContext)
+                .task {
+                    guard let credentials = model.loginController.credentials else {
+                        model.isUserAuthenticated = false
+                        model.isLoginSheetPresented = true
+                        return
+                    }
+
+                    switch credentials {
+                        case .noTumID:
+                            model.isUserAuthenticated = false
+                            model.isLoginSheetPresented = false
+                    case .tumID(tumID: _, token: _), .tumIDAndKey(tumID: _, token: _, key: _):
+                            model.isUserAuthenticated = true
+                            model.isLoginSheetPresented = false
+                    }
+                }
         }
     }
 
     func tabViewComponent() -> some View {
         TabView(selection: $selectedTab) {
             NavigationView {
-                CalendarContentView(
+                CalendarScreen(
                     model: model,
                     refresh: $model.isUserAuthenticated
                 )

Campus-iOS/Base/Enums/Enums.swift

@@ -31,7 +31,22 @@ enum Gender: Decodable, Hashable {
     }
 }
 
-enum ContactInfo {
+enum ContactInfo: Identifiable {
+    var id: String {
+        switch self {
+        case .phone(let phone):
+            return phone
+        case .mobilePhone(let mobile):
+            return mobile
+        case .fax(let fax):
+            return fax
+        case .additionalInfo(let info):
+            return info
+        case .homepage(let homepage):
+            return homepage
+        }
+    }
+
     case phone(String)
     case mobilePhone(String)
     case fax(String)

Campus-iOS/Base/Networking/APIErrors/EatAPIError.swift

@@ -0,0 +1,37 @@
+//
+//  EatAPIError.swift
+//  Campus-iOS
+//
+//  Created by David Lin on 10.02.23.
+//
+
+import Foundation
+
+enum EatAPIError: APIError, LocalizedError {
+    case unknown(String)
+
+    enum CodingKeys: String, CodingKey {
+        case message
+    }
+
+    init(from decoder: Decoder) throws {
+        let container = try decoder.container(keyedBy: CodingKeys.self)
+        let error = try container.decode(String.self, forKey: .message)
+
+        switch error {
+        default:
+            self = .unknown(error)
+        }
+    }
+
+    init(message: String) {
+        self = .unknown(message)
+    }
+
+    public var errorDescription: String? {
+        switch self {
+        case let .unknown(message):
+            return "\("Unkonw error".localized): \(message)"
+        }
+    }
+}