From 4be302bbeab75083291a5335022c92128dcf5843 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Tue, 29 Jan 2019 16:32:30 -0500 Subject: [PATCH] Update link previews setting behavior. --- Signal.xcodeproj/project.pbxproj | 4 -- Signal/src/AppDelegate.m | 7 ++- .../OWS115LinkPreviewsMigration.swift | 43 ------------------- .../migrations/OWSDatabaseMigrationRunner.m | 1 - 4 files changed, 6 insertions(+), 49 deletions(-) delete mode 100644 SignalMessaging/environment/migrations/OWS115LinkPreviewsMigration.swift diff --git a/Signal.xcodeproj/project.pbxproj b/Signal.xcodeproj/project.pbxproj index 5287229a6..d31ba05a7 100644 --- a/Signal.xcodeproj/project.pbxproj +++ b/Signal.xcodeproj/project.pbxproj @@ -298,7 +298,6 @@ 34EA69422194DE8000702471 /* MediaUploadView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34EA69412194DE7F00702471 /* MediaUploadView.swift */; }; 34F308A21ECB469700BB7697 /* OWSBezierPathView.m in Sources */ = {isa = PBXBuildFile; fileRef = 34F308A11ECB469700BB7697 /* OWSBezierPathView.m */; }; 34FDB29221FF986600A01202 /* UIView+OWS.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34FDB29121FF986600A01202 /* UIView+OWS.swift */; }; - 34FDB2942200974600A01202 /* OWS115LinkPreviewsMigration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34FDB2932200974600A01202 /* OWS115LinkPreviewsMigration.swift */; }; 4503F1BE20470A5B00CEE724 /* classic-quiet.aifc in Resources */ = {isa = PBXBuildFile; fileRef = 4503F1BB20470A5B00CEE724 /* classic-quiet.aifc */; }; 4503F1BF20470A5B00CEE724 /* classic.aifc in Resources */ = {isa = PBXBuildFile; fileRef = 4503F1BC20470A5B00CEE724 /* classic.aifc */; }; 4503F1C3204711D300CEE724 /* OWS107LegacySounds.m in Sources */ = {isa = PBXBuildFile; fileRef = 4503F1C1204711D200CEE724 /* OWS107LegacySounds.m */; }; @@ -1015,7 +1014,6 @@ 34F308A01ECB469700BB7697 /* OWSBezierPathView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OWSBezierPathView.h; sourceTree = ""; }; 34F308A11ECB469700BB7697 /* OWSBezierPathView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OWSBezierPathView.m; sourceTree = ""; }; 34FDB29121FF986600A01202 /* UIView+OWS.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIView+OWS.swift"; sourceTree = ""; }; - 34FDB2932200974600A01202 /* OWS115LinkPreviewsMigration.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OWS115LinkPreviewsMigration.swift; sourceTree = ""; }; 435EAC2E5E22D3F087EB3192 /* Pods-SignalShareExtension.app store release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-SignalShareExtension.app store release.xcconfig"; path = "Pods/Target Support Files/Pods-SignalShareExtension/Pods-SignalShareExtension.app store release.xcconfig"; sourceTree = ""; }; 4503F1BB20470A5B00CEE724 /* classic-quiet.aifc */ = {isa = PBXFileReference; lastKnownFileType = file; path = "classic-quiet.aifc"; sourceTree = ""; }; 4503F1BC20470A5B00CEE724 /* classic.aifc */ = {isa = PBXFileReference; lastKnownFileType = file; path = classic.aifc; sourceTree = ""; }; @@ -1682,7 +1680,6 @@ 34B6A908218B8824007C4606 /* OWS112TypingIndicatorsMigration.swift */, 4C7537882193779700DF5E37 /* OWS113MultiAttachmentMediaMessages.swift */, 34BEDB0A21C2FA3D007B0EAE /* OWS114RemoveDynamicInteractions.swift */, - 34FDB2932200974600A01202 /* OWS115LinkPreviewsMigration.swift */, 346129931FD1E30000532771 /* OWSDatabaseMigration.h */, 346129941FD1E30000532771 /* OWSDatabaseMigration.m */, 346129E51FD5C0C600532771 /* OWSDatabaseMigrationRunner.h */, @@ -3414,7 +3411,6 @@ 346129AF1FD1F5D900532771 /* SystemContactsFetcher.swift in Sources */, 34AC09E3211B39B100997B47 /* OWSViewController.m in Sources */, 346129C81FD2072E00532771 /* NSAttributedString+OWS.m in Sources */, - 34FDB2942200974600A01202 /* OWS115LinkPreviewsMigration.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/Signal/src/AppDelegate.m b/Signal/src/AppDelegate.m index 20f6f059f..a88139623 100644 --- a/Signal/src/AppDelegate.m +++ b/Signal/src/AppDelegate.m @@ -1326,12 +1326,17 @@ static NSTimeInterval launchStartedAt; [self.primaryStorage touchDbAsync]; - // Try to update account attributes every time we upgrade. + // Every time the user upgrades to a new version: + // + // * Update account attributes. + // * Sync configuration. if ([self.tsAccountManager isRegistered]) { AppVersion *appVersion = AppVersion.sharedInstance; if (appVersion.lastAppVersion.length > 0 && ![appVersion.lastAppVersion isEqualToString:appVersion.currentAppVersion]) { [[self.tsAccountManager updateAccountAttributes] retainUntilComplete]; + + [SSKEnvironment.shared.syncManager sendConfigurationSyncMessage]; } } } diff --git a/SignalMessaging/environment/migrations/OWS115LinkPreviewsMigration.swift b/SignalMessaging/environment/migrations/OWS115LinkPreviewsMigration.swift deleted file mode 100644 index 3459e0175..000000000 --- a/SignalMessaging/environment/migrations/OWS115LinkPreviewsMigration.swift +++ /dev/null @@ -1,43 +0,0 @@ -// -// Copyright (c) 2019 Open Whisper Systems. All rights reserved. -// - -import Foundation -import SignalServiceKit - -@objc -public class OWS115LinkPreviewsMigration: OWSDatabaseMigration { - - // MARK: - - - // Increment a similar constant for each migration. - @objc - class func migrationId() -> String { - return "115" - } - - override public func runUp(completion: @escaping OWSDatabaseMigrationCompletion) { - Logger.debug("") - BenchAsync(title: "Link Previews Migration") { (benchCompletion) in - self.doMigrationAsync(completion: { - benchCompletion() - completion() - }) - } - } - - private func doMigrationAsync(completion : @escaping OWSDatabaseMigrationCompletion) { - DispatchQueue.main.async { - // Link Previews should be disabled by default for legacy users. - SSKPreferences.setAreLinkPreviewsEnabled(value: false) - - DispatchQueue.global().async { - self.dbReadWriteConnection().readWrite { transaction in - self.save(with: transaction) - } - - completion() - } - } - } -} diff --git a/SignalMessaging/environment/migrations/OWSDatabaseMigrationRunner.m b/SignalMessaging/environment/migrations/OWSDatabaseMigrationRunner.m index c9a9bd1c6..9837b79bf 100644 --- a/SignalMessaging/environment/migrations/OWSDatabaseMigrationRunner.m +++ b/SignalMessaging/environment/migrations/OWSDatabaseMigrationRunner.m @@ -48,7 +48,6 @@ NS_ASSUME_NONNULL_BEGIN [[OWS112TypingIndicatorsMigration alloc] init], [[OWS113MultiAttachmentMediaMessages alloc] init], [[OWS114RemoveDynamicInteractions alloc] init], - [[OWS115LinkPreviewsMigration alloc] init], ]; }