From e5771f4c95b0d50650456f6779a29915270cfb58 Mon Sep 17 00:00:00 2001 From: Bill Thornton Date: Thu, 16 Jan 2020 10:59:23 -0500 Subject: [PATCH] Fix ChannelManager crash on older API levels --- .editorconfig | 6 ++++-- .../java/org/jellyfin/androidtv/channels/ChannelManager.kt | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.editorconfig b/.editorconfig index 744d8a919..7f21f1bf3 100644 --- a/.editorconfig +++ b/.editorconfig @@ -1,6 +1,8 @@ +[*] +end_of_line = lf +insert_final_newline = true + [{*.kts, *.kt}] charset = utf-8 -end_of_line = crlf -insert_final_newline = true indent_style = tab tab_width = 4 diff --git a/app/src/main/java/org/jellyfin/androidtv/channels/ChannelManager.kt b/app/src/main/java/org/jellyfin/androidtv/channels/ChannelManager.kt index 04732c7b1..049f64eb4 100644 --- a/app/src/main/java/org/jellyfin/androidtv/channels/ChannelManager.kt +++ b/app/src/main/java/org/jellyfin/androidtv/channels/ChannelManager.kt @@ -2,6 +2,7 @@ package org.jellyfin.androidtv.channels import android.content.Intent import android.net.Uri +import android.os.Build import androidx.tvprovider.media.tv.TvContractCompat.WatchNextPrograms import androidx.tvprovider.media.tv.WatchNextProgram import kotlinx.coroutines.Dispatchers @@ -33,9 +34,10 @@ class ChannelManager { private val application = TvApp.getApplication() /** - * Check if the app can use Leanback features + * Check if the app can use Leanback features and is API level 26 or higher */ - private val isSupported = application.packageManager.hasSystemFeature("android.software.leanback") + private val isSupported = Build.VERSION.SDK_INT >= Build.VERSION_CODES.O + && application.packageManager.hasSystemFeature("android.software.leanback") /** * Update all channels for the currently authenticated user