[APT-10658] Better EncryptedSharedPreferences Resilience #52
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The earlier failsafe does not protect against the app crashing on startup. This time, the exception is caught and the SecureStorage can handle the SharedPref being null.
rubeus90
approved these changes
Oct 23, 2024
Armadillo to simply took the DRMInfo passed into it for granted without checking whether the content even needed a key to play. Exoplayer can raise an exception on its own and didn't need the DrmMediaSourceHelper to throw its own exceptions separately.
griffinfscribd
approved these changes
Oct 23, 2024
kschults
reviewed
Oct 24, 2024
| @@ -73,28 +78,30 @@ internal class ArmadilloSecureStorage @Inject constructor( | |||
| override fun saveDrmDownload(context: Context, id: String, drmDownload: DrmDownload) { | |||
| val alias = getDrmDownloadAlias(id, drmDownload.drmType) | |||
| val value = Base64.encodeToString(Json.encodeToString(drmDownload).toByteArray(StandardCharsets.UTF_8), Base64.NO_WRAP) | |||
| secureDrmStorage.edit().putString(alias, value).apply() | |||
| secureDrmStorage?.edit()?.putString(alias, value)?.apply() | |||
There was a problem hiding this comment.
Should we try to put it in legacy if secure doesn't exist?
There was a problem hiding this comment.
That would be failing insecure.
| val tag = "DeletingSharedPrefs" | ||
| try { | ||
| val sharedPrefsFile = File( | ||
| (context.filesDir.getParent()?.plus("/shared_prefs/")) + filename + ".xml" |
There was a problem hiding this comment.
I think it's worth adding a comment that this file is only a guess at the filepath, and may not actually exist depending on SDK version and OEM, and what happens if we do/don't delete it.
| import java.io.File | ||
| import java.security.KeyStore | ||
|
|
||
| fun SharedPreferences.deleteSharedPreference(context: Context, filename: String, keystoreAlias: String) { |
There was a problem hiding this comment.
This should be named specific to the encryption prefs, since it also does things with the keystore.
kschults
approved these changes
Oct 24, 2024
[APT-10650] Better DrmInfo Resilience
Ignore flaky test that was already hard to write. Have to go back later for it.
rubeus90
approved these changes
Oct 24, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The earlier failsafe does not protect against the app crashing on startup. This time, the exception is caught and the SecureStorage can handle the SharedPref being null.
issue for EncryptedSharedPreferences
https://issuetracker.google.com/issues/176215143?pli=1