diff -Nru kodi-18.0+git20181115.0201-6f8f706/BUILDDATE kodi-18.0+git20181116.0202-d99f45c/BUILDDATE --- kodi-18.0+git20181115.0201-6f8f706/BUILDDATE 2018-11-15 01:01:44.000000000 +0000 +++ kodi-18.0+git20181116.0202-d99f45c/BUILDDATE 2018-11-16 01:02:35.000000000 +0000 @@ -1 +1 @@ -20181115 +20181116 diff -Nru kodi-18.0+git20181115.0201-6f8f706/debian/changelog kodi-18.0+git20181116.0202-d99f45c/debian/changelog --- kodi-18.0+git20181115.0201-6f8f706/debian/changelog 2018-11-15 01:11:35.000000000 +0000 +++ kodi-18.0+git20181116.0202-d99f45c/debian/changelog 2018-11-16 01:13:00.000000000 +0000 @@ -1,4 +1,17 @@ -kodi (2:18.0+git20181115.0201-6f8f706-0xenial) xenial; urgency=high +kodi (2:18.0+git20181116.0202-d99f45c-0xenial) xenial; urgency=high + + [enen92] + * [docs] Trivial fixes to xbmc.Monitor docs + + [peak3d] + * [Android] check for valid winsystem when dispatching events + + [peak3d] + * fetch current libandroidjni version + + [enen92] + * Extend IsRemote check to some missing vfs paths (closes #14817) + [DaVukovic] * [docs] Adding FrameAdvance documentation diff -Nru kodi-18.0+git20181115.0201-6f8f706/debian/changelog.tmp kodi-18.0+git20181116.0202-d99f45c/debian/changelog.tmp --- kodi-18.0+git20181115.0201-6f8f706/debian/changelog.tmp 2018-11-15 01:02:13.000000000 +0000 +++ kodi-18.0+git20181116.0202-d99f45c/debian/changelog.tmp 2018-11-16 01:03:33.000000000 +0000 @@ -1,4 +1,17 @@ -kodi (2:18.0+git20181115.0201-6f8f706-0dist) dist; urgency=high +kodi (2:18.0+git20181116.0202-d99f45c-0dist) dist; urgency=high + + [enen92] + * [docs] Trivial fixes to xbmc.Monitor docs + + [peak3d] + * [Android] check for valid winsystem when dispatching events + + [peak3d] + * fetch current libandroidjni version + + [enen92] + * Extend IsRemote check to some missing vfs paths (closes #14817) + [DaVukovic] * [docs] Adding FrameAdvance documentation diff -Nru kodi-18.0+git20181115.0201-6f8f706/debian/changelog.tmp.old kodi-18.0+git20181116.0202-d99f45c/debian/changelog.tmp.old --- kodi-18.0+git20181115.0201-6f8f706/debian/changelog.tmp.old 2018-11-15 01:01:45.000000000 +0000 +++ kodi-18.0+git20181116.0202-d99f45c/debian/changelog.tmp.old 2018-11-16 01:02:35.000000000 +0000 @@ -1,5 +1,15 @@ kodi (2:18.0+git20180719.0202-3231481-0dist) dist; urgency=high + [DaVukovic] + * [docs] Adding FrameAdvance documentation + + [Wolfgang Haupt] + * VideoInfoTag: fix missing field overview for sets + + [Memphiz] + * [DetectDVDType]: in case DRIVER_OP_UNSUPPORTED is returned when checking traystate - ensure to treat it as NO_DVD_DRIVE. This fixes a crash where some raw disk on osx is wrongly detected as DVD Driver due to m_dwTrayState is initialised as TRAY_CLOSED_MEDIA_PRESENT and status is not checked for errors. + + [Kai Sommerfeld] * [pvr] Fix channel sorting. Fixes #14854. diff -Nru kodi-18.0+git20181115.0201-6f8f706/tools/depends/target/libandroidjni/Makefile kodi-18.0+git20181116.0202-d99f45c/tools/depends/target/libandroidjni/Makefile --- kodi-18.0+git20181115.0201-6f8f706/tools/depends/target/libandroidjni/Makefile 2018-10-03 07:06:26.000000000 +0000 +++ kodi-18.0+git20181116.0202-d99f45c/tools/depends/target/libandroidjni/Makefile 2018-11-16 01:02:23.000000000 +0000 @@ -3,7 +3,7 @@ # lib name, version LIBNAME=libandroidjni -VERSION=482232cc05102021e955e9d907b0047801fa47b4 +VERSION=aa12538cc5090d061d34b5fd7385d939ea82ce8b SOURCE=archive ARCHIVE=$(VERSION).tar.gz GIT_BASE_URL=https://github.com/xbmc diff -Nru kodi-18.0+git20181115.0201-6f8f706/VERSION kodi-18.0+git20181116.0202-d99f45c/VERSION --- kodi-18.0+git20181115.0201-6f8f706/VERSION 2018-11-15 01:01:44.000000000 +0000 +++ kodi-18.0+git20181116.0202-d99f45c/VERSION 2018-11-16 01:02:35.000000000 +0000 @@ -1 +1 @@ -6f8f706 +d99f45c diff -Nru kodi-18.0+git20181115.0201-6f8f706/xbmc/interfaces/legacy/Monitor.h kodi-18.0+git20181116.0202-d99f45c/xbmc/interfaces/legacy/Monitor.h --- kodi-18.0+git20181115.0201-6f8f706/xbmc/interfaces/legacy/Monitor.h 2018-07-31 18:47:39.000000000 +0000 +++ kodi-18.0+git20181116.0202-d99f45c/xbmc/interfaces/legacy/Monitor.h 2018-11-16 01:02:23.000000000 +0000 @@ -144,6 +144,8 @@ /// /// @note Will be called when library clean has ended and return video or /// music to indicate which library is being scanned + /// + /// ///----------------------------------------------------------------------- /// @python_v14 New function added. /// @@ -164,6 +166,8 @@ /// /// @note Will be called when library clean has ended and return video or /// music to indicate which library has been scanned + /// + /// ///----------------------------------------------------------------------- /// @python_v14 New function added. /// @@ -209,6 +213,8 @@ /// /// @note Will be called when library clean has ended and return video or /// music to indicate which library has been cleaned + /// + /// ///----------------------------------------------------------------------- /// @python_v14 New function added. /// @@ -229,6 +235,8 @@ /// /// @note Will be called when library clean has ended and return video or /// music to indicate which library has been finished + /// + /// ///----------------------------------------------------------------------- /// @python_v14 New function added. /// @@ -261,6 +269,8 @@ /// @param data JSON-encoded data of the notification /// /// @note Will be called when Kodi receives or sends a notification + /// + /// ///----------------------------------------------------------------------- /// @python_v13 New function added. /// @@ -280,9 +290,12 @@ /// /// @param timeout [opt] float - timeout in seconds. /// Default: no timeout. + /// /// @return True when abort have been requested, /// False if a timeout is given and the /// operation times out. + /// + /// ///----------------------------------------------------------------------- /// @python_v14 New function added. /// @@ -298,6 +311,8 @@ /// Returns True if abort has been requested. /// /// @return True if requested + /// + /// ///----------------------------------------------------------------------- /// @python_v14 New function added. /// diff -Nru kodi-18.0+git20181115.0201-6f8f706/xbmc/platform/android/activity/AndroidKey.cpp kodi-18.0+git20181116.0202-d99f45c/xbmc/platform/android/activity/AndroidKey.cpp --- kodi-18.0+git20181115.0201-6f8f706/xbmc/platform/android/activity/AndroidKey.cpp 2018-07-31 18:47:40.000000000 +0000 +++ kodi-18.0+git20181116.0202-d99f45c/xbmc/platform/android/activity/AndroidKey.cpp 2018-11-16 01:02:23.000000000 +0000 @@ -312,6 +312,10 @@ void CAndroidKey::XBMC_Key(uint8_t code, uint16_t key, uint16_t modifiers, uint16_t unicode, bool up) { + CWinSystemAndroid* winSystem(dynamic_cast(CServiceBroker::GetWinSystem())); + if (!winSystem) + return; + XBMC_Event newEvent; memset(&newEvent, 0, sizeof(newEvent)); @@ -323,5 +327,5 @@ newEvent.key.keysym.mod = (XBMCMod)modifiers; //CXBMCApp::android_printf("XBMC_Key(%u, %u, 0x%04X, %d)", code, key, modifiers, up); - dynamic_cast(CServiceBroker::GetWinSystem())->MessagePush(&newEvent); + winSystem->MessagePush(&newEvent); } diff -Nru kodi-18.0+git20181115.0201-6f8f706/xbmc/utils/test/TestURIUtils.cpp kodi-18.0+git20181116.0202-d99f45c/xbmc/utils/test/TestURIUtils.cpp --- kodi-18.0+git20181115.0201-6f8f706/xbmc/utils/test/TestURIUtils.cpp 2018-10-24 00:01:35.000000000 +0000 +++ kodi-18.0+git20181116.0202-d99f45c/xbmc/utils/test/TestURIUtils.cpp 2018-11-16 01:02:23.000000000 +0000 @@ -378,6 +378,11 @@ EXPECT_TRUE(URIUtils::IsRemote("https://path/to/file")); EXPECT_FALSE(URIUtils::IsRemote("addons://user/")); EXPECT_FALSE(URIUtils::IsRemote("sources://video/")); + EXPECT_FALSE(URIUtils::IsRemote("videodb://movies/titles")); + EXPECT_FALSE(URIUtils::IsRemote("musicdb://genres/")); + EXPECT_FALSE(URIUtils::IsRemote("library://video/")); + EXPECT_FALSE(URIUtils::IsRemote("androidapp://app")); + EXPECT_FALSE(URIUtils::IsRemote("plugin://plugin.video.id")); } TEST_F(TestURIUtils, IsSmb) diff -Nru kodi-18.0+git20181115.0201-6f8f706/xbmc/utils/URIUtils.cpp kodi-18.0+git20181116.0202-d99f45c/xbmc/utils/URIUtils.cpp --- kodi-18.0+git20181115.0201-6f8f706/xbmc/utils/URIUtils.cpp 2018-10-24 00:01:35.000000000 +0000 +++ kodi-18.0+git20181116.0202-d99f45c/xbmc/utils/URIUtils.cpp 2018-11-16 01:02:23.000000000 +0000 @@ -598,6 +598,18 @@ if (IsSourcesPath(strFile)) return false; + + if (IsVideoDb(strFile) || IsMusicDb(strFile)) + return false; + + if (IsLibraryFolder(strFile)) + return false; + + if (IsPlugin(strFile)) + return false; + + if (IsAndroidApp(strFile)) + return false; if (!url.IsLocal()) return true;