FIX: [droid] proper JNI device listener

project/cmake/scripts/android/Install.cmake

@@ -50,6 +50,7 @@ set(package_files strings.xml
                   src/interfaces/XBMCAudioManagerOnAudioFocusChangeListener.java
                   src/interfaces/XBMCNsdManagerRegistrationListener.java
                   src/interfaces/XBMCNsdManagerDiscoveryListener.java
+                  src/interfaces/XBMCInputDeviceListener.java
                   src/XBMCBroadcastReceiver.java
                   src/model/TVEpisode.java
                   src/model/Movie.java
@@ -61,7 +62,6 @@ set(package_files strings.xml
                   src/model/Media.java
                   src/XBMCSearchableActivity.java
                   src/XBMCRecommendationBuilder.java
-                  src/XBMCInputDeviceListener.java
                   src/XBMCProperties.java
                   src/content/XBMCFileContentProvider.java
                   src/content/XBMCMediaContentProvider.java

tools/android/packaging/xbmc/src/XBMCInputDeviceListener.java.in → tools/android/packaging/xbmc/src/interfaces/XBMCInputDeviceListener.java.in

@@ -1,4 +1,4 @@
-package @APP_PACKAGE@;
+package @APP_PACKAGE@.interfaces;
 
 import android.hardware.input.InputManager.InputDeviceListener;
 import android.util.Log;

xbmc/platform/android/activity/CMakeLists.txt

@@ -17,6 +17,7 @@ set(SOURCES android_main.cpp
             JNIXBMCNsdManagerResolveListener.cpp
             JNIXBMCJsonHandler.cpp
             JNIXBMCFile.cpp
+            JNIXBMCInputDeviceListener.cpp
             XBMCApp.cpp
             ${NDKROOT}/sources/android/native_app_glue/android_native_app_glue.c
             ${NDKROOT}/sources/android/cpufeatures/cpu-features.c)
@@ -42,7 +43,9 @@ set(HEADERS AndroidExtra.h
             JNIXBMCNsdManagerResolveListener.h
             JNIXBMCJsonHandler.h
             JNIXBMCFile.h
-            XBMCApp.h)
+            JNIXBMCInputDeviceListener.h
+            XBMCApp.h
+            )
 
 core_add_library(platform_android_activity)
 target_include_directories(${CORE_LIBRARY}

xbmc/platform/android/activity/JNIMainActivity.cpp

@@ -128,33 +128,6 @@ void CJNIMainActivity::_onVolumeChanged(JNIEnv *env, jobject context, jint volum
     m_appInstance->onVolumeChanged(volume);
 }
 
-void CJNIMainActivity::_onInputDeviceAdded(JNIEnv *env, jobject context, jint deviceId)
-{
-  static_cast<void>(env);
-  static_cast<void>(context);
-
-  if (m_appInstance != nullptr)
-    m_appInstance->onInputDeviceAdded(deviceId);
-}
-
-void CJNIMainActivity::_onInputDeviceChanged(JNIEnv *env, jobject context, jint deviceId)
-{
-  static_cast<void>(env);
-  static_cast<void>(context);
-
-  if (m_appInstance != nullptr)
-    m_appInstance->onInputDeviceChanged(deviceId);
-}
-
-void CJNIMainActivity::_onInputDeviceRemoved(JNIEnv *env, jobject context, jint deviceId)
-{
-  static_cast<void>(env);
-  static_cast<void>(context);
-
-  if (m_appInstance != nullptr)
-    m_appInstance->onInputDeviceRemoved(deviceId);
-}
-
 void CJNIMainActivity::_onAudioDeviceAdded(JNIEnv *env, jobject context, jobjectArray devices)
 {
   static_cast<void>(env);

xbmc/platform/android/activity/JNIMainActivity.h

@@ -25,7 +25,7 @@
 #include <androidjni/Image.h>
 #include <androidjni/AudioDeviceInfo.h>
 
-class CJNIMainActivity : public CJNIActivity, public CJNIInputManagerInputDeviceListener
+class CJNIMainActivity : public CJNIActivity
 {
 public:
   CJNIMainActivity(const ANativeActivity *nativeActivity);
@@ -37,9 +37,6 @@ class CJNIMainActivity : public CJNIActivity, public CJNIInputManagerInputDevice
   static void _onActivityResult(JNIEnv *env, jobject context, jint requestCode, jint resultCode, jobject resultData);
   static void _onVolumeChanged(JNIEnv *env, jobject context, jint volume);
   static void _doFrame(JNIEnv *env, jobject context, jlong frameTimeNanos);
-  static void _onInputDeviceAdded(JNIEnv *env, jobject context, jint deviceId);
-  static void _onInputDeviceChanged(JNIEnv *env, jobject context, jint deviceId);
-  static void _onInputDeviceRemoved(JNIEnv *env, jobject context, jint deviceId);
   static void _onCaptureAvailable(JNIEnv *env, jobject context, jobject image);
   static void _onScreenshotAvailable(JNIEnv *env, jobject context, jobject image);
   static void _onVisibleBehindCanceled(JNIEnv *env, jobject context);

xbmc/platform/android/activity/JNIXBMCInputDeviceListener.cpp

@@ -0,0 +1,90 @@
+/*
+ *      Copyright (C) 2018 Christian Browet
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with XBMC; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include <algorithm>
+
+#include "JNIXBMCInputDeviceListener.h"
+#include <androidjni/jutils-details.hpp>
+
+#include "CompileInfo.h"
+
+using namespace jni;
+
+static std::string s_className = std::string(CCompileInfo::GetClass()) + "/interfaces/XBMCInputDeviceListener";
+
+CJNIXBMCInputDeviceListener::CJNIXBMCInputDeviceListener()
+  : CJNIBase()
+{
+  add_instance(m_object, this);
+}
+
+CJNIXBMCInputDeviceListener::CJNIXBMCInputDeviceListener(const CJNIXBMCInputDeviceListener& other)
+  : CJNIBase(other)
+{
+  add_instance(m_object, this);
+}
+
+CJNIXBMCInputDeviceListener::~CJNIXBMCInputDeviceListener()
+{
+  remove_instance(this);
+}
+
+void CJNIXBMCInputDeviceListener::RegisterNatives(JNIEnv* env)
+{
+  jclass cClass = env->FindClass(s_className.c_str());
+  if(cClass)
+  {
+    JNINativeMethod methods[] =
+    {
+      { "_onInputDeviceAdded", "(I)V", (void*)&CJNIXBMCInputDeviceListener::_onInputDeviceAdded },
+      { "_onInputDeviceChanged", "(I)V", (void*)&CJNIXBMCInputDeviceListener::_onInputDeviceChanged },
+      { "_onInputDeviceRemoved", "(I)V", (void*)&CJNIXBMCInputDeviceListener::_onInputDeviceRemoved }
+    };
+
+    env->RegisterNatives(cClass, methods, sizeof(methods)/sizeof(methods[0]));
+  }
+}
+
+void CJNIXBMCInputDeviceListener::_onInputDeviceAdded(JNIEnv *env, jobject thiz, jint deviceId)
+{
+  (void)env;
+
+  CJNIXBMCInputDeviceListener *inst = find_instance(thiz);
+  if (inst)
+    inst->onInputDeviceAdded(deviceId);
+}
+
+void CJNIXBMCInputDeviceListener::_onInputDeviceChanged(JNIEnv *env, jobject thiz, jint deviceId)
+{
+  (void)env;
+
+  CJNIXBMCInputDeviceListener *inst = find_instance(thiz);
+  if (inst)
+    inst->onInputDeviceChanged(deviceId);
+}
+
+void CJNIXBMCInputDeviceListener::_onInputDeviceRemoved(JNIEnv *env, jobject thiz, jint deviceId)
+{
+  (void)env;
+
+  CJNIXBMCInputDeviceListener *inst = find_instance(thiz);
+  if (inst)
+    inst->onInputDeviceRemoved(deviceId);
+}

xbmc/platform/android/activity/JNIXBMCInputDeviceListener.h

@@ -0,0 +1,51 @@
+#pragma once
+/*
+ *      Copyright (C) 2018 Christian Browet
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with XBMC; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include <androidjni/JNIBase.h>
+
+#include <androidjni/InputManager.h>
+
+namespace jni
+{
+
+class CJNIXBMCInputDeviceListener : public CJNIInputManagerInputDeviceListener, public CJNIInterfaceImplem<CJNIXBMCInputDeviceListener>
+{
+public:
+  CJNIXBMCInputDeviceListener();
+  CJNIXBMCInputDeviceListener(const CJNIXBMCInputDeviceListener& other);
+  CJNIXBMCInputDeviceListener(const jni::jhobject &object) : CJNIBase(object) {}
+  virtual ~CJNIXBMCInputDeviceListener();
+
+  static void RegisterNatives(JNIEnv* env);
+
+  // CJNINsdManagerDiscoveryListener interface
+public:
+  void onInputDeviceAdded(int deviceId) = 0;
+  void onInputDeviceChanged(int deviceId) = 0;
+  void onInputDeviceRemoved(int deviceId) = 0;
+
+protected:
+  static void _onInputDeviceAdded(JNIEnv *env, jobject thiz, jint deviceId);
+  static void _onInputDeviceChanged(JNIEnv *env, jobject thiz, jint deviceId);
+  static void _onInputDeviceRemoved(JNIEnv *env, jobject thiz, jint deviceId);
+};
+
+}

xbmc/platform/android/activity/XBMCApp.cpp

@@ -161,6 +161,7 @@ CRect CXBMCApp::m_surface_rect;
 CXBMCApp::CXBMCApp(ANativeActivity* nativeActivity)
   : CJNIMainActivity(nativeActivity)
   , CJNIBroadcastReceiver(CJNIContext::getPackageName() + ".XBMCBroadcastReceiver")
+  , CJNIXBMCInputDeviceListener()
   , m_videosurfaceInUse(false)
 {
   m_xbmcappinstance = this;

xbmc/platform/android/activity/XBMCApp.h

@@ -52,6 +52,7 @@
 #include "JNIXBMCAudioManagerOnAudioFocusChangeListener.h"
 #include "JNIXBMCMainView.h"
 #include "JNIXBMCMediaSession.h"
+#include "JNIXBMCInputDeviceListener.h"
 #include "platform/xbmc.h"
 
 // forward delares
@@ -113,6 +114,7 @@ class CXBMCApp
     , public CJNIBroadcastReceiver
     , public ANNOUNCEMENT::IAnnouncer
     , public CJNISurfaceHolderCallback
+    , public jni::CJNIXBMCInputDeviceListener
 {
 public:
   CXBMCApp(ANativeActivity *nativeActivity);