toki/mattermost-mobile
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'release-1.35' of github.com:mattermost/mattermost-mobile into release-1.35

Browse source
This commit is contained in:
Elias Nahum 2020-08-14 14:06:07 -04:00
commit 1805874740
No known key found for this signature in database
GPG key ID: E038DB71E0B61702
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/components/post_draft/quick_actions/file_quick_action/index.js
View file

@ -68,8 +68,10 @@ export default class FileQuickAction extends PureComponent {
}
}
// Decode file uri to get the actual path
res.uri = decodeURIComponent(res.uri);
if (Platform.OS === 'ios') {
// Decode file uri to get the actual path
res.uri = decodeURIComponent(res.uri);
}
this.props.onUploadFiles([res]);
} catch (error) {

6
app/utils/file.test.js
View file

@ -1,7 +1,11 @@
// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
// See LICENSE.txt for license information.
import {generateId, getLocalFilePathFromFile, getExtensionFromContentDisposition} from 'app/utils/file';
import {
generateId,
getLocalFilePathFromFile,
getExtensionFromContentDisposition,
} from 'app/utils/file';
describe('getExtensionFromContentDisposition', () => {
it('should return the extracted the extension', () => {