release: v1.6.9

ui/flutter/android/app/build.gradle

@@ -48,7 +48,7 @@ android {
         // You can update the following values to match your application needs.
         // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-build-configuration.
         minSdkVersion 21
-        targetSdkVersion 29
+        targetSdkVersion 34
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
     }

ui/flutter/android/app/src/main/AndroidManifest.xml

@@ -7,6 +7,8 @@
     <uses-permission android:name="android.permission.READ_MEDIA_VIDEO" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" android:maxSdkVersion="32" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" android:maxSdkVersion="32" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC" />
     <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
 
     <application
@@ -91,7 +93,8 @@
         <!-- Add android:stopWithTask option only when necessary. -->
         <service 
             android:name="com.pravera.flutter_foreground_task.service.ForegroundService"
-            android:stopWithTask="true" />
+            android:foregroundServiceType="dataSync"
+            android:exported="false" />
 
         <!-- Don't delete the meta-data below.
              This is used by the Flutter tool to generate GeneratedPluginRegistrant.java -->

ui/flutter/lib/app/modules/create/views/create_view.dart

@@ -82,16 +82,7 @@ class CreateView extends GetView<CreateController> {
       _urlController.text = url;
       _urlController.selection = TextSelection.fromPosition(
           TextPosition(offset: _urlController.text.length));
-      final uppercaseUrl = url.toUpperCase();
-      Protocol? protocol;
-      if (uppercaseUrl.startsWith("HTTP:") ||
-          uppercaseUrl.startsWith("HTTPS:")) {
-        protocol = Protocol.http;
-      }
-      if (uppercaseUrl.startsWith("MAGNET:") ||
-          uppercaseUrl.endsWith(".TORRENT")) {
-        protocol = Protocol.bt;
-      }
+      final protocol = parseProtocol(url);
       if (protocol != null) {
         final extraHandlers = {
           Protocol.http: () {
@@ -672,6 +663,20 @@ class CreateView extends GetView<CreateController> {
     );
   }
 
+  // parse protocol from url
+  parseProtocol(String url) {
+    final uppercaseUrl = url.toUpperCase();
+    Protocol? protocol;
+    if (uppercaseUrl.startsWith("HTTP:") || uppercaseUrl.startsWith("HTTPS:")) {
+      protocol = Protocol.http;
+    }
+    if (uppercaseUrl.startsWith("MAGNET:") ||
+        uppercaseUrl.endsWith(".TORRENT")) {
+      protocol = Protocol.bt;
+    }
+    return protocol;
+  }
+
   // recognize magnet uri, if length == 40, auto add magnet prefix
   recognizeMagnetUri(String text) {
     if (text.length != 40) {
@@ -764,24 +769,23 @@ class CreateView extends GetView<CreateController> {
 
   Object? parseReqExtra(String url) {
     Object? reqExtra;
-    if (controller.showAdvanced.value) {
-      switch (controller.advancedTabController.index) {
-        case 0:
-          final header = Map<String, String>.fromEntries(_httpHeaderControllers
-              .map((e) => MapEntry(e.name.text, e.value.text)));
-          header.removeWhere(
-              (key, value) => key.trim().isEmpty || value.trim().isEmpty);
-          if (header.isNotEmpty) {
-            reqExtra = ReqExtraHttp()..header = header;
-          }
-          break;
-        case 1:
-          if (_btTrackerController.text.trim().isNotEmpty) {
-            reqExtra = ReqExtraBt()
-              ..trackers = Util.textToLines(_btTrackerController.text);
-          }
-          break;
-      }
+    final protocol = parseProtocol(url);
+    switch (protocol) {
+      case Protocol.http:
+        final header = Map<String, String>.fromEntries(_httpHeaderControllers
+            .map((e) => MapEntry(e.name.text, e.value.text)));
+        header.removeWhere(
+            (key, value) => key.trim().isEmpty || value.trim().isEmpty);
+        if (header.isNotEmpty) {
+          reqExtra = ReqExtraHttp()..header = header;
+        }
+        break;
+      case Protocol.bt:
+        if (_btTrackerController.text.trim().isNotEmpty) {
+          reqExtra = ReqExtraBt()
+            ..trackers = Util.textToLines(_btTrackerController.text);
+        }
+        break;
     }
     return reqExtra;
   }

ui/flutter/lib/app/modules/setting/views/setting_view.dart

@@ -762,7 +762,7 @@ class SettingView extends GetView<SettingController> {
             width: 80,
             child: DropdownButtonFormField<String>(
               value: startCfg.value.network,
-              onChanged: Util.isDesktop()
+              onChanged: Util.isDesktop() || Util.isAndroid()
                   ? (value) async {
                       startCfg.update((val) {
                         val!.network = value!;
@@ -786,7 +786,8 @@ class SettingView extends GetView<SettingController> {
             ),
           )
         ];
-        if (Util.isDesktop() && startCfg.value.network == 'tcp') {
+        if ((Util.isDesktop() || Util.isAndroid()) &&
+            startCfg.value.network == 'tcp') {
           final arr = startCfg.value.address.split(':');
           var ip = '127.0.0.1';
           var port = '0';

ui/flutter/lib/main.dart

@@ -1,6 +1,7 @@
 import 'package:args/args.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_foreground_task/flutter_foreground_task.dart';
 import 'package:get/get.dart';
 import 'package:window_manager/window_manager.dart';
 
@@ -40,6 +41,7 @@ void main(List<String> arguments) async {
 
 Future<void> init(Args args) async {
   WidgetsFlutterBinding.ensureInitialized();
+  FlutterForegroundTask.initCommunicationPort();
   await Util.initStorageDir();
   await Database.instance.init();
   if (Util.isDesktop()) {

ui/flutter/lib/util/browser_extension_host/entry/browser_extension_host_native.dart

@@ -3,7 +3,6 @@ import 'dart:io';
 
 import 'package:flutter/services.dart';
 import 'package:path/path.dart' as path;
-import 'package:path_provider/path_provider.dart';
 import 'package:win32_registry/win32_registry.dart';
 
 import '../../win32.dart';
@@ -27,8 +26,7 @@ const _firefoxNativeHostsKey = r'Software\Mozilla\NativeMessagingHosts';
 
 /// Install host binary for browser extension
 Future<void> doInstallHost() async {
-  final hostPath =
-      path.join((await getApplicationSupportDirectory()).path, _hostExecName);
+  final hostPath = _joinExePath(_hostExecName);
 
   Future<List<int>> getHostAssetData() async {
     final hostAsset = await rootBundle.load('assets/host/$_hostExecName');
@@ -102,7 +100,7 @@ Future<bool> doCheckManifestInstalled(Browser browser) async {
   }
 
   final existingContent = await File(manifestPath).readAsString();
-  final expectedContent = await _getManifestContent();
+  final expectedContent = await _getManifestContent(browser);
   return existingContent == expectedContent;
 }
 
@@ -112,7 +110,7 @@ Future<void> doInstallManifest(Browser browser) async {
   if (await checkManifestInstalled(browser)) return;
 
   final manifestPath = _getManifestPath(browser)!;
-  final manifestContent = await _getManifestContent();
+  final manifestContent = await _getManifestContent(browser);
   final manifestDir = path.dirname(manifestPath);
   await Directory(manifestDir).create(recursive: true);
   await File(manifestPath).writeAsString(manifestContent);
@@ -235,10 +233,10 @@ List<String> _getUnixExecutablePaths(Browser browser) {
 }
 
 String? _getManifestPath(Browser browser) {
+  final manifestName =
+      browser == Browser.firefox ? '$_hostName.moz.json' : '$_hostName.json';
   if (Platform.isWindows) {
-    final execPath = Platform.resolvedExecutable;
-    final execDir = path.dirname(execPath);
-    return path.join(execDir, '$_hostName.json');
+    return _joinExePath(manifestName);
   }
 
   final home =
@@ -249,25 +247,25 @@ String? _getManifestPath(Browser browser) {
     switch (browser) {
       case Browser.chrome:
         return path.join(home, 'Library', 'Application Support', 'Google',
-            'Chrome', 'NativeMessagingHosts', '$_hostName.json');
+            'Chrome', 'NativeMessagingHosts', manifestName);
       case Browser.edge:
         return path.join(home, 'Library', 'Application Support',
-            'Microsoft Edge', 'NativeMessagingHosts', '$_hostName.json');
+            'Microsoft Edge', 'NativeMessagingHosts', manifestName);
       case Browser.firefox:
         return path.join(home, 'Library', 'Application Support', 'Mozilla',
-            'NativeMessagingHosts', '$_hostName.json');
+            'NativeMessagingHosts', manifestName);
     }
   } else if (Platform.isLinux) {
     switch (browser) {
       case Browser.chrome:
         return path.join(home, '.config', 'google-chrome',
-            'NativeMessagingHosts', '$_hostName.json');
+            'NativeMessagingHosts', manifestName);
       case Browser.edge:
         return path.join(home, '.config', 'microsoft-edge',
-            'NativeMessagingHosts', '$_hostName.json');
+            'NativeMessagingHosts', manifestName);
       case Browser.firefox:
         return path.join(
-            home, '.mozilla', 'native-messaging-hosts', '$_hostName.json');
+            home, '.mozilla', 'native-messaging-hosts', manifestName);
     }
   }
   return null;
@@ -283,20 +281,20 @@ Future<bool> _checkWindowsRegistry(String keyPath) async {
   }
 }
 
-Future<String> _getManifestContent() async {
-  final hostPath =
-      path.join((await getApplicationSupportDirectory()).path, _hostExecName);
+Future<String> _getManifestContent(Browser browser) async {
+  final hostPath = _joinExePath(_hostExecName);
   final manifest = {
     'name': _hostName,
     'description': 'Gopeed browser extension host',
     'path': hostPath,
     'type': 'stdio',
-    'allowed_origins': [
-      'chrome-extension://$_chromeExtensionId/',
-      'chrome-extension://$_edgeExtensionId/',
-      ..._debugExtensionIds.map((id) => 'chrome-extension://$id/'),
-    ],
-    'allowed_extensions': [_firefoxExtensionId],
+    if (browser != Browser.firefox)
+      'allowed_origins': [
+        'chrome-extension://$_chromeExtensionId/',
+        'chrome-extension://$_edgeExtensionId/',
+        ..._debugExtensionIds.map((id) => 'chrome-extension://$id/'),
+      ],
+    if (browser == Browser.firefox) 'allowed_extensions': [_firefoxExtensionId],
   };
   return const JsonEncoder.withIndent('  ').convert(manifest);
 }
@@ -311,3 +309,9 @@ String _getWindowsRegistryKey(Browser browser) {
       return _firefoxNativeHostsKey;
   }
 }
+
+String _joinExePath(String fileName) {
+  final execPath = Platform.resolvedExecutable;
+  final execDir = path.dirname(execPath);
+  return path.join(execDir, fileName);
+}

ui/flutter/pubspec.yaml

@@ -15,7 +15,7 @@ publish_to: "none" # Remove this line if you wish to publish to pub.dev
 # 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.6.8+1
+version: 1.6.9+1
 
 environment:
   sdk: ">=3.0.0 <4.0.0"