Merge pull request #1274 from RomanPodymov/main

Fix some warnings
planetary-social · Jul 24, 2024 · 45e5f08 · 45e5f08
2 parents 77261a3 + 2d0af52
commit 45e5f08
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 7 deletions.
diff --git a/Source/App/AppConfiguration+Data.swift b/Source/App/AppConfiguration+Data.swift
@@ -18,9 +18,12 @@ extension AppConfiguration {
     }
 
     static func from(_ data: Data) -> AppConfiguration? {
-        guard let object = try? NSKeyedUnarchiver.unarchiveTopLevelObjectWithData(data) else { return nil }
-        let configuration = object as? AppConfiguration
-        if configuration == nil { Log.unexpected(.missingValue, "Configuration could not be unarchived") }
+        let unarchiver = try? NSKeyedUnarchiver(forReadingFrom: data)
+        unarchiver?.requiresSecureCoding = false
+        guard let configuration = unarchiver?.decodeObject(of: self, forKey: NSKeyedArchiveRootObjectKey) else {
+            Log.unexpected(.missingValue, "Configuration could not be unarchived")
+            return nil
+        }
         return configuration
     }
 }

diff --git a/Source/Controller/BlobViewController.swift b/Source/Controller/BlobViewController.swift
@@ -58,6 +58,10 @@ class BlobViewController: ContentViewController {
         forgetBlobCompletion()
 
         Task { @MainActor [weak self] in
+            guard let blob = self?.blob else {
+                return
+            }
+
             // cached image
             if let uiImage = Caches.blobs.image(for: blob) {
                 self?.imageView.image = uiImage

diff --git a/Source/Controller/LaunchViewController.swift b/Source/Controller/LaunchViewController.swift
@@ -82,7 +82,7 @@ class LaunchViewController: UIViewController {
         }
 
         // if no configuration then onboard
-        guard var configuration = appConfiguration else {
+        guard let configuration = appConfiguration else {
             launchIntoOnboarding()
             return
         }

diff --git a/Source/Onboarding/Steps/JoinOnboardingStep.swift b/Source/Onboarding/Steps/JoinOnboardingStep.swift
@@ -34,7 +34,7 @@ import CrashReporting
         }
 
         Task { [weak self] in
-            var context: Onboarding.Context?
+            let context: Onboarding.Context?
 
             do {
                 context = try await Onboarding.createProfile(from: data)

diff --git a/Source/UI/Identity/ImageMetadataView.swift b/Source/UI/Identity/ImageMetadataView.swift
@@ -67,7 +67,7 @@ fileprivate class ImageLoader: ObservableObject {
 
         await MainActor.run { [weak self] in
             guard let metadata = metadata, metadata.link != .null else {
-                isLoading = false
+                self?.isLoading = false
                 return
             }
 

diff --git a/Source/UI/ManageAliasView.swift b/Source/UI/ManageAliasView.swift
@@ -19,7 +19,7 @@ struct RoomAlias: Identifiable {
     var authorID: Int64
 
     var alias: String {
-        var components = string.replacingOccurrences(of: "https://", with: "")
+        let components = string.replacingOccurrences(of: "https://", with: "")
             .replacingOccurrences(of: "http://", with: "")
             .components(separatedBy: ".")
         return components.joined(separator: ".")