Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
CastagnaIT merged 4 commits into from
Mar 8, 2026
+11 −12
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f8ff2ac
[widevine][android] set base class name to JNIBase
CastagnaIT Mar 7, 2026
86a476b
[widevine][android] rename getenv variable
CastagnaIT Mar 7, 2026
b091523
[widevine][android] Log base class name
CastagnaIT Mar 8, 2026
8fc5117
[depends] bump libandroidjni
CastagnaIT Mar 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion depends/android/libandroidjni/libandroidjni.sha256
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
e489e131705751a713e86799b347dff24463c7b6f36ace986e7c2449f9acb82f
44a65c4f936cfa6b4b0114eee7a809efeb26a3fa442f70e95c998183d252953c
2 changes: 1 addition & 1 deletion depends/android/libandroidjni/libandroidjni.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
libandroidjni https://github.com/xbmc/libandroidjni/archive/8e59504d0b914ad7cb4bed3acfce846aff1c375e.tar.gz
libandroidjni https://github.com/xbmc/libandroidjni/archive/2f8346bbe794cc3bd41b4195a59f0470470aa52e.tar.gz
19 changes: 9 additions & 10 deletions src/decrypters/widevineandroid/WVDecrypter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Comment thread
CastagnaIT marked this conversation as resolved.

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");
Expand Down
⚡