From 8e8ba23da71712d4e5950d6d1e890e3e87726048 Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Tue, 13 Feb 2024 10:12:15 -0500
Subject: [PATCH] Do not show the QR code shortuct if you have no username.

---
 .../securesms/components/settings/app/AppSettingsFragment.kt  | 3 ++-
 .../src/main/java/org/signal/core/util/StringExtensions.kt    | 4 ++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/AppSettingsFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/AppSettingsFragment.kt
index 1190c09c70..4a2decb73b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/AppSettingsFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/AppSettingsFragment.kt
@@ -10,6 +10,7 @@ import androidx.navigation.fragment.findNavController
 import org.greenrobot.eventbus.EventBus
 import org.greenrobot.eventbus.Subscribe
 import org.greenrobot.eventbus.ThreadMode
+import org.signal.core.util.isNotNullOrBlank
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.badges.BadgeImageView
 import org.thoughtcrime.securesms.components.AvatarImageView
@@ -363,7 +364,7 @@ class AppSettingsFragment : DSLSettingsFragment(
       summaryView.visibility = View.VISIBLE
       avatarView.visibility = View.VISIBLE
 
-      if (SignalStore.account().usernameSyncState == AccountValues.UsernameSyncState.IN_SYNC) {
+      if (SignalStore.account().username.isNotNullOrBlank()) {
         qrButton.visibility = View.VISIBLE
         qrButton.isClickable = true
         qrButton.setOnClickListener { model.onQrButtonClicked() }
diff --git a/core-util/src/main/java/org/signal/core/util/StringExtensions.kt b/core-util/src/main/java/org/signal/core/util/StringExtensions.kt
index 49fe18533c..bb986b58ad 100644
--- a/core-util/src/main/java/org/signal/core/util/StringExtensions.kt
+++ b/core-util/src/main/java/org/signal/core/util/StringExtensions.kt
@@ -54,3 +54,7 @@ fun String?.nullIfBlank(): String? {
     null
   }
 }
+
+fun CharSequence?.isNotNullOrBlank(): Boolean {
+  return !this.isNullOrBlank()
+}