kavin/LibreTube
1
0
Fork 0
mirror of https://github.com/libre-tube/LibreTube.git synced 2025-04-28 16:00:31 +05:30
Code Issues Projects Releases Wiki Activity

fixes

Browse Source
This commit is contained in:
Bnyro 2022-09-08 21:05:51 +02:00
parent 726ef9276f
commit 316bd539a2
3 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/github/libretube/adapters/PlaylistAdapter.kt
View File

@ -58,7 +58,7 @@ class PlaylistAdapter(
root.setOnClickListener { root.setOnClickListener {
NavigationHelper.navigateVideo(root.context, streamItem.url, playlistId) NavigationHelper.navigateVideo(root.context, streamItem.url, playlistId)
} }
val videoId = streamItem.url.toID() val videoId = streamItem.url!!.toID()
root.setOnLongClickListener { root.setOnLongClickListener {
VideoOptionsDialog(videoId) VideoOptionsDialog(videoId)
.show(childFragmentManager, VideoOptionsDialog::class.java.name) .show(childFragmentManager, VideoOptionsDialog::class.java.name)

2
app/src/main/java/com/github/libretube/db/DatabaseHelper.kt
View File

@ -15,7 +15,7 @@ object DatabaseHelper {
streams.title, streams.title,
streams.uploadDate, streams.uploadDate,
streams.uploader, streams.uploader,
streams.uploaderUrl.toID(), streams.uploaderUrl!!.toID(),
streams.uploaderAvatar, streams.uploaderAvatar,
streams.thumbnailUrl, streams.thumbnailUrl,
streams.duration streams.duration

17
app/src/main/java/com/github/libretube/util/NotificationHelper.kt
View File

@ -4,6 +4,7 @@ import android.app.NotificationManager
import android.app.PendingIntent import android.app.PendingIntent
import android.content.Context import android.content.Context
import android.content.Intent import android.content.Intent
import android.os.Build
import androidx.core.app.NotificationCompat import androidx.core.app.NotificationCompat
import androidx.core.app.NotificationManagerCompat import androidx.core.app.NotificationManagerCompat
import androidx.work.Constraints import androidx.work.Constraints
@ -30,7 +31,11 @@ class NotificationHelper(
context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
// the id where notification channels start // the id where notification channels start
private var notificationId = NotificationManager.activeNotifications.size + 5 private var notificationId = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
NotificationManager.activeNotifications.size + 5
} else {
5
}
/** /**
* Enqueue the work manager task * Enqueue the work manager task
@ -117,7 +122,7 @@ class NotificationHelper(
} }
val lastSeenStreamId = PreferenceHelper.getLatestVideoId() val lastSeenStreamId = PreferenceHelper.getLatestVideoId()
val latestFeedStreamId = videoFeed[0].url.toID() val latestFeedStreamId = videoFeed[0].url!!.toID()
// first time notifications enabled or no new video available // first time notifications enabled or no new video available
if (lastSeenStreamId == "" || lastSeenStreamId == latestFeedStreamId) { if (lastSeenStreamId == "" || lastSeenStreamId == latestFeedStreamId) {
@ -126,7 +131,7 @@ class NotificationHelper(
} }
// filter the new videos out // filter the new videos out
val lastSeenStreamItem = videoFeed.filter { it.url.toID() == lastSeenStreamId } val lastSeenStreamItem = videoFeed.filter { it.url!!.toID() == lastSeenStreamId }
// previous video not found // previous video not found
if (lastSeenStreamItem.isEmpty()) return@runBlocking if (lastSeenStreamItem.isEmpty()) return@runBlocking
@ -141,7 +146,7 @@ class NotificationHelper(
// create a notification for each new stream // create a notification for each new stream
channelGroups.forEach { (_, streams) -> channelGroups.forEach { (_, streams) ->
createNotification( createNotification(
group = streams[0].uploaderUrl.toID(), group = streams[0].uploaderUrl!!.toID(),
title = streams[0].uploaderName.toString(), title = streams[0].uploaderName.toString(),
isSummary = true isSummary = true
) )
@ -151,12 +156,12 @@ class NotificationHelper(
createNotification( createNotification(
title = streamItem.title.toString(), title = streamItem.title.toString(),
description = streamItem.uploaderName.toString(), description = streamItem.uploaderName.toString(),
group = streamItem.uploaderUrl.toID() group = streamItem.uploaderUrl!!.toID()
) )
} }
} }
// save the latest streams that got notified about // save the latest streams that got notified about
PreferenceHelper.setLatestVideoId(videoFeed[0].url.toID()) PreferenceHelper.setLatestVideoId(videoFeed[0].url!!.toID())
} }
// return whether the work succeeded // return whether the work succeeded
return success return success