Add custom header support to HTML (#709, #1272)

assets/translations/bs.json

@@ -287,6 +287,7 @@
     "shizuku": "Shizuku",
     "root": "Root",
     "shizukuBinderNotFound": "Shizuku is not running",
+    "requestHeader": "Request header",
     "removeAppQuestion": {
         "one": "Želite li ukloniti aplikaciju?",
         "other": "Želite li ukloniti aplikacije?"

assets/translations/cs.json

@@ -287,6 +287,7 @@
     "shizuku": "Shizuku",
     "root": "Správce",
     "shizukuBinderNotFound": "Shizuku neběží",
+    "requestHeader": "Request header",
     "removeAppQuestion": {
         "one": "Odstranit Apku?",
         "other": "Odstranit Apky?"

assets/translations/de.json

@@ -287,6 +287,7 @@
     "shizuku": "Shizuku",
     "root": "Root",
     "shizukuBinderNotFound": "Shizuku läuft nicht",
+    "requestHeader": "Request header",
     "removeAppQuestion": {
         "one": "App entfernen?",
         "other": "Apps entfernen?"

assets/translations/en.json

@@ -289,6 +289,7 @@
     "shizukuBinderNotFound": "Сompatible Shizuku service wasn't found",
     "useSystemFont": "Use the system font",
     "systemFontError": "Error loading the system font: {}",
+    "requestHeader": "Request header",
     "removeAppQuestion": {
         "one": "Remove App?",
         "other": "Remove Apps?"

assets/translations/es.json

@@ -287,6 +287,7 @@
     "shizuku": "Shizuku",
     "root": "Root",
     "shizukuBinderNotFound": "Shizuku no está operativo",
+    "requestHeader": "Request header",
     "removeAppQuestion": {
         "one": "¿Eliminar Aplicación?",
         "other": "¿Eliminar Aplicaciones?"

assets/translations/fa.json

@@ -287,6 +287,7 @@
     "shizuku": "Shizuku",
     "root": "Root",
     "shizukuBinderNotFound": "Shizuku is not running",
+    "requestHeader": "Request header",
     "removeAppQuestion": {
         "one": "برنامه حذف شود؟",
         "other": "برنامه ها حذف شوند؟"

assets/translations/fr.json

@@ -287,6 +287,7 @@
     "shizuku": "Shizuku",
     "root": "Root",
     "shizukuBinderNotFound": "Shizuku is not running",
+    "requestHeader": "Request header",
     "removeAppQuestion": {
         "one": "Supprimer l'application ?",
         "other": "Supprimer les applications ?"

assets/translations/hu.json

@@ -287,6 +287,7 @@
     "shizuku": "Shizuku",
     "root": "Root",
     "shizukuBinderNotFound": "Shizuku is not running",
+    "requestHeader": "Request header",
     "removeAppQuestion": {
         "one": "Eltávolítja az alkalmazást?",
         "other": "Eltávolítja az alkalmazást?"

assets/translations/it.json

@@ -287,6 +287,7 @@
     "shizuku": "Shizuku",
     "root": "Root",
     "shizukuBinderNotFound": "Shizuku non è in esecuzione",
+    "requestHeader": "Request header",
     "removeAppQuestion": {
         "one": "Rimuovere l'app?",
         "other": "Rimuovere le app?"

assets/translations/ja.json

@@ -287,6 +287,7 @@
     "shizuku": "Shizuku",
     "root": "Root",
     "shizukuBinderNotFound": "Shizukuが起動していません",
+    "requestHeader": "Request header",
     "removeAppQuestion": {
         "one": "アプリを削除しますか？",
         "other": "アプリを削除しますか？"

assets/translations/nl.json

@@ -287,6 +287,7 @@
     "shizuku": "Shizuku",
     "root": "Root",
     "shizukuBinderNotFound": "Shizuku is not running",
+    "requestHeader": "Request header",
     "removeAppQuestion": {
         "one": "App verwijderen?",
         "other": "Apps verwijderen?"

assets/translations/pl.json

@@ -287,6 +287,7 @@
     "shizuku": "Shizuku",
     "root": "Root",
     "shizukuBinderNotFound": "Shizuku is not running",
+    "requestHeader": "Request header",
     "removeAppQuestion": {
         "one": "Usunąć aplikację?",
         "few": "Usunąć aplikacje?",

assets/translations/pt.json

@@ -287,6 +287,7 @@
     "shizuku": "Shizuku",
     "root": "Root",
     "shizukuBinderNotFound": "Shizuku não está rodando",
+    "requestHeader": "Request header",
     "removeAppQuestion": {
         "one": "Remover aplicativo?",
         "other": "Remover aplicativos?"

assets/translations/ru.json

@@ -289,6 +289,7 @@
     "shizukuBinderNotFound": "Совместимый сервис Shizuku не найден",
     "useSystemFont": "Использовать системный шрифт",
     "systemFontError": "Ошибка загрузки системного шрифта: {}",
+    "requestHeader": "Request header",
     "removeAppQuestion": {
         "one": "Удалить приложение?",
         "other": "Удалить приложения?"

assets/translations/sv.json

@@ -273,6 +273,7 @@
     "shizuku": "Shizuku",
     "root": "Root",
     "shizukuBinderNotFound": "Shizuku is not running",
+    "requestHeader": "Request header",
     "removeAppQuestion": {
         "one": "Ta Bort App?",
         "other": "Ta Bort Appar?"

assets/translations/tr.json

@@ -287,6 +287,7 @@
     "shizuku": "Shizuku",
     "root": "Root",
     "shizukuBinderNotFound": "Shizuku is not running",
+    "requestHeader": "Request header",
     "removeAppQuestion": {
         "one": "Uygulamayı Kaldır?",
         "other": "Uygulamaları Kaldır?"

assets/translations/zh.json

@@ -289,6 +289,7 @@
     "shizukuBinderNotFound": "未发现兼容的 Shizuku 服务",
     "useSystemFont": "使用系统字体",
     "systemFontError": "加载系统字体出错：{}",
+    "requestHeader": "Request header",
     "removeAppQuestion": {
         "one": "是否删除应用？",
         "other": "是否删除应用？"

lib/app_sources/html.dart

@@ -141,7 +141,37 @@ class HTML extends AppSource {
       ],
       finalStepFormitems[0],
       ...commonFormItems,
-      ...finalStepFormitems.sublist(1)
+      ...finalStepFormitems.sublist(1),
+      [
+        GeneratedFormSubForm(
+            'requestHeader',
+            [
+              [
+                GeneratedFormTextField('requestHeader',
+                    label: tr('requestHeader'),
+                    additionalValidators: [
+                      (value) {
+                        if ((value ?? 'empty:valid')
+                                .split(':')
+                                .map((e) => e.trim())
+                                .where((e) => e.isNotEmpty)
+                                .length <
+                            2) {
+                          return tr('invalidInput');
+                        }
+                        return null;
+                      }
+                    ])
+              ]
+            ],
+            label: tr('requestHeader'),
+            defaultValue: [
+              {
+                'requestHeader':
+                    'User-Agent: Mozilla/5.0 (Linux; Android 10; K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/114.0.0.0 Mobile Safari/537.36'
+              }
+            ])
+      ]
     ];
     overrideVersionDetectionFormDefault('noVersionDetection',
         disableStandard: false, disableRelDate: true);
@@ -151,10 +181,23 @@ class HTML extends AppSource {
   Future<Map<String, String>?> getRequestHeaders(
       {Map<String, dynamic> additionalSettings = const <String, dynamic>{},
       bool forAPKDownload = false}) async {
-    return {
+    if (additionalSettings.isNotEmpty) {
-      "User-Agent":
+      if (additionalSettings['requestHeader']?.isNotEmpty != true) {
-          "Mozilla/5.0 (Linux; Android 10; K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/114.0.0.0 Mobile Safari/537.36"
+        additionalSettings['requestHeader'] = [];
-    };
+      }
+      additionalSettings['requestHeader'] = additionalSettings['requestHeader']
+          .where((l) => l['requestHeader'].isNotEmpty == true)
+          .toList();
+      Map<String, String> requestHeaders = {};
+      for (int i = 0; i < (additionalSettings['requestHeader'].length); i++) {
+        var temp =
+            (additionalSettings['requestHeader'][i]['requestHeader'] as String)
+                .split(':');
+        requestHeaders[temp[0].trim()] = temp.sublist(1).join(':').trim();
+      }
+      return requestHeaders;
+    }
+    return null;
   }
 
   @override

lib/app_sources/vlc.dart

@@ -1,7 +1,6 @@
 import 'package:easy_localization/easy_localization.dart';
 import 'package:html/parser.dart';
 import 'package:http/http.dart';
-import 'package:obtainium/app_sources/html.dart';
 import 'package:obtainium/custom_errors.dart';
 import 'package:obtainium/providers/source_provider.dart';
 
@@ -13,11 +12,13 @@ class VLC extends AppSource {
 
   @override
   Future<Map<String, String>?> getRequestHeaders(
-          {Map<String, dynamic> additionalSettings = const <String, dynamic>{},
+      {Map<String, dynamic> additionalSettings = const <String, dynamic>{},
-          bool forAPKDownload = false}) =>
+      bool forAPKDownload = false}) async {
-      HTML().getRequestHeaders(
+    return {
-          additionalSettings: additionalSettings,
+      "User-Agent":
-          forAPKDownload: forAPKDownload);
+          "Mozilla/5.0 (Linux; Android 10; K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/114.0.0.0 Mobile Safari/537.36"
+    };
+  }
 
   @override
   String sourceSpecificStandardizeURL(String url) {