From 92b3ea5d253a950cee7f4e5cae20e4db43c4223f Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Mon, 1 Aug 2016 10:41:10 -0700 Subject: [PATCH] Re-enable attachment cleanup migration after fixing it in SSK (#1298) // FREEBIE --- Podfile.lock | 2 +- Signal/src/environment/VersionMigrations.m | 11 ++++------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/Podfile.lock b/Podfile.lock index cb5105cec..07c0a7fdd 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -130,7 +130,7 @@ EXTERNAL SOURCES: CHECKOUT OPTIONS: SignalServiceKit: - :commit: c14e4bb7b372a8277860f27ebd7eed7637828395 + :commit: 9aa88f6ce5c16ee36509a8698e191560328aa2e5 :git: https://github.com/WhisperSystems/SignalServiceKit.git SocketRocket: :commit: 8096fef47d582bff8ae3758c9ae7af1d55ea53d6 diff --git a/Signal/src/environment/VersionMigrations.m b/Signal/src/environment/VersionMigrations.m index c518b8bdc..f7b2b749a 100644 --- a/Signal/src/environment/VersionMigrations.m +++ b/Signal/src/environment/VersionMigrations.m @@ -63,13 +63,10 @@ [self clearBloomFilterCache]; } - // Disabled until further stability testing is done. After some local testing, I saw missing attachments. - MJK - // - // if ([self isVersion:previousVersion atLeast:@"2.0.0" andLessThan:@"2.4.1"] && [TSAccountManager isRegistered]) - // { - // DDLogInfo(@"Running migration: removing orphaned data."); - // [[OWSOrphanedDataCleaner new] removeOrphanedData]; - // } + if ([self isVersion:previousVersion atLeast:@"2.0.0" andLessThan:@"2.4.1"] && [TSAccountManager isRegistered]) { + DDLogInfo(@"Running migration: removing orphaned data."); + [[OWSOrphanedDataCleaner new] removeOrphanedData]; + } [Environment.preferences setAndGetCurrentVersion]; }