From af1b87830850379fb256e44523b7dd5a6c6f3283 Mon Sep 17 00:00:00 2001 From: Greg Pomerantz Date: Fri, 21 Aug 2026 13:00:03 -0400 Subject: [PATCH] passgo package: modernize for go 1.24; reset store.Empty in GetStore. - Update to //go:build tags, gofmt, and the android-35 javac template in //go:generate. - GetStore: reset store.Empty when the store directory exists (it was only set true when the dir was missing, so a reconfigured store kept the stale 'Empty' state and showed the configure button). - Rebuild PgpConnect.jar (android-35). --- PgpConnect.jar | Bin 8214 -> 7821 bytes impl_android.go | 14 ++++++++------ impl_darwin.go | 5 +++-- impl_linux.go | 5 +++-- impl_shared.go | 3 ++- jni_android.go | 7 ++++--- main.go | 2 ++ 7 files changed, 22 insertions(+), 14 deletions(-) diff --git a/PgpConnect.jar b/PgpConnect.jar index f41371c29f2461217651d2060d4052acd543d112..91a741f5fd36d21ecf99025c6dcd4d090a48ce98 100644 GIT binary patch literal 7821 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 literal 8214 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 diff --git a/impl_android.go b/impl_android.go index f33fcd5..aac5da8 100644 --- a/impl_android.go +++ b/impl_android.go @@ -1,6 +1,8 @@ -//+build android +//go:build android +// +build android + //go:generate mkdir -p classes -//go:generate javac -bootclasspath $ANDROID_HOME/platforms/android-29/android.jar -classpath openpgp-api.jar -d classes PgpConnect.java Foo.java +//go:generate javac -nowarn -classpath $ANDROID_HOME/platforms/android-35/android.jar:openpgp-api.jar -d classes PgpConnect.java //go:generate jar cf PgpConnect.jar -C classes . //go:generate rm -rf classes @@ -15,8 +17,8 @@ import "C" import ( "fmt" "io/ioutil" - "path" "log" + "path" "strings" "sync" "unsafe" @@ -27,10 +29,10 @@ import ( ) var ( - jvm uintptr + jvm uintptr waitch chan struct{} //w *app.Window - pgp PGP + pgp PGP installCompleteOnce sync.Once ) @@ -64,7 +66,7 @@ func connect() { <-waitch } -//Clip copies a string to the clipboard +// Clip copies a string to the clipboard func Clip(x string) { pgp.Clip(x) } diff --git a/impl_darwin.go b/impl_darwin.go index 708df3c..ca68407 100644 --- a/impl_darwin.go +++ b/impl_darwin.go @@ -1,4 +1,5 @@ -//+build darwin +//go:build darwin +// +build darwin package passgo @@ -119,7 +120,7 @@ func init() { setAgentInfo() } -//Clip copies a string to the clipboard +// Clip copies a string to the clipboard func Clip(x string) { clip.Set(x) } diff --git a/impl_linux.go b/impl_linux.go index f5600f3..0695b2d 100644 --- a/impl_linux.go +++ b/impl_linux.go @@ -1,4 +1,5 @@ -//+build !android,linux +//go:build !android && linux +// +build !android,linux package passgo @@ -7,7 +8,7 @@ import ( "os/exec" ) -//Clip copies a string to the clipboard +// Clip copies a string to the clipboard func Clip(x string) { b := bytes.NewBuffer([]byte(x)) cmd := exec.Command("xclip") diff --git a/impl_shared.go b/impl_shared.go index 4ec07a9..0ea463e 100644 --- a/impl_shared.go +++ b/impl_shared.go @@ -1,4 +1,5 @@ -//+build darwin !android,linux +//go:build darwin || (!android && linux) +// +build darwin !android,linux package passgo diff --git a/jni_android.go b/jni_android.go index 33cffc5..beed4d3 100644 --- a/jni_android.go +++ b/jni_android.go @@ -13,11 +13,12 @@ import ( "fmt" "log" "runtime" - "unsafe" "sync" + "unsafe" ) var theJVM *C.JavaVM + type JNIEnv = C.JNIEnv func SetJVM(jvm uintptr) { @@ -33,8 +34,8 @@ type PGP C.jobject var ( fragChans map[int]chan string - chmux sync.Mutex - chint int + chmux sync.Mutex + chint int ) func (p PGP) GetId() (string, error) { diff --git a/main.go b/main.go index 73281ee..d092bc6 100644 --- a/main.go +++ b/main.go @@ -49,6 +49,8 @@ func GetStore(store *Store) error { } if _, err := os.Stat(store.Dir); os.IsNotExist(err) { store.Empty = true + } else { + store.Empty = false } id, err := ioutil.ReadFile(path.Join(store.Dir, ".gpg-id")) if err != nil {