From bbefc4a50e6fd189032dc4a1298ada24e7cc5595 Mon Sep 17 00:00:00 2001 From: Jakob Heher Date: Fri, 30 Sep 2022 12:03:23 +0200 Subject: cleanup --- .../src/main/java/at/asit/pdfover/commons/Constants.java | 5 +++-- .../at/asit/pdfover/gui/bku/mobile/ATrustHandler.java | 15 --------------- .../gui/composites/MobileBKUFingerprintComposite.java | 2 +- 3 files changed, 4 insertions(+), 18 deletions(-) diff --git a/pdf-over-commons/src/main/java/at/asit/pdfover/commons/Constants.java b/pdf-over-commons/src/main/java/at/asit/pdfover/commons/Constants.java index d3864fdf..8e8188fa 100644 --- a/pdf-over-commons/src/main/java/at/asit/pdfover/commons/Constants.java +++ b/pdf-over-commons/src/main/java/at/asit/pdfover/commons/Constants.java @@ -47,12 +47,13 @@ public class Constants { v = props.getProperty("version"); } catch (Exception e) { log.warn("Failed to load project version", e); + v = "UNKNOWN-SNAPSHOT"; } APP_VERSION = v; } /** Application name + version */ - public static final String APP_NAME_VERSION = (APP_VERSION == null ? APP_NAME : APP_NAME + " v" + APP_VERSION); + public static final String APP_NAME_VERSION = (APP_NAME + " v" + APP_VERSION); public static final String SIGNATURE_PROFILE = "SIGNATURE_PROFILE"; public static final String DEFAULT_POSTFIX = "_signed"; @@ -114,7 +115,7 @@ public class Constants { public static final int SIGNATURE_KEYBOARD_POSITIONING_OFFSET = 15; /** PDF-Over User Agent string */ - public static final String USER_AGENT_STRING = "PDF-Over " + (APP_VERSION == null ? "4.3" : APP_VERSION); + public static final String USER_AGENT_STRING = "PDF-Over " + APP_VERSION; /** Current release file */ public static final String CURRENT_RELEASE_URL = "https://updates.a-sit.at/pdf-over/Release.txt"; diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/bku/mobile/ATrustHandler.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/bku/mobile/ATrustHandler.java index 5e4975e3..5d96d49e 100644 --- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/bku/mobile/ATrustHandler.java +++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/bku/mobile/ATrustHandler.java @@ -508,21 +508,6 @@ public class ATrustHandler extends MobileBKUHandler { return executeGet(client, get); } - /** - * @param responseData - * @return a boolean - */ - public Boolean handleWaitforAppResponse(String responseData) { - - getStatus().errorMessage = null; - if (!responseData.toLowerCase().contains("Bitte starten Sie Ihre Handy-Signatur App!".toLowerCase())/* || - responseData.toLowerCase().contains("TAN (Handy-Signatur App)".toLowerCase())*/) { - - return true; - } - return false; - } - /** * Parse QR code response * @param responseData diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/MobileBKUFingerprintComposite.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/MobileBKUFingerprintComposite.java index 44ff4077..af630b8d 100644 --- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/MobileBKUFingerprintComposite.java +++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/MobileBKUFingerprintComposite.java @@ -191,9 +191,9 @@ public class MobileBKUFingerprintComposite extends StateComposite { * the reference value to set */ public void setRefVal(String refVal) { - this.refVal = refVal.trim(); if (this.refVal != null) { + this.refVal = refVal.trim(); this.lblRefVal.setText(this.refVal); } else { this.lblRefVal.setText(""); -- cgit v1.2.3