diff --git a/Signal.xcodeproj/project.pbxproj b/Signal.xcodeproj/project.pbxproj index 6f85706c0..76604da47 100644 --- a/Signal.xcodeproj/project.pbxproj +++ b/Signal.xcodeproj/project.pbxproj @@ -13,6 +13,7 @@ 34535D821E256BE9008A4747 /* UIView+OWS.m in Sources */ = {isa = PBXBuildFile; fileRef = 34535D811E256BE9008A4747 /* UIView+OWS.m */; }; 348F3A4F1E4A533900750D44 /* CallInterstitialViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 348F3A4E1E4A533900750D44 /* CallInterstitialViewController.swift */; }; 34FD93701E3BD43A00109093 /* OWSAnyTouchGestureRecognizer.m in Sources */ = {isa = PBXBuildFile; fileRef = 34FD936F1E3BD43A00109093 /* OWSAnyTouchGestureRecognizer.m */; }; + 450573FE1E78A06D00615BB4 /* OWS103EnableVideoCalling.m in Sources */ = {isa = PBXBuildFile; fileRef = 450573FD1E78A06D00615BB4 /* OWS103EnableVideoCalling.m */; }; 4505C2BF1E648EA300CEBF41 /* ExperienceUpgrade.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4505C2BE1E648EA300CEBF41 /* ExperienceUpgrade.swift */; }; 4505C2C01E648EA300CEBF41 /* ExperienceUpgrade.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4505C2BE1E648EA300CEBF41 /* ExperienceUpgrade.swift */; }; 4505C2C21E648F7A00CEBF41 /* ExperienceUpgradeFinder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4505C2C11E648F7A00CEBF41 /* ExperienceUpgradeFinder.swift */; }; @@ -627,6 +628,8 @@ 348F3A4E1E4A533900750D44 /* CallInterstitialViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CallInterstitialViewController.swift; sourceTree = ""; }; 34FD936E1E3BD43A00109093 /* OWSAnyTouchGestureRecognizer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OWSAnyTouchGestureRecognizer.h; path = views/OWSAnyTouchGestureRecognizer.h; sourceTree = ""; }; 34FD936F1E3BD43A00109093 /* OWSAnyTouchGestureRecognizer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OWSAnyTouchGestureRecognizer.m; path = views/OWSAnyTouchGestureRecognizer.m; sourceTree = ""; }; + 450573FC1E78A06D00615BB4 /* OWS103EnableVideoCalling.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OWS103EnableVideoCalling.h; path = Migrations/OWS103EnableVideoCalling.h; sourceTree = ""; }; + 450573FD1E78A06D00615BB4 /* OWS103EnableVideoCalling.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OWS103EnableVideoCalling.m; path = Migrations/OWS103EnableVideoCalling.m; sourceTree = ""; }; 4505C2BE1E648EA300CEBF41 /* ExperienceUpgrade.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ExperienceUpgrade.swift; path = ExperienceUpgrades/ExperienceUpgrade.swift; sourceTree = ""; }; 4505C2C11E648F7A00CEBF41 /* ExperienceUpgradeFinder.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ExperienceUpgradeFinder.swift; sourceTree = ""; }; 4505C2C41E64977D00CEBF41 /* ExperienceUpgradesPageViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ExperienceUpgradesPageViewController.swift; sourceTree = ""; }; @@ -1389,6 +1392,8 @@ 4516E3FE1DD2193B00DC4206 /* OWS101ExistingUsersBlockOnIdentityChange.m */, 45387B021E36D650005D00B3 /* OWS102MoveLoggingPreferenceToUserDefaults.h */, 45387B031E36D650005D00B3 /* OWS102MoveLoggingPreferenceToUserDefaults.m */, + 450573FC1E78A06D00615BB4 /* OWS103EnableVideoCalling.h */, + 450573FD1E78A06D00615BB4 /* OWS103EnableVideoCalling.m */, ); name = Migrations; sourceTree = ""; @@ -3232,6 +3237,7 @@ FCFA64B41A24F3880007FB87 /* UIColor+OWS.m in Sources */, 4517642B1DE939FD00EDB8B9 /* ContactCell.swift in Sources */, 451764271DE939F300EDB8B9 /* ContactsPicker.swift in Sources */, + 450573FE1E78A06D00615BB4 /* OWS103EnableVideoCalling.m in Sources */, 76EB05C218170B33006006FC /* DhPacketSharedSecretHashes.m in Sources */, B6C93C4E199567AD00EDF894 /* DebugLogger.m in Sources */, 76EB063218170B33006006FC /* Crc32.m in Sources */, diff --git a/Signal/src/environment/Migrations/OWS103EnableVideoCalling.h b/Signal/src/environment/Migrations/OWS103EnableVideoCalling.h new file mode 100644 index 000000000..9730100f5 --- /dev/null +++ b/Signal/src/environment/Migrations/OWS103EnableVideoCalling.h @@ -0,0 +1,9 @@ +// +// Copyright (c) 2017 Open Whisper Systems. All rights reserved. +// + +#import "OWSDatabaseMigration.h" + +@interface OWS103EnableVideoCalling : OWSDatabaseMigration + +@end diff --git a/Signal/src/environment/Migrations/OWS103EnableVideoCalling.m b/Signal/src/environment/Migrations/OWS103EnableVideoCalling.m new file mode 100644 index 000000000..86f309a03 --- /dev/null +++ b/Signal/src/environment/Migrations/OWS103EnableVideoCalling.m @@ -0,0 +1,47 @@ +// +// Copyright (c) 2017 Open Whisper Systems. All rights reserved. +// + +#import "OWS103EnableVideoCalling.h" +#import +#import + +// Increment a similar constant for every future DBMigration +static NSString *const OWS103EnableVideoCallingMigrationId = @"103"; + +@implementation OWS103EnableVideoCalling + ++ (NSString *)migrationId +{ + return OWS103EnableVideoCallingMigrationId; +} + +// Override parent migration +- (void)runUp +{ + DDLogWarn(@"%@ running migration...", self.tag); + + TSUpdateAttributesRequest *request = [[TSUpdateAttributesRequest alloc] initWithUpdatedAttributesWithVoice]; + [[TSNetworkManager sharedManager] makeRequest:request + success:^(NSURLSessionDataTask *task, id responseObject) { + DDLogInfo(@"%@ successfully ran", self.tag); + [self save]; + } + failure:^(NSURLSessionDataTask *task, NSError *error) { + DDLogError(@"%@ failed with error: %@", self.tag, error); + }]; +} + +#pragma mark - Logging + ++ (NSString *)tag +{ + return [NSString stringWithFormat:@"[%@]", self.class]; +} + +- (NSString *)tag +{ + return self.class.tag; +} + +@end diff --git a/Signal/src/environment/Migrations/OWSDatabaseMigrationRunner.m b/Signal/src/environment/Migrations/OWSDatabaseMigrationRunner.m index 133c59281..38ac8b7f3 100644 --- a/Signal/src/environment/Migrations/OWSDatabaseMigrationRunner.m +++ b/Signal/src/environment/Migrations/OWSDatabaseMigrationRunner.m @@ -1,10 +1,12 @@ -// Created by Michael Kirk on 9/28/16. -// Copyright © 2016 Open Whisper Systems. All rights reserved. +// +// Copyright (c) 2017 Open Whisper Systems. All rights reserved. +// #import "OWSDatabaseMigrationRunner.h" #import "OWS100RemoveTSRecipientsMigration.h" #import "OWS101ExistingUsersBlockOnIdentityChange.h" #import "OWS102MoveLoggingPreferenceToUserDefaults.h" +#import "OWS103EnableVideoCalling.h" NS_ASSUME_NONNULL_BEGIN @@ -27,7 +29,8 @@ NS_ASSUME_NONNULL_BEGIN return @[ [[OWS100RemoveTSRecipientsMigration alloc] initWithStorageManager:self.storageManager], [[OWS101ExistingUsersBlockOnIdentityChange alloc] initWithStorageManager:self.storageManager], - [[OWS102MoveLoggingPreferenceToUserDefaults alloc] initWithStorageManager:self.storageManager] + [[OWS102MoveLoggingPreferenceToUserDefaults alloc] initWithStorageManager:self.storageManager], + [[OWS103EnableVideoCalling alloc] initWithStorageManager:self.storageManager] ]; }