adjust build and add a variant that doesn't allow user-added libraries

This commit is contained in:
Helium314 2024-02-01 22:10:54 +01:00
parent 53022afdab
commit 978d76ed7c
6 changed files with 39 additions and 52 deletions

View file

@ -18,8 +18,6 @@ import java.util.List;
/**
* KeyboardLayout maintains the keyboard layout information.
*/
// todo: this seems completely unused, see whether it can be removed, or re-purposed to contain
// some useful information about the layout (currently that's in KeyboardParser.LayoutInfos)
public class KeyboardLayout {
private final int[] mKeyCodes;

View file

@ -117,6 +117,9 @@ class AdvancedSettingsFragment : SubScreenFragment() {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
removePreference(Settings.PREF_SHOW_SETUP_WIZARD_ICON)
}
if (BuildConfig.BUILD_TYPE == "nouserlib") {
removePreference("load_gesture_library")
}
setupKeyLongpressTimeoutSettings()
findPreference<Preference>("load_gesture_library")?.setOnPreferenceClickListener { onClickLoadLibrary() }
findPreference<Preference>("backup_restore")?.setOnPreferenceClickListener { showBackupRestoreDialog() }

View file

@ -57,7 +57,7 @@ public final class JniUtils {
if (app != null) // use the actual path if possible
filesDir = app.getFilesDir().getAbsolutePath();
final File userSuppliedLibrary = new File(filesDir + File.separator + JNI_LIB_IMPORT_FILE_NAME);
if (userSuppliedLibrary.exists()) {
if (!BuildConfig.BUILD_TYPE.equals("nouserlib") && userSuppliedLibrary.exists()) {
String wantedChecksum = expectedDefaultChecksum();
try {
if (app != null) {