diff --git a/apps/frontend/public/downloads/.gitignore b/apps/frontend/public/downloads/.gitignore new file mode 100644 index 0000000..a06e3ee --- /dev/null +++ b/apps/frontend/public/downloads/.gitignore @@ -0,0 +1,2 @@ +*.apk +!.gitkeep diff --git a/tauri_app/Dockerfile.apk b/tauri_app/Dockerfile.apk index 7f7e41d..06b099a 100644 --- a/tauri_app/Dockerfile.apk +++ b/tauri_app/Dockerfile.apk @@ -53,6 +53,7 @@ COPY tsconfig.base.json ./ COPY tauri_app ./tauri_app COPY tauri_app/docker/build-android-apk.sh /usr/local/bin/build-android-apk -RUN chmod +x /usr/local/bin/build-android-apk +RUN sed -i 's/\r$//' /usr/local/bin/build-android-apk \ + && chmod +x /usr/local/bin/build-android-apk CMD ["build-android-apk"] diff --git a/tauri_app/src-tauri/Cargo.toml b/tauri_app/src-tauri/Cargo.toml index 11bd550..1a57df1 100644 --- a/tauri_app/src-tauri/Cargo.toml +++ b/tauri_app/src-tauri/Cargo.toml @@ -20,7 +20,6 @@ tauri = { version = "2", features = [] } tauri-plugin-opener = "2" tauri-plugin-stronghold = "2" url = "2" -dirs-next = "2" [profile.release] panic = "abort" diff --git a/tauri_app/src-tauri/icons/icon.png b/tauri_app/src-tauri/icons/icon.png new file mode 100644 index 0000000..f854216 Binary files /dev/null and b/tauri_app/src-tauri/icons/icon.png differ diff --git a/tauri_app/src-tauri/src/lib.rs b/tauri_app/src-tauri/src/lib.rs index 36b201a..c61cbd8 100644 --- a/tauri_app/src-tauri/src/lib.rs +++ b/tauri_app/src-tauri/src/lib.rs @@ -122,18 +122,11 @@ fn normalize_base32_secret(secret: &str) -> String { .collect() } +#[cfg_attr(mobile, tauri::mobile_entry_point)] pub fn run() { tauri::Builder::default() .plugin(tauri_plugin_opener::init()) - .plugin(tauri_plugin_stronghold::Builder::new(|password| { - use tauri_plugin_stronghold::stronghold::Client; - - let salt_path = dirs_next::data_dir() - .unwrap_or_else(std::env::temp_dir) - .join("lendry-id-stronghold.salt"); - tauri_plugin_stronghold::stronghold::derive_key_from_password(password.as_ref(), &salt_path) - }) - .build()) + .plugin(tauri_plugin_stronghold::Builder::new(|password| password.as_bytes().to_vec()).build()) .invoke_handler(tauri::generate_handler![ validate_qr_session_payload, validate_api_base_url,