luckyimnotanigger/HeliBoard
1
0
Fork 0
mirror of https://github.com/Helium314/HeliBoard.git synced 2025-06-09 16:17:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

avoid potential issues when restoring settings

Browse source
This commit is contained in:
Helium314 2024-02-02 21:47:25 +01:00
parent 246cd6c5cf
commit f06193f1f0
2 changed files with 19 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

15
app/src/main/java/helium314/keyboard/latin/settings/AdvancedSettingsFragment.kt
View file

@ -33,12 +33,14 @@ import helium314.keyboard.latin.checkVersionUpgrade
import helium314.keyboard.latin.common.FileUtils import helium314.keyboard.latin.common.FileUtils
import helium314.keyboard.latin.common.LocaleUtils.constructLocale import helium314.keyboard.latin.common.LocaleUtils.constructLocale
import helium314.keyboard.latin.settings.SeekBarDialogPreference.ValueProxy import helium314.keyboard.latin.settings.SeekBarDialogPreference.ValueProxy
import helium314.keyboard.latin.utils.AdditionalSubtypeUtils
import helium314.keyboard.latin.utils.CUSTOM_LAYOUT_PREFIX import helium314.keyboard.latin.utils.CUSTOM_LAYOUT_PREFIX
import helium314.keyboard.latin.utils.DeviceProtectedUtils import helium314.keyboard.latin.utils.DeviceProtectedUtils
import helium314.keyboard.latin.utils.JniUtils import helium314.keyboard.latin.utils.JniUtils
import helium314.keyboard.latin.utils.editCustomLayout import helium314.keyboard.latin.utils.editCustomLayout
import helium314.keyboard.latin.utils.infoDialog import helium314.keyboard.latin.utils.infoDialog
import helium314.keyboard.latin.utils.reloadEnabledSubtypes import helium314.keyboard.latin.utils.reloadEnabledSubtypes
import helium314.keyboard.latin.utils.updateAdditionalSubtypes
import java.io.File import java.io.File
import java.io.FileInputStream import java.io.FileInputStream
import java.io.FileOutputStream import java.io.FileOutputStream
@ -350,6 +352,7 @@ class AdvancedSettingsFragment : SubScreenFragment() {
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 val deviceProtectedFilesDir = DeviceProtectedUtils.getDeviceProtectedContext(requireContext()).filesDir?.path ?: return
Settings.getInstance().stopListener()
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}")
@ -377,7 +380,15 @@ class AdvancedSettingsFragment : SubScreenFragment() {
} }
} }
} }
} catch (t: Throwable) {
// inform about every error
Log.w(TAG, "error during restore", t)
infoDialog(requireContext(), requireContext().getString(R.string.restore_error, t.message))
} finally {
Settings.getInstance().startListener()
checkVersionUpgrade(requireContext()) checkVersionUpgrade(requireContext())
val additionalSubtypes = Settings.readPrefAdditionalSubtypes(sharedPreferences, resources);
updateAdditionalSubtypes(AdditionalSubtypeUtils.createAdditionalSubtypesArray(additionalSubtypes));
reloadEnabledSubtypes(requireContext()) reloadEnabledSubtypes(requireContext())
val newDictBroadcast = Intent(DictionaryPackConstants.NEW_DICTIONARY_INTENT_ACTION) val newDictBroadcast = Intent(DictionaryPackConstants.NEW_DICTIONARY_INTENT_ACTION)
activity?.sendBroadcast(newDictBroadcast) activity?.sendBroadcast(newDictBroadcast)
@ -385,10 +396,6 @@ class AdvancedSettingsFragment : SubScreenFragment() {
preferenceScreen.removeAll() preferenceScreen.removeAll()
setupPreferences() setupPreferences()
KeyboardSwitcher.getInstance().forceUpdateKeyboardTheme(requireContext()) KeyboardSwitcher.getInstance().forceUpdateKeyboardTheme(requireContext())
} catch (t: Throwable) {
// inform about every error
Log.w(TAG, "error during restore", t)
infoDialog(requireContext(), requireContext().getString(R.string.restore_error, t.message))
} }
} }

8
app/src/main/java/helium314/keyboard/latin/settings/Settings.java
View file

@ -240,6 +240,14 @@ public final class Settings implements SharedPreferences.OnSharedPreferenceChang
} }
} }
public void stopListener() {
mPrefs.unregisterOnSharedPreferenceChangeListener(this);
}
public void startListener() {
mPrefs.registerOnSharedPreferenceChangeListener(this);
}
// TODO: Remove this method and add proxy method to SettingsValues. // TODO: Remove this method and add proxy method to SettingsValues.
public SettingsValues getCurrent() { public SettingsValues getCurrent() {
return mSettingsValues; return mSettingsValues;