From 530ee2aaa7a7374b46c4fb00abd4a3c867665745 Mon Sep 17 00:00:00 2001 From: xrh0905 <1014930533@qq.com> Date: Wed, 11 Jan 2023 15:22:43 +0000 Subject: [PATCH 1/2] Stop checking locale to disable Callkit. --- MatrixSDK/VoIP/CallKit/MXCallKitAdapter.m | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/MatrixSDK/VoIP/CallKit/MXCallKitAdapter.m b/MatrixSDK/VoIP/CallKit/MXCallKitAdapter.m index a549f46bee..48a725a095 100644 --- a/MatrixSDK/VoIP/CallKit/MXCallKitAdapter.m +++ b/MatrixSDK/VoIP/CallKit/MXCallKitAdapter.m @@ -313,8 +313,9 @@ + (BOOL)callKitAvailable // CallKit currently illegal in China // https://github.com/vector-im/riot-ios/issues/1941 + // E2EE is illegal in China too, so it's pointless to check locale. - return ![NSLocale.currentLocale.countryCode isEqualToString:@"CN"]; + return YES; } #pragma mark - CXProviderDelegate From cc800435d0617c7db1d18ca498f4da37d0fcec29 Mon Sep 17 00:00:00 2001 From: xrh0905 <1014930533@qq.com> Date: Wed, 11 Jan 2023 15:37:56 +0000 Subject: [PATCH 2/2] Add change log for remove locale lock for callkit. --- changelog.d/1679.change | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/1679.change diff --git a/changelog.d/1679.change b/changelog.d/1679.change new file mode 100644 index 0000000000..408a2dc340 --- /dev/null +++ b/changelog.d/1679.change @@ -0,0 +1 @@ +Callkit: Remove locale lock for callkit. Contributed by xrh0905. \ No newline at end of file