From ffd7c70d6125b3cca16e2125a6802a15fe339d19 Mon Sep 17 00:00:00 2001 From: Harrison Healey Date: Tue, 26 Jun 2018 19:39:07 -0400 Subject: [PATCH 01/12] MM-10996 Fixed getting post thread after receiving posts over the websocket (#1835) --- 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 55fbc8832..0e5fa20a0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10100,8 +10100,8 @@ } }, "mattermost-redux": { - "version": "github:mattermost/mattermost-redux#d0b887aa93d1f9527016258dfc226f802723433d", - "from": "github:mattermost/mattermost-redux#d0b887aa93d1f9527016258dfc226f802723433d", + "version": "github:mattermost/mattermost-redux#193521daf0fed4c51e66ab9bc30d9704c4ab00cf", + "from": "github:mattermost/mattermost-redux#193521daf0fed4c51e66ab9bc30d9704c4ab00cf", "requires": { "deep-equal": "1.0.1", "eslint-plugin-header": "1.2.0", diff --git a/package.json b/package.json index 76c790ee3..b5cf2033e 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ "intl": "1.2.5", "jail-monkey": "1.0.0", "jsc-android": "216113.0.3", - "mattermost-redux": "github:mattermost/mattermost-redux#d0b887aa93d1f9527016258dfc226f802723433d", + "mattermost-redux": "github:mattermost/mattermost-redux#193521daf0fed4c51e66ab9bc30d9704c4ab00cf", "mime-db": "1.33.0", "prop-types": "15.6.1", "react": "16.3.2", From cd265fb7c2215076ca5d613d59fdcfb138ed7b97 Mon Sep 17 00:00:00 2001 From: Elias Nahum Date: Wed, 27 Jun 2018 08:13:21 -0400 Subject: [PATCH 02/12] Fix jump to recent messages (#1834) * Fix jump to recent messages * force scroll to bottom when jumping to recent messages --- app/components/post_list/post_list.js | 4 ++++ app/screens/permalink/permalink.js | 31 ++++++++++++++++----------- 2 files changed, 23 insertions(+), 12 deletions(-) diff --git a/app/components/post_list/post_list.js b/app/components/post_list/post_list.js index d5d3bd502..178f91bd3 100644 --- a/app/components/post_list/post_list.js +++ b/app/components/post_list/post_list.js @@ -10,6 +10,8 @@ import { StyleSheet, } from 'react-native'; +import EventEmitter from 'mattermost-redux/utils/event_emitter'; + import Post from 'app/components/post'; import {DATE_LINE, START_OF_NEW_MESSAGES} from 'app/selectors/post_list'; import mattermostManaged from 'app/mattermost_managed'; @@ -77,6 +79,7 @@ export default class PostList extends PureComponent { } componentDidMount() { + EventEmitter.on('reset_channel', this.scrollToBottomOffset); this.setManagedConfig(); } @@ -98,6 +101,7 @@ export default class PostList extends PureComponent { } componentWillUnmount() { + EventEmitter.off('reset_channel', this.scrollToBottomOffset); mattermostManaged.removeEventListener(this.listenerId); } diff --git a/app/screens/permalink/permalink.js b/app/screens/permalink/permalink.js index 88963a3e2..d33686252 100644 --- a/app/screens/permalink/permalink.js +++ b/app/screens/permalink/permalink.js @@ -14,6 +14,7 @@ import * as Animatable from 'react-native-animatable'; import MaterialIcon from 'react-native-vector-icons/MaterialIcons'; import {General} from 'mattermost-redux/constants'; +import EventEmitter from 'mattermost-redux/utils/event_emitter'; import FormattedText from 'app/components/formatted_text'; import Loading from 'app/components/loading'; @@ -200,22 +201,28 @@ export default class Permalink extends PureComponent { actions.selectPost(''); + if (channelId === currentChannelId) { + EventEmitter.emit('reset_channel'); + } else { + navigator.resetTo({ + screen: 'Channel', + animated: true, + animationType: 'fade', + navigatorStyle: { + navBarHidden: true, + statusBarHidden: false, + statusBarHideWithNavBar: false, + screenBackgroundColor: theme.centerChannelBg, + }, + }); + } + + navigator.dismissAllModals({animationType: 'slide-down'}); + if (onClose) { onClose(); } - navigator.resetTo({ - screen: 'Channel', - animated: true, - animationType: 'fade', - navigatorStyle: { - navBarHidden: true, - statusBarHidden: false, - statusBarHideWithNavBar: false, - screenBackgroundColor: theme.centerChannelBg, - }, - }); - if (channelTeamId && currentTeamId !== channelTeamId) { handleTeamChange(channelTeamId, false); } From cf24580e48ae01016648bc2caf03f049ad98991b Mon Sep 17 00:00:00 2001 From: Elias Nahum Date: Wed, 27 Jun 2018 08:13:28 -0400 Subject: [PATCH 03/12] Update RNFetchBlob to allow arabic chars (#1836) --- 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 0e5fa20a0..ecaef26f6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14705,8 +14705,8 @@ } }, "react-native-fetch-blob": { - "version": "github:enahum/react-native-fetch-blob#27983c83d7fad1cb4821dd6ba8e405da4af64f3a", - "from": "github:enahum/react-native-fetch-blob#27983c83d7fad1cb4821dd6ba8e405da4af64f3a", + "version": "github:enahum/react-native-fetch-blob#729c4b49b2e2195b1793c4d3490ab67cb9a8e472", + "from": "github:enahum/react-native-fetch-blob#729c4b49b2e2195b1793c4d3490ab67cb9a8e472", "requires": { "base-64": "0.1.0", "glob": "7.0.6" diff --git a/package.json b/package.json index b5cf2033e..6a5865064 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,7 @@ "react-native-drawer": "2.5.0", "react-native-exception-handler": "2.7.5", "react-native-fast-image": "4.0.8", - "react-native-fetch-blob": "enahum/react-native-fetch-blob.git#27983c83d7fad1cb4821dd6ba8e405da4af64f3a", + "react-native-fetch-blob": "enahum/react-native-fetch-blob.git#729c4b49b2e2195b1793c4d3490ab67cb9a8e472", "react-native-image-gallery": "enahum/react-native-image-gallery#a98b1051e94f5a394541ca1ff9b15e2c9ffed84f", "react-native-image-picker": "0.26.7", "react-native-keyboard-aware-scroll-view": "0.5.0", From 3cee7b310ee34a7d70766d96f05fe6c416bd830b Mon Sep 17 00:00:00 2001 From: Elias Nahum Date: Wed, 27 Jun 2018 08:13:52 -0400 Subject: [PATCH 04/12] Set Android share extension default mime type for images and videos (#1833) --- .../java/com/mattermost/share/ShareModule.java | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/android/app/src/main/java/com/mattermost/share/ShareModule.java b/android/app/src/main/java/com/mattermost/share/ShareModule.java index 5ce9cd654..d77cd982c 100644 --- a/android/app/src/main/java/com/mattermost/share/ShareModule.java +++ b/android/app/src/main/java/com/mattermost/share/ShareModule.java @@ -147,6 +147,13 @@ public class ShareModule extends ReactContextBaseJavaModule { Uri uri = (Uri) intent.getParcelableExtra(Intent.EXTRA_STREAM); text = "file://" + RealPathUtil.getRealPathFromURI(currentActivity, uri); map.putString("value", text); + + if (type.equals("image/*")) { + type = "image/jpeg"; + } else if (type.equals("video/*")) { + type = "video/mp4"; + } + map.putString("type", type); items.pushMap(map); } else if (Intent.ACTION_SEND_MULTIPLE.equals(action)) { @@ -156,7 +163,15 @@ public class ShareModule extends ReactContextBaseJavaModule { map = Arguments.createMap(); text = "file://" + filePath; map.putString("value", text); - map.putString("type", RealPathUtil.getMimeTypeFromUri(currentActivity, uri)); + + type = RealPathUtil.getMimeTypeFromUri(currentActivity, uri); + if (type.equals("image/*")) { + type = "image/jpeg"; + } else if (type.equals("video/*")) { + type = "video/mp4"; + } + + map.putString("type", type); items.pushMap(map); } } From a208df94179183fa5abd174919babd23f0c61957 Mon Sep 17 00:00:00 2001 From: Elias Nahum Date: Wed, 27 Jun 2018 08:35:22 -0400 Subject: [PATCH 05/12] Fix uploading files from androids download provider (#1837) --- .../com/mattermost/share/RealPathUtil.java | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/android/app/src/main/java/com/mattermost/share/RealPathUtil.java b/android/app/src/main/java/com/mattermost/share/RealPathUtil.java index 8640f161f..b66ffd831 100644 --- a/android/app/src/main/java/com/mattermost/share/RealPathUtil.java +++ b/android/app/src/main/java/com/mattermost/share/RealPathUtil.java @@ -10,6 +10,8 @@ import android.content.ContentUris; import android.content.ContentResolver; import android.os.Environment; import android.webkit.MimeTypeMap; +import android.util.Log; +import android.text.TextUtils; import android.os.ParcelFileDescriptor; import java.io.*; @@ -37,10 +39,19 @@ public class RealPathUtil { // DownloadsProvider final String id = DocumentsContract.getDocumentId(uri); - final Uri contentUri = ContentUris.withAppendedId( - Uri.parse("content://downloads/public_downloads"), Long.valueOf(id)); - - return getDataColumn(context, contentUri, null, null); + if (!TextUtils.isEmpty(id)) { + if (id.startsWith("raw:")) { + return id.replaceFirst("raw:", ""); + } + try { + final Uri contentUri = ContentUris.withAppendedId( + Uri.parse("content://downloads/public_downloads"), Long.valueOf(id)); + return getDataColumn(context, contentUri, null, null); + } catch (NumberFormatException e) { + Log.e("ReactNative", "DownloadsProvider unexpected uri " + uri.toString()); + return null; + } + } } else if (isMediaDocument(uri)) { // MediaProvider From 5680988590c08b17159aeebb324347eb436bc9e7 Mon Sep 17 00:00:00 2001 From: Elias Nahum Date: Wed, 27 Jun 2018 09:23:47 -0400 Subject: [PATCH 06/12] Fix iOS Share extension crash (#1832) --- assets/base/i18n/en.json | 1 + ios/MattermostShare/SessionManager.h | 2 + ios/MattermostShare/SessionManager.m | 8 +++ ios/MattermostShare/ShareViewController.m | 21 +++++-- share_extension/ios/extension_post.js | 74 +++++++++++++++++------ 5 files changed, 82 insertions(+), 24 deletions(-) diff --git a/assets/base/i18n/en.json b/assets/base/i18n/en.json index f8642183f..69bd897da 100644 --- a/assets/base/i18n/en.json +++ b/assets/base/i18n/en.json @@ -2513,6 +2513,7 @@ "mobile.share_extension.error_close": "Close", "mobile.share_extension.error_message": "An error has occurred while using the share extension.", "mobile.share_extension.error_title": "Extension Error", + "mobile.share_extension.post_error": "An error has occurred while posting the message. Please try again.", "mobile.share_extension.send": "Send", "mobile.share_extension.team": "Team", "mobile.suggestion.members": "Members", diff --git a/ios/MattermostShare/SessionManager.h b/ios/MattermostShare/SessionManager.h index 53823aed1..d8959c6d7 100644 --- a/ios/MattermostShare/SessionManager.h +++ b/ios/MattermostShare/SessionManager.h @@ -3,6 +3,8 @@ @interface SessionManager : NSObject @property (nonatomic, copy) void (^savedCompletionHandler)(void); +@property (nonatomic, copy) void (^sendShareEvent)(NSString *); +@property (nonatomic, copy) void (^closeExtension)(void); @property MattermostBucket *bucket; diff --git a/ios/MattermostShare/SessionManager.m b/ios/MattermostShare/SessionManager.m index ae0e82387..1109b63e1 100644 --- a/ios/MattermostShare/SessionManager.m +++ b/ios/MattermostShare/SessionManager.m @@ -37,6 +37,7 @@ NSLog(@"ERROR %@", [error userInfo]); NSLog(@"invalidating session %@", requestWithGroup); [session invalidateAndCancel]; + self.sendShareEvent(@"extensionPostFailed"); } else if (requestWithGroup != nil) { NSString *appGroupId = [self getAppGroupIdFromRequestIdentifier:requestWithGroup]; NSURL *requestUrl = [[task originalRequest] URL]; @@ -80,6 +81,8 @@ } [data setObject:fileIds forKey:@"file_ids"]; [self setDataForRequest:data forRequestWithGroup:requestWithGroup]; + } else { + self.sendShareEvent(@"extensionPostFailed"); } } } @@ -124,6 +127,7 @@ NSString *appGroupId = [self getAppGroupIdFromRequestIdentifier:requestWithGroup]; if (credentials == nil) { + self.sendShareEvent(@"extensionPostFailed"); return; } @@ -164,6 +168,7 @@ NSDictionary *credentials = [self getCredentialsForRequest:requestWithGroup]; if (credentials == nil) { + self.sendShareEvent(@"extensionPostFailed"); return; } @@ -196,6 +201,9 @@ NSURLSessionDataTask *createTask = [createSession dataTaskWithRequest:request]; NSLog(@"Executing post request"); [createTask resume]; + self.closeExtension(); + } else { + self.sendShareEvent(@"extensionPostFailed"); } } diff --git a/ios/MattermostShare/ShareViewController.m b/ios/MattermostShare/ShareViewController.m index ff9797715..a1d36d056 100644 --- a/ios/MattermostShare/ShareViewController.m +++ b/ios/MattermostShare/ShareViewController.m @@ -12,6 +12,8 @@ NSExtensionContext* extensionContext; return YES; } +@synthesize bridge = _bridge; + - (UIView*) shareView { NSURL *jsCodeLocation; @@ -56,12 +58,23 @@ RCT_EXPORT_METHOD(close:(NSDictionary *)data appGroupId:(NSString *)appGroupId) if (isBackgroundUpload) { NSString *requestWithGroup = [NSString stringWithFormat:@"%@|%@", requestId, appGroupId]; + + [SessionManager sharedSession].closeExtension = ^{ + [extensionContext completeRequestReturningItems:nil + completionHandler:nil]; + NSLog(@"Extension closed"); + }; + + [SessionManager sharedSession].sendShareEvent = ^(NSString* eventName) { + NSLog(@"Send Share Extension Event to JS"); + [_bridge enqueueJSCall:@"RCTDeviceEventEmitter" + method:@"emit" + args:@[eventName] + completion:nil]; + }; + [[SessionManager sharedSession] setDataForRequest:data forRequestWithGroup:requestWithGroup]; [[SessionManager sharedSession] createPostForRequest:requestWithGroup]; - - [extensionContext completeRequestReturningItems:nil - completionHandler:nil]; - NSLog(@"Extension closed"); } else { NSDictionary *post = [data objectForKey:@"post"]; NSArray *files = [data objectForKey:@"files"]; diff --git a/share_extension/ios/extension_post.js b/share_extension/ios/extension_post.js index 7458167c8..7437c7771 100644 --- a/share_extension/ios/extension_post.js +++ b/share_extension/ios/extension_post.js @@ -1,11 +1,12 @@ -// Copyright (c) 2017-present Mattermost, Inc. All Rights Reserved. -// See License.txt for license information. +// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved. +// See LICENSE.txt for license information. import React, {PureComponent} from 'react'; import PropTypes from 'prop-types'; import {intlShape} from 'react-intl'; import { ActivityIndicator, + DeviceEventEmitter, Dimensions, Image, NativeModules, @@ -93,6 +94,7 @@ export default class ExtensionPost extends PureComponent { } componentWillMount() { + this.event = DeviceEventEmitter.addListener('extensionPostFailed', this.handlePostFailed); this.loadData(); } @@ -100,6 +102,10 @@ export default class ExtensionPost extends PureComponent { this.focusInput(); } + componentWillUnmount() { + this.event.remove(); + } + componentDidUpdate() { this.focusInput(); } @@ -141,6 +147,10 @@ export default class ExtensionPost extends PureComponent { const {navigator, theme} = this.props; const {channel, entities, team} = this.state; + if (!entities || !team || !channel) { + return; + } + navigator.push({ component: ExtensionChannels, wrapperStyle: { @@ -161,7 +171,11 @@ export default class ExtensionPost extends PureComponent { goToTeams = preventDoubleTap(() => { const {navigator, theme} = this.props; const {formatMessage} = this.context.intl; - const {team} = this.state; + const {entities, team} = this.state; + + if (!entities || !team) { + return; + } navigator.push({ component: ExtensionTeams, @@ -171,7 +185,7 @@ export default class ExtensionPost extends PureComponent { backgroundColor: theme.centerChannelBg, }, passProps: { - entities: this.state.entities, + entities, currentTeamId: team.id, onSelectTeam: this.selectTeam, theme, @@ -187,6 +201,19 @@ export default class ExtensionPost extends PureComponent { this.setState({value}); }; + handlePostFailed = () => { + const {formatMessage} = this.context.intl; + this.setState({ + error: { + message: formatMessage({ + id: 'mobile.share_extension.post_error', + defaultMessage: 'An error has occurred while posting the message. Please try again.', + }), + }, + sending: false, + }); + }; + loadData = async () => { const {entities} = this.state; @@ -287,6 +314,16 @@ export default class ExtensionPost extends PureComponent { const serverMaxFileSize = getAllowedServerMaxFileSize(config); const maxSize = Math.min(MAX_FILE_SIZE, serverMaxFileSize); + if (error) { + return ( + + + {error.message} + + + ); + } + if (sending) { return ( @@ -336,16 +373,6 @@ export default class ExtensionPost extends PureComponent { ); } - if (error) { - return ( - - - {error.message} - - - ); - } - return ( @@ -552,7 +579,7 @@ export default class ExtensionPost extends PureComponent { this.setState({channel: townSquare}); } } else { - this.setState({error}); + this.setState({error, channel: null}); } }); }; @@ -627,15 +654,22 @@ export default class ExtensionPost extends PureComponent { render() { const {authenticated, theme} = this.props; - const {channel, totalSize, sending} = this.state; + const {channel, error, totalSize, sending} = this.state; const {formatMessage} = this.context.intl; const styles = getStyleSheet(theme); let postButtonText = formatMessage({id: 'mobile.share_extension.send', defaultMessage: 'Send'}); - if (totalSize >= MAX_FILE_SIZE || sending || !channel) { + if (totalSize >= MAX_FILE_SIZE || sending || error || !channel) { postButtonText = null; } + let cancelButton = formatMessage({id: 'mobile.share_extension.cancel', defaultMessage: 'Cancel'}); + if (sending) { + cancelButton = null; + } else if (error) { + cancelButton = formatMessage({id: 'mobile.share_extension.error_close', defaultMessage: 'Close'}); + } + return ( {this.renderBody(styles)} - {this.renderTeamButton(styles)} - {this.renderChannelButton(styles)} + {!error && this.renderTeamButton(styles)} + {!error && this.renderChannelButton(styles)} ); } From dcdf6d7971bbccf28eae7e58c340bf4dbadd387f Mon Sep 17 00:00:00 2001 From: Harrison Healey Date: Wed, 27 Jun 2018 09:52:51 -0400 Subject: [PATCH 07/12] MM-11052 Cherry-pick RN fix for Android keyboard emoji autocomplete (#1838) --- 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 ecaef26f6..8b54e3810 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14533,8 +14533,8 @@ } }, "react-native": { - "version": "github:enahum/react-native#d7aa4677f3290cb0650952782a797aea9729e47e", - "from": "github:enahum/react-native#text-0.55", + "version": "github:enahum/react-native#b295c057c20bf3432f339874965e14268410d70b", + "from": "github:enahum/react-native#mm", "requires": { "absolute-path": "^0.0.0", "art": "^0.10.0", diff --git a/package.json b/package.json index 6a5865064..ef2042227 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ "prop-types": "15.6.1", "react": "16.3.2", "react-intl": "2.4.0", - "react-native": "github:enahum/react-native#text-0.55", + "react-native": "github:enahum/react-native#mm", "react-native-animatable": "1.2.4", "react-native-bottom-sheet": "1.0.3", "react-native-button": "2.3.0", From 05b6b8bce9b81cca26266a20a650aa6e22487276 Mon Sep 17 00:00:00 2001 From: Elias Nahum Date: Wed, 27 Jun 2018 10:14:26 -0400 Subject: [PATCH 08/12] Bump iOS build number to 116 (#1839) --- 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 5d9b86e71..c8908fd4d 100644 --- a/ios/Mattermost.xcodeproj/project.pbxproj +++ b/ios/Mattermost.xcodeproj/project.pbxproj @@ -2516,7 +2516,7 @@ CODE_SIGN_ENTITLEMENTS = Mattermost/Mattermost.entitlements; CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - CURRENT_PROJECT_VERSION = 115; + CURRENT_PROJECT_VERSION = 116; DEAD_CODE_STRIPPING = NO; DEVELOPMENT_TEAM = UQ8HT4Q2XM; ENABLE_BITCODE = NO; @@ -2566,7 +2566,7 @@ CODE_SIGN_ENTITLEMENTS = Mattermost/Mattermost.entitlements; CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - CURRENT_PROJECT_VERSION = 115; + CURRENT_PROJECT_VERSION = 116; DEAD_CODE_STRIPPING = NO; DEVELOPMENT_TEAM = UQ8HT4Q2XM; ENABLE_BITCODE = NO; diff --git a/ios/Mattermost/Info.plist b/ios/Mattermost/Info.plist index ff11ab60f..4ba9cb4f1 100644 --- a/ios/Mattermost/Info.plist +++ b/ios/Mattermost/Info.plist @@ -34,7 +34,7 @@ CFBundleVersion - 115 + 116 ITSAppUsesNonExemptEncryption LSRequiresIPhoneOS diff --git a/ios/MattermostShare/Info.plist b/ios/MattermostShare/Info.plist index dda69e6ca..7ada07045 100644 --- a/ios/MattermostShare/Info.plist +++ b/ios/MattermostShare/Info.plist @@ -23,7 +23,7 @@ CFBundleShortVersionString 1.9.2 CFBundleVersion - 115 + 116 NSAppTransportSecurity NSAllowsArbitraryLoads diff --git a/ios/MattermostTests/Info.plist b/ios/MattermostTests/Info.plist index 1d380a42f..f2c966c71 100644 --- a/ios/MattermostTests/Info.plist +++ b/ios/MattermostTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 115 + 116 From 2d23e60576af368a997d611b1741679197e47fe3 Mon Sep 17 00:00:00 2001 From: Elias Nahum Date: Wed, 27 Jun 2018 10:15:59 -0400 Subject: [PATCH 09/12] Bump Android build number to 116 (#1840) --- 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 13ea72d2b..1a4e8d69a 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -113,7 +113,7 @@ android { applicationId "com.mattermost.rnbeta" minSdkVersion 21 targetSdkVersion 23 - versionCode 115 + versionCode 116 versionName "1.9.2" ndk { abiFilters "armeabi-v7a", "x86" From ad12b11f85640ae94fa4fb244da3a4376dc9a1ac Mon Sep 17 00:00:00 2001 From: Elias Nahum Date: Wed, 27 Jun 2018 13:15:06 -0400 Subject: [PATCH 10/12] Fix android extension search (#1842) --- .../android/extension_channels/extension_channels.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/share_extension/android/extension_channels/extension_channels.js b/share_extension/android/extension_channels/extension_channels.js index 940880a70..b7dd63034 100644 --- a/share_extension/android/extension_channels/extension_channels.js +++ b/share_extension/android/extension_channels/extension_channels.js @@ -1,5 +1,5 @@ -// Copyright (c) 2018-present Mattermost, Inc. All Rights Reserved. -// See License.txt for license information. +// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved. +// See LICENSE.txt for license information. import React, {PureComponent} from 'react'; import PropTypes from 'prop-types'; @@ -190,6 +190,7 @@ export default class ExtensionTeam extends PureComponent { titleCancelColor={defaultTheme.centerChannelColor} onChangeText={this.handleSearch} autoCapitalize='none' + value={this.state.term} /> ); From b4829b26f4ccacca8a37e1da61911880e1e61316 Mon Sep 17 00:00:00 2001 From: Elias Nahum Date: Wed, 27 Jun 2018 13:39:22 -0400 Subject: [PATCH 11/12] Bump iOS build number to 117 (#1843) --- 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 c8908fd4d..a2ac0714f 100644 --- a/ios/Mattermost.xcodeproj/project.pbxproj +++ b/ios/Mattermost.xcodeproj/project.pbxproj @@ -2516,7 +2516,7 @@ CODE_SIGN_ENTITLEMENTS = Mattermost/Mattermost.entitlements; CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - CURRENT_PROJECT_VERSION = 116; + CURRENT_PROJECT_VERSION = 117; DEAD_CODE_STRIPPING = NO; DEVELOPMENT_TEAM = UQ8HT4Q2XM; ENABLE_BITCODE = NO; @@ -2566,7 +2566,7 @@ CODE_SIGN_ENTITLEMENTS = Mattermost/Mattermost.entitlements; CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - CURRENT_PROJECT_VERSION = 116; + CURRENT_PROJECT_VERSION = 117; DEAD_CODE_STRIPPING = NO; DEVELOPMENT_TEAM = UQ8HT4Q2XM; ENABLE_BITCODE = NO; diff --git a/ios/Mattermost/Info.plist b/ios/Mattermost/Info.plist index 4ba9cb4f1..891224c1f 100644 --- a/ios/Mattermost/Info.plist +++ b/ios/Mattermost/Info.plist @@ -34,7 +34,7 @@ CFBundleVersion - 116 + 117 ITSAppUsesNonExemptEncryption LSRequiresIPhoneOS diff --git a/ios/MattermostShare/Info.plist b/ios/MattermostShare/Info.plist index 7ada07045..4bde0fc1b 100644 --- a/ios/MattermostShare/Info.plist +++ b/ios/MattermostShare/Info.plist @@ -23,7 +23,7 @@ CFBundleShortVersionString 1.9.2 CFBundleVersion - 116 + 117 NSAppTransportSecurity NSAllowsArbitraryLoads diff --git a/ios/MattermostTests/Info.plist b/ios/MattermostTests/Info.plist index f2c966c71..609e14aa6 100644 --- a/ios/MattermostTests/Info.plist +++ b/ios/MattermostTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 116 + 117 From cd5a6e5556d366c31754791a1e3e91d6a75b1eb2 Mon Sep 17 00:00:00 2001 From: Elias Nahum Date: Wed, 27 Jun 2018 13:43:27 -0400 Subject: [PATCH 12/12] Bump Android build number to 117 (#1844) --- 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 1a4e8d69a..833808547 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -113,7 +113,7 @@ android { applicationId "com.mattermost.rnbeta" minSdkVersion 21 targetSdkVersion 23 - versionCode 116 + versionCode 117 versionName "1.9.2" ndk { abiFilters "armeabi-v7a", "x86"