Updated CreatePasskeyScreen/ViewModel logic, modified handling of http code errors, and removed redundant HttpException handling

cy245 · cy245 · commit d41fc930dd59 · 2025-09-10T11:21:39.000-04:00
diff --git a/Shrine/app/src/main/java/com/authentication/shrine/repository/AuthRepository.kt b/Shrine/app/src/main/java/com/authentication/shrine/repository/AuthRepository.kt
@@ -51,7 +51,6 @@ import com.google.android.libraries.identity.googleid.GoogleIdTokenCredential
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.map
 import org.json.JSONObject
-import retrofit2.HttpException
 import java.io.IOException
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -111,12 +110,10 @@ class AuthRepository @Inject constructor(
                 if (response.code() == 401) {
                     signOut()
                 }
-                AuthResult.Failure(AuthError.UserAlreadyExists)
+                AuthResult.Failure(AuthError.ServerError(response.message()))
             }
         } catch (e: IOException) {
             AuthResult.Failure(AuthError.NetworkError)
-        } catch (e: HttpException) {
-            AuthResult.Failure(AuthError.ServerError(e.message()))
         } catch (e: Exception) {
             AuthResult.Failure(AuthError.Unknown(e.message))
         }
@@ -145,12 +142,10 @@ class AuthRepository @Inject constructor(
                 if (response.code() == 401) {
                     signOut()
                 }
-                AuthResult.Failure(AuthError.ServerError(null))
+                AuthResult.Failure(AuthError.ServerError(response.message()))
             }
         } catch (e: IOException) {
             AuthResult.Failure(AuthError.NetworkError)
-        } catch (e: HttpException) {
-            AuthResult.Failure(AuthError.ServerError(e.message()))
         } catch (e: Exception) {
             AuthResult.Failure(AuthError.Unknown(e.message))
         }
@@ -239,8 +234,6 @@ class AuthRepository @Inject constructor(
             }
         } catch (e: IOException) {
             AuthResult.Failure(AuthError.NetworkError)
-        } catch (e: HttpException) {
-            AuthResult.Failure(AuthError.ServerError(e.message()))
         } catch (e: Exception) {
             AuthResult.Failure(AuthError.Unknown(e.message))
         }
@@ -313,8 +306,6 @@ class AuthRepository @Inject constructor(
             }
         } catch (e: IOException) {
             AuthResult.Failure(AuthError.NetworkError)
-        } catch (e: HttpException) {
-            AuthResult.Failure(AuthError.ServerError(e.message()))
         } catch (e: Exception) {
             AuthResult.Failure(AuthError.Unknown(e.message))
         }
@@ -344,8 +335,6 @@ class AuthRepository @Inject constructor(
             }
         } catch (e: IOException) {
             AuthResult.Failure(AuthError.NetworkError)
-        } catch (e: HttpException) {
-            AuthResult.Failure(AuthError.ServerError(e.message()))
         } catch (e: Exception) {
             AuthResult.Failure(AuthError.Unknown(e.message))
         }
@@ -402,7 +391,7 @@ class AuthRepository @Inject constructor(
                             if (apiResult.code() == 401) {
                                 signOut()
                             }
-                            AuthResult.Failure(AuthError.InvalidCredentials)
+                            AuthResult.Failure(AuthError.ServerError(apiResult.message()))
                         }
                     }
                 }
@@ -418,8 +407,6 @@ class AuthRepository @Inject constructor(
             AuthResult.Failure(AuthError.Unknown(null))
         } catch (e: IOException) {
             AuthResult.Failure(AuthError.NetworkError)
-        } catch (e: HttpException) {
-            AuthResult.Failure(AuthError.ServerError(e.message()))
         } catch (e: Exception) {
             AuthResult.Failure(AuthError.Unknown(e.message))
         }
@@ -454,8 +441,6 @@ class AuthRepository @Inject constructor(
             }
         } catch (e: IOException) {
             AuthResult.Failure(AuthError.NetworkError)
-        } catch (e: HttpException) {
-            AuthResult.Failure(AuthError.ServerError(e.message()))
         } catch (e: Exception) {
             AuthResult.Failure(AuthError.Unknown(e.message))
         }
@@ -477,7 +462,7 @@ class AuthRepository @Inject constructor(
     /**
      * Checks if the user is signed in through passkeys.
      *
-      * @return True if the user is signed in through passkeys, false otherwise.
+     * @return True if the user is signed in through passkeys, false otherwise.
      */
     suspend fun isSignedInThroughPasskeys(): Boolean {
         val isSignedInThroughPasskeys = dataStore.read(IS_SIGNED_IN_THROUGH_PASSKEYS)
@@ -509,8 +494,6 @@ class AuthRepository @Inject constructor(
             }
         } catch (e: IOException) {
             AuthResult.Failure(AuthError.NetworkError)
-        } catch (e: HttpException) {
-            AuthResult.Failure(AuthError.ServerError(e.message()))
         } catch (e: Exception) {
             AuthResult.Failure(AuthError.Unknown(e.message))
         }
@@ -598,8 +581,6 @@ class AuthRepository @Inject constructor(
             }
         } catch (e: IOException) {
             AuthResult.Failure(AuthError.NetworkError)
-        } catch (e: HttpException) {
-            AuthResult.Failure(AuthError.ServerError(e.message()))
         } catch (e: Exception) {
             AuthResult.Failure(AuthError.Unknown(e.message))
         }
diff --git a/Shrine/app/src/main/java/com/authentication/shrine/ui/CreatePasskeyScreen.kt b/Shrine/app/src/main/java/com/authentication/shrine/ui/CreatePasskeyScreen.kt
@@ -145,14 +145,18 @@ fun CreatePasskeyScreen(
             ShrineLoader()
         }
 
-        val snackbarMessage = when {
-            !uiState.errorMessage.isNullOrBlank() -> uiState.errorMessage
-            else -> null
-        }
+        if (uiState.messageResourceId != R.string.empty_string) {
+            val baseMessage = stringResource(uiState.messageResourceId)
+            val finalMessage = if (uiState.errorMessage != null) {
+                "$baseMessage ${uiState.errorMessage}"
+            } else {
+                baseMessage
+            }
 
-        if (snackbarMessage != null) {
-            LaunchedEffect(snackbarMessage) {
-                snackbarHostState.showSnackbar(snackbarMessage)
+            LaunchedEffect(finalMessage) {
+                snackbarHostState.showSnackbar(
+                    message = finalMessage,
+                )
             }
         }
     }
diff --git a/Shrine/app/src/main/java/com/authentication/shrine/ui/viewmodel/CreatePasskeyViewModel.kt b/Shrine/app/src/main/java/com/authentication/shrine/ui/viewmodel/CreatePasskeyViewModel.kt
@@ -135,6 +135,6 @@ class CreatePasskeyViewModel @Inject constructor(
 data class CreatePasskeyUiState(
     val isLoading: Boolean = false,
     val navigateToMainMenu: Boolean = false,
-    @StringRes val messageResourceId: Int? = null,
+    @StringRes val messageResourceId: Int= R.string.empty_string,
     val errorMessage: String? = null,
 )

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,6 @@ import com.google.android.libraries.identity.googleid.GoogleIdTokenCredential`
`51`	`51`	`import kotlinx.coroutines.flow.first`
`52`	`52`	`import kotlinx.coroutines.flow.map`
`53`	`53`	`import org.json.JSONObject`
`54`		`-import retrofit2.HttpException`
`55`	`54`	`import java.io.IOException`
`56`	`55`	`import javax.inject.Inject`
`57`	`56`	`import javax.inject.Singleton`
`@@ -111,12 +110,10 @@ class AuthRepository @Inject constructor(`
`111`	`110`	`if (response.code() == 401) {`
`112`	`111`	`signOut()`
`113`	`112`	`}`
`114`		`- AuthResult.Failure(AuthError.UserAlreadyExists)`
	`113`	`+ AuthResult.Failure(AuthError.ServerError(response.message()))`
`115`	`114`	`}`
`116`	`115`	`} catch (e: IOException) {`
`117`	`116`	`AuthResult.Failure(AuthError.NetworkError)`
`118`		`- } catch (e: HttpException) {`
`119`		`- AuthResult.Failure(AuthError.ServerError(e.message()))`
`120`	`117`	`} catch (e: Exception) {`
`121`	`118`	`AuthResult.Failure(AuthError.Unknown(e.message))`
`122`	`119`	`}`
`@@ -145,12 +142,10 @@ class AuthRepository @Inject constructor(`
`145`	`142`	`if (response.code() == 401) {`
`146`	`143`	`signOut()`
`147`	`144`	`}`
`148`		`- AuthResult.Failure(AuthError.ServerError(null))`
	`145`	`+ AuthResult.Failure(AuthError.ServerError(response.message()))`
`149`	`146`	`}`
`150`	`147`	`} catch (e: IOException) {`
`151`	`148`	`AuthResult.Failure(AuthError.NetworkError)`
`152`		`- } catch (e: HttpException) {`
`153`		`- AuthResult.Failure(AuthError.ServerError(e.message()))`
`154`	`149`	`} catch (e: Exception) {`
`155`	`150`	`AuthResult.Failure(AuthError.Unknown(e.message))`
`156`	`151`	`}`
`@@ -239,8 +234,6 @@ class AuthRepository @Inject constructor(`
`239`	`234`	`}`
`240`	`235`	`} catch (e: IOException) {`
`241`	`236`	`AuthResult.Failure(AuthError.NetworkError)`
`242`		`- } catch (e: HttpException) {`
`243`		`- AuthResult.Failure(AuthError.ServerError(e.message()))`
`244`	`237`	`} catch (e: Exception) {`
`245`	`238`	`AuthResult.Failure(AuthError.Unknown(e.message))`
`246`	`239`	`}`
`@@ -313,8 +306,6 @@ class AuthRepository @Inject constructor(`
`313`	`306`	`}`
`314`	`307`	`} catch (e: IOException) {`
`315`	`308`	`AuthResult.Failure(AuthError.NetworkError)`
`316`		`- } catch (e: HttpException) {`
`317`		`- AuthResult.Failure(AuthError.ServerError(e.message()))`
`318`	`309`	`} catch (e: Exception) {`
`319`	`310`	`AuthResult.Failure(AuthError.Unknown(e.message))`
`320`	`311`	`}`
`@@ -344,8 +335,6 @@ class AuthRepository @Inject constructor(`
`344`	`335`	`}`
`345`	`336`	`} catch (e: IOException) {`
`346`	`337`	`AuthResult.Failure(AuthError.NetworkError)`
`347`		`- } catch (e: HttpException) {`
`348`		`- AuthResult.Failure(AuthError.ServerError(e.message()))`
`349`	`338`	`} catch (e: Exception) {`
`350`	`339`	`AuthResult.Failure(AuthError.Unknown(e.message))`
`351`	`340`	`}`
`@@ -402,7 +391,7 @@ class AuthRepository @Inject constructor(`
`402`	`391`	`if (apiResult.code() == 401) {`
`403`	`392`	`signOut()`
`404`	`393`	`}`
`405`		`- AuthResult.Failure(AuthError.InvalidCredentials)`
	`394`	`+ AuthResult.Failure(AuthError.ServerError(apiResult.message()))`
`406`	`395`	`}`
`407`	`396`	`}`
`408`	`397`	`}`
`@@ -418,8 +407,6 @@ class AuthRepository @Inject constructor(`
`418`	`407`	`AuthResult.Failure(AuthError.Unknown(null))`
`419`	`408`	`} catch (e: IOException) {`
`420`	`409`	`AuthResult.Failure(AuthError.NetworkError)`
`421`		`- } catch (e: HttpException) {`
`422`		`- AuthResult.Failure(AuthError.ServerError(e.message()))`
`423`	`410`	`} catch (e: Exception) {`
`424`	`411`	`AuthResult.Failure(AuthError.Unknown(e.message))`
`425`	`412`	`}`
`@@ -454,8 +441,6 @@ class AuthRepository @Inject constructor(`
`454`	`441`	`}`
`455`	`442`	`} catch (e: IOException) {`
`456`	`443`	`AuthResult.Failure(AuthError.NetworkError)`
`457`		`- } catch (e: HttpException) {`
`458`		`- AuthResult.Failure(AuthError.ServerError(e.message()))`
`459`	`444`	`} catch (e: Exception) {`
`460`	`445`	`AuthResult.Failure(AuthError.Unknown(e.message))`
`461`	`446`	`}`
`@@ -477,7 +462,7 @@ class AuthRepository @Inject constructor(`
`477`	`462`	`/**`
`478`	`463`	`* Checks if the user is signed in through passkeys.`
`479`	`464`	`*`
`480`		`- * @return True if the user is signed in through passkeys, false otherwise.`
	`465`	`+ * @return True if the user is signed in through passkeys, false otherwise.`
`481`	`466`	`*/`
`482`	`467`	`suspend fun isSignedInThroughPasskeys(): Boolean {`
`483`	`468`	`val isSignedInThroughPasskeys = dataStore.read(IS_SIGNED_IN_THROUGH_PASSKEYS)`
`@@ -509,8 +494,6 @@ class AuthRepository @Inject constructor(`
`509`	`494`	`}`
`510`	`495`	`} catch (e: IOException) {`
`511`	`496`	`AuthResult.Failure(AuthError.NetworkError)`
`512`		`- } catch (e: HttpException) {`
`513`		`- AuthResult.Failure(AuthError.ServerError(e.message()))`
`514`	`497`	`} catch (e: Exception) {`
`515`	`498`	`AuthResult.Failure(AuthError.Unknown(e.message))`
`516`	`499`	`}`
`@@ -598,8 +581,6 @@ class AuthRepository @Inject constructor(`
`598`	`581`	`}`
`599`	`582`	`} catch (e: IOException) {`
`600`	`583`	`AuthResult.Failure(AuthError.NetworkError)`
`601`		`- } catch (e: HttpException) {`
`602`		`- AuthResult.Failure(AuthError.ServerError(e.message()))`
`603`	`584`	`} catch (e: Exception) {`
`604`	`585`	`AuthResult.Failure(AuthError.Unknown(e.message))`
`605`	`586`	`}`
Original file line number	Diff line number	Diff line change
`@@ -145,14 +145,18 @@ fun CreatePasskeyScreen(`
`145`	`145`	`ShrineLoader()`
`146`	`146`	`}`
`147`	`147`
`148`		`- val snackbarMessage = when {`
`149`		`- !uiState.errorMessage.isNullOrBlank() -> uiState.errorMessage`
`150`		`- else -> null`
`151`		`- }`
	`148`	`+ if (uiState.messageResourceId != R.string.empty_string) {`
	`149`	`+ val baseMessage = stringResource(uiState.messageResourceId)`
	`150`	`+ val finalMessage = if (uiState.errorMessage != null) {`
	`151`	`+ "$baseMessage ${uiState.errorMessage}"`
	`152`	`+ } else {`
	`153`	`+ baseMessage`
	`154`	`+ }`
`152`	`155`
`153`		`- if (snackbarMessage != null) {`
`154`		`- LaunchedEffect(snackbarMessage) {`
`155`		`- snackbarHostState.showSnackbar(snackbarMessage)`
	`156`	`+ LaunchedEffect(finalMessage) {`
	`157`	`+ snackbarHostState.showSnackbar(`
	`158`	`+ message = finalMessage,`
	`159`	`+ )`
`156`	`160`	`}`
`157`	`161`	`}`
`158`	`162`	`}`
Original file line number	Diff line number	Diff line change
`@@ -135,6 +135,6 @@ class CreatePasskeyViewModel @Inject constructor(`
`135`	`135`	`data class CreatePasskeyUiState(`
`136`	`136`	`val isLoading: Boolean = false,`
`137`	`137`	`val navigateToMainMenu: Boolean = false,`
`138`		`- @StringRes val messageResourceId: Int? = null,`
	`138`	`+ @StringRes val messageResourceId: Int= R.string.empty_string,`
`139`	`139`	`val errorMessage: String? = null,`
`140`	`140`	`)`