Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-21 17:29:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update username to use . as delimiter.

Browse Source
This commit is contained in:
Alex Hart
2022-09-15 10:18:40 -03:00
committed by Greyson Parrelli
parent a457d1f569
commit c96fec9537
7 changed files with 26 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/java/org/thoughtcrime/securesms/profiles/manage/UsernameEditFragment.java
View File

@@ -168,6 +168,7 @@ public class UsernameEditFragment extends LoggingFragment {
presentSuffix(state.getUsername());
presentButtonState(state.getButtonState());
presentSummary(state.getUsername());
switch (state.getUsernameStatus()) {
case NONE:
@@ -210,6 +211,14 @@ public class UsernameEditFragment extends LoggingFragment {
}
}
private void presentSummary(@NonNull UsernameState usernameState) {
if (usernameState.getUsername() != null) {
binding.summary.setText(usernameState.getUsername());
} else {
binding.summary.setText(R.string.UsernameEditFragment__choose_your_username);
}
}
private void presentRegistrationButtonState(@NonNull UsernameEditViewModel.ButtonState buttonState) {
binding.usernameText.setEnabled(true);
binding.usernameProgressCard.setVisibility(View.GONE);

2
app/src/main/java/org/thoughtcrime/securesms/profiles/manage/UsernameEditViewModel.java
View File

@@ -261,7 +261,7 @@ class UsernameEditViewModel extends ViewModel {
NETWORK_FAILURE, SUBMIT_SUCCESS, DELETE_SUCCESS, SUBMIT_FAIL_INVALID, SUBMIT_FAIL_TAKEN, SKIPPED
}
static class Factory extends ViewModelProvider.NewInstanceFactory {
static class Factory implements ViewModelProvider.Factory {
private final boolean isInRegistration;

8
app/src/main/java/org/thoughtcrime/securesms/profiles/manage/UsernameState.kt
View File

@@ -27,10 +27,14 @@ sealed class UsernameState {
) : UsernameState()
fun getNickname(): String? {
return username?.split('#')?.firstOrNull()
return username?.split(DELIMITER)?.firstOrNull()
}
fun getDiscriminator(): String? {
return username?.split('#')?.lastOrNull()
return username?.split(DELIMITER)?.lastOrNull()
}
companion object {
const val DELIMITER = "."
}
}