support of all cases when pressing the sms tan button

1 files changed, 13 insertions, 16 deletions

diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/bku/MobileBKUConnector.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/bku/MobileBKUConnector.java
index 891ff9f4..09e8d17d 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/bku/MobileBKUConnector.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/bku/MobileBKUConnector.java
@@ -88,20 +88,17 @@ public class MobileBKUConnector implements BkuSlConnector {
 				try {

 					String responseData = handler.postCredentials();

 

-					if (responseData.contains("undecided.aspx?sid="))	{ //$NON-NLS-1$

-						// handle polling 

+					if (responseData.contains("undecided.aspx?sid=")) { //$NON-NLS-1$

+						// handle polling

 						this.state.showOpenAppMessageWithSMSandCancel();

 

-						if (((ATrustStatus) this.state.getStatus()).isSmsTan()) {

-							ATrustHandler aHandler = (ATrustHandler) handler;

-							String response = aHandler.postSMSRequest();

-							aHandler.handleCredentialsResponse(response);

-						} else if (handleErrorMessage()) { 

-							throw new SignatureException(new IllegalStateException());

-						} else {

-							handler.handlePolling(responseData);

-						}

-						

+							if (((ATrustStatus) this.state.getStatus()).isSmsTan()) {

+								ATrustHandler aHandler = (ATrustHandler) handler;

+								String response = aHandler.postSMSRequest();

+								aHandler.handleCredentialsResponse(response);

+							} else if (handleErrorMessage()) {

+								throw new SignatureException(new IllegalStateException());

+							} 

 					} else {

 

 					    // Now we have received some data lets check it:

@@ -149,7 +146,7 @@ public class MobileBKUConnector implements BkuSlConnector {
 							enterTAN = false;

 						}

 					} 

-					if (enterTAN && !aStatus.getTanField() && !aStatus.isSmsTan()) {

+					if (enterTAN && !aStatus.getTanField()) {

 						try {

 							 

 							this.state.showFingerPrintInformation();

@@ -158,9 +155,9 @@ public class MobileBKUConnector implements BkuSlConnector {
 								throw new SignatureException(new IllegalStateException());

 						} catch (Exception ex) {

 							log.error("Error in PostCredentialsThread", ex); //$NON-NLS-1$

-							this.state.setThreadException(ex);

-							this.state.displayError(ex);

-							throw new SignatureException(ex);

+							this.state.setThreadException(new IllegalStateException());

+							//this.state.displayError(ex);

+							throw new SignatureException(new IllegalStateException());

 						}

 						

 						if (this.state.getSMSStatus()) {