Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2025-12-22 12:08:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use new linked device flow.

Browse Source
This commit is contained in:
mtang-signal
2024-10-11 08:58:05 -07:00
parent fe8fe0a37b
commit f434ceaa15
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/org/thoughtcrime/securesms/DeviceProvisioningActivity.java
View File

@@ -9,6 +9,7 @@ import androidx.appcompat.app.AlertDialog;
import com.google.android.material.dialog.MaterialAlertDialogBuilder; import com.google.android.material.dialog.MaterialAlertDialogBuilder;
import org.signal.core.util.logging.Log; import org.signal.core.util.logging.Log;
import org.thoughtcrime.securesms.components.settings.app.AppSettingsActivity;
public class DeviceProvisioningActivity extends PassphraseRequiredActivity { public class DeviceProvisioningActivity extends PassphraseRequiredActivity {
@@ -26,7 +27,7 @@ public class DeviceProvisioningActivity extends PassphraseRequiredActivity {
.setTitle(getString(R.string.DeviceProvisioningActivity_link_a_signal_device)) .setTitle(getString(R.string.DeviceProvisioningActivity_link_a_signal_device))
.setMessage(getString(R.string.DeviceProvisioningActivity_it_looks_like_youre_trying_to_link_a_signal_device_using_a_3rd_party_scanner)) .setMessage(getString(R.string.DeviceProvisioningActivity_it_looks_like_youre_trying_to_link_a_signal_device_using_a_3rd_party_scanner))
.setPositiveButton(R.string.DeviceProvisioningActivity_continue, (dialog1, which) -> { .setPositiveButton(R.string.DeviceProvisioningActivity_continue, (dialog1, which) -> {
startActivity(DeviceActivity.getIntentForScanner(this)); startActivity(AppSettingsActivity.linkedDevices(this));
finish(); finish();
}) })
.setNegativeButton(android.R.string.cancel, (dialog12, which) -> { .setNegativeButton(android.R.string.cancel, (dialog12, which) -> {