From 832cf5d3353a5fef867d177b32681b1295497626 Mon Sep 17 00:00:00 2001 From: Jakob Heher Date: Tue, 2 Aug 2022 14:56:46 +0200 Subject: YAGNI: SigningState setters/getters --- .../main/java/at/asit/pdfover/gui/bku/MobileBKUConnector.java | 10 +++++----- .../java/at/asit/pdfover/gui/bku/mobile/ATrustHandler.java | 10 ++++------ .../main/java/at/asit/pdfover/gui/bku/mobile/IAIKHandler.java | 6 ++---- 3 files changed, 11 insertions(+), 15 deletions(-) (limited to 'pdf-over-gui/src/main/java/at/asit/pdfover/gui/bku') 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 2944dd07..34b53173 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 @@ -55,7 +55,7 @@ public class MobileBKUConnector implements BkuSlConnector { @Override public SLResponse handleSLRequest(SLRequest request) throws SignatureException { PdfAs4SigningState signingState = this.state.getSigningState(); - signingState.setSignatureRequest(request); + signingState.signatureRequest = request; MobileBKUHandler handler = this.state.handler; @@ -112,9 +112,9 @@ public class MobileBKUConnector implements BkuSlConnector { } while(this.state.status.errorMessage != null); // Check if response is already available - if (signingState.hasSignatureResponse()) { - SLResponse response = signingState.getSignatureResponse(); - signingState.setSignatureResponse(null); + if (signingState.signatureResponse != null) { + SLResponse response = signingState.signatureResponse; + signingState.signatureResponse = null; return response; } @@ -200,7 +200,7 @@ public class MobileBKUConnector implements BkuSlConnector { throw new SignatureException(new IllegalStateException()); } while (this.state.status.tanTries == -2); - return signingState.getSignatureResponse(); + return signingState.signatureResponse; } private boolean consumeCancelError() { 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 d6febeaa..d0d7e50e 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 @@ -258,12 +258,12 @@ public class ATrustHandler extends MobileBKUHandler { // credentials ok! InfoboxReadResponse state.rememberCredentialsIfNecessary(); log.debug("Credentials accepted - Response given"); - getSigningState().setSignatureResponse(new SLResponse(responseData, getStatus().server, null, null)); + getSigningState().signatureResponse = new SLResponse(responseData, getStatus().server, null, null); return; } else if (responseData.contains("undecided.aspx?sid=")) { // skip intermediate page log.debug("Page Undecided"); - getSigningState().setSignatureResponse(new SLResponse(responseData, getStatus().server, null, null)); + getSigningState().signatureResponse = new SLResponse(responseData, getStatus().server, null, null); status.errorMessage = "waiting..."; return; }else { @@ -339,8 +339,7 @@ public class ATrustHandler extends MobileBKUHandler { responseData.contains("sl:CreateCMSSignatureResponse xmlns:sl")) { // success !! - getSigningState().setSignatureResponse( - new SLResponse(responseData, getStatus().server, null, null)); + getSigningState().signatureResponse = new SLResponse(responseData, getStatus().server, null, null); } else { try { String tries = MobileBKUHelper.extractSubstring( @@ -465,8 +464,7 @@ public class ATrustHandler extends MobileBKUHandler { responseData.contains("sl:CreateCMSSignatureResponse xmlns:sl")) { // success !! - getSigningState().setSignatureResponse( - new SLResponse(responseData, getStatus().server, null, null)); + getSigningState().signatureResponse = new SLResponse(responseData, getStatus().server, null, null); return true; } return false; 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 bf5c865f..e908ec3c 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 @@ -158,8 +158,7 @@ public class IAIKHandler extends MobileBKUHandler { if (responseData.contains("sl:InfoboxReadResponse")) { // credentials ok! InfoboxReadResponse - getSigningState().setSignatureResponse( - new SLResponse(responseData, status.server, null, null)); + getSigningState().signatureResponse = new SLResponse(responseData, status.server, null, null); return; } @@ -288,8 +287,7 @@ public class IAIKHandler extends MobileBKUHandler { status.errorMessage = null; if (responseData.contains("sl:CreateCMSSignatureResponse xmlns:sl")) { // success - getSigningState().setSignatureResponse( - new SLResponse(responseData, status.server, null, null)); + getSigningState().signatureResponse = new SLResponse(responseData, status.server, null, null); } else { try { String errorMessage = MobileBKUHelper.extractContentFromTagWithParam( -- cgit v1.2.3