# HG changeset patch # User bsmith@81767d24-ef19-dc11-ae90-00e081727c95 # Date 1619473734 0 # Node ID cb5b671543990d5f3b3e51aa527907151515a91f # Parent 9f7af6d8c6a46a916330fdcbc4b6ab8a4b4005f4 Android: The DWindows class should be org.dbsoft.dwindows, remove dwtest. Not entirely sure how to modify the package for applications yet. diff -r 9f7af6d8c6a4 -r cb5b67154399 android/DWindows.kt --- a/android/DWindows.kt Mon Apr 26 21:08:02 2021 +0000 +++ b/android/DWindows.kt Mon Apr 26 21:48:54 2021 +0000 @@ -1,4 +1,4 @@ -package org.dbsoft.dwindows.dwtest +package org.dbsoft.dwindows import android.content.pm.ActivityInfo import android.os.Bundle diff -r 9f7af6d8c6a4 -r cb5b67154399 android/dw.cpp --- a/android/dw.cpp Mon Apr 26 21:08:02 2021 +0000 +++ b/android/dw.cpp Mon Apr 26 21:48:54 2021 +0000 @@ -34,7 +34,7 @@ extern "C" { #endif -#define DW_CLASS_NAME "org/dbsoft/dwindows/dwtest/DWindows" +#define DW_CLASS_NAME "org/dbsoft/dwindows/DWindows" static pthread_key_t _dw_env_key; static HEV _dw_main_event; @@ -85,7 +85,7 @@ * path: The path to the Android app. */ JNIEXPORT jstring JNICALL -Java_org_dbsoft_dwindows_dwtest_DWindows_dwindowsInit(JNIEnv* env, jobject obj, jstring path) +Java_org_dbsoft_dwindows_DWindows_dwindowsInit(JNIEnv* env, jobject obj, jstring path) { char *arg = strdup(env->GetStringUTFChars((jstring) path, NULL)); @@ -341,7 +341,7 @@ * Entry location for all event handlers from the Android UI */ JNIEXPORT jint JNICALL -Java_org_dbsoft_dwindows_dwtest_DWindows_eventHandler(JNIEnv* env, jobject obj, jobject obj1, jobject obj2, +Java_org_dbsoft_dwindows_DWindows_eventHandler(JNIEnv* env, jobject obj, jobject obj1, jobject obj2, jint message, jstring str1, jstring str2, jint int1, jint int2, jint int3, jint int4) { const char *utf81 = str1 ? env->GetStringUTFChars(str1, NULL) : NULL; @@ -355,7 +355,7 @@ /* A more simple method for quicker calls */ JNIEXPORT void JNICALL -Java_org_dbsoft_dwindows_dwtest_DWindows_eventHandlerSimple(JNIEnv* env, jobject obj, jobject obj1, jint message) { +Java_org_dbsoft_dwindows_DWindows_eventHandlerSimple(JNIEnv* env, jobject obj, jobject obj1, jint message) { void *params[8] = { NULL }; _dw_event_handler(obj1, params, message);