From 2a5793d96e83635da987e83d79d87f9550e8de0f Mon Sep 17 00:00:00 2001 From: Nicholas Tinsley Date: Mon, 1 Apr 2024 14:13:39 -0400 Subject: [PATCH] Allow saving empty notes with empty nicknames. --- .../org/thoughtcrime/securesms/nicknames/NicknameViewModel.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/nicknames/NicknameViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/nicknames/NicknameViewModel.kt index 24a83a698e..a08c5fc4bc 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/nicknames/NicknameViewModel.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/nicknames/NicknameViewModel.kt @@ -16,6 +16,7 @@ import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import kotlinx.coroutines.withContext import org.signal.core.util.BreakIteratorCompat +import org.signal.core.util.isNotNullOrBlank import org.thoughtcrime.securesms.database.SignalDatabase import org.thoughtcrime.securesms.profiles.ProfileName import org.thoughtcrime.securesms.recipients.Recipient @@ -52,7 +53,7 @@ class NicknameViewModel( noteCharactersRemaining = NOTE_MAX_LENGTH - noteLength, formState = NicknameState.FormState.READY, hasBecomeReady = true, - isEditing = !recipient.nickname.isEmpty + isEditing = !recipient.nickname.isEmpty || recipient.note?.isNotNullOrBlank() == true ) } else { state.value.copy(recipient = recipient)