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

MM-15428 Return empty object for native managed configuration when not set (#2770)

Browse source
This commit is contained in:
Elias Nahum 2019-05-06 12:20:08 -04:00 committed by Miguel Alatzar
parent 0b74be530f
commit d8a76946f3
10 changed files with 19 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
android/app/src/main/java/com/mattermost/rnbeta/MattermostManagedModule.java
View file

@ -56,10 +56,10 @@ public class MattermostManagedModule extends ReactContextBaseJavaModule {
Object result = Arguments.fromBundle(config);
promise.resolve(result);
} else {
throw new Exception("The MDM vendor has not sent any Managed configuration");
promise.resolve(Arguments.createMap());
}
} catch (Exception e) {
promise.reject("no managed configuration", e);
promise.resolve(Arguments.createMap());
}
}
}

2
app/components/at_mention/at_mention.js
View file

@ -99,7 +99,7 @@ export default class AtMention extends React.PureComponent {
const config = mattermostManaged.getCachedConfig();
if (config.copyAndPasteProtection !== 'true') {
if (config?.copyAndPasteProtection !== 'true') {
const cancelText = formatMessage({id: 'mobile.post.cancel', defaultMessage: 'Cancel'});
const actionText = formatMessage({id: 'mobile.mention.copy_mention', defaultMessage: 'Copy Mention'});

2
app/components/markdown/markdown_code_block/markdown_code_block.js
View file

@ -84,7 +84,7 @@ export default class MarkdownCodeBlock extends React.PureComponent {
const config = mattermostManaged.getCachedConfig();
if (config.copyAndPasteProtection !== 'true') {
if (config?.copyAndPasteProtection !== 'true') {
const cancelText = formatMessage({id: 'mobile.post.cancel', defaultMessage: 'Cancel'});
const actionText = formatMessage({id: 'mobile.markdown.code.copy_code', defaultMessage: 'Copy Code'});
BottomSheet.showBottomSheetWithOptions({

2
app/components/markdown/markdown_image/markdown_image.js
View file

@ -146,7 +146,7 @@ export default class MarkdownImage extends React.Component {
const config = mattermostManaged.getCachedConfig();
if (config.copyAndPasteProtection !== 'true') {
if (config?.copyAndPasteProtection !== 'true') {
const cancelText = formatMessage({id: 'mobile.post.cancel', defaultMessage: 'Cancel'});
const actionText = formatMessage({id: 'mobile.markdown.link.copy_url', defaultMessage: 'Copy URL'});
BottomSheet.showBottomSheetWithOptions({

2
app/components/markdown/markdown_link/markdown_link.js
View file

@ -101,7 +101,7 @@ export default class MarkdownLink extends PureComponent {
const config = mattermostManaged.getCachedConfig();
if (config.copyAndPasteProtection !== 'true') {
if (config?.copyAndPasteProtection !== 'true') {
const cancelText = formatMessage({id: 'mobile.post.cancel', defaultMessage: 'Cancel'});
const actionText = formatMessage({id: 'mobile.markdown.link.copy_url', defaultMessage: 'Copy URL'});
BottomSheet.showBottomSheetWithOptions({

1
app/components/post_list/post_list.android.js
View file

@ -19,7 +19,6 @@ export default class PostList extends PostListBase {
this.state = {
refreshing: false,
managedConfig: {},
dataSource: new DataSource(props.postIds, this.keyExtractor),
};
}

1
app/components/post_list/post_list.ios.js
View file

@ -31,7 +31,6 @@ export default class PostList extends PostListBase {
this.makeExtraData = makeExtraData();
this.state = {
managedConfig: {},
postListHeight: 0,
};
}

3
app/mattermost_managed/mattermost-managed.ios.js
View file

@ -8,7 +8,6 @@ const {BlurAppScreen, MattermostManaged} = NativeModules;
const mattermostManagedEmitter = new NativeEventEmitter(MattermostManaged);
const listeners = [];
const emptyObject = {};
let cachedConfig = {};
export default {
@ -39,7 +38,7 @@ export default {
blurAppScreen: BlurAppScreen.enabled,
getConfig: async () => {
try {
cachedConfig = await MattermostManaged.getConfig() || emptyObject;
cachedConfig = await MattermostManaged.getConfig();
} catch (error) {
// do nothing...
}

2
app/screens/post_options/index.js
View file

@ -97,7 +97,7 @@ function mapStateToProps(state, ownProps) {
canAddReaction = false;
}
if (!ownProps.isSystemMessage && ownProps.managedConfig.copyAndPasteProtection !== 'true' && post.message) {
if (!ownProps.isSystemMessage && ownProps.managedConfig?.copyAndPasteProtection !== 'true' && post.message) {
canCopyText = true;
}

15
ios/Mattermost/MattermostManaged.m
View file

@ -69,14 +69,22 @@ static NSString * const feedbackKey = @"com.apple.feedback.managed";
{
NSDictionary *response = [[NSUserDefaults standardUserDefaults] dictionaryForKey:configurationKey];
if (hasListeners) {
[self sendEventWithName:@"managedConfigDidChange" body:response];
@try {
[self sendEventWithName:@"managedConfigDidChange" body:response];
} @catch (NSException *exception) {
NSLog(@"Error sending event managedConfigDidChange to JS details=%@", exception.reason);
}
}
}
- (void) remoteConfigChanged {
NSDictionary *response = [[NSUserDefaults standardUserDefaults] dictionaryForKey:configurationKey];
if (hasListeners) {
[self sendEventWithName:@"managedConfigDidChange" body:response];
@try {
[self sendEventWithName:@"managedConfigDidChange" body:response];
} @catch (NSException *exception) {
NSLog(@"Error sending event managedConfigDidChange to JS details=%@", exception.reason);
}
}
}
@ -87,8 +95,7 @@ RCT_EXPORT_METHOD(getConfig:(RCTPromiseResolveBlock)resolve
resolve(response);
}
else {
NSError *error = [NSError errorWithDomain:@"Mattermost Managed" code:-1 userInfo:nil];
reject(@"no managed configuration", @"The MDM vendor has not sent any Managed configuration", error);
resolve(@{});
}
}