Merge commit 'cc9d3d277fddf162d1f357adaa6543517a3f4581' into dev

Author: samgued

.github/workflows/main.yml

@@ -21,7 +21,7 @@ jobs:
     - uses: actions/checkout@v2
     - uses: actions/setup-java@v2
       with:
-        java-version: '12.x'
+        java-version: '17.x'
         distribution: 'zulu'
     - uses: subosito/flutter-action@v2
       with:

README.md

@@ -502,7 +502,7 @@ Our top sponsors are shown below!
     | **`isCustomNotification`**  | Using custom notifications.                                                                          | `false`                                                           |
     | **`isCustomSmallExNotification`**  | Using custom notification small on some devices clipped out in android.                              | `false`                                                           |
     |       **`isShowLogo`**      | Show logo app inside full screen. `/android/src/main/res/drawable-xxxhdpi/ic_logo.png`               | `false`                                                           |
-    |      **`ringtonePath`**     | File name ringtone. put file into `/android/app/src/main/res/raw/ringtone_default.pm3`               | `system_ringtone_default` <br>using ringtone default of the phone |
+    |      **`ringtonePath`**     | File name of a ringtone ex: `ringtone_default`. Put file into `/android/app/src/main/res/raw/ringtone_default.mp3`               | `system_ringtone_default` <br>using ringtone default of the phone |
     |     **`backgroundColor`**   | Incoming call screen background color.                                                               | `#0955fa`                                                         |
     |      **`backgroundUrl`**    | Using image background for Incoming call screen. example: http://... https://... or "assets/abc.png" | _None_                                                            |
     |      **`actionColor`**      | Color used in button/text on notification.                                                           | `#4CAF50`                                                         |

android/src/main/kotlin/com/hiennv/flutter_callkit_incoming/CallkitSoundPlayerService.kt

@@ -58,6 +58,7 @@ class CallkitSoundPlayerService : Service() {
         when (audioManager?.ringerMode) {
             AudioManager.RINGER_MODE_SILENT -> {
             }
+
             else -> {
                 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
                     vibrator?.vibrate(
@@ -81,20 +82,13 @@ class CallkitSoundPlayerService : Service() {
         )
         var uri = sound?.let { getRingtoneUri(it) }
         if (uri == null) {
-            uri = RingtoneManager.getActualDefaultRingtoneUri(
-                this@CallkitSoundPlayerService,
-                RingtoneManager.TYPE_RINGTONE
-            )
+            // Failed to get ringtone url, can't play sound
+            return
         }
         try {
             mediaPlayer(uri!!)
         } catch (e: Exception) {
-            try {
-                uri = getRingtoneUri("ringtone_default")
-                mediaPlayer(uri!!)
-            } catch (e2: Exception) {
-                e2.printStackTrace()
-            }
+            e.printStackTrace()
         }
     }
 
@@ -128,44 +122,49 @@ class CallkitSoundPlayerService : Service() {
         mediaPlayer?.setDataSource(applicationContext, uri)
     }
 
-    private fun getRingtoneUri(fileName: String) = try {
+    private fun getRingtoneUri(fileName: String): Uri? {
         if (TextUtils.isEmpty(fileName)) {
-            RingtoneManager.getActualDefaultRingtoneUri(
-                this@CallkitSoundPlayerService,
-                RingtoneManager.TYPE_RINGTONE
-            )
+            return getDefaultRingtoneUri()
         }
-        val resId = resources.getIdentifier(fileName, "raw", packageName)
-        if (resId != 0) {
-            Uri.parse("android.resource://${packageName}/$resId")
-        } else {
-            if (fileName.equals("system_ringtone_default", true)) {
-                RingtoneManager.getActualDefaultRingtoneUri(
-                    this@CallkitSoundPlayerService,
-                    RingtoneManager.TYPE_RINGTONE
-                )
-            } else {
-                RingtoneManager.getActualDefaultRingtoneUri(
-                    this@CallkitSoundPlayerService,
-                    RingtoneManager.TYPE_RINGTONE
-                )
+        
+        // If system_ringtone_default is explicitly requested, bypass resource check
+        if (fileName.equals("system_ringtone_default", true)) {
+            return getDefaultRingtoneUri(useSystemDefault = true)
+        }
+
+        try {
+            val resId = resources.getIdentifier(fileName, "raw", packageName)
+            if (resId != 0) {
+                return Uri.parse("android.resource://${packageName}/$resId")
             }
+
+            // For any other unresolved filename, return the default ringtone
+            return getDefaultRingtoneUri()
+        } catch (e: Exception) {
+            // If anything fails, try to return the system default ringtone
+            return getDefaultRingtoneUri()
         }
-    } catch (e: Exception) {
+    }
+
+    private fun getDefaultRingtoneUri(useSystemDefault: Boolean = false): Uri? {
         try {
-            if (fileName.equals("system_ringtone_default", true)) {
-                RingtoneManager.getActualDefaultRingtoneUri(
-                    this@CallkitSoundPlayerService,
-                    RingtoneManager.TYPE_RINGTONE
-                )
-            } else {
-                RingtoneManager.getActualDefaultRingtoneUri(
-                    this@CallkitSoundPlayerService,
-                    RingtoneManager.TYPE_RINGTONE
-                )
+            if (!useSystemDefault) {
+                // First try to use ringtone_default resource if it exists
+                val resId = resources.getIdentifier("ringtone_default", "raw", packageName)
+                if (resId != 0) {
+                    return Uri.parse("android.resource://${packageName}/$resId")
+                }
             }
+
+            // Fall back to system default ringtone
+            return RingtoneManager.getActualDefaultRingtoneUri(
+                this@CallkitSoundPlayerService,
+                RingtoneManager.TYPE_RINGTONE
+            )
         } catch (e: Exception) {
-            null
+            // getActualDefaultRingtoneUri can throw an exception on some devices
+            // for custom ringtones
+            return null
         }
     }
 }