refactor: simplify HTTPS server setup and remove duplicate test utils

Author: mixelas

AnkiDroid/src/androidTest/java/com/ichi2/testutils/common/FailOnUnhandledExceptionRule.kt

@@ -28,18 +28,20 @@ open class AnkiServer(
     cacheDir: File? = null,
     port: Int = 0,
 ) : NanoHTTPD(LOCALHOST, port) {
-    private val isHttps = cacheDir != null
-    private val sslContext = cacheDir?.let { SslUtil.getSSLContext(it) }
+    private val sslContext =
+        cacheDir?.let { cacheDir ->
+            runCatching { SslUtil.getSSLContext(cacheDir) }
+                .onFailure { Timber.w(it, "Failed to initialize HTTPS for AnkiServer") }
+                .getOrNull()
+        }
 
     init {
-        // Enable HTTPS if context was provided (Issue #15991)
-        // This allows WebView to load cards without cleartext restrictions on modern Android
-        if (isHttps && sslContext != null) {
-            makeSecure(sslContext.serverSocketFactory, null)
-        }
+        // Enable HTTPS when a keystore was created successfully (Issue #15991)
+        // This allows WebView to load cards without cleartext restrictions on modern Android.
+        sslContext?.let { makeSecure(it.serverSocketFactory, null) }
     }
 
-    fun baseUrl(): String = "${if (isHttps) "https" else "http"}://$LOCALHOST:$listeningPort/"
+    fun baseUrl(): String = "${if (sslContext != null) "https" else "http"}://$LOCALHOST:$listeningPort/"
 
     // it's faster to serve local files without GZip. see 'page render' in logs
     // This also removes 'W/System: A resource failed to call end.'

AnkiDroid/src/main/java/com/ichi2/anki/pages/AnkiServer.kt

@@ -100,6 +100,8 @@ abstract class PageFragment(
         view: View,
         savedInstanceState: Bundle?,
     ) {
+        // Store the TLS keystore in the app cache directory: it is per-profile by design and can be
+        // regenerated if the OS clears it.
         server = AnkiServer(this, requireContext().cacheDir).also { it.start() }
         webViewLayout = view.findViewById(R.id.webview_layout)
 

AnkiDroid/src/main/java/com/ichi2/anki/pages/PageFragment.kt

@@ -29,8 +29,11 @@ import androidx.core.view.ViewCompat
 import androidx.core.view.doOnLayout
 import androidx.core.view.isVisible
 import androidx.fragment.app.viewModels
+import androidx.lifecycle.createSavedStateHandle
 import androidx.lifecycle.flowWithLifecycle
 import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.viewmodel.initializer
+import androidx.lifecycle.viewmodel.viewModelFactory
 import com.google.android.material.slider.Slider
 import com.ichi2.anki.DispatchKeyEventListener
 import com.ichi2.anki.Flag
@@ -59,7 +62,13 @@ class PreviewerFragment :
     BaseSnackbarBuilderProvider,
     DispatchKeyEventListener,
     BindingProcessor<MappableBinding, PreviewerAction> {
-    override val viewModel: PreviewerViewModel by viewModels { previewerViewModelFactory(requireContext().cacheDir) }
+    override val viewModel: PreviewerViewModel by viewModels {
+        viewModelFactory {
+            initializer {
+                PreviewerViewModel(requireContext().cacheDir, createSavedStateHandle())
+            }
+        }
+    }
     private val binding by viewBinding(FragmentPreviewerBinding::bind)
     override val webViewLayout: SafeWebViewLayout get() = binding.webViewLayout
 

AnkiDroid/src/main/java/com/ichi2/anki/previewer/PreviewerFragment.kt

@@ -19,7 +19,10 @@ import android.os.Bundle
 import android.view.View
 import androidx.core.os.bundleOf
 import androidx.fragment.app.viewModels
+import androidx.lifecycle.createSavedStateHandle
 import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.viewmodel.initializer
+import androidx.lifecycle.viewmodel.viewModelFactory
 import com.ichi2.anki.R
 import com.ichi2.anki.databinding.FragmentTemplatePreviewerBinding
 import com.ichi2.anki.libanki.CardOrdinal
@@ -32,7 +35,13 @@ import kotlinx.coroutines.flow.onEach
 class TemplatePreviewerFragment :
     CardViewerFragment(R.layout.fragment_template_previewer),
     BaseSnackbarBuilderProvider {
-    override val viewModel: TemplatePreviewerViewModel by viewModels { templatePreviewerViewModelFactory(requireContext().cacheDir) }
+    override val viewModel: TemplatePreviewerViewModel by viewModels {
+        viewModelFactory {
+            initializer {
+                TemplatePreviewerViewModel(requireContext().cacheDir, createSavedStateHandle())
+            }
+        }
+    }
 
     lateinit var binding: FragmentTemplatePreviewerBinding
 

AnkiDroid/src/main/java/com/ichi2/anki/previewer/PreviewerViewModelFactory.kt

@@ -45,9 +45,12 @@ import androidx.fragment.app.FragmentManager
 import androidx.fragment.app.commit
 import androidx.fragment.app.viewModels
 import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.createSavedStateHandle
 import androidx.lifecycle.flowWithLifecycle
 import androidx.lifecycle.lifecycleScope
 import androidx.lifecycle.repeatOnLifecycle
+import androidx.lifecycle.viewmodel.initializer
+import androidx.lifecycle.viewmodel.viewModelFactory
 import anki.scheduler.CardAnswer.Rating
 import com.google.android.material.snackbar.Snackbar
 import com.ichi2.anki.CollectionManager
@@ -114,7 +117,13 @@ class ReviewerFragment :
     DispatchKeyEventListener,
     TagsDialogListener,
     ShakeDetector.Listener {
-    override val viewModel: ReviewerViewModel by viewModels { reviewerViewModelFactory(requireContext().cacheDir) }
+    override val viewModel: ReviewerViewModel by viewModels {
+        viewModelFactory {
+            initializer {
+                ReviewerViewModel(requireContext().cacheDir, createSavedStateHandle())
+            }
+        }
+    }
     private val binding by viewBinding(FragmentReviewerBinding::bind)
 
     override val webViewLayout: SafeWebViewLayout get() = binding.webViewLayout