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

Update PIN opt-out strings.

Browse Source
This commit is contained in:
Greyson Parrelli 2020-07-10 17:14:35 -04:00
parent d70999c386
commit db2b64e58c
3 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/src/main/java/org/thoughtcrime/securesms/pin/PinOptOutDialog.java
View File

@ -21,9 +21,6 @@ public final class PinOptOutDialog {
public static void showForSkip(@NonNull Context context, @NonNull Runnable onSuccess, @NonNull Runnable onFailed) { public static void showForSkip(@NonNull Context context, @NonNull Runnable onSuccess, @NonNull Runnable onFailed) {
show(context, show(context,
R.string.PinOptOutDialog_warning,
R.string.PinOptOutDialog_skipping_pin_creation_will_create_a_hidden_high_entropy_pin,
R.string.PinOptOutDialog_skip_pin_creation,
true, true,
onSuccess, onSuccess,
onFailed); onFailed);
@ -31,27 +28,21 @@ public final class PinOptOutDialog {
public static void showForOptOut(@NonNull Context context, @NonNull Runnable onSuccess, @NonNull Runnable onFailed) { public static void showForOptOut(@NonNull Context context, @NonNull Runnable onSuccess, @NonNull Runnable onFailed) {
show(context, show(context,
R.string.PinOptOutDialog_warning,
R.string.PinOptOutDialog_disabling_pins_will_create_a_hidden_high_entropy_pin,
R.string.PinOptOutDialog_disable_pin,
false, false,
onSuccess, onSuccess,
onFailed); onFailed);
} }
private static void show(@NonNull Context context, private static void show(@NonNull Context context,
@StringRes int titleRes,
@StringRes int bodyRes,
@StringRes int buttonRes,
boolean skip, boolean skip,
@NonNull Runnable onSuccess, @NonNull Runnable onSuccess,
@NonNull Runnable onFailed) @NonNull Runnable onFailed)
{ {
AlertDialog dialog = new AlertDialog.Builder(context) AlertDialog dialog = new AlertDialog.Builder(context)
.setTitle(titleRes) .setTitle(R.string.PinOptOutDialog_warning)
.setMessage(bodyRes) .setMessage(R.string.PinOptOutDialog_disabling_pins_will_create_a_hidden_high_entropy_pin)
.setCancelable(true) .setCancelable(true)
.setPositiveButton(buttonRes, (d, which) -> { .setPositiveButton(R.string.PinOptOutDialog_disable_pin, (d, which) -> {
d.dismiss(); d.dismiss();
AlertDialog progress = SimpleProgressDialog.show(context); AlertDialog progress = SimpleProgressDialog.show(context);

2
app/src/main/res/menu/pin_skip.xml
View File

@ -10,6 +10,6 @@
<item <item
android:id="@+id/menu_pin_skip" android:id="@+id/menu_pin_skip"
android:title="@string/KbsSplashFragment__skip_pin_creation" android:title="@string/KbsSplashFragment__disable_pin"
app:showAsAction="never"/> app:showAsAction="never"/>
</menu> </menu>

5
app/src/main/res/values/strings.xml
View File

@ -959,9 +959,6 @@
<!-- PinOptOutDialog --> <!-- PinOptOutDialog -->
<string name="PinOptOutDialog_warning">Warning</string> <string name="PinOptOutDialog_warning">Warning</string>
<string name="PinOptOutDialog_skipping_pin_creation_will_create_a_hidden_high_entropy_pin">Skipping PIN creation will create a hidden, high-entropy PIN associated with your account that is unrecoverable. When you re-register Signal you will lose all data unless you manually back up and restore. You can not turn on Registration Lock while the PIN is disabled.</string>
<string name="PinOptOutDialog_skip_pin_creation">Skip PIN creation</string>
<string name="PinOptOutDialog_disable_pin_title">Disable PIN?</string>
<string name="PinOptOutDialog_disabling_pins_will_create_a_hidden_high_entropy_pin">Disabling PIN will create a hidden, high-entropy PIN associated with your account that is unrecoverable. When you re-register Signal you will lose all data unless you manually back up and restore. You can not turn on Registration Lock while the PIN is disabled.</string> <string name="PinOptOutDialog_disabling_pins_will_create_a_hidden_high_entropy_pin">Disabling PIN will create a hidden, high-entropy PIN associated with your account that is unrecoverable. When you re-register Signal you will lose all data unless you manually back up and restore. You can not turn on Registration Lock while the PIN is disabled.</string>
<string name="PinOptOutDialog_disable_pin">Disable PIN</string> <string name="PinOptOutDialog_disable_pin">Disable PIN</string>
@ -2194,7 +2191,7 @@
<string name="KbsSplashFragment__update_pin">Update PIN</string> <string name="KbsSplashFragment__update_pin">Update PIN</string>
<string name="KbsSplashFragment__create_your_pin">Create your PIN</string> <string name="KbsSplashFragment__create_your_pin">Create your PIN</string>
<string name="KbsSplashFragment__learn_more_about_pins">Learn more about PINs</string> <string name="KbsSplashFragment__learn_more_about_pins">Learn more about PINs</string>
<string name="KbsSplashFragment__skip_pin_creation">Skip PIN creation</string> <string name="KbsSplashFragment__disable_pin">Disable PIN</string>
<!-- KBS Reminder Dialog --> <!-- KBS Reminder Dialog -->
<string name="KbsReminderDialog__enter_your_signal_pin">Enter your Signal PIN</string> <string name="KbsReminderDialog__enter_your_signal_pin">Enter your Signal PIN</string>