chinwag/chinwag-android
chinwag/chinwag-android
2
0
Fork 0
Code Issues Pull requests Releases Activity

fix login on Chromebook (#1533)

Browse source
This commit is contained in:
Konrad Pozniak 2019-10-13 21:09:23 +02:00 committed by GitHub
parent bee10bf375
commit 98d813a5cc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 27 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

76
app/src/main/java/com/keylesspalace/tusky/LoginActivity.kt
View file

@ -26,7 +26,6 @@ import android.text.method.LinkMovementMethod
import android.util.Log import android.util.Log
import android.view.MenuItem import android.view.MenuItem
import android.view.View import android.view.View
import android.widget.EditText
import android.widget.TextView import android.widget.TextView
import androidx.appcompat.app.AlertDialog import androidx.appcompat.app.AlertDialog
import com.keylesspalace.tusky.di.Injectable import com.keylesspalace.tusky.di.Injectable
@ -50,9 +49,6 @@ class LoginActivity : BaseActivity(), Injectable {
lateinit var mastodonApi: MastodonApi lateinit var mastodonApi: MastodonApi
private lateinit var preferences: SharedPreferences private lateinit var preferences: SharedPreferences
private var domain: String = ""
private var clientId: String? = null
private var clientSecret: String? = null
private val oauthRedirectUri: String private val oauthRedirectUri: String
get() { get() {
@ -66,12 +62,6 @@ class LoginActivity : BaseActivity(), Injectable {
setContentView(R.layout.activity_login) setContentView(R.layout.activity_login)
if (savedInstanceState != null) {
domain = savedInstanceState.getString(DOMAIN)!!
clientId = savedInstanceState.getString(CLIENT_ID)
clientSecret = savedInstanceState.getString(CLIENT_SECRET)
}
preferences = getSharedPreferences( preferences = getSharedPreferences(
getString(R.string.preferences_file_key), Context.MODE_PRIVATE) getString(R.string.preferences_file_key), Context.MODE_PRIVATE)
@ -115,13 +105,6 @@ class LoginActivity : BaseActivity(), Injectable {
return super.onOptionsItemSelected(item) return super.onOptionsItemSelected(item)
} }
override fun onSaveInstanceState(outState: Bundle) {
outState.putString(DOMAIN, domain)
outState.putString(CLIENT_ID, clientId)
outState.putString(CLIENT_SECRET, clientSecret)
super.onSaveInstanceState(outState)
}
/** /**
* Obtain the oauth client credentials for this app. This is only necessary the first time the * Obtain the oauth client credentials for this app. This is only necessary the first time the
* app is run on a given server instance. So, after the first authentication, they are * app is run on a given server instance. So, after the first authentication, they are
@ -131,7 +114,7 @@ class LoginActivity : BaseActivity(), Injectable {
loginButton.isEnabled = false loginButton.isEnabled = false
domain = canonicalizeDomain(domainEditText.text.toString()) val domain = canonicalizeDomain(domainEditText.text.toString())
try { try {
HttpUrl.Builder().host(domain).scheme("https").build() HttpUrl.Builder().host(domain).scheme("https").build()
@ -157,10 +140,16 @@ class LoginActivity : BaseActivity(), Injectable {
return return
} }
val credentials = response.body() val credentials = response.body()
clientId = credentials!!.clientId val clientId = credentials!!.clientId
clientSecret = credentials.clientSecret val clientSecret = credentials.clientSecret
redirectUserToAuthorizeAndLogin(domainEditText) preferences.edit()
.putString("domain", domain)
.putString("clientId", clientId)
.putString("clientSecret", clientSecret)
.apply()
redirectUserToAuthorizeAndLogin(domain, clientId)
} }
override fun onFailure(call: Call<AppCredentials>, t: Throwable) { override fun onFailure(call: Call<AppCredentials>, t: Throwable) {
@ -179,16 +168,16 @@ class LoginActivity : BaseActivity(), Injectable {
} }
private fun redirectUserToAuthorizeAndLogin(editText: EditText) { private fun redirectUserToAuthorizeAndLogin(domain: String, clientId: String) {
/* To authorize this app and log in it's necessary to redirect to the domain given, /* To authorize this app and log in it's necessary to redirect to the domain given,
* activity_login there, and the server will redirect back to the app with its response. */ * login there, and the server will redirect back to the app with its response. */
val endpoint = MastodonApi.ENDPOINT_AUTHORIZE val endpoint = MastodonApi.ENDPOINT_AUTHORIZE
val redirectUri = oauthRedirectUri val parameters = mapOf(
val parameters = HashMap<String, String>() "client_id" to clientId,
parameters["client_id"] = clientId!! "redirect_uri" to oauthRedirectUri,
parameters["redirect_uri"] = redirectUri "response_type" to "code",
parameters["response_type"] = "code" "scope" to OAUTH_SCOPES
parameters["scope"] = OAUTH_SCOPES )
val url = "https://" + domain + endpoint + "?" + toQueryString(parameters) val url = "https://" + domain + endpoint + "?" + toQueryString(parameters)
val uri = Uri.parse(url) val uri = Uri.parse(url)
if (!openInCustomTab(uri, this)) { if (!openInCustomTab(uri, this)) {
@ -196,21 +185,12 @@ class LoginActivity : BaseActivity(), Injectable {
if (viewIntent.resolveActivity(packageManager) != null) { if (viewIntent.resolveActivity(packageManager) != null) {
startActivity(viewIntent) startActivity(viewIntent)
} else { } else {
editText.error = getString(R.string.error_no_web_browser_found) domainEditText.error = getString(R.string.error_no_web_browser_found)
setLoading(false) setLoading(false)
} }
} }
} }
override fun onStop() {
super.onStop()
preferences.edit()
.putString("domain", domain)
.putString("clientId", clientId)
.putString("clientSecret", clientSecret)
.apply()
}
override fun onStart() { override fun onStart() {
super.onStart() super.onStart()
/* Check if we are resuming during authorization by seeing if the intent contains the /* Check if we are resuming during authorization by seeing if the intent contains the
@ -223,14 +203,12 @@ class LoginActivity : BaseActivity(), Injectable {
val code = uri.getQueryParameter("code") val code = uri.getQueryParameter("code")
val error = uri.getQueryParameter("error") val error = uri.getQueryParameter("error")
/* During the redirect roundtrip this Activity usually dies, which wipes out the /* restore variables from SharedPreferences */
* instance variables, so they have to be recovered from where they were saved in val domain = preferences.getNonNullString(DOMAIN, "")
* SharedPreferences. */ val clientId = preferences.getNonNullString(CLIENT_ID, "")
domain = preferences.getNonNullString(DOMAIN, "") val clientSecret = preferences.getNonNullString(CLIENT_SECRET, "")
clientId = preferences.getString(CLIENT_ID, null)
clientSecret = preferences.getString(CLIENT_SECRET, null)
if (code != null && domain.isNotEmpty() && !clientId.isNullOrEmpty() && !clientSecret.isNullOrEmpty()) { if (code != null && domain.isNotEmpty() && clientId.isNotEmpty() && clientSecret.isNotEmpty()) {
setLoading(true) setLoading(true)
/* Since authorization has succeeded, the final step to log in is to exchange /* Since authorization has succeeded, the final step to log in is to exchange
@ -238,7 +216,7 @@ class LoginActivity : BaseActivity(), Injectable {
val callback = object : Callback<AccessToken> { val callback = object : Callback<AccessToken> {
override fun onResponse(call: Call<AccessToken>, response: Response<AccessToken>) { override fun onResponse(call: Call<AccessToken>, response: Response<AccessToken>) {
if (response.isSuccessful) { if (response.isSuccessful) {
onLoginSuccess(response.body()!!.accessToken) onLoginSuccess(response.body()!!.accessToken, domain)
} else { } else {
setLoading(false) setLoading(false)
domainTextInputLayout.error = getString(R.string.error_retrieving_oauth_token) domainTextInputLayout.error = getString(R.string.error_retrieving_oauth_token)
@ -257,7 +235,7 @@ class LoginActivity : BaseActivity(), Injectable {
} }
} }
mastodonApi.fetchOAuthToken(domain, clientId!!, clientSecret!!, redirectUri, code, mastodonApi.fetchOAuthToken(domain, clientId, clientSecret, redirectUri, code,
"authorization_code").enqueue(callback) "authorization_code").enqueue(callback)
} else if (error != null) { } else if (error != null) {
/* Authorization failed. Put the error response where the user can read it and they /* Authorization failed. Put the error response where the user can read it and they
@ -293,7 +271,7 @@ class LoginActivity : BaseActivity(), Injectable {
return intent.getBooleanExtra(LOGIN_MODE, false) return intent.getBooleanExtra(LOGIN_MODE, false)
} }
private fun onLoginSuccess(accessToken: String) { private fun onLoginSuccess(accessToken: String, domain: String) {
setLoading(true) setLoading(true)