Skip to content

Commit

Permalink
Merge branch 'master' into beta
Browse files Browse the repository at this point in the history 
# Conflicts:
#	.circleci/config.yml
#	.gitignore
#	README.md
#	__mocks__/expo-keep-awake.js
#	__mocks__/react-native-gesture-handler.js
#	__tests__/__snapshots__/Storyshots.test.js.snap
#	android/app/build.gradle
#	android/app/src/foss/res/drawable/ic_launcher_background.xml
#	android/app/src/foss/res/drawable/ic_launcher_foreground.xml
#	android/app/src/foss/res/mipmap-anydpi-v26/ic_launcher.xml
#	android/app/src/foss/res/mipmap-anydpi-v26/ic_launcher_round.xml
#	android/app/src/foss/res/mipmap-hdpi/ic_launcher.png
#	android/app/src/foss/res/mipmap-hdpi/ic_launcher_round.png
#	android/app/src/foss/res/mipmap-mdpi/ic_launcher.png
#	android/app/src/foss/res/mipmap-mdpi/ic_launcher_round.png
#	android/app/src/foss/res/mipmap-xhdpi/ic_launcher.png
#	android/app/src/foss/res/mipmap-xhdpi/ic_launcher_round.png
#	android/app/src/foss/res/mipmap-xxhdpi/ic_launcher.png
#	android/app/src/foss/res/mipmap-xxhdpi/ic_launcher_round.png
#	android/app/src/foss/res/mipmap-xxxhdpi/ic_launcher.png
#	android/app/src/foss/res/mipmap-xxxhdpi/ic_launcher_round.png
#	android/app/src/foss/res/values/colors.xml
#	android/app/src/main/AndroidManifest.xml
#	android/app/src/main/assets/fonts/custom.ttf
#	android/app/src/main/ic_launcher-web.png
#	android/app/src/main/java/chat/rocket/reactnative/MainApplication.java
#	android/app/src/main/res/drawable-hdpi/logo.png
#	android/app/src/main/res/drawable-mdpi/logo.png
#	android/app/src/main/res/drawable-xhdpi/logo.png
#	android/app/src/main/res/drawable-xxhdpi/logo.png
#	android/app/src/main/res/drawable-xxxhdpi/logo.png
#	android/app/src/main/res/mipmap-hdpi/ic_launcher.png
#	android/app/src/main/res/mipmap-mdpi/ic_launcher.png
#	android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
#	android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
#	android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
#	android/app/src/main/res/values-night/colors.xml
#	android/app/src/main/res/values/colors.xml
#	android/app/src/play/AndroidManifest.xml
#	android/app/src/play/java/chat/rocket/reactnative/CustomPushNotification.java
#	android/app/src/play/java/chat/rocket/reactnative/Ejson.java
#	android/app/src/play/java/chat/rocket/reactnative/LoadNotification.java
#	android/build.gradle
#	android/gradle/wrapper/gradle-wrapper.properties
#	android/settings.gradle
#	app/actions/actionsTypes.js
#	app/actions/share.js
#	app/constants/colors.js
#	app/constants/settings.js
#	app/containers/ActionSheet/ActionSheet.js
#	app/containers/Avatar.js
#	app/containers/Button/index.js
#	app/containers/DisclosureIndicator.js
#	app/containers/FormContainer.js
#	app/containers/Header/index.js
#	app/containers/HeaderButton.js
#	app/containers/InAppNotification/NotifierComponent.js
#	app/containers/ListItem.js
#	app/containers/MessageBox/EmojiKeyboard.js
#	app/containers/MessageBox/Mentions/MentionItem.js
#	app/containers/MessageBox/RecordAudio.js
#	app/containers/MessageBox/buttons/BaseButton.js
#	app/containers/MessageBox/buttons/SendButton.js
#	app/containers/MessageBox/index.js
#	app/containers/MessageBox/styles.js
#	app/containers/ReactionsModal.js
#	app/containers/SafeAreaView.js
#	app/containers/Separator.js
#	app/containers/StatusBar.js
#	app/containers/UIKit/Divider.js
#	app/containers/UIKit/MultiSelect/Items.js
#	app/containers/UIKit/Overflow.js
#	app/containers/markdown/AtMention.js
#	app/containers/markdown/Emoji.js
#	app/containers/markdown/Hashtag.js
#	app/containers/markdown/styles.js
#	app/containers/message/CallButton.js
#	app/containers/message/Discussion.js
#	app/containers/message/MessageAvatar.js
#	app/containers/message/RepliedThread.js
#	app/containers/message/Reply.js
#	app/containers/message/Thread.js
#	app/containers/message/index.js
#	app/containers/message/styles.js
#	app/ee/omnichannel/containers/OmnichannelStatus.js
#	app/ee/omnichannel/views/QueueListView.js
#	app/i18n/locales/de.js
#	app/i18n/locales/en.js
#	app/i18n/locales/es-ES.js
#	app/i18n/locales/fr.js
#	app/i18n/locales/it.js
#	app/i18n/locales/ja.js
#	app/i18n/locales/nl.js
#	app/i18n/locales/pt-BR.js
#	app/i18n/locales/ru.js
#	app/i18n/locales/zh-CN.js
#	app/i18n/locales/zh-TW.js
#	app/index.js
#	app/lib/database/index.js
#	app/lib/database/model/Message.js
#	app/lib/database/model/Room.js
#	app/lib/database/model/Subscription.js
#	app/lib/database/model/User.js
#	app/lib/database/model/migrations.js
#	app/lib/database/schema/app.js
#	app/lib/database/schema/servers.js
#	app/lib/encryption/encryption.js
#	app/lib/methods/getUsersPresence.js
#	app/lib/methods/helpers/findSubscriptionsRooms.js
#	app/lib/methods/helpers/mergeSubscriptionsRooms.js
#	app/lib/methods/sendMessage.js
#	app/lib/methods/subscriptions/rooms.js
#	app/lib/rocketchat.js
#	app/lib/selection.json
#	app/presentation/DirectoryItem/index.js
#	app/presentation/RoomItem/RoomItem.js
#	app/presentation/RoomItem/Wrapper.js
#	app/presentation/RoomItem/index.js
#	app/presentation/UserItem.js
#	app/reducers/share.js
#	app/sagas/encryption.js
#	app/sagas/login.js
#	app/sagas/selectServer.js
#	app/share.js
#	app/stacks/InsideStack.js
#	app/stacks/MasterDetailStack/index.js
#	app/utils/avatar.js
#	app/utils/log/events.js
#	app/utils/moment.js
#	app/utils/room.js
#	app/views/AdminPanelView/index.js
#	app/views/AttachmentView.js
#	app/views/AuthLoadingView.js
#	app/views/AuthenticationWebView.js
#	app/views/AutoTranslateView/index.js
#	app/views/CreateChannelView.js
#	app/views/CreateDiscussionView/SelectChannel.js
#	app/views/CreateDiscussionView/SelectUsers.js
#	app/views/CreateDiscussionView/index.js
#	app/views/DefaultBrowserView.js
#	app/views/DirectoryView/index.js
#	app/views/E2EEnterYourPasswordView.js
#	app/views/E2EHowItWorksView.js
#	app/views/E2ESaveYourPasswordView.js
#	app/views/InviteUsersEditView/index.js
#	app/views/InviteUsersEditView/styles.js
#	app/views/InviteUsersView/index.js
#	app/views/InviteUsersView/styles.js
#	app/views/LanguageView/index.js
#	app/views/LegalView.js
#	app/views/LivechatEditView.js
#	app/views/LoginView.js
#	app/views/MessagesView/index.js
#	app/views/ModalBlockView.js
#	app/views/NewMessageView.js
#	app/views/NewServerView/ServerInput/index.js
#	app/views/NewServerView/index.js
#	app/views/NotificationPreferencesView/index.js
#	app/views/PickerView.js
#	app/views/ProfileView/index.js
#	app/views/ReadReceiptView/index.js
#	app/views/RegisterView.js
#	app/views/RoomActionsView/index.js
#	app/views/RoomActionsView/styles.js
#	app/views/RoomInfoEditView/index.js
#	app/views/RoomInfoEditView/styles.js
#	app/views/RoomInfoView/index.js
#	app/views/RoomMembersView/index.js
#	app/views/RoomView/Header/Header.js
#	app/views/RoomView/Header/Icon.js
#	app/views/RoomView/Header/LeftButtons.js
#	app/views/RoomView/Header/RightButtons.js
#	app/views/RoomView/Header/index.js
#	app/views/RoomView/List.js
#	app/views/RoomView/Separator.js
#	app/views/RoomView/index.js
#	app/views/RoomsListView/ListHeader/Encryption.js
#	app/views/RoomsListView/index.js
#	app/views/RoomsListView/styles.js
#	app/views/ScreenLockConfigView.js
#	app/views/SearchMessagesView/index.js
#	app/views/SelectServerView.js
#	app/views/SelectedUsersView.js
#	app/views/SetUsernameView.js
#	app/views/SettingsView/index.js
#	app/views/SettingsView/styles.js
#	app/views/ShareListView/Header/Header.ios.js
#	app/views/ShareListView/index.js
#	app/views/ShareView/Header.js
#	app/views/ShareView/index.js
#	app/views/SidebarView/index.js
#	app/views/StatusView.js
#	app/views/Styles.js
#	app/views/ThemeView.js
#	app/views/ThreadMessagesView/index.js
#	app/views/ThreadMessagesView/styles.js
#	app/views/UserNotificationPreferencesView/index.js
#	app/views/UserPreferencesView/index.js
#	app/views/VisitorNavigationView.js
#	app/views/WithoutServersView.js
#	e2e/helpers/app.js
#	e2e/tests/assorted/04-setting.spec.js
#	e2e/tests/assorted/06-status.spec.js
#	e2e/tests/room/02-room.spec.js
#	e2e/tests/room/04-roominfo.spec.js
#	ios/Gemfile.lock
#	ios/LaunchScreen.storyboard
#	ios/Podfile
#	ios/Podfile.lock
#	ios/Pods/JitsiMeetSDK/Frameworks/JitsiMeet.framework/Headers/JitsiMeet-Swift.h
#	ios/Pods/JitsiMeetSDK/Frameworks/JitsiMeet.framework/Headers/JitsiMeet.h
#	ios/Pods/JitsiMeetSDK/Frameworks/JitsiMeet.framework/Info.plist
#	ios/Pods/JitsiMeetSDK/Frameworks/JitsiMeet.framework/JitsiMeet
#	ios/Pods/JitsiMeetSDK/Frameworks/JitsiMeet.framework/Modules/JitsiMeet.swiftmodule/Project/x86_64-apple-ios-simulator.swiftsourceinfo
#	ios/Pods/JitsiMeetSDK/Frameworks/JitsiMeet.framework/Modules/JitsiMeet.swiftmodule/Project/x86_64.swiftsourceinfo
#	ios/Pods/JitsiMeetSDK/Frameworks/JitsiMeet.framework/Modules/JitsiMeet.swiftmodule/arm64-apple-ios.swiftdoc
#	ios/Pods/JitsiMeetSDK/Frameworks/JitsiMeet.framework/Modules/JitsiMeet.swiftmodule/arm64-apple-ios.swiftinterface
#	ios/Pods/JitsiMeetSDK/Frameworks/JitsiMeet.framework/Modules/JitsiMeet.swiftmodule/arm64-apple-ios.swiftmodule
#	ios/Pods/JitsiMeetSDK/Frameworks/JitsiMeet.framework/Modules/JitsiMeet.swiftmodule/arm64.swiftdoc
#	ios/Pods/JitsiMeetSDK/Frameworks/JitsiMeet.framework/Modules/JitsiMeet.swiftmodule/arm64.swiftinterface
#	ios/Pods/JitsiMeetSDK/Frameworks/JitsiMeet.framework/Modules/JitsiMeet.swiftmodule/arm64.swiftmodule
#	ios/Pods/JitsiMeetSDK/Frameworks/JitsiMeet.framework/Modules/JitsiMeet.swiftmodule/x86_64-apple-ios-simulator.swiftdoc
#	ios/Pods/JitsiMeetSDK/Frameworks/JitsiMeet.framework/Modules/JitsiMeet.swiftmodule/x86_64-apple-ios-simulator.swiftinterface
#	ios/Pods/JitsiMeetSDK/Frameworks/JitsiMeet.framework/Modules/JitsiMeet.swiftmodule/x86_64-apple-ios-simulator.swiftmodule
#	ios/Pods/JitsiMeetSDK/Frameworks/JitsiMeet.framework/Modules/JitsiMeet.swiftmodule/x86_64.swiftdoc
#	ios/Pods/JitsiMeetSDK/Frameworks/JitsiMeet.framework/Modules/JitsiMeet.swiftmodule/x86_64.swiftinterface
#	ios/Pods/JitsiMeetSDK/Frameworks/JitsiMeet.framework/Modules/JitsiMeet.swiftmodule/x86_64.swiftmodule
#	ios/Pods/JitsiMeetSDK/Frameworks/JitsiMeet.framework/assets/lang/languages-de.json
#	ios/Pods/JitsiMeetSDK/Frameworks/JitsiMeet.framework/assets/lang/languages-enGB.json
#	ios/Pods/JitsiMeetSDK/Frameworks/JitsiMeet.framework/assets/lang/languages-eo.json
#	ios/Pods/JitsiMeetSDK/Frameworks/JitsiMeet.framework/assets/lang/languages-es.json
#	ios/Pods/JitsiMeetSDK/Frameworks/JitsiMeet.framework/assets/lang/languages-fi.json
#	ios/Pods/JitsiMeetSDK/Frameworks/JitsiMeet.framework/assets/lang/languages-fr.json
#	ios/Pods/JitsiMeetSDK/Frameworks/JitsiMeet.framework/assets/lang/languages-frCA.json
#	ios/Pods/JitsiMeetSDK/Frameworks/JitsiMeet.framework/assets/lang/languages-hr.json
#	ios/Pods/JitsiMeetSDK/Frameworks/JitsiMeet.framework/assets/lang/languages-hu.json
#	ios/Pods/JitsiMeetSDK/Frameworks/JitsiMeet.framework/assets/lang/languages-it.json
#	ios/Pods/JitsiMeetSDK/Frameworks/JitsiMeet.framework/assets/lang/languages-oc.json
#	ios/Pods/JitsiMeetSDK/Frameworks/JitsiMeet.framework/assets/lang/languages-ru.json
#	ios/Pods/JitsiMeetSDK/Frameworks/JitsiMeet.framework/assets/lang/languages-sv.json
#	ios/Pods/JitsiMeetSDK/Frameworks/JitsiMeet.framework/assets/lang/languages.json
#	ios/Pods/JitsiMeetSDK/Frameworks/JitsiMeet.framework/assets/lang/main-af.json
#	ios/Pods/JitsiMeetSDK/Frameworks/JitsiMeet.framework/assets/lang/main-bg.json
#	ios/Pods/JitsiMeetSDK/Frameworks/JitsiMeet.framework/assets/lang/main-de.json
#	ios/Pods/JitsiMeetSDK/Frameworks/JitsiMeet.framework/assets/lang/main-enGB.json
#	ios/Pods/JitsiMeetSDK/Frameworks/JitsiMeet.framework/assets/lang/main-eo.json
#	ios/Pods/JitsiMeetSDK/Frameworks/JitsiMeet.framework/assets/lang/main-es.json
#	ios/Pods/JitsiMeetSDK/Frameworks/JitsiMeet.framework/assets/lang/main-esUS.json
#	ios/Pods/JitsiMeetSDK/Frameworks/JitsiMeet.framework/assets/lang/main-et.json
#	ios/Pods/JitsiMeetSDK/Frameworks/JitsiMeet.framework/assets/lang/main-fi.json
#	ios/Pods/JitsiMeetSDK/Frameworks/JitsiMeet.framework/assets/lang/main-fr.json
#	ios/Pods/JitsiMeetSDK/Frameworks/JitsiMeet.framework/assets/lang/main-frCA.json
#	ios/Pods/JitsiMeetSDK/Frameworks/JitsiMeet.framework/assets/lang/main-hr.json
#	ios/Pods/JitsiMeetSDK/Frameworks/JitsiMeet.framework/assets/lang/main-hu.json
#	ios/Pods/JitsiMeetSDK/Frameworks/JitsiMeet.framework/assets/lang/main-it.json
#	ios/Pods/JitsiMeetSDK/Frameworks/JitsiMeet.framework/assets/lang/main-ja.json
#	ios/Pods/JitsiMeetSDK/Frameworks/JitsiMeet.framework/assets/lang/main-ko.json
#	ios/Pods/JitsiMeetSDK/Frameworks/JitsiMeet.framework/assets/lang/main-mn.json
#	ios/Pods/JitsiMeetSDK/Frameworks/JitsiMeet.framework/assets/lang/main-nl.json
#	ios/Pods/JitsiMeetSDK/Frameworks/JitsiMeet.framework/assets/lang/main-oc.json
#	ios/Pods/JitsiMeetSDK/Frameworks/JitsiMeet.framework/assets/lang/main-pl.json
#	ios/Pods/JitsiMeetSDK/Frameworks/JitsiMeet.framework/assets/lang/main-ptBR.json
#	ios/Pods/JitsiMeetSDK/Frameworks/JitsiMeet.framework/assets/lang/main-ru.json
#	ios/Pods/JitsiMeetSDK/Frameworks/JitsiMeet.framework/assets/lang/main-sv.json
#	ios/Pods/JitsiMeetSDK/Frameworks/JitsiMeet.framework/assets/lang/main-vi.json
#	ios/Pods/JitsiMeetSDK/Frameworks/JitsiMeet.framework/assets/lang/main-zhCN.json
#	ios/Pods/JitsiMeetSDK/Frameworks/JitsiMeet.framework/assets/lang/main-zhTW.json
#	ios/Pods/JitsiMeetSDK/Frameworks/JitsiMeet.framework/assets/lang/main.json
#	ios/Pods/JitsiMeetSDK/Frameworks/JitsiMeet.framework/main.jsbundle
#	ios/Pods/JitsiMeetSDK/Frameworks/WebRTC.framework/Headers/RTCAudioSession.h
#	ios/Pods/JitsiMeetSDK/Frameworks/WebRTC.framework/Headers/RTCAudioSessionConfiguration.h
#	ios/Pods/JitsiMeetSDK/Frameworks/WebRTC.framework/Headers/RTCAudioSource.h
#	ios/Pods/JitsiMeetSDK/Frameworks/WebRTC.framework/Headers/RTCAudioTrack.h
#	ios/Pods/JitsiMeetSDK/Frameworks/WebRTC.framework/Headers/RTCCVPixelBuffer.h
#	ios/Pods/JitsiMeetSDK/Frameworks/WebRTC.framework/Headers/RTCCallbackLogger.h
#	ios/Pods/JitsiMeetSDK/Frameworks/WebRTC.framework/Headers/RTCCameraPreviewView.h
#	ios/Pods/JitsiMeetSDK/Frameworks/WebRTC.framework/Headers/RTCCameraVideoCapturer.h
#	ios/Pods/JitsiMeetSDK/Frameworks/WebRTC.framework/Headers/RTCCertificate.h
#	ios/Pods/JitsiMeetSDK/Frameworks/WebRTC.framework/Headers/RTCCodecSpecificInfo.h
#	ios/Pods/JitsiMeetSDK/Frameworks/WebRTC.framework/Headers/RTCCodecSpecificInfoH264.h
#	ios/Pods/JitsiMeetSDK/Frameworks/WebRTC.framework/Headers/RTCConfiguration.h
#	ios/Pods/JitsiMeetSDK/Frameworks/WebRTC.framework/Headers/RTCCryptoOptions.h
#	ios/Pods/JitsiMeetSDK/Frameworks/WebRTC.framework/Headers/RTCDataChannel.h
#	ios/Pods/JitsiMeetSDK/Frameworks/WebRTC.framework/Headers/RTCDataChannelConfiguration.h
#	ios/Pods/JitsiMeetSDK/Frameworks/WebRTC.framework/Headers/RTCDefaultVideoDecoderFactory.h
#	ios/Pods/JitsiMeetSDK/Frameworks/WebRTC.framework/Headers/RTCDefaultVideoEncoderFactory.h
#	ios/Pods/JitsiMeetSDK/Frameworks/WebRTC.framework/Headers/RTCDispatcher.h
#	ios/Pods/JitsiMeetSDK/Frameworks/WebRTC.framework/Headers/RTCDtmfSender.h
#	ios/Pods/JitsiMeetSDK/Frameworks/WebRTC.framework/Headers/RTCEAGLVideoView.h
#	ios/Pods/JitsiMeetSDK/Frameworks/WebRTC.framework/Headers/RTCEncodedImage.h
#	ios/Pods/JitsiMeetSDK/Frameworks/WebRTC.framework/Headers/RTCFileLogger.h
#	ios/Pods/JitsiMeetSDK/Frameworks/WebRTC.framework/Headers/RTCFileVideoCapturer.h
#	ios/Pods/JitsiMeetSDK/Frameworks/WebRTC.framework/Headers/RTCH264ProfileLevelId.h
#	ios/Pods/JitsiMeetSDK/Frameworks/WebRTC.framework/Headers/RTCI420Buffer.h
#	ios/Pods/JitsiMeetSDK/Frameworks/WebRTC.framework/Headers/RTCIceCandidate.h
#	ios/Pods/JitsiMeetSDK/Frameworks/WebRTC.framework/Headers/RTCIceServer.h
#	ios/Pods/JitsiMeetSDK/Frameworks/WebRTC.framework/Headers/RTCLegacyStatsReport.h
#	ios/Pods/JitsiMeetSDK/Frameworks/WebRTC.framework/Headers/RTCMTLVideoView.h
#	ios/Pods/JitsiMeetSDK/Frameworks/WebRTC.framework/Headers/RTCMacros.h
#	ios/Pods/JitsiMeetSDK/Frameworks/WebRTC.framework/Headers/RTCMediaConstraints.h
#	ios/Pods/JitsiMeetSDK/Frameworks/WebRTC.framework/Headers/RTCMediaSource.h
#	ios/Pods/JitsiMeetSDK/Frameworks/WebRTC.framework/Headers/RTCMediaStream.h
#	ios/Pods/JitsiMeetSDK/Frameworks/WebRTC.framework/Headers/RTCMediaStreamTrack.h
#	ios/Pods/JitsiMeetSDK/Frameworks/WebRTC.framework/Headers/RTCMetrics.h
#	ios/Pods/JitsiMeetSDK/Frameworks/WebRTC.framework/Headers/RTCMetricsSampleInfo.h
#	ios/Pods/JitsiMeetSDK/Frameworks/WebRTC.framework/Headers/RTCMutableI420Buffer.h
#	ios/Pods/JitsiMeetSDK/Frameworks/WebRTC.framework/Headers/RTCMutableYUVPlanarBuffer.h
#	ios/Pods/JitsiMeetSDK/Frameworks/WebRTC.framework/Headers/RTCNativeI420Buffer.h
#	ios/Pods/JitsiMeetSDK/Frameworks/WebRTC.framework/Headers/RTCNativeMutableI420Buffer.h
#	ios/Pods/JitsiMeetSDK/Frameworks/WebRTC.framework/Headers/RTCPeerConnection.h
#	ios/Pods/JitsiMeetSDK/Frameworks/WebRTC.framework/Headers/RTCPeerConnectionFactory.h
#	ios/Pods/JitsiMeetSDK/Frameworks/WebRTC.framework/Headers/RTCPeerConnectionFactoryOptions.h
#	ios/Pods/JitsiMeetSDK/Frameworks/WebRTC.framework/Headers/RTCRtcpParameters.h
#	ios/Pods/JitsiMeetSDK/Frameworks/WebRTC.framework/Headers/RTCRtpCodecParameters.h
#	ios/Pods/JitsiMeetSDK/Frameworks/WebRTC.framework/Headers/RTCRtpEncodingParameters.h
#	ios/Pods/JitsiMeetSDK/Frameworks/WebRTC.framework/Headers/RTCRtpFragmentationHeader.h
#	ios/Pods/JitsiMeetSDK/Frameworks/WebRTC.framework/Headers/RTCRtpHeaderExtension.h
#	ios/Pods/JitsiMeetSDK/Frameworks/WebRTC.framework/Headers/RTCRtpParameters.h
#	ios/Pods/JitsiMeetSDK/Frameworks/WebRTC.framework/Headers/RTCRtpReceiver.h
#	ios/Pods/JitsiMeetSDK/Frameworks/WebRTC.framework/Headers/RTCRtpSender.h
#	ios/Pods/JitsiMeetSDK/Frameworks/WebRTC.framework/Headers/RTCRtpTransceiver.h
#	ios/Pods/JitsiMeetSDK/Frameworks/WebRTC.framework/Headers/RTCSessionDescription.h
#	ios/Pods/JitsiMeetSDK/Frameworks/WebRTC.framework/Headers/RTCVideoCapturer.h
#	ios/Pods/JitsiMeetSDK/Frameworks/WebRTC.framework/Headers/RTCVideoCodecInfo.h
#	ios/Pods/JitsiMeetSDK/Frameworks/WebRTC.framework/Headers/RTCVideoDecoder.h
#	ios/Pods/JitsiMeetSDK/Frameworks/WebRTC.framework/Headers/RTCVideoDecoderFactory.h
#	ios/Pods/JitsiMeetSDK/Frameworks/WebRTC.framework/Headers/RTCVideoDecoderFactoryH264.h
#	ios/Pods/JitsiMeetSDK/Frameworks/WebRTC.framework/Headers/RTCVideoDecoderH264.h
#	ios/Pods/JitsiMeetSDK/Frameworks/WebRTC.framework/Headers/RTCVideoDecoderVP8.h
#	ios/Pods/JitsiMeetSDK/Frameworks/WebRTC.framework/Headers/RTCVideoDecoderVP9.h
#	ios/Pods/JitsiMeetSDK/Frameworks/WebRTC.framework/Headers/RTCVideoEncoder.h
#	ios/Pods/JitsiMeetSDK/Frameworks/WebRTC.framework/Headers/RTCVideoEncoderFactory.h
#	ios/Pods/JitsiMeetSDK/Frameworks/WebRTC.framework/Headers/RTCVideoEncoderFactoryH264.h
#	ios/Pods/JitsiMeetSDK/Frameworks/WebRTC.framework/Headers/RTCVideoEncoderH264.h
#	ios/Pods/JitsiMeetSDK/Frameworks/WebRTC.framework/Headers/RTCVideoEncoderQpThresholds.h
#	ios/Pods/JitsiMeetSDK/Frameworks/WebRTC.framework/Headers/RTCVideoEncoderSettings.h
#	ios/Pods/JitsiMeetSDK/Frameworks/WebRTC.framework/Headers/RTCVideoEncoderVP8.h
#	ios/Pods/JitsiMeetSDK/Frameworks/WebRTC.framework/Headers/RTCVideoEncoderVP9.h
#	ios/Pods/JitsiMeetSDK/Frameworks/WebRTC.framework/Headers/RTCVideoFrame.h
#	ios/Pods/JitsiMeetSDK/Frameworks/WebRTC.framework/Headers/RTCVideoFrameBuffer.h
#	ios/Pods/JitsiMeetSDK/Frameworks/WebRTC.framework/Headers/RTCVideoRenderer.h
#	ios/Pods/JitsiMeetSDK/Frameworks/WebRTC.framework/Headers/RTCVideoSource.h
#	ios/Pods/JitsiMeetSDK/Frameworks/WebRTC.framework/Headers/RTCVideoTrack.h
#	ios/Pods/JitsiMeetSDK/Frameworks/WebRTC.framework/Headers/RTCVideoViewShading.h
#	ios/Pods/JitsiMeetSDK/Frameworks/WebRTC.framework/Headers/RTCYUVPlanarBuffer.h
#	ios/Pods/JitsiMeetSDK/Frameworks/WebRTC.framework/Headers/UIDevice+RTCDevice.h
#	ios/Pods/JitsiMeetSDK/Frameworks/WebRTC.framework/Headers/WebRTC.h
#	ios/Pods/JitsiMeetSDK/Frameworks/WebRTC.framework/Info.plist
#	ios/Pods/JitsiMeetSDK/Frameworks/WebRTC.framework/WebRTC
#	ios/Pods/JitsiMeetSDK/README.md
#	ios/Pods/Local Podspecs/react-native-jitsi-meet.podspec.json
#	ios/Pods/Manifest.lock
#	ios/Pods/Pods.xcodeproj/project.pbxproj
#	ios/RocketChatRN.xcodeproj/project.pbxproj
#	ios/RocketChatRN/Images.xcassets/Icons/logo.imageset/Contents.json
#	ios/RocketChatRN/Images.xcassets/Icons/logo.imageset/icon@2x.png
#	ios/RocketChatRN/Images.xcassets/Icons/logo.imageset/icon@3x.png
#	ios/RocketChatRN/Images.xcassets/Launch Screen Icon.imageset/Contents.json
#	ios/RocketChatRN/Images.xcassets/Launch Screen Icon.imageset/icon.png
#	ios/RocketChatRN/Images.xcassets/Launch Screen Icon.imageset/icon@2x.png
#	ios/RocketChatRN/Images.xcassets/Launch Screen Icon.imageset/icon@3x.png
#	ios/RocketChatRN/Images.xcassets/splashBackgroundColor.colorset/Contents.json
#	ios/RocketChatRN/Info.plist
#	ios/ShareRocketChatRN/Info.plist
#	ios/custom.ttf
#	ios/fastlane/Fastfile
#	ios/fastlane/report.xml
#	package.json
#	react-native.config.js
#	storybook/index.js
#	storybook/stories/Message.js
#	storybook/stories/RoomItem.js
#	storybook/stories/index.js
#	yarn.lock
  • Loading branch information
@diegolmello
diegolmello committed Nov 9, 2020
2 parents de81fa3 + f9ccf38 commit 9bf6cac
Show file tree
Hide file tree
Showing 7 changed files with 1,026 additions and 0 deletions.
36 changes: 36 additions & 0 deletions Podfile
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
platform :ios, '11.0'
require_relative '../node_modules/react-native/scripts/react_native_pods'
require_relative '../node_modules/@react-native-community/cli-platform-ios/native_modules'
require_relative '../node_modules/react-native-unimodules/cocoapods.rb'

def all_pods
config = use_native_modules!
use_unimodules!
use_react_native!(:path => config["reactNativePath"])
use_flipper!
end

target 'RocketChatRN' do
# force use our own JitsiMeetSDK
pod 'JitsiMeetSDK', :git => 'https://github.com/RocketChat/jitsi-meet-ios-sdk-releases.git'

all_pods
end

target 'ShareRocketChatRN' do
all_pods
end

# used to get user credentials
target 'NotificationService' do
all_pods
end

post_install do |installer|
installer.pods_project.targets.each do |target|
target.build_configurations.each do |config|
config.build_settings['APPLICATION_EXTENSION_API_ONLY'] = 'NO'
end
end
flipper_post_install(installer)
end
Loading

0 comments on commit 9bf6cac

Please sign in to comment.