From 7b2231cb46f1b43e5d92a15e16294b58985fef9d Mon Sep 17 00:00:00 2001
From: Jakob Heher <jakob.heher@iaik.tugraz.at>
Date: Wed, 6 Jul 2022 13:26:53 +0200
Subject: more misc cleanup

---
 .../at/asit/pdfover/gui/workflow/StatusImpl.java   |  4 ++--
 .../gui/workflow/states/MobileBKUState.java        | 26 +++++-----------------
 .../pdfover/gui/workflow/states/SigningState.java  |  2 +-
 3 files changed, 9 insertions(+), 23 deletions(-)

(limited to 'pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow')

diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/StatusImpl.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/StatusImpl.java
index df64edf5..7fe71f1a 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/StatusImpl.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/StatusImpl.java
@@ -75,10 +75,10 @@ public class StatusImpl implements Status {
 		//if (this.previousState == this.currentState)
 		//	log.error("Changing to same state? " + this.currentState);
 
-		if (this.previousState != null && !this.previousState.equals(currentState))
+		if (this.previousState != this.currentState)
 		{
 			//Reference to previous state will be lost - perform cleanup
-			log.debug("Changing from " + this.currentState + " to " + currentState);
+			log.debug("Changing from " + this.currentState + " to " + currentState); //
 			log.debug("Cleaning up " + this.previousState);
 			this.previousState.cleanUp();
 		}
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 f130c0e6..6ec4302d 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
@@ -246,7 +246,7 @@ public class MobileBKUState extends State {
 			mobileStatus.mobilePassword = ui.getMobilePassword();
 
 			// show waiting composite
-			getStateMachine().getGUIProvider().display(MobileBKUState.this.getWaitingComposite());
+			getStateMachine().getGUIProvider().display(this.getWaitingComposite());
 		});
 	}
 
@@ -335,8 +335,7 @@ public class MobileBKUState extends State {
 			qr.setErrorMessage(status.errorMessage);
 			InputStream qrcode = handler.getQRCode();
 			if (qrcode == null) {
-				MobileBKUState.this.threadException = new Exception(
-						Messages.getString("error.FailedToLoadQRCode"));
+				this.threadException = new Exception(Messages.getString("error.FailedToLoadQRCode"));
 			}
 			qr.setQR(qrcode);
 			getStateMachine().getGUIProvider().display(qr);
@@ -365,22 +364,10 @@ public class MobileBKUState extends State {
 				qr.setDone(false);
 
 			// show waiting composite
-			getStateMachine().getGUIProvider().display(
-					MobileBKUState.this.getWaitingComposite());
+			getStateMachine().getGUIProvider().display(this.getWaitingComposite());
 		});
 	}
 
-
-	/**
-	 *  This composite notifies the user to open the signature-app
-	 */
-	public void showOpenAppMessage() {
-		Display.getDefault().syncExec(() -> {
-			getStateMachine().getGUIProvider().display(this.getWaitingForAppComposite());
-		});
-
-	}
-
 	/**
 	 *  This composite notifies the user to open the signature-app
 	 */
@@ -389,7 +376,7 @@ public class MobileBKUState extends State {
 		final ATrustStatus status = (ATrustStatus) this.status;
 
 		Display.getDefault().syncExec(() -> {
-			WaitingForAppComposite waitingForAppcomposite = MobileBKUState.this.getWaitingForAppComposite();
+			WaitingForAppComposite waitingForAppcomposite = this.getWaitingForAppComposite();
 			getStateMachine().getGUIProvider().display(waitingForAppcomposite);
 
 			Display display = getStateMachine().getGUIProvider().getMainShell().getDisplay();
@@ -415,7 +402,7 @@ public class MobileBKUState extends State {
 				status.errorMessage = "sms";
 				status.isSMSTan = true;
 				// show waiting composite
-				getStateMachine().getGUIProvider().display(MobileBKUState.this.getWaitingComposite());
+				getStateMachine().getGUIProvider().display(this.getWaitingComposite());
 				return;
 
 			}
@@ -513,8 +500,7 @@ public class MobileBKUState extends State {
 				fingerprintComposite.setDone(false);
 
 			// show waiting composite
-			getStateMachine().getGUIProvider().display(
-					MobileBKUState.this.getWaitingComposite());
+			getStateMachine().getGUIProvider().display(this.getWaitingComposite());
 		});
 	}
 
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/SigningState.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/SigningState.java
index 3bc67d65..afb12333 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/SigningState.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/SigningState.java
@@ -98,7 +98,7 @@ public class SigningState extends State {
 			if (status.getPreviousState() instanceof MobileBKUState)
 			{
 				String mobileBkuError = ((MobileBKUState)status.getPreviousState()).status.errorMessage;
-				if ((mobileBkuError != null) && mobileBkuError.equals("cancel"))
+				if ("cancel".equals(mobileBkuError))
 					this.threadException = new SignatureException(new IllegalStateException());
 			}
 
-- 
cgit v1.2.3