last commit...

Author: unitdevgcc

android/app/src/main/java/dev/c0redev/volter/ui/screens/ConfigsScreen.kt

@@ -620,6 +620,7 @@ private fun ConfigEditorDialog(
                     val cfg = Config(
                         server = server,
                         token = token,
+                        dexoteServerPub = parsedCfg?.dexoteServerPub,
                         routes = routesOut,
                         exclude = excludeOut,
                         tunCIDR6 = tun6Out,

android/app/src/test/java/dev/c0redev/volter/domain/model/ConfigDexotePubTest.kt

@@ -20,4 +20,26 @@ class ConfigDexotePubTest {
         val back = Config.fromJson(cfg.toJson())
         assertNull(back.dexoteServerPub)
     }
+
+    @Test
+    fun fromJsonCarriesPub() {
+        val pub = "AAECAwQFBgcICQoLDA0ODxA="
+        val cfg = Config(server = "1.2.3.4:443", token = "tok", dexoteServerPub = pub)
+        val parsed = Config.fromJson(cfg.toJson())
+        assertEquals(pub, parsed.dexoteServerPub)
+    }
+
+    @Test
+    fun editorSaveRoundTripPreservesPub() {
+        val pub = "Zm9vYmFyYmF6cXV4MTIzNDU2Nzg5MA=="
+        val parsedCfg = Config.fromJson(
+            Config(server = "5.6.7.8:443", token = "tok", dexoteServerPub = pub).toJson(),
+        )
+        val rebuilt = Config(
+            server = parsedCfg.server,
+            token = parsedCfg.token,
+            dexoteServerPub = parsedCfg.dexoteServerPub,
+        )
+        assertEquals(pub, rebuilt.dexoteServerPub)
+    }
 }

internal/tui/dexote_pub_test.go

@@ -0,0 +1,39 @@
+package tui
+
+import (
+	"testing"
+
+	"dev.c0redev.volter/internal/config"
+)
+
+func TestConfigFromConnFormInputsPreservesDexotePub(t *testing.T) {
+	pub := "AAECAwQFBgcICQoLDA0ODxA="
+	uri := config.BuildConnectionURI("1.2.3.4:443", "tok", pub)
+	if uri == "" {
+		t.Fatal("BuildConnectionURI returned empty")
+	}
+
+	inputs := newInputsWithValues("name", uri, "", "", "", "auto", "", "", "", "", "")
+	out, errMsg := configFromConnFormInputs(inputs)
+	if errMsg != "" {
+		t.Fatalf("configFromConnFormInputs error: %s", errMsg)
+	}
+	if out.Server != "1.2.3.4:443" || out.Token != "tok" {
+		t.Fatalf("server/token mismatch: %q %q", out.Server, out.Token)
+	}
+	if out.DexoteServerPub != pub {
+		t.Fatalf("dexote pub dropped: got %q want %q", out.DexoteServerPub, pub)
+	}
+}
+
+func TestConfigFromConnFormInputsNoPubStaysEmpty(t *testing.T) {
+	uri := config.BuildConnectionURI("9.9.9.9:443", "tok")
+	inputs := newInputsWithValues("name", uri, "", "", "", "auto", "", "", "", "", "")
+	out, errMsg := configFromConnFormInputs(inputs)
+	if errMsg != "" {
+		t.Fatalf("configFromConnFormInputs error: %s", errMsg)
+	}
+	if out.DexoteServerPub != "" {
+		t.Fatalf("expected empty pub, got %q", out.DexoteServerPub)
+	}
+}

internal/tui/model.go

@@ -1236,6 +1236,10 @@ func configFromConnFormInputs(inputs []textinput.Model) (config.Config, string)
 	if !ok {
 		return config.Config{}, "connection: volter://... или host:port:key"
 	}
+	dexotePub := ""
+	if cc, ccok := config.ParseConnectionConfig(connRaw); ccok {
+		dexotePub = cc.DexoteServerPub
+	}
 	managedCfg := config.Config{}
 	if vk, vok := config.ParseVoultKeyURI(connRaw); vok {
 		managedCfg = config.ConfigFromVoultKey(vk)
@@ -1263,6 +1267,7 @@ func configFromConnFormInputs(inputs []textinput.Model) (config.Config, string)
 	out := config.Config{
 		Server:            server,
 		Token:             token,
+		DexoteServerPub:   dexotePub,
 		Routes:            strings.TrimSpace(inputs[2].Value()),
 		Exclude:           strings.TrimSpace(inputs[3].Value()),
 		TunCIDR6:          strings.TrimSpace(inputs[4].Value()),
@@ -1710,7 +1715,7 @@ func (m *Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 					m.editing = true
 					m.editingName = m.cloudNames[idx]
 					cfg := m.cloudCfgs[idx]
-					m.editInputs = newInputsWithValues(m.cloudNames[idx], config.BuildConnectionURI(cfg.Server, cfg.Token), cfg.Routes, cfg.Exclude, cfg.TunCIDR6,
+					m.editInputs = newInputsWithValues(m.cloudNames[idx], config.BuildConnectionURI(cfg.Server, cfg.Token, cfg.DexoteServerPub), cfg.Routes, cfg.Exclude, cfg.TunCIDR6,
 						cfg.Transport, cfg.QuicServer, cfg.QuicServerName, cfg.QuicSkipVerifyFormField(), cfg.QuicCertPinSHA256, cfg.QuicCaCert)
 					m.editFocus = 0
 					m.editInputs[0].Focus()
@@ -1755,7 +1760,7 @@ func (m *Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 					m.editing = true
 					m.editingName = m.names[idx]
 					cfg := m.cfgs[idx]
-					m.editInputs = newInputsWithValues(m.names[idx], config.BuildConnectionURI(cfg.Server, cfg.Token), cfg.Routes, cfg.Exclude, cfg.TunCIDR6,
+					m.editInputs = newInputsWithValues(m.names[idx], config.BuildConnectionURI(cfg.Server, cfg.Token, cfg.DexoteServerPub), cfg.Routes, cfg.Exclude, cfg.TunCIDR6,
 						cfg.Transport, cfg.QuicServer, cfg.QuicServerName, cfg.QuicSkipVerifyFormField(), cfg.QuicCertPinSHA256, cfg.QuicCaCert)
 					m.editFocus = 0
 					m.editInputs[0].Focus()