Merge pull request #1248 from ImranR98/dev

Removed Steam Source (existing apps auto-switched to HTML) (#1244) + Bugfixes

README.md

@@ -1,12 +1,14 @@
 # ![Obtainium Icon](./assets/graphics/icon_small.png) Obtainium
 
+[![Ceasefire Now](https://badge.techforpalestine.org/default)](https://techforpalestine.org/learn-more)
+
 Get Android App Updates Directly From the Source.
 
 Obtainium allows you to install and update Apps directly from their releases pages, and receive notifications when new releases are made available.
 
 Motivation: [Side Of Burritos - You should use this instead of F-Droid | How to use app RSS feed](https://youtu.be/FFz57zNR_M0)
 
-Wiki: [https://github.com/ImranR98/Obtainium/wiki](https://github.com/ImranR98/Obtainium/wiki)
+Read the Wiki: [https://github.com/ImranR98/Obtainium/wiki](https://github.com/ImranR98/Obtainium/wiki)
 
 Currently supported App sources:
 - Open Source - General:
@@ -30,8 +32,8 @@ Currently supported App sources:
   - [Signal](https://signal.org/)
   - [VLC](https://videolan.org/)
 - Other - App-Specific:
+  - [WhatsApp](https://whatsapp.com)
   - [Telegram App](https://telegram.org)
-  - [Steam Mobile Apps](https://store.steampowered.com/mobile)
   - [Neutron Code](https://neutroncode.com)
 - "HTML" (Fallback): Any other URL that returns an HTML page with links to APK files
 

android/app/build.gradle

@@ -96,19 +96,15 @@ repositories {
 }
 
 dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-
     def shizuku_version = '13.1.5'
     implementation "dev.rikka.shizuku:api:$shizuku_version"
     implementation "dev.rikka.shizuku:provider:$shizuku_version"
 
-    def hidden_api_version = '4.1.0'
+    def hidden_api_version = '4.3.1'
-    // DO NOT UPDATE Hidden API without updating the Android tools
-    // and do not update Android tools without updating the whole Flutter
-    // (also in android/build.gradle)
     implementation "dev.rikka.tools.refine:runtime:$hidden_api_version"
     implementation "dev.rikka.hidden:compat:$hidden_api_version"
     compileOnly "dev.rikka.hidden:stub:$hidden_api_version"
+    implementation "org.lsposed.hiddenapibypass:hiddenapibypass:4.3"
 
     implementation "com.github.topjohnwu.libsu:core:5.2.2"
 }

android/app/src/main/AndroidManifest.xml

@@ -5,7 +5,8 @@
         android:label="Obtainium"
         android:name="${applicationName}"
         android:icon="@mipmap/ic_launcher"
-        android:requestLegacyExternalStorage="true">
+        android:requestLegacyExternalStorage="true"
+        android:usesCleartextTraffic="true">
         <activity
             android:name=".MainActivity"
             android:exported="true"
@@ -44,21 +45,6 @@
         <meta-data
             android:name="flutterEmbedding"
             android:value="2" />
-        <service
-            android:name="dev.fluttercommunity.plus.androidalarmmanager.AlarmService"
-            android:permission="android.permission.BIND_JOB_SERVICE"
-            android:exported="false" />
-        <receiver
-            android:name="dev.fluttercommunity.plus.androidalarmmanager.AlarmBroadcastReceiver"
-            android:exported="false" />
-        <receiver
-            android:name="dev.fluttercommunity.plus.androidalarmmanager.RebootBroadcastReceiver"
-            android:enabled="false"
-            android:exported="false">
-            <intent-filter>
-                <action android:name="android.intent.action.BOOT_COMPLETED" />
-            </intent-filter>
-        </receiver>
         <provider
             android:name="androidx.core.content.FileProvider"
             android:authorities="dev.imranr.obtainium"

android/app/src/main/kotlin/dev/imranr/obtainium/DefaultSystemFont.kt

@@ -0,0 +1,44 @@
+package dev.imranr.obtainium
+
+import android.util.Xml
+import org.xmlpull.v1.XmlPullParser
+import java.io.File
+import java.io.FileInputStream
+
+class DefaultSystemFont {
+    fun get(): String {
+        return try {
+            val file = File("/system/etc/fonts.xml")
+            val fileStream = FileInputStream(file)
+            parseFontsFileStream(fileStream)
+        } catch (e: Exception) {
+            e.message ?: "Unknown fonts.xml parsing exception"
+        }
+    }
+
+    private fun parseFontsFileStream(fileStream: FileInputStream): String {
+        fileStream.use { stream ->
+            val parser = Xml.newPullParser()
+            parser.setFeature(XmlPullParser.FEATURE_PROCESS_NAMESPACES, false)
+            parser.setInput(stream, null)
+            parser.nextTag()
+            return parseFonts(parser)
+        }
+    }
+
+    private fun parseFonts(parser: XmlPullParser): String {
+        while (!((parser.next() == XmlPullParser.END_TAG) && (parser.name == "family"))) {
+            if ((parser.eventType == XmlPullParser.START_TAG) && (parser.name == "font")
+                && (parser.getAttributeValue(null, "style") == "normal")
+                && (parser.getAttributeValue(null, "weight") == "400")) {
+                break
+            }
+        }
+        parser.next()
+        val fontFile = parser.text.trim()
+        if (fontFile == "") {
+            throw NoSuchFieldException("The font filename couldn't be found in fonts.xml")
+        }
+        return "/system/fonts/$fontFile"
+    }
+}

android/app/src/main/kotlin/dev/imranr/obtainium/MainActivity.kt

@@ -22,12 +22,13 @@ import io.flutter.plugin.common.MethodChannel
 import io.flutter.plugin.common.MethodChannel.Result
 import java.io.IOException
 import java.util.concurrent.CountDownLatch
+import org.lsposed.hiddenapibypass.HiddenApiBypass
 import rikka.shizuku.Shizuku
 import rikka.shizuku.Shizuku.OnRequestPermissionResultListener
 import rikka.shizuku.ShizukuBinderWrapper
 
 class MainActivity: FlutterActivity() {
-    private var installersChannel: MethodChannel? = null
+    private var nativeChannel: MethodChannel? = null
     private val SHIZUKU_PERMISSION_REQUEST_CODE = (10..200).random()
 
     private fun shizukuCheckPermission(result: Result) {
@@ -51,7 +52,7 @@ class MainActivity: FlutterActivity() {
             requestCode: Int, grantResult: Int ->
         if (requestCode == SHIZUKU_PERMISSION_REQUEST_CODE) {
             val res = if (grantResult == PackageManager.PERMISSION_GRANTED) 1 else 0
-            installersChannel!!.invokeMethod("resPermShizuku", mapOf("res" to res))
+            nativeChannel!!.invokeMethod("resPermShizuku", mapOf("res" to res))
         }
     }
 
@@ -76,7 +77,8 @@ class MainActivity: FlutterActivity() {
             val params =
                 PackageInstaller.SessionParams(PackageInstaller.SessionParams.MODE_FULL_INSTALL)
             var installFlags: Int = PackageInstallerUtils.getInstallFlags(params)
-            installFlags = installFlags or 0x00000004  // PackageManager.INSTALL_ALLOW_TEST
+            installFlags = installFlags or (0x00000002/*PackageManager.INSTALL_REPLACE_EXISTING*/
+                    or 0x00000004 /*PackageManager.INSTALL_ALLOW_TEST*/)
             PackageInstallerUtils.setInstallFlags(params, installFlags)
             val sessionId = packageInstaller.createSession(params)
             val iSession = IPackageInstallerSession.Stub.asInterface(
@@ -136,7 +138,7 @@ class MainActivity: FlutterActivity() {
     }
 
     private fun rootInstallApk(apkFilePath: String, result: Result) {
-        Shell.sh("pm install -R -t " + apkFilePath).submit { out ->
+        Shell.sh("pm install -r -t " + apkFilePath).submit { out ->
             val builder = StringBuilder()
             for (data in out.getOut()) { builder.append(data) }
             result.success(builder.toString().endsWith("Success"))
@@ -145,12 +147,18 @@ class MainActivity: FlutterActivity() {
 
     override fun configureFlutterEngine(@NonNull flutterEngine: FlutterEngine) {
         super.configureFlutterEngine(flutterEngine)
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+            HiddenApiBypass.addHiddenApiExemptions("")
+        }
         Shizuku.addRequestPermissionResultListener(shizukuRequestPermissionResultListener)
-        installersChannel = MethodChannel(
+        nativeChannel = MethodChannel(
-            flutterEngine.dartExecutor.binaryMessenger, "installers")
+            flutterEngine.dartExecutor.binaryMessenger, "native")
-        installersChannel!!.setMethodCallHandler {
+        nativeChannel!!.setMethodCallHandler {
             call, result ->
-            if (call.method == "checkPermissionShizuku") {
+            if (call.method == "getSystemFont") {
+                val res = DefaultSystemFont().get()
+                result.success(res)
+            } else if (call.method == "checkPermissionShizuku") {
                 shizukuCheckPermission(result)
             } else if (call.method == "checkPermissionRoot") {
                 rootCheckPermission(result)

android/build.gradle

@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '1.7.10'
+    ext.kotlin_version = '1.8.10'
     ext {
         compileSdkVersion   = 34                // or latest
         targetSdkVersion    = 34                // or latest
@@ -11,9 +11,9 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.2.0'
+        classpath "com.android.tools.build:gradle:7.4.2"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath 'dev.rikka.tools.refine:gradle-plugin:4.1.0'  // Do not update!
+        classpath "dev.rikka.tools.refine:gradle-plugin:4.3.1"
     }
 }
 

assets/translations/bs.json

@@ -103,7 +103,6 @@
     "importErrors": "Uvezi greške",
     "importedXOfYApps": "{} od {} aplikacija uvezeno.",
     "followingURLsHadErrors": "Sljedeći URL-ovi su imali greške:",
-    "okay": "Dobro",
     "selectURL": "Odaberite URL",
     "selectURLs": "Odaberite URL-ove",
     "pick": "Odaberi",
@@ -283,6 +282,11 @@
     "supportFixedAPKURL": "Podržite fiksne APK URL-ove",
     "selectX": "Izaberite {}",
     "parallelDownloads": "Allow parallel downloads",
+    "installMethod": "Installation method",
+    "normal": "Normal",
+    "shizuku": "Shizuku",
+    "root": "Root",
+    "shizukuBinderNotFound": "Shizuku is not running",
     "removeAppQuestion": {
         "one": "Želite li ukloniti aplikaciju?",
         "other": "Želite li ukloniti aplikacije?"

assets/translations/cs.json

@@ -103,7 +103,6 @@
     "importErrors": "Chyba importu",
     "importedXOfYApps": "{}importováno z {} aplikací.",
     "followingURLsHadErrors": "U následujících adres došlo k chybám:",
-    "okay": "Okay",
     "selectURL": "Vybrat adresu",
     "selectURLs": "Select adresy",
     "pick": "Vybrat",

assets/translations/de.json

@@ -103,7 +103,6 @@
     "importErrors": "Importfehler",
     "importedXOfYApps": "{} von {} Apps importiert.",
     "followingURLsHadErrors": "Bei folgenden URLs traten Fehler auf:",
-    "okay": "Okay",
     "selectURL": "URL auswählen",
     "selectURLs": "URLs auswählen",
     "pick": "Auswählen",
@@ -283,6 +282,11 @@
     "supportFixedAPKURL": "neuere Version anhand der ersten dreißig Zahlen der Checksumme der APK URL erraten, wenn anderweitig nicht unterstützt",
     "selectX": "Wähle {}",
     "parallelDownloads": "Erlaube parallele Downloads",
+    "installMethod": "Installationsmethode",
+    "normal": "Normal",
+    "shizuku": "Shizuku",
+    "root": "Root",
+    "shizukuBinderNotFound": "Shizuku läuft nicht",
     "removeAppQuestion": {
         "one": "App entfernen?",
         "other": "Apps entfernen?"

assets/translations/en.json

@@ -103,7 +103,6 @@
     "importErrors": "Import Errors",
     "importedXOfYApps": "{} of {} Apps imported.",
     "followingURLsHadErrors": "The following URLs had errors:",
-    "okay": "Okay",
     "selectURL": "Select URL",
     "selectURLs": "Select URLs",
     "pick": "Pick",
@@ -287,7 +286,9 @@
     "normal": "Normal",
     "shizuku": "Shizuku",
     "root": "Root",
-    "shizukuBinderNotFound": "Shizuku is not running",
+    "shizukuBinderNotFound": "Сompatible Shizuku service wasn't found",
+    "useSystemFont": "Use the system font",
+    "systemFontError": "Error loading the system font: {}",
     "removeAppQuestion": {
         "one": "Remove App?",
         "other": "Remove Apps?"

assets/translations/es.json

@@ -8,13 +8,13 @@
     "functionNotImplemented": "Esta clase no ha implementado esta función",
     "placeholder": "Espacio reservado",
     "someErrors": "Han ocurrido algunos errores",
-    "unexpectedError": "Error Inesperado",
+    "unexpectedError": "Error inesperado",
     "ok": "OK",
     "and": "y",
-    "githubPATLabel": "Token Github de Acceso Personal\n(Reduce tiempos de espera)",
+    "githubPATLabel": "Token GitHub de acceso personal\n(reduce tiempos de espera)",
     "includePrereleases": "Incluir versiones preliminares",
     "fallbackToOlderReleases": "Retroceder a versiones previas",
-    "filterReleaseTitlesByRegEx": "Filtrar por título de version",
+    "filterReleaseTitlesByRegEx": "Filtrar por título de versión",
     "invalidRegEx": "Expresión inválida",
     "noDescription": "Sin descripción",
     "cancel": "Cancelar",
@@ -25,11 +25,11 @@
     "githubStarredRepos": "Repositorios favoritos GitHub",
     "uname": "Nombre de usuario",
     "wrongArgNum": "Número de argumentos provistos inválido",
-    "xIsTrackOnly": "{} es de 'Solo Seguimiento'",
+    "xIsTrackOnly": "{} es de 'Sólo seguimiento'",
     "source": "Origen",
     "app": "Aplicación",
-    "appsFromSourceAreTrackOnly": "Las aplicaciones de este origen son de 'Solo Seguimiento'.",
+    "appsFromSourceAreTrackOnly": "Las aplicaciones de este origen son de 'solo seguimiento'.",
-    "youPickedTrackOnly": "Debe seleccionar la opción de 'Solo Seguimiento'.",
+    "youPickedTrackOnly": "Debe seleccionar la opción de 'solo seguimiento'.",
     "trackOnlyAppDescription": "Se hará el seguimiento de actualizaciones para la aplicación, pero Obtainium no será capaz de descargarla o actalizarla.",
     "cancelled": "Cancelado",
     "appAlreadyAdded": "Aplicación ya añadida",
@@ -42,7 +42,7 @@
     "search": "Buscar",
     "additionalOptsFor": "Opciones Adicionales para {}",
     "supportedSources": "Fuentes Soportadas",
-    "trackOnlyInBrackets": "(Solo Seguimiento)",
+    "trackOnlyInBrackets": "(Solo seguimiento)",
     "searchableInBrackets": "(soporta búsqueda)",
     "appsString": "Aplicaciones",
     "noApps": "Sin Aplicaciones",
@@ -61,27 +61,27 @@
     "removeSelectedApps": "Eliminar Aplicaciones Seleccionadas",
     "updateX": "Actualizar {}",
     "installX": "Instalar {}",
-    "markXTrackOnlyAsUpdated": "Marcar {}\n(Solo Seguimiento)\ncomo Actualizada",
+    "markXTrackOnlyAsUpdated": "Marcar {}\n(Solo seguimiento)\ncomo actualizada",
     "changeX": "Cambiar {}",
-    "installUpdateApps": "Instalar/Actualizar Aplicaciones",
+    "installUpdateApps": "Instalar/Actualizar aplicaciones",
-    "installUpdateSelectedApps": "Instalar/Actualizar Aplicaciones Seleccionadas",
+    "installUpdateSelectedApps": "Instalar/Actualizar aplicaciones seleccionadas",
-    "markXSelectedAppsAsUpdated": "¿Marcar {} Aplicaciones Seleccionadas como Actualizadas?",
+    "markXSelectedAppsAsUpdated": "¿Marcar {} aplicaciones seleccionadas como actualizadas?",
     "no": "No",
     "yes": "Sí",
-    "markSelectedAppsUpdated": "Marcar Aplicaciones Seleccionadas como Actualizadas",
+    "markSelectedAppsUpdated": "Marcar aplicaciones seleccionadas como actualizadas",
     "pinToTop": "Fijar arriba",
     "unpinFromTop": "Desfijar de arriba",
-    "resetInstallStatusForSelectedAppsQuestion": "¿Restuarar Estado de Instalación para las Aplicaciones Seleccionadas?",
+    "resetInstallStatusForSelectedAppsQuestion": "¿Restuarar estado de instalación para las aplicaciones seleccionadas?",
     "installStatusOfXWillBeResetExplanation": "El estado de instalación de las aplicaciones seleccionadas será restaurado.\n\nEsto puede ser de útil cuando la versión de la aplicación mostrada en Obtainium es incorrecta por actualizaciones fallidas u otros motivos.",
-    "shareSelectedAppURLs": "Compartir URLs de las Aplicaciones Seleccionadas",
+    "shareSelectedAppURLs": "Compartir URLs de las aplicaciones seleccionadas",
     "resetInstallStatus": "Restaurar Estado de Instalación",
     "more": "Más",
-    "removeOutdatedFilter": "Elimiar Filtro de Aplicaciones Desactualizado",
+    "removeOutdatedFilter": "Elimiar filtro de aplicaciones desactualizado",
-    "showOutdatedOnly": "Mostrar solo Aplicaciones Desactualizadas",
+    "showOutdatedOnly": "Mostrar solo aplicaciones desactualizadas",
     "filter": "Filtrar",
     "filterActive": "Filtrar *",
     "filterApps": "Filtrar Actualizaciones",
-    "appName": "Nombre de la Aplicación",
+    "appName": "Nombre de la aplicación",
     "author": "Autor",
     "upToDateApps": "Aplicaciones Actualizadas",
     "nonInstalledApps": "Aplicaciones No Instaladas",
@@ -103,14 +103,13 @@
     "importErrors": "Errores de Importación",
     "importedXOfYApps": "{} de {} Aplicaciones importadas.",
     "followingURLsHadErrors": "Las siguientes URLs han tenido problemas:",
-    "okay": "Aceptar",
     "selectURL": "Seleccionar URL",
     "selectURLs": "Seleccionar URLs",
     "pick": "Escoger",
     "theme": "Tema",
     "dark": "Oscuro",
     "light": "Claro",
-    "followSystem": "Seguir al Sistema",
+    "followSystem": "Seguir al sistema",
     "obtainium": "Obtainium",
     "materialYou": "Material You",
     "useBlackTheme": "Negro puro en tema Oscuro",
@@ -121,16 +120,16 @@
     "appSortOrder": "Orden de Clasificación",
     "ascending": "Ascendente",
     "descending": "Descendente",
-    "bgUpdateCheckInterval": "Intervalo de Comprobación de Actualizaciones en Segundo Plano",
+    "bgUpdateCheckInterval": "Comprobación actualizaciones en segundo plano",
-    "neverManualOnly": "Nunca - Solo Manual",
+    "neverManualOnly": "Nunca, solo manual",
     "appearance": "Apariencia",
-    "showWebInAppView": "Mostrar Vista de la Web de Origen",
+    "showWebInAppView": "Mostrar vista de la web de origen",
-    "pinUpdates": "Fijar Actualizaciones en la Parte Superior de la Vista de Aplicaciones",
+    "pinUpdates": "Fijar Actualizaciones al principio",
     "updates": "Actualizaciones",
     "sourceSpecific": "Fuente Específica",
-    "appSource": "Fuente de la Aplicación",
+    "appSource": "Obtainium en GitHub",
     "noLogs": "Sin Logs",
-    "appLogs": "Logs de la Aplicación",
+    "appLogs": "Logs",
     "close": "Cerrar",
     "share": "Compartir",
     "appNotFound": "Aplicación no encontrada",
@@ -214,30 +213,30 @@
     "importFromURLsInFile": "Importar URLs desde archivo (como OPML)",
     "versionDetection": "Detección de Versiones",
     "standardVersionDetection": "Por versión",
-    "groupByCategory": "Agrupar por Categoría",
+    "groupByCategory": "Agrupar por categoría",
-    "autoApkFilterByArch": "Filtrar APKs por arquitectura del procesador, si es posible",
+    "autoApkFilterByArch": "Filtrar APKs por arquitectura del procesador (si es posible)",
     "overrideSource": "Sobrescribir Fuente",
     "dontShowAgain": "No mostrar de nuevo",
-    "dontShowTrackOnlyWarnings": "No mostrar avisos de 'Solo Seguimiento'",
+    "dontShowTrackOnlyWarnings": "No mostrar avisos sobre apps en 'solo seguimiento'",
-    "dontShowAPKOriginWarnings": "No mostrar avisos de las fuentes de las APKs",
+    "dontShowAPKOriginWarnings": "No mostrar avisos sobre las fuentes de las APKs",
-    "moveNonInstalledAppsToBottom": "Mover Apps no instaladas en la Parte Inferior de la Vista de Aplicaciones",
+    "moveNonInstalledAppsToBottom": "Mover Apps no instaladas al final",
-    "gitlabPATLabel": "Token GitLab de Acceso Personal\n(Habilita la Búsqueda y Mejor Detección de APKs)",
+    "gitlabPATLabel": "Token GitLab de acceso personal\n(habilita la búsqueda y mejor detección de APKs)",
     "about": "Acerca",
-    "requiresCredentialsInSettings": "{}: Esto requiere credenciales adicionales (en Ajustes)",
+    "requiresCredentialsInSettings": "{}: Esto requiere credenciales adicionales (en ajustes)",
-    "checkOnStart": "Comprobar actualizaciones durante el inicio",
+    "checkOnStart": "Comprobar actualizaciones al inicio",
-    "tryInferAppIdFromCode": "Intentar deducir la ID de la APP por el código fuente",
+    "tryInferAppIdFromCode": "Intentar deducir la ID de la app por el código fuente",
-    "removeOnExternalUninstall": "Auto eliminar Apps desinstaladas externamente",
+    "removeOnExternalUninstall": "Auto eliminar apps desinstaladas externamente",
     "pickHighestVersionCode": "Auto selección versión superior del código APK",
-    "checkUpdateOnDetailPage": "Comprobar actualizaciones al abrir detalles de la App",
+    "checkUpdateOnDetailPage": "Comprobar actualizaciones al abrir detalles de la app",
-    "disablePageTransitions": "Deshabilitar animaciones de transición de la página",
+    "disablePageTransitions": "Deshabilitar animaciones de transición",
-    "reversePageTransitions": "Invertir animaciones de transición de la página",
+    "reversePageTransitions": "Invertir animaciones de transición",
     "minStarCount": "Número Mínimo de Estrellas",
     "addInfoBelow": "Añadir esta información debajo.",
     "addInfoInSettings": "Puede añadir esta información en Ajustes.",
     "githubSourceNote": "La limitación de velocidad de GitHub puede evitarse con una clave API.",
     "gitlabSourceNote": "La extracción de APK de GitLab podría no funcionar sin una clave API.",
     "sortByLastLinkSegment": "Sort by only the last segment of the link",
-    "filterReleaseNotesByRegEx": "Filtrar por notas de nersión (release notes)",
+    "filterReleaseNotesByRegEx": "Filtrar por notas de versión (release notes)",
     "customLinkFilterRegex": "Filtro personalizado de Enlace APK (por defecto '.apk$')",
     "appsPossiblyUpdated": "Actualización de Apps intentada",
     "appsPossiblyUpdatedNotifDescription": "Notifica al usuario que las actualizaciones en segundo plano podrían haberse realizado para una o más aplicaciones",
@@ -245,7 +244,7 @@
     "enableBackgroundUpdates": "Habilitar actualizaciones en segundo plano",
     "backgroundUpdateReqsExplanation": "Las actualizaciones en segundo plano pueden no estar disponibles para todas las aplicaciones.",
     "backgroundUpdateLimitsExplanation": "El éxito de las instalaciones en segundo plano solo se puede comprobar con Obtainium abierto.",
-    "verifyLatestTag": "Comprueba la etiqueta 'Latest'",
+    "verifyLatestTag": "Comprobar la etiqueta 'Latest'",
     "intermediateLinkRegex": "Filtrar por enlace 'intermedio' para visitar primero",
     "filterByLinkText": "Filter links by link text",
     "intermediateLinkNotFound": "Enlace intermedio no encontrado",
@@ -253,10 +252,10 @@
     "exemptFromBackgroundUpdates": "Exenta de actualizciones en segundo plano (si están habilitadas)",
     "bgUpdatesOnWiFiOnly": "Deshabilitar las actualizaciones en segundo plano sin WiFi",
     "autoSelectHighestVersionCode": "Auto Selección de la versionCode APK superior",
-    "versionExtractionRegEx": "Versión de Extracción de RegEx",
+    "versionExtractionRegEx": "Versión de extracción regex",
-    "matchGroupToUse": "Coincidir en Grupo a Usar",
+    "matchGroupToUse": "Grupo a usar para versión de extracción regex",
     "highlightTouchTargets": "Resaltar objetivos menos obvios",
-    "pickExportDir": "Selecciona el Directorio para Exportar",
+    "pickExportDir": "Directorio para Exportar",
     "autoExportOnChanges": "Auto Exportar cuando haya cambios",
     "includeSettings": "Incluir ajustes",
     "filterVersionsByRegEx": "Filtrar por Versiones",
@@ -268,21 +267,26 @@
     "debugMenu": "Menu Depurar",
     "bgTaskStarted": "Iniciada tarea en segundo plano - revisa los logs.",
     "runBgCheckNow": "Ejecutar verficiación de actualizaciones en segundo plano",
-    "versionExtractWholePage": "Aplicar la Versión de Extracción Regex a la Página Entera",
+    "versionExtractWholePage": "Aplicar la versión de extracción regex a la página entera",
     "installing": "Instalando",
-    "skipUpdateNotifications": "Omitir de notificaciones sobre actualizaciones",
+    "skipUpdateNotifications": "No notificar sobre actualizaciones",
-    "updatesAvailableNotifChannel": "Actualizaciones Disponibles",
+    "updatesAvailableNotifChannel": "Actualizaciones disponibles",
-    "appsUpdatedNotifChannel": "Aplicaciones Actualizadas",
+    "appsUpdatedNotifChannel": "Aplicaciones actualizadas",
-    "appsPossiblyUpdatedNotifChannel": "Se ha Intentado Actualizar la Aplicación",
+    "appsPossiblyUpdatedNotifChannel": "Se ha intentado actualizar la aplicación",
-    "errorCheckingUpdatesNotifChannel": "Error Buscando Actualizaciones",
+    "errorCheckingUpdatesNotifChannel": "Error buscando actualizaciones",
-    "appsRemovedNotifChannel": "Aplicaciones Eliminadas",
+    "appsRemovedNotifChannel": "Aplicaciones eliminadas",
     "downloadingXNotifChannel": "Descargando {}",
-    "completeAppInstallationNotifChannel": "Instalación Completa de la Aplicación",
+    "completeAppInstallationNotifChannel": "Instalación completada",
-    "checkingForUpdatesNotifChannel": "Buscando Actualizaciones",
+    "checkingForUpdatesNotifChannel": "Buscando actualizaciones",
-    "onlyCheckInstalledOrTrackOnlyApps": "Comprobar actualizaciones solo para apps instaladas y en seguimiento",
+    "onlyCheckInstalledOrTrackOnlyApps": "Comprobar actualizaciones solo para apps instaladas o en seguimiento",
     "supportFixedAPKURL": "Soporte para URLs fijas de APK",
     "selectX": "Selecciona {}",
     "parallelDownloads": "Permitir descargas paralelas",
+    "installMethod": "Método de instalación",
+    "normal": "Normal",
+    "shizuku": "Shizuku",
+    "root": "Root",
+    "shizukuBinderNotFound": "Shizuku no está operativo",
     "removeAppQuestion": {
         "one": "¿Eliminar Aplicación?",
         "other": "¿Eliminar Aplicaciones?"
@@ -308,16 +312,16 @@
         "other": "{} URLs"
     },
     "minute": {
-        "one": "{} Minuto",
+        "one": "{} minuto",
-        "other": "{} Minutos"
+        "other": "{} minutos"
     },
     "hour": {
-        "one": "{} Hora",
+        "one": "{} hora",
-        "other": "{} Horas"
+        "other": "{} horas"
     },
     "day": {
-        "one": "{} Día",
+        "one": "{} día",
-        "other": "{} Días"
+        "other": "{} días"
     },
     "clearedNLogsBeforeXAfterY": {
         "one": "Eliminado {n} log (previo a = {before}, posterior a = {after})",

assets/translations/fa.json

@@ -103,7 +103,6 @@
     "importErrors": "خطاهای وارد کردن",
     "importedXOfYApps": "{} از {} برنامه وارد شد.",
     "followingURLsHadErrors": "آدرس های اینترنتی زیر دارای خطا بودند:",
-    "okay": "باشه",
     "selectURL": "آدرس اینترنتی انتخاب شده",
     "selectURLs": "آدرس های اینترنتی انتخاب شده",
     "pick": "انتخاب",
@@ -283,6 +282,11 @@
     "supportFixedAPKURL": "پشتیبانی از URL های APK ثابت",
     "selectX": "انتخاب کنید {}",
     "parallelDownloads": "Allow parallel downloads",
+    "installMethod": "Installation method",
+    "normal": "Normal",
+    "shizuku": "Shizuku",
+    "root": "Root",
+    "shizukuBinderNotFound": "Shizuku is not running",
     "removeAppQuestion": {
         "one": "برنامه حذف شود؟",
         "other": "برنامه ها حذف شوند؟"

assets/translations/fr.json

@@ -103,7 +103,6 @@
     "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",
@@ -283,6 +282,11 @@
     "supportFixedAPKURL": "Support fixed APK URLs",
     "selectX": "Select {}",
     "parallelDownloads": "Allow parallel downloads",
+    "installMethod": "Installation method",
+    "normal": "Normal",
+    "shizuku": "Shizuku",
+    "root": "Root",
+    "shizukuBinderNotFound": "Shizuku is not running",
     "removeAppQuestion": {
         "one": "Supprimer l'application ?",
         "other": "Supprimer les applications ?"

assets/translations/hu.json

@@ -103,7 +103,6 @@
     "importErrors": "Importálási hibák",
     "importedXOfYApps": "{}/{} app importálva.",
     "followingURLsHadErrors": "A következő URL-ek hibákat tartalmaztak:",
-    "okay": "Oké",
     "selectURL": "Válassza ki az URL-t",
     "selectURLs": "Kiválasztott URL-ek",
     "pick": "Válasszon",
@@ -283,6 +282,11 @@
     "supportFixedAPKURL": "Támogatja a rögzített APK URL-eket",
     "selectX": "Kiválaszt {}",
     "parallelDownloads": "Párhuzamos letöltéseket enged",
+    "installMethod": "Installation method",
+    "normal": "Normal",
+    "shizuku": "Shizuku",
+    "root": "Root",
+    "shizukuBinderNotFound": "Shizuku is not running",
     "removeAppQuestion": {
         "one": "Eltávolítja az alkalmazást?",
         "other": "Eltávolítja az alkalmazást?"

assets/translations/it.json

@@ -103,7 +103,6 @@
     "importErrors": "Errori di importazione",
     "importedXOfYApps": "{} app di {} importate.",
     "followingURLsHadErrors": "I seguenti URL contengono errori:",
-    "okay": "Va bene",
     "selectURL": "Seleziona l'URL",
     "selectURLs": "Seleziona gli URL",
     "pick": "Seleziona",

assets/translations/ja.json

@@ -103,7 +103,6 @@
     "importErrors": "インポートエラー",
     "importedXOfYApps": "{} / {} アプリをインポートしました",
     "followingURLsHadErrors": "以下のURLでエラーが発生しました:",
-    "okay": "OK",
     "selectURL": "URLを選択",
     "selectURLs": "URLを選択",
     "pick": "選択",
@@ -236,7 +235,7 @@
     "addInfoInSettings": "設定でこの情報を追加してください。",
     "githubSourceNote": "GitHubのレート制限はAPIキーを使うことで回避できます。",
     "gitlabSourceNote": "GitLabのAPK抽出はAPIキーがないと動作しない場合があります。",
-    "sortByLastLinkSegment": "Sort by only the last segment of the link",
+    "sortByLastLinkSegment": "リンクの最後のセグメントのみでソートする",
     "filterReleaseNotesByRegEx": "正規表現でリリースノートをフィルタリングする",
     "customLinkFilterRegex": "正規表現によるカスタムリンクフィルター (デフォルト '.apk$')",
     "appsPossiblyUpdated": "アプリのアップデートを試行",
@@ -246,10 +245,10 @@
     "backgroundUpdateReqsExplanation": "バックグラウンドアップデートは、すべてのアプリで可能とは限りません。",
     "backgroundUpdateLimitsExplanation": "バックグラウンドアップデートが成功したかどうかは、Obtainiumを起動したときにしか判断できません。",
     "verifyLatestTag": "'latest'タグを確認する",
-    "intermediateLinkRegex": "Filter for an 'Intermediate' Link to Visit",
+    "intermediateLinkRegex": "訪問する「中間」リンクのフィルター",
-    "filterByLinkText": "Filter links by link text",
+    "filterByLinkText": "テキストでリンクをフィルタリングする",
     "intermediateLinkNotFound": "中間リンクが見つかりませんでした",
-    "intermediateLink": "Intermediate link",
+    "intermediateLink": "中間リンク",
     "exemptFromBackgroundUpdates": "バックグラウンドアップデートを行わない (有効な場合)",
     "bgUpdatesOnWiFiOnly": "WiFiを使用していない場合，バックグラウンドアップデートを無効にする",
     "autoSelectHighestVersionCode": "最も高いバージョンコードのAPKを自動で選択する",
@@ -263,8 +262,8 @@
     "trySelectingSuggestedVersionCode": "提案されたバージョンコードのAPKを選択する",
     "dontSortReleasesList": "APIからのリリース順を保持する",
     "reverseSort": "逆順ソート",
-    "takeFirstLink": "Take first link",
+    "takeFirstLink": "最初のリンクを取得する",
-    "skipSort": "Skip sorting",
+    "skipSort": "ソートをスキップする",
     "debugMenu": "デバッグメニュー",
     "bgTaskStarted": "バックグラウンドタスクが開始されました - ログを確認してください。",
     "runBgCheckNow": "今すぐバックグラウンドでのアップデート確認を開始する",
@@ -280,9 +279,14 @@
     "completeAppInstallationNotifChannel": "アプリのインストールを完了する",
     "checkingForUpdatesNotifChannel": "アップデートを確認中",
     "onlyCheckInstalledOrTrackOnlyApps": "インストール済みのアプリと「追跡のみ」のアプリのアップデートのみを確認する",
-    "supportFixedAPKURL": "Support fixed APK URLs",
+    "supportFixedAPKURL": "固定されたAPKのURLをサポートする",
-    "selectX": "Select {}",
+    "selectX": "{} 選択",
-    "parallelDownloads": "Allow parallel downloads",
+    "parallelDownloads": "並行ダウンロードを許可する",
+    "installMethod": "インストール方法",
+    "normal": "通常",
+    "shizuku": "Shizuku",
+    "root": "Root",
+    "shizukuBinderNotFound": "Shizukuが起動していません",
     "removeAppQuestion": {
         "one": "アプリを削除しますか？",
         "other": "アプリを削除しますか？"

assets/translations/nl.json

@@ -103,7 +103,6 @@
     "importErrors": "Import foutmeldingen",
     "importedXOfYApps": "{} van {} apps geïmporteerd.",
     "followingURLsHadErrors": "De volgende URL's bevatten fouten:",
-    "okay": "Ok",
     "selectURL": "Selecteer URL",
     "selectURLs": "Selecteer URL's",
     "pick": "Kies",
@@ -283,6 +282,11 @@
     "supportFixedAPKURL": "Support fixed APK URLs",
     "selectX": "Select {}",
     "parallelDownloads": "Allow parallel downloads",
+    "installMethod": "Installation method",
+    "normal": "Normal",
+    "shizuku": "Shizuku",
+    "root": "Root",
+    "shizukuBinderNotFound": "Shizuku is not running",
     "removeAppQuestion": {
         "one": "App verwijderen?",
         "other": "Apps verwijderen?"

assets/translations/pl.json

@@ -103,7 +103,6 @@
     "importErrors": "Błędy importowania",
     "importedXOfYApps": "Zaimportowano {} z {} aplikacji.",
     "followingURLsHadErrors": "Następujące adresy URL zawierały błędy:",
-    "okay": "Okej",
     "selectURL": "Wybierz adres URL",
     "selectURLs": "Wybierz adresy URL",
     "pick": "Wybierz",
@@ -283,6 +282,11 @@
     "supportFixedAPKURL": "Obsługuj stałe adresy URL APK",
     "selectX": "Wybierz {}",
     "parallelDownloads": "Allow parallel downloads",
+    "installMethod": "Installation method",
+    "normal": "Normal",
+    "shizuku": "Shizuku",
+    "root": "Root",
+    "shizukuBinderNotFound": "Shizuku is not running",
     "removeAppQuestion": {
         "one": "Usunąć aplikację?",
         "few": "Usunąć aplikacje?",

assets/translations/pt.json

@@ -103,7 +103,6 @@
     "importErrors": "Erros de Importação",
     "importedXOfYApps": "{} de {} Apps importados.",
     "followingURLsHadErrors": "As seguintes URLs apresentaram erros:",
-    "okay": "Ok",
     "selectURL": "Selecionar URL",
     "selectURLs": "Selecionar URLs",
     "pick": "Escolher",

assets/translations/ru.json

@@ -103,7 +103,6 @@
     "importErrors": "Ошибка импорта",
     "importedXOfYApps": "Импортировано приложений: {} из {}",
     "followingURLsHadErrors": "При импорте следующие URL-адреса содержали ошибки:",
-    "okay": "Ok",
     "selectURL": "Выбрать URL-адрес",
     "selectURLs": "Выбрать URL-адреса",
     "pick": "Выбрать",
@@ -287,7 +286,9 @@
     "normal": "Нормальный",
     "shizuku": "Shizuku",
     "root": "Суперпользователь",
-    "shizukuBinderNotFound": "Shizuku не запущен",
+    "shizukuBinderNotFound": "Совместимый сервис Shizuku не найден",
+    "useSystemFont": "Использовать системный шрифт",
+    "systemFontError": "Ошибка загрузки системного шрифта: {}",
     "removeAppQuestion": {
         "one": "Удалить приложение?",
         "other": "Удалить приложения?"

assets/translations/sv.json

@@ -103,7 +103,6 @@
     "importErrors": "Importfel",
     "importedXOfYApps": "{} av {} Appar importerade.",
     "followingURLsHadErrors": "Följande URL:er hade fel:",
-    "okay": "Okej",
     "selectURL": "Välj URL",
     "selectURLs": "Välj URL:er",
     "pick": "Välj",
@@ -269,6 +268,11 @@
     "bgTaskStarted": "Background task started - check logs.",
     "runBgCheckNow": "Kör Bakgrundsuppdateringskoll Nu",
     "parallelDownloads": "Allow parallel downloads",
+    "installMethod": "Installation method",
+    "normal": "Normal",
+    "shizuku": "Shizuku",
+    "root": "Root",
+    "shizukuBinderNotFound": "Shizuku is not running",
     "removeAppQuestion": {
         "one": "Ta Bort App?",
         "other": "Ta Bort Appar?"

assets/translations/tr.json

@@ -103,7 +103,6 @@
     "importErrors": "İçe Aktarma Hataları",
     "importedXOfYApps": "{}'den {} Uygulama İçe Aktarıldı.",
     "followingURLsHadErrors": "Aşağıdaki URL'lerde hatalar oluştu:",
-    "okay": "Tamam",
     "selectURL": "URL Seç",
     "selectURLs": "URL'leri Seç",
     "pick": "Seç",
@@ -283,6 +282,11 @@
     "supportFixedAPKURL": "Support fixed APK URLs",
     "selectX": "Select {}",
     "parallelDownloads": "Allow parallel downloads",
+    "installMethod": "Installation method",
+    "normal": "Normal",
+    "shizuku": "Shizuku",
+    "root": "Root",
+    "shizukuBinderNotFound": "Shizuku is not running",
     "removeAppQuestion": {
         "one": "Uygulamayı Kaldır?",
         "other": "Uygulamaları Kaldır?"

assets/translations/vi.json

@@ -9,7 +9,7 @@
     "placeholder": "Giữ chỗ",
     "someErrors": "Đã xảy ra một số lỗi",
     "unexpectedError": "Lỗi không mong đợi",
-    "ok": "Ôkê",
+    "ok": "OK",
     "and": "và",
     "githubPATLabel": "Mã thông báo truy cập cá nhân GitHub (Tăng tốc độ giới hạn)",
     "includePrereleases": "Bao gồm các bản phát hành trước",
@@ -17,7 +17,7 @@
     "filterReleaseTitlesByRegEx": "Lọc tiêu đề bản phát hành theo biểu thức chính quy",
     "invalidRegEx": "Biểu thức chính quy không hợp lệ",
     "noDescription": "Không có mô tả",
-    "cancel": "Hủy bỏ",
+    "cancel": "Hủy",
     "continue": "Tiếp tục",
     "requiredInBrackets": "(Yêu cầu)",
     "dropdownNoOptsError": "LỖI: TẢI XUỐNG PHẢI CÓ ÍT NHẤT MỘT LỰA CHỌN",
@@ -103,7 +103,6 @@
     "importErrors": "Lỗi nhập",
     "importedXOfYApps": "{} trong số {} Ứng dụng đã được nhập.",
     "followingURLsHadErrors": "Các URL sau có lỗi:",
-    "okay": "Ôkê",
     "selectURL": "Chọn URL",
     "selectURLs": "Chọn URL",
     "pick": "Chọn",
@@ -113,17 +112,17 @@
     "followSystem": "Theo hệ thống",
     "obtainium": "Obtainium",
     "materialYou": "Material You",
-    "useBlackTheme": "Sử dụng chủ đề tối màu đen thuần túy",
+    "useBlackTheme": "Nền đen",
-    "appSortBy": "Sắp xếp ứng dụng theo",
+    "appSortBy": "Sắp xếp ứng dụng",
-    "authorName": "Tác giả/Tên",
+    "authorName": "Tác giả",
-    "nameAuthor": "Tên/Tác giả",
+    "nameAuthor": "Tên",
     "asAdded": "Như đã thêm",
-    "appSortOrder": "Thứ tự sắp xếp ứng dụng",
+    "appSortOrder": "Thứ tự sắp xếp",
     "ascending": "Tăng dần",
     "descending": "Giảm dần",
     "bgUpdateCheckInterval": "Khoảng thời gian kiểm tra cập nhật nền",
     "neverManualOnly": "Không bao giờ - Chỉ thủ công",
-    "appearance": "Vẻ ngoài",
+    "appearance": "Hiển thị",
     "showWebInAppView": "Hiển thị trang web Nguồn trong chế độ xem Ứng dụng",
     "pinUpdates": "Ghim nội dung cập nhật lên đầu chế độ xem Ứng dụng",
     "updates": "Cập nhật",
@@ -229,7 +228,7 @@
     "removeOnExternalUninstall": "Tự động xóa ứng dụng đã gỡ cài đặt bên ngoài",
     "pickHighestVersionCode": "Tự động chọn APK mã phiên bản cao nhất",
     "checkUpdateOnDetailPage": "Kiểm tra các bản cập nhật khi mở trang chi tiết Ứng dụng",
-    "disablePageTransitions": "Tắt hoạt ảnh chuyển trang",
+    "disablePageTransitions": "Tắt hiệu ứng chuyển trang",
     "reversePageTransitions": "Hoạt ảnh chuyển đổi trang đảo ngược",
     "minStarCount": "Số lượng sao tối thiểu",
     "addInfoBelow": "Thêm thông tin này vào bên dưới.",
@@ -283,6 +282,11 @@
     "supportFixedAPKURL": "Support fixed APK URLs",
     "selectX": "Select {}",
     "parallelDownloads": "Allow parallel downloads",
+    "installMethod": "Installation method",
+    "normal": "Normal",
+    "shizuku": "Shizuku",
+    "root": "Root",
+    "shizukuBinderNotFound": "Shizuku chưa khởi động",
     "removeAppQuestion":{
         "one": "Gỡ ứng dụng?",
         "other": "Gỡ ứng dụng?"

assets/translations/zh.json

@@ -103,7 +103,6 @@
     "importErrors": "导入错误",
     "importedXOfYApps": "已导入 {} 中的 {} 个应用。",
     "followingURLsHadErrors": "下列 URL 存在错误：",
-    "okay": "好的",
     "selectURL": "选择 URL",
     "selectURLs": "选择 URL",
     "pick": "选择",

lib/app_sources/github.dart

@@ -346,6 +346,11 @@ class GitHub extends AppSource {
           continue;
         }
         var apkUrls = getReleaseAPKUrls(releases[i]);
+        if (additionalSettings['apkFilterRegEx'] != null) {
+          var reg = RegExp(additionalSettings['apkFilterRegEx']);
+          apkUrls =
+              apkUrls.where((element) => reg.hasMatch(element.key)).toList();
+        }
         if (apkUrls.isEmpty && additionalSettings['trackOnly'] != true) {
           continue;
         }

lib/app_sources/html.dart

@@ -1,5 +1,4 @@
 import 'package:easy_localization/easy_localization.dart';
-import 'package:flutter/material.dart';
 import 'package:html/parser.dart';
 import 'package:http/http.dart';
 import 'package:obtainium/components/generated_form.dart';
@@ -100,28 +99,6 @@ class HTML extends AppSource {
             }
           ])
     ],
-    [
-      GeneratedFormTextField('versionExtractionRegEx',
-          label: tr('versionExtractionRegEx'),
-          required: false,
-          additionalValidators: [(value) => regExValidator(value)]),
-    ],
-    [
-      GeneratedFormTextField('matchGroupToUse',
-          label: tr('matchGroupToUse'),
-          required: false,
-          hint: '0',
-          textInputType: const TextInputType.numberWithOptions(),
-          additionalValidators: [
-            (value) {
-              if (value?.isEmpty == true) {
-                value = null;
-              }
-              value ??= '0';
-              return intValidator(value);
-            }
-          ])
-    ],
     [
       GeneratedFormSwitch('versionExtractWholePage',
           label: tr('versionExtractWholePage'))
@@ -242,9 +219,14 @@ class HTML extends AppSource {
     Map<String, dynamic> additionalSettings,
   ) async {
     var currentUrl = standardUrl;
-    for (int i = 0;
+    if (additionalSettings['intermediateLink']?.isNotEmpty != true) {
-        i < (additionalSettings['intermediateLink']?.length ?? 0);
+      additionalSettings['intermediateLink'] = [];
-        i++) {
+    }
+    additionalSettings['intermediateLink'] =
+        additionalSettings['intermediateLink']
+            .where((l) => l['customLinkFilterRegex'].isNotEmpty == true)
+            .toList();
+    for (int i = 0; i < (additionalSettings['intermediateLink'].length); i++) {
       var intLinks = await grabLinksCommon(await sourceRequest(currentUrl),
           additionalSettings['intermediateLink'][i]);
       if (intLinks.isEmpty) {
@@ -270,26 +252,12 @@ class HTML extends AppSource {
     if (additionalSettings['supportFixedAPKURL'] != true) {
       version = rel.hashCode.toString();
     }
-    var versionExtractionRegEx =
+    version = extractVersion(
-        additionalSettings['versionExtractionRegEx'] as String?;
+        additionalSettings['versionExtractionRegEx'] as String?,
-    if (versionExtractionRegEx?.isNotEmpty == true) {
+        additionalSettings['matchGroupToUse'] as String?,
-      var match = RegExp(versionExtractionRegEx!).allMatches(
+        additionalSettings['versionExtractWholePage'] == true
-          additionalSettings['versionExtractWholePage'] == true
+            ? res.body.split('\r\n').join('\n').split('\n').join('\\n')
-              ? res.body.split('\r\n').join('\n').split('\n').join('\\n')
+            : rel);
-              : rel);
-      if (match.isEmpty) {
-        throw NoVersionError();
-      }
-      String matchGroupString =
-          (additionalSettings['matchGroupToUse'] as String).trim();
-      if (matchGroupString.isEmpty) {
-        matchGroupString = "0";
-      }
-      version = match.last.group(int.parse(matchGroupString));
-      if (version?.isEmpty == true) {
-        throw NoVersionError();
-      }
-    }
     rel = ensureAbsoluteUrl(rel, uri);
     version ??= (await checkDownloadHash(rel)).toString();
     return APKDetails(version, [rel].map((e) => MapEntry(e, e)).toList(),

lib/components/generated_form.dart

@@ -123,7 +123,7 @@ class GeneratedFormSubForm extends GeneratedFormItem {
   final List<List<GeneratedFormItem>> items;
 
   GeneratedFormSubForm(super.key, this.items,
-      {super.label, super.belowWidgets, super.defaultValue});
+      {super.label, super.belowWidgets, super.defaultValue = const []});
 
   @override
   ensureType(val) {

lib/main.dart

@@ -19,7 +19,7 @@ import 'package:easy_localization/src/easy_localization_controller.dart';
 // ignore: implementation_imports
 import 'package:easy_localization/src/localization.dart';
 
-const String currentVersion = '0.15.3';
+const String currentVersion = '0.15.5';
 const String currentReleaseTag =
     'v$currentVersion-beta'; // KEEP THIS IN SYNC WITH GITHUB RELEASES
 
@@ -36,7 +36,7 @@ List<MapEntry<Locale, String>> supportedLocales = const [
   MapEntry(Locale('fr'), 'Français'),
   MapEntry(Locale('es'), 'Español'),
   MapEntry(Locale('pl'), 'Polski'),
-  MapEntry(Locale('ru'), 'Русский язык'),
+  MapEntry(Locale('ru'), 'Русский'),
   MapEntry(Locale('bs'), 'Bosanski'),
   MapEntry(Locale('pt'), 'Brasileiro'),
   MapEntry(Locale('cs'), 'Česky'),
@@ -236,13 +236,15 @@ class _ObtainiumState extends State<Obtainium> {
               colorScheme: settingsProvider.theme == ThemeSettings.dark
                   ? darkColorScheme
                   : lightColorScheme,
-              fontFamily: 'Metropolis'),
+              fontFamily:
+                  settingsProvider.useSystemFont ? 'SystemFont' : 'Metropolis'),
           darkTheme: ThemeData(
               useMaterial3: true,
               colorScheme: settingsProvider.theme == ThemeSettings.light
                   ? lightColorScheme
                   : darkColorScheme,
-              fontFamily: 'Metropolis'),
+              fontFamily:
+                  settingsProvider.useSystemFont ? 'SystemFont' : 'Metropolis'),
           home: Shortcuts(shortcuts: <LogicalKeySet, Intent>{
             LogicalKeySet(LogicalKeyboardKey.select): const ActivateIntent(),
           }, child: const HomePage()));

lib/pages/home.dart

@@ -5,6 +5,7 @@ import 'package:app_links/app_links.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
+import 'package:obtainium/components/generated_form_modal.dart';
 import 'package:obtainium/custom_errors.dart';
 import 'package:obtainium/pages/add_app.dart';
 import 'package:obtainium/pages/apps.dart';
@@ -76,14 +77,39 @@ class _HomePageState extends State<HomePage> {
       try {
         if (action == 'add') {
           await goToAddApp(data);
-        } else if (action == 'app') {
+        } else if (action == 'app' || action == 'apps') {
-          await context
+          var dataStr = Uri.decodeComponent(data);
-              .read<AppsProvider>()
+          if (await showDialog(
-              .import('{ "apps": [${Uri.decodeComponent(data)}] }');
+                  context: context,
-        } else if (action == 'apps') {
+                  builder: (BuildContext ctx) {
-          await context
+                    return GeneratedFormModal(
-              .read<AppsProvider>()
+                      title: tr('importX', args: [
-              .import('{ "apps": ${Uri.decodeComponent(data)} }');
+                        action == 'app' ? tr('app') : tr('appsString')
+                      ]),
+                      items: const [],
+                      additionalWidgets: [
+                        ExpansionTile(
+                          title: const Text('Raw JSON'),
+                          children: [
+                            Text(
+                              dataStr,
+                              style: const TextStyle(fontFamily: 'monospace'),
+                            )
+                          ],
+                        )
+                      ],
+                    );
+                  }) !=
+              null) {
+            // ignore: use_build_context_synchronously
+            var result = await context.read<AppsProvider>().import(
+                action == 'app'
+                    ? '{ "apps": [$dataStr] }'
+                    : '{ "apps": $dataStr }');
+            // ignore: use_build_context_synchronously
+            showMessage(
+                tr('importedX', args: [plural('apps', result.key)]), context);
+          }
         } else {
           throw ObtainiumError(tr('unknown'));
         }

lib/pages/import_export.dart

@@ -590,7 +590,7 @@ class _ImportErrorDialogState extends State<ImportErrorDialog> {
             onPressed: () {
               Navigator.of(context).pop(null);
             },
-            child: Text(tr('okay')))
+            child: Text(tr('ok')))
       ],
     );
   }

lib/pages/settings.dart

@@ -7,6 +7,7 @@ import 'package:obtainium/custom_errors.dart';
 import 'package:obtainium/main.dart';
 import 'package:obtainium/providers/apps_provider.dart';
 import 'package:obtainium/providers/logs_provider.dart';
+import 'package:obtainium/providers/native_provider.dart';
 import 'package:obtainium/providers/settings_provider.dart';
 import 'package:obtainium/providers/source_provider.dart';
 import 'package:provider/provider.dart';
@@ -350,8 +351,6 @@ class _SettingsPageState extends State<SettingsPage> {
                               ],
                             ),
                             height16,
-                            installMethodDropdown,
-                            height16,
                             Row(
                               mainAxisAlignment: MainAxisAlignment.spaceBetween,
                               children: [
@@ -364,6 +363,7 @@ class _SettingsPageState extends State<SettingsPage> {
                                     })
                               ],
                             ),
+                            installMethodDropdown,
                             height32,
                             Text(
                               tr('sourceSpecific'),
@@ -408,6 +408,30 @@ class _SettingsPageState extends State<SettingsPage> {
                             height16,
                             localeDropdown,
                             height16,
+                            Row(
+                              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                              children: [
+                                Flexible(child: Text(tr('useSystemFont'))),
+                                Switch(
+                                    value: settingsProvider.useSystemFont,
+                                    onChanged: (useSystemFont) {
+                                      if (useSystemFont) {
+                                        NativeFeatures.loadSystemFont().then((fontLoadRes) {
+                                          if (fontLoadRes == 'ok') {
+                                            settingsProvider.useSystemFont = true;
+                                          } else {
+                                            showError(ObtainiumError(
+                                                tr('systemFontError', args: [fontLoadRes])
+                                            ), context);
+                                          }
+                                        });
+                                      } else {
+                                        settingsProvider.useSystemFont = false;
+                                      }
+                                    })
+                              ],
+                            ),
+                            height16,
                             Row(
                               mainAxisAlignment: MainAxisAlignment.spaceBetween,
                               children: [

lib/providers/apps_provider.dart

@@ -32,7 +32,7 @@ import 'package:http/http.dart';
 import 'package:android_intent_plus/android_intent.dart';
 import 'package:flutter_archive/flutter_archive.dart';
 import 'package:shared_storage/shared_storage.dart' as saf;
-import 'installers_provider.dart';
+import 'native_provider.dart';
 
 final pm = AndroidPackageManager();
 
@@ -522,14 +522,15 @@ class AppsProvider with ChangeNotifier {
         code = await AndroidPackageInstaller.installApk(
             apkFilePath: file.file.path);
       case InstallMethodSettings.shizuku:
-        code = (await Installers.installWithShizuku(
+        code = (await NativeFeatures.installWithShizuku(
                 apkFileUri: file.file.uri.toString()))
             ? 0
             : 1;
       case InstallMethodSettings.root:
-        code = (await Installers.installWithRoot(apkFilePath: file.file.path))
+        code =
-            ? 0
+            (await NativeFeatures.installWithRoot(apkFilePath: file.file.path))
-            : 1;
+                ? 0
+                : 1;
     }
     bool installed = false;
     if (code != null && code != 0 && code != 3) {
@@ -694,14 +695,14 @@ class AppsProvider with ChangeNotifier {
               throw ObtainiumError(tr('cancelled'));
             }
           case InstallMethodSettings.shizuku:
-            int code = await Installers.checkPermissionShizuku();
+            int code = await NativeFeatures.checkPermissionShizuku();
             if (code == -1) {
               throw ObtainiumError(tr('shizukuBinderNotFound'));
             } else if (code == 0) {
               throw ObtainiumError(tr('cancelled'));
             }
           case InstallMethodSettings.root:
-            if (!(await Installers.checkPermissionRoot())) {
+            if (!(await NativeFeatures.checkPermissionRoot())) {
               throw ObtainiumError(tr('cancelled'));
             }
         }
@@ -1300,6 +1301,9 @@ class AppsProvider with ChangeNotifier {
           settingsProvider.prefs?.setInt(key, value);
         } else if (value is bool) {
           settingsProvider.prefs?.setBool(key, value);
+        } else if (value is List) {
+          settingsProvider.prefs
+              ?.setStringList(key, value.map((e) => e as String).toList());
         } else {
           settingsProvider.prefs?.setString(key, value as String);
         }

lib/providers/native_provider.dart

@@ -1,12 +1,26 @@
 import 'dart:async';
+import 'dart:io';
 import 'package:flutter/services.dart';
 
-class Installers {
+class NativeFeatures {
-  static const MethodChannel _channel = MethodChannel('installers');
+  static const MethodChannel _channel = MethodChannel('native');
+  static bool _systemFontLoaded = false;
   static bool _callbacksApplied = false;
   static int _resPermShizuku = -2;  // not set
 
-  static Future waitWhile(bool Function() test,
+  static Future<ByteData> _readFileBytes(String path) async {
+    var file = File(path);
+    var bytes = await file.readAsBytes();
+    return ByteData.view(bytes.buffer);
+  }
+
+  static Future _handleCalls(MethodCall call) async {
+    if (call.method == 'resPermShizuku') {
+      _resPermShizuku = call.arguments['res'];
+    }
+  }
+
+  static Future _waitWhile(bool Function() test,
       [Duration pollInterval = const Duration(milliseconds: 250)]) {
     var completer = Completer();
     check() {
@@ -20,20 +34,25 @@ class Installers {
     return completer.future;
   }
 
-  static Future handleCalls(MethodCall call) async {
+  static Future<String> loadSystemFont() async {
-    if (call.method == 'resPermShizuku') {
+    if (_systemFontLoaded) { return "ok"; }
-      _resPermShizuku = call.arguments['res'];
+    var getFontRes = await _channel.invokeMethod('getSystemFont');
-    }
+    if (getFontRes[0] != '/') { return getFontRes; }  // Error
+    var fontLoader = FontLoader('SystemFont');
+    fontLoader.addFont(_readFileBytes(getFontRes));
+    await fontLoader.load();
+    _systemFontLoaded = true;
+    return "ok";
   }
 
   static Future<int> checkPermissionShizuku() async {
     if (!_callbacksApplied) {
-      _channel.setMethodCallHandler(handleCalls);
+      _channel.setMethodCallHandler(_handleCalls);
       _callbacksApplied = true;
     }
     int res = await _channel.invokeMethod('checkPermissionShizuku');
-    if(res == -2) {
+    if (res == -2) {
-      await waitWhile(() => _resPermShizuku == -2);
+      await _waitWhile(() => _resPermShizuku == -2);
       res = _resPermShizuku;
       _resPermShizuku = -2;
     }

lib/providers/settings_provider.dart

@@ -51,6 +51,15 @@ class SettingsProvider with ChangeNotifier {
     notifyListeners();
   }
 
+  bool get useSystemFont {
+    return prefs?.getBool('useSystemFont') ?? false;
+  }
+
+  set useSystemFont(bool useSystemFont) {
+    prefs?.setBool('useSystemFont', useSystemFont);
+    notifyListeners();
+  }
+
   InstallMethodSettings get installMethod {
     return InstallMethodSettings.values[
         prefs?.getInt('installMethod') ?? InstallMethodSettings.normal.index];

lib/providers/source_provider.dart

@@ -163,6 +163,24 @@ appJSONCompatibilityModifiers(Map<String, dynamic> json) {
         return e['customLinkFilterRegex']?.isNotEmpty == true;
       }).toList();
     }
+    // Steam source apps should be converted to HTML (#1244)
+    var legacySteamSourceApps = SteamMobile().apks.keys;
+    if (legacySteamSourceApps.contains(additionalSettings['app'] ?? '')) {
+      json['url'] = '${json['url']}/mobile';
+      var replacementAdditionalSettings = getDefaultValuesFromFormItems(
+          HTML().combinedAppSpecificSettingFormItems);
+      for (var s in replacementAdditionalSettings.keys) {
+        if (additionalSettings.containsKey(s)) {
+          replacementAdditionalSettings[s] = additionalSettings[s];
+        }
+      }
+      replacementAdditionalSettings['customLinkFilterRegex'] =
+          '/${additionalSettings['app']}-(([0-9]+\\.?){1,})\\.apk';
+      replacementAdditionalSettings['versionExtractionRegEx'] =
+          replacementAdditionalSettings['customLinkFilterRegex'];
+      replacementAdditionalSettings['matchGroupToUse'] = '\$1';
+      additionalSettings = replacementAdditionalSettings;
+    }
   }
   json['additionalSettings'] = jsonEncode(additionalSettings);
   // F-Droid no longer needs cloudflare exception since override can be used - migrate apps appropriately
@@ -444,6 +462,16 @@ abstract class AppSource {
         label: tr('trackOnly'),
       )
     ],
+    [
+      GeneratedFormTextField('versionExtractionRegEx',
+          label: tr('versionExtractionRegEx'),
+          required: false,
+          additionalValidators: [(value) => regExValidator(value)]),
+    ],
+    [
+      GeneratedFormTextField('matchGroupToUse',
+          label: tr('matchGroupToUse'), required: false, hint: '\$0')
+    ],
     [
       GeneratedFormDropdown(
           'versionDetection',
@@ -580,6 +608,57 @@ bool isTempId(App app) {
   return RegExp('^[0-9]+\$').hasMatch(app.id);
 }
 
+replaceMatchGroupsInString(RegExpMatch match, String matchGroupString) {
+  if (RegExp('^\\d+\$').hasMatch(matchGroupString)) {
+    matchGroupString = '\$$matchGroupString';
+  }
+  // Regular expression to match numbers in the input string
+  final numberRegex = RegExp(r'\$\d+');
+  // Extract all numbers from the input string
+  final numbers = numberRegex.allMatches(matchGroupString);
+  if (numbers.isEmpty) {
+    // If no numbers found, return the original string
+    return null;
+  }
+  // Replace numbers with corresponding match groups
+  var outputString = matchGroupString;
+  for (final numberMatch in numbers) {
+    final number = numberMatch.group(0)!;
+    final matchGroup = match.group(int.parse(number.substring(1))) ?? '';
+    // Check if the number is preceded by a single backslash
+    final isEscaped = outputString.contains('\\$number');
+    // Replace the number with the corresponding match group
+    if (!isEscaped) {
+      outputString = outputString.replaceAll(number, matchGroup);
+    } else {
+      outputString = outputString.replaceAll('\\$number', number);
+    }
+  }
+  return outputString;
+}
+
+String? extractVersion(String? versionExtractionRegEx, String? matchGroupString,
+    String stringToCheck) {
+  if (versionExtractionRegEx?.isNotEmpty == true) {
+    String? version = stringToCheck;
+    var match = RegExp(versionExtractionRegEx!).allMatches(version);
+    if (match.isEmpty) {
+      throw NoVersionError();
+    }
+    matchGroupString = matchGroupString?.trim() ?? '';
+    if (matchGroupString.isEmpty) {
+      matchGroupString = "0";
+    }
+    version = replaceMatchGroupsInString(match.last, matchGroupString);
+    if (version?.isNotEmpty != true) {
+      throw NoVersionError();
+    }
+    return version!;
+  } else {
+    return null;
+  }
+}
+
 class SourceProvider {
   // Add more source classes here so they are available via the service
   List<AppSource> get sources => [
@@ -597,13 +676,11 @@ class SourceProvider {
         APKMirror(),
         HuaweiAppGallery(),
         Jenkins(),
-        // APKCombo(), // Can't get past their scraping blocking yet (get 403 Forbidden)
         Mullvad(),
         Signal(),
         VLC(),
-        WhatsApp(), // As of 2023-03-20 this is unusable as the version on the webpage is months out of date
+        WhatsApp(),
         TelegramApp(),
-        SteamMobile(),
         NeutronCode(),
         HTML() // This should ALWAYS be the last option as they are tried in order
       ];
@@ -679,6 +756,18 @@ class SourceProvider {
     String standardUrl = source.standardizeUrl(url);
     APKDetails apk =
         await source.getLatestAPKDetails(standardUrl, additionalSettings);
+
+    if (source.runtimeType != HTML().runtimeType) {
+      // HTML does it separately
+      String? extractedVersion = extractVersion(
+          additionalSettings['versionExtractionRegEx'] as String?,
+          additionalSettings['matchGroupToUse'] as String?,
+          apk.version);
+      if (extractedVersion != null) {
+        apk.version = extractedVersion;
+      }
+    }
+
     if (additionalSettings['versionDetection'] == 'releaseDateAsVersion' &&
         apk.releaseDate != null) {
       apk.version = apk.releaseDate!.microsecondsSinceEpoch.toString();

pubspec.lock

@@ -30,10 +30,10 @@ packages:
     dependency: "direct main"
     description:
       name: animations
-      sha256: "708e4b68c23228c264b038fe7003a2f5d01ce85fc64d8cae090e86b27fcea6c5"
+      sha256: d3d6dcfb218225bbe68e87ccf6378bbb2e32a94900722c5f81611dad089911cb
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.10"
+    version: "2.0.11"
   app_links:
     dependency: "direct main"
     description:
@@ -46,10 +46,10 @@ packages:
     dependency: transitive
     description:
       name: archive
-      sha256: "7b875fd4a20b165a3084bd2d210439b22ebc653f21cea4842729c0c30c82596b"
+      sha256: "22600aa1e926be775fa5fe7e6894e7fb3df9efda8891c73f70fb3262399a432d"
       url: "https://pub.dev"
     source: hosted
-    version: "3.4.9"
+    version: "3.4.10"
   args:
     dependency: transitive
     description:
@@ -328,10 +328,10 @@ packages:
     dependency: "direct main"
     description:
       name: flutter_markdown
-      sha256: "35108526a233cc0755664d445f8a6b4b61e6f8fe993b3658b80b4a26827fc196"
+      sha256: "30088ce826b5b9cfbf9e8bece34c716c8a59fa54461dcae1e4ac01a94639e762"
       url: "https://pub.dev"
     source: hosted
-    version: "0.6.18+2"
+    version: "0.6.18+3"
   flutter_plugin_android_lifecycle:
     dependency: transitive
     description:
@@ -610,18 +610,18 @@ packages:
     dependency: transitive
     description:
       name: platform
-      sha256: "0a279f0707af40c890e80b1e9df8bb761694c074ba7e1d4ab1bc4b728e200b59"
+      sha256: "12220bb4b65720483f8fa9450b4332347737cf8213dd2840d8b2c823e47243ec"
       url: "https://pub.dev"
     source: hosted
-    version: "3.1.3"
+    version: "3.1.4"
   plugin_platform_interface:
     dependency: transitive
     description:
       name: plugin_platform_interface
-      sha256: f4f88d4a900933e7267e2b353594774fc0d07fb072b47eedcd5b54e1ea3269f8
+      sha256: "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.7"
+    version: "2.1.8"
   pointycastle:
     dependency: transitive
     description:
@@ -831,18 +831,18 @@ packages:
     dependency: transitive
     description:
       name: url_launcher_android
-      sha256: "31222ffb0063171b526d3e569079cf1f8b294075ba323443fdc690842bfd4def"
+      sha256: c0766a55ab42cefaa728cabc951e82919ab41a3a4fee0aaa96176ca82da8cc51
       url: "https://pub.dev"
     source: hosted
-    version: "6.2.0"
+    version: "6.2.1"
   url_launcher_ios:
     dependency: transitive
     description:
       name: url_launcher_ios
-      sha256: bba3373219b7abb6b5e0d071b0fe66dfbe005d07517a68e38d4fc3638f35c6d3
+      sha256: "46b81e3109cbb2d6b81702ad3077540789a3e74e22795eb9f0b7d494dbaa72ea"
       url: "https://pub.dev"
     source: hosted
-    version: "6.2.1"
+    version: "6.2.2"
   url_launcher_linux:
     dependency: transitive
     description:
@@ -863,18 +863,18 @@ packages:
     dependency: transitive
     description:
       name: url_launcher_platform_interface
-      sha256: "980e8d9af422f477be6948bdfb68df8433be71f5743a188968b0c1b887807e50"
+      sha256: "4aca1e060978e19b2998ee28503f40b5ba6226819c2b5e3e4d1821e8ccd92198"
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.0"
+    version: "2.3.0"
   url_launcher_web:
     dependency: transitive
     description:
       name: url_launcher_web
-      sha256: "7286aec002c8feecc338cc33269e96b73955ab227456e9fb2a91f7fab8a358e9"
+      sha256: fff0932192afeedf63cdd50ecbb1bc825d31aed259f02bb8dba0f3b729a5e88b
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.2"
+    version: "2.2.3"
   url_launcher_windows:
     dependency: transitive
     description:
@@ -911,18 +911,18 @@ packages:
     dependency: "direct main"
     description:
       name: webview_flutter
-      sha256: "42393b4492e629aa3a88618530a4a00de8bb46e50e7b3993fedbfdc5352f0dbf"
+      sha256: "60e23976834e995c404c0b21d3b9db37ecd77d3303ef74f8b8d7a7b19947fc04"
       url: "https://pub.dev"
     source: hosted
-    version: "4.4.2"
+    version: "4.4.3"
   webview_flutter_android:
     dependency: transitive
     description:
       name: webview_flutter_android
-      sha256: b54c89fe14a6d26a2a46e24880da0441cdd2bf1f6d01a5b3e1d39558feb1de0b
+      sha256: "161af93c2abaf94ef2192bffb53a3658b2d721a3bf99b69aa1e47814ee18cc96"
       url: "https://pub.dev"
     source: hosted
-    version: "3.13.1"
+    version: "3.13.2"
   webview_flutter_platform_interface:
     dependency: transitive
     description:
@@ -935,18 +935,18 @@ packages:
     dependency: transitive
     description:
       name: webview_flutter_wkwebview
-      sha256: eebfabfa8a115b535b52031b8b26f7a4b58ceceab378bc9db8762b0fb46f7b5d
+      sha256: "02d8f3ebbc842704b2b662377b3ee11c0f8f1bbaa8eab6398262f40049819160"
       url: "https://pub.dev"
     source: hosted
-    version: "3.10.0"
+    version: "3.10.1"
   win32:
     dependency: transitive
     description:
       name: win32
-      sha256: b0f37db61ba2f2e9b7a78a1caece0052564d1bc70668156cf3a29d676fe4e574
+      sha256: "464f5674532865248444b4c3daca12bd9bf2d7c47f759ce2617986e7229494a8"
       url: "https://pub.dev"
     source: hosted
-    version: "5.1.1"
+    version: "5.2.0"
   win32_registry:
     dependency: transitive
     description:
@@ -959,10 +959,10 @@ packages:
     dependency: transitive
     description:
       name: xdg_directories
-      sha256: "589ada45ba9e39405c198fe34eb0f607cddb2108527e658136120892beac46d2"
+      sha256: faea9dee56b520b55a566385b84f2e8de55e7496104adada9962e0bd11bcff1d
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.3"
+    version: "1.0.4"
   xml:
     dependency: transitive
     description:

pubspec.yaml

@@ -17,7 +17,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 # In Windows, build-name is used as the major, minor, and patch parts
 # of the product and file versions while build-number is used as the build suffix.
-version: 0.15.3+239 # When changing this, update the tag in main() accordingly
+version: 0.15.5+241 # When changing this, update the tag in main() accordingly
 
 environment:
   sdk: '>=3.0.0 <4.0.0'