فهرست منبع

wallet: set HOME dir on android as workaround for tor bug

darkfi 1 سال پیش
والد
کامیت
0b3cd90475
3فایلهای تغییر یافته به همراه9 افزوده شده و 1 حذف شده
  1. 2 0
      bin/darkwallet/Cargo.toml
  2. 1 1
      bin/darkwallet/src/darkirc2.rs
  3. 6 0
      bin/darkwallet/src/main.rs

+ 2 - 0
bin/darkwallet/Cargo.toml

@@ -51,6 +51,8 @@ freetype-sys = { git = "https://github.com/narodnik/freetype-sys" }
 # I'm so confused why this is needed
 halo2_proofs = {git="https://github.com/parazyd/halo2", branch="v4"}
 halo2_gadgets = {git="https://github.com/parazyd/halo2", branch="v4"}
+# This patch didn't work for me
+#dirs-sys = {git="https://github.com/sbechet/dirs-sys-rs.git"}
 
 [target.'cfg(target_os = "android")'.dependencies]
 android_logger = "0.13.3"

+ 1 - 1
bin/darkwallet/src/darkirc2.rs

@@ -33,7 +33,7 @@ use evgrd::{
     FetchEventsMessage, LocalEventGraph, LocalEventGraphPtr, VersionMessage, MSG_EVENT,
     MSG_FETCHEVENTS, MSG_SENDEVENT,
 };
-use futures::{select, FutureExt, AsyncWriteExt};
+use futures::{select, AsyncWriteExt, FutureExt};
 use log::{error, info};
 use sled_overlay::sled;
 use smol::{

+ 6 - 0
bin/darkwallet/src/main.rs

@@ -85,6 +85,12 @@ fn main() {
 
     #[cfg(target_os = "android")]
     {
+        // Workaround for this bug
+        // https://gitlab.torproject.org/tpo/core/arti/-/issues/999
+        unsafe {
+            std::env::set_var("HOME", "/data/data/darkfi.darkwallet/");
+        }
+
         android_logger::init_once(
             android_logger::Config::default().with_max_level(LevelFilter::Debug).with_tag("darkfi"),
         );