From 3b0b00d89c1b4b8aabc3ced9f926ddc2b2d8e06b Mon Sep 17 00:00:00 2001
From: yova <yova@freedomhost.de>
Date: Tue, 20 Feb 2024 11:10:17 +0100
Subject: [PATCH] allow exit from login activity

---
 .../main/java/org/wntr/mdeditor/CredentialManager.kt |  1 -
 app/src/main/java/org/wntr/mdeditor/LoginActivity.kt |  5 +++--
 app/src/main/java/org/wntr/mdeditor/MainActivity.kt  | 12 +++++++++++-
 app/src/main/res/layout/activity_login.xml           |  1 -
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/org/wntr/mdeditor/CredentialManager.kt b/app/src/main/java/org/wntr/mdeditor/CredentialManager.kt
index 3bf6fb8..3f7a5d5 100644
--- a/app/src/main/java/org/wntr/mdeditor/CredentialManager.kt
+++ b/app/src/main/java/org/wntr/mdeditor/CredentialManager.kt
@@ -28,7 +28,6 @@ class CredentialManager(applicationContext: Context) {
         val username = sharedPrefs.getString("username", "nobody")!!
         return (Credentials(instance!!, username!!, "nothing"))
     }
-
 }
 
 
diff --git a/app/src/main/java/org/wntr/mdeditor/LoginActivity.kt b/app/src/main/java/org/wntr/mdeditor/LoginActivity.kt
index d694ad0..597dda4 100644
--- a/app/src/main/java/org/wntr/mdeditor/LoginActivity.kt
+++ b/app/src/main/java/org/wntr/mdeditor/LoginActivity.kt
@@ -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) {
diff --git a/app/src/main/java/org/wntr/mdeditor/MainActivity.kt b/app/src/main/java/org/wntr/mdeditor/MainActivity.kt
index e5218f6..1833cc0 100644
--- a/app/src/main/java/org/wntr/mdeditor/MainActivity.kt
+++ b/app/src/main/java/org/wntr/mdeditor/MainActivity.kt
@@ -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
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index 0b8591b..4f603c2 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -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"