From ce8a3266028c57882893152a56609eff580837c2 Mon Sep 17 00:00:00 2001
From: lendry <lendry@lendry1.ru>
Date: Fri, 26 Jun 2026 15:52:39 +0300
Subject: [PATCH] fix docker for tauri app

---
 apps/frontend/public/downloads/.gitignore |   2 ++
 tauri_app/Dockerfile.apk                  |   3 ++-
 tauri_app/src-tauri/Cargo.toml            |   1 -
 tauri_app/src-tauri/icons/icon.png        | Bin 0 -> 610 bytes
 tauri_app/src-tauri/src/lib.rs            |  11 ++---------
 5 files changed, 6 insertions(+), 11 deletions(-)
 create mode 100644 apps/frontend/public/downloads/.gitignore
 create mode 100644 tauri_app/src-tauri/icons/icon.png

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 0000000000000000000000000000000000000000..f854216260dd0f27ce34946896cc9d3f40f8e1d4
GIT binary patch
literal 610
zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7xzrVAAw-aSW-L^Y*TH-V{TTmWw*7
zJvaaVY7$^>sc8FC_H)-c^{ab+|5~y9@26icKhOU9PW3M%4+HZ71_K5xRK$k$OYNB%
zxaGgEymX(n;Vl0>rX-sNVXylO_zs+0nqO?%;JGxvRI~xeHkUiVyENZI=s@q%d@HsC
zXP4$zn=~xDwB3%+A^GKOdFBN>ua_}Yy=GnT{wm{z^H&)zyx%R?@bBJMhA;19*&W{V
zH+)*hxZr=j4MVLB!zpQQhx4X<4fBAa#~3c`V$gVB!4M_S@RTv&-bRKk`V6O-7wmb=
zkWtSth25c&VM;j<!&9aOKz+=pL^pGQ-F}9nN9!3GPOyO#f>px^cZLRq%fj#34m@Dc
z09w??#BlK5yeeacHlR{>riKK6|9#>N%s`tKGdgV8w){R<Lt-xj!@*f$dxRO9rC1r7
z(xbn+{WDB)(7w;!z}U;iaPWB4U$cMaA0CwL;bvej7iHkMcYU4t$M+A}w|%zV#@z7W
z{M)*24hD|8*hjKS3<^IsUXgZTboj9L$=}Bew*;5u*RwQ)u>ix0bpfyAuWRm184VNm
zz2#uouH<pQM5JN1!jgOosRJb}FK@>(CMdOhS-XzKfYIrfnJ9zb;R*X3O&dhozLc{j
u7<YUrXG~C>^d+4EN30q!yt%yjH`BX^lH5MB8%2O=hr!d;&t;ucLK6VKIq=c|

literal 0
HcmV?d00001

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,