From 741280a8f8a73dcdc2f22f52d5c1d116df157e82 Mon Sep 17 00:00:00 2001 From: Gheorghe Pinzaru Date: Fri, 8 May 2020 13:51:12 +0300 Subject: [PATCH] Fix Flipper iOs crash on base64 image uri https://github.com/facebook/react-native/issues/28583 Signed-off-by: Gheorghe Pinzaru --- ios/Podfile | 2 +- ios/Podfile.lock | 80 ++++++++++++++------------ ios/StatusIm.xcodeproj/project.pbxproj | 3 +- ios/StatusIm/AppDelegate.m | 4 +- 4 files changed, 47 insertions(+), 42 deletions(-) diff --git a/ios/Podfile b/ios/Podfile index 9985db62d54..ba77306ca76 100644 --- a/ios/Podfile +++ b/ios/Podfile @@ -2,7 +2,7 @@ platform :ios, '9.0' require_relative '../node_modules/@react-native-community/cli-platform-ios/native_modules' def add_flipper_pods!(versions = {}) - versions['Flipper'] ||= '~> 0.33.1' + versions['Flipper'] ||= '~> 0.37.0' versions['DoubleConversion'] ||= '1.1.7' versions['Flipper-Folly'] ||= '~> 2.1' versions['Flipper-Glog'] ||= '0.3.6' diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 752a6411af3..db6d9616bd8 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -11,9 +11,9 @@ PODS: - React-Core (= 0.62.2) - React-jsi (= 0.62.2) - ReactCommon/turbomodule/core (= 0.62.2) - - Flipper (0.33.1): - - Flipper-Folly (~> 2.1) - - Flipper-RSocket (~> 1.0) + - Flipper (0.37.0): + - Flipper-Folly (~> 2.2) + - Flipper-RSocket (~> 1.1) - Flipper-DoubleConversion (1.1.7) - Flipper-Folly (2.2.0): - boost-for-react-native @@ -25,36 +25,36 @@ PODS: - Flipper-PeerTalk (0.0.4) - Flipper-RSocket (1.1.0): - Flipper-Folly (~> 2.2) - - FlipperKit (0.33.1): - - FlipperKit/Core (= 0.33.1) - - FlipperKit/Core (0.33.1): - - Flipper (~> 0.33.1) + - FlipperKit (0.37.0): + - FlipperKit/Core (= 0.37.0) + - FlipperKit/Core (0.37.0): + - Flipper (~> 0.37.0) - FlipperKit/CppBridge - FlipperKit/FBCxxFollyDynamicConvert - FlipperKit/FBDefines - FlipperKit/FKPortForwarding - - FlipperKit/CppBridge (0.33.1): - - Flipper (~> 0.33.1) - - FlipperKit/FBCxxFollyDynamicConvert (0.33.1): - - Flipper-Folly (~> 2.1) - - FlipperKit/FBDefines (0.33.1) - - FlipperKit/FKPortForwarding (0.33.1): + - FlipperKit/CppBridge (0.37.0): + - Flipper (~> 0.37.0) + - FlipperKit/FBCxxFollyDynamicConvert (0.37.0): + - Flipper-Folly (~> 2.2) + - FlipperKit/FBDefines (0.37.0) + - FlipperKit/FKPortForwarding (0.37.0): - CocoaAsyncSocket (~> 7.6) - Flipper-PeerTalk (~> 0.0.4) - - FlipperKit/FlipperKitHighlightOverlay (0.33.1) - - FlipperKit/FlipperKitLayoutPlugin (0.33.1): + - FlipperKit/FlipperKitHighlightOverlay (0.37.0) + - FlipperKit/FlipperKitLayoutPlugin (0.37.0): - FlipperKit/Core - FlipperKit/FlipperKitHighlightOverlay - FlipperKit/FlipperKitLayoutTextSearchable - YogaKit (~> 1.18) - - FlipperKit/FlipperKitLayoutTextSearchable (0.33.1) - - FlipperKit/FlipperKitNetworkPlugin (0.33.1): + - FlipperKit/FlipperKitLayoutTextSearchable (0.37.0) + - FlipperKit/FlipperKitNetworkPlugin (0.37.0): - FlipperKit/Core - - FlipperKit/FlipperKitReactPlugin (0.33.1): + - FlipperKit/FlipperKitReactPlugin (0.37.0): - FlipperKit/Core - - FlipperKit/FlipperKitUserDefaultsPlugin (0.33.1): + - FlipperKit/FlipperKitUserDefaultsPlugin (0.37.0): - FlipperKit/Core - - FlipperKit/SKIOSNetworkPlugin (0.33.1): + - FlipperKit/SKIOSNetworkPlugin (0.37.0): - FlipperKit/Core - FlipperKit/FlipperKitNetworkPlugin - Folly (2018.10.22.00): @@ -319,6 +319,8 @@ PODS: - ReactCommon/callinvoker (= 0.62.2) - ReactNativeDarkMode (0.2.2): - React + - RNCClipboard (1.2.2): + - React - RNCMaskedView (0.1.9): - React - RNFS (2.16.6): @@ -359,25 +361,25 @@ DEPENDENCIES: - DoubleConversion (from `../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec`) - FBLazyVector (from `../node_modules/react-native/Libraries/FBLazyVector`) - FBReactNativeSpec (from `../node_modules/react-native/Libraries/FBReactNativeSpec`) - - Flipper (~> 0.33.1) + - Flipper (~> 0.37.0) - Flipper-DoubleConversion (= 1.1.7) - Flipper-Folly (~> 2.1) - Flipper-Glog (= 0.3.6) - Flipper-PeerTalk (~> 0.0.4) - Flipper-RSocket (~> 1.0) - - FlipperKit (~> 0.33.1) - - FlipperKit/Core (~> 0.33.1) - - FlipperKit/CppBridge (~> 0.33.1) - - FlipperKit/FBCxxFollyDynamicConvert (~> 0.33.1) - - FlipperKit/FBDefines (~> 0.33.1) - - FlipperKit/FKPortForwarding (~> 0.33.1) - - FlipperKit/FlipperKitHighlightOverlay (~> 0.33.1) - - FlipperKit/FlipperKitLayoutPlugin (~> 0.33.1) - - FlipperKit/FlipperKitLayoutTextSearchable (~> 0.33.1) - - FlipperKit/FlipperKitNetworkPlugin (~> 0.33.1) - - FlipperKit/FlipperKitReactPlugin (~> 0.33.1) - - FlipperKit/FlipperKitUserDefaultsPlugin (~> 0.33.1) - - FlipperKit/SKIOSNetworkPlugin (~> 0.33.1) + - FlipperKit (~> 0.37.0) + - FlipperKit/Core (~> 0.37.0) + - FlipperKit/CppBridge (~> 0.37.0) + - FlipperKit/FBCxxFollyDynamicConvert (~> 0.37.0) + - FlipperKit/FBDefines (~> 0.37.0) + - FlipperKit/FKPortForwarding (~> 0.37.0) + - FlipperKit/FlipperKitHighlightOverlay (~> 0.37.0) + - FlipperKit/FlipperKitLayoutPlugin (~> 0.37.0) + - FlipperKit/FlipperKitLayoutTextSearchable (~> 0.37.0) + - FlipperKit/FlipperKitNetworkPlugin (~> 0.37.0) + - FlipperKit/FlipperKitReactPlugin (~> 0.37.0) + - FlipperKit/FlipperKitUserDefaultsPlugin (~> 0.37.0) + - FlipperKit/SKIOSNetworkPlugin (~> 0.37.0) - Folly (from `../node_modules/react-native/third-party-podspecs/Folly.podspec`) - glog (from `../node_modules/react-native/third-party-podspecs/glog.podspec`) - RCTRequired (from `../node_modules/react-native/Libraries/RCTRequired`) @@ -412,6 +414,7 @@ DEPENDENCIES: - ReactCommon/callinvoker (from `../node_modules/react-native/ReactCommon`) - ReactCommon/turbomodule/core (from `../node_modules/react-native/ReactCommon`) - ReactNativeDarkMode (from `../node_modules/react-native-dark-mode`) + - "RNCClipboard (from `../node_modules/@react-native-community/clipboard`)" - "RNCMaskedView (from `../node_modules/@react-native-community/masked-view`)" - RNFS (from `../node_modules/react-native-fs`) - RNGestureHandler (from `../node_modules/react-native-gesture-handler`) @@ -516,6 +519,8 @@ EXTERNAL SOURCES: :path: "../node_modules/react-native/ReactCommon" ReactNativeDarkMode: :path: "../node_modules/react-native-dark-mode" + RNCClipboard: + :path: "../node_modules/@react-native-community/clipboard" RNCMaskedView: :path: "../node_modules/@react-native-community/masked-view" RNFS: @@ -548,13 +553,13 @@ SPEC CHECKSUMS: DoubleConversion: 5805e889d232975c086db112ece9ed034df7a0b2 FBLazyVector: 4aab18c93cd9546e4bfed752b4084585eca8b245 FBReactNativeSpec: 5465d51ccfeecb7faa12f9ae0024f2044ce4044e - Flipper: 6c1f484f9a88d30ab3e272800d53688439e50f69 + Flipper: 1670db365568191bd123a0c905b834e77ba9e3d3 Flipper-DoubleConversion: 38631e41ef4f9b12861c67d17cb5518d06badc41 Flipper-Folly: c12092ea368353b58e992843a990a3225d4533c3 Flipper-Glog: 1dfd6abf1e922806c52ceb8701a3599a79a200a6 Flipper-PeerTalk: 116d8f857dc6ef55c7a5a75ea3ceaafe878aadc9 Flipper-RSocket: 64e7431a55835eb953b0bf984ef3b90ae9fdddd7 - FlipperKit: 6dc9b8f4ef60d9e5ded7f0264db299c91f18832e + FlipperKit: afd4259ef9eadeeb2d30250b37d95cb3b6b97a69 Folly: 30e7936e1c45c08d884aa59369ed951a8e68cf51 glog: 682164e7ac67e41afd8f7b6a37a96d04caf61cc0 OpenSSL-Universal: 8b48cc0d10c1b2923617dfe5c178aa9ed2689355 @@ -588,6 +593,7 @@ SPEC CHECKSUMS: React-RCTVibration: 4356114dbcba4ce66991096e51a66e61eda51256 ReactCommon: ed4e11d27609d571e7eee8b65548efc191116eb3 ReactNativeDarkMode: 0178ffca3b10f6a7c9f49d6f9810232b328fa949 + RNCClipboard: 8148e21ac347c51fd6cd4b683389094c216bb543 RNCMaskedView: 71fc32d971f03b7f03d6ab6b86b730c4ee64f5b6 RNFS: 2bd9eb49dc82fa9676382f0585b992c424cd59df RNGestureHandler: 8f09cd560f8d533eb36da5a6c5a843af9f056b38 @@ -605,6 +611,6 @@ SPEC CHECKSUMS: Yoga: 3ebccbdd559724312790e7742142d062476b698e YogaKit: f782866e155069a2cca2517aafea43200b01fd5a -PODFILE CHECKSUM: bc8f0f0e39d12dd833cb71ca1abb6959b5f46885 +PODFILE CHECKSUM: 23557eb8cb46b1c5dd060326fe1873a162394149 COCOAPODS: 1.8.4 diff --git a/ios/StatusIm.xcodeproj/project.pbxproj b/ios/StatusIm.xcodeproj/project.pbxproj index c5fc1bfec97..9d5b9ab1704 100644 --- a/ios/StatusIm.xcodeproj/project.pbxproj +++ b/ios/StatusIm.xcodeproj/project.pbxproj @@ -15,8 +15,8 @@ 34996D7B9E61544498C6F21B /* libPods-StatusIm-StatusImTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BD217B00F08543249C27E827 /* libPods-StatusIm-StatusImTests.a */; }; 3870E1E692E24133A80B07DE /* Inter-SemiBold.otf in Resources */ = {isa = PBXBuildFile; fileRef = 693A62DB37BC4CD5A30E5C96 /* Inter-SemiBold.otf */; }; 393D26E3080B443A998F4A2F /* Inter-Italic.otf in Resources */ = {isa = PBXBuildFile; fileRef = B07176ACDAA1422E8F0A3D6B /* Inter-Italic.otf */; }; - 3ABC7AF8245FF85900612C45 /* InterStatus-Regular.otf in Resources */ = {isa = PBXBuildFile; fileRef = 9C76AF5A418D4D65A4CAD1D9 /* InterStatus-Regular.otf */; }; 3A2626CF245C3F2200D5F94B /* Dummy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A2626CE245C3F2200D5F94B /* Dummy.swift */; }; + 3ABC7AF8245FF85900612C45 /* InterStatus-Regular.otf in Resources */ = {isa = PBXBuildFile; fileRef = 9C76AF5A418D4D65A4CAD1D9 /* InterStatus-Regular.otf */; }; 57C854A7993C47A3B1AECD32 /* Inter-MediumItalic.otf in Resources */ = {isa = PBXBuildFile; fileRef = C6B1215047604CD59A4C74D6 /* Inter-MediumItalic.otf */; }; 70ADBB5ECF934DCF8A0E4919 /* Inter-Regular.otf in Resources */ = {isa = PBXBuildFile; fileRef = 1426DF592BA248FC81D955CB /* Inter-Regular.otf */; }; 74B758FC20D7C00B003343C3 /* launch-image-universal.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 74B758FB20D7C00B003343C3 /* launch-image-universal.storyboard */; }; @@ -679,7 +679,6 @@ "COCOAPODS=1", "$(inherited)", "SQLITE_HAS_CODEC=1", - "ENABLE_FLIPPER=0", ); HEADER_SEARCH_PATHS = ( "$(inherited)", diff --git a/ios/StatusIm/AppDelegate.m b/ios/StatusIm/AppDelegate.m index cb715f9a004..80a3ad11ac6 100644 --- a/ios/StatusIm/AppDelegate.m +++ b/ios/StatusIm/AppDelegate.m @@ -20,7 +20,7 @@ #import #import -#if ENABLE_FLIPPER +#if DEBUG #import #import #import @@ -46,7 +46,7 @@ @implementation AppDelegate - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions { - #if ENABLE_FLIPPER + #if DEBUG InitializeFlipper(application); #endif signal(SIGPIPE, SIG_IGN);