@capgo/capacitor-twilio-voice 8.1.0 → 8.1.2

package/android/src/main/java/ee/forgr/capacitor_twilio_voice/CapacitorTwilioVoicePlugin.java

@@ -75,7 +75,7 @@ import org.json.JSONObject;
 )
 public class CapacitorTwilioVoicePlugin extends Plugin {
 
-    private final String pluginVersion = "8.1.0";
+    private final String pluginVersion = "8.1.2";
 
     private static final String TAG = "CapacitorTwilioVoice";
     private static final String PREF_ACCESS_TOKEN = "twilio_access_token";
@@ -240,6 +240,9 @@ public class CapacitorTwilioVoicePlugin extends Plugin {
         // Set instance for Firebase messaging service
         instance = this;
 
+        // Pre-resolve main activity for notification intents when app is cold-started
+        resolveMainActivityClass();
+
         // Load stored access token
         SharedPreferences prefs = getSafeContext().getSharedPreferences("CapacitorTwilioVoice", Context.MODE_PRIVATE);
         accessToken = prefs.getString(PREF_ACCESS_TOKEN, null);
@@ -443,6 +446,51 @@ public class CapacitorTwilioVoicePlugin extends Plugin {
         this.mainActivityClass = mainActivityClass;
     }
 
+    private Class<?> resolveMainActivityClass() {
+        if (this.mainActivityClass != null) {
+            return this.mainActivityClass;
+        }
+
+        try {
+            Context context = getSafeContext();
+            Intent launchIntent = context.getPackageManager().getLaunchIntentForPackage(context.getPackageName());
+            if (launchIntent != null && launchIntent.getComponent() != null) {
+                this.mainActivityClass = Class.forName(launchIntent.getComponent().getClassName());
+                return this.mainActivityClass;
+            } else {
+                Log.w(TAG, "resolveMainActivityClass: launch intent missing component for package " + context.getPackageName());
+            }
+        } catch (Exception e) {
+            Log.e(TAG, "Failed to resolve main activity class", e);
+        }
+
+        return null;
+    }
+
+    private Intent createMainActivityIntent() {
+        try {
+            Context context = getSafeContext();
+            Class<?> activityClass = resolveMainActivityClass();
+            if (activityClass != null) {
+                return new Intent(context, activityClass);
+            }
+
+            Intent launchIntent = context.getPackageManager().getLaunchIntentForPackage(context.getPackageName());
+            if (launchIntent != null) {
+                Intent intent = new Intent(launchIntent);
+                intent.setComponent(launchIntent.getComponent());
+                intent.setPackage(context.getPackageName());
+                return intent;
+            } else {
+                Log.w(TAG, "createMainActivityIntent: no launch intent available for package " + context.getPackageName());
+            }
+        } catch (Exception e) {
+            Log.e(TAG, "createMainActivityIntent: failed to build intent for main activity", e);
+        }
+
+        return null;
+    }
+
     private void initializeNotifications() {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
             NotificationChannel channel = new NotificationChannel(
@@ -832,20 +880,21 @@ public class CapacitorTwilioVoicePlugin extends Plugin {
             return;
         }
 
-        if (mainActivityClass != null) {
-            Context context = getSafeContext();
-            Intent launchIntent = new Intent(context, mainActivityClass);
-            launchIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP);
-            if (pendingPermissionAction == PendingPermissionAction.ACCEPT_CALL && pendingCallSidForPermission != null) {
-                launchIntent.putExtra("AUTO_ACCEPT_CALL", true);
-                launchIntent.putExtra(EXTRA_CALL_SID, pendingCallSidForPermission);
-            }
-            Log.d(TAG, "requestMicrophonePermission: launching activity to request permission");
-            context.startActivity(launchIntent);
-        } else {
+        Intent launchIntent = createMainActivityIntent();
+        if (launchIntent == null) {
             Log.w(TAG, "Unable to request microphone permission - no activity available");
             handlePermissionFailure();
+            return;
+        }
+
+        Context context = getSafeContext();
+        launchIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP);
+        if (pendingPermissionAction == PendingPermissionAction.ACCEPT_CALL && pendingCallSidForPermission != null) {
+            launchIntent.putExtra("AUTO_ACCEPT_CALL", true);
+            launchIntent.putExtra(EXTRA_CALL_SID, pendingCallSidForPermission);
         }
+        Log.d(TAG, "requestMicrophonePermission: launching activity to request permission");
+        context.startActivity(launchIntent);
     }
 
     private void handleMicPermissionResult(Map<String, Boolean> permissions) {
@@ -1616,11 +1665,17 @@ public class CapacitorTwilioVoicePlugin extends Plugin {
 
     private void showIncomingCallNotification(CallInvite callInvite, String callSid, String callerName) {
         try {
+            Intent activityIntent = createMainActivityIntent();
+            if (activityIntent == null) {
+                Log.e(TAG, "Error showing notification: unable to resolve activity intent");
+                return;
+            }
+
             // Create intent for accepting the call
             PendingIntent acceptPendingIntent;
             if (this.bridge == null) {
                 // App NOT running - launch new activity
-                Intent acceptIntent = new Intent(getSafeContext(), mainActivityClass);
+                Intent acceptIntent = new Intent(activityIntent);
                 acceptIntent.setAction(ACTION_ACCEPT_CALL);
                 acceptIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP);
                 acceptIntent.putExtra("AUTO_ACCEPT_CALL", true);
@@ -1656,7 +1711,7 @@ public class CapacitorTwilioVoicePlugin extends Plugin {
             );
 
             // Create intent for full screen
-            Intent fullScreenIntent = new Intent(getSafeContext(), mainActivityClass);
+            Intent fullScreenIntent = new Intent(activityIntent);
             fullScreenIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
             fullScreenIntent.putExtra("INCOMING_CALL", true);
             fullScreenIntent.putExtra(EXTRA_CALL_SID, callSid);

package/android/src/main/java/ee/forgr/capacitor_twilio_voice/VoiceCallService.java

@@ -134,6 +134,7 @@ public class VoiceCallService extends Service {
 
         // Clean up audio switch
         if (audioSwitch != null) {
+            deactivateAudioSwitch();
             audioSwitch.stop();
             audioSwitch = null;
         }
@@ -164,6 +165,30 @@ public class VoiceCallService extends Service {
         });
     }
 
+    private void activateAudioSwitch() {
+        if (audioSwitch == null) {
+            return;
+        }
+
+        try {
+            audioSwitch.activate();
+        } catch (Exception e) {
+            Log.e(TAG, "Failed to activate AudioSwitch", e);
+        }
+    }
+
+    private void deactivateAudioSwitch() {
+        if (audioSwitch == null) {
+            return;
+        }
+
+        try {
+            audioSwitch.deactivate();
+        } catch (Exception e) {
+            Log.e(TAG, "Failed to deactivate AudioSwitch", e);
+        }
+    }
+
     public void setServiceListener(VoiceCallServiceListener listener) {
         this.serviceListener = listener;
     }
@@ -250,6 +275,7 @@ public class VoiceCallService extends Service {
         boolean speakerEnabled = intent.getBooleanExtra(EXTRA_SPEAKER_ENABLED, false);
 
         if (audioSwitch != null) {
+            activateAudioSwitch();
             List<AudioDevice> audioDevices = audioSwitch.getAvailableAudioDevices();
             AudioDevice selectedDevice = null;
 
@@ -394,6 +420,8 @@ public class VoiceCallService extends Service {
             activeCall = call;
             currentCallSid = call.getSid();
 
+            activateAudioSwitch();
+
             // Update notification to show connected state with actions
             updateOngoingCallNotification();
 
@@ -445,6 +473,8 @@ public class VoiceCallService extends Service {
             isCallMuted = false;
             isSpeakerEnabled = false;
 
+            deactivateAudioSwitch();
+
             if (serviceListener != null) {
                 serviceListener.onCallDisconnected(call, error);
             }

package/ios/Sources/CapacitorTwilioVoicePlugin/CapacitorTwilioVoicePlugin.swift

@@ -27,7 +27,7 @@ public protocol PushKitEventDelegate: AnyObject {
  */
 @objc(CapacitorTwilioVoicePlugin)
 public class CapacitorTwilioVoicePlugin: CAPPlugin, CAPBridgedPlugin, PushKitEventDelegate {
-    private let pluginVersion: String = "8.1.0"
+    private let pluginVersion: String = "8.1.2"
 
     public let identifier = "CapacitorTwilioVoicePlugin"
     public let jsName = "CapacitorTwilioVoice"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capgo/capacitor-twilio-voice",
-  "version": "8.1.0",
+  "version": "8.1.2",
   "description": "Integrates the Twilio Voice SDK into Capacitor",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",