Add HTTP/2, QUIC, VPN and Self-Signed CA support

android/app/src/main/AndroidManifest.xml

@@ -8,7 +8,7 @@
         tools:ignore="ScopedStorage" />
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
     <uses-permission android:name="android.permission.USE_BIOMETRIC"/>
-    
+
     <queries>
       <!-- If your app opens https URLs -->
       <intent>
@@ -37,7 +37,8 @@
         android:label="@string/app_name"
         android:usesCleartextTraffic="true"
         android:requestLegacyExternalStorage="true"
-        android:icon="@mipmap/ic_launcher">
+        android:icon="@mipmap/ic_launcher"
+        android:networkSecurityConfig="@xml/network_security_config">
         <activity
             android:name=".MainActivity"
             android:exported="true"

android/app/src/main/res/xml/network_security_config.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+    <base-config cleartextTrafficPermitted="true">
+        <trust-anchors>
+            <certificates src="system" />
+            <certificates src="user" />
+        </trust-anchors>
+    </base-config>
+</network-security-config>

lib/boorus/anime-pictures/providers.dart

@@ -10,13 +10,12 @@ import 'package:boorusama/core/configs/configs.dart';
 import 'package:boorusama/core/downloads/downloads.dart';
 import 'package:boorusama/core/posts/posts.dart';
 import 'package:boorusama/core/tags/tags.dart';
-import 'package:boorusama/foundation/networking/networking.dart';
 import 'anime_pictures.dart';
 
 final animePicturesClientProvider =
     Provider.family<AnimePicturesClient, BooruConfig>(
   (ref, config) {
-    final dio = newDio(ref.watch(dioArgsProvider(config)));
+    final dio = ref.watch(dioProvider(config));
 
     return AnimePicturesClient(
       dio: dio,

lib/boorus/danbooru/danbooru_provider.dart

@@ -9,12 +9,11 @@ import 'package:boorusama/core/autocompletes/autocompletes.dart';
 import 'package:boorusama/core/configs/configs.dart';
 import 'package:boorusama/core/posts/posts.dart';
 import 'package:boorusama/core/tags/tags.dart';
-import 'package:boorusama/foundation/networking/networking.dart';
 import 'package:boorusama/functional.dart';
 
 final danbooruClientProvider =
     Provider.family<DanbooruClient, BooruConfig>((ref, booruConfig) {
-  final dio = newDio(ref.watch(dioArgsProvider(booruConfig)));
+  final dio = ref.watch(dioProvider(booruConfig));
 
   return DanbooruClient(
     dio: dio,

lib/boorus/danbooru/users/users_provider.dart

@@ -11,7 +11,6 @@ import 'package:boorusama/boorus/providers.dart';
 import 'package:boorusama/clients/danbooru/danbooru_client.dart';
 import 'package:boorusama/core/configs/configs.dart';
 import 'package:boorusama/core/posts/posts.dart';
-import 'package:boorusama/foundation/networking/networking.dart';
 import 'package:boorusama/functional.dart';
 
 final danbooruUserRepoProvider =
@@ -37,7 +36,7 @@ final danbooruCurrentUserProvider =
 
   // If the cached id is null, we need to fetch it from the api
   if (id == null) {
-    final dio = newDio(ref.watch(dioArgsProvider(config)));
+    final dio = ref.watch(dioProvider(config));
 
     final data = await DanbooruClient(
             dio: dio,

lib/boorus/e621/e621.dart

@@ -14,7 +14,6 @@ import 'package:boorusama/core/configs/configs.dart';
 import 'package:boorusama/core/configs/create/create.dart';
 import 'package:boorusama/core/downloads/downloads.dart';
 import 'package:boorusama/core/posts/posts.dart';
-import 'package:boorusama/foundation/networking/networking.dart';
 import 'artists/artists.dart';
 import 'comments/comments.dart';
 import 'favorites/favorites.dart';
@@ -24,7 +23,7 @@ import 'tags/tags.dart';
 
 final e621ClientProvider =
     Provider.family<E621Client, BooruConfig>((ref, booruConfig) {
-  final dio = newDio(ref.watch(dioArgsProvider(booruConfig)));
+  final dio = ref.watch(dioProvider(booruConfig));
 
   return E621Client(
     baseUrl: booruConfig.url,

lib/boorus/gelbooru/gelbooru.dart

@@ -21,7 +21,6 @@ import 'package:boorusama/core/notes/notes.dart';
 import 'package:boorusama/core/posts/posts.dart';
 import 'package:boorusama/core/scaffolds/scaffolds.dart';
 import 'package:boorusama/core/tags/tags.dart';
-import 'package:boorusama/foundation/networking/networking.dart';
 import 'artists/gelbooru_artist_page.dart';
 import 'comments/gelbooru_comment_page.dart';
 import 'configs/create_gelbooru_config_page.dart';
@@ -38,7 +37,7 @@ String getGelbooruProfileUrl(String url) => url.endsWith('/')
 
 final gelbooruClientProvider =
     Provider.family<GelbooruClient, BooruConfig>((ref, booruConfig) {
-  final dio = newDio(ref.watch(dioArgsProvider(booruConfig)));
+  final dio = ref.watch(dioProvider(booruConfig));
 
   return GelbooruClient.custom(
     baseUrl: booruConfig.url,

lib/boorus/gelbooru_v1/gelbooru_v1.dart

@@ -20,7 +20,6 @@ import 'package:boorusama/core/downloads/downloads.dart';
 import 'package:boorusama/core/posts/posts.dart';
 import 'package:boorusama/core/scaffolds/scaffolds.dart';
 import 'package:boorusama/foundation/html.dart';
-import 'package:boorusama/foundation/networking/networking.dart';
 import 'package:boorusama/widgets/info_container.dart';
 
 part 'providers.dart';

lib/boorus/gelbooru_v1/providers.dart

@@ -73,7 +73,7 @@ final gelbooruV1AutocompleteRepoProvider =
 
 final gelbooruV1ClientProvider =
     Provider.family<GelbooruV1Client, BooruConfig>((ref, booruConfig) {
-  final dio = newDio(ref.watch(dioArgsProvider(booruConfig)));
+  final dio = ref.watch(dioProvider(booruConfig));
 
   return GelbooruV1Client(
     baseUrl: booruConfig.url,

lib/boorus/gelbooru_v2/gelbooru_v2.dart

@@ -21,7 +21,6 @@ import 'package:boorusama/core/notes/notes.dart';
 import 'package:boorusama/core/posts/posts.dart';
 import 'package:boorusama/core/scaffolds/scaffolds.dart';
 import 'package:boorusama/core/tags/tags.dart';
-import 'package:boorusama/foundation/networking/networking.dart';
 import 'create_gelbooru_v2_config_page.dart';
 import 'home/gelbooru_v2_home_page.dart';
 import 'posts/gelbooru_v2_post_details_page.dart';
@@ -31,7 +30,7 @@ const kGelbooruV2CustomDownloadFileNameFormat =
 
 final gelbooruV2ClientProvider =
     Provider.family<GelbooruV2Client, BooruConfig>((ref, booruConfig) {
-  final dio = newDio(ref.watch(dioArgsProvider(booruConfig)));
+  final dio = ref.watch(dioProvider(booruConfig));
 
   return GelbooruV2Client.custom(
     baseUrl: booruConfig.url,

lib/boorus/hydrus/hydrus.dart

@@ -21,7 +21,6 @@ import 'package:boorusama/core/home/home.dart';
 import 'package:boorusama/core/posts/posts.dart';
 import 'package:boorusama/core/scaffolds/scaffolds.dart';
 import 'package:boorusama/foundation/i18n.dart';
-import 'package:boorusama/foundation/networking/networking.dart';
 import 'package:boorusama/router.dart';
 import 'package:boorusama/widgets/widgets.dart';
 import 'favorites/favorites.dart';
@@ -65,7 +64,7 @@ class HydrusPost extends SimplePost {
 
 final hydrusClientProvider =
     Provider.family<HydrusClient, BooruConfig>((ref, config) {
-  final dio = newDio(ref.watch(dioArgsProvider(config)));
+  final dio = ref.watch(dioProvider(config));
 
   return HydrusClient(
     dio: dio,

lib/boorus/moebooru/moebooru.dart

@@ -16,7 +16,6 @@ import 'package:boorusama/core/downloads/downloads.dart';
 import 'package:boorusama/core/posts/posts.dart';
 import 'package:boorusama/core/scaffolds/scaffolds.dart';
 import 'package:boorusama/core/tags/tags.dart';
-import 'package:boorusama/foundation/networking/networking.dart';
 import 'package:boorusama/functional.dart';
 import 'configs/create_moebooru_config_page.dart';
 import 'feats/posts/posts.dart';
@@ -29,7 +28,7 @@ import 'pages/widgets/moebooru_related_post_section.dart';
 
 final moebooruClientProvider =
     Provider.family<MoebooruClient, BooruConfig>((ref, booruConfig) {
-  final dio = newDio(ref.watch(dioArgsProvider(booruConfig)));
+  final dio = ref.watch(dioProvider(booruConfig));
 
   return MoebooruClient.custom(
     baseUrl: booruConfig.url,

lib/boorus/philomena/providers.dart

@@ -9,12 +9,11 @@ import 'package:boorusama/clients/philomena/types/image_dto.dart';
 import 'package:boorusama/core/autocompletes/autocompletes.dart';
 import 'package:boorusama/core/configs/configs.dart';
 import 'package:boorusama/core/posts/posts.dart';
-import 'package:boorusama/foundation/networking/networking.dart';
 import 'package:boorusama/functional.dart';
 
 final philomenaClientProvider = Provider.family<PhilomenaClient, BooruConfig>(
   (ref, config) {
-    final dio = newDio(ref.watch(dioArgsProvider(config)));
+    final dio = ref.watch(dioProvider(config));
 
     return PhilomenaClient(
       dio: dio,

lib/boorus/providers.dart

@@ -2,6 +2,7 @@
 import 'dart:io';
 
 // Package imports:
+import 'package:dio/dio.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:hive/hive.dart';
 
@@ -234,20 +235,20 @@ class DioArgs {
   final BooruFactory booruFactory;
 }
 
-final dioArgsProvider = Provider.family<DioArgs, BooruConfig>((ref, config) {
+final dioProvider = Provider.family<Dio, BooruConfig>((ref, config) {
   final cacheDir = ref.watch(httpCacheDirProvider);
   final userAgentGenerator = ref.watch(userAgentGeneratorProvider(config));
   final loggerService = ref.watch(loggerProvider);
   final booruFactory = ref.watch(booruFactoryProvider);
 
-  return DioArgs(
+  return newDio(DioArgs(
     cacheDir: cacheDir,
     baseUrl: config.url,
     userAgentGenerator: userAgentGenerator,
     booruConfig: config,
     loggerService: loggerService,
     booruFactory: booruFactory,
-  );
+  ));
 });
 
 final httpCacheDirProvider = Provider<Directory>(
@@ -492,7 +493,7 @@ final blacklistTagsProvider =
 
 final booruSiteValidatorProvider =
     FutureProvider.autoDispose.family<bool, BooruConfig>((ref, config) {
-  final dio = newDio(ref.watch(dioArgsProvider(config)));
+  final dio = ref.watch(dioProvider(config));
   final login =
       config.login.toOption().fold(() => null, (v) => v.isEmpty ? null : v);
   final apiKey =

lib/boorus/sankaku/sankaku.dart

@@ -21,7 +21,6 @@ import 'package:boorusama/core/posts/posts.dart';
 import 'package:boorusama/core/scaffolds/artist_page_scaffold.dart';
 import 'package:boorusama/core/tags/tags.dart';
 import 'package:boorusama/foundation/caching/caching.dart';
-import 'package:boorusama/foundation/networking/networking.dart';
 import 'package:boorusama/router.dart';
 import 'sankaku_post.dart';
 

lib/boorus/sankaku/sankaku_provider.dart

@@ -2,7 +2,7 @@ part of 'sankaku.dart';
 
 final sankakuClientProvider = Provider.family<SankakuClient, BooruConfig>(
   (ref, config) {
-    final dio = newDio(ref.watch(dioArgsProvider(config)));
+    final dio = ref.watch(dioProvider(config));
     final booruFactory = ref.watch(booruFactoryProvider);
     final booru = booruFactory.create(type: config.booruType);
 

lib/boorus/shimmie2/providers.dart

@@ -7,12 +7,11 @@ import 'package:boorusama/clients/shimmie2/shimmie2_client.dart';
 import 'package:boorusama/core/autocompletes/autocompletes.dart';
 import 'package:boorusama/core/configs/configs.dart';
 import 'package:boorusama/core/posts/posts.dart';
-import 'package:boorusama/foundation/networking/networking.dart';
 import 'package:boorusama/foundation/path.dart';
 
 final shimmie2ClientProvider = Provider.family<Shimmie2Client, BooruConfig>(
   (ref, config) {
-    final dio = newDio(ref.watch(dioArgsProvider(config)));
+    final dio = ref.watch(dioProvider(config));
 
     return Shimmie2Client(
       dio: dio,

lib/boorus/szurubooru/providers.dart

@@ -11,15 +11,14 @@ import 'package:boorusama/core/configs/configs.dart';
 import 'package:boorusama/core/posts/posts.dart';
 import 'package:boorusama/core/tags/tags.dart';
 import 'package:boorusama/dart.dart';
-import 'package:boorusama/foundation/networking/networking.dart';
 import 'package:boorusama/foundation/path.dart';
 import 'package:boorusama/functional.dart';
 import 'post_votes/post_votes.dart';
 import 'szurubooru_post.dart';
 
 final szurubooruClientProvider = Provider.family<SzurubooruClient, BooruConfig>(
   (ref, config) {
-    final dio = newDio(ref.watch(dioArgsProvider(config)));
+    final dio = ref.watch(dioProvider(config));
 
     return SzurubooruClient(
       dio: dio,

lib/boorus/zerochan/providers.dart

@@ -9,13 +9,12 @@ import 'package:boorusama/core/autocompletes/autocompletes.dart';
 import 'package:boorusama/core/configs/configs.dart';
 import 'package:boorusama/core/posts/posts.dart';
 import 'package:boorusama/core/tags/tags.dart';
-import 'package:boorusama/foundation/networking/networking.dart';
 import 'package:boorusama/foundation/path.dart' as path;
 import 'zerochan_post.dart';
 
 final zerochanClientProvider =
     Provider.family<ZerochanClient, BooruConfig>((ref, config) {
-  final dio = newDio(ref.watch(dioArgsProvider(config)));
+  final dio = ref.watch(dioProvider(config));
   final logger = ref.watch(loggerProvider);
 
   return ZerochanClient(

lib/core/comments/youtube_preview_box.dart

@@ -4,11 +4,11 @@ import 'package:flutter/material.dart';
 
 // Package imports:
 import 'package:dio/dio.dart';
-import 'package:extended_image/extended_image.dart';
 import 'package:html/parser.dart';
 import 'package:material_symbols_icons/symbols.dart';
 
 // Project imports:
+import 'package:boorusama/core/images/dio_extended_image.dart';
 import 'package:boorusama/core/images/images.dart';
 import 'package:boorusama/foundation/theme.dart';
 import 'package:boorusama/foundation/url_launcher.dart';
@@ -24,8 +24,9 @@ class YoutubePreviewBox extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     try {
+      final dio = Dio();
       return FutureBuilder<PreviewUrlData>(
-        future: Dio()
+        future: dio
             .getUri(uri)
             .then((value) => value.data)
             .then((value) => parseHtmlAsync(value, uri.toString())),
@@ -60,8 +61,9 @@ class YoutubePreviewBox extends StatelessWidget {
                             ClipRRect(
                               borderRadius:
                                   const BorderRadius.all(Radius.circular(8)),
-                              child: ExtendedImage.network(
+                              child: DioExtendedImage.network(
                                 data.previewImage!,
+                                dio: dio,
                                 fit: BoxFit.contain,
                                 cacheMaxAge: kDefaultImageCacheDuration,
                               ),

lib/core/configs/booru_factory.dart

@@ -29,6 +29,8 @@ class BooruFactory {
     return null;
   }
 
+  Booru? getBooruFromId(int id) => boorus.firstWhereOrNull((e) => e.id == id);
+
   Booru? create({
     required BooruType type,
   }) {
@@ -49,6 +51,6 @@ class BooruFactory {
       BooruType.unknown => 0,
     };
 
-    return boorus.firstWhereOrNull((e) => e.id == id);
+    return getBooruFromId(id);
   }
 }

lib/core/downloads/download_provider.dart

@@ -18,7 +18,7 @@ final downloadServiceProvider = Provider.family<DownloadService, BooruConfig>(
     return BackgroundDownloader();
   },
   dependencies: [
-    dioArgsProvider,
+    dioProvider,
     downloadNotificationProvider,
     currentBooruConfigProvider,
     settingsProvider,