Pixelfed
/
PixelDroid-App-Android
mirror of https://gitlab.shinice.net/pixeldroid/PixelDroid
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'login_consistency_improvement' into 'master' 

Improve validation and SharedSettings clearing

See merge request pixeldroid/PixelDroid!469
This commit is contained in:
Matthieu 2022-08-21 16:00:54 +00:00
parent 56b2d97889 eede5f4426
commit e03fcac03c
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
app/src/main/java/org/pixeldroid/app/LoginActivity.kt
View File

@ -9,7 +9,7 @@ import android.os.Bundle
import android.view.View import android.view.View
import android.view.inputmethod.InputMethodManager import android.view.inputmethod.InputMethodManager
import androidx.lifecycle.lifecycleScope import androidx.lifecycle.lifecycleScope
import androidx.paging.ExperimentalPagingApi import com.google.gson.Gson
import kotlinx.coroutines.Deferred import kotlinx.coroutines.Deferred
import kotlinx.coroutines.async import kotlinx.coroutines.async
import kotlinx.coroutines.coroutineScope import kotlinx.coroutines.coroutineScope
@ -46,6 +46,7 @@ class LoginActivity : BaseThemedWithoutBarActivity() {
companion object { companion object {
private const val PACKAGE_ID = BuildConfig.APPLICATION_ID private const val PACKAGE_ID = BuildConfig.APPLICATION_ID
private const val PREFERENCE_NAME = "$PACKAGE_ID.loginPref"
private const val SCOPE = "read write follow" private const val SCOPE = "read write follow"
} }
@ -66,7 +67,7 @@ class LoginActivity : BaseThemedWithoutBarActivity() {
loadingAnimation(true) loadingAnimation(true)
appName = getString(R.string.app_name) appName = getString(R.string.app_name)
oauthScheme = getString(R.string.auth_scheme) oauthScheme = getString(R.string.auth_scheme)
preferences = getSharedPreferences("$PACKAGE_ID.pref", Context.MODE_PRIVATE) preferences = getSharedPreferences(PREFERENCE_NAME, Context.MODE_PRIVATE)
if (hasInternet(applicationContext)) { if (hasInternet(applicationContext)) {
binding.connectInstanceButton.setOnClickListener { binding.connectInstanceButton.setOnClickListener {
@ -186,7 +187,7 @@ class LoginActivity : BaseThemedWithoutBarActivity() {
val domain: String = try { val domain: String = try {
if (nodeInfo.hasInstanceEndpointInfo()) { if (nodeInfo.hasInstanceEndpointInfo()) {
storeInstance(db, nodeInfo) preferences.edit().putString("nodeInfo", Gson().toJson(nodeInfo)).remove("instance").apply()
nodeInfo.metadata?.config?.site?.url nodeInfo.metadata?.config?.site?.url
} else { } else {
val instance: Instance = try { val instance: Instance = try {
@ -196,13 +197,15 @@ class LoginActivity : BaseThemedWithoutBarActivity() {
} catch (exception: HttpException) { } catch (exception: HttpException) {
return@coroutineScope failedRegistration(getString(R.string.instance_error)) return@coroutineScope failedRegistration(getString(R.string.instance_error))
} }
storeInstance(db, nodeInfo = null, instance = instance) preferences.edit().putString("instance", Gson().toJson(instance)).remove("nodeInfo").apply()
instance.uri instance.uri
} }
} catch (e: IllegalArgumentException){ null } } catch (e: IllegalArgumentException){ null }
?: return@coroutineScope failedRegistration(getString(R.string.instance_error)) ?: return@coroutineScope failedRegistration(getString(R.string.instance_error))
preferences.edit().putString("domain", normalizeDomain(domain)).apply() preferences.edit()
.putString("domain", normalizeDomain(domain))
.apply()
if (!nodeInfo.software?.name.orEmpty().contains("pixelfed")) { if (!nodeInfo.software?.name.orEmpty().contains("pixelfed")) {
@ -254,6 +257,8 @@ class LoginActivity : BaseThemedWithoutBarActivity() {
//Successful authorization //Successful authorization
pixelfedAPI = PixelfedAPI.createFromUrl(domain) pixelfedAPI = PixelfedAPI.createFromUrl(domain)
val nodeInfo: NodeInfo? = Gson().fromJson(preferences.getString("nodeInfo", null), NodeInfo::class.java)
val instance: Instance? = Gson().fromJson(preferences.getString("instance", null), Instance::class.java)
lifecycleScope.launch { lifecycleScope.launch {
try { try {
@ -264,6 +269,7 @@ class LoginActivity : BaseThemedWithoutBarActivity() {
if (token.access_token == null) { if (token.access_token == null) {
return@launch failedRegistration(getString(R.string.token_error)) return@launch failedRegistration(getString(R.string.token_error))
} }
storeInstance(db, nodeInfo, instance)
storeUser( storeUser(
token.access_token, token.access_token,
token.refresh_token, token.refresh_token,
@ -288,8 +294,7 @@ class LoginActivity : BaseThemedWithoutBarActivity() {
} }
private fun wipeSharedSettings(){ private fun wipeSharedSettings(){
preferences.edit().remove("domain").remove("clientId").remove("clientSecret") preferences.edit().clear().apply()
.apply()
} }
private fun loadingAnimation(on: Boolean){ private fun loadingAnimation(on: Boolean){