Merge pull request #1430 from bemusementpark/fix-null-display-name

Fix NPE on null display name
oxen-io · Mar 13, 2024 · 36edca8 · 36edca8
2 parents 3dee7ec + 3cba05e
commit 36edca8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 10 deletions.
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt b/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt
@@ -182,7 +182,7 @@ open class Storage(
     }
 
     override fun getUserProfile(): Profile {
-        val displayName = TextSecurePreferences.getProfileName(context)!!
+        val displayName = TextSecurePreferences.getProfileName(context)
         val profileKey = ProfileKeyUtil.getProfileKey(context)
         val profilePictureUrl = TextSecurePreferences.getProfilePictureURL(context)
         return Profile(displayName, profileKey, profilePictureUrl)

diff --git a/libsession/src/main/java/org/session/libsession/messaging/messages/visible/Profile.kt b/libsession/src/main/java/org/session/libsession/messaging/messages/visible/Profile.kt
@@ -4,10 +4,11 @@ import com.google.protobuf.ByteString
 import org.session.libsignal.utilities.Log
 import org.session.libsignal.protos.SignalServiceProtos
 
-class Profile() {
-    var displayName: String? = null
-    var profileKey: ByteArray? = null
+class Profile(
+    var displayName: String? = null,
+    var profileKey: ByteArray? = null,
     var profilePictureURL: String? = null
+) {
 
     companion object {
         const val TAG = "Profile"
@@ -25,12 +26,6 @@ class Profile() {
         }
     }
 
-    constructor(displayName: String, profileKey: ByteArray? = null, profilePictureURL: String? = null) : this() {
-        this.displayName = displayName
-        this.profileKey = profileKey
-        this.profilePictureURL = profilePictureURL
-    }
-
     fun toProto(): SignalServiceProtos.DataMessage? {
         val displayName = displayName
         if (displayName == null) {