Fix iOS build issues

steviek · Mar 1, 2024 · 4f70350 · 4f70350
1 parent 803f1bd
commit 4f70350
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 6 deletions.
diff --git a/iosApp/iosApp/Info.plist b/iosApp/iosApp/Info.plist
@@ -19,7 +19,7 @@
 	<key>CFBundlePackageType</key>
 	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.1</string>x`
+	<string>2.1</string>
 	<key>CFBundleVersion</key>
 	<string>6</string>
 	<key>CFBundleLocalizations</key>

diff --git a/iosApp/widget/FetchResult.swift b/iosApp/widget/FetchResult.swift
@@ -10,5 +10,6 @@ import ComposeApp
 
 struct FetchResult {
     let data: WidgetData?
+    let hadInternet: Bool
     let hasError: Bool
 }
diff --git a/iosApp/widget/Interop.swift b/iosApp/widget/Interop.swift
@@ -31,6 +31,12 @@ extension Bool {
     }
 }
 
+extension KotlinBoolean {
+    func toBool() -> Bool {
+        self.boolValue
+    }
+}
+
 extension ColorWrapper {
     func toColor(isDark: Bool) -> SwiftUI.Color {
         let adjusted = adjustForDarkMode(isDark: isDark)

diff --git a/iosApp/widget/WidgetInterop.swift b/iosApp/widget/WidgetInterop.swift
@@ -80,18 +80,24 @@ extension WidgetDataFetcher {
                     stations: stations,
                     sort: sort,
                     filter: filter,
-                    force: false,
+                     force: false,
                     includeClosestStation: false,
                     onSuccess: { data in
-                        continuation.resume(returning: FetchResult(data: data, hasError: false))
+                        continuation.resume(returning: FetchResult(data: data, hadInternet: true, hasError: false))
                     },
-                    onFailure: { (e, data) in
-                        continuation.resume(returning: FetchResult(data: data, hasError: true))
+                    onFailure: { (e, hadInternet, data) in
+                        continuation.resume(
+                            returning: FetchResult(
+                                data: data,
+                                hadInternet: hadInternet.toBool(),
+                                hasError: true
+                            )
+                        )
                     }
                 )
             }
         } catch {
-            return FetchResult(data: nil, hasError: true)
+            return FetchResult(data: nil, hadInternet: true, hasError: true)
         }
 
     }