From 068e0674a16c5c0bdf5779905b89839ef49c0a63 Mon Sep 17 00:00:00 2001
From: Elias Nahum <nahumhbl@gmail.com>
Date: Wed, 12 Sep 2018 14:46:07 -0300
Subject: [PATCH 1/4] Fix okta login (#2107)

* Fix okta login

* Feedback review
---
 app/screens/sso/sso.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/screens/sso/sso.js b/app/screens/sso/sso.js
index 91020ec7a..64080d6c1 100644
--- a/app/screens/sso/sso.js
+++ b/app/screens/sso/sso.js
@@ -235,7 +235,7 @@ class SSO extends PureComponent {
                     onNavigationStateChange={this.onNavigationStateChange}
                     onShouldStartLoadWithRequest={() => true}
                     renderLoading={this.renderLoading}
-                    onMessage={this.onMessage}
+                    onMessage={jsCode ? this.onMessage : null}
                     injectedJavaScript={jsCode}
                     onLoadEnd={this.onLoadEnd}
                 />

From 5f17a48f4c488a69c40ecd6356e05252240236b3 Mon Sep 17 00:00:00 2001
From: Elias Nahum <nahumhbl@gmail.com>
Date: Wed, 12 Sep 2018 16:16:38 -0300
Subject: [PATCH 2/4] Fix unable to delete file cache in Android (#2108)

---
 app/utils/file.js | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/app/utils/file.js b/app/utils/file.js
index 716481b93..91653adaf 100644
--- a/app/utils/file.js
+++ b/app/utils/file.js
@@ -88,9 +88,20 @@ export async function getFileCacheSize() {
 }
 
 export async function deleteFileCache() {
-    await RNFetchBlob.fs.unlink(DOCUMENTS_PATH);
-    await RNFetchBlob.fs.unlink(IMAGES_PATH);
-    await RNFetchBlob.fs.unlink(VIDEOS_PATH);
+    const isDocsDir = await RNFetchBlob.fs.isDir(DOCUMENTS_PATH);
+    const isImagesDir = await RNFetchBlob.fs.isDir(IMAGES_PATH);
+    const isVideosDir = await RNFetchBlob.fs.isDir(VIDEOS_PATH);
+    if (isDocsDir) {
+        await RNFetchBlob.fs.unlink(DOCUMENTS_PATH);
+    }
+
+    if (isImagesDir) {
+        await RNFetchBlob.fs.unlink(IMAGES_PATH);
+    }
+
+    if (isVideosDir) {
+        await RNFetchBlob.fs.unlink(VIDEOS_PATH);
+    }
     return true;
 }
 

From 5fc4c9957edab3009410ec842d62f13b0048c72a Mon Sep 17 00:00:00 2001
From: Elias Nahum <nahumhbl@gmail.com>
Date: Wed, 12 Sep 2018 18:54:03 -0300
Subject: [PATCH 3/4] Bump iOS build number to 139 (#2110)

---
 ios/Mattermost.xcodeproj/project.pbxproj | 4 ++--
 ios/Mattermost/Info.plist                | 2 +-
 ios/MattermostShare/Info.plist           | 2 +-
 ios/MattermostTests/Info.plist           | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ios/Mattermost.xcodeproj/project.pbxproj b/ios/Mattermost.xcodeproj/project.pbxproj
index 9732223ee..96daa5f8e 100644
--- a/ios/Mattermost.xcodeproj/project.pbxproj
+++ b/ios/Mattermost.xcodeproj/project.pbxproj
@@ -2427,7 +2427,7 @@
 				CODE_SIGN_ENTITLEMENTS = Mattermost/Mattermost.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				CURRENT_PROJECT_VERSION = 138;
+				CURRENT_PROJECT_VERSION = 139;
 				DEAD_CODE_STRIPPING = NO;
 				DEVELOPMENT_TEAM = UQ8HT4Q2XM;
 				ENABLE_BITCODE = NO;
@@ -2476,7 +2476,7 @@
 				CODE_SIGN_ENTITLEMENTS = Mattermost/Mattermost.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				CURRENT_PROJECT_VERSION = 138;
+				CURRENT_PROJECT_VERSION = 139;
 				DEAD_CODE_STRIPPING = NO;
 				DEVELOPMENT_TEAM = UQ8HT4Q2XM;
 				ENABLE_BITCODE = NO;
diff --git a/ios/Mattermost/Info.plist b/ios/Mattermost/Info.plist
index ded902426..b2bebf07d 100644
--- a/ios/Mattermost/Info.plist
+++ b/ios/Mattermost/Info.plist
@@ -34,7 +34,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>138</string>
+	<string>139</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSRequiresIPhoneOS</key>
diff --git a/ios/MattermostShare/Info.plist b/ios/MattermostShare/Info.plist
index e1d934203..f43165f21 100644
--- a/ios/MattermostShare/Info.plist
+++ b/ios/MattermostShare/Info.plist
@@ -23,7 +23,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>1.12.0</string>
 	<key>CFBundleVersion</key>
-	<string>138</string>
+	<string>139</string>
 	<key>NSAppTransportSecurity</key>
 	<dict>
 		<key>NSAllowsArbitraryLoads</key>
diff --git a/ios/MattermostTests/Info.plist b/ios/MattermostTests/Info.plist
index 0b14c75f3..7ea9159f1 100644
--- a/ios/MattermostTests/Info.plist
+++ b/ios/MattermostTests/Info.plist
@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>138</string>
+	<string>139</string>
 </dict>
 </plist>

From 7454613ef96a6640dc1487f846a4fab9a0c0dad6 Mon Sep 17 00:00:00 2001
From: Elias Nahum <nahumhbl@gmail.com>
Date: Wed, 12 Sep 2018 19:21:04 -0300
Subject: [PATCH 4/4] Bump Android build number to 139 (#2111)

---
 android/app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/android/app/build.gradle b/android/app/build.gradle
index 3e557c212..6bd7c106d 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -113,7 +113,7 @@ android {
         applicationId "com.mattermost.rnbeta"
         minSdkVersion 21
         targetSdkVersion 26
-        versionCode 138
+        versionCode 139
         versionName "1.12.0"
         multiDexEnabled = true
         ndk {