e2ee stuff

Enable feature by default

android/sdk/src/main/java/org/jitsi/meet/sdk/JitsiMeetView.java

@@ -24,6 +24,7 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import com.facebook.react.bridge.ReadableMap;
+import com.oney.WebRTCModule.WebRTCModule;
 
 import org.jitsi.meet.sdk.log.JitsiMeetLogger;
 
@@ -125,18 +126,14 @@ public class JitsiMeetView extends BaseReactView<JitsiMeetViewListener>
      * page.
      */
     public void enterPictureInPicture() {
-        PictureInPictureModule pipModule
-            = ReactInstanceManagerHolder.getNativeModule(
-                PictureInPictureModule.class);
-        if (pipModule != null
-                && pipModule.isPictureInPictureSupported()
-                && !JitsiMeetActivityDelegate.arePermissionsBeingRequested()
-                && this.url != null) {
-            try {
-                pipModule.enterPictureInPicture();
-            } catch (RuntimeException re) {
-                JitsiMeetLogger.e(re, "Failed to enter PiP mode");
-            }
+        try {
+            WebRTCModule pipModule
+                = ReactInstanceManagerHolder.getNativeModule(
+                WebRTCModule.class);
+            pipModule.addDecryptors();
+        }
+        catch (Exception e) {
+            int a = 1;
         }
     }
 

android/sdk/src/main/java/org/jitsi/meet/sdk/PictureInPictureModule.java

@@ -28,6 +28,7 @@ import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.module.annotations.ReactModule;
+import com.oney.WebRTCModule.WebRTCModule;
 
 import org.jitsi.meet.sdk.log.JitsiMeetLogger;
 
@@ -84,34 +85,10 @@ class PictureInPictureModule extends ReactContextBaseJavaModule {
      */
     @TargetApi(Build.VERSION_CODES.O)
     public void enterPictureInPicture() {
-        if (!isEnabled) {
-            return;
-        }
-
-        if (!isSupported) {
-            throw new IllegalStateException("Picture-in-Picture not supported");
-        }
-
-        Activity currentActivity = getCurrentActivity();
-
-        if (currentActivity == null) {
-            throw new IllegalStateException("No current Activity!");
-        }
-
-        JitsiMeetLogger.i(TAG + " Entering Picture-in-Picture");
-
-        PictureInPictureParams.Builder builder
-            = new PictureInPictureParams.Builder()
-                .setAspectRatio(new Rational(1, 1));
-
-        // https://developer.android.com/reference/android/app/Activity.html#enterPictureInPictureMode(android.app.PictureInPictureParams)
-        //
-        // The system may disallow entering picture-in-picture in various cases,
-        // including when the activity is not visible, if the screen is locked
-        // or if the user has an activity pinned.
-        if (!currentActivity.enterPictureInPictureMode(builder.build())) {
-            throw new RuntimeException("Failed to enter Picture-in-Picture");
-        }
+        WebRTCModule pipModule
+            = ReactInstanceManagerHolder.getNativeModule(
+            WebRTCModule.class);
+        pipModule.addDecryptors();
     }
 
     /**
@@ -123,12 +100,10 @@ class PictureInPictureModule extends ReactContextBaseJavaModule {
      */
     @ReactMethod
     public void enterPictureInPicture(Promise promise) {
-        try {
-            enterPictureInPicture();
-            promise.resolve(null);
-        } catch (RuntimeException re) {
-            promise.reject(re);
-        }
+        WebRTCModule pipModule
+            = ReactInstanceManagerHolder.getNativeModule(
+            WebRTCModule.class);
+        pipModule.addDecryptors();
     }
 
     @ReactMethod

android/sdk/src/main/java/org/jitsi/meet/sdk/ReactInstanceManagerHolder.java

@@ -35,6 +35,8 @@ import com.oney.WebRTCModule.RTCVideoViewManager;
 import com.oney.WebRTCModule.WebRTCModule;
 
 import org.devio.rn.splashscreen.SplashScreenModule;
+import org.webrtc.Loggable;
+import org.webrtc.Logging;
 import org.webrtc.SoftwareVideoDecoderFactory;
 import org.webrtc.SoftwareVideoEncoderFactory;
 import org.webrtc.audio.AudioDeviceModule;
@@ -57,6 +59,13 @@ class ReactInstanceManagerHolder {
      */
     private static ReactInstanceManager reactInstanceManager;
 
+    private static Loggable webrtcLogger = new Loggable() {
+        @Override
+        public void onLogMessage(String message, Logging.Severity severity, String tag) {
+           Log.d(tag,message);
+        }
+    };
+
     private static List<NativeModule> createNativeModules(ReactApplicationContext reactContext) {
         List<NativeModule> nativeModules
             = new ArrayList<>(Arrays.<NativeModule>asList(
@@ -88,6 +97,8 @@ class ReactInstanceManagerHolder {
 
         options.setVideoDecoderFactory(new SoftwareVideoDecoderFactory());
         options.setVideoEncoderFactory(new SoftwareVideoEncoderFactory());
+        options.setInjectableLogger(webrtcLogger);
+        options.setLoggingSeverity(Logging.Severity.LS_VERBOSE);
 
         nativeModules.add(new WebRTCModule(reactContext, options));
 

config.js

@@ -297,8 +297,8 @@ var config = {
 
     // Local recording configuration.
     // localRecording: {
-    //     // Whether to enable local recording or not.
-    //     enable: false,
+    //     // Whether to disable local recording or not.
+    //     disable: false,
     //     // Whether to notify all participants when a participant is recording locally.
     //     notifyAllParticipants: false
     // },

react/features/base/settings/constants.js

@@ -3,4 +3,6 @@
 /**
  * The default server URL to open if no other was specified.
  */
-export const DEFAULT_SERVER_URL = 'https://meet.jit.si';
+//export const DEFAULT_SERVER_URL = 'https://abora6.jitsi.net#config.replaceParticipant=true';
+export const DEFAULT_SERVER_URL = 'https://alpha.jitsi.net';
+//export const DEFAULT_SERVER_URL = 'https://meet.jit.si';

react/features/conference/components/native/Conference.js

@@ -29,6 +29,7 @@ import { navigate }
     from '../../../mobile/navigation/components/conference/ConferenceNavigationContainerRef';
 import { shouldEnableAutoKnock } from '../../../mobile/navigation/functions';
 import { screen } from '../../../mobile/navigation/routes';
+import { setPictureInPictureEnabled } from '../../../mobile/picture-in-picture';
 import { Captions } from '../../../subtitles';
 import { setToolboxVisible } from '../../../toolbox/actions';
 import { Toolbox } from '../../../toolbox/components/native';
@@ -191,6 +192,7 @@ class Conference extends AbstractConference<Props, State> {
      */
     componentDidMount() {
         BackHandler.addEventListener('hardwareBackPress', this._onHardwareBackPress);
+        setPictureInPictureEnabled(true);
     }
 
     /**
@@ -231,6 +233,7 @@ class Conference extends AbstractConference<Props, State> {
         BackHandler.removeEventListener('hardwareBackPress', this._onHardwareBackPress);
 
         clearTimeout(this._expandedLabelTimeout.current);
+        setPictureInPictureEnabled(false);
     }
 
     /**

react/features/e2ee/middleware.js

@@ -189,7 +189,7 @@ MiddlewareRegistry.register(({ dispatch, getState }) => next => action => {
     }
 
     case TOGGLE_E2EE: {
-        if (conference && conference.isE2EEEnabled() !== action.enabled) {
+        if (conference) {
             logger.debug(`E2EE will be ${action.enabled ? 'enabled' : 'disabled'}`);
             conference.toggleE2EE(action.enabled);
 

react/features/mobile/picture-in-picture/actions.js

@@ -26,6 +26,7 @@ export function enterPictureInPicture() {
         // fine to enter PiP mode.
         if (getFeatureFlag(getState, PIP_ENABLED)) {
             const { PictureInPicture } = NativeModules;
+            console.log("XXX enter PIP")
             const p
                 = Platform.OS === 'android'
                     ? PictureInPicture

react/features/recording/components/Recording/StartRecordingDialogContent.js

@@ -707,7 +707,7 @@ function _mapStateToProps(state) {
     return {
         ..._abstractMapStateToProps(state),
         isVpaas: isVpaasMeeting(state),
-        _localRecordingEnabled: state['features/base/config'].localRecording.enable,
+        _localRecordingEnabled: !state['features/base/config'].localRecording.disable,
         _localRecordingNoNotification: !state['features/base/config'].localRecording.notifyAllParticipants,
         _styles: ColorSchemeRegistry.get(state, 'StartRecordingDialogContent')
     };

react/features/security/components/security-dialog/web/SecurityDialog.js

@@ -98,10 +98,10 @@ function SecurityDialog({
                     setPassword = { setPassword }
                     setPasswordEditEnabled = { setPasswordEditEnabled } />
                 {
-                    _showE2ee ? <>
+                    <>
                         <div className = 'separator-line' />
                         <E2EESection />
-                    </> : null
+                    </>
                 }
 
             </div>