element-hq/element-ios/issues/5298 - Using MXEventAssetTypeUser as de…

…fault as per the MSC.
matrix-org · Jan 19, 2022 · 3f8db87 · 3f8db87
1 parent cfdac87
commit 3f8db87
Showing 1 changed file with 21 additions and 8 deletions.
diff --git a/MatrixSDK/JSONModels/Event/Content/MXEventContentLocation.m b/MatrixSDK/JSONModels/Event/Content/MXEventContentLocation.m
@@ -40,33 +40,46 @@ + (instancetype)modelFromJSON:(NSDictionary *)JSONDictionary
 {
  NSString *description;
  NSString *geoURIString;
- MXEventAssetType assetType = MXEventAssetTypeGeneric;
+ MXEventAssetType assetType = MXEventAssetTypeUser;
 
  NSDictionary *locationDictionary = JSONDictionary[kMXMessageContentKeyExtensibleLocationMSC3488];
  if (locationDictionary == nil)
  {
  locationDictionary = JSONDictionary[kMXMessageContentKeyExtensibleLocation];
  }
 
- if (locationDictionary) {
+ if (locationDictionary)
+ {
  MXJSONModelSetString(geoURIString, locationDictionary[kMXMessageContentKeyExtensibleLocationURI]);
  MXJSONModelSetString(description, locationDictionary[kMXMessageContentKeyExtensibleLocationDescription]);
- } else if ([JSONDictionary[kMXMessageTypeKey] isEqualToString:kMXMessageTypeLocation]) {
+ }
+ else if ([JSONDictionary[kMXMessageTypeKey] isEqualToString:kMXMessageTypeLocation])
+ {
  MXJSONModelSetString(geoURIString, JSONDictionary[kMXMessageGeoURIKey]);
- } else {
+ }
+ else
+ {
  return nil;
  }
 
- if ([JSONDictionary[kMXMessageContentKeyExtensibleAsset][kMXMessageContentKeyExtensibleAssetType] isEqualToString:kMXMessageContentKeyExtensibleAssetTypeUser] ||
-  [JSONDictionary[kMXMessageContentKeyExtensibleAssetMSC3488][kMXMessageContentKeyExtensibleAssetType] isEqualToString:kMXMessageContentKeyExtensibleAssetTypeUser])
+ NSDictionary *assetDictionary = JSONDictionary[kMXMessageContentKeyExtensibleAssetMSC3488];
+ if (assetDictionary == nil)
  {
- assetType = MXEventAssetTypeUser;
+ assetDictionary = JSONDictionary[kMXMessageContentKeyExtensibleAsset];
+ }
+
+ if (assetDictionary)
+ {
+ if (![assetDictionary[kMXMessageContentKeyExtensibleAssetType] isEqualToString:kMXMessageContentKeyExtensibleAssetTypeUser]) {
+ assetType = MXEventAssetTypeGeneric;
+ }
  }
 
  NSString *locationString = [[geoURIString componentsSeparatedByString:@":"].lastObject componentsSeparatedByString:@";"].firstObject;
  NSArray *locationComponents = [locationString componentsSeparatedByString:@","];
 
- if (locationComponents.count != 2) {
+ if (locationComponents.count != 2)
+ {
  return nil;
  }