diff options
| author | Andreas Abraham <andreas.abraham@egiz.gv.at> | 2019-11-05 16:20:44 +0100 |
|---|---|---|
| committer | Andreas Abraham <andreas.abraham@egiz.gv.at> | 2019-11-05 16:20:44 +0100 |
| commit | 03b9af56efaec1adecfadc09327a14dc116a9c3a (patch) | |
| tree | 9c3f5238dbbed83d1449b81e6a84796538bbd229 /pdf-over-gui/src/main/java/at/asit/pdfover/gui/bku/mobile | |
| parent | 02bae5a8841e77f4409778576ffcebf3ab582d5e (diff) | |
| download | pdf-over-03b9af56efaec1adecfadc09327a14dc116a9c3a.tar.gz pdf-over-03b9af56efaec1adecfadc09327a14dc116a9c3a.tar.bz2 pdf-over-03b9af56efaec1adecfadc09327a14dc116a9c3a.zip | |
support of all cases when pressing the sms tan button
Diffstat (limited to 'pdf-over-gui/src/main/java/at/asit/pdfover/gui/bku/mobile')
3 files changed, 13 insertions, 12 deletions
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 2c6f0e55..7d3f986a 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 @@ -452,11 +452,10 @@ public class ATrustHandler extends MobileBKUHandler { public Boolean handleWaitforAppResponse(String responseData) {
getStatus().setErrorMessage(null);
- if (!responseData.contains("Bitte starten Sie Ihre")) { //$NON-NLS-1$
- //getSigningState().setSignatureResponse(
- // new SLResponse(responseData, getStatus().getServer(), null, null));
+ if (!responseData.toLowerCase().contains("Bitte starten Sie Ihre Handy-Signatur App!".toLowerCase())/* || //$NON-NLS-1$
+ responseData.toLowerCase().contains("TAN (Handy-Signatur App)".toLowerCase())*/) { //$NON-NLS-1$
+
return true;
-
}
return false;
}
@@ -497,14 +496,15 @@ public class ATrustHandler extends MobileBKUHandler { *
*/
@Override
- public void handlePolling(String responseData) throws ATrustConnectionException {
-
+ public boolean handlePolling() throws ATrustConnectionException {
+
ATrustStatus status = getStatus();
URLConnection urlconnection = null;
String isReady = null;
Status serverStatus = null;
int waits = 0;
final String ERROR = "Error: Server is not responding"; //$NON-NLS-1$
+
try {
do {
@@ -527,11 +527,11 @@ public class ATrustHandler extends MobileBKUHandler { if (serverStatus.isFin()) {
String response = getSignaturePage();
handleCredentialsResponse(response);
- } else {
- status.setErrorMessage("Server reponded ERROR during polling"); //$NON-NLS-1$
- log.error("Server reponded ERROR during polling"); //$NON-NLS-1$
- throw new ATrustConnectionException();
+ return true;
}
+ status.setErrorMessage("Server reponded ERROR during polling"); //$NON-NLS-1$
+ log.error("Server reponded ERROR during polling"); //$NON-NLS-1$
+ throw new ATrustConnectionException();
} catch (Exception e) {
log.error("handle polling failed" + e.getMessage()); //$NON-NLS-1$
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/bku/mobile/IAIKHandler.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/bku/mobile/IAIKHandler.java index efb2b37d..2595de44 100644 --- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/bku/mobile/IAIKHandler.java +++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/bku/mobile/IAIKHandler.java @@ -362,7 +362,8 @@ public class IAIKHandler extends MobileBKUHandler { }
@Override
- public void handlePolling(String responseData) {
+ public boolean handlePolling() {
//nothing todo
+ return true;
}
}
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/bku/mobile/MobileBKUHandler.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/bku/mobile/MobileBKUHandler.java index 3ab47941..4c09c02d 100644 --- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/bku/mobile/MobileBKUHandler.java +++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/bku/mobile/MobileBKUHandler.java @@ -356,5 +356,5 @@ public abstract class MobileBKUHandler { /**
* @param responseData
*/
- public abstract void handlePolling(String responseData) throws ATrustConnectionException;
+ public abstract boolean handlePolling() throws ATrustConnectionException;
}
|