Merge pull request #788 from ImranR98/dev

Pub update

README.md

@@ -18,6 +18,7 @@ Currently supported App sources:
 - [SourceHut](https://git.sr.ht/)
 - [APKMirror](https://apkmirror.com/) (Track-Only)
 - [APKPure](https://apkpure.com/)
+- [Huawei AppGallery](https://appgallery.huawei.com/)
 - Third Party F-Droid Repos
 - Jenkins Jobs
 - [Steam](https://store.steampowered.com/mobile)

android/app/build.gradle

@@ -49,7 +49,6 @@ android {
     }
 
     defaultConfig {
-        // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "dev.imranr.obtainium"
         // 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.

android/app/src/main/AndroidManifest.xml

@@ -62,6 +62,7 @@
     </application>
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
+    <uses-permission android:name="android.permission.UPDATE_PACKAGES_WITHOUT_USER_ACTION" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
     <uses-permission android:name="android.permission.WAKE_LOCK"/>

assets/translations/bs.json

@@ -246,6 +246,7 @@
    "gitlabSourceNote": "GitLab APK extraction may not work without an API key.",
    "sortByFileNamesNotLinks": "Sort by file names instead of full links",
    "filterReleaseNotesByRegEx": "Filter Release Notes by Regular Expression",
+   "customLinkFilterRegex": "Custom Link Filter by Regular Expression (Default '.apk$')",
    "removeAppQuestion": {
       "one": "Želite li ukloniti aplikaciju?",
       "other": "Želite li ukloniti aplikacije?"

assets/translations/de.json

@@ -229,7 +229,7 @@
     "dontShowTrackOnlyWarnings": "Warnung für 'Nur Nachverfolgen' nicht anzeigen",
     "dontShowAPKOriginWarnings": "Warnung für APK-Herkunft nicht anzeigen",
     "moveNonInstalledAppsToBottom": "Nicht installierte Apps ans Ende der Apps Ansicht verschieben",
-    "gitlabPATLabel": "GitLab Personal Access Token\n(Aktiviert Suche and Better APK Discovery)",
+    "gitlabPATLabel": "GitLab Personal Access Token\n(Aktiviert Suche und bessere APK Entdeckung)",
     "about": "Über",
     "requiresCredentialsInSettings": "Benötigt zusätzliche Anmeldedaten (in den Einstellungen)",
     "checkOnStart": "Überprüfe einmalig beim Start",
@@ -244,8 +244,9 @@
     "addInfoInSettings": "Fügen Sie diese Info in den Einstellungen hinzu.",
     "githubSourceNote": "Die GitHub-Ratenbegrenzung kann mit einem API-Schlüssel umgangen werden.",
     "gitlabSourceNote": "GitLab APK-Extraktion funktioniert möglicherweise nicht ohne API-Schlüssel",
-    "sortByFileNamesNotLinks": "Sort by file names instead of full links",
+    "sortByFileNamesNotLinks": "Sortiere nach Dateinamen, anstelle von ganzen Links",
-    "filterReleaseNotesByRegEx": "Filter Release Notes by Regular Expression",
+    "filterReleaseNotesByRegEx": "Versionshinweise nach regulärem Ausdruck filtern",
+    "customLinkFilterRegex": "Benutzerdefinierter Link Filter nach Regulärem Ausdruck (Standard '.apk$')",
     "removeAppQuestion": {
         "one": "App entfernen?",
         "other": "Apps entfernen?"

assets/translations/en.json

@@ -246,6 +246,7 @@
     "gitlabSourceNote": "GitLab APK extraction may not work without an API key.",
     "sortByFileNamesNotLinks": "Sort by file names instead of full links",
     "filterReleaseNotesByRegEx": "Filter Release Notes by Regular Expression",
+    "customLinkFilterRegex": "Custom Link Filter by Regular Expression (Default '.apk$')",
     "removeAppQuestion": {
         "one": "Remove App?",
         "other": "Remove Apps?"

assets/translations/es.json

@@ -246,6 +246,7 @@
     "gitlabSourceNote": "GitLab APK extraction may not work without an API key.",
     "sortByFileNamesNotLinks": "Sort by file names instead of full links",
     "filterReleaseNotesByRegEx": "Filter Release Notes by Regular Expression",
+    "customLinkFilterRegex": "Custom Link Filter by Regular Expression (Default '.apk$')",
     "removeAppQuestion": {
         "one": "¿Eliminar Aplicación?",
         "other": "¿Eliminar Aplicaciones?"

assets/translations/fa.json

@@ -229,23 +229,24 @@
     "dontShowTrackOnlyWarnings": "هشدار 'فقط ردیابی' را نشان ندهید",
     "dontShowAPKOriginWarnings": "هشدارهای منبع APK را نشان ندهید",
     "moveNonInstalledAppsToBottom": "برنامه های نصب نشده را به نمای پایین برنامه ها منتقل کنید",
-    "gitlabPATLabel": "رمز دسترسی شخصی GitLab\n(جستجو را فعال می کند and Better APK Discovery)",
+    "gitlabPATLabel": "رمز دسترسی شخصی GitLab\n(جستجو و کشف بهتر APK را فعال میکند)",
     "about": "درباره",
     "requiresCredentialsInSettings": "این به اعتبارنامه های اضافی نیاز دارد (در تنظیمات)",
     "checkOnStart": "بررسی در شروع",
     "tryInferAppIdFromCode": "شناسه برنامه را از کد منبع استنباط کنید",
-    "removeOnExternalUninstall": "Automatically remove externally uninstalled Apps",
+    "removeOnExternalUninstall": "حذف خودکار برنامه های حذف نصب شده خارجی",
-    "pickHighestVersionCode": "Auto-select highest version code APK",
+    "pickHighestVersionCode": "انتخاب خودکار بالاترین کد نسخه APK",
-    "checkUpdateOnDetailPage": "Check for updates on opening an App detail page",
+    "checkUpdateOnDetailPage": "برای باز کردن صفحه جزئیات برنامه، به‌روزرسانی‌ها را بررسی کنید",
-    "disablePageTransitions": "Disable page transition animations",
+    "disablePageTransitions": "غیرفعال کردن انیمیشن های انتقال صفحه",
-    "reversePageTransitions": "Reverse page transition animations",
+    "reversePageTransitions": "انیمیشن های انتقال معکوس صفحه",
-    "minStarCount": "Minimum Star Count",
+    "minStarCount": "حداقل تعداد ستاره",
-    "addInfoBelow": "Add this info below.",
+    "addInfoBelow": "این اطلاعات را در زیر اضافه کنید",
-    "addInfoInSettings": "Add this info in the Settings.",
+    "addInfoInSettings": "این اطلاعات را در تنظیمات اضافه کنید.",
-    "githubSourceNote": "GitHub rate limiting can be avoided using an API key.",
+    "githubSourceNote": "با استفاده از کلید API می توان از محدودیت نرخ GitHub جلوگیری کرد.",
-    "gitlabSourceNote": "GitLab APK extraction may not work without an API key.",
+    "gitlabSourceNote": "استخراج APK GitLab ممکن است بدون کلید API کار نکند.",
-    "sortByFileNamesNotLinks": "Sort by file names instead of full links",
+    "sortByFileNamesNotLinks": "مرتب سازی بر اساس نام فایل به جای پیوندهای کامل",
-    "filterReleaseNotesByRegEx": "Filter Release Notes by Regular Expression",
+    "filterReleaseNotesByRegEx": "یادداشت های انتشار را با بیان منظم فیلتر کنید",
+    "customLinkFilterRegex": "فیلتر پیوند سفارشی بر اساس عبارت منظم (پیش‌فرض '.apk$')",
     "removeAppQuestion": {
         "one": "برنامه حذف شود؟",
         "other": "برنامه ها حذف شوند؟"

assets/translations/fr.json

@@ -246,6 +246,7 @@
     "gitlabSourceNote": "GitLab APK extraction may not work without an API key.",
     "sortByFileNamesNotLinks": "Sort by file names instead of full links",
     "filterReleaseNotesByRegEx": "Filter Release Notes by Regular Expression",
+    "customLinkFilterRegex": "Custom Link Filter by Regular Expression (Default '.apk$')",
     "removeAppQuestion": {
         "one": "Supprimer l'application ?",
         "other": "Supprimer les applications ?"

assets/translations/hu.json

@@ -93,13 +93,13 @@
     "author": "Szerző",
     "upToDateApps": "Naprakész appok",
     "nonInstalledApps": "Nem telepített appok",
-    "importExport": "Import/Export",
+    "importExport": "Importálás/Exportálás",
     "settings": "Beállítások",
     "exportedTo": "Exportálva ide {}",
-    "obtainiumExport": "Obtainium Export",
+    "obtainiumExport": "Obtainium Adat Exportálás",
     "invalidInput": "Hibás bemenet",
     "importedX": "Importálva innen {}",
-    "obtainiumImport": "Obtainium Import",
+    "obtainiumImport": "Obtainium Adat Importálás",
     "importFromURLList": "Importálás URL listából",
     "searchQuery": "Keresési lekérdezés",
     "appURLList": "App URL lista",
@@ -139,11 +139,11 @@
     "appSource": "App forrás",
     "noLogs": "Nincsenek naplók",
     "appLogs": "App naplók",
-    "close": "Bezár",
+    "close": "Bezárás",
-    "share": "Megoszt",
+    "share": "Megosztás",
     "appNotFound": "App nem található",
     "obtainiumExportHyphenatedLowercase": "obtainium-export",
-    "pickAnAPK": "Válasszon egy APK-t",
+    "pickAnAPK": "Válasszon egy APK-ot",
     "appHasMoreThanOnePackage": "A(z) {} egynél több csomaggal rendelkezik:",
     "deviceSupportsXArch": "Eszköze támogatja a {} CPU architektúrát.",
     "deviceSupportsFollowingArchs": "Az eszköze a következő CPU architektúrákat támogatja:",
@@ -210,7 +210,7 @@
     "copiedToClipboard": "Másolva a vágólapra",
     "storagePermissionDenied": "Tárhely engedély megtagadva",
     "selectedCategorizeWarning": "Ez felváltja a kiválasztott alkalmazások meglévő kategória-beállításait.",
-    "filterAPKsByRegEx": "Az APK-k szűrése reguláris kifejezéssel",
+    "filterAPKsByRegEx": "Az APK-ok szűrése reguláris kifejezéssel",
     "removeFromObtainium": "Eltávolítás az Obtainiumból",
     "uninstallFromDevice": "Eltávolítás a készülékről",
     "onlyWorksWithNonVersionDetectApps": "Csak azoknál az alkalmazásoknál működik, amelyeknél a verzióérzékelés le van tiltva.",
@@ -222,7 +222,7 @@
     "versionDetection": "Verzió érzékelés",
     "standardVersionDetection": "Alapért. verzió érzékelés",
     "groupByCategory": "Csoportosítás Kategória alapján",
-    "autoApkFilterByArch": "Ha lehetséges, próbálja CPU architektúra szerint szűrni az APK-kat",
+    "autoApkFilterByArch": "Ha lehetséges, próbálja CPU architektúra szerint szűrni az APK-okat",
     "overrideSource": "Forrás felülbírálása",
     "dontShowAgain": "Ne mutassa ezt újra",
     "dontShowTrackOnlyWarnings": "Ne jelenítsen meg 'Csak nyomon követés' figyelmeztetést",
@@ -231,20 +231,21 @@
     "gitlabPATLabel": "GitLab Personal Access Token\n(Engedélyezi a Keresést és jobb APK felfedezés)",
     "about": "Rólunk",
     "requiresCredentialsInSettings": "Ehhez további hitelesítő adatokra van szükség (a Beállításokban)",
-    "checkOnStart": "Egyszer az indításkor",
+    "checkOnStart": "Egyszer az alkalmazás indításakor is",
     "tryInferAppIdFromCode": "Próbálja kikövetkeztetni az app azonosítót a forráskódból",
     "removeOnExternalUninstall": "A külsőleg eltávolított appok auto. eltávolítása",
     "pickHighestVersionCode": "A legmagasabb verziószámú APK auto. kiválasztása",
     "checkUpdateOnDetailPage": "Frissítések keresése az app részleteit tartalmazó oldal megnyitásakor",
-    "disablePageTransitions": "Lap áttűnési animációk tiltása",
+    "disablePageTransitions": "Lap áttűnési animációk letiltása",
     "reversePageTransitions": "Fordított lap áttűnési animációk",
     "minStarCount": "Minimális csillag szám",
     "addInfoBelow": "Adja hozzá ezt az infót alább.",
     "addInfoInSettings": "Adja hozzá ezt az infót a Beállításokban.",
-    "githubSourceNote": "A GitHub értékelési korlátozása elkerülhető API-kulcs használatával.",
+    "githubSourceNote": "A GitHub sebességkorlátozás elkerülhető API-kulcs használatával.",
     "gitlabSourceNote": "Előfordulhat, hogy a GitLab APK kibontása nem működik API-kulcs nélkül.",
-    "sortByFileNamesNotLinks": "Sort by file names instead of full links",
+    "sortByFileNamesNotLinks": "Fájlnevek szerinti elrendezés teljes linkek helyett",
-    "filterReleaseNotesByRegEx": "Filter Release Notes by Regular Expression",
+    "filterReleaseNotesByRegEx": "Kiadási megjegyzések szűrése reguláris kifejezéssel",
+    "customLinkFilterRegex": "Custom Link Filter by Regular Expression (Default '.apk$')",
     "removeAppQuestion": {
         "one": "Eltávolítja az alkalmazást?",
         "other": "Eltávolítja az alkalmazást?"
@@ -287,10 +288,10 @@
     },
     "xAndNMoreUpdatesAvailable": {
         "one": "A(z) {} és 1 további alkalmazás frissítéseket kapott.",
-        "other": "{} és további {} alkalmazás frissítéseket kapott."
+        "other": "{} és {} további alkalmazás frissítéseket kapott."
     },
     "xAndNMoreUpdatesInstalled": {
         "one": "A(z) {} és 1 további alkalmazás frissítve.",
-        "other": "{} és további {} alkalmazás frissítve."
+        "other": "{} és {} további alkalmazás frissítve."
     }
 }

assets/translations/it.json

@@ -246,6 +246,7 @@
     "gitlabSourceNote": "GitLab APK extraction may not work without an API key.",
     "sortByFileNamesNotLinks": "Sort by file names instead of full links",
     "filterReleaseNotesByRegEx": "Filter Release Notes by Regular Expression",
+    "customLinkFilterRegex": "Custom Link Filter by Regular Expression (Default '.apk$')",
     "removeAppQuestion": {
         "one": "Rimuovere l'app?",
         "other": "Rimuovere le app?"

assets/translations/ja.json

@@ -22,7 +22,7 @@
     "githubPATFormat": "ユーザー名:トークン",
     "includePrereleases": "プレリリースを含む",
     "fallbackToOlderReleases": "旧リリースへのフォールバック",
-    "filterReleaseTitlesByRegEx": "正規表現でリリースタイトルを絞り込む",
+    "filterReleaseTitlesByRegEx": "正規表現でリリースタイトルをフィルタリングする",
     "invalidRegEx": "無効な正規表現",
     "noDescription": "説明はありません",
     "cancel": "キャンセル",
@@ -88,7 +88,7 @@
     "showOutdatedOnly": "アップデートが存在するアプリのみ表示する",
     "filter": "フィルター",
     "filterActive": "フィルター *",
-    "filterApps": "アプリを絞り込む",
+    "filterApps": "アプリをフィルタリングする",
     "appName": "アプリ名",
     "author": "作者",
     "upToDateApps": "最新のアプリ",
@@ -211,7 +211,7 @@
     "copiedToClipboard": "クリップボードにコピーしました",
     "storagePermissionDenied": "ストレージ権限が拒否されました",
     "selectedCategorizeWarning": "これにより、選択したアプリの既存のカテゴリ設定がすべて置き換えられます。",
-    "filterAPKsByRegEx": "正規表現でAPKを絞り込む",
+    "filterAPKsByRegEx": "正規表現でAPKをフィルタリングする",
     "removeFromObtainium": "Obtainiumから削除する",
     "uninstallFromDevice": "デバイスからアンインストールする",
     "onlyWorksWithNonVersionDetectApps": "バージョン検出を無効にしているアプリにのみ動作します。",
@@ -244,8 +244,9 @@
     "addInfoInSettings": "設定でこの情報を追加してください。",
     "githubSourceNote": "GitHubのレート制限はAPIキーを使うことで回避できます。",
     "gitlabSourceNote": "GitLabのAPK抽出はAPIキーがないと動作しない場合があります。",
-    "sortByFileNamesNotLinks": "Sort by file names instead of full links",
+    "sortByFileNamesNotLinks": "フルのリンクではなくファイル名でソートする",
-    "filterReleaseNotesByRegEx": "Filter Release Notes by Regular Expression",
+    "filterReleaseNotesByRegEx": "正規表現でリリースノートをフィルタリングする",
+    "customLinkFilterRegex": "正規表現によるカスタムリンクフィルター (デフォルト '.apk$')",
     "removeAppQuestion": {
         "one": "アプリを削除しますか？",
         "other": "アプリを削除しますか？"

assets/translations/pl.json

@@ -248,8 +248,9 @@
     "addInfoInSettings": "Dodaj tę informację w Ustawieniach.",
     "githubSourceNote": "Limit żądań GitHub można ominąć za pomocą klucza API.",
     "gitlabSourceNote": "Pozyskiwanie pliku APK z GitLab może nie działać bez klucza API.",
-    "sortByFileNamesNotLinks": "Sort by file names instead of full links",
+    "sortByFileNamesNotLinks": "Sortuj wg nazw plików zamiast pełnych linków",
-    "filterReleaseNotesByRegEx": "Filter Release Notes by Regular Expression",
+    "filterReleaseNotesByRegEx": "Filtruj informacje o wersji według wyrażenia regularnego",
+    "customLinkFilterRegex": "Niestandardowy filtr linków wg. wyrażenia regularnego (domyślnie \".apk$\")",
     "removeAppQuestion": {
         "one": "Usunąć aplikację?",
         "other": "Usunąć aplikacje?"

assets/translations/ru.json

@@ -246,6 +246,7 @@
     "gitlabSourceNote": "Извлечение APK из GitLab может не работать без ключа API.",
     "sortByFileNamesNotLinks": "Sort by file names instead of full links",
     "filterReleaseNotesByRegEx": "Filter Release Notes by Regular Expression",
+    "customLinkFilterRegex": "Custom Link Filter by Regular Expression (Default '.apk$')",
     "removeAppQuestion": {
         "one": "Удалить приложение?",
         "other": "Удалить приложения?"

assets/translations/zh.json

@@ -244,8 +244,9 @@
     "addInfoInSettings": "在“设置”中添加此凭据。",
     "githubSourceNote": "使用访问令牌可避免触发 GitHub 的 API 请求限制。",
     "gitlabSourceNote": "未使用访问令牌时可能无法从 GitLab 获取 APK 文件。",
-    "sortByFileNamesNotLinks": "Sort by file names instead of full links",
+    "sortByFileNamesNotLinks": "根据文件名而不是完整链接来排序",
-    "filterReleaseNotesByRegEx": "Filter Release Notes by Regular Expression",
+    "filterReleaseNotesByRegEx": "用正则表达式筛选发布说明",
+    "customLinkFilterRegex": "用正则表达式自定义链接筛选（默认 '.apk$'）",
     "removeAppQuestion": {
         "one": "是否删除应用？",
         "other": "是否删除应用？"

lib/app_sources/html.dart

@@ -91,7 +91,18 @@ class HTML extends AppSource {
       [
         GeneratedFormSwitch('sortByFileNamesNotLinks',
             label: tr('sortByFileNamesNotLinks'))
-      ]
+      ],
+      [
+        GeneratedFormTextField('customLinkFilterRegex',
+            label: tr('customLinkFilterRegex'),
+            hint: 'download/(.*/)?(android|apk|mobile)',
+            required: false,
+            additionalValidators: [
+              (value) {
+                return regExValidator(value);
+              }
+            ])
+      ],
     ];
   }
 
@@ -99,7 +110,7 @@ class HTML extends AppSource {
   // TODO: implement requestHeaders choice, hardcoded for now
   Map<String, String>? get requestHeaders => {
         "User-Agent":
-            "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0"
+            "Mozilla/5.0 (Linux; Android 10; K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/114.0.0.0 Mobile Safari/537.36"
       };
 
   @override
@@ -115,16 +126,29 @@ class HTML extends AppSource {
     var uri = Uri.parse(standardUrl);
     Response res = await sourceRequest(standardUrl);
     if (res.statusCode == 200) {
-      List<String> links = parse(res.body)
+      var html = parse(res.body);
+      List<String> allLinks = html
           .querySelectorAll('a')
           .map((element) => element.attributes['href'] ?? '')
-          .where((element) =>
-              Uri.parse(element).path.toLowerCase().endsWith('.apk'))
           .toList();
+      List<String> links = [];
+      if ((additionalSettings['customLinkFilterRegex'] as String?)
+              ?.isNotEmpty ==
+          true) {
+        var reg = RegExp(additionalSettings['customLinkFilterRegex']);
+        links = allLinks.where((element) => reg.hasMatch(element)).toList();
+      } else {
+        links = allLinks
+            .where((element) =>
+                Uri.parse(element).path.toLowerCase().endsWith('.apk'))
+            .toList();
+      }
       links.sort((a, b) => additionalSettings['sortByFileNamesNotLinks'] == true
-          ? compareAlphaNumeric(a.split('/').last, b.split('/').last)
+          ? compareAlphaNumeric(a.split('/').where((e) => e.isNotEmpty).last,
+              b.split('/').where((e) => e.isNotEmpty).last)
           : compareAlphaNumeric(a, b));
-      if (additionalSettings['apkFilterRegEx'] != null) {
+      if ((additionalSettings['apkFilterRegEx'] as String?)?.isNotEmpty ==
+          true) {
         var reg = RegExp(additionalSettings['apkFilterRegEx']);
         links = links.where((element) => reg.hasMatch(element)).toList();
       }

lib/app_sources/huaweiappgallery.dart

@@ -0,0 +1,90 @@
+import 'package:easy_localization/easy_localization.dart';
+import 'package:http/http.dart';
+import 'package:obtainium/custom_errors.dart';
+import 'package:obtainium/providers/source_provider.dart';
+
+class HuaweiAppGallery extends AppSource {
+  HuaweiAppGallery() {
+    name = 'Huawei AppGallery';
+    host = 'appgallery.huawei.com';
+    overrideVersionDetectionFormDefault('releaseDateAsVersion', true);
+  }
+
+  @override
+  String sourceSpecificStandardizeURL(String url) {
+    RegExp standardUrlRegEx = RegExp('^https?://$host/app/[^/]+');
+    RegExpMatch? match = standardUrlRegEx.firstMatch(url.toLowerCase());
+    if (match == null) {
+      throw InvalidURLError(name);
+    }
+    return url.substring(0, match.end);
+  }
+
+  getDlUrl(String standardUrl) =>
+      'https://${host!.replaceAll('appgallery.', 'appgallery.cloud.')}/appdl/${standardUrl.split('/').last}';
+
+  requestAppdlRedirect(String dlUrl) async {
+    Response res = await sourceRequest(dlUrl, followRedirects: false);
+    if (res.statusCode == 200 ||
+        res.statusCode == 302 ||
+        res.statusCode == 304) {
+      return res;
+    } else {
+      throw getObtainiumHttpError(res);
+    }
+  }
+
+  appIdFromRedirectDlUrl(String redirectDlUrl) {
+    var parts = redirectDlUrl
+        .split('?')[0]
+        .split('/')
+        .last
+        .split('.')
+        .reversed
+        .toList();
+    parts.removeAt(0);
+    parts.removeAt(0);
+    return parts.reversed.join('.');
+  }
+
+  @override
+  Future<String?> tryInferringAppId(String standardUrl,
+      {Map<String, dynamic> additionalSettings = const {}}) async {
+    String dlUrl = getDlUrl(standardUrl);
+    Response res = await requestAppdlRedirect(dlUrl);
+    return res.headers['location'] != null
+        ? appIdFromRedirectDlUrl(res.headers['location']!)
+        : null;
+  }
+
+  @override
+  Future<APKDetails> getLatestAPKDetails(
+    String standardUrl,
+    Map<String, dynamic> additionalSettings,
+  ) async {
+    String dlUrl = getDlUrl(standardUrl);
+    Response res = await requestAppdlRedirect(dlUrl);
+    if (res.headers['location'] == null) {
+      throw NoReleasesError();
+    }
+    String appId = appIdFromRedirectDlUrl(res.headers['location']!);
+    var relDateStr =
+        res.headers['location']?.split('?')[0].split('.').reversed.toList()[1];
+    var relDateStrAdj = relDateStr?.split('');
+    var tempLen = relDateStrAdj?.length ?? 0;
+    var i = 2;
+    while (i < tempLen) {
+      relDateStrAdj?.insert((i + i ~/ 2 - 1), '-');
+      i += 2;
+    }
+    var relDate = relDateStrAdj == null
+        ? null
+        : DateFormat('yy-MM-dd-HH-mm').parse(relDateStrAdj.join(''));
+    if (relDateStr == null) {
+      throw NoVersionError();
+    }
+    return APKDetails(
+        relDateStr, [MapEntry('$appId.apk', dlUrl)], AppNames(name, appId),
+        releaseDate: relDate);
+  }
+}

lib/app_sources/vlc.dart

@@ -1,5 +1,6 @@
 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';
 
@@ -7,55 +8,60 @@ class VLC extends AppSource {
   VLC() {
     host = 'videolan.org';
   }
+  get dwUrlBase => 'https://get.$host/vlc-android/';
+
+  @override
+  Map<String, String>? get requestHeaders => HTML().requestHeaders;
 
   @override
   String sourceSpecificStandardizeURL(String url) {
     return 'https://$host';
   }
 
+  Future<String?> getLatestVersion(String standardUrl) async {
+    Response res = await sourceRequest(dwUrlBase);
+    if (res.statusCode == 200) {
+      var dwLinks = parse(res.body)
+          .querySelectorAll('a')
+          .where((element) => element.attributes['href'] != 'last/')
+          .map((e) => e.attributes['href']?.split('/')[0])
+          .toList();
+      String? version = dwLinks.isNotEmpty ? dwLinks.last : null;
+      if (version == null) {
+        throw NoVersionError();
+      }
+      return version;
+    } else {
+      throw getObtainiumHttpError(res);
+    }
+  }
+
   @override
   Future<APKDetails> getLatestAPKDetails(
     String standardUrl,
     Map<String, dynamic> additionalSettings,
   ) async {
-    Response res = await sourceRequest(
+    String? version = await getLatestVersion(standardUrl);
-        'https://www.videolan.org/vlc/download-android.html');
+    if (version == null) {
+      throw NoVersionError();
+    }
+    String? targetUrl = '$dwUrlBase$version/';
+    Response res = await sourceRequest(targetUrl);
+    List<String> apkUrls = [];
     if (res.statusCode == 200) {
-      var dwUrlBase = 'get.videolan.org/vlc-android';
+      apkUrls = parse(res.body)
-      var dwLinks = parse(res.body)
           .querySelectorAll('a')
-          .where((element) =>
+          .map((e) => e.attributes['href']?.split('/').last)
-              element.attributes['href']?.contains(dwUrlBase) ?? false)
+          .where((h) =>
+              h != null && h.isNotEmpty && h.toLowerCase().endsWith('.apk'))
+          .map((e) => targetUrl + e!)
           .toList();
-      String? version = dwLinks.isNotEmpty
-          ? dwLinks.first.attributes['href']
-              ?.split('/')
-              .where((s) => s.isNotEmpty)
-              .last
-          : null;
-      if (version == null) {
-        throw NoVersionError();
-      }
-      String? targetUrl = 'https://$dwUrlBase/$version/';
-      Response res2 = await sourceRequest(targetUrl);
-      List<String> apkUrls = [];
-      if (res2.statusCode == 200) {
-        apkUrls = parse(res2.body)
-            .querySelectorAll('a')
-            .map((e) => e.attributes['href']?.split('/').last)
-            .where((h) =>
-                h != null && h.isNotEmpty && h.toLowerCase().endsWith('.apk'))
-            .map((e) => targetUrl + e!)
-            .toList();
-      } else {
-        throw getObtainiumHttpError(res2);
-      }
-
-      return APKDetails(
-          version, getApkUrlsFromUrls(apkUrls), AppNames('VideoLAN', 'VLC'));
     } else {
       throw getObtainiumHttpError(res);
     }
+
+    return APKDetails(
+        version, getApkUrlsFromUrls(apkUrls), AppNames('VideoLAN', 'VLC'));
   }
 
   @override

lib/main.dart

@@ -22,7 +22,7 @@ import 'package:easy_localization/src/easy_localization_controller.dart';
 // ignore: implementation_imports
 import 'package:easy_localization/src/localization.dart';
 
-const String currentVersion = '0.13.23';
+const String currentVersion = '0.13.26';
 const String currentReleaseTag =
     'v$currentVersion-beta'; // KEEP THIS IN SYNC WITH GITHUB RELEASES
 
@@ -299,7 +299,9 @@ class _ObtainiumState extends State<Obtainium> {
                   ? lightColorScheme
                   : darkColorScheme,
               fontFamily: 'Metropolis'),
-          home: const HomePage());
+          home: Shortcuts(shortcuts: <LogicalKeySet, Intent>{
+            LogicalKeySet(LogicalKeyboardKey.select): const ActivateIntent(),
+          }, child: const HomePage()));
     });
   }
 }

lib/pages/apps.dart

@@ -643,15 +643,15 @@ class AppsPageState extends State<AppsPage> {
                     label: tr('installX', args: [
                       plural('apps', newInstallIdsAllOrSelected.length)
                     ]),
-                    defaultValue: existingUpdateIdsAllOrSelected.isNotEmpty));
+                    defaultValue: existingUpdateIdsAllOrSelected.isEmpty));
               }
               if (trackOnlyUpdateIdsAllOrSelected.isNotEmpty) {
                 formItems.add(GeneratedFormSwitch('trackonlies',
                     label: tr('markXTrackOnlyAsUpdated', args: [
                       plural('apps', trackOnlyUpdateIdsAllOrSelected.length)
                     ]),
-                    defaultValue: existingUpdateIdsAllOrSelected.isNotEmpty ||
+                    defaultValue: existingUpdateIdsAllOrSelected.isEmpty &&
-                        newInstallIdsAllOrSelected.isNotEmpty));
+                        newInstallIdsAllOrSelected.isEmpty));
               }
               showDialog<Map<String, dynamic>?>(
                   context: context,

lib/providers/apps_provider.dart

@@ -7,6 +7,7 @@ import 'dart:io';
 
 import 'package:android_intent_plus/flag.dart';
 import 'package:android_package_installer/android_package_installer.dart';
+import 'package:android_package_manager/android_package_manager.dart';
 import 'package:device_info_plus/device_info_plus.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
@@ -29,6 +30,8 @@ import 'package:http/http.dart';
 import 'package:android_intent_plus/android_intent.dart';
 import 'package:flutter_archive/flutter_archive.dart';
 
+final pm = AndroidPackageManager();
+
 class AppInMemory {
   late App app;
   double? downloadProgress;
@@ -322,16 +325,39 @@ class AppsProvider with ChangeNotifier {
       .isNotEmpty;
 
   Future<bool> canInstallSilently(App app) async {
-    return false;
+    if (app.apkUrls.length > 1) {
-    // TODO: Uncomment the below if silent updates are ever figured out
+      // Manual API selection means silent install is not possible
-    // // NOTE: This is unreliable - try to get from OS in the future
+      return false;
-    // if (app.apkUrls.length > 1) {
+    }
-    //    return false;
+
-    // }
+    var osInfo = await DeviceInfoPlugin().androidInfo;
-    // var osInfo = await DeviceInfoPlugin().androidInfo;
+    String? installerPackageName;
-    // return app.installedVersion != null &&
+    try {
-    //     osInfo.version.sdkInt >= 30 &&
+      installerPackageName = osInfo.version.sdkInt >= 30
-    //     osInfo.version.release.compareTo('12') >= 0;
+          ? (await pm.getInstallSourceInfo(packageName: app.id))
+              ?.installingPackageName
+          : (await pm.getInstallerPackageName(packageName: app.id));
+    } catch (e) {
+      // Probably not installed - ignore
+    }
+    if (installerPackageName != obtainiumId) {
+      // If we did not install the app (or it isn't installed), silent install is not possible
+      return false;
+    }
+    int? targetSDK;
+    try {
+      targetSDK = (await pm.getPackageInfo(packageName: app.id))
+          ?.applicationInfo
+          ?.targetSdkVersion;
+    } catch (e) {
+      // Weird if you get here - ignore
+    }
+
+    // The OS must also be new enough and the APK should target a new enough API
+    return osInfo.version.sdkInt >= 30 &&
+        targetSDK != null &&
+        targetSDK >= // https://developer.android.com/reference/android/content/pm/PackageInstaller.SessionParams#setRequireUserAction(int)
+            (osInfo.version.sdkInt - 3);
   }
 
   Future<void> waitForUserToReturnToForeground(BuildContext context) async {
@@ -359,26 +385,24 @@ class AppsProvider with ChangeNotifier {
         zipFile: File(filePath), destinationDir: Directory(destinationPath));
   }
 
-  Future<void> installXApkDir(DownloadedXApkDir dir,
+  Future<void> installXApkDir(DownloadedXApkDir dir) async {
-      {bool silent = false}) async {
     // We don't know which APKs in an XAPK are supported by the user's device
     // So we try installing all of them and assume success if at least one installed
     // If 0 APKs installed, throw the first install error encountered
     try {
       var somethingInstalled = false;
-      Object? firstError;
+      MultiAppMultiError errors = MultiAppMultiError();
       for (var file in dir.extracted
           .listSync(recursive: true, followLinks: false)
           .whereType<File>()) {
         if (file.path.toLowerCase().endsWith('.apk')) {
           try {
             somethingInstalled = somethingInstalled ||
-                await installApk(DownloadedApk(dir.appId, file),
+                await installApk(DownloadedApk(dir.appId, file));
-                    silent: silent);
           } catch (e) {
             logs.add(
                 'Could not install APK from XAPK \'${file.path}\': ${e.toString()}');
-            firstError ??= e;
+            errors.add(dir.appId, e.toString());
           }
         } else if (file.path.toLowerCase().endsWith('.obb')) {
           await moveObbFile(file, dir.appId);
@@ -386,16 +410,15 @@ class AppsProvider with ChangeNotifier {
       }
       if (somethingInstalled) {
         dir.file.delete(recursive: true);
-      } else if (firstError != null) {
+      } else if (errors.content.isNotEmpty) {
-        throw firstError;
+        throw errors;
       }
     } finally {
       dir.extracted.delete(recursive: true);
     }
   }
 
-  Future<bool> installApk(DownloadedApk file, {bool silent = false}) async {
+  Future<bool> installApk(DownloadedApk file) async {
-    // TODO: Use 'silent' when/if ever possible
     var newInfo = await PackageArchiveInfo.fromPath(file.file.path);
     AppInfo? appInfo;
     try {
@@ -571,7 +594,6 @@ class AppsProvider with ChangeNotifier {
         }
         bool willBeSilent = await canInstallSilently(
             apps[downloadedFile?.appId ?? downloadedDir!.appId]!.app);
-        willBeSilent = false; // TODO: Remove this when silent updates work
         if (!(await settingsProvider?.getInstallPermission(enforce: false) ??
             true)) {
           throw ObtainiumError(tr('cancelled'));
@@ -584,9 +606,9 @@ class AppsProvider with ChangeNotifier {
         notifyListeners();
         try {
           if (downloadedFile != null) {
-            await installApk(downloadedFile, silent: willBeSilent);
+            await installApk(downloadedFile);
           } else {
-            await installXApkDir(downloadedDir!, silent: willBeSilent);
+            await installXApkDir(downloadedDir!);
           }
         } finally {
           apps[id]?.downloadProgress = null;

lib/providers/source_provider.dart

@@ -14,6 +14,7 @@ import 'package:obtainium/app_sources/fdroid.dart';
 import 'package:obtainium/app_sources/fdroidrepo.dart';
 import 'package:obtainium/app_sources/github.dart';
 import 'package:obtainium/app_sources/gitlab.dart';
+import 'package:obtainium/app_sources/huaweiappgallery.dart';
 import 'package:obtainium/app_sources/izzyondroid.dart';
 import 'package:obtainium/app_sources/html.dart';
 import 'package:obtainium/app_sources/jenkins.dart';
@@ -355,10 +356,14 @@ abstract class AppSource {
 
   Map<String, String>? get requestHeaders => null;
 
-  Future<Response> sourceRequest(String url) async {
+  Future<Response> sourceRequest(String url,
-    if (requestHeaders != null) {
+      {bool followRedirects = true}) async {
+    if (requestHeaders != null || followRedirects == false) {
       var req = Request('GET', Uri.parse(url));
-      req.headers.addAll(requestHeaders!);
+      req.followRedirects = followRedirects;
+      if (requestHeaders != null) {
+        req.headers.addAll(requestHeaders!);
+      }
       return Response.fromStream(await Client().send(req));
     } else {
       return get(Uri.parse(url));
@@ -508,6 +513,7 @@ class SourceProvider {
         SourceHut(),
         APKMirror(),
         APKPure(),
+        HuaweiAppGallery(),
         // APKCombo(), // Can't get past their scraping blocking yet (get 403 Forbidden)
         Mullvad(),
         Signal(),

pubspec.lock

@@ -22,10 +22,19 @@ packages:
     description:
       path: "."
       ref: main
-      resolved-ref: f09c79eee5be3c60b04760143eb954a13fdd07f1
+      resolved-ref: ba2aa7a11edc2649d1d80c25ed9291521262f714
       url: "https://github.com/ImranR98/android_package_installer"
     source: git
     version: "0.0.1"
+  android_package_manager:
+    dependency: "direct main"
+    description:
+      path: "."
+      ref: master
+      resolved-ref: "6e68991ef9c6232695abce2eef345d3cca2f52ac"
+      url: "https://github.com/ImranR98/android_package_manager"
+    source: git
+    version: "0.5.4"
   animations:
     dependency: "direct main"
     description:
@@ -206,10 +215,10 @@ packages:
     dependency: transitive
     description:
       name: ffi
-      sha256: ed5337a5660c506388a9f012be0288fb38b49020ce2b45fe1f8b8323fe429f99
+      sha256: "7bf0adc28a23d395f19f3f1eb21dd7cfd1dd9f8e1c50051c069122e6853bc878"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.2"
+    version: "2.1.0"
   file:
     dependency: transitive
     description:
@@ -296,10 +305,10 @@ packages:
     dependency: "direct main"
     description:
       name: flutter_markdown
-      sha256: "4b1bfbb802d76320a1a46d9ce984106135093efd9d969765d07c2125af107bdf"
+      sha256: "2b206d397dd7836ea60035b2d43825c8a303a76a5098e66f42d55a753e18d431"
       url: "https://pub.dev"
     source: hosted
-    version: "0.6.17"
+    version: "0.6.17+1"
   flutter_plugin_android_lifecycle:
     dependency: transitive
     description:
@@ -482,10 +491,10 @@ packages:
     dependency: "direct main"
     description:
       name: path_provider
-      sha256: "3087813781ab814e4157b172f1a11c46be20179fcc9bea043e0fba36bc0acaa2"
+      sha256: "909b84830485dbcd0308edf6f7368bc8fd76afa26a270420f34cabea2a6467a0"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.15"
+    version: "2.1.0"
   path_provider_android:
     dependency: transitive
     description:
@@ -578,10 +587,10 @@ packages:
     dependency: transitive
     description:
       name: platform
-      sha256: "4a451831508d7d6ca779f7ac6e212b4023dd5a7d08a27a63da33756410e32b76"
+      sha256: "57c07bf82207aee366dfaa3867b3164e4f03a238a461a11b0e8a3a510d51203d"
       url: "https://pub.dev"
     source: hosted
-    version: "3.1.0"
+    version: "3.1.1"
   plugin_platform_interface:
     dependency: transitive
     description:
@@ -642,10 +651,10 @@ packages:
     dependency: transitive
     description:
       name: shared_preferences_foundation
-      sha256: f39696b83e844923b642ce9dd4bd31736c17e697f6731a5adf445b1274cf3cd4
+      sha256: d29753996d8eb8f7619a1f13df6ce65e34bc107bef6330739ed76f18b22310ef
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.2"
+    version: "2.3.3"
   shared_preferences_linux:
     dependency: transitive
     description:
@@ -783,10 +792,10 @@ packages:
     dependency: transitive
     description:
       name: url_launcher_android
-      sha256: "78cb6dea3e93148615109e58e42c35d1ffbf5ef66c44add673d0ab75f12ff3af"
+      sha256: "3dd2388cc0c42912eee04434531a26a82512b9cb1827e0214430c9bcbddfe025"
       url: "https://pub.dev"
     source: hosted
-    version: "6.0.37"
+    version: "6.0.38"
   url_launcher_ios:
     dependency: transitive
     description:
@@ -863,26 +872,26 @@ packages:
     dependency: transitive
     description:
       name: webview_flutter_android
-      sha256: d936a09fbfd08cb78f7329e0bbacf6158fbdfe24ffc908b22444c07d295eb193
+      sha256: bca797abba472868655b5f1a6029c1132385685ee9db4713cb0e7f33076210c6
       url: "https://pub.dev"
     source: hosted
-    version: "3.9.2"
+    version: "3.9.3"
   webview_flutter_platform_interface:
     dependency: transitive
     description:
       name: webview_flutter_platform_interface
-      sha256: "564ef378cafc1a0e29f1d76ce175ef517a0a6115875dff7b43fccbef2b0aeb30"
+      sha256: "0ca3cfcc6781a7de701d580917af4a9efc4e3e129f8ead95a80587f0a749480a"
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.0"
+    version: "2.5.0"
   webview_flutter_wkwebview:
     dependency: transitive
     description:
       name: webview_flutter_wkwebview
-      sha256: "5fa098f28b606f699e8ca52d9e4e11edbbfef65189f5f77ae92703ba5408fd25"
+      sha256: ed749f94ac9e814d04a258a9255cf69cfa4cc6006ff59542aea7fb4590144972
       url: "https://pub.dev"
     source: hosted
-    version: "3.7.2"
+    version: "3.7.3"
   win32:
     dependency: transitive
     description:
@@ -903,10 +912,10 @@ packages:
     dependency: transitive
     description:
       name: xdg_directories
-      sha256: e0b1147eec179d3911f1f19b59206448f78195ca1d20514134e10641b7d7fbff
+      sha256: f0c26453a2d47aa4c2570c6a033246a3fc62da2fe23c7ffdd0a7495086dc0247
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.1"
+    version: "1.0.2"
   xml:
     dependency: transitive
     description:

pubspec.yaml

@@ -1,5 +1,5 @@
 name: obtainium
-description: A new Flutter project.
+description: Get Android App Updates Directly From the Source.
 
 # The following line prevents the package from being accidentally published to
 # pub.dev using `flutter pub publish`. This is preferred for private packages.
@@ -17,7 +17,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 # In Windows, build-name is used as the major, minor, and patch parts
 # of the product and file versions while build-number is used as the build suffix.
-version: 0.13.23+187 # When changing this, update the tag in main() accordingly
+version: 0.13.26+190 # When changing this, update the tag in main() accordingly
 
 environment:
   sdk: '>=2.18.2 <3.0.0'
@@ -55,9 +55,13 @@ dependencies:
     git:
       url: https://github.com/ImranR98/android_package_installer
       ref: main
+  android_package_manager:
+    git:
+        url: https://github.com/ImranR98/android_package_manager
+        ref: master
   share_plus: ^7.0.0
-  installed_apps: ^1.3.1
+  installed_apps: ^1.3.1 # TODO: Remove when android_package_manager supports getting icon as UInt8List and versionCode
-  package_archive_info: ^0.1.0
+  package_archive_info: ^0.1.0 # TODO: Remove when android_package_manager supports getting versionCode
   android_alarm_manager_plus: ^3.0.0
   sqflite: ^2.2.0+3
   easy_localization: ^3.0.1