Android: Prevent potential NPEs and improve nullability handling #89999
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
m4gr3d
requested changes
Mar 28, 2024
| Log.v(TAG, "Force quitting Godot instance") | ||
| ProcessPhoenix.forceQuit(this) | ||
| godotFragment?.let { | ||
| if (instance == it.godot) { |
There was a problem hiding this comment.
Here the original logic has a triple equal === for referential equality; looks like it was inadvertently converted to a double equals ==.
There was a problem hiding this comment.
Ah, good catch, I missed that, thanks! Will fix...
| Log.v(TAG, "Restarting Godot instance...") | ||
| ProcessPhoenix.triggerRebirth(this) | ||
| godotFragment?.let { | ||
| if (instance == it.godot) { |
There was a problem hiding this comment.
Similar comment as above; the original logic has a triple equal === for referential equality; looks like it was inadvertently converted to a double equals ==.
This PR prevents potential NPEs, and follows Kotlin conventions more closely by replacing the unsafe !! operator with safe ?. (or ?.let) (usually !! would only be used very rarely, and with a good reason - there is one place left in this PR where !! makes sense), and by replacing Java style 'if (x != null)' with Kotlin's '?.'
melquiadess
force-pushed
the
prevent-potential-NPEs-and-improve-nullability-handling
branch
from
26fbf64 to
70ea3e2
Compare
Thanks for a quick review |
akien-mga
changed the title
|
Thanks! And congrats for your first merged Godot contribution 🎉 |
melquiadess
deleted the
prevent-potential-NPEs-and-improve-nullability-handling
branch
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.
Context
This PR aims to improve nullability handling in Godot's Android
libmodule:!!operator is used in a few lines, whereas elsewhere the safer?.is used - this is now replaced with the safe?.(or?.let) operator consistently; (usually!!would only be used very rarely, and with a good reason - there is one place left in this PR where I believe!!makes sense ->GodotActivity.kt, L79)if (x != null)replaced with idiomatic Kotlin's?.FileAccessHandler.renameFile()accepted nullable args, (and so its use sites were again having!!for the args passed to this function), but it can be inferred that the args the function receives are non-nullable, therefore we can get rid of nullability in those args (and so the!!use)Godot.getRotatedValues()- this could produce an NPE inonSensorChanged()in some situations - fixedThere are 2 outcomes from the above: