refactor: make getServerPort non static

so it uses the provided `prefs` object instead of relying on the `Prefs` object

Author: BrayanDSO

AnkiDroid/src/main/java/com/ichi2/anki/AbstractFlashcardViewer.kt

@@ -562,7 +562,7 @@ abstract class AbstractFlashcardViewer :
 
         setContentView(getContentViewAttr(fullscreenMode))
 
-        val port = StudyScreenRepository.getServerPort()
+        val port = StudyScreenRepository().getServerPort()
         server = AnkiServer(this, port).also { it.start() }
         // Make ACTION_PROCESS_TEXT for in-app searching possible on > Android 4.0
         delegate.isHandleNativeActionModesEnabled = true

AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/reviewer/ReviewerViewModel.kt

@@ -116,7 +116,7 @@ class ReviewerViewModel(
     val pageDownFlow = MutableSharedFlow<Unit>()
     val statesMutationEvalFlow = MutableSharedFlow<String>()
 
-    override val server: AnkiServer = AnkiServer(this, StudyScreenRepository.getServerPort()).also { it.start() }
+    override val server: AnkiServer = AnkiServer(this, StudyScreenRepository().getServerPort()).also { it.start() }
     private val stateMutationKey = TimeManager.time.intTimeMS().toString()
     private var typedAnswer = ""
 

AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/reviewer/StudyScreenRepository.kt

@@ -26,7 +26,7 @@ import java.net.BindException
 import java.net.ServerSocket
 
 class StudyScreenRepository(
-    prefs: PrefsRepository = Prefs,
+    private val prefs: PrefsRepository = Prefs,
 ) {
     val isMarkShownInToolbar: Boolean
     val isFlagShownInToolbar: Boolean
@@ -42,23 +42,21 @@ class StudyScreenRepository(
         isFlagShownInToolbar = isToolbarShown && ViewerAction.FLAG_MENU in actions
     }
 
-    companion object {
-        fun getServerPort(): Int {
-            if (!Prefs.useFixedPortInReviewer) return 0
-            return try {
-                ServerSocket(Prefs.reviewerPort)
-                    .use {
-                        it.reuseAddress = true
-                        it.localPort
-                    }.also {
-                        if (Prefs.reviewerPort == 0) {
-                            Prefs.reviewerPort = it
-                        }
+    fun getServerPort(): Int {
+        if (!prefs.useFixedPortInReviewer) return 0
+        return try {
+            ServerSocket(prefs.reviewerPort)
+                .use {
+                    it.reuseAddress = true
+                    it.localPort
+                }.also {
+                    if (prefs.reviewerPort == 0) {
+                        prefs.reviewerPort = it
                     }
-            } catch (_: BindException) {
-                Timber.w("Fixed port %d under use. Using dynamic port", Prefs.reviewerPort)
-                0
-            }
+                }
+        } catch (_: BindException) {
+            Timber.w("Fixed port %d under use. Using dynamic port", prefs.reviewerPort)
+            0
         }
     }
 }