Fix metadata for notification

Author: gcandrade10

app/schemas/org.schabi.newpipe.database.AppDatabase/10.json

@@ -2,7 +2,7 @@
   "formatVersion": 1,
   "database": {
     "version": 10,
-    "identityHash": "8401456768674521d2a28a221a37406c",
+    "identityHash": "97b77504ce430e914b8e8628f548c03c",
     "entities": [
       {
         "tableName": "subscriptions",
@@ -722,7 +722,7 @@
       },
       {
         "tableName": "download",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`creation_date` INTEGER NOT NULL, `id_key` TEXT NOT NULL, `url_key` TEXT NOT NULL, `uri_value` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`creation_date` INTEGER NOT NULL, `id_key` TEXT NOT NULL, `url_key` TEXT NOT NULL, `uri_value` TEXT NOT NULL, `name` TEXT NOT NULL, `uploader_name` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
         "fields": [
           {
             "fieldPath": "creationDate",
@@ -748,6 +748,18 @@
             "affinity": "TEXT",
             "notNull": true
           },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "uploaderName",
+            "columnName": "uploader_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
           {
             "fieldPath": "id",
             "columnName": "id",
@@ -768,7 +780,7 @@
     "views": [],
     "setupQueries": [
       "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
-      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '8401456768674521d2a28a221a37406c')"
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '97b77504ce430e914b8e8628f548c03c')"
     ]
   }
 }

app/src/main/java/org/schabi/newpipe/database/download/entry/DownloadEntry.kt

@@ -10,7 +10,9 @@ data class DownloadEntry(
     @field:ColumnInfo(name = CREATION_DATE) var creationDate: OffsetDateTime,
     @field:ColumnInfo(name = ID_KEY) var idKey: String,
     @field:ColumnInfo(name = URL_KEY) var url: String,
-    @field:ColumnInfo(name = URI_VALUE) var uriValue: String
+    @field:ColumnInfo(name = URI_VALUE) var uriValue: String,
+    @field:ColumnInfo(name = NAME) var name: String,
+    @field:ColumnInfo(name = UPLOADER_NAME) var uploaderName: String
 ) {
     @ColumnInfo(name = ID)
     @PrimaryKey(autoGenerate = true)
@@ -23,5 +25,7 @@ data class DownloadEntry(
         const val URL_KEY = "url_key"
         const val URI_VALUE = "uri_value"
         const val CREATION_DATE = "creation_date"
+        const val NAME = "name"
+        const val UPLOADER_NAME = "uploader_name"
     }
 }

app/src/main/java/org/schabi/newpipe/download/DownloadDialog.java

@@ -1156,9 +1156,12 @@ private void continueSelectedDownload(@NonNull final StoredFileHelper storage) {
             Log.d("GERRR", "continueSelectedDownload: " + data);
         }
 
+        final String name = currentInfo.getName();
+        final String uploaderName = currentInfo.getUploaderName();
+
         // TODO improve error handling
         disposables.add(recordManager.insert(currentInfo.getId(), storage.getUri().toString(),
-                        currentInfo.getUrl()).onErrorComplete()
+                        currentInfo.getUrl(), name, uploaderName).onErrorComplete()
                 .subscribe(
                         ignored -> {
                             /* successful */

app/src/main/java/org/schabi/newpipe/download/DownloadHelper.kt

@@ -353,8 +353,11 @@ private fun continueSelectedDownload(
 
     val disposables = CompositeDisposable()
 
+    val name = currentInfo.name
+    val uploaderName = currentInfo.uploaderName
+
     disposables.add(
-        recordManager.insert(currentInfo.id, storage.uri.toString(), currentInfo.url).onErrorComplete()
+        recordManager.insert(currentInfo.id, storage.uri.toString(), currentInfo.url, name, uploaderName).onErrorComplete()
             .subscribe(
                 { ignored: Long? ->
                     /* successful */

app/src/main/java/org/schabi/newpipe/local/download/DownloadRecordManager.kt

@@ -20,11 +20,11 @@ class DownloadRecordManager(context: Context) {
         downloadTable = database.downloadDAO()
     }
 
-    fun insert(key: String, uri: String, url: String): Maybe<Long> {
+    fun insert(key: String, uri: String, url: String, name: String, uploaderName: String): Maybe<Long> {
         return Maybe.fromCallable {
             database.runInTransaction<Long> {
                 val currentTime = OffsetDateTime.now(ZoneOffset.UTC)
-                downloadTable.insert(DownloadEntry(currentTime, key, url, uri))
+                downloadTable.insert(DownloadEntry(currentTime, key, url, uri, name, uploaderName))
             }
         }.subscribeOn(Schedulers.io())
     }

app/src/main/java/org/schabi/newpipe/player/mediaitem/MediaTagImpl.kt

@@ -0,0 +1,42 @@
+package org.schabi.newpipe.player.mediaitem
+
+import org.schabi.newpipe.extractor.stream.StreamType
+import java.util.Optional
+
+class MediaTagImpl(private val pTitle: String, private val pUploaderName: String) : MediaItemTag {
+
+    private val extras: Any? = null
+    override fun getErrors(): MutableList<Exception> = mutableListOf()
+
+    override fun getServiceId(): Int = -1
+
+    override fun getTitle(): String {
+        return pTitle
+    }
+
+    override fun getUploaderName(): String {
+        return pUploaderName
+    }
+
+    override fun getDurationSeconds(): Long = 0L
+
+    override fun getStreamUrl(): String = ""
+
+    override fun getThumbnailUrl(): String = ""
+
+    override fun getUploaderUrl(): String = ""
+
+    override fun getStreamType(): StreamType = StreamType.AUDIO_STREAM
+
+    override fun <T> getMaybeExtras(type: Class<T>): Optional<T>? {
+        return Optional.ofNullable<Any>(extras).map<T> { obj: Any? ->
+            type.cast(
+                obj
+            )
+        }
+    }
+
+    override fun <T : Any?> withExtras(extra: T & Any): MediaItemTag {
+        return MediaTagImpl("withExtras", "withExtras")
+    }
+}

app/src/main/java/org/schabi/newpipe/player/playback/MediaSourceManager.java

@@ -17,6 +17,7 @@
 import org.schabi.newpipe.extractor.exceptions.ExtractionException;
 import org.schabi.newpipe.local.download.DownloadRecordManager;
 import org.schabi.newpipe.player.mediaitem.MediaItemTag;
+import org.schabi.newpipe.player.mediaitem.MediaTagImpl;
 import org.schabi.newpipe.player.mediasource.FailedMediaSource;
 import org.schabi.newpipe.player.mediasource.LoadedMediaSource;
 import org.schabi.newpipe.player.mediasource.LocalMediaSource;
@@ -447,7 +448,11 @@ private void maybeLoadItem(@NonNull final PlayQueueItem item) {
                 final MediaItem mediaItem = new MediaItem.Builder()
                         .setUri(audioUri)
                         .setMediaId(item.getUrl())
-                        .setTag(audioUri)
+                        .setTag(
+                                new MediaTagImpl(
+                                        downloadEntry.getName(),
+                                        downloadEntry.getUploaderName())
+                        )
                         .build();
 
                 final ProgressiveMediaSource mediaSource =