refs #5613 tokenCreated
This commit is contained in:
parent
9818b545c2
commit
7d318e0e07
|
|
@ -17,6 +17,7 @@ import androidx.lifecycle.Observer
|
|||
import androidx.recyclerview.widget.LinearLayoutManager
|
||||
import com.google.firebase.crashlytics.ktx.crashlytics
|
||||
import com.google.firebase.ktx.Firebase
|
||||
import es.verdnatura.MobileApplication
|
||||
import es.verdnatura.R
|
||||
import es.verdnatura.databinding.FragmentLoginBinding
|
||||
import es.verdnatura.domain.notNull
|
||||
|
|
@ -31,8 +32,6 @@ import es.verdnatura.presentation.view.feature.login.adapter.WorkFormAdapter
|
|||
import es.verdnatura.presentation.view.feature.login.model.WorkForms
|
||||
import es.verdnatura.presentation.view.feature.main.activity.MainActivity
|
||||
import java.io.File
|
||||
import java.time.Duration
|
||||
import java.time.Instant
|
||||
import java.util.*
|
||||
import kotlin.system.exitProcess
|
||||
|
||||
|
|
@ -73,9 +72,9 @@ class LoginFragment(var imageUri: Uri?) :
|
|||
)
|
||||
}
|
||||
|
||||
|
||||
if (imageUri != null && getData(TOKEN).isNotBlank()) {
|
||||
goToMain()
|
||||
//Tarea 5613 se quita porque debe hacerse login. Ya no se guarda user y password per
|
||||
if (getData(TOKEN).isNotBlank() && binding.switchRemember.isChecked) {
|
||||
viewModel.operator_add()
|
||||
}
|
||||
|
||||
binding.textviewRememberPassword.setOnClickListener {
|
||||
|
|
@ -105,23 +104,6 @@ class LoginFragment(var imageUri: Uri?) :
|
|||
|
||||
}
|
||||
|
||||
@RequiresApi(Build.VERSION_CODES.O)
|
||||
private fun checkToken() {
|
||||
|
||||
|
||||
if (getData(TOKEN).isNotBlank()) {
|
||||
|
||||
val renewPeriod = getDataInt("renewPeriod")
|
||||
var renewInterval=getDataInt("renewInterval")
|
||||
|
||||
val dateTokenCreated = Instant.parse(getData(TOKENCREATED))
|
||||
val dateToday= Instant.now()
|
||||
|
||||
val duracion = Duration.between(dateToday, dateTokenCreated)
|
||||
val secondsDifference = duracion.seconds
|
||||
}
|
||||
}
|
||||
|
||||
private fun createFolderSerial() {
|
||||
|
||||
val directory = File(
|
||||
|
|
@ -265,7 +247,7 @@ class LoginFragment(var imageUri: Uri?) :
|
|||
binding.edittextUsername.setText(prefs.getString(USER, ""))
|
||||
binding.edittextPassword.setText(prefs.getString(PASSWORD, ""))
|
||||
|
||||
if (binding.edittextPassword.text.toString().isNotEmpty()) {
|
||||
if (prefs.getString("token", "") != "") {
|
||||
binding.switchRemember.isChecked = true
|
||||
}
|
||||
}
|
||||
|
|
@ -498,7 +480,7 @@ class LoginFragment(var imageUri: Uri?) :
|
|||
|
||||
if (it.isError) {
|
||||
binding.splashProgress.visibility = View.GONE
|
||||
saveTokenPref("","")
|
||||
saveTokenPref("", 0)
|
||||
customDialog.setTitle(getString(R.string.error))
|
||||
|
||||
.setDescription(
|
||||
|
|
@ -515,22 +497,22 @@ class LoginFragment(var imageUri: Uri?) :
|
|||
|
||||
}.show()
|
||||
} else {
|
||||
saveTokenPref(it.token, it.created)
|
||||
saveTokenPref(it.token, it.ttl)
|
||||
//test
|
||||
//saveTokenPref("RTymwJzRuVchAMY5u8xG2wpgcjPf7t0DQImLvMsTdNFmbFwDiVsa8lA6fr1XSaBo","2026-29-06")
|
||||
// local
|
||||
//saveTokenPref("rpG3yNMdViFYDh1sZfeYRCUmuHZYmKW5EqzwHkckj0zFbszSZGTWbs8xNETHyvuw","2026-29-06")
|
||||
//Tarea 5613 borrar que se guarde
|
||||
saveUserAccesPref(
|
||||
/* saveUserAccesPref(
|
||||
binding.edittextUsername.text.toString(),
|
||||
binding.edittextPassword.text.toString()
|
||||
)
|
||||
)*/
|
||||
app.userName = binding.edittextUsername.text.toString()
|
||||
app.userPassword = binding.edittextPassword.text.toString()
|
||||
setupFirebase(app.userName!!)
|
||||
|
||||
//Tarea 4351 quitar el if y poner e device_checkLogin a continuación del response de operator_add
|
||||
viewModel.operator_add()
|
||||
//Tarea 5613
|
||||
viewModel.getAccessTokenConfigs()
|
||||
//viewModel.operator_add()
|
||||
|
||||
}
|
||||
}
|
||||
|
|
@ -544,10 +526,11 @@ class LoginFragment(var imageUri: Uri?) :
|
|||
|
||||
} else {
|
||||
if (!it.list[0].isError) {
|
||||
app.renewPeriod = it.list[0].renewPeriod!!
|
||||
app.renewPeriod = it.list[0].renewPeriod!!
|
||||
app.renewInterval = it.list[0].renewInterval!!
|
||||
//saveDataInt("renewPeriod", it.list[0].renewPeriod!!)
|
||||
//saveDataInt("renewInterval", it.list[0].renewInterval)
|
||||
saveDataLong("renewPeriod", it.list[0].renewPeriod!!)
|
||||
saveDataLong("renewInterval", it.list[0].renewInterval)
|
||||
viewModel.operator_add()
|
||||
} else {
|
||||
it.list[0].errorMessage.toast(context)
|
||||
}
|
||||
|
|
@ -570,11 +553,12 @@ class LoginFragment(var imageUri: Uri?) :
|
|||
return info.versionName
|
||||
}
|
||||
|
||||
private fun saveTokenPref(token: String, date: String) {
|
||||
private fun saveTokenPref(token: String, ttl: Long) {
|
||||
val prefs: SharedPreferences = requireActivity().getSharedPreferences(PREFS_USER, 0)
|
||||
val editor = prefs.edit()
|
||||
editor.putString(TOKEN, token)
|
||||
editor.putString(TOKENCREATED, date)
|
||||
editor.putLong(TTL, ttl)
|
||||
editor.putLong(TOKENCREATED, Date().time)
|
||||
editor.apply()
|
||||
}
|
||||
|
||||
|
|
@ -601,6 +585,7 @@ class LoginFragment(var imageUri: Uri?) :
|
|||
}
|
||||
|
||||
private fun goToMain() {
|
||||
setupFirebase((requireActivity().application as MobileApplication).userId.toString())
|
||||
val intent = Intent(activity, MainActivity::class.java)
|
||||
intent.data = imageUri
|
||||
startActivity(intent)
|
||||
|
|
|
|||
Loading…
Reference in New Issue