From b81a244bb9fe51c9c9eb53043ca3cbde6ca1243c Mon Sep 17 00:00:00 2001
From: Rudi <rudi@nightmare.haus>
Date: Sat, 12 Sep 2026 17:22:19 -0400
Subject: [PATCH] Add bugfixes from testing

---
 .gitignore                                            |  1 +
 .../java/haus/nightmare/a3270/TerminalViewModel.kt    | 11 ++++++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index ab8cd1a..efeb9b0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@ captures/
 *.jar
 !gradle/wrapper/gradle-wrapper.jar
 *.txt
+*.log*
diff --git a/src/main/java/haus/nightmare/a3270/TerminalViewModel.kt b/src/main/java/haus/nightmare/a3270/TerminalViewModel.kt
index 01690a8..2028843 100644
--- a/src/main/java/haus/nightmare/a3270/TerminalViewModel.kt
+++ b/src/main/java/haus/nightmare/a3270/TerminalViewModel.kt
@@ -789,21 +789,26 @@ class TerminalViewModel(application: Application) : AndroidViewModel(application
                 val globalVerify = AppSettings.isVerifyCertsEnabled(getApplication())
                 val effectiveVerify = tlsVerifyCert && globalVerify
                 val gMode = haus.nightmare.lib3270j.graphics.GraphicsMode.fromString(graphicsModeStr)
+                val effectiveLu = if (luName.isNotBlank()) luName.trim() else (parsedConfig.luName ?: "").trim()
 
                 _isTlsActive.value = effectiveTls
                 _isTlsVerified.value = effectiveVerify
-                _oiaText.value = "Connecting to $effectiveHost:$effectivePort" + (if (effectiveTls) " [TLS]" else "") + "..."
+                _oiaText.value = "Connecting to " +
+                    (if (effectiveLu.isNotBlank()) "$effectiveLu@" else "") +
+                    "$effectiveHost:$effectivePort" +
+                    (if (effectiveTls) " [TLS]" else "") + "..."
 
                 val config = ConnectionConfig(effectiveHost, effectivePort, model).apply {
                     if (model == TerminalModel.IBM_DYNAMIC) {
                         setDynamicDimensions(dynamicRows, dynamicCols)
                     }
-                    if (luName.isNotBlank()) {
-                        setLuName(luName)
+                    if (effectiveLu.isNotBlank()) {
+                        setLuName(effectiveLu)
                     }
                     isUseTls = effectiveTls
                     isTlsVerifyCert = effectiveVerify
                     isTn3270eEnabled = effectiveTn3270e
+                    isAutoSysUnlock = true
                     graphicsMode = gMode
                     codePage = codePageStr