From 76352bf4711d105243db8ff8977180e172c41f97 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Fri, 17 Jun 2016 15:41:41 -0700 Subject: [PATCH] Code Cleanup (#1229) * remove unused Signal-Bridging-Header * move Adapters out of ViewControllers directory * remove unimplemented method from header * Fix unused variable warning. * Move SignalsViewControllers out of UITests directory. * remove executable bit from source files // FREEBIE --- Signal.xcodeproj/project.pbxproj | 43 +++++++++++++------ .../TSMessageAdapaters}/TSAnimatedAdapter.h | 0 .../TSMessageAdapaters}/TSAnimatedAdapter.m | 0 .../TSMessageAdapaters}/TSContentAdapters.h | 0 .../TSMessageAdapaters}/TSMessageAdapter.h | 0 .../TSMessageAdapaters}/TSMessageAdapter.m | 0 .../TSMessageAdapaters}/TSPhotoAdapter.h | 0 .../TSMessageAdapaters}/TSPhotoAdapter.m | 0 .../TSVideoAttachmentAdapter.h | 0 .../TSVideoAttachmentAdapter.m | 0 Signal/src/Storyboard/Storyboard.storyboard | 0 Signal/src/contact/ContactsManager.h | 1 - Signal/src/environment/VersionMigrations.m | 2 +- .../NotificationSettingsViewController.h | 0 .../NotificationSettingsViewController.m | 0 .../view controllers/Signal-Bridging-Header.h | 4 -- .../{UITests => }/SignalsViewController.h | 0 .../{UITests => }/SignalsViewController.m | 0 18 files changed, 30 insertions(+), 20 deletions(-) rename Signal/src/{view controllers => Models/TSMessageAdapaters}/TSAnimatedAdapter.h (100%) rename Signal/src/{view controllers => Models/TSMessageAdapaters}/TSAnimatedAdapter.m (100%) rename Signal/src/{view controllers => Models/TSMessageAdapaters}/TSContentAdapters.h (100%) rename Signal/src/{view controllers => Models/TSMessageAdapaters}/TSMessageAdapter.h (100%) rename Signal/src/{view controllers => Models/TSMessageAdapaters}/TSMessageAdapter.m (100%) rename Signal/src/{view controllers => Models/TSMessageAdapaters}/TSPhotoAdapter.h (100%) rename Signal/src/{view controllers => Models/TSMessageAdapaters}/TSPhotoAdapter.m (100%) rename Signal/src/{view controllers => Models/TSMessageAdapaters}/TSVideoAttachmentAdapter.h (100%) rename Signal/src/{view controllers => Models/TSMessageAdapaters}/TSVideoAttachmentAdapter.m (100%) mode change 100755 => 100644 Signal/src/Storyboard/Storyboard.storyboard mode change 100755 => 100644 Signal/src/view controllers/NotificationSettingsViewController.h mode change 100755 => 100644 Signal/src/view controllers/NotificationSettingsViewController.m delete mode 100644 Signal/src/view controllers/Signal-Bridging-Header.h rename Signal/src/view controllers/{UITests => }/SignalsViewController.h (100%) rename Signal/src/view controllers/{UITests => }/SignalsViewController.m (100%) diff --git a/Signal.xcodeproj/project.pbxproj b/Signal.xcodeproj/project.pbxproj index ab323955e..fd4595d24 100644 --- a/Signal.xcodeproj/project.pbxproj +++ b/Signal.xcodeproj/project.pbxproj @@ -879,7 +879,6 @@ B6B226961BE4B7D200860F4D /* ContactsUI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ContactsUI.framework; path = System/Library/Frameworks/ContactsUI.framework; sourceTree = SDKROOT; }; B6B226981BE4C59200860F4D /* APNavigationController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APNavigationController.h; sourceTree = ""; }; B6B226991BE4C59200860F4D /* APNavigationController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = APNavigationController.m; sourceTree = ""; }; - B6B3655F1C286AD2009B72FF /* Signal-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Signal-Bridging-Header.h"; sourceTree = ""; }; B6B9ECFA198B31BA00C620D3 /* PushManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PushManager.h; sourceTree = ""; }; B6B9ECFB198B31BA00C620D3 /* PushManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PushManager.m; sourceTree = ""; }; B6BADBE51B88D1AC0086A80D /* LockInteractionController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LockInteractionController.h; sourceTree = ""; }; @@ -991,8 +990,8 @@ FC5CDF371A3393DD00B47253 /* error_white@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "error_white@2x.png"; sourceTree = ""; }; FC5CDF381A3393DD00B47253 /* warning_white@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "warning_white@2x.png"; sourceTree = ""; }; FC91203F1A39EFB70074545C /* qr@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "qr@2x.png"; sourceTree = ""; }; - FCAC963A19FEF9280046DFC5 /* SignalsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SignalsViewController.h; path = UITests/SignalsViewController.h; sourceTree = ""; }; - FCAC963B19FEF9280046DFC5 /* SignalsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SignalsViewController.m; path = UITests/SignalsViewController.m; sourceTree = ""; }; + FCAC963A19FEF9280046DFC5 /* SignalsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SignalsViewController.h; sourceTree = ""; }; + FCAC963B19FEF9280046DFC5 /* SignalsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SignalsViewController.m; sourceTree = ""; }; FCAC963D19FEF99A0046DFC5 /* InboxTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = InboxTableViewCell.h; path = "../view controllers/InboxTableViewCell.h"; sourceTree = ""; }; FCAC963E19FEF99A0046DFC5 /* InboxTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = InboxTableViewCell.m; path = "../view controllers/InboxTableViewCell.m"; sourceTree = ""; }; FCAC964F19FF0A6E0046DFC5 /* MessagesViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MessagesViewController.h; sourceTree = ""; }; @@ -1078,6 +1077,21 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ + 457F3AB01D1470CF00C51351 /* view controllers */ = { + isa = PBXGroup; + children = ( + ); + name = "view controllers"; + sourceTree = ""; + }; + 457F3AC01D14A0F700C51351 /* Models */ = { + isa = PBXGroup; + children = ( + B62D53F41A23CC8B009AAF82 /* TSMessageAdapters */, + ); + path = Models; + sourceTree = ""; + }; 70B8009F190C529C0042E3F0 /* Products */ = { isa = PBXGroup; children = ( @@ -1126,8 +1140,9 @@ 76EB04B118170B33006006FC /* profiling */, B60959791C2C0FA9004E8797 /* rating */, 76EB04C818170B33006006FC /* util */, - 76EB04FE18170B33006006FC /* view controllers */, - 76EB052B18170B33006006FC /* views */, + 457F3AC01D14A0F700C51351 /* Models */, + 76EB052B18170B33006006FC /* Views */, + 76EB04FE18170B33006006FC /* View Controllers */, ); path = src; sourceTree = ""; @@ -1595,23 +1610,24 @@ path = utilities; sourceTree = ""; }; - 76EB04FE18170B33006006FC /* view controllers */ = { + 76EB04FE18170B33006006FC /* View Controllers */ = { isa = PBXGroup; children = ( + FC3196311A08141D0094C78E /* Settings */, + FC3196321A08142D0094C78E /* Signals */, + FCFD25791A1543D500F4C644 /* Signup */, B6B226981BE4C59200860F4D /* APNavigationController.h */, B6B226991BE4C59200860F4D /* APNavigationController.m */, B6BADBE51B88D1AC0086A80D /* LockInteractionController.h */, B6BADBE61B88D1AC0086A80D /* LockInteractionController.m */, - FCFD25791A1543D500F4C644 /* Signup */, - FC3196321A08142D0094C78E /* Signals */, - FC3196311A08141D0094C78E /* Settings */, 76EB050B18170B33006006FC /* InCallViewController.h */, 76EB050C18170B33006006FC /* InCallViewController.m */, ); + name = "View Controllers"; path = "view controllers"; sourceTree = ""; }; - 76EB052B18170B33006006FC /* views */ = { + 76EB052B18170B33006006FC /* Views */ = { isa = PBXGroup; children = ( A5509ECB1A69B1D600ABA4BC /* CountryCodeTableViewCell.h */, @@ -1624,6 +1640,7 @@ 76EB052F18170B33006006FC /* ContactTableViewCell.m */, 76EB053818170B33006006FC /* xibs */, ); + name = Views; path = views; sourceTree = ""; }; @@ -1670,6 +1687,7 @@ B6D3CBCE1C1376BE00C039DF /* TSContentAdapters.h */, ); name = TSMessageAdapters; + path = TSMessageAdapaters; sourceTree = ""; }; B633C4FD1A1D190B0059AC12 /* Images */ = { @@ -1724,6 +1742,7 @@ B660F66C1C29867F00687D6E /* test */ = { isa = PBXGroup; children = ( + 457F3AB01D1470CF00C51351 /* view controllers */, B660F66D1C29867F00687D6E /* audio */, B660F6731C29867F00687D6E /* call */, B660F6751C29867F00687D6E /* contact */, @@ -2148,7 +2167,6 @@ A569778E1A351BC400173BF2 /* ScanIdentityBarcodeViewController.m */, A56977901A351BC400173BF2 /* PresentIdentityQRCodeViewController.h */, A569778F1A351BC400173BF2 /* PresentIdentityQRCodeViewController.m */, - B62D53F41A23CC8B009AAF82 /* TSMessageAdapters */, FC3196281A067D8F0094C78E /* MessageComposeTableViewController.h */, FC3196291A067D8F0094C78E /* MessageComposeTableViewController.m */, FCAC963A19FEF9280046DFC5 /* SignalsViewController.h */, @@ -2196,7 +2214,6 @@ FCFD25811A154B3800F4C644 /* CodeVerificationViewController.m */, B97CBFA518860EA3008E0DE9 /* CountryCodeViewController.h */, B97CBFA618860EA3008E0DE9 /* CountryCodeViewController.m */, - B6B3655F1C286AD2009B72FF /* Signal-Bridging-Header.h */, ); name = Signup; sourceTree = ""; @@ -3117,7 +3134,6 @@ PRODUCT_BUNDLE_IDENTIFIER = org.whispersystems.signal; PRODUCT_NAME = Signal; SDKROOT = iphoneos; - SWIFT_OBJC_BRIDGING_HEADER = "Signal/src/view controllers/Signal-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; TEST_AFTER_BUILD = YES; VALID_ARCHS = "arm64 armv7 armv7s i386"; @@ -3172,7 +3188,6 @@ PRODUCT_NAME = Signal; PROVISIONING_PROFILE = ""; SDKROOT = iphoneos; - SWIFT_OBJC_BRIDGING_HEADER = "Signal/src/view controllers/Signal-Bridging-Header.h"; TEST_AFTER_BUILD = YES; VALID_ARCHS = "arm64 armv7 armv7s i386"; WRAPPER_EXTENSION = app; diff --git a/Signal/src/view controllers/TSAnimatedAdapter.h b/Signal/src/Models/TSMessageAdapaters/TSAnimatedAdapter.h similarity index 100% rename from Signal/src/view controllers/TSAnimatedAdapter.h rename to Signal/src/Models/TSMessageAdapaters/TSAnimatedAdapter.h diff --git a/Signal/src/view controllers/TSAnimatedAdapter.m b/Signal/src/Models/TSMessageAdapaters/TSAnimatedAdapter.m similarity index 100% rename from Signal/src/view controllers/TSAnimatedAdapter.m rename to Signal/src/Models/TSMessageAdapaters/TSAnimatedAdapter.m diff --git a/Signal/src/view controllers/TSContentAdapters.h b/Signal/src/Models/TSMessageAdapaters/TSContentAdapters.h similarity index 100% rename from Signal/src/view controllers/TSContentAdapters.h rename to Signal/src/Models/TSMessageAdapaters/TSContentAdapters.h diff --git a/Signal/src/view controllers/TSMessageAdapter.h b/Signal/src/Models/TSMessageAdapaters/TSMessageAdapter.h similarity index 100% rename from Signal/src/view controllers/TSMessageAdapter.h rename to Signal/src/Models/TSMessageAdapaters/TSMessageAdapter.h diff --git a/Signal/src/view controllers/TSMessageAdapter.m b/Signal/src/Models/TSMessageAdapaters/TSMessageAdapter.m similarity index 100% rename from Signal/src/view controllers/TSMessageAdapter.m rename to Signal/src/Models/TSMessageAdapaters/TSMessageAdapter.m diff --git a/Signal/src/view controllers/TSPhotoAdapter.h b/Signal/src/Models/TSMessageAdapaters/TSPhotoAdapter.h similarity index 100% rename from Signal/src/view controllers/TSPhotoAdapter.h rename to Signal/src/Models/TSMessageAdapaters/TSPhotoAdapter.h diff --git a/Signal/src/view controllers/TSPhotoAdapter.m b/Signal/src/Models/TSMessageAdapaters/TSPhotoAdapter.m similarity index 100% rename from Signal/src/view controllers/TSPhotoAdapter.m rename to Signal/src/Models/TSMessageAdapaters/TSPhotoAdapter.m diff --git a/Signal/src/view controllers/TSVideoAttachmentAdapter.h b/Signal/src/Models/TSMessageAdapaters/TSVideoAttachmentAdapter.h similarity index 100% rename from Signal/src/view controllers/TSVideoAttachmentAdapter.h rename to Signal/src/Models/TSMessageAdapaters/TSVideoAttachmentAdapter.h diff --git a/Signal/src/view controllers/TSVideoAttachmentAdapter.m b/Signal/src/Models/TSMessageAdapaters/TSVideoAttachmentAdapter.m similarity index 100% rename from Signal/src/view controllers/TSVideoAttachmentAdapter.m rename to Signal/src/Models/TSMessageAdapaters/TSVideoAttachmentAdapter.m diff --git a/Signal/src/Storyboard/Storyboard.storyboard b/Signal/src/Storyboard/Storyboard.storyboard old mode 100755 new mode 100644 diff --git a/Signal/src/contact/ContactsManager.h b/Signal/src/contact/ContactsManager.h index b877297e3..911f30d8e 100644 --- a/Signal/src/contact/ContactsManager.h +++ b/Signal/src/contact/ContactsManager.h @@ -28,7 +28,6 @@ typedef void (^ABReloadRequestCompletionBlock)(NSArray *contacts); - (ObservableValue *)getObservableContacts; - (NSArray *)getContactsFromAddressBook:(ABAddressBookRef)addressBook; -- (Contact *)latestContactWithRecordId:(ABRecordID)recordId; - (Contact *)latestContactForPhoneNumber:(PhoneNumber *)phoneNumber; - (NSArray *)latestContactsWithSearchString:(NSString *)searchString; diff --git a/Signal/src/environment/VersionMigrations.m b/Signal/src/environment/VersionMigrations.m index 3b22360f5..9a9453b02 100644 --- a/Signal/src/environment/VersionMigrations.m +++ b/Signal/src/environment/VersionMigrations.m @@ -32,7 +32,7 @@ + (void)performUpdateCheck { NSString *previousVersion = Environment.preferences.lastRanVersion; - NSString *currentVersion = [Environment.preferences setAndGetCurrentVersion]; + [Environment.preferences setAndGetCurrentVersion]; BOOL VOIPRegistration = [[PushManager sharedManager] supportsVOIPPush] && ![Environment.preferences hasRegisteredVOIPPush]; diff --git a/Signal/src/view controllers/NotificationSettingsViewController.h b/Signal/src/view controllers/NotificationSettingsViewController.h old mode 100755 new mode 100644 diff --git a/Signal/src/view controllers/NotificationSettingsViewController.m b/Signal/src/view controllers/NotificationSettingsViewController.m old mode 100755 new mode 100644 diff --git a/Signal/src/view controllers/Signal-Bridging-Header.h b/Signal/src/view controllers/Signal-Bridging-Header.h deleted file mode 100644 index 1b2cb5d6d..000000000 --- a/Signal/src/view controllers/Signal-Bridging-Header.h +++ /dev/null @@ -1,4 +0,0 @@ -// -// Use this file to import your target's public headers that you would like to expose to Swift. -// - diff --git a/Signal/src/view controllers/UITests/SignalsViewController.h b/Signal/src/view controllers/SignalsViewController.h similarity index 100% rename from Signal/src/view controllers/UITests/SignalsViewController.h rename to Signal/src/view controllers/SignalsViewController.h diff --git a/Signal/src/view controllers/UITests/SignalsViewController.m b/Signal/src/view controllers/SignalsViewController.m similarity index 100% rename from Signal/src/view controllers/UITests/SignalsViewController.m rename to Signal/src/view controllers/SignalsViewController.m