diff --git a/app/src/main/java/com/utsmm/kbz/util/tms/TMSSetupsImpl.java b/app/src/main/java/com/utsmm/kbz/util/tms/TMSSetupsImpl.java index 3144532..5b90815 100644 --- a/app/src/main/java/com/utsmm/kbz/util/tms/TMSSetupsImpl.java +++ b/app/src/main/java/com/utsmm/kbz/util/tms/TMSSetupsImpl.java @@ -237,15 +237,21 @@ public class TMSSetupsImpl implements TMSSetups{ } else if(siriusHost.getPrimaryIP().trim().isEmpty()) { SystemParamsOperation.getInstance().setIpAddress(""); } - - if (siriusHost.getSecondaryIP().contains(":")) { - - SystemParamsOperation.getInstance().setSecIpAddress(siriusHost.getSecondaryIP().trim()); - - } else if(siriusHost.getSecondaryIP().trim().isEmpty()){ + String secondaryIp = siriusHost.getSecondaryIP(); + if(secondaryIp == null || secondaryIp.trim().isEmpty()){ SystemParamsOperation.getInstance().setSecIpAddress(""); + }else if(secondaryIp.contains(":")){ + SystemParamsOperation.getInstance().setSecIpAddress(secondaryIp.trim()); } +// if (siriusHost.getSecondaryIP().contains(":")) { +// +// SystemParamsOperation.getInstance().setSecIpAddress(siriusHost.getSecondaryIP().trim()); +// +// } else if(siriusHost.getSecondaryIP().trim().isEmpty()){ +// SystemParamsOperation.getInstance().setSecIpAddress(""); +// } + if (!siriusHost.getCurrency().isEmpty()) { SystemParamsOperation.getInstance().setCurrencyType(currencyTextToCurrencyType(siriusHost.getCurrency())); diff --git a/app/src/main/java/com/utsmm/kbz/util/tms/TMSUtil.java b/app/src/main/java/com/utsmm/kbz/util/tms/TMSUtil.java index f40431a..04de3e6 100644 --- a/app/src/main/java/com/utsmm/kbz/util/tms/TMSUtil.java +++ b/app/src/main/java/com/utsmm/kbz/util/tms/TMSUtil.java @@ -233,7 +233,7 @@ public class TMSUtil { String secHostIp = SystemParamsOperation.getInstance().getSecIpAddress(); String keyIndex = SystemParamsOperation.getInstance().getTMKIndex(); - if(tid.length() == 8 && mid.length() == 15 && !hostIp.isEmpty() && !secHostIp.isEmpty() && !keyIndex.isEmpty()) { + if(tid.length() == 8 && mid.length() == 15 && !hostIp.isEmpty() && !keyIndex.isEmpty()) { tmsValidity = new TMSValidity(ValidityStatus.SUCCESS,"Success"); } else if(tid.length() != 8) { tmsValidity = new TMSValidity(ValidityStatus.FAILURE,"Tid is invalid!"); @@ -241,9 +241,11 @@ public class TMSUtil { tmsValidity = new TMSValidity(ValidityStatus.FAILURE,"Mid is invalid!"); } else if(hostIp.isEmpty()) { tmsValidity = new TMSValidity(ValidityStatus.FAILURE,"Pri-Ip is invalid!"); - } else if(secHostIp.isEmpty()) { - tmsValidity = new TMSValidity(ValidityStatus.FAILURE,"Sec-Ip is invalid!"); - } else { + } +// else if(secHostIp.isEmpty()) { +// tmsValidity = new TMSValidity(ValidityStatus.FAILURE,"Sec-Ip is invalid!"); +// } + else { tmsValidity = new TMSValidity(ValidityStatus.FAILURE,"KeyIndex is invalid!"); } diff --git a/gradle.properties b/gradle.properties index d0056b9..ef03384 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,7 +8,7 @@ # The setting is particularly useful for tweaking memory settings. org.gradle.jvmargs=-Xmx4096m -XX:MaxMetaspaceSize=1024m -Dfile.encoding=UTF-8 # Force Gradle to use system Java instead of Android Studio's JBR -org.gradle.java.home=/Library/Java/JavaVirtualMachines/jdk-17.jdk/Contents/Home +#org.gradle.java.home=/Library/Java/JavaVirtualMachines/jdk-17.jdk/Contents/Home #org.gradle.java.home=C:\\Program Files\\Microsoft\\jdk-17.0.16.8-hotspot # Enable parallel builds and configure cache