TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-06-09 14:38:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix strings in KBS PIN flow.

Browse Source
This commit is contained in:
Greyson Parrelli 2020-02-02 23:19:25 -05:00
parent 77caa9e9d4
commit a6786e5c2b
2 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/org/thoughtcrime/securesms/lock/v2/ConfirmKbsPinFragment.java
View File

@ -32,9 +32,9 @@ public class ConfirmKbsPinFragment extends BaseKbsPinFragment<ConfirmKbsPinViewM
args = ConfirmKbsPinFragmentArgs.fromBundle(requireArguments()); args = ConfirmKbsPinFragmentArgs.fromBundle(requireArguments());
if (args.getIsNewPin()) { if (args.getIsNewPin()) {
initializeViewStatesForNewPin(); initializeViewStatesForPinCreate();
} else { } else {
initializeViewStatesForPin(); initializeViewStatesForPinUpdate();
} }
} }
@ -53,15 +53,15 @@ public class ConfirmKbsPinFragment extends BaseKbsPinFragment<ConfirmKbsPinViewM
return viewModel; return viewModel;
} }
private void initializeViewStatesForNewPin() { private void initializeViewStatesForPinCreate() {
getTitle().setText(R.string.CreateKbsPinFragment__create_a_new_pin); getTitle().setText(R.string.CreateKbsPinFragment__create_your_pin);
getDescription().setText(R.string.ConfirmKbsPinFragment__confirm_your_pin); getDescription().setText(R.string.ConfirmKbsPinFragment__confirm_your_pin);
getKeyboardToggle().setVisibility(View.INVISIBLE); getKeyboardToggle().setVisibility(View.INVISIBLE);
getLabel().setText(""); getLabel().setText("");
} }
private void initializeViewStatesForPin() { private void initializeViewStatesForPinUpdate() {
getTitle().setText(R.string.CreateKbsPinFragment__create_your_pin); getTitle().setText(R.string.CreateKbsPinFragment__create_a_new_pin);
getDescription().setText(R.string.ConfirmKbsPinFragment__confirm_your_pin); getDescription().setText(R.string.ConfirmKbsPinFragment__confirm_your_pin);
getKeyboardToggle().setVisibility(View.INVISIBLE); getKeyboardToggle().setVisibility(View.INVISIBLE);
getLabel().setText(""); getLabel().setText("");

17
app/src/main/java/org/thoughtcrime/securesms/lock/v2/CreateKbsPinFragment.java
View File

@ -16,26 +16,25 @@ public class CreateKbsPinFragment extends BaseKbsPinFragment<CreateKbsPinViewMod
args = CreateKbsPinFragmentArgs.fromBundle(requireArguments()); args = CreateKbsPinFragmentArgs.fromBundle(requireArguments());
if (args.getIsNewPin()) { if (args.getIsNewPin()) {
initializeViewStatesForNewPin(); initializeViewStatesForPinCreate();
} else { } else {
initializeViewStatesForPin(); initializeViewStatesForPinUpdate();
} }
getLabel().setText(getPinLengthRestrictionText(R.plurals.CreateKbsPinFragment__pin_must_be_at_least_digits)); getLabel().setText(getPinLengthRestrictionText(R.plurals.CreateKbsPinFragment__pin_must_be_at_least_digits));
getConfirm().setEnabled(false); getConfirm().setEnabled(false);
} }
private void initializeViewStatesForPin() { private void initializeViewStatesForPinUpdate() {
getTitle().setText(R.string.CreateKbsPinFragment__create_your_pin);
getDescription().setText(R.string.CreateKbsPinFragment__pins_add_an_extra_layer_of_security);
}
private void initializeViewStatesForNewPin() {
getTitle().setText(R.string.CreateKbsPinFragment__create_a_new_pin); getTitle().setText(R.string.CreateKbsPinFragment__create_a_new_pin);
getDescription().setText(R.string.CreateKbsPinFragment__because_youre_still_logged_in); getDescription().setText(R.string.CreateKbsPinFragment__because_youre_still_logged_in);
} }
private void initializeViewStatesForPinCreate() {
getTitle().setText(R.string.CreateKbsPinFragment__create_your_pin);
getDescription().setText(R.string.CreateKbsPinFragment__pins_add_an_extra_layer_of_security);
}
@Override @Override
protected CreateKbsPinViewModel initializeViewModel() { protected CreateKbsPinViewModel initializeViewModel() {
CreateKbsPinViewModel viewModel = ViewModelProviders.of(this).get(CreateKbsPinViewModel.class); CreateKbsPinViewModel viewModel = ViewModelProviders.of(this).get(CreateKbsPinViewModel.class);