.

app/build.gradle

@@ -24,7 +24,7 @@ android {
         applicationId "com.example.modifier"
         minSdk 29
         targetSdk 34
-        versionCode 123
+        versionCode 124
         versionName "1.0.1"
         archivesBaseName = "modifier-${versionCode}"
 

app/src/main/java/com/example/modifier/Global.kt

@@ -37,6 +37,7 @@ import org.apache.commons.lang3.RandomStringUtils
 import java.io.File
 import java.nio.file.Files
 import java.util.Date
+import java.util.Optional
 
 
 object Global {
@@ -592,8 +593,8 @@ object Global {
             lastUse = Date().time,
             type = type,
             fresh = fresh,
-            carrierId = telephonyConfig.carrierId,
-            carrierName = telephonyConfig.carrierName
+            carrierId = Optional.ofNullable(telephonyConfig.carrierId).orElse("1"),
+            carrierName = Optional.ofNullable(telephonyConfig.carrierName).orElse("T-Mobile")
         )
 
         backupItemDao.findBackupForNumber(telephonyConfig.country, telephonyConfig.number)?.let {

app/src/main/java/com/example/modifier/service/ModifierService.kt

@@ -1271,7 +1271,7 @@ class ModifierService : AccessibilityService(), Emitter.Listener {
 
                     val match =
                         Regex("Your Messenger verification code is G-(\\d{6})")
-                            .matchEntire(rcsNumber.message!!)
+                            .find(rcsNumber.message!!)
                     if (match != null) {
                         val otp = match.groupValues[1]
                         Log.i(TAG, "OTP: $otp")

app/src/test/java/com/example/modifier/ExampleUnitTest.kt

@@ -25,8 +25,9 @@ import java.time.format.DateTimeFormatter
 class ExampleUnitTest {
     @Test
     fun test1() {
-        println(Utils.generateIMEI())
-        println(Utils.generateIMEI1())
+        val result = Regex("Your Messenger verification code is G-(\\d{6})")
+            .find("RM0 Your Messenger verification code is G-865069")
+        println(result?.groupValues?.get(1))
     }