some bug fixes

app/src/main/java/com/github/libretube/database/AppDatabase.kt

@@ -14,7 +14,7 @@ import com.github.libretube.obj.WatchPosition
         SearchHistoryItem::class,
         CustomInstance::class
     ],
-    version = 5
+    version = 6
 )
 abstract class AppDatabase : RoomDatabase() {
     /**

app/src/main/java/com/github/libretube/dialogs/CustomInstanceDialog.kt

@@ -26,10 +26,11 @@ class CustomInstanceDialog : DialogFragment() {
             }
 
             binding.addInstance.setOnClickListener {
-                val customInstance = CustomInstance()
+                val customInstance = CustomInstance(
-                customInstance.name = binding.instanceName.text.toString()
+                    name = binding.instanceName.text.toString(),
-                customInstance.apiUrl = binding.instanceApiUrl.text.toString()
+                    apiUrl = binding.instanceApiUrl.text.toString(),
-                customInstance.frontendUrl = binding.instanceFrontendUrl.text.toString()
+                    frontendUrl = binding.instanceFrontendUrl.text.toString()
+                )
 
                 if (
                     customInstance.name != "" &&

app/src/main/java/com/github/libretube/extensions/SetWatchProgressLength.kt

@@ -5,42 +5,36 @@ import android.view.ViewTreeObserver
 import android.widget.LinearLayout
 import com.github.libretube.database.DatabaseHolder
 import com.github.libretube.extensions.await
-import com.github.libretube.obj.WatchPosition
 
 /**
  * shows the already watched time under the video
  */
 fun View?.setWatchProgressLength(videoId: String, duration: Long) {
     val view = this!!
-    var positions = listOf<WatchPosition>()
+    var progress: Long? = null
-    var newWidth: Long? = null
 
     Thread {
-        positions = DatabaseHolder.database.watchPositionDao().getAll()
+        try {
+            progress = DatabaseHolder.database.watchPositionDao().findById(videoId).position
+        } catch (e: Exception) {
+            progress = null
+        }
     }.await()
 
     view.getViewTreeObserver()
         .addOnGlobalLayoutListener(object : ViewTreeObserver.OnGlobalLayoutListener {
             override fun onGlobalLayout() {
                 this@setWatchProgressLength.getViewTreeObserver().removeOnGlobalLayoutListener(this)
-                positions.forEach {
+                if (progress == null) {
-                    if (it.videoId == videoId) {
-                        val fullWidth = (parent as LinearLayout).width
-                        if (duration != 0L) newWidth =
-                            (fullWidth * (it.position / (duration))) / 1000
-                        return@forEach
-                    }
-                }
-                if (newWidth != null) {
-                    val lp = view.layoutParams
-                    lp.apply {
-                        width = newWidth!!.toInt()
-                    }
-                    view.layoutParams = lp
-                    view.visibility = View.VISIBLE
-                } else {
                     view.visibility = View.GONE
+                    return
                 }
+                val fullWidth = (parent as LinearLayout).width
+                val newWidth = (fullWidth * (progress!! / (duration))) / 1000
+                val lp = view.layoutParams
+                lp.width = newWidth.toInt()
+                view.layoutParams = lp
+                view.visibility = View.VISIBLE
             }
         })
 }

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

@@ -53,7 +53,6 @@ import com.github.libretube.obj.ChapterSegment
 import com.github.libretube.obj.Segment
 import com.github.libretube.obj.Segments
 import com.github.libretube.obj.Streams
-import com.github.libretube.obj.WatchPosition
 import com.github.libretube.preferences.PreferenceHelper
 import com.github.libretube.preferences.PreferenceKeys
 import com.github.libretube.services.BackgroundMode
@@ -936,17 +935,14 @@ class PlayerFragment : BaseFragment() {
 
     private fun seekToWatchPosition() {
         // seek to saved watch position if available
-        var watchPositions = listOf<WatchPosition>()
-        Thread {
-            watchPositions = DatabaseHolder.database.watchPositionDao().getAll()
-        }.await()
         var position: Long? = null
-        watchPositions.forEach {
+        Thread {
-            if (it.videoId == videoId &&
+            try {
-                // don't seek to the position if it's the end, autoplay would skip it immediately
+                position = DatabaseHolder.database.watchPositionDao().findById(videoId!!).position
-                streams.duration!! - it.position / 1000 > 2
+            } catch (e: Exception) {
-            ) position = it.position
+                position = null
-        }
+            }
+        }.await()
         // support for time stamped links
         val timeStamp: Long? = arguments?.getLong("timeStamp")
         if (timeStamp != null && timeStamp != 0L) {

app/src/main/java/com/github/libretube/obj/CustomInstance.kt

@@ -6,8 +6,7 @@ import androidx.room.PrimaryKey
 
 @Entity(tableName = "customInstance")
 class CustomInstance(
-    @PrimaryKey(autoGenerate = true) var id: Int = 0,
+    @PrimaryKey var name: String = "",
-    @ColumnInfo var name: String = "",
     @ColumnInfo var apiUrl: String = "",
     @ColumnInfo var frontendUrl: String = ""
 )

app/src/main/java/com/github/libretube/preferences/InstanceSettings.kt

@@ -1,6 +1,5 @@
 package com.github.libretube.preferences
 
-import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
 import android.widget.Toast