Lift ScreenSaverService scope used for WebView retry into property to properly handle when dreaming stops

Author: kimsey0

app/src/main/java/com/immichframe/immichframe/ScreenSaverService.kt

@@ -27,6 +27,9 @@ import android.widget.Toast
 import androidx.preference.PreferenceManager
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.cancel
+import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import retrofit2.Call
@@ -41,6 +44,7 @@ import androidx.core.graphics.drawable.toDrawable
 import androidx.core.net.toUri
 
 class ScreenSaverService : DreamService() {
+    private var webViewRetryScope: CoroutineScope? = null
     private var wakeLock: PowerManager.WakeLock? = null
     private lateinit var webView: WebView
     private lateinit var imageView1: ImageView
@@ -83,6 +87,7 @@ class ScreenSaverService : DreamService() {
     @SuppressLint("ClickableViewAccessibility")
     override fun onDreamingStarted() {
         super.onDreamingStarted()
+        webViewRetryScope = CoroutineScope(Dispatchers.Main + Job())
         isFullscreen = true
         isInteractive = true
         setContentView(R.layout.screen_saver_view)
@@ -105,6 +110,8 @@ class ScreenSaverService : DreamService() {
 
     override fun onDreamingStopped() {
         super.onDreamingStopped()
+        webViewRetryScope?.cancel()
+        webViewRetryScope = null
         stopImageTimer()
         releaseWakeLock()
         handler.removeCallbacksAndMessages(null)
@@ -614,32 +621,35 @@ class ScreenSaverService : DreamService() {
         wakeLock = null
     }
 
-    private fun loadWebViewWithRetry(url: String, attempt: Int = 1, maxAttempts: Int = 36) {
-        CoroutineScope(Dispatchers.IO).launch {
-            val reachable = Helpers.isServerReachable(url)
-            withContext(Dispatchers.Main) {
-                if (reachable) {
-                    webView.loadUrl(url)
-                } else {
-                    if (attempt <= maxAttempts) {
-                        Toast.makeText(
-                            this@ScreenSaverService,
-                            "Connecting to server... Attempt $attempt of $maxAttempts",
-                            Toast.LENGTH_SHORT
-                        ).show()
-                        handler.postDelayed({
-                            loadWebViewWithRetry(url, attempt + 1, maxAttempts)
-                        }, 5000)
-                    } else {
-                        Toast.makeText(
-                            this@ScreenSaverService,
-                            "Could not connect to server after $maxAttempts attempts",
-                            Toast.LENGTH_LONG
-                        ).show()
-                        // Load anyway as a last resort - maybe the server will respond
-                        webView.loadUrl(url)
-                    }
-                }
+    private fun loadWebViewWithRetry(
+        url: String,
+        attempt: Int = 1,
+        maxAttempts: Int = 36
+    ) {
+        webViewRetryScope?.launch {
+            val reachable = withContext(Dispatchers.IO) {
+                Helpers.isServerReachable(url)
+            }
+
+            if (reachable) {
+                webView.loadUrl(url)
+            } else if (attempt <= maxAttempts) {
+                Toast.makeText(
+                    this@ScreenSaverService,
+                    "Connecting to server... Attempt $attempt of $maxAttempts",
+                    Toast.LENGTH_SHORT
+                ).show()
+
+                delay(5_000)
+                loadWebViewWithRetry(url, attempt + 1, maxAttempts)
+            } else {
+                Toast.makeText(
+                    this@ScreenSaverService,
+                    "Could not connect to server after $maxAttempts attempts",
+                    Toast.LENGTH_LONG
+                ).show()
+
+                webView.loadUrl(url)
             }
         }
     }