Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-22 09:49:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Inline the username flag.

Browse Source
This commit is contained in:
Greyson Parrelli
2024-02-06 10:34:40 -05:00
committed by Cody Henthorne
parent bd3b779282
commit 8ad77ac7aa
11 changed files with 14 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/org/thoughtcrime/securesms/profiles/manage/EditProfileFragment.kt
View File

@@ -37,7 +37,6 @@ import org.thoughtcrime.securesms.profiles.ProfileName
import org.thoughtcrime.securesms.profiles.manage.EditProfileViewModel.AvatarState
import org.thoughtcrime.securesms.profiles.manage.UsernameRepository.UsernameDeleteResult
import org.thoughtcrime.securesms.recipients.Recipient
import org.thoughtcrime.securesms.util.FeatureFlags
import org.thoughtcrime.securesms.util.NameUtil.getAbbreviation
import org.thoughtcrime.securesms.util.livedata.LiveDataUtil
import org.thoughtcrime.securesms.util.navigation.safeNavigate
@@ -128,7 +127,7 @@ class EditProfileFragment : LoggingFragment() {
)
}
if (FeatureFlags.usernames() && SignalStore.account().username != null && SignalStore.account().usernameSyncState != AccountValues.UsernameSyncState.USERNAME_AND_LINK_CORRUPTED) {
if (SignalStore.account().username != null && SignalStore.account().usernameSyncState != AccountValues.UsernameSyncState.USERNAME_AND_LINK_CORRUPTED) {
binding.usernameLinkContainer.setOnClickListener {
findNavController().safeNavigate(EditProfileFragmentDirections.actionManageProfileFragmentToUsernameLinkFragment())
}
@@ -165,14 +164,7 @@ class EditProfileFragment : LoggingFragment() {
viewModel.about.observe(viewLifecycleOwner) { presentAbout(it) }
viewModel.aboutEmoji.observe(viewLifecycleOwner) { presentAboutEmoji(it) }
viewModel.badge.observe(viewLifecycleOwner) { presentBadge(it) }
if (viewModel.shouldShowUsername()) {
viewModel.username.observe(viewLifecycleOwner) { presentUsername(it) }
} else {
binding.manageProfileUsernameContainer.visibility = View.GONE
binding.manageProfileDivider.root.visibility = View.GONE
binding.usernameInfoText.visibility = View.GONE
}
viewModel.username.observe(viewLifecycleOwner) { presentUsername(it) }
}
private fun presentAvatarImage(avatarData: Optional<ByteArray>) {

4
app/src/main/java/org/thoughtcrime/securesms/profiles/manage/EditProfileViewModel.java
View File

@@ -107,10 +107,6 @@ class EditProfileViewModel extends ViewModel {
return UsernameRepository.deleteUsernameAndLink().observeOn(AndroidSchedulers.mainThread());
}
public boolean shouldShowUsername() {
return FeatureFlags.usernames();
}
public void onAvatarSelected(@NonNull Context context, @Nullable Media media) {
previousAvatar = internalAvatarState.getValue() != null ? internalAvatarState.getValue().getAvatar() : null;