diff --git a/android/app/build.gradle b/android/app/build.gradle
index d25d0425f..e4a4f5260 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -144,7 +144,7 @@ android {
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode VERSIONCODE as Integer
- versionName "4.13.0"
+ versionName "4.13.1"
vectorDrawables.useSupportLibrary = true
if (!isFoss) {
manifestPlaceholders = [BugsnagAPIKey: BugsnagAPIKey as String]
diff --git a/app/lib/methods/helpers/mergeSubscriptionsRooms.js b/app/lib/methods/helpers/mergeSubscriptionsRooms.js
index 024a246d6..1bc3f18b2 100644
--- a/app/lib/methods/helpers/mergeSubscriptionsRooms.js
+++ b/app/lib/methods/helpers/mergeSubscriptionsRooms.js
@@ -15,9 +15,6 @@ export const merge = (subscription, room) => {
if (room) {
if (room._updatedAt) {
subscription.lastMessage = normalizeMessage(room.lastMessage);
- const updatedAt = room?._updatedAt ? new Date(room._updatedAt) : null;
- const lastMessageTs = subscription?.lastMessage?.ts ? new Date(subscription.lastMessage.ts) : null;
- subscription.roomUpdatedAt = Math.max(updatedAt, lastMessageTs);
subscription.description = room.description;
subscription.topic = room.topic;
subscription.announcement = room.announcement;
@@ -28,6 +25,9 @@ export const merge = (subscription, room) => {
subscription.usernames = room.usernames;
subscription.uids = room.uids;
}
+ // https://github.com/RocketChat/Rocket.Chat/blob/develop/app/ui-sidenav/client/roomList.js#L180
+ const lastRoomUpdate = room.lm || subscription.ts || subscription._updatedAt;
+ subscription.roomUpdatedAt = subscription.lr ? Math.max(new Date(subscription.lr), new Date(lastRoomUpdate)) : lastRoomUpdate;
subscription.ro = room.ro;
subscription.broadcast = room.broadcast;
subscription.encrypted = room.encrypted;
diff --git a/app/sagas/deepLinking.js b/app/sagas/deepLinking.js
index 4e30ddfea..caf2a46f9 100644
--- a/app/sagas/deepLinking.js
+++ b/app/sagas/deepLinking.js
@@ -15,7 +15,6 @@ import {
} from '../actions/app';
import { localAuthenticate } from '../utils/localAuthentication';
import { goRoom } from '../utils/goRoom';
-import callJitsi from '../lib/methods/callJitsi';
const roomTypes = {
channel: 'c', direct: 'd', group: 'p', channels: 'l'
@@ -54,7 +53,7 @@ const navigate = function* navigate({ params }) {
yield goRoom({ item, isMasterDetail });
if (params.isCall) {
- callJitsi(item.rid);
+ RocketChat.callJitsi(item.rid);
}
}
} else {
diff --git a/app/utils/fileUpload/index.ios.js b/app/utils/fileUpload/index.ios.js
index 81a94d879..9b8d8d08e 100644
--- a/app/utils/fileUpload/index.ios.js
+++ b/app/utils/fileUpload/index.ios.js
@@ -1,46 +1,50 @@
+class Upload {
+ constructor() {
+ this.xhr = new XMLHttpRequest();
+ this.formData = new FormData();
+ }
+
+ then = (callback) => {
+ this.xhr.onload = () => callback({ respInfo: this.xhr });
+ this.xhr.send(this.formData);
+ }
+
+ catch = (callback) => {
+ this.xhr.onerror = callback;
+ }
+
+ uploadProgress = (callback) => {
+ this.xhr.upload.onprogress = ({ total, loaded }) => callback(loaded, total);
+ }
+
+ cancel = () => {
+ this.xhr.abort();
+ return Promise.resolve();
+ }
+}
+
class FileUpload {
- _xhr = new XMLHttpRequest();
-
- _formData = new FormData();
-
fetch = (method, url, headers, data) => {
- this._xhr.open(method, url);
+ const upload = new Upload();
+ upload.xhr.open(method, url);
Object.keys(headers).forEach((key) => {
- this._xhr.setRequestHeader(key, headers[key]);
+ upload.xhr.setRequestHeader(key, headers[key]);
});
data.forEach((item) => {
if (item.uri) {
- this._formData.append(item.name, {
+ upload.formData.append(item.name, {
uri: item.uri,
type: item.type,
name: item.filename
});
} else {
- this._formData.append(item.name, item.data);
+ upload.formData.append(item.name, item.data);
}
});
- return this;
- }
-
- then = (callback) => {
- this._xhr.onload = () => callback({ respInfo: this._xhr });
- this._xhr.send(this._formData);
- }
-
- catch = (callback) => {
- this._xhr.onerror = callback;
- }
-
- uploadProgress = (callback) => {
- this._xhr.upload.onprogress = ({ total, loaded }) => callback(loaded, total);
- }
-
- cancel = () => {
- this._xhr.abort();
- return Promise.resolve();
+ return upload;
}
}
diff --git a/app/views/AttachmentView.js b/app/views/AttachmentView.js
index 0246b8397..3f4adfec7 100644
--- a/app/views/AttachmentView.js
+++ b/app/views/AttachmentView.js
@@ -119,7 +119,8 @@ class AttachmentView extends React.Component {
this.setState({ loading: true });
try {
const extension = image_url ? `.${ mime.extension(image_type) || 'jpg' }` : `.${ mime.extension(video_type) || 'mp4' }`;
- const path = `${ RNFetchBlob.fs.dirs.DocumentDir + SHA256(url) + extension }`;
+ const documentDir = `${ RNFetchBlob.fs.dirs.DocumentDir }/`;
+ const path = `${ documentDir + SHA256(url) + extension }`;
const file = await RNFetchBlob.config({ path }).fetch('GET', mediaAttachment).then(res => res.path());
await CameraRoll.save(file, { album: 'Rocket.Chat' });
EventEmitter.emit(LISTENER, { message: I18n.t('saved_to_gallery') });
diff --git a/ios/Podfile b/ios/Podfile
index f12dd43a0..9b4904be1 100644
--- a/ios/Podfile
+++ b/ios/Podfile
@@ -10,11 +10,14 @@ def all_pods
use_flipper!
end
-target 'RocketChatRN' do
+abstract_target 'defaults' do
# force use our own JitsiMeetSDK
pod 'JitsiMeetSDK', :git => 'https://github.com/RocketChat/jitsi-meet-ios-sdk-releases.git'
all_pods
+
+ target 'RocketChatRN' # Experimental app
+ target 'Rocket.Chat' # Official app
end
target 'ShareRocketChatRN' do
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
index bbf90a9ed..4d25556b4 100644
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -39,14 +39,14 @@ PODS:
- UMFileSystemInterface
- EXWebBrowser (8.3.1):
- UMCore
- - FBLazyVector (0.63.2)
- - FBReactNativeSpec (0.63.2):
+ - FBLazyVector (0.63.4)
+ - FBReactNativeSpec (0.63.4):
- Folly (= 2020.01.13.00)
- - RCTRequired (= 0.63.2)
- - RCTTypeSafety (= 0.63.2)
- - React-Core (= 0.63.2)
- - React-jsi (= 0.63.2)
- - ReactCommon/turbomodule/core (= 0.63.2)
+ - RCTRequired (= 0.63.4)
+ - RCTTypeSafety (= 0.63.4)
+ - React-Core (= 0.63.4)
+ - React-jsi (= 0.63.4)
+ - ReactCommon/turbomodule/core (= 0.63.4)
- Firebase/Analytics (6.27.1):
- Firebase/Core
- Firebase/Core (6.27.1):
@@ -87,7 +87,7 @@ PODS:
- GoogleUtilities/Environment (~> 6.7)
- GoogleUtilities/UserDefaults (~> 6.7)
- PromisesObjC (~> 1.2)
- - Flipper (0.41.5):
+ - Flipper (0.54.0):
- Flipper-Folly (~> 2.2)
- Flipper-RSocket (~> 1.1)
- Flipper-DoubleConversion (1.1.7)
@@ -101,36 +101,36 @@ PODS:
- Flipper-PeerTalk (0.0.4)
- Flipper-RSocket (1.1.0):
- Flipper-Folly (~> 2.2)
- - FlipperKit (0.41.5):
- - FlipperKit/Core (= 0.41.5)
- - FlipperKit/Core (0.41.5):
- - Flipper (~> 0.41.5)
+ - FlipperKit (0.54.0):
+ - FlipperKit/Core (= 0.54.0)
+ - FlipperKit/Core (0.54.0):
+ - Flipper (~> 0.54.0)
- FlipperKit/CppBridge
- FlipperKit/FBCxxFollyDynamicConvert
- FlipperKit/FBDefines
- FlipperKit/FKPortForwarding
- - FlipperKit/CppBridge (0.41.5):
- - Flipper (~> 0.41.5)
- - FlipperKit/FBCxxFollyDynamicConvert (0.41.5):
+ - FlipperKit/CppBridge (0.54.0):
+ - Flipper (~> 0.54.0)
+ - FlipperKit/FBCxxFollyDynamicConvert (0.54.0):
- Flipper-Folly (~> 2.2)
- - FlipperKit/FBDefines (0.41.5)
- - FlipperKit/FKPortForwarding (0.41.5):
+ - FlipperKit/FBDefines (0.54.0)
+ - FlipperKit/FKPortForwarding (0.54.0):
- CocoaAsyncSocket (~> 7.6)
- Flipper-PeerTalk (~> 0.0.4)
- - FlipperKit/FlipperKitHighlightOverlay (0.41.5)
- - FlipperKit/FlipperKitLayoutPlugin (0.41.5):
+ - FlipperKit/FlipperKitHighlightOverlay (0.54.0)
+ - FlipperKit/FlipperKitLayoutPlugin (0.54.0):
- FlipperKit/Core
- FlipperKit/FlipperKitHighlightOverlay
- FlipperKit/FlipperKitLayoutTextSearchable
- YogaKit (~> 1.18)
- - FlipperKit/FlipperKitLayoutTextSearchable (0.41.5)
- - FlipperKit/FlipperKitNetworkPlugin (0.41.5):
+ - FlipperKit/FlipperKitLayoutTextSearchable (0.54.0)
+ - FlipperKit/FlipperKitNetworkPlugin (0.54.0):
- FlipperKit/Core
- - FlipperKit/FlipperKitReactPlugin (0.41.5):
+ - FlipperKit/FlipperKitReactPlugin (0.54.0):
- FlipperKit/Core
- - FlipperKit/FlipperKitUserDefaultsPlugin (0.41.5):
+ - FlipperKit/FlipperKitUserDefaultsPlugin (0.54.0):
- FlipperKit/Core
- - FlipperKit/SKIOSNetworkPlugin (0.41.5):
+ - FlipperKit/SKIOSNetworkPlugin (0.54.0):
- FlipperKit/Core
- FlipperKit/FlipperKitNetworkPlugin
- Folly (2020.01.13.00):
@@ -196,179 +196,179 @@ PODS:
- OpenSSL-Universal/Static (= 1.0.2.19)
- OpenSSL-Universal/Static (1.0.2.19)
- PromisesObjC (1.2.9)
- - RCTRequired (0.63.2)
- - RCTTypeSafety (0.63.2):
- - FBLazyVector (= 0.63.2)
+ - RCTRequired (0.63.4)
+ - RCTTypeSafety (0.63.4):
+ - FBLazyVector (= 0.63.4)
- Folly (= 2020.01.13.00)
- - RCTRequired (= 0.63.2)
- - React-Core (= 0.63.2)
- - React (0.63.2):
- - React-Core (= 0.63.2)
- - React-Core/DevSupport (= 0.63.2)
- - React-Core/RCTWebSocket (= 0.63.2)
- - React-RCTActionSheet (= 0.63.2)
- - React-RCTAnimation (= 0.63.2)
- - React-RCTBlob (= 0.63.2)
- - React-RCTImage (= 0.63.2)
- - React-RCTLinking (= 0.63.2)
- - React-RCTNetwork (= 0.63.2)
- - React-RCTSettings (= 0.63.2)
- - React-RCTText (= 0.63.2)
- - React-RCTVibration (= 0.63.2)
- - React-callinvoker (0.63.2)
- - React-Core (0.63.2):
+ - RCTRequired (= 0.63.4)
+ - React-Core (= 0.63.4)
+ - React (0.63.4):
+ - React-Core (= 0.63.4)
+ - React-Core/DevSupport (= 0.63.4)
+ - React-Core/RCTWebSocket (= 0.63.4)
+ - React-RCTActionSheet (= 0.63.4)
+ - React-RCTAnimation (= 0.63.4)
+ - React-RCTBlob (= 0.63.4)
+ - React-RCTImage (= 0.63.4)
+ - React-RCTLinking (= 0.63.4)
+ - React-RCTNetwork (= 0.63.4)
+ - React-RCTSettings (= 0.63.4)
+ - React-RCTText (= 0.63.4)
+ - React-RCTVibration (= 0.63.4)
+ - React-callinvoker (0.63.4)
+ - React-Core (0.63.4):
- Folly (= 2020.01.13.00)
- glog
- - React-Core/Default (= 0.63.2)
- - React-cxxreact (= 0.63.2)
- - React-jsi (= 0.63.2)
- - React-jsiexecutor (= 0.63.2)
+ - React-Core/Default (= 0.63.4)
+ - React-cxxreact (= 0.63.4)
+ - React-jsi (= 0.63.4)
+ - React-jsiexecutor (= 0.63.4)
- Yoga
- - React-Core/CoreModulesHeaders (0.63.2):
+ - React-Core/CoreModulesHeaders (0.63.4):
- Folly (= 2020.01.13.00)
- glog
- React-Core/Default
- - React-cxxreact (= 0.63.2)
- - React-jsi (= 0.63.2)
- - React-jsiexecutor (= 0.63.2)
+ - React-cxxreact (= 0.63.4)
+ - React-jsi (= 0.63.4)
+ - React-jsiexecutor (= 0.63.4)
- Yoga
- - React-Core/Default (0.63.2):
+ - React-Core/Default (0.63.4):
- Folly (= 2020.01.13.00)
- glog
- - React-cxxreact (= 0.63.2)
- - React-jsi (= 0.63.2)
- - React-jsiexecutor (= 0.63.2)
+ - React-cxxreact (= 0.63.4)
+ - React-jsi (= 0.63.4)
+ - React-jsiexecutor (= 0.63.4)
- Yoga
- - React-Core/DevSupport (0.63.2):
+ - React-Core/DevSupport (0.63.4):
- Folly (= 2020.01.13.00)
- glog
- - React-Core/Default (= 0.63.2)
- - React-Core/RCTWebSocket (= 0.63.2)
- - React-cxxreact (= 0.63.2)
- - React-jsi (= 0.63.2)
- - React-jsiexecutor (= 0.63.2)
- - React-jsinspector (= 0.63.2)
+ - React-Core/Default (= 0.63.4)
+ - React-Core/RCTWebSocket (= 0.63.4)
+ - React-cxxreact (= 0.63.4)
+ - React-jsi (= 0.63.4)
+ - React-jsiexecutor (= 0.63.4)
+ - React-jsinspector (= 0.63.4)
- Yoga
- - React-Core/RCTActionSheetHeaders (0.63.2):
+ - React-Core/RCTActionSheetHeaders (0.63.4):
- Folly (= 2020.01.13.00)
- glog
- React-Core/Default
- - React-cxxreact (= 0.63.2)
- - React-jsi (= 0.63.2)
- - React-jsiexecutor (= 0.63.2)
+ - React-cxxreact (= 0.63.4)
+ - React-jsi (= 0.63.4)
+ - React-jsiexecutor (= 0.63.4)
- Yoga
- - React-Core/RCTAnimationHeaders (0.63.2):
+ - React-Core/RCTAnimationHeaders (0.63.4):
- Folly (= 2020.01.13.00)
- glog
- React-Core/Default
- - React-cxxreact (= 0.63.2)
- - React-jsi (= 0.63.2)
- - React-jsiexecutor (= 0.63.2)
+ - React-cxxreact (= 0.63.4)
+ - React-jsi (= 0.63.4)
+ - React-jsiexecutor (= 0.63.4)
- Yoga
- - React-Core/RCTBlobHeaders (0.63.2):
+ - React-Core/RCTBlobHeaders (0.63.4):
- Folly (= 2020.01.13.00)
- glog
- React-Core/Default
- - React-cxxreact (= 0.63.2)
- - React-jsi (= 0.63.2)
- - React-jsiexecutor (= 0.63.2)
+ - React-cxxreact (= 0.63.4)
+ - React-jsi (= 0.63.4)
+ - React-jsiexecutor (= 0.63.4)
- Yoga
- - React-Core/RCTImageHeaders (0.63.2):
+ - React-Core/RCTImageHeaders (0.63.4):
- Folly (= 2020.01.13.00)
- glog
- React-Core/Default
- - React-cxxreact (= 0.63.2)
- - React-jsi (= 0.63.2)
- - React-jsiexecutor (= 0.63.2)
+ - React-cxxreact (= 0.63.4)
+ - React-jsi (= 0.63.4)
+ - React-jsiexecutor (= 0.63.4)
- Yoga
- - React-Core/RCTLinkingHeaders (0.63.2):
+ - React-Core/RCTLinkingHeaders (0.63.4):
- Folly (= 2020.01.13.00)
- glog
- React-Core/Default
- - React-cxxreact (= 0.63.2)
- - React-jsi (= 0.63.2)
- - React-jsiexecutor (= 0.63.2)
+ - React-cxxreact (= 0.63.4)
+ - React-jsi (= 0.63.4)
+ - React-jsiexecutor (= 0.63.4)
- Yoga
- - React-Core/RCTNetworkHeaders (0.63.2):
+ - React-Core/RCTNetworkHeaders (0.63.4):
- Folly (= 2020.01.13.00)
- glog
- React-Core/Default
- - React-cxxreact (= 0.63.2)
- - React-jsi (= 0.63.2)
- - React-jsiexecutor (= 0.63.2)
+ - React-cxxreact (= 0.63.4)
+ - React-jsi (= 0.63.4)
+ - React-jsiexecutor (= 0.63.4)
- Yoga
- - React-Core/RCTSettingsHeaders (0.63.2):
+ - React-Core/RCTSettingsHeaders (0.63.4):
- Folly (= 2020.01.13.00)
- glog
- React-Core/Default
- - React-cxxreact (= 0.63.2)
- - React-jsi (= 0.63.2)
- - React-jsiexecutor (= 0.63.2)
+ - React-cxxreact (= 0.63.4)
+ - React-jsi (= 0.63.4)
+ - React-jsiexecutor (= 0.63.4)
- Yoga
- - React-Core/RCTTextHeaders (0.63.2):
+ - React-Core/RCTTextHeaders (0.63.4):
- Folly (= 2020.01.13.00)
- glog
- React-Core/Default
- - React-cxxreact (= 0.63.2)
- - React-jsi (= 0.63.2)
- - React-jsiexecutor (= 0.63.2)
+ - React-cxxreact (= 0.63.4)
+ - React-jsi (= 0.63.4)
+ - React-jsiexecutor (= 0.63.4)
- Yoga
- - React-Core/RCTVibrationHeaders (0.63.2):
+ - React-Core/RCTVibrationHeaders (0.63.4):
- Folly (= 2020.01.13.00)
- glog
- React-Core/Default
- - React-cxxreact (= 0.63.2)
- - React-jsi (= 0.63.2)
- - React-jsiexecutor (= 0.63.2)
+ - React-cxxreact (= 0.63.4)
+ - React-jsi (= 0.63.4)
+ - React-jsiexecutor (= 0.63.4)
- Yoga
- - React-Core/RCTWebSocket (0.63.2):
+ - React-Core/RCTWebSocket (0.63.4):
- Folly (= 2020.01.13.00)
- glog
- - React-Core/Default (= 0.63.2)
- - React-cxxreact (= 0.63.2)
- - React-jsi (= 0.63.2)
- - React-jsiexecutor (= 0.63.2)
+ - React-Core/Default (= 0.63.4)
+ - React-cxxreact (= 0.63.4)
+ - React-jsi (= 0.63.4)
+ - React-jsiexecutor (= 0.63.4)
- Yoga
- - React-CoreModules (0.63.2):
- - FBReactNativeSpec (= 0.63.2)
+ - React-CoreModules (0.63.4):
+ - FBReactNativeSpec (= 0.63.4)
- Folly (= 2020.01.13.00)
- - RCTTypeSafety (= 0.63.2)
- - React-Core/CoreModulesHeaders (= 0.63.2)
- - React-jsi (= 0.63.2)
- - React-RCTImage (= 0.63.2)
- - ReactCommon/turbomodule/core (= 0.63.2)
- - React-cxxreact (0.63.2):
+ - RCTTypeSafety (= 0.63.4)
+ - React-Core/CoreModulesHeaders (= 0.63.4)
+ - React-jsi (= 0.63.4)
+ - React-RCTImage (= 0.63.4)
+ - ReactCommon/turbomodule/core (= 0.63.4)
+ - React-cxxreact (0.63.4):
- boost-for-react-native (= 1.63.0)
- DoubleConversion
- Folly (= 2020.01.13.00)
- glog
- - React-callinvoker (= 0.63.2)
- - React-jsinspector (= 0.63.2)
- - React-jsi (0.63.2):
+ - React-callinvoker (= 0.63.4)
+ - React-jsinspector (= 0.63.4)
+ - React-jsi (0.63.4):
- boost-for-react-native (= 1.63.0)
- DoubleConversion
- Folly (= 2020.01.13.00)
- glog
- - React-jsi/Default (= 0.63.2)
- - React-jsi/Default (0.63.2):
+ - React-jsi/Default (= 0.63.4)
+ - React-jsi/Default (0.63.4):
- boost-for-react-native (= 1.63.0)
- DoubleConversion
- Folly (= 2020.01.13.00)
- glog
- - React-jsiexecutor (0.63.2):
+ - React-jsiexecutor (0.63.4):
- DoubleConversion
- Folly (= 2020.01.13.00)
- glog
- - React-cxxreact (= 0.63.2)
- - React-jsi (= 0.63.2)
- - React-jsinspector (0.63.2)
+ - React-cxxreact (= 0.63.4)
+ - React-jsi (= 0.63.4)
+ - React-jsinspector (0.63.4)
- react-native-appearance (0.3.4):
- React
- react-native-background-timer (2.2.0):
- React
- react-native-blur (0.8.0):
- React
- - react-native-cameraroll (4.0.0):
+ - react-native-cameraroll (4.0.1):
- React
- react-native-cookies (4.0.0):
- React
@@ -397,66 +397,66 @@ PODS:
- React
- react-native-webview (10.3.2):
- React
- - React-RCTActionSheet (0.63.2):
- - React-Core/RCTActionSheetHeaders (= 0.63.2)
- - React-RCTAnimation (0.63.2):
- - FBReactNativeSpec (= 0.63.2)
+ - React-RCTActionSheet (0.63.4):
+ - React-Core/RCTActionSheetHeaders (= 0.63.4)
+ - React-RCTAnimation (0.63.4):
+ - FBReactNativeSpec (= 0.63.4)
- Folly (= 2020.01.13.00)
- - RCTTypeSafety (= 0.63.2)
- - React-Core/RCTAnimationHeaders (= 0.63.2)
- - React-jsi (= 0.63.2)
- - ReactCommon/turbomodule/core (= 0.63.2)
- - React-RCTBlob (0.63.2):
- - FBReactNativeSpec (= 0.63.2)
+ - RCTTypeSafety (= 0.63.4)
+ - React-Core/RCTAnimationHeaders (= 0.63.4)
+ - React-jsi (= 0.63.4)
+ - ReactCommon/turbomodule/core (= 0.63.4)
+ - React-RCTBlob (0.63.4):
+ - FBReactNativeSpec (= 0.63.4)
- Folly (= 2020.01.13.00)
- - React-Core/RCTBlobHeaders (= 0.63.2)
- - React-Core/RCTWebSocket (= 0.63.2)
- - React-jsi (= 0.63.2)
- - React-RCTNetwork (= 0.63.2)
- - ReactCommon/turbomodule/core (= 0.63.2)
- - React-RCTImage (0.63.2):
- - FBReactNativeSpec (= 0.63.2)
+ - React-Core/RCTBlobHeaders (= 0.63.4)
+ - React-Core/RCTWebSocket (= 0.63.4)
+ - React-jsi (= 0.63.4)
+ - React-RCTNetwork (= 0.63.4)
+ - ReactCommon/turbomodule/core (= 0.63.4)
+ - React-RCTImage (0.63.4):
+ - FBReactNativeSpec (= 0.63.4)
- Folly (= 2020.01.13.00)
- - RCTTypeSafety (= 0.63.2)
- - React-Core/RCTImageHeaders (= 0.63.2)
- - React-jsi (= 0.63.2)
- - React-RCTNetwork (= 0.63.2)
- - ReactCommon/turbomodule/core (= 0.63.2)
- - React-RCTLinking (0.63.2):
- - FBReactNativeSpec (= 0.63.2)
- - React-Core/RCTLinkingHeaders (= 0.63.2)
- - React-jsi (= 0.63.2)
- - ReactCommon/turbomodule/core (= 0.63.2)
- - React-RCTNetwork (0.63.2):
- - FBReactNativeSpec (= 0.63.2)
+ - RCTTypeSafety (= 0.63.4)
+ - React-Core/RCTImageHeaders (= 0.63.4)
+ - React-jsi (= 0.63.4)
+ - React-RCTNetwork (= 0.63.4)
+ - ReactCommon/turbomodule/core (= 0.63.4)
+ - React-RCTLinking (0.63.4):
+ - FBReactNativeSpec (= 0.63.4)
+ - React-Core/RCTLinkingHeaders (= 0.63.4)
+ - React-jsi (= 0.63.4)
+ - ReactCommon/turbomodule/core (= 0.63.4)
+ - React-RCTNetwork (0.63.4):
+ - FBReactNativeSpec (= 0.63.4)
- Folly (= 2020.01.13.00)
- - RCTTypeSafety (= 0.63.2)
- - React-Core/RCTNetworkHeaders (= 0.63.2)
- - React-jsi (= 0.63.2)
- - ReactCommon/turbomodule/core (= 0.63.2)
- - React-RCTSettings (0.63.2):
- - FBReactNativeSpec (= 0.63.2)
+ - RCTTypeSafety (= 0.63.4)
+ - React-Core/RCTNetworkHeaders (= 0.63.4)
+ - React-jsi (= 0.63.4)
+ - ReactCommon/turbomodule/core (= 0.63.4)
+ - React-RCTSettings (0.63.4):
+ - FBReactNativeSpec (= 0.63.4)
- Folly (= 2020.01.13.00)
- - RCTTypeSafety (= 0.63.2)
- - React-Core/RCTSettingsHeaders (= 0.63.2)
- - React-jsi (= 0.63.2)
- - ReactCommon/turbomodule/core (= 0.63.2)
- - React-RCTText (0.63.2):
- - React-Core/RCTTextHeaders (= 0.63.2)
- - React-RCTVibration (0.63.2):
- - FBReactNativeSpec (= 0.63.2)
+ - RCTTypeSafety (= 0.63.4)
+ - React-Core/RCTSettingsHeaders (= 0.63.4)
+ - React-jsi (= 0.63.4)
+ - ReactCommon/turbomodule/core (= 0.63.4)
+ - React-RCTText (0.63.4):
+ - React-Core/RCTTextHeaders (= 0.63.4)
+ - React-RCTVibration (0.63.4):
+ - FBReactNativeSpec (= 0.63.4)
- Folly (= 2020.01.13.00)
- - React-Core/RCTVibrationHeaders (= 0.63.2)
- - React-jsi (= 0.63.2)
- - ReactCommon/turbomodule/core (= 0.63.2)
- - ReactCommon/turbomodule/core (0.63.2):
+ - React-Core/RCTVibrationHeaders (= 0.63.4)
+ - React-jsi (= 0.63.4)
+ - ReactCommon/turbomodule/core (= 0.63.4)
+ - ReactCommon/turbomodule/core (0.63.4):
- DoubleConversion
- Folly (= 2020.01.13.00)
- glog
- - React-callinvoker (= 0.63.2)
- - React-Core (= 0.63.2)
- - React-cxxreact (= 0.63.2)
- - React-jsi (= 0.63.2)
+ - React-callinvoker (= 0.63.4)
+ - React-Core (= 0.63.4)
+ - React-cxxreact (= 0.63.4)
+ - React-jsi (= 0.63.4)
- ReactNativeART (1.2.0):
- React
- ReactNativeUiLib (3.0.4):
@@ -560,25 +560,25 @@ DEPENDENCIES:
- EXWebBrowser (from `../node_modules/expo-web-browser/ios`)
- FBLazyVector (from `../node_modules/react-native/Libraries/FBLazyVector`)
- FBReactNativeSpec (from `../node_modules/react-native/Libraries/FBReactNativeSpec`)
- - Flipper (~> 0.41.1)
+ - Flipper (~> 0.54.0)
- Flipper-DoubleConversion (= 1.1.7)
- Flipper-Folly (~> 2.2)
- Flipper-Glog (= 0.3.6)
- Flipper-PeerTalk (~> 0.0.4)
- Flipper-RSocket (~> 1.1)
- - FlipperKit (~> 0.41.1)
- - FlipperKit/Core (~> 0.41.1)
- - FlipperKit/CppBridge (~> 0.41.1)
- - FlipperKit/FBCxxFollyDynamicConvert (~> 0.41.1)
- - FlipperKit/FBDefines (~> 0.41.1)
- - FlipperKit/FKPortForwarding (~> 0.41.1)
- - FlipperKit/FlipperKitHighlightOverlay (~> 0.41.1)
- - FlipperKit/FlipperKitLayoutPlugin (~> 0.41.1)
- - FlipperKit/FlipperKitLayoutTextSearchable (~> 0.41.1)
- - FlipperKit/FlipperKitNetworkPlugin (~> 0.41.1)
- - FlipperKit/FlipperKitReactPlugin (~> 0.41.1)
- - FlipperKit/FlipperKitUserDefaultsPlugin (~> 0.41.1)
- - FlipperKit/SKIOSNetworkPlugin (~> 0.41.1)
+ - FlipperKit (~> 0.54.0)
+ - FlipperKit/Core (~> 0.54.0)
+ - FlipperKit/CppBridge (~> 0.54.0)
+ - FlipperKit/FBCxxFollyDynamicConvert (~> 0.54.0)
+ - FlipperKit/FBDefines (~> 0.54.0)
+ - FlipperKit/FKPortForwarding (~> 0.54.0)
+ - FlipperKit/FlipperKitHighlightOverlay (~> 0.54.0)
+ - FlipperKit/FlipperKitLayoutPlugin (~> 0.54.0)
+ - FlipperKit/FlipperKitLayoutTextSearchable (~> 0.54.0)
+ - FlipperKit/FlipperKitNetworkPlugin (~> 0.54.0)
+ - FlipperKit/FlipperKitReactPlugin (~> 0.54.0)
+ - FlipperKit/FlipperKitUserDefaultsPlugin (~> 0.54.0)
+ - FlipperKit/SKIOSNetworkPlugin (~> 0.54.0)
- Folly (from `../node_modules/react-native/third-party-podspecs/Folly.podspec`)
- glog (from `../node_modules/react-native/third-party-podspecs/glog.podspec`)
- JitsiMeetSDK (from `https://github.com/RocketChat/jitsi-meet-ios-sdk-releases.git`)
@@ -897,21 +897,21 @@ SPEC CHECKSUMS:
EXPermissions: 80ac3acbdb145930079810fe5b08c022b3428aa8
EXVideoThumbnails: f70bdc5511749f3181028f5000bcb7be203c631d
EXWebBrowser: d37a5ffdea1b65947352bc001dd9f732463725d4
- FBLazyVector: 3ef4a7f62e7db01092f9d517d2ebc0d0677c4a37
- FBReactNativeSpec: dc7fa9088f0f2a998503a352b0554d69a4391c5a
+ FBLazyVector: 3bb422f41b18121b71783a905c10e58606f7dc3e
+ FBReactNativeSpec: f2c97f2529dd79c083355182cc158c9f98f4bd6e
Firebase: 919186c8e119dd9372a45fd1dd17a8a942bc1892
FirebaseAnalytics: 5fa308e1b13f838d0f6dc74719ac2a72e8c5afc4
FirebaseCore: 8cd4f8ea22075e0ee582849b1cf79d8816506085
FirebaseCoreDiagnostics: 4505e4d4009b1d93f605088ee7d7764d5f0d1c84
FirebaseCrashlytics: 7d0fa02ea8842cc4b2ab07b0735edafde1ad77d6
FirebaseInstallations: 3c520c951305cbf9ca54eb891ff9e6d1fd384881
- Flipper: 33585e2d9810fe5528346be33bcf71b37bb7ae13
+ Flipper: be611d4b742d8c87fbae2ca5f44603a02539e365
Flipper-DoubleConversion: 38631e41ef4f9b12861c67d17cb5518d06badc41
Flipper-Folly: c12092ea368353b58e992843a990a3225d4533c3
Flipper-Glog: 1dfd6abf1e922806c52ceb8701a3599a79a200a6
Flipper-PeerTalk: 116d8f857dc6ef55c7a5a75ea3ceaafe878aadc9
Flipper-RSocket: 64e7431a55835eb953b0bf984ef3b90ae9fdddd7
- FlipperKit: bc68102cd4952a258a23c9c1b316c7bec1fecf83
+ FlipperKit: ab353d41aea8aae2ea6daaf813e67496642f3d7d
Folly: b73c3869541e86821df3c387eb0af5f65addfab4
glog: 40a13f7840415b9a77023fbcae0f1e6f43192af3
GoogleAppMeasurement: 8cd1f289d60e629cf16ab03363b9e89c776b9651
@@ -926,20 +926,20 @@ SPEC CHECKSUMS:
nanopb: c43f40fadfe79e8b8db116583945847910cbabc9
OpenSSL-Universal: 8b48cc0d10c1b2923617dfe5c178aa9ed2689355
PromisesObjC: b48e0338dbbac2207e611750777895f7a5811b75
- RCTRequired: f13f25e7b12f925f1f6a6a8c69d929a03c0129fe
- RCTTypeSafety: 44982c5c8e43ff4141eb519a8ddc88059acd1f3a
- React: e1c65dd41cb9db13b99f24608e47dd595f28ca9a
- React-callinvoker: 552a6a6bc8b3bb794cf108ad59e5a9e2e3b4fc98
- React-Core: 9d341e725dc9cd2f49e4c49ad1fc4e8776aa2639
- React-CoreModules: 5335e168165da7f7083ce7147768d36d3e292318
- React-cxxreact: d3261ec5f7d11743fbf21e263a34ea51d1f13ebc
- React-jsi: 54245e1d5f4b690dec614a73a3795964eeef13a8
- React-jsiexecutor: 8ca588cc921e70590820ce72b8789b02c67cce38
- React-jsinspector: b14e62ebe7a66e9231e9581279909f2fc3db6606
+ RCTRequired: 082f10cd3f905d6c124597fd1c14f6f2655ff65e
+ RCTTypeSafety: 8c9c544ecbf20337d069e4ae7fd9a377aadf504b
+ React: b0a957a2c44da4113b0c4c9853d8387f8e64e615
+ React-callinvoker: c3f44dd3cb195b6aa46621fff95ded79d59043fe
+ React-Core: d3b2a1ac9a2c13c3bcde712d9281fc1c8a5b315b
+ React-CoreModules: 0581ff36cb797da0943d424f69e7098e43e9be60
+ React-cxxreact: c1480d4fda5720086c90df537ee7d285d4c57ac3
+ React-jsi: a0418934cf48f25b485631deb27c64dc40fb4c31
+ React-jsiexecutor: 93bd528844ad21dc07aab1c67cb10abae6df6949
+ React-jsinspector: 58aef7155bc9a9683f5b60b35eccea8722a4f53a
react-native-appearance: 0f0e5fc2fcef70e03d48c8fe6b00b9158c2ba8aa
react-native-background-timer: 1f7d560647b40e6a60b01c452ba29c54bf581fc4
react-native-blur: cad4d93b364f91e7b7931b3fa935455487e5c33c
- react-native-cameraroll: ae0a7c0cc8462508855707ff623b1e789b692865
+ react-native-cameraroll: 60ba0068826eab1c8d43146191bafd4363ea58a7
react-native-cookies: d79e5015a5d3a38e08f5cb39c4948532be7e9c2b
react-native-document-picker: 825552b827012282baf4b7cbf119d3b37a280c90
react-native-jitsi-meet: f2407aca85566e031ee7b222e497ee5ecb6623de
@@ -952,16 +952,16 @@ SPEC CHECKSUMS:
react-native-simple-crypto: 564740fd8124827d82e9e8ded4a0de8c695c8a4d
react-native-slider: 0221b417686c5957f6e77cd9ac22c1478a165355
react-native-webview: 679b6f400176e2ea8a785acf7ae16cf282e7d1eb
- React-RCTActionSheet: 910163b6b09685a35c4ebbc52b66d1bfbbe39fc5
- React-RCTAnimation: 9a883bbe1e9d2e158d4fb53765ed64c8dc2200c6
- React-RCTBlob: 39cf0ece1927996c4466510e25d2105f67010e13
- React-RCTImage: de355d738727b09ad3692f2a979affbd54b5f378
- React-RCTLinking: 8122f221d395a63364b2c0078ce284214bd04575
- React-RCTNetwork: 8f96c7b49ea6a0f28f98258f347b6ad218bc0830
- React-RCTSettings: 8a49622aff9c1925f5455fa340b6fe4853d64ab6
- React-RCTText: 1b6773e776e4b33f90468c20fe3b16ca3e224bb8
- React-RCTVibration: 4d2e726957f4087449739b595f107c0d4b6c2d2d
- ReactCommon: a0a1edbebcac5e91338371b72ffc66aa822792ce
+ React-RCTActionSheet: 89a0ca9f4a06c1f93c26067af074ccdce0f40336
+ React-RCTAnimation: 1bde3ecc0c104c55df246eda516e0deb03c4e49b
+ React-RCTBlob: a97d378b527740cc667e03ebfa183a75231ab0f0
+ React-RCTImage: c1b1f2d3f43a4a528c8946d6092384b5c880d2f0
+ React-RCTLinking: 35ae4ab9dc0410d1fcbdce4d7623194a27214fb2
+ React-RCTNetwork: 29ec2696f8d8cfff7331fac83d3e893c95ef43ae
+ React-RCTSettings: 60f0691bba2074ef394f95d4c2265ec284e0a46a
+ React-RCTText: 5c51df3f08cb9dedc6e790161195d12bac06101c
+ React-RCTVibration: ae4f914cfe8de7d4de95ae1ea6cc8f6315d73d9d
+ ReactCommon: 73d79c7039f473b76db6ff7c6b159c478acbbb3b
ReactNativeART: 78edc68dd4a1e675338cd0cd113319cf3a65f2ab
ReactNativeUiLib: cde7263a7d308b60161cd286f95c9433e79f2f7d
rn-extensions-share: 8db79372089567cbc5aefe8444869bbc808578d3
@@ -1000,9 +1000,9 @@ SPEC CHECKSUMS:
UMReactNativeAdapter: 538efe92e781b5d7678cf95b34c46f2d0989a557
UMSensorsInterface: cb5bf31d52c4349f0ff9e3c049bbe4df0d80d383
UMTaskManagerInterface: 80653f25c55d9e6d79d6a0a65589fa213feaee11
- Yoga: 7740b94929bbacbddda59bf115b5317e9a161598
+ Yoga: 4bd86afe9883422a7c4028c00e34790f560923d6
YogaKit: f782866e155069a2cca2517aafea43200b01fd5a
-PODFILE CHECKSUM: c38f9a91b5c154453863a4ee1ccc203da58ad2f2
+PODFILE CHECKSUM: 8477bd3277dec7b3190105d922512e3791bc026f
COCOAPODS: 1.9.3
diff --git a/ios/Pods/Flipper/README.md b/ios/Pods/Flipper/README.md
index b028c7ec3..b176ff737 100644
--- a/ios/Pods/Flipper/README.md
+++ b/ios/Pods/Flipper/README.md
@@ -1,8 +1,26 @@
-# Flipper [![Build Status](https://travis-ci.org/facebook/flipper.svg?branch=master)](https://travis-ci.org/facebook/flipper) [![Android Maven Badge](https://img.shields.io/maven-metadata/v/https/jcenter.bintray.com/com/facebook/flipper/flipper/maven-metadata.xml.svg?color=green&label=android)](https://bintray.com/facebook/maven/com.facebook.flipper%3Aflipper) [![iOS](https://img.shields.io/cocoapods/v/FlipperKit.svg?label=iOS&color=blue)](https://cocoapods.org/pods/Flipper) [![Greenkeeper badge](https://badges.greenkeeper.io/facebook/flipper.svg)](https://greenkeeper.io/)
+
+
+
+
+ Flipper
+
+
+
+
+
+
+
+
+
+
+
+
-Flipper (formerly Sonar) is a platform for debugging mobile apps on iOS and Android. Visualize, inspect, and control your apps from a simple desktop interface. Use Flipper as is or extend it using the plugin API.
+
+ Flipper (formerly Sonar) is a platform for debugging mobile apps on iOS and Android. Visualize, inspect, and control your apps from a simple desktop interface. Use Flipper as is or extend it using the plugin API.
+
-![Flipper](/docs/assets/layout.png)
+![Flipper](/website/static/img/layout.png)
## Table of Contents
@@ -32,7 +50,7 @@ Flipper is built as a platform. In addition to using the tools already included,
## Contributing to Flipper
-Both Flipper's desktop app and native mobile SDKs are open-source and MIT licensed. This enables you to see and understand how we are building plugins, and of course, join the community and help improve Flipper. We are excited to see what you will build on this platform.
+Both Flipper's desktop app and native mobile SDKs are open-source and MIT licensed. This enables you to see and understand how we are building plugins, and of course, join the community and help to improve Flipper. We are excited to see what you will build on this platform.
# In this repo
diff --git a/ios/Pods/Flipper/xplat/Flipper/ConnectionContextStore.cpp b/ios/Pods/Flipper/xplat/Flipper/ConnectionContextStore.cpp
index b1d448ab2..59be9b3ba 100644
--- a/ios/Pods/Flipper/xplat/Flipper/ConnectionContextStore.cpp
+++ b/ios/Pods/Flipper/xplat/Flipper/ConnectionContextStore.cpp
@@ -8,12 +8,10 @@
#include "ConnectionContextStore.h"
#include
#include
-#include
#include
#include
#include "CertificateUtils.h"
#include "Log.h"
-
using namespace facebook::flipper;
static constexpr auto CSR_FILE_NAME = "app.csr";
diff --git a/ios/Pods/Flipper/xplat/Flipper/FlipperCertificateExchangeMedium.h b/ios/Pods/Flipper/xplat/Flipper/FlipperCertificateExchangeMedium.h
new file mode 100644
index 000000000..552b081e5
--- /dev/null
+++ b/ios/Pods/Flipper/xplat/Flipper/FlipperCertificateExchangeMedium.h
@@ -0,0 +1,8 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+enum FlipperCertificateExchangeMedium { FS_ACCESS = 1, WWW = 2 };
diff --git a/ios/Pods/Flipper/xplat/Flipper/FlipperCertificateProvider.h b/ios/Pods/Flipper/xplat/Flipper/FlipperCertificateProvider.h
new file mode 100644
index 000000000..7ff01d424
--- /dev/null
+++ b/ios/Pods/Flipper/xplat/Flipper/FlipperCertificateProvider.h
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#pragma once
+
+#include
+#include
+#include "FlipperCertificateExchangeMedium.h"
+#include "FlipperState.h"
+#include "FlipperStep.h"
+namespace facebook {
+namespace flipper {
+
+/**
+ * Represents a FlipperCertificateProvider which is responsible for obtaining
+ * Flipper TLS certificates.
+ */
+class FlipperCertificateProvider {
+ public:
+ virtual ~FlipperCertificateProvider() {}
+
+ /**
+ * Gets certificates downloaded at a path, which is passed as an argument.
+ */
+ virtual void getCertificates(
+ const std::string& path,
+ const std::string& deviceID) = 0;
+
+ /**
+ * Sets certificate exchange medium
+ */
+ virtual void setCertificateExchangeMedium(
+ const FlipperCertificateExchangeMedium medium) = 0;
+
+ /**
+ * Gets certificate exchange medium
+ */
+ virtual FlipperCertificateExchangeMedium getCertificateExchangeMedium() = 0;
+
+ /**
+ * This lets the Client know if it should reset the connection folder when
+ * `stop` is called.
+ */
+ virtual bool shouldResetCertificateFolder() = 0;
+
+ /**
+ * Sets the FlipperState, so that Cert Provider can send debuggin information
+ * to troubleshoot screen.
+ */
+ virtual void setFlipperState(std::shared_ptr state) = 0;
+};
+
+} // namespace flipper
+} // namespace facebook
diff --git a/ios/Pods/Flipper/xplat/Flipper/FlipperClient.cpp b/ios/Pods/Flipper/xplat/Flipper/FlipperClient.cpp
index 6b897d581..44659fc40 100644
--- a/ios/Pods/Flipper/xplat/Flipper/FlipperClient.cpp
+++ b/ios/Pods/Flipper/xplat/Flipper/FlipperClient.cpp
@@ -73,6 +73,17 @@ void FlipperClient::addPlugin(std::shared_ptr plugin) {
});
}
+void FlipperClient::setCertificateProvider(
+ const std::shared_ptr provider) {
+ socket_->setCertificateProvider(provider);
+ log("cpp setCertificateProvider called");
+}
+
+std::shared_ptr
+FlipperClient::getCertificateProvider() {
+ return socket_->getCertificateProvider();
+}
+
void FlipperClient::removePlugin(std::shared_ptr plugin) {
performAndReportError([this, plugin]() {
log("FlipperClient::removePlugin " + plugin->identifier());
diff --git a/ios/Pods/Flipper/xplat/Flipper/FlipperClient.h b/ios/Pods/Flipper/xplat/Flipper/FlipperClient.h
index 28071e818..31b71e8ac 100644
--- a/ios/Pods/Flipper/xplat/Flipper/FlipperClient.h
+++ b/ios/Pods/Flipper/xplat/Flipper/FlipperClient.h
@@ -10,6 +10,7 @@
#include