Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Disable CallKit in China (#1941) #578

Merged
merged 4 commits into from
Oct 16, 2018
Merged

Disable CallKit in China (#1941) #578

merged 4 commits into from
Oct 16, 2018

Conversation

aaronraimist
Copy link
Contributor

@aaronraimist aaronraimist commented Oct 15, 2018

Fixes element-hq/element-ios#1941
Fixes element-hq/element-ios#1891

I decided to just disable in the same way that we disable it if you are on iOS 9.

I think it would be pointless to display the grayed out CallKit settings to Chinese users and add a new string that says basically sorry we can't legally give you this feature.

Copy link
Contributor

@manuroe manuroe left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @aaronraimist. That change will be greatly appreciated.
It is not mentioned yet anywhere in matrix iOS contribution guides but could you please update CHANGES.rst?

// CallKit currently illegal in China
// https://github.com/vector-im/riot-ios/issues/1941

return ![NSLocale.currentLocale.countryCode isEqual: @"CN"];
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

https://stackoverflow.com/a/51319158 checks also "CHN". We could do the same.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

screen shot 2018-10-16 at 11 04 38 am

It seems like they are all two letters as least as far as iOS is concerned.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok, so "CN" only.

MatrixSDK/VoIP/CallKit/MXCallKitAdapter.m Outdated Show resolved Hide resolved
@aaronraimist
Copy link
Contributor Author

Should be good to go

@manuroe manuroe merged commit d9f55a4 into matrix-org:develop Oct 16, 2018
@aaronraimist aaronraimist deleted the callkit-china branch October 16, 2018 16:28
@manuroe
Copy link
Contributor

manuroe commented Oct 16, 2018

I think it would be pointless to display the grayed out CallKit settings to Chinese users and add a new string that says basically sorry we can't legally give you this feature.

If [MXCallKitAdapter callKitAvailable] == NO, this section is not displayed in the settings so we are good.

@aaronraimist
Copy link
Contributor Author

Yeah I was just responding to element-hq/element-ios#1941 which talked about adding a new string and disabling it in a different way so it would still show that section of the settings but explain that it can't be enabled legally.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants