Merge pull request #1450 from matrix-org/andy/undo_realm

Revert Realm schema

Author: Anderas

MatrixSDK/Crypto/Data/Store/MXRealmCryptoStore/MXRealmCryptoStore.m

@@ -32,7 +32,7 @@
 #import "MXBackgroundModeHandler.h"
 #import "RLMRealm+MatrixSDK.h"
 
-NSUInteger const kMXRealmCryptoStoreVersion = 18;
+NSUInteger const kMXRealmCryptoStoreVersion = 17;
 
 static NSString *const kMXRealmCryptoStoreFolder = @"MXRealmCryptoStore";
 
@@ -114,7 +114,6 @@ @implementation MXRealmOlmSession
 @interface MXRealmOlmInboundGroupSession : RLMObject
 @property NSString *sessionId;
 @property NSString *senderKey;
-@property NSString *roomId;
 @property NSData *olmInboundGroupSessionData;
 
 // A primary key is required to update `backedUp`.
@@ -124,8 +123,6 @@ @interface MXRealmOlmInboundGroupSession : RLMObject
 // Indicate if the key has been backed up to the homeserver
 @property BOOL backedUp;
 
-@property BOOL sharedHistory;
-
 @end
 
 @implementation MXRealmOlmInboundGroupSession
@@ -954,10 +951,8 @@ - (void)storeInboundGroupSessions:(NSArray<MXOlmInboundGroupSession *>*)sessions
                 realmSession = [[MXRealmOlmInboundGroupSession alloc] initWithValue:@{
                     @"sessionId": session.session.sessionIdentifier,
                     @"senderKey": session.senderKey,
-                    @"roomId": session.roomId,
                     @"sessionIdSenderKey": sessionIdSenderKey,
                     @"olmInboundGroupSessionData": [NSKeyedArchiver archivedDataWithRootObject:session],
-                    @"sharedHistory": @(session.sharedHistory)
                 }];
 
                 [realm addObject:realmSession];
@@ -2155,8 +2150,6 @@ + (BOOL)finaliseMigrationWith:(RLMMigration *)migration oldSchemaVersion:(uint64
                         newObject[@"cryptoVersion"] = @(MXCryptoVersion2);
                     }
                 }];
-            case 17:
-                MXLogDebug(@"[MXRealmCryptoStore] Migration from schema #17 -> #18: Automatically adding MXRealmOlmInboundGroupSession.roomId and MXRealmOlmInboundGroupSession.sharedHistory");
         }
     }