Do not show the QR code shortuct if you have no username.

greyson-signal · cody-signal · commit 8e8ba23da717 · 2024-02-15T21:43:36.000-05:00
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
@@ -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
@@ -54,3 +54,7 @@ fun String?.nullIfBlank(): String? {
     null
   }
 }
+
+fun CharSequence?.isNotNullOrBlank(): Boolean {
+  return !this.isNullOrBlank()
+}

Original file line number	Diff line number	Diff line change
`@@ -54,3 +54,7 @@ fun String?.nullIfBlank(): String? {`
`54`	`54`	`null`
`55`	`55`	`}`
`56`	`56`	`}`
	`57`	`+`
	`58`	`+fun CharSequence?.isNotNullOrBlank(): Boolean {`
	`59`	`+ return !this.isNullOrBlank()`
	`60`	`+}`