From 95c34fb4317c6f2bf6924c29b6dca2b74975fb34 Mon Sep 17 00:00:00 2001 From: Iaphetes Date: Fri, 14 Mar 2025 09:30:43 +0100 Subject: [PATCH] config storing --- src-tauri/gen/android/app/build.gradle.kts | 8 ++++---- src-tauri/gen/android/app/src/main/AndroidManifest.xml | 2 -- src-tauri/src/config.rs | 5 +++-- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src-tauri/gen/android/app/build.gradle.kts b/src-tauri/gen/android/app/build.gradle.kts index dabf31d..742eb45 100644 --- a/src-tauri/gen/android/app/build.gradle.kts +++ b/src-tauri/gen/android/app/build.gradle.kts @@ -32,15 +32,13 @@ android { if (keystorePropertiesFile.exists()) { keystoreProperties.load(FileInputStream(keystorePropertiesFile)) } - + keyAlias = keystoreProperties["keyAlias"] as String keyPassword = keystoreProperties["password"] as String storeFile = file(keystoreProperties["storeFile"] as String) storePassword = keystoreProperties["password"] as String } } - - buildTypes { getByName("debug") { manifestPlaceholders["usesCleartextTraffic"] = "true" @@ -54,7 +52,6 @@ android { } } getByName("release") { - signingConfig = signingConfigs.getByName("release") isMinifyEnabled = true proguardFiles( *fileTree(".") { include("**/*.pro") } @@ -62,6 +59,9 @@ android { .toList().toTypedArray() ) } + getByName("release") { + signingConfig = signingConfigs.getByName("release") + } } kotlinOptions { jvmTarget = "1.8" diff --git a/src-tauri/gen/android/app/src/main/AndroidManifest.xml b/src-tauri/gen/android/app/src/main/AndroidManifest.xml index 13e2334..40bcd28 100644 --- a/src-tauri/gen/android/app/src/main/AndroidManifest.xml +++ b/src-tauri/gen/android/app/src/main/AndroidManifest.xml @@ -1,8 +1,6 @@ - - diff --git a/src-tauri/src/config.rs b/src-tauri/src/config.rs index 8177856..bff8f63 100644 --- a/src-tauri/src/config.rs +++ b/src-tauri/src/config.rs @@ -35,11 +35,11 @@ impl Default for CoreCFG { pub fn load_config(path: Option) -> Config { match path { Some(p) => confy::load_path(p).expect("Configuration could not be loaded"), - None => confy::load("apographe", Some("config")) + None => confy::load("apograph", Some("config")) .ok() .unwrap_or_else(|| { let config: Config = Config::default(); - let _ = confy::store("aphorme", Some("config"), Config::default()); + let _ = confy::store("apograph", Some("config"), Config::default()); config }), } @@ -68,6 +68,7 @@ pub fn set_basepath(app_handle: tauri::AppHandle, path: String) -> bool { // Lock the mutex to get mutable access: let mut config = config.lock().unwrap(); config.core_cfg.home_path = Some(basepath); + let _ = confy::store("apograph", Some("config"), config.clone()); return true; } else { return false;