From 52f101baffa841275534c6b2fbd410249a759d43 Mon Sep 17 00:00:00 2001 From: Andreas Abraham Date: Mon, 5 Aug 2019 13:18:43 +0200 Subject: refactor --- .../at/asit/pdfover/gui/bku/mobile/ATrustHandler.java | 16 ++++++++-------- .../at/asit/pdfover/gui/bku/mobile/MobileBKUHelper.java | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) 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 2c13cb9d..e95121b2 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 @@ -111,10 +111,10 @@ public class ATrustHandler extends MobileBKUHandler { String viewstateGenerator = MobileBKUHelper.extractValueFromTagWithParamOptional(responseData, "", "id", "__VIEWSTATEGENERATOR", "value"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ - String dynamicAttrPhonenumber = MobileBKUHelper.getNameAttribute(responseData, Constants.LABEL_PHONE_NUMBER); - String dynamicAttrPassword = MobileBKUHelper.getNameAttribute(responseData, Constants.LABEL_SIGN_PASS); - String dynamicAttrButtonId = MobileBKUHelper.getNameAttribute(responseData, Constants.LABEL_BTN_IDF); - String dynamicAttrTan = MobileBKUHelper.getNameAttribute(responseData, Constants.LABEL_TAN); + String dynamicAttrPhonenumber = MobileBKUHelper.getDynamicNameAttribute(responseData, Constants.LABEL_PHONE_NUMBER); + String dynamicAttrPassword = MobileBKUHelper.getDynamicNameAttribute(responseData, Constants.LABEL_SIGN_PASS); + String dynamicAttrButtonId = MobileBKUHelper.getDynamicNameAttribute(responseData, Constants.LABEL_BTN_IDF); + String dynamicAttrTan = MobileBKUHelper.getDynamicNameAttribute(responseData, Constants.LABEL_TAN); log.info("sessionID: " + sessionID); //$NON-NLS-1$ @@ -258,16 +258,16 @@ public class ATrustHandler extends MobileBKUHandler { try { tanField = MobileBKUHelper.extractValueFromTagWithParam(responseData, "label", "id", "label_for_input_tan", "for"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ status.setTanField(tanField); - status.setDynAttrTan(MobileBKUHelper.getNameAttribute(responseData, Constants.LABEL_TAN)); - status.setDynAttrSignButton(MobileBKUHelper.getNameAttribute(responseData, Constants.LABEL_SIGN_BTN)); + status.setDynAttrTan(MobileBKUHelper.getDynamicNameAttribute(responseData, Constants.LABEL_TAN)); + status.setDynAttrSignButton(MobileBKUHelper.getDynamicNameAttribute(responseData, Constants.LABEL_SIGN_BTN)); } catch (Exception e) { log.debug("No tan field found"); //$NON-NLS-1$ } try { tanTextTan = tanField = MobileBKUHelper.extractContentFromTagWithParam(responseData, "span", "id", "text_tan"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ status.setIsAPPTan(tanTextTan); - status.setDynAttrTan(MobileBKUHelper.getNameAttribute(responseData, Constants.LABEL_TAN)); - status.setDynAttrSignButton(MobileBKUHelper.getNameAttribute(responseData, Constants.LABEL_SIGN_BTN)); + status.setDynAttrTan(MobileBKUHelper.getDynamicNameAttribute(responseData, Constants.LABEL_TAN)); + status.setDynAttrSignButton(MobileBKUHelper.getDynamicNameAttribute(responseData, Constants.LABEL_SIGN_BTN)); }catch (Exception e) { log.debug("No text_tan tag"); //$NON-NLS-1$ } diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/bku/mobile/MobileBKUHelper.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/bku/mobile/MobileBKUHelper.java index 04397f14..9971e3c2 100644 --- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/bku/mobile/MobileBKUHelper.java +++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/bku/mobile/MobileBKUHelper.java @@ -320,7 +320,7 @@ public class MobileBKUHelper { * @param attributeName is the attribute which should be selected * @return returns the attribute name or null otherswise */ - public static String getNameAttribute(String htmlString, String attributeName) { + public static String getDynamicNameAttribute(String htmlString, String attributeName) { Document doc = Jsoup.parse(htmlString); Elements inputs = doc.select("div input#" + attributeName); -- cgit v1.2.3