Merge branch 'ismail/5068_design_tweaks' into ismail/5096_thread_notifications

Riot/Modules/MatrixKit/Utils/MXKAnalyticsConstants.h

@@ -1,33 +0,0 @@
-// 
-// Copyright 2020 The Matrix.org Foundation C.I.C
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-#import <Foundation/Foundation.h>
-
-
-typedef NSString *const MXKAnalyticsCategory NS_TYPED_EXTENSIBLE_ENUM;
-
-/**
- The analytics category for local contacts.
- */
-static MXKAnalyticsCategory const MXKAnalyticsCategoryContacts = @"localContacts";
-
-
-typedef NSString *const MXKAnalyticsName NS_TYPED_EXTENSIBLE_ENUM;
-
-/**
- The analytics value for accept/decline of local contacts access.
- */
-static MXKAnalyticsName const MXKAnalyticsNameContactsAccessGranted = @"accessGranted";

Riot/Modules/MatrixKit/Utils/MXKTools.m

@@ -27,7 +27,6 @@
 #import "MXKAppSettings.h"
 #import <MatrixSDK/MXTools.h>
 #import "MXKSwiftHeader.h"
-#import "MXKAnalyticsConstants.h"
 
 #pragma mark - Constants definitions
 
@@ -884,9 +883,7 @@ manualChangeMessageForVideo:(NSString*)manualChangeMessageForVideo
         // Request address book access
         [[CNContactStore new] requestAccessForEntityType:CNEntityTypeContacts completionHandler:^(BOOL granted, NSError * _Nullable error) {
             
-            [MXSDKOptions.sharedInstance.analyticsDelegate trackValue:[NSNumber numberWithBool:granted]
-                                                             category:MXKAnalyticsCategoryContacts
-                                                                 name:MXKAnalyticsNameContactsAccessGranted];
+            [MXSDKOptions.sharedInstance.analyticsDelegate trackContactsAccessGranted:granted];
             
             dispatch_async(dispatch_get_main_queue(), ^{