diff --git a/share_extension/android/extension_channels/extension_channels.js b/share_extension/android/extension_channels/extension_channels.js index b7dd63034..5f1d2c4e6 100644 --- a/share_extension/android/extension_channels/extension_channels.js +++ b/share_extension/android/extension_channels/extension_channels.js @@ -59,6 +59,10 @@ export default class ExtensionTeam extends PureComponent { publicChannels: publicFiltered, } = this.props; + directFiltered = directFiltered.filter((c) => c.delete_at === 0); + privateFiletered = privateFiletered.filter((c) => c.delete_at === 0); + publicFiltered = publicFiltered.filter((c) => c.delete_at === 0); + if (term) { directFiltered = directFiltered.filter((c) => c.display_name.toLowerCase().includes(term.toLowerCase())); privateFiletered = privateFiletered.filter((c) => c.display_name.toLowerCase().includes(term.toLowerCase())); diff --git a/share_extension/android/extension_post/index.js b/share_extension/android/extension_post/index.js index 7e62aa5cc..12ad2ca75 100644 --- a/share_extension/android/extension_post/index.js +++ b/share_extension/android/extension_post/index.js @@ -3,7 +3,7 @@ import {connect} from 'react-redux'; -import {getCurrentChannelId} from 'mattermost-redux/selectors/entities/channels'; +import {getCurrentChannel, getDefaultChannel} from 'mattermost-redux/selectors/entities/channels'; import {getCurrentTeamId} from 'mattermost-redux/selectors/entities/teams'; import {getCurrentUserId} from 'mattermost-redux/selectors/entities/users'; import {getConfig} from 'mattermost-redux/selectors/entities/general'; @@ -16,9 +16,13 @@ function mapStateToProps(state) { const config = getConfig(state); const {credentials} = state.entities.general; const {token, url} = credentials; + let channel = getCurrentChannel(state); + if (channel.delete_at !== 0) { + channel = getDefaultChannel(state); + } return { - channelId: getCurrentChannelId(state), + channelId: channel.id, currentUserId: getCurrentUserId(state), maxFileSize: getAllowedServerMaxFileSize(config), teamId: getCurrentTeamId(state), diff --git a/share_extension/ios/extension_channels.js b/share_extension/ios/extension_channels.js index 81b68d616..d03c2cd0a 100644 --- a/share_extension/ios/extension_channels.js +++ b/share_extension/ios/extension_channels.js @@ -53,7 +53,7 @@ export default class ExtensionChannels extends PureComponent { channels.forEach((channel) => { const include = term ? channel.display_name.toLowerCase().includes(term.toLowerCase()) : true; - if (channel.display_name && include) { + if (channel.display_name && include && channel.delete_at === 0) { switch (channel.type) { case General.OPEN_CHANNEL: publicChannels.push(channel); diff --git a/share_extension/ios/extension_post.js b/share_extension/ios/extension_post.js index 1e91a159b..cf765cc81 100644 --- a/share_extension/ios/extension_post.js +++ b/share_extension/ios/extension_post.js @@ -22,7 +22,7 @@ import RNFetchBlob from 'rn-fetch-blob'; import {Client4} from 'mattermost-redux/client'; import {General} from 'mattermost-redux/constants'; -import {getChannel} from 'mattermost-redux/selectors/entities/channels'; +import {getChannel, getDefaultChannel} from 'mattermost-redux/selectors/entities/channels'; import {getFormattedFileSize, lookupMimeType} from 'mattermost-redux/utils/file_utils'; import {isMinimumServerVersion} from 'mattermost-redux/utils/helpers'; @@ -237,6 +237,10 @@ export default class ExtensionPost extends PureComponent { channel = getChannel({entities}, channel.id); } + if (channel.delete_at !== 0) { + channel = getDefaultChannel({entities}); + } + for (let i = 0; i < items.length; i++) { const item = items[i]; switch (item.type) {