allow exit from login activity

hauntED
yova 3 months ago
parent d14d96f3a0
commit 3b0b00d89c

@ -28,7 +28,6 @@ class CredentialManager(applicationContext: Context) {
val username = sharedPrefs.getString("username", "nobody")!!
return (Credentials(instance!!, username!!, "nothing"))
}
}

@ -27,8 +27,9 @@ class LoginActivity : AppCompatActivity() {
val creds = MainActivity.credManager.loadCredentialsFromSharedPrefs()
binding = ActivityLoginBinding.inflate(layoutInflater)
setContentView(binding.root)
binding.instance.setText(creds.instance)
binding.username.setText(creds.username)
if (creds.instance != "nowhere") binding.instance.setText(creds.instance)
if (creds.username != "nobody") binding.username.setText(creds.username)
}
fun onButtonLoginClick(view: View) {

@ -655,7 +655,17 @@ class MainActivity : AppCompatActivity() {
fun checkGhostConnection(): Boolean {
if (ghostConnection) return true
if (SharedPrefsCookiePersistor(applicationContext).loadAll().size == 0) {
ghostSettings.launch(Intent(this, LoginActivity::class.java))
this.runOnUiThread({
with(AlertDialog.Builder(this)){
setTitle("No ghost CMS login defined. Edit credentials?")
setPositiveButton("Yes", { dialog, id ->
ghostSettings.launch(Intent(this@MainActivity, LoginActivity::class.java))
})
setNeutralButton("No", { dialog, id ->
})
show()
}
})
return false
}
// we have a cookie

@ -16,7 +16,6 @@
android:hint="Ghost instance"
android:inputType="textUri"
android:selectAllOnFocus="true"
android:text="@{entry.fakeTitle ?? entry.printTitle}"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"

Loading…
Cancel
Save