Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
VLC-Android
Manage
Activity
Members
Labels
Plan
Issues
528
Issue boards
Milestones
Wiki
Code
Merge requests
14
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
VideoLAN
VLC-Android
Commits
f3ede435
Commit
f3ede435
authored
4 years ago
by
Nicolas Pomepuy
Browse files
Options
Downloads
Patches
Plain Diff
Fix NPE on TV Channel creation
parent
b531b574
No related branches found
Branches containing commit
No related tags found
Tags containing commit
Loading
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
tools/src/main/java/videolan/org/commontools/TvChannelUtils.kt
+2
-1
2 additions, 1 deletion
.../src/main/java/videolan/org/commontools/TvChannelUtils.kt
with
2 additions
and
1 deletion
tools/src/main/java/videolan/org/commontools/TvChannelUtils.kt
+
2
−
1
View file @
f3ede435
...
...
@@ -27,10 +27,10 @@ import android.content.SharedPreferences
import
android.database.Cursor
import
android.net.Uri
import
android.os.Build
import
android.util.Log
import
androidx.annotation.RequiresApi
import
androidx.annotation.WorkerThread
import
androidx.tvprovider.media.tv.*
import
android.util.Log
typealias
ProgramsList
=
MutableList
<
TvPreviewProgram
>
...
...
@@ -58,6 +58,7 @@ fun createOrUpdateChannel(prefs: SharedPreferences, context: Context, name: Stri
.
setAppLinkIntentUri
(
createUri
(
appId
))
if
(
channelId
==
-
1L
)
{
val
channelUri
=
context
.
contentResolver
.
insert
(
TvContractCompat
.
Channels
.
CONTENT_URI
,
builder
.
build
().
toContentValues
())
?:
return
-
1L
channelId
=
ContentUris
.
parseId
(
channelUri
)
prefs
.
edit
().
putLong
(
KEY_TV_CHANNEL_ID
,
channelId
).
apply
()
TvContractCompat
.
requestChannelBrowsable
(
context
,
channelId
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment