Merge pull request #4263 from nextcloud/bugfix/4262/UninitializedProp…

…ertyAccessExceptionSpreedCapabilities avoid UninitializedPropertyAccessException for spreedCapabilities
nextcloud · Sep 24, 2024 · 68627ad · 68627ad
2 parents 3d9d694 + aeacfa0
commit 68627ad
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt b/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt
@@ -2535,8 +2535,12 @@ class ChatActivity :
             }
         }
 
-        if (CapabilitiesUtil.hasSpreedFeatureCapability(spreedCapabilities, SpreedFeatures.MESSAGE_EXPIRATION)) {
-            deleteExpiredMessages()
+        if (this::spreedCapabilities.isInitialized) {
+            if (CapabilitiesUtil.hasSpreedFeatureCapability(spreedCapabilities, SpreedFeatures.MESSAGE_EXPIRATION)) {
+                deleteExpiredMessages()
+            }
+        } else {
+            Log.w(TAG, "spreedCapabilities are not initialized in processExpiredMessages()")
         }
     }