Google Play Service error handle #2900
Closed
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
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## master #2900 +/- ##
=========================================
Coverage 62.52% 62.52%
Complexity 1203 1203
=========================================
Files 267 267
Lines 6357 6357
Branches 881 881
=========================================
Hits 3975 3975
Misses 1831 1831
Partials 551 551 |
gino-m
requested changes
Dec 6, 2024
ground/src/main/java/com/google/android/ground/system/GoogleApiManager.kt
Outdated
Show resolved
Hide resolved
ground/src/main/java/com/google/android/ground/system/GoogleApiManager.kt
Outdated
Show resolved
Hide resolved
ground/src/main/java/com/google/android/ground/ui/startup/StartupFragment.kt
Outdated
Show resolved
Hide resolved
gino-m
requested changes
Dec 6, 2024
ground/src/main/java/com/google/android/ground/system/GoogleApiManager.kt
Outdated
Show resolved
Hide resolved
ground/src/main/java/com/google/android/ground/system/GoogleApiManager.kt
Outdated
Show resolved
Hide resolved
ground/src/main/java/com/google/android/ground/ui/startup/StartupFragment.kt
Outdated
Show resolved
Hide resolved
ground/src/main/java/com/google/android/ground/ui/startup/StartupFragment.kt
Outdated
Show resolved
Hide resolved
ground/src/main/java/com/google/android/ground/ui/startup/StartupFragment.kt
Outdated
Show resolved
Hide resolved
ground/src/main/java/com/google/android/ground/ui/startup/StartupFragment.kt
Outdated
Show resolved
Hide resolved
…lay-service' into anandwana001/2783/handle-googleplay-service
gino-m
requested changes
Dec 9, 2024
ground/src/main/java/com/google/android/ground/system/GoogleApiManager.kt
Outdated
Show resolved
Hide resolved
ground/src/main/java/com/google/android/ground/system/GoogleApiManager.kt
Outdated
Show resolved
Hide resolved
ground/src/main/java/com/google/android/ground/ui/startup/StartupViewModel.kt
Outdated
Show resolved
Hide resolved
gino-m
requested changes
Dec 10, 2024
| } catch (e: Exception) { | ||
| Timber.e( | ||
| e, | ||
| "Failed to handle activity result for requestCode: $requestCode. Exception details: ${e.message}", |
There was a problem hiding this comment.
The message and stack trace are already logged by Timber.e, no need to add it to the message as well.
| @@ -37,29 +38,31 @@ constructor( | |||
| * Displays a dialog to install Google Play Services, if missing. Throws an error if install not | |||
| * possible or cancelled. | |||
| */ | |||
| suspend fun installGooglePlayServices() { | |||
| suspend fun installGooglePlayServices(): Boolean { | |||
There was a problem hiding this comment.
Adding a Boolean return value means the caller needs to address both return value and thrown exceptions as failure states. Since we need to catch exceptions anyway, why not rely on those for error states?
| } | ||
|
|
||
| private fun startResolution(status: Int, requestCode: Int, throwable: Throwable) { | ||
| if (!googleApiAvailability.isUserResolvableError(status)) throw throwable | ||
| private suspend fun startResolution(status: Int, requestCode: Int): Boolean { |
| @@ -29,7 +29,10 @@ internal constructor( | |||
|
|
|||
| /** Checks & installs Google Play Services and initializes the login flow. */ | |||
| suspend fun initializeLogin() { | |||
| googleApiManager.installGooglePlayServices() | |||
| val isGooglePlayServicesAvailable = googleApiManager.installGooglePlayServices() | |||
| if (!isGooglePlayServicesAvailable) { | |||
There was a problem hiding this comment.
Same comment here. This entire condition goes away if installGooglePlayServices throws an exception.
# Conflicts: # ground/src/main/java/com/google/android/ground/system/GoogleApiManager.kt # ground/src/main/java/com/google/android/ground/ui/startup/StartupFragment.kt
|
Closing as it is fixed at #2924 |
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.
Fixes #2783
@shobhitagarwal1612 @gino-m PTAL?