Merge branch 'dev' into bumpFragment

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -1,6 +1,6 @@
 name: Bug report
 description: Create a bug report to help us improve
-labels: [bug]
+labels: [bug, needs triage]
 body:
   - type: markdown
     attributes:

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -1,6 +1,6 @@
 name: Feature request
 description: Suggest an idea for this project
-labels: [enhancement]
+labels: [enhancement, needs triage]
 body:
   - type: markdown
     attributes:

.github/ISSUE_TEMPLATE/question.yml

@@ -1,6 +1,6 @@
 name: Question
 description: Ask about anything NewPipe-related
-labels: [question]
+labels: [question, needs triage]
 body:
   - type: markdown
     attributes:

app/build.gradle

@@ -97,12 +97,12 @@ android {
 ext {
     checkstyleVersion = '10.3.1'
 
-    androidxLifecycleVersion = '2.3.1'
+    androidxLifecycleVersion = '2.5.1'
     androidxRoomVersion = '2.4.2'
     androidxWorkVersion = '2.7.1'
 
     icepickVersion = '3.2.0'
-    exoPlayerVersion = '2.18.0'
+    exoPlayerVersion = '2.18.1'
     googleAutoServiceVersion = '1.0.1'
     groupieVersion = '2.10.1'
     markwonVersion = '4.6.2'
@@ -203,8 +203,8 @@ dependencies {
     implementation 'androidx.core:core-ktx:1.8.0'
     implementation 'androidx.documentfile:documentfile:1.0.1'
     implementation 'androidx.fragment:fragment-ktx:1.4.1'
-    implementation "androidx.lifecycle:lifecycle-livedata:${androidxLifecycleVersion}"
+    implementation "androidx.lifecycle:lifecycle-livedata-ktx:${androidxLifecycleVersion}"
-    implementation "androidx.lifecycle:lifecycle-viewmodel:${androidxLifecycleVersion}"
+    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:${androidxLifecycleVersion}"
     implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.1.0'
     implementation 'androidx.media:media:1.6.0'
     implementation 'androidx.preference:preference:1.2.0'

app/src/main/java/org/schabi/newpipe/local/feed/FeedFragment.kt

@@ -135,8 +135,8 @@ class FeedFragment : BaseStateFragment<FeedState>() {
         _feedBinding = FragmentFeedBinding.bind(rootView)
         super.onViewCreated(rootView, savedInstanceState)
 
-        val factory = FeedViewModel.Factory(requireContext(), groupId)
+        val factory = FeedViewModel.getFactory(requireContext(), groupId)
-        viewModel = ViewModelProvider(this, factory).get(FeedViewModel::class.java)
+        viewModel = ViewModelProvider(this, factory)[FeedViewModel::class.java]
         showPlayedItems = viewModel.getShowPlayedItemsFromPreferences()
         showFutureItems = viewModel.getShowFutureItemsFromPreferences()
         viewModel.stateLiveData.observe(viewLifecycleOwner) { it?.let(::handleResult) }

app/src/main/java/org/schabi/newpipe/local/feed/FeedViewModel.kt

@@ -1,17 +1,20 @@
 package org.schabi.newpipe.local.feed
 
+import android.app.Application
 import android.content.Context
 import androidx.core.content.edit
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
-import androidx.lifecycle.ViewModelProvider
+import androidx.lifecycle.viewmodel.initializer
+import androidx.lifecycle.viewmodel.viewModelFactory
 import androidx.preference.PreferenceManager
 import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
 import io.reactivex.rxjava3.core.Flowable
 import io.reactivex.rxjava3.functions.Function5
 import io.reactivex.rxjava3.processors.BehaviorProcessor
 import io.reactivex.rxjava3.schedulers.Schedulers
+import org.schabi.newpipe.App
 import org.schabi.newpipe.R
 import org.schabi.newpipe.database.feed.model.FeedGroupEntity
 import org.schabi.newpipe.database.stream.StreamWithState
@@ -26,12 +29,12 @@ import java.time.OffsetDateTime
 import java.util.concurrent.TimeUnit
 
 class FeedViewModel(
-    private val applicationContext: Context,
+    private val application: Application,
     groupId: Long = FeedGroupEntity.GROUP_ALL_ID,
     initialShowPlayedItems: Boolean = true,
     initialShowFutureItems: Boolean = true
 ) : ViewModel() {
-    private var feedDatabaseManager: FeedDatabaseManager = FeedDatabaseManager(applicationContext)
+    private val feedDatabaseManager = FeedDatabaseManager(application)
 
     private val toggleShowPlayedItems = BehaviorProcessor.create<Boolean>()
     private val toggleShowPlayedItemsFlowable = toggleShowPlayedItems
@@ -113,24 +116,24 @@ class FeedViewModel(
     }
 
     fun saveShowPlayedItemsToPreferences(showPlayedItems: Boolean) =
-        PreferenceManager.getDefaultSharedPreferences(applicationContext).edit {
+        PreferenceManager.getDefaultSharedPreferences(application).edit {
-            this.putBoolean(applicationContext.getString(R.string.feed_show_played_items_key), showPlayedItems)
+            this.putBoolean(application.getString(R.string.feed_show_played_items_key), showPlayedItems)
             this.apply()
         }
 
-    fun getShowPlayedItemsFromPreferences() = getShowPlayedItemsFromPreferences(applicationContext)
+    fun getShowPlayedItemsFromPreferences() = getShowPlayedItemsFromPreferences(application)
 
     fun toggleFutureItems(showFutureItems: Boolean) {
         toggleShowFutureItems.onNext(showFutureItems)
     }
 
     fun saveShowFutureItemsToPreferences(showFutureItems: Boolean) =
-        PreferenceManager.getDefaultSharedPreferences(applicationContext).edit {
+        PreferenceManager.getDefaultSharedPreferences(application).edit {
-            this.putBoolean(applicationContext.getString(R.string.feed_show_future_items_key), showFutureItems)
+            this.putBoolean(application.getString(R.string.feed_show_future_items_key), showFutureItems)
             this.apply()
         }
 
-    fun getShowFutureItemsFromPreferences() = getShowFutureItemsFromPreferences(applicationContext)
+    fun getShowFutureItemsFromPreferences() = getShowFutureItemsFromPreferences(application)
 
     companion object {
         private fun getShowPlayedItemsFromPreferences(context: Context) =
@@ -139,21 +142,16 @@ class FeedViewModel(
         private fun getShowFutureItemsFromPreferences(context: Context) =
             PreferenceManager.getDefaultSharedPreferences(context)
                 .getBoolean(context.getString(R.string.feed_show_future_items_key), true)
-    }
+        fun getFactory(context: Context, groupId: Long) = viewModelFactory {
-
+            initializer {
-    class Factory(
+                FeedViewModel(
-        private val context: Context,
+                    App.getApp(),
-        private val groupId: Long = FeedGroupEntity.GROUP_ALL_ID
+                    groupId,
-    ) : ViewModelProvider.Factory {
+                    // Read initial value from preferences
-        @Suppress("UNCHECKED_CAST")
+                    getShowPlayedItemsFromPreferences(context.applicationContext),
-        override fun <T : ViewModel?> create(modelClass: Class<T>): T {
+                    getShowFutureItemsFromPreferences(context.applicationContext)
-            return FeedViewModel(
+                )
-                context.applicationContext,
+            }
-                groupId,
-                // Read initial value from preferences
-                getShowPlayedItemsFromPreferences(context.applicationContext),
-                getShowFutureItemsFromPreferences(context.applicationContext)
-            ) as T
         }
     }
 }

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

@@ -122,7 +122,7 @@ class FeedGroupDialogViewModel(
         private val initialShowOnlyUngrouped: Boolean = false
     ) : ViewModelProvider.Factory {
         @Suppress("UNCHECKED_CAST")
-        override fun <T : ViewModel?> create(modelClass: Class<T>): T {
+        override fun <T : ViewModel> create(modelClass: Class<T>): T {
             return FeedGroupDialogViewModel(
                 context.applicationContext,
                 groupId, initialQuery, initialShowOnlyUngrouped

app/src/main/java/org/schabi/newpipe/player/datasource/YoutubeHttpDataSource.java

@@ -1,5 +1,5 @@
 /*
- * Based on ExoPlayer's DefaultHttpDataSource, version 2.18.0.
+ * Based on ExoPlayer's DefaultHttpDataSource, version 2.18.1.
  *
  * Original source code copyright (C) 2016 The Android Open Source Project, licensed under the
  * Apache License, Version 2.0.