From 076e518b11d4caa7fac5240df0c8abec55a756f2 Mon Sep 17 00:00:00 2001
From: Elias Nahum <nahumhbl@gmail.com>
Date: Tue, 10 Sep 2019 15:33:19 -0300
Subject: [PATCH] Update webview library to remove deprecated API (#3233)

* Update webview library to remove deprecated API

* Remove unnecessary timeout
---
 app/screens/sso/sso.js                   | 2 --
 ios/Mattermost.xcodeproj/project.pbxproj | 4 ++--
 package-lock.json                        | 4 ++--
 package.json                             | 2 +-
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/app/screens/sso/sso.js b/app/screens/sso/sso.js
index 2710db9ad..20ed882b8 100644
--- a/app/screens/sso/sso.js
+++ b/app/screens/sso/sso.js
@@ -226,11 +226,9 @@ class SSO extends PureComponent {
                     startInLoadingState={true}
                     onNavigationStateChange={this.onNavigationStateChange}
                     onShouldStartLoadWithRequest={() => true}
-                    renderLoading={this.renderLoading}
                     injectedJavaScript={jsCode}
                     onLoadEnd={this.onLoadEnd}
                     onMessage={messagingEnabled ? this.onMessage : null}
-                    useWebKit={this.useWebkit}
                     useSharedProcessPool={true}
                     cacheEnabled={true}
                 />
diff --git a/ios/Mattermost.xcodeproj/project.pbxproj b/ios/Mattermost.xcodeproj/project.pbxproj
index c08cf6f5e..4d96ef55c 100644
--- a/ios/Mattermost.xcodeproj/project.pbxproj
+++ b/ios/Mattermost.xcodeproj/project.pbxproj
@@ -63,7 +63,6 @@
 		7F240ADB220E089300637665 /* Item.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7F240ADA220E089300637665 /* Item.swift */; };
 		7F240ADD220E094A00637665 /* TeamsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7F240ADC220E094A00637665 /* TeamsViewController.swift */; };
 		7F2691A11EE1DC6A007574FE /* libRNNotifications.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7F2691A01EE1DC51007574FE /* libRNNotifications.a */; };
-		7F26C1CC219C463D00FEB42D /* libRNCWebView.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7F26C1CB219C463300FEB42D /* libRNCWebView.a */; };
 		7F292A711E8AB73400A450A3 /* SplashScreenResource in Resources */ = {isa = PBXBuildFile; fileRef = 7F292A701E8AB73400A450A3 /* SplashScreenResource */; };
 		7F292AA61E8ABB1100A450A3 /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7F292AA41E8ABB1100A450A3 /* LaunchScreen.xib */; };
 		7F292AA71E8ABB1100A450A3 /* splash.png in Resources */ = {isa = PBXBuildFile; fileRef = 7F292AA51E8ABB1100A450A3 /* splash.png */; };
@@ -94,6 +93,7 @@
 		7FABE04622137F5C00D0F595 /* libUploadAttachments.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7FABE04522137F2A00D0F595 /* libUploadAttachments.a */; };
 		7FABE0562213884700D0F595 /* libUploadAttachments.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7FABE04522137F2A00D0F595 /* libUploadAttachments.a */; };
 		7FBB5E9B1E1F5A4B000DE18A /* libRNVectorIcons.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7FDF290C1E1F4B4E00DBBE56 /* libRNVectorIcons.a */; };
+		7FD1DD0823273C6000E0D948 /* libRNCWebView.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7F26C1CB219C463300FEB42D /* libRNCWebView.a */; };
 		7FDB92B11F706F58006CDFD1 /* libRNImagePicker.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7FDB92A71F706F45006CDFD1 /* libRNImagePicker.a */; };
 		7FEB10981F6101710039A015 /* BlurAppScreen.m in Sources */ = {isa = PBXBuildFile; fileRef = 7FEB10971F6101710039A015 /* BlurAppScreen.m */; };
 		7FEB109D1F61019C0039A015 /* MattermostManaged.m in Sources */ = {isa = PBXBuildFile; fileRef = 7FEB109A1F61019C0039A015 /* MattermostManaged.m */; };
@@ -955,7 +955,7 @@
 				7FDB92B11F706F58006CDFD1 /* libRNImagePicker.a in Frameworks */,
 				7F5CA9A0208FE3B9004F91CE /* libRNDocumentPicker.a in Frameworks */,
 				7F43D5DE1F6BF96A001FC614 /* libRCTYouTube.a in Frameworks */,
-				7F26C1CC219C463D00FEB42D /* libRNCWebView.a in Frameworks */,
+				7FD1DD0823273C6000E0D948 /* libRNCWebView.a in Frameworks */,
 				7F88A04422270FD400DC5DE2 /* libRNSentry.a in Frameworks */,
 				7F43D6061F6BF9EB001FC614 /* libPods-Mattermost.a in Frameworks */,
 				A9B746D2CFA9CEBFB8AE2B5B /* libPods-Mattermost.a in Frameworks */,
diff --git a/package-lock.json b/package-lock.json
index 428d95410..055ea2669 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -16898,8 +16898,8 @@
       }
     },
     "react-native-webview": {
-      "version": "github:mattermost/react-native-webview#34e1dbef70413134ddda85df863c962f24b8826e",
-      "from": "github:mattermost/react-native-webview#34e1dbef70413134ddda85df863c962f24b8826e",
+      "version": "github:mattermost/react-native-webview#b5e22940a613869d3999feac9451ee65352f4fbe",
+      "from": "github:mattermost/react-native-webview#b5e22940a613869d3999feac9451ee65352f4fbe",
       "requires": {
         "escape-string-regexp": "1.0.5",
         "invariant": "2.2.4"
diff --git a/package.json b/package.json
index 1b06dacae..fc9b5718e 100644
--- a/package.json
+++ b/package.json
@@ -58,7 +58,7 @@
     "react-native-svg": "9.4.0",
     "react-native-vector-icons": "6.4.2",
     "react-native-video": "4.4.1",
-    "react-native-webview": "github:mattermost/react-native-webview#34e1dbef70413134ddda85df863c962f24b8826e",
+    "react-native-webview": "github:mattermost/react-native-webview#b5e22940a613869d3999feac9451ee65352f4fbe",
     "react-native-youtube": "github:mattermost/react-native-youtube#3f395b620ae4e05a3f1c6bdeef3a1158e78daadc",
     "react-navigation": "3.9.1",
     "react-redux": "7.0.3",