capacitor-jitsi-meet 2.2.0 → 2.2.1-beta.0

package/CHANGELOG.md

@@ -4,7 +4,12 @@ Each version of the capacitor plugin uses a specific Jitsi SDK version. In iOS d
 
 See Jitsi-meet SDK [changelog](https://github.com/jitsi/jitsi-meet-release-notes/blob/master/CHANGELOG-MOBILE-SDKS.md)
 
-# 2.2.0 (2022-03-04)
+# 2.2.1 (2022-03-11)
+
+- bug fix: onConferenceJoined and onConferenceLeft not firing
+- bug fix: iOS leaveConference() not working
+
+2.2.0 (2022-03-04)
 
 ## Breaking Changes
 

package/README.md

@@ -108,6 +108,7 @@ const result = await Jitsi.joinConference({
     recordingEnabled: false, // (experimental) enable recording feature
     screenSharingEnabled: false, // (experimental) enable screen sharing feature
 });
+console.log(result) // { success: true }
 
 window.addEventListener('onConferenceJoined', () => {
     // do things here
@@ -116,6 +117,8 @@ window.addEventListener('onConferenceLeft', () => {
     // do things here
 });
 
+const result = await Jitsi.leaveConference()
+console.log(result) // { success: true }
 ```
 
 3. Build the project

package/android/src/main/java/com/capacitor/jitsi/plugin/JitsiActivity.java

@@ -5,10 +5,9 @@ import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
-import android.os.Build;
-import android.os.Bundle;
+import android.net.Uri;
 
-import androidx.annotation.RequiresApi;
+import androidx.annotation.Nullable;
 import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 import timber.log.Timber;
 
@@ -20,8 +19,20 @@ public class JitsiActivity extends JitsiMeetActivity {
     private BroadcastReceiver broadcastReceiver;
     private static final String TAG = "CapacitorJitsiMeet";
     private static final String ACTION_JITSI_MEET_CONFERENCE = "org.jitsi.meet.CONFERENCE";
+    private static final String JITSI_MEET_CONFERENCE_OPTIONS = "JitsiMeetConferenceOptions";
     private static JitsiMeetConferenceOptions session_options;
 
+    @Override
+    protected void initialize() {
+        broadcastReceiver = new BroadcastReceiver() {
+            @Override
+            public void onReceive(Context context, Intent intent) {
+                onBroadcastReceived(intent);
+            }
+        };
+        registerForBroadcastMessages();
+        join(getConferenceOptions(getIntent()));
+    }
     // this overrides the launch class and runs the extended JitsiActivity class instead
     public static void launch(Context context, JitsiMeetConferenceOptions options) {
         session_options = options;
@@ -34,11 +45,20 @@ public class JitsiActivity extends JitsiMeetActivity {
         context.startActivity(intent);
     }
 
+    private void registerForBroadcastMessages() {
+        IntentFilter intentFilter = new IntentFilter();
+
+        for (BroadcastEvent.Type type : BroadcastEvent.Type.values()) {
+            intentFilter.addAction(type.getAction());
+        }
+
+        LocalBroadcastManager.getInstance(this).registerReceiver(broadcastReceiver, intentFilter);
+    }
+
     private void onBroadcastReceived(Intent intent) {
         JitsiMeetView view = getJitsiView();
         if (intent != null) {
             BroadcastEvent event = new BroadcastEvent(intent);
-
             switch (event.getType()) {
                 case CONFERENCE_JOINED:
                     on("onConferenceJoined");
@@ -90,5 +110,21 @@ public class JitsiActivity extends JitsiMeetActivity {
         Timber.tag(TAG).d("Is in picture-in-picture mode: " + isInPictureInPictureMode);
     }
 
+    private @Nullable
+    JitsiMeetConferenceOptions getConferenceOptions(Intent intent) {
+        String action = intent.getAction();
+
+        if (Intent.ACTION_VIEW.equals(action)) {
+            Uri uri = intent.getData();
+            if (uri != null) {
+                return new JitsiMeetConferenceOptions.Builder().setRoom(uri.toString()).build();
+            }
+        } else if (ACTION_JITSI_MEET_CONFERENCE.equals(action)) {
+            return intent.getParcelableExtra(JITSI_MEET_CONFERENCE_OPTIONS);
+        }
+
+        return null;
+    }
+
     private static final String ADD_PEOPLE_CONTROLLER_QUERY = null;
 }

package/dist/esm/definitions.d.ts

@@ -19,24 +19,9 @@ export interface JitsiPlugin {
         featureFlags?: any;
         configOverrides?: any;
     }): Promise<{
-        roomName: string;
-        url: string;
-        token?: string;
-        channelLastN?: string;
-        displayName?: string;
-        subject?: string;
-        email?: string;
-        avatarURL?: string;
-        startWithAudioMuted?: boolean;
-        startWithVideoMuted?: boolean;
-        chatEnabled?: boolean;
-        inviteEnabled?: boolean;
-        callIntegrationEnabled?: boolean;
-        recordingEnabled?: boolean;
-        liveStreamingEnabled?: boolean;
-        screenSharingEnabled?: boolean;
-        featureFlags?: any;
-        configOverrides?: any;
+        success?: boolean;
+    }>;
+    leaveConference(options?: {}): Promise<{
+        success?: boolean;
     }>;
-    leaveConference(options: {}): Promise<{}>;
 }

package/dist/esm/web.d.ts

@@ -21,26 +21,11 @@ export declare class JitsiWeb extends WebPlugin implements JitsiPlugin {
         featureFlags?: any;
         configOverrides?: any;
     }): Promise<{
-        roomName: string;
-        url: string;
-        token?: string;
-        channelLastN?: string;
-        displayName?: string;
-        subject?: string;
-        email?: string;
-        avatarURL?: string;
-        startWithAudioMuted?: boolean;
-        startWithVideoMuted?: boolean;
-        chatEnabled?: boolean;
-        inviteEnabled?: boolean;
-        callIntegrationEnabled?: boolean;
-        recordingEnabled?: boolean;
-        liveStreamingEnabled?: boolean;
-        screenSharingEnabled?: boolean;
-        featureFlags?: any;
-        configOverrides?: any;
+        success?: boolean;
+    }>;
+    leaveConference(options?: {}): Promise<{
+        success?: boolean;
     }>;
-    leaveConference(options: {}): Promise<{}>;
 }
 declare const Jitsi: JitsiWeb;
 export { Jitsi };

package/dist/esm/web.js.map

@@ -1 +1 @@
-{"version":3,"file":"web.js","sourceRoot":"","sources":["../../src/web.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAG5C,MAAM,OAAO,QAAS,SAAQ,SAAS;IAErC,aAAa;IACL,cAAc,CAAC,OAmBtB;;YAoBG,MAAM,IAAI,CAAC,WAAW,CAAC,kGAAkG,CAAC,CAAC;QAC/H,CAAC;KAAA;IAAA,CAAC;IACA,aAAa;IACT,eAAe,CAAC,OAAW;;YAC7B,MAAM,IAAI,CAAC,WAAW,CAAC,kGAAkG,CAAC,CAAC;QAC/H,CAAC;KAAA;IAAA,CAAC;CACH;AAED,MAAM,KAAK,GAAG,IAAI,QAAQ,EAAE,CAAC;AAE7B,OAAO,EAAE,KAAK,EAAE,CAAC"}
+{"version":3,"file":"web.js","sourceRoot":"","sources":["../../src/web.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAG5C,MAAM,OAAO,QAAS,SAAQ,SAAS;IAErC,aAAa;IACL,cAAc,CAAC,OAmBtB;;YAGG,MAAM,IAAI,CAAC,WAAW,CAAC,kGAAkG,CAAC,CAAC;QAC/H,CAAC;KAAA;IAAA,CAAC;IACA,aAAa;IACT,eAAe,CAAC,OAAY;;YAC9B,MAAM,IAAI,CAAC,WAAW,CAAC,kGAAkG,CAAC,CAAC;QAC/H,CAAC;KAAA;IAAA,CAAC;CACH;AAED,MAAM,KAAK,GAAG,IAAI,QAAQ,EAAE,CAAC;AAE7B,OAAO,EAAE,KAAK,EAAE,CAAC"}

package/ios/Plugin/Plugin/JitsiMeetViewController.swift

@@ -63,6 +63,13 @@ public class JitsiMeetViewController: UIViewController, UIGestureRecognizerDeleg
         jitsiMeetView?.removeFromSuperview()
         jitsiMeetView = nil
     }
+
+    public func leave() {
+        print("[Jitsi Plugin Native iOS]: JitsiMeetViewController::leave");
+        let jitsiMeetView = JitsiMeetView()
+        self.jitsiMeetView = jitsiMeetView
+        jitsiMeetView.hangUp()
+    }
 }
 
 protocol JitsiMeetViewControllerDelegate: AnyObject {

package/ios/Plugin/Plugin/Plugin.swift

@@ -108,17 +108,26 @@ public class Jitsi: CAPPlugin {
         self.jitsiMeetViewController?.delegate = self;
 
         DispatchQueue.main.async {
-            self.bridge?.viewController?.present(self.jitsiMeetViewController!, animated: true, completion: nil);
+            self.bridge?.viewController?.present(self.jitsiMeetViewController!, animated: true, completion: { call.resolve(["success": true ]) });
+        }
+    }
+
+    @objc func leaveConference(_ call: CAPPluginCall) {
+        DispatchQueue.main.async {
+            self.jitsiMeetViewController?.leave();
+            call.resolve([
+                "success": true
+            ])
         }
     }
 }
 
 extension Jitsi: JitsiMeetViewControllerDelegate {
     @objc func onConferenceJoined() {
-        self.bridge?.triggerWindowJSEvent(eventName: "onConferenceJoined");
+        self.bridge?.triggerJSEvent(eventName: "onConferenceJoined", target: "window");
     }
 
     @objc func onConferenceLeft() {
-        self.bridge?.triggerWindowJSEvent(eventName: "onConferenceLeft");
+        self.bridge?.triggerJSEvent(eventName: "onConferenceLeft", target: "window");
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "capacitor-jitsi-meet",
-  "version": "2.2.0",
+  "version": "2.2.1-beta.0",
   "description": "This Ionic Capacitor plugin is created to make video calls through the free, open-sourced Jitsi video platform (https://meet.jit.si) on iOS and Android.",
   "main": "dist/esm/index.js",
   "module": "dist/esm/index.js",