android 0.9.82

Author: Notsfsssf

android/app/build.gradle.kts

@@ -80,8 +80,8 @@ android {
         applicationId = packageName
         minSdk = flutter.minSdkVersion
         targetSdk = 35
-        versionCode = 10009801
-        versionName = "0.9.81 predicate"
+        versionCode = 10009820
+        versionName = "0.9.82 port"
         ndk {
             abiFilters.addAll(arrayOf("armeabi-v7a", "arm64-v8a", "x86_64"))
         }

ios/Podfile

@@ -1,5 +1,5 @@
 # Uncomment this line to define a global platform for your project
-# platform :ios, '13.0'
+platform :ios, '13.0'
 
 # CocoaPods analytics sends network stats synchronously affecting flutter build latency.
 ENV['COCOAPODS_DISABLE_STATS'] = 'true'

ios/Podfile.lock

@@ -46,6 +46,6 @@ SPEC CHECKSUMS:
   receive_sharing_intent: 222384f00ffe7e952bbfabaa9e3967cb87e5fe00
   rhttp: 359daed992674fc912552df3106bfbc746bcc929
 
-PODFILE CHECKSUM: 3b292933a45bc95b47d4515d4c08f8fa56b8f8b8
+PODFILE CHECKSUM: b24155e93407be36a2b6ddd91ab8e5a09dc38630
 
 COCOAPODS: 1.16.2

ios/Runner.xcodeproj/project.pbxproj

@@ -317,7 +317,7 @@
 			);
 			mainGroup = 97C146E51CF9000F007C117D;
 			packageReferences = (
-				781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage" */,
+				781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "FlutterGeneratedPluginSwiftPackage" */,
 				CF18B5642D0EDB1A0096872D /* XCRemoteSwiftPackageReference "fmdb" */,
 			);
 			productRefGroup = 97C146EF1CF9000F007C117D /* Products */;
@@ -377,14 +377,10 @@
 			inputFileListPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
 			);
-			inputPaths = (
-			);
 			name = "[CP] Embed Pods Frameworks";
 			outputFileListPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
 			);
-			outputPaths = (
-			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
@@ -413,14 +409,10 @@
 			inputFileListPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist",
 			);
-			inputPaths = (
-			);
 			name = "[CP] Copy Pods Resources";
 			outputFileListPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist",
 			);
-			outputPaths = (
-			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
@@ -944,7 +936,7 @@
 /* End XCConfigurationList section */
 
 /* Begin XCLocalSwiftPackageReference section */
-		781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage" */ = {
+		781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "FlutterGeneratedPluginSwiftPackage" */ = {
 			isa = XCLocalSwiftPackageReference;
 			relativePath = Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage;
 		};

lib/constants.dart

@@ -18,7 +18,7 @@ import 'dart:io';
 
 class Constants {
   static const String no_h = 'assets/images/h_long.jpg';
-  static String tagName = "0.9.81";
+  static String tagName = "0.9.82";
   static const isGooglePlay =
       bool.fromEnvironment("IS_GOOGLEPLAY", defaultValue: false);
   static int type = 0;

lib/er/fetcher.dart

@@ -17,9 +17,12 @@ import 'dart:io';
 
 import 'dart:isolate';
 
+import 'package:dio/dio.dart';
+import 'package:dio_compatibility_layer/dio_compatibility_layer.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_cache_manager/flutter_cache_manager.dart';
+import 'package:flutter_cache_manager_dio/flutter_cache_manager_dio.dart';
 import 'package:path_provider/path_provider.dart';
 import 'package:pixez/component/pixiv_image.dart';
 import 'package:pixez/er/hoster.dart';
@@ -31,7 +34,7 @@ import 'package:pixez/models/illust.dart';
 import 'package:pixez/models/task_persist.dart';
 import 'package:pixez/store/save_store.dart';
 import 'package:quiver/collection.dart';
-import 'package:rhttp/rhttp.dart';
+import 'package:rhttp/rhttp.dart' as r;
 
 enum IsoTaskState { INIT, APPEND, PROGRESS, ERROR, COMPLETE }
 
@@ -144,6 +147,7 @@ class Fetcher {
       SendMessage(
         receivePort.sendPort,
         pictureSource,
+        userSetting.disableBypassSni,
         RootIsolateToken.instance!,
       ),
       debugName: 'childIsolate',
@@ -236,9 +240,15 @@ class Fetcher {
 class SendMessage {
   final SendPort sendPort;
   final String pictureSource;
+  final bool disableBypassSni;
   final RootIsolateToken rootIsolateToken;
 
-  SendMessage(this.sendPort, this.pictureSource, this.rootIsolateToken);
+  SendMessage(
+    this.sendPort,
+    this.pictureSource,
+    this.disableBypassSni,
+    this.rootIsolateToken,
+  );
 }
 
 entryPoint(SendMessage message) async {
@@ -248,10 +258,32 @@ entryPoint(SendMessage message) async {
   LPrinter.d("entryPoint ====== $pictureSource");
   String inSource = pictureSource;
   BackgroundIsolateBinaryMessenger.ensureInitialized(rootIsolateToken);
-  await Rhttp.init();
+  await r.Rhttp.init();
   await Hoster.initMap();
   Hoster.dnsQueryFetcher();
-  await PixivImage.generatePixivCache();
+  final dio = Dio();
+  final client = await r.RhttpCompatibleClient.createSync(
+    settings: (message.disableBypassSni || pictureSource != ImageHost)
+        ? null
+        : r.ClientSettings(
+            tlsSettings: r.TlsSettings(verifyCertificates: false, sni: false),
+            dnsSettings: r.DnsSettings.dynamic(
+              resolver: (host) async {
+                if (host == 'i.pximg.net') {
+                  return [Hoster.iPximgNet()];
+                }
+                if (host == 's.pximg.net') {
+                  return [Hoster.sPximgNet()];
+                }
+                return await InternetAddress.lookup(
+                  host,
+                ).then((value) => value.map((e) => e.address).toList());
+              },
+            ),
+          ),
+  );
+  dio.httpClientAdapter = ConversionLayerAdapter(client);
+  DioCacheManager.initialize(dio);
   ReceivePort receivePort = ReceivePort();
   sendPort.send(
     IsoContactBean(state: IsoTaskState.INIT, data: receivePort.sendPort),

pubspec.yaml

@@ -24,7 +24,7 @@ dependencies:
   flutter_localizations:
     sdk: flutter
   dio: ^5.9.0
-  crypto: ^3.0.6
+  crypto: ^3.0.7
   path_provider: ^2.1.5
   shared_preferences: ^2.5.3
   share_plus: ^12.0.1