diff -Nru kodi-20.0+git20221121.0300-41de6b9949/BUILDDATE kodi-20.0+git20221123.0301-0e150116aa/BUILDDATE --- kodi-20.0+git20221121.0300-41de6b9949/BUILDDATE 2013-05-12 08:41:54.000000000 +0000 +++ kodi-20.0+git20221123.0301-0e150116aa/BUILDDATE 2013-05-12 08:41:54.000000000 +0000 @@ -1 +1 @@ -20221121 +20221123 diff -Nru kodi-20.0+git20221121.0300-41de6b9949/debian/changelog kodi-20.0+git20221123.0301-0e150116aa/debian/changelog --- kodi-20.0+git20221121.0300-41de6b9949/debian/changelog 2013-05-12 08:41:54.000000000 +0000 +++ kodi-20.0+git20221123.0301-0e150116aa/debian/changelog 2013-05-12 08:41:54.000000000 +0000 @@ -1,4 +1,4 @@ -kodi (6:20.0+git20221121.0300-41de6b9949-0~focal) focal; urgency=medium +kodi (6:20.0+git20221123.0301-0e150116aa-0~focal) focal; urgency=medium [ kodi ] * autogenerated dummy changelog diff -Nru kodi-20.0+git20221121.0300-41de6b9949/tools/android/packaging/xbmc/src/Main.java.in kodi-20.0+git20221123.0301-0e150116aa/tools/android/packaging/xbmc/src/Main.java.in --- kodi-20.0+git20221121.0300-41de6b9949/tools/android/packaging/xbmc/src/Main.java.in 2013-05-12 08:41:54.000000000 +0000 +++ kodi-20.0+git20221123.0301-0e150116aa/tools/android/packaging/xbmc/src/Main.java.in 2013-05-12 08:41:54.000000000 +0000 @@ -171,21 +171,14 @@ { public void run() { - if (android.os.Build.VERSION.SDK_INT >= 19) - { - // Immersive mode - - // Constants from API > 17 - final int API_SYSTEM_UI_FLAG_IMMERSIVE_STICKY = 0x00001000; - - mDecorView.setSystemUiVisibility( - View.SYSTEM_UI_FLAG_LAYOUT_STABLE - | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION - | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN - | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION - | View.SYSTEM_UI_FLAG_FULLSCREEN - | API_SYSTEM_UI_FLAG_IMMERSIVE_STICKY); - } + // Immersive mode + mDecorView.setSystemUiVisibility( + View.SYSTEM_UI_FLAG_LAYOUT_STABLE + | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION + | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN + | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION + | View.SYSTEM_UI_FLAG_FULLSCREEN + | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY); } }); } @@ -225,22 +218,15 @@ { super.onResume(); - if (android.os.Build.VERSION.SDK_INT >= 19) - { - // Immersive mode - - // Constants from API > 17 - final int API_SYSTEM_UI_FLAG_IMMERSIVE_STICKY = 0x00001000; - - mDecorView.setSystemUiVisibility( - View.SYSTEM_UI_FLAG_LAYOUT_STABLE - | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION - | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN - | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION - | View.SYSTEM_UI_FLAG_FULLSCREEN - | API_SYSTEM_UI_FLAG_IMMERSIVE_STICKY); - } - + // Immersive mode + mDecorView.setSystemUiVisibility( + View.SYSTEM_UI_FLAG_LAYOUT_STABLE + | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION + | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN + | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION + | View.SYSTEM_UI_FLAG_FULLSCREEN + | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY); + // New intent ? for (final DelayedIntent delayedIntent : mDelayedIntents) { diff -Nru kodi-20.0+git20221121.0300-41de6b9949/VERSION kodi-20.0+git20221123.0301-0e150116aa/VERSION --- kodi-20.0+git20221121.0300-41de6b9949/VERSION 2013-05-12 08:41:54.000000000 +0000 +++ kodi-20.0+git20221123.0301-0e150116aa/VERSION 2013-05-12 08:41:54.000000000 +0000 @@ -1 +1 @@ -41de6b9949 +0e150116aa diff -Nru kodi-20.0+git20221121.0300-41de6b9949/xbmc/cores/VideoPlayer/DVDCodecs/Audio/DVDAudioCodecAndroidMediaCodec.cpp kodi-20.0+git20221123.0301-0e150116aa/xbmc/cores/VideoPlayer/DVDCodecs/Audio/DVDAudioCodecAndroidMediaCodec.cpp --- kodi-20.0+git20221121.0300-41de6b9949/xbmc/cores/VideoPlayer/DVDCodecs/Audio/DVDAudioCodecAndroidMediaCodec.cpp 2013-05-12 08:41:54.000000000 +0000 +++ kodi-20.0+git20221123.0301-0e150116aa/xbmc/cores/VideoPlayer/DVDCodecs/Audio/DVDAudioCodecAndroidMediaCodec.cpp 2013-05-12 08:41:54.000000000 +0000 @@ -26,8 +26,6 @@ #include "utils/StringUtils.h" #include "utils/log.h" -#include "platform/android/activity/AndroidFeatures.h" - #include #include diff -Nru kodi-20.0+git20221121.0300-41de6b9949/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecAndroidMediaCodec.cpp kodi-20.0+git20221123.0301-0e150116aa/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecAndroidMediaCodec.cpp --- kodi-20.0+git20221121.0300-41de6b9949/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecAndroidMediaCodec.cpp 2013-05-12 08:41:54.000000000 +0000 +++ kodi-20.0+git20221123.0301-0e150116aa/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecAndroidMediaCodec.cpp 2013-05-12 08:41:54.000000000 +0000 @@ -32,7 +32,6 @@ #include "utils/log.h" #include "windowing/android/AndroidUtils.h" -#include "platform/android/activity/AndroidFeatures.h" #include "platform/android/activity/JNIXBMCSurfaceTextureOnFrameAvailableListener.h" #include "platform/android/activity/XBMCApp.h" diff -Nru kodi-20.0+git20221121.0300-41de6b9949/xbmc/platform/android/activity/AndroidFeatures.cpp kodi-20.0+git20221123.0301-0e150116aa/xbmc/platform/android/activity/AndroidFeatures.cpp --- kodi-20.0+git20221121.0300-41de6b9949/xbmc/platform/android/activity/AndroidFeatures.cpp 2013-05-12 08:41:54.000000000 +0000 +++ kodi-20.0+git20221123.0301-0e150116aa/xbmc/platform/android/activity/AndroidFeatures.cpp 2013-05-12 08:41:54.000000000 +0000 @@ -25,38 +25,6 @@ return false; } -int CAndroidFeatures::GetVersion() -{ - static int version = -1; - - if (version == -1) - { - version = 0; - - JNIEnv *jenv = xbmc_jnienv(); - - jclass jcOsBuild = jenv->FindClass("android/os/Build$VERSION"); - if (jcOsBuild == NULL) - { - CLog::Log(LOGERROR, "{}: Error getting class android.os.Build.VERSION", __PRETTY_FUNCTION__); - return version; - } - - jint iSdkVersion = jenv->GetStaticIntField(jcOsBuild, jenv->GetStaticFieldID(jcOsBuild, "SDK_INT", "I")); - CLog::Log(LOGDEBUG, "{}: android.os.Build.VERSION {}", __PRETTY_FUNCTION__, (int)iSdkVersion); - - // <= 10 Gingerbread - // <= 13 Honeycomb - // <= 15 IceCreamSandwich - // JellyBean - // <= 19 KitKat - version = iSdkVersion; - - jenv->DeleteLocalRef(jcOsBuild); - } - return version; -} - int CAndroidFeatures::GetCPUCount() { static int count = -1; diff -Nru kodi-20.0+git20221121.0300-41de6b9949/xbmc/platform/android/activity/AndroidFeatures.h kodi-20.0+git20221123.0301-0e150116aa/xbmc/platform/android/activity/AndroidFeatures.h --- kodi-20.0+git20221121.0300-41de6b9949/xbmc/platform/android/activity/AndroidFeatures.h 2013-05-12 08:41:54.000000000 +0000 +++ kodi-20.0+git20221123.0301-0e150116aa/xbmc/platform/android/activity/AndroidFeatures.h 2013-05-12 08:41:54.000000000 +0000 @@ -15,6 +15,5 @@ public: static bool HasNeon(); - static int GetVersion(); static int GetCPUCount(); }; diff -Nru kodi-20.0+git20221121.0300-41de6b9949/xbmc/platform/android/filesystem/AndroidAppFile.cpp kodi-20.0+git20221123.0301-0e150116aa/xbmc/platform/android/filesystem/AndroidAppFile.cpp --- kodi-20.0+git20221121.0300-41de6b9949/xbmc/platform/android/filesystem/AndroidAppFile.cpp 2013-05-12 08:41:54.000000000 +0000 +++ kodi-20.0+git20221123.0301-0e150116aa/xbmc/platform/android/filesystem/AndroidAppFile.cpp 2013-05-12 08:41:54.000000000 +0000 @@ -104,7 +104,7 @@ ? env->FindClass("android/graphics/drawable/AdaptiveIconDrawable") : nullptr; - if (CJNIBuild::SDK_INT >= 15 && m_icon) + if (m_icon) { CJNIResources res = CJNIContext::GetPackageManager().getResourcesForApplication(m_packageName); if (res) diff -Nru kodi-20.0+git20221121.0300-41de6b9949/xbmc/settings/SettingConditions.cpp kodi-20.0+git20221123.0301-0e150116aa/xbmc/settings/SettingConditions.cpp --- kodi-20.0+git20221121.0300-41de6b9949/xbmc/settings/SettingConditions.cpp 2013-05-12 08:41:54.000000000 +0000 +++ kodi-20.0+git20221123.0301-0e150116aa/xbmc/settings/SettingConditions.cpp 2013-05-12 08:41:54.000000000 +0000 @@ -13,9 +13,6 @@ #include "addons/Skin.h" #include "addons/addoninfo/AddonType.h" #include "application/AppParams.h" -#if defined(TARGET_ANDROID) -#include "platform/android/activity/AndroidFeatures.h" -#endif // defined(TARGET_ANDROID) #include "cores/AudioEngine/Engines/ActiveAE/ActiveAESettings.h" #include "ServiceBroker.h" #include "GUIPassword.h" diff -Nru kodi-20.0+git20221121.0300-41de6b9949/xbmc/video/ContextMenus.cpp kodi-20.0+git20221123.0301-0e150116aa/xbmc/video/ContextMenus.cpp --- kodi-20.0+git20221121.0300-41de6b9949/xbmc/video/ContextMenus.cpp 2013-05-12 08:41:54.000000000 +0000 +++ kodi-20.0+git20221123.0301-0e150116aa/xbmc/video/ContextMenus.cpp 2013-05-12 08:41:54.000000000 +0000 @@ -76,6 +76,9 @@ if (item.IsDeleted()) // e.g. trashed pvr recording return false; + if (item.m_bIsFolder && item.IsPlugin()) // we cannot manage plugin folder's watched state + return false; + if (item.m_bIsFolder) // Only allow video db content, video and recording folders to be updated recursively { if (item.HasVideoInfoTag()) @@ -102,6 +105,9 @@ if (item.IsDeleted()) // e.g. trashed pvr recording return false; + if (item.m_bIsFolder && item.IsPlugin()) // we cannot manage plugin folder's watched state + return false; + if (item.m_bIsFolder) // Only allow video db content, video and recording folders to be updated recursively { if (item.HasVideoInfoTag()) diff -Nru kodi-20.0+git20221121.0300-41de6b9949/xbmc/video/VideoUtils.cpp kodi-20.0+git20221123.0301-0e150116aa/xbmc/video/VideoUtils.cpp --- kodi-20.0+git20221121.0300-41de6b9949/xbmc/video/VideoUtils.cpp 2013-05-12 08:41:54.000000000 +0000 +++ kodi-20.0+git20221123.0301-0e150116aa/xbmc/video/VideoUtils.cpp 2013-05-12 08:41:54.000000000 +0000 @@ -495,6 +495,9 @@ ResumeInformation GetFolderItemResumeInformation(const CFileItem& item) { + if (!item.m_bIsFolder) + return {}; + bool hasInProgressVideo = false; CFileItem folderItem(item); @@ -637,7 +640,7 @@ if (bookmark.IsSet()) { - resumeInfo.isResumable = true; + resumeInfo.isResumable = bookmark.IsPartWay(); resumeInfo.startOffset = CUtil::ConvertSecsToMilliSecs(bookmark.timeInSeconds); resumeInfo.partNumber = static_cast(bookmark.partNumber); }