luckyimnotanigger/HeliBoard
1
0
Fork 0
mirror of https://github.com/Helium314/HeliBoard.git synced 2025-04-20 22:29:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

a bunch of minor fixes

Browse source
This commit is contained in:
Helium314 2024-01-31 17:26:27 +01:00
parent 09803fdf92
commit 8c40d4f3e8
3 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/src/main/java/org/dslul/openboard/inputmethod/latin/settings/AdvancedSettingsFragment.kt
View file

@ -326,10 +326,10 @@ class AdvancedSettingsFragment : SubScreenFragment() {
zipStream.closeEntry() zipStream.closeEntry()
} }
zipStream.putNextEntry(ZipEntry(PREFS_FILE_NAME)) zipStream.putNextEntry(ZipEntry(PREFS_FILE_NAME))
settingsToJsonStream2(sharedPreferences.all, zipStream) settingsToJsonStream(sharedPreferences.all, zipStream)
zipStream.closeEntry() zipStream.closeEntry()
zipStream.putNextEntry(ZipEntry(PROTECTED_PREFS_FILE_NAME)) zipStream.putNextEntry(ZipEntry(PROTECTED_PREFS_FILE_NAME))
settingsToJsonStream2(PreferenceManager.getDefaultSharedPreferences(requireContext()).all, zipStream) settingsToJsonStream(PreferenceManager.getDefaultSharedPreferences(requireContext()).all, zipStream)
zipStream.closeEntry() zipStream.closeEntry()
zipStream.close() zipStream.close()
} }
@ -346,12 +346,13 @@ class AdvancedSettingsFragment : SubScreenFragment() {
ZipInputStream(inputStream).use { zip -> ZipInputStream(inputStream).use { zip ->
var entry: ZipEntry? = zip.nextEntry var entry: ZipEntry? = zip.nextEntry
val filesDir = requireContext().filesDir?.path ?: return val filesDir = requireContext().filesDir?.path ?: return
val deviceProtectedFilesDir = DeviceProtectedUtils.getDeviceProtectedContext(requireContext()).filesDir?.path ?: return
while (entry != null) { while (entry != null) {
if (entry.name.startsWith("unprotected${File.separator}")) { if (entry.name.startsWith("unprotected${File.separator}")) {
val adjustedName = entry.name.substringAfter("unprotected${File.separator}") val adjustedName = entry.name.substringAfter("unprotected${File.separator}")
if (backupFilePatterns.any { adjustedName.matches(it) }) { if (backupFilePatterns.any { adjustedName.matches(it) }) {
val targetFileName = upgradeFileNames(adjustedName) val targetFileName = upgradeFileNames(adjustedName)
val file = File(filesDir, targetFileName) val file = File(deviceProtectedFilesDir, targetFileName)
FileUtils.copyStreamToNewFile(zip, file) FileUtils.copyStreamToNewFile(zip, file)
} }
} else if (backupFilePatterns.any { entry!!.name.matches(it) }) { } else if (backupFilePatterns.any { entry!!.name.matches(it) }) {
@ -447,7 +448,7 @@ class AdvancedSettingsFragment : SubScreenFragment() {
companion object { companion object {
@Suppress("UNCHECKED_CAST") // it is checked... but whatever (except string set, because can't check for that)) @Suppress("UNCHECKED_CAST") // it is checked... but whatever (except string set, because can't check for that))
private fun settingsToJsonStream2(settings: Map<String, Any?>, out: OutputStream) { private fun settingsToJsonStream(settings: Map<String, Any?>, out: OutputStream) {
val booleans = settings.filterValues { it is Boolean } as Map<String, Boolean> val booleans = settings.filterValues { it is Boolean } as Map<String, Boolean>
val ints = settings.filterValues { it is Int } as Map<String, Int> val ints = settings.filterValues { it is Int } as Map<String, Int>
val longs = settings.filterValues { it is Long } as Map<String, Long> val longs = settings.filterValues { it is Long } as Map<String, Long>

3
app/src/main/java/org/dslul/openboard/inputmethod/latin/settings/UserDictionaryListFragment.java
View file

@ -145,7 +145,8 @@ public class UserDictionaryListFragment extends SubScreenFragment {
} else { } else {
newPref.setTitle(UserDictionarySettings.getLocaleDisplayName(requireContext(), locale)); newPref.setTitle(UserDictionarySettings.getLocaleDisplayName(requireContext(), locale));
} }
newPref.getExtras().putString("locale", locale.toLanguageTag()); if (locale == UserDictionarySettings.emptyLocale) newPref.getExtras().putString("locale", "");
else newPref.getExtras().putString("locale", locale.toLanguageTag());
newPref.setIconSpaceReserved(false); newPref.setIconSpaceReserved(false);
newPref.setFragment(UserDictionarySettings.class.getName()); newPref.setFragment(UserDictionarySettings.class.getName());

2
app/src/main/res/values/strings.xml
View file

@ -66,7 +66,7 @@
<!-- Units abbreviation for the duration (milliseconds) [CHAR LIMIT=10] --> <!-- Units abbreviation for the duration (milliseconds) [CHAR LIMIT=10] -->
<string name="abbreviation_unit_milliseconds"><xliff:g id="MILLISECONDS">%s</xliff:g> ms</string> <string name="abbreviation_unit_milliseconds"><xliff:g id="MILLISECONDS">%s</xliff:g> ms</string>
<!-- Units abbreviation for the duration (minutes) [CHAR LIMIT=10] --> <!-- Units abbreviation for the duration (minutes) [CHAR LIMIT=10] -->
<string name="abbreviation_unit_minutes"><xliff:g id="MINUTES">%s</xliff:g>min.</string> <string name="abbreviation_unit_minutes"><xliff:g id="MINUTES">%s</xliff:g> min</string>
<!-- The text that represents the current settings value is the system default [CHAR LIMIT=25] --> <!-- The text that represents the current settings value is the system default [CHAR LIMIT=25] -->
<string name="settings_system_default">System default</string> <string name="settings_system_default">System default</string>
<!-- The text that represents an unlimited delay [CHAR LIMIT=25] --> <!-- The text that represents an unlimited delay [CHAR LIMIT=25] -->