From b0b310a7b0d2b5274126362e2d3dfc9e7b804db4 Mon Sep 17 00:00:00 2001 From: Greg Date: Fri, 19 Jun 2020 14:35:49 -0400 Subject: [PATCH] Bump gio version, use window.Do() instead of RegisterFragment(). --- Ble.jar | Bin 7134 -> 7388 bytes BlessedConnect.java | 10 ++++++++++ ble_android.go | 10 ++++++++-- go.mod | 2 +- go.sum | 3 +++ jni_android.c | 9 +++++++++ jni_android.h | 1 + 7 files changed, 32 insertions(+), 3 deletions(-) diff --git a/Ble.jar b/Ble.jar index be5d86db18948f8a97c2dd0862db9d2d0afe8a74..5d85407dbb3136e9e5ce9db49fa00ba6f53909d7 100644 GIT binary patch delta 6453 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 Hcjo^9L3|X9 delta 6209 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 U-#e!N?~KU>6nyB6WPcX_50pciuK)l5 diff --git a/BlessedConnect.java b/BlessedConnect.java index 0740283..769b612 100644 --- a/BlessedConnect.java +++ b/BlessedConnect.java @@ -5,6 +5,7 @@ import java.util.List; import java.util.UUID; import android.app.Activity; import android.app.Fragment; +import android.app.FragmentTransaction; import android.bluetooth.BluetoothAdapter; import android.bluetooth.BluetoothGatt; import android.bluetooth.BluetoothGattCharacteristic; @@ -19,6 +20,7 @@ import android.content.IntentFilter; import android.content.pm.PackageManager; import android.Manifest; import android.util.Log; +import android.view.View; import com.welie.blessed.BluetoothCentral; import com.welie.blessed.BluetoothCentralCallback; @@ -36,6 +38,14 @@ public class BlessedConnect extends Fragment { Log.d("gio", "BlessedConnect()"); } + public void register(View view) { + Log.d("gio", "BlessedConnect: register()"); + Activity act = (Activity)view.getContext(); + FragmentTransaction ft = act.getFragmentManager().beginTransaction(); + ft.add(this, "BlessedConnect"); + ft.commitNow(); + } + @Override public void onAttach(Context ctx) { super.onAttach(ctx); Log.d("gio", "BlessedConnect: onAttach()"); diff --git a/ble_android.go b/ble_android.go index 86b578b..aa1155b 100644 --- a/ble_android.go +++ b/ble_android.go @@ -225,7 +225,14 @@ func NewBLE() *BLE { //Enable func (b *BLE) Enable(w *app.Window) { log.Printf("ble.Enable()") - w.RegisterFragment("st/wow/git/ble/BlessedConnect") + setJVM(app.JavaVM()) + go w.Do(func(view uintptr) { + log.Printf("ble.Enable(): inside w.Do()") + runInJVM(func(env *C.JNIEnv) { + log.Printf("ble.Enable(): inside runInJVM()") + C.registerFragment(env, (C.jobject)(unsafe.Pointer(view))) + }) + }) } // Go callbacks from Java @@ -237,7 +244,6 @@ func Java_st_wow_git_ble_BlessedConnect_installComplete(env *C.JNIEnv, class C.j log.Printf("BlessedConnect object is nil!") } gBLE.handle.BlessedConnect = (C.NewGlobalRef)(env,b) - setJVM(app.JavaVM()) if C.enabled(env, gBLE.handle.BlessedConnect) == C.JNI_TRUE { gBLE.handle.state = STATE_ON gBLE.ready = true diff --git a/go.mod b/go.mod index bf5afd7..488a5c3 100644 --- a/go.mod +++ b/go.mod @@ -2,4 +2,4 @@ module git.wow.st/gmp/ble go 1.13 -require gioui.org v0.0.0-20200612151431-2dc19a36959c +require gioui.org v0.0.0-20200619121558-88ced59dad93 diff --git a/go.sum b/go.sum index 51ab686..889df00 100644 --- a/go.sum +++ b/go.sum @@ -3,6 +3,8 @@ gioui.org v0.0.0-20191126175243-2ca2e5462f16 h1:p31rtmKm51xpj2QtqGNlljAyHEP1oStU gioui.org v0.0.0-20191126175243-2ca2e5462f16/go.mod h1:KqFFi2Dq5gYA3FJ0sDOt8OBXoMsuxMtE8v2f0JExXAY= gioui.org v0.0.0-20200612151431-2dc19a36959c h1:sGUKyRMv2bbfbsRyG8ghOI12l+WCGta+PivmznjuLgo= gioui.org v0.0.0-20200612151431-2dc19a36959c/go.mod h1:AHI9rFr6AEEHCb8EPVtb/p5M+NMJRKH58IOp8O3Je04= +gioui.org v0.0.0-20200619121558-88ced59dad93 h1:Llh4Tigdbu++FrRXL/KzqDHnH2Q5LPmAEk0djh6NLwk= +gioui.org v0.0.0-20200619121558-88ced59dad93/go.mod h1:jiUwifN9cRl/zmco43aAqh0aV+s9GbhG13KcD+gEpkU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= @@ -11,6 +13,7 @@ golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL golang.org/x/exp v0.0.0-20191002040644-a1355ae1e2c3/go.mod h1:NOZ3BPKG0ec/BKJQgnvsSFpcKLM5xXVWnvZS97DWHgE= golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= +golang.org/x/image v0.0.0-20200618115811-c13761719519/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= diff --git a/jni_android.c b/jni_android.c index e50c218..5e72b6f 100644 --- a/jni_android.c +++ b/jni_android.c @@ -3,6 +3,15 @@ #include #include "_cgo_export.h" +void +registerFragment(JNIEnv *env, jobject view) { + jclass cls = (*env)->FindClass(env, "st/wow/git/ble/BlessedConnect"); + jmethodID reg = (*env)->GetMethodID(env, cls, "register", "(Landroid/view/View;)V"); + jmethodID init = (*env)->GetMethodID(env, cls, "", "()V"); + jobject inst = (*env)->NewObject(env, cls, init); + (*env)->CallVoidMethod(env, inst, reg, view); +} + jboolean enabled(JNIEnv *env, jobject b) { jclass cls = (*env)->GetObjectClass(env, b); diff --git a/jni_android.h b/jni_android.h index d8977ec..202a85e 100644 --- a/jni_android.h +++ b/jni_android.h @@ -1,5 +1,6 @@ #include +void registerFragment(JNIEnv *env, jobject view); jboolean enabled(JNIEnv *env, jobject p); void scan(JNIEnv *env, jobject b); void stopScan(JNIEnv *env, jobject b);