Compare commits
1 Commits
351379b5b3
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
|
b81a244bb9
|
@@ -10,3 +10,4 @@ captures/
|
||||
*.jar
|
||||
!gradle/wrapper/gradle-wrapper.jar
|
||||
*.txt
|
||||
*.log*
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
Reference in New Issue
Block a user