Merge pull request #1826 from ImranR98/dev

- Improved APKPure compatibility by prioritizing APK when available (over XAPK)
- Auto-select direct APK source for URLs ending in '.apk' (#1820)
- Handle install failures more gracefully on apps page (#1782)
- Enabled ZH-TW and EO languages
- Added "allow insecure request" option (#1825)

assets/translations/bs.json

@@ -314,6 +314,7 @@
     "appVerifierInstructionToast": "Dijeli sa AppVerifier-om, zatim se vratite kada ste spremni.",
     "wiki": "Pomoć/Wiki",
     "crowdsourcedConfigsLabel": "Konfiguracije aplikacije obezbeđene pomoću velikog broja ljudi (crowdsourcing) (koristite na svoju odgovornost)",
+    "allowInsecure": "Allow insecure HTTP requests",
     "removeAppQuestion": {
         "one": "Želite li ukloniti aplikaciju?",
         "other": "Želite li ukloniti aplikacije?"

assets/translations/cs.json

@@ -314,6 +314,7 @@
     "appVerifierInstructionToast": "Sdílejte do aplikace AppVerifier a po dokončení se sem vraťte.",
     "wiki": "Nápověda/Wiki",
     "crowdsourcedConfigsLabel": "Konfigurace aplikací s využitím crowdsourcingu (použití na vlastní nebezpečí)",
+    "allowInsecure": "Povolení nezabezpečených požadavků HTTP",
     "removeAppQuestion": {
         "one": "Odstranit Apku?",
         "other": "Odstranit Apky?"

assets/translations/da.json

@@ -314,6 +314,7 @@
     "appVerifierInstructionToast": "Del til AppVerifier, og vend tilbage hertil, når du er klar.",
     "wiki": "Hjælp/Wiki",
     "crowdsourcedConfigsLabel": "Crowdsourcede app-konfigurationer (brug på egen risiko)",
+    "allowInsecure": "Tillad usikre HTTP-anmodninger",
     "removeAppQuestion": {
         "one": "Fjern app?",
         "other": "Fjern apps?"

assets/translations/de.json

@@ -314,6 +314,7 @@
     "appVerifierInstructionToast": "Geben Sie die Daten an AppVerifier weiter und kehren Sie dann hierher zurück, wenn Sie fertig sind.",
     "wiki": "Hilfe/Wiki",
     "crowdsourcedConfigsLabel": "Crowdsourced App-Konfigurationen (Verwendung auf eigene Gefahr)",
+    "allowInsecure": "Unsichere HTTP-Anfragen zulassen",
     "removeAppQuestion": {
         "one": "App entfernen?",
         "other": "Apps entfernen?"

assets/translations/eo.json → assets/translations/en-EO.json

@@ -102,7 +102,7 @@
     "searchX": "Serĉi {}",
     "noResults": "Neniu rezulto",
     "importX": "Importi {}",
-    "importedAppsIdDisclaimer": "La importitaj apoj povas montriĝi malĝuste kiel \"Neinstalitaj\".\nPor solvi tion, reinstalu ilin per Obtainium.\Tiu ne afekcios la apodatumoj.\n\nAkefcias nur la URL-ajn lak triajn importmetodojn.",
+    "importedAppsIdDisclaimer": "La importitaj apoj povas montriĝi malĝuste kiel \"Neinstalitaj\".\nPor solvi tion, reinstalu ilin per Obtainium.\nTiu ne afekcios la apodatumoj.\n\nAkefcias nur la URL-ajn lak triajn importmetodojn.",
     "importErrors": "Eraroj de importado",
     "importedXOfYApps": "{} apoj el {} importitaj.",
     "followingURLsHadErrors": "La sekvantaj URLj havis erarojn:",
@@ -314,6 +314,7 @@
     "appVerifierInstructionToast": "Diskonigu kun AppVerifier, poste revenu ĉi tie kiam preta.",
     "wiki": "Helpo/Vikio",
     "crowdsourcedConfigsLabel": "Komunumaj apo-agordoj (uzu kun singardo)",
+    "allowInsecure": "Allow insecure HTTP requests",
     "removeAppQuestion": {
         "one": "Forigi la aplikaĵon?",
         "other": "Forigi la aplikaĵojn?"

assets/translations/en.json

@@ -314,6 +314,7 @@
     "appVerifierInstructionToast": "Share to AppVerifier, then return here when ready.",
     "wiki": "Help/Wiki",
     "crowdsourcedConfigsLabel": "Crowdsourced App Configurations (use at your own risk)",
+    "allowInsecure": "Allow insecure HTTP requests",
     "removeAppQuestion": {
         "one": "Remove App?",
         "other": "Remove Apps?"

assets/translations/es.json

@@ -314,6 +314,7 @@
     "appVerifierInstructionToast": "Comparta con AppVerifier y vuelva aquí cuando esté listo.",
     "wiki": "Ayuda/Wiki",
     "crowdsourcedConfigsLabel": "Crowdsourced App Configurations (uso bajo su propia responsabilidad)",
+    "allowInsecure": "Permitir peticiones HTTP inseguras",
     "removeAppQuestion": {
         "one": "¿Eliminar aplicación?",
         "other": "¿Eliminar aplicaciones?"

assets/translations/fa.json

@@ -314,6 +314,7 @@
     "appVerifierInstructionToast": "در AppVerifier به اشتراک بگذارید، سپس پس از آماده شدن به اینجا برگردید.",
     "wiki": "راهنما/ویکی",
     "crowdsourcedConfigsLabel": "تنظیمات برنامه Crowdsourced (با مسئولیت خود استفاده کنید)",
+    "allowInsecure": "Allow insecure HTTP requests",
     "removeAppQuestion": {
         "one": "برنامه حذف شود؟",
         "other": "برنامه ها حذف شوند؟"

assets/translations/fr.json

@@ -314,6 +314,7 @@
     "appVerifierInstructionToast": "Partagez avec AppVerifier, puis revenez ici lorsque tout est prêt.",
     "wiki": "Aide/Wiki",
     "crowdsourcedConfigsLabel": "Configurations d'applications par la communauté (à utiliser à vos risques et périls)",
+    "allowInsecure": "Autoriser les requêtes HTTP non sécurisées",
     "removeAppQuestion": {
         "one": "Supprimer l'application ?",
         "other": "Supprimer les applications ?"

assets/translations/hu.json

@@ -314,6 +314,7 @@
     "appVerifierInstructionToast": "Ossza meg az AppVerifierrel, majd térjen vissza ide, ha kész.",
     "wiki": "Súgó/Wiki",
     "crowdsourcedConfigsLabel": "Crowdsourced App Configurations (használat saját felelősségre)",
+    "allowInsecure": "Bizonytalan HTTP-kérések engedélyezése",
     "removeAppQuestion": {
         "one": "Eltávolítja az alkalmazást?",
         "other": "Eltávolítja az alkalmazásokat?"

assets/translations/it.json

@@ -314,6 +314,7 @@
     "appVerifierInstructionToast": "Condividete con AppVerifier, quindi tornate qui quando siete pronti.",
     "wiki": "Aiuto/Wiki",
     "crowdsourcedConfigsLabel": "Configurazioni di app in crowdsourcing (uso a proprio rischio)",
+    "allowInsecure": "Consentire le richieste HTTP non sicure",
     "removeAppQuestion": {
         "one": "Rimuovere l'app?",
         "other": "Rimuovere le app?"

assets/translations/ja.json

@@ -314,6 +314,7 @@
     "appVerifierInstructionToast": "AppVerifierに共有し、準備ができたらここに戻ってください。",
     "wiki": "ヘルプ/ウィキ",
     "crowdsourcedConfigsLabel": "クラウドソーシングによるアプリの設定（利用は自己責任で）",
+    "allowInsecure": "安全でないHTTPリクエストを許可する",
     "removeAppQuestion": {
         "one": "アプリを削除しますか？",
         "other": "アプリを削除しますか？"

assets/translations/nl.json

@@ -314,6 +314,7 @@
     "appVerifierInstructionToast": "Deel het met AppVerifier en keer daarna hier terug.",
     "wiki": "Help/Wiki",
     "crowdsourcedConfigsLabel": "Crowdsourced App-configuraties (gebruik op eigen risico)",
+    "allowInsecure": "Onveilige HTTP-verzoeken toestaan",
     "removeAppQuestion": {
         "one": "App verwijderen?",
         "other": "Apps verwijderen?"

assets/translations/pl.json

@@ -314,6 +314,7 @@
     "appVerifierInstructionToast": "Udostępnij w AppVerifier, a następnie wróć tutaj, gdy będziesz gotowy.",
     "wiki": "Pomoc/Wiki",
     "crowdsourcedConfigsLabel": "Konfiguracje aplikacji pochodzące z crowdsourcingu (korzystanie na własne ryzyko)",
+    "allowInsecure": "Zezwalaj na niezabezpieczone żądania HTTP",
     "removeAppQuestion": {
         "one": "Usunąć aplikację?",
         "few": "Usunąć aplikacje?",

assets/translations/pt.json

@@ -314,6 +314,7 @@
     "appVerifierInstructionToast": "Partilhe com o AppVerifier e, em seguida, regresse aqui quando estiver pronto.",
     "wiki": "Ajuda/Wiki",
     "crowdsourcedConfigsLabel": "Configurações de aplicações de crowdsourcing (utilização por sua conta e risco)",
+    "allowInsecure": "Permitir pedidos HTTP inseguros",
     "removeAppQuestion": {
         "one": "Remover aplicativo?",
         "other": "Remover aplicativos?"

assets/translations/ru.json

@@ -314,6 +314,7 @@
     "appVerifierInstructionToast": "Поделитесь с AppVerifier, а затем вернитесь сюда, когда будете готовы.",
     "wiki": "Помощь/Вики",
     "crowdsourcedConfigsLabel": "Конфигурации приложений на основе краудсорсинга (используйте на свой страх и риск)",
+    "allowInsecure": "Разрешить небезопасные HTTP-запросы",
     "removeAppQuestion": {
         "one": "Удалить приложение?",
         "other": "Удалить приложения?"

assets/translations/sv.json

@@ -314,6 +314,7 @@
     "appVerifierInstructionToast": "Dela till AppVerifier och återvänd sedan hit när du är klar.",
     "wiki": "Hjälp/Wiki",
     "crowdsourcedConfigsLabel": "Crowdsourcade appkonfigurationer (använd på egen risk)",
+    "allowInsecure": "Tillåt osäkra HTTP-förfrågningar",
     "removeAppQuestion": {
         "one": "Ta Bort App?",
         "other": "Ta Bort Appar?"

assets/translations/tr.json

@@ -314,6 +314,7 @@
     "appVerifierInstructionToast": "AppVerifier ile paylaşın, hazır olduğunuzda buraya dönün.",
     "wiki": "Yardım/Wiki",
     "crowdsourcedConfigsLabel": "Kitle Kaynaklı Uygulama Yapılandırmaları (riski size ait olmak üzere kullanın)",
+    "allowInsecure": "Güvensiz HTTP isteklerine izin ver",
     "removeAppQuestion": {
         "one": "Uygulamayı Kaldır?",
         "other": "Uygulamaları Kaldır?"

assets/translations/uk.json

@@ -314,6 +314,7 @@
     "appVerifierInstructionToast": "Надішліть на AppVerifier, а потім поверніться сюди, коли будете готові.",
     "wiki": "Довідка/Вікі",
     "crowdsourcedConfigsLabel": "Краудсорсингові конфігурації додатків (використовуйте на свій страх і ризик)",
+    "allowInsecure": "Дозволити незахищені HTTP-запити",
     "removeAppQuestion": {
         "one": "Видалити застосунок?",
         "other": "Видалити застосунки?"

assets/translations/vi.json

@@ -314,6 +314,7 @@
     "appVerifierInstructionToast": "Chia sẻ lên AppVerifier, sau đó quay lại đây khi sẵn sàng.",
     "wiki": "Trợ giúp/Wiki",
     "crowdsourcedConfigsLabel": "Crowdsourced App Configurations (use at your own risk)",
+    "allowInsecure": "Allow insecure HTTP requests",
     "removeAppQuestion": {
         "one": "Gỡ ứng dụng?",
         "other": "Gỡ ứng dụng?"

assets/translations/zh-TW.json → assets/translations/zh-Hant-TW.json

@@ -314,6 +314,7 @@
     "appVerifierInstructionToast": "分享至 AppVerifier，然後準備好時回到此處。",
     "wiki": "幫助/維基",
     "crowdsourcedConfigsLabel": "群眾外包的應用程式設定（使用風險自負）",
+    "allowInsecure": "Allow insecure HTTP requests",
     "removeAppQuestion": {
         "one": "移除應用程式？",
         "other": "移除應用程式？"

assets/translations/zh.json

@@ -314,6 +314,7 @@
     "appVerifierInstructionToast": "分享至 AppVerifier，完成后返回此处。",
     "wiki": "帮助/Wiki",
     "crowdsourcedConfigsLabel": "众包应用程序配置（使用风险自负）",
+    "allowInsecure": "允许不安全的 HTTP 请求",
     "removeAppQuestion": {
         "one": "是否删除应用？",
         "other": "是否删除应用？"

lib/app_sources/apkcombo.dart

@@ -10,7 +10,7 @@ class APKCombo extends AppSource {
   }
 
   @override
-  String sourceSpecificStandardizeURL(String url) {
+  String sourceSpecificStandardizeURL(String url, {bool forSelection = false}) {
     RegExp standardUrlRegEx = RegExp(
         '^https?://(www\\.)?${getSourceRegex(hosts)}/+[^/]+/+[^/]+',
         caseSensitive: false);

lib/app_sources/apkmirror.dart

@@ -32,7 +32,7 @@ class APKMirror extends AppSource {
   }
 
   @override
-  String sourceSpecificStandardizeURL(String url) {
+  String sourceSpecificStandardizeURL(String url, {bool forSelection = false}) {
     RegExp standardUrlRegEx = RegExp(
         '^https?://(www\\.)?${getSourceRegex(hosts)}/apk/[^/]+/[^/]+',
         caseSensitive: false);

lib/app_sources/apkpure.dart

@@ -29,7 +29,7 @@ class APKPure extends AppSource {
   }
 
   @override
-  String sourceSpecificStandardizeURL(String url) {
+  String sourceSpecificStandardizeURL(String url, {bool forSelection = false}) {
     RegExp standardUrlRegExB = RegExp(
         '^https?://m.${getSourceRegex(hosts)}(/+[^/]{2})?/+[^/]+/+[^/]+',
         caseSensitive: false);
@@ -109,11 +109,16 @@ class APKPure extends AppSource {
                           '')
                       ?.group(0)
                       ?.trim();
-                  String? type = apkInfo
-                          ?.querySelector('div.info-top span.tag')
-                          ?.text
-                          .trim() ??
-                      'APK';
+                  var types = apkInfo
+                          ?.querySelectorAll('div.info-top span.tag')
+                          .map((e) => e.text.trim())
+                          .map((t) => t == 'APKs' ? 'APK' : t) ??
+                      [];
+                  String type = types.isEmpty
+                      ? 'APK'
+                      : types.length == 1
+                          ? types.first
+                          : types.last;
                   String? dateString = apkInfo
                       ?.querySelector('div.info-bottom span.time')
                       ?.text

lib/app_sources/aptoide.dart

@@ -14,7 +14,7 @@ class Aptoide extends AppSource {
   }
 
   @override
-  String sourceSpecificStandardizeURL(String url) {
+  String sourceSpecificStandardizeURL(String url, {bool forSelection = false}) {
     RegExp standardUrlRegEx = RegExp(
         '^https?://([^\\.]+\\.){2,}${getSourceRegex(hosts)}',
         caseSensitive: false);

lib/app_sources/codeberg.dart

@@ -16,7 +16,7 @@ class Codeberg extends AppSource {
   }
 
   @override
-  String sourceSpecificStandardizeURL(String url) {
+  String sourceSpecificStandardizeURL(String url, {bool forSelection = false}) {
     RegExp standardUrlRegEx = RegExp(
         '^https?://(www\\.)?${getSourceRegex(hosts)}/[^/]+/[^/]+',
         caseSensitive: false);

lib/app_sources/directAPKLink.dart

@@ -1,12 +1,12 @@
 import 'package:easy_localization/easy_localization.dart';
 import 'package:obtainium/app_sources/html.dart';
+import 'package:obtainium/custom_errors.dart';
 import 'package:obtainium/providers/source_provider.dart';
 
 class DirectAPKLink extends AppSource {
   HTML html = HTML();
 
   DirectAPKLink() {
-    neverAutoSelect = true;
     name = tr('directAPKLink');
     additionalSourceAppSpecificSettingFormItems = html
         .additionalSourceAppSpecificSettingFormItems
@@ -24,6 +24,19 @@ class DirectAPKLink extends AppSource {
     ];
   }
 
+  @override
+  String sourceSpecificStandardizeURL(String url, {bool forSelection = false}) {
+    if (!forSelection) {
+      return url;
+    }
+    RegExp standardUrlRegExA = RegExp('.+\\.apk\$', caseSensitive: false);
+    var match = standardUrlRegExA.firstMatch(url);
+    if (match == null) {
+      throw InvalidURLError(name);
+    }
+    return match.group(0)!;
+  }
+
   @override
   Future<Map<String, String>?> getRequestHeaders(
       Map<String, dynamic> additionalSettings,

lib/app_sources/fdroid.dart

@@ -38,7 +38,7 @@ class FDroid extends AppSource {
   }
 
   @override
-  String sourceSpecificStandardizeURL(String url) {
+  String sourceSpecificStandardizeURL(String url, {bool forSelection = false}) {
     RegExp standardUrlRegExB = RegExp(
         '^https?://(www\\.)?${getSourceRegex(hosts)}/+[^/]+/+packages/+[^/]+',
         caseSensitive: false);

lib/app_sources/fdroidrepo.dart

@@ -43,7 +43,7 @@ class FDroidRepo extends AppSource {
   }
 
   @override
-  String sourceSpecificStandardizeURL(String url) {
+  String sourceSpecificStandardizeURL(String url, {bool forSelection = false}) {
     var standardUri = Uri.parse(url);
     var pathSegments = standardUri.pathSegments;
     if (pathSegments.isNotEmpty && pathSegments.last == 'index.xml') {

lib/app_sources/github.dart

@@ -154,7 +154,7 @@ class GitHub extends AppSource {
   }
 
   @override
-  String sourceSpecificStandardizeURL(String url) {
+  String sourceSpecificStandardizeURL(String url, {bool forSelection = false}) {
     RegExp standardUrlRegEx = RegExp(
         '^https?://(www\\.)?${getSourceRegex(hosts)}/[^/]+/[^/]+',
         caseSensitive: false);

lib/app_sources/gitlab.dart

@@ -52,7 +52,7 @@ class GitLab extends AppSource {
   }
 
   @override
-  String sourceSpecificStandardizeURL(String url) {
+  String sourceSpecificStandardizeURL(String url, {bool forSelection = false}) {
     RegExp standardUrlRegEx = RegExp(
         '^https?://(www\\.)?${getSourceRegex(hosts)}/[^/]+/[^/]+',
         caseSensitive: false);

lib/app_sources/html.dart

@@ -288,7 +288,7 @@ class HTML extends AppSource {
   }
 
   @override
-  String sourceSpecificStandardizeURL(String url) {
+  String sourceSpecificStandardizeURL(String url, {bool forSelection = false}) {
     return url;
   }
 
@@ -350,7 +350,8 @@ class HTML extends AppSource {
         ? rel.hashCode.toString()
         : (await checkPartialDownloadHashDynamic(rel,
                 headers: await getRequestHeaders(additionalSettings,
-                    forAPKDownload: true)))
+                    forAPKDownload: true),
+                allowInsecure: additionalSettings['allowInsecure'] == true))
             .toString();
     return APKDetails(version, [rel].map((e) => MapEntry(e, e)).toList(),
         AppNames(uri.host, tr('app')));

lib/app_sources/huaweiappgallery.dart

@@ -12,7 +12,7 @@ class HuaweiAppGallery extends AppSource {
   }
 
   @override
-  String sourceSpecificStandardizeURL(String url) {
+  String sourceSpecificStandardizeURL(String url, {bool forSelection = false}) {
     RegExp standardUrlRegEx = RegExp(
         '^https?://(www\\.)?${getSourceRegex(hosts)}(/#)?/(app|appdl)/[^/]+',
         caseSensitive: false);

lib/app_sources/izzyondroid.dart

@@ -14,7 +14,7 @@ class IzzyOnDroid extends AppSource {
   }
 
   @override
-  String sourceSpecificStandardizeURL(String url) {
+  String sourceSpecificStandardizeURL(String url, {bool forSelection = false}) {
     RegExp standardUrlRegExA = RegExp(
         '^https?://android.${getSourceRegex(hosts)}/repo/apk/[^/]+',
         caseSensitive: false);

lib/app_sources/mullvad.dart

@@ -10,7 +10,7 @@ class Mullvad extends AppSource {
   }
 
   @override
-  String sourceSpecificStandardizeURL(String url) {
+  String sourceSpecificStandardizeURL(String url, {bool forSelection = false}) {
     RegExp standardUrlRegEx = RegExp(
         '^https?://(www\\.)?${getSourceRegex(hosts)}',
         caseSensitive: false);

lib/app_sources/neutroncode.dart

@@ -10,7 +10,7 @@ class NeutronCode extends AppSource {
   }
 
   @override
-  String sourceSpecificStandardizeURL(String url) {
+  String sourceSpecificStandardizeURL(String url, {bool forSelection = false}) {
     RegExp standardUrlRegEx = RegExp(
         '^https?://(www\\.)?${getSourceRegex(hosts)}/downloads/file/[^/]+',
         caseSensitive: false);

lib/app_sources/signal.dart

@@ -9,7 +9,7 @@ class Signal extends AppSource {
   }
 
   @override
-  String sourceSpecificStandardizeURL(String url) {
+  String sourceSpecificStandardizeURL(String url, {bool forSelection = false}) {
     return 'https://${hosts[0]}';
   }
 

lib/app_sources/sourceforge.dart

@@ -9,7 +9,7 @@ class SourceForge extends AppSource {
   }
 
   @override
-  String sourceSpecificStandardizeURL(String url) {
+  String sourceSpecificStandardizeURL(String url, {bool forSelection = false}) {
     var sourceRegex = getSourceRegex(hosts);
     RegExp standardUrlRegExC =
         RegExp('^https?://(www\\.)?$sourceRegex/p/.+', caseSensitive: false);