Settings upgrade (#1325)

Re-implement most of the settings in compose, searchable Languages & Layouts, Colors, and Personal Dictionary still missing, will be done later
2025-06-02 12:52:15 +00:00 · 2025-02-09 13:27:55 +01:00 · 2025-02-09 13:27:55 +01:00 · e845e38e42
commit e845e38e42
parent 679754bb2d
52 changed files with 4708 additions and 24 deletions
--- a/app/src/main/java/helium314/keyboard/settings/preferences/LoadGestureLibPreference.kt
+++ b/app/src/main/java/helium314/keyboard/settings/preferences/LoadGestureLibPreference.kt
@ -0,0 +1,113 @@
+// SPDX-License-Identifier: GPL-3.0-only
+package helium314.keyboard.settings.preferences
+
+import android.app.Activity
+import android.content.Intent
+import android.os.Build
+import androidx.activity.compose.rememberLauncherForActivityResult
+import androidx.activity.result.contract.ActivityResultContracts
+import androidx.appcompat.app.AlertDialog
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.saveable.rememberSaveable
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.stringResource
+import helium314.keyboard.latin.R
+import helium314.keyboard.latin.common.FileUtils
+import helium314.keyboard.latin.settings.Settings
+import helium314.keyboard.latin.utils.ChecksumCalculator
+import helium314.keyboard.latin.utils.JniUtils
+import helium314.keyboard.latin.utils.prefs
+import helium314.keyboard.settings.Setting
+import helium314.keyboard.settings.dialogs.ConfirmationDialog
+import java.io.File
+import java.io.FileInputStream
+import java.io.FileOutputStream
+import java.io.IOException
+
+@Composable
+fun LoadGestureLibPreference(setting: Setting) {
+    var showDialog by rememberSaveable { mutableStateOf(false) }
+    val ctx = LocalContext.current
+    val prefs = ctx.prefs()
+    val abi = Build.SUPPORTED_ABIS[0]
+    val libFile = File(ctx.filesDir.absolutePath + File.separator + JniUtils.JNI_LIB_IMPORT_FILE_NAME)
+    fun renameToLibFileAndRestart(file: File, checksum: String) {
+        libFile.delete()
+        // store checksum in default preferences (soo JniUtils)
+        prefs.edit().putString(Settings.PREF_LIBRARY_CHECKSUM, checksum).commit()
+        file.renameTo(libFile)
+        Runtime.getRuntime().exit(0) // exit will restart the app, so library will be loaded
+    }
+    var tempFilePath: String? by rememberSaveable { mutableStateOf(null) }
+    val launcher = rememberLauncherForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
+        if (result.resultCode != Activity.RESULT_OK) return@rememberLauncherForActivityResult
+        val uri = result.data?.data ?: return@rememberLauncherForActivityResult
+        val tmpfile = File(ctx.filesDir.absolutePath + File.separator + "tmplib")
+        try {
+            val otherTemporaryFile = File(ctx.filesDir.absolutePath + File.separator + "tmpfile")
+            FileUtils.copyContentUriToNewFile(uri, ctx, otherTemporaryFile)
+            val inputStream = FileInputStream(otherTemporaryFile)
+            val outputStream = FileOutputStream(tmpfile)
+            outputStream.use {
+                tmpfile.setReadOnly() // as per recommendations in https://developer.android.com/about/versions/14/behavior-changes-14#safer-dynamic-code-loading
+                FileUtils.copyStreamToOtherStream(inputStream, it)
+            }
+            otherTemporaryFile.delete()
+
+            val checksum = ChecksumCalculator.checksum(tmpfile.inputStream()) ?: ""
+            if (checksum == JniUtils.expectedDefaultChecksum()) {
+                renameToLibFileAndRestart(tmpfile, checksum)
+            } else {
+                tempFilePath = tmpfile.absolutePath
+                AlertDialog.Builder(ctx)
+                    .setMessage(ctx.getString(R.string.checksum_mismatch_message, abi))
+                    .setPositiveButton(android.R.string.ok) { _, _ -> renameToLibFileAndRestart(tmpfile, checksum) }
+                    .setNegativeButton(android.R.string.cancel) { _, _ -> tmpfile.delete() }
+                    .show()
+            }
+        } catch (e: IOException) {
+            tmpfile.delete()
+            // should inform user, but probably the issues will only come when reading the library
+        }
+    }
+    Preference(
+        name = setting.title,
+        onClick = { showDialog = true }
+    )
+    if (showDialog) {
+        ConfirmationDialog(
+            onDismissRequest = { showDialog = false },
+            onConfirmed = {
+                val intent = Intent(Intent.ACTION_OPEN_DOCUMENT)
+                    .addCategory(Intent.CATEGORY_OPENABLE)
+                    .setType("application/octet-stream")
+                launcher.launch(intent)
+            },
+            title = { Text(stringResource(R.string.load_gesture_library)) },
+            text = { Text(stringResource(R.string.load_gesture_library_message, abi)) },
+            neutralButtonText = if (libFile.exists()) stringResource(R.string.load_gesture_library_button_delete) else null,
+            onNeutral = {
+                libFile.delete()
+                prefs.edit().remove(Settings.PREF_LIBRARY_CHECKSUM).commit()
+                Runtime.getRuntime().exit(0)
+            }
+        )
+    }
+    if (tempFilePath != null)
+        ConfirmationDialog(
+            onDismissRequest = {
+                File(tempFilePath!!).delete()
+                tempFilePath = null
+            },
+            text = { Text(stringResource(R.string.checksum_mismatch_message, abi)) },
+            onConfirmed = {
+                val tempFile = File(tempFilePath!!)
+                renameToLibFileAndRestart(tempFile, ChecksumCalculator.checksum(tempFile.inputStream()) ?: "")
+            }
+        )
+}