From 0afdbdd0f91cb0392ed0aaea9abd005d306ae92f Mon Sep 17 00:00:00 2001
From: Saturnino Abril <saturnino.abril@gmail.com>
Date: Fri, 14 Sep 2018 20:10:10 +0800
Subject: [PATCH 1/3] remove backgroundColor from styles.video of Android share
 extension that's causing app to crash (#2119)

---
 app/screens/entry/entry.js                               | 2 +-
 share_extension/android/extension_post/extension_post.js | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/screens/entry/entry.js b/app/screens/entry/entry.js
index 8f61e1884..d75d7550b 100644
--- a/app/screens/entry/entry.js
+++ b/app/screens/entry/entry.js
@@ -62,7 +62,7 @@ export default class Entry extends PureComponent {
         isLandscape: PropTypes.bool,
         enableTimezone: PropTypes.bool,
         deviceTimezone: PropTypes.string,
-        initializeModules: PropTypes.func.isRequired,
+        initializeModules: PropTypes.func,
         actions: PropTypes.shape({
             autoUpdateTimezone: PropTypes.func.isRequired,
             setDeviceToken: PropTypes.func.isRequired,
diff --git a/share_extension/android/extension_post/extension_post.js b/share_extension/android/extension_post/extension_post.js
index 69911da8c..4070d60fb 100644
--- a/share_extension/android/extension_post/extension_post.js
+++ b/share_extension/android/extension_post/extension_post.js
@@ -638,7 +638,6 @@ const getStyleSheet = makeStyleSheetFromTheme((theme) => {
             width: 38,
         },
         video: {
-            backgroundColor: theme.centerChannelBg,
             alignItems: 'center',
             height: 48,
             justifyContent: 'center',

From a2c51e06092b09508fcca9aed3001feaf5b198ab Mon Sep 17 00:00:00 2001
From: Elias Nahum <nahumhbl@gmail.com>
Date: Fri, 14 Sep 2018 09:22:04 -0300
Subject: [PATCH 2/3] Bump Android build number to 141 (#2120)

---
 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 b76419f12..bed041b24 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 140
+        versionCode 141
         versionName "1.12.0"
         multiDexEnabled = true
         ndk {

From 0af9c6fbaf9ca9ac90e3d66861543367ed112876 Mon Sep 17 00:00:00 2001
From: Elias Nahum <nahumhbl@gmail.com>
Date: Fri, 14 Sep 2018 09:43:15 -0300
Subject: [PATCH 3/3] Bump iOS build number to 141 (#2121)

---
 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 b5fcddcd0..a28c28b96 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 = 140;
+				CURRENT_PROJECT_VERSION = 141;
 				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 = 140;
+				CURRENT_PROJECT_VERSION = 141;
 				DEAD_CODE_STRIPPING = NO;
 				DEVELOPMENT_TEAM = UQ8HT4Q2XM;
 				ENABLE_BITCODE = NO;
diff --git a/ios/Mattermost/Info.plist b/ios/Mattermost/Info.plist
index 03e18129a..cb53db03d 100644
--- a/ios/Mattermost/Info.plist
+++ b/ios/Mattermost/Info.plist
@@ -34,7 +34,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>140</string>
+	<string>141</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSRequiresIPhoneOS</key>
diff --git a/ios/MattermostShare/Info.plist b/ios/MattermostShare/Info.plist
index e099d857c..9c7e6191a 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>140</string>
+	<string>141</string>
 	<key>NSAppTransportSecurity</key>
 	<dict>
 		<key>NSAllowsArbitraryLoads</key>
diff --git a/ios/MattermostTests/Info.plist b/ios/MattermostTests/Info.plist
index 61c07c1ae..49396922c 100644
--- a/ios/MattermostTests/Info.plist
+++ b/ios/MattermostTests/Info.plist
@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>140</string>
+	<string>141</string>
 </dict>
 </plist>