capacitor-jitsi-meet 2.1.2-beta.2 → 2.1.2

package/CHANGELOG.md

@@ -4,6 +4,18 @@ 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)
+
+## iOS
+
+- uses Jitsi SDK 4.1.0.
+- [iOS](https://github.com/jitsi/jitsi-meet/releases/tag/ios-sdk-4.1.0)
+
+## Android
+
+- uses Jitsi SDK 4.1.0.
+- [Android](https://github.com/jitsi/jitsi-meet/releases/tag/android-sdk-4.1.0)
+
 # 2.1.1 (2021-12-15)
 
 ## Android

package/README.md

@@ -29,7 +29,7 @@ This Ionic Capacitor plugin is created to make video calls through the free, ope
         v2
       </td>
       <td>
-        >= 1.3.7
+        <= 1.5.14
       </td>
       <td>
         until Sept 30, 2021
@@ -63,7 +63,7 @@ This plugin does not currently support web implementation. We recommend using th
 
 1. npm install capacitor-jitsi-meet
 
-2. use it as a Capacitor Plugin
+2. use it as a [Capacitor Plugin](https://capacitorjs.com/docs/getting-started#adding-capacitor-to-your-app)
 
 ```javascript
 // On Capacitor 3
@@ -78,18 +78,22 @@ const { Jitsi } = Plugins;
 
 ```javascript
 const result = await Jitsi.joinConference({
-   roomName: 'room1', // room identifier for the conference
-   url: 'https://meet.jit.si' // endpoint of the Jitsi Meet video bridge,
-   token: string; // jwt authentication token
-   displayName: string; // user's display name
-   email: string; // user's email
-   avatarURL: string; // user's avatar url
-   channelLastN: string; // last N participants allowed to join
-   startWithAudioMuted: true, // start with audio muted
-   startWithVideoMuted: false // start with video muted
-   chatEnabled: false, // enable Chat feature
-   inviteEnabled: false // enable Invitation feature
-   callIntegrationEnabled: true // enable call integration (CallKit on iOS, ConnectionService on Android)
+    // 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
+    displayName: string, // user's display name
+    email: string, // user's email
+    avatarURL: string, // user's avatar url
+    startWithAudioMuted: true, // start with audio muted, default: false
+    startWithVideoMuted: false, // start with video muted, default: false
+    chatEnabled: false, // enable Chat feature, default: true
+    inviteEnabled: false, // enable Invitation feature, default: true
+    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
 });
 
 window.addEventListener('onConferenceJoined', () => {
@@ -103,11 +107,18 @@ await Jitsi.leaveConference();
 
 ```
 
-
 3. Build the project
 
+```
+$ npm run build
+```
+
 4. Follow the deployment instructions for [Android](android/README.md) and [iOS](ios/README.md).
 
+## 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
+
 ## Feature Requests and Jitsi SDK Customizations
 
 I appreciate those who use this plugin in their production apps and are funding this project as sponsors. Your sponsorship enables me to continue to maintain and roll out releases in a timely manner. Consider joining as a sponsor to get first-class support and consultation. For feature requests, create an issue with a label 'feature request'. I also offer paid consultation service to those needing to modify the Jitsi UI interface. To submit a request, create an issue and add the label 'sdk customization'.

package/android/README.md

@@ -4,51 +4,20 @@ This plugin uses the Jitsi SDK for android. See the plugin [changelog](https://g
 
 ### Usage
 
-1. npm install capacitor-jitsi-meet, then use it as a Capacitor Plugin
+[Follow installation steps 1-3 here.](https://github.com/calvinckho/capacitor-jitsi-meet#usage)
 
-```javascript
-// On Capacitor 3
-import { Jitsi } from 'capacitor-jitsi-meet';
+4. Follow [these steps](https://ionicframework.com/docs/developing/android#project-setup) to add Android to your project
 
-// On Capacitor 2
-import { Plugins } from '@capacitor/core';
-import 'capacitor-jitsi-meet';
+5. Let capacitor sync the projects using either of the following commands
 
-const { Jitsi } = Plugins;
 ```
-
-```javascript
-const result: any = await Jitsi.joinConference({
-   roomName: 'room1', // room identifier for the conference
-   url: 'https://meet.jit.si' // endpoint of the Jitsi Meet video bridge
-   token: string; // jwt authentication token
-   displayName: string; // user's display name
-   email: string; // user's email
-   avatarURL: string; // user's avatar url
-   channelLastN: string; // last N participants allowed to join
-   startWithAudioMuted: true, // start with audio muted
-   startWithVideoMuted: false // start with video muted
-   chatEnabled: false, // enable Chat feature
-   inviteEnabled: false // enable Invitation feature
-   callIntegrationEnabled: true // enable call integration (CallKit on iOS, ConnectionService on Android)
-});
-console.log("join status", result.success);
-
-window.addEventListener('onConferenceJoined', () => {
-    // do things here
-});
-window.addEventListener('onConferenceLeft', () => {
-    // do things here
-});
-
-const result: any = await Jitsi.leaveConference();
-console.log("leave status": result.success);
-
+npx cap update
+```
+```
+npx cap sync
 ```
 
-2. npx cap sync
-
-3. In your android/build.gradle, add the Maven repository
+6. In your android/build.gradle, add the Maven repository
 
 ```gradle
 allprojects {
@@ -62,7 +31,7 @@ allprojects {
 }
 ```
 
-4. In your android/app/build.gradle file, add Java 1.8 compatibility support
+6. In your android/app/build.gradle file, add Java 1.8 compatibility support
 
 ```gradle
 android {
@@ -74,7 +43,7 @@ android {
     ...
 ```
 
-Also, replace the line implementation 'ionic-team:capacitor-android:1+' with:
+In older capacitor versions, replace the line implementation 'ionic-team:capacitor-android:1+' with:
 
 ```gradle
 dependencies {
@@ -83,14 +52,12 @@ dependencies {
 }
 ```
 
-5. No need to register the plugin in your main Activity anymore.
+7. In older capacitor versions, if not already created, follow the [Ionic doc](https://capacitorjs.com/docs/android/updating#from-1-5-1-to-2-0-0) to create common variables.
 
-6. For 2.0+, follow the [Ionic doc](https://capacitorjs.com/docs/android/updating#from-1-5-1-to-2-0-0) to create common variables.
-
- Create a android/variables.gradle file with this content
+ Create an android/variables.gradle file with this content
  ```gradle
  ext {
-   minSdkVersion = 21
+   minSdkVersion = 23
    compileSdkVersion = 29
    targetSdkVersion = 29
    androidxAppCompatVersion = '1.1.0'
@@ -108,9 +75,13 @@ dependencies {
 ```
  In android/build.gradle file, add apply from: "variables.gradle" as shown [here](https://github.com/ionic-team/capacitor/blob/master/android-template/build.gradle#L18).
 
-7. Build it in Android Studio
+9. Build it in Android Studio
+
+```
+ionic capacitor open android
+```
 
-8. If upgrading from previous versions of this plugin you may receive this error: `Error: Unfortunately you can't have non-Gradle Java modules and > Android-Gradle modules in one project`. Follow these steps to resolve it:
+10. If upgrading from previous versions of this plugin you may receive this error: `Error: Unfortunately you can't have non-Gradle Java modules and > Android-Gradle modules in one project`. Follow these steps to resolve it:
 
    a. In Android Studio Go to File -> Invalidate Caches/Restart.
    

package/android/src/main/AndroidManifest.xml

@@ -3,7 +3,7 @@
   <application android:theme="@style/AppTheme">
     <activity android:name="com.capacitor.jitsi.plugin.JitsiActivity"
               android:excludeFromRecents="true"
-              android:supportsPictureInPicture="true"
+              android:supportsPictureInPicture="false"
               android:resizeableActivity="true"
               android:launchMode="singleTask"
               android:theme="@style/AppTheme.NoActionBar"

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

@@ -40,6 +40,9 @@ public class Jitsi extends Plugin {
         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");
 
         receiver = new JitsiBroadcastReceiver();
         receiver.setModule(this);
@@ -72,6 +75,12 @@ public class Jitsi extends Plugin {
         if(callIntegrationEnabled == null) {
             callIntegrationEnabled = true;
         }
+        if(recordingEnabled == null){
+            recordingEnabled = false;
+        }
+        if(screenSharingEnabled == null){
+            screenSharingEnabled = false;
+        }
         Timber.tag(TAG).v("display url: %s", url);
 
         Intent intent = new Intent(getActivity(), JitsiActivity.class);
@@ -86,6 +95,11 @@ public class Jitsi extends Plugin {
         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));
+        }
+        intent.putExtra("screenSharingEnabled", screenSharingEnabled);
 
         getActivity().startActivity(intent);
 

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

@@ -61,6 +61,9 @@ public class JitsiActivity extends JitsiMeetActivity {
         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");
@@ -93,6 +96,9 @@ public class JitsiActivity extends JitsiMeetActivity {
                 .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();
@@ -155,8 +161,12 @@ public class JitsiActivity extends JitsiMeetActivity {
         super.onDestroy();
     }
 
-    // detect if PIP window is closed. If closed, dispose view and finish activity
-    @Override
+    // 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
     public void onStop() {
         Timber.d("Picture-in-picture is stopped. Disposing view and finishing activity.");
         if (view != null) {
@@ -166,9 +176,9 @@ public class JitsiActivity extends JitsiMeetActivity {
         }
         on("onConferenceLeft"); // intentionally uses the obsolete onConferenceLeft in order to be consistent with iOS deployment and broadcast to JS listeners
         super.onStop();
-    }
+    }*/
 
-    // for logging only. nothing is done when picture-in-picture mode is toggled
+    // for logging entering and leaving PIP only
     @Override
     public void onPictureInPictureModeChanged(boolean isInPictureInPictureMode) {
         super.onPictureInPictureModeChanged(isInPictureInPictureMode);

package/dist/esm/definitions.d.ts

@@ -2,29 +2,35 @@ export interface JitsiPlugin {
     joinConference(options: {
         roomName: string;
         url: string;
-        token: string;
-        channelLastN: string;
-        displayName: string;
-        email: string;
-        avatarURL: string;
-        startWithAudioMuted: boolean;
-        startWithVideoMuted: boolean;
-        chatEnabled: boolean;
-        inviteEnabled: boolean;
-        callIntegrationEnabled: boolean;
+        token?: string;
+        channelLastN?: string;
+        displayName?: string;
+        email?: string;
+        avatarURL?: string;
+        startWithAudioMuted?: boolean;
+        startWithVideoMuted?: boolean;
+        chatEnabled?: boolean;
+        inviteEnabled?: boolean;
+        callIntegrationEnabled?: boolean;
+        recordingEnabled?: boolean;
+        liveStreamingEnabled?: boolean;
+        screenSharingEnabled?: boolean;
     }): Promise<{
         roomName: string;
         url: string;
-        token: string;
-        channelLastN: string;
-        displayName: string;
-        email: string;
-        avatarURL: string;
-        startWithAudioMuted: boolean;
-        startWithVideoMuted: boolean;
-        chatEnabled: boolean;
-        inviteEnabled: boolean;
-        callIntegrationEnabled: boolean;
+        token?: string;
+        channelLastN?: string;
+        displayName?: string;
+        email?: string;
+        avatarURL?: string;
+        startWithAudioMuted?: boolean;
+        startWithVideoMuted?: boolean;
+        chatEnabled?: boolean;
+        inviteEnabled?: boolean;
+        callIntegrationEnabled?: boolean;
+        recordingEnabled?: boolean;
+        liveStreamingEnabled?: boolean;
+        screenSharingEnabled?: boolean;
     }>;
     leaveConference(options: {}): Promise<{}>;
 }

package/dist/esm/web.d.ts

@@ -4,29 +4,35 @@ export declare class JitsiWeb extends WebPlugin implements JitsiPlugin {
     joinConference(options: {
         roomName: string;
         url: string;
-        token: string;
-        channelLastN: string;
-        displayName: string;
-        email: string;
-        avatarURL: string;
-        startWithAudioMuted: boolean;
-        startWithVideoMuted: boolean;
-        chatEnabled: boolean;
-        inviteEnabled: boolean;
-        callIntegrationEnabled: boolean;
+        token?: string;
+        channelLastN?: string;
+        displayName?: string;
+        email?: string;
+        avatarURL?: string;
+        startWithAudioMuted?: boolean;
+        startWithVideoMuted?: boolean;
+        chatEnabled?: boolean;
+        inviteEnabled?: boolean;
+        callIntegrationEnabled?: boolean;
+        recordingEnabled?: boolean;
+        liveStreamingEnabled?: boolean;
+        screenSharingEnabled?: boolean;
     }): Promise<{
         roomName: string;
         url: string;
-        token: string;
-        channelLastN: string;
-        displayName: string;
-        email: string;
-        avatarURL: string;
-        startWithAudioMuted: boolean;
-        startWithVideoMuted: boolean;
-        chatEnabled: boolean;
-        inviteEnabled: boolean;
-        callIntegrationEnabled: boolean;
+        token?: string;
+        channelLastN?: string;
+        displayName?: string;
+        email?: string;
+        avatarURL?: string;
+        startWithAudioMuted?: boolean;
+        startWithVideoMuted?: boolean;
+        chatEnabled?: boolean;
+        inviteEnabled?: boolean;
+        callIntegrationEnabled?: boolean;
+        recordingEnabled?: boolean;
+        liveStreamingEnabled?: boolean;
+        screenSharingEnabled?: boolean;
     }>;
     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,OAatB;;YAcG,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,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"}

package/ios/Plugin/Plugin/JitsiMeetViewController.swift

@@ -20,6 +20,9 @@ public class JitsiMeetViewController: UIViewController {
     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
@@ -62,6 +65,9 @@ public class JitsiMeetViewController: UIViewController {
             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
         })

package/ios/Plugin/Plugin/Plugin.swift

@@ -38,6 +38,9 @@ public class Jitsi: CAPPlugin {
         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;
 
         DispatchQueue.main.async {

package/ios/README.md

@@ -10,63 +10,48 @@ See the plugin [changelog](https://github.com/calvinckho/capacitor-jitsi-meet/bl
 
 ### Usage
 
-1. npm install capacitor-jitsi-meet, then use it as a Capacitor Plugin
+[Follow installation steps 1-3 here.](https://github.com/calvinckho/capacitor-jitsi-meet#usage)
 
-```javascript
-// On Capacitor 3
-import { Jitsi } from 'capacitor-jitsi-meet';
+4. Follow [these steps](https://ionicframework.com/docs/developing/ios#project-setup) to add iOS to your project
 
-// On Capacitor 2
-import { Plugins } from '@capacitor/core';
-import 'capacitor-jitsi-meet';
+5. Let capacitor sync the projects using either of the following commands
 
-const { Jitsi } = Plugins;
 ```
-
-```javascript
-const result: any = await Jitsi.joinConference({
-   roomName: 'room1', // room identifier for the conference
-   url: 'https://meet.jit.si' // endpoint of the Jitsi Meet video bridge
-   token: string; // jwt authentication token
-   displayName: string; // user's display name
-   email: string; // user's email
-   avatarURL: string; // user's avatar url
-   channelLastN: string; // last N participants allowed to join
-   startWithAudioMuted: true, // start with audio muted
-   startWithVideoMuted: false // start with video muted
-   chatEnabled: false, // enable Chat feature
-   inviteEnabled: false // enable Invitation feature
-   callIntegrationEnabled: true // enable call integration (CallKit on iOS, ConnectionService on Android)
-});
-console.log("join status", result.success);
-
-window.addEventListener('onConferenceJoined', () => {
-    // do things here
-});
-window.addEventListener('onConferenceLeft', () => {
-    // do things here
-});
-
-const result: any = await Jitsi.leaveConference();
-console.log("leave status": result.success);
-
+npx cap update
+```
+```
+npx cap sync
 ```
 
-2. npx cap sync
-
-3. Turn off Bitcode in the app target as well as the pod targets. In xcode Project Navigator,
-
+6. Turn off Bitcode in the app target as well as the pod targets. In xcode Project Navigator,
 
+```
    i. Pods -> Project -> Pods -> Build Settings -> Enable Bitcode -> No
    
    ii Pods -> Targets -> CapacitorJitsiMeet -> Build Settings -> Enable Bitcode -> No
-   
+  ``` 
 
-4. Use Swift 5 for the Capacitor target. In Xcode Project Navigator,
+7. Use Swift 5 for the Capacitor target. In Xcode Project Navigator,
 
+```
     i. Pods -> Targets -> Capacitor -> Build Settings -> Swift Language Version -> Swift 5
+```
+
+8. In order for app to properly work in the background, select the "audio" and "voip" background modes.
+
+```
+<key>UIBackgroundModes</key>
+	<array>
+		<string>audio</string>
+		<string>voip</string>
+	</array>
+```
+
+9. Build it in Xcode and deploy it to your device
 
-5. Deploy it to your device
+```
+ionic capacitor open ios
+```
 
 ### iOS SDK Developer Guide
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "capacitor-jitsi-meet",
-  "version": "2.1.2-beta.2",
+  "version": "2.1.2",
   "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",