From 859e88bb68f0460b126c4f4f7ef1c1c1273d982c Mon Sep 17 00:00:00 2001 From: Andreas Abraham Date: Wed, 11 Aug 2021 13:47:32 +0200 Subject: mobile phone number verification removed --- .../pdfover/gui/composites/MobileBKUEnterNumberComposite.java | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/MobileBKUEnterNumberComposite.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/MobileBKUEnterNumberComposite.java index f10ea855..250cc238 100644 --- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/MobileBKUEnterNumberComposite.java +++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/MobileBKUEnterNumberComposite.java @@ -66,8 +66,7 @@ public class MobileBKUEnterNumberComposite extends StateComposite { String number = MobileBKUEnterNumberComposite.this.txt_number .getText(); - - number = MobileBKUHelper.normalizeMobileNumber(number); + number = number.replaceAll("\\s",""); MobileBKUEnterNumberComposite.this.setMobileNumber(number); @@ -83,11 +82,6 @@ public class MobileBKUEnterNumberComposite extends StateComposite { MobileBKUEnterNumberComposite.this.btn_ok.setEnabled(false); - } catch(InvalidNumberException ex) { - log.error("Validating input for Mobile BKU failed!", ex); //$NON-NLS-1$ - MobileBKUEnterNumberComposite.this - .setErrorMessage(Messages.getString("error.InvalidPhoneNumber")); //$NON-NLS-1$ - MobileBKUEnterNumberComposite.this.txt_number.setFocus(); } catch(InvalidPasswordException ex) { log.error("Validating input for Mobile BKU failed!", ex); //$NON-NLS-1$ MobileBKUEnterNumberComposite.this -- cgit v1.2.3 From c097313bf68bdeb54a6ac1dfaa308bf45ba7e80a Mon Sep 17 00:00:00 2001 From: Andreas Abraham Date: Fri, 13 Aug 2021 09:50:59 +0200 Subject: Change label for mobile phone number --- .../composites/MobileBKUEnterNumberComposite.java | 28 ++++++++++------------ .../at/asit/pdfover/gui/messages.properties | 2 +- .../at/asit/pdfover/gui/messages_de.properties | 2 +- 3 files changed, 14 insertions(+), 18 deletions(-) diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/MobileBKUEnterNumberComposite.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/MobileBKUEnterNumberComposite.java index 250cc238..5c372848 100644 --- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/MobileBKUEnterNumberComposite.java +++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/MobileBKUEnterNumberComposite.java @@ -196,20 +196,16 @@ public class MobileBKUEnterNumberComposite extends StateComposite { setLayout(new FormLayout()); final Composite containerComposite = new Composite(this, SWT.NATIVE); - containerComposite.addPaintListener(new PaintListener() { - - @Override - public void paintControl(PaintEvent e) { - Rectangle clientArea = containerComposite.getClientArea(); - - //e.gc.setForeground(); - e.gc.setForeground(Constants.MAINBAR_ACTIVE_BACK_DARK); - e.gc.setLineWidth(3); - e.gc.setLineStyle(SWT.LINE_SOLID); - e.gc.drawRoundRectangle(clientArea.x, - clientArea.y, clientArea.width - 2, clientArea.height - 2, - 10, 10); - } + containerComposite.addPaintListener(e -> { + Rectangle clientArea = containerComposite.getClientArea(); + + //e.gc.setForeground(); + e.gc.setForeground(Constants.MAINBAR_ACTIVE_BACK_DARK); + e.gc.setLineWidth(3); + e.gc.setLineStyle(SWT.LINE_SOLID); + e.gc.drawRoundRectangle(clientArea.x, + clientArea.y, clientArea.width - 2, clientArea.height - 2, + 10, 10); }); containerComposite.setLayout(new FormLayout()); FormData fd_containerComposite = new FormData(); @@ -246,8 +242,8 @@ public class MobileBKUEnterNumberComposite extends StateComposite { Image mobile = new Image(getDisplay(), data); FormData fd_lbl_image = new FormData(); - fd_lbl_image.top = new FormAttachment(50, -1 * (data.width / 2)); - fd_lbl_image.bottom = new FormAttachment(50, data.width / 2); + fd_lbl_image.top = new FormAttachment(20, -1 * (data.width / 2)); + fd_lbl_image.bottom = new FormAttachment(20, data.width / 2); fd_lbl_image.left = new FormAttachment(0, 10); fd_lbl_image.width = data.width; lbl_image.setLayoutData(fd_lbl_image); diff --git a/pdf-over-gui/src/main/resources/at/asit/pdfover/gui/messages.properties b/pdf-over-gui/src/main/resources/at/asit/pdfover/gui/messages.properties index b86c0a21..2a60104b 100644 --- a/pdf-over-gui/src/main/resources/at/asit/pdfover/gui/messages.properties +++ b/pdf-over-gui/src/main/resources/at/asit/pdfover/gui/messages.properties @@ -199,7 +199,7 @@ main.signature=Signing mobileBKU.aTrustDisclaimer=This service is provided by A-Trust mobileBKU.certExpiresSoon=Since the validity of your certificate expires in the next few days, a new activation is necessary (free of charge). Press "Yes" to visit https\://www.handy-signatur.at/ now, and then sign in to your account. mobileBKU.notice=Notice from server\: -mobileBKU.number=Number\: +mobileBKU.number=Username/Phone Number\: mobileBKU.password=Password\: mobileBKU.show=Show signature data mobileBKU.show_tooltip=Shows the data to be signed diff --git a/pdf-over-gui/src/main/resources/at/asit/pdfover/gui/messages_de.properties b/pdf-over-gui/src/main/resources/at/asit/pdfover/gui/messages_de.properties index 48686c92..2b0f4dd5 100644 --- a/pdf-over-gui/src/main/resources/at/asit/pdfover/gui/messages_de.properties +++ b/pdf-over-gui/src/main/resources/at/asit/pdfover/gui/messages_de.properties @@ -190,7 +190,7 @@ main.signature=Signatur mobileBKU.aTrustDisclaimer=Dieses Service wird von der Fa. A-Trust zu Verf\u00FCgung gestellt mobileBKU.certExpiresSoon=Da die G\u00FCltigkeit Ihres Zertifikats in den n\u00E4chsten Tagen endet, ist eine erneute Aktivierung erforderlich (geb\u00FChrenfrei). W\u00E4hlen Sie "Ja" um https\://www.handy-signatur.at/ zu \u00F6ffnen, und loggen Sie sich dann in Ihr Konto ein. mobileBKU.notice=Nachricht vom Server\: -mobileBKU.number=Nummer\: +mobileBKU.number=Benutzername/Telefonnummer\: mobileBKU.password=Passwort\: mobileBKU.show=Signaturdaten anzeigen mobileBKU.show_tooltip=Zeigt die zu signierenden Daten an -- cgit v1.2.3 From 1902a618addd64eea104f8d96a113c9a266f800b Mon Sep 17 00:00:00 2001 From: Andreas Abraham Date: Fri, 13 Aug 2021 09:54:42 +0200 Subject: Code cleanup --- .../gui/composites/MobileBKUEnterNumberComposite.java | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/MobileBKUEnterNumberComposite.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/MobileBKUEnterNumberComposite.java index 5c372848..e290528e 100644 --- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/MobileBKUEnterNumberComposite.java +++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/MobileBKUEnterNumberComposite.java @@ -95,8 +95,6 @@ public class MobileBKUEnterNumberComposite extends StateComposite { MobileBKUEnterNumberComposite.this.txt_number.setFocus(); return; } - - //MobileBKUEnterNumberComposite.this.state.updateStateMachine(); } }; @@ -218,7 +216,6 @@ public class MobileBKUEnterNumberComposite extends StateComposite { this.txt_number = new Text(containerComposite, SWT.SINGLE | SWT.NATIVE | SWT.BORDER); FormData fd_number = new FormData(); - //fd_number.top = new FormAttachment(0, 20); fd_number.bottom = new FormAttachment(50, -10); fd_number.left = new FormAttachment(50, 10); fd_number.right = new FormAttachment(100, -20); @@ -230,9 +227,7 @@ public class MobileBKUEnterNumberComposite extends StateComposite { this.lbl_number.setAlignment(SWT.RIGHT); this.lbl_number.setText(Messages.getString("mobileBKU.number")); //$NON-NLS-1$ FormData fd_lbl_number = new FormData(); - //fd_lbl_number.top = new FormAttachment(30, -15); fd_lbl_number.bottom = new FormAttachment(50, -10); - //fd_lbl_number.left = new FormAttachment(0, 20); fd_lbl_number.right = new FormAttachment(50, -10); this.lbl_number.setLayoutData(fd_lbl_number); @@ -254,7 +249,6 @@ public class MobileBKUEnterNumberComposite extends StateComposite { | SWT.BORDER | SWT.NATIVE); FormData fd_password = new FormData(); fd_password.top = new FormAttachment(50, 10); - //fd_password.bottom = new FormAttachment(50, 15); fd_password.left = new FormAttachment(50, 10); fd_password.right = new FormAttachment(100, -20); this.txt_password.setLayoutData(fd_password); @@ -265,28 +259,22 @@ public class MobileBKUEnterNumberComposite extends StateComposite { this.lbl_password.setText(Messages.getString("mobileBKU.password")); //$NON-NLS-1$ FormData fd_lbl_password = new FormData(); fd_lbl_password.top = new FormAttachment(50, 10); - //fd_lbl_password.bottom = new FormAttachment(50, 15); - //fd_lbl_password.left = new FormAttachment(0, 20); fd_lbl_password.right = new FormAttachment(50, -10); this.lbl_password.setLayoutData(fd_lbl_password); this.btn_ok = new Button(containerComposite, SWT.NATIVE); this.btn_ok.setText(Messages.getString("common.Ok")); //$NON-NLS-1$ FormData fd_btn_ok = new FormData(); - //fd_btn_ok.top = new FormAttachment(87, 0); fd_btn_ok.bottom = new FormAttachment(100, -20); fd_btn_ok.right = new FormAttachment(100, -20); - //fd_btn_ok.left = new FormAttachment(100, -70); this.btn_ok.setLayoutData(fd_btn_ok); this.btn_ok.addSelectionListener(this.okListener); this.btn_cancel = new Button(containerComposite, SWT.NATIVE); this.btn_cancel.setText(Messages.getString("common.Cancel")); //$NON-NLS-1$ FormData fd_btn_cancel = new FormData(); - //fd_btn_cancel.top = new FormAttachment(87, 0); fd_btn_cancel.bottom = new FormAttachment(100, -20); fd_btn_cancel.right = new FormAttachment(this.btn_ok, -10); - //fd_btn_cancel.left = new FormAttachment(100, -70); this.btn_cancel.setLayoutData(fd_btn_cancel); this.btn_cancel.addSelectionListener(this.cancelListener); @@ -312,7 +300,7 @@ public class MobileBKUEnterNumberComposite extends StateComposite { this.btn_ok.setEnabled(true); } - /* + /** * (non-Javadoc) * * @see at.asit.pdfover.gui.composites.StateComposite#doLayout() @@ -367,7 +355,7 @@ public class MobileBKUEnterNumberComposite extends StateComposite { } } - /* (non-Javadoc) + /** (non-Javadoc) * @see at.asit.pdfover.gui.composites.StateComposite#reloadResources() */ @Override -- cgit v1.2.3