mobile/davx5-ose
mobile/davx5-ose
1
0
Fork 0
mirror of https://github.com/bitfireAT/davx5-ose synced 2024-10-07 03:42:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Google OAuth: fix endless loop in Fragment (bitfireAT/davx5#295)

Browse source 
Fix endless loop
This commit is contained in:
Ricki Hirner 2023-06-13 18:32:46 +02:00
parent ba36d01e11
commit 24a3954d75
2 changed files with 29 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/at/bitfire/davdroid/network/GoogleOAuth.kt
View file

@ -12,7 +12,7 @@ import net.openid.appauth.ResponseTypeValues
object GoogleOAuth {
// davx5integration@gmail.com
// davx5integration@gmail.com (for davx5-ose)
private const val CLIENT_ID = "1069050168830-eg09u4tk1cmboobevhm4k3bj1m4fav9i.apps.googleusercontent.com"
val SCOPES = arrayOf(
@ -33,4 +33,4 @@ object GoogleOAuth {
Uri.parse(BuildConfig.APPLICATION_ID + ":/oauth/redirect")
)
}
}

47
app/src/main/java/at/bitfire/davdroid/ui/setup/GoogleLoginFragment.kt
View file

@ -33,6 +33,7 @@ import androidx.compose.material.icons.filled.Warning
import androidx.compose.runtime.Composable
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.saveable.rememberSaveable
import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.ComposeView
import androidx.compose.ui.platform.LocalContext
@ -96,30 +97,37 @@ class GoogleLoginFragment: Fragment() {
override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
val v = ComposeView(requireActivity())
v.setContent {
GoogleLogin(onLogin = { account, clientId ->
loginModel.baseURI = googleBaseUri(account)
val view = ComposeView(requireActivity()).apply {
setContent {
GoogleLogin(onLogin = { account, clientId ->
loginModel.baseURI = googleBaseUri(account)
val authRequest = GoogleOAuth.authRequestBuilder(clientId)
.setScopes(*GoogleOAuth.SCOPES)
.setLoginHint(account)
.build()
authRequestContract.launch(authRequest)
})
val authRequest = GoogleOAuth.authRequestBuilder(clientId)
.setScopes(*GoogleOAuth.SCOPES)
.setLoginHint(account)
.build()
authRequestContract.launch(authRequest)
})
}
}
model.credentials.observe(viewLifecycleOwner) { credentials ->
loginModel.credentials = credentials
if (credentials != null) {
// pass credentials to login model
loginModel.credentials = credentials
// continue with service detection
parentFragmentManager.beginTransaction()
.replace(android.R.id.content, DetectConfigurationFragment(), null)
.addToBackStack(null)
.commit()
// continue with service detection
parentFragmentManager.beginTransaction()
.replace(android.R.id.content, DetectConfigurationFragment(), null)
.addToBackStack(null)
.commit()
// reset because setting credentials LiveData represents a one-shot action
model.credentials.value = null
}
}
return v
return view
}
@ -140,7 +148,6 @@ class GoogleLoginFragment: Fragment() {
// success
authState.update(tokenResponse, refreshTokenException)
// save authState (= refresh token)
credentials.postValue(Credentials(authState = authState))
}
}
@ -189,7 +196,7 @@ fun GoogleLogin(
}
}
val email = remember { mutableStateOf("") }
val email = rememberSaveable { mutableStateOf("") }
val emailError = remember { mutableStateOf(false) }
OutlinedTextField(
email.value,
@ -204,7 +211,7 @@ fun GoogleLogin(
.padding(top = 8.dp)
)
val userClientId = remember { mutableStateOf("") }
val userClientId = rememberSaveable { mutableStateOf("") }
val userClientIdError = remember { mutableStateOf(false) }
OutlinedTextField(
userClientId.value,