Fixes

Author: xaionaro@dx.center

.gitignore

@@ -4,3 +4,4 @@
 *.so
 cover.out
 examples/test_results/
+/jnigen

.golangci.yml

@@ -2,8 +2,6 @@ version: "2"
 
 run:
   timeout: 5m
-  build-tags:
-    - android
 
 linters:
   enable:
@@ -12,3 +10,8 @@ linters:
     - errcheck
     - ineffassign
     - unused
+
+issues:
+  exclude-dirs:
+    - capi
+    - examples

Makefile

@@ -1,4 +1,4 @@
-.PHONY: generate specs jni java proto protoc grpc cli clean lint test test-tools build prove
+.PHONY: generate specs jni java clean lint test test-tools build prove
 
 # JDK detection for host tests (jni.h and libjvm.so).
 JDK_HOME ?= $(shell readlink -f $$(which javac) 2>/dev/null | sed 's|/bin/javac$$||')
@@ -8,12 +8,8 @@ LIBJVM_DIR ?= $(shell find $(JDK_HOME) -name libjvm.so -printf '%h' -quit 2>/dev
 # Android SDK platform JAR for specgen.
 ANDROID_JAR ?= $(ANDROID_HOME)/platforms/android-36/android.jar
 
-# Output directory for gRPC proxy code (proto/, grpc/, cmd/jnicli/).
-# Set PROXY_DIR to a jni-proxy checkout to generate into that repo.
-PROXY_DIR ?= .
-
-# Run all generators
-generate: specs jni java proto protoc grpc cli
+# Run all generators (proto/grpc/cli generation moved to jni-proxy repo)
+generate: specs jni java
 
 # Run specgen — generates YAML specs from ref/ .class files
 specs:
@@ -27,31 +23,6 @@ jni:
 java:
 	go run ./tools/cmd/javagen/ -specs spec/java/ -overlays spec/overlays/java/ -templates templates/java/ -output . -go-module github.com/AndroidGoLab/jni
 
-# Run protogen — generates .proto files from Java API specs
-# Output goes to PROXY_DIR (set to jni-proxy checkout path).
-proto:
-	go run ./tools/cmd/protogen/ -specs spec/java/ -overlays spec/overlays/java/ -output $(PROXY_DIR)/proto/ -go-module github.com/AndroidGoLab/jni-proxy
-	@mkdir -p $(PROXY_DIR)/proto/handlestore
-	@cp spec/handlestore.proto $(PROXY_DIR)/proto/handlestore/handlestore.proto
-
-# Run protoc — compiles .proto files to Go stubs
-protoc: proto
-	@command -v protoc >/dev/null 2>&1 || { echo "protoc not found. Install: https://grpc.io/docs/protoc-installation/"; exit 1; }
-	@for dir in $(PROXY_DIR)/proto/*/; do \
-		pkg=$$(basename "$$dir"); \
-		protoc -I. --go_out=. --go_opt=paths=source_relative \
-			--go-grpc_out=. --go-grpc_opt=paths=source_relative \
-			"$$dir$$pkg.proto"; \
-	done
-
-# Run grpcgen — generates gRPC server and client wrappers
-grpc: protoc
-	go run ./tools/cmd/grpcgen/ -specs spec/java/ -overlays spec/overlays/java/ -output $(PROXY_DIR) -go-module github.com/AndroidGoLab/jni-proxy
-
-# Run cligen — generates jnicli cobra commands from Java API specs
-cli: grpc
-	go run ./tools/cmd/cligen/ -specs spec/java/ -overlays spec/overlays/java/ -output $(PROXY_DIR)/cmd/jnicli/ -go-module github.com/AndroidGoLab/jni-proxy
-
 # Remove all generated files (identified by "DO NOT EDIT" header), excluding tools/
 clean:
 	grep -rl "Code generated by jnigen\. DO NOT EDIT\." --include="*.go" --exclude-dir=tools . | xargs -r rm -f

app/context.go

@@ -52,7 +52,7 @@ func ensureContextInit(env *jni.Env) error {
 // After Close, the Context must not be used.
 func (m *Context) Close() {
 	if m.Obj != nil {
-		m.VM.Do(func(env *jni.Env) error {
+		_ = m.VM.Do(func(env *jni.Env) error {
 			env.DeleteGlobalRef(m.Obj)
 			m.Obj = nil
 			return nil
@@ -64,7 +64,7 @@ func (m *Context) Close() {
 func (m *Context) PackageManager() (*jni.Object, error) {
 	var result *jni.Object
 	var callErr error
-	m.VM.Do(func(env *jni.Env) error {
+	doErr := m.VM.Do(func(env *jni.Env) error {
 		if err := ensureContextInit(env); err != nil {
 			callErr = err
 			return err
@@ -81,14 +81,17 @@ func (m *Context) PackageManager() (*jni.Object, error) {
 		result, callErr = env.CallObjectMethod(m.Obj, mid)
 		return callErr
 	})
-	return result, callErr
+	if callErr != nil {
+		return result, callErr
+	}
+	return result, doErr
 }
 
 // ContentResolver calls android.content.Context.getContentResolver().
 func (m *Context) ContentResolver() (*jni.Object, error) {
 	var result *jni.Object
 	var callErr error
-	m.VM.Do(func(env *jni.Env) error {
+	doErr := m.VM.Do(func(env *jni.Env) error {
 		if err := ensureContextInit(env); err != nil {
 			callErr = err
 			return err
@@ -105,14 +108,17 @@ func (m *Context) ContentResolver() (*jni.Object, error) {
 		result, callErr = env.CallObjectMethod(m.Obj, mid)
 		return callErr
 	})
-	return result, callErr
+	if callErr != nil {
+		return result, callErr
+	}
+	return result, doErr
 }
 
 // GetSystemService calls android.content.Context.getSystemService.
 func (m *Context) GetSystemService(name string) (*jni.Object, error) {
 	var result *jni.Object
 	var callErr error
-	m.VM.Do(func(env *jni.Env) error {
+	doErr := m.VM.Do(func(env *jni.Env) error {
 		if err := ensureContextInit(env); err != nil {
 			callErr = err
 			return err
@@ -128,5 +134,8 @@ func (m *Context) GetSystemService(name string) (*jni.Object, error) {
 		)
 		return callErr
 	})
-	return result, callErr
+	if callErr != nil {
+		return result, callErr
+	}
+	return result, doErr
 }

app/intent_extra.go

@@ -40,8 +40,8 @@ func NewIntent(vm *jni.VM) (*Intent, error) {
 func (i *Intent) PutStringExtra(
 	key string,
 	value string,
-) {
-	i.VM.Do(func(env *jni.Env) error {
+) error {
+	return i.VM.Do(func(env *jni.Env) error {
 		cls := env.GetObjectClass(i.Obj)
 		mid, err := env.GetMethodID(cls, "putExtra",
 			"(Ljava/lang/String;Ljava/lang/String;)Landroid/content/Intent;")
@@ -66,8 +66,8 @@ func (i *Intent) PutStringExtra(
 func (i *Intent) PutIntExtra(
 	key string,
 	value int32,
-) {
-	i.VM.Do(func(env *jni.Env) error {
+) error {
+	return i.VM.Do(func(env *jni.Env) error {
 		cls := env.GetObjectClass(i.Obj)
 		mid, err := env.GetMethodID(cls, "putExtra",
 			"(Ljava/lang/String;I)Landroid/content/Intent;")
@@ -88,8 +88,8 @@ func (i *Intent) PutIntExtra(
 func (i *Intent) PutBoolExtra(
 	key string,
 	value bool,
-) {
-	i.VM.Do(func(env *jni.Env) error {
+) error {
+	return i.VM.Do(func(env *jni.Env) error {
 		cls := env.GetObjectClass(i.Obj)
 		mid, err := env.GetMethodID(cls, "putExtra",
 			"(Ljava/lang/String;Z)Landroid/content/Intent;")

array.go

@@ -58,7 +58,7 @@ func NewAdapter(ctx *app.Context) (*Adapter, error) {
 // Close releases the global reference to the underlying Java object.
 func (m *Adapter) Close() {
 	if m.Obj != nil {
-		m.VM.Do(func(env *jni.Env) error {
+		_ = m.VM.Do(func(env *jni.Env) error {
 			env.DeleteGlobalRef(m.Obj)
 			m.Obj = nil
 			return nil