diff --git a/app/lib/core/providers/defaults.dart b/app/lib/core/providers/defaults.dart index 9ce8615e..92b38ba2 100644 --- a/app/lib/core/providers/defaults.dart +++ b/app/lib/core/providers/defaults.dart @@ -18,7 +18,6 @@ * along with this program. If not, see . */ import 'package:flutter/material.dart'; -import 'package:riverpod/riverpod.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart'; part 'defaults.g.dart'; diff --git a/app/lib/core/providers/router.dart b/app/lib/core/providers/router.dart index f9039aa4..85fdde03 100644 --- a/app/lib/core/providers/router.dart +++ b/app/lib/core/providers/router.dart @@ -18,7 +18,6 @@ * along with this program. If not, see . */ import 'package:go_router/go_router.dart'; -import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart'; import 'package:weblibre/core/routing/routes.dart'; import 'package:weblibre/features/user/domain/repositories/onboarding.dart'; diff --git a/app/lib/features/about/data/repositories/package_info_repository.dart b/app/lib/features/about/data/repositories/package_info_repository.dart index c4d2030f..9f1c0cdd 100644 --- a/app/lib/features/about/data/repositories/package_info_repository.dart +++ b/app/lib/features/about/data/repositories/package_info_repository.dart @@ -18,7 +18,6 @@ * along with this program. If not, see . */ import 'package:package_info_plus/package_info_plus.dart'; -import 'package:riverpod/riverpod.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart'; part 'package_info_repository.g.dart'; diff --git a/app/lib/features/app_widget/domain/services/home_widget.dart b/app/lib/features/app_widget/domain/services/home_widget.dart index 97d2f55d..846d724d 100644 --- a/app/lib/features/app_widget/domain/services/home_widget.dart +++ b/app/lib/features/app_widget/domain/services/home_widget.dart @@ -18,7 +18,6 @@ * along with this program. If not, see . */ import 'package:home_widget/home_widget.dart'; -import 'package:riverpod/riverpod.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart'; import 'package:rxdart/rxdart.dart'; import 'package:weblibre/data/models/received_intent_parameter.dart'; diff --git a/app/lib/features/bangs/data/providers.dart b/app/lib/features/bangs/data/providers.dart index 27bb0359..76b10c1f 100644 --- a/app/lib/features/bangs/data/providers.dart +++ b/app/lib/features/bangs/data/providers.dart @@ -21,7 +21,6 @@ import 'package:drift/drift.dart'; import 'package:drift/native.dart'; import 'package:path/path.dart' as p; import 'package:path_provider/path_provider.dart' as path_provider; -import 'package:riverpod/riverpod.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart'; import 'package:sqlite3/sqlite3.dart'; import 'package:sqlite3_flutter_libs/sqlite3_flutter_libs.dart'; diff --git a/app/lib/features/bangs/domain/repositories/sync.dart b/app/lib/features/bangs/domain/repositories/sync.dart index f3517595..021a69d2 100644 --- a/app/lib/features/bangs/domain/repositories/sync.dart +++ b/app/lib/features/bangs/domain/repositories/sync.dart @@ -19,7 +19,6 @@ */ import 'package:drift/isolate.dart'; import 'package:exceptions/exceptions.dart'; -import 'package:riverpod/riverpod.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart'; import 'package:weblibre/features/bangs/data/database/database.dart'; import 'package:weblibre/features/bangs/data/models/bang_group.dart'; diff --git a/app/lib/features/geckoview/domain/providers.dart b/app/lib/features/geckoview/domain/providers.dart index f68e1132..1b0efba1 100644 --- a/app/lib/features/geckoview/domain/providers.dart +++ b/app/lib/features/geckoview/domain/providers.dart @@ -20,7 +20,6 @@ import 'dart:async'; import 'package:flutter_mozilla_components/flutter_mozilla_components.dart'; -import 'package:riverpod/riverpod.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart'; import 'package:share_plus/share_plus.dart'; import 'package:url_launcher/url_launcher.dart'; diff --git a/app/lib/features/geckoview/domain/providers/browser_extension.dart b/app/lib/features/geckoview/domain/providers/browser_extension.dart index d23687f1..e561abf6 100644 --- a/app/lib/features/geckoview/domain/providers/browser_extension.dart +++ b/app/lib/features/geckoview/domain/providers/browser_extension.dart @@ -18,7 +18,6 @@ * along with this program. If not, see . */ import 'package:flutter_mozilla_components/flutter_mozilla_components.dart'; -import 'package:riverpod/riverpod.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart'; part 'browser_extension.g.dart'; diff --git a/app/lib/features/geckoview/domain/providers/tab_session.dart b/app/lib/features/geckoview/domain/providers/tab_session.dart index dbe382e2..79fbfc02 100644 --- a/app/lib/features/geckoview/domain/providers/tab_session.dart +++ b/app/lib/features/geckoview/domain/providers/tab_session.dart @@ -20,7 +20,6 @@ import 'dart:typed_data'; import 'package:flutter_mozilla_components/flutter_mozilla_components.dart'; -import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart'; part 'tab_session.g.dart'; diff --git a/app/lib/features/geckoview/features/history/domain/providers.dart b/app/lib/features/geckoview/features/history/domain/providers.dart index 7890a080..b018bb69 100644 --- a/app/lib/features/geckoview/features/history/domain/providers.dart +++ b/app/lib/features/geckoview/features/history/domain/providers.dart @@ -19,7 +19,6 @@ */ import 'package:flutter/material.dart'; import 'package:flutter_mozilla_components/flutter_mozilla_components.dart'; -import 'package:riverpod/riverpod.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart'; import 'package:weblibre/features/geckoview/features/history/domain/entities/history_filter_options.dart'; diff --git a/app/lib/features/geckoview/features/preferences/data/repositories/preference_settings.dart b/app/lib/features/geckoview/features/preferences/data/repositories/preference_settings.dart index f0f40b49..10c7a7a7 100644 --- a/app/lib/features/geckoview/features/preferences/data/repositories/preference_settings.dart +++ b/app/lib/features/geckoview/features/preferences/data/repositories/preference_settings.dart @@ -23,7 +23,6 @@ import 'dart:convert'; import 'package:collection/collection.dart'; import 'package:flutter/services.dart'; import 'package:flutter_mozilla_components/flutter_mozilla_components.dart'; -import 'package:riverpod/riverpod.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart'; import 'package:rxdart/rxdart.dart'; import 'package:weblibre/features/geckoview/features/preferences/data/models/preference_setting.dart'; diff --git a/app/lib/features/geckoview/features/readerview/domain/providers/readerable.dart b/app/lib/features/geckoview/features/readerview/domain/providers/readerable.dart index 3c70386f..9d370b24 100644 --- a/app/lib/features/geckoview/features/readerview/domain/providers/readerable.dart +++ b/app/lib/features/geckoview/features/readerview/domain/providers/readerable.dart @@ -18,7 +18,6 @@ * along with this program. If not, see . */ import 'package:flutter_mozilla_components/flutter_mozilla_components.dart'; -import 'package:riverpod/riverpod.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart'; part 'readerable.g.dart'; diff --git a/app/lib/features/geckoview/features/tabs/data/providers.dart b/app/lib/features/geckoview/features/tabs/data/providers.dart index 62127c28..e042e6fa 100644 --- a/app/lib/features/geckoview/features/tabs/data/providers.dart +++ b/app/lib/features/geckoview/features/tabs/data/providers.dart @@ -21,7 +21,6 @@ import 'package:drift/drift.dart'; import 'package:drift/native.dart'; import 'package:path/path.dart' as p; import 'package:path_provider/path_provider.dart' as path_provider; -import 'package:riverpod/riverpod.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart'; import 'package:sqlite3/sqlite3.dart'; import 'package:sqlite3_flutter_libs/sqlite3_flutter_libs.dart'; diff --git a/app/lib/features/geckoview/features/tabs/domain/providers/selected_container.dart b/app/lib/features/geckoview/features/tabs/domain/providers/selected_container.dart index 4aca84d1..ccc0ae84 100644 --- a/app/lib/features/geckoview/features/tabs/domain/providers/selected_container.dart +++ b/app/lib/features/geckoview/features/tabs/domain/providers/selected_container.dart @@ -18,7 +18,6 @@ * along with this program. If not, see . */ import 'package:flutter_mozilla_components/flutter_mozilla_components.dart'; -import 'package:riverpod/riverpod.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart'; import 'package:weblibre/core/logger.dart'; import 'package:weblibre/features/geckoview/domain/providers/selected_tab.dart'; diff --git a/app/lib/features/share_intent/domain/services/sharing_intent.dart b/app/lib/features/share_intent/domain/services/sharing_intent.dart index 84ad0c05..4888cc8b 100644 --- a/app/lib/features/share_intent/domain/services/sharing_intent.dart +++ b/app/lib/features/share_intent/domain/services/sharing_intent.dart @@ -22,7 +22,6 @@ import 'dart:async'; import 'package:mime/mime.dart' as mime; import 'package:nullability/nullability.dart'; import 'package:path/path.dart' as p; -import 'package:riverpod/riverpod.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart'; import 'package:simple_intent_receiver/simple_intent_receiver.dart'; import 'package:uri_to_file/uri_to_file.dart' as uri_to_file; diff --git a/app/lib/features/user/data/providers.dart b/app/lib/features/user/data/providers.dart index a464aa14..391b32b5 100644 --- a/app/lib/features/user/data/providers.dart +++ b/app/lib/features/user/data/providers.dart @@ -21,7 +21,6 @@ import 'package:drift/drift.dart'; import 'package:drift/native.dart'; import 'package:path/path.dart' as p; import 'package:path_provider/path_provider.dart' as path_provider; -import 'package:riverpod/riverpod.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart'; import 'package:sqlite3/sqlite3.dart'; import 'package:sqlite3_flutter_libs/sqlite3_flutter_libs.dart'; diff --git a/app/lib/features/web_feed/data/providers.dart b/app/lib/features/web_feed/data/providers.dart index 400b75d8..6ef10947 100644 --- a/app/lib/features/web_feed/data/providers.dart +++ b/app/lib/features/web_feed/data/providers.dart @@ -19,7 +19,6 @@ */ import 'package:drift/drift.dart'; import 'package:drift/native.dart'; -import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:path/path.dart' as p; import 'package:path_provider/path_provider.dart' as path_provider; import 'package:riverpod_annotation/riverpod_annotation.dart'; diff --git a/packages/tor/example/lib/main.dart b/packages/tor/example/lib/main.dart index f208fa6d..1306f344 100644 --- a/packages/tor/example/lib/main.dart +++ b/packages/tor/example/lib/main.dart @@ -24,9 +24,7 @@ class MyApp extends StatelessWidget { @override Widget build(BuildContext context) { - return const MaterialApp( - home: Home(), - ); + return const MaterialApp(home: Home()); } } @@ -47,8 +45,9 @@ class _MyAppState extends State { // Set the default text for the onion input field. final onionController = TextEditingController( - text: - 'https://cflarexljc3rw355ysrkrzwapozws6nre6xsy3n4yrj7taye3uiby3ad.onion'); + text: + 'https://cflarexljc3rw355ysrkrzwapozws6nre6xsy3n4yrj7taye3uiby3ad.onion', + ); // See https://blog.cloudflare.com/cloudflare-onion-service/ for more options: // cflarexljc3rw355ysrkrzwapozws6nre6xsy3n4yrj7taye3uiby3ad.onion // cflarenuttlfuyn7imozr4atzvfbiw3ezgbdjdldmdx7srterayaozid.onion @@ -62,14 +61,16 @@ class _MyAppState extends State { // cflare2nge4h4yqr3574crrd7k66lil3torzbisz6uciyuzqc2h2ykyd.onion final bitcoinOnionController = TextEditingController( - text: - 'qly7g5n5t3f3h23xvbp44vs6vpmayurno4basuu5rcvrupli7y2jmgid.onion:50001'); + text: + 'qly7g5n5t3f3h23xvbp44vs6vpmayurno4basuu5rcvrupli7y2jmgid.onion:50001', + ); // For more options, see https://bitnodes.io/nodes/addresses/?q=onion and // https://sethforprivacy.com/about/ final moneroOnionController = TextEditingController( - text: - 'ucdouiihzwvb5edg3ezeufcs4yp26gq4x64n6b4kuffb7s7jxynnk7qd.onion:18081/json_rpc'); + text: + 'ucdouiihzwvb5edg3ezeufcs4yp26gq4x64n6b4kuffb7s7jxynnk7qd.onion:18081/json_rpc', + ); Future startTor() async { await Tor.init(); @@ -96,9 +97,7 @@ class _MyAppState extends State { Widget build(BuildContext context) { const spacerSmall = SizedBox(height: 10); return Scaffold( - appBar: AppBar( - title: const Text('Tor example'), - ), + appBar: AppBar(title: const Text('Tor example')), body: SingleChildScrollView( child: Container( padding: const EdgeInsets.all(10), @@ -129,11 +128,13 @@ class _MyAppState extends State { await startTor(); - print("Starting tor took " - "${DateTime.now().difference(time).inSeconds} " - "seconds. Proxy running on port ${Tor.instance.port}"); + print( + "Starting tor took " + "${DateTime.now().difference(time).inSeconds} " + "seconds. Proxy running on port ${Tor.instance.port}", + ); - if (mounted) { + if (context.mounted) { Navigator.of(context).pop(); } }, @@ -176,10 +177,11 @@ class _MyAppState extends State { // Assign connection factory. SocksTCPClient.assignToHttpClient(client, [ - ProxySettings(InternetAddress.loopbackIPv4, - Tor.instance.port, - password: - null), // TODO Need to get from tor config file. + ProxySettings( + InternetAddress.loopbackIPv4, + Tor.instance.port, + password: null, + ), // TODO Need to get from tor config file. ]); // GET request. @@ -188,8 +190,9 @@ class _MyAppState extends State { final response = await request.close(); // Print response. - var responseString = - await utf8.decodeStream(response); + var responseString = await utf8.decodeStream( + response, + ); print(responseString); // If host input left to default icanhazip.com, a Tor // exit node IP should be printed to the console. @@ -223,7 +226,9 @@ class _MyAppState extends State { // // Note that this is an SSL example. await socksSocket.connectTo( - 'bitcoin.stackwallet.com', 50002); + 'bitcoin.stackwallet.com', + 50002, + ); // Send a server features command to the connected socket, see method for more specific usage example.. await socksSocket.sendServerFeaturesCommand(); @@ -288,17 +293,20 @@ class _MyAppState extends State { return; } - String domain = - bitcoinOnionController.text.split(":").first; + String domain = bitcoinOnionController.text + .split(":") + .first; int port = int.parse( - bitcoinOnionController.text.split(":").last); + bitcoinOnionController.text.split(":").last, + ); // Instantiate a socks socket at localhost and on the port selected by the tor service. var socksSocket = await SOCKSSocket.create( proxyHost: InternetAddress.loopbackIPv4.address, proxyPort: Tor.instance.port, - sslEnabled: !domain - .endsWith(".onion"), // For SSL connections. + sslEnabled: !domain.endsWith( + ".onion", + ), // For SSL connections. ); // Connect to the socks instantiated above. @@ -341,13 +349,10 @@ class _MyAppState extends State { // Close the socket. await socksSocket.close(); } - // A mutex should be added to this example to prevent // multiple connections from being made at once. TODO : null, - child: const Text( - "Test Bitcoin onion node connection", - ), + child: const Text("Test Bitcoin onion node connection"), ), ], ), @@ -369,24 +374,28 @@ class _MyAppState extends State { onPressed: torStarted ? () async { // Validate the onion address. - if (!moneroOnionController.text - .contains(".onion")) { + if (!moneroOnionController.text.contains( + ".onion", + )) { print("Invalid onion address"); return; - } else if (!moneroOnionController.text - .contains(":")) { + } else if (!moneroOnionController.text.contains( + ":", + )) { print("Invalid onion address (needs port)"); return; } - final String host = - moneroOnionController.text.split(":").first; - final int port = int.parse(moneroOnionController - .text + final String host = moneroOnionController.text .split(":") - .last - .split("/") - .first); + .first; + final int port = int.parse( + moneroOnionController.text + .split(":") + .last + .split("/") + .first, + ); final String path = moneroOnionController.text .split(":") .last @@ -408,7 +417,8 @@ class _MyAppState extends State { "method": "get_info", }); - final request = 'POST /$path HTTP/1.1\r\n' + final request = + 'POST /$path HTTP/1.1\r\n' 'Host: $host\r\n' 'Content-Type: application/json\r\n' 'Content-Length: ${body.length}\r\n' @@ -449,13 +459,10 @@ class _MyAppState extends State { await socksSocket.close(); } - // A mutex should be added to this example to prevent // multiple connections from being made at once. TODO : null, - child: const Text( - "Test Monero onion node connection", - ), + child: const Text("Test Monero onion node connection"), ), ], ),