Load remote images over Tor when it is enabled
What changed, and why it matters
This commit fixes a privacy leak in Stack Wallet. When users turned on Tor mode to hide their internet traffic, the app was still loading remote images—such as token logos, exchange icons, gift-card pictures, and theme previews—directly over the normal internet, bypassing Tor. The change adds new image loaders that route these image requests through the app's Tor-aware HTTP client, and replaces all direct image loading calls across the wallet's user interface.
Users who rely on Tor for privacy should upgrade to a release containing this commit and verify that remote images load successfully in Tor mode. Developers should audit for any remaining direct `Image.network` or `SvgPicture.network` usages and confirm that the `HTTP` wrapper enforces Tor proxy settings consistently across all outbound requests.
Security signals we found
Privacy leak: remote image requests bypassed Tor and exposed real IP address
Fix routes image traffic through app's Tor-aware HTTP client
Fails closed: throws when Tor is enabled but not connected
Wide UI coverage: token, exchange, CakePay, ShopInBit, and theme images
No CVE or vendor security advisory referenced in commit materials
Evidence from the diff
The patch introduces TorAwareNetworkImage and TorAwareSvgNetworkLoader, which use the existing HTTP wrapper and TorService.getProxyInfo() to fetch image bytes over Tor when the Tor preference is enabled. It then replaces Image.network and SvgPicture.network call sites in 12 UI files (token icons, coin selection, exchange provider logos, CakePay card/vendor images, ShopInBit attachments, theme previews) so that remote images no longer use Flutter’s default clearnet HTTP clients. The helper also throws if Tor is enabled but not connected, preventing silent fallback to clearnet.
Changed components
lib/networking/tor_aware_network_image.dartlib/pages/add_wallet_views/add_token_view/sub_widgets/add_token_list_element.dartlib/pages/add_wallet_views/add_wallet_view/sub_widgets/coin_select_item.dartlib/pages/cakepay/cakepay_card_detail_view.dartlib/pages/cakepay/cakepay_vendors_view.dartlib/pages/exchange_view/exchange_coin_selection/exchange_currency_selection_view.dartlib/pages/exchange_view/sub_widgets/exchange_provider_option.dartlib/pages/settings_views/global_settings_view/appearance_settings/sub_widgets/stack_theme_card.dartlib/pages/shopinbit/shopinbit_ticket_detail.dartlib/widgets/icon_widgets/eth_token_icon.dartlib/widgets/icon_widgets/sol_token_icon.dartlib/widgets/textfields/exchange_textfield.dartlib/widgets/wallet_info_row/sub_widgets/wallet_info_row_coin_icon.dartInspect captured patch +401 / −273
### lib/networking/tor_aware_network_image.dart
@@ -0,0 +1,123 @@
+import 'dart:async';
+import 'dart:convert';
+import 'dart:ui' as ui;
+
+import 'package:flutter/foundation.dart';
+import 'package:flutter/widgets.dart';
+import 'package:flutter_svg/flutter_svg.dart';
+
+import '../app_config.dart';
+import '../services/tor_service.dart';
+import '../utilities/prefs.dart';
+import 'http.dart';
+
+/// Fetches [url] through the app's [HTTP] client, routing over Tor when it is
+/// enabled. Throws if Tor is enabled but not connected, so nothing falls back
+/// to clearnet.
+Future<Uint8List> fetchTorAwareBytes(String url) async {
+ final response = await const HTTP().get(
+ url: Uri.parse(url),
+ proxyInfo: !AppConfig.hasFeature(AppFeature.tor)
+ ? null
+ : Prefs.instance.useTor
+ ? TorService.sharedInstance.getProxyInfo()
+ : null,
+ );
+
+ if (response.code != 200) {
+ throw Exception("Failed to load $url: status=${response.code}");
+ }
+
+ return Uint8List.fromList(response.bodyBytes);
+}
+
+/// Drop-in replacement for [NetworkImage] that respects the Tor preference.
+/// Use with [Image] instead of [Image.network], which always goes clearnet.
+@immutable
+class TorAwareNetworkImage extends ImageProvider<TorAwareNetworkImage> {
+ const TorAwareNetworkImage(this.url);
+
+ final String url;
+
+ @override
+ Future<TorAwareNetworkImage> obtainKey(ImageConfiguration configuration) =>
+ SynchronousFuture<TorAwareNetworkImage>(this);
+
+ @override
+ ImageStreamCompleter loadImage(
+ TorAwareNetworkImage key,
+ ImageDecoderCallback decode,
+ ) {
+ final chunkEvents = StreamController<ImageChunkEvent>();
+ return MultiFrameImageStreamCompleter(
+ codec: _load(key, decode, chunkEvents),
+ chunkEvents: chunkEvents.stream,
+ scale: 1.0,
+ debugLabel: key.url,
+ );
+ }
+
+ Future<ui.Codec> _load(
+ TorAwareNetworkImage key,
+ ImageDecoderCallback decode,
+ StreamController<ImageChunkEvent> chunkEvents,
+ ) async {
+ try {
+ // Lets loadingBuilder show its indicator while the request runs.
+ chunkEvents.add(
+ const ImageChunkEvent(
+ cumulativeBytesLoaded: 0,
+ expectedTotalBytes: null,
+ ),
+ );
+ final bytes = await fetchTorAwareBytes(key.url);
+ final buffer = await ui.ImmutableBuffer.fromUint8List(bytes);
+ return await decode(buffer);
+ } catch (_) {
+ // Don't keep a failed load in the cache.
+ scheduleMicrotask(() {
+ PaintingBinding.instance.imageCache.evict(key);
+ });
+ rethrow;
+ } finally {
+ unawaited(chunkEvents.close());
+ }
+ }
+
+ @override
+ bool operator ==(Object other) =>
+ other is TorAwareNetworkImage && other.url == url;
+
+ @override
+ int get hashCode => url.hashCode;
+
+ @override
+ String toString() =>
+ "${objectRuntimeType(this, "TorAwareNetworkImage")}"
+ "(\"$url\")";
+}
+
+/// Drop-in replacement for the loader behind [SvgPicture.network] that
+/// respects the Tor preference.
+/// Use as `SvgPicture(TorAwareSvgNetworkLoader(url))`.
+@immutable
+class TorAwareSvgNetworkLoader extends SvgLoader<Uint8List> {
+ const TorAwareSvgNetworkLoader(this.url);
+
+ final String url;
+
+ @override
+ Future<Uint8List?> prepareMessage(BuildContext? context) =>
+ fetchTorAwareBytes(url);
+
+ @override
+ String provideSvg(Uint8List? message) =>
+ utf8.decode(message!, allowMalformed: true);
+
+ @override
+ bool operator ==(Object other) =>
+ other is TorAwareSvgNetworkLoader && other.url == url;
+
+ @override
+ int get hashCode => url.hashCode;
+}
### lib/pages/add_wallet_views/add_token_view/sub_widgets/add_token_list_element.dart
@@ -16,6 +16,7 @@ import 'package:isar_community/isar.dart';
import '../../../../models/isar/exchange_cache/currency.dart';
import '../../../../models/isar/models/contract.dart';
import '../../../../models/isar/models/ethereum/eth_contract.dart';
+import '../../../../networking/tor_aware_network_image.dart';
import '../../../../services/exchange/change_now/change_now_exchange.dart';
import '../../../../services/exchange/exchange_data_loading_service.dart';
import '../../../../themes/stack_colors.dart';
@@ -101,8 +102,8 @@ class _AddTokenListElementState extends ConsumerState<AddTokenListElement> {
)
else
currency != null
- ? SvgPicture.network(
- currency!.image,
+ ? SvgPicture(
+ TorAwareSvgNetworkLoader(currency!.image),
width: iconSize,
height: iconSize,
placeholderBuilder: (_) =>
### lib/pages/add_wallet_views/add_wallet_view/sub_widgets/coin_select_item.dart
@@ -19,6 +19,7 @@ import '../../../../models/add_wallet_list_entity/add_wallet_list_entity.dart';
import '../../../../models/add_wallet_list_entity/sub_classes/eth_token_entity.dart';
import '../../../../models/add_wallet_list_entity/sub_classes/sol_token_entity.dart';
import '../../../../models/isar/exchange_cache/currency.dart';
+import '../../../../networking/tor_aware_network_image.dart';
import '../../../../providers/providers.dart';
import '../../../../services/exchange/change_now/change_now_exchange.dart';
import '../../../../services/exchange/exchange_data_loading_service.dart';
@@ -146,15 +147,15 @@ class _CoinSelectItemState extends ConsumerState<CoinSelectItem> {
else
tokenImageUri != null
? tokenImageUri!.toLowerCase().endsWith(".svg")
- ? SvgPicture.network(
- tokenImageUri!,
+ ? SvgPicture(
+ TorAwareSvgNetworkLoader(tokenImageUri!),
width: 26,
height: 26,
placeholderBuilder: (_) =>
const AppIcon(width: 26, height: 26),
)
- : Image.network(
- tokenImageUri!,
+ : Image(
+ image: TorAwareNetworkImage(tokenImageUri!),
width: 26,
height: 26,
errorBuilder: (_, _, _) => SvgPicture.file(
### lib/pages/cakepay/cakepay_card_detail_view.dart
@@ -3,6 +3,7 @@ import 'package:flutter/gestures.dart';
import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
+import '../../networking/tor_aware_network_image.dart';
import '../../providers/global/locale_provider.dart';
import '../../services/cakepay/cakepay_service.dart';
import '../../services/cakepay/src/models/card.dart';
@@ -340,8 +341,8 @@ class _CardImage extends StatelessWidget {
),
child: ClipRRect(
borderRadius: BorderRadius.circular(8),
- child: Image.network(
- imageUrl,
+ child: Image(
+ image: TorAwareNetworkImage(imageUrl),
width: isDesktop ? 300 : null,
fit: isDesktop ? .contain : .fitWidth,
loadingBuilder: (_, child, event) {
### lib/pages/cakepay/cakepay_vendors_view.dart
@@ -2,6 +2,7 @@ import 'package:dropdown_button2/dropdown_button2.dart';
import 'package:flutter/material.dart';
import 'package:flutter_svg/flutter_svg.dart';
+import '../../networking/tor_aware_network_image.dart';
import '../../services/cakepay/cakepay_service.dart';
import '../../services/cakepay/src/models/card.dart';
import '../../themes/stack_colors.dart';
@@ -87,9 +88,8 @@ class _CakePayVendorsViewState extends State<CakePayVendorsView> {
}
Future<void> _onCardTapped(CakePayCard card) async {
- await Navigator.of(
- context,
- ).pushNamed(CakePayCardDetailView.routeName, arguments: card);
+ await Navigator.of(context)
+ .pushNamed(CakePayCardDetailView.routeName, arguments: card);
}
@override
@@ -130,9 +130,9 @@ class _CakePayVendorsViewState extends State<CakePayVendorsView> {
condition: !isDesktop,
builder: (child) => Background(
child: Scaffold(
- backgroundColor: Theme.of(
- context,
- ).extension<StackColors>()!.background,
+ backgroundColor: Theme.of(context)
+ .extension<StackColors>()!
+ .background,
appBar: AppBar(
leading: AppBarBackButton(
onPressed: () => Navigator.of(context).pop(),
@@ -210,9 +210,9 @@ class _CakePayVendorsViewState extends State<CakePayVendorsView> {
child: Text(
"No items",
style: STextStyles.w500_14(context).copyWith(
- color: Theme.of(
- context,
- ).extension<StackColors>()!.textSubtitle1,
+ color: Theme.of(context)
+ .extension<StackColors>()!
+ .textSubtitle1,
),
),
),
@@ -226,9 +226,9 @@ class _CakePayVendorsViewState extends State<CakePayVendorsView> {
Text(
error.toString(),
style: STextStyles.w500_14(context).copyWith(
- color: Theme.of(
- context,
- ).extension<StackColors>()!.textSubtitle1,
+ color: Theme.of(context)
+ .extension<StackColors>()!
+ .textSubtitle1,
),
),
const SizedBox(height: 16),
@@ -276,9 +276,9 @@ class _SearchField extends StatelessWidget {
focusNode: focusNode,
style: isDesktop
? STextStyles.desktopTextExtraSmall(context).copyWith(
- color: Theme.of(
- context,
- ).extension<StackColors>()!.textFieldActiveText,
+ color: Theme.of(context)
+ .extension<StackColors>()!
+ .textFieldActiveText,
)
: STextStyles.field(context),
decoration:
@@ -327,9 +327,8 @@ class _CountryDropdown extends StatelessWidget {
);
final itemStyle = isDesktop
- ? STextStyles.desktopTextExtraSmall(
- context,
- ).copyWith(color: colors.textFieldActiveText)
+ ? STextStyles.desktopTextExtraSmall(context)
+ .copyWith(color: colors.textFieldActiveText)
: STextStyles.w500_14(context);
return ClipRRect(
@@ -341,9 +340,8 @@ class _CountryDropdown extends StatelessWidget {
hint: Text(
"All countries",
style: isDesktop
- ? STextStyles.desktopTextExtraSmall(
- context,
- ).copyWith(color: colors.textFieldDefaultSearchIconLeft)
+ ? STextStyles.desktopTextExtraSmall(context)
+ .copyWith(color: colors.textFieldDefaultSearchIconLeft)
: STextStyles.fieldLabel(context),
),
items: [
@@ -446,8 +444,8 @@ class _CardTile extends StatelessWidget {
ClipRRect(
borderRadius: BorderRadius.circular(4),
child: card.cardImageUrl != null
- ? Image.network(
- card.cardImageUrl!,
+ ? Image(
+ image: TorAwareNetworkImage(card.cardImageUrl!),
width: isDesktop ? 60 : 48,
height: isDesktop ? 40 : 32,
fit: BoxFit.cover,
@@ -483,9 +481,8 @@ class _CardTile extends StatelessWidget {
].join(' '),
style: isDesktop
? STextStyles.desktopTextExtraExtraSmall(context)
- : STextStyles.itemSubtitle12(
- context,
- ).copyWith(color: colors.textSubtitle1),
+ : STextStyles.itemSubtitle12(context)
+ .copyWith(color: colors.textSubtitle1),
),
],
),
### lib/pages/exchange_view/exchange_coin_selection/exchange_currency_selection_view.dart
@@ -19,6 +19,7 @@ import '../../../app_config.dart';
import '../../../models/exchange/aggregate_currency.dart';
import '../../../models/isar/exchange_cache/currency.dart';
import '../../../models/isar/exchange_cache/pair.dart';
+import '../../../networking/tor_aware_network_image.dart';
import '../../../services/exchange/exchange.dart';
import '../../../services/exchange/exchange_data_loading_service.dart';
import '../../../themes/stack_colors.dart';
@@ -73,19 +74,19 @@ class _ExchangeCurrencySelectionViewState
showDialog<void>(
context: context,
barrierDismissible: false,
- builder:
- (_) => WillPopScope(
- onWillPop: () async => false,
- child: Container(
- color: Theme.of(
- context,
- ).extension<StackColors>()!.overlay.withOpacity(0.6),
- child: const CustomLoadingOverlay(
- message: "Loading currencies",
- eventBus: null,
- ),
- ),
+ builder: (_) => WillPopScope(
+ onWillPop: () async => false,
+ child: Container(
+ color: Theme.of(context)
+ .extension<StackColors>()!
+ .overlay
+ .withOpacity(0.6),
+ child: const CustomLoadingOverlay(
+ message: "Loading currencies",
+ eventBus: null,
),
+ ),
+ ),
),
);
@@ -101,36 +102,33 @@ class _ExchangeCurrencySelectionViewState
Future<List<AggregateCurrency>> _loadCurrencies() async {
await ExchangeDataLoadingService.instance.initDB();
final isar = await ExchangeDataLoadingService.instance.isar;
- final currencies =
- await isar.currencies
- .where()
- .filter()
- .isFiatEqualTo(false)
- .and()
- .group(
- (q) =>
- widget.isFixedRate
- ? q
- .rateTypeEqualTo(SupportedRateType.both)
- .or()
- .rateTypeEqualTo(SupportedRateType.fixed)
- : q
- .rateTypeEqualTo(SupportedRateType.both)
- .or()
- .rateTypeEqualTo(SupportedRateType.estimated),
- )
- .sortByIsStackCoin()
- .thenByName()
- .findAll();
+ final currencies = await isar.currencies
+ .where()
+ .filter()
+ .isFiatEqualTo(false)
+ .and()
+ .group(
+ (q) => widget.isFixedRate
+ ? q
+ .rateTypeEqualTo(SupportedRateType.both)
+ .or()
+ .rateTypeEqualTo(SupportedRateType.fixed)
+ : q
+ .rateTypeEqualTo(SupportedRateType.both)
+ .or()
+ .rateTypeEqualTo(SupportedRateType.estimated),
+ )
+ .sortByIsStackCoin()
+ .thenByName()
+ .findAll();
// If using Tor, filter exchanges which do not support Tor.
if (Prefs.instance.useTor) {
if (Exchange.exchangeNamesWithTorSupport.isNotEmpty) {
currencies.removeWhere(
- (element) =>
- !Exchange.exchangeNamesWithTorSupport.contains(
- element.exchangeName,
- ),
+ (element) => !Exchange.exchangeNamesWithTorSupport.contains(
+ element.exchangeName,
+ ),
);
}
}
@@ -163,20 +161,18 @@ class _ExchangeCurrencySelectionViewState
results.remove(widget.pairedCurrency);
}
- final walletCoins =
- results
- .where(
- (currency) =>
- AppConfig.coins
- .where(
- (coin) =>
- coin.ticker.toLowerCase() ==
- currency.ticker.toLowerCase() &&
- currency.fuzzyNet == coin.ticker.toLowerCase(),
- )
- .isNotEmpty,
- )
- .toList();
+ final walletCoins = results
+ .where(
+ (currency) => AppConfig.coins
+ .where(
+ (coin) =>
+ coin.ticker.toLowerCase() ==
+ currency.ticker.toLowerCase() &&
+ currency.fuzzyNet == coin.ticker.toLowerCase(),
+ )
+ .isNotEmpty,
+ )
+ .toList();
final list = results.toList();
@@ -240,8 +236,9 @@ class _ExchangeCurrencySelectionViewState
builder: (child) {
return Background(
child: Scaffold(
- backgroundColor:
- Theme.of(context).extension<StackColors>()!.background,
+ backgroundColor: Theme.of(context)
+ .extension<StackColors>()!
+ .background,
appBar: AppBar(
leading: AppBarBackButton(
onPressed: () async {
@@ -286,45 +283,45 @@ class _ExchangeCurrencySelectionViewState
focusNode: _searchFocusNode,
onChanged: (value) => setState(() => _searchString = value),
style: STextStyles.field(context),
- decoration: standardInputDecoration(
- "Search",
- _searchFocusNode,
- context,
- desktopMed: isDesktop,
- ).copyWith(
- prefixIcon: Padding(
- padding: const EdgeInsets.symmetric(
- horizontal: 10,
- vertical: 16,
- ),
- child: SvgPicture.asset(
- Assets.svg.search,
- width: 16,
- height: 16,
- ),
- ),
- suffixIcon:
- _searchController.text.isNotEmpty
+ decoration:
+ standardInputDecoration(
+ "Search",
+ _searchFocusNode,
+ context,
+ desktopMed: isDesktop,
+ ).copyWith(
+ prefixIcon: Padding(
+ padding: const EdgeInsets.symmetric(
+ horizontal: 10,
+ vertical: 16,
+ ),
+ child: SvgPicture.asset(
+ Assets.svg.search,
+ width: 16,
+ height: 16,
+ ),
+ ),
+ suffixIcon: _searchController.text.isNotEmpty
? Padding(
- padding: const EdgeInsets.only(right: 0),
- child: UnconstrainedBox(
- child: Row(
- children: [
- TextFieldIconButton(
- child: const XIcon(),
- onTap: () async {
- setState(() {
- _searchController.text = "";
- _searchString = "";
- });
- },
- ),
- ],
+ padding: const EdgeInsets.only(right: 0),
+ child: UnconstrainedBox(
+ child: Row(
+ children: [
+ TextFieldIconButton(
+ child: const XIcon(),
+ onTap: () async {
+ setState(() {
+ _searchController.text = "";
+ _searchString = "";
+ });
+ },
+ ),
+ ],
+ ),
),
- ),
- )
+ )
: null,
- ),
+ ),
),
),
const SizedBox(height: 20),
@@ -358,23 +355,20 @@ class _ExchangeCurrencySelectionViewState
height: 24,
child:
AppConfig.isStackCoin(
- items[index].ticker,
- )
- ? CoinIconForTicker(
- ticker: items[index].ticker,
- size: 24,
- )
- : hasImageUrl
- ? _NetImage(
- url: image,
- key: ValueKey(
- image + items[index].fuzzyNet,
- ),
- )
- : const SizedBox(
- width: 24,
- height: 24,
+ items[index].ticker,
+ )
+ ? CoinIconForTicker(
+ ticker: items[index].ticker,
+ size: 24,
+ )
+ : hasImageUrl
+ ? _NetImage(
+ url: image,
+ key: ValueKey(
+ image + items[index].fuzzyNet,
),
+ )
+ : const SizedBox(width: 24, height: 24),
),
const SizedBox(width: 10),
Expanded(
@@ -399,24 +393,21 @@ class _ExchangeCurrencySelectionViewState
left: 12,
),
child: CoinTickerTag(
- ticker:
- items[index].fuzzyNet
- .toUpperCase(),
+ ticker: items[index].fuzzyNet
+ .toUpperCase(),
),
),
],
),
const SizedBox(height: 2),
Text(
items[index].ticker.toUpperCase(),
- style: STextStyles.smallMed12(
- context,
- ).copyWith(
- color:
- Theme.of(context)
+ style: STextStyles.smallMed12(context)
+ .copyWith(
+ color: Theme.of(context)
.extension<StackColors>()!
.textSubtitle1,
- ),
+ ),
),
],
),
@@ -447,15 +438,20 @@ class _NetImage extends StatelessWidget {
@override
Widget build(BuildContext context) {
if (url.endsWith(".svg")) {
- return SvgPicture.network(
+ return SvgPicture(
key: key,
- url,
+ TorAwareSvgNetworkLoader(url),
width: 24,
height: 24,
placeholderBuilder: (_) => const LoadingIndicator(),
);
} else {
- return Image.network(url, width: 24, height: 24, key: key);
+ return Image(
+ image: TorAwareNetworkImage(url),
+ width: 24,
+ height: 24,
+ key: key,
+ );
}
}
}
### lib/pages/exchange_view/sub_widgets/exchange_provider_option.dart
@@ -15,6 +15,7 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
import '../../../app_config.dart';
import '../../../models/exchange/aggregate_currency.dart';
import '../../../models/exchange/response_objects/estimate.dart';
+import '../../../networking/tor_aware_network_image.dart';
import '../../../providers/exchange/exchange_form_state_provider.dart';
import '../../../providers/global/locale_provider.dart';
import '../../../services/exchange/exchange.dart';
@@ -164,9 +165,9 @@ class _ExchangeOptionState extends ConsumerState<ExchangeOption> {
isDesktop
? Container(
height: 1,
- color: Theme.of(
- context,
- ).extension<StackColors>()!.background,
+ color: Theme.of(context)
+ .extension<StackColors>()!
+ .background,
)
: const SizedBox(height: 16),
child,
@@ -215,9 +216,9 @@ class _ExchangeOptionState extends ConsumerState<ExchangeOption> {
estimate: null,
pair: pair,
rateString: message ?? "Failed to fetch rate",
- rateColor: Theme.of(
- context,
- ).extension<StackColors>()!.textError,
+ rateColor: Theme.of(context)
+ .extension<StackColors>()!
+ .textError,
);
},
);
@@ -354,9 +355,9 @@ class _ProviderOptionState extends ConsumerState<ExchProviderOption> {
child: Padding(
padding: EdgeInsets.only(top: isDesktop ? 20.0 : 15.0),
child: Radio(
- activeColor: Theme.of(
- context,
- ).extension<StackColors>()!.radioButtonIconEnabled,
+ activeColor: Theme.of(context)
+ .extension<StackColors>()!
+ .radioButtonIconEnabled,
value: _id,
groupValue: groupValue,
onChanged: (_) {
@@ -382,8 +383,10 @@ class _ProviderOptionState extends ConsumerState<ExchProviderOption> {
widget.estimate!.exchangeProviderLogo!.isNotEmpty
? ClipRRect(
borderRadius: BorderRadius.circular(5),
- child: Image.network(
- widget.estimate!.exchangeProviderLogo!,
+ child: Image(
+ image: TorAwareNetworkImage(
+ widget.estimate!.exchangeProviderLogo!,
+ ),
loadingBuilder:
(context, child, loadingProgress) {
if (loadingProgress == null) {
@@ -427,9 +430,9 @@ class _ProviderOptionState extends ConsumerState<ExchProviderOption> {
widget.estimate?.exchangeProvider ??
widget.exchange.name,
style: STextStyles.titleBold12(context).copyWith(
- color: Theme.of(
- context,
- ).extension<StackColors>()!.textDark2,
+ color: Theme.of(context)
+ .extension<StackColors>()!
+ .textDark2,
),
),
),
@@ -443,9 +446,9 @@ class _ProviderOptionState extends ConsumerState<ExchProviderOption> {
],
style: STextStyles.itemSubtitle12(context)
.copyWith(
- color: Theme.of(
- context,
- ).extension<StackColors>()!.textSubtitle1,
+ color: Theme.of(context)
+ .extension<StackColors>()!
+ .textSubtitle1,
),
)
: Text(
### lib/pages/settings_views/global_settings_view/appearance_settings/sub_widgets/stack_theme_card.dart
@@ -17,6 +17,7 @@ import 'package:flutter_svg/svg.dart';
import 'package:isar_community/isar.dart';
import '../../../../../models/isar/stack_theme.dart';
+import '../../../../../networking/tor_aware_network_image.dart';
import '../../../../../notifications/show_flush_bar.dart';
import '../../../../../providers/db/main_db_provider.dart';
import '../../../../../providers/global/prefs_provider.dart';
@@ -69,18 +70,16 @@ class _StackThemeCardState extends ConsumerState<StackThemeCard> {
}
Future<void> _downloadPressed() async {
- final result =
- (await showLoading(
- whileFuture: _downloadAndInstall(),
- context: context,
- message: "Downloading and installing theme...",
- ))!;
+ final result = (await showLoading(
+ whileFuture: _downloadAndInstall(),
+ context: context,
+ message: "Downloading and installing theme...",
+ ))!;
if (mounted) {
- final message =
- result
- ? "${widget.data.name} theme installed!"
- : "Failed to install ${widget.data.name} theme";
+ final message = result
+ ? "${widget.data.name} theme installed!"
+ : "Failed to install ${widget.data.name} theme";
if (isDesktop) {
await showFloatingFlushBar(
type: result ? FlushBarType.success : FlushBarType.warning,
@@ -90,16 +89,15 @@ class _StackThemeCardState extends ConsumerState<StackThemeCard> {
} else {
await showDialog<void>(
context: context,
- builder:
- (_) => StackOkDialog(
- title: message,
- onOkPressed: (_) {
- setState(() {
- _needsUpdate = !result;
- _hasTheme = result;
- });
- },
- ),
+ builder: (_) => StackOkDialog(
+ title: message,
+ onOkPressed: (_) {
+ setState(() {
+ _needsUpdate = !result;
+ _hasTheme = result;
+ });
+ },
+ ),
);
}
}
@@ -155,14 +153,13 @@ class _StackThemeCardState extends ConsumerState<StackThemeCard> {
}
}
- StackTheme? getInstalled() =>
- ref
- .read(mainDBProvider)
- .isar
- .stackThemes
- .where()
- .themeIdEqualTo(widget.data.id)
- .findFirstSync();
+ StackTheme? getInstalled() => ref
+ .read(mainDBProvider)
+ .isar
+ .stackThemes
+ .where()
+ .themeIdEqualTo(widget.data.id)
+ .findFirstSync();
@override
void initState() {
@@ -207,39 +204,41 @@ class _StackThemeCardState extends ConsumerState<StackThemeCard> {
Widget build(BuildContext context) {
return RoundedWhiteContainer(
radiusMultiplier: isDesktop ? 2.5 : 1,
- borderColor:
- isDesktop
- ? Theme.of(context).extension<StackColors>()!.textSubtitle6
- : null,
+ borderColor: isDesktop
+ ? Theme.of(context).extension<StackColors>()!.textSubtitle6
+ : null,
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
Padding(
padding: const EdgeInsets.symmetric(horizontal: 18),
- child:
- widget.data.previewImageUrl.isNotEmpty
- ? AspectRatio(
- aspectRatio: 1,
- child: ClipRRect(
- borderRadius: BorderRadius.circular(100),
- child: Image.network(widget.data.previewImageUrl),
+ child: widget.data.previewImageUrl.isNotEmpty
+ ? AspectRatio(
+ aspectRatio: 1,
+ child: ClipRRect(
+ borderRadius: BorderRadius.circular(100),
+ child: Image(
+ image: TorAwareNetworkImage(
+ widget.data.previewImageUrl,
+ ),
),
- )
- : Builder(
- builder: (context) {
- final themePreview =
- ref
- .watch(pThemeService)
- .getTheme(themeId: widget.data.id)
- ?.assets
- .themePreview ??
- "";
-
- return (themePreview.endsWith(".png"))
- ? Image.file(File(themePreview), height: 100)
- : SvgPicture.file(File(themePreview), height: 100);
- },
),
+ )
+ : Builder(
+ builder: (context) {
+ final themePreview =
+ ref
+ .watch(pThemeService)
+ .getTheme(themeId: widget.data.id)
+ ?.assets
+ .themePreview ??
+ "";
+
+ return (themePreview.endsWith(".png"))
+ ? Image.file(File(themePreview), height: 100)
+ : SvgPicture.file(File(themePreview), height: 100);
+ },
+ ),
),
const SizedBox(height: 12),
Text(widget.data.name, style: STextStyles.itemSubtitle12(context)),
@@ -276,10 +275,9 @@ class _StackThemeCardState extends ConsumerState<StackThemeCard> {
const SizedBox(height: 12),
AnimatedCrossFade(
duration: const Duration(milliseconds: 300),
- crossFadeState:
- _hasTheme
- ? CrossFadeState.showSecond
- : CrossFadeState.showFirst,
+ crossFadeState: _hasTheme
+ ? CrossFadeState.showSecond
+ : CrossFadeState.showFirst,
firstChild: PrimaryButton(
label: "Download",
buttonHeight: isDesktop ? ButtonHeight.s : ButtonHeight.l,
### lib/pages/shopinbit/shopinbit_ticket_detail.dart
@@ -10,6 +10,7 @@ import 'package:url_launcher/url_launcher.dart';
import '../../db/drift/shared_db/shared_database.dart';
import '../../models/shopinbit/shopinbit_enums.dart';
+import '../../networking/tor_aware_network_image.dart';
import '../../notifications/show_flush_bar.dart';
import '../../providers/db/drift_provider.dart';
import '../../providers/global/shopin_bit_service_provider.dart';
@@ -432,9 +433,8 @@ class _ShopInBitTicketDetailState extends ConsumerState<ShopInBitTicketDetail>
);
}
if (context.mounted) {
- await Navigator.of(
- context,
- ).pushNamed(ShopInBitOfferView.routeName, arguments: _id);
+ await Navigator.of(context)
+ .pushNamed(ShopInBitOfferView.routeName, arguments: _id);
}
}
@@ -443,9 +443,9 @@ class _ShopInBitTicketDetailState extends ConsumerState<ShopInBitTicketDetail>
padding: .only(bottom: isDesktop ? 12 : 8),
child: RoundedWhiteContainer(
borderColor: isDesktop
- ? Theme.of(
- context,
- ).extension<StackColors>()!.textFieldDefaultBG
+ ? Theme.of(context)
+ .extension<StackColors>()!
+ .textFieldDefaultBG
: null,
child: ConditionalParent(
condition: Util.isDesktop,
@@ -559,9 +559,9 @@ class _ShopInBitTicketDetailState extends ConsumerState<ShopInBitTicketDetail>
? STextStyles.desktopTextExtraSmall(context)
: STextStyles.field(context))
.copyWith(
- color: Theme.of(
- context,
- ).extension<StackColors>()!.textDark,
+ color: Theme.of(context)
+ .extension<StackColors>()!
+ .textDark,
),
decoration: InputDecoration(
hintText: "Type a message...",
@@ -585,9 +585,9 @@ class _ShopInBitTicketDetailState extends ConsumerState<ShopInBitTicketDetail>
Assets.svg.send,
width: 24,
height: 24,
- color: Theme.of(
- context,
- ).extension<StackColors>()!.accentColorBlue,
+ color: Theme.of(context)
+ .extension<StackColors>()!
+ .accentColorBlue,
),
),
],
@@ -600,9 +600,9 @@ class _ShopInBitTicketDetailState extends ConsumerState<ShopInBitTicketDetail>
padding: EdgeInsets.only(bottom: isDesktop ? 12 : 8),
child: RoundedWhiteContainer(
borderColor: isDesktop
- ? Theme.of(
- context,
- ).extension<StackColors>()!.textFieldDefaultBG
+ ? Theme.of(context)
+ .extension<StackColors>()!
+ .textFieldDefaultBG
: null,
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
@@ -698,9 +698,9 @@ class _ShopInBitTicketDetailState extends ConsumerState<ShopInBitTicketDetail>
condition: !isDesktop,
builder: (child) => Background(
child: Scaffold(
- backgroundColor: Theme.of(
- context,
- ).extension<StackColors>()!.background,
+ backgroundColor: Theme.of(context)
+ .extension<StackColors>()!
+ .background,
appBar: AppBar(
leading: AppBarBackButton(
onPressed: () => Navigator.of(context).pop(),
@@ -892,10 +892,13 @@ class _ProxyImageState extends State<_ProxyImage> {
if (resp.hasError || resp.value == null) {
return widget.fallback();
}
- return Image.network(
- resp.value!.toString(),
+ return Image(
+ image: ResizeImage.resizeIfNeeded(
+ null,
+ _kAttachmentDecodeHeight,
+ TorAwareNetworkImage(resp.value!.toString()),
+ ),
fit: BoxFit.contain,
- cacheHeight: _kAttachmentDecodeHeight,
semanticLabel: "Image attachment",
errorBuilder: (_, _, _) => widget.fallback(),
);
### lib/widgets/icon_widgets/eth_token_icon.dart
@@ -16,6 +16,7 @@ import 'package:flutter_svg/svg.dart';
import 'package:isar_community/isar.dart';
import '../../models/isar/exchange_cache/currency.dart';
+import '../../networking/tor_aware_network_image.dart';
import '../../services/exchange/change_now/change_now_exchange.dart';
import '../../services/exchange/exchange_data_loading_service.dart';
import '../../themes/coin_icon_provider.dart';
@@ -87,8 +88,8 @@ class _EthTokenIconState extends ConsumerState<EthTokenIcon> {
height: widget.size,
);
} else {
- return SvgPicture.network(
- imageUrl!,
+ return SvgPicture(
+ TorAwareSvgNetworkLoader(imageUrl!),
width: widget.size,
height: widget.size,
placeholderBuilder: (_) => const LoadingIndicator(),
### lib/widgets/icon_widgets/sol_token_icon.dart
@@ -15,6 +15,7 @@ import 'package:flutter_svg/svg.dart';
import 'package:isar_community/isar.dart';
import '../../models/isar/exchange_cache/currency.dart';
+import '../../networking/tor_aware_network_image.dart';
import '../../services/exchange/change_now/change_now_exchange.dart';
import '../../services/exchange/exchange_data_loading_service.dart';
import '../../themes/coin_icon_provider.dart';
@@ -84,8 +85,8 @@ class _SolTokenIconState extends ConsumerState<SolTokenIcon> {
);
} else {
// Display token icon from network.
- return SvgPicture.network(
- imageUrl!,
+ return SvgPicture(
+ TorAwareSvgNetworkLoader(imageUrl!),
width: widget.size,
height: widget.size,
placeholderBuilder: (_) => const LoadingIndicator(),
### lib/widgets/textfields/exchange_textfield.dart
@@ -14,6 +14,7 @@ import 'package:flutter_svg/svg.dart';
import '../../app_config.dart';
import '../../models/exchange/aggregate_currency.dart';
+import '../../networking/tor_aware_network_image.dart';
import '../../pages/buy_view/sub_widgets/crypto_selection_view.dart';
import '../../providers/global/locale_provider.dart';
import '../../themes/stack_colors.dart';
@@ -181,8 +182,10 @@ class _ExchangeTextFieldState extends ConsumerState<ExchangeTextField> {
} else if (widget.currency != null &&
widget.currency!.image.isNotEmpty) {
return Center(
- child: SvgPicture.network(
- widget.currency!.image,
+ child: SvgPicture(
+ TorAwareSvgNetworkLoader(
+ widget.currency!.image,
+ ),
height: 18,
placeholderBuilder: (_) => Container(
width: 18,
### lib/widgets/wallet_info_row/sub_widgets/wallet_info_row_coin_icon.dart
@@ -16,6 +16,7 @@ import 'package:flutter_svg/svg.dart';
import 'package:isar_community/isar.dart';
import '../../../models/isar/exchange_cache/currency.dart';
+import '../../../networking/tor_aware_network_image.dart';
import '../../../services/exchange/change_now/change_now_exchange.dart';
import '../../../services/exchange/exchange_data_loading_service.dart';
import '../../../themes/coin_icon_provider.dart';
@@ -48,18 +49,14 @@ class _WalletInfoCoinIconState extends ConsumerState<WalletInfoCoinIcon> {
ExchangeDataLoadingService.instance.isar.then((isar) async {
if (widget.contractAddress != null) {
- final currency =
- await isar.currencies
- .where()
- .exchangeNameEqualTo(ChangeNowExchange.exchangeName)
- .filter()
- .tokenContractEqualTo(
- widget.contractAddress!,
- caseSensitive: false,
- )
- .and()
- .imageIsNotEmpty()
- .findFirst();
+ final currency = await isar.currencies
+ .where()
+ .exchangeNameEqualTo(ChangeNowExchange.exchangeName)
+ .filter()
+ .tokenContractEqualTo(widget.contractAddress!, caseSensitive: false)
+ .and()
+ .imageIsNotEmpty()
+ .findFirst();
if (mounted) {
WidgetsBinding.instance.addPostFrameCallback((_) {
@@ -87,14 +84,17 @@ class _WalletInfoCoinIconState extends ConsumerState<WalletInfoCoinIcon> {
),
child: Padding(
padding: EdgeInsets.all(widget.size / 5),
- child:
- imageUrl != null && imageUrl!.isNotEmpty
- ? SvgPicture.network(imageUrl!, width: 20, height: 20)
- : SvgPicture.file(
- File(ref.watch(coinIconProvider(widget.coin))),
- width: 20,
- height: 20,
- ),
+ child: imageUrl != null && imageUrl!.isNotEmpty
+ ? SvgPicture(
+ TorAwareSvgNetworkLoader(imageUrl!),
+ width: 20,
+ height: 20,
+ )
+ : SvgPicture.file(
+ File(ref.watch(coinIconProvider(widget.coin))),
+ width: 20,
+ height: 20,
+ ),
),
);
}Why this scored 71/100
Community notes
Notes can correct, qualify, or add evidence to the AI analysis. Every note shown here has been validated by a human moderator.
The AI analysis stands alone for now. Submit a note if you can add evidence or important context.