Merge pull request #993 from ImranR98/dev

Separate notif channel title translations (#979), Add 'skip update notification' per-app toggle (#980), Better error for some incompatible APK cases (#981), Add whole-page version extraction for HTML (#989), Better relative link resolution (#989), Clearer wording (#991), Fixed issues in some translation files (#992)

.github/workflows/release.yml

@@ -1,4 +1,4 @@
-name: Release (as Draft)
+name: Build and Release
 
 on:
   workflow_dispatch:
@@ -42,18 +42,16 @@ jobs:
           done
           rm apksign.keystore
           PGP_KEY_FINGERPRINT="${{ steps.import_pgp_key.outputs.fingerprint }}"
-          gpg --batch --yes --delete-secret-keys "$PGP_KEY_FINGERPRINT"
-          gpg --batch --yes --delete-keys "$PGP_KEY_FINGERPRINT"
         
       - name: Extract Version
         id: extract_version      
         run: |
            VERSION=$(grep -oP "currentVersion = '\K[^']+" lib/main.dart)
-           echo "::set-output name=version::$VERSION"
+           echo "version=$VERSION" >> $GITHUB_OUTPUT
            TAG=$(grep -oP "'.*\\\$currentVersion.*'" lib/main.dart | head -c -2 | tail -c +2 | sed "s/\$currentVersion/$VERSION/g")
-           echo "::set-output name=tag::$TAG"
+           echo "tag=$TAG" >> $GITHUB_OUTPUT
            if [ -n "$(echo $TAG | grep -oP '\-beta$')" ]; then BETA=true; else BETA=false; fi
-           echo "::set-output name=beta::$BETA"
+           echo "beta=$BETA" >> $GITHUB_OUTPUT
 
       - name: Create Tag
         uses: mathieudutour/github-tag-action@v6.1
@@ -70,11 +68,3 @@ jobs:
           prerelease: "${{ steps.extract_version.outputs.beta }}"
           artifacts: ./build/app/outputs/flutter-apk/*-release*.apk*
           generateReleaseNotes: true
-          draft: true
-                  
-      - name: Archive Reports For Job
-        uses: actions/upload-artifact@v3
-        with:
-          name: reports
-          path: '*/build/reports'
-        if: ${{ always() }}

assets/translations/bs.json

@@ -242,9 +242,12 @@
     "appsPossiblyUpdated": "App Updates Attempted",
     "appsPossiblyUpdatedNotifDescription": "Notifies the user that updates to one or more Apps were potentially applied in the background",
     "xWasPossiblyUpdatedToY": "{} may have been updated to {}.",
+    "enableBackgroundUpdates": "Enable background updates",
     "backgroundUpdateReqsExplanation": "Background updates may not be possible for all apps.",
     "backgroundUpdateLimitsExplanation": "The success of a background install can only be determined when Obtainium is opened.",
     "verifyLatestTag": "Verify the 'latest' tag",
+    "intermediateLinkRegex": "Filter for an 'Intermediate' Link to Visit First",
+    "intermediateLinkNotFound": "Intermediate link not found",
     "exemptFromBackgroundUpdates": "Exempt from background updates (if enabled)",
     "bgUpdatesOnWiFiOnly": "Disable background updates when not on WiFi",
     "autoSelectHighestVersionCode": "Auto-select highest versionCode APK",
@@ -260,6 +263,17 @@
     "debugMenu": "Debug Menu",
     "bgTaskStarted": "Background task started - check logs.",
     "runBgCheckNow": "Run Background Update Check Now",
+    "versionExtractWholePage": "Apply Version Extraction Regex to Entire Page",
+    "installing": "Installing",
+    "skipUpdateNotifications": "Skip update notifications",
+    "updatesAvailableNotifChannel": "Dostupna ažuriranja",
+    "appsUpdatedNotifChannel": "Aplikacije su ažurirane",
+    "appsPossiblyUpdatedNotifChannel": "App Updates Attempted",
+    "errorCheckingUpdatesNotifChannel": "Greška pri provjeri ažuriranja",
+    "appsRemovedNotifChannel": "Aplikacije su uklonjene",
+    "downloadingXNotifChannel": "Preuzimanje {}",
+    "completeAppInstallationNotifChannel": "Dovršite instalaciju aplikacije",
+    "checkingForUpdatesNotifChannel": "Tražim moguće nadogradnje",
     "removeAppQuestion": {
         "one": "Želite li ukloniti aplikaciju?",
         "other": "Želite li ukloniti aplikacije?"

assets/translations/cs.json

@@ -25,7 +25,7 @@
     "githubStarredRepos": "GitHub Starred Repos",
     "uname": "username",
     "wrongArgNum": "Špatný počet předložených argumentů",
-    "xIsTrackOnly":"{} je určeno pouze pro sledování",
+    "xIsTrackOnly": "{} je určeno pouze pro sledování",
     "source": "zdroj",
     "app": "App",
     "appsFromSourceAreTrackOnly": "Aplikace z tohoto zdroje jsou 'Jen sledovány'.",
@@ -56,7 +56,7 @@
     "estimateInBrackets": "(přibližně)",
     "selectAll": "Vybrat Vše",
     "deselectN": "{} deselected",
-    "xWillBeRemovedButRemainInstalled":"{} bude odstraněn z Obtainium, ale zůstane nainstalován v zařízení.",
+    "xWillBeRemovedButRemainInstalled": "{} bude odstraněn z Obtainium, ale zůstane nainstalován v zařízení.",
     "removeSelectedAppsQuestion": "Odebrat vybrané aplikace?",
     "removeSelectedApps": "Odebrat vybrané aplikace",
     "updateX": "Aktualizovat {}",
@@ -101,7 +101,7 @@
     "importX": "Import {}",
     "importedAppsIdDisclaimer": "Importované aplikace mohou být nesprávně zobrazeny jako \"Neinstalované\". Chcete-li to opravit, nainstalujte je znovu prostřednictvím Obtainium. To nemá vliv na data aplikací. Ovlivňuje pouze metody importu URL a třetích stran.",
     "importErrors": "Import Errors",
-    "importedXOfYApps":"{}importováno {}aplikací.",
+    "importedXOfYApps": "{}importováno {}aplikací.",
     "followingURLsHadErrors": "U následujících adres URL došlo k chybám:",
     "okay": "Okay",
     "selectURL": "Select URL",
@@ -136,7 +136,7 @@
     "appNotFound": "App not found",
     "obtainiumExportHyphenatedLowercase": "obtainium-export",
     "pickAnAPK": "Vybrat APK",
-    "appHasMoreThanOnePackage":"{} má více než jeden balíček:",
+    "appHasMoreThanOnePackage": "{} má více než jeden balíček:",
     "deviceSupportsXArch": "Vaše zařízení podporuje architekturu CPU {}.",
     "deviceSupportsFollowingArchs": "Vaše zařízení podporuje následující architektury CPU:",
     "warning": "Varování",
@@ -144,15 +144,15 @@
     "updatesAvailable": "dostupné aktualizace",
     "updatesAvailableNotifDescription": "Upozorňuje uživatele, že jsou k dispozici aktualizace pro jednu nebo více aplikací sledovaných Obtainium",
     "noNewUpdates": "Žádné nové aktualizace.",
-    "xHasAnUpdate":"{} má aktualizaci.",
+    "xHasAnUpdate": "{} má aktualizaci.",
     "appsUpdated": "Aplikace aktualizovány",
     "appsUpdatedNotifDescription": "Upozorňuje uživatele, že byly provedeny aktualizace jedné nebo více aplikací na pozadí",
-    "xWasUpdatedToY":"{} byl aktualizován na {}",
+    "xWasUpdatedToY": "{} byl aktualizován na {}",
     "errorCheckingUpdates": "Chybová kontrola aktualizací",
     "errorCheckingUpdatesNotifDescription": "Oznámení zobrazené při neúspěšné kontrole aktualizací na pozadí",
     "appsRemoved": "Odstraněné aplikace",
     "appsRemovedNotifDescription": "Oznámení uživateli, že jedna nebo více aplikací byly odstraněny z důvodu chyb při načítání",
-    "xWasRemovedDueToErrorY":"{} byla odstraněna z důvodu následující chyby: {}",
+    "xWasRemovedDueToErrorY": "{} byla odstraněna z důvodu následující chyby: {}",
     "completeAppInstallation": "Dokončit instalaci aplikace",
     "obtainiumMustBeOpenToInstallApps": "Obtainium musí být otevřeno, aby bylo možné instalovat aplikace",
     "completeAppInstallationNotifDescription": "Vyzvat uživatele k návratu do Obtainium pro dokončení instalace aplikací",
@@ -241,7 +241,7 @@
     "customLinkFilterRegex": "Vlastní filtr odkazů APK podle regulárního výrazu (výchozí '.apk$')",
     "appsPossiblyUpdated": "Byly provedeny pokusy o aktualizaci aplikací",
     "appsPossiblyUpdatedNotifDescription": "Upozorňuje uživatele, že na pozadí mohly být provedeny aktualizace jedné nebo více aplikací",
-    "xWasPossiblyUpdatedToY":"{} mohlo být aktualizováno na {}.",
+    "xWasPossiblyUpdatedToY": "{} mohlo být aktualizováno na {}.",
     "enableBackgroundUpdates": "Povolit aktualizace na pozadí",
     "backgroundUpdateReqsExplanation": "Aktualizace na pozadí nemusí být možné pro všechny aplikace.",
     "backgroundUpdateLimitsExplanation": "Úspěšnost instalace na pozadí lze určit pouze v případě, že je otevřen Obtainium.",
@@ -263,6 +263,17 @@
     "debugMenu": "Debug Menu",
     "bgTaskStarted": "Background task started - check logs.",
     "runBgCheckNow": "Run Background Update Check Now",
+    "versionExtractWholePage": "Apply Version Extraction Regex to Entire Page",
+    "installing": "Installing",
+    "skipUpdateNotifications": "Skip update notifications",
+    "updatesAvailableNotifChannel": "dostupné aktualizace",
+    "appsUpdatedNotifChannel": "Aplikace aktualizovány",
+    "appsPossiblyUpdatedNotifChannel": "Byly provedeny pokusy o aktualizaci aplikací",
+    "errorCheckingUpdatesNotifChannel": "Chybová kontrola aktualizací",
+    "appsRemovedNotifChannel": "Odstraněné aplikace",
+    "downloadingXNotifChannel": "download {}",
+    "completeAppInstallationNotifChannel": "Dokončit instalaci aplikace",
+    "checkingForUpdatesNotifChannel": "Zkontrolovat aktualizace",
     "removeAppQuestion": {
         "one": "Odstranit Apku?",
         "other": "Odstranit Apky?"
@@ -280,15 +291,15 @@
         "other": "Kontrola aktualizací na pozadí našla {} aktualizací - v případě potřeby upozorní uživatele"
     },
     "apps": {
-        "one":"{} App",
+        "one": "{} App",
-        "other":"{} apps"
+        "other": "{} apps"
     },
     "url": {
         "jedna": "{} URL",
         "other": "{} URLs"
     },
     "minute": {
-        "one":"{} minute",
+        "one": "{} minute",
         "other": "{} minutes"
     },
     "hour": {
@@ -300,20 +311,19 @@
         "other": "{} dny"
     },
     "clearedNLogsBeforeXAfterY": {
-        "one":"{n} log vymazán (před = {před}, po = {po})",
+        "one": "{n} log vymazán (před = {před}, po = {po})",
         "other": "{n} logů vymazáno (před = {před}, po = {po})"
     },
     "xAndNMoreUpdatesAvailable": {
-        "one":"{} a 1 další aplikace mají aktualizace.",
+        "one": "{} a 1 další aplikace mají aktualizace.",
-        "other":"{} a {} další aplikace mají aktualizace."
+        "other": "{} a {} další aplikace mají aktualizace."
     },
     "xAndNMoreUpdatesInstalled": {
-        "one":"{} a {} další aplikace mají aktualizace.",
+        "one": "{} a {} další aplikace mají aktualizace.",
-        "další":"{} a {} další aplikace byly aktualizovány."
+        "další": "{} a {} další aplikace byly aktualizovány."
     },
     "xAndNMoreUpdatesPossiblyInstalled": {
-        "one":"{} a {} další aplikace byly možná aktualizovány",
+        "one": "{} a {} další aplikace byly možná aktualizovány",
-        "other":"{} a {} další aplikace mohly být aktualizovány."
+        "other": "{} a {} další aplikace mohly být aktualizovány."
     }
 }
-

assets/translations/de.json

@@ -242,9 +242,12 @@
     "appsPossiblyUpdated": "App Aktualisierungen wurden versucht",
     "appsPossiblyUpdatedNotifDescription": "Benachrichtigt den Benutzer, dass Updates für eine oder mehrere Apps möglicherweise im Hintergrund durchgeführt wurden",
     "xWasPossiblyUpdatedToY": "{} wurde möglicherweise aktualisiert auf {}.",
+    "enableBackgroundUpdates": "Aktiviere Hintergrundaktualisierungen",
     "backgroundUpdateReqsExplanation": "Die Hintergrundaktualisierung ist möglicherweise nicht für alle Apps möglich.",
     "backgroundUpdateLimitsExplanation": "Der Erfolg einer Hintergrundinstallation kann nur festgestellt werden, wenn Obtainium geöffnet wird.",
     "verifyLatestTag": "Überprüfe das „latest“ Tag",
+    "intermediateLinkRegex": "Filter für einen \"Zwischen\"-Link, der zuerst besucht werden soll",
+    "intermediateLinkNotFound": "Zwischenlink nicht gefunden",
     "exemptFromBackgroundUpdates": "Ausschluss von Hintergrundaktualisierungen (falls aktiviert)",
     "bgUpdatesOnWiFiOnly": "Hintergrundaktualisierungen deaktivieren, wenn kein WLAN vorhanden ist",
     "autoSelectHighestVersionCode": "Automatisch höchste APK-Code-Version auswählen",
@@ -260,6 +263,17 @@
     "debugMenu": "Debug Menü",
     "bgTaskStarted": "Hintergrundaufgabe gestartet – Logs prüfen.",
     "runBgCheckNow": "Hintergrundaktualisierungsprüfung jetzt durchführen",
+    "versionExtractWholePage": "Apply Version Extraction Regex to Entire Page",
+    "installing": "Installing",
+    "skipUpdateNotifications": "Skip update notifications",
+    "updatesAvailableNotifChannel": "Aktualisierungen verfügbar",
+    "appsUpdatedNotifChannel": "Apps aktualisiert",
+    "appsPossiblyUpdatedNotifChannel": "App Aktualisierungen wurden versucht",
+    "errorCheckingUpdatesNotifChannel": "Fehler beim Prüfen auf Aktualisierungen",
+    "appsRemovedNotifChannel": "Apps entfernt",
+    "downloadingXNotifChannel": "Lade {} herunter",
+    "completeAppInstallationNotifChannel": "App Installation abschließen",
+    "checkingForUpdatesNotifChannel": "Nach Aktualisierungen suchen",
     "removeAppQuestion": {
         "one": "App entfernen?",
         "other": "Apps entfernen?"
@@ -297,8 +311,8 @@
         "other": "{} Tage"
     },
     "clearedNLogsBeforeXAfterY": {
-        "one": "{n} Log gelöscht (vorher = {vorher}, nachher = {nachher})",
+        "one": "{n} Log gelöscht (vorher = {before}, nachher = {after})",
-        "other": "{n} Logs gelöscht (vorher = {vorher}, nachher = {nachher})"
+        "other": "{n} Logs gelöscht (vorher = {before}, nachher = {after})"
     },
     "xAndNMoreUpdatesAvailable": {
         "one": "{} und 1 weitere App haben Aktualisierungen.",

assets/translations/en.json

@@ -252,7 +252,7 @@
     "bgUpdatesOnWiFiOnly": "Disable background updates when not on WiFi",
     "autoSelectHighestVersionCode": "Auto-select highest versionCode APK",
     "versionExtractionRegEx": "Version Extraction RegEx",
-    "matchGroupToUse": "Match Group to Use",
+    "matchGroupToUse": "Match Group to Use for Version Extraction Regex",
     "highlightTouchTargets": "Highlight less obvious touch targets",
     "pickExportDir": "Pick Export Directory",
     "autoExportOnChanges": "Auto-export on changes",
@@ -263,6 +263,17 @@
     "debugMenu": "Debug Menu",
     "bgTaskStarted": "Background task started - check logs.",
     "runBgCheckNow": "Run Background Update Check Now",
+    "versionExtractWholePage": "Apply Version Extraction Regex to Entire Page",
+    "installing": "Installing",
+    "skipUpdateNotifications": "Skip update notifications",
+    "updatesAvailableNotifChannel": "Updates Available",
+    "appsUpdatedNotifChannel": "Apps Updated",
+    "appsPossiblyUpdatedNotifChannel": "App Updates Attempted",
+    "errorCheckingUpdatesNotifChannel": "Error Checking for Updates",
+    "appsRemovedNotifChannel": "Apps Removed",
+    "downloadingXNotifChannel": "Downloading {}",
+    "completeAppInstallationNotifChannel": "Complete App Installation",
+    "checkingForUpdatesNotifChannel": "Checking for Updates",
     "removeAppQuestion": {
         "one": "Remove App?",
         "other": "Remove Apps?"

assets/translations/es.json

@@ -242,9 +242,12 @@
     "appsPossiblyUpdated": "App Updates Attempted",
     "appsPossiblyUpdatedNotifDescription": "Notifies the user that updates to one or more Apps were potentially applied in the background",
     "xWasPossiblyUpdatedToY": "{} may have been updated to {}.",
+    "enableBackgroundUpdates": "Enable background updates",
     "backgroundUpdateReqsExplanation": "Background updates may not be possible for all apps.",
     "backgroundUpdateLimitsExplanation": "The success of a background install can only be determined when Obtainium is opened.",
     "verifyLatestTag": "Verify the 'latest' tag",
+    "intermediateLinkRegex": "Filter for an 'Intermediate' Link to Visit First",
+    "intermediateLinkNotFound": "Intermediate link not found",
     "exemptFromBackgroundUpdates": "Exempt from background updates (if enabled)",
     "bgUpdatesOnWiFiOnly": "Disable background updates when not on WiFi",
     "autoSelectHighestVersionCode": "Auto-select highest versionCode APK",
@@ -260,6 +263,17 @@
     "debugMenu": "Debug Menu",
     "bgTaskStarted": "Background task started - check logs.",
     "runBgCheckNow": "Run Background Update Check Now",
+    "versionExtractWholePage": "Apply Version Extraction Regex to Entire Page",
+    "installing": "Installing",
+    "skipUpdateNotifications": "Skip update notifications",
+    "updatesAvailableNotifChannel": "Actualizaciones Disponibles",
+    "appsUpdatedNotifChannel": "Aplicaciones Actualizadas",
+    "appsPossiblyUpdatedNotifChannel": "App Updates Attempted",
+    "errorCheckingUpdatesNotifChannel": "Error Buscando Actualizaciones",
+    "appsRemovedNotifChannel": "Aplicaciones Eliminadas",
+    "downloadingXNotifChannel": "Descargando {}",
+    "completeAppInstallationNotifChannel": "Instalación Completa de la Aplicación",
+    "checkingForUpdatesNotifChannel": "Buscando Actualizaciones",
     "removeAppQuestion": {
         "one": "¿Eliminar Aplicación?",
         "other": "¿Eliminar Aplicaciones?"

assets/translations/fa.json

@@ -242,9 +242,12 @@
     "appsPossiblyUpdated": "App Updates Attempted",
     "appsPossiblyUpdatedNotifDescription": "Notifies the user that updates to one or more Apps were potentially applied in the background",
     "xWasPossiblyUpdatedToY": "{} may have been updated to {}.",
+    "enableBackgroundUpdates": "Enable background updates",
     "backgroundUpdateReqsExplanation": "Background updates may not be possible for all apps.",
     "backgroundUpdateLimitsExplanation": "The success of a background install can only be determined when Obtainium is opened.",
     "verifyLatestTag": "Verify the 'latest' tag",
+    "intermediateLinkRegex": "Filter for an 'Intermediate' Link to Visit First",
+    "intermediateLinkNotFound": "Intermediate link not found",
     "exemptFromBackgroundUpdates": "Exempt from background updates (if enabled)",
     "bgUpdatesOnWiFiOnly": "Disable background updates when not on WiFi",
     "autoSelectHighestVersionCode": "Auto-select highest versionCode APK",
@@ -260,6 +263,17 @@
     "debugMenu": "Debug Menu",
     "bgTaskStarted": "Background task started - check logs.",
     "runBgCheckNow": "Run Background Update Check Now",
+    "versionExtractWholePage": "Apply Version Extraction Regex to Entire Page",
+    "installing": "Installing",
+    "skipUpdateNotifications": "Skip update notifications",
+    "updatesAvailableNotifChannel": "بروزرسانی در دسترس ",
+    "appsUpdatedNotifChannel": "برنامه ها به روز شدند",
+    "appsPossiblyUpdatedNotifChannel": "App Updates Attempted",
+    "errorCheckingUpdatesNotifChannel": "خطا در بررسی به‌روزرسانی‌ها",
+    "appsRemovedNotifChannel": "برنامه ها حذف شدند",
+    "downloadingXNotifChannel": "در حال دانلود {}",
+    "completeAppInstallationNotifChannel": "نصب کامل برنامه",
+    "checkingForUpdatesNotifChannel": "بررسی به‌روزرسانی‌ها",
     "removeAppQuestion": {
         "one": "برنامه حذف شود؟",
         "other": "برنامه ها حذف شوند؟"

assets/translations/fr.json

@@ -242,9 +242,12 @@
     "appsPossiblyUpdated": "App Updates Attempted",
     "appsPossiblyUpdatedNotifDescription": "Notifies the user that updates to one or more Apps were potentially applied in the background",
     "xWasPossiblyUpdatedToY": "{} may have been updated to {}.",
+    "enableBackgroundUpdates": "Enable background updates",
     "backgroundUpdateReqsExplanation": "Background updates may not be possible for all apps.",
     "backgroundUpdateLimitsExplanation": "The success of a background install can only be determined when Obtainium is opened.",
     "verifyLatestTag": "Verify the 'latest' tag",
+    "intermediateLinkRegex": "Filter for an 'Intermediate' Link to Visit First",
+    "intermediateLinkNotFound": "Intermediate link not found",
     "exemptFromBackgroundUpdates": "Exempt from background updates (if enabled)",
     "bgUpdatesOnWiFiOnly": "Disable background updates when not on WiFi",
     "autoSelectHighestVersionCode": "Auto-select highest versionCode APK",
@@ -260,6 +263,17 @@
     "debugMenu": "Debug Menu",
     "bgTaskStarted": "Background task started - check logs.",
     "runBgCheckNow": "Run Background Update Check Now",
+    "versionExtractWholePage": "Apply Version Extraction Regex to Entire Page",
+    "installing": "Installing",
+    "skipUpdateNotifications": "Skip update notifications",
+    "updatesAvailableNotifChannel": "Mises à jour disponibles",
+    "appsUpdatedNotifChannel": "Applications mises à jour",
+    "appsPossiblyUpdatedNotifChannel": "App Updates Attempted",
+    "errorCheckingUpdatesNotifChannel": "Erreur lors de la vérification des mises à jour",
+    "appsRemovedNotifChannel": "Applications supprimées",
+    "downloadingXNotifChannel": "Téléchargement {}",
+    "completeAppInstallationNotifChannel": "Installation complète de l'application",
+    "checkingForUpdatesNotifChannel": "Vérification des mises à jour",
     "removeAppQuestion": {
         "one": "Supprimer l'application ?",
         "other": "Supprimer les applications ?"

assets/translations/hu.json

@@ -194,6 +194,7 @@
     "categories": "Kategóriák",
     "category": "Kategória",
     "noCategory": "Nincs kategória",
+    "noCategories": "No Categories",
     "deleteCategoryQuestion": "Törli a kategóriát?",
     "categoryDeleteWarning": "A(z) {} összes app kategorizálatlan állapotba kerül.",
     "addCategory": "Új kategória",
@@ -244,6 +245,8 @@
     "backgroundUpdateReqsExplanation": "Előfordulhat, hogy nem minden appnál lehetséges a háttérbeli frissítés.",
     "backgroundUpdateLimitsExplanation": "A háttérben történő telepítés sikeressége csak az Obtainium megnyitásakor állapítható meg.",
     "verifyLatestTag": "Ellenőrizze a „legújabb” címkét",
+    "intermediateLinkRegex": "Filter for an 'Intermediate' Link to Visit First",
+    "intermediateLinkNotFound": "Intermediate link not found",
     "exemptFromBackgroundUpdates": "Mentes a háttérben történő frissítések alól (ha engedélyezett)",
     "bgUpdatesOnWiFiOnly": "Tiltsa le a háttérben frissítéseket, ha nincs Wi-Fi-n",
     "autoSelectHighestVersionCode": "A legmagasabb verziószámú APK auto. kiválasztása",
@@ -260,6 +263,17 @@
     "bgTaskStarted": "A háttérfeladat elindult – ellenőrizze a naplókat.",
     "enableBackgroundUpdates": "Frissítések a háttérben",
     "runBgCheckNow": "Futtassa a Háttérben frissítés ellenőrzését most",
+    "versionExtractWholePage": "Apply Version Extraction Regex to Entire Page",
+    "installing": "Installing",
+    "skipUpdateNotifications": "Skip update notifications",
+    "updatesAvailableNotifChannel": "Frissítések érhetők el",
+    "appsUpdatedNotifChannel": "Alkalmazások frissítve",
+    "appsPossiblyUpdatedNotifChannel": "App frissítési kísérlet",
+    "errorCheckingUpdatesNotifChannel": "Hiba a frissítések keresésekor",
+    "appsRemovedNotifChannel": "Alkalmazások eltávolítva",
+    "downloadingXNotifChannel": "{} letöltés",
+    "completeAppInstallationNotifChannel": "Teljes app telepítés",
+    "checkingForUpdatesNotifChannel": "Frissítések keresése",
     "removeAppQuestion": {
         "one": "Eltávolítja az alkalmazást?",
         "other": "Eltávolítja az alkalmazást?"

assets/translations/it.json

@@ -242,9 +242,12 @@
     "appsPossiblyUpdated": "App Updates Attempted",
     "appsPossiblyUpdatedNotifDescription": "Notifies the user that updates to one or more Apps were potentially applied in the background",
     "xWasPossiblyUpdatedToY": "{} may have been updated to {}.",
+    "enableBackgroundUpdates": "Enable background updates",
     "backgroundUpdateReqsExplanation": "Background updates may not be possible for all apps.",
     "backgroundUpdateLimitsExplanation": "The success of a background install can only be determined when Obtainium is opened.",
     "verifyLatestTag": "Verify the 'latest' tag",
+    "intermediateLinkRegex": "Filter for an 'Intermediate' Link to Visit First",
+    "intermediateLinkNotFound": "Intermediate link not found",
     "exemptFromBackgroundUpdates": "Exempt from background updates (if enabled)",
     "bgUpdatesOnWiFiOnly": "Disable background updates when not on WiFi",
     "autoSelectHighestVersionCode": "Auto-select highest versionCode APK",
@@ -260,6 +263,17 @@
     "debugMenu": "Debug Menu",
     "bgTaskStarted": "Background task started - check logs.",
     "runBgCheckNow": "Run Background Update Check Now",
+    "versionExtractWholePage": "Apply Version Extraction Regex to Entire Page",
+    "installing": "Installing",
+    "skipUpdateNotifications": "Skip update notifications",
+    "updatesAvailableNotifChannel": "Aggiornamenti disponibili",
+    "appsUpdatedNotifChannel": "App aggiornate",
+    "appsPossiblyUpdatedNotifChannel": "App Updates Attempted",
+    "errorCheckingUpdatesNotifChannel": "Controllo degli errori per gli aggiornamenti",
+    "appsRemovedNotifChannel": "App rimosse",
+    "downloadingXNotifChannel": "Scaricamento di {} in corso",
+    "completeAppInstallationNotifChannel": "Completa l'installazione dell'app",
+    "checkingForUpdatesNotifChannel": "Controllo degli aggiornamenti in corso",
     "removeAppQuestion": {
         "one": "Rimuovere l'app?",
         "other": "Rimuovere le app?"

assets/translations/ja.json

@@ -263,6 +263,17 @@
     "debugMenu": "Debug Menu",
     "bgTaskStarted": "Background task started - check logs.",
     "runBgCheckNow": "Run Background Update Check Now",
+    "versionExtractWholePage": "Apply Version Extraction Regex to Entire Page",
+    "installing": "Installing",
+    "skipUpdateNotifications": "Skip update notifications",
+    "updatesAvailableNotifChannel": "アップデートが利用可能",
+    "appsUpdatedNotifChannel": "アプリをアップデートしました",
+    "appsPossiblyUpdatedNotifChannel": "アプリのアップデートを試行",
+    "errorCheckingUpdatesNotifChannel": "アップデート確認中のエラー",
+    "appsRemovedNotifChannel": "削除されたアプリ",
+    "downloadingXNotifChannel": "{} をダウンロード中",
+    "completeAppInstallationNotifChannel": "アプリのインストールを完了する",
+    "checkingForUpdatesNotifChannel": "アップデートを確認中",
     "removeAppQuestion": {
         "one": "アプリを削除しますか？",
         "other": "アプリを削除しますか？"

assets/translations/pl.json

@@ -1,14 +1,4 @@
 {
-    "noDescription": "Brak opisu",
-    "no": "Nie",
-    "okay": "Okej",
-    "appId": "ID aplikacji",
-    "bgUpdateGotErrorRetryInMinutes": {
-        "one": "Sprawdzanie aktualizacji w tle napotkało {}, zaplanuje ponowne sprawdzenie za {} minutę",
-        "few": "Sprawdzanie aktualizacji w tle napotkało {}, zaplanuje ponowne sprawdzenie za {} minuty",
-        "many": "Sprawdzanie aktualizacji w tle napotkało {}, zaplanuje ponowne sprawdzenie za {} minut",
-        "other": "Sprawdzanie aktualizacji w tle napotkało {}, zaplanuje ponowne sprawdzenie za {} minuty"
-    },
     "invalidURLForSource": "Nieprawidłowy adres URL aplikacji {}",
     "noReleaseFound": "Nie można znaleźć odpowiedniego wydania",
     "noVersionFound": "Nie można określić wersji wydania",
@@ -26,6 +16,7 @@
     "fallbackToOlderReleases": "Powracaj do starszych wersji",
     "filterReleaseTitlesByRegEx": "Filtruj tytuły wydań wg. wyrażeń regularnych",
     "invalidRegEx": "Nieprawidłowe wyrażenie regularne",
+    "noDescription": "Brak opisu",
     "cancel": "Anuluj",
     "continue": "Kontynuuj",
     "requiredInBrackets": "(Wymagane)",
@@ -75,6 +66,7 @@
     "installUpdateApps": "Instaluj/aktualizuj aplikacje",
     "installUpdateSelectedApps": "Zainstaluj/zaktualizuj wybrane aplikacje",
     "markXSelectedAppsAsUpdated": "Oznaczyć {} wybranych aplikacji jako zaktualizowane?",
+    "no": "Nie",
     "yes": "Tak",
     "markSelectedAppsUpdated": "Oznacz wybrane aplikacje jako zaktualizowane",
     "pinToTop": "Przypnij",
@@ -111,6 +103,7 @@
     "importErrors": "Błędy importowania",
     "importedXOfYApps": "Zaimportowano {} z {} aplikacji.",
     "followingURLsHadErrors": "Następujące adresy URL zawierały błędy:",
+    "okay": "Okej",
     "selectURL": "Wybierz adres URL",
     "selectURLs": "Wybierz adresy URL",
     "pick": "Wybierz",
@@ -179,6 +172,7 @@
     "yesMarkUpdated": "Tak, oznacz jako zaktualizowane",
     "fdroid": "Oficjalny F-Droid",
     "appIdOrName": "ID aplikacji lub nazwa",
+    "appId": "ID aplikacji",
     "appWithIdOrNameNotFound": "Nie znaleziono aplikacji o tym identyfikatorze lub nazwie",
     "reposHaveMultipleApps": "Repozytoria mogą zawierać wiele aplikacji",
     "fdroidThirdPartyRepo": "Zewnętrzne repo F-Droid",
@@ -245,12 +239,15 @@
     "sortByFileNamesNotLinks": "Sortuj wg nazw plików zamiast pełnych linków",
     "filterReleaseNotesByRegEx": "Filtruj informacje o wersji według wyrażenia regularnego",
     "customLinkFilterRegex": "Filtruj linki APK według wyrażenia regularnego (domyślnie \".apk$\")",
-    "appsPossiblyUpdated": "Informuj o próbach aktualizacji",
+    "appsPossiblyUpdated": "Próbowano zaktualizować aplikację",
     "appsPossiblyUpdatedNotifDescription": "Powiadamiaj o potencjalnym zastosowaniu w tle aktualizacji jednej lub większej ilości aplikacji",
     "xWasPossiblyUpdatedToY": "{} być może zaktualizowano do {}.",
+    "enableBackgroundUpdates": "Włącz aktualizacje w tle",
     "backgroundUpdateReqsExplanation": "Aktualizacje w tle mogą nie być możliwe dla wszystkich aplikacji.",
     "backgroundUpdateLimitsExplanation": "Powodzenie instalacji w tle można określić dopiero po otwarciu Obtainium.",
     "verifyLatestTag": "Zweryfikuj najnowszy tag",
+    "intermediateLinkRegex": "Filtr linków \"pośrednich\" do odwiedzenia w pierwszej kolejności",
+    "intermediateLinkNotFound": "Nie znaleziono linku pośredniego",
     "exemptFromBackgroundUpdates": "Wyklucz z uaktualnień w tle (jeśli są włączone)",
     "bgUpdatesOnWiFiOnly": "Wyłącz aktualizacje w tle, gdy nie ma połączenia z Wi-Fi",
     "autoSelectHighestVersionCode": "Automatycznie wybierz najwyższy kod wersji APK",
@@ -266,6 +263,17 @@
     "debugMenu": "Menu debugowania",
     "bgTaskStarted": "Uruchomiono zadanie w tle - sprawdź logi.",
     "runBgCheckNow": "Wymuś sprawdzenie aktualizacji w tle",
+    "versionExtractWholePage": "Apply Version Extraction Regex to Entire Page",
+    "installing": "Installing",
+    "skipUpdateNotifications": "Skip update notifications",
+    "updatesAvailableNotifChannel": "Dostępne aktualizacje",
+    "appsUpdatedNotifChannel": "Zaktualizowane aplikacje",
+    "appsPossiblyUpdatedNotifChannel": "Informuj o próbach aktualizacji",
+    "errorCheckingUpdatesNotifChannel": "Sprawdzanie błędów aktualizacji",
+    "appsRemovedNotifChannel": "Usunięte aplikacje",
+    "downloadingXNotifChannel": "Pobieranie {}",
+    "completeAppInstallationNotifChannel": "Ukończenie instalacji aplikacji",
+    "checkingForUpdatesNotifChannel": "Sprawdzanie aktualizacji",
     "removeAppQuestion": {
         "one": "Usunąć aplikację?",
         "few": "Usunąć aplikacje?",
@@ -278,6 +286,12 @@
         "many": "Zbyt wiele żądań (ograniczona częstotliwość) - spróbuj ponownie za {} minut",
         "other": "Zbyt wiele żądań (ograniczona częstotliwość) - spróbuj ponownie za {} minuty"
     },
+    "bgUpdateGotErrorRetryInMinutes": {
+        "one": "Sprawdzanie aktualizacji w tle napotkało {}, zaplanuje ponowne sprawdzenie za {} minutę",
+        "few": "Sprawdzanie aktualizacji w tle napotkało {}, zaplanuje ponowne sprawdzenie za {} minuty",
+        "many": "Sprawdzanie aktualizacji w tle napotkało {}, zaplanuje ponowne sprawdzenie za {} minut",
+        "other": "Sprawdzanie aktualizacji w tle napotkało {}, zaplanuje ponowne sprawdzenie za {} minuty"
+    },
     "bgCheckFoundUpdatesWillNotifyIfNeeded": {
         "one": "W tle znaleziono {} aktualizację - w razie potrzeby użytkownik zostanie o tym powiadomiony",
         "few": "W tle znaleziono {} aktualizacje - w razie potrzeby użytkownik zostanie o tym powiadomiony",
@@ -337,8 +351,5 @@
         "few": "{} i {} inne apki mogły zostać zaktualizowane.",
         "many": "{} i {} innych apek mogło zostać zaktualizowanych.",
         "other": "{} i {} inne apki mogły zostać zaktualizowane."
-    },
+    }
-    "enableBackgroundUpdates": "Włącz aktualizacje w tle",
-    "intermediateLinkRegex": "Filtr linków \"pośrednich\" do odwiedzenia w pierwszej kolejności",
-    "intermediateLinkNotFound": "Nie znaleziono linku pośredniego"
 }

assets/translations/pt.json

@@ -263,6 +263,17 @@
     "debugMenu": "Menu Debug",
     "bgTaskStarted": "Tarefa em segundo plano iniciada - verifique os logs.",
     "runBgCheckNow": "Execute a verificação de atualização em segundo plano agora",
+    "versionExtractWholePage": "Apply Version Extraction Regex to Entire Page",
+    "installing": "Installing",
+    "skipUpdateNotifications": "Skip update notifications",
+    "updatesAvailableNotifChannel": "Atualizações Disponíveis",
+    "appsUpdatedNotifChannel": "Apps Atualizados",
+    "appsPossiblyUpdatedNotifChannel": "Tentativas de atualização de Apps",
+    "errorCheckingUpdatesNotifChannel": "Erro ao Procurar por Atualizações",
+    "appsRemovedNotifChannel": "Apps Removidos",
+    "downloadingXNotifChannel": "Baixando {}",
+    "completeAppInstallationNotifChannel": "Instalação completa do App",
+    "checkingForUpdatesNotifChannel": "Checando por Atualizações",
     "removeAppQuestion": {
         "one": "Remover App?",
         "other": "Remover Apps?"

assets/translations/ru.json

@@ -263,6 +263,17 @@
     "debugMenu": "Меню Отладки",
     "bgTaskStarted": "Фоновая задача начата - проверьте журналы.",
     "runBgCheckNow": "Запустить проверку фонового обновления сейчас",
+    "versionExtractWholePage": "Apply Version Extraction Regex to Entire Page",
+    "installing": "Installing",
+    "skipUpdateNotifications": "Skip update notifications",
+    "updatesAvailableNotifChannel": "Доступны обновления",
+    "appsUpdatedNotifChannel": "Приложения обновлены",
+    "appsPossiblyUpdatedNotifChannel": "Попытки обновления приложений",
+    "errorCheckingUpdatesNotifChannel": "Ошибка при проверке обновлений",
+    "appsRemovedNotifChannel": "Приложение удалено",
+    "downloadingXNotifChannel": "Загрузка {}",
+    "completeAppInstallationNotifChannel": "Завершение установки приложения",
+    "checkingForUpdatesNotifChannel": "Проверка обновлений",
     "removeAppQuestion": {
         "one": "Удалить приложение?",
         "other": "Удалить приложения?"

assets/translations/zh.json

@@ -263,6 +263,17 @@
     "debugMenu": "调试选项",
     "bgTaskStarted": "后台任务已启动 - 详见日志",
     "runBgCheckNow": "立即进行后台更新检查",
+    "versionExtractWholePage": "Apply Version Extraction Regex to Entire Page",
+    "installing": "Installing",
+    "skipUpdateNotifications": "Skip update notifications",
+    "updatesAvailableNotifChannel": "更新可用",
+    "appsUpdatedNotifChannel": "应用已更新",
+    "appsPossiblyUpdatedNotifChannel": "已尝试更新应用",
+    "errorCheckingUpdatesNotifChannel": "检查更新出错",
+    "appsRemovedNotifChannel": "应用已删除",
+    "downloadingXNotifChannel": "正在下载{}",
+    "completeAppInstallationNotifChannel": "完成应用安装",
+    "checkingForUpdatesNotifChannel": "正在检查更新",
     "removeAppQuestion": {
         "one": "是否删除应用？",
         "other": "是否删除应用？"

lib/app_sources/fdroid.dart

@@ -11,6 +11,7 @@ class FDroid extends AppSource {
   FDroid() {
     host = 'f-droid.org';
     name = tr('fdroid');
+    naiveStandardVersionDetection = true;
     canSearch = true;
     additionalSourceAppSpecificSettingFormItems = [
       [

lib/app_sources/html.dart

@@ -22,7 +22,7 @@ String ensureAbsoluteUrl(String ambiguousUrl, Uri referenceAbsoluteUrl) {
   } else if (ambiguousUrl.split('/').where((e) => e.isNotEmpty).length == 1) {
     return '${referenceAbsoluteUrl.origin}/${currPathSegments.join('/')}/$ambiguousUrl';
   } else {
-    return '${referenceAbsoluteUrl.origin}/${currPathSegments.sublist(0, currPathSegments.length - 1).join('/')}/$ambiguousUrl';
+    return '${referenceAbsoluteUrl.origin}/${currPathSegments.sublist(0, currPathSegments.length - (currPathSegments.last.contains('.') ? 1 : 0)).join('/')}/$ambiguousUrl';
   }
 }
 
@@ -117,6 +117,8 @@ class HTML extends AppSource {
             label: tr('versionExtractionRegEx'),
             required: false,
             additionalValidators: [(value) => regExValidator(value)]),
+      ],
+      [
         GeneratedFormTextField('matchGroupToUse',
             label: tr('matchGroupToUse'),
             required: false,
@@ -131,6 +133,10 @@ class HTML extends AppSource {
                 return intValidator(value);
               }
             ])
+      ],
+      [
+        GeneratedFormSwitch('versionExtractWholePage',
+            label: tr('versionExtractWholePage'))
       ]
     ];
     overrideVersionDetectionFormDefault('noVersionDetection',
@@ -212,7 +218,8 @@ class HTML extends AppSource {
       var versionExtractionRegEx =
           additionalSettings['versionExtractionRegEx'] as String?;
       if (versionExtractionRegEx?.isNotEmpty == true) {
-        var match = RegExp(versionExtractionRegEx!).allMatches(rel);
+        var match = RegExp(versionExtractionRegEx!).allMatches(
+            res.body.split('\r\n').join('\n').split('\n').join('\\n'));
         if (match.isEmpty) {
           throw NoVersionError();
         }

lib/app_sources/uptodown.dart

@@ -35,7 +35,7 @@ class Uptodown extends AppSource {
     var html = parse(res.body);
     String? version = html.querySelector('div.version')?.innerHtml;
     String? apkUrl =
-        html.querySelector('#detail-download-button')?.attributes['data-url'];
+        '${standardUrl.split('/').reversed.toList().sublist(1).reversed.join('/')}/post-download';
     String? name = html.querySelector('#detail-app-name')?.innerHtml.trim();
     String? author = html.querySelector('#author-link')?.innerHtml.trim();
     var detailElements = html.querySelectorAll('#technical-information td');

lib/app_sources/whatsapp.dart

@@ -16,14 +16,13 @@ class WhatsApp extends AppSource {
   @override
   Future<String> apkUrlPrefetchModifier(
       String apkUrl, String standardUrl) async {
-    Response res = await sourceRequest('https://www.whatsapp.com/android');
+    Response res = await sourceRequest('$standardUrl/android');
     if (res.statusCode == 200) {
       var targetLinks = parse(res.body)
           .querySelectorAll('a')
           .map((e) => e.attributes['href'] ?? '')
           .where((e) => e.isNotEmpty)
-          .where((e) =>
+          .where((e) => e.contains('WhatsApp.apk'))
-              e.contains('content.whatsapp.net') && e.contains('WhatsApp.apk'))
           .toList();
       if (targetLinks.isEmpty) {
         throw NoAPKError();
@@ -39,37 +38,16 @@ class WhatsApp extends AppSource {
     String standardUrl,
     Map<String, dynamic> additionalSettings,
   ) async {
-    Response res = await sourceRequest('https://www.whatsapp.com/android');
+    // This is a CDN link that is consistent per version
-    if (res.statusCode == 200) {
+    // But it has query params that change constantly
-      var targetElements = parse(res.body)
+    Uri apkUri =
-          .querySelectorAll('p')
+        Uri.parse(await apkUrlPrefetchModifier(standardUrl, standardUrl));
-          .where((element) => element.innerHtml.contains('Version '))
+    var unusableApkUrl = '${apkUri.origin}/${apkUri.path}';
-          .toList();
+    // So we use the param-less URL is a pseudo-version to add the app and check for updates
-      if (targetElements.isEmpty) {
+    // See #357 for why we can't scrape the version number directly
-        throw NoVersionError();
+    // But we re-fetch the URL again with its latest query params at the actual download time
-      }
+    String version = unusableApkUrl.hashCode.toString();
-      var vLines = targetElements[0]
+    return APKDetails(version, getApkUrlsFromUrls([unusableApkUrl]),
-          .innerHtml
-          .split('\n')
-          .where((element) => element.contains('Version '))
-          .toList();
-      if (vLines.isEmpty) {
-        throw NoVersionError();
-      }
-      var versionMatch = RegExp('[0-9]+(\\.[0-9]+)+').firstMatch(vLines[0]);
-      if (versionMatch == null) {
-        throw NoVersionError();
-      }
-      String version =
-          vLines[0].substring(versionMatch.start, versionMatch.end);
-      return APKDetails(
-          version,
-          getApkUrlsFromUrls([
-            'https://www.whatsapp.com/android?v=$version&=thisIsaPlaceholder&a=realURLPrefetchedAtDownloadTime'
-          ]),
         AppNames('Meta', 'WhatsApp'));
-    } else {
-      throw getObtainiumHttpError(res);
-    }
   }
 }

lib/custom_errors.dart

@@ -1,3 +1,5 @@
+import 'dart:io';
+
 import 'package:android_package_installer/android_package_installer.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
@@ -72,6 +74,9 @@ class MultiAppMultiError extends ObtainiumError {
   MultiAppMultiError() : super(tr('placeholder'), unexpected: true);
 
   add(String appId, dynamic error, {String? appName}) {
+    if (error is SocketException) {
+      error = error.message;
+    }
     rawErrors[appId] = error;
     var string = error.toString();
     var tempIds = idsByErrorString.remove(string);
@@ -83,12 +88,17 @@ class MultiAppMultiError extends ObtainiumError {
     }
   }
 
-  String errorString(String appId) =>
+  String errorString(String appId, {bool includeIdsWithNames = false}) =>
-      '${appIdNames.containsKey(appId) ? '${appIdNames[appId]} ($appId)' : appId}: ${rawErrors[appId].toString()}';
+      '${appIdNames.containsKey(appId) ? '${appIdNames[appId]}${includeIdsWithNames ? ' ($appId)' : ''}' : appId}: ${rawErrors[appId].toString()}';
+
+  String errorsAppsString(String errString, List<String> appIds,
+          {bool includeIdsWithNames = false}) =>
+      '$errString [${list2FriendlyString(appIds.map((id) => appIdNames.containsKey(id) == true ? '${appIdNames[id]}${includeIdsWithNames ? ' ($id)' : ''}' : id).toList())}]';
 
   @override
-  String toString() =>
+  String toString() => idsByErrorString.entries
-      idsByErrorString.keys.map((e) => errorString(e)).join('\n\n');
+      .map((e) => errorsAppsString(e.key, e.value))
+      .join('\n\n');
 }
 
 showError(dynamic e, BuildContext context) {

lib/main.dart

@@ -19,7 +19,7 @@ import 'package:easy_localization/src/easy_localization_controller.dart';
 // ignore: implementation_imports
 import 'package:easy_localization/src/localization.dart';
 
-const String currentVersion = '0.14.23';
+const String currentVersion = '0.14.27';
 const String currentReleaseTag =
     'v$currentVersion-beta'; // KEEP THIS IN SYNC WITH GITHUB RELEASES
 

lib/pages/apps.dart

@@ -566,7 +566,7 @@ class AppsPageState extends State<AppsPage> {
                                 .toInt()
                                 .toString()
                           ])
-                        : tr('pleaseWait'),
+                        : tr('installing'),
                     textAlign: (listedApps[index].downloadProgress! >= 0)
                         ? TextAlign.start
                         : TextAlign.end,

lib/providers/apps_provider.dart

@@ -263,12 +263,13 @@ class AppsProvider with ChangeNotifier {
     return downloadedFile;
   }
 
-  Future<File> handleAPKIDChange(App app, PackageInfo newInfo,
+  Future<File> handleAPKIDChange(App app, PackageInfo? newInfo,
       File downloadedFile, String downloadUrl) async {
     // If the APK package ID is different from the App ID, it is either new (using a placeholder ID) or the ID has changed
     // The former case should be handled (give the App its real ID), the latter is a security issue
-    if (app.id != newInfo.packageName) {
     var isTempId = SourceProvider().isTempId(app);
+    if (newInfo != null) {
+      if (app.id != newInfo.packageName) {
         if (apps[app.id] != null && !isTempId && !app.allowIdChange) {
           throw IDChangedError(newInfo.packageName!);
         }
@@ -283,6 +284,9 @@ class AppsProvider with ChangeNotifier {
           await saveApps([app], onlyIfExists: !isTempId && !idChangeWasAllowed);
         }
       }
+    } else if (isTempId) {
+      throw ObtainiumError('Could not get ID from APK');
+    }
     return downloadedFile;
   }
 
@@ -344,7 +348,7 @@ class AppsProvider with ChangeNotifier {
             await pm.getPackageArchiveInfo(archiveFilePath: apks.first.path);
       }
       downloadedFile =
-          await handleAPKIDChange(app, newInfo!, downloadedFile, downloadUrl);
+          await handleAPKIDChange(app, newInfo, downloadedFile, downloadUrl);
       // Delete older versions of the file if any
       for (var file in downloadedFile.parent.listSync()) {
         var fn = file.path.split('/').last;
@@ -1136,7 +1140,6 @@ class AppsProvider with ChangeNotifier {
         return null;
       }
       if (exportDir == null) {
-        logs.add('Skipping auto-export as dir is not set.');
         return null;
       }
       var files = await saf
@@ -1369,116 +1372,130 @@ Future<void> bgUpdateCheck(int taskId, Map<String, dynamic>? params) async {
         (<List<MapEntry<String, int>>>[]))
   ];
 
-  bool installMode = toCheck.isEmpty &&
-      toInstall.isNotEmpty; // Task is either in update mode or install mode
-
-  logs.add(
-      'BG ${installMode ? 'install' : 'update'} task $taskId: Started (${installMode ? toInstall.length : toCheck.length}).');
-
-  if (!installMode) {
-    // If in update mode, we check for updates.
-    // We divide the results into 4 groups:
-    // - toNotify - Apps with updates that the user will be notified about (can't be silently installed)
-    // - toRetry - Apps with update check errors that will be retried in a while
-    // - toThrow - Apps with update check errors that the user will be notified about (no retry)
-    // - toInstall - Apps with updates that will be installed silently
-    // After grouping the updates, we take care of toNotify and toThrow first
-    // Then if toRetry is not empty, we schedule another update task to run in a while (toInstall is retained)
-    // If toRetry is empty, we take care of toInstall
-
-    // Init. vars.
-    List<App> updates = [];
-    List<App> toNotify = [];
-    List<MapEntry<String, int>> toRetry = [];
-    var retryAfterXSeconds = 0;
-    List<String> toThrow = [];
-    var networkRestricted = false;
-    if (appsProvider.settingsProvider.bgUpdatesOnWiFiOnly) {
   var netResult = await (Connectivity().checkConnectivity());
-      networkRestricted = (netResult != ConnectivityResult.wifi) &&
-          (netResult != ConnectivityResult.ethernet);
-    }
-    MultiAppMultiError? errors;
-    CheckingUpdatesNotification notif =
-        CheckingUpdatesNotification(plural('apps', toCheck.length));
 
-    try {
+  if (netResult == ConnectivityResult.none) {
-      // Check for updates
+    var networkBasedRetryInterval = 15;
-      notificationsProvider.notify(notif, cancelExisting: true);
+    var nextRegularCheck = appsProvider.settingsProvider.lastBGCheckTime
-      updates = await appsProvider.checkUpdates(
+        .add(Duration(minutes: appsProvider.settingsProvider.updateInterval));
-          specificIds: toCheck.map((e) => e.key).toList());
+    var potentialNetworkRetryCheck =
-    } catch (e) {
+        DateTime.now().add(Duration(minutes: networkBasedRetryInterval));
-      // If there were errors, group them into toRetry and toThrow
+    var shouldRetry = potentialNetworkRetryCheck.isBefore(nextRegularCheck);
-      if (e is Map) {
-        updates = e['updates'];
-        errors = e['errors'];
-        errors!.rawErrors.forEach((key, err) {
     logs.add(
-              'BG update task $taskId: Got error on checking for $key \'${err.toString()}\'.');
+        'BG update task $taskId: No network. Will ${shouldRetry ? 'retry in $networkBasedRetryInterval minutes' : 'not retry'}.');
-          var toCheckApp = toCheck.where((element) => element.key == key).first;
-          if (toCheckApp.value < maxAttempts) {
-            toRetry.add(MapEntry(toCheckApp.key, toCheckApp.value + 1));
-            var minRetryIntervalForThisApp = err is RateLimitError
-                ? (err.remainingMinutes * 60)
-                : e is ClientException
-                    ? (15 * 60)
-                    : pow(toCheckApp.value + 1, 2).toInt();
-            if (minRetryIntervalForThisApp > retryAfterXSeconds) {
-              retryAfterXSeconds = minRetryIntervalForThisApp;
-            }
-          } else {
-            toThrow.add(key);
-          }
-        });
-      } else {
-        // We don't expect to ever get here in any situation so no need to catch
-        logs.add('Fatal error in BG update task: ${e.toString()}');
-        rethrow;
-      }
-    } finally {
-      notificationsProvider.cancel(notif.id);
-    }
-
-    // Group the updates into toNotify and toInstall
-    for (var i = 0; i < updates.length; i++) {
-      if (networkRestricted ||
-          !(await appsProvider.canInstallSilently(updates[i]))) {
-        toNotify.add(updates[i]);
-      } else {
-        toInstall.add(MapEntry(updates[i].id, 0));
-      }
-    }
-
-    // Send the update notification
-    if (toNotify.isNotEmpty) {
-      notificationsProvider.notify(UpdateNotification(toNotify));
-    }
-
-    // Send the error notifications
-    if (toThrow.isNotEmpty) {
-      for (var appId in toThrow) {
-        notificationsProvider.notify(ErrorCheckingUpdatesNotification(
-            errors!.errorString(appId),
-            id: Random().nextInt(10000)));
-      }
-    }
-
-    // if there are update checks to retry, schedule a retry task
-    if (toRetry.isNotEmpty) {
-      logs.add(
-          'BG update task $taskId: Will retry in $retryAfterXSeconds seconds.');
     AndroidAlarmManager.oneShot(
-          Duration(seconds: retryAfterXSeconds), taskId + 1, bgUpdateCheck,
+        const Duration(minutes: 15), taskId + 1, bgUpdateCheck,
         params: {
-            'toCheck': toRetry
+          'toCheck': toCheck
               .map((entry) => {'key': entry.key, 'value': entry.value})
               .toList(),
           'toInstall': toInstall
               .map((entry) => {'key': entry.key, 'value': entry.value})
               .toList(),
         });
-    } else if (toInstall.isNotEmpty) {
+    return;
-      // If there are no more update checks, schedule an install task
+  }
+
+  var networkRestricted = false;
+  if (appsProvider.settingsProvider.bgUpdatesOnWiFiOnly) {
+    networkRestricted = (netResult != ConnectivityResult.wifi) &&
+        (netResult != ConnectivityResult.ethernet);
+  }
+
+  bool installMode =
+      toCheck.isEmpty; // Task is either in update mode or install mode
+
+  // In install mode, grab all available silent updates unless explicitly told otherwise
+  if (installMode && toInstall.isEmpty && !networkRestricted) {
+    var temp = appsProvider.findExistingUpdates(installedOnly: true);
+    for (var i = 0; i < temp.length; i++) {
+      if (await appsProvider
+          .canInstallSilently(appsProvider.apps[temp[i]]!.app)) {
+        toInstall.add(MapEntry(temp[i], 0));
+      }
+    }
+  }
+
+  logs.add(
+      'BG ${installMode ? 'install' : 'update'} task $taskId: Started (${installMode ? toInstall.length : toCheck.length}).');
+
+  if (!installMode) {
+    // If in update mode...
+    var didCompleteChecking = false;
+    CheckingUpdatesNotification? notif;
+    // Loop through all updates and check each
+    List<App> toNotify = [];
+    try {
+      for (int i = 0; i < toCheck.length; i++) {
+        var appId = toCheck[i].key;
+        var attemptCount = toCheck[i].value + 1;
+        AppInMemory? app = appsProvider.apps[appId];
+        if (app?.app.installedVersion != null) {
+          try {
+            notificationsProvider.notify(
+                notif = CheckingUpdatesNotification(app?.name ?? appId),
+                cancelExisting: true);
+            App? newApp = await appsProvider.checkUpdate(appId);
+            if (newApp != null) {
+              if (networkRestricted ||
+                  !(await appsProvider.canInstallSilently(app!.app))) {
+                if (newApp.additionalSettings['skipUpdateNotifications'] !=
+                    true) {
+                  toNotify.add(newApp);
+                }
+              }
+            }
+            if (i == (toCheck.length - 1)) {
+              didCompleteChecking = true;
+            }
+          } catch (e) {
+            // If you got an error, move the offender to the back of the line (increment their fail count) and schedule another task to continue checking shortly
+            logs.add(
+                'BG update task $taskId: Got error on checking for $appId \'${e.toString()}\'.');
+            if (attemptCount < maxAttempts) {
+              var remainingSeconds = e is RateLimitError
+                  ? (i == 0 ? (e.remainingMinutes * 60) : (5 * 60))
+                  : e is ClientException
+                      ? (15 * 60)
+                      : pow(attemptCount, 2).toInt();
+              logs.add(
+                  'BG update task $taskId: Will continue in $remainingSeconds seconds (with $appId moved to the end of the line).');
+              var remainingToCheck = moveStrToEndMapEntryWithCount(
+                  toCheck.sublist(i), MapEntry(appId, attemptCount));
+              AndroidAlarmManager.oneShot(Duration(seconds: remainingSeconds),
+                  taskId + 1, bgUpdateCheck,
+                  params: {
+                    'toCheck': remainingToCheck
+                        .map(
+                            (entry) => {'key': entry.key, 'value': entry.value})
+                        .toList(),
+                    'toInstall': toInstall
+                        .map(
+                            (entry) => {'key': entry.key, 'value': entry.value})
+                        .toList(),
+                  });
+              break;
+            } else {
+              // If the offender has reached its fail limit, notify the user and remove it from the list (task can continue)
+              toCheck.removeAt(i);
+              i--;
+              notificationsProvider
+                  .notify(ErrorCheckingUpdatesNotification(e.toString()));
+            }
+          } finally {
+            if (notif != null) {
+              notificationsProvider.cancel(notif.id);
+            }
+          }
+        }
+      }
+    } finally {
+      if (toNotify.isNotEmpty) {
+        notificationsProvider.notify(UpdateNotification(toNotify));
+      }
+    }
+    // If you're done checking and found some silently installable updates, schedule another task which will run in install mode
+    if (didCompleteChecking) {
       logs.add(
           'BG update task $taskId: Done. Scheduling install task to run immediately.');
       AndroidAlarmManager.oneShot(
@@ -1489,14 +1506,11 @@ Future<void> bgUpdateCheck(int taskId, Map<String, dynamic>? params) async {
                 .map((entry) => {'key': entry.key, 'value': entry.value})
                 .toList()
           });
+    } else if (didCompleteChecking) {
+      logs.add('BG update task $taskId: Done.');
+    }
   } else {
-      logs.add('BG install task $taskId: Done.');
+    // If in install mode...
-    }
-  }
-
-  if (installMode) {
-    // If in install mode, we install silent updates.
-
     var didCompleteInstalling = false;
     var tempObtArr = toInstall.where((element) => element.key == obtainiumId);
     if (tempObtArr.isNotEmpty) {

lib/providers/notifications_provider.dart

@@ -28,7 +28,7 @@ class UpdateNotification extends ObtainiumNotification {
             tr('updatesAvailable'),
             '',
             'UPDATES_AVAILABLE',
-            tr('updatesAvailable'),
+            tr('updatesAvailableNotifChannel'),
             tr('updatesAvailableNotifDescription'),
             Importance.max) {
     message = updates.isEmpty
@@ -42,8 +42,14 @@ class UpdateNotification extends ObtainiumNotification {
 
 class SilentUpdateNotification extends ObtainiumNotification {
   SilentUpdateNotification(List<App> updates, {int? id})
-      : super(id ?? 3, tr('appsUpdated'), '', 'APPS_UPDATED', tr('appsUpdated'),
+      : super(
-            tr('appsUpdatedNotifDescription'), Importance.defaultImportance) {
+            id ?? 3,
+            tr('appsUpdated'),
+            '',
+            'APPS_UPDATED',
+            tr('appsUpdatedNotifChannel'),
+            tr('appsUpdatedNotifDescription'),
+            Importance.defaultImportance) {
     message = updates.length == 1
         ? tr('xWasUpdatedToY',
             args: [updates[0].finalName, updates[0].latestVersion])
@@ -59,7 +65,7 @@ class SilentUpdateAttemptNotification extends ObtainiumNotification {
             tr('appsPossiblyUpdated'),
             '',
             'APPS_POSSIBLY_UPDATED',
-            tr('appsPossiblyUpdated'),
+            tr('appsPossiblyUpdatedNotifChannel'),
             tr('appsPossiblyUpdatedNotifDescription'),
             Importance.defaultImportance) {
     message = updates.length == 1
@@ -77,15 +83,21 @@ class ErrorCheckingUpdatesNotification extends ObtainiumNotification {
             tr('errorCheckingUpdates'),
             error,
             'BG_UPDATE_CHECK_ERROR',
-            tr('errorCheckingUpdates'),
+            tr('errorCheckingUpdatesNotifChannel'),
             tr('errorCheckingUpdatesNotifDescription'),
             Importance.high);
 }
 
 class AppsRemovedNotification extends ObtainiumNotification {
   AppsRemovedNotification(List<List<String>> namedReasons)
-      : super(6, tr('appsRemoved'), '', 'APPS_REMOVED', tr('appsRemoved'),
+      : super(
-            tr('appsRemovedNotifDescription'), Importance.max) {
+            6,
+            tr('appsRemoved'),
+            '',
+            'APPS_REMOVED',
+            tr('appsRemovedNotifChannel'),
+            tr('appsRemovedNotifDescription'),
+            Importance.max) {
     message = '';
     for (var r in namedReasons) {
       message += '${tr('xWasRemovedDueToErrorY', args: [r[0], r[1]])} \n';
@@ -101,7 +113,7 @@ class DownloadNotification extends ObtainiumNotification {
             tr('downloadingX', args: [appName]),
             '',
             'APP_DOWNLOADING',
-            tr('downloadingX', args: [tr('app')]),
+            tr('downloadingXNotifChannel', args: [tr('app')]),
             tr('downloadNotifDescription'),
             Importance.low,
             onlyAlertOnce: true,
@@ -113,7 +125,7 @@ final completeInstallationNotification = ObtainiumNotification(
     tr('completeAppInstallation'),
     tr('obtainiumMustBeOpenToInstallApps'),
     'COMPLETE_INSTALL',
-    tr('completeAppInstallation'),
+    tr('completeAppInstallationNotifChannel'),
     tr('completeAppInstallationNotifDescription'),
     Importance.max);
 
@@ -124,7 +136,7 @@ class CheckingUpdatesNotification extends ObtainiumNotification {
             tr('checkingForUpdates'),
             appName,
             'BG_UPDATE_CHECK',
-            tr('checkingForUpdates'),
+            tr('checkingForUpdatesNotifChannel'),
             tr('checkingForUpdatesNotifDescription'),
             Importance.min);
 }

lib/providers/source_provider.dart

@@ -28,6 +28,7 @@ import 'package:obtainium/app_sources/steammobile.dart';
 import 'package:obtainium/app_sources/telegramapp.dart';
 import 'package:obtainium/app_sources/uptodown.dart';
 import 'package:obtainium/app_sources/vlc.dart';
+import 'package:obtainium/app_sources/whatsapp.dart';
 import 'package:obtainium/components/generated_form.dart';
 import 'package:obtainium/custom_errors.dart';
 import 'package:obtainium/mass_app_sources/githubstars.dart';
@@ -441,6 +442,10 @@ abstract class AppSource {
     [
       GeneratedFormSwitch('exemptFromBackgroundUpdates',
           label: tr('exemptFromBackgroundUpdates'))
+    ],
+    [
+      GeneratedFormSwitch('skipUpdateNotifications',
+          label: tr('skipUpdateNotifications'))
     ]
   ];
 
@@ -557,7 +562,7 @@ class SourceProvider {
         Mullvad(),
         Signal(),
         VLC(),
-        // WhatsApp(), // As of 2023-03-20 this is unusable as the version on the webpage is months out of date
+        WhatsApp(), // As of 2023-03-20 this is unusable as the version on the webpage is months out of date
         TelegramApp(),
         SteamMobile(),
         NeutronCode(),

pubspec.lock

@@ -5,18 +5,18 @@ packages:
     dependency: "direct main"
     description:
       name: android_alarm_manager_plus
-      sha256: c20d91a9096596f66274bf8172321c278f9cba8091638f80205fe66d31587fa5
+      sha256: "82fb28c867c4b3dd7e9157728e46426b8916362f977dbba46b949210f00099f4"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.2"
+    version: "3.0.3"
   android_intent_plus:
     dependency: "direct main"
     description:
       name: android_intent_plus
-      sha256: f72ae20bb37108694f442e7ae6acbd28b453ca62ce86842f6787b784355abfe6
+      sha256: e1c62bb41c90e15083b7fb84dc327fe90396cc9c1445b55ff1082144fabfb4d9
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.2"
+    version: "4.0.3"
   android_package_installer:
     dependency: "direct main"
     description:
@@ -46,10 +46,10 @@ packages:
     dependency: transitive
     description:
       name: archive
-      sha256: "06a96f1249f38a00435b3b0c9a3246d934d7dbc8183fc7c9e56989860edb99d4"
+      sha256: "7e0d52067d05f2e0324268097ba723b71cb41ac8a6a2b24d1edf9c536b987b03"
       url: "https://pub.dev"
     source: hosted
-    version: "3.4.4"
+    version: "3.4.6"
   args:
     dependency: transitive
     description:
@@ -118,10 +118,10 @@ packages:
     dependency: "direct main"
     description:
       name: connectivity_plus
-      sha256: "77a180d6938f78ca7d2382d2240eb626c0f6a735d0bfdce227d8ffb80f95c48b"
+      sha256: "94d51c6f1299133a2baa4c5c3d2c11ec7d7fb4768dee5c52a56f7d7522fcf70e"
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.2"
+    version: "5.0.0"
   connectivity_plus_platform_interface:
     dependency: transitive
     description:
@@ -142,10 +142,10 @@ packages:
     dependency: transitive
     description:
       name: cross_file
-      sha256: fd832b5384d0d6da4f6df60b854d33accaaeb63aa9e10e736a87381f08dee2cb
+      sha256: "445db18de832dba8d851e287aff8ccf169bed30d2e94243cb54c7d2f1ed2142c"
       url: "https://pub.dev"
     source: hosted
-    version: "0.3.3+5"
+    version: "0.3.3+6"
   crypto:
     dependency: transitive
     description:
@@ -238,10 +238,10 @@ packages:
     dependency: transitive
     description:
       name: file
-      sha256: "1b92bec4fc2a72f59a8e15af5f52cd441e4a7860b49499d69dfa817af20e925d"
+      sha256: "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c"
       url: "https://pub.dev"
     source: hosted
-    version: "6.1.4"
+    version: "7.0.0"
   file_picker:
     dependency: "direct main"
     description:
@@ -562,10 +562,10 @@ packages:
     dependency: transitive
     description:
       name: permission_handler_platform_interface
-      sha256: f2343e9fa9c22ae4fd92d4732755bfe452214e7189afcc097380950cf567b4b2
+      sha256: "6760eb5ef34589224771010805bea6054ad28453906936f843a8cc4d3a55c4a4"
       url: "https://pub.dev"
     source: hosted
-    version: "3.11.5"
+    version: "3.12.0"
   permission_handler_windows:
     dependency: transitive
     description:
@@ -586,10 +586,10 @@ packages:
     dependency: transitive
     description:
       name: platform
-      sha256: ae68c7bfcd7383af3629daafb32fb4e8681c7154428da4febcff06200585f102
+      sha256: "0a279f0707af40c890e80b1e9df8bb761694c074ba7e1d4ab1bc4b728e200b59"
       url: "https://pub.dev"
     source: hosted
-    version: "3.1.2"
+    version: "3.1.3"
   plugin_platform_interface:
     dependency: transitive
     description:
@@ -634,10 +634,10 @@ packages:
     dependency: "direct main"
     description:
       name: shared_preferences
-      sha256: b7f41bad7e521d205998772545de63ff4e6c97714775902c199353f8bf1511ac
+      sha256: "81429e4481e1ccfb51ede496e916348668fd0921627779233bd24cc3ff6abd02"
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.1"
+    version: "2.2.2"
   shared_preferences_android:
     dependency: transitive
     description:
@@ -658,10 +658,10 @@ packages:
     dependency: transitive
     description:
       name: shared_preferences_linux
-      sha256: c2eb5bf57a2fe9ad6988121609e47d3e07bb3bdca5b6f8444e4cf302428a128a
+      sha256: "9f2cbcf46d4270ea8be39fa156d86379077c8a5228d9dfdb1164ae0bb93f1faa"
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.1"
+    version: "2.3.2"
   shared_preferences_platform_interface:
     dependency: transitive
     description:
@@ -682,10 +682,10 @@ packages:
     dependency: transitive
     description:
       name: shared_preferences_windows
-      sha256: f763a101313bd3be87edffe0560037500967de9c394a714cd598d945517f694f
+      sha256: "841ad54f3c8381c480d0c9b508b89a34036f512482c407e6df7a9c4aa2ef8f59"
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.1"
+    version: "2.3.2"
   shared_storage:
     dependency: "direct main"
     description:

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.14.23+215 # When changing this, update the tag in main() accordingly
+version: 0.14.27+219 # When changing this, update the tag in main() accordingly
 
 environment:
   sdk: '>=3.0.0 <4.0.0'
@@ -64,7 +64,7 @@ dependencies:
   flutter_markdown: ^0.6.14
   flutter_archive: ^5.0.0
   hsluv: ^1.1.3
-  connectivity_plus: ^4.0.2
+  connectivity_plus: ^5.0.0
   shared_storage: ^0.8.0
 
 dev_dependencies: