diff --git a/examples/dex/dex_android.go b/examples/dex/dex_android.go index 822e5b8..96a7665 100644 --- a/examples/dex/dex_android.go +++ b/examples/dex/dex_android.go @@ -132,14 +132,13 @@ import ( var theJVM *C.JavaVM func SetJVM() { - h := app.PlatformHandle() - theJVM = (*C.JavaVM)(unsafe.Pointer(h.JVM)) + theJVM = (*C.JavaVM)(unsafe.Pointer(app.JavaVM())) dex := MustAsset("java/classes.dex") RunInJVM(func(env *C.JNIEnv) { labchan <- "Set up JVM" C.SetupJVM( env, - (C.jobject)(h.Context), + (C.jobject)(app.AppContext()), unsafe.Pointer(&dex[0]), C.int(len(dex)), ) diff --git a/examples/dex/dex_other.go b/examples/dex/dex_other.go index c02f383..0006c0f 100644 --- a/examples/dex/dex_other.go +++ b/examples/dex/dex_other.go @@ -1,3 +1,5 @@ +// +build !android + package main func SetJVM() { diff --git a/examples/jni/os_android.go b/examples/jni/os_android.go index 609e381..24eb13c 100644 --- a/examples/jni/os_android.go +++ b/examples/jni/os_android.go @@ -14,10 +14,11 @@ import ( func callJni() { time.Sleep(time.Second/5) - h := app.PlatformHandle() - labchan <- fmt.Sprintf("JVM = %d", h.JVM) - labchan <- fmt.Sprintf("Context = %d", h.Context) - SetJVM(h.JVM, h.Context) + jvm := app.JavaVM() + ctx := app.AppContext() + labchan <- fmt.Sprintf("JVM = %d", jvm) + labchan <- fmt.Sprintf("Context = %d", ctx) + SetJVM(jvm, ctx) RunInJVM(func(env *JNIEnv) { log.Print("finding class") diff --git a/examples/pgp/PgpConnect.java b/examples/pgp/PgpConnect.java deleted file mode 100644 index 907f011..0000000 --- a/examples/pgp/PgpConnect.java +++ /dev/null @@ -1,208 +0,0 @@ -package st.wow.git.pgp; - -import java.lang.Runnable; -import java.lang.String; -import java.util.concurrent.BlockingQueue; -import java.util.concurrent.LinkedBlockingQueue; -import android.os.Handler; -import java.io.InputStream; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.UnsupportedEncodingException; -import org.openintents.openpgp.OpenPgpError; -import org.openintents.openpgp.OpenPgpSignatureResult; -import org.openintents.openpgp.util.OpenPgpApi; -import org.openintents.openpgp.util.OpenPgpServiceConnection; -import android.content.Context; -import android.content.ClipboardManager; -import android.content.ClipData; -import android.content.Intent; -import android.util.Log; -import android.app.Activity; -import android.app.Fragment; -import android.app.FragmentManager; -import android.app.FragmentTransaction; -import android.app.PendingIntent; -import android.content.IntentSender; -import android.content.IntentSender.OnFinished; -import android.content.IntentSender.SendIntentException; -import android.os.Bundle; - -public class PgpConnect extends Fragment { - Activity act; - Context ctx; - Handler handler; - OpenPgpServiceConnection mServiceConnection; - ClipboardManager cb; - - PgpConnect(Activity act) { - act = act; - ctx = act.getApplicationContext(); - this.handler = new Handler(ctx.getMainLooper()); - - final FragmentManager fm = act.getFragmentManager(); - final Fragment frag = this; - handler.post(new Runnable() { - public void run() { - FragmentTransaction ft = fm.beginTransaction(); - ft.add(frag, "PgpConnect"); - ft.commitNow(); - } - }); - } - - @Override public void onAttach(Context ctx) { - super.onAttach(ctx); - Log.d("gio", "onAttach()"); - this.ctx = ctx; - this.handler = new Handler(ctx.getMainLooper()); - mServiceConnection = new OpenPgpServiceConnection(ctx, "org.sufficientlysecure.keychain"); - mServiceConnection.bindToService(); - cb = (ClipboardManager) ctx.getSystemService(Context.CLIPBOARD_SERVICE); - } - - - @Override public void onActivityResult(int requestCode, int resultCode, Intent data) { - Log.d("gio", "onActivityResult(" + requestCode + "): " + resultCode); - super.onActivityResult(requestCode, resultCode, data); - //activityResult(requestCode, resultCode); - if (resultCode != Activity.RESULT_OK) { - Log.d("gio", "onActivityResult: not OK"); - stringResult(requestCode, null); - return; - } - switch (data.getAction()) { - case OpenPgpApi.ACTION_DECRYPT_VERIFY: { - Log.d("gio", "action decrypt"); - _decrypt(data, requestCode); - break; - } - case OpenPgpApi.ACTION_ENCRYPT: { - Log.d("gio", "action encrypt"); - _encrypt(data, requestCode); - break; - } - default: { - Log.d("gio", "some other action"); - } - } - } - - public void Clip(byte []dat) { - ClipData clip = ClipData.newPlainText("PgpConnect", new String(dat)); - cb.setPrimaryClip(clip); - } - - public void Decrypt(byte []dat, int chint) { - if (handler == null) { - return; - } - handler.post(new Runnable() { - public void run() { - Intent data = new Intent(); - data.setAction(OpenPgpApi.ACTION_DECRYPT_VERIFY); - data.putExtra("DATA", dat); - _decrypt(data, chint); - } - }); - } - - private void _decrypt(Intent data, int chint) { - Log.d("gio","_decrypt"); - byte []dat = data.getByteArrayExtra("DATA"); - InputStream is = new ByteArrayInputStream(dat); - ByteArrayOutputStream os = new ByteArrayOutputStream(); - OpenPgpApi api = new OpenPgpApi(this.ctx, mServiceConnection.getService()); - Intent result = api.executeApi(data, is, os); - switch (result.getIntExtra(OpenPgpApi.RESULT_CODE, OpenPgpApi.RESULT_CODE_ERROR)) { - case OpenPgpApi.RESULT_CODE_SUCCESS: { - try { - String ret = os.toString("UTF-8"); - Log.d(OpenPgpApi.TAG, "output: " + ret); - stringResult(chint, ret); - } catch (UnsupportedEncodingException e) { - Log.e("gio", "UnsupportedEncodingException", e); - stringResult(chint, null); - } - break; - } - case OpenPgpApi.RESULT_CODE_USER_INTERACTION_REQUIRED: { - PendingIntent pi = result.getParcelableExtra(OpenPgpApi.RESULT_INTENT); - try { - startIntentSenderForResult(pi.getIntentSender(), chint, null, 0, 0, 0, null); - } catch (IntentSender.SendIntentException e) { - Log.e("gio", "SendIntentException", e); - stringResult(chint, null); - } - break; - } - case OpenPgpApi.RESULT_CODE_ERROR: { - OpenPgpError error = result.getParcelableExtra(OpenPgpApi.RESULT_ERROR); - stringResult(chint, null); - } - } - } - - public void Encrypt(byte[] id, byte[] dat, int chint) { - if (handler == null) { - return; - } - handler.post(new Runnable() { - public void run() { - Intent data = new Intent(); - data.setAction(OpenPgpApi.ACTION_ENCRYPT); - data.putExtra(OpenPgpApi.EXTRA_USER_IDS, new String[]{new String(id)}); - data.putExtra(OpenPgpApi.EXTRA_REQUEST_ASCII_ARMOR, true); - data.putExtra("DATA", dat); - _encrypt(data, chint); - } - }); - } - - private void _encrypt(Intent data, int chint) { - Log.d("gio","_encrypt"); - byte []dat = data.getByteArrayExtra("DATA"); - InputStream is = new ByteArrayInputStream(dat); - ByteArrayOutputStream os = new ByteArrayOutputStream(); - OpenPgpApi api = new OpenPgpApi(this.ctx, mServiceConnection.getService()); - Intent result = api.executeApi(data, is, os); - switch (result.getIntExtra(OpenPgpApi.RESULT_CODE, OpenPgpApi.RESULT_CODE_ERROR)) { - case OpenPgpApi.RESULT_CODE_SUCCESS: { - try { - String ret = os.toString("UTF-8"); - Log.d(OpenPgpApi.TAG, "output: " + ret); - stringResult(chint, ret); - } catch (UnsupportedEncodingException e) { - Log.e("gio", "UnsupportedEncodingException", e); - stringResult(chint, null); - } - - if (result.hasExtra(OpenPgpApi.RESULT_SIGNATURE)) { - OpenPgpSignatureResult sigResult - = result.getParcelableExtra(OpenPgpApi.RESULT_SIGNATURE); - } - break; - } - case OpenPgpApi.RESULT_CODE_USER_INTERACTION_REQUIRED: { - PendingIntent pi = result.getParcelableExtra(OpenPgpApi.RESULT_INTENT); - try { - IntentSender sender = pi.getIntentSender(); - Log.d("PgpConnect", "IntentSender:" + sender.toString()); - startIntentSenderForResult(sender, chint, null, 0, 0, 0, null); - } catch (IntentSender.SendIntentException e) { - Log.e("gio", "SendIntentException", e); - stringResult(chint, null); - } - break; - } - case OpenPgpApi.RESULT_CODE_ERROR: { - OpenPgpError error = result.getParcelableExtra(OpenPgpApi.RESULT_ERROR); - stringResult(chint, null); - break; - } - } - } - - static private native void activityResult(int requestCode, int resultCode); - static private native void stringResult(int requestCode, String result); -} diff --git a/examples/pgp/jni_android.c b/examples/pgp/jni_android.c deleted file mode 100644 index ebfc1f3..0000000 --- a/examples/pgp/jni_android.c +++ /dev/null @@ -1,116 +0,0 @@ - -#include -#include -#include -#include "jni_android.h" -#include "_cgo_export.h" - -static jobject gClassLoader; -static jmethodID gFindClassMethod; - -void -SetLoader(JNIEnv* env, jobject context) { - jclass cclass = (*env)->GetObjectClass(env, context); - jmethodID gcl_id = (*env)->GetMethodID(env, cclass, "getClassLoader", "()Ljava/lang/ClassLoader;"); - jobject loader = (*env)->CallObjectMethod(env, context, gcl_id); - gClassLoader = (*env)->NewGlobalRef(env, loader); - jclass lclass = (*env)->GetObjectClass(env, loader); - gFindClassMethod = (*env)->GetMethodID(env, lclass, "findClass", "(Ljava/lang/String;)Ljava/lang/Class;"); -} - -jclass -FindClass(JNIEnv* env, char* name) { - jstring strClassName = (*env)->NewStringUTF(env, name); - return (*env)->CallObjectMethod(env, gClassLoader, gFindClassMethod, strClassName); -} - -jobject -CreateObject(JNIEnv* env, jclass cls) { - jmethodID init = (*env)->GetMethodID(env, cls, "", "()V"); - return (*env)->NewObject(env, cls, init); -} - -jobject -NewPgpConnect(JNIEnv* env, jobject act) { - jclass cls = FindClass(env, "st/wow/git/pgp/PgpConnect"); - jmethodID init = (*env)->GetMethodID(env, cls, "", "(Landroid/app/Activity;)V"); - jobject ret = (*env)->NewObject(env, cls, init, act); - //cls = (*env)->GetObjectClass(env, ret); - - static const JNINativeMethod actMethods[] = { - { - .name = "activityResult", - .signature = "(II)V", - .fnPtr = activityResult - }, - { - .name = "stringResult", - .signature = "(ILjava/lang/String;)V", - .fnPtr = stringResult - }, - }; - - (*env)->RegisterNatives(env, cls, actMethods, sizeof(actMethods)/sizeof(actMethods[0])); - - return (*env)->NewGlobalRef(env, ret); -} - -const char* -Decrypt(JNIEnv* env, jobject p, char* cdata, int datalen, int chint) { - jbyteArray data = (*env)->NewByteArray(env, datalen); - (*env)->SetByteArrayRegion(env, data, 0, datalen, cdata); - jclass cls = (*env)->GetObjectClass(env, p); - jmethodID mid = (*env)->GetMethodID(env, cls, "Decrypt", "([BI)V"); - jstring ret = (*env)->CallObjectMethod(env, p, mid, data, chint); - return (*env)->GetStringUTFChars(env, ret, NULL); -} - -void stringResult(JNIEnv* env, jclass cls, jint requestCode, jobject response) { - if (response == 0) { - goStringResult(env, cls, requestCode, 0); - } else { - char* str = (*env)->GetStringUTFChars(env, response, NULL); - goStringResult(env, cls, requestCode, str); - } -} - -const char* -Encrypt(JNIEnv* env, jobject p, char* cid, int idlen, char* cdata, int datalen, int chint) { - jbyteArray id = (*env)->NewByteArray(env, idlen); - (*env)->SetByteArrayRegion(env, id, 0, idlen, cid); - jbyteArray data = (*env)->NewByteArray(env, datalen); - (*env)->SetByteArrayRegion(env, data, 0, datalen, cdata); - jclass cls = (*env)->GetObjectClass(env, p); - jmethodID mid = (*env)->GetMethodID(env, cls, "Encrypt", "([B[BI)V"); - jstring ret = (*env)->CallObjectMethod(env, p, mid, id, data, chint); - return (*env)->GetStringUTFChars(env, ret, NULL); -} - -void CallVoidMethod(JNIEnv *env, jobject obj, jmethodID methodID) { - (*env)->CallVoidMethod(env, obj, methodID); -} - -void CallVoidMethod1(JNIEnv *env, jobject obj, jmethodID methodID, jobject arg) { - (*env)->CallVoidMethod(env, obj, methodID, arg); -} - -jint CallIntMethod(JNIEnv *env, jobject obj, jmethodID methodID) { - return (*env)->CallIntMethod(env, obj, methodID); -} - -jmethodID GetMethodID(JNIEnv *env, jclass clazz, const char *name, const char *sig) { - return (*env)->GetMethodID(env, clazz, name, sig); -} - -jint GetEnv(JavaVM *vm, JNIEnv **env, jint version) { - return (*vm)->GetEnv(vm, (void **)env, version); -} - -jint AttachCurrentThread(JavaVM *vm, JNIEnv **p_env, void *thr_args) { - return (*vm)->AttachCurrentThread(vm, p_env, thr_args); -} - -jint DetachCurrentThread(JavaVM *vm) { - return (*vm)->DetachCurrentThread(vm); -} - diff --git a/examples/pgp/jni_android.go b/examples/pgp/jni_android.go deleted file mode 100644 index 7f8601d..0000000 --- a/examples/pgp/jni_android.go +++ /dev/null @@ -1,160 +0,0 @@ -package main - -/* -#cgo LDFLAGS: -landroid - -#include -#include "jni_android.h" -*/ -import "C" - -import ( - "errors" - "fmt" - "log" - "runtime" - "unsafe" - "sync" -) - -var theJVM *C.JavaVM -type JNIEnv = C.JNIEnv - -func SetJVM(jvm, context uintptr) { - log.Print("set theJVM") - theJVM = (*C.JavaVM)(unsafe.Pointer(jvm)) - RunInJVM(func(env *C.JNIEnv) { - C.SetLoader(env, (C.jobject)(context)) - }) -} - -func FindClass(env *C.JNIEnv, name string) C.jclass { - cname := C.CString(name) - defer C.free(unsafe.Pointer(cname)) - return C.FindClass((*C.JNIEnv)(env), cname) -} - -func JniCallVoidMethod(env *C.JNIEnv, obj C.jobject, methodID C.jmethodID) { - C.CallVoidMethod(env, obj, methodID) -} - -func JniCallVoidMethod1(env *C.JNIEnv, obj C.jobject, methodID C.jmethodID, arg uintptr) { - C.CallVoidMethod1(env, obj, methodID, C.jobject(unsafe.Pointer(arg))) -} - -func JniCallIntMethod(env *C.JNIEnv, obj C.jobject, methodID C.jmethodID) int { - return (int)(C.CallIntMethod(env, obj, methodID)) -} - -func JniGetMethodID(env *C.JNIEnv, cls C.jclass, name, sig string) C.jmethodID { - cname := C.CString(name) - defer C.free(unsafe.Pointer(cname)) - csig := C.CString(sig) - defer C.free(unsafe.Pointer(csig)) - return C.GetMethodID(env, cls, cname, csig) -} - -func CreateObject(env *C.JNIEnv, cls C.jclass) C.jobject { - return C.CreateObject(env, (C.jclass)(cls)) -} - -type PGP C.jobject - -func NewPgpConnect(env uintptr, act uintptr) PGP { - return (PGP)(C.NewPgpConnect((*C.JNIEnv)(unsafe.Pointer(env)), (C.jobject)(unsafe.Pointer(act)))) -} - -var ( - fragChans map[int]chan string - chmux sync.Mutex - chint int -) - -func (p PGP) Decrypt(data string) (string, error) { - ch := make(chan string) - chmux.Lock() - if fragChans == nil { - fragChans = make(map[int]chan string) - } - fragChans[chint] = ch - curint := chint - chint++ - chmux.Unlock() - - cdata := C.CString(data) - defer C.free(unsafe.Pointer(cdata)) - RunInJVM(func(env *JNIEnv) { - retc := C.Decrypt(env, (C.jobject)(p), (*C.char)(unsafe.Pointer(cdata)), (C.int)(len(data)), C.int(curint)) - defer C.free(unsafe.Pointer(retc)) - }) - switch x := <-ch; { - case x == "": - return "", fmt.Errorf("Decryption failed") - default: - return x, nil - } -} - -func (p PGP) Encrypt(id, data string) (string, error) { - ch := make(chan string) - chmux.Lock() - if fragChans == nil { - fragChans = make(map[int]chan string) - } - fragChans[chint] = ch - curint := chint - chint++ - chmux.Unlock() - - cid := C.CString(id) - defer C.free(unsafe.Pointer(cid)) - cdata := C.CString(data) - defer C.free(unsafe.Pointer(cdata)) - RunInJVM(func(env *JNIEnv) { - retc := C.Encrypt(env, (C.jobject)(p), (*C.char)(unsafe.Pointer(cid)), (C.int)(len(id)), (*C.char)(unsafe.Pointer(cdata)), (C.int)(len(data)), C.int(curint)) - defer C.free(unsafe.Pointer(retc)) - }) - switch x := <-ch; { - case x == "": - return "", fmt.Errorf("Encryption failed") - default: - return x, nil - } -} - -func RunInJVM(f func(env *C.JNIEnv)) { - runtime.LockOSThread() - defer runtime.UnlockOSThread() - var env *C.JNIEnv - var detach bool - if res := C.GetEnv(theJVM, &env, C.JNI_VERSION_1_6); res != C.JNI_OK { - if res != C.JNI_EDETACHED { - panic(fmt.Errorf("JNI GetEnv failed with error %d", res)) - } - if C.AttachCurrentThread(theJVM, &env, nil) != C.JNI_OK { - panic(errors.New("runInJVM: AttachCurrentThread failed")) - } - detach = true - } - - if detach { - defer func() { - C.DetachCurrentThread(theJVM) - }() - } - f(env) -} - -//export activityResult -func activityResult(env *C.JNIEnv, class C.jclass, request, result C.jint) { - log.Printf("activityResult (%d): %d", request, result) -} - -//export goStringResult -func goStringResult(env *C.JNIEnv, class C.jclass, request C.jint, str *C.char) { - fragChans[int(request)] <- C.GoString(str) - C.free(unsafe.Pointer(str)) - chmux.Lock() - delete(fragChans, int(request)) - chmux.Unlock() -} diff --git a/examples/pgp/jni_android.h b/examples/pgp/jni_android.h deleted file mode 100644 index 90fa1fc..0000000 --- a/examples/pgp/jni_android.h +++ /dev/null @@ -1,16 +0,0 @@ -#include - -void SetLoader(JNIEnv* env, jobject context); -jclass FindClass(JNIEnv* env, char* name); -jobject CreateObject(JNIEnv* env, jclass cls); -jobject NewPgpConnect(JNIEnv* env, jobject act); -const char* Decrypt(JNIEnv* env, jobject p, char* cdata, int datalen, int chint); -const char* Encrypt(JNIEnv* env, jobject p, char* cid, int idlen, char* cdata, int datalen, int chint); -void stringResult(JNIEnv* env, jclass cls, jint requestCode, jobject response); -void CallVoidMethod(JNIEnv *env, jobject obj, jmethodID methodID); -void CallVoidMethod1(JNIEnv *env, jobject obj, jmethodID methodID, jobject arg); -jint CallIntMethod(JNIEnv *env, jobject obj, jmethodID methodID); -jmethodID GetMethodID(JNIEnv *env, jclass clazz, const char *name, const char *sig); -jint GetEnv(JavaVM *vm, JNIEnv **env, jint version); -jint AttachCurrentThread(JavaVM *vm, JNIEnv **p_env, void *thr_args); -jint DetachCurrentThread(JavaVM *vm); diff --git a/examples/pgp/main.go b/examples/pgp/main.go deleted file mode 100644 index 8addc60..0000000 --- a/examples/pgp/main.go +++ /dev/null @@ -1,87 +0,0 @@ -// +build darwin linux - -package main - -import ( - "log" - - "gioui.org/app" - "gioui.org/io/system" - "gioui.org/layout" - "gioui.org/op" - "gioui.org/unit" - "gioui.org/widget/material" - - "gioui.org/font/gofont" -) - -var ( - labchan chan string -) - -type ( - D = layout.Dimensions - C = layout.Context -) - -func main() { - labchan = make(chan string) - log.Print("Staring event loop") - go eventloop() - app.Main() - log.Print("app.Main() returned") -} - -func eventloop() { - w := app.NewWindow( - app.Size(unit.Dp(400), unit.Dp(400)), - app.Title("Hello")) - th := material.NewTheme(gofont.Collection()) - var ops op.Ops - - sysinset := &layout.Inset{} - margin := layout.UniformInset(unit.Dp(10)) - labels := []material.LabelStyle{} - list := &layout.List{Axis: layout.Vertical} - - resetSysinset := func(x system.Insets) { - sysinset.Top = x.Top - sysinset.Bottom = x.Bottom - sysinset.Left = x.Left - sysinset.Right = x.Right - } - go func() { - labchan <- "Starting" - callJni(w) - }() - for { - select { - case x := <-labchan: - labels = append(labels, material.Body1(th, x)) - w.Invalidate() - case e := <-w.Events(): - switch e := e.(type) { - case system.DestroyEvent: - return - case system.FrameEvent: - gtx := layout.NewContext(&ops, e) - resetSysinset(e.Insets) - sysinset.Layout(gtx, func(gtx C) D { - return margin.Layout(gtx, func(gtx C) D { - return list.Layout(gtx, len(labels), func(gtx C, i int) D { - return labels[i].Layout(gtx) - }) - }) - }) - e.Frame(gtx.Ops) - case system.StageEvent: - log.Printf("stage event -- %s", e.Stage) - if e.Stage == system.StageRunning { - initPgp(w) - } - case *system.CommandEvent: - log.Print("command event") - } - } - } -} diff --git a/examples/pgp/openpgp-api.jar b/examples/pgp/openpgp-api.jar deleted file mode 100644 index 0ff1dc0..0000000 Binary files a/examples/pgp/openpgp-api.jar and /dev/null differ diff --git a/examples/pgp/os_android.go b/examples/pgp/os_android.go deleted file mode 100644 index 628ddf1..0000000 --- a/examples/pgp/os_android.go +++ /dev/null @@ -1,83 +0,0 @@ -//go:generate mkdir -p classes -//go:generate javac -bootclasspath $ANDROID_HOME/platforms/android-29/android.jar -classpath openpgp-api.jar -d classes PgpConnect.java -//go:generate jar cf PgpConnect.jar -C classes . -//go:generate rm -rf classes - -package main - -import ( - "fmt" - "log" - "time" - - "gioui.org/app" -) - -var ( - h *app.Handle - connected bool - ready bool - wch chan struct{} - w *app.Window - pgp PGP -) - -func init() { - wch = make(chan struct{}) -} - -func initPgp(x *app.Window) { - w = x - close(wch) -} - -func connect(w *app.Window) bool { - <-wch - if !connected { - log.Print("PlatformHandle()") - h = app.PlatformHandle() - log.Print("SetJVM()") - SetJVM(h.JVM, h.Context) - log.Print("SetJVM() returned") - log.Print("calling window.Run()()") - w.Run(func(env app.JNIEnv, act app.Activity) { - log.Print("in window.Run() -- NewPgpConnect()") - pgp = NewPgpConnect(env.JNIEnv, act.Activity) - }) - connected = true - } - return true -} - -func checkPermission(w *app.Window) bool { - if !connect(w) { - return false - } - //return pgp.CheckPermission(env) - return false -} - -func callJni(w *app.Window) { - if !connect(w) { - return - } - labchan <- fmt.Sprintf("JVM = %d", h.JVM) - labchan <- fmt.Sprintf("Context = %d", h.Context) - time.Sleep(time.Second / 5) - - val, err := pgp.Encrypt("greg_pomerantz@yahoo.com", "hi there") - if err != nil { - fmt.Printf("Encryption error: %s", err) - labchan <- err.Error() - return - } - log.Print("val = ", val) - val2, err := pgp.Decrypt(val) - if err != nil { - fmt.Printf("Decryption error: %s", err) - labchan <- err.Error() - return - } - labchan <- "result = " + val2 -} - diff --git a/examples/pgp/os_other.go b/examples/pgp/os_other.go deleted file mode 100644 index 379ff35..0000000 --- a/examples/pgp/os_other.go +++ /dev/null @@ -1,13 +0,0 @@ -// +build !android - -package main - -import ( - "gioui.org/app" -) - -func callJni(w *app.Window) { -} - -func initPgp(w *app.Window) { -}