diff --git a/sormas-app/app/src/main/java/de/symeda/sormas/app/component/validation/ValidationHelper.java b/sormas-app/app/src/main/java/de/symeda/sormas/app/component/validation/ValidationHelper.java index ada9ccc7d4e..c10b287d656 100644 --- a/sormas-app/app/src/main/java/de/symeda/sormas/app/component/validation/ValidationHelper.java +++ b/sormas-app/app/src/main/java/de/symeda/sormas/app/component/validation/ValidationHelper.java @@ -98,6 +98,18 @@ public static void initPhoneNumberValidator(ControlTextEditField textEditField) return false; }); } + public static void initEbsPhoneNumberValidator(ControlTextEditField textEditField) { + textEditField.setValidationCallback(() -> { + String phoneNumber = textEditField.getValue(); + if (!DataHelper.isValidEbsPhoneNumber(phoneNumber)) { + textEditField.enableErrorState(I18nProperties.getValidationError(Validations.validPhoneNumber, textEditField.getCaption())); + + return true; + } + + return false; + }); + } public static void resetValidator(ControlTextEditField textEditField) { textEditField.disableErrorState(); diff --git a/sormas-app/app/src/main/java/de/symeda/sormas/app/ebs/edit/EbsEditFragment.java b/sormas-app/app/src/main/java/de/symeda/sormas/app/ebs/edit/EbsEditFragment.java index e6e35e9801d..622ffa59893 100644 --- a/sormas-app/app/src/main/java/de/symeda/sormas/app/ebs/edit/EbsEditFragment.java +++ b/sormas-app/app/src/main/java/de/symeda/sormas/app/ebs/edit/EbsEditFragment.java @@ -186,8 +186,8 @@ public void onLayoutBinding(final FragmentEbsEditLayoutBinding contentBinding) { contentBinding.setAutomaticScanningTypeClass(AutomaticScanningType.class); contentBinding.setManualScanningTypeClass(ManualScanningType.class); contentBinding.setMediaScannningTypeClass(MediaScannningType.class); - ValidationHelper.initPhoneNumberValidator(contentBinding.ebsInformantTel); - ValidationHelper.initPhoneNumberValidator(contentBinding.ebsPersonPhone); + ValidationHelper.initEbsPhoneNumberValidator(contentBinding.ebsInformantTel); + ValidationHelper.initEbsPhoneNumberValidator(contentBinding.ebsPersonPhone); InfrastructureFieldsDependencyHandler.instance.initializeRegionFields( contentBinding.ebsRegion, initialRegions,