ignore

Author: DP-Hridayan

app/src/github/java/in/hridayan/ashell/settings/data/repository/GoogleAuthRepositoryImpl.kt

@@ -12,6 +12,7 @@ import androidx.credentials.exceptions.NoCredentialException
 import com.google.android.libraries.identity.googleid.GetGoogleIdOption
 import com.google.android.libraries.identity.googleid.GoogleIdTokenCredential
 import dagger.hilt.android.qualifiers.ApplicationContext
+import `in`.hridayan.ashell.core.utils.findActivity
 import `in`.hridayan.ashell.settings.data.SettingsKeys
 import `in`.hridayan.ashell.settings.domain.exception.NoGoogleAccountException
 import `in`.hridayan.ashell.settings.domain.model.GoogleUserState
@@ -80,9 +81,10 @@ class GoogleAuthRepositoryImpl @Inject constructor(
         }
     }
 
-    override suspend fun signIn(): Result<String> = withContext(Dispatchers.IO) {
+    override suspend fun signIn(context: Context): Result<String> = withContext(Dispatchers.IO) {
         try {
-            val credentialManager = CredentialManager.create(context)
+            val activity = context.findActivity()
+            val credentialManager = CredentialManager.create(activity ?: context)
 
             val googleIdOption = GetGoogleIdOption.Builder()
                 .setFilterByAuthorizedAccounts(false)
@@ -94,7 +96,7 @@ class GoogleAuthRepositoryImpl @Inject constructor(
                 .build()
 
             val result: GetCredentialResponse =
-                credentialManager.getCredential(context, request)
+                credentialManager.getCredential(activity ?: context, request)
 
             val credential = result.credential
 

app/src/main/java/in/hridayan/ashell/settings/domain/repository/GoogleAuthRepository.kt

@@ -15,7 +15,7 @@ interface GoogleAuthRepository {
      * Launch sign-in via Credential Manager (modern bottom sheet) and request Drive scope.
      * Returns Result.success(email) or Result.failure(exception).
      */
-    suspend fun signIn(): Result<String>
+    suspend fun signIn(context: Context): Result<String>
 
     /** Sign out and clear stored credential. */
     suspend fun signOut()

app/src/main/java/in/hridayan/ashell/settings/presentation/components/dialog/NoGoogleAccountDialog.kt

@@ -54,7 +54,6 @@ fun NoGoogleAccountDialog(
                 Text(
                     text = stringResource(R.string.no_google_account_title),
                     style = MaterialTheme.typography.titleLarge,
-                    color = MaterialTheme.colorScheme.primary,
                     textAlign = TextAlign.Center,
                     modifier = Modifier
                         .fillMaxWidth()

app/src/main/java/in/hridayan/ashell/settings/presentation/page/backup/screens/BackupAndRestoreScreen.kt

@@ -171,7 +171,7 @@ fun BackupAndRestoreScreen(
                 }
 
                 is SettingsUiEvent.RequestGoogleSignIn -> {
-                    backupAndRestoreViewModel.signInWithGoogle()
+                    backupAndRestoreViewModel.signInWithGoogle(context)
                 }
 
                 is SettingsUiEvent.Navigate -> navController.navigate(event.route)
@@ -265,7 +265,7 @@ fun BackupAndRestoreScreen(
                                             userPhotoUrl = googleUserState.photoUrl,
                                             isLoading = isSigningIn || cloudOperationMessage != null,
                                             onSignInClick = {
-                                                backupAndRestoreViewModel.signInWithGoogle()
+                                                backupAndRestoreViewModel.signInWithGoogle(context)
                                             },
                                             onSignOutClick = {
                                                 dialogManager.show(DialogKey.Settings.ConfirmGoogleSignOut)

app/src/main/java/in/hridayan/ashell/settings/presentation/page/backup/viewmodel/BackupAndRestoreViewModel.kt

@@ -207,12 +207,12 @@ class BackupAndRestoreViewModel @Inject constructor(
         }
     }
 
-    fun signInWithGoogle() {
+    fun signInWithGoogle(context: Context) {
         viewModelScope.launch {
             Log.d(TAG, "signInWithGoogle: starting...")
             _isSigningIn.value = true
 
-            val result = googleAuthRepository.signIn()
+            val result = googleAuthRepository.signIn(context)
 
             _isSigningIn.value = false
 
@@ -242,9 +242,10 @@ class BackupAndRestoreViewModel @Inject constructor(
                         }
                     } else {
                         viewModelScope.launch {
+                            val errorMessage = error.message ?: context.getString(R.string.unknown_error)
                             _uiEvent.emit(
                                 SettingsUiEvent.ShowToast(
-                                    context.getString(R.string.sign_in_failed)
+                                    context.getString(R.string.sign_in_failed) + ": $errorMessage"
                                 )
                             )
                         }