Merge pull request #401 from ImranR98/dev

Bugfix: "releaseDateAsVersion" resets to "noVersionDetection"

README.md

@@ -19,6 +19,9 @@ Currently supported App sources:
 - Third Party F-Droid Repos
   - Any URLs ending with `/fdroid/<word>`, where `<word>` can be anything - most often `repo`
 - [Steam](https://store.steampowered.com/mobile)
+- [Telegram App](https://telegram.org)
+- [VLC](https://www.videolan.org/vlc/download-android.html)
+- [Neutron Code](https://neutroncode.com)
 - "HTML" (Fallback)
   - Any other URL that returns an HTML page with links to APK files (if multiple, the last file alphabetically is picked)
 

android/app/src/main/res/drawable/ic_launcher_foreground.xml

@@ -0,0 +1,46 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt"
+    android:viewportWidth="142.129"
+    android:viewportHeight="142.129"
+    android:width="503.6066dp"
+    android:height="503.6066dp">
+    <group
+        android:translateX="-30.39437"
+        android:translateY="-54.68043">
+        <path
+            android:pathData="M109.8808 153.22596c-0.73146 -0.38777 -5.00657 -2.75679 -25.032416 -13.87149 -5.57273 -3.09297 -10.93823 -6.06723 -11.92332 -6.60948 -2.23728 -1.23152 -2.58105 -1.53456 -2.58105 -2.27528 0 -0.3879 0.89293 -2.87231 2.98561 -8.30689 1.64209 -4.2644 3.09426 -8.0014 3.22705 -8.30444 0.3024 -0.69008 0.78972 -1.27621 1.26573 -1.52236 0.44558 -0.23042 11.58052 -4.29685 12.14814 -4.43644 0.61355 -0.1509 1.1428 0.13977 1.45487 0.79901 0.14976 0.31638 0.77213 1.94934 1.38303 3.6288 0.6109 1.67945 1.52036 4.16275 2.02104 5.51844 1.14709 3.10604 1.18992 3.54589 0.3912 4.01771 -0.2117 0.12505 -1.58874 0.66539 -3.06009 1.20075 -1.47136 0.53536 -2.87533 1.08982 -3.11993 1.23213 -0.56422 0.32826 -0.64913 0.83523 -0.20815 1.24273 0.17523 0.16193 3.00434 1.77571 6.28691 3.58618 9.174936 5.06035 8.665596 4.83136 9.277626 4.17097 0.29987 -0.32356 5.78141 -14.266 6.09596 -15.50521 0.1344 -0.5295 0.11969 -0.60308 -0.16695 -0.83519 -0.39165 -0.31714 -0.335 -0.33071 -3.93797 0.9431 -3.56937 1.26192 -3.90926 1.28864 -4.38744 0.34488 -0.25108 -0.49556 -4.095796 -11.05481 -4.334456 -11.90432 -0.15438 -0.5495 0.0344 -1.0717 0.49701 -1.37482 0.19228 -0.12598 2.990116 -1.19935 6.217406 -2.38526 4.78924 -1.75986 6.0081 -2.15842 6.63117 -2.16837 0.8037 -0.0128 0.90917 0.0424 15.64514 8.19599 1.02104 0.56495 1.56579 1.15961 1.56579 1.70925 0 0.21814 -3.6538 9.91011 -8.11957 21.53771 -6.2982 16.39877 -8.19916 21.21114 -8.4744 21.45338 -0.46789 0.41179 -0.8512 0.39392 -1.74794 -0.0815z"
+            android:strokeWidth="0.139">
+            <aapt:attr
+                name="android:fillColor">
+                <gradient
+                    android:startX="76.74697"
+                    android:startY="113.4246"
+                    android:endX="110.6445"
+                    android:endY="152.5006"
+                    android:tileMode="clamp">
+                    <item
+                        android:color="#9B58DC"
+                        android:offset="0" />
+                    <item
+                        android:color="#321C92"
+                        android:offset="1" />
+                </gradient>
+            </aapt:attr>
+            <aapt:attr
+                name="android:strokeColor">
+                <gradient
+                    android:startX="76.74697"
+                    android:startY="113.4246"
+                    android:endX="110.6445"
+                    android:endY="152.5006"
+                    android:tileMode="clamp">
+                    <item
+                        android:color="#9B58DC"
+                        android:offset="0" />
+                    <item
+                        android:color="#321C92"
+                        android:offset="1" />
+                </gradient>
+            </aapt:attr>
+        </path>
+    </group>
+</vector>

android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+  <background android:drawable="@color/ic_launcher_background"/>
+  <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+  <monochrome android:drawable="@drawable/ic_launcher_foreground"/>
+</adaptive-icon>

assets/ca/lets-encrypt-r3.pem

@@ -0,0 +1,30 @@
+-----BEGIN CERTIFICATE-----
+MIIFFjCCAv6gAwIBAgIRAJErCErPDBinU/bWLiWnX1owDQYJKoZIhvcNAQELBQAw
+TzELMAkGA1UEBhMCVVMxKTAnBgNVBAoTIEludGVybmV0IFNlY3VyaXR5IFJlc2Vh
+cmNoIEdyb3VwMRUwEwYDVQQDEwxJU1JHIFJvb3QgWDEwHhcNMjAwOTA0MDAwMDAw
+WhcNMjUwOTE1MTYwMDAwWjAyMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNTGV0J3Mg
+RW5jcnlwdDELMAkGA1UEAxMCUjMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+AoIBAQC7AhUozPaglNMPEuyNVZLD+ILxmaZ6QoinXSaqtSu5xUyxr45r+XXIo9cP
+R5QUVTVXjJ6oojkZ9YI8QqlObvU7wy7bjcCwXPNZOOftz2nwWgsbvsCUJCWH+jdx
+sxPnHKzhm+/b5DtFUkWWqcFTzjTIUu61ru2P3mBw4qVUq7ZtDpelQDRrK9O8Zutm
+NHz6a4uPVymZ+DAXXbpyb/uBxa3Shlg9F8fnCbvxK/eG3MHacV3URuPMrSXBiLxg
+Z3Vms/EY96Jc5lP/Ooi2R6X/ExjqmAl3P51T+c8B5fWmcBcUr2Ok/5mzk53cU6cG
+/kiFHaFpriV1uxPMUgP17VGhi9sVAgMBAAGjggEIMIIBBDAOBgNVHQ8BAf8EBAMC
+AYYwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMBIGA1UdEwEB/wQIMAYB
+Af8CAQAwHQYDVR0OBBYEFBQusxe3WFbLrlAJQOYfr52LFMLGMB8GA1UdIwQYMBaA
+FHm0WeZ7tuXkAXOACIjIGlj26ZtuMDIGCCsGAQUFBwEBBCYwJDAiBggrBgEFBQcw
+AoYWaHR0cDovL3gxLmkubGVuY3Iub3JnLzAnBgNVHR8EIDAeMBygGqAYhhZodHRw
+Oi8veDEuYy5sZW5jci5vcmcvMCIGA1UdIAQbMBkwCAYGZ4EMAQIBMA0GCysGAQQB
+gt8TAQEBMA0GCSqGSIb3DQEBCwUAA4ICAQCFyk5HPqP3hUSFvNVneLKYY611TR6W
+PTNlclQtgaDqw+34IL9fzLdwALduO/ZelN7kIJ+m74uyA+eitRY8kc607TkC53wl
+ikfmZW4/RvTZ8M6UK+5UzhK8jCdLuMGYL6KvzXGRSgi3yLgjewQtCPkIVz6D2QQz
+CkcheAmCJ8MqyJu5zlzyZMjAvnnAT45tRAxekrsu94sQ4egdRCnbWSDtY7kh+BIm
+lJNXoB1lBMEKIq4QDUOXoRgffuDghje1WrG9ML+Hbisq/yFOGwXD9RiX8F6sw6W4
+avAuvDszue5L3sz85K+EC4Y/wFVDNvZo4TYXao6Z0f+lQKc0t8DQYzk1OXVu8rp2
+yJMC6alLbBfODALZvYH7n7do1AZls4I9d1P4jnkDrQoxB3UqQ9hVl3LEKQ73xF1O
+yK5GhDDX8oVfGKF5u+decIsH4YaTw7mP3GFxJSqv3+0lUFJoi5Lc5da149p90Ids
+hCExroL1+7mryIkXPeFM5TgO9r0rvZaBFOvV2z0gp35Z0+L4WPlbuEjN/lxPFin+
+HlUjr8gRsI3qfJOQFy/9rKIJR0Y/8Omwt/8oTWgy1mdeHmmjk7j1nYsvC9JSQ6Zv
+MldlTTKB3zhThV1+XWYp6rjd5JW1zbVWEkLNxE7GJThEUG3szgBVGP7pSWTUTsqX
+nLRbwHOoq7hHwg==
+-----END CERTIFICATE-----

assets/graphics/icon.svg

@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="142.12897mm"
+   height="142.12897mm"
+   viewBox="0 0 142.12897 142.12897"
+   version="1.1"
+   id="svg5"
+   xml:space="preserve"
+   inkscape:version="1.2.2 (b0a8486541, 2022-12-01)"
+   sodipodi:docname="icon.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"><sodipodi:namedview
+     id="namedview7"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:document-units="mm"
+     showgrid="false"
+     inkscape:zoom="2.4175295"
+     inkscape:cx="371.03994"
+     inkscape:cy="273.62644"
+     inkscape:window-width="2256"
+     inkscape:window-height="1427"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="layer1" /><defs
+     id="defs2"><linearGradient
+       inkscape:collect="always"
+       id="linearGradient3657"><stop
+         style="stop-color:#9b58dc;stop-opacity:1;"
+         offset="0"
+         id="stop3653" /><stop
+         style="stop-color:#321c92;stop-opacity:1;"
+         offset="1"
+         id="stop3655" /></linearGradient><linearGradient
+       inkscape:collect="always"
+       id="linearGradient945"><stop
+         style="stop-color:#9b58dc;stop-opacity:1;"
+         offset="0"
+         id="stop941" /><stop
+         style="stop-color:#321c92;stop-opacity:1;"
+         offset="1"
+         id="stop943" /></linearGradient><linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient945"
+       id="linearGradient947"
+       x1="76.787094"
+       y1="113.40435"
+       x2="110.68458"
+       y2="152.48038"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-0.04012535,0.02025786)" /><linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3657"
+       id="linearGradient3659"
+       x1="76.787094"
+       y1="113.40435"
+       x2="110.68458"
+       y2="152.48038"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-0.04012535,0.02025786)" /></defs><g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-30.394373,-54.680428)"><path
+       style="fill:url(#linearGradient3659);fill-opacity:1;stroke:url(#linearGradient947);stroke-width:0.139;stroke-dasharray:none"
+       d="m 109.8808,153.22596 c -0.73146,-0.38777 -5.00657,-2.75679 -25.032416,-13.87149 -5.57273,-3.09297 -10.93823,-6.06723 -11.92332,-6.60948 -2.23728,-1.23152 -2.58105,-1.53456 -2.58105,-2.27528 0,-0.3879 0.89293,-2.87231 2.98561,-8.30689 1.64209,-4.2644 3.09426,-8.0014 3.22705,-8.30444 0.3024,-0.69008 0.78972,-1.27621 1.26573,-1.52236 0.44558,-0.23042 11.58052,-4.29685 12.14814,-4.43644 0.61355,-0.1509 1.1428,0.13977 1.45487,0.79901 0.14976,0.31638 0.77213,1.94934 1.38303,3.6288 0.6109,1.67945 1.52036,4.16275 2.02104,5.51844 1.14709,3.10604 1.18992,3.54589 0.3912,4.01771 -0.2117,0.12505 -1.58874,0.66539 -3.06009,1.20075 -1.47136,0.53536 -2.87533,1.08982 -3.11993,1.23213 -0.56422,0.32826 -0.64913,0.83523 -0.20815,1.24273 0.17523,0.16193 3.00434,1.77571 6.28691,3.58618 9.174936,5.06035 8.665596,4.83136 9.277626,4.17097 0.29987,-0.32356 5.78141,-14.266 6.09596,-15.50521 0.1344,-0.5295 0.11969,-0.60308 -0.16695,-0.83519 -0.39165,-0.31714 -0.335,-0.33071 -3.93797,0.9431 -3.56937,1.26192 -3.90926,1.28864 -4.38744,0.34488 -0.25108,-0.49556 -4.095796,-11.05481 -4.334456,-11.90432 -0.15438,-0.5495 0.0344,-1.0717 0.49701,-1.37482 0.19228,-0.12598 2.990116,-1.19935 6.217406,-2.38526 4.78924,-1.75986 6.0081,-2.15842 6.63117,-2.16837 0.8037,-0.0128 0.90917,0.0424 15.64514,8.19599 1.02104,0.56495 1.56579,1.15961 1.56579,1.70925 0,0.21814 -3.6538,9.91011 -8.11957,21.53771 -6.2982,16.39877 -8.19916,21.21114 -8.4744,21.45338 -0.46789,0.41179 -0.8512,0.39392 -1.74794,-0.0815 z"
+       id="path239" /></g></svg>

assets/translations/de.json

@@ -217,9 +217,9 @@
     "releaseDateAsVersionExplanation": "Diese Option sollte nur für Apps verwendet werden, bei denen die Versionserkennung nicht korrekt funktioniert, aber ein Veröffentlichungsdatum verfügbar ist.",
     "changes": "Änderungen",
     "releaseDate": "Veröffentlichungsdatum",
-    "importFromURLsInFile": "Import from URLs in File (like OPML)",
+    "importFromURLsInFile": "Importieren von URLs aus Datei ( z.B. OPML)",
-    "versionDetection": "Version Detection",
+    "versionDetection": "Versionserkennung",
-    "standardVersionDetection": "Standard version detection",
+    "standardVersionDetection": "Standardversionserkennung",
     "removeAppQuestion": {
         "one": "App entfernen?",
         "other": "App entfernen?"

assets/translations/fa.json

@@ -213,13 +213,13 @@
     "removeFromObtainium": "از Obtainium حذف کنید",
     "uninstallFromDevice": "حذف نصب از دستگاه",
     "onlyWorksWithNonVersionDetectApps": "فقط برای برنامه‌هایی کار می‌کند که تشخیص نسخه غیرفعال است.",
-    "releaseDateAsVersion": "Use Release Date as Version",
+    "releaseDateAsVersion": "از تاریخ انتشار به عنوان نسخه استفاده کنید",
-    "releaseDateAsVersionExplanation": "This option should only be used for Apps where version detection does not work correctly, but a release date is available.",
+    "releaseDateAsVersionExplanation": "این گزینه فقط باید برای برنامه هایی استفاده شود که تشخیص نسخه به درستی کار نمی کند، اما تاریخ انتشار در دسترس است.",
-    "changes": "Changes",
+    "changes": "تغییرات",
-    "releaseDate": "Release Date",
+    "releaseDate": "تاریخ انتشار",
-    "importFromURLsInFile": "Import from URLs in File (like OPML)",
+    "importFromURLsInFile": "وارد کردن از آدرس های اینترنتی موجود در فایل (مانند OPML)",
-    "versionDetection": "Version Detection",
+    "versionDetection": "تشخیص نسخه",
-    "standardVersionDetection": "Standard version detection",
+    "standardVersionDetection": "تشخیص نسخه استاندارد",
     "removeAppQuestion": {
         "one": "برنامه حذف شود؟",
         "other": "برنامه ها حذف شوند؟"

assets/translations/fr.json

@@ -0,0 +1,271 @@
+{
+    "invalidURLForSource": "URL d'application {} invalide",
+    "noReleaseFound": "Impossible de trouver une version appropriée",
+    "noVersionFound": "Impossible de déterminer la version de la version",
+    "urlMatchesNoSource": "L'URL ne correspond pas à une source connue",
+    "cantInstallOlderVersion": "Impossible d'installer une ancienne version d'une application",
+    "appIdMismatch": "L'ID de paquet téléchargé ne correspond pas à l'ID de l'application existante",
+    "functionNotImplemented": "Cette classe n'a pas implémenté cette fonction",
+    "placeholder": "Espace réservé",
+    "someErrors": "Des erreurs se sont produites",
+    "unexpectedError": "Erreur inattendue",
+    "ok": "Okay",
+    "and": "et",
+    "startedBgUpdateTask": "Démarrage de la tâche de vérification de mise à jour en arrière-plan",
+    "bgUpdateIgnoreAfterIs": "Mise à jour en arrière-plan est ignoré après  {}",
+    "startedActualBGUpdateCheck": "Démarrage de la vérification de la mise à jour en arrière-plan",
+    "bgUpdateTaskFinished": "Tâche de vérification de la mise à jour en arrière-plan terminée",
+    "firstRun": "Il s'agit de la toute première exécution d'Obtainium",
+    "settingUpdateCheckIntervalTo": "Définition de l'intervalle de mise à jour sur {}",
+    "githubPATLabel": "Jeton d'Accès Personnel GitHub (Augmente la limite de débit)",
+    "githubPATHint": "Le JAP doit être dans ce format : username:token",
+    "githubPATFormat": "username:token",
+    "githubPATLinkText": "À propos des JAP GitHub",
+    "includePrereleases": "Inclure les avant-premières",
+    "fallbackToOlderReleases": "Retour aux anciennes versions",
+    "filterReleaseTitlesByRegEx": "Filtrer les titres de version par expression régulière",
+    "invalidRegEx": "Expression régulière invalide",
+    "noDescription": "Pas de description",
+    "cancel": "Annuler",
+    "continue": "Continuer",
+    "requiredInBrackets": "(Requis)",
+    "dropdownNoOptsError": "ERREUR : LE DÉROULEMENT DOIT AVOIR AU MOINS UNE OPT",
+    "colour": "Couleur",
+    "githubStarredRepos": "Dépôts étoilés GitHub",
+    "uname": "Nom d'utilisateur",
+    "wrongArgNum": "Mauvais nombre d'arguments fournis",
+    "xIsTrackOnly": "{} est en 'Suivi uniquement'",
+    "source": "Source",
+    "app": "Application",
+    "appsFromSourceAreTrackOnly": "Les applications de cette source sont en 'Suivi uniquement'.",
+    "youPickedTrackOnly": "Vous avez sélectionné l'option 'Suivi uniquement'.",
+    "trackOnlyAppDescription": "L'application sera suivie pour les mises à jour, mais Obtainium ne pourra pas la télécharger ou l'installer.",
+    "cancelled": "Annulé",
+    "appAlreadyAdded": "Application déjà ajoutée",
+    "alreadyUpToDateQuestion": "Application déjà à jour ?",
+    "addApp": "Ajouter une application",
+    "appSourceURL": "URL de la source de l'application",
+    "error": "Erreur",
+    "add": "Ajoutée",
+    "searchSomeSourcesLabel": "Rechercher (certaines sources uniquement)",
+    "search": "Rechercher",
+    "additionalOptsFor": "Options supplémentaires pour {}",
+    "supportedSourcesBelow": "Sources prises en charge :",
+    "trackOnlyInBrackets": "(Suivi uniquement)",
+    "searchableInBrackets": "(Recherchable)",
+    "appsString": "Applications",
+    "noApps": "Aucune application",
+    "noAppsForFilter": "Aucune application pour le filtre",
+    "byX": "Par {}",
+    "percentProgress": "Progrès: {}%",
+    "pleaseWait": "Veuillez patienter",
+    "updateAvailable": "Mise à jour disponible",
+    "estimateInBracketsShort": "(Est.)",
+    "notInstalled": "Pas installé",
+    "estimateInBrackets": "(Estimation)",
+    "selectAll": "Tout sélectionner",
+    "deselectN": "Déselectionner {}",
+    "xWillBeRemovedButRemainInstalled": "{} sera supprimé d'Obtainium mais restera installé sur l'appareil.",
+    "removeSelectedAppsQuestion": "Supprimer les applications sélectionnées ?",
+    "removeSelectedApps": "Supprimer les applications sélectionnées",
+    "updateX": "Mise à jour {}",
+    "installX": "Installer {}",
+    "markXTrackOnlyAsUpdated": "Marquer {}\n(Suivi uniquement)\nas mis à jour",
+    "changeX": "Changer {}",
+    "installUpdateApps": "Installer/Mettre à jour les applications",
+    "installUpdateSelectedApps": "Installer/Mettre à jour les applications sélectionnées",
+    "markXSelectedAppsAsUpdated": "Marquer {} les applications sélectionnées comme mises à jour ?",
+    "no": "Non",
+    "yes": "Oui",
+    "markSelectedAppsUpdated": "Marquer les applications sélectionnées comme mises à jour",
+    "pinToTop": "Épingler en haut",
+    "unpinFromTop": "Détacher du haut",
+    "resetInstallStatusForSelectedAppsQuestion": "Réinitialiser l'état d'installation des applications sélectionnées ?",
+    "installStatusOfXWillBeResetExplanation": "L'état d'installation de toutes les applications sélectionnées sera réinitialisé.\n\nCela peut aider lorsque la version de l'application affichée dans Obtainium est incorrecte en raison d'échecs de mises à jour ou d'autres problèmes.",
+    "shareSelectedAppURLs": "Partager les URL d'application sélectionnées",
+    "resetInstallStatus": "Réinitialiser le statut d'installation",
+    "more": "Plus",
+    "removeOutdatedFilter": "Supprimer le filtre d'application obsolète",
+    "showOutdatedOnly": "Afficher uniquement les applications obsolètes",
+    "filter": "Filtre",
+    "filterActive": "Filtre *",
+    "filterApps": "Filtrer les applications",
+    "appName": "Nom de l'application",
+    "author": "Auteur",
+    "upToDateApps": "Applications à jour",
+    "nonInstalledApps": "Applications non installées",
+    "importExport": "Importer/Exporter",
+    "settings": "Paramètres",
+    "exportedTo": "Exporté vers {}",
+    "obtainiumExport": "Exportation d'Obtainium",
+    "invalidInput": "Entrée invalide",
+    "importedX": "Importé {}",
+    "obtainiumImport": "Importation d'Obtainium",
+    "importFromURLList": "Importer à partir de la liste d'URL",
+    "searchQuery": "Requête de recherche",
+    "appURLList": "Liste d'URL d'application",
+    "line": "Queue",
+    "searchX": "Rechercher {}",
+    "noResults": "Aucun résultat trouvé",
+    "importX": "Importer {}",
+    "importedAppsIdDisclaimer": "Les applications importées peuvent s'afficher à tort comme \"Non installées\".\nPour résoudre ce problème, réinstallez-les via Obtainium.\nCela ne devrait pas affecter les données de l'application.\n\nN'affecte que les URL et les méthodes d'importation tierces.",
+    "importErrors": "Erreurs d'importation",
+    "importedXOfYApps": "{} sur {} applications importées.",
+    "followingURLsHadErrors": "Les URL suivantes comportaient des erreurs :",
+    "okay": "Okay",
+    "selectURL": "Sélectionnez l'URL",
+    "selectURLs": "Sélectionnez les URLs",
+    "pick": "Prendre",
+    "theme": "Thème",
+    "dark": "Sombre",
+    "light": "Clair",
+    "followSystem": "Suivre le système",
+    "obtainium": "Obtainium",
+    "materialYou": "Material You",
+    "appSortBy": "Applications triées par",
+    "authorName": "Auteur/Nom",
+    "nameAuthor": "Nom/Auteur",
+    "asAdded": "Comme ajouté",
+    "appSortOrder": "Ordre de tri des applications",
+    "ascending": "Ascendant",
+    "descending": "Descendanr",
+    "bgUpdateCheckInterval": "Intervalle de vérification des mises à jour en arrière-plan",
+    "neverManualOnly": "Jamais - Manuel uniquement",
+    "appearance": "Apparence",
+    "showWebInAppView": "Afficher la page Web source dans la vue de l'application",
+    "pinUpdates": "Épingler les mises à jour dans la vue Top des applications",
+    "updates": "Mises à jour",
+    "sourceSpecific": "Spécifique à la source",
+    "appSource": "Source de l'application",
+    "noLogs": "Aucun journal",
+    "appLogs": "Journaux d'application",
+    "close": "Fermer",
+    "share": "Partager",
+    "appNotFound": "Application introuvable",
+    "obtainiumExportHyphenatedLowercase": "obtainium-export",
+    "pickAnAPK": "Choisissez un APK",
+    "appHasMoreThanOnePackage": "{} a plus d'un paquet :",
+    "deviceSupportsXArch": "Votre appareil prend en charge l'architecture de processeur {}.",
+    "deviceSupportsFollowingArchs": "Votre appareil prend en charge les architectures CPU suivantes :",
+    "warning": "Avertissement",
+    "sourceIsXButPackageFromYPrompt": "La source de l'application est '{}' mais le paquet de version provient de '{}'. Continuer?",
+    "updatesAvailable": "Mises à jour disponibles",
+    "updatesAvailableNotifDescription": "Avertit l'utilisateur que des mises à jour sont disponibles pour une ou plusieurs applications suivies par Obtainium",
+    "noNewUpdates": "Aucune nouvelle mise à jour.",
+    "xHasAnUpdate": "{} a une mise à jour.",
+    "appsUpdated": "Applications mises à jour",
+    "appsUpdatedNotifDescription": "Avertit l'utilisateur que les mises à jour d'une ou plusieurs applications ont été appliquées en arrière-plan",
+    "xWasUpdatedToY": "{} a été mis à jour pour {}.",
+    "errorCheckingUpdates": "Erreur lors de la vérification des mises à jour",
+    "errorCheckingUpdatesNotifDescription": "Une notification qui s'affiche lorsque la vérification de la mise à jour en arrière-plan échoue",
+    "appsRemoved": "Applications supprimées",
+    "appsRemovedNotifDescription": "Avertit l'utilisateur qu'une ou plusieurs applications ont été supprimées en raison d'erreurs lors de leur chargement",
+    "xWasRemovedDueToErrorY": "{} a été supprimé en raison de cette erreur : {}",
+    "completeAppInstallation": "Installation complète de l'application",
+    "obtainiumMustBeOpenToInstallApps": "Obtainium doit être ouvert pour installer des applications",
+    "completeAppInstallationNotifDescription": "Demande à l'utilisateur de retourner sur Obtainium pour terminer l'installation d'une application",
+    "checkingForUpdates": "Vérification des mises à jour",
+    "checkingForUpdatesNotifDescription": "Notification transitoire qui apparaît lors de la recherche de mises à jour",
+    "pleaseAllowInstallPerm": "Veuillez autoriser Obtainium à installer des applications",
+    "trackOnly": "Suivi uniquement",
+    "errorWithHttpStatusCode": "Erreur {}",
+    "versionCorrectionDisabled": "Correction de version désactivée (le plugin ne semble pas fonctionner)",
+    "unknown": "Inconnu",
+    "none": "Aucun",
+    "never": "Jamais",
+    "latestVersionX": "Dernière version: {}",
+    "installedVersionX": "Version installée : {}",
+    "lastUpdateCheckX": "Vérification de la dernière mise à jour : {}",
+    "remove": "Retirer",
+    "yesMarkUpdated": "Oui, marquer comme mis à jour",
+    "fdroid": "F-Droid",
+    "appIdOrName": "ID ou nom de l'application",
+    "appWithIdOrNameNotFound": "Aucune application n'a été trouvée avec cet identifiant ou ce nom",
+    "reposHaveMultipleApps": "Les dépôts peuvent contenir plusieurs applications",
+    "fdroidThirdPartyRepo": "Dépôt tiers F-Droid",
+    "steam": "Steam",
+    "steamMobile": "Steam Mobile",
+    "steamChat": "Steam Chat",
+    "install": "Installer",
+    "markInstalled": "Marquer installée",
+    "update": "Mettre à jour",
+    "markUpdated": "Marquer à jour",
+    "additionalOptions": "Options additionelles",
+    "disableVersionDetection": "Désactiver la détection de version",
+    "noVersionDetectionExplanation": "Cette option ne doit être utilisée que pour les applications où la détection de version ne fonctionne pas correctement.",
+    "downloadingX": "Téléchargement {}",
+    "downloadNotifDescription": "Avertit l'utilisateur de la progression du téléchargement d'une application",
+    "noAPKFound": "Aucun APK trouvé",
+    "noVersionDetection": "Pas de détection de version",
+    "categorize": "Catégoriser",
+    "categories": "Catégories",
+    "category": "Catégorie",
+    "noCategory": "No Category",
+    "noCategories": "Aucune catégorie",
+    "deleteCategoriesQuestion": "Supprimer les catégories ?",
+    "categoryDeleteWarning": "Toutes les applications dans les catégories supprimées seront définies sur non catégorisées.",
+    "addCategory": "Ajouter une catégorie",
+    "label": "Étiquette",
+    "language": "Langue",
+    "storagePermissionDenied": "Autorisation de stockage refusée",
+    "selectedCategorizeWarning": "Cela remplacera tous les paramètres de catégorie existants pour les applications sélectionnées.",
+    "filterAPKsByRegEx": "Filtrer les APK par expression régulière",
+    "removeFromObtainium": "Supprimer d'Obtainium",
+    "uninstallFromDevice": "Désinstaller de l'appareil",
+    "onlyWorksWithNonVersionDetectApps": "Fonctionne uniquement pour les applications avec la détection de version désactivée.",
+    "releaseDateAsVersion": "Utiliser la date de sortie comme version",
+    "releaseDateAsVersionExplanation": "Cette option ne doit être utilisée que pour les applications où la détection de version ne fonctionne pas correctement, mais une date de sortie est disponible.",
+    "changes": "Changements",
+    "releaseDate": "Date de sortie",
+    "importFromURLsInFile": "Importer à partir d'URL dans un fichier (comme OPML)",
+    "versionDetection": "Détection des versions",
+    "standardVersionDetection": "Détection de version standard",
+    "removeAppQuestion": {
+        "one": "Supprimer l'application ?",
+        "other": "Supprimer les applications ?"
+    },
+    "tooManyRequestsTryAgainInMinutes": {
+        "one": "Trop de demandes (taux limité) - réessayez dans {} minute",
+        "other": "Trop de demandes (taux limité) - réessayez dans {} minutes"
+    },
+    "bgUpdateGotErrorRetryInMinutes": {
+        "one": "La vérification de la mise à jour en arrière-plan a rencontré un {}, planifiera une nouvelle tentative de vérification dans {} minute",
+        "other": "La vérification de la mise à jour en arrière-plan a rencontré un {}, planifiera une nouvelle tentative de vérification dans {} minutes"
+    },
+    "bgCheckFoundUpdatesWillNotifyIfNeeded": {
+        "one": "La vérification des mises à jour en arrière-plan trouvée {} mise à jour - avertira l'utilisateur si nécessaire",
+        "other": "La vérification des mises à jour en arrière-plan a trouvé {} mises à jour - avertira l'utilisateur si nécessaire"
+    },
+    "apps": {
+        "one": "{} Application",
+        "other": "{} Applications"
+    },
+    "url": {
+        "one": "{} URL",
+        "other": "{} URLs"
+    },
+    "minute": {
+        "one": "{} Minute",
+        "other": "{} Minutes"
+    },
+    "hour": {
+        "one": "{} Heure",
+        "other": "{} Heures"
+    },
+    "day": {
+        "one": "{} Jour",
+        "other": "{} Jours"
+    },
+    "clearedNLogsBeforeXAfterY": {
+        "one": "{n} journal effacé (avant = {before}, après = {after})",
+        "other": "{n} journaux effacés (avant = {before}, après = {after})"
+    },
+    "xAndNMoreUpdatesAvailable": {
+        "one": "{} et 1 autre application ont des mises à jour.",
+        "other": "{} et {} autres applications ont des mises à jour."
+    },
+    "xAndNMoreUpdatesInstalled": {
+        "one": "{} et 1 autre application ont été mises à jour.",
+        "other": "{} et {} autres applications ont été mises à jour."
+    }
+}

assets/translations/hu.json

@@ -56,7 +56,7 @@
     "appsString": "Appok",
     "noApps": "Nincs App",
     "noAppsForFilter": "Nincsenek appok a szűrőhöz",
-    "byX": "{} által",
+    "byX": "Fejlesztő: {}",
     "percentProgress": "Folyamat: {}%",
     "pleaseWait": "Kis türelmet",
     "updateAvailable": "Frissítés érhető el",
@@ -191,7 +191,7 @@
     "update": "Frissít",
     "markUpdated": "Frissítettnek jelöl",
     "additionalOptions": "További lehetőségek",
-    "disableVersionDetection": "Verzióérzékelés letiltása",
+    "disableVersionDetection": "Verzió érzékelés letiltása",
     "noVersionDetectionExplanation": "Ezt a beállítást csak olyan alkalmazásoknál szabad használni, ahol a verzióérzékelés nem működik megfelelően.",
     "downloadingX": "{} letöltés",
     "downloadNotifDescription": "Értesíti a felhasználót az app letöltésének előrehaladásáról",
@@ -216,9 +216,9 @@
     "releaseDateAsVersionExplanation": "Ezt a beállítást csak olyan alkalmazásoknál szabad használni, ahol a verzió érzékelése nem működik megfelelően, de elérhető a kiadás dátuma.",
     "changes": "Változtatások",
     "releaseDate": "Kiadás dátuma",
-    "importFromURLsInFile": "Import from URLs in File (like OPML)",
+    "importFromURLsInFile": "Importálás fájlban található URL-ből (mint pl. OPML)",
-    "versionDetection": "Version Detection",
+    "versionDetection": "Verzió érzékelés",
-    "standardVersionDetection": "Standard version detection",
+    "standardVersionDetection": "Alapért. verzió érzékelés",
     "removeAppQuestion": {
         "one": "Eltávolítja az alkalmazást?",
         "other": "Eltávolítja az alkalmazást?"

assets/translations/it.json

@@ -217,9 +217,9 @@
     "releaseDateAsVersionExplanation": "Questa opzione dovrebbe essere usata solo per le App in cui il rilevamento della versione non funziona correttamente, ma è disponibile una data di rilascio.",
     "changes": "Novità",
     "releaseDate": "Data di rilascio",
-    "importFromURLsInFile": "Import from URLs in File (like OPML)",
+    "importFromURLsInFile": "Importa da URL in file (come OPML)",
-    "versionDetection": "Version Detection",
+    "versionDetection": "Rilevamento di versione",
-    "standardVersionDetection": "Standard version detection",
+    "standardVersionDetection": "Rilevamento di versione standard",
     "removeAppQuestion": {
         "one": "Rimuovere l'App?",
         "other": "Rimuovere le App?"

assets/translations/ja.json

@@ -107,7 +107,7 @@
     "line": "行",
     "searchX": "{}で検索",
     "noResults": "結果は見つかりませんでした",
-    "importX": "{}をインポートする",
+    "importX": "{}をインポート",
     "importedAppsIdDisclaimer": "インポートしたアプリが「未インストール」と表示されることがあります。\nこれを解決するには、Obtainiumから再インストールしてください。\nアプリのデータには影響しません。\n\nURLとサードパーティのインポートメソッドにのみ影響します。",
     "importErrors": "インポートエラー",
     "importedXOfYApps": "{} / {} アプリをインポートしました",
@@ -217,9 +217,9 @@
     "releaseDateAsVersionExplanation": "このオプションは、バージョン検出が正しく機能しないアプリで、リリース日が利用可能な場合にのみ使用する必要があります。",
     "changes": "変更点",
     "releaseDate": "リリース日",
-    "importFromURLsInFile": "Import from URLs in File (like OPML)",
+    "importFromURLsInFile": "ファイル（OPMLなど）内のURLからインポート",
-    "versionDetection": "Version Detection",
+    "versionDetection": "バージョン検出",
-    "standardVersionDetection": "Standard version detection",
+    "standardVersionDetection": "標準のバージョン検出",
     "removeAppQuestion": {
         "one": "アプリを削除しますか？",
         "other": "アプリを削除しますか？"

lib/app_sources/codeberg.dart

@@ -118,9 +118,11 @@ class Codeberg extends AppSource {
       if (version == null) {
         throw NoVersionError();
       }
+      var changeLog = targetRelease['body'].toString();
       return APKDetails(version, targetRelease['apkUrls'] as List<String>,
           getAppNames(standardUrl),
-          releaseDate: releaseDate);
+          releaseDate: releaseDate,
+          changeLog: changeLog.isEmpty ? null : changeLog);
     } else {
       throw getObtainiumHttpError(res);
     }

lib/app_sources/fdroid.dart

@@ -27,9 +27,6 @@ class FDroid extends AppSource {
     return url.substring(0, match.end);
   }
 
-  @override
-  String? changeLogPageFromStandardUrl(String standardUrl) => null;
-
   @override
   String? tryInferringAppId(String standardUrl,
       {Map<String, dynamic> additionalSettings = const {}}) {

lib/app_sources/github.dart

@@ -160,9 +160,11 @@ class GitHub extends AppSource {
       if (version == null) {
         throw NoVersionError();
       }
+      var changeLog = targetRelease['body'].toString();
       return APKDetails(version, targetRelease['apkUrls'] as List<String>,
           getAppNames(standardUrl),
-          releaseDate: releaseDate);
+          releaseDate: releaseDate,
+          changeLog: changeLog.isEmpty ? null : changeLog);
     } else {
       rateLimitErrorCheck(res);
       throw getObtainiumHttpError(res);

lib/app_sources/html.dart

@@ -10,9 +10,6 @@ class HTML extends AppSource {
     return url;
   }
 
-  @override
-  String? changeLogPageFromStandardUrl(String standardUrl) => null;
-
   @override
   Future<APKDetails> getLatestAPKDetails(
     String standardUrl,

lib/app_sources/izzyondroid.dart

@@ -18,9 +18,6 @@ class IzzyOnDroid extends AppSource {
     return url.substring(0, match.end);
   }
 
-  @override
-  String? changeLogPageFromStandardUrl(String standardUrl) => null;
-
   @override
   String? tryInferringAppId(String standardUrl,
       {Map<String, dynamic> additionalSettings = const {}}) {

lib/app_sources/mullvad.dart

@@ -1,5 +1,7 @@
 import 'package:html/parser.dart';
 import 'package:http/http.dart';
+import 'package:obtainium/app_sources/github.dart';
+import 'package:obtainium/app_sources/html.dart';
 import 'package:obtainium/custom_errors.dart';
 import 'package:obtainium/providers/source_provider.dart';
 
@@ -27,23 +29,24 @@ class Mullvad extends AppSource {
     String standardUrl,
     Map<String, dynamic> additionalSettings,
   ) async {
-    Response res = await get(Uri.parse('$standardUrl/en/download/android'));
+    var details = await HTML().getLatestAPKDetails(
-    if (res.statusCode == 200) {
+        '$standardUrl/en/download/android', additionalSettings);
-      var version = parse(res.body)
+    var fileName = details.apkUrls[0].split('/').last;
-          .querySelector('p.subtitle.is-6')
+    var versionMatch = RegExp('[0-9]+(\\.[0-9]+)+').firstMatch(fileName);
-          ?.querySelector('a')
+    if (versionMatch == null) {
-          ?.attributes['href']
+      throw NoVersionError();
-          ?.split('/')
-          .last;
-      if (version == null) {
-        throw NoVersionError();
-      }
-      return APKDetails(
-          version,
-          ['https://mullvad.net/download/app/apk/latest'],
-          AppNames(name, 'Mullvad-VPN'));
-    } else {
-      throw getObtainiumHttpError(res);
     }
+    details.version = fileName.substring(versionMatch.start, versionMatch.end);
+    details.names = AppNames(name, 'Mullvad-VPN');
+    try {
+      details.changeLog = (await GitHub().getLatestAPKDetails(
+              'https://github.com/mullvad/mullvadvpn-app',
+              {'fallbackToOlderReleases': true}))
+          .changeLog;
+    } catch (e) {
+      print(e);
+      // Ignore
+    }
+    return details;
   }
 }

lib/app_sources/neutroncode.dart

@@ -0,0 +1,111 @@
+import 'package:html/parser.dart';
+import 'package:http/http.dart';
+import 'package:obtainium/custom_errors.dart';
+import 'package:obtainium/providers/source_provider.dart';
+
+class NeutronCode extends AppSource {
+  NeutronCode() {
+    host = 'neutroncode.com';
+  }
+
+  @override
+  String standardizeURL(String url) {
+    RegExp standardUrlRegEx = RegExp('^https?://$host/downloads/file/[^/]+');
+    RegExpMatch? match = standardUrlRegEx.firstMatch(url.toLowerCase());
+    if (match == null) {
+      throw InvalidURLError(name);
+    }
+    return url.substring(0, match.end);
+  }
+
+  @override
+  String? changeLogPageFromStandardUrl(String standardUrl) => standardUrl;
+
+  String monthNameToNumberString(String s) {
+    switch (s.toLowerCase()) {
+      case 'january':
+        return '01';
+      case 'february':
+        return '02';
+      case 'march':
+        return '03';
+      case 'april':
+        return '04';
+      case 'may':
+        return '05';
+      case 'june':
+        return '06';
+      case 'july':
+        return '07';
+      case 'august':
+        return '08';
+      case 'september':
+        return '09';
+      case 'october':
+        return '10';
+      case 'november':
+        return '11';
+      case 'december':
+        return '12';
+      default:
+        throw ArgumentError('Invalid month name: $s');
+    }
+  }
+
+  customDateParse(String dateString) {
+    List<String> parts = dateString.split(' ');
+    if (parts.length != 3) {
+      return null;
+    }
+    String result = '';
+    for (var s in parts.reversed) {
+      try {
+        try {
+          int.parse(s);
+          result += '$s-';
+        } catch (e) {
+          result += '${monthNameToNumberString(s)}-';
+        }
+      } catch (e) {
+        return null;
+      }
+    }
+    return result.substring(0, result.length - 1);
+  }
+
+  @override
+  Future<APKDetails> getLatestAPKDetails(
+    String standardUrl,
+    Map<String, dynamic> additionalSettings,
+  ) async {
+    Response res = await get(Uri.parse(standardUrl));
+    if (res.statusCode == 200) {
+      var http = parse(res.body);
+      var name = http.querySelector('.pd-title')?.innerHtml;
+      var filename = http.querySelector('.pd-filename .pd-float')?.innerHtml;
+      if (filename == null) {
+        throw NoReleasesError();
+      }
+      var version =
+          http.querySelector('.pd-version-txt')?.nextElementSibling?.innerHtml;
+      if (version == null) {
+        throw NoVersionError();
+      }
+      String? apkUrl = 'https://$host/download/$filename';
+      var dateStringOriginal =
+          http.querySelector('.pd-date-txt')?.nextElementSibling?.innerHtml;
+      var dateString = dateStringOriginal != null
+          ? (customDateParse(dateStringOriginal))
+          : null;
+      var changeLogElements = http.querySelectorAll('.pd-fdesc p');
+      return APKDetails(version, [apkUrl],
+          AppNames(runtimeType.toString(), name ?? standardUrl.split('/').last),
+          releaseDate: dateString != null ? DateTime.parse(dateString) : null,
+          changeLog: changeLogElements.isNotEmpty
+              ? changeLogElements.last.innerHtml
+              : null);
+    } else {
+      throw getObtainiumHttpError(res);
+    }
+  }
+}

lib/app_sources/signal.dart

@@ -13,9 +13,6 @@ class Signal extends AppSource {
     return 'https://$host';
   }
 
-  @override
-  String? changeLogPageFromStandardUrl(String standardUrl) => null;
-
   @override
   Future<APKDetails> getLatestAPKDetails(
     String standardUrl,

lib/app_sources/sourceforge.dart

@@ -18,9 +18,6 @@ class SourceForge extends AppSource {
     return url.substring(0, match.end);
   }
 
-  @override
-  String? changeLogPageFromStandardUrl(String standardUrl) => null;
-
   @override
   Future<APKDetails> getLatestAPKDetails(
     String standardUrl,

lib/app_sources/steammobile.dart

@@ -24,9 +24,6 @@ class SteamMobile extends AppSource {
     return 'https://$host';
   }
 
-  @override
-  String? changeLogPageFromStandardUrl(String standardUrl) => null;
-
   @override
   Future<APKDetails> getLatestAPKDetails(
     String standardUrl,

lib/app_sources/telegramapp.dart

@@ -0,0 +1,40 @@
+import 'package:easy_localization/easy_localization.dart';
+import 'package:html/parser.dart';
+import 'package:http/http.dart';
+import 'package:obtainium/custom_errors.dart';
+import 'package:obtainium/providers/source_provider.dart';
+
+class TelegramApp extends AppSource {
+  TelegramApp() {
+    host = 'telegram.org';
+    name = 'Telegram ${tr('app')}';
+  }
+
+  @override
+  String standardizeURL(String url) {
+    return 'https://$host';
+  }
+
+  @override
+  Future<APKDetails> getLatestAPKDetails(
+    String standardUrl,
+    Map<String, dynamic> additionalSettings,
+  ) async {
+    Response res = await get(Uri.parse('https://t.me/s/TAndroidAPK'));
+    if (res.statusCode == 200) {
+      var http = parse(res.body);
+      var messages =
+          http.querySelectorAll('.tgme_widget_message_text.js-message_text');
+      var version = messages.isNotEmpty
+          ? messages.last.innerHtml.split('\n').first.trim().split(' ').first
+          : null;
+      if (version == null) {
+        throw NoVersionError();
+      }
+      String? apkUrl = 'https://telegram.org/dl/android/apk';
+      return APKDetails(version, [apkUrl], AppNames('Telegram', 'Telegram'));
+    } else {
+      throw getObtainiumHttpError(res);
+    }
+  }
+}

lib/app_sources/vlc.dart

@@ -0,0 +1,62 @@
+import 'package:html/parser.dart';
+import 'package:http/http.dart';
+import 'package:obtainium/app_sources/html.dart';
+import 'package:obtainium/custom_errors.dart';
+import 'package:obtainium/providers/source_provider.dart';
+
+class VLC extends AppSource {
+  VLC() {
+    host = 'videolan.org';
+  }
+
+  @override
+  String standardizeURL(String url) {
+    return 'https://$host';
+  }
+
+  @override
+  Future<APKDetails> getLatestAPKDetails(
+    String standardUrl,
+    Map<String, dynamic> additionalSettings,
+  ) async {
+    Response res = await get(
+        Uri.parse('https://www.videolan.org/vlc/download-android.html'));
+    if (res.statusCode == 200) {
+      var dwUrlBase = 'get.videolan.org/vlc-android';
+      var dwLinks = parse(res.body)
+          .querySelectorAll('a')
+          .where((element) =>
+              element.attributes['href']?.contains(dwUrlBase) ?? false)
+          .toList();
+      String? version = dwLinks.isNotEmpty
+          ? dwLinks.first.attributes['href']
+              ?.split('/')
+              .where((s) => s.isNotEmpty)
+              .last
+          : null;
+      if (version == null) {
+        throw NoVersionError();
+      }
+      String? targetUrl = 'https://$dwUrlBase/$version/';
+      Response res2 = await get(Uri.parse(targetUrl));
+      String mirrorDwBase =
+          'https://plug-mirror.rcac.purdue.edu/vlc/vlc-android/$version/';
+      List<String> apkUrls = [];
+      if (res2.statusCode == 200) {
+        apkUrls = parse(res2.body)
+            .querySelectorAll('a')
+            .map((e) => e.attributes['href'])
+            .where((h) =>
+                h != null && h.isNotEmpty && h.toLowerCase().endsWith('.apk'))
+            .map((e) => mirrorDwBase + e!)
+            .toList();
+      } else {
+        throw getObtainiumHttpError(res2);
+      }
+
+      return APKDetails(version, apkUrls, AppNames('VideoLAN', 'VLC'));
+    } else {
+      throw getObtainiumHttpError(res);
+    }
+  }
+}

lib/app_sources/whatsapp.dart

@@ -0,0 +1,75 @@
+import 'package:html/parser.dart';
+import 'package:http/http.dart';
+import 'package:obtainium/custom_errors.dart';
+import 'package:obtainium/providers/source_provider.dart';
+
+class WhatsApp extends AppSource {
+  WhatsApp() {
+    host = 'whatsapp.com';
+  }
+
+  @override
+  String standardizeURL(String url) {
+    return 'https://$host';
+  }
+
+  @override
+  Future<String> apkUrlPrefetchModifier(String apkUrl) async {
+    Response res = await get(Uri.parse('https://www.whatsapp.com/android'));
+    if (res.statusCode == 200) {
+      var targetLinks = parse(res.body)
+          .querySelectorAll('a')
+          .map((e) => e.attributes['href'])
+          .where((e) => e != null)
+          .where((e) =>
+              e!.contains('scontent.whatsapp.net') &&
+              e.contains('WhatsApp.apk'))
+          .toList();
+      if (targetLinks.isEmpty) {
+        throw NoAPKError();
+      }
+      return targetLinks[0]!;
+    } else {
+      throw getObtainiumHttpError(res);
+    }
+  }
+
+  @override
+  Future<APKDetails> getLatestAPKDetails(
+    String standardUrl,
+    Map<String, dynamic> additionalSettings,
+  ) async {
+    Response res = await get(Uri.parse('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,
+          [
+            'https://www.whatsapp.com/android?v=$version&=thisIsaPlaceholder&a=realURLPrefetchedAtDownloadTime'
+          ],
+          AppNames('Meta', 'WhatsApp'));
+    } else {
+      throw getObtainiumHttpError(res);
+    }
+  }
+}

lib/components/generated_form.dart

@@ -48,6 +48,7 @@ class GeneratedFormTextField extends GeneratedFormItem {
 
 class GeneratedFormDropdown extends GeneratedFormItem {
   late List<MapEntry<String, String>>? opts;
+  List<String>? disabledOptKeys;
 
   GeneratedFormDropdown(
     String key,
@@ -55,6 +56,7 @@ class GeneratedFormDropdown extends GeneratedFormItem {
     String label = 'Input',
     List<Widget> belowWidgets = const [],
     String defaultValue = '',
+    this.disabledOptKeys,
     List<String? Function(String? value)> additionalValidators = const [],
   }) : super(key,
             label: label,
@@ -225,10 +227,15 @@ class _GeneratedFormState extends State<GeneratedForm> {
           return DropdownButtonFormField(
               decoration: InputDecoration(labelText: formItem.label),
               value: values[formItem.key],
-              items: formItem.opts!
+              items: formItem.opts!.map((e2) {
-                  .map((e2) =>
+                var enabled =
-                      DropdownMenuItem(value: e2.key, child: Text(e2.value)))
+                    formItem.disabledOptKeys?.contains(e2.key) != true;
-                  .toList(),
+                return DropdownMenuItem(
+                    value: e2.key,
+                    enabled: enabled,
+                    child: Opacity(
+                        opacity: enabled ? 1 : 0.5, child: Text(e2.value)));
+              }).toList(),
               onChanged: (value) {
                 setState(() {
                   values[formItem.key] = value ?? formItem.opts!.first.key;
@@ -460,10 +467,9 @@ class _GeneratedFormState extends State<GeneratedForm> {
       if (rowInputs.key > 0) {
         rows.add([
           SizedBox(
-            height: widget.items[rowInputs.key][0] is GeneratedFormSwitch &&
+            height: widget.items[rowInputs.key - 1][0] is GeneratedFormSwitch
-                    widget.items[rowInputs.key - 1][0] is! GeneratedFormSwitch
+                ? 8
-                ? 25
+                : 25,
-                : 8,
           )
         ]);
       }
@@ -477,6 +483,7 @@ class _GeneratedFormState extends State<GeneratedForm> {
         rowItems.add(Expanded(
             child: Column(
                 crossAxisAlignment: CrossAxisAlignment.stretch,
+                mainAxisSize: MainAxisSize.min,
                 children: [
               rowInput.value,
               ...widget.items[rowInputs.key][rowInput.key].belowWidgets

lib/main.dart

@@ -21,7 +21,7 @@ import 'package:easy_localization/src/easy_localization_controller.dart';
 // ignore: implementation_imports
 import 'package:easy_localization/src/localization.dart';
 
-const String currentVersion = '0.11.3';
+const String currentVersion = '0.11.16';
 const String currentReleaseTag =
     'v$currentVersion-beta'; // KEEP THIS IN SYNC WITH GITHUB RELEASES
 
@@ -34,7 +34,8 @@ const supportedLocales = [
   Locale('ja'),
   Locale('hu'),
   Locale('de'),
-  Locale('fa')
+  Locale('fa'),
+  Locale('fr')
 ];
 const fallbackLocale = Locale('en');
 const localeDir = 'assets/translations';
@@ -146,6 +147,14 @@ Future<void> bgUpdateCheck(int taskId, Map<String, dynamic>? params) async {
 
 void main() async {
   WidgetsFlutterBinding.ensureInitialized();
+  try {
+    ByteData data =
+        await PlatformAssetBundle().load('assets/ca/lets-encrypt-r3.pem');
+    SecurityContext.defaultContext
+        .setTrustedCertificatesBytes(data.buffer.asUint8List());
+  } catch (e) {
+    // Already added, do nothing (see #375)
+  }
   await EasyLocalization.ensureInitialized();
   if ((await DeviceInfoPlugin().androidInfo).version.sdkInt >= 29) {
     SystemChrome.setSystemUIOverlayStyle(
@@ -209,7 +218,15 @@ class _ObtainiumState extends State<Obtainium> {
               {'includePrereleases': true},
               null,
               false)
-        ]);
+        ], onlyIfExists: false);
+      }
+      if (!supportedLocales
+              .map((e) => e.languageCode)
+              .contains(context.locale.languageCode) ||
+          settingsProvider.forcedLocale == null &&
+              context.deviceLocale.languageCode !=
+                  context.locale.languageCode) {
+        settingsProvider.resetLocaleSafe(context);
       }
       // Register the background update task according to the user's setting
       if (existingUpdateInterval != settingsProvider.updateInterval) {

lib/pages/add_app.dart

@@ -33,10 +33,10 @@ class _AddAppPageState extends State<AddAppPage> {
   bool additionalSettingsValid = true;
   List<String> pickedCategories = [];
   int searchnum = 0;
+  SourceProvider sourceProvider = SourceProvider();
 
   @override
   Widget build(BuildContext context) {
-    SourceProvider sourceProvider = SourceProvider();
     AppsProvider appsProvider = context.read<AppsProvider>();
 
     bool doingSomething = gettingAppInfo || searching;
@@ -64,65 +64,56 @@ class _AddAppPageState extends State<AddAppPage> {
       }
     }
 
+    getTrackOnlyConfirmationIfNeeded(bool userPickedTrackOnly) async {
+      return (!((userPickedTrackOnly || pickedSource!.enforceTrackOnly) &&
+          // ignore: use_build_context_synchronously
+          await showDialog(
+                  context: context,
+                  builder: (BuildContext ctx) {
+                    return GeneratedFormModal(
+                      title: tr('xIsTrackOnly', args: [
+                        pickedSource!.enforceTrackOnly
+                            ? tr('source')
+                            : tr('app')
+                      ]),
+                      items: const [],
+                      message:
+                          '${pickedSource!.enforceTrackOnly ? tr('appsFromSourceAreTrackOnly') : tr('youPickedTrackOnly')}\n\n${tr('trackOnlyAppDescription')}',
+                    );
+                  }) ==
+              null));
+    }
+
+    getReleaseDateAsVersionConfirmationIfNeeded(
+        bool userPickedTrackOnly) async {
+      return (!(additionalSettings['versionDetection'] ==
+              'releaseDateAsVersion' &&
+          // ignore: use_build_context_synchronously
+          await showDialog(
+                  context: context,
+                  builder: (BuildContext ctx) {
+                    return GeneratedFormModal(
+                      title: tr('releaseDateAsVersion'),
+                      items: const [],
+                      message: tr('releaseDateAsVersionExplanation'),
+                    );
+                  }) ==
+              null));
+    }
+
     addApp({bool resetUserInputAfter = false}) async {
       setState(() {
         gettingAppInfo = true;
       });
-      var settingsProvider = context.read<SettingsProvider>();
+      try {
-      () async {
+        var settingsProvider = context.read<SettingsProvider>();
         var userPickedTrackOnly = additionalSettings['trackOnly'] == true;
-        var cont = true;
+        App? app;
-        if ((userPickedTrackOnly || pickedSource!.enforceTrackOnly) &&
+        if ((await getTrackOnlyConfirmationIfNeeded(userPickedTrackOnly)) &&
-            // ignore: use_build_context_synchronously
+            (await getReleaseDateAsVersionConfirmationIfNeeded(
-            await showDialog(
+                userPickedTrackOnly))) {
-                    context: context,
-                    builder: (BuildContext ctx) {
-                      return GeneratedFormModal(
-                        title: tr('xIsTrackOnly', args: [
-                          pickedSource!.enforceTrackOnly
-                              ? tr('source')
-                              : tr('app')
-                        ]),
-                        items: const [],
-                        message:
-                            '${pickedSource!.enforceTrackOnly ? tr('appsFromSourceAreTrackOnly') : tr('youPickedTrackOnly')}\n\n${tr('trackOnlyAppDescription')}',
-                      );
-                    }) ==
-                null) {
-          cont = false;
-        }
-        if (additionalSettings['versionDetection'] == 'releaseDateAsVersion' &&
-            // ignore: use_build_context_synchronously
-            await showDialog(
-                    context: context,
-                    builder: (BuildContext ctx) {
-                      return GeneratedFormModal(
-                        title: tr('releaseDateAsVersion'),
-                        items: const [],
-                        message: tr('releaseDateAsVersionExplanation'),
-                      );
-                    }) ==
-                null) {
-          cont = false;
-        }
-        if (additionalSettings['versionDetection'] == 'noVersionDetection' &&
-            // ignore: use_build_context_synchronously
-            await showDialog(
-                    context: context,
-                    builder: (BuildContext ctx) {
-                      return GeneratedFormModal(
-                        title: tr('disableVersionDetection'),
-                        items: const [],
-                        message: tr('noVersionDetectionExplanation'),
-                      );
-                    }) ==
-                null) {
-          cont = false;
-        }
-        if (cont) {
-          HapticFeedback.selectionClick();
           var trackOnly = pickedSource!.enforceTrackOnly || userPickedTrackOnly;
-          App app = await sourceProvider.getApp(
+          app = await sourceProvider.getApp(
               pickedSource!, userInput, additionalSettings,
               trackOnlyOverride: trackOnly);
           if (!trackOnly) {
@@ -149,28 +140,233 @@ class _AddAppPageState extends State<AddAppPage> {
             app.installedVersion = app.latestVersion;
           }
           app.categories = pickedCategories;
-          await appsProvider.saveApps([app]);
+          await appsProvider.saveApps([app], onlyIfExists: false);
-
-          return app;
         }
-      }()
-          .then((app) {
         if (app != null) {
-          Navigator.push(context,
+          Navigator.push(globalNavigatorKey.currentContext ?? context,
-              MaterialPageRoute(builder: (context) => AppPage(appId: app.id)));
+              MaterialPageRoute(builder: (context) => AppPage(appId: app!.id)));
         }
-      }).catchError((e) {
+      } catch (e) {
         showError(e, context);
-      }).whenComplete(() {
+      } finally {
         setState(() {
           gettingAppInfo = false;
           if (resetUserInputAfter) {
             changeUserInput('', false, true);
           }
         });
-      });
+      }
     }
 
+    Widget getUrlInputRow() => Row(
+          children: [
+            Expanded(
+                child: GeneratedForm(
+                    key: Key(searchnum.toString()),
+                    items: [
+                      [
+                        GeneratedFormTextField('appSourceURL',
+                            label: tr('appSourceURL'),
+                            defaultValue: userInput,
+                            additionalValidators: [
+                              (value) {
+                                try {
+                                  sourceProvider
+                                      .getSource(value ?? '')
+                                      .standardizeURL(
+                                          preStandardizeUrl(value ?? ''));
+                                } catch (e) {
+                                  return e is String
+                                      ? e
+                                      : e is ObtainiumError
+                                          ? e.toString()
+                                          : tr('error');
+                                }
+                                return null;
+                              }
+                            ])
+                      ]
+                    ],
+                    onValueChanges: (values, valid, isBuilding) {
+                      changeUserInput(
+                          values['appSourceURL']!, valid, isBuilding);
+                    })),
+            const SizedBox(
+              width: 16,
+            ),
+            gettingAppInfo
+                ? const CircularProgressIndicator()
+                : ElevatedButton(
+                    onPressed: doingSomething ||
+                            pickedSource == null ||
+                            (pickedSource!.combinedAppSpecificSettingFormItems
+                                    .isNotEmpty &&
+                                !additionalSettingsValid)
+                        ? null
+                        : () {
+                            HapticFeedback.selectionClick();
+                            addApp();
+                          },
+                    child: Text(tr('add')))
+          ],
+        );
+
+    runSearch() async {
+      setState(() {
+        searching = true;
+      });
+      try {
+        var results = await Future.wait(sourceProvider.sources
+            .where((e) => e.canSearch)
+            .map((e) => e.search(searchQuery)));
+
+        // .then((results) async {
+        // Interleave results instead of simple reduce
+        Map<String, String> res = {};
+        var si = 0;
+        var done = false;
+        while (!done) {
+          done = true;
+          for (var r in results) {
+            if (r.length > si) {
+              done = false;
+              res.addEntries([r.entries.elementAt(si)]);
+            }
+          }
+          si++;
+        }
+        List<String>? selectedUrls = res.isEmpty
+            ? []
+            // ignore: use_build_context_synchronously
+            : await showDialog<List<String>?>(
+                context: context,
+                builder: (BuildContext ctx) {
+                  return UrlSelectionModal(
+                    urlsWithDescriptions: res,
+                    selectedByDefault: false,
+                    onlyOneSelectionAllowed: true,
+                  );
+                });
+        if (selectedUrls != null && selectedUrls.isNotEmpty) {
+          changeUserInput(selectedUrls[0], true, false, isSearch: true);
+        }
+      } catch (e) {
+        showError(e, context);
+      } finally {
+        setState(() {
+          searching = false;
+        });
+      }
+    }
+
+    bool shouldShowSearchBar() =>
+        sourceProvider.sources.where((e) => e.canSearch).isNotEmpty &&
+        pickedSource == null &&
+        userInput.isEmpty;
+
+    Widget getSearchBarRow() => Row(
+          children: [
+            Expanded(
+              child: GeneratedForm(
+                  items: [
+                    [
+                      GeneratedFormTextField('searchSomeSources',
+                          label: tr('searchSomeSourcesLabel'), required: false),
+                    ]
+                  ],
+                  onValueChanges: (values, valid, isBuilding) {
+                    if (values.isNotEmpty && valid && !isBuilding) {
+                      setState(() {
+                        searchQuery = values['searchSomeSources']!.trim();
+                      });
+                    }
+                  }),
+            ),
+            const SizedBox(
+              width: 16,
+            ),
+            ElevatedButton(
+                onPressed: searchQuery.isEmpty || doingSomething
+                    ? null
+                    : () {
+                        runSearch();
+                      },
+                child: Text(tr('search')))
+          ],
+        );
+
+    Widget getAdditionalOptsCol() => Column(
+          crossAxisAlignment: CrossAxisAlignment.stretch,
+          children: [
+            const Divider(
+              height: 64,
+            ),
+            Text(
+                tr('additionalOptsFor',
+                    args: [pickedSource?.name ?? tr('source')]),
+                style: TextStyle(color: Theme.of(context).colorScheme.primary)),
+            const SizedBox(
+              height: 16,
+            ),
+            GeneratedForm(
+                key: Key(pickedSource.runtimeType.toString()),
+                items: pickedSource!.combinedAppSpecificSettingFormItems,
+                onValueChanges: (values, valid, isBuilding) {
+                  if (!isBuilding) {
+                    setState(() {
+                      additionalSettings = values;
+                      additionalSettingsValid = valid;
+                    });
+                  }
+                }),
+            Column(
+              children: [
+                const SizedBox(
+                  height: 16,
+                ),
+                CategoryEditorSelector(
+                    alignment: WrapAlignment.start,
+                    onSelected: (categories) {
+                      pickedCategories = categories;
+                    }),
+              ],
+            ),
+          ],
+        );
+
+    Widget getSourcesListWidget() => Expanded(
+            child: Column(
+                crossAxisAlignment: CrossAxisAlignment.center,
+                mainAxisAlignment: MainAxisAlignment.center,
+                children: [
+              const SizedBox(
+                height: 48,
+              ),
+              Text(
+                tr('supportedSourcesBelow'),
+              ),
+              const SizedBox(
+                height: 8,
+              ),
+              ...sourceProvider.sources
+                  .map((e) => GestureDetector(
+                      onTap: e.host != null
+                          ? () {
+                              launchUrlString('https://${e.host}',
+                                  mode: LaunchMode.externalApplication);
+                            }
+                          : null,
+                      child: Text(
+                        '${e.name}${e.enforceTrackOnly ? ' ${tr('trackOnlyInBrackets')}' : ''}${e.canSearch ? ' ${tr('searchableInBrackets')}' : ''}',
+                        style: TextStyle(
+                            decoration: e.host != null
+                                ? TextDecoration.underline
+                                : TextDecoration.none,
+                            fontStyle: FontStyle.italic),
+                      )))
+                  .toList()
+            ]));
+
     return Scaffold(
         backgroundColor: Theme.of(context).colorScheme.surface,
         body: CustomScrollView(slivers: <Widget>[
@@ -181,230 +377,16 @@ class _AddAppPageState extends State<AddAppPage> {
                 child: Column(
                     crossAxisAlignment: CrossAxisAlignment.stretch,
                     children: [
-                      Row(
+                      getUrlInputRow(),
-                        children: [
+                      if (shouldShowSearchBar())
-                          Expanded(
-                              child: GeneratedForm(
-                                  key: Key(searchnum.toString()),
-                                  items: [
-                                    [
-                                      GeneratedFormTextField('appSourceURL',
-                                          label: tr('appSourceURL'),
-                                          defaultValue: userInput,
-                                          additionalValidators: [
-                                            (value) {
-                                              try {
-                                                sourceProvider
-                                                    .getSource(value ?? '')
-                                                    .standardizeURL(
-                                                        preStandardizeUrl(
-                                                            value ?? ''));
-                                              } catch (e) {
-                                                return e is String
-                                                    ? e
-                                                    : e is ObtainiumError
-                                                        ? e.toString()
-                                                        : tr('error');
-                                              }
-                                              return null;
-                                            }
-                                          ])
-                                    ]
-                                  ],
-                                  onValueChanges: (values, valid, isBuilding) {
-                                    changeUserInput(values['appSourceURL']!,
-                                        valid, isBuilding);
-                                  })),
-                          const SizedBox(
-                            width: 16,
-                          ),
-                          gettingAppInfo
-                              ? const CircularProgressIndicator()
-                              : ElevatedButton(
-                                  onPressed: doingSomething ||
-                                          pickedSource == null ||
-                                          (pickedSource!
-                                                  .combinedAppSpecificSettingFormItems
-                                                  .isNotEmpty &&
-                                              !additionalSettingsValid)
-                                      ? null
-                                      : addApp,
-                                  child: Text(tr('add')))
-                        ],
-                      ),
-                      if (sourceProvider.sources
-                              .where((e) => e.canSearch)
-                              .isNotEmpty &&
-                          pickedSource == null &&
-                          userInput.isEmpty)
                         const SizedBox(
                           height: 16,
                         ),
-                      if (sourceProvider.sources
+                      if (shouldShowSearchBar()) getSearchBarRow(),
-                              .where((e) => e.canSearch)
-                              .isNotEmpty &&
-                          pickedSource == null &&
-                          userInput.isEmpty)
-                        Row(
-                          children: [
-                            Expanded(
-                              child: GeneratedForm(
-                                  items: [
-                                    [
-                                      GeneratedFormTextField(
-                                          'searchSomeSources',
-                                          label: tr('searchSomeSourcesLabel'),
-                                          required: false),
-                                    ]
-                                  ],
-                                  onValueChanges: (values, valid, isBuilding) {
-                                    if (values.isNotEmpty &&
-                                        valid &&
-                                        !isBuilding) {
-                                      setState(() {
-                                        searchQuery =
-                                            values['searchSomeSources']!.trim();
-                                      });
-                                    }
-                                  }),
-                            ),
-                            const SizedBox(
-                              width: 16,
-                            ),
-                            ElevatedButton(
-                                onPressed: searchQuery.isEmpty || doingSomething
-                                    ? null
-                                    : () {
-                                        setState(() {
-                                          searching = true;
-                                        });
-                                        Future.wait(sourceProvider.sources
-                                                .where((e) => e.canSearch)
-                                                .map((e) =>
-                                                    e.search(searchQuery)))
-                                            .then((results) async {
-                                          // Interleave results instead of simple reduce
-                                          Map<String, String> res = {};
-                                          var si = 0;
-                                          var done = false;
-                                          while (!done) {
-                                            done = true;
-                                            for (var r in results) {
-                                              if (r.length > si) {
-                                                done = false;
-                                                res.addEntries(
-                                                    [r.entries.elementAt(si)]);
-                                              }
-                                            }
-                                            si++;
-                                          }
-                                          List<String>? selectedUrls = res
-                                                  .isEmpty
-                                              ? []
-                                              : await showDialog<List<String>?>(
-                                                  context: context,
-                                                  builder: (BuildContext ctx) {
-                                                    return UrlSelectionModal(
-                                                      urlsWithDescriptions: res,
-                                                      selectedByDefault: false,
-                                                      onlyOneSelectionAllowed:
-                                                          true,
-                                                    );
-                                                  });
-                                          if (selectedUrls != null &&
-                                              selectedUrls.isNotEmpty) {
-                                            changeUserInput(
-                                                selectedUrls[0], true, false,
-                                                isSearch: true);
-                                          }
-                                        }).catchError((e) {
-                                          showError(e, context);
-                                        }).whenComplete(() {
-                                          setState(() {
-                                            searching = false;
-                                          });
-                                        });
-                                      },
-                                child: Text(tr('search')))
-                          ],
-                        ),
                       if (pickedSource != null)
-                        Column(
+                        getAdditionalOptsCol()
-                          crossAxisAlignment: CrossAxisAlignment.stretch,
-                          children: [
-                            const Divider(
-                              height: 64,
-                            ),
-                            Text(
-                                tr('additionalOptsFor',
-                                    args: [pickedSource?.name ?? tr('source')]),
-                                style: TextStyle(
-                                    color:
-                                        Theme.of(context).colorScheme.primary)),
-                            const SizedBox(
-                              height: 16,
-                            ),
-                            GeneratedForm(
-                                key: Key(pickedSource.runtimeType.toString()),
-                                items: pickedSource!
-                                    .combinedAppSpecificSettingFormItems,
-                                onValueChanges: (values, valid, isBuilding) {
-                                  if (!isBuilding) {
-                                    setState(() {
-                                      additionalSettings = values;
-                                      additionalSettingsValid = valid;
-                                    });
-                                  }
-                                }),
-                            Column(
-                              children: [
-                                const SizedBox(
-                                  height: 16,
-                                ),
-                                CategoryEditorSelector(
-                                    alignment: WrapAlignment.start,
-                                    onSelected: (categories) {
-                                      pickedCategories = categories;
-                                    }),
-                              ],
-                            ),
-                          ],
-                        )
                       else
-                        Expanded(
+                        getSourcesListWidget(),
-                            child: Column(
-                                crossAxisAlignment: CrossAxisAlignment.center,
-                                mainAxisAlignment: MainAxisAlignment.center,
-                                children: [
-                              const SizedBox(
-                                height: 48,
-                              ),
-                              Text(
-                                tr('supportedSourcesBelow'),
-                              ),
-                              const SizedBox(
-                                height: 8,
-                              ),
-                              ...sourceProvider.sources
-                                  .map((e) => GestureDetector(
-                                      onTap: e.host != null
-                                          ? () {
-                                              launchUrlString(
-                                                  'https://${e.host}',
-                                                  mode: LaunchMode
-                                                      .externalApplication);
-                                            }
-                                          : null,
-                                      child: Text(
-                                        '${e.name}${e.enforceTrackOnly ? ' ${tr('trackOnlyInBrackets')}' : ''}${e.canSearch ? ' ${tr('searchableInBrackets')}' : ''}',
-                                        style: TextStyle(
-                                            decoration: e.host != null
-                                                ? TextDecoration.underline
-                                                : TextDecoration.none,
-                                            fontStyle: FontStyle.italic),
-                                      )))
-                                  .toList()
-                            ])),
                       const SizedBox(
                         height: 8,
                       ),

lib/pages/app.dart

@@ -1,6 +1,7 @@
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
+import 'package:obtainium/components/generated_form.dart';
 import 'package:obtainium/components/generated_form_modal.dart';
 import 'package:obtainium/custom_errors.dart';
 import 'package:obtainium/main.dart';
@@ -34,406 +35,414 @@ class _AppPageState extends State<AppPage> {
       });
     }
 
+    bool areDownloadsRunning = appsProvider.areDownloadsRunning();
+
     var sourceProvider = SourceProvider();
     AppInMemory? app = appsProvider.apps[widget.appId];
     var source = app != null ? sourceProvider.getSource(app.app.url) : null;
-    if (!appsProvider.areDownloadsRunning() && prevApp == null && app != null) {
+    if (!areDownloadsRunning && prevApp == null && app != null) {
       prevApp = app;
       getUpdate(app.app.id);
     }
     var trackOnly = app?.app.additionalSettings['trackOnly'] == true;
 
-    var infoColumn = Column(
+    bool isVersionDetectionStandard =
-      mainAxisAlignment: MainAxisAlignment.center,
+        app?.app.additionalSettings['versionDetection'] ==
-      crossAxisAlignment: CrossAxisAlignment.stretch,
+            'standardVersionDetection';
-      children: [
-        GestureDetector(
-            onTap: () {
-              if (app?.app.url != null) {
-                launchUrlString(app?.app.url ?? '',
-                    mode: LaunchMode.externalApplication);
-              }
-            },
-            child: Text(
-              app?.app.url ?? '',
-              textAlign: TextAlign.center,
-              style: const TextStyle(
-                  decoration: TextDecoration.underline,
-                  fontStyle: FontStyle.italic,
-                  fontSize: 12),
-            )),
-        const SizedBox(
-          height: 32,
-        ),
-        Text(
-          tr('latestVersionX', args: [app?.app.latestVersion ?? tr('unknown')]),
-          textAlign: TextAlign.center,
-          style: Theme.of(context).textTheme.bodyLarge,
-        ),
-        Text(
-          '${tr('installedVersionX', args: [
-                app?.app.installedVersion ?? tr('none')
-              ])}${trackOnly ? ' ${tr('estimateInBrackets')}\n\n${tr('xIsTrackOnly', args: [
-                  tr('app')
-                ])}' : ''}',
-          textAlign: TextAlign.center,
-          style: Theme.of(context).textTheme.bodyLarge,
-        ),
-        const SizedBox(
-          height: 32,
-        ),
-        Text(
-          tr('lastUpdateCheckX', args: [
-            app?.app.lastUpdateCheck == null
-                ? tr('never')
-                : '\n${app?.app.lastUpdateCheck?.toLocal()}'
-          ]),
-          textAlign: TextAlign.center,
-          style: const TextStyle(fontStyle: FontStyle.italic, fontSize: 12),
-        ),
-        const SizedBox(
-          height: 48,
-        ),
-        CategoryEditorSelector(
-            alignment: WrapAlignment.center,
-            preselected:
-                app?.app.categories != null ? app!.app.categories.toSet() : {},
-            onSelected: (categories) {
-              if (app != null) {
-                app.app.categories = categories;
-                appsProvider.saveApps([app.app]);
-              }
-            }),
-      ],
-    );
 
-    var fullInfoColumn = Column(
+    getInfoColumn() => Column(
-      mainAxisAlignment: MainAxisAlignment.center,
+          mainAxisAlignment: MainAxisAlignment.center,
-      crossAxisAlignment: CrossAxisAlignment.stretch,
+          crossAxisAlignment: CrossAxisAlignment.stretch,
-      children: [
+          children: [
-        const SizedBox(height: 125),
+            GestureDetector(
-        app?.installedInfo != null
+                onTap: () {
-            ? Row(mainAxisAlignment: MainAxisAlignment.center, children: [
+                  if (app?.app.url != null) {
-                Image.memory(
+                    launchUrlString(app?.app.url ?? '',
-                  app!.installedInfo!.icon!,
+                        mode: LaunchMode.externalApplication);
-                  height: 150,
+                  }
-                  gaplessPlayback: true,
+                },
-                )
+                child: Text(
-              ])
+                  app?.app.url ?? '',
-            : Container(),
+                  textAlign: TextAlign.center,
-        const SizedBox(
+                  style: const TextStyle(
-          height: 25,
+                      decoration: TextDecoration.underline,
-        ),
+                      fontStyle: FontStyle.italic,
-        Text(
+                      fontSize: 12),
-          app?.installedInfo?.name ?? app?.app.name ?? tr('app'),
+                )),
-          textAlign: TextAlign.center,
+            const SizedBox(
-          style: Theme.of(context).textTheme.displayLarge,
+              height: 32,
-        ),
+            ),
-        Text(
+            Text(
-          tr('byX', args: [app?.app.author ?? tr('unknown')]),
+              tr('latestVersionX',
-          textAlign: TextAlign.center,
+                  args: [app?.app.latestVersion ?? tr('unknown')]),
-          style: Theme.of(context).textTheme.headlineMedium,
+              textAlign: TextAlign.center,
-        ),
+              style: Theme.of(context).textTheme.bodyLarge,
-        const SizedBox(
+            ),
-          height: 8,
+            Text(
-        ),
+              '${tr('installedVersionX', args: [
-        Text(
+                    app?.app.installedVersion ?? tr('none')
-          app?.app.id ?? '',
+                  ])}${trackOnly ? ' ${tr('estimateInBrackets')}\n\n${tr('xIsTrackOnly', args: [
-          textAlign: TextAlign.center,
+                      tr('app')
-          style: Theme.of(context).textTheme.labelSmall,
+                    ])}' : ''}',
-        ),
+              textAlign: TextAlign.center,
-        app?.app.releaseDate == null
+              style: Theme.of(context).textTheme.bodyLarge,
-            ? const SizedBox.shrink()
+            ),
-            : Text(
+            if (app?.app.installedVersion != null &&
-                app!.app.releaseDate.toString(),
+                !isVersionDetectionStandard)
-                textAlign: TextAlign.center,
+              Column(
-                style: Theme.of(context).textTheme.labelSmall,
+                children: [
+                  const SizedBox(
+                    height: 4,
+                  ),
+                  Text(
+                    tr('noVersionDetection'),
+                    style: Theme.of(context).textTheme.labelSmall,
+                  )
+                ],
               ),
-        const SizedBox(
+            const SizedBox(
-          height: 32,
+              height: 32,
-        ),
+            ),
-        infoColumn,
+            Text(
-        const SizedBox(height: 150)
+              tr('lastUpdateCheckX', args: [
-      ],
+                app?.app.lastUpdateCheck == null
-    );
+                    ? tr('never')
+                    : '\n${app?.app.lastUpdateCheck?.toLocal()}'
+              ]),
+              textAlign: TextAlign.center,
+              style: const TextStyle(fontStyle: FontStyle.italic, fontSize: 12),
+            ),
+            const SizedBox(
+              height: 48,
+            ),
+            CategoryEditorSelector(
+                alignment: WrapAlignment.center,
+                preselected: app?.app.categories != null
+                    ? app!.app.categories.toSet()
+                    : {},
+                onSelected: (categories) {
+                  if (app != null) {
+                    app.app.categories = categories;
+                    appsProvider.saveApps([app.app]);
+                  }
+                }),
+          ],
+        );
+
+    getFullInfoColumn() => Column(
+          mainAxisAlignment: MainAxisAlignment.center,
+          crossAxisAlignment: CrossAxisAlignment.stretch,
+          children: [
+            const SizedBox(height: 125),
+            app?.installedInfo != null
+                ? Row(mainAxisAlignment: MainAxisAlignment.center, children: [
+                    Image.memory(
+                      app!.installedInfo!.icon!,
+                      height: 150,
+                      gaplessPlayback: true,
+                    )
+                  ])
+                : Container(),
+            const SizedBox(
+              height: 25,
+            ),
+            Text(
+              app?.installedInfo?.name ?? app?.app.name ?? tr('app'),
+              textAlign: TextAlign.center,
+              style: Theme.of(context).textTheme.displayLarge,
+            ),
+            Text(
+              tr('byX', args: [app?.app.author ?? tr('unknown')]),
+              textAlign: TextAlign.center,
+              style: Theme.of(context).textTheme.headlineMedium,
+            ),
+            const SizedBox(
+              height: 8,
+            ),
+            Text(
+              app?.app.id ?? '',
+              textAlign: TextAlign.center,
+              style: Theme.of(context).textTheme.labelSmall,
+            ),
+            app?.app.releaseDate == null
+                ? const SizedBox.shrink()
+                : Text(
+                    app!.app.releaseDate.toString(),
+                    textAlign: TextAlign.center,
+                    style: Theme.of(context).textTheme.labelSmall,
+                  ),
+            const SizedBox(
+              height: 32,
+            ),
+            getInfoColumn(),
+            const SizedBox(height: 150)
+          ],
+        );
+
+    getAppWebView() => app != null
+        ? WebViewWidget(
+            controller: WebViewController()
+              ..setJavaScriptMode(JavaScriptMode.unrestricted)
+              ..setBackgroundColor(Theme.of(context).colorScheme.background)
+              ..setJavaScriptMode(JavaScriptMode.unrestricted)
+              ..setNavigationDelegate(
+                NavigationDelegate(
+                  onWebResourceError: (WebResourceError error) {
+                    if (error.isForMainFrame == true) {
+                      showError(
+                          ObtainiumError(error.description, unexpected: true),
+                          context);
+                    }
+                  },
+                ),
+              )
+              ..loadRequest(Uri.parse(app.app.url)))
+        : Container();
+
+    showMarkUpdatedDialog() {
+      return showDialog(
+          context: context,
+          builder: (BuildContext ctx) {
+            return AlertDialog(
+              title: Text(tr('alreadyUpToDateQuestion')),
+              actions: [
+                TextButton(
+                    onPressed: () {
+                      Navigator.of(context).pop();
+                    },
+                    child: Text(tr('no'))),
+                TextButton(
+                    onPressed: () {
+                      HapticFeedback.selectionClick();
+                      var updatedApp = app?.app;
+                      if (updatedApp != null) {
+                        updatedApp.installedVersion = updatedApp.latestVersion;
+                        appsProvider.saveApps([updatedApp]);
+                      }
+                      Navigator.of(context).pop();
+                    },
+                    child: Text(tr('yesMarkUpdated')))
+              ],
+            );
+          });
+    }
+
+    showAdditionalOptionsDialog() async {
+      return await showDialog<Map<String, dynamic>?>(
+          context: context,
+          builder: (BuildContext ctx) {
+            var items =
+                (source?.combinedAppSpecificSettingFormItems ?? []).map((row) {
+              row = row.map((e) {
+                if (app?.app.additionalSettings[e.key] != null) {
+                  e.defaultValue = app?.app.additionalSettings[e.key];
+                }
+                return e;
+              }).toList();
+              return row;
+            }).toList();
+
+            items = items.map((row) {
+              row = row.map((e) {
+                if (e.key == 'versionDetection' && e is GeneratedFormDropdown) {
+                  e.disabledOptKeys ??= [];
+                  if (app?.app.installedVersion != null &&
+                      app?.app.additionalSettings['versionDetection'] !=
+                          'releaseDateAsVersion' &&
+                      !appsProvider.isVersionDetectionPossible(app)) {
+                    e.disabledOptKeys!.add('standardVersionDetection');
+                  }
+                  if (app?.app.releaseDate == null) {
+                    e.disabledOptKeys!.add('releaseDateAsVersion');
+                  }
+                }
+                return e;
+              }).toList();
+              return row;
+            }).toList();
+
+            return GeneratedFormModal(
+              title: tr('additionalOptions'),
+              items: items,
+            );
+          });
+    }
+
+    handleAdditionalOptionChanges(Map<String, dynamic>? values) {
+      if (app != null && values != null) {
+        Map<String, dynamic> originalSettings = app.app.additionalSettings;
+        app.app.additionalSettings = values;
+        if (source?.enforceTrackOnly == true) {
+          app.app.additionalSettings['trackOnly'] = true;
+          // ignore: use_build_context_synchronously
+          showError(tr('appsFromSourceAreTrackOnly'), context);
+        }
+        if (app.app.additionalSettings['versionDetection'] ==
+            'releaseDateAsVersion') {
+          if (originalSettings['versionDetection'] != 'releaseDateAsVersion') {
+            if (app.app.releaseDate != null) {
+              bool isUpdated =
+                  app.app.installedVersion == app.app.latestVersion;
+              app.app.latestVersion =
+                  app.app.releaseDate!.microsecondsSinceEpoch.toString();
+              if (isUpdated) {
+                app.app.installedVersion = app.app.latestVersion;
+              }
+            }
+          }
+        } else if (originalSettings['versionDetection'] ==
+            'releaseDateAsVersion') {
+          app.app.installedVersion =
+              app.installedInfo?.versionName ?? app.app.installedVersion;
+        }
+        appsProvider.saveApps([app.app]).then((value) {
+          getUpdate(app.app.id);
+        });
+      }
+    }
+
+    getInstallOrUpdateButton() => TextButton(
+        onPressed: (app?.app.installedVersion == null ||
+                    app?.app.installedVersion != app?.app.latestVersion) &&
+                !areDownloadsRunning
+            ? () async {
+                try {
+                  HapticFeedback.heavyImpact();
+                  if (app?.app.additionalSettings['trackOnly'] != true) {
+                    await settingsProvider.getInstallPermission();
+                  }
+                  var res = await appsProvider.downloadAndInstallLatestApps(
+                      [app!.app.id], globalNavigatorKey.currentContext);
+                  if (res.isNotEmpty && mounted) {
+                    Navigator.of(context).pop();
+                  }
+                } catch (e) {
+                  showError(e, context);
+                }
+              }
+            : null,
+        child: Text(app?.app.installedVersion == null
+            ? !trackOnly
+                ? tr('install')
+                : tr('markInstalled')
+            : !trackOnly
+                ? tr('update')
+                : tr('markUpdated')));
+
+    getBottomSheetMenu() => Padding(
+        padding:
+            EdgeInsets.fromLTRB(0, 0, 0, MediaQuery.of(context).padding.bottom),
+        child: Column(
+          mainAxisSize: MainAxisSize.min,
+          children: [
+            Padding(
+                padding: const EdgeInsets.fromLTRB(16, 8, 16, 0),
+                child: Row(
+                    mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+                    children: [
+                      if (app?.app.installedVersion != null &&
+                          app?.app.installedVersion != app?.app.latestVersion &&
+                          !isVersionDetectionStandard &&
+                          !trackOnly)
+                        IconButton(
+                            onPressed: app?.downloadProgress != null
+                                ? null
+                                : showMarkUpdatedDialog,
+                            tooltip: tr('markUpdated'),
+                            icon: const Icon(Icons.done)),
+                      if (source != null &&
+                          source.combinedAppSpecificSettingFormItems.isNotEmpty)
+                        IconButton(
+                            onPressed: app?.downloadProgress != null
+                                ? null
+                                : () async {
+                                    var values =
+                                        await showAdditionalOptionsDialog();
+                                    handleAdditionalOptionChanges(values);
+                                  },
+                            tooltip: tr('additionalOptions'),
+                            icon: const Icon(Icons.edit)),
+                      if (app != null && app.installedInfo != null)
+                        IconButton(
+                          onPressed: () {
+                            appsProvider.openAppSettings(app.app.id);
+                          },
+                          icon: const Icon(Icons.settings),
+                          tooltip: tr('settings'),
+                        ),
+                      if (app != null && settingsProvider.showAppWebpage)
+                        IconButton(
+                            onPressed: () {
+                              showDialog(
+                                  context: context,
+                                  builder: (BuildContext ctx) {
+                                    return AlertDialog(
+                                      scrollable: true,
+                                      content: getInfoColumn(),
+                                      title: Text(
+                                          '${app.app.name} ${tr('byX', args: [
+                                            app.app.author
+                                          ])}'),
+                                      actions: [
+                                        TextButton(
+                                            onPressed: () {
+                                              Navigator.of(context).pop();
+                                            },
+                                            child: Text(tr('continue')))
+                                      ],
+                                    );
+                                  });
+                            },
+                            icon: const Icon(Icons.more_horiz),
+                            tooltip: tr('more')),
+                      const SizedBox(width: 16.0),
+                      Expanded(child: getInstallOrUpdateButton()),
+                      const SizedBox(width: 16.0),
+                      Expanded(
+                          child: TextButton(
+                        onPressed: app?.downloadProgress != null
+                            ? null
+                            : () {
+                                appsProvider.removeAppsWithModal(
+                                    context, [app!.app]).then((value) {
+                                  if (value == true) {
+                                    Navigator.of(context).pop();
+                                  }
+                                });
+                              },
+                        style: TextButton.styleFrom(
+                            foregroundColor:
+                                Theme.of(context).colorScheme.error,
+                            surfaceTintColor:
+                                Theme.of(context).colorScheme.error),
+                        child: Text(tr('remove')),
+                      )),
+                    ])),
+            if (app?.downloadProgress != null)
+              Padding(
+                  padding: const EdgeInsets.fromLTRB(0, 8, 0, 0),
+                  child: LinearProgressIndicator(
+                      value: app!.downloadProgress! / 100))
+          ],
+        ));
 
     return Scaffold(
-      appBar: settingsProvider.showAppWebpage ? AppBar() : null,
+        appBar: settingsProvider.showAppWebpage ? AppBar() : null,
-      backgroundColor: Theme.of(context).colorScheme.surface,
+        backgroundColor: Theme.of(context).colorScheme.surface,
-      body: RefreshIndicator(
+        body: RefreshIndicator(
-          child: settingsProvider.showAppWebpage
+            child: settingsProvider.showAppWebpage
-              ? app != null
+                ? getAppWebView()
-                  ? WebViewWidget(
+                : CustomScrollView(
-                      controller: WebViewController()
+                    slivers: [
-                        ..setJavaScriptMode(JavaScriptMode.unrestricted)
+                      SliverToBoxAdapter(
-                        ..setBackgroundColor(
+                          child: Column(children: [getFullInfoColumn()])),
-                            Theme.of(context).colorScheme.background)
+                    ],
-                        ..setJavaScriptMode(JavaScriptMode.unrestricted)
+                  ),
-                        ..setNavigationDelegate(
+            onRefresh: () async {
-                          NavigationDelegate(
+              if (app != null) {
-                            onWebResourceError: (WebResourceError error) {
+                getUpdate(app.app.id);
-                              if (error.isForMainFrame == true) {
+              }
-                                showError(
+            }),
-                                    ObtainiumError(error.description,
+        bottomSheet: getBottomSheetMenu());
-                                        unexpected: true),
-                                    context);
-                              }
-                            },
-                          ),
-                        )
-                        ..loadRequest(Uri.parse(app.app.url)))
-                  : Container()
-              : CustomScrollView(
-                  slivers: [
-                    SliverToBoxAdapter(
-                        child: Column(children: [fullInfoColumn])),
-                  ],
-                ),
-          onRefresh: () async {
-            if (app != null) {
-              getUpdate(app.app.id);
-            }
-          }),
-      bottomSheet: Padding(
-          padding: EdgeInsets.fromLTRB(
-              0, 0, 0, MediaQuery.of(context).padding.bottom),
-          child: Column(
-            mainAxisSize: MainAxisSize.min,
-            children: [
-              Padding(
-                  padding: const EdgeInsets.fromLTRB(16, 8, 16, 0),
-                  child: Row(
-                      mainAxisAlignment: MainAxisAlignment.spaceEvenly,
-                      children: [
-                        if (app?.app.additionalSettings['versionDetection'] !=
-                                'standardVersionDetection' &&
-                            !trackOnly &&
-                            app?.app.installedVersion != null &&
-                            app?.app.installedVersion != app?.app.latestVersion)
-                          IconButton(
-                              onPressed: app?.downloadProgress != null
-                                  ? null
-                                  : () {
-                                      showDialog(
-                                          context: context,
-                                          builder: (BuildContext ctx) {
-                                            return AlertDialog(
-                                              title: Text(tr(
-                                                  'alreadyUpToDateQuestion')),
-                                              actions: [
-                                                TextButton(
-                                                    onPressed: () {
-                                                      Navigator.of(context)
-                                                          .pop();
-                                                    },
-                                                    child: Text(tr('no'))),
-                                                TextButton(
-                                                    onPressed: () {
-                                                      HapticFeedback
-                                                          .selectionClick();
-                                                      var updatedApp = app?.app;
-                                                      if (updatedApp != null) {
-                                                        updatedApp
-                                                                .installedVersion =
-                                                            updatedApp
-                                                                .latestVersion;
-                                                        appsProvider.saveApps(
-                                                            [updatedApp]);
-                                                      }
-                                                      Navigator.of(context)
-                                                          .pop();
-                                                    },
-                                                    child: Text(
-                                                        tr('yesMarkUpdated')))
-                                              ],
-                                            );
-                                          });
-                                    },
-                              tooltip: tr('markUpdated'),
-                              icon: const Icon(Icons.done)),
-                        if (source != null &&
-                            source
-                                .combinedAppSpecificSettingFormItems.isNotEmpty)
-                          IconButton(
-                              onPressed: app?.downloadProgress != null
-                                  ? null
-                                  : () {
-                                      showDialog<Map<String, dynamic>?>(
-                                          context: context,
-                                          builder: (BuildContext ctx) {
-                                            var items = source
-                                                .combinedAppSpecificSettingFormItems
-                                                .map((row) {
-                                              row.map((e) {
-                                                if (app?.app.additionalSettings[
-                                                        e.key] !=
-                                                    null) {
-                                                  e.defaultValue = app?.app
-                                                          .additionalSettings[
-                                                      e.key];
-                                                }
-                                                return e;
-                                              }).toList();
-                                              return row;
-                                            }).toList();
-                                            return GeneratedFormModal(
-                                              title: tr('additionalOptions'),
-                                              items: items,
-                                            );
-                                          }).then((values) {
-                                        if (app != null && values != null) {
-                                          Map<String, dynamic>
-                                              originalSettings =
-                                              app.app.additionalSettings;
-                                          app.app.additionalSettings = values;
-                                          if (source.enforceTrackOnly) {
-                                            app.app.additionalSettings[
-                                                'trackOnly'] = true;
-                                            showError(
-                                                tr('appsFromSourceAreTrackOnly'),
-                                                context);
-                                          }
-                                          if (app.app.additionalSettings[
-                                                  'versionDetection'] ==
-                                              'releaseDateAsVersion') {
-                                            if (originalSettings[
-                                                    'versionDetection'] !=
-                                                'releaseDateAsVersion') {
-                                              if (app.app.releaseDate != null) {
-                                                bool isUpdated =
-                                                    app.app.installedVersion ==
-                                                        app.app.latestVersion;
-                                                app.app.latestVersion = app
-                                                    .app
-                                                    .releaseDate!
-                                                    .microsecondsSinceEpoch
-                                                    .toString();
-                                                if (isUpdated) {
-                                                  app.app.installedVersion =
-                                                      app.app.latestVersion;
-                                                }
-                                              }
-                                            }
-                                          } else if (originalSettings[
-                                                  'versionDetection'] ==
-                                              'releaseDateAsVersion') {
-                                            app.app.installedVersion = app
-                                                    .installedInfo
-                                                    ?.versionName ??
-                                                app.app.installedVersion;
-                                          }
-                                          appsProvider.saveApps([app.app]).then(
-                                              (value) {
-                                            getUpdate(app.app.id);
-                                          });
-                                        }
-                                      });
-                                    },
-                              tooltip: tr('additionalOptions'),
-                              icon: const Icon(Icons.edit)),
-                        if (app != null && app.installedInfo != null)
-                          IconButton(
-                            onPressed: () {
-                              appsProvider.openAppSettings(app.app.id);
-                            },
-                            icon: const Icon(Icons.settings),
-                            tooltip: tr('settings'),
-                          ),
-                        if (app != null && settingsProvider.showAppWebpage)
-                          IconButton(
-                              onPressed: () {
-                                showDialog(
-                                    context: context,
-                                    builder: (BuildContext ctx) {
-                                      return AlertDialog(
-                                        scrollable: true,
-                                        content: infoColumn,
-                                        title: Text(
-                                            '${app.app.name} ${tr('byX', args: [
-                                              app.app.author
-                                            ])}'),
-                                        actions: [
-                                          TextButton(
-                                              onPressed: () {
-                                                Navigator.of(context).pop();
-                                              },
-                                              child: Text(tr('continue')))
-                                        ],
-                                      );
-                                    });
-                              },
-                              icon: const Icon(Icons.more_horiz),
-                              tooltip: tr('more')),
-                        const SizedBox(width: 16.0),
-                        Expanded(
-                            child: TextButton(
-                                onPressed: (app?.app.installedVersion == null ||
-                                            app?.app.installedVersion !=
-                                                app?.app.latestVersion) &&
-                                        !appsProvider.areDownloadsRunning()
-                                    ? () {
-                                        HapticFeedback.heavyImpact();
-                                        () async {
-                                          if (app?.app.additionalSettings[
-                                                  'trackOnly'] !=
-                                              true) {
-                                            await settingsProvider
-                                                .getInstallPermission();
-                                          }
-                                        }()
-                                            .then((value) {
-                                          appsProvider
-                                              .downloadAndInstallLatestApps(
-                                                  [app!.app.id],
-                                                  globalNavigatorKey
-                                                      .currentContext).then(
-                                                  (res) {
-                                            if (res.isNotEmpty && mounted) {
-                                              Navigator.of(context).pop();
-                                            }
-                                          }).catchError((e) {
-                                            showError(e, context);
-                                          });
-                                        }).catchError((e) {
-                                          showError(e, context);
-                                        });
-                                      }
-                                    : null,
-                                child: Text(app?.app.installedVersion == null
-                                    ? !trackOnly
-                                        ? tr('install')
-                                        : tr('markInstalled')
-                                    : !trackOnly
-                                        ? tr('update')
-                                        : tr('markUpdated')))),
-                        const SizedBox(width: 16.0),
-                        Expanded(
-                            child: TextButton(
-                          onPressed: app?.downloadProgress != null
-                              ? null
-                              : () {
-                                  appsProvider.removeAppsWithModal(
-                                      context, [app!.app]).then((value) {
-                                    if (value == true) {
-                                      Navigator.of(context).pop();
-                                    }
-                                  });
-                                },
-                          style: TextButton.styleFrom(
-                              foregroundColor:
-                                  Theme.of(context).colorScheme.error,
-                              surfaceTintColor:
-                                  Theme.of(context).colorScheme.error),
-                          child: Text(tr('remove')),
-                        )),
-                      ])),
-              if (app?.downloadProgress != null)
-                Padding(
-                    padding: const EdgeInsets.fromLTRB(0, 8, 0, 0),
-                    child: LinearProgressIndicator(
-                        value: app!.downloadProgress! / 100))
-            ],
-          )),
-    );
   }
 }

lib/pages/import_export.dart

@@ -30,6 +30,7 @@ class _ImportExportPageState extends State<ImportExportPage> {
     SourceProvider sourceProvider = SourceProvider();
     var appsProvider = context.read<AppsProvider>();
     var settingsProvider = context.read<SettingsProvider>();
+
     var outlineButtonStyle = ButtonStyle(
       shape: MaterialStateProperty.all(
         StadiumBorder(
@@ -101,6 +102,193 @@ class _ImportExportPageState extends State<ImportExportPage> {
       });
     }
 
+    runObtainiumExport() {
+      HapticFeedback.selectionClick();
+      appsProvider.exportApps().then((String path) {
+        showError(tr('exportedTo', args: [path]), context);
+      }).catchError((e) {
+        showError(e, context);
+      });
+    }
+
+    runObtainiumImport() {
+      HapticFeedback.selectionClick();
+      FilePicker.platform.pickFiles().then((result) {
+        setState(() {
+          importInProgress = true;
+        });
+        if (result != null) {
+          String data = File(result.files.single.path!).readAsStringSync();
+          try {
+            jsonDecode(data);
+          } catch (e) {
+            throw ObtainiumError(tr('invalidInput'));
+          }
+          appsProvider.importApps(data).then((value) {
+            var cats = settingsProvider.categories;
+            appsProvider.apps.forEach((key, value) {
+              for (var c in value.app.categories) {
+                if (!cats.containsKey(c)) {
+                  cats[c] = generateRandomLightColor().value;
+                }
+              }
+            });
+            settingsProvider.categories = cats;
+            showError(tr('importedX', args: [plural('apps', value)]), context);
+          });
+        } else {
+          // User canceled the picker
+        }
+      }).catchError((e) {
+        showError(e, context);
+      }).whenComplete(() {
+        setState(() {
+          importInProgress = false;
+        });
+      });
+    }
+
+    runUrlImport() {
+      FilePicker.platform.pickFiles().then((result) {
+        if (result != null) {
+          urlListImport(
+              overrideInitValid: true,
+              initValue: RegExp('https?://[^"]+')
+                  .allMatches(
+                      File(result.files.single.path!).readAsStringSync())
+                  .map((e) => e.input.substring(e.start, e.end))
+                  .toSet()
+                  .toList()
+                  .where((url) {
+                try {
+                  sourceProvider.getSource(url);
+                  return true;
+                } catch (e) {
+                  return false;
+                }
+              }).join('\n'));
+        }
+      });
+    }
+
+    runSourceSearch(AppSource source) {
+      () async {
+        var values = await showDialog<Map<String, dynamic>?>(
+            context: context,
+            builder: (BuildContext ctx) {
+              return GeneratedFormModal(
+                title: tr('searchX', args: [source.name]),
+                items: [
+                  [
+                    GeneratedFormTextField('searchQuery',
+                        label: tr('searchQuery'))
+                  ]
+                ],
+              );
+            });
+        if (values != null &&
+            (values['searchQuery'] as String?)?.isNotEmpty == true) {
+          setState(() {
+            importInProgress = true;
+          });
+          var urlsWithDescriptions =
+              await source.search(values['searchQuery'] as String);
+          if (urlsWithDescriptions.isNotEmpty) {
+            var selectedUrls =
+                // ignore: use_build_context_synchronously
+                await showDialog<List<String>?>(
+                    context: context,
+                    builder: (BuildContext ctx) {
+                      return UrlSelectionModal(
+                        urlsWithDescriptions: urlsWithDescriptions,
+                        selectedByDefault: false,
+                      );
+                    });
+            if (selectedUrls != null && selectedUrls.isNotEmpty) {
+              var errors = await appsProvider.addAppsByURL(selectedUrls);
+              if (errors.isEmpty) {
+                // ignore: use_build_context_synchronously
+                showError(
+                    tr('importedX', args: [plural('app', selectedUrls.length)]),
+                    context);
+              } else {
+                // ignore: use_build_context_synchronously
+                showDialog(
+                    context: context,
+                    builder: (BuildContext ctx) {
+                      return ImportErrorDialog(
+                          urlsLength: selectedUrls.length, errors: errors);
+                    });
+              }
+            }
+          } else {
+            throw ObtainiumError(tr('noResults'));
+          }
+        }
+      }()
+          .catchError((e) {
+        showError(e, context);
+      }).whenComplete(() {
+        setState(() {
+          importInProgress = false;
+        });
+      });
+    }
+
+    runMassSourceImport(MassAppUrlSource source) {
+      () async {
+        var values = await showDialog<Map<String, dynamic>?>(
+            context: context,
+            builder: (BuildContext ctx) {
+              return GeneratedFormModal(
+                title: tr('importX', args: [source.name]),
+                items: source.requiredArgs
+                    .map((e) => [GeneratedFormTextField(e, label: e)])
+                    .toList(),
+              );
+            });
+        if (values != null) {
+          setState(() {
+            importInProgress = true;
+          });
+          var urlsWithDescriptions = await source.getUrlsWithDescriptions(
+              values.values.map((e) => e.toString()).toList());
+          var selectedUrls =
+              // ignore: use_build_context_synchronously
+              await showDialog<List<String>?>(
+                  context: context,
+                  builder: (BuildContext ctx) {
+                    return UrlSelectionModal(
+                        urlsWithDescriptions: urlsWithDescriptions);
+                  });
+          if (selectedUrls != null) {
+            var errors = await appsProvider.addAppsByURL(selectedUrls);
+            if (errors.isEmpty) {
+              // ignore: use_build_context_synchronously
+              showError(
+                  tr('importedX', args: [plural('app', selectedUrls.length)]),
+                  context);
+            } else {
+              // ignore: use_build_context_synchronously
+              showDialog(
+                  context: context,
+                  builder: (BuildContext ctx) {
+                    return ImportErrorDialog(
+                        urlsLength: selectedUrls.length, errors: errors);
+                  });
+            }
+          }
+        }
+      }()
+          .catchError((e) {
+        showError(e, context);
+      }).whenComplete(() {
+        setState(() {
+          importInProgress = false;
+        });
+      });
+    }
+
     return Scaffold(
         backgroundColor: Theme.of(context).colorScheme.surface,
         body: CustomScrollView(slivers: <Widget>[
@@ -120,18 +308,7 @@ class _ImportExportPageState extends State<ImportExportPage> {
                                   onPressed: appsProvider.apps.isEmpty ||
                                           importInProgress
                                       ? null
-                                      : () {
+                                      : runObtainiumExport,
-                                          HapticFeedback.selectionClick();
-                                          appsProvider
-                                              .exportApps()
-                                              .then((String path) {
-                                            showError(
-                                                tr('exportedTo', args: [path]),
-                                                context);
-                                          }).catchError((e) {
-                                            showError(e, context);
-                                          });
-                                        },
                                   child: Text(tr('obtainiumExport')))),
                           const SizedBox(
                             width: 16,
@@ -141,59 +318,7 @@ class _ImportExportPageState extends State<ImportExportPage> {
                                   style: outlineButtonStyle,
                                   onPressed: importInProgress
                                       ? null
-                                      : () {
+                                      : runObtainiumImport,
-                                          HapticFeedback.selectionClick();
-                                          FilePicker.platform
-                                              .pickFiles()
-                                              .then((result) {
-                                            setState(() {
-                                              importInProgress = true;
-                                            });
-                                            if (result != null) {
-                                              String data = File(
-                                                      result.files.single.path!)
-                                                  .readAsStringSync();
-                                              try {
-                                                jsonDecode(data);
-                                              } catch (e) {
-                                                throw ObtainiumError(
-                                                    tr('invalidInput'));
-                                              }
-                                              appsProvider
-                                                  .importApps(data)
-                                                  .then((value) {
-                                                var cats =
-                                                    settingsProvider.categories;
-                                                appsProvider.apps
-                                                    .forEach((key, value) {
-                                                  for (var c
-                                                      in value.app.categories) {
-                                                    if (!cats.containsKey(c)) {
-                                                      cats[c] =
-                                                          generateRandomLightColor()
-                                                              .value;
-                                                    }
-                                                  }
-                                                });
-                                                settingsProvider.categories =
-                                                    cats;
-                                                showError(
-                                                    tr('importedX', args: [
-                                                      plural('apps', value)
-                                                    ]),
-                                                    context);
-                                              });
-                                            } else {
-                                              // User canceled the picker
-                                            }
-                                          }).catchError((e) {
-                                            showError(e, context);
-                                          }).whenComplete(() {
-                                            setState(() {
-                                              importInProgress = false;
-                                            });
-                                          });
-                                        },
                                   child: Text(tr('obtainiumImport'))))
                         ],
                       ),
@@ -216,49 +341,15 @@ class _ImportExportPageState extends State<ImportExportPage> {
                               height: 32,
                             ),
                             TextButton(
-                                onPressed: importInProgress
+                                onPressed:
-                                    ? null
+                                    importInProgress ? null : urlListImport,
-                                    : () {
-                                        urlListImport();
-                                      },
                                 child: Text(
                                   tr('importFromURLList'),
                                 )),
                             const SizedBox(height: 8),
                             TextButton(
-                                onPressed: importInProgress
+                                onPressed:
-                                    ? null
+                                    importInProgress ? null : runUrlImport,
-                                    : () {
-                                        FilePicker.platform
-                                            .pickFiles()
-                                            .then((result) {
-                                          if (result != null) {
-                                            urlListImport(
-                                                overrideInitValid: true,
-                                                initValue:
-                                                    RegExp('https?://[^"]+')
-                                                        .allMatches(File(result
-                                                                .files
-                                                                .single
-                                                                .path!)
-                                                            .readAsStringSync())
-                                                        .map((e) =>
-                                                            e.input.substring(
-                                                                e.start, e.end))
-                                                        .toSet()
-                                                        .toList()
-                                                        .where((url) {
-                                                  try {
-                                                    sourceProvider
-                                                        .getSource(url);
-                                                    return true;
-                                                  } catch (e) {
-                                                    return false;
-                                                  }
-                                                }).join('\n'));
-                                          }
-                                        });
-                                      },
                                 child: Text(
                                   tr('importFromURLsInFile'),
                                 )),
@@ -275,106 +366,7 @@ class _ImportExportPageState extends State<ImportExportPage> {
                                         onPressed: importInProgress
                                             ? null
                                             : () {
-                                                () async {
+                                                runSourceSearch(source);
-                                                  var values = await showDialog<
-                                                          Map<String,
-                                                              dynamic>?>(
-                                                      context: context,
-                                                      builder:
-                                                          (BuildContext ctx) {
-                                                        return GeneratedFormModal(
-                                                          title: tr('searchX',
-                                                              args: [
-                                                                source.name
-                                                              ]),
-                                                          items: [
-                                                            [
-                                                              GeneratedFormTextField(
-                                                                  'searchQuery',
-                                                                  label: tr(
-                                                                      'searchQuery'))
-                                                            ]
-                                                          ],
-                                                        );
-                                                      });
-                                                  if (values != null &&
-                                                      (values['searchQuery']
-                                                                  as String?)
-                                                              ?.isNotEmpty ==
-                                                          true) {
-                                                    setState(() {
-                                                      importInProgress = true;
-                                                    });
-                                                    var urlsWithDescriptions =
-                                                        await source.search(
-                                                            values['searchQuery']
-                                                                as String);
-                                                    if (urlsWithDescriptions
-                                                        .isNotEmpty) {
-                                                      var selectedUrls =
-                                                          // ignore: use_build_context_synchronously
-                                                          await showDialog<
-                                                                  List<
-                                                                      String>?>(
-                                                              context: context,
-                                                              builder:
-                                                                  (BuildContext
-                                                                      ctx) {
-                                                                return UrlSelectionModal(
-                                                                  urlsWithDescriptions:
-                                                                      urlsWithDescriptions,
-                                                                  selectedByDefault:
-                                                                      false,
-                                                                );
-                                                              });
-                                                      if (selectedUrls !=
-                                                              null &&
-                                                          selectedUrls
-                                                              .isNotEmpty) {
-                                                        var errors =
-                                                            await appsProvider
-                                                                .addAppsByURL(
-                                                                    selectedUrls);
-                                                        if (errors.isEmpty) {
-                                                          // ignore: use_build_context_synchronously
-                                                          showError(
-                                                              tr('importedX',
-                                                                  args: [
-                                                                    plural(
-                                                                        'app',
-                                                                        selectedUrls
-                                                                            .length)
-                                                                  ]),
-                                                              context);
-                                                        } else {
-                                                          // ignore: use_build_context_synchronously
-                                                          showDialog(
-                                                              context: context,
-                                                              builder:
-                                                                  (BuildContext
-                                                                      ctx) {
-                                                                return ImportErrorDialog(
-                                                                    urlsLength:
-                                                                        selectedUrls
-                                                                            .length,
-                                                                    errors:
-                                                                        errors);
-                                                              });
-                                                        }
-                                                      }
-                                                    } else {
-                                                      throw ObtainiumError(
-                                                          tr('noResults'));
-                                                    }
-                                                  }
-                                                }()
-                                                    .catchError((e) {
-                                                  showError(e, context);
-                                                }).whenComplete(() {
-                                                  setState(() {
-                                                    importInProgress = false;
-                                                  });
-                                                });
                                               },
                                         child: Text(
                                             tr('searchX', args: [source.name])))
@@ -390,93 +382,7 @@ class _ImportExportPageState extends State<ImportExportPage> {
                                         onPressed: importInProgress
                                             ? null
                                             : () {
-                                                () async {
+                                                runMassSourceImport(source);
-                                                  var values = await showDialog<
-                                                          Map<String,
-                                                              dynamic>?>(
-                                                      context: context,
-                                                      builder:
-                                                          (BuildContext ctx) {
-                                                        return GeneratedFormModal(
-                                                          title: tr('importX',
-                                                              args: [
-                                                                source.name
-                                                              ]),
-                                                          items:
-                                                              source
-                                                                  .requiredArgs
-                                                                  .map(
-                                                                      (e) => [
-                                                                            GeneratedFormTextField(e,
-                                                                                label: e)
-                                                                          ])
-                                                                  .toList(),
-                                                        );
-                                                      });
-                                                  if (values != null) {
-                                                    setState(() {
-                                                      importInProgress = true;
-                                                    });
-                                                    var urlsWithDescriptions =
-                                                        await source
-                                                            .getUrlsWithDescriptions(
-                                                                values.values
-                                                                    .map((e) =>
-                                                                        e.toString())
-                                                                    .toList());
-                                                    var selectedUrls =
-                                                        // ignore: use_build_context_synchronously
-                                                        await showDialog<
-                                                                List<String>?>(
-                                                            context: context,
-                                                            builder:
-                                                                (BuildContext
-                                                                    ctx) {
-                                                              return UrlSelectionModal(
-                                                                  urlsWithDescriptions:
-                                                                      urlsWithDescriptions);
-                                                            });
-                                                    if (selectedUrls != null) {
-                                                      var errors =
-                                                          await appsProvider
-                                                              .addAppsByURL(
-                                                                  selectedUrls);
-                                                      if (errors.isEmpty) {
-                                                        // ignore: use_build_context_synchronously
-                                                        showError(
-                                                            tr('importedX',
-                                                                args: [
-                                                                  plural(
-                                                                      'app',
-                                                                      selectedUrls
-                                                                          .length)
-                                                                ]),
-                                                            context);
-                                                      } else {
-                                                        // ignore: use_build_context_synchronously
-                                                        showDialog(
-                                                            context: context,
-                                                            builder:
-                                                                (BuildContext
-                                                                    ctx) {
-                                                              return ImportErrorDialog(
-                                                                  urlsLength:
-                                                                      selectedUrls
-                                                                          .length,
-                                                                  errors:
-                                                                      errors);
-                                                            });
-                                                      }
-                                                    }
-                                                  }
-                                                }()
-                                                    .catchError((e) {
-                                                  showError(e, context);
-                                                }).whenComplete(() {
-                                                  setState(() {
-                                                    importInProgress = false;
-                                                  });
-                                                });
                                               },
                                         child: Text(
                                             tr('importX', args: [source.name])))

lib/pages/settings.dart

@@ -152,7 +152,7 @@ class _SettingsPageState extends State<SettingsPage> {
           if (value != null) {
             context.setLocale(Locale(value));
           } else {
-            context.resetLocale();
+            settingsProvider.resetLocaleSafe(context);
           }
         });
 

lib/providers/apps_provider.dart

@@ -73,6 +73,18 @@ List<String> generateStandardVersionRegExStrings() {
 List<String> standardVersionRegExStrings =
     generateStandardVersionRegExStrings();
 
+Set<String> findStandardFormatsForVersion(String version, bool strict) {
+  // If !strict, even a substring match is valid
+  Set<String> results = {};
+  for (var pattern in standardVersionRegExStrings) {
+    if (RegExp('${strict ? '^' : ''}$pattern${strict ? '\$' : ''}')
+        .hasMatch(version)) {
+      results.add(pattern);
+    }
+  }
+  return results;
+}
+
 class AppsProvider with ChangeNotifier {
   // In memory App state (should always be kept in sync with local storage versions)
   Map<String, AppInMemory> apps = {};
@@ -145,56 +157,68 @@ class AppsProvider with ChangeNotifier {
   }
 
   Future<DownloadedApk> downloadApp(App app, BuildContext? context) async {
-    var fileName =
-        '${app.id}-${app.latestVersion}-${app.preferredApkIndex}.apk';
-    String downloadUrl = await SourceProvider()
-        .getSource(app.url)
-        .apkUrlPrefetchModifier(app.apkUrls[app.preferredApkIndex]);
     NotificationsProvider? notificationsProvider =
         context?.read<NotificationsProvider>();
-    var notif = DownloadNotification(app.name, 100);
+    var notifId = DownloadNotification(app.name, 0).id;
-    notificationsProvider?.cancel(notif.id);
+    if (apps[app.id] != null) {
-    int? prevProg;
+      apps[app.id]!.downloadProgress = 0;
-    File downloadedFile =
+      notifyListeners();
-        await downloadFile(downloadUrl, fileName, (double? progress) {
+    }
-      int? prog = progress?.ceil();
+    try {
+      var fileName =
+          '${app.id}-${app.latestVersion}-${app.preferredApkIndex}.apk';
+      String downloadUrl = await SourceProvider()
+          .getSource(app.url)
+          .apkUrlPrefetchModifier(app.apkUrls[app.preferredApkIndex]);
+      var notif = DownloadNotification(app.name, 100);
+      notificationsProvider?.cancel(notif.id);
+      int? prevProg;
+      File downloadedFile =
+          await downloadFile(downloadUrl, fileName, (double? progress) {
+        int? prog = progress?.ceil();
+        if (apps[app.id] != null) {
+          apps[app.id]!.downloadProgress = progress;
+          notifyListeners();
+        }
+        notif = DownloadNotification(app.name, prog ?? 100);
+        if (prog != null && prevProg != prog) {
+          notificationsProvider?.notify(notif);
+        }
+        prevProg = prog;
+      });
+      // Delete older versions of the APK if any
+      for (var file in downloadedFile.parent.listSync()) {
+        var fn = file.path.split('/').last;
+        if (fn.startsWith('${app.id}-') &&
+            fn.endsWith('.apk') &&
+            fn != fileName) {
+          file.delete();
+        }
+      }
+      // If the APK package ID is different from the App ID, it is either new (using a placeholder ID) or the ID has changed
+      // The former case should be handled (give the App its real ID), the latter is a security issue
+      var newInfo = await PackageArchiveInfo.fromPath(downloadedFile.path);
+      if (app.id != newInfo.packageName) {
+        if (apps[app.id] != null && !SourceProvider().isTempId(app)) {
+          throw IDChangedError();
+        }
+        var originalAppId = app.id;
+        app.id = newInfo.packageName;
+        downloadedFile = downloadedFile.renameSync(
+            '${downloadedFile.parent.path}/${app.id}-${app.latestVersion}-${app.preferredApkIndex}.apk');
+        if (apps[originalAppId] != null) {
+          await removeApps([originalAppId]);
+          await saveApps([app]);
+        }
+      }
+      return DownloadedApk(app.id, downloadedFile);
+    } finally {
+      notificationsProvider?.cancel(notifId);
       if (apps[app.id] != null) {
-        apps[app.id]!.downloadProgress = progress;
+        apps[app.id]!.downloadProgress = null;
         notifyListeners();
       }
-      notif = DownloadNotification(app.name, prog ?? 100);
-      if (prog != null && prevProg != prog) {
-        notificationsProvider?.notify(notif);
-      }
-      prevProg = prog;
-    });
-    notificationsProvider?.cancel(notif.id);
-    // Delete older versions of the APK if any
-    for (var file in downloadedFile.parent.listSync()) {
-      var fn = file.path.split('/').last;
-      if (fn.startsWith('${app.id}-') &&
-          fn.endsWith('.apk') &&
-          fn != fileName) {
-        file.delete();
-      }
     }
-    // If the APK package ID is different from the App ID, it is either new (using a placeholder ID) or the ID has changed
-    // The former case should be handled (give the App its real ID), the latter is a security issue
-    var newInfo = await PackageArchiveInfo.fromPath(downloadedFile.path);
-    if (app.id != newInfo.packageName) {
-      if (apps[app.id] != null && !SourceProvider().isTempId(app)) {
-        throw IDChangedError();
-      }
-      var originalAppId = app.id;
-      app.id = newInfo.packageName;
-      downloadedFile = downloadedFile.renameSync(
-          '${downloadedFile.parent.path}/${app.id}-${app.latestVersion}-${app.preferredApkIndex}.apk');
-      if (apps[originalAppId] != null) {
-        await removeApps([originalAppId]);
-        await saveApps([app]);
-      }
-    }
-    return DownloadedApk(app.id, downloadedFile);
   }
 
   bool areDownloadsRunning() => apps.values
@@ -460,94 +484,117 @@ class AppsProvider with ChangeNotifier {
     return res;
   }
 
-  // If the App says it is installed but installedInfo is null, set it to not installed
+  bool isVersionDetectionPossible(AppInMemory? app) {
-  // If there is any other mismatch between installedInfo and installedVersion, try reconciling them intelligently
+    return app?.app.additionalSettings['trackOnly'] != true &&
-  // If that fails, just set it to the actual version string (all we can do at that point)
+        app?.app.additionalSettings['versionDetection'] !=
-  // Don't save changes, just return the object if changes were made (else null)
+            'releaseDateAsVersion' &&
+        app?.installedInfo?.versionName != null &&
+        app?.app.installedVersion != null &&
+        reconcileVersionDifferences(
+                app!.installedInfo!.versionName!, app.app.installedVersion!) !=
+            null;
+  }
+
+  // Given an App and it's on-device info...
+  // Reconcile unexpected differences between its reported installed version, real installed version, and reported latest version
   App? getCorrectedInstallStatusAppIfPossible(App app, AppInfo? installedInfo) {
     var modded = false;
     var trackOnly = app.additionalSettings['trackOnly'] == true;
     var noVersionDetection = app.additionalSettings['versionDetection'] !=
         'standardVersionDetection';
+    // 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
       app.installedVersion = null;
       modded = true;
     } else if (installedInfo?.versionName != null &&
         app.installedVersion == null) {
+      // App says it's not installed but really is - set to installed and use real package versionName
       app.installedVersion = installedInfo!.versionName;
       modded = true;
-    } else if (installedInfo?.versionName != null &&
+    }
+    // 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) {
-      String? correctedInstalledVersion = reconcileRealAndInternalVersions(
+      // 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(
           installedInfo.versionName!, app.installedVersion!);
-      if (correctedInstalledVersion != null) {
+      if (correctedInstalledVersion?.key == false) {
-        app.installedVersion = correctedInstalledVersion;
+        app.installedVersion = correctedInstalledVersion!.value;
         modded = true;
       }
     }
+    // THIRD, RECONCILE THE APP'S REPORTED INSTALLED AND LATEST VERSIONS
     if (app.installedVersion != null &&
         app.installedVersion != app.latestVersion &&
         !noVersionDetection) {
-      app.installedVersion = reconcileRealAndInternalVersions(
+      // App's reported installed and latest versions don't match (and it uses standard version detection)
-              app.installedVersion!, app.latestVersion,
+      // If they share a standard format, make sure the App's reported installed version uses that format
-              matchMode: true) ??
+      var correctedInstalledVersion =
-          app.installedVersion;
+          reconcileVersionDifferences(app.installedVersion!, app.latestVersion);
+      if (correctedInstalledVersion?.key == true) {
+        app.installedVersion = correctedInstalledVersion!.value;
+        modded = true;
+      }
+    }
+    // FOURTH, DISABLE VERSION DETECTION IF ENABLED AND THE REPORTED/REAL INSTALLED VERSIONS ARE NOT STANDARDIZED
+    if (installedInfo != null &&
+        app.additionalSettings['versionDetection'] ==
+            'standardVersionDetection' &&
+        !isVersionDetectionPossible(AppInMemory(app, null, installedInfo))) {
+      app.additionalSettings['versionDetection'] = 'noVersionDetection';
+      logs.add('Could not reconcile version formats for: ${app.id}');
       modded = true;
     }
+    // if (app.installedVersion != null &&
+    //     app.additionalSettings['versionDetection'] ==
+    //         'standardVersionDetection') {
+    //   var correctedInstalledVersion =
+    //       reconcileVersionDifferences(app.installedVersion!, app.latestVersion);
+    //   if (correctedInstalledVersion == null) {
+    //     app.additionalSettings['versionDetection'] = 'noVersionDetection';
+    //     logs.add('Could not reconcile version formats for: ${app.id}');
+    //     modded = true;
+    //   }
+    // }
+
     return modded ? app : null;
   }
 
-  String? reconcileRealAndInternalVersions(
+  MapEntry<bool, String>? reconcileVersionDifferences(
-      String realVersion, String internalVersion,
+      String templateVersion, String comparisonVersion) {
-      {bool matchMode = false}) {
+    // Returns null if the versions don't share a common standard format
-    // 1. If one or both of these can't be converted to a "standard" format, return null (leave as is)
+    // Returns <true, comparisonVersion> if they share a common format and are equal
-    // 2. If both have a "standard" format under which they are equal, return null (leave as is)
+    // Returns <false, templateVersion> if they share a common format but are not equal
-    // 3. If both have a "standard" format in common but are unequal, return realVersion (this means it was changed externally)
+    // templateVersion must fully match a standard format, while comparisonVersion can have a substring match
-    // If in matchMode, the outcomes of rules 2 and 3 are reversed, and the "real" version is not matched strictly
+    var templateVersionFormats =
-    // Matchmode to be used when comparing internal install version and internal latest version
+        findStandardFormatsForVersion(templateVersion, true);
-
+    var comparisonVersionFormats =
-    bool doStringsMatchUnderRegEx(
+        findStandardFormatsForVersion(comparisonVersion, false);
-        String pattern, String value1, String value2) {
-      var r = RegExp(pattern);
-      var m1 = r.firstMatch(value1);
-      var m2 = r.firstMatch(value2);
-      return m1 != null && m2 != null
-          ? value1.substring(m1.start, m1.end) ==
-              value2.substring(m2.start, m2.end)
-          : false;
-    }
-
-    Set<String> findStandardFormatsForVersion(String version, bool strict) {
-      Set<String> results = {};
-      for (var pattern in standardVersionRegExStrings) {
-        if (RegExp('${strict ? '^' : ''}$pattern${strict ? '\$' : ''}')
-            .hasMatch(version)) {
-          results.add(pattern);
-        }
-      }
-      return results;
-    }
-
-    var realStandardVersionFormats =
-        findStandardFormatsForVersion(realVersion, true);
-    var internalStandardVersionFormats =
-        findStandardFormatsForVersion(internalVersion, false);
     var commonStandardFormats =
-        realStandardVersionFormats.intersection(internalStandardVersionFormats);
+        templateVersionFormats.intersection(comparisonVersionFormats);
     if (commonStandardFormats.isEmpty) {
-      return null; // Incompatible; no "enhanced detection"
+      return null;
     }
     for (String pattern in commonStandardFormats) {
-      if (doStringsMatchUnderRegEx(pattern, internalVersion, realVersion)) {
+      if (doStringsMatchUnderRegEx(
-        return matchMode
+          pattern, comparisonVersion, templateVersion)) {
-            ? internalVersion
+        return MapEntry(true, comparisonVersion);
-            : null; // Enhanced detection says no change
       }
     }
-    return matchMode
+    return MapEntry(false, templateVersion);
-        ? null
+  }
-        : realVersion; // Enhanced detection says something changed
+
+  bool doStringsMatchUnderRegEx(String pattern, String value1, String value2) {
+    var r = RegExp(pattern);
+    var m1 = r.firstMatch(value1);
+    var m2 = r.firstMatch(value2);
+    return m1 != null && m2 != null
+        ? value1.substring(m1.start, m1.end) ==
+            value2.substring(m2.start, m2.end)
+        : false;
   }
 
   Future<void> loadApps() async {
@@ -559,7 +606,21 @@ class AppsProvider with ChangeNotifier {
     List<App> newApps = (await getAppsDir())
         .listSync()
         .where((item) => item.path.toLowerCase().endsWith('.json'))
-        .map((e) => App.fromJson(jsonDecode(File(e.path).readAsStringSync())))
+        .map((e) {
+          try {
+            return App.fromJson(jsonDecode(File(e.path).readAsStringSync()));
+          } catch (err) {
+            if (err is FormatException) {
+              logs.add('Corrupt JSON when loading App (will be ignored): $e');
+              e.renameSync('${e.path}.corrupt');
+              return App(
+                  '', '', '', '', '', '', [], 0, {}, DateTime.now(), false);
+            } else {
+              rethrow;
+            }
+          }
+        })
+        .where((element) => element.id.isNotEmpty)
         .toList();
     var idsToDelete = apps.values
         .map((e) => e.app.id)
@@ -602,7 +663,8 @@ class AppsProvider with ChangeNotifier {
   }
 
   Future<void> saveApps(List<App> apps,
-      {bool attemptToCorrectInstallStatus = true}) async {
+      {bool attemptToCorrectInstallStatus = true,
+      bool onlyIfExists = true}) async {
     attemptToCorrectInstallStatus =
         attemptToCorrectInstallStatus && (await doesInstalledAppsPluginWork());
     for (var app in apps) {
@@ -613,9 +675,15 @@ class AppsProvider with ChangeNotifier {
       }
       File('${(await getAppsDir()).path}/${app.id}.json')
           .writeAsStringSync(jsonEncode(app.toJson()));
-      this.apps.update(
+      try {
-          app.id, (value) => AppInMemory(app, value.downloadProgress, info),
+        this.apps.update(
-          ifAbsent: () => AppInMemory(app, null, info));
+            app.id, (value) => AppInMemory(app, value.downloadProgress, info),
+            ifAbsent: onlyIfExists ? null : () => AppInMemory(app, null, info));
+      } catch (e) {
+        if (e is! ArgumentError || e.name != 'key') {
+          rethrow;
+        }
+      }
     }
     notifyListeners();
   }
@@ -636,8 +704,11 @@ class AppsProvider with ChangeNotifier {
   }
 
   Future<bool> removeAppsWithModal(BuildContext context, List<App> apps) async {
-    var showUninstallOption =
+    var showUninstallOption = apps
-        apps.where((a) => a.installedVersion != null).isNotEmpty;
+        .where((a) =>
+            a.installedVersion != null &&
+            a.additionalSettings['trackOnly'] != true)
+        .isNotEmpty;
     var values = await showDialog(
         context: context,
         builder: (BuildContext ctx) {
@@ -798,7 +869,7 @@ class AppsProvider with ChangeNotifier {
         a.installedVersion = apps[a.id]?.app.installedVersion;
       }
     }
-    await saveApps(importedApps);
+    await saveApps(importedApps, onlyIfExists: false);
     notifyListeners();
     return importedApps.length;
   }
@@ -818,7 +889,7 @@ class AppsProvider with ChangeNotifier {
       if (apps.containsKey(app.id)) {
         errorsMap.addAll({app.id: tr('appAlreadyAdded')});
       } else {
-        await saveApps([app]);
+        await saveApps([app], onlyIfExists: false);
       }
     }
     List<List<String>> errors =

lib/providers/settings_provider.dart

@@ -178,4 +178,15 @@ class SettingsProvider with ChangeNotifier {
 
   bool setEqual(Set<String> a, Set<String> b) =>
       a.length == b.length && a.union(b).length == a.length;
+
+  void resetLocaleSafe(BuildContext context) {
+    if (context.supportedLocales
+        .map((e) => e.languageCode)
+        .contains(context.deviceLocale.languageCode)) {
+      context.resetLocale();
+    } else {
+      context.setLocale(context.fallbackLocale!);
+      context.deleteSaveLocale();
+    }
+  }
 }

lib/providers/source_provider.dart

@@ -15,9 +15,12 @@ import 'package:obtainium/app_sources/gitlab.dart';
 import 'package:obtainium/app_sources/izzyondroid.dart';
 import 'package:obtainium/app_sources/html.dart';
 import 'package:obtainium/app_sources/mullvad.dart';
+import 'package:obtainium/app_sources/neutroncode.dart';
 import 'package:obtainium/app_sources/signal.dart';
 import 'package:obtainium/app_sources/sourceforge.dart';
 import 'package:obtainium/app_sources/steammobile.dart';
+import 'package:obtainium/app_sources/telegramapp.dart';
+import 'package:obtainium/app_sources/vlc.dart';
 import 'package:obtainium/components/generated_form.dart';
 import 'package:obtainium/custom_errors.dart';
 import 'package:obtainium/mass_app_sources/githubstars.dart';
@@ -34,8 +37,10 @@ class APKDetails {
   late List<String> apkUrls;
   late AppNames names;
   late DateTime? releaseDate;
+  late String? changeLog;
 
-  APKDetails(this.version, this.apkUrls, this.names, {this.releaseDate});
+  APKDetails(this.version, this.apkUrls, this.names,
+      {this.releaseDate, this.changeLog});
 }
 
 class App {
@@ -52,6 +57,7 @@ class App {
   bool pinned = false;
   List<String> categories;
   late DateTime? releaseDate;
+  late String? changeLog;
   App(
       this.id,
       this.url,
@@ -65,7 +71,8 @@ class App {
       this.lastUpdateCheck,
       this.pinned,
       {this.categories = const [],
-      this.releaseDate});
+      this.releaseDate,
+      this.changeLog});
 
   @override
   String toString() {
@@ -103,16 +110,16 @@ class App {
     // Convert bool style version detection options to dropdown style
     if (additionalSettings['noVersionDetection'] == true) {
       additionalSettings['versionDetection'] = 'noVersionDetection';
-    }
+      if (additionalSettings['releaseDateAsVersion'] == true) {
-    if (additionalSettings['releaseDateAsVersion'] == true) {
+        additionalSettings['versionDetection'] = 'releaseDateAsVersion';
-      additionalSettings['versionDetection'] = 'releaseDateAsVersion';
+        additionalSettings.remove('releaseDateAsVersion');
-      additionalSettings.remove('releaseDateAsVersion');
+      }
-    }
+      if (additionalSettings['noVersionDetection'] != null) {
-    if (additionalSettings['noVersionDetection'] != null) {
+        additionalSettings.remove('noVersionDetection');
-      additionalSettings.remove('noVersionDetection');
+      }
-    }
+      if (additionalSettings['releaseDateAsVersion'] != null) {
-    if (additionalSettings['releaseDateAsVersion'] != null) {
+        additionalSettings.remove('releaseDateAsVersion');
-      additionalSettings.remove('releaseDateAsVersion');
+      }
     }
     // Ensure additionalSettings are correctly typed
     for (var item in formItems) {
@@ -128,34 +135,35 @@ class App {
       preferredApkIndex = 0;
     }
     return App(
-      json['id'] as String,
+        json['id'] as String,
-      json['url'] as String,
+        json['url'] as String,
-      json['author'] as String,
+        json['author'] as String,
-      json['name'] as String,
+        json['name'] as String,
-      json['installedVersion'] == null
+        json['installedVersion'] == null
-          ? null
+            ? null
-          : json['installedVersion'] as String,
+            : json['installedVersion'] as String,
-      json['latestVersion'] as String,
+        json['latestVersion'] as String,
-      json['apkUrls'] == null
+        json['apkUrls'] == null
-          ? []
+            ? []
-          : List<String>.from(jsonDecode(json['apkUrls'])),
+            : List<String>.from(jsonDecode(json['apkUrls'])),
-      preferredApkIndex,
+        preferredApkIndex,
-      additionalSettings,
+        additionalSettings,
-      json['lastUpdateCheck'] == null
+        json['lastUpdateCheck'] == null
-          ? null
+            ? null
-          : DateTime.fromMicrosecondsSinceEpoch(json['lastUpdateCheck']),
+            : DateTime.fromMicrosecondsSinceEpoch(json['lastUpdateCheck']),
-      json['pinned'] ?? false,
+        json['pinned'] ?? false,
-      categories: json['categories'] != null
+        categories: json['categories'] != null
-          ? (json['categories'] as List<dynamic>)
+            ? (json['categories'] as List<dynamic>)
-              .map((e) => e.toString())
+                .map((e) => e.toString())
-              .toList()
+                .toList()
-          : json['category'] != null
+            : json['category'] != null
-              ? [json['category'] as String]
+                ? [json['category'] as String]
-              : [],
+                : [],
-      releaseDate: json['releaseDate'] == null
+        releaseDate: json['releaseDate'] == null
-          ? null
+            ? null
-          : DateTime.fromMicrosecondsSinceEpoch(json['releaseDate']),
+            : DateTime.fromMicrosecondsSinceEpoch(json['releaseDate']),
-    );
+        changeLog:
+            json['changeLog'] == null ? null : json['changeLog'] as String);
   }
 
   Map<String, dynamic> toJson() => {
@@ -171,7 +179,8 @@ class App {
         'lastUpdateCheck': lastUpdateCheck?.microsecondsSinceEpoch,
         'pinned': pinned,
         'categories': categories,
-        'releaseDate': releaseDate?.microsecondsSinceEpoch
+        'releaseDate': releaseDate?.microsecondsSinceEpoch,
+        'changeLog': changeLog
       };
 }
 
@@ -220,6 +229,7 @@ class AppSource {
   String? host;
   late String name;
   bool enforceTrackOnly = false;
+  bool changeLogIfAnyIsMarkDown = true;
 
   AppSource() {
     name = runtimeType.toString();
@@ -332,12 +342,16 @@ class SourceProvider {
     Codeberg(),
     FDroid(),
     IzzyOnDroid(),
-    Mullvad(),
+    FDroidRepo(),
-    Signal(),
     SourceForge(),
     APKMirror(),
-    FDroidRepo(),
+    Mullvad(),
+    Signal(),
+    VLC(),
+    // WhatsApp(), // As of 2023-03-20 this is unusable as the version on the webpage is months out of date
+    TelegramApp(),
     SteamMobile(),
+    NeutronCode(),
     HTML() // This should ALWAYS be the last option as they are tried in order
   ];
 
@@ -433,7 +447,8 @@ class SourceProvider {
         DateTime.now(),
         currentApp?.pinned ?? false,
         categories: currentApp?.categories ?? const [],
-        releaseDate: apk.releaseDate);
+        releaseDate: apk.releaseDate,
+        changeLog: apk.changeLog);
   }
 
   // Returns errors in [results, errors] instead of throwing them

pubspec.lock

@@ -25,14 +25,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.0.7"
-  archive:
-    dependency: transitive
-    description:
-      name: archive
-      sha256: d6347d54a2d8028e0437e3c099f66fdb8ae02c4720c1e7534c9f24c10351f85d
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.3.6"
   args:
     dependency: transitive
     description:
@@ -65,22 +57,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.2.1"
-  checked_yaml:
-    dependency: transitive
-    description:
-      name: checked_yaml
-      sha256: "3d1505d91afa809d177efd4eed5bb0eb65805097a1463abdd2add076effae311"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.0.2"
-  cli_util:
-    dependency: transitive
-    description:
-      name: cli_util
-      sha256: "66f86e916d285c1a93d3b79587d94bd71984a66aac4ff74e524cfa7877f1395c"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.3.5"
   clock:
     dependency: transitive
     description:
@@ -97,14 +73,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.17.0"
-  convert:
-    dependency: transitive
-    description:
-      name: convert
-      sha256: "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592"
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.1.1"
   cross_file:
     dependency: transitive
     description:
@@ -213,10 +181,10 @@ packages:
     dependency: "direct main"
     description:
       name: file_picker
-      sha256: d090ae03df98b0247b82e5928f44d1b959867049d18d73635e2e0bc3f49542b9
+      sha256: d8e9ca7e5d1983365c277f12c21b4362df6cf659c99af146ad4d04eb33033013
       url: "https://pub.dev"
     source: hosted
-    version: "5.2.5"
+    version: "5.2.6"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -230,14 +198,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.2.2"
-  flutter_launcher_icons:
-    dependency: "direct dev"
-    description:
-      name: flutter_launcher_icons
-      sha256: "02dcaf49d405f652b7160e882bacfc02cb497041bb2eab2a49b1c393cf9aac12"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.12.0"
   flutter_lints:
     dependency: "direct dev"
     description:
@@ -275,14 +235,22 @@ packages:
     description: flutter
     source: sdk
     version: "0.0.0"
+  flutter_markdown:
+    dependency: "direct main"
+    description:
+      name: flutter_markdown
+      sha256: "7b25c10de1fea883f3c4f9b8389506b54053cd00807beab69fd65c8653a2711f"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.6.14"
   flutter_plugin_android_lifecycle:
     dependency: transitive
     description:
       name: flutter_plugin_android_lifecycle
-      sha256: "4bef634684b2c7f3468c77c766c831229af829a0cd2d4ee6c1b99558bd14e5d2"
+      sha256: c224ac897bed083dabf11f238dd11a239809b446740be0c2044608c50029ffdf
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.8"
+    version: "2.0.9"
   flutter_test:
     dependency: "direct dev"
     description: flutter
@@ -305,10 +273,10 @@ packages:
     dependency: "direct main"
     description:
       name: html
-      sha256: d9793e10dbe0e6c364f4c59bf3e01fb33a9b2a674bc7a1081693dba0614b6269
+      sha256: "79d498e6d6761925a34ee5ea8fa6dfef38607781d2fa91e37523474282af55cb"
       url: "https://pub.dev"
     source: hosted
-    version: "0.15.1"
+    version: "0.15.2"
   http:
     dependency: "direct main"
     description:
@@ -325,14 +293,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "4.0.2"
-  image:
-    dependency: transitive
-    description:
-      name: image
-      sha256: "483a389d6ccb292b570c31b3a193779b1b0178e7eb571986d9a49904b6861227"
-      url: "https://pub.dev"
-    source: hosted
-    version: "4.0.15"
   install_plugin_v2:
     dependency: "direct main"
     description:
@@ -365,14 +325,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.6.5"
-  json_annotation:
-    dependency: transitive
-    description:
-      name: json_annotation
-      sha256: c33da08e136c3df0190bd5bbe51ae1df4a7d96e7954d1d7249fea2968a72d317
-      url: "https://pub.dev"
-    source: hosted
-    version: "4.8.0"
   lints:
     dependency: transitive
     description:
@@ -381,6 +333,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.0.1"
+  markdown:
+    dependency: transitive
+    description:
+      name: markdown
+      sha256: b3c60dee8c2af50ad0e6e90cceba98e47718a6ee0a7a6772c77846a0cc21f78b
+      url: "https://pub.dev"
+    source: hosted
+    version: "7.0.1"
   matcher:
     dependency: transitive
     description:
@@ -449,34 +409,34 @@ packages:
     dependency: "direct main"
     description:
       name: path_provider
-      sha256: "04890b994ee89bfa80bf3080bfec40d5a92c5c7a785ebb02c13084a099d2b6f9"
+      sha256: c7edf82217d4b2952b2129a61d3ad60f1075b9299e629e149a8d2e39c2e6aad4
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.13"
+    version: "2.0.14"
   path_provider_android:
     dependency: transitive
     description:
       name: path_provider_android
-      sha256: "7623b7d4be0f0f7d9a8b5ee6879fc13e4522d4c875ab86801dee4af32b54b83e"
+      sha256: "019f18c9c10ae370b08dce1f3e3b73bc9f58e7f087bb5e921f06529438ac0ae7"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.23"
+    version: "2.0.24"
   path_provider_foundation:
     dependency: transitive
     description:
       name: path_provider_foundation
-      sha256: eec003594f19fe2456ea965ae36b3fc967bc5005f508890aafe31fa75e41d972
+      sha256: "818b2dc38b0f178e0ea3f7cf3b28146faab11375985d815942a68eee11c2d0f7"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.2"
+    version: "2.2.1"
   path_provider_linux:
     dependency: transitive
     description:
       name: path_provider_linux
-      sha256: "525ad5e07622d19447ad740b1ed5070031f7a5437f44355ae915ff56e986429a"
+      sha256: "2ae08f2216225427e64ad224a24354221c2c7907e448e6e0e8b57b1eb9f10ad1"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.9"
+    version: "2.1.10"
   path_provider_platform_interface:
     dependency: transitive
     description:
@@ -489,10 +449,10 @@ packages:
     dependency: transitive
     description:
       name: path_provider_windows
-      sha256: "642ddf65fde5404f83267e8459ddb4556316d3ee6d511ed193357e25caa3632d"
+      sha256: f53720498d5a543f9607db4b0e997c4b5438884de25b0f73098cc2671a51b130
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.4"
+    version: "2.1.5"
   permission_handler:
     dependency: "direct main"
     description:
@@ -513,10 +473,10 @@ packages:
     dependency: transitive
     description:
       name: permission_handler_apple
-      sha256: "9c370ef6a18b1c4b2f7f35944d644a56aa23576f23abee654cf73968de93f163"
+      sha256: ee96ac32f5a8e6f80756e25b25b9f8e535816c8e6665a96b6d70681f8c4f7e85
       url: "https://pub.dev"
     source: hosted
-    version: "9.0.7"
+    version: "9.0.8"
   permission_handler_platform_interface:
     dependency: transitive
     description:
@@ -557,14 +517,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.1.4"
-  pointycastle:
-    dependency: transitive
-    description:
-      name: pointycastle
-      sha256: db7306cf0249f838d1a24af52b5a5887c5bf7f31d8bb4e827d071dc0939ad346
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.6.2"
   process:
     dependency: transitive
     description:
@@ -601,58 +553,58 @@ packages:
     dependency: "direct main"
     description:
       name: shared_preferences
-      sha256: ee6257848f822b8481691f20c3e6d2bfee2e9eccb2a3d249907fcfb198c55b41
+      sha256: "78528fd87d0d08ffd3e69551173c026e8eacc7b7079c82eb6a77413957b7e394"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.18"
+    version: "2.0.20"
   shared_preferences_android:
     dependency: transitive
     description:
       name: shared_preferences_android
-      sha256: a51a4f9375097f94df1c6e0a49c0374440d31ab026b59d58a7e7660675879db4
+      sha256: ad423a80fe7b4e48b50d6111b3ea1027af0e959e49d485712e134863d9c1c521
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.16"
+    version: "2.0.17"
   shared_preferences_foundation:
     dependency: transitive
     description:
       name: shared_preferences_foundation
-      sha256: "6b84fdf06b32bb336f972d373cd38b63734f3461ba56ac2ba01b56d052796259"
+      sha256: "1e755f8583229f185cfca61b1d80fb2344c9d660e1c69ede5450d8f478fa5310"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.4"
+    version: "2.1.5"
   shared_preferences_linux:
     dependency: transitive
     description:
       name: shared_preferences_linux
-      sha256: d7fb71e6e20cd3dfffcc823a28da3539b392e53ed5fc5c2b90b55fdaa8a7e8fa
+      sha256: "3a59ed10890a8409ad0faad7bb2957dab4b92b8fbe553257b05d30ed8af2c707"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.4"
+    version: "2.1.5"
   shared_preferences_platform_interface:
     dependency: transitive
     description:
       name: shared_preferences_platform_interface
-      sha256: "824bfd02713e37603b2bdade0842e47d56e7db32b1dcdd1cae533fb88e2913fc"
+      sha256: fb5cf25c0235df2d0640ac1b1174f6466bd311f621574997ac59018a6664548d
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.1"
+    version: "2.2.0"
   shared_preferences_web:
     dependency: transitive
     description:
       name: shared_preferences_web
-      sha256: "6737b757e49ba93de2a233df229d0b6a87728cea1684da828cbc718b65dcf9d7"
+      sha256: "0dc2633f215a3d4aa3184c9b2c5766f4711e4e5a6b256e62aafee41f89f1bfb8"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.5"
+    version: "2.0.6"
   shared_preferences_windows:
     dependency: transitive
     description:
       name: shared_preferences_windows
-      sha256: bd014168e8484837c39ef21065b78f305810ceabc1d4f90be6e3b392ce81b46d
+      sha256: "71bcd669bb9cdb6b39f22c4a7728b6d49e934f6cba73157ffa5a54f1eed67436"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.4"
+    version: "2.1.5"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -670,18 +622,18 @@ packages:
     dependency: "direct main"
     description:
       name: sqflite
-      sha256: "78324387dc81df14f78df06019175a86a2ee0437624166c382e145d0a7fd9a4f"
+      sha256: "500d6fec583d2c021f2d25a056d96654f910662c64f836cd2063167b8f1fa758"
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.4+1"
+    version: "2.2.6"
   sqflite_common:
     dependency: transitive
     description:
       name: sqflite_common
-      sha256: bfd6973aaeeb93475bc0d875ac9aefddf7965ef22ce09790eb963992ffc5183f
+      sha256: "963dad8c4aa2f814ce7d2d5b1da2f36f31bd1a439d8f27e3dc189bb9d26bc684"
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.2+2"
+    version: "2.4.3"
   stack_trace:
     dependency: transitive
     description:
@@ -758,34 +710,34 @@ packages:
     dependency: transitive
     description:
       name: url_launcher_android
-      sha256: "1f4d9ebe86f333c15d318f81dcdc08b01d45da44af74552608455ebdc08d9732"
+      sha256: dd729390aa936bf1bdf5cd1bc7468ff340263f80a2c4f569416507667de8e3c8
       url: "https://pub.dev"
     source: hosted
-    version: "6.0.24"
+    version: "6.0.26"
   url_launcher_ios:
     dependency: transitive
     description:
       name: url_launcher_ios
-      sha256: c9cd648d2f7ab56968e049d4e9116f96a85517f1dd806b96a86ea1018a3a82e5
+      sha256: "3dedc66ca3c0bef9e6a93c0999aee102556a450afcc1b7bcfeace7a424927d92"
       url: "https://pub.dev"
     source: hosted
-    version: "6.1.1"
+    version: "6.1.3"
   url_launcher_linux:
     dependency: transitive
     description:
       name: url_launcher_linux
-      sha256: e29039160ab3730e42f3d811dc2a6d5f2864b90a70fb765ea60144b03307f682
+      sha256: "206fb8334a700ef7754d6a9ed119e7349bc830448098f21a69bf1b4ed038cabc"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.3"
+    version: "3.0.4"
   url_launcher_macos:
     dependency: transitive
     description:
       name: url_launcher_macos
-      sha256: "2dddb3291a57b074dade66b5e07e64401dd2487caefd4e9e2f467138d8c7eb06"
+      sha256: "0ef2b4f97942a16523e51256b799e9aa1843da6c60c55eefbfa9dbc2dcb8331a"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.3"
+    version: "3.0.4"
   url_launcher_platform_interface:
     dependency: transitive
     description:
@@ -798,18 +750,18 @@ packages:
     dependency: transitive
     description:
       name: url_launcher_web
-      sha256: "574cfbe2390666003c3a1d129bdc4574aaa6728f0c00a4829a81c316de69dd9b"
+      sha256: "81fe91b6c4f84f222d186a9d23c73157dc4c8e1c71489c4d08be1ad3b228f1aa"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.15"
+    version: "2.0.16"
   url_launcher_windows:
     dependency: transitive
     description:
       name: url_launcher_windows
-      sha256: "97c9067950a0d09cbd93e2e3f0383d1403989362b97102fbf446473a48079a4b"
+      sha256: a83ba3607a507758669cfafb03f9de09bf6e6280c14d9b9cb18f013e406dcacd
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.4"
+    version: "3.0.5"
   uuid:
     dependency: transitive
     description:
@@ -830,34 +782,34 @@ packages:
     dependency: "direct main"
     description:
       name: webview_flutter
-      sha256: "9ba213434f13e760ea0f175fbc4d6bb6aeafd7dfc6c7d973f15d3e47a5d6686e"
+      sha256: "47663d51a9061451aa3880a214ee9a65dcbb933b77bc44388e194279ab3ccaf6"
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.5"
+    version: "4.0.7"
   webview_flutter_android:
     dependency: transitive
     description:
       name: webview_flutter_android
-      sha256: "48c8cfb023168473c0a3a4c21ffea6c23a32cc7156701c39f618b303c6a3c96e"
+      sha256: "34f83c2f0f64c75ad75c77a2ccfc8d2e531afbe8ad41af1fd787d6d33336aa90"
       url: "https://pub.dev"
     source: hosted
-    version: "3.3.1"
+    version: "3.4.3"
   webview_flutter_platform_interface:
     dependency: transitive
     description:
       name: webview_flutter_platform_interface
-      sha256: df6472164b3f4eaf3280422227f361dc8424b106726b7f21d79a8656ba53f71f
+      sha256: "1939c39e2150fb4d30fd3cc59a891a49fed9935db53007df633ed83581b6117b"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.2"
+    version: "2.1.0"
   webview_flutter_wkwebview:
     dependency: transitive
     description:
       name: webview_flutter_wkwebview
-      sha256: "283a38c2a2544768033864c698e0133aa9eee0f2c800f494b538a3d1044f7ecb"
+      sha256: d601aba11ad8d4481e17a34a76fa1d30dee92dcbbe2c58b0df3120e9453099c7
       url: "https://pub.dev"
     source: hosted
-    version: "3.1.1"
+    version: "3.2.3"
   win32:
     dependency: transitive
     description:
@@ -882,14 +834,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "6.2.2"
-  yaml:
-    dependency: transitive
-    description:
-      name: yaml
-      sha256: "23812a9b125b48d4007117254bca50abb6c712352927eece9e155207b1db2370"
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.1.1"
 sdks:
   dart: ">=2.18.2 <3.0.0"
   flutter: ">=3.4.0-17.0.pre"

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.11.3+122 # When changing this, update the tag in main() accordingly
+version: 0.11.16+138 # When changing this, update the tag in main() accordingly
 
 environment:
   sdk: '>=2.18.2 <3.0.0'
@@ -59,12 +59,12 @@ dependencies:
   sqflite: ^2.2.0+3
   easy_localization: ^3.0.1
   android_intent_plus: ^3.1.5
+  flutter_markdown: ^0.6.14
 
 
 dev_dependencies:
   flutter_test:
     sdk: flutter
-  flutter_launcher_icons: ^0.12.0
 
   # The "flutter_lints" package below contains a set of recommended lints to
   # encourage good coding practices. The lint set provided by the package is
@@ -73,12 +73,6 @@ dev_dependencies:
   # rules and activating additional ones.
   flutter_lints: ^2.0.1
 
-flutter_icons:
-  android: true
-  image_path: "assets/graphics/icon.png"
-  adaptive_icon_background: "#FFFFFF"
-  adaptive_icon_foreground: "assets/graphics/icon.png"
-
 # For information on the generic Dart part of this file, see the
 # following page: https://dart.dev/tools/pub/pubspec
 
@@ -97,6 +91,8 @@ flutter:
   
   assets:
     - assets/translations/
+    - assets/graphics/
+    - assets/ca/
 
   # An image asset can refer to one or more resolution-specific "variants", see
   # https://flutter.dev/assets-and-images/#resolution-aware