Error handling fixes

Author: caleb-bit

app/src/main/java/com/cornellappdev/coursegrab/LoginActivity.kt

@@ -26,14 +26,14 @@ import com.cornellappdev.coursegrab.networking.deviceToken
 import com.cornellappdev.coursegrab.networking.initializeSession
 import com.cornellappdev.coursegrab.networking.setNotification
 import com.cornellappdev.coursegrab.networking.updateSession
-import com.google.android.gms.common.api.ApiException
 import com.google.android.libraries.identity.googleid.GetGoogleIdOption
 import com.google.android.libraries.identity.googleid.GetSignInWithGoogleOption
 import com.google.android.libraries.identity.googleid.GoogleIdTokenCredential
 import com.google.android.libraries.identity.googleid.GoogleIdTokenParsingException
 import com.google.android.material.snackbar.Snackbar
 import com.google.firebase.messaging.FirebaseMessaging
 import com.google.gson.reflect.TypeToken
+import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
@@ -61,26 +61,29 @@ class LoginActivity : AppCompatActivity() {
             val intent = Intent(this@LoginActivity, MainActivity::class.java)
             startActivity(intent)
         } else {
-            if (preferencesHelper.updateToken != null)
-                try {
-                    val updateSession =
-                        Endpoint.updateSession(preferencesHelper.updateToken.toString())
+            val updateToken = preferencesHelper.updateToken
+            if (!updateToken.isNullOrBlank()) {
+                val updateSession = Endpoint.updateSession(updateToken)
 
-                    lifecycleScope.launch {
+                lifecycleScope.launch {
+                    val userSession = try {
                         val typeToken = object : TypeToken<ApiResponse<UserSession>>() {}.type
-                        val userSession = withContext(Dispatchers.IO) {
+                        withContext(Dispatchers.IO) {
                             Request.makeRequest<ApiResponse<UserSession>>(
                                 updateSession.okHttpRequest(),
                                 typeToken
                             )
-                        }!!.data
-
-                        verifySession(userSession)
+                        }?.data
+                    } catch (e: CancellationException) {
+                        throw e
+                    } catch (e: Exception) {
+                        Log.d(TAG, "Could not resume previous session", e)
+                        null
                     }
 
-                } catch (e: ApiException) {
-                    e.printStackTrace()
+                    if (userSession != null) verifySession(userSession)
                 }
+            }
         }
 
         binding.signInButton.setOnClickListener { signIn() }
@@ -190,13 +193,25 @@ class LoginActivity : AppCompatActivity() {
         val initializeSession = Endpoint.initializeSession(googleCredential.idToken, null)
 
         lifecycleScope.launch {
-            val typeToken = object : TypeToken<ApiResponse<UserSession>>() {}.type
-            val userSession = withContext(Dispatchers.IO) {
-                Request.makeRequest<ApiResponse<UserSession>>(
-                    initializeSession.okHttpRequest(),
-                    typeToken
-                )
-            }!!.data
+            val userSession = try {
+                val typeToken = object : TypeToken<ApiResponse<UserSession>>() {}.type
+                withContext(Dispatchers.IO) {
+                    Request.makeRequest<ApiResponse<UserSession>>(
+                        initializeSession.okHttpRequest(),
+                        typeToken
+                    )
+                }?.data
+            } catch (e: CancellationException) {
+                throw e
+            } catch (e: Exception) {
+                Log.e(TAG, "Failed to initialize session", e)
+                null
+            }
+
+            if (userSession == null) {
+                showLoginError("Sign-in failed. Please try again.")
+                return@launch
+            }
 
             verifySession(userSession)
         }

build.gradle

@@ -9,7 +9,7 @@ buildscript {
     dependencies {
         classpath 'com.android.tools.build:gradle:9.3.2'
         classpath 'com.google.gms:google-services:4.5.0'
-        classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:2.2.10'
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'com.google.firebase:firebase-crashlytics-gradle:3.0.8'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files