From b8ee29ce9a06a046f0e5423aae23522d94d88128 Mon Sep 17 00:00:00 2001 From: heyethereum Date: Sat, 17 Aug 2024 15:20:03 +0800 Subject: [PATCH] solved logic error --- .../app/qrcode/service/SMSVerificationService.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/safeqr/app/qrcode/service/SMSVerificationService.java b/src/main/java/com/safeqr/app/qrcode/service/SMSVerificationService.java index 606f671..4ea2e79 100644 --- a/src/main/java/com/safeqr/app/qrcode/service/SMSVerificationService.java +++ b/src/main/java/com/safeqr/app/qrcode/service/SMSVerificationService.java @@ -99,13 +99,17 @@ public class SMSVerificationService { if (lowerCaseSms.contains(keyword)) { logger.info("Phishing keyword detected: {}", keyword); smsEntity.setKeywordDetected("Potential Phishing - " + category); - return CLASSIFY_WARNING; + return checkPhoneNumber(smsEntity.getPhone()).equals(CLASSIFY_WARNING) ? + CLASSIFY_WARNING : + CLASSIFY_UNSAFE; } } } // If no phishing keywords are found, sent for local phone number checks - return checkPhoneNumber(smsEntity.getPhone()); + return checkPhoneNumber(smsEntity.getPhone()).equals(CLASSIFY_UNSAFE) ? + CLASSIFY_WARNING : + CLASSIFY_SAFE; } private String checkPhoneNumber(String phoneNumber) { @@ -121,7 +125,7 @@ public class SMSVerificationService { // Check if it's a valid Singapore mobile or landline number if (phoneNumber.matches("^[689]\\d{7}$") && (phoneNumber.startsWith("8") || phoneNumber.startsWith("9"))) { - return CLASSIFY_SAFE; + return CLASSIFY_WARNING; } // If it doesn't match mobile