MXEventAssetType: Remove no more needed MXEventAssetTypeLiveLocation case and use MXEventAssetTypeUser where needed.

Author: SBiOSoftWhare

MatrixSDK/JSONModels/Location/MXBeaconInfo.m

@@ -49,7 +49,7 @@ - (instancetype)initWithUserId:(NSString *)userId
         _desc = desc;
         _timeout = timeout;
         _isLive = isLive;
-        _assetType = MXEventAssetTypeLiveLocation;
+        _assetType = MXEventAssetTypeUser;
         _timestamp = timestamp;
         _originalEvent = originalEvent;
     }
@@ -122,7 +122,7 @@ + (id)modelFromJSON:(NSDictionary *)jsonDictionary
 
         MXJSONModelSetString(assetTypeString, assetDictionary[kMXMessageContentKeyExtensibleAssetType]);
 
-        isAssetTypeValid = [assetTypeString isEqualToString:kMXMessageContentKeyExtensibleAssetTypeLiveLocation];
+        isAssetTypeValid = [assetTypeString isEqualToString:kMXMessageContentKeyExtensibleAssetTypeUser];
     }
 
     MXJSONModelSetNumber(timestampNumber, jsonDictionary[kMXMessageContentKeyExtensibleTimestampMSC3488])
@@ -144,7 +144,7 @@ + (id)modelFromJSON:(NSDictionary *)jsonDictionary
 
         beaconInfo->_timestamp = [timestampNumber unsignedLongLongValue];
 
-        beaconInfo->_assetType = MXEventAssetTypeLiveLocation;
+        beaconInfo->_assetType = MXEventAssetTypeUser;
     }
 
     return beaconInfo;
@@ -166,7 +166,7 @@ - (NSDictionary *)JSONDictionary
     // Asset type
 
     content[kMXMessageContentKeyExtensibleAssetMSC3488] = @{
-        kMXMessageContentKeyExtensibleAssetType: kMXMessageContentKeyExtensibleAssetTypeLiveLocation
+        kMXMessageContentKeyExtensibleAssetType: kMXMessageContentKeyExtensibleAssetTypeUser
     };
 
     return content;

MatrixSDK/JSONModels/MXEvent.h

@@ -294,8 +294,6 @@ FOUNDATION_EXPORT NSString *const kMXMessageContentKeyExtensibleAssetMSC3488;
 FOUNDATION_EXPORT NSString *const kMXMessageContentKeyExtensibleAssetType;
 FOUNDATION_EXPORT NSString *const kMXMessageContentKeyExtensibleAssetTypeUser;
 FOUNDATION_EXPORT NSString *const kMXMessageContentKeyExtensibleAssetTypePin;
-// live user location tracking
-FOUNDATION_EXPORT NSString *const kMXMessageContentKeyExtensibleAssetTypeLiveLocation;
 
 // Join Rules
 

MatrixSDK/JSONModels/MXEvent.m

@@ -195,7 +195,6 @@
 NSString *const kMXMessageContentKeyExtensibleAssetType = @"type";
 NSString *const kMXMessageContentKeyExtensibleAssetTypeUser = @"m.self";
 NSString *const kMXMessageContentKeyExtensibleAssetTypePin = @"m.pin";
-NSString *const kMXMessageContentKeyExtensibleAssetTypeLiveLocation = @"m.self.live";
 
 // Join Rules
 

MatrixSDK/JSONModels/MXEventAssetType.h

@@ -19,7 +19,6 @@
 typedef NS_ENUM(NSUInteger, MXEventAssetType)
 {
     MXEventAssetTypeGeneric, // A generic location without context
-    MXEventAssetTypeUser, // Static user location
-    MXEventAssetTypePin, // Pin location (POI)
-    MXEventAssetTypeLiveLocation // User live location
+    MXEventAssetTypeUser, // User location, it can be static or live depending of event type
+    MXEventAssetTypePin // Pin location (POI)
 };

MatrixSDK/Utils/MXEventAssetTypeMapper.swift

@@ -31,9 +31,7 @@ public class MXEventAssetTypeMapper: NSObject {
         case .pin:
             eventKey = kMXMessageContentKeyExtensibleAssetTypePin
         case .generic:
-            eventKey = ""
-        case .liveLocation:
-            eventKey = kMXMessageContentKeyExtensibleAssetTypeLiveLocation
+            eventKey = ""        
         @unknown default:
             eventKey = ""
         }

MatrixSDKTests/MXBeaconInfoUnitTests.swift

@@ -36,7 +36,7 @@ class MXBeaconInfoUnitTests: XCTestCase {
             "live": expectedIsLive,
             kMXMessageContentKeyExtensibleTimestampMSC3488: expectedTimestamp,
             kMXMessageContentKeyExtensibleAssetMSC3488: [
-                kMXMessageContentKeyExtensibleAssetType: kMXMessageContentKeyExtensibleAssetTypeLiveLocation
+                kMXMessageContentKeyExtensibleAssetType: kMXMessageContentKeyExtensibleAssetTypeUser
             ]
         ]
 
@@ -51,7 +51,7 @@ class MXBeaconInfoUnitTests: XCTestCase {
         XCTAssertEqual(beaconInfo.timeout, expectedTimeout)
         XCTAssertEqual(beaconInfo.isLive, expectedIsLive)
         XCTAssertEqual(beaconInfo.timestamp, expectedTimestamp)
-        XCTAssertEqual(beaconInfo.assetType, MXEventAssetType.liveLocation)
+        XCTAssertEqual(beaconInfo.assetType, MXEventAssetType.user)
     }
 
     func testParsingFailMissingTimeout() throws {
@@ -65,7 +65,7 @@ class MXBeaconInfoUnitTests: XCTestCase {
             "live": expectedIsLive,
             kMXMessageContentKeyExtensibleTimestampMSC3488: expectedTimestamp,
             kMXMessageContentKeyExtensibleAssetMSC3488: [
-                kMXMessageContentKeyExtensibleAssetType: kMXMessageContentKeyExtensibleAssetTypeLiveLocation
+                kMXMessageContentKeyExtensibleAssetType: kMXMessageContentKeyExtensibleAssetTypeUser
             ]
         ]