diff options
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/hosted/android/keyboard.c | 11 | ||||
| -rw-r--r-- | apps/hosted/android/notification.c | 7 | ||||
| -rw-r--r-- | apps/hosted/android/yesno.c | 20 |
3 files changed, 21 insertions, 17 deletions
diff --git a/apps/hosted/android/keyboard.c b/apps/hosted/android/keyboard.c index 9407d970fd..7c16cff079 100644 --- a/apps/hosted/android/keyboard.c +++ b/apps/hosted/android/keyboard.c @@ -59,14 +59,17 @@ static void kdb_init(void) { semaphore_init(&kbd_wakeup, 1, 0); /* get the class and its constructor */ - RockboxKeyboardInput_class = e->FindClass(env_ptr, + jclass kbInput_class = e->FindClass(env_ptr, "org/rockbox/RockboxKeyboardInput"); + RockboxKeyboardInput_class = e->NewGlobalRef(env_ptr, kbInput_class); jmethodID constructor = e->GetMethodID(env_ptr, RockboxKeyboardInput_class, "<init>", "()V"); - RockboxKeyboardInput_instance = e->NewObject(env_ptr, - RockboxKeyboardInput_class, - constructor); + jobject kbInput_instance = e->NewObject(env_ptr, + RockboxKeyboardInput_class, + constructor); + RockboxKeyboardInput_instance = e->NewGlobalRef(env_ptr, + kbInput_instance); kbd_inputfunc = e->GetMethodID(env_ptr, RockboxKeyboardInput_class, "kbd_input", "(Ljava/lang/String;" diff --git a/apps/hosted/android/notification.c b/apps/hosted/android/notification.c index 443200698c..33a7717012 100644 --- a/apps/hosted/android/notification.c +++ b/apps/hosted/android/notification.c @@ -125,13 +125,14 @@ void notification_init(void) JNIEnv e = *env_ptr; jfieldID nNM = e->GetFieldID(env_ptr, RockboxService_class, "fg_runner", "Lorg/rockbox/Helper/RunForegroundManager;"); - NotificationManager_instance = e->GetObjectField(env_ptr, - RockboxService_instance, nNM); - if (NotificationManager_instance == NULL) + jobject nMN_instance = e->GetObjectField(env_ptr, + RockboxService_instance, nNM); + if (nMN_instance == NULL) { DEBUGF("Failed to get RunForegroundManager instance. Performance will be bad"); return; } + NotificationManager_instance = e->NewGlobalRef(env_ptr, nMN_instance); jclass class = e->GetObjectClass(env_ptr, NotificationManager_instance); updateNotification = e->GetMethodID(env_ptr, class, "updateNotification", diff --git a/apps/hosted/android/yesno.c b/apps/hosted/android/yesno.c index a1de64e3f9..7aca3f7f79 100644 --- a/apps/hosted/android/yesno.c +++ b/apps/hosted/android/yesno.c @@ -30,7 +30,6 @@ #include "kernel.h" extern JNIEnv *env_ptr; -static jclass RockboxYesno_class = NULL; static jobject RockboxYesno_instance = NULL; static jmethodID yesno_func; static struct semaphore yesno_done; @@ -49,24 +48,25 @@ static void yesno_init(void) { JNIEnv e = *env_ptr; static jmethodID yesno_is_usable; - if (RockboxYesno_class == NULL) + if (RockboxYesno_instance == NULL) { semaphore_init(&yesno_done, 1, 0); /* get the class and its constructor */ - RockboxYesno_class = e->FindClass(env_ptr, - "org/rockbox/RockboxYesno"); + jclass yesno_class = e->FindClass(env_ptr, + "org/rockbox/RockboxYesno"); jmethodID constructor = e->GetMethodID(env_ptr, - RockboxYesno_class, + yesno_class, "<init>", "()V"); - RockboxYesno_instance = e->NewObject(env_ptr, - RockboxYesno_class, - constructor); - yesno_func = e->GetMethodID(env_ptr, RockboxYesno_class, + jobject yesno_instance = e->NewObject(env_ptr, + yesno_class, + constructor); + RockboxYesno_instance = e->NewGlobalRef(env_ptr, yesno_instance); + yesno_func = e->GetMethodID(env_ptr, yesno_class, "yesno_display", "(Ljava/lang/String;" "Ljava/lang/String;" "Ljava/lang/String;)V"); - yesno_is_usable = e->GetMethodID(env_ptr, RockboxYesno_class, + yesno_is_usable = e->GetMethodID(env_ptr, yesno_class, "is_usable", "()Z"); } /* need to get it every time incase the activity died/restarted */ |