From 2bce6776377232c33655666041c11752b8756ce1 Mon Sep 17 00:00:00 2001 From: Erwan Croze Date: Tue, 15 Jan 2019 11:49:53 +0100 Subject: [PATCH] Remove read of uncrypted Qrcode --- .../assistant/RemoteProvisioningLoginActivity.java | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/src/android/org/linphone/assistant/RemoteProvisioningLoginActivity.java b/src/android/org/linphone/assistant/RemoteProvisioningLoginActivity.java index 435dfa678..27ebd2c42 100644 --- a/src/android/org/linphone/assistant/RemoteProvisioningLoginActivity.java +++ b/src/android/org/linphone/assistant/RemoteProvisioningLoginActivity.java @@ -322,17 +322,11 @@ public class RemoteProvisioningLoginActivity extends Activity implements OnClick if (id == R.id.valider) { displayRemoteProvisioningInProgressDialog(); ok.setEnabled(false); - if (qrcodeString != null - && (qrcodeString.startsWith("http://") - || qrcodeString.startsWith("https://"))) { - storeAccount(qrcodeString); + if (decryptQrcode()) { + storeAccount(remoteUrl); } else { - if (decryptQrcode()) { - storeAccount(remoteUrl); - } else { - ok.setEnabled(true); - if (progress != null) progress.cancel(); - } + ok.setEnabled(true); + if (progress != null) progress.cancel(); } } }