summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakob Heher <jakob.heher@iaik.tugraz.at>2022-09-30 12:03:23 +0200
committerJakob Heher <jakob.heher@iaik.tugraz.at>2022-09-30 12:03:23 +0200
commitbbefc4a50e6fd189032dc4a1298ada24e7cc5595 (patch)
tree2e6646bd881ccc19e82506013d565aed5189f95c
parent29059e0e1e69bc15eea215427df299378be931b5 (diff)
downloadpdf-over-bbefc4a50e6fd189032dc4a1298ada24e7cc5595.tar.gz
pdf-over-bbefc4a50e6fd189032dc4a1298ada24e7cc5595.tar.bz2
pdf-over-bbefc4a50e6fd189032dc4a1298ada24e7cc5595.zip
cleanup
-rw-r--r--pdf-over-commons/src/main/java/at/asit/pdfover/commons/Constants.java5
-rw-r--r--pdf-over-gui/src/main/java/at/asit/pdfover/gui/bku/mobile/ATrustHandler.java15
-rw-r--r--pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/MobileBKUFingerprintComposite.java2
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
@@ -509,21 +509,6 @@ public class ATrustHandler extends MobileBKUHandler {
}
/**
- * @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
* @return whether a SL response was received
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("");