[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-4' - loleaflet/src

[Libreoffice Gerrit user]

 loleaflet/src/control/Signing.js |   13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

New commits:
commit 69b4ad7b5204d79b8c624a90819351c6148b4ada
Author:     Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
AuthorDate: Thu Jan 3 22:08:12 2019 +0100
Commit:     Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
CommitDate: Thu Jan 3 22:10:31 2019 +0100

    try default PIN first, fix wrong error condition, error reporting
    
    Change-Id: I2e04c3cba8a3d907b7f94471cd5a30439d34ef42
    (cherry picked from commit 83ae7f93af7c866df6ac2e023388c9e627f81223)

diff --git a/loleaflet/src/control/Signing.js b/loleaflet/src/control/Signing.js
index 46167f0c1..1c3230caa 100644
--- a/loleaflet/src/control/Signing.js
+++ b/loleaflet/src/control/Signing.js
@@ -213,7 +213,8 @@ function vereignLogin() {
 			}
 			else {
 				vex.dialog.alert(_('Error at login.'));
-				console.log('Login Error: ' + result);
+				console.log('Error at login of previousa added device');
+				console.log(result);
 				identity = null;
 			}
 		});
@@ -239,7 +240,8 @@ function verignNewIdentity(newIdentity) {
 		}
 		else {
 			vex.dialog.alert(_('Couldn\'t get the QR code image.'));
-			console.log('Login Error: ' + result);
+			console.log('Error getting the QR code');
+			console.log(result);
 			library.clearIdentities();
 		}
 	});
@@ -263,7 +265,10 @@ function vereignRecoverFromEmail(emailOrSMS) {
 		}
 		var createdIdentity = result.data;
 		library.identityRestoreAccess(result.data, emailOrSMS).then(function(result) {
-			if (isSuccess(result)) {
+			if (!isSuccess(result)) {
+				vex.dialog.alert(_('Error when trying to restore access to identity.'));
+				console.log('Error at IdentityRestoreAccess');
+				console.log(result);
 				return;
 			}
 			vex.dialog.open({
@@ -482,7 +487,7 @@ L.Map.include({
 						vereignRecoverFromEmailDialog();
 					}
 					else if (selectedIdentityKey) {
-						vereignPinCodeDialog(selectedIdentityKey);
+						vereignLoadIdentity(selectedIdentityKey, '00000000');
 					}
 				}
 			});