@capgo/capacitor-stream-call 0.0.82 → 0.0.83

package/android/src/main/java/ee/forgr/capacitor/streamcall/TouchInterceptWrapper.kt

@@ -2,6 +2,8 @@ import android.view.MotionEvent
 import android.view.ViewGroup
 import androidx.coordinatorlayout.widget.CoordinatorLayout
 import android.util.Log
+import androidx.core.view.isNotEmpty
+import androidx.core.view.isVisible
 
 class TouchInterceptWrapper(private val originalViewGroup: ViewGroup) : CoordinatorLayout(
     originalViewGroup.context
@@ -9,7 +11,7 @@ class TouchInterceptWrapper(private val originalViewGroup: ViewGroup) : Coordina
     init {
         // Copy layout parameters and children
         layoutParams = originalViewGroup.layoutParams
-        while (originalViewGroup.childCount > 0) {
+        while (originalViewGroup.isNotEmpty()) {
             val child = originalViewGroup.getChildAt(0)
             originalViewGroup.removeViewAt(0)
             addView(child)
@@ -23,8 +25,8 @@ class TouchInterceptWrapper(private val originalViewGroup: ViewGroup) : Coordina
         // Traverse children from top (highest z) to bottom
         for (i in childCount - 1 downTo 0) {
             val child = getChildAt(i)
-            Log.d("TouchInterceptWrapper", "Checking child $i: ${child::class.java.simpleName}, visibility: ${child.visibility == VISIBLE}")
-            if (child.visibility == VISIBLE) {
+            Log.d("TouchInterceptWrapper", "Checking child $i: ${child::class.java.simpleName}, visibility: ${child.isVisible}")
+            if (child.isVisible) {
                 val copy = MotionEvent.obtain(ev)
                 // It's important to transform event coordinates to the child's coordinate system
                 copy.offsetLocation(-child.left.toFloat(), -child.top.toFloat())

package/android/src/main/java/ee/forgr/capacitor/streamcall/UserRepository.kt

@@ -5,6 +5,7 @@ import android.content.SharedPreferences
 import android.util.ArrayMap
 import io.getstream.video.android.model.User
 import org.json.JSONObject
+import androidx.core.content.edit
 
 data class UserCredentials(
     val user: User,
@@ -65,15 +66,14 @@ class SecureUserRepository private constructor(context: Context) : UserRepositor
             put("custom", customJson)
         }
 
-        with(sharedPreferences.edit()) {
+        sharedPreferences.edit {
             putString(KEY_USER, userJson.toString())
             putString(KEY_TOKEN, user.tokenValue)
-            apply()
         }
     }
 
     override fun save(token: String) {
-        sharedPreferences.edit().putString(KEY_TOKEN, token).apply()
+        sharedPreferences.edit { putString(KEY_TOKEN, token) }
     }
 
     override fun loadCurrentUser(): UserCredentials? {
@@ -102,10 +102,9 @@ class SecureUserRepository private constructor(context: Context) : UserRepositor
     }
 
     override fun removeCurrentUser() {
-        with(sharedPreferences.edit()) {
+        sharedPreferences.edit {
             remove(KEY_USER)
             remove(KEY_TOKEN)
-            apply()
         }
     }
 } 

package/ios/Sources/StreamCallPlugin/StreamCallPlugin.swift

@@ -1043,10 +1043,6 @@ public class StreamCallPlugin: CAPPlugin, CAPBridgedPlugin {
         return UserDefaults.standard.string(forKey: dynamicApiKeyKey)
     }
     
-    func clearDynamicApiKey() {
-        UserDefaults.standard.removeObject(forKey: dynamicApiKeyKey)
-    }
-    
     func getEffectiveApiKey() -> String? {
         // A) Check if the key exists in UserDefaults
         if let dynamicApiKey = getDynamicApiKey(), !dynamicApiKey.trimmingCharacters(in: CharacterSet.whitespacesAndNewlines).isEmpty {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capgo/capacitor-stream-call",
-  "version": "0.0.82",
+  "version": "0.0.83",
   "description": "Uses the https://getstream.io/ SDK to implement calling in Capacitor",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",

package/android/src/main/java/ee/forgr/capacitor/streamcall/RingtonePlayer.kt

@@ -1,162 +0,0 @@
-package ee.forgr.capacitor.streamcall
-
-import android.app.Application
-import android.app.NotificationManager
-import android.content.Context
-import android.media.AudioAttributes
-import android.media.MediaPlayer
-import android.media.RingtoneManager
-import android.os.Handler
-import android.os.Looper
-import android.util.Log
-import io.getstream.video.android.core.notifications.NotificationHandler
-
-class RingtonePlayer(
-    private val application: Application,
-    private val cancelIncomingCallService: () -> Unit = {  }
-) {
-    companion object {
-        private const val DEFAULT_RINGTONE_DURATION = 30000L // 30 seconds in milliseconds
-    }
-
-    private var mediaPlayer: MediaPlayer? = null
-    private val handler = Handler(Looper.getMainLooper())
-    private var stopRingtoneRunnable: Runnable? = null
-    private var isPaused = false
-    private var isStopped = true
-
-    private fun isOurNotification(notification: android.service.notification.StatusBarNotification): Boolean {
-        return notification.id == NotificationHandler.INCOMING_CALL_NOTIFICATION_ID
-    }
-
-    fun pauseRinging() {
-        Log.d("RingtonePlayer", "Pause ringing")
-//        try {
-//            if (!isStopped) {
-//                mediaPlayer?.pause()
-//                isPaused = true
-//            }
-//        } catch (e: Exception) {
-//            Log.e("RingtonePlayer", "Error pausing ringtone: ${e.message}")
-//        }
-    }
-
-    fun resumeRinging() {
-        Log.d("RingtonePlayer", "Resume ringing")
-//        try {
-//            if (!isStopped && isPaused) {
-//                mediaPlayer?.start()
-//                isPaused = false
-//            }
-//        } catch (e: Exception) {
-//            Log.e("RingtonePlayer", "Error resuming ringtone: ${e.message}")
-//        }
-    }
-
-    fun isPaused(): Boolean {
-        return isPaused
-    }
-
-    fun startRinging() {
-        Log.d("RingtonePlayer", "Start ringing")
-//        try {
-//            isStopped = false
-//            isPaused = false
-//            if (mediaPlayer == null) {
-//                val uri = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_RINGTONE)
-//                mediaPlayer = MediaPlayer().apply {
-//                    setDataSource(application, uri)
-//                    isLooping = true
-//                    setAudioAttributes(
-//                        AudioAttributes.Builder()
-//                            .setUsage(AudioAttributes.USAGE_NOTIFICATION_RINGTONE)
-//                            .setContentType(AudioAttributes.CONTENT_TYPE_SONIFICATION)
-//                            .build()
-//                    )
-//                    prepare()
-//                }
-//            }
-//
-//            val notificationManager = application.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
-//            val notifs = notificationManager.activeNotifications.toList()
-//            var notificationTime = 0L
-//
-//            for (notification in notifs) {
-//                // First check if it's our notification
-//                val isOurs = isOurNotification(notification)
-//
-//                // Only proceed with ringtone if it's our notification
-//                if (!isOurs) {
-//                    Log.d("RingtonePlayer", "Skipping notification as it's not our incoming call notification")
-//                    continue
-//                }
-//
-//                // Cancel our notification
-//                try {
-//                    Log.d("RingtonePlayer", "Canceling notification/service with id: ${notification.id}")
-//                    this.cancelIncomingCallService()
-//                } catch (e: Exception) {
-//                    Log.e("RingtonePlayer", "Error cancelling notification: ${e.message}")
-//                }
-//                notificationTime = notification.postTime
-//            }
-//
-//            if (notificationTime > 0) {
-//                val currentTime = System.currentTimeMillis()
-//                val elapsedTime = currentTime - notificationTime
-//
-//                // Only start playing if we're within the ringtone duration
-//                if (elapsedTime < DEFAULT_RINGTONE_DURATION) {
-//                    // Get the ringtone duration
-//                    val ringtoneDuration = mediaPlayer?.duration?.toLong() ?: DEFAULT_RINGTONE_DURATION
-//
-//                    // Calculate the position to seek to
-//                    val seekPosition = (elapsedTime % ringtoneDuration).toInt()
-//                    Log.d("RingtonePlayer", "Seeking to position: $seekPosition ms in ringtone")
-//
-//                    mediaPlayer?.seekTo(seekPosition)
-//                    mediaPlayer?.start()
-//
-//                    // Schedule stop at the remaining duration
-//                    val remainingDuration = DEFAULT_RINGTONE_DURATION - elapsedTime
-//                    stopRingtoneRunnable = Runnable { stopRinging() }
-//                    handler.postDelayed(stopRingtoneRunnable!!, remainingDuration)
-//
-//                    Log.d("RingtonePlayer", "Starting ringtone with offset: $elapsedTime ms, will play for $remainingDuration ms")
-//                } else {
-//                    Log.d("RingtonePlayer", "Not starting ringtone as elapsed time ($elapsedTime ms) exceeds duration")
-//                }
-//            } else {
-//                // If no notification time found, just play normally
-//                mediaPlayer?.start()
-//
-//                // Schedule stop at the default duration
-//                stopRingtoneRunnable = Runnable { stopRinging() }
-//                handler.postDelayed(stopRingtoneRunnable!!, DEFAULT_RINGTONE_DURATION)
-//
-//                Log.d("RingtonePlayer", "Starting ringtone with default duration")
-//            }
-//        } catch (e: Exception) {
-//            Log.e("RingtonePlayer", "Error playing ringtone: ${e.message}")
-//        }
-    }
-
-    fun stopRinging() {
-        Log.d("RingtonePlayer", "Stop ringing")
-//        try {
-//            isStopped = true
-//            isPaused = false
-//            stopRingtoneRunnable?.let { handler.removeCallbacks(it) }
-//            stopRingtoneRunnable = null
-//
-//            mediaPlayer?.stop()
-//            mediaPlayer?.reset()
-//            mediaPlayer?.release()
-//            mediaPlayer = null
-//        } catch (e: Exception) {
-//            Log.e("RingtonePlayer", "Error stopping ringtone: ${e.message}")
-//        }
-    }
-
-
-}