changed urlconnection to apache http client, new pdf-as version added, a-trust url changed

1 files changed, 27 insertions, 30 deletions

diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/MobileBKUState.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/MobileBKUState.java
index 116d5bb2..8a416676 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/MobileBKUState.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/MobileBKUState.java
@@ -542,42 +542,39 @@ public class MobileBKUState extends State {
 				}

 			}

 		}, 0, 5000);

-		Display.getDefault().syncExec(new Runnable() {

-			@Override

-			public void run() {

-				MobileBKUFingerprintComposite fingerprintComposite = getMobileBKUFingerprintComposite();

-		

-				fingerprintComposite.setRefVal(status.getRefVal());

-				fingerprintComposite.setSignatureData(status.getSignatureDataURL());

-				fingerprintComposite.setErrorMessage(status.getErrorMessage());

-				getStateMachine().getGUIProvider().display(fingerprintComposite);

-

-				Display display = getStateMachine().getGUIProvider().getMainShell().getDisplay(); 

-				while (!fingerprintComposite.isUserCancel() && !fingerprintComposite.isUserSMS() && !fingerprintComposite.isDone()) {

-					if (!display.readAndDispatch()) {

-						display.sleep();

-					}

+		Display.getDefault().syncExec(() -> {

+			MobileBKUFingerprintComposite fingerprintComposite = getMobileBKUFingerprintComposite();

+

+			fingerprintComposite.setRefVal(status.getRefVal());

+			fingerprintComposite.setSignatureData(status.getSignatureDataURL());

+			fingerprintComposite.setErrorMessage(status.getErrorMessage());

+			getStateMachine().getGUIProvider().display(fingerprintComposite);

+

+			Display display = getStateMachine().getGUIProvider().getMainShell().getDisplay();

+			while (!fingerprintComposite.isUserCancel() && !fingerprintComposite.isUserSMS() && !fingerprintComposite.isDone()) {

+				if (!display.readAndDispatch()) {

+					display.sleep();

 				}

-				checkDone.cancel();

+			}

+			checkDone.cancel();

 

-				if (fingerprintComposite.isUserCancel()) {

-					fingerprintComposite.setUserCancel(false);

-					status.setErrorMessage("cancel"); //$NON-NLS-1$

-					return;

-				}

+			if (fingerprintComposite.isUserCancel()) {

+				fingerprintComposite.setUserCancel(false);

+				status.setErrorMessage("cancel"); //$NON-NLS-1$

+				return;

+			}

 

-				if (fingerprintComposite.isUserSMS()) {

+			if (fingerprintComposite.isUserSMS()) {

 //					fingerprintComposite.setUserSMS(false);

-					status.setQRCode(null);

-				}

+				status.setQRCode(null);

+			}

 

-				if (fingerprintComposite.isDone())

-					fingerprintComposite.setDone(false);

+			if (fingerprintComposite.isDone())

+				fingerprintComposite.setDone(false);

 

-				// show waiting composite

-				getStateMachine().getGUIProvider().display(

-						MobileBKUState.this.getWaitingComposite());

-			}

+			// show waiting composite

+			getStateMachine().getGUIProvider().display(

+					MobileBKUState.this.getWaitingComposite());

 		});

 	}