fixed crash when commenter was null in VideoChatMessage.kt

AndreyAsadchy · Jan 15, 2021 · 04aa271 · 04aa271
1 parent c427013
commit 04aa271
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -26,7 +26,7 @@ android {
     defaultConfig {
         applicationId "com.github.exact7.xtra"
         minSdkVersion 16
-        versionCode 96
+        versionCode 97
         versionName "1.5.6.6"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         targetSdkVersion 29

diff --git a/app/src/main/java/com/github/exact7/xtra/model/chat/VideoChatMessage.kt b/app/src/main/java/com/github/exact7/xtra/model/chat/VideoChatMessage.kt
@@ -17,7 +17,7 @@ data class VideoChatMessage(
         val contentId: String,
         @SerializedName("content_offset_seconds")
         val contentOffsetSeconds: Double,
-        val commenter: Commenter,
+        val commenter: Commenter?,
         val source: String,
         val state: String,
         @SerializedName("message")
@@ -26,7 +26,7 @@ data class VideoChatMessage(
         val moreReplies: Boolean) : ChatMessage {
 
     override val userName: String
-        get() = commenter.name
+        get() = commenter?.name.orEmpty()
 
     override val message: String
         get() = messageObj.body
@@ -46,7 +46,7 @@ data class VideoChatMessage(
     override var subscriberBadge: SubscriberBadge? = null
 
     override val displayName: String
-        get() = commenter.displayName
+        get() = commenter?.displayName.orEmpty()
 
     data class Commenter(
             @SerializedName("display_name")