From 1b694a53c0beda0a13614b67279aa129a8f606df Mon Sep 17 00:00:00 2001 From: careck Date: Tue, 2 Jun 2026 18:47:54 +1000 Subject: [PATCH 1/3] chore: change app identifier to io.opswarm.krillnotes The previous com.twopisoftware.krillnotes identifier used a domain we don't own. Switch to io.opswarm.krillnotes across Tauri config, iOS project.yml, Android build.gradle.kts, and Rust fallback path. --- krillnotes-desktop/src-tauri/gen/android/app/build.gradle.kts | 4 ++-- .../twopisoftware => io/opswarm}/krillnotes/MainActivity.kt | 2 +- krillnotes-desktop/src-tauri/gen/apple/project.yml | 4 ++-- krillnotes-desktop/src-tauri/src/lib.rs | 2 +- krillnotes-desktop/src-tauri/tauri.conf.json | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) rename krillnotes-desktop/src-tauri/gen/android/app/src/main/java/{com/twopisoftware => io/opswarm}/krillnotes/MainActivity.kt (94%) diff --git a/krillnotes-desktop/src-tauri/gen/android/app/build.gradle.kts b/krillnotes-desktop/src-tauri/gen/android/app/build.gradle.kts index 7c0f6e74..b1a01745 100644 --- a/krillnotes-desktop/src-tauri/gen/android/app/build.gradle.kts +++ b/krillnotes-desktop/src-tauri/gen/android/app/build.gradle.kts @@ -15,10 +15,10 @@ val tauriProperties = Properties().apply { android { compileSdk = 36 - namespace = "com.twopisoftware.krillnotes" + namespace = "io.opswarm.krillnotes" defaultConfig { manifestPlaceholders["usesCleartextTraffic"] = "false" - applicationId = "com.twopisoftware.krillnotes" + applicationId = "io.opswarm.krillnotes" minSdk = 24 targetSdk = 36 versionCode = tauriProperties.getProperty("tauri.android.versionCode", "1").toInt() diff --git a/krillnotes-desktop/src-tauri/gen/android/app/src/main/java/com/twopisoftware/krillnotes/MainActivity.kt b/krillnotes-desktop/src-tauri/gen/android/app/src/main/java/io/opswarm/krillnotes/MainActivity.kt similarity index 94% rename from krillnotes-desktop/src-tauri/gen/android/app/src/main/java/com/twopisoftware/krillnotes/MainActivity.kt rename to krillnotes-desktop/src-tauri/gen/android/app/src/main/java/io/opswarm/krillnotes/MainActivity.kt index f48d7581..cf675d5f 100644 --- a/krillnotes-desktop/src-tauri/gen/android/app/src/main/java/com/twopisoftware/krillnotes/MainActivity.kt +++ b/krillnotes-desktop/src-tauri/gen/android/app/src/main/java/io/opswarm/krillnotes/MainActivity.kt @@ -1,4 +1,4 @@ -package com.twopisoftware.krillnotes +package io.opswarm.krillnotes import android.os.Bundle import androidx.core.view.ViewCompat diff --git a/krillnotes-desktop/src-tauri/gen/apple/project.yml b/krillnotes-desktop/src-tauri/gen/apple/project.yml index 26abaae3..f931e7bd 100644 --- a/krillnotes-desktop/src-tauri/gen/apple/project.yml +++ b/krillnotes-desktop/src-tauri/gen/apple/project.yml @@ -1,6 +1,6 @@ name: krillnotes-desktop options: - bundleIdPrefix: com.twopisoftware.krillnotes + bundleIdPrefix: io.opswarm.krillnotes deploymentTarget: iOS: 14.0 fileGroups: [../../src] @@ -11,7 +11,7 @@ settingGroups: app: base: PRODUCT_NAME: Krillnotes - PRODUCT_BUNDLE_IDENTIFIER: com.twopisoftware.krillnotes + PRODUCT_BUNDLE_IDENTIFIER: io.opswarm.krillnotes targetTemplates: app: type: application diff --git a/krillnotes-desktop/src-tauri/src/lib.rs b/krillnotes-desktop/src-tauri/src/lib.rs index 7a7b87f9..bb11e241 100644 --- a/krillnotes-desktop/src-tauri/src/lib.rs +++ b/krillnotes-desktop/src-tauri/src/lib.rs @@ -185,7 +185,7 @@ pub fn run() { std::env::var("HOME").ok().map(std::path::PathBuf::from) }) .unwrap_or_else(|| { - std::path::PathBuf::from("/data/data/com.twopisoftware.krillnotes/files") + std::path::PathBuf::from("/data/data/io.opswarm.krillnotes/files") }); settings::set_mobile_data_dir(data_dir); } diff --git a/krillnotes-desktop/src-tauri/tauri.conf.json b/krillnotes-desktop/src-tauri/tauri.conf.json index 45861b68..ae1b171e 100644 --- a/krillnotes-desktop/src-tauri/tauri.conf.json +++ b/krillnotes-desktop/src-tauri/tauri.conf.json @@ -2,7 +2,7 @@ "$schema": "https://schema.tauri.app/config/2", "productName": "Krillnotes", "version": "1.1.1", - "identifier": "com.twopisoftware.krillnotes", + "identifier": "io.opswarm.krillnotes", "build": { "beforeDevCommand": "npm run dev", "devUrl": "http://localhost:1420", From c745e04bc38f14a8db8017d04f97cb66a8d45314 Mon Sep 17 00:00:00 2001 From: careck Date: Tue, 2 Jun 2026 19:05:47 +1000 Subject: [PATCH 2/3] fix: auto-start emulator in android-dev.sh --emulator mode Instead of failing when no emulator is running, pick the first available AVD, launch it in the background, and wait for boot to complete before starting the Tauri build. --- krillnotes-desktop/android-dev.sh | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/krillnotes-desktop/android-dev.sh b/krillnotes-desktop/android-dev.sh index 2d81dd40..156d186e 100755 --- a/krillnotes-desktop/android-dev.sh +++ b/krillnotes-desktop/android-dev.sh @@ -27,10 +27,20 @@ case "${1:-}" in ;; --emulator) if ! adb devices | grep -q "^emulator-"; then - echo "❌ No emulator found. Start one from Android Studio first." >&2 - exit 1 + AVD=$("$ANDROID_HOME/emulator/emulator" -list-avds 2>/dev/null | head -1) + if [ -z "$AVD" ]; then + echo "❌ No AVDs found. Create one in Android Studio first." >&2 + exit 1 + fi + echo "📱 Starting emulator: $AVD" + "$ANDROID_HOME/emulator/emulator" -avd "$AVD" & + echo "⏳ Waiting for emulator to boot..." + adb wait-for-device + while [ "$(adb shell getprop sys.boot_completed 2>/dev/null)" != "1" ]; do sleep 1; done + echo "✅ Emulator ready" + else + echo "📱 Targeting running emulator" fi - echo "📱 Targeting emulator" ;; *) echo "📱 Auto-detecting target (use --device or --emulator to override)" From 34f5b5ef36bf8de23e09925c4eac1429363dcf26 Mon Sep 17 00:00:00 2001 From: careck Date: Tue, 2 Jun 2026 19:16:08 +1000 Subject: [PATCH 3/3] style: cargo fmt --- krillnotes-desktop/src-tauri/src/lib.rs | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/krillnotes-desktop/src-tauri/src/lib.rs b/krillnotes-desktop/src-tauri/src/lib.rs index bb11e241..de79fea1 100644 --- a/krillnotes-desktop/src-tauri/src/lib.rs +++ b/krillnotes-desktop/src-tauri/src/lib.rs @@ -184,9 +184,7 @@ pub fn run() { // Use the standard app-private files directory. std::env::var("HOME").ok().map(std::path::PathBuf::from) }) - .unwrap_or_else(|| { - std::path::PathBuf::from("/data/data/io.opswarm.krillnotes/files") - }); + .unwrap_or_else(|| std::path::PathBuf::from("/data/data/io.opswarm.krillnotes/files")); settings::set_mobile_data_dir(data_dir); }