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

fix crash when using credential protected preferences too early

Browse source
This commit is contained in:
Helium314 2024-02-13 08:23:07 +01:00
parent d0dc242a28
commit d983b469fe
6 changed files with 42 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -24,6 +24,7 @@ import android.view.Gravity;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.core.content.ContextCompat;
import androidx.preference.PreferenceManager;
import helium314.keyboard.keyboard.KeyboardTheme;
import helium314.keyboard.keyboard.internal.keyboard_parser.LocaleKeyTextsKt;
@ -477,12 +478,23 @@ public final class Settings implements SharedPreferences.OnSharedPreferenceChang
return prefs.getInt(PREF_LAST_SHOWN_EMOJI_CATEGORY_PAGE_ID, defValue);
}
public static String readPinnedClipString(final SharedPreferences prefs) {
return prefs.getString(PREF_PINNED_CLIPS, "");
public static String readPinnedClipString(final Context context) {
try {
final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
return prefs.getString(PREF_PINNED_CLIPS, "");
} catch (final IllegalStateException e) {
// SharedPreferences in credential encrypted storage are not available until after user is unlocked
return "";
}
}
public static void writePinnedClipString(final SharedPreferences prefs, final String clips) {
prefs.edit().putString(PREF_PINNED_CLIPS, clips).apply();
public static void writePinnedClipString(final Context context, final String clips) {
try {
final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
prefs.edit().putString(PREF_PINNED_CLIPS, clips).apply();
} catch (final IllegalStateException e) {
// SharedPreferences in credential encrypted storage are not available until after user is unlocked
}
}
public static ArrayList<ToolbarKey> readPinnedKeys(final SharedPreferences prefs) {
@ -539,7 +551,7 @@ public final class Settings implements SharedPreferences.OnSharedPreferenceChang
}
public static File getLayoutsDir(final Context context) {
return new File(DeviceProtectedUtils.getDeviceProtectedContext(context).getFilesDir(), "layouts");
return new File(DeviceProtectedUtils.getFilesDir(context), "layouts");
}
@Nullable public static Drawable readUserBackgroundImage(final Context context, final boolean night) {
@ -561,8 +573,7 @@ public final class Settings implements SharedPreferences.OnSharedPreferenceChang
}
public static File getCustomBackgroundFile(final Context context, final boolean night) {
return new File(DeviceProtectedUtils.getDeviceProtectedContext(context).getFilesDir(),
"custom_background_image" + (night ? "_night" : ""));
return new File(DeviceProtectedUtils.getFilesDir(context), "custom_background_image" + (night ? "_night" : ""));
}
public static boolean readDayNightPref(final SharedPreferences prefs, final Resources res) {