Merge pull request #1230 from re7gog/re7gog

Fixes and system font

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

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

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

@@ -103,7 +103,6 @@
     "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",

assets/translations/fa.json

@@ -103,7 +103,6 @@
     "importErrors": "خطاهای وارد کردن",
     "importedXOfYApps": "{} از {} برنامه وارد شد.",
     "followingURLsHadErrors": "آدرس های اینترنتی زیر دارای خطا بودند:",
-    "okay": "باشه",
     "selectURL": "آدرس اینترنتی انتخاب شده",
     "selectURLs": "آدرس های اینترنتی انتخاب شده",
     "pick": "انتخاب",

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

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

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": "選択",

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

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

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

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

assets/translations/vi.json

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

assets/translations/zh.json

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

lib/main.dart

@@ -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,17 @@ 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/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,12 +522,12 @@ 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 = (await NativeFeatures.installWithRoot(apkFilePath: file.file.path))
             ? 0
             : 1;
     }
@@ -694,14 +694,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'));
             }
         }

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) {
-      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];