Improve subscription upsert methods

Author: Isira-Seneviratne

app/src/main/java/org/schabi/newpipe/database/subscription/SubscriptionDAO.kt

@@ -90,7 +90,7 @@ abstract class SubscriptionDAO : BasicDAO<SubscriptionEntity> {
     internal abstract fun silentInsertAllInternal(entities: List<SubscriptionEntity>): List<Long>
 
     @Transaction
-    open fun upsertAll(entities: List<SubscriptionEntity>): List<SubscriptionEntity> {
+    open fun upsertAll(entities: List<SubscriptionEntity>) {
         val insertUidList = silentInsertAllInternal(entities)
 
         insertUidList.forEachIndexed { index: Int, uidFromInsert: Long ->
@@ -106,7 +106,5 @@ abstract class SubscriptionDAO : BasicDAO<SubscriptionEntity> {
                 update(entity)
             }
         }
-
-        return entities
     }
 }

app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionManager.kt

@@ -48,23 +48,16 @@ class SubscriptionManager(context: Context) {
         }
     }
 
-    fun upsertAll(infoList: List<Pair<ChannelInfo, List<ChannelTabInfo>>>): List<SubscriptionEntity> {
-        val listEntities = subscriptionTable.upsertAll(
-            infoList.map { SubscriptionEntity.from(it.first) }
-        )
+    fun upsertAll(infoList: List<Pair<ChannelInfo, ChannelTabInfo>>) {
+        val listEntities = infoList.map { SubscriptionEntity.from(it.first) }
+        subscriptionTable.upsertAll(listEntities)
 
         database.runInTransaction {
             infoList.forEachIndexed { index, info ->
-                info.second.forEach {
-                    feedDatabaseManager.upsertAll(
-                        listEntities[index].uid,
-                        it.relatedItems.filterIsInstance<StreamInfoItem>()
-                    )
-                }
+                val streams = info.second.relatedItems.filterIsInstance<StreamInfoItem>()
+                feedDatabaseManager.upsertAll(listEntities[index].uid, streams)
             }
         }
-
-        return listEntities
     }
 
     fun updateChannelInfo(info: ChannelInfo): Completable =

app/src/main/java/org/schabi/newpipe/local/subscription/workers/SubscriptionImportWorker.kt

@@ -77,7 +77,7 @@ class SubscriptionImportWorker(
                         val currentIndex = mutex.withLock { index++ }
                         setForeground(createForegroundInfo(title, channelInfo.name, currentIndex, qty))
 
-                        Pair(channelInfo, listOf(channelTab))
+                        Pair(channelInfo, channelTab)
                     }
                 }.awaitAll()
         }