diff --git a/android/sdk/src/main/java/org/jitsi/meet/sdk/JitsiMeetActivity.java b/android/sdk/src/main/java/org/jitsi/meet/sdk/JitsiMeetActivity.java index e428f0cd3d..44033e1104 100644 --- a/android/sdk/src/main/java/org/jitsi/meet/sdk/JitsiMeetActivity.java +++ b/android/sdk/src/main/java/org/jitsi/meet/sdk/JitsiMeetActivity.java @@ -135,7 +135,11 @@ public class JitsiMeetActivity extends AppCompatActivity JitsiMeetActivityDelegate.onHostResume(this); setContentView(R.layout.activity_jitsi_meet); - addTopBottomInsets(getWindow(),findViewById(android.R.id.content)); + + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.VANILLA_ICE_CREAM) { + addTopBottomInsets(getWindow(), findViewById(android.R.id.content)); + } + this.jitsiView = findViewById(R.id.jitsiView); registerForBroadcastMessages(); diff --git a/react/features/mobile/navigation/components/RootNavigationContainer.tsx b/react/features/mobile/navigation/components/RootNavigationContainer.tsx index d09c29b146..40bb24f559 100644 --- a/react/features/mobile/navigation/components/RootNavigationContainer.tsx +++ b/react/features/mobile/navigation/components/RootNavigationContainer.tsx @@ -1,14 +1,13 @@ import { NavigationContainer, Theme } from '@react-navigation/native'; import { createStackNavigator } from '@react-navigation/stack'; import React, { useCallback } from 'react'; -import { StatusBar } from 'react-native'; import { connect } from 'react-redux'; import { IReduxState, IStore } from '../../../app/types'; import DialInSummary from '../../../invite/components/dial-in-summary/native/DialInSummary'; import Prejoin from '../../../prejoin/components/native/Prejoin'; import UnsafeRoomWarning from '../../../prejoin/components/native/UnsafeRoomWarning'; -import { isUnsafeRoomWarningEnabled } from '../../../prejoin/functions'; +import { isUnsafeRoomWarningEnabled } from '../../../prejoin/functions.native'; import VisitorsQueue from '../../../visitors/components/native/VisitorsQueue'; // eslint-disable-next-line // @ts-ignore @@ -70,11 +69,6 @@ const RootNavigationContainer = ({ dispatch, isUnsafeRoomWarningAvailable, isWel onReady = { onReady } ref = { rootNavigationRef } theme = { navigationContainerTheme as Theme }> - {