Switch to a New Background Task Plugin (#608), Add Link Text Filter for HTML Links (#1182), Add Support for Multiple Intermediate Links to HTML Source (#1204)

- Switch to a New Background Task Plugin (#608) - Add Link Text Filter for HTML Links (#1182) - Add Support for Multiple Intermediate Links to HTML Source
2025-07-13 13:26:43 +02:00 · 2023-12-28 16:06:11 -06:00
parent 45fa0a165a
commit 77d81716ed
31 changed files with 606 additions and 437 deletions
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@ -33,7 +33,7 @@ if (keystorePropertiesFile.exists()) {
 }

 android {
-    compileSdkVersion 34
+    compileSdkVersion rootProject.ext.compileSdkVersion
    ndkVersion flutter.ndkVersion

    compileOptions {
@ -54,7 +54,7 @@ android {
        // You can update the following values to match your application needs.
        // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-build-configuration.
        minSdkVersion 24
-        targetSdkVersion 34
+        targetSdkVersion rootProject.ext.targetSdkVersion
        versionCode flutterVersionCode.toInteger()
        versionName flutterVersionName
    }
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@ -1,4 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
    package="dev.imranr.obtainium">
    <application
        android:label="Obtainium"
--- a/android/build.gradle
+++ b/android/build.gradle
@ -1,5 +1,10 @@
 buildscript {
    ext.kotlin_version = '1.7.10'
+    ext {
+        compileSdkVersion   = 34                // or latest
+        targetSdkVersion    = 34                // or latest
+        appCompatVersion    = "1.4.2"           // or latest
+    }
    repositories {
        google()
        mavenCentral()
@ -16,6 +21,10 @@ allprojects {
    repositories {
        google()
        mavenCentral()
+        maven {
+            // [required] background_fetch
+            url "${project(':background_fetch').projectDir}/libs"
+        }
    }
 }

--- a/assets/translations/bs.json
+++ b/assets/translations/bs.json
@ -236,7 +236,7 @@
    "addInfoInSettings": "Dodajte ove informacije u Postavkama.",
    "githubSourceNote": "GitHub ograničavanje se može izbjeći korišćenjem tokena za lični pristup.",
    "gitlabSourceNote": "GitLab APK preuzimanje možda neće raditi bez tokena za lični pristup.",
-    "sortByFileNamesNotLinks": "Sortirajte po imenima datoteka umjesto po punim linkovima",
+    "sortByLastLinkSegment": "Sort by only the last segment of the link",
    "filterReleaseNotesByRegEx": "Filtirajte promjene u izdanju po regularnom izrazu",
    "customLinkFilterRegex": "Prilagođeni APK link filtrira se po regularnom izrazu (Zadano '.apk$')",
    "appsPossiblyUpdated": "Pokušano ažuriranje aplikacija",
@ -246,8 +246,10 @@
    "backgroundUpdateReqsExplanation": "Ažuriranja u pozadini možda neće raditi za sve aplikacije.",
    "backgroundUpdateLimitsExplanation": "Uspjeh ažuriranja u pozadini se može provjeriti tek kada otvorite Obtainium.",
    "verifyLatestTag": "Provjerite 'posljednu' ('latest') oznaku",
-    "intermediateLinkRegex": "Filtrirajte da prvo posjetite 'Intemediate' link",
+    "intermediateLinkRegex": "Filter for an 'Intermediate' Link to Visit",
+    "filterByLinkText": "Filter links by link text",
    "intermediateLinkNotFound": "Intermediate link nije nađen",
+    "intermediateLink": "Intermediate link",
    "exemptFromBackgroundUpdates": "Izuzmi iz ažuriranja u pozadini (ako su uključeni)",
    "bgUpdatesOnWiFiOnly": "Isključite ažuriranje u pozadini kada niste na WiFi-ju",
    "autoSelectHighestVersionCode": "Automatski izaberite najveću (verziju) versionCode APK-a",
--- a/assets/translations/cs.json
+++ b/assets/translations/cs.json
@ -236,7 +236,7 @@
    "addInfoInSettings": "Přidat tuto informaci do nastavení.",
    "githubSourceNote": "Omezení rychlosti GitHub lze obejít pomocí klíče API.",
    "gitlabSourceNote": "Extrakce GitLab APK nemusí fungovat bez klíče API",
-    "sortByFileNamesNotLinks": "Řadit podle názvů souborů místo celých odkazů",
+    "sortByLastLinkSegment": "Sort by only the last segment of the link",
    "filterReleaseNotesByRegEx": "Filtrovat poznámky k vydání podle regulárního výrazu",
    "customLinkFilterRegex": "Vlastní filtr odkazů APK podle regulárního výrazu (výchozí '.apk$')",
    "appsPossiblyUpdated": "Byly provedeny pokusy o aktualizaci aplikací",
@ -246,8 +246,10 @@
    "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.",
    "verifyLatestTag": "Ověřit značku 'latest'",
-    "intermediateLinkRegex": "Filter for an 'Intermediate' Link to Visit First",
+    "intermediateLinkRegex": "Filter for an 'Intermediate' Link to Visit",
+    "filterByLinkText": "Filter links by link text",
    "intermediateLinkNotFound": "Intermediate link not found",
+    "intermediateLink": "Intermediate link",
    "exemptFromBackgroundUpdates": "Vyloučit aktualizace na pozadí (pokud jsou povoleny)",
    "bgUpdatesOnWiFiOnly": "Zakázat aktualizace na pozadí, pokud není přítomna Wi-Fi",
    "autoSelectHighestVersionCode": "Automatický výběr nejvyššího kódu verze APK",
--- a/assets/translations/de.json
+++ b/assets/translations/de.json
@ -236,7 +236,7 @@
    "addInfoInSettings": "Fügen Sie diese Info in den Einstellungen hinzu.",
    "githubSourceNote": "Die GitHub-Ratenbegrenzung kann mit einem API-Schlüssel umgangen werden.",
    "gitlabSourceNote": "GitLab APK-Extraktion funktioniert möglicherweise nicht ohne API-Schlüssel",
-    "sortByFileNamesNotLinks": "Sortiere nach Dateinamen, anstelle von ganzen Links",
+    "sortByLastLinkSegment": "Sort by only the last segment of the link",
    "filterReleaseNotesByRegEx": "Versionshinweise nach regulärem Ausdruck filtern",
    "customLinkFilterRegex": "Benutzerdefinierter APK Link Filter nach Regulärem Ausdruck (Standard '.apk$')",
    "appsPossiblyUpdated": "App Aktualisierungen wurden versucht",
@ -246,8 +246,10 @@
    "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",
+    "intermediateLinkRegex": "Filter for an 'Intermediate' Link to Visit",
+    "filterByLinkText": "Filter links by link text",
    "intermediateLinkNotFound": "„Zwischen“link nicht gefunden",
+    "intermediateLink": "Intermediate link",
    "exemptFromBackgroundUpdates": "Ausschluss von Hintergrundaktualisierungen (falls aktiviert)",
    "bgUpdatesOnWiFiOnly": "Hintergrundaktualisierungen deaktivieren, wenn kein WLAN vorhanden ist",
    "autoSelectHighestVersionCode": "Automatisch höchste APK-Version auswählen",
--- a/assets/translations/en.json
+++ b/assets/translations/en.json
@ -236,7 +236,7 @@
    "addInfoInSettings": "Add this info in the Settings.",
    "githubSourceNote": "GitHub rate limiting can be avoided using an API key.",
    "gitlabSourceNote": "GitLab APK extraction may not work without an API key.",
-    "sortByFileNamesNotLinks": "Sort by file names instead of full links",
+    "sortByLastLinkSegment": "Sort by only the last segment of the link",
    "filterReleaseNotesByRegEx": "Filter Release Notes by Regular Expression",
    "customLinkFilterRegex": "Custom APK Link Filter by Regular Expression (Default '.apk$')",
    "appsPossiblyUpdated": "App Updates Attempted",
@ -246,8 +246,10 @@
    "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",
+    "intermediateLinkRegex": "Filter for an 'Intermediate' Link to Visit",
+    "filterByLinkText": "Filter links by link text",
    "intermediateLinkNotFound": "Intermediate link not found",
+    "intermediateLink": "Intermediate link",
    "exemptFromBackgroundUpdates": "Exempt from background updates (if enabled)",
    "bgUpdatesOnWiFiOnly": "Disable background updates when not on WiFi",
    "autoSelectHighestVersionCode": "Auto-select highest versionCode APK",
--- a/assets/translations/es.json
+++ b/assets/translations/es.json
@ -236,7 +236,7 @@
    "addInfoInSettings": "Añadir esta información en Ajustes.",
    "githubSourceNote": "La limitación de velocidad de GitHub puede evitarse con una clave API.",
    "gitlabSourceNote": "La extracción de APK de GitLab podría no funcionar sin una clave API.",
-    "sortByFileNamesNotLinks": "Ordenar por nombres de fichero en vez de por enlaces completos",
+    "sortByLastLinkSegment": "Sort by only the last segment of the link",
    "filterReleaseNotesByRegEx": "Filtrar por Notas de Versión (Release Notes)",
    "customLinkFilterRegex": "Filtro personalizado de Enlace APK (por defecto '.apk$')",
    "appsPossiblyUpdated": "Actualización de Apps intentada",
@ -246,8 +246,10 @@
    "backgroundUpdateReqsExplanation": "Las actualizaciones en segundo plano pueden no estar disponibles para todas las aplicaciones.",
    "backgroundUpdateLimitsExplanation": "El éxito de las instalaciones en segundo plano solo se puede comprobar con Obtainium abierto.",
    "verifyLatestTag": "Comprueba la etiqueta 'latest'",
-    "intermediateLinkRegex": "Filtrar por Enlace 'Intermedio' para Visitar Primero",
+    "intermediateLinkRegex": "Filter for an 'Intermediate' Link to Visit",
+    "filterByLinkText": "Filter links by link text",
    "intermediateLinkNotFound": "Enlace Intermedio no encontrado",
+    "intermediateLink": "Intermediate link",
    "exemptFromBackgroundUpdates": "Exento de actualizciones en segundo plano (si están habilitadas)",
    "bgUpdatesOnWiFiOnly": "Deshabilitar las actualizaciones en segundo plano sin WiFi",
    "autoSelectHighestVersionCode": "Auto Selección de la versionCode APK superior",
--- a/assets/translations/fa.json
+++ b/assets/translations/fa.json
@ -236,7 +236,7 @@
    "addInfoInSettings": "این اطلاعات را در تنظیمات اضافه کنید.",
    "githubSourceNote": "با استفاده از کلید API می توان از محدودیت نرخ GitHub جلوگیری کرد.",
    "gitlabSourceNote": "استخراج APK GitLab ممکن است بدون کلید API کار نکند.",
-    "sortByFileNamesNotLinks": "مرتب سازی بر اساس نام فایل به جای پیوندهای کامل",
+    "sortByLastLinkSegment": "Sort by only the last segment of the link",
    "filterReleaseNotesByRegEx": "یادداشت های انتشار را با بیان منظم فیلتر کنید",
    "customLinkFilterRegex": "فیلتر پیوند سفارشی بر اساس عبارت منظم (پیش‌فرض '.apk$')",
    "appsPossiblyUpdated": "به‌روزرسانی برنامه انجام شد",
@ -246,8 +246,10 @@
    "backgroundUpdateReqsExplanation": "به روز رسانی پس زمینه ممکن است برای همه برنامه ها امکان پذیر نباشد.",
    "backgroundUpdateLimitsExplanation": "موفقیت نصب پس‌زمینه تنها زمانی مشخص می‌شود که Obtainium باز شود.",
    "verifyLatestTag": "برچسب \"آخرین\" را تأیید کنید",
-    "intermediateLinkRegex": "برای اولین بار بازدید از لینک \"متوسط\" را فیلتر کنید",
+    "intermediateLinkRegex": "Filter for an 'Intermediate' Link to Visit",
+    "filterByLinkText": "Filter links by link text",
    "intermediateLinkNotFound": "لینک میانی پیدا نشد",
+    "intermediateLink": "Intermediate link",
    "exemptFromBackgroundUpdates": "معاف از به‌روزرسانی‌های پس‌زمینه (در صورت فعال بودن)",
    "bgUpdatesOnWiFiOnly": "به‌روزرسانی‌های پس‌زمینه را در صورت عدم اتصال به WiFi غیرفعال کنید",
    "autoSelectHighestVersionCode": "انتخاب خودکار بالاترین نسخه کد APK",
--- a/assets/translations/fr.json
+++ b/assets/translations/fr.json
@ -236,7 +236,7 @@
    "addInfoInSettings": "Add this info in the Settings.",
    "githubSourceNote": "GitHub rate limiting can be avoided using an API key.",
    "gitlabSourceNote": "GitLab APK extraction may not work without an API key.",
-    "sortByFileNamesNotLinks": "Sort by file names instead of full links",
+    "sortByLastLinkSegment": "Sort by only the last segment of the link",
    "filterReleaseNotesByRegEx": "Filter Release Notes by Regular Expression",
    "customLinkFilterRegex": "Custom APK Link Filter by Regular Expression (Default '.apk$')",
    "appsPossiblyUpdated": "App Updates Attempted",
@ -246,8 +246,10 @@
    "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",
+    "intermediateLinkRegex": "Filter for an 'Intermediate' Link to Visit",
+    "filterByLinkText": "Filter links by link text",
    "intermediateLinkNotFound": "Intermediate link not found",
+    "intermediateLink": "Intermediate link",
    "exemptFromBackgroundUpdates": "Exempt from background updates (if enabled)",
    "bgUpdatesOnWiFiOnly": "Disable background updates when not on WiFi",
    "autoSelectHighestVersionCode": "Auto-select highest versionCode APK",
--- a/assets/translations/hu.json
+++ b/assets/translations/hu.json
@ -236,7 +236,7 @@
    "addInfoInSettings": "Adja hozzá ezt az infót a Beállításokban.",
    "githubSourceNote": "A GitHub sebességkorlátozás elkerülhető API-kulcs használatával.",
    "gitlabSourceNote": "Előfordulhat, hogy a GitLab APK kibontása nem működik API-kulcs nélkül.",
-    "sortByFileNamesNotLinks": "Fájlnevek szerinti elrendezés teljes linkek helyett",
+    "sortByLastLinkSegment": "Sort by only the last segment of the link",
    "filterReleaseNotesByRegEx": "Kiadási megjegyzések szűrése reguláris kifejezéssel",
    "customLinkFilterRegex": "Egyéni APK hivatkozásszűrő reguláris kifejezéssel (Alapérték '.apk$')",
    "appsPossiblyUpdated": "App frissítési kísérlet",
@ -245,8 +245,10 @@
    "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": "Szűrés egy 'közvetítő' linkre, amelyet először meg kell látogatni",
+    "intermediateLinkRegex": "Filter for an 'Intermediate' Link to Visit",
+    "filterByLinkText": "Filter links by link text",
    "intermediateLinkNotFound": "Közvetítő link nem található",
+    "intermediateLink": "Intermediate link",
    "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",
--- a/assets/translations/it.json
+++ b/assets/translations/it.json
@ -236,7 +236,7 @@
    "addInfoInSettings": "Aggiungi questa info nelle impostazioni.",
    "githubSourceNote": "Il limite di ricerca GitHub può essere evitato usando una chiave API.",
    "gitlabSourceNote": "L'estrazione di APK da GitLab potrebbe non funzionare senza chiave API.",
-    "sortByFileNamesNotLinks": "Ordina per nome del file invece dei link completi",
+    "sortByLastLinkSegment": "Sort by only the last segment of the link",
    "filterReleaseNotesByRegEx": "Filtra le note di rilascio con espressione regolare",
    "customLinkFilterRegex": "Filtra link APK personalizzato con espressione regolare (predefinito '.apk$')",
    "appsPossiblyUpdated": "Aggiornamenti app tentati",
@ -246,8 +246,10 @@
    "backgroundUpdateReqsExplanation": "Gli aggiornamenti in secondo piano potrebbero non essere possibili per tutte le app.",
    "backgroundUpdateLimitsExplanation": "La riuscita di un'installazione in secondo piano può essere determinata solo quando viene aperto Obtainium.",
    "verifyLatestTag": "Verifica l'etichetta 'Latest'",
-    "intermediateLinkRegex": "Filtra un link 'Intermedio' da visitare prima",
+    "intermediateLinkRegex": "Filter for an 'Intermediate' Link to Visit",
+    "filterByLinkText": "Filter links by link text",
    "intermediateLinkNotFound": "Link intermedio non trovato",
+    "intermediateLink": "Intermediate link",
    "exemptFromBackgroundUpdates": "Esente da aggiornamenti in secondo piano (se attivo)",
    "bgUpdatesOnWiFiOnly": "Disattiva aggiornamenti in secondo piano quando non si usa il WiFi",
    "autoSelectHighestVersionCode": "Auto-seleziona APK con versionCode più alto",
--- a/assets/translations/ja.json
+++ b/assets/translations/ja.json
@ -236,7 +236,7 @@
    "addInfoInSettings": "設定でこの情報を追加してください。",
    "githubSourceNote": "GitHubのレート制限はAPIキーを使うことで回避できます。",
    "gitlabSourceNote": "GitLabのAPK抽出はAPIキーがないと動作しない場合があります。",
-    "sortByFileNamesNotLinks": "フルのリンクではなくファイル名でソートする",
+    "sortByLastLinkSegment": "Sort by only the last segment of the link",
    "filterReleaseNotesByRegEx": "正規表現でリリースノートをフィルタリングする",
    "customLinkFilterRegex": "正規表現によるカスタムリンクフィルター (デフォルト '.apk$')",
    "appsPossiblyUpdated": "アプリのアップデートを試行",
@ -246,8 +246,10 @@
    "backgroundUpdateReqsExplanation": "バックグラウンドアップデートは、すべてのアプリで可能とは限りません。",
    "backgroundUpdateLimitsExplanation": "バックグラウンドアップデートが成功したかどうかは、Obtainiumを起動したときにしか判断できません。",
    "verifyLatestTag": "'latest'タグを確認する",
-    "intermediateLinkRegex": "最初にアクセスする「中間」リンクをフィルタリングする",
+    "intermediateLinkRegex": "Filter for an 'Intermediate' Link to Visit",
+    "filterByLinkText": "Filter links by link text",
    "intermediateLinkNotFound": "中間リンクが見つかりませんでした",
+    "intermediateLink": "Intermediate link",
    "exemptFromBackgroundUpdates": "バックグラウンドアップデートを行わない (有効な場合)",
    "bgUpdatesOnWiFiOnly": "WiFiを使用していない場合，バックグラウンドアップデートを無効にする",
    "autoSelectHighestVersionCode": "最も高いバージョンコードのAPKを自動で選択する",
--- a/assets/translations/nl.json
+++ b/assets/translations/nl.json
@ -236,7 +236,7 @@
    "addInfoInSettings": "Voeg deze informatie toe in de instellingen.",
    "githubSourceNote": "Beperkingen van GitHub kunnen worden vermeden door het gebruik van een API-sleutel.",
    "gitlabSourceNote": "GitLab APK-extractie werkt mogelijk niet zonder een API-sleutel.",
-    "sortByFileNamesNotLinks": "Sorteren op bestandsnamen in plaats van volledige links.",
+    "sortByLastLinkSegment": "Sort by only the last segment of the link",
    "filterReleaseNotesByRegEx": "Filter release-opmerkingen met een reguliere expressie.",
    "customLinkFilterRegex": "Aangepaste APK-linkfilter met een reguliere expressie (Standaard '.apk$').",
    "appsPossiblyUpdated": "Poging tot app-updates",
@ -246,8 +246,10 @@
    "backgroundUpdateReqsExplanation": "Achtergrondupdates zijn mogelijk niet voor alle apps mogelijk.",
    "backgroundUpdateLimitsExplanation": "Het succes van een installatie in de achtergrond kan alleen worden bepaald wanneer Obtainium is geopend.",
    "verifyLatestTag": "Verifieer de 'Laatste'-tag",
-    "intermediateLinkRegex": "Filter voor een 'tussenliggende' link om eerst te bezoeken",
+    "intermediateLinkRegex": "Filter for an 'Intermediate' Link to Visit",
+    "filterByLinkText": "Filter links by link text",
    "intermediateLinkNotFound": "Tussenliggende link niet gevonden",
+    "intermediateLink": "Intermediate link",
    "exemptFromBackgroundUpdates": "Vrijgesteld van achtergrondupdates (indien ingeschakeld)",
    "bgUpdatesOnWiFiOnly": "Achtergrondupdates uitschakelen wanneer niet verbonden met WiFi",
    "autoSelectHighestVersionCode": "Automatisch de APK met de hoogste versiecode selecteren",
--- a/assets/translations/pl.json
+++ b/assets/translations/pl.json
@ -236,7 +236,7 @@
    "addInfoInSettings": "Dodaj tę informację w Ustawieniach.",
    "githubSourceNote": "Limit żądań GitHub można ominąć za pomocą klucza API.",
    "gitlabSourceNote": "Pozyskiwanie pliku APK z GitLab może nie działać bez klucza API.",
-    "sortByFileNamesNotLinks": "Sortuj wg nazw plików zamiast pełnych linków",
+    "sortByLastLinkSegment": "Sort by only the last segment of the link",
    "filterReleaseNotesByRegEx": "Filtruj informacje o wersji według wyrażenia regularnego",
    "customLinkFilterRegex": "Filtruj linki APK według wyrażenia regularnego (domyślnie \".apk$\")",
    "appsPossiblyUpdated": "Aplikacje mogły zostać zaktualizowane",
@ -246,8 +246,10 @@
    "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",
+    "intermediateLinkRegex": "Filter for an 'Intermediate' Link to Visit",
+    "filterByLinkText": "Filter links by link text",
    "intermediateLinkNotFound": "Nie znaleziono linku pośredniego",
+    "intermediateLink": "Intermediate link",
    "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",
--- a/assets/translations/pt.json
+++ b/assets/translations/pt.json
@ -236,7 +236,7 @@
    "addInfoInSettings": "Adicionar essa informação nas configurações.",
    "githubSourceNote": "A limitação de taxa do GitHub pode ser evitada usando uma chave de API.",
    "gitlabSourceNote": "A extração de APK do GitLab pode não funcionar sem uma chave de API.",
-    "sortByFileNamesNotLinks": "Classifique por nomes de arquivos em vez de links completos",
+    "sortByLastLinkSegment": "Sort by only the last segment of the link",
    "filterReleaseNotesByRegEx": "Filtrar Notas de Lançamento por Expressão Regular",
    "customLinkFilterRegex": "Filtro de Link Personalizado por Expressão Regular (Padrão '.apk$')",
    "appsPossiblyUpdated": "Tentativas de atualização de Apps",
@ -246,8 +246,10 @@
    "backgroundUpdateReqsExplanation": "Atualizações em segundo plano podem não ser possíveis para todos os Apps.",
    "backgroundUpdateLimitsExplanation": "O sucesso de uma instalação em segundo plano só pode ser determinado quando o Obtainium é aberto.",
    "verifyLatestTag": "Verifique a 'ultima' etiqueta",
-    "intermediateLinkRegex": "Filtre por um Link 'Intermediário' para Visitar Primeiro",
+    "intermediateLinkRegex": "Filter for an 'Intermediate' Link to Visit",
+    "filterByLinkText": "Filter links by link text",
    "intermediateLinkNotFound": "Link intermediário não encontrado",
+    "intermediateLink": "Intermediate link",
    "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-selecionar o maior codigo de versão",
--- a/assets/translations/ru.json
+++ b/assets/translations/ru.json
@ -236,7 +236,7 @@
    "addInfoInSettings": "Добавьте эту информацию в Настройки",
    "githubSourceNote": "Используя ключ API можно обойти лимит запросов GitHub",
    "gitlabSourceNote": "Без ключа API может не работать извлечение APK с GitLab",
-    "sortByFileNamesNotLinks": "Сортировать по именам файлов, а не ссылкам целиком",
+    "sortByLastLinkSegment": "Sort by only the last segment of the link",
    "filterReleaseNotesByRegEx": "Фильтровать примечания к выпуску\n(регулярное выражение)",
    "customLinkFilterRegex": "Пользовательский фильтр ссылок APK\n(регулярное выражение, по умолчанию: '.apk$')",
    "appsPossiblyUpdated": "Попытки обновления приложений",
@ -246,8 +246,10 @@
    "backgroundUpdateReqsExplanation": "Фоновые обновления могут быть возможны не для всех приложений",
    "backgroundUpdateLimitsExplanation": "Успешность фоновой установки можно определить только после открытия Obtainium",
    "verifyLatestTag": "Проверять тег 'latest'",
-    "intermediateLinkRegex": "Фильтр промежуточных ссылок для первоочередного посещения\n(регулярное выражение)",
+    "intermediateLinkRegex": "Filter for an 'Intermediate' Link to Visit",
+    "filterByLinkText": "Filter links by link text",
    "intermediateLinkNotFound": "Промежуточная ссылка не найдена",
+    "intermediateLink": "Intermediate link",
    "exemptFromBackgroundUpdates": "Исключить из фоновых обновлений (если включено)",
    "bgUpdatesOnWiFiOnly": "Отключить фоновые обновления, если нет соединения с Wi-Fi",
    "autoSelectHighestVersionCode": "Автоматически выбирать APK с актуальной версией кода",
--- a/assets/translations/sv.json
+++ b/assets/translations/sv.json
@ -236,7 +236,7 @@
    "addInfoInSettings": "Lägg till denna information i Inställningar.",
    "githubSourceNote": "GitHub rate limiting can be avoided using an API key.",
    "gitlabSourceNote": "GitLab APK extraction may not work without an API key.",
-    "sortByFileNamesNotLinks": "Sort by file names instead of full links",
+    "sortByLastLinkSegment": "Sort by only the last segment of the link",
    "filterReleaseNotesByRegEx": "Filter Release Notes by Regular Expression",
    "customLinkFilterRegex": "Custom APK Link Filter by Regular Expression (Default '.apk$')",
    "appsPossiblyUpdated": "App Updates Attempted",
@ -246,8 +246,10 @@
    "backgroundUpdateReqsExplanation": "Bakgrundsuppdateringar är inte möjligt för alla appar.",
    "backgroundUpdateLimitsExplanation": "The success of a background install can only be determined when Obtainium is opened.",
    "verifyLatestTag": "Verifiera 'senaste'-taggen",
-    "intermediateLinkRegex": "Filter for an 'Intermediate' Link to Visit First",
+    "intermediateLinkRegex": "Filter for an 'Intermediate' Link to Visit",
+    "filterByLinkText": "Filter links by link text",
    "intermediateLinkNotFound": "Intermediate link not found",
+    "intermediateLink": "Intermediate link",
    "exemptFromBackgroundUpdates": "Undta från bakgrundsuppdateringar (om aktiverad)",
    "bgUpdatesOnWiFiOnly": "Inaktivera Bakgrundsuppdateringar utan WiFi",
    "autoSelectHighestVersionCode": "Auto-select highest versionCode APK",
--- a/assets/translations/tr.json
+++ b/assets/translations/tr.json
@ -236,7 +236,7 @@
    "addInfoInSettings": "Bu bilgiyi Ayarlar'da ekleyin.",
    "githubSourceNote": "GitHub hız sınırlaması bir API anahtarı kullanılarak atlanabilir.",
    "gitlabSourceNote": "GitLab APK çıkarma işlemi bir API anahtarı olmadan çalışmayabilir.",
-    "sortByFileNamesNotLinks": "Bağlantılar yerine dosya adlarına göre sırala",
+    "sortByLastLinkSegment": "Sort by only the last segment of the link",
    "filterReleaseNotesByRegEx": "Sürüm Notlarını Düzenli İfade ile Filtrele",
    "customLinkFilterRegex": "Özel APK Bağlantı Filtresi Düzenli İfade ile (Varsayılan '.apk$')",
    "appsPossiblyUpdated": "Uygulama Güncellemeleri Denendi",
@ -246,8 +246,10 @@
    "backgroundUpdateReqsExplanation": "Arka plan güncellemeleri tüm uygulamalar için mümkün olmayabilir.",
    "backgroundUpdateLimitsExplanation": "Arka plan kurulumunun başarısı, Obtainium'un açıldığında ancak belirlenebilir.",
    "verifyLatestTag": "'latest' etiketini doğrula",
-    "intermediateLinkRegex": "İlk Ziyaret Edilecek 'Ara' Bağlantısını Filtrele",
+    "intermediateLinkRegex": "Filter for an 'Intermediate' Link to Visit",
+    "filterByLinkText": "Filter links by link text",
    "intermediateLinkNotFound": "Ara bağlantı bulunamadı",
+    "intermediateLink": "Intermediate link",
    "exemptFromBackgroundUpdates": "Arka plan güncellemelerinden muaf tut (etkinse)",
    "bgUpdatesOnWiFiOnly": "WiFi olmadığında arka plan güncellemelerini devre dışı bırak",
    "autoSelectHighestVersionCode": "Otomatik olarak en yüksek sürüm kodunu seç",
--- a/assets/translations/vi.json
+++ b/assets/translations/vi.json
@ -236,7 +236,7 @@
    "addInfoInSettings": "Thêm thông tin này vào Cài đặt.",
    "githubSourceNote": "Có thể tránh được việc giới hạn tốc độ GitHub bằng cách sử dụng khóa API.",
    "gitlabSourceNote": "Trích xuất APK GitLab có thể không hoạt động nếu không có khóa API.",
-    "sortByFileNamesNotLinks": "Sắp xếp theo tên tệp thay vì liên kết đầy đủ",
+    "sortByLastLinkSegment": "Sort by only the last segment of the link",
    "filterReleaseNotesByRegEx": "Lọc ghi chú phát hành theo biểu thức chính quy",
    "customLinkFilterRegex": "Bộ lọc liên kết APK tùy chỉnh theo biểu thức chính quy (Mặc định '.apk$')",
    "appsPossiblyUpdated": "Đã cố gắng cập nhật ứng dụng",
@ -246,8 +246,10 @@
    "backgroundUpdateReqsExplanation": "Có thể không thực hiện được cập nhật nền cho tất cả ứng dụng.",
    "backgroundUpdateLimitsExplanation": "Sự thành công của cài đặt nền chỉ có thể được xác định khi mở Obtainium.",
    "verifyLatestTag": "Xác minh thẻ 'mới nhất'",
-    "intermediateLinkRegex": "Lọc tìm liên kết 'Trung gian' để truy cập trước",
+    "intermediateLinkRegex": "Filter for an 'Intermediate' Link to Visit",
+    "filterByLinkText": "Filter links by link text",
    "intermediateLinkNotFound": "Không tìm thấy liên kết trung gian",
+    "intermediateLink": "Intermediate link",
    "exemptFromBackgroundUpdates": "Miễn cập nhật nền (nếu được bật)",
    "bgUpdatesOnWiFiOnly": "Tắt cập nhật nền khi không có WiFi",
    "autoSelectHighestVersionCode": "Tự động chọn APK mã phiên bản cao nhất",
--- a/assets/translations/zh.json
+++ b/assets/translations/zh.json
@ -236,7 +236,7 @@
    "addInfoInSettings": "在“设置”中添加此凭据。",
    "githubSourceNote": "使用访问令牌可避免触发 GitHub 的 API 请求限制。",
    "gitlabSourceNote": "未使用访问令牌时可能无法从 GitLab 获取 APK 文件。",
-    "sortByFileNamesNotLinks": "使用文件名代替链接进行排序",
+    "sortByLastLinkSegment": "Sort by only the last segment of the link",
    "filterReleaseNotesByRegEx": "筛选发行说明（正则表达式）",
    "customLinkFilterRegex": "筛选自定义来源 APK 文件链接\n（正则表达式，默认匹配模式为“.apk$”）",
    "appsPossiblyUpdated": "已尝试更新应用",
@ -246,8 +246,10 @@
    "backgroundUpdateReqsExplanation": "后台更新未必适用于所有的应用。",
    "backgroundUpdateLimitsExplanation": "只有在启动 Obtainium 时才能确认安装是否成功。",
    "verifyLatestTag": "验证“Latest”标签",
-    "intermediateLinkRegex": "筛选首先访问的“中转”链接（正则表达式）",
+    "intermediateLinkRegex": "Filter for an 'Intermediate' Link to Visit",
+    "filterByLinkText": "Filter links by link text",
    "intermediateLinkNotFound": "未找到“中转”链接",
+    "intermediateLink": "Intermediate link",
    "exemptFromBackgroundUpdates": "禁用后台更新\n（如果已经全局启用）",
    "bgUpdatesOnWiFiOnly": "未连接 Wi-Fi 时禁用后台更新",
    "autoSelectHighestVersionCode": "自动选择版本号最高的 APK 文件",
--- a/lib/app_sources/aptoide.dart
+++ b/lib/app_sources/aptoide.dart
@ -7,7 +7,7 @@ import 'package:obtainium/providers/source_provider.dart';
 class Aptoide extends AppSource {
  Aptoide() {
    host = 'aptoide.com';
-    name = tr('Aptoide');
+    name = 'Aptoide';
    allowSubDomains = true;
    naiveStandardVersionDetection = true;
  }
--- a/lib/app_sources/html.dart
+++ b/lib/app_sources/html.dart
@ -88,18 +88,7 @@ bool _isNumeric(String s) {
 }

 class HTML extends AppSource {
-  HTML() {
-    additionalSourceAppSpecificSettingFormItems = [
-      [
-        GeneratedFormSwitch('sortByFileNamesNotLinks',
-            label: tr('sortByFileNamesNotLinks'))
-      ],
-      [GeneratedFormSwitch('skipSort', label: tr('skipSort'))],
-      [GeneratedFormSwitch('reverseSort', label: tr('takeFirstLink'))],
-      [
-        GeneratedFormSwitch('supportFixedAPKURL',
-            defaultValue: true, label: tr('supportFixedAPKURL')),
-      ],
+  var finalStepFormitems = [
    [
      GeneratedFormTextField('customLinkFilterRegex',
          label: tr('customLinkFilterRegex'),
@ -111,13 +100,6 @@ class HTML extends AppSource {
            }
          ])
    ],
-      [
-        GeneratedFormTextField('intermediateLinkRegex',
-            label: tr('intermediateLinkRegex'),
-            hint: '([0-9]+.)*[0-9]+/\$',
-            required: false,
-            additionalValidators: [(value) => regExValidator(value)])
-      ],
    [
      GeneratedFormTextField('versionExtractionRegEx',
          label: tr('versionExtractionRegEx'),
@ -143,7 +125,40 @@ class HTML extends AppSource {
    [
      GeneratedFormSwitch('versionExtractWholePage',
          label: tr('versionExtractWholePage'))
-      ]
+    ],
+    [
+      GeneratedFormSwitch('supportFixedAPKURL',
+          defaultValue: true, label: tr('supportFixedAPKURL')),
+    ],
+  ];
+  var commonFormItems = [
+    [GeneratedFormSwitch('filterByLinkText', label: tr('filterByLinkText'))],
+    [GeneratedFormSwitch('skipSort', label: tr('skipSort'))],
+    [GeneratedFormSwitch('reverseSort', label: tr('takeFirstLink'))],
+    [
+      GeneratedFormSwitch('sortByLastLinkSegment',
+          label: tr('sortByLastLinkSegment'))
+    ],
+  ];
+  var intermediateFormItems = [
+    [
+      GeneratedFormTextField('customLinkFilterRegex',
+          label: tr('intermediateLinkRegex'),
+          hint: '([0-9]+.)*[0-9]+/\$',
+          required: true,
+          additionalValidators: [(value) => regExValidator(value)])
+    ],
+  ];
+  HTML() {
+    additionalSourceAppSpecificSettingFormItems = [
+      [
+        GeneratedFormSubForm(
+            'intermediateLink', [...intermediateFormItems, ...commonFormItems],
+            label: tr('intermediateLink'))
+      ],
+      finalStepFormitems[0],
+      ...commonFormItems,
+      ...finalStepFormitems.sublist(1)
    ];
    overrideVersionDetectionFormDefault('noVersionDetection',
        disableStandard: false, disableRelDate: true);
@ -164,77 +179,93 @@ class HTML extends AppSource {
    return url;
  }

-  @override
-  Future<APKDetails> getLatestAPKDetails(
-    String standardUrl,
-    Map<String, dynamic> additionalSettings,
-  ) async {
-    var uri = Uri.parse(standardUrl);
-    Response res = await sourceRequest(standardUrl);
-    if (res.statusCode == 200) {
+  // Given an HTTP response, grab some links according to the common additional settings
+  // (those that apply to intermediate and final steps)
+  Future<List<MapEntry<String, String>>> grabLinksCommon(
+      Response res, Map<String, dynamic> additionalSettings) async {
+    if (res.statusCode != 200) {
+      throw getObtainiumHttpError(res);
+    }
    var html = parse(res.body);
-      List<String> allLinks = html
+    List<MapEntry<String, String>> allLinks = html
        .querySelectorAll('a')
-          .map((element) => element.attributes['href'] ?? '')
-          .where((element) => element.isNotEmpty)
+        .map((element) => MapEntry(
+            element.attributes['href'] ?? '',
+            element.text.isNotEmpty
+                ? element.text
+                : (element.attributes['href'] ?? '').split('/').last))
+        .where((element) => element.key.isNotEmpty)
        .toList();
    if (allLinks.isEmpty) {
      allLinks = RegExp(
              r'(http|ftp|https)://([\w_-]+(?:(?:\.[\w_-]+)+))([\w.,@?^=%&:/~+#-]*[\w@?^=%&/~+#-])?')
          .allMatches(res.body)
-            .map((match) => match.group(0)!)
+          .map((match) =>
+              MapEntry(match.group(0)!, match.group(0)?.split('/').last ?? ''))
          .toList();
    }
-      List<String> links = [];
+    List<MapEntry<String, String>> links = [];
    bool skipSort = additionalSettings['skipSort'] == true;
-      if ((additionalSettings['intermediateLinkRegex'] as String?)
-              ?.isNotEmpty ==
-          true) {
-        var reg = RegExp(additionalSettings['intermediateLinkRegex']);
-        links = allLinks.where((element) => reg.hasMatch(element)).toList();
-        if (!skipSort) {
-          links.sort((a, b) => compareAlphaNumeric(a, b));
-        }
-        if (links.isEmpty) {
-          throw ObtainiumError(tr('intermediateLinkNotFound'));
-        }
-        Map<String, dynamic> additionalSettingsTemp =
-            Map.from(additionalSettings);
-        additionalSettingsTemp['intermediateLinkRegex'] = null;
-        return getLatestAPKDetails(
-            ensureAbsoluteUrl(links.last, uri), additionalSettingsTemp);
-      }
-      if ((additionalSettings['customLinkFilterRegex'] as String?)
-              ?.isNotEmpty ==
+    bool filterLinkByText = additionalSettings['filterByLinkText'] == true;
+    if ((additionalSettings['customLinkFilterRegex'] as String?)?.isNotEmpty ==
        true) {
      var reg = RegExp(additionalSettings['customLinkFilterRegex']);
-        links = allLinks.where((element) => reg.hasMatch(element)).toList();
+      links = allLinks
+          .where((element) =>
+              reg.hasMatch(filterLinkByText ? element.value : element.key))
+          .toList();
    } else {
      links = allLinks
          .where((element) =>
-                Uri.parse(element).path.toLowerCase().endsWith('.apk'))
+              Uri.parse(filterLinkByText ? element.value : element.key)
+                  .path
+                  .toLowerCase()
+                  .endsWith('.apk'))
          .toList();
    }
    if (!skipSort) {
-        links.sort((a, b) =>
-            additionalSettings['sortByFileNamesNotLinks'] == true
+      links.sort((a, b) => additionalSettings['sortByLastLinkSegment'] == true
          ? compareAlphaNumeric(
-                    a.split('/').where((e) => e.isNotEmpty).last,
-                    b.split('/').where((e) => e.isNotEmpty).last)
-                : compareAlphaNumeric(a, b));
+              a.key.split('/').where((e) => e.isNotEmpty).last,
+              b.key.split('/').where((e) => e.isNotEmpty).last)
+          : compareAlphaNumeric(a.key, b.key));
    }
    if (additionalSettings['reverseSort'] == true) {
      links = links.reversed.toList();
    }
-      if ((additionalSettings['apkFilterRegEx'] as String?)?.isNotEmpty ==
-          true) {
+    return links;
+  }
+
+  @override
+  Future<APKDetails> getLatestAPKDetails(
+    String standardUrl,
+    Map<String, dynamic> additionalSettings,
+  ) async {
+    var currentUrl = standardUrl;
+    for (int i = 0;
+        i < (additionalSettings['intermediateLink']?.length ?? 0);
+        i++) {
+      var intLinks = await grabLinksCommon(await sourceRequest(currentUrl),
+          additionalSettings['intermediateLink'][i]);
+      if (intLinks.isEmpty) {
+        throw NoReleasesError();
+      } else {
+        currentUrl = intLinks.last.key;
+      }
+    }
+
+    var uri = Uri.parse(currentUrl);
+    Response res = await sourceRequest(currentUrl);
+    var links = await grabLinksCommon(res, additionalSettings);
+
+    if ((additionalSettings['apkFilterRegEx'] as String?)?.isNotEmpty == true) {
      var reg = RegExp(additionalSettings['apkFilterRegEx']);
-        links = links.where((element) => reg.hasMatch(element)).toList();
+      links = links.where((element) => reg.hasMatch(element.key)).toList();
    }
    if (links.isEmpty) {
      throw NoReleasesError();
    }
-      var rel = links.last;
+    var rel = links.last.key;
    String? version;
    if (additionalSettings['supportFixedAPKURL'] != true) {
      version = rel.hashCode.toString();
@ -263,8 +294,5 @@ class HTML extends AppSource {
    version ??= (await checkDownloadHash(rel)).toString();
    return APKDetails(version, [rel].map((e) => MapEntry(e, e)).toList(),
        AppNames(uri.host, tr('app')));
-    } else {
-      throw getObtainiumHttpError(res);
-    }
  }
 }
--- a/lib/components/generated_form.dart
+++ b/lib/components/generated_form.dart
@ -4,6 +4,7 @@ import 'package:hsluv/hsluv.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:obtainium/components/generated_form_modal.dart';
+import 'package:obtainium/providers/source_provider.dart';

 abstract class GeneratedFormItem {
  late String key;
@ -31,7 +32,8 @@ class GeneratedFormTextField extends GeneratedFormItem {
      {super.label,
      super.belowWidgets,
      String super.defaultValue = '',
-      List<String? Function(String? value)> super.additionalValidators = const [],
+      List<String? Function(String? value)> super.additionalValidators =
+          const [],
      this.required = true,
      this.max = 1,
      this.hint,
@ -117,6 +119,18 @@ class GeneratedForm extends StatefulWidget {
  State<GeneratedForm> createState() => _GeneratedFormState();
 }

+class GeneratedFormSubForm extends GeneratedFormItem {
+  final List<List<GeneratedFormItem>> items;
+
+  GeneratedFormSubForm(super.key, this.items,
+      {super.label, super.belowWidgets, super.defaultValue});
+
+  @override
+  ensureType(val) {
+    return val; // Not easy to validate List<Map<String, dynamic>>
+  }
+}
+
 // Generates a color in the HSLuv (Pastel) color space
 // https://pub.dev/documentation/hsluv/latest/hsluv/Hsluv/hpluvToRgb.html
 Color generateRandomLightColor() {
@ -133,6 +147,9 @@ Color generateRandomLightColor() {
  return Color.fromARGB(255, rgbValues[0], rgbValues[1], rgbValues[2]);
 }

+bool validateTextField(TextFormField tf) =>
+    (tf.key as GlobalKey<FormFieldState>).currentState?.isValid == true;
+
 class _GeneratedFormState extends State<GeneratedForm> {
  final _formKey = GlobalKey<FormState>();
  Map<String, dynamic> values = {};
@ -141,19 +158,18 @@ class _GeneratedFormState extends State<GeneratedForm> {
  String? initKey;

  // If any value changes, call this to update the parent with value and validity
-  void someValueChanged({bool isBuilding = false}) {
+  void someValueChanged({bool isBuilding = false, bool forceInvalid = false}) {
    Map<String, dynamic> returnValues = values;
    var valid = true;
    for (int r = 0; r < widget.items.length; r++) {
      for (int i = 0; i < widget.items[r].length; i++) {
        if (formInputs[r][i] is TextFormField) {
-          var fieldState =
-              (formInputs[r][i].key as GlobalKey<FormFieldState>).currentState;
-          if (fieldState != null) {
-            valid = valid && fieldState.isValid;
+          valid = valid && validateTextField(formInputs[r][i] as TextFormField);
        }
      }
    }
+    if (forceInvalid) {
+      valid = false;
    }
    widget.onValueChanges(returnValues, valid, isBuilding);
  }
@ -229,6 +245,17 @@ class _GeneratedFormState extends State<GeneratedForm> {
                  someValueChanged();
                });
              });
+        } else if (formItem is GeneratedFormSubForm) {
+          values[formItem.key] = [];
+          for (Map<String, dynamic> v
+              in ((formItem.defaultValue ?? []) as List<dynamic>)) {
+            var fullDefaults = getDefaultValuesFromFormItems(formItem.items);
+            for (var element in v.entries) {
+              fullDefaults[element.key] = element.value;
+            }
+            values[formItem.key].add(fullDefaults);
+          }
+          return Container();
        } else {
          return Container(); // Some input types added in build
        }
@ -250,6 +277,7 @@ class _GeneratedFormState extends State<GeneratedForm> {
    }
    for (var r = 0; r < formInputs.length; r++) {
      for (var e = 0; e < formInputs[r].length; e++) {
+        String fieldKey = widget.items[r][e].key;
        if (widget.items[r][e] is GeneratedFormSwitch) {
          formInputs[r][e] = Row(
            mainAxisAlignment: MainAxisAlignment.spaceBetween,
@ -259,10 +287,10 @@ class _GeneratedFormState extends State<GeneratedForm> {
                width: 8,
              ),
              Switch(
-                  value: values[widget.items[r][e].key],
+                  value: values[fieldKey],
                  onChanged: (value) {
                    setState(() {
-                      values[widget.items[r][e].key] = value;
+                      values[fieldKey] = value;
                      someValueChanged();
                    });
                  })
@ -271,8 +299,7 @@ class _GeneratedFormState extends State<GeneratedForm> {
        } else if (widget.items[r][e] is GeneratedFormTagInput) {
          formInputs[r][e] =
              Column(crossAxisAlignment: CrossAxisAlignment.stretch, children: [
-            if ((values[widget.items[r][e].key]
-                            as Map<String, MapEntry<int, bool>>?)
+            if ((values[fieldKey] as Map<String, MapEntry<int, bool>>?)
                        ?.isNotEmpty ==
                    true &&
                (widget.items[r][e] as GeneratedFormTagInput)
@ -295,8 +322,7 @@ class _GeneratedFormState extends State<GeneratedForm> {
                  (widget.items[r][e] as GeneratedFormTagInput).alignment,
              crossAxisAlignment: WrapCrossAlignment.center,
              children: [
-                (values[widget.items[r][e].key]
-                                as Map<String, MapEntry<int, bool>>?)
+                (values[fieldKey] as Map<String, MapEntry<int, bool>>?)
                            ?.isEmpty ==
                        true
                    ? Text(
@ -304,8 +330,7 @@ class _GeneratedFormState extends State<GeneratedForm> {
                            .emptyMessage,
                      )
                    : const SizedBox.shrink(),
-                ...(values[widget.items[r][e].key]
-                            as Map<String, MapEntry<int, bool>>?)
+                ...(values[fieldKey] as Map<String, MapEntry<int, bool>>?)
                        ?.entries
                        .map((e2) {
                      return Padding(
@ -318,11 +343,10 @@ class _GeneratedFormState extends State<GeneratedForm> {
                            selected: e2.value.value,
                            onSelected: (value) {
                              setState(() {
-                                (values[widget.items[r][e].key] as Map<String,
+                                (values[fieldKey] as Map<String,
                                        MapEntry<int, bool>>)[e2.key] =
                                    MapEntry(
-                                        (values[widget.items[r][e].key] as Map<
-                                                String,
+                                        (values[fieldKey] as Map<String,
                                                MapEntry<int, bool>>)[e2.key]!
                                            .key,
                                        value);
@ -330,20 +354,16 @@ class _GeneratedFormState extends State<GeneratedForm> {
                                            as GeneratedFormTagInput)
                                        .singleSelect &&
                                    value == true) {
-                                  for (var key in (values[
-                                              widget.items[r][e].key]
+                                  for (var key in (values[fieldKey]
                                          as Map<String, MapEntry<int, bool>>)
                                      .keys) {
                                    if (key != e2.key) {
-                                      (values[widget.items[r][e].key] as Map<
-                                              String,
-                                              MapEntry<int, bool>>)[key] =
-                                          MapEntry(
-                                              (values[widget.items[r][e].key]
-                                                      as Map<
+                                      (values[fieldKey] as Map<
                                          String,
                                          MapEntry<int,
-                                                              bool>>)[key]!
+                                              bool>>)[key] = MapEntry(
+                                          (values[fieldKey] as Map<String,
+                                                  MapEntry<int, bool>>)[key]!
                                              .key,
                                          false);
                                    }
@ -355,8 +375,7 @@ class _GeneratedFormState extends State<GeneratedForm> {
                          ));
                    }) ??
                    [const SizedBox.shrink()],
-                (values[widget.items[r][e].key]
-                                as Map<String, MapEntry<int, bool>>?)
+                (values[fieldKey] as Map<String, MapEntry<int, bool>>?)
                            ?.values
                            .where((e) => e.value)
                            .length ==
@ -366,7 +385,7 @@ class _GeneratedFormState extends State<GeneratedForm> {
                        child: IconButton(
                          onPressed: () {
                            setState(() {
-                              var temp = values[widget.items[r][e].key]
+                              var temp = values[fieldKey]
                                  as Map<String, MapEntry<int, bool>>;
                              // get selected category str where bool is true
                              final oldEntry = temp.entries
@ -379,7 +398,7 @@ class _GeneratedFormState extends State<GeneratedForm> {
                              // Update entry with new color, remain selected
                              temp.update(oldEntry.key,
                                  (old) => MapEntry(newColor, old.value));
-                              values[widget.items[r][e].key] = temp;
+                              values[fieldKey] = temp;
                              someValueChanged();
                            });
                          },
@ -388,8 +407,7 @@ class _GeneratedFormState extends State<GeneratedForm> {
                          tooltip: tr('colour'),
                        ))
                    : const SizedBox.shrink(),
-                (values[widget.items[r][e].key]
-                                as Map<String, MapEntry<int, bool>>?)
+                (values[fieldKey] as Map<String, MapEntry<int, bool>>?)
                            ?.values
                            .where((e) => e.value)
                            .isNotEmpty ==
@ -400,10 +418,10 @@ class _GeneratedFormState extends State<GeneratedForm> {
                          onPressed: () {
                            fn() {
                              setState(() {
-                                var temp = values[widget.items[r][e].key]
+                                var temp = values[fieldKey]
                                    as Map<String, MapEntry<int, bool>>;
                                temp.removeWhere((key, value) => value.value);
-                                values[widget.items[r][e].key] = temp;
+                                values[fieldKey] = temp;
                                someValueChanged();
                              });
                            }
@ -454,7 +472,7 @@ class _GeneratedFormState extends State<GeneratedForm> {
                          String? label = value?['label'];
                          if (label != null) {
                            setState(() {
-                              var temp = values[widget.items[r][e].key]
+                              var temp = values[fieldKey]
                                  as Map<String, MapEntry<int, bool>>?;
                              temp ??= {};
                              if (temp[label] == null) {
@ -467,7 +485,7 @@ class _GeneratedFormState extends State<GeneratedForm> {
                                temp[label] = MapEntry(
                                    generateRandomLightColor().value,
                                    !(someSelected && singleSelect));
-                                values[widget.items[r][e].key] = temp;
+                                values[fieldKey] = temp;
                                someValueChanged();
                              }
                            });
@ -481,6 +499,85 @@ class _GeneratedFormState extends State<GeneratedForm> {
              ],
            )
          ]);
+        } else if (widget.items[r][e] is GeneratedFormSubForm) {
+          List<Widget> subformColumn = [];
+          for (int i = 0; i < values[fieldKey].length; i++) {
+            subformColumn.add(Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                const Divider(),
+                const SizedBox(
+                  height: 16,
+                ),
+                Text(
+                  '${(widget.items[r][e] as GeneratedFormSubForm).label} (${i + 1})',
+                  style: const TextStyle(fontWeight: FontWeight.bold),
+                ),
+                GeneratedForm(
+                  items: (widget.items[r][e] as GeneratedFormSubForm)
+                      .items
+                      .map((x) => x.map((y) {
+                            y.defaultValue = values[fieldKey]?[i]?[y.key];
+                            return y;
+                          }).toList())
+                      .toList(),
+                  onValueChanges: (values, valid, isBuilding) {
+                    if (valid) {
+                      this.values[fieldKey]?[i] = values;
+                    }
+                    someValueChanged(
+                        isBuilding: isBuilding, forceInvalid: !valid);
+                  },
+                ),
+                Row(
+                  mainAxisAlignment: MainAxisAlignment.end,
+                  children: [
+                    TextButton.icon(
+                        style: TextButton.styleFrom(
+                            foregroundColor:
+                                Theme.of(context).colorScheme.error),
+                        onPressed: (values[fieldKey].length > 0)
+                            ? () {
+                                var temp = List.from(values[fieldKey]);
+                                temp.removeAt(i);
+                                values[fieldKey] = List.from(temp);
+                                someValueChanged();
+                              }
+                            : null,
+                        label: Text(
+                          '${(widget.items[r][e] as GeneratedFormSubForm).label} (${i + 1})',
+                        ),
+                        icon: const Icon(
+                          Icons.delete_outline_rounded,
+                        ))
+                  ],
+                ),
+              ],
+            ));
+          }
+          subformColumn.add(Padding(
+            padding: EdgeInsets.only(
+                bottom: values[fieldKey].length > 0 ? 24 : 0, top: 8),
+            child: Row(
+              children: [
+                Expanded(
+                    child: ElevatedButton.icon(
+                        onPressed: () {
+                          values[fieldKey].add(getDefaultValuesFromFormItems(
+                              (widget.items[r][e] as GeneratedFormSubForm)
+                                  .items));
+                          someValueChanged();
+                        },
+                        icon: const Icon(Icons.add),
+                        label: Text((widget.items[r][e] as GeneratedFormSubForm)
+                            .label))),
+              ],
+            ),
+          ));
+          if (values[fieldKey].length > 0) {
+            subformColumn.add(const Divider());
+          }
+          formInputs[r][e] = Column(children: subformColumn);
        }
      }
    }
--- a/lib/main.dart
+++ b/lib/main.dart
@ -12,14 +12,14 @@ import 'package:permission_handler/permission_handler.dart';
 import 'package:provider/provider.dart';
 import 'package:dynamic_color/dynamic_color.dart';
 import 'package:device_info_plus/device_info_plus.dart';
-import 'package:android_alarm_manager_plus/android_alarm_manager_plus.dart';
+import 'package:background_fetch/background_fetch.dart';
 import 'package:easy_localization/easy_localization.dart';
 // ignore: implementation_imports
 import 'package:easy_localization/src/easy_localization_controller.dart';
 // ignore: implementation_imports
 import 'package:easy_localization/src/localization.dart';

-const String currentVersion = '0.14.41';
+const String currentVersion = '0.15.0';
 const String currentReleaseTag =
    'v$currentVersion-beta'; // KEEP THIS IN SYNC WITH GITHUB RELEASES

@ -76,6 +76,19 @@ Future<void> loadTranslations() async {
      fallbackTranslations: controller.fallbackTranslations);
 }

+@pragma('vm:entry-point')
+void backgroundFetchHeadlessTask(HeadlessTask task) async {
+  String taskId = task.taskId;
+  bool isTimeout = task.timeout;
+  if (isTimeout) {
+    print('BG update task timed out.');
+    BackgroundFetch.finish(taskId);
+    return;
+  }
+  await bgUpdateCheck(taskId, null);
+  BackgroundFetch.finish(taskId);
+}
+
 void main() async {
  WidgetsFlutterBinding.ensureInitialized();
  try {
@ -93,7 +106,6 @@ void main() async {
    );
    SystemChrome.setEnabledSystemUIMode(SystemUiMode.edgeToEdge);
  }
-  await AndroidAlarmManager.initialize();
  runApp(MultiProvider(
    providers: [
      ChangeNotifierProvider(create: (context) => AppsProvider()),
@ -108,6 +120,7 @@ void main() async {
        useOnlyLangCode: true,
        child: const Obtainium()),
  ));
+  BackgroundFetch.registerHeadlessTask(backgroundFetchHeadlessTask);
 }

 var defaultThemeColour = Colors.deepPurple;
@ -122,6 +135,33 @@ class Obtainium extends StatefulWidget {
 class _ObtainiumState extends State<Obtainium> {
  var existingUpdateInterval = -1;

+  @override
+  void initState() {
+    super.initState();
+    initPlatformState();
+  }
+
+  Future<void> initPlatformState() async {
+    await BackgroundFetch.configure(
+        BackgroundFetchConfig(
+            minimumFetchInterval: 15,
+            stopOnTerminate: false,
+            enableHeadless: true,
+            requiresBatteryNotLow: false,
+            requiresCharging: false,
+            requiresStorageNotLow: false,
+            requiresDeviceIdle: false,
+            requiredNetworkType: NetworkType.ANY), (String taskId) async {
+      // We don't want periodic tasks in the foreground - ignore
+      await bgUpdateCheck(taskId, null);
+      BackgroundFetch.finish(taskId);
+    }, (String taskId) async {
+      context.read<LogsProvider>().add('BG update task timed out.');
+      BackgroundFetch.finish(taskId);
+    });
+    if (!mounted) return;
+  }
+
  @override
  Widget build(BuildContext context) {
    SettingsProvider settingsProvider = context.watch<SettingsProvider>();
@ -161,30 +201,6 @@ class _ObtainiumState extends State<Obtainium> {
                  context.locale.languageCode)) {
        settingsProvider.resetLocaleSafe(context);
      }
-      // Register the background update task according to the user's setting
-      var actualUpdateInterval = settingsProvider.updateInterval;
-      if (existingUpdateInterval != actualUpdateInterval) {
-        if (actualUpdateInterval == 0) {
-          AndroidAlarmManager.cancel(bgUpdateCheckAlarmId);
-        } else {
-          var settingChanged = existingUpdateInterval != -1;
-          var lastCheckWasTooLongAgo = actualUpdateInterval != 0 &&
-              settingsProvider.lastBGCheckTime
-                  .add(Duration(minutes: actualUpdateInterval + 60))
-                  .isBefore(DateTime.now());
-          if (settingChanged || lastCheckWasTooLongAgo) {
-            logs.add(
-                'Update interval was set to ${actualUpdateInterval.toString()} (reason: ${settingChanged ? 'setting changed' : 'last check was ${settingsProvider.lastBGCheckTime.toLocal().toString()}'}).');
-            AndroidAlarmManager.periodic(
-                Duration(minutes: actualUpdateInterval),
-                bgUpdateCheckAlarmId,
-                bgUpdateCheck,
-                rescheduleOnReboot: true,
-                wakeup: true);
-          }
-        }
-        existingUpdateInterval = actualUpdateInterval;
-      }
    }

    return DynamicColorBuilder(
--- a/lib/pages/settings.dart
+++ b/lib/pages/settings.dart
@ -1,4 +1,3 @@
-import 'package:android_alarm_manager_plus/android_alarm_manager_plus.dart';
 import 'package:device_info_plus/device_info_plus.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
@ -608,38 +607,35 @@ class _SettingsPageState extends State<SettingsPage> {
                const Divider(
                  height: 32,
                ),
-                Padding(
-                  padding: const EdgeInsets.fromLTRB(16, 0, 16, 16),
-                  child: Column(children: [
-                    Row(
-                      mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                      children: [
-                        Flexible(child: Text(tr('debugMenu'))),
-                        Switch(
-                            value: settingsProvider.showDebugOpts,
-                            onChanged: (value) {
-                              settingsProvider.showDebugOpts = value;
-                            })
-                      ],
-                    ),
-                    if (settingsProvider.showDebugOpts)
-                      Column(
-                        crossAxisAlignment: CrossAxisAlignment.stretch,
-                        children: [
-                          height16,
-                          TextButton(
-                              onPressed: () {
-                                AndroidAlarmManager.oneShot(
-                                    const Duration(seconds: 0),
-                                    bgUpdateCheckAlarmId + 200,
-                                    bgUpdateCheck);
-                                showMessage(tr('bgTaskStarted'), context);
-                              },
-                              child: Text(tr('runBgCheckNow')))
-                        ],
-                      ),
-                  ]),
-                ),
+                // Padding(
+                //   padding: const EdgeInsets.fromLTRB(16, 0, 16, 16),
+                //   child: Column(children: [
+                //     Row(
+                //       mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                //       children: [
+                //         Flexible(child: Text(tr('debugMenu'))),
+                //         Switch(
+                //             value: settingsProvider.showDebugOpts,
+                //             onChanged: (value) {
+                //               settingsProvider.showDebugOpts = value;
+                //             })
+                //       ],
+                //     ),
+                //     if (settingsProvider.showDebugOpts)
+                //       Column(
+                //         crossAxisAlignment: CrossAxisAlignment.stretch,
+                //         children: [
+                //           height16,
+                //           TextButton(
+                //               onPressed: () {
+                //                 bgUpdateCheck('taskId', null);
+                //                 showMessage(tr('bgTaskStarted'), context);
+                //               },
+                //               child: Text(tr('runBgCheckNow')))
+                //         ],
+                //       ),
+                //   ]),
+                // ),
              ],
            ),
          )
--- a/lib/providers/apps_provider.dart
+++ b/lib/providers/apps_provider.dart
@ -8,7 +8,6 @@ import 'dart:math';
 import 'package:http/http.dart' as http;
 import 'package:crypto/crypto.dart';

-import 'package:android_alarm_manager_plus/android_alarm_manager_plus.dart';
 import 'package:android_intent_plus/flag.dart';
 import 'package:android_package_installer/android_package_installer.dart';
 import 'package:android_package_manager/android_package_manager.dart';
@ -621,7 +620,8 @@ class AppsProvider with ChangeNotifier {
  // Returns an array of Ids for Apps that were successfully downloaded, regardless of installation result
  Future<List<String>> downloadAndInstallLatestApps(
      List<String> appIds, BuildContext? context,
-      {NotificationsProvider? notificationsProvider}) async {
+      {NotificationsProvider? notificationsProvider,
+      bool forceParallelDownloads = false}) async {
    notificationsProvider =
        notificationsProvider ?? context?.read<NotificationsProvider>();
    List<String> appsToInstall = [];
@ -742,7 +742,7 @@ class AppsProvider with ChangeNotifier {
      }
    }

-    if (!settingsProvider.parallelDownloads) {
+    if (forceParallelDownloads || !settingsProvider.parallelDownloads) {
      for (var id in appsToInstall) {
        await updateFn(id);
      }
@ -1448,19 +1448,17 @@ class _APKOriginWarningDialogState extends State<APKOriginWarningDialog> {
 /// 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 (in parallel).
 /// If an update is available and it cannot be installed silently, the user is notified of the available update.
-/// If there are any errors, the task is run again for the remaining apps after a few minutes (based on the error with the longest retry interval).
-/// Any app that has reached it's retry limit, the user is notified that it could not be checked.
+/// If there are any errors, we recursively call the same function with retry count for the relevant apps decremented (if zero, the user is notified).
 ///
 /// Once all update checks are complete, the task is run again in install mode.
-/// In this mode, all pending silent updates are downloaded and installed in the background (serially - one at a time).
-/// If there is an error, the offending app is moved to the back of the line of remaining apps, and the task is retried.
-/// If an app repeatedly fails to install up to its retry limit, the user is notified.
+/// In this mode, all pending silent updates are downloaded (in parallel) and installed in the background.
+/// If there is an error, the user is notified.
 ///
-@pragma('vm:entry-point')
-Future<void> bgUpdateCheck(int taskId, Map<String, dynamic>? params) async {
+Future<void> bgUpdateCheck(String taskId, Map<String, dynamic>? params) async {
+  // ignore: avoid_print
+  print('Started $taskId: ${params.toString()}');
  WidgetsFlutterBinding.ensureInitialized();
  await EasyLocalization.ensureInitialized();
-  await AndroidAlarmManager.initialize();
  await loadTranslations();

  LogsProvider logs = LogsProvider();
@ -1469,11 +1467,20 @@ Future<void> bgUpdateCheck(int taskId, Map<String, dynamic>? params) async {
  await appsProvider.loadApps();

  int maxAttempts = 4;
+  int maxRetryWaitSeconds = 5;
+
+  var netResult = await (Connectivity().checkConnectivity());
+  if (netResult == ConnectivityResult.none) {
+    logs.add('BG update task: No network.');
+    return;
+  }

  params ??= {};
-  if (params['toCheck'] == null) {
-    appsProvider.settingsProvider.lastBGCheckTime = DateTime.now();
-  }
+
+  bool firstEverUpdateTask = DateTime.fromMillisecondsSinceEpoch(0)
+          .compareTo(appsProvider.settingsProvider.lastCompletedBGCheckTime) ==
+      0;
+
  List<MapEntry<String, int>> toCheck = <MapEntry<String, int>>[
    ...(params['toCheck']
            ?.map((entry) => MapEntry<String, int>(
@ -1481,6 +1488,11 @@ Future<void> bgUpdateCheck(int taskId, Map<String, dynamic>? params) async {
            .toList() ??
        appsProvider
            .getAppsSortedByUpdateCheckTime(
+                ignoreAppsCheckedAfter: params['toCheck'] == null
+                    ? firstEverUpdateTask
+                        ? null
+                        : appsProvider.settingsProvider.lastCompletedBGCheckTime
+                    : null,
                onlyCheckInstalledOrTrackOnlyApps: appsProvider
                    .settingsProvider.onlyCheckInstalledOrTrackOnlyApps)
            .map((e) => MapEntry(e, 0)))
@ -1493,51 +1505,34 @@ Future<void> bgUpdateCheck(int taskId, Map<String, dynamic>? params) async {
        (<List<MapEntry<String, int>>>[]))
  ];

-  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
-
-  logs.add(
-      'BG ${installMode ? 'install' : 'update'} task $taskId: Started (${installMode ? toInstall.length : toCheck.length}).');
-
-  if (!installMode) {
+  if (toCheck.isNotEmpty) {
+    // Task is either in update mode or install mode
    // 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)
    // 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
-    // If toRetry is empty, we take care of schedule another task that will run in install mode (toCheck is empty)
+    // Then we run the function again in install mode (toCheck is empty)
+
+    var enoughTimePassed = appsProvider.settingsProvider.updateInterval != 0 &&
+        appsProvider.settingsProvider.lastCompletedBGCheckTime
+            .add(
+                Duration(minutes: appsProvider.settingsProvider.updateInterval))
+            .isBefore(DateTime.now());
+    if (!enoughTimePassed) {
+      // ignore: avoid_print
+      print(
+          'BG update task: Too early for another check (last check was ${appsProvider.settingsProvider.lastCompletedBGCheckTime.toIso8601String()}, interval is ${appsProvider.settingsProvider.updateInterval}).');
+      return;
+    }
+
+    logs.add('BG update task: Started (${toCheck.length}).');

    // Init. vars.
    List<App> updates = []; // All updates found (silent and non-silent)
@ -1545,8 +1540,7 @@ Future<void> bgUpdateCheck(int taskId, Map<String, dynamic>? params) async {
        []; // All non-silent updates that the user will be notified about
    List<MapEntry<String, int>> toRetry =
        []; // All apps that got errors while checking
-    var retryAfterXSeconds =
-        0; // How long to wait until the next attempt (if there are errors)
+    var retryAfterXSeconds = 0;
    MultiAppMultiError?
        errors; // All errors including those that will lead to a retry
    MultiAppMultiError toThrow =
@ -1569,28 +1563,33 @@ Future<void> bgUpdateCheck(int taskId, Map<String, dynamic>? params) async {
          specificIds: toCheck.map((e) => e.key).toList(),
          sp: appsProvider.settingsProvider);
    } catch (e) {
-      // If there were errors, group them into toRetry and toThrow based on max retry count per app
      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: Got error on checking for $key \'${err.toString()}\'.');
+
          var toCheckApp = toCheck.where((element) => element.key == key).first;
          if (toCheckApp.value < maxAttempts) {
            toRetry.add(MapEntry(toCheckApp.key, toCheckApp.value + 1));
            // Next task interval is based on the error with the longest retry time
-            var minRetryIntervalForThisApp = err is RateLimitError
+            int minRetryIntervalForThisApp = err is RateLimitError
                ? (err.remainingMinutes * 60)
                : e is ClientException
                    ? (15 * 60)
-                    : pow(toCheckApp.value + 1, 2).toInt();
+                    : (toCheckApp.value + 1);
+            if (minRetryIntervalForThisApp > maxRetryWaitSeconds) {
+              minRetryIntervalForThisApp = maxRetryWaitSeconds;
+            }
            if (minRetryIntervalForThisApp > retryAfterXSeconds) {
              retryAfterXSeconds = minRetryIntervalForThisApp;
            }
          } else {
+            if (err is! RateLimitError) {
              toThrow.add(key, err, appName: errors?.appIdNames[key]);
            }
+          }
        });
      } else {
        // We don't expect to ever get here in any situation so no need to catch (but log it in case)
@ -1624,14 +1623,12 @@ Future<void> bgUpdateCheck(int taskId, Map<String, dynamic>? params) async {
            id: Random().nextInt(10000)));
      }
    }
-
    // if there are update checks to retry, schedule a retry task
+    logs.add('BG update task: Done checking for updates.');
    if (toRetry.isNotEmpty) {
      logs.add(
          'BG update task $taskId: Will retry in $retryAfterXSeconds seconds.');
-      AndroidAlarmManager.oneShot(
-          Duration(seconds: retryAfterXSeconds), taskId + 1, bgUpdateCheck,
-          params: {
+      return await bgUpdateCheck(taskId, {
        'toCheck': toRetry
            .map((entry) => {'key': entry.key, 'value': entry.value})
            .toList(),
@ -1640,12 +1637,9 @@ Future<void> bgUpdateCheck(int taskId, Map<String, dynamic>? params) async {
            .toList(),
      });
    } else {
-      // If there are no more update checks, schedule an install task
-      logs.add(
-          'BG update task $taskId: Done. Scheduling install task to run immediately.');
-      AndroidAlarmManager.oneShot(
-          const Duration(minutes: 0), taskId + 1, bgUpdateCheck,
-          params: {
+      // If there are no more update checks, call the function in install mode
+      logs.add('BG update task: Done checking for updates.');
+      return await bgUpdateCheck(taskId, {
        'toCheck': [],
        'toInstall': toInstall
            .map((entry) => {'key': entry.key, 'value': entry.value})
@ -1654,7 +1648,7 @@ Future<void> bgUpdateCheck(int taskId, Map<String, dynamic>? params) async {
    }
  } else {
    // In install mode...
-    // If you haven't explicitly been given updates to install (which is the case for new tasks), grab all available silent updates
+    // If you haven't explicitly been given updates to install, grab all available silent updates
    if (toInstall.isEmpty && !networkRestricted) {
      var temp = appsProvider.findExistingUpdates(installedOnly: true);
      for (var i = 0; i < temp.length; i++) {
@ -1664,7 +1658,8 @@ Future<void> bgUpdateCheck(int taskId, Map<String, dynamic>? params) async {
        }
      }
    }
-    var didCompleteInstalling = false;
+    if (toInstall.isNotEmpty) {
+      logs.add('BG install task: Started (${toInstall.length}).');
      var tempObtArr = toInstall.where((element) => element.key == obtainiumId);
      if (tempObtArr.isNotEmpty) {
        // Move obtainium to the end of the list as it must always install last
@ -1672,52 +1667,25 @@ Future<void> bgUpdateCheck(int taskId, Map<String, dynamic>? params) async {
        toInstall = moveStrToEndMapEntryWithCount(toInstall, obt);
      }
      // Loop through all updates and install each
-    for (var i = 0; i < toInstall.length; i++) {
-      var appId = toInstall[i].key;
-      var retryCount = toInstall[i].value;
      try {
-        logs.add(
-            'BG install task $taskId: Attempting to update $appId in the background.');
-        await appsProvider.downloadAndInstallLatestApps([appId], null,
-            notificationsProvider: notificationsProvider);
-        await Future.delayed(const Duration(
-            seconds:
-                5)); // Just in case task ending causes install fail (not clear)
-        if (i == (toCheck.length - 1)) {
-          didCompleteInstalling = true;
-        }
+        await appsProvider.downloadAndInstallLatestApps(
+            toInstall.map((e) => e.key).toList(), null,
+            notificationsProvider: notificationsProvider,
+            forceParallelDownloads: 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 installing shortly
-        logs.add(
-            'BG install task $taskId: Got error on updating $appId \'${e.toString()}\'.');
-        if (retryCount < maxAttempts) {
-          var remainingSeconds = retryCount;
-          logs.add(
-              'BG install task $taskId: Will continue in $remainingSeconds seconds (with $appId moved to the end of the line).');
-          var remainingToInstall = moveStrToEndMapEntryWithCount(
-              toInstall.sublist(i), MapEntry(appId, retryCount + 1));
-          AndroidAlarmManager.oneShot(
-              Duration(seconds: remainingSeconds), taskId + 1, bgUpdateCheck,
-              params: {
-                'toCheck': toCheck
-                    .map((entry) => {'key': entry.key, 'value': entry.value})
-                    .toList(),
-                'toInstall': remainingToInstall
-                    .map((entry) => {'key': entry.key, 'value': entry.value})
-                    .toList(),
+        if (e is MultiAppMultiError) {
+          e.idsByErrorString.forEach((key, value) {
+            notificationsProvider.notify(ErrorCheckingUpdatesNotification(
+                e.errorsAppsString(key, value)));
          });
-          break;
        } else {
-          // If the offender has reached its fail limit, notify the user and remove it from the list (task can continue)
-          toInstall.removeAt(i);
-          i--;
-          notificationsProvider
-              .notify(ErrorCheckingUpdatesNotification(e.toString()));
+          // We don't expect to ever get here in any situation so no need to catch (but log it in case)
+          logs.add('Fatal error in BG install task: ${e.toString()}');
+          rethrow;
        }
      }
-    }
-    if (didCompleteInstalling || toInstall.isEmpty) {
-      logs.add('BG install task $taskId: Done.');
+      logs.add('BG install task: Done installing updates.');
    }
  }
+  appsProvider.settingsProvider.lastCompletedBGCheckTime = DateTime.now();
 }
--- a/lib/providers/settings_provider.dart
+++ b/lib/providers/settings_provider.dart
@ -52,8 +52,8 @@ class SettingsProvider with ChangeNotifier {
  }

  InstallMethodSettings get installMethod {
-    return InstallMethodSettings
-        .values[prefs?.getInt('installMethod') ?? InstallMethodSettings.normal.index];
+    return InstallMethodSettings.values[
+        prefs?.getInt('installMethod') ?? InstallMethodSettings.normal.index];
  }

  set installMethod(InstallMethodSettings t) {
@ -345,15 +345,15 @@ class SettingsProvider with ChangeNotifier {
    notifyListeners();
  }

-  DateTime get lastBGCheckTime {
-    int? temp = prefs?.getInt('lastBGCheckTime');
+  DateTime get lastCompletedBGCheckTime {
+    int? temp = prefs?.getInt('lastCompletedBGCheckTime');
    return temp != null
        ? DateTime.fromMillisecondsSinceEpoch(temp)
        : DateTime.fromMillisecondsSinceEpoch(0);
  }

-  set lastBGCheckTime(DateTime val) {
-    prefs?.setInt('lastBGCheckTime', val.millisecondsSinceEpoch);
+  set lastCompletedBGCheckTime(DateTime val) {
+    prefs?.setInt('lastCompletedBGCheckTime', val.millisecondsSinceEpoch);
    notifyListeners();
  }

--- a/lib/providers/source_provider.dart
+++ b/lib/providers/source_provider.dart
@ -135,11 +135,29 @@ appJSONCompatibilityModifiers(Map<String, dynamic> json) {
  if (additionalSettings['autoApkFilterByArch'] == null) {
    additionalSettings['autoApkFilterByArch'] = false;
  }
+  if (source.runtimeType == HTML().runtimeType) {
    // HTML 'fixed URL' support should be disabled if it previously did not exist
-  if (source.runtimeType == HTML().runtimeType &&
-      originalAdditionalSettings['supportFixedAPKURL'] == null) {
+    if (originalAdditionalSettings['supportFixedAPKURL'] == null) {
      additionalSettings['supportFixedAPKURL'] = false;
    }
+    // HTML key rename
+    if (originalAdditionalSettings['sortByFileNamesNotLinks'] != null) {
+      additionalSettings['sortByLastLinkSegment'] =
+          originalAdditionalSettings['sortByFileNamesNotLinks'];
+    }
+    // HTML single 'intermediate link' should be converted to multi-support version
+    if (originalAdditionalSettings['intermediateLinkRegex'] != null &&
+        additionalSettings['intermediateLink']?.isNotEmpty != true) {
+      additionalSettings['intermediateLink'] = [
+        {
+          'customLinkFilterRegex':
+              originalAdditionalSettings['intermediateLinkRegex'],
+          'filterByLinkText':
+              originalAdditionalSettings['intermediateLinkByText']
+        }
+      ];
+    }
+  }
  json['additionalSettings'] = jsonEncode(additionalSettings);
  // F-Droid no longer needs cloudflare exception since override can be used - migrate apps appropriately
  // This allows us to reverse the changes made for issue #418 (support cloudflare.f-droid)
--- a/pubspec.lock
+++ b/pubspec.lock
@ -1,14 +1,6 @@
 # Generated by pub
 # See https://dart.dev/tools/pub/glossary#lockfile
 packages:
-  android_alarm_manager_plus:
-    dependency: "direct main"
-    description:
-      name: android_alarm_manager_plus
-      sha256: "84720c8ad2758aabfbeafd24a8c355d8c8dd3aa52b01eaf3bb827c7210f61a91"
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.0.4"
  android_intent_plus:
    dependency: "direct main"
    description:
@ -74,6 +66,14 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "2.11.0"
+  background_fetch:
+    dependency: "direct main"
+    description:
+      name: background_fetch
+      sha256: f70b28a0f7a3156195e9742229696f004ea3bf10f74039b7bf4c78a74fbda8a4
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.2.1"
  boolean_selector:
    dependency: transitive
    description:
@ -299,10 +299,10 @@ packages:
    dependency: "direct main"
    description:
      name: flutter_local_notifications
-      sha256: bb5cd63ff7c91d6efe452e41d0d0ae6348925c82eafd10ce170ef585ea04776e
+      sha256: "892ada16046d641263f30c72e7432397088810a84f34479f6677494802a2b535"
      url: "https://pub.dev"
    source: hosted
-    version: "16.2.0"
+    version: "16.3.0"
  flutter_local_notifications_linux:
    dependency: transitive
    description:
@ -514,10 +514,10 @@ packages:
    dependency: transitive
    description:
      name: path_provider_android
-      sha256: e595b98692943b4881b219f0a9e3945118d3c16bd7e2813f98ec6e532d905f72
+      sha256: "477184d672607c0a3bf68fbbf601805f92ef79c82b64b4d6eb318cbca4c48668"
      url: "https://pub.dev"
    source: hosted
-    version: "2.2.1"
+    version: "2.2.2"
  path_provider_foundation:
    dependency: transitive
    description:
--- a/pubspec.yaml
+++ b/pubspec.yaml
@ -17,7 +17,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 # In Windows, build-name is used as the major, minor, and patch parts
 # of the product and file versions while build-number is used as the build suffix.
-version: 0.14.41+235 # When changing this, update the tag in main() accordingly
+version: 0.15.0+236 # When changing this, update the tag in main() accordingly

 environment:
  sdk: '>=3.0.0 <4.0.0'
@ -57,7 +57,6 @@ dependencies:
      ref: main
  android_package_manager: ^0.6.0
  share_plus: ^7.0.0
-  android_alarm_manager_plus: ^3.0.0
  sqflite: ^2.2.0+3
  easy_localization: ^3.0.1
  android_intent_plus: ^4.0.0
@ -68,6 +67,7 @@ dependencies:
  shared_storage: ^0.8.0
  crypto: ^3.0.3
  app_links: ^3.5.0
+  background_fetch: ^1.2.1

 dev_dependencies:
  flutter_test: