fix: run Android on Linux emulator VMs

Android/app/build.gradle.kts

@@ -22,10 +22,33 @@ configurations.configureEach {
 }
 
 val repoRoot = rootProject.projectDir.parentFile
+// Supported ABIs: arm64-v8a for devices, x86_64 for the Android emulator VM.
+val androidNativeAbis = (System.getenv("LOGSEQ_CHAT_ANDROID_ABIS")
+    ?: System.getenv("LOGSEQ_CHAT_ANDROID_ABI")
+    ?: "arm64-v8a")
+    .split(Regex("[,\\s]+"))
+    .map { it.trim() }
+    .filter { it.isNotEmpty() }
+    .distinct()
 
-tasks.register<Exec>("buildAndroidNativeCore") {
-    workingDir = repoRoot
-    commandLine("bash", "scripts/build-android-native.sh")
+val androidNativeCoreTasks = androidNativeAbis.map { abi ->
+    tasks.register<Exec>("buildAndroidNativeCore_${abi.replace('-', '_')}") {
+        workingDir = repoRoot
+        environment("LOGSEQ_CHAT_ANDROID_ABI", abi)
+        listOf(
+            "ANDROID_HOME",
+            "ANDROID_SDK_ROOT",
+            "ANDROID_NDK_HOME",
+            "LOGSEQ_CHAT_BUILD_JOBS"
+        ).forEach { key ->
+            System.getenv(key)?.let { value -> environment(key, value) }
+        }
+        commandLine("bash", "scripts/build-android-native.sh")
+    }
+}
+
+tasks.register("buildAndroidNativeCore") {
+    dependsOn(androidNativeCoreTasks)
 }
 
 tasks.named("preBuild") {

Android/gradle/wrapper/gradle-wrapper.properties

@@ -1 +1 @@
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip

Android/settings.gradle.kts

@@ -7,8 +7,20 @@ pluginManagement {
     //System.setProperty("BUILT_PRODUCTS_DIR", "${System.getProperty("user.home")}/Library/Developer/Xcode/DerivedData/MySkipProject-HASH/Build/Products/Debug-iphonesimulator")
 
     val skipPluginResult = providers.exec {
-        commandLine("/bin/sh", "-c", "skip plugin --prebuild --package-path '${settings.rootDir.parent}' --plugin-ref '${pluginPath.absolutePath}'")
-        environment("PATH", "${System.getenv("PATH")}:/opt/homebrew/bin")
+        // Xcode `xcrun` is required for Skip's iOS prebuild. On Linux emulator
+        // hosts, fall back to `--no-prebuild` and consume existing skipstone output.
+        commandLine(
+            "/bin/sh",
+            "-c",
+            """
+            if command -v xcrun >/dev/null 2>&1; then
+              skip plugin --prebuild --package-path '${settings.rootDir.parent}' --plugin-ref '${pluginPath.absolutePath}'
+            else
+              skip plugin --no-prebuild --package-path '${settings.rootDir.parent}' --plugin-ref '${pluginPath.absolutePath}'
+            fi
+            """.trimIndent()
+        )
+        environment("PATH", "${System.getenv("PATH")}:/opt/homebrew/bin:${System.getProperty("user.home")}/opt/skip/skip.artifactbundle/bin")
     }
     val skipPluginOutput = skipPluginResult.standardOutput.asText.get()
     print(skipPluginOutput)

Sources/LogseqChat/LogseqChatApp.swift

@@ -1,5 +1,7 @@
 import Foundation
+#if os(iOS) || os(macOS) || os(tvOS) || os(watchOS)
 import OSLog
+#endif
 import SwiftUI
 import LogseqChatModel
 
@@ -9,34 +11,34 @@ import UIKit
 #endif
 
 struct LogseqAppLogger {
-    #if !SKIP
+    #if os(iOS) || os(macOS) || os(tvOS) || os(watchOS)
     private let systemLogger = os.Logger(subsystem: "com.logseq.chat", category: "LogseqChat")
     #endif
 
     func debug(_ message: String) {
         LogseqRuntimeLog.shared.append(level: .debug, source: .ui, message: message)
-        #if SKIP
-        print(message)
-        #else
+        #if os(iOS) || os(macOS) || os(tvOS) || os(watchOS)
         systemLogger.debug("\(message, privacy: .public)")
+        #else
+        print(message)
         #endif
     }
 
     func info(_ message: String) {
         LogseqRuntimeLog.shared.append(level: .info, source: .ui, message: message)
-        #if SKIP
-        print(message)
-        #else
+        #if os(iOS) || os(macOS) || os(tvOS) || os(watchOS)
         systemLogger.info("\(message, privacy: .public)")
+        #else
+        print(message)
         #endif
     }
 
     func error(_ message: String) {
         LogseqRuntimeLog.shared.append(level: .error, source: .ui, message: message)
-        #if SKIP
-        print(message)
-        #else
+        #if os(iOS) || os(macOS) || os(tvOS) || os(watchOS)
         systemLogger.error("\(message, privacy: .public)")
+        #else
+        print(message)
         #endif
     }
 }

Sources/LogseqChatModel/Authentication.swift

@@ -15,7 +15,7 @@ public enum LogseqAuthenticationState: String, Sendable {
     case signingOut
 }
 
-public enum LogseqAuthenticationError: Error, LocalizedError {
+public enum LogseqAuthenticationError: Error, LocalizedError, Equatable {
     case notSignedIn
 
     public var errorDescription: String? {
@@ -52,9 +52,12 @@ public enum LogseqAuthenticationError: Error, LocalizedError {
             }
             state = .signedIn
             onAccessToken(token)
+        } catch is LogseqAuthenticationError {
+            state = .signedOut
+            onAccessToken(nil)
         } catch {
             state = .signedOut
-            errorMessage = error.localizedDescription
+            errorMessage = Self.displayedMessage(for: error)
             onAccessToken(nil)
         }
     }
@@ -71,7 +74,7 @@ public enum LogseqAuthenticationError: Error, LocalizedError {
             onAccessToken(token)
         } catch {
             state = .signedOut
-            errorMessage = error.localizedDescription
+            errorMessage = Self.displayedMessage(for: error)
             onAccessToken(nil)
         }
     }
@@ -82,7 +85,7 @@ public enum LogseqAuthenticationError: Error, LocalizedError {
         do {
             try await provider.signOut()
         } catch {
-            errorMessage = error.localizedDescription
+            errorMessage = Self.displayedMessage(for: error)
         }
         state = .signedOut
         onAccessToken(nil)
@@ -92,19 +95,40 @@ public enum LogseqAuthenticationError: Error, LocalizedError {
         do {
             guard let token = try await provider.accessToken(), !token.isEmpty else {
                 state = .signedOut
-                errorMessage = LogseqAuthenticationError.notSignedIn.localizedDescription
+                errorMessage = nil
                 onAccessToken(nil)
                 throw LogseqAuthenticationError.notSignedIn
             }
             state = .signedIn
             errorMessage = nil
             onAccessToken(token)
             return token
+        } catch is LogseqAuthenticationError {
+            state = .signedOut
+            errorMessage = nil
+            onAccessToken(nil)
+            throw LogseqAuthenticationError.notSignedIn
         } catch {
             state = .signedOut
-            errorMessage = error.localizedDescription
+            errorMessage = Self.displayedMessage(for: error)
             onAccessToken(nil)
             throw error
         }
     }
+
+    private static func displayedMessage(for error: Error) -> String {
+        if let authenticationError = error as? LogseqAuthenticationError {
+            return authenticationError.errorDescription ?? "Sign in to connect to Logseq Sync."
+        }
+        if let localized = error as? LocalizedError,
+           let description = localized.errorDescription,
+           !description.isEmpty {
+            return description
+        }
+        let description = error.localizedDescription
+        if description.contains("$") || description.contains("Case") {
+            return "Something went wrong. Try signing in again."
+        }
+        return description
+    }
 }

Sources/LogseqChatModel/GraphSyncHTTP.swift

@@ -1,5 +1,8 @@
 import Foundation
 #if !SKIP
+#if canImport(FoundationNetworking)
+import FoundationNetworking
+#endif
 import LogseqChatCoreABI
 #endif
 
@@ -184,7 +187,14 @@ public enum LogseqGraphSyncHTTP {
         }
         var downloadRequest = URLRequest(url: downloadURL.absoluteURL)
         downloadRequest.setValue("Bearer \(accessToken)", forHTTPHeaderField: "Authorization")
+        #if os(iOS) || os(macOS)
         let (temporaryURL, downloadResponse) = try await URLSession.shared.download(for: downloadRequest)
+        #else
+        let (downloadData, downloadResponse) = try await URLSession.shared.data(for: downloadRequest)
+        let temporaryURL = FileManager.default.temporaryDirectory
+            .appendingPathComponent("logseq-graph-\(UUID().uuidString).partial")
+        try downloadData.write(to: temporaryURL, options: .atomic)
+        #endif
         try requireSuccess(downloadResponse)
         guard let http = downloadResponse as? HTTPURLResponse,
               let rowCountText = http.value(forHTTPHeaderField: "x-snapshot-row-count"),

Sources/LogseqChatModel/PendingSyncTransport.swift

@@ -1,6 +1,9 @@
 import Foundation
 
 #if !SKIP
+#if canImport(FoundationNetworking)
+import FoundationNetworking
+#endif
 public enum LogseqPendingSyncDuplicateAssetResolver {
     public static func isDuplicate(status: Int, body: String) -> Bool {
         guard status == 409,

Sources/LogseqChatModel/ViewModel.swift

@@ -1,8 +1,13 @@
 import Foundation
 import Observation
-#if !os(Android)
+#if os(iOS) || os(macOS) || os(tvOS) || os(watchOS)
 import OSLog
 #endif
+#if !SKIP
+#if canImport(FoundationNetworking)
+import FoundationNetworking
+#endif
+#endif
 #if SKIP
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
@@ -13,25 +18,25 @@ import LogseqChatCoreABI
 #endif
 
 private struct LogseqModelLogger {
-    #if !os(Android)
+    #if os(iOS) || os(macOS) || os(tvOS) || os(watchOS)
     private let logger = Logger(subsystem: "logseq.chat.model", category: "LogseqChatModel")
     #endif
 
     func info(_ message: String) {
         LogseqRuntimeLog.shared.append(level: .info, source: .core, message: message)
-        #if os(Android)
-        print(message)
-        #else
+        #if os(iOS) || os(macOS) || os(tvOS) || os(watchOS)
         logger.info("\(message, privacy: .public)")
+        #else
+        print(message)
         #endif
     }
 
     func error(_ message: String) {
         LogseqRuntimeLog.shared.append(level: .error, source: .core, message: message)
-        #if os(Android)
-        print(message)
-        #else
+        #if os(iOS) || os(macOS) || os(tvOS) || os(watchOS)
         logger.error("\(message, privacy: .public)")
+        #else
+        print(message)
         #endif
     }
 }
@@ -833,7 +838,7 @@ private struct DeletePagePayload: Encodable {
             syncError = LogseqChatCoreError(code: "sse_connection_failed", message: "\(error)")
         }
         return false
-        #else
+        #elseif os(iOS) || os(macOS)
         do {
             let request = try LogseqGraphSyncHTTP.eventsRequest(
                 baseURL: baseURL,
@@ -897,6 +902,12 @@ private struct DeletePagePayload: Encodable {
             }
         }
         return false
+        #else
+        lastError = LogseqChatCoreError(
+            code: "sse_unsupported_platform",
+            message: "Graph event streaming requires iOS, macOS, or Android"
+        )
+        return false
         #endif
     }
 

Tests/LogseqChatModelTests/AuthenticationTests.swift

@@ -103,6 +103,24 @@ private struct FailingCognitoProvider: LogseqCognitoProviding {
         #expect(await provider.recordedSignOutCount() == 1)
     }
 
+    @Test @MainActor func missingAccessTokenDoesNotSurfaceARawErrorOnTheSignInScreen() async {
+        let auth = LogseqAuthenticationStore(provider: FakeCognitoProvider(token: nil))
+
+        await auth.restore()
+        #expect(auth.state == .signedOut)
+        #expect(auth.errorMessage == nil)
+
+        do {
+            _ = try await auth.accessToken()
+            #expect(1 == 0, "Expected a missing access token to throw")
+        } catch is LogseqAuthenticationError {
+            #expect(auth.state == .signedOut)
+            #expect(auth.errorMessage == nil)
+        } catch {
+            #expect(1 == 0, "Expected LogseqAuthenticationError.notSignedIn")
+        }
+    }
+
     @Test @MainActor func accessTokenFailureUpdatesObservableAuthenticationState() async {
         var published: [String?] = []
         let auth = LogseqAuthenticationStore(provider: FailingCognitoProvider()) { token in

scripts/test-android-native-script.sh

@@ -22,13 +22,13 @@ require_text() {
     fail "missing $path"
     return
   fi
-  grep -F "$pattern" "$repo_root/$path" >/dev/null || fail "$path does not contain: $pattern"
+  grep -F -- "$pattern" "$repo_root/$path" >/dev/null || fail "$path does not contain: $pattern"
 }
 
 reject_text() {
   local path=$1
   local pattern=$2
-  if [[ -f $repo_root/$path ]] && grep -F "$pattern" "$repo_root/$path" >/dev/null; then
+  if [[ -f $repo_root/$path ]] && grep -F -- "$pattern" "$repo_root/$path" >/dev/null; then
     fail "$path unexpectedly contains: $pattern"
   fi
 }
@@ -77,6 +77,10 @@ require_text "Sources/LogseqChat/Skip/AndroidAssetImporter.kt" "contentResolver.
 reject_text "scripts/build-android-native.sh" "logseq_chat_https_stub.c"
 require_text "Android/app/build.gradle.kts" "buildAndroidNativeCore"
 require_text "Android/app/build.gradle.kts" "scripts/build-android-native.sh"
+require_text "Android/app/build.gradle.kts" "LOGSEQ_CHAT_ANDROID_ABIS"
+require_text "Android/app/build.gradle.kts" "x86_64"
+require_text "scripts/build-android-native.sh" "x86_64"
+require_text "Android/gradle/wrapper/gradle-wrapper.properties" "gradle-9.4.1-bin.zip"
 
 if [[ $failures -ne 0 ]]; then
   exit 1