Merge pull request #666 from ImranR98/dev

Add better GitLab APK discover when API key set (#3 and duplicates #41, #282, partly #356)
Merge remote-tracking branch 'origin/main' into dev
2025-11-04 15:23:28 +01:00 · 2023-07-14 23:56:27 -04:00 · 2023-07-14 23:54:17 -04:00 · 2023-07-14 23:54:03 -04:00 · 2023-07-14 23:53:28 -04:00 · 2023-07-15 06:32:08 +03:00
20 changed files with 244 additions and 96 deletions
--- a/assets/translations/de.json
+++ b/assets/translations/de.json
@@ -229,11 +229,14 @@
    "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 (Aktiviert Suche)",
+    "gitlabPATLabel": "GitLab Personal Access Token\n(Aktiviert Suche and Better APK Discovery)",
    "about": "Über",
    "requiresCredentialsInSettings": "Benötigt zusätzliche Anmeldedaten (in den Einstellungen)",
    "checkOnStart": "Überprüfe einmalig beim Start",
    "tryInferAppIdFromCode": "Try inferring App ID from source code",
+    "removeOnExternalUninstall": "Automatically remove externally uninstalled Apps",
+    "pickHighestVersionCode": "Auto-select highest version code APK",
+    "checkUpdateOnDetailPage": "Check for updates on opening an App detail page",
    "removeAppQuestion": {
        "one": "App entfernen?",
        "other": "Apps entfernen?"
--- a/assets/translations/en.json
+++ b/assets/translations/en.json
@@ -121,7 +121,7 @@
    "followSystem": "Follow System",
    "obtainium": "Obtainium",
    "materialYou": "Material You",
-    "useBlackTheme": "Use Pure Black Dark Theme",
+    "useBlackTheme": "Use pure black dark theme",
    "appSortBy": "App Sort By",
    "authorName": "Author/Name",
    "nameAuthor": "Name/Author",
@@ -132,8 +132,8 @@
    "bgUpdateCheckInterval": "Background Update Checking Interval",
    "neverManualOnly": "Never - Manual Only",
    "appearance": "Appearance",
-    "showWebInAppView": "Show Source Webpage in App View",
-    "pinUpdates": "Pin Updates to Top of Apps View",
+    "showWebInAppView": "Show Source webpage in App view",
+    "pinUpdates": "Pin updates to top of Apps view",
    "updates": "Updates",
    "sourceSpecific": "Source-Specific",
    "appSource": "App Source",
@@ -226,14 +226,17 @@
    "autoApkFilterByArch": "Attempt to filter APKs by CPU architecture if possible",
    "overrideSource": "Override Source",
    "dontShowAgain": "Don't show this again",
-    "dontShowTrackOnlyWarnings": "Don't Show 'Track-Only' Warnings",
-    "dontShowAPKOriginWarnings": "Don't Show APK Origin Warnings",
-    "moveNonInstalledAppsToBottom": "Move Non-Installed Apps to Bottom of Apps View",
-    "gitlabPATLabel": "GitLab Personal Access Token (Enables Search)",
+    "dontShowTrackOnlyWarnings": "Don't show 'Track-Only' warnings",
+    "dontShowAPKOriginWarnings": "Don't show APK origin warnings",
+    "moveNonInstalledAppsToBottom": "Move non-installed Apps to bottom of Apps view",
+    "gitlabPATLabel": "GitLab Personal Access Token\n(Enables Search and Better APK Discovery)",
    "about": "About",
    "requiresCredentialsInSettings": "This needs additional credentials (in Settings)",
-    "checkOnStart": "Check Once on Start",
+    "checkOnStart": "Check for updates on startup",
    "tryInferAppIdFromCode": "Try inferring App ID from source code",
+    "removeOnExternalUninstall": "Automatically remove externally uninstalled Apps",
+    "pickHighestVersionCode": "Auto-select highest version code APK",
+    "checkUpdateOnDetailPage": "Check for updates on opening an App detail page",
    "removeAppQuestion": {
        "one": "Remove App?",
        "other": "Remove Apps?"
--- a/assets/translations/es.json
+++ b/assets/translations/es.json
@@ -228,12 +228,15 @@
    "dontShowAgain": "No mostrar de nuevo",
    "dontShowTrackOnlyWarnings": "No mostrar avisos de 'Solo Seguimiento'",
    "dontShowAPKOriginWarnings": "No mostrar avisos de las fuentes de las APks",
-    "moveNonInstalledAppsToBottom": "Move Non-Installed Apps to Bottom of Apps View",
-    "gitlabPATLabel": "GitLab Personal Access Token (Enables Search)",
+    "moveNonInstalledAppsToBottom": "Move non-installed Apps to bottom of Apps view",
+    "gitlabPATLabel": "GitLab Personal Access Token\n(Enables Search and Better APK Discovery)",
    "about": "About",
    "requiresCredentialsInSettings": "This needs additional credentials (in Settings)",
-    "checkOnStart": "Check Once on Start",
+    "checkOnStart": "Check for updates on startup",
    "tryInferAppIdFromCode": "Try inferring App ID from source code",
+    "removeOnExternalUninstall": "Automatically remove externally uninstalled Apps",
+    "pickHighestVersionCode": "Auto-select highest version code APK",
+    "checkUpdateOnDetailPage": "Check for updates on opening an App detail page",
    "removeAppQuestion": {
        "one": "¿Eliminar Aplicación?",
        "other": "¿Eliminar Aplicaciones?"
--- a/assets/translations/fa.json
+++ b/assets/translations/fa.json
@@ -229,11 +229,14 @@
    "dontShowTrackOnlyWarnings": "هشدار 'فقط ردیابی' را نشان ندهید",
    "dontShowAPKOriginWarnings": "هشدارهای منبع APK را نشان ندهید",
    "moveNonInstalledAppsToBottom": "برنامه های نصب نشده را به نمای پایین برنامه ها منتقل کنید",
-    "gitlabPATLabel": "رمز دسترسی شخصی GitLab (جستجو را فعال می کند)",
+    "gitlabPATLabel": "رمز دسترسی شخصی GitLab\n(جستجو را فعال می کند and Better APK Discovery)",
    "about": "درباره",
    "requiresCredentialsInSettings": "این به اعتبارنامه های اضافی نیاز دارد (در تنظیمات)",
    "checkOnStart": "بررسی در شروع",
    "tryInferAppIdFromCode": "شناسه برنامه را از کد منبع استنباط کنید",
+    "removeOnExternalUninstall": "Automatically remove externally uninstalled Apps",
+    "pickHighestVersionCode": "Auto-select highest version code APK",
+    "checkUpdateOnDetailPage": "Check for updates on opening an App detail page",
    "removeAppQuestion": {
        "one": "برنامه حذف شود؟",
        "other": "برنامه ها حذف شوند؟"
--- a/assets/translations/fr.json
+++ b/assets/translations/fr.json
@@ -121,7 +121,7 @@
    "followSystem": "Suivre le système",
    "obtainium": "Obtainium",
    "materialYou": "Material You",
-    "useBlackTheme": "Use Pure Black Dark Theme",
+    "useBlackTheme": "Use pure black dark theme",
    "appSortBy": "Applications triées par",
    "authorName": "Auteur/Nom",
    "nameAuthor": "Nom/Auteur",
@@ -227,13 +227,16 @@
    "overrideSource": "Override Source",
    "dontShowAgain": "Don't show this again",
    "dontShowTrackOnlyWarnings": "Don't Show the 'Track-Only' Warning",
-    "dontShowAPKOriginWarnings": "Don't Show APK Origin Warnings",
-    "moveNonInstalledAppsToBottom": "Move Non-Installed Apps to Bottom of Apps View",
-    "gitlabPATLabel": "GitLab Personal Access Token (Enables Search)",
+    "dontShowAPKOriginWarnings": "Don't show APK origin warnings",
+    "moveNonInstalledAppsToBottom": "Move non-installed Apps to bottom of Apps view",
+    "gitlabPATLabel": "GitLab Personal Access Token\n(Enables Search and Better APK Discovery)",
    "about": "About",
    "requiresCredentialsInSettings": "This needs additional credentials (in Settings)",
-    "checkOnStart": "Check Once on Start",
+    "checkOnStart": "Check for updates on startup",
    "tryInferAppIdFromCode": "Try inferring App ID from source code",
+    "removeOnExternalUninstall": "Automatically remove externally uninstalled Apps",
+    "pickHighestVersionCode": "Auto-select highest version code APK",
+    "checkUpdateOnDetailPage": "Check for updates on opening an App detail page",
    "removeAppQuestion": {
        "one": "Supprimer l'application ?",
        "other": "Supprimer les applications ?"
--- a/assets/translations/hu.json
+++ b/assets/translations/hu.json
@@ -228,11 +228,14 @@
    "dontShowTrackOnlyWarnings": "Ne jelenítsen meg 'Csak nyomon követés' figyelmeztetést",
    "dontShowAPKOriginWarnings": "Ne jelenítsen meg az APK eredetére vonatkozó figyelmeztetéseket",
    "moveNonInstalledAppsToBottom": "Helyezze át a nem telepített appokat az App nézet aljára",
-    "gitlabPATLabel": "GitLab Personal Access Token (Engedélyezi a Keresést)",
+    "gitlabPATLabel": "GitLab Personal Access Token\n(Engedélyezi a Keresést and Better APK Discovery)",
    "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",
    "tryInferAppIdFromCode": "Próbálja kikövetkeztetni az app azonosítót a forráskódból",
+    "removeOnExternalUninstall": "Automatically remove externally uninstalled Apps",
+    "pickHighestVersionCode": "Auto-select highest version code APK",
+    "checkUpdateOnDetailPage": "Check for updates on opening an App detail page",
    "removeAppQuestion": {
        "one": "Eltávolítja az alkalmazást?",
        "other": "Eltávolítja az alkalmazást?"
--- a/assets/translations/it.json
+++ b/assets/translations/it.json
@@ -229,11 +229,14 @@
    "dontShowTrackOnlyWarnings": "Non mostrare gli avvisi 'Solo-Monitoraggio'",
    "dontShowAPKOriginWarnings": "Non mostrare gli avvisi di origine dell'APK",
    "moveNonInstalledAppsToBottom": "Sposta le app non installate in fondo alla lista",
-    "gitlabPATLabel": "GitLab Personal Access Token (attiva la ricerca)",
+    "gitlabPATLabel": "GitLab Personal Access Token\n(attiva la ricerca and Better APK Discovery)",
    "about": "Informazioni",
    "requiresCredentialsInSettings": "Servono credenziali aggiuntive (in Impostazioni)",
    "checkOnStart": "Controlla una volta all'avvio",
    "tryInferAppIdFromCode": "Prova a dedurre l'ID dell'app dal codice sorgente",
+    "removeOnExternalUninstall": "Automatically remove externally uninstalled Apps",
+    "pickHighestVersionCode": "Auto-select highest version code APK",
+    "checkUpdateOnDetailPage": "Check for updates on opening an App detail page",
    "removeAppQuestion": {
        "one": "Rimuovere l'app?",
        "other": "Rimuovere le app?"
--- a/assets/translations/ja.json
+++ b/assets/translations/ja.json
@@ -229,11 +229,14 @@
    "dontShowTrackOnlyWarnings": "「追跡のみ」の警告を表示しない",
    "dontShowAPKOriginWarnings": "APK Originの警告を表示しない",
    "moveNonInstalledAppsToBottom": "未インストールのアプリをアプリ一覧の下部に移動させる",
-    "gitlabPATLabel": "GitLab パーソナルアクセストークン (検索を有効化する)",
+    "gitlabPATLabel": "GitLab パーソナルアクセストークン\n(検索を有効化する and Better APK Discovery)",
    "about": "概要",
    "requiresCredentialsInSettings": "これには追加の認証が必要です (設定にて)",
-    "checkOnStart": "Check Once on Start",
+    "checkOnStart": "Check for updates on startup",
    "tryInferAppIdFromCode": "Try inferring App ID from source code",
+    "removeOnExternalUninstall": "Automatically remove externally uninstalled Apps",
+    "pickHighestVersionCode": "Auto-select highest version code APK",
+    "checkUpdateOnDetailPage": "Check for updates on opening an App detail page",
    "removeAppQuestion": {
        "one": "アプリを削除しますか？",
        "other": "アプリを削除しますか？"
--- a/assets/translations/pl.json
+++ b/assets/translations/pl.json
@@ -233,11 +233,14 @@
    "dontShowTrackOnlyWarnings": "Nie wyświetlaj ostrzeżeń „Tylko obserwowana”",
    "dontShowAPKOriginWarnings": "Nie pokazuj ostrzeżeń o pochodzeniu APK",
    "moveNonInstalledAppsToBottom": "Przenieś niezainstalowane aplikacje na dół widoku aplikacji",
-    "gitlabPATLabel": "Osobisty Token Dostępu GitLab (umożliwia wyszukiwanie)",
+    "gitlabPATLabel": "Osobisty Token Dostępu GitLab\n(umożliwia wyszukiwanie and Better APK Discovery)",
    "about": "Więcej informacji",
    "requiresCredentialsInSettings": "Wymaga to dodatkowych poświadczeń (w Ustawieniach)",
    "checkOnStart": "Sprawdź raz przy starcie",
    "tryInferAppIdFromCode": "Spróbuj wywnioskować identyfikator aplikacji z kodu źródłowego",
+    "removeOnExternalUninstall": "Automatically remove externally uninstalled Apps",
+    "pickHighestVersionCode": "Auto-select highest version code APK",
+    "checkUpdateOnDetailPage": "Check for updates on opening an App detail page",
    "removeAppQuestion": {
        "one": "Usunąć aplikację?",
        "other": "Usunąć aplikacje?"
--- a/assets/translations/ru.json
+++ b/assets/translations/ru.json
@@ -7,7 +7,7 @@
    "appIdMismatch": "ID загруженного пакета не совпадает с существующим ID приложения",
    "functionNotImplemented": "Этот класс не реализовал эту функцию",
    "placeholder": "Заполнитель",
-    "someErrors": "Произошли некоторые ошибки",
+    "someErrors": "Возникли некоторые ошибки",
    "unexpectedError": "Неожиданная ошибка",
    "ok": "Окей",
    "and": "и",
@@ -121,7 +121,7 @@
    "followSystem": "Следовать системе",
    "obtainium": "Obtainium",
    "materialYou": "Material You",
-    "useBlackTheme": "Использовать темную тему",
+    "useBlackTheme": "Использовать чёрную тему",
    "appSortBy": "Сортировка приложений по",
    "authorName": "Автор/Название",
    "nameAuthor": "Название/Автор",
@@ -132,7 +132,7 @@
    "bgUpdateCheckInterval": "Интервал проверки обновлений в фоновом режиме",
    "neverManualOnly": "Никогда - Только вручную",
    "appearance": "Внешний вид",
-    "showWebInAppView": "Показывать веб-страницу источника в представлении приложения",
+    "showWebInAppView": "Показывать исходную веб-страницу в представлении приложения",
    "pinUpdates": "Закрепить обновления сверху списка приложений",
    "updates": "Обновления",
    "sourceSpecific": "Специфика источника",
@@ -229,11 +229,14 @@
    "dontShowTrackOnlyWarnings": "Не показывать предупреждения о только отслеживаемых приложениях",
    "dontShowAPKOriginWarnings": "Не показывать предупреждения об источнике APK-файлов",
    "moveNonInstalledAppsToBottom": "Переместить неустановленные приложения вниз списка",
-    "gitlabPATLabel": "Персональный токен доступа GitLab (Включает поиск)",
+    "gitlabPATLabel": "Персональный токен доступа GitLab\n(Включает поиск and Better APK Discovery)",
    "about": "О приложении",
    "requiresCredentialsInSettings": "Для этого требуются дополнительные учетные данные (в настройках)",
-    "checkOnStart": "Проверить один раз при запуске",
+    "checkOnStart": "Проверять наличие обновлений при запуске",
    "tryInferAppIdFromCode": "Попытаться определить ID приложения из исходного кода",
+    "removeOnExternalUninstall": "Автоматически удалять удаленные извне приложения",
+    "pickHighestVersionCode": "Автовыбор кода наивысшей версии APK",
+    "checkUpdateOnDetailPage": "Проверять наличие обновлений при открытии страницы представления приложения",
    "removeAppQuestion": {
        "one": "Удалить приложение?",
        "other": "Удалить приложения?"
@@ -275,11 +278,11 @@
        "other": "Очищено {n} журналов (до = {before}, после = {after})"
    },
    "xAndNMoreUpdatesAvailable": {
-        "one": "У {} и еще 1 приложения есть обновления.",
-        "other": "{} and {} more apps have updates."
+        "one": "У {} и еще 1 приложения есть обновление.",
+        "other": "У {} и ещё {} приложений есть обновления."
    },
    "xAndNMoreUpdatesInstalled": {
-        "one": "{} and 1 more app were updated.",
-        "other": "У {} и еще {} приложений есть обновления."
+        "one": "{} и еще 1 приложение были обновлены.",
+        "other": "{} и еще {} приложений были обновлены."
    }
 }
--- a/assets/translations/zh.json
+++ b/assets/translations/zh.json
@@ -229,11 +229,14 @@
    "dontShowTrackOnlyWarnings": "不显示“仅追踪”模式警告",
    "dontShowAPKOriginWarnings": "不显示 APK 文件来源警告",
    "moveNonInstalledAppsToBottom": "将未安装应用置底",
-    "gitlabPATLabel": "GitLab 个人访问令牌（用于搜索应用）",
+    "gitlabPATLabel": "GitLab 个人访问令牌\n（用于搜索应用 and Better APK Discovery）",
    "about": "相关文档",
    "requiresCredentialsInSettings": "此功能需要额外的凭据（在“设置”中添加）",
    "checkOnStart": "启动时进行一次检查",
    "tryInferAppIdFromCode": "尝试从源代码推断应用 ID",
+    "removeOnExternalUninstall": "Automatically remove externally uninstalled Apps",
+    "pickHighestVersionCode": "Auto-select highest version code APK",
+    "checkUpdateOnDetailPage": "Check for updates on opening an App detail page",
    "removeAppQuestion": {
        "one": "是否删除应用？",
        "other": "是否删除应用？"
--- a/lib/app_sources/fdroidrepo.dart
+++ b/lib/app_sources/fdroidrepo.dart
@@ -14,6 +14,10 @@ class FDroidRepo extends AppSource {
            label: tr('appIdOrName'),
            hint: tr('reposHaveMultipleApps'),
            required: true)
+      ],
+      [
+        GeneratedFormSwitch('pickHighestVersionCode',
+            label: tr('pickHighestVersionCode'), defaultValue: false)
      ]
    ];
  }
@@ -24,6 +28,7 @@ class FDroidRepo extends AppSource {
    Map<String, dynamic> additionalSettings,
  ) async {
    String? appIdOrName = additionalSettings['appIdOrName'];
+    bool pickHighestVersionCode = additionalSettings['pickHighestVersionCode'];
    if (appIdOrName == null) {
      throw NoReleasesError();
    }
@@ -62,10 +67,19 @@ class FDroidRepo extends AppSource {
      if (latestVersion == null) {
        throw NoVersionError();
      }
-      List<String> apkUrls = releases
+      var latestVersionReleases = releases
          .where((element) =>
              element.querySelector('version')?.innerHtml == latestVersion &&
              element.querySelector('apkname') != null)
+          .toList();
+      if (latestVersionReleases.length > 1 && pickHighestVersionCode) {
+        latestVersionReleases.sort((e1, e2) {
+          return int.parse(e2.querySelector('versioncode')!.innerHtml)
+              .compareTo(int.parse(e1.querySelector('versioncode')!.innerHtml));
+        });
+        latestVersionReleases = [latestVersionReleases[0]];
+      }
+      List<String> apkUrls = latestVersionReleases
          .map((e) => '$standardUrl/${e.querySelector('apkname')!.innerHtml}')
          .toList();
      return APKDetails(latestVersion, getApkUrlsFromUrls(apkUrls),
--- a/lib/app_sources/gitlab.dart
+++ b/lib/app_sources/gitlab.dart
@@ -102,11 +102,53 @@ class GitLab extends AppSource {
  ) async {
    bool fallbackToOlderReleases =
        additionalSettings['fallbackToOlderReleases'] == true;
-    Response res = await sourceRequest('$standardUrl/-/tags?format=atom');
-    if (res.statusCode == 200) {
+    String? PAT = await getPATIfAny();
+    Iterable<APKDetails> apkDetailsList = [];
+    if (PAT != null) {
+      var names = GitHub().getAppNames(standardUrl);
+      Response res = await sourceRequest(
+          'https://$host/api/v4/projects/${names.author}%2F${names.name}/releases?private_token=$PAT');
+      if (res.statusCode != 200) {
+        throw getObtainiumHttpError(res);
+      }
+      var json = jsonDecode(res.body) as List<dynamic>;
+      apkDetailsList = json.map((e) {
+        var apkUrlsFromAssets = (e['assets']?['links'] as List<dynamic>? ?? [])
+            .map((e) {
+              return (e['direct_asset_url'] ?? e['url'] ?? '') as String;
+            })
+            .where((s) => s.isNotEmpty)
+            .toList();
+        List<String> uploadedAPKsFromDescription =
+            ((e['description'] ?? '') as String)
+                .split('](')
+                .join('\n')
+                .split('.apk)')
+                .join('.apk\n')
+                .split('\n')
+                .where((s) => s.startsWith('/uploads/') && s.endsWith('apk'))
+                .map((s) => '$standardUrl$s')
+                .toList();
+        var apkUrlsSet = apkUrlsFromAssets.toSet();
+        apkUrlsSet.addAll(uploadedAPKsFromDescription);
+        var releaseDateString = e['released_at'] ?? e['created_at'];
+        DateTime? releaseDate = releaseDateString != null
+            ? DateTime.parse(releaseDateString)
+            : null;
+        return APKDetails(
+            e['tag_name'] ?? e['name'],
+            getApkUrlsFromUrls(apkUrlsSet.toList()),
+            GitHub().getAppNames(standardUrl),
+            releaseDate: releaseDate);
+      });
+    } else {
+      Response res = await sourceRequest('$standardUrl/-/tags?format=atom');
+      if (res.statusCode != 200) {
+        throw getObtainiumHttpError(res);
+      }
      var standardUri = Uri.parse(standardUrl);
      var parsedHtml = parse(res.body);
-      var apkDetailsList = parsedHtml.querySelectorAll('entry').map((entry) {
+      apkDetailsList = parsedHtml.querySelectorAll('entry').map((entry) {
        var entryContent = parse(
            parseFragment(entry.querySelector('content')!.innerHtml).text);
        var apkUrls = [
@@ -124,7 +166,6 @@ class GitLab extends AppSource {
              .where((element) => Uri.parse(element).host != '')
              .toList()
        ];
-
        var entryId = entry.querySelector('id')?.innerHtml;
        var version =
            entryId == null ? null : Uri.parse(entryId).pathSegments.last;
@@ -139,21 +180,19 @@ class GitLab extends AppSource {
            GitHub().getAppNames(standardUrl),
            releaseDate: releaseDate);
      });
+    }
+    if (apkDetailsList.isEmpty) {
+      throw NoReleasesError();
+    }
+    if (fallbackToOlderReleases) {
+      if (additionalSettings['trackOnly'] != true) {
+        apkDetailsList =
+            apkDetailsList.where((e) => e.apkUrls.isNotEmpty).toList();
+      }
      if (apkDetailsList.isEmpty) {
        throw NoReleasesError();
      }
-      if (fallbackToOlderReleases) {
-        if (additionalSettings['trackOnly'] != true) {
-          apkDetailsList =
-              apkDetailsList.where((e) => e.apkUrls.isNotEmpty).toList();
-        }
-        if (apkDetailsList.isEmpty) {
-          throw NoReleasesError();
-        }
-      }
-      return apkDetailsList.first;
-    } else {
-      throw getObtainiumHttpError(res);
    }
+    return apkDetailsList.first;
  }
 }
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -21,7 +21,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.14';
+const String currentVersion = '0.13.16';
 const String currentReleaseTag =
    'v$currentVersion-beta'; // KEEP THIS IN SYNC WITH GITHUB RELEASES

@@ -226,9 +226,9 @@ class _ObtainiumState extends State<Obtainium> {
      if (!supportedLocales
              .map((e) => e.key.languageCode)
              .contains(context.locale.languageCode) ||
-          settingsProvider.forcedLocale == null &&
+          (settingsProvider.forcedLocale == null &&
              context.deviceLocale.languageCode !=
-                  context.locale.languageCode) {
+                  context.locale.languageCode)) {
        settingsProvider.resetLocaleSafe(context);
      }
      // Register the background update task according to the user's setting
--- a/lib/pages/app.dart
+++ b/lib/pages/app.dart
@@ -44,7 +44,10 @@ class _AppPageState extends State<AppPage> {
        ? sourceProvider.getSource(app.app.url,
            overrideSource: app.app.overrideSource)
        : null;
-    if (!areDownloadsRunning && prevApp == null && app != null) {
+    if (!areDownloadsRunning &&
+        prevApp == null &&
+        app != null &&
+        settingsProvider.checkUpdateOnDetailPage) {
      prevApp = app;
      getUpdate(app.app.id);
    }
--- a/lib/pages/settings.dart
+++ b/lib/pages/settings.dart
@@ -240,6 +240,21 @@ class _SettingsPageState extends State<SettingsPage> {
                                    })
                              ],
                            ),
+                            height16,
+                            Row(
+                              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                              children: [
+                                Flexible(
+                                    child: Text(tr('checkUpdateOnDetailPage'))),
+                                Switch(
+                                    value: settingsProvider
+                                        .checkUpdateOnDetailPage,
+                                    onChanged: (value) {
+                                      settingsProvider.checkUpdateOnDetailPage =
+                                          value;
+                                    })
+                              ],
+                            ),
                            height32,
                            Text(
                              tr('sourceSpecific'),
@@ -322,6 +337,22 @@ class _SettingsPageState extends State<SettingsPage> {
                              ],
                            ),
                            height16,
+                            Row(
+                              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                              children: [
+                                Flexible(
+                                    child:
+                                        Text(tr('removeOnExternalUninstall'))),
+                                Switch(
+                                    value: settingsProvider
+                                        .removeOnExternalUninstall,
+                                    onChanged: (value) {
+                                      settingsProvider
+                                          .removeOnExternalUninstall = value;
+                                    })
+                              ],
+                            ),
+                            height16,
                            Row(
                              mainAxisAlignment: MainAxisAlignment.spaceBetween,
                              children: [
--- a/lib/providers/apps_provider.dart
+++ b/lib/providers/apps_provider.dart
@@ -335,19 +335,21 @@ class AppsProvider with ChangeNotifier {
  }

  Future<void> unzipFile(String filePath, String destinationPath) async {
-    await ZipFile.extractToDirectory(zipFile: File(filePath), destinationDir: Directory(destinationPath));
+    await ZipFile.extractToDirectory(
+        zipFile: File(filePath), destinationDir: Directory(destinationPath));
  }

  Future<void> installXApkDir(DownloadedXApkDir dir,
      {bool silent = false}) async {
    try {
      var somethingInstalled = false;
-      for (var file in dir.extracted.listSync(recursive: true, followLinks: false).whereType<File>()) {
+      for (var file in dir.extracted
+          .listSync(recursive: true, followLinks: false)
+          .whereType<File>()) {
        if (file.path.toLowerCase().endsWith('.apk')) {
          somethingInstalled = somethingInstalled ||
              await installApk(DownloadedApk(dir.appId, file), silent: silent);
-        }
-        else if (file.path.toLowerCase().endsWith('.obb')) {
+        } else if (file.path.toLowerCase().endsWith('.obb')) {
          await moveObbFile(file, dir.appId);
        }
      }
@@ -389,7 +391,7 @@ class AppsProvider with ChangeNotifier {
  }

  Future<void> moveObbFile(File file, String appId) async {
-    if(!file.path.toLowerCase().endsWith('.obb')) return;
+    if (!file.path.toLowerCase().endsWith('.obb')) return;

    // TODO: Does not support Android 11+
    if ((await DeviceInfoPlugin().androidInfo).version.sdkInt <= 29) {
@@ -754,21 +756,37 @@ class AppsProvider with ChangeNotifier {
    }
    loadingApps = false;
    notifyListeners();
-    refreshInstallStatuses();
+
+    refreshInstallStatuses(useExistingInstalledInfo: true);
  }

-  Future<void> refreshInstallStatuses() async {
+  Future<void> refreshInstallStatuses(
+      {bool useExistingInstalledInfo = false}) async {
    if (await doesInstalledAppsPluginWork()) {
      List<App> modifiedApps = [];
      for (var app in apps.values) {
-        var moddedApp =
-            getCorrectedInstallStatusAppIfPossible(app.app, app.installedInfo);
+        var moddedApp = getCorrectedInstallStatusAppIfPossible(
+            app.app,
+            useExistingInstalledInfo
+                ? app.installedInfo
+                : await getInstalledInfo(app.app.id));
        if (moddedApp != null) {
          modifiedApps.add(moddedApp);
        }
      }
      if (modifiedApps.isNotEmpty) {
        await saveApps(modifiedApps, attemptToCorrectInstallStatus: false);
+        var removedAppIds = modifiedApps
+            .where((a) => a.installedVersion == null)
+            .map((e) => e.id)
+            .toList();
+        if (removedAppIds.isNotEmpty) {
+          var settingsProvider = SettingsProvider();
+          await settingsProvider.initializeSettings();
+          if (settingsProvider.removeOnExternalUninstall) {
+            await removeApps(removedAppIds);
+          }
+        }
      }
    }
  }
--- a/lib/providers/settings_provider.dart
+++ b/lib/providers/settings_provider.dart
@@ -273,4 +273,22 @@ class SettingsProvider with ChangeNotifier {
      context.deleteSaveLocale();
    }
  }
+
+  bool get removeOnExternalUninstall {
+    return prefs?.getBool('removeOnExternalUninstall') ?? false;
+  }
+
+  set removeOnExternalUninstall(bool show) {
+    prefs?.setBool('removeOnExternalUninstall', show);
+    notifyListeners();
+  }
+
+  bool get checkUpdateOnDetailPage {
+    return prefs?.getBool('checkUpdateOnDetailPage') ?? true;
+  }
+
+  set checkUpdateOnDetailPage(bool show) {
+    prefs?.setBool('checkUpdateOnDetailPage', show);
+    notifyListeners();
+  }
 }
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -402,10 +402,10 @@ packages:
    dependency: transitive
    description:
      name: markdown
-      sha256: "8e332924094383133cee218b676871f42db2514f1f6ac617b6cf6152a7faab8e"
+      sha256: acf35edccc0463a9d7384e437c015a3535772e09714cf60e07eeef3a15870dcd
      url: "https://pub.dev"
    source: hosted
-    version: "7.1.0"
+    version: "7.1.1"
  matcher:
    dependency: transitive
    description:
@@ -490,10 +490,10 @@ packages:
    dependency: transitive
    description:
      name: path_provider_foundation
-      sha256: "1995d88ec2948dac43edf8fe58eb434d35d22a2940ecee1a9fefcd62beee6eb3"
+      sha256: "916731ccbdce44d545414dd9961f26ba5fbaa74bcbb55237d8e65a623a8c7297"
      url: "https://pub.dev"
    source: hosted
-    version: "2.2.3"
+    version: "2.2.4"
  path_provider_linux:
    dependency: transitive
    description:
@@ -522,34 +522,34 @@ packages:
    dependency: "direct main"
    description:
      name: permission_handler
-      sha256: "415af30ba76a84faccfe1eb251fe1e4fdc790f876924c65ad7d6ed7a1404bcd6"
+      sha256: "63e5216aae014a72fe9579ccd027323395ce7a98271d9defa9d57320d001af81"
      url: "https://pub.dev"
    source: hosted
-    version: "10.4.2"
+    version: "10.4.3"
  permission_handler_android:
    dependency: transitive
    description:
      name: permission_handler_android
-      sha256: "3b61f3da3b1c83bc3fb6a2b431e8dab01d0e5b45f6a3d9c7609770ec88b2a89e"
+      sha256: c0c9754479a4c4b1c1f3862ddc11930c9b3f03bef2816bb4ea6eed1e13551d6f
      url: "https://pub.dev"
    source: hosted
-    version: "10.3.0"
+    version: "10.3.2"
  permission_handler_apple:
    dependency: transitive
    description:
      name: permission_handler_apple
-      sha256: "7a187b671a39919462af2b5e813148365b71a615979165a119868d667fe90c03"
+      sha256: "99e220bce3f8877c78e4ace901082fb29fa1b4ebde529ad0932d8d664b34f3f5"
      url: "https://pub.dev"
    source: hosted
-    version: "9.1.3"
+    version: "9.1.4"
  permission_handler_platform_interface:
    dependency: transitive
    description:
      name: permission_handler_platform_interface
-      sha256: "463a07cb7cc6c758a7a1c7da36ce666bb80a0b4b5e92df0fa36872e0ed456993"
+      sha256: "7c6b1500385dd1d2ca61bb89e2488ca178e274a69144d26bbd65e33eae7c02a9"
      url: "https://pub.dev"
    source: hosted
-    version: "3.11.1"
+    version: "3.11.3"
  permission_handler_windows:
    dependency: transitive
    description:
@@ -590,14 +590,6 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "3.7.3"
-  process:
-    dependency: transitive
-    description:
-      name: process
-      sha256: "53fd8db9cec1d37b0574e12f07520d582019cb6c44abf5479a01505099a34a09"
-      url: "https://pub.dev"
-    source: hosted
-    version: "4.2.4"
  provider:
    dependency: "direct main"
    description:
@@ -642,10 +634,10 @@ packages:
    dependency: transitive
    description:
      name: shared_preferences_foundation
-      sha256: b046999bf0ff58f04c364491bb803dcfa8f42e47b19c75478f53d323684a8cc1
+      sha256: f39696b83e844923b642ce9dd4bd31736c17e697f6731a5adf445b1274cf3cd4
      url: "https://pub.dev"
    source: hosted
-    version: "2.3.1"
+    version: "2.3.2"
  shared_preferences_linux:
    dependency: transitive
    description:
@@ -807,10 +799,10 @@ packages:
    dependency: transitive
    description:
      name: url_launcher_macos
-      sha256: "91ee3e75ea9dadf38036200c5d3743518f4a5eb77a8d13fda1ee5764373f185e"
+      sha256: "1c4fdc0bfea61a70792ce97157e5cc17260f61abbe4f39354513f39ec6fd73b1"
      url: "https://pub.dev"
    source: hosted
-    version: "3.0.5"
+    version: "3.0.6"
  url_launcher_platform_interface:
    dependency: transitive
    description:
@@ -863,26 +855,26 @@ packages:
    dependency: transitive
    description:
      name: webview_flutter_android
-      sha256: "1c93e96f3069bacdc734fad6b7e1d3a480fd516a3ae5b8858becf7f07515a2f3"
+      sha256: "27ad6a99c4b2d5e1ffd2b993a10f738b6b4979f139b4d64c34ac511595fcd748"
      url: "https://pub.dev"
    source: hosted
-    version: "3.8.2"
+    version: "3.9.0"
  webview_flutter_platform_interface:
    dependency: transitive
    description:
      name: webview_flutter_platform_interface
-      sha256: "656e2aeaef318900fffd21468b6ddc7958c7092a642f0e7220bac328b70d4a81"
+      sha256: "564ef378cafc1a0e29f1d76ce175ef517a0a6115875dff7b43fccbef2b0aeb30"
      url: "https://pub.dev"
    source: hosted
-    version: "2.3.1"
+    version: "2.4.0"
  webview_flutter_wkwebview:
    dependency: transitive
    description:
      name: webview_flutter_wkwebview
-      sha256: a8d7e8b4be2a79e83b70235369971ec97d14df4cdbb40d305a8eeae67d8e6432
+      sha256: "369fdf6160944a7db660ff15fa048c2bd681b09557907beaef1f95e8557d21dc"
      url: "https://pub.dev"
    source: hosted
-    version: "3.6.2"
+    version: "3.7.0"
  win32:
    dependency: transitive
    description:
@@ -903,10 +895,10 @@ packages:
    dependency: transitive
    description:
      name: xdg_directories
-      sha256: ee1505df1426458f7f60aac270645098d318a8b4766d85fde75f76f2e21807d1
+      sha256: e0b1147eec179d3911f1f19b59206448f78195ca1d20514134e10641b7d7fbff
      url: "https://pub.dev"
    source: hosted
-    version: "1.0.0"
+    version: "1.0.1"
  xml:
    dependency: transitive
    description:
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -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.14+178 # When changing this, update the tag in main() accordingly
+version: 0.13.16+180 # When changing this, update the tag in main() accordingly

 environment:
  sdk: '>=2.18.2 <3.0.0'
Author	SHA1	Message	Date
Imran Remtulla	6a3278432d	Merge pull request #666 from ImranR98/dev Add better GitLab APK discover when API key set (#3 and duplicates #41, #282, partly #356)	2023-07-14 23:56:27 -04:00
Imran Remtulla	81c51970aa	Merge remote-tracking branch 'origin/main' into dev	2023-07-14 23:54:17 -04:00
Imran Remtulla	7f9d431b9b	Merge pull request #664 from TangyWrecker/main Update ru.json	2023-07-14 23:54:03 -04:00
Imran Remtulla	360591ebb9	Add better GitLab APK discover when API key set (#3 )	2023-07-14 23:53:28 -04:00
Tangy Wrecker	814ff2c2e5	Update ru.json fix and update	2023-07-15 06:32:08 +03:00
Imran Remtulla	f74df57400	Merge pull request #663 from ImranR98/dev - Add auto-remove on uninstall option (#656) - Add option to auto-select the highest version code APK for F-Droid Third-Party Repos (#658) - Toggle to disable update check on detail page (#659) - Refresh-on-foreground bugfix - String capitalization consistency	2023-07-14 22:00:04 -04:00
Imran Remtulla	6b29a0f0f3	Update Packages, increment version	2023-07-14 21:56:57 -04:00
Imran Remtulla	2a58ee8729	Toggle to disable update check on detail page (#659 ), string capitalization consistency	2023-07-14 21:53:50 -04:00
Imran Remtulla	41d9edcf83	Auto-select version code for F-Droid Third-Party Repos (#658 )	2023-07-14 21:36:42 -04:00
Imran Remtulla	3ec33a1c77	Add auto-remove option (#656 ) + on-foreground bugfix	2023-07-14 21:09:20 -04:00