Merge pull request #987 from ImranR98/dev

Fix issues with last conflit resolution commit

.github/workflows/release.yml

@@ -0,0 +1,70 @@
+name: Build and Release
+
+on:
+  workflow_dispatch:
+    
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      
+      - uses: actions/checkout@v3
+      - uses: subosito/flutter-action@v2
+
+      - name: Import GPG key
+        id: import_pgp_key
+        uses: crazy-max/ghaction-import-gpg@v6
+        with:
+          gpg_private_key: ${{ secrets.PGP_KEY_BASE64 }}
+          passphrase: ${{ secrets.PGP_PASSPHRASE }}
+
+      - name: Build APKs
+        run: |
+          sed -i 's/signingConfig signingConfigs.release//g' android/app/build.gradle
+          flutter build apk && flutter build apk --split-per-abi
+          rm ./build/app/outputs/flutter-apk/*.sha1
+          ls -l ./build/app/outputs/flutter-apk/
+        
+      - name: Sign APKs
+        env:
+          KEYSTORE_BASE64: ${{ secrets.KEYSTORE_BASE64 }}
+          KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }}
+          PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}
+        run: |
+          echo "${KEYSTORE_BASE64}" | base64 -d > apksign.keystore
+          for apk in ./build/app/outputs/flutter-apk/*-release*.apk; do
+            unsignedFn=${apk/-release/-unsigned}
+            mv "$apk" "$unsignedFn"
+            ${ANDROID_HOME}/build-tools/30.0.2/apksigner sign --ks apksign.keystore --ks-pass pass:"${KEYSTORE_PASSWORD}" --out "${apk}" "${unsignedFn}"
+            sha256sum ${apk} | cut -d " " -f 1 > "$apk".sha256
+            gpg --batch  --pinentry-mode loopback --passphrase "${PGP_PASSPHRASE}" --sign --detach-sig "$apk".sha256
+          done
+          rm apksign.keystore
+          PGP_KEY_FINGERPRINT="${{ steps.import_pgp_key.outputs.fingerprint }}"
+        
+      - name: Extract Version
+        id: extract_version      
+        run: |
+           VERSION=$(grep -oP "currentVersion = '\K[^']+" lib/main.dart)
+           echo "version=$VERSION" >> $GITHUB_OUTPUT
+           TAG=$(grep -oP "'.*\\\$currentVersion.*'" lib/main.dart | head -c -2 | tail -c +2 | sed "s/\$currentVersion/$VERSION/g")
+           echo "tag=$TAG" >> $GITHUB_OUTPUT
+           if [ -n "$(echo $TAG | grep -oP '\-beta$')" ]; then BETA=true; else BETA=false; fi
+           echo "beta=$BETA" >> $GITHUB_OUTPUT
+
+      - name: Create Tag
+        uses: mathieudutour/github-tag-action@v6.1
+        with:
+          github_token: ${{ secrets.GH_ACCESS_TOKEN }}
+          custom_tag: "${{ steps.extract_version.outputs.tag }}"
+          tag_prefix: ""
+      
+      - name: Create Release And Upload APKs
+        uses: ncipollo/release-action@v1
+        with:
+          token: ${{ secrets.GH_ACCESS_TOKEN }}
+          tag: "${{ steps.extract_version.outputs.tag }}"
+          prerelease: "${{ steps.extract_version.outputs.beta }}"
+          artifacts: ./build/app/outputs/flutter-apk/*-release*.apk*
+          generateReleaseNotes: true

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",
@@ -312,4 +315,4 @@
       "one": "{} and 1 more app may have been updated.",
       "other": "{} and {} more apps may have been updated."
    }
-}
+}

assets/translations/de.json

@@ -122,15 +122,15 @@
     "ascending": "Aufsteigend",
     "descending": "Absteigend",
     "bgUpdateCheckInterval": "Prüfintervall für Hintergrundaktualisierung",
-    "neverManualOnly": "Nie - nur manuell",
+    "neverManualOnly": "Nie – nur manuell",
     "appearance": "Aussehen",
     "showWebInAppView": "Quellwebseite in der App-Ansicht anzeigen",
     "pinUpdates": "Apps mit Aktualisierungen oben anheften",
     "updates": "Aktualisierungen",
     "sourceSpecific": "Quellenspezifisch",
     "appSource": "App-Quelle",
-    "noLogs": "Keine Protokolle",
-    "appLogs": "App Protokolle",
+    "noLogs": "Keine Logs",
+    "appLogs": "App-Logs",
     "close": "Schließen",
     "share": "Teilen",
     "appNotFound": "App nicht gefunden",
@@ -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",
@@ -256,25 +259,25 @@
     "filterVersionsByRegEx": "Versionen nach regulären Ausdrücken filtern",
     "trySelectingSuggestedVersionCode": "Versuchen, die vorgeschlagene APK-Code-Version auszuwählen",
     "dontSortReleasesList": "Retain release order from API",
-    "reverseSort": "Reverse sorting",
-    "debugMenu": "Debug Menu",
-    "bgTaskStarted": "Background task started - check logs.",
-    "runBgCheckNow": "Run Background Update Check Now",
+    "reverseSort": "Umgekehrtes Sortieren",
+    "debugMenu": "Debug Menü",
+    "bgTaskStarted": "Hintergrundaufgabe gestartet – Logs prüfen.",
+    "runBgCheckNow": "Hintergrundaktualisierungsprüfung jetzt durchführen",
     "removeAppQuestion": {
         "one": "App entfernen?",
         "other": "Apps entfernen?"
     },
     "tooManyRequestsTryAgainInMinutes": {
-        "one": "Zu viele Anfragen (Rate begrenzt) - versuchen Sie es in {} Minute erneut",
-        "other": "Zu viele Anfragen (Rate begrenzt) - versuchen Sie es in {} Minuten erneut"
+        "one": "Zu viele Anfragen (Rate begrenzt) – versuchen Sie es in {} Minute erneut",
+        "other": "Zu viele Anfragen (Rate begrenzt) – versuchen Sie es in {} Minuten erneut"
     },
     "bgUpdateGotErrorRetryInMinutes": {
         "one": "Bei der Aktualisierungsprüfung im Hintergrund wurde ein {} festgestellt, eine erneute Prüfung wird in {} Minute geplant",
         "other": "Bei der Aktualisierungsprüfung im Hintergrund wurde ein {} festgestellt, eine erneute Prüfung wird in {} Minuten geplant"
     },
     "bgCheckFoundUpdatesWillNotifyIfNeeded": {
-        "one": "Hintergrundaktualisierungsprüfung fand {} Aktualisierung - benachrichtigt den Benutzer, falls erforderlich",
-        "other": "Hintergrundaktualisierungsprüfung fand {} Aktualisierungen - benachrichtigt den Benutzer, falls erforderlich"
+        "one": "Die Hintergrundaktualisierungsprüfung fand {} Aktualisierung – benachrichtigt den Benutzer, falls erforderlich",
+        "other": "Die Hintergrundaktualisierungsprüfung fand {} Aktualisierungen – benachrichtigt den Benutzer, falls erforderlich"
     },
     "apps": {
         "one": "{} App",
@@ -297,8 +300,8 @@
         "other": "{} Tage"
     },
     "clearedNLogsBeforeXAfterY": {
-        "one": "{n} Protokoll gelöscht (vorher = {vorher}, nachher = {nachher})",
-        "other": "{n} Protokolle gelöscht (vorher = {vorher}, nachher = {nachher})"
+        "one": "{n} Log gelöscht (vorher = {before}, nachher = {after})",
+        "other": "{n} Logs gelöscht (vorher = {before}, nachher = {after})"
     },
     "xAndNMoreUpdatesAvailable": {
         "one": "{} und 1 weitere App haben Aktualisierungen.",

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",

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",

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",

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",
@@ -241,9 +242,12 @@
     "appsPossiblyUpdated": "App frissítési kísérlet",
     "appsPossiblyUpdatedNotifDescription": "Értesíti a felhasználót, hogy egy vagy több alkalmazás frissítése lehetséges a háttérben",
     "xWasPossiblyUpdatedToY": "{} frissítve lehet erre {}.",
+    "enableBackgroundUpdates": "Enable background updates",
     "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",

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",

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)",
@@ -34,10 +25,10 @@
     "githubStarredRepos": "Repozytoria GitHub oznaczone gwiazdką",
     "uname": "Nazwa użytkownika",
     "wrongArgNum": "Nieprawidłowa liczba podanych argumentów",
-    "xIsTrackOnly": "{} jest tylko obserwowana",
+    "xIsTrackOnly": "{} jest tylko obserwowane",
     "source": "Źródło",
     "app": "Aplikacja",
-    "appsFromSourceAreTrackOnly": "Aplikacje z tego źródła są „Obserwowane”.",
+    "appsFromSourceAreTrackOnly": "Aplikacje z tego źródła są „tylko obserwowane”.",
     "youPickedTrackOnly": "Wybrano opcję „Tylko obserwuj”.",
     "trackOnlyAppDescription": "Aplikacja będzie obserwowana pod kątem aktualizacji, ale Obtainium nie będzie w stanie jej pobrać ani zainstalować.",
     "cancelled": "Anulowano",
@@ -52,7 +43,7 @@
     "additionalOptsFor": "Dodatkowe opcje dla {}",
     "supportedSources": "Obsługiwane źródła",
     "trackOnlyInBrackets": "(tylko obserwowane)",
-    "searchableInBrackets": "(Wyszukiwalne)",
+    "searchableInBrackets": "(wyszukiwalne)",
     "appsString": "Aplikacje",
     "noApps": "Brak aplikacji",
     "noAppsForFilter": "Brak aplikacji dla filtra",
@@ -70,11 +61,12 @@
     "removeSelectedApps": "Usuń wybrane aplikacje",
     "updateX": "Zaktualizuj {}",
     "installX": "Zainstaluj {}",
-    "markXTrackOnlyAsUpdated": "Oznacz {}\n(Tylko obserwowana)\njako zaktualizowaną",
+    "markXTrackOnlyAsUpdated": "Oznacz {}\n(tylko obserwowana)\njako zaktualizowaną",
     "changeX": "Zmień {}",
     "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,15 +239,18 @@
     "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 {}.",
-    "backgroundUpdateReqsExplanation": "Aktualizacje w tle mogą nie być możliwe dla wszystkich aplikacji.",
+    "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",
+    "autoSelectHighestVersionCode": "Automatycznie wybierz najwyższy kod wersji APK",  
     "versionExtractionRegEx": "Wyrażenie regularne wyodrębniające wersję",
     "matchGroupToUse": "Dopasuj grupę do użycia",
     "highlightTouchTargets": "Wyróżnij mniej oczywiste elementy dotykowe",
@@ -261,11 +258,11 @@
     "autoExportOnChanges": "Automatyczny eksport po wprowadzeniu zmian",
     "filterVersionsByRegEx": "Filtruj wersje według wyrażenia regularnego",
     "trySelectingSuggestedVersionCode": "Spróbuj wybierać sugerowany kod wersji APK",
-    "dontSortReleasesList": "Retain release order from API",
-    "reverseSort": "Reverse sorting",
-    "debugMenu": "Debug Menu",
-    "bgTaskStarted": "Background task started - check logs.",
-    "runBgCheckNow": "Run Background Update Check Now",
+    "dontSortReleasesList": "Utrzymaj kolejność wydań z interfejsu API",
+    "reverseSort": "Odwrotne sortowanie",
+    "debugMenu": "Menu debugowania",
+    "bgTaskStarted": "Uruchomiono zadanie w tle - sprawdź logi.",
+    "runBgCheckNow": "Wymuś sprawdzenie aktualizacji w tle",
     "removeAppQuestion": {
         "one": "Usunąć aplikację?",
         "few": "Usunąć aplikacje?",
@@ -276,7 +273,13 @@
         "one": "Zbyt wiele żądań (ograniczona częstotliwość) - spróbuj ponownie za {} minutę",
         "few": "Zbyt wiele żądań (ograniczona częstotliwość) - spróbuj ponownie za {} minuty",
         "many": "Zbyt wiele żądań (ograniczona częstotliwość) - spróbuj ponownie za {} minut",
-        "other": "Zbyt wiele żądań (ograniczona częstotliwość) - spróbuj ponownie za {} minuty"
+        "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",
@@ -337,8 +340,4 @@
         "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

@@ -128,7 +128,7 @@
     "pinUpdates": "Fixar atualizações no topo da visão de Apps",
     "updates": "Atualizações",
     "sourceSpecific": "Específico a fonte",
-    "appSource": "Fonte de Apps",
+    "appSource": "Fonte do App",
     "noLogs": "Sem Logs",
     "appLogs": "Logs do App",
     "close": "Fechar",
@@ -250,19 +250,19 @@
     "intermediateLinkNotFound": "Link intermediário não encontrado",
     "exemptFromBackgroundUpdates": "Isento de atualizações em segundo plano (se ativadas)",
     "bgUpdatesOnWiFiOnly": "Desative atualizações em segundo plano quando não estiver em WiFi",
-    "autoSelectHighestVersionCode": "Auto-select highest versionCode APK",
-    "versionExtractionRegEx": "Version Extraction RegEx",
-    "matchGroupToUse": "Match Group to Use",
-    "highlightTouchTargets": "Highlight less obvious touch targets",
-    "pickExportDir": "Pick Export Directory",
-    "autoExportOnChanges": "Auto-export on changes",
-    "filterVersionsByRegEx": "Filter Versions by Regular Expression",
-    "trySelectingSuggestedVersionCode": "Try selecting suggested versionCode APK",
-    "dontSortReleasesList": "Retain release order from API",
-    "reverseSort": "Reverse sorting",
-    "debugMenu": "Debug Menu",
-    "bgTaskStarted": "Background task started - check logs.",
-    "runBgCheckNow": "Run Background Update Check Now",
+    "autoSelectHighestVersionCode": "Auto-selecionar o maior codigo de versão",
+    "versionExtractionRegEx": "RegEx para Extração de Versão",
+    "matchGroupToUse": "Grupo de Seleção para Usar",
+    "highlightTouchTargets": "Destaque areas de toque menos óbvias",
+    "pickExportDir": "Escolher Diretorio de Exportação",
+    "autoExportOnChanges": "Auto-exportar em mudanças",
+    "filterVersionsByRegEx": "Filtrar Versões por Expressão Regular",
+    "trySelectingSuggestedVersionCode": "Tente selecionar a versão sugerida",
+    "dontSortReleasesList": "Reter a ordem de lançamento da API",
+    "reverseSort": "Ordenação reversa",
+    "debugMenu": "Menu Debug",
+    "bgTaskStarted": "Tarefa em segundo plano iniciada - verifique os logs.",
+    "runBgCheckNow": "Execute a verificação de atualização em segundo plano agora",
     "removeAppQuestion": {
         "one": "Remover App?",
         "other": "Remover Apps?"

assets/translations/ru.json

@@ -236,30 +236,33 @@
     "addInfoInSettings": "Добавьте эту информацию в Настройки.",
     "githubSourceNote": "Лимит запросов GitHub можно обойти, используя ключ API.",
     "gitlabSourceNote": "Извлечение APK из GitLab может не работать без ключа API.",
-    "sortByFileNamesNotLinks": "Sort by file names instead of full links",
-    "filterReleaseNotesByRegEx": "Filter Release Notes by Regular Expression",
-    "customLinkFilterRegex": "Custom APK Link Filter by Regular Expression (Default '.apk$')",
-    "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 {}.",
-    "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",
-    "exemptFromBackgroundUpdates": "Exempt from background updates (if enabled)",
-    "bgUpdatesOnWiFiOnly": "Disable background updates when not on WiFi",
-    "autoSelectHighestVersionCode": "Auto-select highest versionCode APK",
-    "versionExtractionRegEx": "Version Extraction RegEx",
-    "matchGroupToUse": "Match Group to Use",
-    "highlightTouchTargets": "Highlight less obvious touch targets",
-    "pickExportDir": "Pick Export Directory",
-    "autoExportOnChanges": "Auto-export on changes",
-    "filterVersionsByRegEx": "Filter Versions by Regular Expression",
-    "trySelectingSuggestedVersionCode": "Try selecting suggested versionCode APK",
-    "dontSortReleasesList": "Retain release order from API",
-    "reverseSort": "Reverse sorting",
-    "debugMenu": "Debug Menu",
-    "bgTaskStarted": "Background task started - check logs.",
-    "runBgCheckNow": "Run Background Update Check Now",
+    "sortByFileNamesNotLinks": "Сортировать по именам файлов, а не по полным ссылкам",
+    "filterReleaseNotesByRegEx": "Фильтровать примечания к выпуску по регулярному выражению",
+    "customLinkFilterRegex": "Пользовательский фильтр ссылок APK по регулярному выражению (по умолчанию '.apk$')",
+    "appsPossiblyUpdated": "Попытки обновления приложений",
+    "appsPossiblyUpdatedNotifDescription": "Уведомляет пользователя о возможных обновлениях одного или нескольких приложений в фоновом режиме",
+    "xWasPossiblyUpdatedToY": "{} возможно был обновлен до {}.",
+    "enableBackgroundUpdates": "Включить обновления в фоне",
+    "backgroundUpdateReqsExplanation": "Фоновые обновления могут быть невозможны для всех приложений.",
+    "backgroundUpdateLimitsExplanation": "Успех фоновой установки можно определить только после открытия Obtainium.",
+    "verifyLatestTag": "Проверьте тег 'последний'",
+    "intermediateLinkRegex": "Фильтр ссылок 'промежуточного' типа для приоритетного посещения",
+    "intermediateLinkNotFound": "Промежуточная ссылка не найдена",
+    "exemptFromBackgroundUpdates": "Исключить из фоновых обновлений (если включено)",
+    "bgUpdatesOnWiFiOnly": "Отключить фоновые обновления, если нет соединения с Wi-Fi",
+    "autoSelectHighestVersionCode": "Автоматически выбирать APK с наивысшим кодом версии",
+    "versionExtractionRegEx": "Регулярное выражение для извлечения версии",
+    "matchGroupToUse": "Выберите группу для использования",
+    "highlightTouchTargets": "Выделить менее очевидные элементы управления касанием",
+    "pickExportDir": "Выбрать каталог для экспорта",
+    "autoExportOnChanges": "Автоэкспорт при изменениях",
+    "filterVersionsByRegEx": "Фильтровать версии по регулярному выражению",
+    "trySelectingSuggestedVersionCode": "Попробуйте выбрать предложенный код версии APK",
+    "dontSortReleasesList": "Сохранить порядок выпусков от API",
+    "reverseSort": "Обратная сортировка",
+    "debugMenu": "Меню Отладки",
+    "bgTaskStarted": "Фоновая задача начата - проверьте журналы.",
+    "runBgCheckNow": "Запустить проверку фонового обновления сейчас",
     "removeAppQuestion": {
         "one": "Удалить приложение?",
         "other": "Удалить приложения?"
@@ -305,11 +308,11 @@
         "other": "У {} и ещё {} приложений есть обновления."
     },
     "xAndNMoreUpdatesInstalled": {
-        "one": "{} и еще 1 приложение были обновлены.",
-        "other": "{} и еще {} приложений были обновлены."
+        "one": "{} и ещё 1 приложение были обновлены.",
+        "other": "{} и ещё {} приложений были обновлены."
     },
     "xAndNMoreUpdatesPossiblyInstalled": {
-        "one": "{} and 1 more app may have been updated.",
-        "other": "{} and {} more apps may have been updated."
+        "one": "{} и ещё 1 приложение могли быть обновлены.",
+        "other": "{} и ещё {} приложений могли быть обновлены."
     }
 }

assets/translations/zh.json

@@ -238,31 +238,31 @@
     "gitlabSourceNote": "未使用访问令牌时可能无法从 GitLab 获取 APK 文件。",
     "sortByFileNamesNotLinks": "使用文件名代替链接进行排序",
     "filterReleaseNotesByRegEx": "使用正则表达式筛选发行说明",
-    "customLinkFilterRegex": "使用正则表达式自定义链接筛选（默认模式为“.apk$”）",
+    "customLinkFilterRegex": "使用正则表达式筛选自定义来源 APK 文件链接\n（未填写时，默认匹配模式为“.apk$”）",
     "appsPossiblyUpdated": "已尝试更新应用",
     "appsPossiblyUpdatedNotifDescription": "当应用已尝试在后台更新时发送通知",
-    "xWasPossiblyUpdatedToY": "已尝试将 {} 更新至 {}。",
+    "xWasPossiblyUpdatedToY": "已尝试将“{}”更新至 {}。",
     "enableBackgroundUpdates": "启用后台更新",
     "backgroundUpdateReqsExplanation": "后台更新未必适用于所有的应用。",
     "backgroundUpdateLimitsExplanation": "只有在启动 Obtainium 时才能确认安装是否成功。",
     "verifyLatestTag": "验证“Latest”标签",
-    "intermediateLinkRegex": "首先访问“中间”链接的过滤器",
-    "intermediateLinkNotFound": "中间链接未找到",
-    "exemptFromBackgroundUpdates": "禁用后台更新（如果全局设置启用）",
-    "bgUpdatesOnWiFiOnly": "不在连接 WiFi 时禁用后台更新",
-    "autoSelectHighestVersionCode": "自动选择最高版本号 APK",
-    "versionExtractionRegEx": "版本提取正则表达式",
-    "matchGroupToUse": "匹配要使用的组",
-    "highlightTouchTargets": "突出显示不明显的触摸目标",
-    "pickExportDir": "选择导出目录",
-    "autoExportOnChanges": "修改时自动导出",
-    "filterVersionsByRegEx": "使用正则表达式筛选版本",
-    "trySelectingSuggestedVersionCode": "尝试选择推荐版本 APK",
-    "dontSortReleasesList": "Retain release order from API",
-    "reverseSort": "Reverse sorting",
-    "debugMenu": "Debug Menu",
-    "bgTaskStarted": "Background task started - check logs.",
-    "runBgCheckNow": "Run Background Update Check Now",
+    "intermediateLinkRegex": "筛选一个首先访问的“中转”链接（正则表达式）",
+    "intermediateLinkNotFound": "未找到“中转”链接",
+    "exemptFromBackgroundUpdates": "单独禁用后台更新（若已经全局启用）",
+    "bgUpdatesOnWiFiOnly": "未连接 Wi-Fi 时禁用后台更新",
+    "autoSelectHighestVersionCode": "自动选择版本号最高的 APK 文件",
+    "versionExtractionRegEx": "获取版本号的正则表达式",
+    "matchGroupToUse": "引用的捕获组",
+    "highlightTouchTargets": "突出展示不明显的触摸区域",
+    "pickExportDir": "选择导出文件夹",
+    "autoExportOnChanges": "数据变更时自动导出",
+    "filterVersionsByRegEx": "使用正则表达式筛选版本号",
+    "trySelectingSuggestedVersionCode": "尝试选择推荐版本的 APK 文件",
+    "dontSortReleasesList": "保持来自 API 的发行顺序",
+    "reverseSort": "反转排序",
+    "debugMenu": "调试选项",
+    "bgTaskStarted": "后台任务已启动 - 详见日志",
+    "runBgCheckNow": "立即进行后台更新检查",
     "removeAppQuestion": {
         "one": "是否删除应用？",
         "other": "是否删除应用？"

lib/app_sources/apkpure.dart

@@ -22,16 +22,19 @@ class APKPure extends AppSource {
   APKPure() {
     host = 'apkpure.com';
     allowSubDomains = true;
+    naiveStandardVersionDetection = true;
   }
 
   @override
   String sourceSpecificStandardizeURL(String url) {
-    RegExp standardUrlRegExB = RegExp('^https?://m.$host/+[^/]+/+[^/]+');
+    RegExp standardUrlRegExB =
+        RegExp('^https?://m.$host/+[^/]+/+[^/]+(/+[^/]+)?');
     RegExpMatch? match = standardUrlRegExB.firstMatch(url.toLowerCase());
     if (match != null) {
       url = 'https://$host${Uri.parse(url).path}';
     }
-    RegExp standardUrlRegExA = RegExp('^https?://$host/+[^/]+/+[^/]+');
+    RegExp standardUrlRegExA =
+        RegExp('^https?://$host/+[^/]+/+[^/]+(/+[^/]+)?');
     match = standardUrlRegExA.firstMatch(url.toLowerCase());
     if (match == null) {
       throw InvalidURLError(name);

lib/app_sources/aptoide.dart

@@ -9,6 +9,7 @@ class Aptoide extends AppSource {
     host = 'aptoide.com';
     name = tr('Aptoide');
     allowSubDomains = true;
+    naiveStandardVersionDetection = true;
   }
 
   @override

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

@@ -120,14 +120,14 @@ class HTML extends AppSource {
         GeneratedFormTextField('matchGroupToUse',
             label: tr('matchGroupToUse'),
             required: false,
-            hint: '1',
+            hint: '0',
             textInputType: const TextInputType.numberWithOptions(),
             additionalValidators: [
               (value) {
                 if (value?.isEmpty == true) {
                   value = null;
                 }
-                value ??= '1';
+                value ??= '0';
                 return intValidator(value);
               }
             ])
@@ -216,8 +216,12 @@ class HTML extends AppSource {
         if (match.isEmpty) {
           throw NoVersionError();
         }
-        version = match.last
-            .group(int.parse(additionalSettings['matchGroupToUse'] as String));
+        String matchGroupString =
+            (additionalSettings['matchGroupToUse'] as String).trim();
+        if (matchGroupString.isEmpty) {
+          matchGroupString = "0";
+        }
+        version = match.last.group(int.parse(matchGroupString));
         if (version?.isEmpty == true) {
           throw NoVersionError();
         }

lib/app_sources/uptodown.dart

@@ -8,6 +8,7 @@ class Uptodown extends AppSource {
   Uptodown() {
     host = 'uptodown.com';
     allowSubDomains = true;
+    naiveStandardVersionDetection = true;
   }
 
   @override
@@ -34,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');
@@ -79,4 +80,20 @@ class Uptodown extends AppSource {
         version, getApkUrlsFromUrls([apkUrl]), AppNames(author, appName),
         releaseDate: relDate);
   }
+
+  @override
+  Future<String> apkUrlPrefetchModifier(
+      String apkUrl, String standardUrl) async {
+    var res = await sourceRequest(apkUrl);
+    if (res.statusCode != 200) {
+      throw getObtainiumHttpError(res);
+    }
+    var html = parse(res.body);
+    var finalUrl =
+        (html.querySelector('.post-download')?.attributes['data-url']);
+    if (finalUrl == null) {
+      throw NoAPKError();
+    }
+    return finalUrl;
+  }
 }

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) =>
-              e.contains('content.whatsapp.net') && e.contains('WhatsApp.apk'))
+          .where((e) => 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');
-    if (res.statusCode == 200) {
-      var targetElements = parse(res.body)
-          .querySelectorAll('p')
-          .where((element) => element.innerHtml.contains('Version '))
-          .toList();
-      if (targetElements.isEmpty) {
-        throw NoVersionError();
-      }
-      var vLines = targetElements[0]
-          .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);
-    }
+    // This is a CDN link that is consistent per version
+    // But it has query params that change constantly
+    Uri apkUri =
+        Uri.parse(await apkUrlPrefetchModifier(standardUrl, standardUrl));
+    var unusableApkUrl = '${apkUri.origin}/${apkUri.path}';
+    // So we use the param-less URL is a pseudo-version to add the app and check for updates
+    // See #357 for why we can't scrape the version number directly
+    // But we re-fetch the URL again with its latest query params at the actual download time
+    String version = unusableApkUrl.hashCode.toString();
+    return APKDetails(version, getApkUrlsFromUrls([unusableApkUrl]),
+        AppNames('Meta', 'WhatsApp'));
   }
 }

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';
@@ -65,25 +67,38 @@ class NotImplementedError extends ObtainiumError {
 }
 
 class MultiAppMultiError extends ObtainiumError {
-  Map<String, List<String>> content = {};
+  Map<String, dynamic> rawErrors = {};
+  Map<String, List<String>> idsByErrorString = {};
+  Map<String, String> appIdNames = {};
 
   MultiAppMultiError() : super(tr('placeholder'), unexpected: true);
 
-  add(String appId, String string) {
-    var tempIds = content.remove(string);
+  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);
     tempIds ??= [];
     tempIds.add(appId);
-    content.putIfAbsent(string, () => tempIds!);
+    idsByErrorString.putIfAbsent(string, () => tempIds!);
+    if (appName != null) {
+      appIdNames[appId] = appName;
+    }
   }
 
+  String errorString(String appId, {bool includeIdsWithNames = false}) =>
+      '${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 finalString = '';
-    for (var e in content.keys) {
-      finalString += '$e: ${content[e].toString()}\n\n';
-    }
-    return finalString;
-  }
+  String toString() => idsByErrorString.entries
+      .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.19';
+const String currentVersion = '0.14.26';
 const String currentReleaseTag =
     'v$currentVersion-beta'; // KEEP THIS IN SYNC WITH GITHUB RELEASES
 

lib/pages/apps.dart

@@ -68,7 +68,7 @@ class AppsPageState extends State<AppsPage> {
         refreshingSince = DateTime.now();
       });
       return appsProvider.checkUpdates().catchError((e) {
-        showError(e, context);
+        showError(e is Map ? e['errors'] : e, context);
         return <App>[];
       }).whenComplete(() {
         setState(() {
@@ -833,7 +833,7 @@ class AppsPageState extends State<AppsPage> {
                 items: const [],
                 initValid: true,
                 message: tr('installStatusOfXWillBeResetExplanation',
-                    args: [plural('app', selectedAppIds.length)]),
+                    args: [plural('apps', selectedAppIds.length)]),
               );
             });
         if (values != null) {

lib/pages/import_export.dart

@@ -102,11 +102,12 @@ class _ImportExportPageState extends State<ImportExportPage> {
       });
     }
 
-    runObtainiumExport() async {
+    runObtainiumExport({bool pickOnly = false}) async {
       HapticFeedback.selectionClick();
       appsProvider
           .exportApps(
-              pickOnly: (await settingsProvider.getExportDir()) == null,
+              pickOnly:
+                  pickOnly || (await settingsProvider.getExportDir()) == null,
               sp: settingsProvider)
           .then((String? result) {
         if (result != null) {
@@ -216,7 +217,8 @@ class _ImportExportPageState extends State<ImportExportPage> {
               if (errors.isEmpty) {
                 // ignore: use_build_context_synchronously
                 showError(
-                    tr('importedX', args: [plural('app', selectedUrls.length)]),
+                    tr('importedX',
+                        args: [plural('apps', selectedUrls.length)]),
                     context);
               } else {
                 // ignore: use_build_context_synchronously
@@ -273,7 +275,7 @@ class _ImportExportPageState extends State<ImportExportPage> {
             if (errors.isEmpty) {
               // ignore: use_build_context_synchronously
               showError(
-                  tr('importedX', args: [plural('app', selectedUrls.length)]),
+                  tr('importedX', args: [plural('apps', selectedUrls.length)]),
                   context);
             } else {
               // ignore: use_build_context_synchronously
@@ -320,21 +322,38 @@ class _ImportExportPageState extends State<ImportExportPage> {
                                     onPressed: appsProvider.apps.isEmpty ||
                                             importInProgress
                                         ? null
-                                        : runObtainiumExport,
-                                    child: Text(tr(snapshot.data != null
-                                        ? 'obtainiumExport'
-                                        : 'pickExportDir')),
+                                        : () {
+                                            runObtainiumExport(pickOnly: true);
+                                          },
+                                    child: Text(tr('pickExportDir')),
                                   )),
                                   const SizedBox(
                                     width: 16,
                                   ),
+                                  Expanded(
+                                      child: TextButton(
+                                    style: outlineButtonStyle,
+                                    onPressed: appsProvider.apps.isEmpty ||
+                                            importInProgress ||
+                                            snapshot.data == null
+                                        ? null
+                                        : runObtainiumExport,
+                                    child: Text(tr('obtainiumExport')),
+                                  )),
+                                ],
+                              ),
+                              const SizedBox(
+                                height: 8,
+                              ),
+                              Row(
+                                children: [
                                   Expanded(
                                       child: TextButton(
                                           style: outlineButtonStyle,
                                           onPressed: importInProgress
                                               ? null
                                               : runObtainiumImport,
-                                          child: Text(tr('obtainiumImport'))))
+                                          child: Text(tr('obtainiumImport')))),
                                 ],
                               ),
                               if (snapshot.data != null)

lib/providers/apps_provider.dart

@@ -449,7 +449,7 @@ class AppsProvider with ChangeNotifier {
           } catch (e) {
             logs.add(
                 'Could not install APK from XAPK \'${file.path}\': ${e.toString()}');
-            errors.add(dir.appId, e.toString());
+            errors.add(dir.appId, e, appName: apps[dir.appId]?.name);
           }
         } else if (file.path.toLowerCase().endsWith('.obb')) {
           await moveObbFile(file, dir.appId);
@@ -457,7 +457,7 @@ class AppsProvider with ChangeNotifier {
       }
       if (somethingInstalled) {
         dir.file.delete(recursive: true);
-      } else if (errors.content.isNotEmpty) {
+      } else if (errors.idsByErrorString.isNotEmpty) {
         throw errors;
       }
     } finally {
@@ -677,11 +677,11 @@ class AppsProvider with ChangeNotifier {
         }
         installedIds.add(id);
       } catch (e) {
-        errors.add(id, e.toString());
+        errors.add(id, e, appName: apps[id]?.name);
       }
     }
 
-    if (errors.content.isNotEmpty) {
+    if (errors.idsByErrorString.isNotEmpty) {
       throw errors;
     }
 
@@ -709,14 +709,21 @@ class AppsProvider with ChangeNotifier {
   }
 
   bool isVersionDetectionPossible(AppInMemory? app) {
-    return app?.app.additionalSettings['trackOnly'] != true &&
-        app?.app.additionalSettings['versionDetection'] !=
+    if (app?.app == null) {
+      return false;
+    }
+    var naiveStandardVersionDetection = SourceProvider()
+        .getSource(app!.app.url, overrideSource: app.app.overrideSource)
+        .naiveStandardVersionDetection;
+    return app.app.additionalSettings['trackOnly'] != true &&
+        app.app.additionalSettings['versionDetection'] !=
             'releaseDateAsVersion' &&
-        app?.installedInfo?.versionName != null &&
-        app?.app.installedVersion != null &&
-        reconcileVersionDifferences(
-                app!.installedInfo!.versionName!, app.app.installedVersion!) !=
-            null;
+        app.installedInfo?.versionName != null &&
+        app.app.installedVersion != null &&
+        (reconcileVersionDifferences(app.installedInfo!.versionName!,
+                    app.app.installedVersion!) !=
+                null ||
+            naiveStandardVersionDetection);
   }
 
   // Given an App and it's on-device info...
@@ -725,8 +732,12 @@ class AppsProvider with ChangeNotifier {
       App app, PackageInfo? installedInfo) {
     var modded = false;
     var trackOnly = app.additionalSettings['trackOnly'] == true;
-    var noVersionDetection = app.additionalSettings['versionDetection'] !=
-        'standardVersionDetection';
+    var versionDetectionIsStandard =
+        app.additionalSettings['versionDetection'] ==
+            'standardVersionDetection';
+    var naiveStandardVersionDetection = SourceProvider()
+        .getSource(app.url, overrideSource: app.overrideSource)
+        .naiveStandardVersionDetection;
     // FIRST, COMPARE THE APP'S REPORTED AND REAL INSTALLED VERSIONS, WHERE ONE IS NULL
     if (installedInfo == null && app.installedVersion != null && !trackOnly) {
       // App says it's installed but isn't really (and isn't track only) - set to not installed
@@ -741,7 +752,7 @@ class AppsProvider with ChangeNotifier {
     // SECOND, RECONCILE DIFFERENCES BETWEEN THE APP'S REPORTED AND REAL INSTALLED VERSIONS, WHERE NEITHER IS NULL
     if (installedInfo?.versionName != null &&
         installedInfo!.versionName != app.installedVersion &&
-        !noVersionDetection) {
+        versionDetectionIsStandard) {
       // App's reported version and real version don't match (and it uses standard version detection)
       // If they share a standard format (and are still different under it), update the reported version accordingly
       var correctedInstalledVersion = reconcileVersionDifferences(
@@ -749,12 +760,15 @@ class AppsProvider with ChangeNotifier {
       if (correctedInstalledVersion?.key == false) {
         app.installedVersion = correctedInstalledVersion!.value;
         modded = true;
+      } else if (naiveStandardVersionDetection) {
+        app.installedVersion = installedInfo.versionName;
+        modded = true;
       }
     }
     // THIRD, RECONCILE THE APP'S REPORTED INSTALLED AND LATEST VERSIONS
     if (app.installedVersion != null &&
         app.installedVersion != app.latestVersion &&
-        !noVersionDetection) {
+        versionDetectionIsStandard) {
       // App's reported installed and latest versions don't match (and it uses standard version detection)
       // If they share a standard format, make sure the App's reported installed version uses that format
       var correctedInstalledVersion =
@@ -766,8 +780,7 @@ class AppsProvider with ChangeNotifier {
     }
     // FOURTH, DISABLE VERSION DETECTION IF ENABLED AND THE REPORTED/REAL INSTALLED VERSIONS ARE NOT STANDARDIZED
     if (installedInfo != null &&
-        app.additionalSettings['versionDetection'] ==
-            'standardVersionDetection' &&
+        versionDetectionIsStandard &&
         !isVersionDetectionPossible(
             AppInMemory(app, null, installedInfo, null))) {
       app.additionalSettings['versionDetection'] = 'noVersionDetection';
@@ -1055,7 +1068,8 @@ class AppsProvider with ChangeNotifier {
 
   Future<List<App>> checkUpdates(
       {DateTime? ignoreAppsCheckedAfter,
-      bool throwErrorsForRetry = false}) async {
+      bool throwErrorsForRetry = false,
+      List<String>? specificIds}) async {
     List<App> updates = [];
     MultiAppMultiError errors = MultiAppMultiError();
     if (!gettingUpdates) {
@@ -1063,27 +1077,33 @@ class AppsProvider with ChangeNotifier {
       try {
         List<String> appIds = getAppsSortedByUpdateCheckTime(
             ignoreAppsCheckedAfter: ignoreAppsCheckedAfter);
-        for (int i = 0; i < appIds.length; i++) {
+        if (specificIds != null) {
+          appIds = appIds.where((aId) => specificIds.contains(aId)).toList();
+        }
+        await Future.wait(appIds.map((appId) async {
           App? newApp;
           try {
-            newApp = await checkUpdate(appIds[i]);
+            newApp = await checkUpdate(appId);
           } catch (e) {
             if ((e is RateLimitError || e is SocketException) &&
                 throwErrorsForRetry) {
               rethrow;
             }
-            errors.add(appIds[i], e.toString());
+            errors.add(appId, e, appName: apps[appId]?.name);
           }
           if (newApp != null) {
             updates.add(newApp);
           }
-        }
+        }), eagerError: true);
       } finally {
         gettingUpdates = false;
       }
     }
-    if (errors.content.isNotEmpty) {
-      throw errors;
+    if (errors.idsByErrorString.isNotEmpty) {
+      var res = <String, dynamic>{};
+      res['errors'] = errors;
+      res['updates'] = updates;
+      throw res;
     }
     return updates;
   }
@@ -1116,7 +1136,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
@@ -1300,18 +1319,16 @@ class _APKOriginWarningDialogState extends State<APKOriginWarningDialog> {
 
 /// Background updater function
 ///
-/// @param List<String>? toCheck: The appIds to check for updates (default to all apps sorted by last update check time)
+/// @param List<MapEntry<String, int>>? toCheck: The appIds to check for updates (with the number of previous attempts made per appid) (defaults to all apps)
 ///
 /// @param List<String>? toInstall: The appIds to attempt to update (defaults to an empty array)
 ///
-/// @param int? attemptCount: The number of times the function has failed up to this point (defaults to 0)
-///
 /// When toCheck is empty, the function is in "install mode" (else it is in "update mode").
 /// In update mode, all apps in toCheck are checked for updates.
 /// If an update is available, the appId is either added to toInstall (if a background update is possible) or the user is notified.
-/// If there is an error, the function tries to continue after a few minutes (duration depends on the error), up to a maximum of 5 tries.
+/// If there are errors, the task is run again for the remaining apps after a few minutes (duration depends on the errors), up to a maximum of 5 tries for any app.
 ///
-/// Once all update checks are complete, the function is called again in install mode.
+/// Once all update checks are complete, the task is run again in install mode.
 /// In this mode, all apps in toInstall are downloaded and installed in the background (install result is unknown).
 /// If there is an error, the function tries to continue after a few minutes (duration depends on the error), up to a maximum of 5 tries.
 ///
@@ -1351,8 +1368,49 @@ 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
+  var netResult = await (Connectivity().checkConnectivity());
+
+  if (netResult == ConnectivityResult.none) {
+    var networkBasedRetryInterval = 15;
+    var nextRegularCheck = appsProvider.settingsProvider.lastBGCheckTime
+        .add(Duration(minutes: appsProvider.settingsProvider.updateInterval));
+    var potentialNetworkRetryCheck =
+        DateTime.now().add(Duration(minutes: networkBasedRetryInterval));
+    var shouldRetry = potentialNetworkRetryCheck.isBefore(nextRegularCheck);
+    logs.add(
+        'BG update task $taskId: No network. Will ${shouldRetry ? 'retry in $networkBasedRetryInterval minutes' : 'not retry'}.');
+    AndroidAlarmManager.oneShot(
+        const Duration(minutes: 15), taskId + 1, bgUpdateCheck,
+        params: {
+          'toCheck': toCheck
+              .map((entry) => {'key': entry.key, 'value': entry.value})
+              .toList(),
+          'toInstall': toInstall
+              .map((entry) => {'key': entry.key, 'value': entry.value})
+              .toList(),
+        });
+    return;
+  }
+
+  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}).');
@@ -1361,12 +1419,6 @@ Future<void> bgUpdateCheck(int taskId, Map<String, dynamic>? params) async {
     // If in update mode...
     var didCompleteChecking = false;
     CheckingUpdatesNotification? notif;
-    var networkRestricted = false;
-    if (appsProvider.settingsProvider.bgUpdatesOnWiFiOnly) {
-      var netResult = await (Connectivity().checkConnectivity());
-      networkRestricted = (netResult != ConnectivityResult.wifi) &&
-          (netResult != ConnectivityResult.ethernet);
-    }
     // Loop through all updates and check each
     List<App> toNotify = [];
     try {
@@ -1384,8 +1436,6 @@ Future<void> bgUpdateCheck(int taskId, Map<String, dynamic>? params) async {
               if (networkRestricted ||
                   !(await appsProvider.canInstallSilently(app!.app))) {
                 toNotify.add(newApp);
-              } else {
-                toInstall.add(MapEntry(appId, 0));
               }
             }
             if (i == (toCheck.length - 1)) {
@@ -1438,7 +1488,7 @@ Future<void> bgUpdateCheck(int taskId, Map<String, dynamic>? params) async {
       }
     }
     // If you're done checking and found some silently installable updates, schedule another task which will run in install mode
-    if (didCompleteChecking && toInstall.isNotEmpty) {
+    if (didCompleteChecking) {
       logs.add(
           'BG update task $taskId: Done. Scheduling install task to run immediately.');
       AndroidAlarmManager.oneShot(
@@ -1450,7 +1500,7 @@ Future<void> bgUpdateCheck(int taskId, Map<String, dynamic>? params) async {
                 .toList()
           });
     } else if (didCompleteChecking) {
-      logs.add('BG install task $taskId: Done.');
+      logs.add('BG update task $taskId: Done.');
     }
   } else {
     // If in install mode...

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';
@@ -328,6 +329,7 @@ abstract class AppSource {
   bool changeLogIfAnyIsMarkDown = true;
   bool appIdInferIsOptional = false;
   bool allowSubDomains = false;
+  bool naiveStandardVersionDetection = false;
 
   AppSource() {
     name = runtimeType.toString();
@@ -556,7 +558,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: "20071638cbe4e5964a427cfa0e86dce55d060bc7d82d56f3554095d7239a8765"
+      sha256: "7e0d52067d05f2e0324268097ba723b71cb41ac8a6a2b24d1edf9c536b987b03"
       url: "https://pub.dev"
     source: hosted
-    version: "3.4.2"
+    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:
@@ -291,10 +291,10 @@ packages:
     dependency: "direct main"
     description:
       name: flutter_local_notifications
-      sha256: "3002092e5b8ce2f86c3361422e52e6db6776c23ee21e0b2f71b892bf4259ef04"
+      sha256: "6d11ea777496061e583623aaf31923f93a9409ef8fcaeeefdd6cd78bf4fe5bb3"
       url: "https://pub.dev"
     source: hosted
-    version: "15.1.1"
+    version: "16.1.0"
   flutter_local_notifications_linux:
     dependency: transitive
     description:
@@ -320,10 +320,10 @@ packages:
     dependency: "direct main"
     description:
       name: flutter_markdown
-      sha256: a10979814c5f4ddbe2b6143fba25d927599e21e3ba65b3862995960606fae78f
+      sha256: "8afc9a6aa6d8e8063523192ba837149dbf3d377a37c0b0fc579149a1fbd4a619"
       url: "https://pub.dev"
     source: hosted
-    version: "0.6.17+3"
+    version: "0.6.18"
   flutter_plugin_android_lifecycle:
     dependency: transitive
     description:
@@ -386,10 +386,10 @@ packages:
     dependency: transitive
     description:
       name: image
-      sha256: "6e703d5e2f8c63fb31a77753915c1ec8baebde8088844e0d29f71b8f0b108888"
+      sha256: "028f61960d56f26414eb616b48b04eb37d700cbe477b7fb09bf1d7ce57fd9271"
       url: "https://pub.dev"
     source: hosted
-    version: "4.1.0"
+    version: "4.1.3"
   intl:
     dependency: transitive
     description:
@@ -538,18 +538,18 @@ packages:
     dependency: "direct main"
     description:
       name: permission_handler
-      sha256: ad65ba9af42a3d067203641de3fd9f547ded1410bad3b84400c2b4899faede70
+      sha256: "284a66179cabdf942f838543e10413246f06424d960c92ba95c84439154fcac8"
       url: "https://pub.dev"
     source: hosted
-    version: "11.0.0"
+    version: "11.0.1"
   permission_handler_android:
     dependency: transitive
     description:
       name: permission_handler_android
-      sha256: f2543a236584a5e8be79076f858022f100ce690e31530e6fa4c32ac94f276d3a
+      sha256: ace7d15a3d1a4a0b91c041d01e5405df221edb9de9116525efc773c74e6fc790
       url: "https://pub.dev"
     source: hosted
-    version: "11.0.3"
+    version: "11.0.5"
   permission_handler_apple:
     dependency: transitive
     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:
@@ -879,18 +879,18 @@ packages:
     dependency: "direct main"
     description:
       name: webview_flutter
-      sha256: "82f6787d5df55907aa01e49bd9644f4ed1cc82af7a8257dd9947815959d2e755"
+      sha256: c1ab9b81090705c6069197d9fdc1625e587b52b8d70cdde2339d177ad0dbb98e
       url: "https://pub.dev"
     source: hosted
-    version: "4.2.4"
+    version: "4.4.1"
   webview_flutter_android:
     dependency: transitive
     description:
       name: webview_flutter_android
-      sha256: ddc167c6676f57c8b367d19fcbee267d6dc6adf81bd6c3cb87981d30746e0a6d
+      sha256: b0cd33dd7d3dd8e5f664e11a19e17ba12c352647269921a3b568406b001f1dff
       url: "https://pub.dev"
     source: hosted
-    version: "3.10.1"
+    version: "3.12.0"
   webview_flutter_platform_interface:
     dependency: transitive
     description:
@@ -903,18 +903,18 @@ packages:
     dependency: transitive
     description:
       name: webview_flutter_wkwebview
-      sha256: "485af05f2c5f83c7f78c20e236b170ad02df7153b299ae9917345be43871d29f"
+      sha256: "30b9af6bdd457b44c08748b9190d23208b5165357cc2eb57914fee1366c42974"
       url: "https://pub.dev"
     source: hosted
-    version: "3.8.0"
+    version: "3.9.1"
   win32:
     dependency: transitive
     description:
       name: win32
-      sha256: c97defd418eef4ec88c0d1652cdce84b9f7b63dd7198e266d06ac1710d527067
+      sha256: "350a11abd2d1d97e0cc7a28a81b781c08002aa2864d9e3f192ca0ffa18b06ed3"
       url: "https://pub.dev"
     source: hosted
-    version: "5.0.8"
+    version: "5.0.9"
   win32_registry:
     dependency: transitive
     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.19+211 # When changing this, update the tag in main() accordingly
+version: 0.14.26+218 # When changing this, update the tag in main() accordingly
 
 environment:
   sdk: '>=3.0.0 <4.0.0'
@@ -38,7 +38,7 @@ dependencies:
   cupertino_icons: ^1.0.5
   path_provider: ^2.0.11
   flutter_fgbg: ^0.3.0 # Try removing reliance on this
-  flutter_local_notifications: ^15.1.0+1
+  flutter_local_notifications: ^16.1.0
   provider: ^6.0.3
   http: ^1.0.0
   webview_flutter: ^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: