From 03865ded524fe4df587c8887e311ef4d47104b0f Mon Sep 17 00:00:00 2001
From: Chris Howey <chris@howey.me>
Date: Tue, 20 Apr 2021 09:30:34 -0500
Subject: [PATCH] pake curve setting

---
 AndroidManifest.xml              | 4 ++--
 main.go                          | 1 +
 metadata/en-US/changelogs/14.txt | 1 +
 metadata/en-US/changelogs/15.txt | 2 ++
 recv.go                          | 1 +
 send.go                          | 1 +
 settings.go                      | 8 ++++++++
 7 files changed, 16 insertions(+), 2 deletions(-)
 create mode 100644 metadata/en-US/changelogs/15.txt

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index c218efd..ef2e9ca 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -3,8 +3,8 @@
 	xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
 	package="com.github.howeyc.crocgui"
-	android:versionCode="14"
-	android:versionName="1.8.0">
+	android:versionCode="15"
+	android:versionName="1.8.1">
 
     <application android:label="Croc">
 	<activity android:name="org.golang.app.GoNativeActivity"
diff --git a/main.go b/main.go
index 0b68e82..84c880e 100644
--- a/main.go
+++ b/main.go
@@ -62,6 +62,7 @@ func main() {
 	a.Preferences().SetBool("disable-compression", a.Preferences().BoolWithFallback("disable-compression", false))
 	a.Preferences().SetString("theme", a.Preferences().StringWithFallback("theme", "light"))
 	a.Preferences().SetString("debug-level", a.Preferences().StringWithFallback("debug-level", "error"))
+	a.Preferences().SetString("pake-curve", a.Preferences().StringWithFallback("pake-curve", "siec"))
 
 	setTheme(a.Preferences().String("theme"))
 	log.SetLevel(a.Preferences().String("debug-level"))
diff --git a/metadata/en-US/changelogs/14.txt b/metadata/en-US/changelogs/14.txt
index 0d79195..b786bc8 100644
--- a/metadata/en-US/changelogs/14.txt
+++ b/metadata/en-US/changelogs/14.txt
@@ -1 +1,2 @@
 - Update to croc cli v9
+- PAKE Curve setting
diff --git a/metadata/en-US/changelogs/15.txt b/metadata/en-US/changelogs/15.txt
new file mode 100644
index 0000000..b786bc8
--- /dev/null
+++ b/metadata/en-US/changelogs/15.txt
@@ -0,0 +1,2 @@
+- Update to croc cli v9
+- PAKE Curve setting
diff --git a/recv.go b/recv.go
index 78874ed..6fc7036 100644
--- a/recv.go
+++ b/recv.go
@@ -68,6 +68,7 @@ func recvTabItem(a fyne.App, w fyne.Window) *container.TabItem {
 					NoMultiplexing: a.Preferences().Bool("disable-multiplexing"),
 					OnlyLocal:      a.Preferences().Bool("force-local"),
 					NoCompress:     a.Preferences().Bool("disable-compression"),
+					Curve:          a.Preferences().String("pake-curve"),
 				})
 				if err != nil {
 					log.Error("Receive setup error:", err)
diff --git a/send.go b/send.go
index e0446bf..19295f9 100644
--- a/send.go
+++ b/send.go
@@ -148,6 +148,7 @@ func sendTabItem(a fyne.App, w fyne.Window) *container.TabItem {
 			NoMultiplexing: a.Preferences().Bool("disable-multiplexing"),
 			OnlyLocal:      a.Preferences().Bool("force-local"),
 			NoCompress:     a.Preferences().Bool("disable-compression"),
+			Curve:          a.Preferences().String("pake-curve"),
 		})
 		if err != nil {
 			log.Errorf("croc error: %s\n", err.Error())
diff --git a/settings.go b/settings.go
index e28734d..3c3026b 100644
--- a/settings.go
+++ b/settings.go
@@ -62,6 +62,13 @@ func settingsTabItem(a fyne.App) *container.TabItem {
 	currentTheme, _ := themeBinding.Get()
 	themeSelect.SetSelected(currentTheme)
 
+	curveBinding := binding.BindPreferenceString("pake-curve", a.Preferences())
+	curveSelect := widget.NewSelect([]string{"siec", "p256", "p348", "p521"}, func(selection string) {
+		curveBinding.Set(selection)
+	})
+	currentCurve, _ := curveBinding.Get()
+	curveSelect.SetSelected(currentCurve)
+
 	debugLevelBinding := binding.BindPreferenceString("debug-level", a.Preferences())
 	debugCheck := widget.NewCheck("Enable Debug Log", func(debug bool) {
 		if debug {
@@ -96,6 +103,7 @@ func settingsTabItem(a fyne.App) *container.TabItem {
 		widget.NewSeparator(),
 		widget.NewLabelWithStyle("Transfer Options", fyne.TextAlignLeading, fyne.TextStyle{Bold: true}),
 		widget.NewForm(
+			widget.NewFormItem("PAKE Curve", curveSelect),
 			widget.NewFormItem("", widget.NewCheckWithData("Disable Multiplexing", binding.BindPreferenceBool("disable-multiplexing", a.Preferences()))),
 			widget.NewFormItem("", widget.NewCheckWithData("Disable Compression", binding.BindPreferenceBool("disable-compression", a.Preferences()))),
 		),