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

package/CHANGELOG.md

@@ -4,7 +4,19 @@ 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.1.2 (2022-02-08)
+# 2.2.0 (2022-02-25)
+
+- adds the subject, featureFlags, and configOverrides params
+
+# 2.1.3 (2022-02-09)
+
+## Breaking Changes
+- adds the following optional parameters with their default values. Those defaulted to false must be manually set to true in order to enable them.
+  - recordEnabled (default: false)
+  - liveStreamingEnabled (default: auto-detected)
+  - screenSharingEnabled (android only, default: false)
+
+- fixes liveStreamingEnabled bug in 2.1.2
 
 ## iOS
 

package/CapacitorJitsiMeet.podspec

@@ -1,7 +1,7 @@
 
   Pod::Spec.new do |s|
     s.name = 'CapacitorJitsiMeet'
-    s.version = '2.1.0'
+    s.version = '2.2.0'
     s.summary = 'This plugin is used to make video calls using Jitsi video platform (https://meet.jit.si) on iOS and Android using Capacitor. Since the current implementation of Ionic/PWA apps on iOS run on top of WKWebView, and as of today (24/01/2019), Apple does not support WebRTC on WKWebView, the only way to work with Jitsi Video on this platform is to build it natively.'
     s.license = 'MIT'
     s.homepage = 'https://github.com/calvinckho/capacitor-jitsi-meet'
@@ -15,5 +15,5 @@
     }
     s.ios.deployment_target  = '12.0'
     s.dependency 'Capacitor'
-    s.dependency 'JitsiMeetSDK', '4.0.0'
+    s.dependency 'JitsiMeetSDK', '4.1.0'
   end

package/README.md

@@ -56,7 +56,7 @@ Follow the [official Capacitor doc to upgrade to Capacitor 3](https://capacitorj
 See the plugin [changelog](https://github.com/calvinckho/capacitor-jitsi-meet/blob/master/CHANGELOG.md) for plugin versions that are compatible to your local Xcode version.
 
 ## Embedding in web applications
-   
+
 This plugin does not currently support web implementation. We recommend using the Jitsi iFrame API (https://jitsi.github.io/handbook/docs/dev-guide/dev-guide-iframe) for full web implementation.
 
 ## Usage
@@ -81,8 +81,9 @@ const result = await Jitsi.joinConference({
     // required parameters
     roomName: 'room1', // room identifier for the conference
     url: 'https://meet.jit.si', // endpoint of the Jitsi Meet video bridge
+    
     // optional parameters
-    token: string, // jwt authentication token
+    subject: string, // name of the video room
     displayName: string, // user's display name
     email: string, // user's email
     avatarURL: string, // user's avatar url
@@ -90,10 +91,17 @@ const result = await Jitsi.joinConference({
     startWithVideoMuted: false, // start with video muted, default: false
     chatEnabled: false, // enable Chat feature, default: true
     inviteEnabled: false, // enable Invitation feature, default: true
+    
+    // advanced settings, optional
+    token: string, // jwt authentication token
+    featureFlags: { 'call-integration.enabled': true, 'live-streaming.enabled': false }, // see list of featureFlags in the official Jitsi Meet SDK documentation
+    configOverrides: { 'p2p.enabled': false }, // see list of config overrides in the official Jitsi Meet SDK documentation
+
+   // advanced settings to be deprecated in 3.0. Use featureFlags and configOverrides instead
     callIntegrationEnabled: true, // enable call integration (CallKit on iOS, ConnectionService on Android), default: true
-    recordingEnabled: false, // enable recording feature, default: false
-    liveStreamingEnabled: false, // enable live streaming feature, default: false
-    screenSharingEnabled: false, // enable screen sharing feature, default: false
+    liveStreamingEnabled: false, // enable live streaming feature, default: auto-detected
+    recordingEnabled: false, // (experimental) enable recording feature, default: false, requires adding Dropbox APP_KEY to Info.plist and AndroidManifest.xml
+    screenSharingEnabled: false, // enable screen sharing feature, default: false, iOS requires manually adding the Broadcast Upload Extension
 });
 
 window.addEventListener('onConferenceJoined', () => {
@@ -103,8 +111,6 @@ window.addEventListener('onConferenceLeft', () => {
     // do things here
 });
 
-await Jitsi.leaveConference();
-
 ```
 
 3. Build the project
@@ -115,6 +121,10 @@ $ npm run build
 
 4. Follow the deployment instructions for [Android](android/README.md) and [iOS](ios/README.md).
 
+## Official Jitsi-Meet SDK Documentation
+
+This plugin uses the Jitsi Meet SDK. See the [Jitsi Meet SDK documentation](https://jitsi.github.io/handbook/docs/dev-guide/dev-guide-mobile), and the lists of [feature flags](https://jitsi.github.io/handbook/docs/dev-guide/mobile-feature-flags) and [config overrides](https://github.com/jitsi/jitsi-meet/blob/e2731ce73e9221408d0f4d985affc91eb11fc214/config.js).
+
 ## Sample React App for Android
 
 You can see a [React Demo App](https://github.com/calvinckho/react-capacitor-jitsi-meet-sample) which runs the Jitsi meeting on the Android device
@@ -125,4 +135,4 @@ I appreciate those who use this plugin in their production apps and are funding
 
 ## Acknowledgements
 
-This plugin uses the [Jitsi Meet SDK](https://jitsi.github.io/handbook/docs/dev-guide/dev-guide-mobile). It was originally developed by then ESTOS' developer Philipp Hancke who then contributed it to the community where development continues with joint forces!
+This plugin enables web and mobile apps to implement video conferencing feature for free. The Jitsi Meet mobile SDKs are actively maintained by Jitsi. Video bridges for multi-user video conferencing is powered by [Jitsi Meet](https://meet.jit.si), or you can run [your own video bridge](https://jitsi.github.io/handbook/docs/devops-guide/devops-guide-start).

package/android/README.md

@@ -95,6 +95,14 @@ ionic capacitor open android
    
    f. run `npx cap sync && npx cap open android` 
 
+### Dropbox Integration
+
+See [Jitsi Meet Handbook](https://jitsi.github.io/handbook/docs/dev-guide/dev-guide-android-sdk#dropbox-integration).
+
+### Screen Sharing Integration
+
+Some users experienced issues on Android. Report your issues [here](https://github.com/calvinckho/capacitor-jitsi-meet/issues/35).
+
 ### Android SDK Developer Guide
 
 Consult the official Jitsi Android SDK [documentation](https://jitsi.github.io/handbook/docs/dev-guide/dev-guide-android-sdk).

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

@@ -1,5 +1,9 @@
 package com.capacitor.jitsi.plugin;
 
+import java.net.URL;
+import java.net.MalformedURLException;
+import java.util.*;
+
 import com.getcapacitor.JSObject;
 import com.getcapacitor.Plugin;
 import com.getcapacitor.PluginCall;
@@ -10,12 +14,15 @@ import com.getcapacitor.annotation.Permission;
 import android.content.IntentFilter;
 import android.content.Intent;
 import android.Manifest;
-import androidx.localbroadcastmanager.content.LocalBroadcastManager;
-
-import org.jitsi.meet.sdk.BroadcastIntentHelper;
+import android.os.Build;
 
+import androidx.annotation.RequiresApi;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 import timber.log.Timber;
 
+import org.jitsi.meet.sdk.*;
+import org.json.JSONException;
+
 @CapacitorPlugin(
     name= "Jitsi",
     permissions={
@@ -26,24 +33,28 @@ import timber.log.Timber;
 public class Jitsi extends Plugin {
     private static final String TAG = "CapacitorJitsiMeet";
     private JitsiBroadcastReceiver receiver;
+    private JitsiMeetUserInfo userInfo;
 
+    @RequiresApi(api = Build.VERSION_CODES.N)
     @PluginMethod()
-    public void joinConference(PluginCall call) {
-        String url = call.getString("url");
+    public void joinConference(PluginCall call) throws JSONException {
+        URL url = null;
+        try {
+            url = new URL(call.getString("url"));
+        } catch (MalformedURLException e) {
+            call.reject("Must provide an url");
+            e.printStackTrace();
+        }
         String roomName = call.getString("roomName");
         String token = call.getString("token");
         String displayName = call.getString("displayName");
+        String subject = call.getString("subject", " ");
         String email = call.getString("email");
         String avatarURL = call.getString("avatarURL");
         Boolean startWithAudioMuted = call.getBoolean("startWithAudioMuted");
         Boolean startWithVideoMuted = call.getBoolean("startWithVideoMuted");
-        Boolean chatEnabled = call.getBoolean("chatEnabled");
-        Boolean inviteEnabled = call.getBoolean("inviteEnabled");
-        Boolean callIntegrationEnabled = call.getBoolean("callIntegrationEnabled");
-        Boolean recordingEnabled = call.getBoolean("recordingEnabled");
-        Boolean liveStreamingEnabled = call.getBoolean("liveStreamingEnabled");
-        Boolean screenSharingEnabled = call.getBoolean("screenSharingEnabled");
-
+        JSObject featureFlags = call.getObject("featureFlags", new JSObject());
+        JSObject configOverrides = call.getObject("configOverrides", new JSObject());
         receiver = new JitsiBroadcastReceiver();
         receiver.setModule(this);
         IntentFilter filter = new IntentFilter();
@@ -52,56 +63,104 @@ public class Jitsi extends Plugin {
         filter.addAction("onConferenceLeft"); // intentionally uses the obsolete onConferenceLeft in order to be consistent with iOS deployment and broadcast to JS listeners
         getContext().registerReceiver(receiver, filter);
 
-        if(url == null) {
-            call.reject("Must provide an url");
-            return;
-        }
         if(roomName == null) {
             call.reject("Must provide an conference room name");
             return;
         }
-        if(startWithAudioMuted == null) {
-            startWithAudioMuted = false;
+
+        // assign user info
+        userInfo = new JitsiMeetUserInfo();
+        if (displayName != null) {
+            userInfo.setDisplayName(displayName);
+        }
+        if (email != null) {
+            userInfo.setEmail(email);
+        }
+        if (avatarURL != null) {
+            // try to assign avatar URL
+            try {
+                userInfo.setAvatar(new URL(avatarURL));
+            } catch (MalformedURLException e) {
+                e.printStackTrace();
+            }
+        }
+        //Timber.tag(TAG).d("display url: " + call.getString("url"));
+
+        JitsiMeetConferenceOptions.Builder builder = new JitsiMeetConferenceOptions.Builder()
+                .setServerURL(url)
+                .setRoom(roomName)
+                .setToken(token)
+                .setSubject(subject)
+                .setUserInfo(userInfo);
+        if(startWithAudioMuted != null){
+            builder.setAudioMuted(startWithAudioMuted);
+        }
+        if(startWithVideoMuted != null){
+            builder.setVideoMuted(startWithVideoMuted);
         }
-        if(startWithVideoMuted == null) {
-            startWithVideoMuted = false;
+
+        // default PiP is off, but allowing user to overrides it by providing the featureFlag below
+        builder.setFeatureFlag("pip.enabled", false);
+
+        // general settings can be overridden by subsequent featureFlags settings
+        if(call.getBoolean("chatEnabled") != null){
+            builder.setFeatureFlag("chat.enabled", call.getBoolean("chatEnabled"));
         }
-        if(chatEnabled == null) {
-            chatEnabled = true;
+        if(call.getBoolean("inviteEnabled") != null){
+            builder.setFeatureFlag("invite.enabled", call.getBoolean("inviteEnabled"));
         }
-        if(inviteEnabled == null) {
-            chatEnabled = true;
+        if(call.getBoolean("callIntegrationEnabled") != null){
+            builder.setFeatureFlag("call-integration.enabled", call.getBoolean("callIntegrationEnabled"));
         }
-        if(callIntegrationEnabled == null) {
-            callIntegrationEnabled = true;
+        if(call.getBoolean("recordingEnabled") != null){
+            builder.setFeatureFlag("recording.enabled", call.getBoolean("recordingEnabled"));
         }
-        if(recordingEnabled == null){
-            recordingEnabled = false;
+        if(call.getBoolean("liveStreamingEnabled") != null){
+            builder.setFeatureFlag("live-streaming.enabled", call.getBoolean("liveStreamingEnabled"));
         }
-        if(screenSharingEnabled == null){
-            screenSharingEnabled = false;
+        if(call.getBoolean("screenSharingEnabled") != null){
+            builder.setFeatureFlag("android.screensharing.enabled", call.getBoolean("screenSharingEnabled"));
         }
-        Timber.tag(TAG).v("display url: %s", url);
 
-        Intent intent = new Intent(getActivity(), JitsiActivity.class);
-        intent.putExtra("url", url);
-        intent.putExtra("token", token);
-        intent.putExtra("roomName", roomName);
-        intent.putExtra("displayName", displayName);
-        intent.putExtra("email", email);
-        intent.putExtra("avatarURL", avatarURL);
-        intent.putExtra("startWithAudioMuted", startWithAudioMuted);
-        intent.putExtra("startWithVideoMuted", startWithVideoMuted);
-        intent.putExtra("chatEnabled", chatEnabled);
-        intent.putExtra("inviteEnabled", inviteEnabled);
-        intent.putExtra("callIntegrationEnabled", callIntegrationEnabled);
-        intent.putExtra("recordingEnabled", recordingEnabled);
-        if(liveStreamingEnabled != null){
-            intent.putExtra("liveStreamingEnabled", Boolean.parseBoolean(liveStreamingEnabled));
+        // setfeatureFlag() provides finer control, and will override some of the setFeatureFlag methods above
+        Iterator<String> keys = featureFlags.keys();
+        while(keys.hasNext()) {
+            String key = keys.next();
+            // Can only be bool, int or string according to
+            // the overloads of setFeatureFlag.
+
+            if (featureFlags.get(key) != null) {
+                if (featureFlags.get(key) instanceof Boolean) {
+                    builder.setFeatureFlag(key, (Boolean) featureFlags.get(key));
+                } else if (featureFlags.get(key) instanceof Integer) {
+                    builder.setFeatureFlag(key, (Integer) featureFlags.get(key));
+                } else if (featureFlags.get(key) instanceof String) {
+                    builder.setFeatureFlag(key, (String) featureFlags.get(key));
+                } else {
+                    builder.setFeatureFlag(key, featureFlags.get(key).toString());
+                }
+            }
         }
-        intent.putExtra("screenSharingEnabled", screenSharingEnabled);
 
-        getActivity().startActivity(intent);
+        keys = configOverrides.keys();
+        while(keys.hasNext()) {
+            String key = keys.next();
+            // Can only be bool, int or string according to
+            // the overloads of setFeatureFlag.
+            if (configOverrides.get(key) != null) {
+                if (configOverrides.get(key) instanceof Boolean) {
+                    builder.setConfigOverride(key, (Boolean) configOverrides.get(key));
+                } else if (configOverrides.get(key) instanceof Integer) {
+                    builder.setConfigOverride(key, (Integer) configOverrides.get(key));
+                } else if (configOverrides.get(key) instanceof String[]) {
+                    builder.setConfigOverride(key, (String[]) configOverrides.get(key));
+                } else {
+                    builder.setConfigOverride(key, configOverrides.get(key).toString());
+                }
+            }
+        }
+        JitsiMeetConferenceOptions options = builder.build();
+        JitsiActivity.launch(getActivity(), options);
 
         JSObject ret = new JSObject();
         ret.put("success", true);
@@ -120,6 +179,7 @@ public class Jitsi extends Plugin {
 
     public void onEventReceived(String eventName) {
         bridge.triggerWindowJSEvent(eventName);
+        Timber.tag(TAG).d(eventName);
         if(eventName.equals("onConferenceLeft")) {
             if (receiver != null) {
                 getContext().unregisterReceiver(receiver);

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

@@ -1,122 +1,41 @@
 package com.capacitor.jitsi.plugin;
 
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.Map;
-
+import android.app.Activity;
 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 androidx.annotation.RequiresApi;
 import androidx.localbroadcastmanager.content.LocalBroadcastManager;
+import timber.log.Timber;
 
 import com.facebook.react.bridge.UiThreadUtil;
 
-import org.jitsi.meet.sdk.JitsiMeetView;
-import org.jitsi.meet.sdk.JitsiMeetActivity;
-import org.jitsi.meet.sdk.JitsiMeetViewListener;
-import org.jitsi.meet.sdk.JitsiMeetConferenceOptions;
-import org.jitsi.meet.sdk.JitsiMeetUserInfo;
-import org.jitsi.meet.sdk.BroadcastEvent;
-
-import timber.log.Timber;
+import org.jitsi.meet.sdk.*;
 
 public class JitsiActivity extends JitsiMeetActivity {
-    private JitsiMeetView view;
-    private JitsiMeetUserInfo userInfo;
     private BroadcastReceiver broadcastReceiver;
-
-    @Override
-    protected void initialize() {
-        broadcastReceiver = new BroadcastReceiver() {
-            @Override
-            public void onReceive(Context context, Intent intent) {
-                onBroadcastReceived(intent);
-            }
-        };
-        registerForBroadcastMessages();
-    }
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        view = new JitsiMeetView(this);
-        Timber.d("entering");
-
-        URL serverURL;
-        try {
-            serverURL = new URL(getIntent().getStringExtra("url"));
-        } catch (MalformedURLException e) {
-            e.printStackTrace();
-            throw new RuntimeException("Invalid server URL!");
-        }
-
-        String roomName = getIntent().getStringExtra("roomName");
-        String token = getIntent().getStringExtra("token");
-        Boolean startWithAudioMuted = getIntent().getBooleanExtra("startWithAudioMuted", false);
-        Boolean startWithVideoMuted = getIntent().getBooleanExtra("startWithVideoMuted", false);
-        Boolean chatEnabled = getIntent().getBooleanExtra("chatEnabled", false);
-        Boolean inviteEnabled = getIntent().getBooleanExtra("inviteEnabled", false);
-        Boolean callIntegrationEnabled = getIntent().getBooleanExtra("callIntegrationEnabled", false);
-        Boolean recordingEnabled = getIntent().getBooleanExtra("recordingEnabled", false);
-        Boolean liveStreamingEnabled = getIntent().getBooleanExtra("liveStreamingEnabled", false);
-        Boolean screenSharingEnabled = getIntent().getBooleanExtra("screenSharingEnabled", false);
-
-        String displayName = getIntent().getStringExtra("displayName");
-        String email = getIntent().getStringExtra("email");
-        String avatarURL = getIntent().getStringExtra("avatarURL");
-
-        // assign user info
-        userInfo = new JitsiMeetUserInfo();
-        if (displayName != null) {
-            userInfo.setDisplayName(displayName);
+    private static final String TAG = "CapacitorJitsiMeet";
+    private static final String ACTION_JITSI_MEET_CONFERENCE = "org.jitsi.meet.CONFERENCE";
+    private static JitsiMeetConferenceOptions session_options;
+
+    // this overrides the launch class and runs the extended JitsiActivity class instead
+    public static void launch(Context context, JitsiMeetConferenceOptions options) {
+        session_options = options;
+        Intent intent = new Intent(context, JitsiActivity.class);
+        intent.setAction(ACTION_JITSI_MEET_CONFERENCE);
+        intent.putExtra("JitsiMeetConferenceOptions", options);
+        if (!(context instanceof Activity)) {
+            intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
         }
-        if (email != null) {
-            userInfo.setEmail(email);
-        }
-        if (avatarURL != null) {
-            // try to assign avatar URL
-            try {
-                userInfo.setAvatar(new URL(getIntent().getStringExtra("avatarURL")));
-            } catch (MalformedURLException e) {
-                e.printStackTrace();
-            }
-        }
-
-        JitsiMeetConferenceOptions options = new JitsiMeetConferenceOptions.Builder()
-                .setServerURL(serverURL)
-                .setRoom(roomName)
-                .setToken(token)
-                .setSubject(" ")
-                .setAudioMuted(startWithAudioMuted)
-                .setVideoMuted(startWithVideoMuted)
-                .setFeatureFlag("chat.enabled", chatEnabled)
-                .setFeatureFlag("invite.enabled", inviteEnabled)
-                .setFeatureFlag("call-integration.enabled", callIntegrationEnabled)
-                .setFeatureFlag("recording.enabled", recordingEnabled)
-                .setFeatureFlag("live-streaming.enabled", liveStreamingEnabled)
-                .setFeatureFlag("android.screensharing.enabled", screenSharingEnabled)
-                //.setAudioOnly(false)
-                .setUserInfo(userInfo)
-                .build();
-        view.join(options);
-        setContentView(view);
-    }
-
-    private void registerForBroadcastMessages() {
-        IntentFilter intentFilter = new IntentFilter();
-
-        for (BroadcastEvent.Type type : BroadcastEvent.Type.values()) {
-            intentFilter.addAction(type.getAction());
-        }
-
-        LocalBroadcastManager.getInstance(this).registerReceiver(broadcastReceiver, intentFilter);
+        context.startActivity(intent);
     }
 
     private void onBroadcastReceived(Intent intent) {
+        JitsiMeetView view = getJitsiView();
         if (intent != null) {
             BroadcastEvent event = new BroadcastEvent(intent);
 
@@ -128,8 +47,6 @@ public class JitsiActivity extends JitsiMeetActivity {
                     on("onConferenceWillJoin");
                     break;
                 case READY_TO_CLOSE:
-                    view.dispose();
-                    view = null;
                     finish();
                     on("onConferenceLeft"); // intentionally uses the obsolete onConferenceLeft in order to be consistent with iOS deployment and broadcast to JS listeners
                     break;
@@ -145,45 +62,32 @@ public class JitsiActivity extends JitsiMeetActivity {
 
     private void on(String name) {
         UiThreadUtil.assertOnUiThread();
-        Timber.d(JitsiMeetView.class.getSimpleName() + ": " + name);
+        Timber.tag(TAG).d(JitsiMeetView.class.getSimpleName() + ": " + name);
 
         Intent intent = new Intent(name);
         intent.putExtra("eventName", name);
         sendBroadcast(intent);
     }
 
-    @Override
-    public void onDestroy() {
-        if (broadcastReceiver != null) {
-            LocalBroadcastManager.getInstance(this).unregisterReceiver(broadcastReceiver);
-            broadcastReceiver = null;
-        }
-        super.onDestroy();
-    }
-
     // The following handler is triggered when the app transitions from the background to the foreground.
-    // For PIP users, uncomment the code to try PIP mode. Also change android:supportsPictureInPicture="true" in AndroidManifest.xml
     // When PIP is enabled, it can detect when the PIP window is closed by caller so it can terminate the call correctly.
-    // TODO: Some users who enabled PIP report that it doesn't always terminate the call correctly.
-    //  Therefore the PIP mode is disabled in the published plugin until this issue is resolved
-    /*@Override
+    @Override
     public void onStop() {
-        Timber.d("Picture-in-picture is stopped. Disposing view and finishing activity.");
-        if (view != null) {
-            view.dispose();
-            view = null;
+        JitsiMeetView view = getJitsiView();
+        Timber.tag(TAG).d("onStop %s", session_options.getFeatureFlags().getBoolean("pip.enabled"));
+        if (session_options.getFeatureFlags().getBoolean("pip.enabled")) { //TODO: also check the CapacitorJitsiMeet's AndroidManifest.xml file and ensure android:supportsPictureInPicture="true"
             finish();
+            on("onConferenceLeft"); // intentionally uses the obsolete onConferenceLeft in order to be consistent with iOS deployment and broadcast to JS listeners
         }
-        on("onConferenceLeft"); // intentionally uses the obsolete onConferenceLeft in order to be consistent with iOS deployment and broadcast to JS listeners
         super.onStop();
-    }*/
+    }
 
     // for logging entering and leaving PIP only
     @Override
     public void onPictureInPictureModeChanged(boolean isInPictureInPictureMode) {
         super.onPictureInPictureModeChanged(isInPictureInPictureMode);
 
-        Timber.d("Is in picture-in-picture mode: " + isInPictureInPictureMode);
+        Timber.tag(TAG).d("Is in picture-in-picture mode: " + isInPictureInPictureMode);
     }
 
     private static final String ADD_PEOPLE_CONTROLLER_QUERY = null;

package/dist/esm/definitions.d.ts

@@ -5,6 +5,7 @@ export interface JitsiPlugin {
         token?: string;
         channelLastN?: string;
         displayName?: string;
+        subject?: string;
         email?: string;
         avatarURL?: string;
         startWithAudioMuted?: boolean;
@@ -15,12 +16,15 @@ export interface JitsiPlugin {
         recordingEnabled?: boolean;
         liveStreamingEnabled?: boolean;
         screenSharingEnabled?: boolean;
+        featureFlags?: any;
+        configOverrides?: any;
     }): Promise<{
         roomName: string;
         url: string;
         token?: string;
         channelLastN?: string;
         displayName?: string;
+        subject?: string;
         email?: string;
         avatarURL?: string;
         startWithAudioMuted?: boolean;
@@ -31,6 +35,8 @@ export interface JitsiPlugin {
         recordingEnabled?: boolean;
         liveStreamingEnabled?: boolean;
         screenSharingEnabled?: boolean;
+        featureFlags?: any;
+        configOverrides?: any;
     }>;
     leaveConference(options: {}): Promise<{}>;
 }

package/dist/esm/web.d.ts

@@ -7,6 +7,7 @@ export declare class JitsiWeb extends WebPlugin implements JitsiPlugin {
         token?: string;
         channelLastN?: string;
         displayName?: string;
+        subject?: string;
         email?: string;
         avatarURL?: string;
         startWithAudioMuted?: boolean;
@@ -17,12 +18,15 @@ export declare class JitsiWeb extends WebPlugin implements JitsiPlugin {
         recordingEnabled?: boolean;
         liveStreamingEnabled?: boolean;
         screenSharingEnabled?: boolean;
+        featureFlags?: Map<string, any>;
+        configOverrides?: Map<string, any>;
     }): Promise<{
         roomName: string;
         url: string;
         token?: string;
         channelLastN?: string;
         displayName?: string;
+        subject?: string;
         email?: string;
         avatarURL?: string;
         startWithAudioMuted?: boolean;
@@ -33,6 +37,8 @@ export declare class JitsiWeb extends WebPlugin implements JitsiPlugin {
         recordingEnabled?: boolean;
         liveStreamingEnabled?: boolean;
         screenSharingEnabled?: boolean;
+        featureFlags?: Map<string, any>;
+        configOverrides?: Map<string, any>;
     }>;
     leaveConference(options: {}): Promise<{}>;
 }

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,OAgBtB;;YAiBG,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;;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"}

package/ios/Plugin/Plugin/JitsiMeet.storyboard

@@ -1,24 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
-    <device id="retina4_7" orientation="portrait" appearance="light"/>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="19162" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina5_9" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19144"/>
+        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
         <!--Jitsi Meet View Controller-->
         <scene sceneID="tne-QT-ifu">
             <objects>
-                <viewController storyboardIdentifier="jitsiMeetStoryBoardID" modalPresentationStyle="fullScreen" useStoryboardIdentifierAsRestorationIdentifier="YES" id="BYZ-38-t0r" customClass="JitsiMeetViewController" customModule="CapacitorJitsiMeet" sceneMemberID="viewController">
-                    <layoutGuides>
-                        <viewControllerLayoutGuide type="top" id="drl-1K-Grw"/>
-                        <viewControllerLayoutGuide type="bottom" id="qI8-KV-6mq"/>
-                    </layoutGuides>
-                    <view key="view" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" id="8bC-Xf-vdC" customClass="JitsiMeetView">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                <viewController storyboardIdentifier="jitsiMeetStoryBoardID" modalTransitionStyle="crossDissolve" modalPresentationStyle="overFullScreen" useStoryboardIdentifierAsRestorationIdentifier="YES" id="BYZ-38-t0r" customClass="JitsiMeetViewController" customModule="CapacitorJitsiMeet" sceneMemberID="viewController">
+                    <view key="view" contentMode="scaleToFill" id="8bC-Xf-vdC">
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="812"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <viewLayoutGuide key="safeArea" id="6Tk-OE-BBY"/>
+                        <color key="backgroundColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                        <gestureRecognizers/>
                     </view>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/>

package/ios/Plugin/Plugin/JitsiMeetViewController.swift

@@ -8,81 +8,60 @@
 import Foundation
 import UIKit
 import JitsiMeetSDK
+import WebKit
 
-public class JitsiMeetViewController: UIViewController {
-
-    var jitsiMeetView: JitsiMeetView!
-    var url: String = ""
-    var roomName: String = ""
-    var token: String? = nil
-    var startWithAudioMuted: Bool = false
-    var startWithVideoMuted: Bool = false
-    var chatEnabled: Bool = true
-    var inviteEnabled: Bool = true
-    var callIntegrationEnabled: Bool = true
-    var screenSharingEnabled: Bool = false
-    var recordingEnabled: Bool = false
-    var liveStreamingEnabled: Bool = false
-    var email: String? = nil
-    var displayName: String? = nil
-    var avatarUrl: String? = nil
-    let userLocale = NSLocale.current as NSLocale
+public class JitsiMeetViewController: UIViewController, UIGestureRecognizerDelegate {
+
+    fileprivate var jitsiMeetView: UIView?
+    var options: JitsiMeetConferenceOptions? = nil
     weak var delegate: JitsiMeetViewControllerDelegate?
+    fileprivate var pipViewCoordinator: PiPViewCoordinator?
+
+    var webView: WKWebView? = nil;
 
     public override func viewDidLoad() {
         super.viewDidLoad()
         print("[Jitsi Plugin Native iOS]: JitsiMeetViewController::viewDidLoad");
+        openJitsiMeet();
     }
 
-    public override func viewDidAppear(_ animated: Bool) {
-        super.viewDidAppear(animated);
-
-        print("[Jitsi Plugin Native iOS]: JitsiMeetViewController::viewDidAppear");
-
-        jitsiMeetView = view as? JitsiMeetView;
-        jitsiMeetView?.delegate = self
-
-        if  userLocale.countryCode?.contains("CN") ?? false ||
-            userLocale.countryCode?.contains("CHN") ?? false ||
-            userLocale.countryCode?.contains("MO") ?? false ||
-            userLocale.countryCode?.contains("HK") ?? false {
-            print("currentLocale is China so we cannot use CallKit.")
-            callIntegrationEnabled = false
-        }
-
-        let userInfo = JitsiMeetUserInfo()
-        userInfo.displayName = self.displayName
-        userInfo.email = self.email
-        userInfo.avatar = URL(string: self.avatarUrl ?? "")
-
-        let options = JitsiMeetConferenceOptions.fromBuilder({ builder in
-            builder.serverURL = URL(string: self.url)
-            builder.room = self.roomName
-            builder.token = self.token
-            builder.setAudioMuted(self.startWithAudioMuted);
-            builder.setVideoMuted(self.startWithVideoMuted);
-            builder.setFeatureFlag("meeting-name.enabled", withBoolean: false)
-            builder.setFeatureFlag("chat.enabled", withBoolean: self.chatEnabled)
-            builder.setFeatureFlag("invite.enabled", withBoolean: self.inviteEnabled)
-            builder.setFeatureFlag("call-integration.enabled", withBoolean: self.callIntegrationEnabled)
-            builder.setFeatureFlag("ios.screensharing.enabled", withBoolean: self.screenSharingEnabled)
-            builder.setFeatureFlag("ios.recording.enabled", withBoolean: self.recordingEnabled)
-            builder.setFeatureFlag("live-streaming.enabled", withBoolean: self.liveStreamingEnabled)
-
-            builder.userInfo = userInfo
-        })
-        jitsiMeetView.join(options)
+    public override func viewWillTransition(to size: CGSize, with coordinator: UIViewControllerTransitionCoordinator) {
+        super.viewWillTransition(to: size, with: coordinator)
+        print("[Jitsi Plugin Native iOS]: JitsiMeetViewController::viewWillTransition");
     }
 
-    public override func viewWillDisappear(_ animated: Bool) {
-        super.viewWillDisappear(animated)
+    func openJitsiMeet() {
+        cleanUp()
 
-        print("[Jitsi Plugin Native iOS]: JitsiMeetViewController::leaveConference");
+        print("[Jitsi Plugin Native iOS]: JitsiMeetViewController::openJitsiMeet");
 
-        jitsiMeetView = view as? JitsiMeetView;
-        jitsiMeetView?.delegate = self
-        jitsiMeetView.leave()
+        // create and configure the absorbPointerView and jitsimeet view
+        let jitsiMeetView = JitsiMeetView()
+        jitsiMeetView.delegate = self
+        self.jitsiMeetView = jitsiMeetView
+        jitsiMeetView.join(options)
+
+        // Enable jitsimeet view to be a view that can be displayed
+        // on top of all the things, and let the coordinator to manage
+        // the view state and interactions
+        pipViewCoordinator = PiPViewCoordinator(withView: jitsiMeetView)
+        pipViewCoordinator?.configureAsStickyView(withParentView: view)
 
+        // animate in
+        jitsiMeetView.alpha = 1
+        pipViewCoordinator?.show()
+    }
+
+    public override func viewDidDisappear(_ animated: Bool) {
+        super.viewDidDisappear(animated)
+        print("[Jitsi Plugin Native iOS]: JitsiMeetViewController::viewDidDisappear");
+        cleanUp();
+    }
+
+    fileprivate func cleanUp() {
+        print("[Jitsi Plugin Native iOS]: JitsiMeetViewController::cleanUp");
+        jitsiMeetView?.removeFromSuperview()
+        jitsiMeetView = nil
     }
 }
 
@@ -94,14 +73,17 @@ protocol JitsiMeetViewControllerDelegate: AnyObject {
 
 // MARK: JitsiMeetViewDelegate
 extension JitsiMeetViewController: JitsiMeetViewDelegate {
+
     @objc public func conferenceJoined(_ data: [AnyHashable : Any]!) {
         delegate?.onConferenceJoined()
-        print("[Jitsi Plugin Native iOS]: JitsiMeetViewController::conference joined. Room name is \(self.roomName)");
+        print("[Jitsi Plugin Native iOS]: JitsiMeetViewController::conference joined.");
     }
 
     @objc public func ready(toClose: [AnyHashable : Any]!) {
         print("[Jitsi Plugin Native iOS]: JitsiMeetViewController::ready to close");
         delegate?.onConferenceLeft()
+        self.cleanUp()
+
         self.dismiss(animated: true, completion: nil); // e.g. user ends the call. This is preferred over conferenceLeft to shorten the white screen while exiting the room
     }
 }

package/ios/Plugin/Plugin/Plugin.swift

@@ -1,6 +1,7 @@
 import Foundation
 import Capacitor
-
+import JitsiMeetSDK
+import UIKit
 /**
  * Please read the Capacitor iOS Plugin Development Guide
  * here: https://capacitor.ionicframework.com/docs/plugins/ios
@@ -8,17 +9,9 @@ import Capacitor
 @objc(Jitsi)
 public class Jitsi: CAPPlugin {
 
-    var jitsiMeetViewController: JitsiMeetViewController!
+    var jitsiMeetViewController: JitsiMeetViewController?
 
     @objc func joinConference(_ call: CAPPluginCall) {
-        guard let url = call.options["url"] as? String else {
-                call.reject("Must provide an url")
-                return
-            }
-        guard let roomName = call.options["roomName"] as? String else {
-            call.reject("Must provide a roomName")
-            return
-        }
 
         let podBundle = Bundle(for: JitsiMeetViewController.self)
         let bundleURL = podBundle.url(forResource: "Plugin", withExtension: "bundle")
@@ -26,40 +19,96 @@ public class Jitsi: CAPPlugin {
 
         let storyboard = UIStoryboard(name: "JitsiMeet", bundle: bundle)
         self.jitsiMeetViewController = storyboard.instantiateViewController(withIdentifier: "jitsiMeetStoryBoardID") as? JitsiMeetViewController
+        guard let url = call.options["url"] as? String else {
+            call.reject("Must provide an url")
+            return
+        }
+        guard let roomName = call.options["roomName"] as? String else {
+            call.reject("Must provide a roomName")
+            return
+        }
+        let subject = call.options["subject"] as? String ?? " "
 
-        self.jitsiMeetViewController.url = url;
-        self.jitsiMeetViewController.token = call.options["token"] as? String ?? nil;
-        self.jitsiMeetViewController.roomName = roomName;
-        self.jitsiMeetViewController.startWithAudioMuted = call.options["startWithAudioMuted"] as? Bool ?? false;
-        self.jitsiMeetViewController.startWithVideoMuted = call.options["startWithVideoMuted"] as? Bool ?? false;
-        self.jitsiMeetViewController.chatEnabled = call.options["chatEnabled"] as? Bool ?? false;
-        self.jitsiMeetViewController.inviteEnabled = call.options["inviteEnabled"] as? Bool ?? false;
-        self.jitsiMeetViewController.email = call.options["email"] as? String ?? nil
-        self.jitsiMeetViewController.displayName = call.options["displayName"] as? String ?? nil
-        self.jitsiMeetViewController.avatarUrl = call.options["avatarURL"] as? String ?? nil
-        self.jitsiMeetViewController.callIntegrationEnabled = call.options["callIntegrationEnabled"] as? Bool ?? true
-        self.jitsiMeetViewController.screenSharingEnabled = call.options["screenSharingEnabled"] as? Bool ?? false
-        self.jitsiMeetViewController.recordingEnabled = call.options["recordingEnabled"] as? Bool ?? false
-        self.jitsiMeetViewController.liveStreamingEnabled = call.options["liveStreamingEnabled"] as? Bool ?? false
-        self.jitsiMeetViewController.delegate = self;
+        self.jitsiMeetViewController?.webView = self.webView
 
-        DispatchQueue.main.async {
-            self.bridge?.presentVC(self.jitsiMeetViewController, animated: true, completion: {
-                call.resolve([
-                    "success": true
-                    ])
-            });
+        self.jitsiMeetViewController?.options = JitsiMeetConferenceOptions.fromBuilder { (builder) in
+            builder.serverURL = URL(string: url)
+            builder.room = roomName
+            builder.setSubject(subject)
+
+            if let token = call.options["token"] as? String {
+                builder.token = token;
+            }
+
+            if let isAudioMuted = call.options["startWithAudioMuted"] as? Bool {
+                builder.setAudioMuted(isAudioMuted);
+            }
+
+            /* if let isAudioOnly = call.options["isAudioOnly"] as? Bool {
+                builder.setAudioOnly(isAudioOnly)
+            } */
+
+            if let isVideoMuted = call.options["startWithVideoMuted"] as? Bool {
+                builder.setVideoMuted(isVideoMuted)
+            }
+
+            let displayName = call.options["displayName"] as? String
+            let email = call.options["email"] as? String
+            let avatarUrlString = call.options["avatarURL"] as? String
+
+            if (displayName != nil || email != nil || avatarUrlString != nil) {
+                let avatarUrl = avatarUrlString != nil ? URL(string: avatarUrlString!) : nil
+                builder.userInfo = JitsiMeetUserInfo(displayName: displayName, andEmail: email, andAvatar: avatarUrl)
+            }
+
+            var callIntegrationEnabled = call.options["callIntegrationEnabled"] as? Bool ?? true
+            let userLocale = NSLocale.current as NSLocale
+            if  userLocale.countryCode?.contains("CN") ?? false ||
+                userLocale.countryCode?.contains("CHN") ?? false ||
+                userLocale.countryCode?.contains("MO") ?? false ||
+                userLocale.countryCode?.contains("HK") ?? false {
+                print("currentLocale is China so we cannot use CallKit.")
+                callIntegrationEnabled = false
+            }
+            builder.setFeatureFlag("call-integration.enabled", withBoolean: callIntegrationEnabled)
+
+            // default PiP is off as the feature is not fully functioning yet, but allow user to overrides it by providing the featureFlag
+            builder.setFeatureFlag("pip.enabled", withBoolean: false)
+
+            // if not set in the feature flags above, this will take effect
+            if let chatEnabled = call.options["chatEnabled"] as? Bool {
+                builder.setFeatureFlag("chat.enabled", withBoolean: chatEnabled)
+            }
+            if let inviteEnabled = call.options["inviteEnabled"] as? Bool {
+                builder.setFeatureFlag("invite.enabled", withBoolean: inviteEnabled)
+            }
+            if let screenSharingEnabled = call.options["screenSharingEnabled"] as? Bool {
+                builder.setFeatureFlag("ios.screensharing.enabled", withBoolean: screenSharingEnabled)
+            }
+            if let recordingEnabled = call.options["recordingEnabled"] as? Bool {
+                builder.setFeatureFlag("ios.recording.enabled", withBoolean: recordingEnabled)
+            }
+            if let liveStreamingEnabled = call.options["liveStreamingEnabled"] as? Bool {
+                builder.setFeatureFlag("live-streaming.enabled", withBoolean: liveStreamingEnabled)
+            }
+
+            // setfeatureFlag() provides finer control, and will override some of the settings above
+            let featureFlags = call.options["featureFlags"] as? Dictionary<String, Any>
+
+            featureFlags?.forEach { key, value in
+                builder.setFeatureFlag(key, withValue: value);
+            }
+
+            let configOverrides = call.options["configOverrides"] as? Dictionary<String, Any>
+            configOverrides?.forEach { key, value in
+                builder.setConfigOverride(key, withValue: value);
+            }
         }
-    }
 
-    @objc func leaveConference(_ call: CAPPluginCall) {
-        self.jitsiMeetViewController.delegate = self;
+        self.jitsiMeetViewController?.delegate = self;
+
         DispatchQueue.main.async {
-            self.bridge?.dismissVC(animated: true, completion: {
-                call.resolve([
-                    "success": true
-                ])
-            })
+            self.bridge?.viewController?.present(self.jitsiMeetViewController!, animated: true, completion: nil);
         }
     }
 }

package/ios/Plugin/Podfile

@@ -7,7 +7,7 @@ target 'Plugin' do
 
   # Pods for IonicRunner
   pod 'Capacitor'
-  pod 'JitsiMeetSDK', '4.0.0'
+  pod 'JitsiMeetSDK', '4.1.0'
 end
 
 post_install do |installer|
@@ -22,5 +22,5 @@ target 'PluginTests' do
   use_frameworks!
 
   pod 'Capacitor'
-  pod 'JitsiMeetSDK', '4.0.0'
+  pod 'JitsiMeetSDK', '4.1.0'
 end

package/ios/README.md

@@ -53,6 +53,15 @@ npx cap sync
 ionic capacitor open ios
 ```
 
+### Dropbox Integration
+
+See [Jitsi Meet Handbook](https://jitsi.github.io/handbook/docs/dev-guide/dev-guide-ios-sdk#dropbox-integration).
+
+### Screen Sharing Integration
+
+See [Jitsi Meet Handbook](https://jitsi.github.io/handbook/docs/dev-guide/dev-guide-ios-sdk#screen-sharing-integration).
+
+
 ### iOS SDK Developer Guide
 
 Consult the official Jitsi iOS SDK [documentation](https://jitsi.github.io/handbook/docs/dev-guide/dev-guide-ios-sdk).

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "capacitor-jitsi-meet",
-  "version": "2.1.2",
+  "version": "2.2.0-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",
@@ -12,6 +12,7 @@
     "build": "npm run clean && tsc && rollup -c rollup.config.js",
     "clean": "rimraf ./dist",
     "watch": "tsc --watch",
+    "prepare": "npm run build",
     "prepublishOnly": "npm run build"
   },
   "author": "Calvin Ho",