From 170aeb06dab5655fd41c538a3d2e3a63362fd4fc Mon Sep 17 00:00:00 2001
From: DevCodeSpace <github@devcodespace.com>
Date: Tue, 25 Feb 2025 12:14:54 +0530
Subject: [PATCH 1/3] Bug Fixing related of the Flutter Stable

---
 .gitignore                                    |   3 +
 CHANGELOG.md                                  |  19 +-
 README.md                                     |   2 +-
 android/.gitignore                            |   9 -
 android/.idea/compiler.xml                    |   2 +-
 android/.idea/gradle.xml                      |   2 +-
 android/.idea/misc.xml                        |   2 +-
 android/.idea/other.xml                       | 318 ------------------
 android/build.gradle                          |  14 +-
 android/local.properties                      |   8 +
 android/src/main/AndroidManifest.xml          |   5 +-
 .../IncomingCallNotificationService.java      |  35 +-
 .../flutter/TwilioVoiceFlutterPlugin.java     |  50 +--
 .../voice/flutter/Utils/PreferencesUtils.java |  18 +-
 example/pubspec.lock                          | 108 +++---
 ios/.gitignore                                |  38 ---
 ios/Assets/.gitkeep                           |   0
 ios/Classes/TwilioVoiceFlutterPlugin.swift    |   4 +-
 ios/twilio_voice_flutter.podspec              |   2 +-
 pubspec.lock                                  |  56 +--
 pubspec.yaml                                  |   8 +-
 21 files changed, 182 insertions(+), 521 deletions(-)
 create mode 100644 .gitignore
 delete mode 100644 android/.gitignore
 delete mode 100644 android/.idea/other.xml
 create mode 100644 android/local.properties
 delete mode 100644 ios/.gitignore
 delete mode 100644 ios/Assets/.gitkeep

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..2ed3fc3
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+/android/.gradle
+/android/.idea
+/android/.idea
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ba94552..0d8b5cf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,13 @@
-## 0.0.4
+## Version 0.0.6
+
+* Bug Fixing and Improvements
+
+## Version 0.0.5
+
+* Bug Fixing and Improvements
+* Plugin move to the stable version
+
+## Version 0.0.4
 
 ✨ Added
 
@@ -12,14 +21,14 @@
 
 🌊 Enhanced event stream for calls.
 
-## 0.0.3
+## Version 0.0.3
 
 * Improving documentation clarity and optimizing code for better performance and efficiency.
 
-## 0.0.2
+## Version 0.0.2
 
 * Fixed `MissingPluginException` issue ([#1](https://github.com/DevCodeSpace/twilio_voice_flutter/issues/1), [#2](https://github.com/DevCodeSpace/twilio_voice_flutter/issues/2))
 
-## 0.0.1
+## Version 0.0.1
 
-* Version 0.0.1 introduces voice SDK to allow adding voice-over-IP (VoIP) calling into your Flutter applications.
\ No newline at end of file
+* 0.0.1 introduces voice SDK to allow adding voice-over-IP (VoIP) calling into your Flutter applications.
\ No newline at end of file
diff --git a/README.md b/README.md
index fdd2194..5894625 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@ Add dependency to your `pubspec.yaml` file & run Pub get
 
 ```yaml
 dependencies:
-  twilio_voice_flutter: ^0.0.4
+  twilio_voice_flutter: ^0.0.6
 ```
 And import package into your class file
 
diff --git a/android/.gitignore b/android/.gitignore
deleted file mode 100644
index 161bdcd..0000000
--- a/android/.gitignore
+++ /dev/null
@@ -1,9 +0,0 @@
-*.iml
-.gradle
-/local.properties
-/.idea/workspace.xml
-/.idea/libraries
-.DS_Store
-/build
-/captures
-.cxx
diff --git a/android/.idea/compiler.xml b/android/.idea/compiler.xml
index b589d56..b86273d 100644
--- a/android/.idea/compiler.xml
+++ b/android/.idea/compiler.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="17" />
+    <bytecodeTargetLevel target="21" />
   </component>
 </project>
\ No newline at end of file
diff --git a/android/.idea/gradle.xml b/android/.idea/gradle.xml
index aeac74f..3532892 100644
--- a/android/.idea/gradle.xml
+++ b/android/.idea/gradle.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="GradleMigrationSettings" migrationVersion="1" />
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
+        <option name="testRunner" value="CHOOSE_PER_TEST" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
         <option name="modules">
diff --git a/android/.idea/misc.xml b/android/.idea/misc.xml
index 0ad17cb..74dd639 100644
--- a/android/.idea/misc.xml
+++ b/android/.idea/misc.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="jbr-21" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/android/.idea/other.xml b/android/.idea/other.xml
deleted file mode 100644
index 94c96f6..0000000
--- a/android/.idea/other.xml
+++ /dev/null
@@ -1,318 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="direct_access_persist.xml">
-    <option name="deviceSelectionList">
-      <list>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="27" />
-          <option name="brand" value="DOCOMO" />
-          <option name="codename" value="F01L" />
-          <option name="id" value="F01L" />
-          <option name="manufacturer" value="FUJITSU" />
-          <option name="name" value="F-01L" />
-          <option name="screenDensity" value="360" />
-          <option name="screenX" value="720" />
-          <option name="screenY" value="1280" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="28" />
-          <option name="brand" value="DOCOMO" />
-          <option name="codename" value="SH-01L" />
-          <option name="id" value="SH-01L" />
-          <option name="manufacturer" value="SHARP" />
-          <option name="name" value="AQUOS sense2 SH-01L" />
-          <option name="screenDensity" value="480" />
-          <option name="screenX" value="1080" />
-          <option name="screenY" value="2160" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="31" />
-          <option name="brand" value="samsung" />
-          <option name="codename" value="a51" />
-          <option name="id" value="a51" />
-          <option name="manufacturer" value="Samsung" />
-          <option name="name" value="Galaxy A51" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="1080" />
-          <option name="screenY" value="2400" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="34" />
-          <option name="brand" value="google" />
-          <option name="codename" value="akita" />
-          <option name="id" value="akita" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel 8a" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="1080" />
-          <option name="screenY" value="2400" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="33" />
-          <option name="brand" value="samsung" />
-          <option name="codename" value="b0q" />
-          <option name="id" value="b0q" />
-          <option name="manufacturer" value="Samsung" />
-          <option name="name" value="Galaxy S22 Ultra" />
-          <option name="screenDensity" value="600" />
-          <option name="screenX" value="1440" />
-          <option name="screenY" value="3088" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="32" />
-          <option name="brand" value="google" />
-          <option name="codename" value="bluejay" />
-          <option name="id" value="bluejay" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel 6a" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="1080" />
-          <option name="screenY" value="2400" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="34" />
-          <option name="brand" value="google" />
-          <option name="codename" value="caiman" />
-          <option name="id" value="caiman" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel 9 Pro" />
-          <option name="screenDensity" value="360" />
-          <option name="screenX" value="960" />
-          <option name="screenY" value="2142" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="34" />
-          <option name="brand" value="google" />
-          <option name="codename" value="comet" />
-          <option name="id" value="comet" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel 9 Pro Fold" />
-          <option name="screenDensity" value="390" />
-          <option name="screenX" value="2076" />
-          <option name="screenY" value="2152" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="29" />
-          <option name="brand" value="samsung" />
-          <option name="codename" value="crownqlteue" />
-          <option name="id" value="crownqlteue" />
-          <option name="manufacturer" value="Samsung" />
-          <option name="name" value="Galaxy Note9" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="2220" />
-          <option name="screenY" value="1080" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="34" />
-          <option name="brand" value="samsung" />
-          <option name="codename" value="dm3q" />
-          <option name="id" value="dm3q" />
-          <option name="manufacturer" value="Samsung" />
-          <option name="name" value="Galaxy S23 Ultra" />
-          <option name="screenDensity" value="600" />
-          <option name="screenX" value="1440" />
-          <option name="screenY" value="3088" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="34" />
-          <option name="brand" value="samsung" />
-          <option name="codename" value="e1q" />
-          <option name="id" value="e1q" />
-          <option name="manufacturer" value="Samsung" />
-          <option name="name" value="Galaxy S24" />
-          <option name="screenDensity" value="480" />
-          <option name="screenX" value="1080" />
-          <option name="screenY" value="2340" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="33" />
-          <option name="brand" value="google" />
-          <option name="codename" value="felix" />
-          <option name="id" value="felix" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel Fold" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="2208" />
-          <option name="screenY" value="1840" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="34" />
-          <option name="brand" value="google" />
-          <option name="codename" value="felix" />
-          <option name="id" value="felix" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel Fold" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="2208" />
-          <option name="screenY" value="1840" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="33" />
-          <option name="brand" value="google" />
-          <option name="codename" value="felix_camera" />
-          <option name="id" value="felix_camera" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel Fold (Camera-enabled)" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="2208" />
-          <option name="screenY" value="1840" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="33" />
-          <option name="brand" value="samsung" />
-          <option name="codename" value="gts8uwifi" />
-          <option name="id" value="gts8uwifi" />
-          <option name="manufacturer" value="Samsung" />
-          <option name="name" value="Galaxy Tab S8 Ultra" />
-          <option name="screenDensity" value="320" />
-          <option name="screenX" value="1848" />
-          <option name="screenY" value="2960" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="34" />
-          <option name="brand" value="google" />
-          <option name="codename" value="husky" />
-          <option name="id" value="husky" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel 8 Pro" />
-          <option name="screenDensity" value="390" />
-          <option name="screenX" value="1008" />
-          <option name="screenY" value="2244" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="30" />
-          <option name="brand" value="motorola" />
-          <option name="codename" value="java" />
-          <option name="id" value="java" />
-          <option name="manufacturer" value="Motorola" />
-          <option name="name" value="G20" />
-          <option name="screenDensity" value="280" />
-          <option name="screenX" value="720" />
-          <option name="screenY" value="1600" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="34" />
-          <option name="brand" value="google" />
-          <option name="codename" value="komodo" />
-          <option name="id" value="komodo" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel 9 Pro XL" />
-          <option name="screenDensity" value="360" />
-          <option name="screenX" value="1008" />
-          <option name="screenY" value="2244" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="33" />
-          <option name="brand" value="google" />
-          <option name="codename" value="lynx" />
-          <option name="id" value="lynx" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel 7a" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="1080" />
-          <option name="screenY" value="2400" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="31" />
-          <option name="brand" value="google" />
-          <option name="codename" value="oriole" />
-          <option name="id" value="oriole" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel 6" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="1080" />
-          <option name="screenY" value="2400" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="33" />
-          <option name="brand" value="google" />
-          <option name="codename" value="panther" />
-          <option name="id" value="panther" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel 7" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="1080" />
-          <option name="screenY" value="2400" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="34" />
-          <option name="brand" value="samsung" />
-          <option name="codename" value="q5q" />
-          <option name="id" value="q5q" />
-          <option name="manufacturer" value="Samsung" />
-          <option name="name" value="Galaxy Z Fold5" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="1812" />
-          <option name="screenY" value="2176" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="30" />
-          <option name="brand" value="google" />
-          <option name="codename" value="r11" />
-          <option name="id" value="r11" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel Watch" />
-          <option name="screenDensity" value="320" />
-          <option name="screenX" value="384" />
-          <option name="screenY" value="384" />
-          <option name="type" value="WEAR_OS" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="30" />
-          <option name="brand" value="google" />
-          <option name="codename" value="redfin" />
-          <option name="id" value="redfin" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel 5" />
-          <option name="screenDensity" value="440" />
-          <option name="screenX" value="1080" />
-          <option name="screenY" value="2340" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="34" />
-          <option name="brand" value="google" />
-          <option name="codename" value="shiba" />
-          <option name="id" value="shiba" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel 8" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="1080" />
-          <option name="screenY" value="2400" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="33" />
-          <option name="brand" value="google" />
-          <option name="codename" value="tangorpro" />
-          <option name="id" value="tangorpro" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel Tablet" />
-          <option name="screenDensity" value="320" />
-          <option name="screenX" value="1600" />
-          <option name="screenY" value="2560" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="34" />
-          <option name="brand" value="google" />
-          <option name="codename" value="tokay" />
-          <option name="id" value="tokay" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel 9" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="1080" />
-          <option name="screenY" value="2424" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="29" />
-          <option name="brand" value="samsung" />
-          <option name="codename" value="x1q" />
-          <option name="id" value="x1q" />
-          <option name="manufacturer" value="Samsung" />
-          <option name="name" value="Galaxy S20" />
-          <option name="screenDensity" value="480" />
-          <option name="screenX" value="1440" />
-          <option name="screenY" value="3200" />
-        </PersistentDeviceSelectionData>
-      </list>
-    </option>
-  </component>
-</project>
\ No newline at end of file
diff --git a/android/build.gradle b/android/build.gradle
index 50e7267..6b43db6 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -39,25 +39,25 @@ android {
 
     dependencies {
         // Firebase
-        implementation platform('com.google.firebase:firebase-bom:33.1.2')
-        implementation "com.google.firebase:firebase-messaging:24.0.0"
+        implementation platform('com.google.firebase:firebase-bom:33.9.0')
+        implementation "com.google.firebase:firebase-messaging:24.1.0"
 
         // Kotlin
-        implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.10"
+        implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.0.21"
 
         // Twilio
         implementation "com.twilio:audioswitch:1.1.8"
         implementation "com.twilio:voice-android:6.6.1"
 
         // AndroidX
-        implementation 'androidx.appcompat:appcompat:1.6.1'
-        implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
+        implementation 'androidx.appcompat:appcompat:1.7.0'
+        implementation 'androidx.constraintlayout:constraintlayout:2.2.0'
         implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
         implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.1.0'
 
         // Other
         implementation 'com.squareup.picasso:picasso:2.71828'
-//        implementation files("libs/flutter.jar")
+        // implementation files("libs/flutter.jar")
 
         // Testing
         testImplementation 'org.junit.jupiter:junit-jupiter:5.10.0'
@@ -78,4 +78,4 @@ android {
 
 dependencies {
     testImplementation 'org.testng:testng:6.9.6'
-}
+}
\ No newline at end of file
diff --git a/android/local.properties b/android/local.properties
new file mode 100644
index 0000000..ece294c
--- /dev/null
+++ b/android/local.properties
@@ -0,0 +1,8 @@
+## This file must *NOT* be checked into Version Control Systems,
+# as it contains information specific to your local configuration.
+#
+# Location of the SDK. This is only used by Gradle.
+# For customization when using a Version Control System, please read the
+# header note.
+#Fri Feb 14 11:29:39 IST 2025
+sdk.dir=/Users/imac/Library/Android/sdk
diff --git a/android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml
index e00f227..fec58b2 100644
--- a/android/src/main/AndroidManifest.xml
+++ b/android/src/main/AndroidManifest.xml
@@ -1,3 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-  package="com.twilio.voice.flutter">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <uses-permission android:name="android.permission.VIBRATE" />
 </manifest>
diff --git a/android/src/main/java/com/twilio/voice/flutter/IncomingCallNotificationService.java b/android/src/main/java/com/twilio/voice/flutter/IncomingCallNotificationService.java
index a2e0641..e7b2b84 100644
--- a/android/src/main/java/com/twilio/voice/flutter/IncomingCallNotificationService.java
+++ b/android/src/main/java/com/twilio/voice/flutter/IncomingCallNotificationService.java
@@ -81,7 +81,7 @@ public IBinder onBind(Intent intent) {
         return null;
     }
 
-    private Notification createNotification(CallInvite callInvite, int notificationId, int channelImportance) {
+    private Notification createNotification(CallInvite callInvite, int notificationId) {
         Intent intent = new Intent(this, NotificationProxyActivity.class);
         intent.setAction(TwilioConstants.ACTION_INCOMING_CALL_NOTIFICATION);
         intent.putExtra(TwilioConstants.INCOMING_CALL_NOTIFICATION_ID, notificationId);
@@ -100,7 +100,7 @@ private Notification createNotification(CallInvite callInvite, int notificationI
                     extras,
                     callInvite,
                     notificationId,
-                    createChannel(channelImportance));
+                    createChannel());
         } else {
             return new NotificationCompat.Builder(this)
                     .setSmallIcon(R.drawable.ic_phone_call)
@@ -126,12 +126,8 @@ private Notification buildNotification(String text, PendingIntent pendingIntent,
         rejectIntent.putExtra(TwilioConstants.EXTRA_INCOMING_CALL_INVITE, callInvite);
         rejectIntent.putExtra(TwilioConstants.INCOMING_CALL_NOTIFICATION_ID, notificationId);
         PendingIntent piRejectIntent;
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-            piRejectIntent = PendingIntent.getActivity(this, 0, rejectIntent,
-                    PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
-        } else {
-            piRejectIntent = PendingIntent.getActivity(this, 0, rejectIntent, PendingIntent.FLAG_UPDATE_CURRENT);
-        }
+        piRejectIntent = PendingIntent.getActivity(this, 0, rejectIntent,
+                PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
 
         Intent acceptIntent = new Intent(getApplicationContext(), NotificationProxyActivity.class);
         acceptIntent.setAction(TwilioConstants.ACTION_ACCEPT);
@@ -139,12 +135,8 @@ private Notification buildNotification(String text, PendingIntent pendingIntent,
         acceptIntent.putExtra(TwilioConstants.INCOMING_CALL_NOTIFICATION_ID, notificationId);
         acceptIntent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
         PendingIntent piAcceptIntent;
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-            piAcceptIntent = PendingIntent.getActivity(this, 0, acceptIntent,
-                    PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
-        } else {
-            piAcceptIntent = PendingIntent.getActivity(this, 0, acceptIntent, PendingIntent.FLAG_UPDATE_CURRENT);
-        }
+        piAcceptIntent = PendingIntent.getActivity(this, 0, acceptIntent,
+                PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
 
         Notification.Builder builder = new Notification.Builder(getApplicationContext(), channelId)
                 .setSmallIcon(R.drawable.ic_phone_call)
@@ -168,16 +160,11 @@ private Notification buildNotification(String text, PendingIntent pendingIntent,
     }
 
     @TargetApi(Build.VERSION_CODES.O)
-    private String createChannel(int channelImportance) {
+    private String createChannel() {
         NotificationChannel callInviteChannel = new NotificationChannel(TwilioConstants.VOICE_CHANNEL_HIGH_IMPORTANCE,
                 "Primary Voice Channel", NotificationManager.IMPORTANCE_HIGH);
         String channelId = TwilioConstants.VOICE_CHANNEL_HIGH_IMPORTANCE;
 
-        if (channelImportance == NotificationManager.IMPORTANCE_LOW) {
-            callInviteChannel = new NotificationChannel(TwilioConstants.VOICE_CHANNEL_LOW_IMPORTANCE,
-                    "Primary Voice Channel", NotificationManager.IMPORTANCE_LOW);
-            channelId = TwilioConstants.VOICE_CHANNEL_LOW_IMPORTANCE;
-        }
         callInviteChannel.setLightColor(Color.GREEN);
         callInviteChannel.setLockscreenVisibility(Notification.VISIBILITY_PRIVATE);
         NotificationManager notificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
@@ -262,13 +249,13 @@ private void endForeground() {
     private void setCallInProgressNotification(CallInvite callInvite, int notificationId) {
         if (isAppVisible()) {
             Log.i(TAG, "setCallInProgressNotification - app is visible.");
-            Notification notification = createNotification(callInvite, notificationId,
-                    NotificationManager.IMPORTANCE_HIGH);
+            Notification notification = createNotification(callInvite, notificationId
+            );
             startForeground(notificationId, notification);
         } else {
             Log.i(TAG, "setCallInProgressNotification - app is NOT visible.");
-            Notification notification = createNotification(callInvite, notificationId,
-                    NotificationManager.IMPORTANCE_HIGH);
+            Notification notification = createNotification(callInvite, notificationId
+            );
             startForeground(notificationId, notification);
         }
     }
diff --git a/android/src/main/java/com/twilio/voice/flutter/TwilioVoiceFlutterPlugin.java b/android/src/main/java/com/twilio/voice/flutter/TwilioVoiceFlutterPlugin.java
index 1d46a11..6a77cad 100644
--- a/android/src/main/java/com/twilio/voice/flutter/TwilioVoiceFlutterPlugin.java
+++ b/android/src/main/java/com/twilio/voice/flutter/TwilioVoiceFlutterPlugin.java
@@ -42,7 +42,7 @@
 import java.util.concurrent.CopyOnWriteArrayList;
 
 public class TwilioVoiceFlutterPlugin
-    implements FlutterPlugin, MethodCallHandler, EventChannel.StreamHandler, ActivityAware, NewIntentListener {
+        implements FlutterPlugin, MethodCallHandler, EventChannel.StreamHandler, ActivityAware, NewIntentListener {
   private static final String TAG = "TwilioVoiceFlutter";
   public static final String ACTION_CALL_EVENT = "ACTION_CALL_EVENT";
   private static final String METHOD_CHANNEL_NAME = "twilio_voice_flutter";
@@ -68,7 +68,7 @@ public class TwilioVoiceFlutterPlugin
   public void onAttachedToEngine(@NonNull FlutterPlugin.FlutterPluginBinding flutterPluginBinding) {
     Log.d(TAG, "onAttachedToEngine");
     context = flutterPluginBinding.getApplicationContext();
-    preferencesUtils = new PreferencesUtils(context);
+    preferencesUtils = PreferencesUtils.getInstance(context);
     methodChannel = new MethodChannel(flutterPluginBinding.getBinaryMessenger(), METHOD_CHANNEL_NAME);
     methodChannel.setMethodCallHandler(this);
 
@@ -109,6 +109,9 @@ public void onMethodCall(@NonNull MethodCall call, @NonNull Result result) {
         String to = call.argument("to");
         makeCall(to, result);
         break;
+      case "activeCall":
+        result.success(getCallDetails());
+        break;
       case "hangUp":
         hangup(result);
         break;
@@ -165,10 +168,10 @@ public void onUnregistered(String s, String s1) {
       @Override
       public void onError(RegistrationException error, String accessToken, String fcmToken) {
         String message = String.format(
-            Locale.US,
-            "Registration Error: %d, %s",
-            error.getErrorCode(),
-            error.getMessage());
+                Locale.US,
+                "Registration Error: %d, %s",
+                error.getErrorCode(),
+                error.getMessage());
 
         Log.d(TAG, "Error unregistering. " + message);
       }
@@ -187,10 +190,11 @@ private void makeCall(String to, Result result) {
     Map<String, String> params = new HashMap<>();
     params.put("to", to);
     ConnectOptions connectOptions = new ConnectOptions.Builder(accessToken)
-        .params(params)
-        .build();
+            .params(params)
+            .build();
     activeCall = Voice.connect(context, connectOptions, callListener);
-    result.success("Calling " + to);
+
+    result.success(getCallDetails());
   }
 
   private void hangup(Result result) {
@@ -270,13 +274,13 @@ public void onRegistered(@NonNull String accessToken, @NonNull String fcmToken)
 
       @Override
       public void onError(@NonNull RegistrationException error,
-          @NonNull String accessToken,
-          @NonNull String fcmToken) {
+                          @NonNull String accessToken,
+                          @NonNull String fcmToken) {
         String message = String.format(
-            Locale.US,
-            "Registration Error: %d, %s",
-            error.getErrorCode(),
-            error.getMessage());
+                Locale.US,
+                "Registration Error: %d, %s",
+                error.getErrorCode(),
+                error.getMessage());
         Log.e(TAG, message);
 
       }
@@ -296,10 +300,10 @@ public void onRinging(@NonNull Call call) {
       @Override
       public void onConnectFailure(@NonNull Call call, @NonNull CallException error) {
         String message = String.format(
-            Locale.US,
-            "Call Error: %d, %s",
-            error.getErrorCode(),
-            error.getMessage());
+                Locale.US,
+                "Call Error: %d, %s",
+                error.getErrorCode(),
+                error.getMessage());
         Log.e(TAG, message);
         status = "callFailure";
         sendEvent("callFailure", message);
@@ -332,10 +336,10 @@ public void onDisconnected(@NonNull Call call, CallException error) {
         Log.d(TAG, "Disconnected");
         if (error != null) {
           String message = String.format(
-              Locale.US,
-              "Call Error: %d, %s",
-              error.getErrorCode(),
-              error.getMessage());
+                  Locale.US,
+                  "Call Error: %d, %s",
+                  error.getErrorCode(),
+                  error.getMessage());
           sendEvent("callDisconnected", message);
         } else {
           sendEvent("callDisconnected", "");
diff --git a/android/src/main/java/com/twilio/voice/flutter/Utils/PreferencesUtils.java b/android/src/main/java/com/twilio/voice/flutter/Utils/PreferencesUtils.java
index 69bbb09..4f00ed3 100644
--- a/android/src/main/java/com/twilio/voice/flutter/Utils/PreferencesUtils.java
+++ b/android/src/main/java/com/twilio/voice/flutter/Utils/PreferencesUtils.java
@@ -9,11 +9,19 @@ public class PreferencesUtils {
     private static final String KEY_FCM_TOKEN = "fcm_token";
 
     private final SharedPreferences sharedPreferences;
+    private static PreferencesUtils instance;
 
-    public PreferencesUtils(Context context) {
+    private PreferencesUtils(Context context) {
         sharedPreferences = context.getSharedPreferences(PREF_NAME, Context.MODE_PRIVATE);
     }
 
+    public static synchronized PreferencesUtils getInstance(Context context) {
+        if (instance == null) {
+            instance = new PreferencesUtils(context.getApplicationContext());
+        }
+        return instance;
+    }
+
     public void setAccessToken(String accessToken) {
         SharedPreferences.Editor editor = sharedPreferences.edit();
         editor.putString(KEY_ACCESS_TOKEN, accessToken);
@@ -40,4 +48,10 @@ public void clearTokens() {
         editor.remove(KEY_FCM_TOKEN);
         editor.apply();
     }
-}
+
+
+    // Add this method to handle contact name lookup
+    public String findContactName(String phoneNumber) {
+        return phoneNumber;
+    }
+}
\ No newline at end of file
diff --git a/example/pubspec.lock b/example/pubspec.lock
index 89f0fb2..75c995c 100644
--- a/example/pubspec.lock
+++ b/example/pubspec.lock
@@ -5,10 +5,10 @@ packages:
     dependency: transitive
     description:
       name: _flutterfire_internals
-      sha256: "5fdcea390499dd26c808a3c662df5f4208d6bbc0643072eee94f1476249e2818"
+      sha256: "401dd18096f5eaa140404ccbbbf346f83c850e6f27049698a7ee75a3488ddb32"
       url: "https://pub.dev"
     source: hosted
-    version: "1.3.43"
+    version: "1.3.52"
   async:
     dependency: transitive
     description:
@@ -45,10 +45,10 @@ packages:
     dependency: transitive
     description:
       name: collection
-      sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
+      sha256: a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf
       url: "https://pub.dev"
     source: hosted
-    version: "1.18.0"
+    version: "1.19.0"
   cupertino_icons:
     dependency: "direct main"
     description:
@@ -61,10 +61,10 @@ packages:
     dependency: transitive
     description:
       name: equatable
-      sha256: c2b87cb7756efdf69892005af546c56c0b5037f54d2a88269b4f347a505e3ca2
+      sha256: "567c64b3cb4cf82397aac55f4f0cbd3ca20d77c6c03bedbc4ceaddc08904aef7"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.5"
+    version: "2.0.7"
   fake_async:
     dependency: transitive
     description:
@@ -85,50 +85,50 @@ packages:
     dependency: "direct main"
     description:
       name: firebase_core
-      sha256: c7de9354eb2cd8bfe8059e1112174c9a58beda7051807207306bc48283277cfb
+      sha256: "6a4ea0f1d533443c8afc3d809cd36a4e2b8f2e2e711f697974f55bb31d71d1b8"
       url: "https://pub.dev"
     source: hosted
-    version: "3.5.0"
+    version: "3.12.0"
   firebase_core_platform_interface:
     dependency: transitive
     description:
       name: firebase_core_platform_interface
-      sha256: e30da58198a6d4b49d5bce4e852f985c32cb10db329ebef9473db2b9f09ce810
+      sha256: d7253d255ff10f85cfd2adaba9ac17bae878fa3ba577462451163bd9f1d1f0bf
       url: "https://pub.dev"
     source: hosted
-    version: "5.3.0"
+    version: "5.4.0"
   firebase_core_web:
     dependency: transitive
     description:
       name: firebase_core_web
-      sha256: f967a7138f5d2ffb1ce15950e2a382924239eaa521150a8f144af34e68b3b3e5
+      sha256: e47f5c2776de018fa19bc9f6f723df136bc75cdb164d64b65305babd715c8e41
       url: "https://pub.dev"
     source: hosted
-    version: "2.18.1"
+    version: "2.21.0"
   firebase_messaging:
     dependency: "direct main"
     description:
       name: firebase_messaging
-      sha256: "29941ba5a3204d80656c0e52103369aa9a53edfd9ceae05a2bb3376f24fda453"
+      sha256: "8755a083a20bac4485e8b46d223f6f2eab34e659a76a75f8cf3cded53bc98a15"
       url: "https://pub.dev"
     source: hosted
-    version: "15.1.0"
+    version: "15.2.3"
   firebase_messaging_platform_interface:
     dependency: transitive
     description:
       name: firebase_messaging_platform_interface
-      sha256: "69671a0f1a40c7b7c46ad0283e6f34ca2a59a0362ca14a240a4ea01c46e8a521"
+      sha256: "8cc771079677460de53ad8fcca5bc3074d58c5fc4f9d89b19585e5bfd9c64292"
       url: "https://pub.dev"
     source: hosted
-    version: "4.5.45"
+    version: "4.6.3"
   firebase_messaging_web:
     dependency: transitive
     description:
       name: firebase_messaging_web
-      sha256: "6890111a9d01d7b13d0f6fe74850812c334e903d2c80a2d9356a3abb8c3a9e9a"
+      sha256: caa73059b0396c97f691683c4cfc3f897c8543801579b7dd4851c431d8e4e091
       url: "https://pub.dev"
     source: hosted
-    version: "3.9.1"
+    version: "3.10.3"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -171,18 +171,18 @@ packages:
     dependency: transitive
     description:
       name: leak_tracker
-      sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a"
+      sha256: "7bb2830ebd849694d1ec25bf1f44582d6ac531a57a365a803a6034ff751d2d06"
       url: "https://pub.dev"
     source: hosted
-    version: "10.0.4"
+    version: "10.0.7"
   leak_tracker_flutter_testing:
     dependency: transitive
     description:
       name: leak_tracker_flutter_testing
-      sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8"
+      sha256: "9491a714cca3667b60b5c420da8217e6de0d1ba7a5ec322fab01758f6998f379"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.3"
+    version: "3.0.8"
   leak_tracker_testing:
     dependency: transitive
     description:
@@ -211,18 +211,18 @@ packages:
     dependency: transitive
     description:
       name: material_color_utilities
-      sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a"
+      sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec
       url: "https://pub.dev"
     source: hosted
-    version: "0.8.0"
+    version: "0.11.1"
   meta:
     dependency: transitive
     description:
       name: meta
-      sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136"
+      sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7
       url: "https://pub.dev"
     source: hosted
-    version: "1.12.0"
+    version: "1.15.0"
   path:
     dependency: transitive
     description:
@@ -235,42 +235,42 @@ packages:
     dependency: "direct main"
     description:
       name: permission_handler
-      sha256: "18bf33f7fefbd812f37e72091a15575e72d5318854877e0e4035a24ac1113ecb"
+      sha256: "59adad729136f01ea9e35a48f5d1395e25cba6cea552249ddbe9cf950f5d7849"
       url: "https://pub.dev"
     source: hosted
-    version: "11.3.1"
+    version: "11.4.0"
   permission_handler_android:
     dependency: transitive
     description:
       name: permission_handler_android
-      sha256: "76e4ab092c1b240d31177bb64d2b0bea43f43d0e23541ec866151b9f7b2490fa"
+      sha256: d3971dcdd76182a0c198c096b5db2f0884b0d4196723d21a866fc4cdea057ebc
       url: "https://pub.dev"
     source: hosted
-    version: "12.0.12"
+    version: "12.1.0"
   permission_handler_apple:
     dependency: transitive
     description:
       name: permission_handler_apple
-      sha256: e6f6d73b12438ef13e648c4ae56bd106ec60d17e90a59c4545db6781229082a0
+      sha256: f84a188e79a35c687c132a0a0556c254747a08561e99ab933f12f6ca71ef3c98
       url: "https://pub.dev"
     source: hosted
-    version: "9.4.5"
+    version: "9.4.6"
   permission_handler_html:
     dependency: transitive
     description:
       name: permission_handler_html
-      sha256: af26edbbb1f2674af65a8f4b56e1a6f526156bc273d0e65dd8075fab51c78851
+      sha256: "38f000e83355abb3392140f6bc3030660cfaef189e1f87824facb76300b4ff24"
       url: "https://pub.dev"
     source: hosted
-    version: "0.1.3+2"
+    version: "0.1.3+5"
   permission_handler_platform_interface:
     dependency: transitive
     description:
       name: permission_handler_platform_interface
-      sha256: e9c8eadee926c4532d0305dff94b85bf961f16759c3af791486613152af4b4f9
+      sha256: eb99b295153abce5d683cac8c02e22faab63e50679b937fa1bf67d58bb282878
       url: "https://pub.dev"
     source: hosted
-    version: "4.2.3"
+    version: "4.3.0"
   permission_handler_windows:
     dependency: transitive
     description:
@@ -283,10 +283,10 @@ packages:
     dependency: transitive
     description:
       name: platform
-      sha256: "12220bb4b65720483f8fa9450b4332347737cf8213dd2840d8b2c823e47243ec"
+      sha256: "9b71283fc13df574056616011fb138fd3b793ea47cc509c189a6c3fa5f8a1a65"
       url: "https://pub.dev"
     source: hosted
-    version: "3.1.4"
+    version: "3.1.5"
   plugin_platform_interface:
     dependency: transitive
     description:
@@ -307,7 +307,7 @@ packages:
     dependency: transitive
     description: flutter
     source: sdk
-    version: "0.0.99"
+    version: "0.0.0"
   source_span:
     dependency: transitive
     description:
@@ -320,10 +320,10 @@ packages:
     dependency: transitive
     description:
       name: stack_trace
-      sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b"
+      sha256: "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377"
       url: "https://pub.dev"
     source: hosted
-    version: "1.11.1"
+    version: "1.12.0"
   stream_channel:
     dependency: transitive
     description:
@@ -336,10 +336,10 @@ packages:
     dependency: transitive
     description:
       name: string_scanner
-      sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde"
+      sha256: "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3"
       url: "https://pub.dev"
     source: hosted
-    version: "1.2.0"
+    version: "1.3.0"
   sync_http:
     dependency: transitive
     description:
@@ -360,17 +360,17 @@ packages:
     dependency: transitive
     description:
       name: test_api
-      sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f"
+      sha256: "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c"
       url: "https://pub.dev"
     source: hosted
-    version: "0.7.0"
+    version: "0.7.3"
   twilio_voice_flutter:
     dependency: "direct main"
     description:
       path: ".."
       relative: true
     source: path
-    version: "0.0.3"
+    version: "0.0.6"
   vector_math:
     dependency: transitive
     description:
@@ -383,26 +383,26 @@ packages:
     dependency: transitive
     description:
       name: vm_service
-      sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec"
+      sha256: f6be3ed8bd01289b34d679c2b62226f63c0e69f9fd2e50a6b3c1c729a961041b
       url: "https://pub.dev"
     source: hosted
-    version: "14.2.1"
+    version: "14.3.0"
   web:
     dependency: transitive
     description:
       name: web
-      sha256: d43c1d6b787bf0afad444700ae7f4db8827f701bc61c255ac8d328c6f4d52062
+      sha256: cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.0"
+    version: "1.1.0"
   webdriver:
     dependency: transitive
     description:
       name: webdriver
-      sha256: "003d7da9519e1e5f329422b36c4dcdf18d7d2978d1ba099ea4e45ba490ed845e"
+      sha256: "3d773670966f02a646319410766d3b5e1037efb7f07cc68f844d5e06cd4d61c8"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.3"
+    version: "3.0.4"
 sdks:
-  dart: ">=3.4.3 <4.0.0"
-  flutter: ">=3.22.0"
+  dart: ">=3.5.0 <4.0.0"
+  flutter: ">=3.24.0"
diff --git a/ios/.gitignore b/ios/.gitignore
deleted file mode 100644
index 034771f..0000000
--- a/ios/.gitignore
+++ /dev/null
@@ -1,38 +0,0 @@
-.idea/
-.vagrant/
-.sconsign.dblite
-.svn/
-
-.DS_Store
-*.swp
-profile
-
-DerivedData/
-build/
-GeneratedPluginRegistrant.h
-GeneratedPluginRegistrant.m
-
-.generated/
-
-*.pbxuser
-*.mode1v3
-*.mode2v3
-*.perspectivev3
-
-!default.pbxuser
-!default.mode1v3
-!default.mode2v3
-!default.perspectivev3
-
-xcuserdata
-
-*.moved-aside
-
-*.pyc
-*sync/
-Icon?
-.tags*
-
-/Flutter/Generated.xcconfig
-/Flutter/ephemeral/
-/Flutter/flutter_export_environment.sh
diff --git a/ios/Assets/.gitkeep b/ios/Assets/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/ios/Classes/TwilioVoiceFlutterPlugin.swift b/ios/Classes/TwilioVoiceFlutterPlugin.swift
index a0b34dc..c273d6f 100644
--- a/ios/Classes/TwilioVoiceFlutterPlugin.swift
+++ b/ios/Classes/TwilioVoiceFlutterPlugin.swift
@@ -464,14 +464,14 @@ public class TwilioVoiceFlutterPlugin: NSObject, FlutterPlugin, NotificationDele
     func callDisconnected(id: UUID, error: String?) {
         self.call = nil
         self.callInvite = nil
-        self.fromDisplayName = nil
+        self.fromDisplayName = nilCall event: callDisconnected 
         self.toDisplayName = nil
         self.callKitCompletionCallback = nil
         self.userInitiatedDisconnect = false
 
         DispatchQueue.main.async {
             self.callStatus = "callDisconnected"
-            self.channel?.invokeMethod("callDisconnected", arguments: nil)
+            self.channel?.invokeMethod("callDisconnected", arguments: [:])
         }
 
 
diff --git a/ios/twilio_voice_flutter.podspec b/ios/twilio_voice_flutter.podspec
index 2d75383..98dcb1c 100644
--- a/ios/twilio_voice_flutter.podspec
+++ b/ios/twilio_voice_flutter.podspec
@@ -5,7 +5,7 @@
 #
 Pod::Spec.new do |s|
   s.name             = 'twilio_voice_flutter'
-  s.version          = '0.0.4'
+  s.version          = '0.0.6'
   s.summary          = 'Voice SDK to allow adding voice-over-IP (VoIP) calling into your Flutter applications.'
   s.description      = <<-DESC
 The twilio_voice_flutter package simplifies integration with Twilio's Programmable Voice SDK, enabling VoIP calling within your Flutter apps. It supports both iOS and Android, offering an easy-to-use API for managing calls. Ideal for customer service, communication, or any app needing real-time voice, it leverages Twilio's reliable infrastructure to deliver high-quality VoIP features.
diff --git a/pubspec.lock b/pubspec.lock
index 10e9c93..87345a5 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -37,18 +37,18 @@ packages:
     dependency: transitive
     description:
       name: collection
-      sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
+      sha256: a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf
       url: "https://pub.dev"
     source: hosted
-    version: "1.18.0"
+    version: "1.19.0"
   equatable:
     dependency: "direct main"
     description:
       name: equatable
-      sha256: c2b87cb7756efdf69892005af546c56c0b5037f54d2a88269b4f347a505e3ca2
+      sha256: "567c64b3cb4cf82397aac55f4f0cbd3ca20d77c6c03bedbc4ceaddc08904aef7"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.5"
+    version: "2.0.7"
   fake_async:
     dependency: transitive
     description:
@@ -66,10 +66,10 @@ packages:
     dependency: "direct dev"
     description:
       name: flutter_lints
-      sha256: "3f41d009ba7172d5ff9be5f6e6e6abb4300e263aab8866d2a0842ed2a70f8f0c"
+      sha256: "5398f14efa795ffb7a33e9b6a08798b26a180edac4ad7db3f231e40f82ce11e1"
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.0"
+    version: "5.0.0"
   flutter_test:
     dependency: "direct dev"
     description: flutter
@@ -84,18 +84,18 @@ packages:
     dependency: transitive
     description:
       name: leak_tracker
-      sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a"
+      sha256: "7bb2830ebd849694d1ec25bf1f44582d6ac531a57a365a803a6034ff751d2d06"
       url: "https://pub.dev"
     source: hosted
-    version: "10.0.4"
+    version: "10.0.7"
   leak_tracker_flutter_testing:
     dependency: transitive
     description:
       name: leak_tracker_flutter_testing
-      sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8"
+      sha256: "9491a714cca3667b60b5c420da8217e6de0d1ba7a5ec322fab01758f6998f379"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.3"
+    version: "3.0.8"
   leak_tracker_testing:
     dependency: transitive
     description:
@@ -108,10 +108,10 @@ packages:
     dependency: transitive
     description:
       name: lints
-      sha256: "976c774dd944a42e83e2467f4cc670daef7eed6295b10b36ae8c85bcbf828235"
+      sha256: c35bb79562d980e9a453fc715854e1ed39e24e7d0297a880ef54e17f9874a9d7
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.0"
+    version: "5.1.1"
   matcher:
     dependency: transitive
     description:
@@ -124,18 +124,18 @@ packages:
     dependency: transitive
     description:
       name: material_color_utilities
-      sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a"
+      sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec
       url: "https://pub.dev"
     source: hosted
-    version: "0.8.0"
+    version: "0.11.1"
   meta:
     dependency: transitive
     description:
       name: meta
-      sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136"
+      sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7
       url: "https://pub.dev"
     source: hosted
-    version: "1.12.0"
+    version: "1.15.0"
   path:
     dependency: transitive
     description:
@@ -156,7 +156,7 @@ packages:
     dependency: transitive
     description: flutter
     source: sdk
-    version: "0.0.99"
+    version: "0.0.0"
   source_span:
     dependency: transitive
     description:
@@ -169,10 +169,10 @@ packages:
     dependency: transitive
     description:
       name: stack_trace
-      sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b"
+      sha256: "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377"
       url: "https://pub.dev"
     source: hosted
-    version: "1.11.1"
+    version: "1.12.0"
   stream_channel:
     dependency: transitive
     description:
@@ -185,10 +185,10 @@ packages:
     dependency: transitive
     description:
       name: string_scanner
-      sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde"
+      sha256: "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3"
       url: "https://pub.dev"
     source: hosted
-    version: "1.2.0"
+    version: "1.3.0"
   term_glyph:
     dependency: transitive
     description:
@@ -201,10 +201,10 @@ packages:
     dependency: transitive
     description:
       name: test_api
-      sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f"
+      sha256: "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c"
       url: "https://pub.dev"
     source: hosted
-    version: "0.7.0"
+    version: "0.7.3"
   vector_math:
     dependency: transitive
     description:
@@ -217,18 +217,18 @@ packages:
     dependency: transitive
     description:
       name: vm_service
-      sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec"
+      sha256: f6be3ed8bd01289b34d679c2b62226f63c0e69f9fd2e50a6b3c1c729a961041b
       url: "https://pub.dev"
     source: hosted
-    version: "14.2.1"
+    version: "14.3.0"
   web:
     dependency: "direct main"
     description:
       name: web
-      sha256: d43c1d6b787bf0afad444700ae7f4db8827f701bc61c255ac8d328c6f4d52062
+      sha256: cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.0"
+    version: "1.1.0"
 sdks:
-  dart: ">=3.4.3 <4.0.0"
+  dart: ">=3.6.0 <4.0.0"
   flutter: ">=3.18.0-18.0.pre.54"
diff --git a/pubspec.yaml b/pubspec.yaml
index b8b6146..6595080 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: twilio_voice_flutter
 description: Voice SDK to allow adding voice-over-IP (VoIP) calling into your Flutter applications.
-version: 0.0.4
+version: 0.0.6
 homepage: https://github.com/DevCodeSpace/twilio_voice_flutter
 issue_tracker: https://github.com/DevCodeSpace/twilio_voice_flutter/issues
 documentation: https://pub.dev/documentation/twilio_voice_flutter/latest/
@@ -14,15 +14,15 @@ dependencies:
     sdk: flutter
   flutter_web_plugins:
     sdk: flutter
-  web: ^1.0.0
+  web: ^1.1.0
   plugin_platform_interface: ^2.1.8
 
-  equatable: ^2.0.5
+  equatable: ^2.0.7
 
 dev_dependencies:
   flutter_test:
     sdk: flutter
-  flutter_lints: ^4.0.0
+  flutter_lints: ^5.0.0
 
 screenshots:
   - description: 'Voice SDK to allow adding voice-over-IP (VoIP)'

From 5b05f5ec81fa41aacfcf3edd21f5fbd2a0645255 Mon Sep 17 00:00:00 2001
From: Thibaut Chavet <thibaut@tchavet.be>
Date: Mon, 24 Mar 2025 13:40:16 +0100
Subject: [PATCH 2/3] Fix data argument in makeCall function

---
 .../twilio/voice/flutter/TwilioVoiceFlutterPlugin.java | 10 +++++-----
 lib/twilio_voice_flutter.dart                          |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/android/src/main/java/com/twilio/voice/flutter/TwilioVoiceFlutterPlugin.java b/android/src/main/java/com/twilio/voice/flutter/TwilioVoiceFlutterPlugin.java
index 6a77cad..cc2a15f 100644
--- a/android/src/main/java/com/twilio/voice/flutter/TwilioVoiceFlutterPlugin.java
+++ b/android/src/main/java/com/twilio/voice/flutter/TwilioVoiceFlutterPlugin.java
@@ -107,7 +107,8 @@ public void onMethodCall(@NonNull MethodCall call, @NonNull Result result) {
         break;
       case "makeCall":
         String to = call.argument("to");
-        makeCall(to, result);
+        Map<String, String> data = call.argument("data");
+        makeCall(to, data, result);
         break;
       case "activeCall":
         result.success(getCallDetails());
@@ -178,7 +179,7 @@ public void onError(RegistrationException error, String accessToken, String fcmT
     });
   }
 
-  private void makeCall(String to, Result result) {
+  private void makeCall(String to, Map<String, String> data, Result result) {
     String accessToken = preferencesUtils.getAccessToken();
     if (accessToken == null) {
       result.error("NO_ACCESS_TOKEN", "No access token available", null);
@@ -187,10 +188,9 @@ private void makeCall(String to, Result result) {
 
     sendEvent("callConnecting", "");
 
-    Map<String, String> params = new HashMap<>();
-    params.put("to", to);
+    data.put("to", to);
     ConnectOptions connectOptions = new ConnectOptions.Builder(accessToken)
-            .params(params)
+            .params(data)
             .build();
     activeCall = Voice.connect(context, connectOptions, callListener);
 
diff --git a/lib/twilio_voice_flutter.dart b/lib/twilio_voice_flutter.dart
index d68614f..6ed3a05 100644
--- a/lib/twilio_voice_flutter.dart
+++ b/lib/twilio_voice_flutter.dart
@@ -125,7 +125,7 @@ class TwilioVoiceFlutter {
   /// [data] is optional and can include additional information to send with the call; defaults to an empty map.
   static Future<TwilioVoiceFlutterCall> makeCall({
     required String to,
-    Map<String, dynamic> data = const <String, dynamic>{},
+    Map<String, String> data = const <String, String>{},
   }) async {
     final args = <String, Object>{
       "to": to.trim().replaceAll(" ", ""),

From bbee7a31168666e4a07b504c1083e0cbd1e34c81 Mon Sep 17 00:00:00 2001
From: Thibaut Chavet <thibaut@tchavet.be>
Date: Mon, 24 Mar 2025 16:17:32 +0100
Subject: [PATCH 3/3] Fix event channel

---
 lib/twilio_voice_flutter.dart | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/lib/twilio_voice_flutter.dart b/lib/twilio_voice_flutter.dart
index 6ed3a05..e3c19bb 100644
--- a/lib/twilio_voice_flutter.dart
+++ b/lib/twilio_voice_flutter.dart
@@ -13,8 +13,8 @@ class TwilioVoiceFlutter {
   static const MethodChannel _channel = MethodChannel('twilio_voice_flutter');
 
   /// Method channel used to listen for responses from the native platform regarding Twilio voice events.
-  static const MethodChannel _eventChannel =
-      MethodChannel('twilio_voice_flutter_response');
+  static const EventChannel _eventChannel =
+      EventChannel('twilio_voice_flutter_events');
 
   /// StreamController for managing the stream of [TwilioVoiceFlutterEvent] events.
   static late StreamController<TwilioVoiceFlutterEvent> _streamController;
@@ -31,18 +31,20 @@ class TwilioVoiceFlutter {
     _streamController = StreamController.broadcast();
 
     /// Set the method call handler for the event channel to process events coming from the native platform.
-    _eventChannel.setMethodCallHandler((event) async {
-      log("Call event: ${event.method} . Arguments: ${event.arguments}");
+    _eventChannel.receiveBroadcastStream().listen((event) async {
+      final method = event["event"];
+      final arguments = event["data"];
+      log("Call event: $method . Arguments: $arguments");
 
       try {
         /// Get the event type based on the event method name.
-        final eventType = getEventType(event.method);
+        final eventType = getEventType(method);
         TwilioVoiceFlutterCall? call;
 
         /// Try to create a TwilioVoiceFlutterCall object from the event arguments.
         try {
           call = TwilioVoiceFlutterCall.fromMap(
-              Map<String, dynamic>.from(event.arguments));
+              Map<String, dynamic>.from(arguments));
         } catch (error) {
           log("$error");
 
@@ -53,7 +55,7 @@ class TwilioVoiceFlutter {
         _streamController.add(TwilioVoiceFlutterEvent(eventType, call));
       } catch (error, stack) {
         /// Log any error encountered during the event handling process.
-        log("Error parsing call event. ${event.arguments}",
+        log("Error parsing call event. ${arguments}",
             error: error, stackTrace: stack);
       }
     });