diff --git a/res/values/strings.xml b/res/values/strings.xml index 459fcf7b5..fed86c0d9 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -470,6 +470,7 @@ Add Second Device Make sure both devices are on the same Wi-Fi or network + This creates a QR code that the second device can scan to copy the account. Install Delta Chat on your other device (https://get.delta.chat) Start Delta Chat, tap “Add as Second Device” and scan the code shown here diff --git a/src/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java b/src/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java index e2be59d37..89c669678 100644 --- a/src/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java +++ b/src/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java @@ -29,6 +29,7 @@ import android.os.Bundle; import androidx.annotation.NonNull; import androidx.annotation.Nullable; +import androidx.appcompat.app.AlertDialog; import androidx.core.content.ContextCompat; import androidx.core.graphics.drawable.DrawableCompat; import androidx.fragment.app.Fragment; @@ -275,8 +276,17 @@ public class ApplicationPreferencesActivity extends PassphraseRequiredActionBarA fragment = new ChatsPreferenceFragment(); break; case PREFERENCE_CATEGORY_MULTIDEVICE: - if (!ScreenLockUtil.applyScreenLock(getActivity(), getString(R.string.multidevice_title), ScreenLockUtil.REQUEST_CODE_CONFIRM_CREDENTIALS)) { - ((ApplicationPreferencesActivity)getActivity()).showBackupProvider(); + if (!ScreenLockUtil.applyScreenLock(getActivity(), getString(R.string.multidevice_title), + getString(R.string.multidevice_this_creates_a_qr_code) + "\n\n" + getString(R.string.enter_system_secret_to_continue), + ScreenLockUtil.REQUEST_CODE_CONFIRM_CREDENTIALS)) { + new AlertDialog.Builder(getActivity()) + .setTitle(R.string.multidevice_title) + .setMessage(R.string.multidevice_this_creates_a_qr_code) + .setPositiveButton(R.string.perm_continue, + (dialog, which) -> ((ApplicationPreferencesActivity)getActivity()).showBackupProvider()) + .setNegativeButton(R.string.cancel, null) + .show(); + ; } break; case PREFERENCE_CATEGORY_ADVANCED: diff --git a/src/org/thoughtcrime/securesms/preferences/AdvancedPreferenceFragment.java b/src/org/thoughtcrime/securesms/preferences/AdvancedPreferenceFragment.java index bf2b94284..d52d18d24 100644 --- a/src/org/thoughtcrime/securesms/preferences/AdvancedPreferenceFragment.java +++ b/src/org/thoughtcrime/securesms/preferences/AdvancedPreferenceFragment.java @@ -300,7 +300,7 @@ public class AdvancedPreferenceFragment extends ListSummaryPreferenceFragment private class ManageKeysListener implements Preference.OnPreferenceClickListener { @Override public boolean onPreferenceClick(Preference preference) { - boolean result = ScreenLockUtil.applyScreenLock(getActivity(), getString(R.string.pref_manage_keys), REQUEST_CODE_CONFIRM_CREDENTIALS_KEYS); + boolean result = ScreenLockUtil.applyScreenLock(getActivity(), getString(R.string.pref_manage_keys), getString(R.string.enter_system_secret_to_continue), REQUEST_CODE_CONFIRM_CREDENTIALS_KEYS); if (!result) { exportKeys(); } diff --git a/src/org/thoughtcrime/securesms/preferences/ChatsPreferenceFragment.java b/src/org/thoughtcrime/securesms/preferences/ChatsPreferenceFragment.java index 62f9fc77a..d4c536a46 100644 --- a/src/org/thoughtcrime/securesms/preferences/ChatsPreferenceFragment.java +++ b/src/org/thoughtcrime/securesms/preferences/ChatsPreferenceFragment.java @@ -257,7 +257,7 @@ public class ChatsPreferenceFragment extends ListSummaryPreferenceFragment { private class BackupListener implements Preference.OnPreferenceClickListener { @Override public boolean onPreferenceClick(Preference preference) { - boolean result = ScreenLockUtil.applyScreenLock(getActivity(), getString(R.string.pref_backup), REQUEST_CODE_CONFIRM_CREDENTIALS_BACKUP); + boolean result = ScreenLockUtil.applyScreenLock(getActivity(), getString(R.string.pref_backup), getString(R.string.enter_system_secret_to_continue), REQUEST_CODE_CONFIRM_CREDENTIALS_BACKUP); if (!result) { performBackup(); } diff --git a/src/org/thoughtcrime/securesms/util/ScreenLockUtil.java b/src/org/thoughtcrime/securesms/util/ScreenLockUtil.java index 11db50e7e..89ad8b559 100644 --- a/src/org/thoughtcrime/securesms/util/ScreenLockUtil.java +++ b/src/org/thoughtcrime/securesms/util/ScreenLockUtil.java @@ -11,11 +11,11 @@ public class ScreenLockUtil { public static final int REQUEST_CODE_CONFIRM_CREDENTIALS = 1001; - public static boolean applyScreenLock(Activity activity, String title, int requestCode) { + public static boolean applyScreenLock(Activity activity, String title, String descr, int requestCode) { KeyguardManager keyguardManager = (KeyguardManager) activity.getSystemService(Context.KEYGUARD_SERVICE); Intent intent; if (keyguardManager != null && isScreenLockAvailable()) { - intent = keyguardManager.createConfirmDeviceCredentialIntent(title, activity.getString(R.string.enter_system_secret_to_continue)); + intent = keyguardManager.createConfirmDeviceCredentialIntent(title, descr); if (intent != null) { activity.startActivityForResult(intent, requestCode); return true;