Merge pull request #4405 from vector-im/element_4403

Fix crash when entering a DM after a call is hung-up/rejected while being answered (#4403)
element-hq · Jun 9, 2021 · 5060d46 · 5060d46
2 parents 3679404 + 21a80b5
commit 5060d46
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -10,7 +10,7 @@ Changes to be released in next version
  * Integrated FLEX for debug builds.
 
 🐛 Bugfix
- * 
+ * RoomDirectCallStatusBubbleCell: Fix crash when entering a DM after a call is hung-up/rejected while being answered (#4403).
 
 ⚠️ API Changes
  * 

diff --git a/Riot/Modules/Room/Views/BubbleCells/Call/Direct/RoomDirectCallStatusBubbleCell.swift b/Riot/Modules/Room/Views/BubbleCells/Call/Direct/RoomDirectCallStatusBubbleCell.swift
@@ -412,6 +412,11 @@ class RoomDirectCallStatusBubbleCell: RoomBaseCallBubbleCell {
             return (NSTimeIntervalSince1970 - TimeInterval(startDate))/MSEC_PER_SEC
         }
 
+        guard startDate < endDate else {
+            // started but hung up/rejected on other end around the same time
+            return 0
+        }
+
         //  ended, compute the diff between two dates
         return TimeInterval(endDate - startDate)/MSEC_PER_SEC
     }