1
0
mirror of https://github.com/taigrr/crocgui synced 2025-01-18 04:03:16 -08:00

pake curve setting

This commit is contained in:
Chris Howey 2021-04-20 09:30:34 -05:00
parent 0d6b0ed33a
commit 03865ded52
7 changed files with 16 additions and 2 deletions

View File

@ -3,8 +3,8 @@
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
package="com.github.howeyc.crocgui" package="com.github.howeyc.crocgui"
android:versionCode="14" android:versionCode="15"
android:versionName="1.8.0"> android:versionName="1.8.1">
<application android:label="Croc"> <application android:label="Croc">
<activity android:name="org.golang.app.GoNativeActivity" <activity android:name="org.golang.app.GoNativeActivity"

View File

@ -62,6 +62,7 @@ func main() {
a.Preferences().SetBool("disable-compression", a.Preferences().BoolWithFallback("disable-compression", false)) a.Preferences().SetBool("disable-compression", a.Preferences().BoolWithFallback("disable-compression", false))
a.Preferences().SetString("theme", a.Preferences().StringWithFallback("theme", "light")) a.Preferences().SetString("theme", a.Preferences().StringWithFallback("theme", "light"))
a.Preferences().SetString("debug-level", a.Preferences().StringWithFallback("debug-level", "error")) 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")) setTheme(a.Preferences().String("theme"))
log.SetLevel(a.Preferences().String("debug-level")) log.SetLevel(a.Preferences().String("debug-level"))

View File

@ -1 +1,2 @@
- Update to croc cli v9 - Update to croc cli v9
- PAKE Curve setting

View File

@ -0,0 +1,2 @@
- Update to croc cli v9
- PAKE Curve setting

View File

@ -68,6 +68,7 @@ func recvTabItem(a fyne.App, w fyne.Window) *container.TabItem {
NoMultiplexing: a.Preferences().Bool("disable-multiplexing"), NoMultiplexing: a.Preferences().Bool("disable-multiplexing"),
OnlyLocal: a.Preferences().Bool("force-local"), OnlyLocal: a.Preferences().Bool("force-local"),
NoCompress: a.Preferences().Bool("disable-compression"), NoCompress: a.Preferences().Bool("disable-compression"),
Curve: a.Preferences().String("pake-curve"),
}) })
if err != nil { if err != nil {
log.Error("Receive setup error:", err) log.Error("Receive setup error:", err)

View File

@ -148,6 +148,7 @@ func sendTabItem(a fyne.App, w fyne.Window) *container.TabItem {
NoMultiplexing: a.Preferences().Bool("disable-multiplexing"), NoMultiplexing: a.Preferences().Bool("disable-multiplexing"),
OnlyLocal: a.Preferences().Bool("force-local"), OnlyLocal: a.Preferences().Bool("force-local"),
NoCompress: a.Preferences().Bool("disable-compression"), NoCompress: a.Preferences().Bool("disable-compression"),
Curve: a.Preferences().String("pake-curve"),
}) })
if err != nil { if err != nil {
log.Errorf("croc error: %s\n", err.Error()) log.Errorf("croc error: %s\n", err.Error())

View File

@ -62,6 +62,13 @@ func settingsTabItem(a fyne.App) *container.TabItem {
currentTheme, _ := themeBinding.Get() currentTheme, _ := themeBinding.Get()
themeSelect.SetSelected(currentTheme) 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()) debugLevelBinding := binding.BindPreferenceString("debug-level", a.Preferences())
debugCheck := widget.NewCheck("Enable Debug Log", func(debug bool) { debugCheck := widget.NewCheck("Enable Debug Log", func(debug bool) {
if debug { if debug {
@ -96,6 +103,7 @@ func settingsTabItem(a fyne.App) *container.TabItem {
widget.NewSeparator(), widget.NewSeparator(),
widget.NewLabelWithStyle("Transfer Options", fyne.TextAlignLeading, fyne.TextStyle{Bold: true}), widget.NewLabelWithStyle("Transfer Options", fyne.TextAlignLeading, fyne.TextStyle{Bold: true}),
widget.NewForm( widget.NewForm(
widget.NewFormItem("PAKE Curve", curveSelect),
widget.NewFormItem("", widget.NewCheckWithData("Disable Multiplexing", binding.BindPreferenceBool("disable-multiplexing", a.Preferences()))), widget.NewFormItem("", widget.NewCheckWithData("Disable Multiplexing", binding.BindPreferenceBool("disable-multiplexing", a.Preferences()))),
widget.NewFormItem("", widget.NewCheckWithData("Disable Compression", binding.BindPreferenceBool("disable-compression", a.Preferences()))), widget.NewFormItem("", widget.NewCheckWithData("Disable Compression", binding.BindPreferenceBool("disable-compression", a.Preferences()))),
), ),