remove unsafe null check

d1b38c0a · Cool-fire · e18537a7 · d1b38c0a
Commit d1b38c0a authored Apr 16, 2019 by Cool-fire
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 6 deletions

VideoConferenceActivity.kt ...ket/android/videoconference/ui/VideoConferenceActivity.kt +8 -6

No files found.
--- a/app/src/main/java/chat/rocket/android/videoconference/ui/VideoConferenceActivity.kt
+++ b/app/src/main/java/chat/rocket/android/videoconference/ui/VideoConferenceActivity.kt
@@ -54,12 +54,14 @@ class VideoConferenceActivity : JitsiMeetActivity(), JitsiVideoConferenceView,
        logJitsiMeetViewState("Joined video conferencing", map)

    override fun onConferenceTerminated(map: MutableMap<String, Any>?) {
-        if(map!!.containsKey("error")) {
-            logJitsiMeetViewState("Terminated video conferencing with error", map)
-        }
-        else{
-            logJitsiMeetViewState("Terminated video conferencing", map)
-            finishJitsiVideoConference()
+        if(!map.isNullOrEmpty()){
+            if(map.containsKey("error")) {
+                logJitsiMeetViewState("Terminated video conferencing with error", map)
+            }
+            else{
+                logJitsiMeetViewState("Terminated video conferencing", map)
+                finishJitsiVideoConference()
+            }
        }
    }