Fixed MATTERMOST-MOBILE-ANDROID-87 (#1566)

* Fix iOS Extension crash

* Bump app version to 1.7.1 and build to 92

android/app/build.gradle

@@ -111,8 +111,8 @@ android {
         applicationId "com.mattermost.rnbeta"
         minSdkVersion 21
         targetSdkVersion 23
-        versionCode 91
+        versionCode 92
-        versionName "1.7.0"
+        versionName "1.7.1"
         multiDexEnabled true
         ndk {
             abiFilters "armeabi-v7a", "x86"

app/components/markdown/markdown.js

@@ -361,7 +361,7 @@ export default class Markdown extends PureComponent {
 
         if (this.props.isEdited) {
             const editIndicatorNode = new Node('edited_indicator');
-            if (['heading', 'paragraph'].includes(ast.lastChild.type)) {
+            if (ast.lastChild && ['heading', 'paragraph'].includes(ast.lastChild.type)) {
                 ast.lastChild.appendChild(editIndicatorNode);
             } else {
                 const node = new Node('paragraph');

app/reducers/views/channel.js

@@ -13,7 +13,7 @@ import {ViewTypes} from 'app/constants';
 function displayName(state = '', action) {
     switch (action.type) {
     case ViewTypes.SET_CHANNEL_DISPLAY_NAME:
-        return action.displayName;
+        return action.displayName || '';
     default:
         return state;
     }

app/utils/file.js

@@ -82,5 +82,5 @@ export const encodeHeaderURIStringToUTF8 = (string) => {
 };
 
 export const getAllowedServerMaxFileSize = (config) => {
-    return config.MaxFileSize ? parseInt(config.MaxFileSize, 10) : DEFAULT_SERVER_MAX_FILE_SIZE;
+    return config && config.MaxFileSize ? parseInt(config.MaxFileSize, 10) : DEFAULT_SERVER_MAX_FILE_SIZE;
 };

ios/Mattermost/Info.plist

@@ -19,7 +19,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.7.0</string>
+	<string>1.7.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -34,7 +34,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>91</string>
+	<string>92</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSRequiresIPhoneOS</key>
@@ -54,6 +54,8 @@
 			</dict>
 		</dict>
 	</dict>
+	<key>NSAppleMusicUsageDescription</key>
+	<string>Let Mattermost access your Media files</string>
 	<key>NSBluetoothPeripheralUsageDescription</key>
 	<string>Share post data accross devices with Mattermost</string>
 	<key>NSCalendarsUsageDescription</key>
@@ -68,8 +70,6 @@
 	<string>Upload Photos and Videos to your Mattermost instance or save them to your device</string>
 	<key>NSSpeechRecognitionUsageDescription</key>
 	<string>Send voice messages to your Mattermost instance</string>
-	<key>NSAppleMusicUsageDescription</key>
-    <string>Let Mattermost access your Media files</string>
 	<key>UIAppFonts</key>
 	<array>
 		<string>Entypo.ttf</string>

ios/MattermostShare/Info.plist

@@ -21,9 +21,9 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.7.0</string>
+	<string>1.7.1</string>
 	<key>CFBundleVersion</key>
-	<string>91</string>
+	<string>92</string>
 	<key>NSAppTransportSecurity</key>
 	<dict>
 		<key>NSAllowsArbitraryLoads</key>

ios/MattermostTests/Info.plist

@@ -15,10 +15,10 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.7.0</string>
+	<string>1.7.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>91</string>
+	<string>92</string>
 </dict>
 </plist>

package.json

@@ -15,7 +15,7 @@
     "fuse.js": "^3.2.0",
     "intl": "1.2.5",
     "jail-monkey": "0.2.0",
-    "mattermost-redux": "mattermost/mattermost-redux",
+    "mattermost-redux": "mattermost/mattermost-redux#rn-release-1.7",
     "prop-types": "15.6.0",
     "react": "16.2.0",
     "react-intl": "2.4.0",

share_extension/ios/index.js

@@ -73,8 +73,12 @@ export default class SharedApp extends PureComponent {
     };
 
     userIsLoggedIn = () => {
-        return Boolean(this.entities && this.entities.general && this.entities.general.credentials &&
+        if (this.entities && this.entities.general && this.entities.general.credentials &&
-            this.entities.general.credentials.token && this.entities.general.credentials.url);
+            this.entities.general.credentials.token && this.entities.general.credentials.url) {
+            return true;
+        }
+
+        return false;
     };
 
     render() {

yarn.lock

@@ -1774,7 +1774,7 @@ commonmark-react-renderer@hmhealey/commonmark-react-renderer:
 
 commonmark@hmhealey/commonmark.js:
   version "0.28.0"
-  resolved "https://codeload.github.com/hmhealey/commonmark.js/tar.gz/bcd754c640ed8192fa959f2416f183acf9e1cfaf"
+  resolved "https://codeload.github.com/hmhealey/commonmark.js/tar.gz/7c20ebc1b60f5bb56c1ed9ad3239f53293278d5c"
   dependencies:
     entities "~ 1.1.1"
     mdurl "~ 1.0.1"
@@ -4094,7 +4094,7 @@ makeerror@1.0.x:
   dependencies:
     tmpl "1.0.x"
 
-mattermost-redux@mattermost/mattermost-redux:
+mattermost-redux@mattermost/mattermost-redux#rn-release-1.7:
   version "1.2.0"
   resolved "https://codeload.github.com/mattermost/mattermost-redux/tar.gz/0ad40c2abc2900277a279316790f180dfe4ad785"
   dependencies: