diff --git a/src/main/java/com/b44t/messenger/DcContext.java b/src/main/java/com/b44t/messenger/DcContext.java index 22207ea3b..2fb0ecaae 100644 --- a/src/main/java/com/b44t/messenger/DcContext.java +++ b/src/main/java/com/b44t/messenger/DcContext.java @@ -51,8 +51,8 @@ public class DcContext { public final static int DC_QR_FPR_MISMATCH = 220; public final static int DC_QR_FPR_WITHOUT_ADDR = 230; public final static int DC_QR_ACCOUNT = 250; - public final static int DC_QR_BACKUP = 251; public final static int DC_QR_BACKUP2 = 252; + public final static int DC_QR_BACKUP_TOO_NEW = 255; public final static int DC_QR_WEBRTC = 260; public final static int DC_QR_PROXY = 271; public final static int DC_QR_ADDR = 320; diff --git a/src/main/java/org/thoughtcrime/securesms/WelcomeActivity.java b/src/main/java/org/thoughtcrime/securesms/WelcomeActivity.java index 879964472..073ebe58b 100644 --- a/src/main/java/org/thoughtcrime/securesms/WelcomeActivity.java +++ b/src/main/java/org/thoughtcrime/securesms/WelcomeActivity.java @@ -349,7 +349,6 @@ public class WelcomeActivity extends BaseActionBarActivity implements DcEventCen } DcLot qrParsed = dcContext.checkQr(qrRaw); switch (qrParsed.getState()) { - case DcContext.DC_QR_BACKUP: case DcContext.DC_QR_BACKUP2: final String finalQrRaw = qrRaw; new AlertDialog.Builder(this) @@ -361,6 +360,14 @@ public class WelcomeActivity extends BaseActionBarActivity implements DcEventCen .show(); break; + case DcContext.DC_QR_BACKUP_TOO_NEW: + new AlertDialog.Builder(this) + .setTitle(R.string.multidevice_receiver_title) + .setMessage(R.string.multidevice_receiver_needs_update) + .setPositiveButton(R.string.ok, null) + .show(); + break; + default: new AlertDialog.Builder(this) .setMessage(R.string.qraccount_qr_code_cannot_be_used) diff --git a/src/main/java/org/thoughtcrime/securesms/qr/QrCodeHandler.java b/src/main/java/org/thoughtcrime/securesms/qr/QrCodeHandler.java index af8189f08..25e430456 100644 --- a/src/main/java/org/thoughtcrime/securesms/qr/QrCodeHandler.java +++ b/src/main/java/org/thoughtcrime/securesms/qr/QrCodeHandler.java @@ -74,7 +74,6 @@ public class QrCodeHandler { builder.setCancelable(false); break; - case DcContext.DC_QR_BACKUP: case DcContext.DC_QR_BACKUP2: builder.setTitle(R.string.multidevice_receiver_title); builder.setMessage(activity.getString(R.string.multidevice_receiver_scanning_ask) + "\n\n" + activity.getString(R.string.multidevice_same_network_hint)); @@ -89,6 +88,12 @@ public class QrCodeHandler { BackupTransferActivity.appendSSID(activity, alertDialog.findViewById(android.R.id.message)); return; + case DcContext.DC_QR_BACKUP_TOO_NEW: + builder.setTitle(R.string.multidevice_receiver_title); + builder.setMessage(activity.getString(R.string.multidevice_receiver_needs_update)); + builder.setNegativeButton(R.string.ok, null); + break; + case DcContext.DC_QR_PROXY: builder.setTitle(R.string.proxy_use_proxy); builder.setMessage(activity.getString(R.string.proxy_use_proxy_confirm, qrParsed.getText1())); diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 3d4ab0197..655dd3b41 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -550,6 +550,7 @@ Add as Second Device On the first device, go to “Settings / Add Second Device“ and scan the code shown there Copy the profile from the other device to this device? + The profile you want to import is from a newer Delta Chat version.\n\nTo continue setting up second device, please update this device to the latest version of Delta Chat. Abort setting up second device? This will invalidate the QR code copied to clipboard. (experimental, version 1.36 required)