luckyimnotanigger/HeliBoard
1
0
Fork 0
mirror of https://github.com/Helium314/HeliBoard.git synced 2025-06-10 00:27:45 +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

7
app/src/main/java/helium314/keyboard/latin/utils/JniUtils.java
View file

@ -63,8 +63,7 @@ public final class JniUtils {
if (app != null) {
// we want the default preferences, because storing the checksum in device protected storage is discouraged
// see https://developer.android.com/reference/android/content/Context#createDeviceProtectedStorageContext()
// todo: test what happens on an encrypted phone after reboot (don't have one...)
// does the app restart after unlocking, or is gesture typing unavailable?
// if device is locked, this will throw an IllegalStateException
wantedChecksum = PreferenceManager.getDefaultSharedPreferences(app).getString(Settings.PREF_LIBRARY_CHECKSUM, wantedChecksum);
}
final String checksum = ChecksumCalculator.INSTANCE.checksum(new FileInputStream(userSuppliedLibrary));
@ -79,7 +78,9 @@ public final class JniUtils {
sHaveGestureLib = false;
}
} catch (Throwable t) { // catch everything, maybe provided library simply doesn't work
Log.w(TAG, "Could not load user-supplied library", t);
if (!(t instanceof IllegalStateException) || !"SharedPreferences in credential encrypted storage are not available until after user is unlocked".equals(t.getMessage()))
// but don't log if device is locked, here we expect the exception and only load system library, if possible
Log.w(TAG, "Could not load user-supplied library", t);
}
}