Merge pull request #1961 from Bnyro/master

Fix the watch position pref

app/src/main/java/com/github/libretube/services/BackgroundMode.kt

@@ -131,7 +131,7 @@ class BackgroundMode : Service() {
                 streamItem.url?.toID()?.let { playNextVideo(it) }
             }
 
-            updateWatchPosition()
+            if (PlayerHelper.watchPositionsEnabled) updateWatchPosition()
         } catch (e: Exception) {
             onDestroy()
         }

app/src/main/java/com/github/libretube/ui/fragments/PlayerFragment.kt

@@ -501,11 +501,12 @@ class PlayerFragment : BaseFragment(), OnlinePlayerOptions {
     override fun onDestroy() {
         super.onDestroy()
         try {
-            // clear the playing queue
-            PlayingQueue.resetToDefaults()
-
             saveWatchPosition()
+
+            // clear the playing queue and release the player
+            PlayingQueue.resetToDefaults()
             nowPlayingNotification.destroySelfAndPlayer()
+
             activity?.requestedOrientation =
                 if ((activity as MainActivity).autoRotationEnabled) {
                     ActivityInfo.SCREEN_ORIENTATION_USER
@@ -520,16 +521,16 @@ class PlayerFragment : BaseFragment(), OnlinePlayerOptions {
     // save the watch position if video isn't finished and option enabled
     private fun saveWatchPosition() {
         if (!PlayerHelper.watchPositionsEnabled) return
-        if (exoPlayer.currentPosition != exoPlayer.duration) {
+        Log.e(
-            val watchPosition = WatchPosition(videoId!!, exoPlayer.currentPosition)
+            "watchpositions",
-            query {
+            PreferenceHelper.getBoolean(
-                Database.watchPositionDao().insertAll(watchPosition)
+                PreferenceKeys.WATCH_POSITION_TOGGLE,
-            }
+                true
-        } else if (PlayerHelper.watchPositionsEnabled) {
+            ).toString()
-            // delete watch position if video has ended
+        )
-            query {
+        val watchPosition = WatchPosition(videoId!!, exoPlayer.currentPosition)
-                Database.watchPositionDao().deleteById(videoId!!)
+        query {
-            }
+            Database.watchPositionDao().insertAll(watchPosition)
         }
     }
 

app/src/main/java/com/github/libretube/util/PlayerHelper.kt

@@ -256,12 +256,6 @@ object PlayerHelper {
             false
         )
 
-    val progressiveLoadingIntervalSize: String
-        get() = PreferenceHelper.getString(
-            PreferenceKeys.PROGRESSIVE_LOADING_INTERVAL_SIZE,
-            "64"
-        )
-
     val autoPlayEnabled: Boolean
         get() = PreferenceHelper.getBoolean(
             PreferenceKeys.AUTO_PLAY,

app/src/main/res/xml/audio_video_settings.xml

@@ -76,15 +76,6 @@
             android:title="@string/hls_instead_of_dash"
             app:key="use_hls" />
 
-        <ListPreference
-            android:icon="@drawable/ic_loading"
-            app:defaultValue="64"
-            app:entries="@array/loadingInterval"
-            app:entryValues="@array/loadingIntervalValues"
-            app:key="progressive_loading_interval"
-            app:summary="@string/progressive_load_interval_summary"
-            app:title="@string/progressive_load_interval" />
-
     </PreferenceCategory>
 
     <PreferenceCategory app:title="@string/background_mode">