From c598f60380077e4e156f3ad4424eb42ec8aa0f28 Mon Sep 17 00:00:00 2001
From: Jakob Heher <jakob.heher@iaik.tugraz.at>
Date: Wed, 6 Jul 2022 10:35:23 +0200
Subject: YAGNI cleanup #1

---
 .../at/asit/pdfover/gui/bku/mobile/ATrustHandler.java    |  6 +++---
 .../at/asit/pdfover/gui/bku/mobile/ATrustStatus.java     |  4 ++--
 .../java/at/asit/pdfover/gui/bku/mobile/IAIKHandler.java |  2 +-
 .../at/asit/pdfover/gui/bku/mobile/MobileBKUHandler.java | 16 ++++------------
 4 files changed, 10 insertions(+), 18 deletions(-)

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

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 05168d61..d5353b3e 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
@@ -247,7 +247,7 @@ public class ATrustHandler extends MobileBKUHandler {
 			try {
 				qrCode = MobileBKUHelper.extractValueFromTagWithParam(responseData, "img", "class", "qrcode", "src"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
 				log.debug("QR Code found: " + qrCode); //$NON-NLS-1$
-				status.setQRCode(qrCode);
+				status.setQRCodeURL(qrCode);
 			} catch (Exception e) {
 				log.debug("No QR Code found"); //$NON-NLS-1$
 			}
@@ -406,7 +406,7 @@ public class ATrustHandler extends MobileBKUHandler {
 		HttpClient client = MobileBKUHelper.getHttpClient(getStatus());
 
 		GetMethod get = new GetMethod(status.getBaseURL() + "/" + //$NON-NLS-1$
-				status.getQRCode());
+				status.getQRCodeURL());
 
 		try {
 			log.debug("Getting " + get.getURI()); //$NON-NLS-1$
@@ -478,7 +478,7 @@ public class ATrustHandler extends MobileBKUHandler {
 
 	@Override
 	public ATrustStatus getStatus() {
-		return (ATrustStatus) getState().getStatus();
+		return (ATrustStatus) state.status;
 	}
 
 	/* (non-Javadoc)
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/bku/mobile/ATrustStatus.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/bku/mobile/ATrustStatus.java
index fe91dfa9..9994d522 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/bku/mobile/ATrustStatus.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/bku/mobile/ATrustStatus.java
@@ -112,7 +112,7 @@ public class ATrustStatus extends AbstractMobileBKUStatusImpl {
 	/**
 	 * @return the QR code
 	 */
-	public String getQRCode() {
+	public String getQRCodeURL() {
 		return this.qrcode;
 	}
 
@@ -120,7 +120,7 @@ public class ATrustStatus extends AbstractMobileBKUStatusImpl {
 	 * @param qrcode
 	 *            the QR code to set
 	 */
-	public void setQRCode(String qrcode) {
+	public void setQRCodeURL(String qrcode) {
 		this.qrcode = qrcode;
 	}
 	
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 1d0ec579..ec1c7c66 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
@@ -336,7 +336,7 @@ public class IAIKHandler extends MobileBKUHandler {
 
 	@Override
 	public IAIKStatus getStatus() {
-		return (IAIKStatus) getState().getStatus();
+		return (IAIKStatus) state.status;
 	}
 
 	private String getRedirect(HttpClient client, String redirectURL) throws HttpException, IOException {
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 4c09c02d..1ada0337 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
@@ -51,7 +51,7 @@ public abstract class MobileBKUHandler {
 	static final Logger log = LoggerFactory
 			.getLogger(MobileBKUHandler.class);
 
-	private MobileBKUState state;
+	public final MobileBKUState state;
 
 	/**
 	 * Constructor
@@ -99,7 +99,7 @@ public abstract class MobileBKUHandler {
 		}
 		log.trace("SL Request: " + sl_request); //$NON-NLS-1$
 
-		getState().getStatus().setBaseURL(
+		state.status.setBaseURL(
 				MobileBKUHelper.stripQueryString(mobileBKUUrl));
 
 		return executePost(client, post);
@@ -141,20 +141,12 @@ public abstract class MobileBKUHandler {
 	 */
 	public abstract void handleTANResponse(String responseData) throws Exception;
 
-	/**
-	 * Get the MobileBKUState
-	 * @return the MobileBKUState
-	 */
-	protected MobileBKUState getState() {
-		return this.state;
-	}
-
 	/**
 	 * Get the MobileBKUStatus
 	 * @return the MobileBKUStatus
 	 */
 	protected MobileBKUStatus getStatus() {
-		return this.state.getStatus();
+		return this.state.status;
 	}
 
 	/**
@@ -162,7 +154,7 @@ public abstract class MobileBKUHandler {
 	 * @return the SigningState
 	 */
 	protected SigningState getSigningState() {
-		return getState().getSigningState();
+		return state.getSigningState();
 	}
 
 	/**
-- 
cgit v1.2.3