From 77646fbae916473523e75d97707d7eb4b29aa6cf Mon Sep 17 00:00:00 2001 From: Taksh Date: Fri, 4 Sep 2026 22:27:04 +0530 Subject: [PATCH] Tolerate a null mesh myPeerID when building mention candidates CommandProcessorTest mocks MeshService without stubbing myPeerID. Pass orEmpty() so the helper does not NPE on that path. --- app/src/main/java/com/bitchat/android/ui/CommandProcessor.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/bitchat/android/ui/CommandProcessor.kt b/app/src/main/java/com/bitchat/android/ui/CommandProcessor.kt index ab0b33a0..b811c9c8 100644 --- a/app/src/main/java/com/bitchat/android/ui/CommandProcessor.kt +++ b/app/src/main/java/com/bitchat/android/ui/CommandProcessor.kt @@ -564,7 +564,7 @@ class CommandProcessor( null -> { meshMentionCandidates( peerNicknames = meshService.getPeerNicknames(), - myPeerID = meshService.myPeerID, + myPeerID = meshService.myPeerID.orEmpty(), isPeerBlocked = privateChatManager::isPeerBlocked ) } @@ -601,7 +601,7 @@ class CommandProcessor( } else { meshMentionCandidates( peerNicknames = meshService.getPeerNicknames(), - myPeerID = meshService.myPeerID, + myPeerID = meshService.myPeerID.orEmpty(), isPeerBlocked = privateChatManager::isPeerBlocked ) }