Merge pull request #2007 from CastagnaIT/jni_fixes

[widevine][android] Fix problem with hardcoded class names on jni objects

Author: CastagnaIT

depends/android/libandroidjni/libandroidjni.sha256

@@ -1 +1 @@
-e489e131705751a713e86799b347dff24463c7b6f36ace986e7c2449f9acb82f
+44a65c4f936cfa6b4b0114eee7a809efeb26a3fa442f70e95c998183d252953c

depends/android/libandroidjni/libandroidjni.txt

@@ -1 +1 @@
-libandroidjni https://github.com/xbmc/libandroidjni/archive/8e59504d0b914ad7cb4bed3acfce846aff1c375e.tar.gz
+libandroidjni https://github.com/xbmc/libandroidjni/archive/2f8346bbe794cc3bd41b4195a59f0470470aa52e.tar.gz

src/decrypters/widevineandroid/WVDecrypter.cpp

@@ -151,24 +151,23 @@ bool CWVDecrypterA::Initialize()
     return false;
   }
 
-  //JNIEnv* env = static_cast<JNIEnv*>(m_androidSystem.GetJNIEnv());
+  LOG::Log(LOGDEBUG, "WVDecrypter JNI, SDK version: %d, Base class name: %s",
+           m_androidSystem.GetSDKVersion(), m_androidSystem.GetClassName().c_str());
+
   CJNIBase::SetSDKVersion(m_androidSystem.GetSDKVersion());
-  //CJNIBase::SetBaseClassName(m_androidSystem.GetClassName()); ---> unused
-  LOG::Log(LOGDEBUG, "WVDecrypter JNI, SDK version: %d", m_androidSystem.GetSDKVersion());
+  CJNIBase::SetBaseClassName(m_androidSystem.GetClassName());
 
-  const char* apkEnv = getenv("XBMC_ANDROID_APK");
-  if (!apkEnv)
-    apkEnv = getenv("KODI_ANDROID_APK");
+  const char* apkPath = getenv("XBMC_ANDROID_APK");
+  if (!apkPath)
+    apkPath = getenv("KODI_ANDROID_APK");
 
-  if (!apkEnv)
+  if (!apkPath)
   {
     LOG::LogF(LOGERROR, "Cannot get enviroment XBMC_ANDROID_APK/KODI_ANDROID_APK value");
     return false;
   }
 
-  std::string apkPath = apkEnv;
-
-  m_classLoader = std::make_shared<CJNIClassLoader>(apkEnv);
+  m_classLoader = std::make_shared<CJNIClassLoader>(apkPath);
   if (xbmc_jnienv()->ExceptionCheck())
   {
     LOG::LogF(LOGERROR, "Failed to create ClassLoader");