diff --git a/crypto_plugins/flutter_libmonero b/crypto_plugins/flutter_libmonero index 8a46a5d09..34a200020 160000 --- a/crypto_plugins/flutter_libmonero +++ b/crypto_plugins/flutter_libmonero @@ -1 +1 @@ -Subproject commit 8a46a5d0984cf7fbc1ce5d77cbb74dc6933da59c +Subproject commit 34a20002095cda70b81460d2aa4654a8280fbf0c diff --git a/lib/pages/settings_views/global_settings_view/tor_settings/tor_settings_view.dart b/lib/pages/settings_views/global_settings_view/tor_settings/tor_settings_view.dart index f0a944cb5..c05a519ef 100644 --- a/lib/pages/settings_views/global_settings_view/tor_settings/tor_settings_view.dart +++ b/lib/pages/settings_views/global_settings_view/tor_settings/tor_settings_view.dart @@ -246,9 +246,17 @@ class _TorAnimatedButtonState extends ConsumerState } } - Future _playConnecting() async { + Future _playPlug() async { await _play( - from: "connecting-start", + from: "0.0", + to: "connecting-start", + repeat: false, + ); + } + + Future _playConnecting({double? start}) async { + await _play( + from: start?.toString() ?? "connecting-start", to: "connecting-end", repeat: true, ); @@ -256,7 +264,7 @@ class _TorAnimatedButtonState extends ConsumerState Future _playConnectingDone() async { await _play( - from: "connecting-end", + from: "${controller1.value}", to: "connected-start", repeat: false, ); @@ -285,7 +293,7 @@ class _TorAnimatedButtonState extends ConsumerState required bool repeat, }) async { final composition = await _completer.future; - final start = composition.getMarker(from)!.start; + final start = double.tryParse(from) ?? composition.getMarker(from)!.start; final end = composition.getMarker(to)!.start; controller1.value = start; @@ -326,7 +334,6 @@ class _TorAnimatedButtonState extends ConsumerState @override Widget build(BuildContext context) { - // TODO: modify size (waiting for updated onion lottie animation file) final width = MediaQuery.of(context).size.width / 1.5; return TorSubscription( @@ -343,6 +350,7 @@ class _TorAnimatedButtonState extends ConsumerState break; case TorConnectionStatus.connecting: + await _playPlug(); await _playConnecting(); break; } diff --git a/lib/widgets/onetime_popups/tor_has_been_add_dialog.dart b/lib/widgets/onetime_popups/tor_has_been_add_dialog.dart index 8f316c012..2e265024f 100644 --- a/lib/widgets/onetime_popups/tor_has_been_add_dialog.dart +++ b/lib/widgets/onetime_popups/tor_has_been_add_dialog.dart @@ -145,6 +145,16 @@ class _TorHasBeenAddedDialogState extends State<_TorHasBeenAddedDialog> { ? STextStyles.desktopTextMedium(context) : STextStyles.smallMed14(context), ), + SizedBox( + height: Util.isDesktop ? 24 : 16, + ), + Text( + "Note: Tor does NOT yet work for Monero or Epic Cash wallets. " + "Opening one of these will leak your IP address.", + style: Util.isDesktop + ? STextStyles.desktopTextMedium(context) + : STextStyles.smallMed14(context), + ), ], ), ), diff --git a/pubspec.lock b/pubspec.lock index 5bfe671b9..6460c3fae 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -1656,8 +1656,8 @@ packages: dependency: "direct main" description: path: "." - ref: "7123505a9e5f702dba1c0c9aa12b289b5dfbb3bf" - resolved-ref: "7123505a9e5f702dba1c0c9aa12b289b5dfbb3bf" + ref: c8b97bc118c7bbfe1027d0442cfadea44dc285aa + resolved-ref: c8b97bc118c7bbfe1027d0442cfadea44dc285aa url: "https://github.com/cypherstack/tor.git" source: git version: "0.0.1" diff --git a/pubspec.yaml b/pubspec.yaml index a87ba8824..14ba88ce0 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -11,7 +11,7 @@ description: Stack Wallet # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion. # Read more about iOS versioning at # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html -version: 1.7.20+188 +version: 1.8.0+191 environment: sdk: ">=3.0.2 <4.0.0" @@ -60,7 +60,7 @@ dependencies: tor_ffi_plugin: git: url: https://github.com/cypherstack/tor.git - ref: 7123505a9e5f702dba1c0c9aa12b289b5dfbb3bf + ref: c8b97bc118c7bbfe1027d0442cfadea44dc285aa # Utility plugins http: ^0.13.0 diff --git a/scripts/android/build_all.sh b/scripts/android/build_all.sh index 19e2ec64c..7f448c508 100755 --- a/scripts/android/build_all.sh +++ b/scripts/android/build_all.sh @@ -4,7 +4,7 @@ set -e # libepiccash requires old rust source ../rust_version.sh -set_rust_to_1680 +set_rust_to_1671 mkdir build . ./config.sh diff --git a/scripts/ios/build_all.sh b/scripts/ios/build_all.sh index 5ff7cb2f4..dd6ad38ff 100755 --- a/scripts/ios/build_all.sh +++ b/scripts/ios/build_all.sh @@ -4,7 +4,11 @@ set -e # libepiccash requires old rust source ../rust_version.sh -set_rust_to_1680 +set_rust_to_1671 + +# ensure ios rust triples are there +rustup target add aarch64-apple-ios +rustup target add x86_64-apple-ios # ensure ios rust triples are there rustup target add aarch64-apple-ios diff --git a/scripts/linux/build_all.sh b/scripts/linux/build_all.sh index 9a6ee34d9..672668c13 100755 --- a/scripts/linux/build_all.sh +++ b/scripts/linux/build_all.sh @@ -4,7 +4,7 @@ set -e # libepiccash requires old rust source ../rust_version.sh -set_rust_to_1680 +set_rust_to_1671 # for arm # flutter-elinux clean diff --git a/scripts/macos/build_all.sh b/scripts/macos/build_all.sh index a91fb73b2..0e086fc71 100755 --- a/scripts/macos/build_all.sh +++ b/scripts/macos/build_all.sh @@ -4,7 +4,7 @@ set -e # libepiccash requires old rust source ../rust_version.sh -set_rust_to_1680 +set_rust_to_1671 (cd ../../crypto_plugins/flutter_liblelantus/scripts/macos && ./build_all.sh ) & (cd ../../crypto_plugins/flutter_libepiccash/scripts/macos && ./build_all.sh ) & diff --git a/scripts/rust_version.sh b/scripts/rust_version.sh index 91ead188d..8cda1229b 100755 --- a/scripts/rust_version.sh +++ b/scripts/rust_version.sh @@ -1,10 +1,10 @@ #!/bin/sh -set_rust_to_1680() { - if rustup toolchain list | grep -q "1.68.0"; then - rustup default 1.68.0 +set_rust_to_1671() { + if rustup toolchain list | grep -q "1.67.1"; then + rustup default 1.67.1 else - echo "Rust version 1.68.0 is not installed. Please install it using 'rustup install 1.68.0'." >&2 + echo "Rust version 1.67.1 is not installed. Please install it using 'rustup install 1.67.1'." >&2 exit 1 fi } diff --git a/scripts/windows/build_all.sh b/scripts/windows/build_all.sh index 54d340b5e..ee3c1b558 100755 --- a/scripts/windows/build_all.sh +++ b/scripts/windows/build_all.sh @@ -4,7 +4,7 @@ set -e # libepiccash requires old rust source ../rust_version.sh -set_rust_to_1680 +set_rust_to_1671 mkdir -p build (cd ../../crypto_plugins/flutter_libepiccash/scripts/windows && ./build_all.sh ) &