From ae521ba0261fd2052833177be0a8bd8e3301ee09 Mon Sep 17 00:00:00 2001 From: Harrison Healey Date: Mon, 8 Jul 2019 09:11:31 -0400 Subject: [PATCH 1/6] MM-16695 Update mattermost-redux to add additional null check (#2951) * MM-16695 Update mattermost-redux to add additional null check * Update mattermost-redux --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 6c33a6fed..0d4c403e9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13155,8 +13155,8 @@ "integrity": "sha512-rUxjysqif/BZQH2yhd5Aaq7vXMSx9NdEsQcyA07uEzIvxgI7zIr33gGsh+RU0/XjmQpCW7RsVof1vlkvQVCK5A==" }, "mattermost-redux": { - "version": "github:mattermost/mattermost-redux#66dcea7c71de9f87e3fe12652458e16f9517f6b7", - "from": "github:mattermost/mattermost-redux#66dcea7c71de9f87e3fe12652458e16f9517f6b7", + "version": "github:mattermost/mattermost-redux#09d6cfe6e9efe537919c1eac74d7df0adc54a163", + "from": "github:mattermost/mattermost-redux#09d6cfe6e9efe537919c1eac74d7df0adc54a163", "requires": { "deep-equal": "1.0.1", "eslint-plugin-header": "3.0.0", diff --git a/package.json b/package.json index 80ce281a8..db0b1ab3f 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ "intl": "1.2.5", "jail-monkey": "2.2.0", "jsc-android": "241213.2.0", - "mattermost-redux": "github:mattermost/mattermost-redux#66dcea7c71de9f87e3fe12652458e16f9517f6b7", + "mattermost-redux": "github:mattermost/mattermost-redux#09d6cfe6e9efe537919c1eac74d7df0adc54a163", "mime-db": "1.40.0", "moment-timezone": "0.5.25", "prop-types": "15.7.2", From 72594446d5d2c1154a164fec835397f3d9e43d00 Mon Sep 17 00:00:00 2001 From: Harrison Healey Date: Mon, 8 Jul 2019 09:45:12 -0400 Subject: [PATCH 2/6] Bump app build number to 205 (#2960) --- android/app/build.gradle | 2 +- ios/Mattermost.xcodeproj/project.pbxproj | 4 ++-- ios/Mattermost/Info.plist | 2 +- ios/MattermostShare/Info.plist | 2 +- ios/MattermostTests/Info.plist | 2 +- ios/NotificationService/Info.plist | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 9ea2d1864..60a1ca2c2 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -122,7 +122,7 @@ android { applicationId "com.mattermost.rnbeta" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 204 + versionCode 205 versionName "1.21.0" multiDexEnabled = true ndk { diff --git a/ios/Mattermost.xcodeproj/project.pbxproj b/ios/Mattermost.xcodeproj/project.pbxproj index 3beae4ae9..861ae9fb3 100644 --- a/ios/Mattermost.xcodeproj/project.pbxproj +++ b/ios/Mattermost.xcodeproj/project.pbxproj @@ -2768,7 +2768,7 @@ CODE_SIGN_ENTITLEMENTS = Mattermost/Mattermost.entitlements; CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - CURRENT_PROJECT_VERSION = 204; + CURRENT_PROJECT_VERSION = 205; DEAD_CODE_STRIPPING = NO; DEVELOPMENT_TEAM = UQ8HT4Q2XM; ENABLE_BITCODE = NO; @@ -2828,7 +2828,7 @@ CODE_SIGN_ENTITLEMENTS = Mattermost/Mattermost.entitlements; CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - CURRENT_PROJECT_VERSION = 204; + CURRENT_PROJECT_VERSION = 205; DEAD_CODE_STRIPPING = NO; DEVELOPMENT_TEAM = UQ8HT4Q2XM; ENABLE_BITCODE = NO; diff --git a/ios/Mattermost/Info.plist b/ios/Mattermost/Info.plist index f510b2885..150b9df91 100644 --- a/ios/Mattermost/Info.plist +++ b/ios/Mattermost/Info.plist @@ -34,7 +34,7 @@ CFBundleVersion - 204 + 205 ITSAppUsesNonExemptEncryption LSRequiresIPhoneOS diff --git a/ios/MattermostShare/Info.plist b/ios/MattermostShare/Info.plist index 543c3520d..dbdeccbfa 100644 --- a/ios/MattermostShare/Info.plist +++ b/ios/MattermostShare/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString 1.21.0 CFBundleVersion - 204 + 205 NSAppTransportSecurity NSAllowsArbitraryLoads diff --git a/ios/MattermostTests/Info.plist b/ios/MattermostTests/Info.plist index 4b72d0097..c6234ffa5 100644 --- a/ios/MattermostTests/Info.plist +++ b/ios/MattermostTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 204 + 205 diff --git a/ios/NotificationService/Info.plist b/ios/NotificationService/Info.plist index 5adc55fee..87e06a9a2 100644 --- a/ios/NotificationService/Info.plist +++ b/ios/NotificationService/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString 1.21.0 CFBundleVersion - 204 + 205 NSExtension NSExtensionPointIdentifier From f82b571d13d445b8c813d32c221a97189a42ac6c Mon Sep 17 00:00:00 2001 From: Elias Nahum Date: Mon, 8 Jul 2019 18:37:55 -0400 Subject: [PATCH 3/6] Bump app build number to 206 (#2963) * Bump app build number to 206 * Set Android targetSdkVersion to API level 28 --- android/app/build.gradle | 2 +- android/build.gradle | 2 +- ios/Mattermost.xcodeproj/project.pbxproj | 4 ++-- ios/Mattermost/Info.plist | 2 +- ios/MattermostShare/Info.plist | 2 +- ios/MattermostTests/Info.plist | 2 +- ios/NotificationService/Info.plist | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 60a1ca2c2..c99996d94 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -122,7 +122,7 @@ android { applicationId "com.mattermost.rnbeta" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 205 + versionCode 206 versionName "1.21.0" multiDexEnabled = true ndk { diff --git a/android/build.gradle b/android/build.gradle index 3c826c44c..a9beff6ed 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -5,7 +5,7 @@ buildscript { buildToolsVersion = "28.0.3" minSdkVersion = 24 compileSdkVersion = 28 - targetSdkVersion = 26 + targetSdkVersion = 28 supportLibVersion = "28.0.0" } repositories { diff --git a/ios/Mattermost.xcodeproj/project.pbxproj b/ios/Mattermost.xcodeproj/project.pbxproj index 861ae9fb3..53ddc69d4 100644 --- a/ios/Mattermost.xcodeproj/project.pbxproj +++ b/ios/Mattermost.xcodeproj/project.pbxproj @@ -2768,7 +2768,7 @@ CODE_SIGN_ENTITLEMENTS = Mattermost/Mattermost.entitlements; CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - CURRENT_PROJECT_VERSION = 205; + CURRENT_PROJECT_VERSION = 206; DEAD_CODE_STRIPPING = NO; DEVELOPMENT_TEAM = UQ8HT4Q2XM; ENABLE_BITCODE = NO; @@ -2828,7 +2828,7 @@ CODE_SIGN_ENTITLEMENTS = Mattermost/Mattermost.entitlements; CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - CURRENT_PROJECT_VERSION = 205; + CURRENT_PROJECT_VERSION = 206; DEAD_CODE_STRIPPING = NO; DEVELOPMENT_TEAM = UQ8HT4Q2XM; ENABLE_BITCODE = NO; diff --git a/ios/Mattermost/Info.plist b/ios/Mattermost/Info.plist index 150b9df91..9d660f7ed 100644 --- a/ios/Mattermost/Info.plist +++ b/ios/Mattermost/Info.plist @@ -34,7 +34,7 @@ CFBundleVersion - 205 + 206 ITSAppUsesNonExemptEncryption LSRequiresIPhoneOS diff --git a/ios/MattermostShare/Info.plist b/ios/MattermostShare/Info.plist index dbdeccbfa..4f20e233a 100644 --- a/ios/MattermostShare/Info.plist +++ b/ios/MattermostShare/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString 1.21.0 CFBundleVersion - 205 + 206 NSAppTransportSecurity NSAllowsArbitraryLoads diff --git a/ios/MattermostTests/Info.plist b/ios/MattermostTests/Info.plist index c6234ffa5..d83246253 100644 --- a/ios/MattermostTests/Info.plist +++ b/ios/MattermostTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 205 + 206 diff --git a/ios/NotificationService/Info.plist b/ios/NotificationService/Info.plist index 87e06a9a2..a99905930 100644 --- a/ios/NotificationService/Info.plist +++ b/ios/NotificationService/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString 1.21.0 CFBundleVersion - 205 + 206 NSExtension NSExtensionPointIdentifier From aa6ddf062d13934d725976ce23cce60aa6336a3c Mon Sep 17 00:00:00 2001 From: Saturnino Abril Date: Tue, 9 Jul 2019 22:11:29 +0800 Subject: [PATCH 4/6] fix app chrashing when sending invalid slash command (#2966) --- app/actions/views/command.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/actions/views/command.js b/app/actions/views/command.js index a51266e25..dfc97208c 100644 --- a/app/actions/views/command.js +++ b/app/actions/views/command.js @@ -30,7 +30,7 @@ export function executeCommand(message, channelId, rootId) { const {data, error} = await dispatch(executeCommandService(msg, args)); - if (data.trigger_id) { + if (data?.trigger_id) { //eslint-disable-line camelcase dispatch({type: IntegrationTypes.RECEIVED_DIALOG_TRIGGER_ID, data: data.trigger_id}); } From 5715ed8e6fe9f14be45f91754cecc549a585a176 Mon Sep 17 00:00:00 2001 From: Saturnino Abril Date: Tue, 9 Jul 2019 22:50:00 +0800 Subject: [PATCH 5/6] minor fix to access state of websocket (#2965) --- app/actions/views/typing.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/actions/views/typing.js b/app/actions/views/typing.js index 589f09030..bcd7e069c 100644 --- a/app/actions/views/typing.js +++ b/app/actions/views/typing.js @@ -5,7 +5,7 @@ import {userTyping as wsUserTyping} from 'mattermost-redux/actions/websocket'; export function userTyping(channelId, rootId) { return async (dispatch, getState) => { - const {websocket} = getState().device; + const {websocket} = getState(); if (websocket.connected) { wsUserTyping(channelId, rootId)(dispatch, getState); } From 83e9dd844a49e9457b496dd52c7029a76b7fedd6 Mon Sep 17 00:00:00 2001 From: Elias Nahum Date: Tue, 9 Jul 2019 11:55:57 -0400 Subject: [PATCH 6/6] MM-16857 Fix long posts (#2967) --- app/screens/long_post/index.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/screens/long_post/index.js b/app/screens/long_post/index.js index 1b6f2d954..be8dedc13 100644 --- a/app/screens/long_post/index.js +++ b/app/screens/long_post/index.js @@ -4,9 +4,9 @@ import {bindActionCreators} from 'redux'; import {connect} from 'react-redux'; -import {selectPost, makeGetReactionsForPost} from 'mattermost-redux/actions/posts'; +import {selectPost} from 'mattermost-redux/actions/posts'; import {makeGetChannel} from 'mattermost-redux/selectors/entities/channels'; -import {getPost} from 'mattermost-redux/selectors/entities/posts'; +import {getPost, makeGetReactionsForPost} from 'mattermost-redux/selectors/entities/posts'; import {getTheme} from 'mattermost-redux/selectors/entities/preferences'; import {loadThreadIfNecessary} from 'app/actions/views/channel';