kopia lustrzana https://github.com/ryukoposting/Signal-Android
Update PIN opt-out strings.
rodzic
d70999c386
commit
db2b64e58c
|
@ -21,9 +21,6 @@ public final class PinOptOutDialog {
|
|||
|
||||
public static void showForSkip(@NonNull Context context, @NonNull Runnable onSuccess, @NonNull Runnable onFailed) {
|
||||
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,
|
||||
onSuccess,
|
||||
onFailed);
|
||||
|
@ -31,27 +28,21 @@ public final class PinOptOutDialog {
|
|||
|
||||
public static void showForOptOut(@NonNull Context context, @NonNull Runnable onSuccess, @NonNull Runnable onFailed) {
|
||||
show(context,
|
||||
R.string.PinOptOutDialog_warning,
|
||||
R.string.PinOptOutDialog_disabling_pins_will_create_a_hidden_high_entropy_pin,
|
||||
R.string.PinOptOutDialog_disable_pin,
|
||||
false,
|
||||
onSuccess,
|
||||
onFailed);
|
||||
}
|
||||
|
||||
private static void show(@NonNull Context context,
|
||||
@StringRes int titleRes,
|
||||
@StringRes int bodyRes,
|
||||
@StringRes int buttonRes,
|
||||
boolean skip,
|
||||
@NonNull Runnable onSuccess,
|
||||
@NonNull Runnable onFailed)
|
||||
{
|
||||
AlertDialog dialog = new AlertDialog.Builder(context)
|
||||
.setTitle(titleRes)
|
||||
.setMessage(bodyRes)
|
||||
.setTitle(R.string.PinOptOutDialog_warning)
|
||||
.setMessage(R.string.PinOptOutDialog_disabling_pins_will_create_a_hidden_high_entropy_pin)
|
||||
.setCancelable(true)
|
||||
.setPositiveButton(buttonRes, (d, which) -> {
|
||||
.setPositiveButton(R.string.PinOptOutDialog_disable_pin, (d, which) -> {
|
||||
d.dismiss();
|
||||
AlertDialog progress = SimpleProgressDialog.show(context);
|
||||
|
||||
|
|
|
@ -10,6 +10,6 @@
|
|||
|
||||
<item
|
||||
android:id="@+id/menu_pin_skip"
|
||||
android:title="@string/KbsSplashFragment__skip_pin_creation"
|
||||
android:title="@string/KbsSplashFragment__disable_pin"
|
||||
app:showAsAction="never"/>
|
||||
</menu>
|
|
@ -959,9 +959,6 @@
|
|||
|
||||
<!-- PinOptOutDialog -->
|
||||
<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_disable_pin">Disable PIN</string>
|
||||
|
||||
|
@ -2194,7 +2191,7 @@
|
|||
<string name="KbsSplashFragment__update_pin">Update 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__skip_pin_creation">Skip PIN creation</string>
|
||||
<string name="KbsSplashFragment__disable_pin">Disable PIN</string>
|
||||
|
||||
<!-- KBS Reminder Dialog -->
|
||||
<string name="KbsReminderDialog__enter_your_signal_pin">Enter your Signal PIN</string>
|
||||
|
|
Ładowanie…
Reference in New Issue