From 0991636c6d310edf75606f32fb2756306152a90d Mon Sep 17 00:00:00 2001
From: sowjanyakch <sowjanya.kch@gmail.com>
Date: Mon, 28 Apr 2025 13:55:35 +0200
Subject: [PATCH] mitigate endless loop in case of exception

Signed-off-by: sowjanyakch <sowjanya.kch@gmail.com>
---
 .../java/com/nextcloud/talk/settings/SettingsActivity.kt  | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/nextcloud/talk/settings/SettingsActivity.kt b/app/src/main/java/com/nextcloud/talk/settings/SettingsActivity.kt
index 73b88bbfb..80f8921d4 100644
--- a/app/src/main/java/com/nextcloud/talk/settings/SettingsActivity.kt
+++ b/app/src/main/java/com/nextcloud/talk/settings/SettingsActivity.kt
@@ -1358,10 +1358,11 @@ class SettingsActivity :
 
     @Suppress("Detekt.TooGenericExceptionCaught")
     private fun observeReadPrivacy() {
+        var exceptionCaught = false
         lifecycleScope.launch {
             var state = appPreferences.readPrivacy
             readPrivacyFlow.collect { newBoolean ->
-                if (state != newBoolean) {
+                if (!exceptionCaught && state != newBoolean) {
                     state = newBoolean
                     val booleanValue = if (newBoolean) "0" else "1"
                     val json = "{\"key\": \"read_status_privacy\", \"value\" : $booleanValue}"
@@ -1377,6 +1378,7 @@ class SettingsActivity :
                             }
                         } catch (e: Exception) {
                             withContext(Dispatchers.Main) {
+                                exceptionCaught = true
                                 appPreferences.setReadPrivacy(!newBoolean)
                                 binding.settingsReadPrivacySwitch.isChecked = !newBoolean
                             }
@@ -1394,10 +1396,11 @@ class SettingsActivity :
 
     @Suppress("Detekt.TooGenericExceptionCaught")
     private fun observeTypingStatus() {
+        var exceptionCaught = false
         lifecycleScope.launch {
             var state = appPreferences.typingStatus
             typingStatusFlow.collect { newBoolean ->
-                if (state != newBoolean) {
+                if (!exceptionCaught && state != newBoolean) {
                     state = newBoolean
                     val booleanValue = if (newBoolean) "0" else "1"
                     val json = "{\"key\": \"typing_privacy\", \"value\" : $booleanValue}"
@@ -1416,6 +1419,7 @@ class SettingsActivity :
                             }
                         } catch (e: Exception) {
                             withContext(Dispatchers.Main) {
+                                exceptionCaught = true
                                 appPreferences.typingStatus = !newBoolean
                                 binding.settingsTypingStatusSwitch.isChecked = !newBoolean
                             }