Google Play Service error handle

ground/src/main/java/com/google/android/ground/system/GoogleApiManager.kt

@@ -21,6 +21,7 @@
 import dagger.hilt.android.qualifiers.ApplicationContext
 import javax.inject.Inject
 import javax.inject.Singleton
+import timber.log.Timber
 
 private val INSTALL_API_REQUEST_CODE = GoogleApiAvailability::class.java.hashCode() and 0xffff
 
@@ -37,29 +38,30 @@
    * 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 {
     val status = googleApiAvailability.isGooglePlayServicesAvailable(context)
-    if (status == ConnectionResult.SUCCESS) return
+    if (status == ConnectionResult.SUCCESS) return true
 
     val requestCode = INSTALL_API_REQUEST_CODE
-    startResolution(status, requestCode, GooglePlayServicesMissingException())
-    getNextResult(requestCode)
+    return startResolution(status, requestCode)
   }
 
-  private fun startResolution(status: Int, requestCode: Int, throwable: Throwable) {
-    if (!googleApiAvailability.isUserResolvableError(status)) throw throwable
+  private suspend fun startResolution(status: Int, requestCode: Int): Boolean {
+    if (!googleApiAvailability.isUserResolvableError(status)) return false
 
-    activityStreams.withActivity {
-      googleApiAvailability.showErrorDialogFragment(it, status, requestCode) { throw throwable }
+    return try {
+      activityStreams.withActivity { activity ->
+        googleApiAvailability.showErrorDialogFragment(activity, status, requestCode, null)
+      }
+      getNextResult(requestCode)
+    } catch (e: Exception) {
+      Timber.e("Activity result was not successful for requestCode: $requestCode")
+      false
     }
   }
 
-  private suspend fun getNextResult(requestCode: Int) {
+  private suspend fun getNextResult(requestCode: Int): Boolean {
     val result = activityStreams.getNextActivityResult(requestCode)
-    if (!result.isOk()) {
-      error("Activity result failed: requestCode = $requestCode, result = $result")
-    }
+    return result.isOk()
   }
-
-  class GooglePlayServicesMissingException : Error("Google play services not available")
 }

ground/src/main/java/com/google/android/ground/ui/startup/StartupFragment.kt

@@ -21,13 +21,11 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.lifecycle.lifecycleScope
 import com.google.android.ground.R
-import com.google.android.ground.system.GoogleApiManager
 import com.google.android.ground.ui.common.AbstractFragment
 import com.google.android.ground.ui.common.EphemeralPopups
 import dagger.hilt.android.AndroidEntryPoint
 import javax.inject.Inject
 import kotlinx.coroutines.launch
-import timber.log.Timber
 
 @AndroidEntryPoint
 class StartupFragment : AbstractFragment() {
@@ -47,15 +45,18 @@ class StartupFragment : AbstractFragment() {
     savedInstanceState: Bundle?,
   ): View? = inflater.inflate(R.layout.startup_frag, container, false)
 
+  @Suppress("SwallowedException")
   override fun onResume() {
     super.onResume()
     showProgressDialog(R.string.initializing)
     viewLifecycleOwner.lifecycleScope.launch {
-      try {
-        viewModel.initializeLogin()
-      } catch (t: Throwable) {
-        onInitFailed(t)
-      }
+      val success =
+        try {
+          viewModel.initializeLogin()
+        } catch (t: Throwable) {
+          false
+        }
+      handleLoginResult(success)
     }
   }
 
@@ -64,11 +65,10 @@ class StartupFragment : AbstractFragment() {
     super.onPause()
   }
 
-  private fun onInitFailed(t: Throwable) {
-    Timber.e(t, "Failed to launch app")
-    if (t is GoogleApiManager.GooglePlayServicesMissingException) {
+  private fun handleLoginResult(success: Boolean) {
+    if (!success) {
       popups.ErrorPopup().show(R.string.google_api_install_failed)
+      requireActivity().finish()
     }
-    requireActivity().finish()
   }
 }

ground/src/main/java/com/google/android/ground/ui/startup/StartupViewModel.kt

@@ -28,8 +28,12 @@ internal constructor(
 ) : AbstractViewModel() {
 
   /** Checks & installs Google Play Services and initializes the login flow. */
-  suspend fun initializeLogin() {
-    googleApiManager.installGooglePlayServices()
+  suspend fun initializeLogin(): Boolean {
+    val isGooglePlayServicesAvailable = googleApiManager.installGooglePlayServices()
+    if (!isGooglePlayServicesAvailable) {
+      return false
+    }
     userRepository.init()
+    return true
   }
 }