Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-02-26 04:33:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add espresso test for usernames.

Browse Source
This commit is contained in:
Alex Hart
2022-09-13 10:15:07 -03:00
committed by Greyson Parrelli
parent 4882a4d11c
commit a340ebf74a
10 changed files with 333 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -35,7 +35,6 @@ import org.thoughtcrime.securesms.R;
import org.thoughtcrime.securesms.contactshare.SimpleTextWatcher;
import org.thoughtcrime.securesms.databinding.UsernameEditFragmentBinding;
import org.thoughtcrime.securesms.recipients.Recipient;
import org.thoughtcrime.securesms.util.AccessibilityUtil;
import org.thoughtcrime.securesms.util.FragmentResultContract;
import org.thoughtcrime.securesms.util.LifecycleDisposable;
import org.thoughtcrime.securesms.util.UsernameUtil;
@@ -91,7 +90,7 @@ public class UsernameEditFragment extends LoggingFragment {
viewModel = new ViewModelProvider(this, new UsernameEditViewModel.Factory(args.getIsInRegistration())).get(UsernameEditViewModel.class);
lifecycleDisposable.add(viewModel.getUiState().subscribe(this::onUiStateChanged));
viewModel.getEvents().observe(getViewLifecycleOwner(), this::onEvent);
lifecycleDisposable.add(viewModel.getEvents().subscribe(this::onEvent));
binding.usernameSubmitButton.setOnClickListener(v -> viewModel.onUsernameSubmitted());
binding.usernameDeleteButton.setOnClickListener(v -> viewModel.onUsernameDeleted());
@@ -142,6 +141,8 @@ public class UsernameEditFragment extends LoggingFragment {
suffixProgress = new ImageView(requireContext());
suffixProgress.setImageDrawable(getInProgressDrawable());
suffixProgress.setContentDescription(getString(R.string.load_more_header__loading));
suffixProgress.setVisibility(View.GONE);
suffixParent.addView(suffixProgress, 0, layoutParams);
suffixTextView.setOnClickListener(this::onLearnMore);

17
app/src/main/java/org/thoughtcrime/securesms/profiles/manage/UsernameEditRepository.java
View File

@@ -18,28 +18,29 @@ import org.whispersystems.signalservice.internal.push.ReserveUsernameResponse;
import java.io.IOException;
import java.util.concurrent.Executor;
import io.reactivex.rxjava3.core.Single;
import io.reactivex.rxjava3.schedulers.Schedulers;
class UsernameEditRepository {
private static final String TAG = Log.tag(UsernameEditRepository.class);
private final SignalServiceAccountManager accountManager;
private final Executor executor;
UsernameEditRepository() {
this.accountManager = ApplicationDependencies.getSignalServiceAccountManager();
this.executor = SignalExecutors.UNBOUNDED;
}
void reserveUsername(@NonNull String nickname, @NonNull Callback<Result<ReserveUsernameResponse, UsernameSetResult>> callback) {
executor.execute(() -> callback.onComplete(reserveUsernameInternal(nickname)));
@NonNull Single<Result<ReserveUsernameResponse, UsernameSetResult>> reserveUsername(@NonNull String nickname) {
return Single.fromCallable(() -> reserveUsernameInternal(nickname)).subscribeOn(Schedulers.io());
}
void confirmUsername(@NonNull ReserveUsernameResponse reserveUsernameResponse, @NonNull Callback<UsernameSetResult> callback) {
executor.execute(() -> callback.onComplete(confirmUsernameInternal(reserveUsernameResponse)));
@NonNull Single<UsernameSetResult> confirmUsername(@NonNull ReserveUsernameResponse reserveUsernameResponse) {
return Single.fromCallable(() -> confirmUsernameInternal(reserveUsernameResponse)).subscribeOn(Schedulers.io());
}
void deleteUsername(@NonNull Callback<UsernameDeleteResult> callback) {
executor.execute(() -> callback.onComplete(deleteUsernameInternal()));
@NonNull Single<UsernameDeleteResult> deleteUsername() {
return Single.fromCallable(this::deleteUsernameInternal).subscribeOn(Schedulers.io());
}
@WorkerThread

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

@@ -3,14 +3,11 @@ package org.thoughtcrime.securesms.profiles.manage;
import android.text.TextUtils;
import androidx.annotation.NonNull;
import androidx.lifecycle.LiveData;
import androidx.lifecycle.ViewModel;
import androidx.lifecycle.ViewModelProvider;
import org.signal.core.util.ThreadUtil;
import org.thoughtcrime.securesms.keyvalue.SignalStore;
import org.thoughtcrime.securesms.recipients.Recipient;
import org.thoughtcrime.securesms.util.SingleLiveEvent;
import org.thoughtcrime.securesms.util.UsernameUtil;
import org.thoughtcrime.securesms.util.UsernameUtil.InvalidReason;
import org.thoughtcrime.securesms.util.rx.RxStore;
@@ -21,27 +18,29 @@ import java.util.concurrent.TimeUnit;
import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
import io.reactivex.rxjava3.core.Flowable;
import io.reactivex.rxjava3.core.Observable;
import io.reactivex.rxjava3.disposables.CompositeDisposable;
import io.reactivex.rxjava3.disposables.Disposable;
import io.reactivex.rxjava3.processors.PublishProcessor;
import io.reactivex.rxjava3.schedulers.Schedulers;
import io.reactivex.rxjava3.subjects.PublishSubject;
/**
* Manages the state around username updates.
*
* <p>
* A note on naming conventions:
*
* <p>
* Usernames are made up of two discrete components, a nickname and a discriminator. They are formatted thusly:
*
* <p>
* [nickname]#[discriminator]
*
* <p>
* The nickname is user-controlled, whereas the discriminator is controlled by the server.
*/
class UsernameEditViewModel extends ViewModel {
private static final long NICKNAME_PUBLISHER_DEBOUNCE_TIMEOUT_MILLIS = 500;
private final SingleLiveEvent<Event> events;
private final PublishSubject<Event> events;
private final UsernameEditRepository repo;
private final RxStore<State> uiState;
private final PublishProcessor<String> nicknamePublisher;
@@ -50,8 +49,9 @@ class UsernameEditViewModel extends ViewModel {
private UsernameEditViewModel(boolean isInRegistration) {
this.repo = new UsernameEditRepository();
this.uiState = new RxStore<>(new State(ButtonState.SUBMIT_DISABLED, UsernameStatus.NONE, Recipient.self().getUsername().<UsernameState>map(UsernameState.Set::new).orElse(UsernameState.NoUsername.INSTANCE)), Schedulers.computation());
this.events = new SingleLiveEvent<>();
this.uiState = new RxStore<>(new State(ButtonState.SUBMIT_DISABLED, UsernameStatus.NONE, Recipient.self().getUsername().<UsernameState>map(UsernameState.Set::new)
.orElse(UsernameState.NoUsername.INSTANCE)), Schedulers.computation());
this.events = PublishSubject.create();
this.nicknamePublisher = PublishProcessor.create();
this.disposables = new CompositeDisposable();
this.isInRegistration = isInRegistration;
@@ -84,7 +84,7 @@ class UsernameEditViewModel extends ViewModel {
void onUsernameSkipped() {
SignalStore.uiHints().markHasSetOrSkippedUsernameCreation();
events.setValue(Event.SKIPPED);
events.onNext(Event.SKIPPED);
}
void onUsernameSubmitted() {
@@ -109,66 +109,67 @@ class UsernameEditViewModel extends ViewModel {
uiState.update(state -> new State(ButtonState.SUBMIT_LOADING, UsernameStatus.NONE, state.usernameState));
repo.confirmUsername(((UsernameState.Reserved) usernameState).getReserveUsernameResponse(), (result) -> {
ThreadUtil.runOnMain(() -> {
String nickname = usernameState.getNickname();
Disposable confirmUsernameDisposable = repo.confirmUsername(((UsernameState.Reserved) usernameState).getReserveUsernameResponse())
.subscribe(result -> {
String nickname = usernameState.getNickname();
switch (result) {
case SUCCESS:
SignalStore.uiHints().markHasSetOrSkippedUsernameCreation();
uiState.update(state -> new State(ButtonState.SUBMIT_DISABLED, UsernameStatus.NONE, state.usernameState));
events.postValue(Event.SUBMIT_SUCCESS);
break;
case USERNAME_INVALID:
uiState.update(state -> new State(ButtonState.SUBMIT_DISABLED, UsernameStatus.INVALID_GENERIC, state.usernameState));
events.postValue(Event.SUBMIT_FAIL_INVALID);
switch (result) {
case SUCCESS:
SignalStore.uiHints().markHasSetOrSkippedUsernameCreation();
uiState.update(state -> new State(ButtonState.SUBMIT_DISABLED, UsernameStatus.NONE, state.usernameState));
events.onNext(Event.SUBMIT_SUCCESS);
break;
case USERNAME_INVALID:
uiState.update(state -> new State(ButtonState.SUBMIT_DISABLED, UsernameStatus.INVALID_GENERIC, state.usernameState));
events.onNext(Event.SUBMIT_FAIL_INVALID);
if (nickname != null) {
onNicknameUpdated(nickname);
}
break;
case USERNAME_UNAVAILABLE:
uiState.update(state -> new State(ButtonState.SUBMIT_DISABLED, UsernameStatus.TAKEN, state.usernameState));
events.postValue(Event.SUBMIT_FAIL_TAKEN);
if (nickname != null) {
onNicknameUpdated(nickname);
}
break;
case USERNAME_UNAVAILABLE:
uiState.update(state -> new State(ButtonState.SUBMIT_DISABLED, UsernameStatus.TAKEN, state.usernameState));
events.onNext(Event.SUBMIT_FAIL_TAKEN);
if (nickname != null) {
onNicknameUpdated(nickname);
}
break;
case NETWORK_ERROR:
uiState.update(state -> new State(ButtonState.SUBMIT, UsernameStatus.NONE, state.usernameState));
events.postValue(Event.NETWORK_FAILURE);
break;
}
});
});
if (nickname != null) {
onNicknameUpdated(nickname);
}
break;
case NETWORK_ERROR:
uiState.update(state -> new State(ButtonState.SUBMIT, UsernameStatus.NONE, state.usernameState));
events.onNext(Event.NETWORK_FAILURE);
break;
}
});
disposables.add(confirmUsernameDisposable);
}
void onUsernameDeleted() {
uiState.update(state -> new State(ButtonState.DELETE_LOADING, UsernameStatus.NONE, state.usernameState));
repo.deleteUsername((result) -> {
ThreadUtil.runOnMain(() -> {
switch (result) {
case SUCCESS:
uiState.update(state -> new State(ButtonState.DELETE_DISABLED, UsernameStatus.NONE, state.usernameState));
events.postValue(Event.DELETE_SUCCESS);
break;
case NETWORK_ERROR:
uiState.update(state -> new State(ButtonState.DELETE, UsernameStatus.NONE, state.usernameState));
events.postValue(Event.NETWORK_FAILURE);
break;
}
});
Disposable deletionDisposable = repo.deleteUsername().subscribe(result -> {
switch (result) {
case SUCCESS:
uiState.update(state -> new State(ButtonState.DELETE_DISABLED, UsernameStatus.NONE, state.usernameState));
events.onNext(Event.DELETE_SUCCESS);
break;
case NETWORK_ERROR:
uiState.update(state -> new State(ButtonState.DELETE, UsernameStatus.NONE, state.usernameState));
events.onNext(Event.NETWORK_FAILURE);
break;
}
});
disposables.add(deletionDisposable);
}
@NonNull Flowable<State> getUiState() {
return uiState.getStateFlowable().observeOn(AndroidSchedulers.mainThread());
}
@NonNull LiveData<Event> getEvents() {
return events;
@NonNull Observable<Event> getEvents() {
return events.observeOn(AndroidSchedulers.mainThread());
}
private void onNicknameChanged(@NonNull String nickname) {
@@ -177,33 +178,33 @@ class UsernameEditViewModel extends ViewModel {
}
uiState.update(state -> new State(ButtonState.SUBMIT_DISABLED, UsernameStatus.NONE, UsernameState.Loading.INSTANCE));
repo.reserveUsername(nickname, result -> {
ThreadUtil.runOnMain(() -> {
result.either(
reserveUsernameJsonResponse -> {
uiState.update(state -> new State(ButtonState.SUBMIT, UsernameStatus.NONE, new UsernameState.Reserved(reserveUsernameJsonResponse)));
return null;
},
failure -> {
switch (failure) {
case SUCCESS:
throw new AssertionError();
case USERNAME_INVALID:
uiState.update(state -> new State(ButtonState.SUBMIT_DISABLED, UsernameStatus.INVALID_GENERIC, UsernameState.NoUsername.INSTANCE));
break;
case USERNAME_UNAVAILABLE:
uiState.update(state -> new State(ButtonState.SUBMIT_DISABLED, UsernameStatus.TAKEN, UsernameState.NoUsername.INSTANCE));
break;
case NETWORK_ERROR:
uiState.update(state -> new State(ButtonState.SUBMIT, UsernameStatus.NONE, UsernameState.NoUsername.INSTANCE));
events.postValue(Event.NETWORK_FAILURE);
break;
}
Disposable reserveDisposable = repo.reserveUsername(nickname).subscribe(result -> {
result.either(
reserveUsernameJsonResponse -> {
uiState.update(state -> new State(ButtonState.SUBMIT, UsernameStatus.NONE, new UsernameState.Reserved(reserveUsernameJsonResponse)));
return null;
},
failure -> {
switch (failure) {
case SUCCESS:
throw new AssertionError();
case USERNAME_INVALID:
uiState.update(state -> new State(ButtonState.SUBMIT_DISABLED, UsernameStatus.INVALID_GENERIC, UsernameState.NoUsername.INSTANCE));
break;
case USERNAME_UNAVAILABLE:
uiState.update(state -> new State(ButtonState.SUBMIT_DISABLED, UsernameStatus.TAKEN, UsernameState.NoUsername.INSTANCE));
break;
case NETWORK_ERROR:
uiState.update(state -> new State(ButtonState.SUBMIT, UsernameStatus.NONE, UsernameState.NoUsername.INSTANCE));
events.onNext(Event.NETWORK_FAILURE);
break;
}
return null;
});
});
return null;
});
});
disposables.add(reserveDisposable);
}
private static UsernameStatus mapUsernameError(@NonNull InvalidReason invalidReason) {

6
app/src/main/java/org/thoughtcrime/securesms/util/views/CircularProgressMaterialButton.kt
View File

@@ -9,6 +9,7 @@ import android.util.AttributeSet
import android.view.ViewAnimationUtils
import android.widget.FrameLayout
import androidx.annotation.StringRes
import androidx.annotation.VisibleForTesting
import androidx.core.animation.doOnEnd
import androidx.core.content.withStyledAttributes
import com.google.android.material.button.MaterialButton
@@ -88,6 +89,11 @@ class CircularProgressMaterialButton @JvmOverloads constructor(
materialButton.setOnClickListener(onClickListener)
}
@VisibleForTesting
fun getRequestedState(): State {
return requestedState
}
fun setSpinning() {
transformTo(State.PROGRESS, true)
}