SMS Retriever: Handle SMS without sender number (#2325)

microg · Apr 29, 2024 · 85571d9 · 85571d9
1 parent 4b96074
commit 85571d9
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/...ervices-auth-api-phone/core/src/main/kotlin/org/microg/gms/auth/phone/SmsRetrieverCore.kt b/...ervices-auth-api-phone/core/src/main/kotlin/org/microg/gms/auth/phone/SmsRetrieverCore.kt
@@ -16,6 +16,7 @@ import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
 import android.content.pm.PackageManager.PERMISSION_GRANTED
+import android.database.Cursor
 import android.os.*
 import android.os.Build.VERSION.SDK_INT
 import android.provider.ContactsContract
@@ -296,19 +297,20 @@ class SmsRetrieverCore(private val context: Context, override val lifecycle: Lif
         }
 
         val normalizePhoneNumber = normalizePhoneNumber(phoneNumber)
-        val cursor = context.contentResolver.query(Phone.CONTENT_URI, arrayOf(Phone.NUMBER), null, null, null) ?: return false
+        var cursor: Cursor? = null
         try {
+            cursor = context.contentResolver.query(Phone.CONTENT_URI, arrayOf(Phone.NUMBER), null, null, null) ?: return false
             while (cursor.moveToNext()) {
                 val addressIndex = cursor.getColumnIndex(Phone.NUMBER)
                 val contactPhoneNumber = normalizePhoneNumber(cursor.getString(addressIndex))
-                if (normalizePhoneNumber == contactPhoneNumber) {
+                if (!TextUtils.isEmpty(normalizePhoneNumber) && !TextUtils.isEmpty(contactPhoneNumber) && normalizePhoneNumber == contactPhoneNumber) {
                     return true
                 }
             }
         } catch (e: Exception) {
             Log.w(TAG, e)
         } finally {
-            cursor.close()
+            cursor?.close()
         }
         return false
     }