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
pull/1/head
Michael Kirk 9 years ago committed by GitHub
parent 7c84c4569a
commit 76352bf471

@ -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 = "<group>"; };
B6B226991BE4C59200860F4D /* APNavigationController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = APNavigationController.m; sourceTree = "<group>"; };
B6B3655F1C286AD2009B72FF /* Signal-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Signal-Bridging-Header.h"; sourceTree = "<group>"; };
B6B9ECFA198B31BA00C620D3 /* PushManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PushManager.h; sourceTree = "<group>"; };
B6B9ECFB198B31BA00C620D3 /* PushManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PushManager.m; sourceTree = "<group>"; };
B6BADBE51B88D1AC0086A80D /* LockInteractionController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LockInteractionController.h; sourceTree = "<group>"; };
@ -991,8 +990,8 @@
FC5CDF371A3393DD00B47253 /* error_white@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "error_white@2x.png"; sourceTree = "<group>"; };
FC5CDF381A3393DD00B47253 /* warning_white@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "warning_white@2x.png"; sourceTree = "<group>"; };
FC91203F1A39EFB70074545C /* qr@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "qr@2x.png"; sourceTree = "<group>"; };
FCAC963A19FEF9280046DFC5 /* SignalsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SignalsViewController.h; path = UITests/SignalsViewController.h; sourceTree = "<group>"; };
FCAC963B19FEF9280046DFC5 /* SignalsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SignalsViewController.m; path = UITests/SignalsViewController.m; sourceTree = "<group>"; };
FCAC963A19FEF9280046DFC5 /* SignalsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SignalsViewController.h; sourceTree = "<group>"; };
FCAC963B19FEF9280046DFC5 /* SignalsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SignalsViewController.m; sourceTree = "<group>"; };
FCAC963D19FEF99A0046DFC5 /* InboxTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = InboxTableViewCell.h; path = "../view controllers/InboxTableViewCell.h"; sourceTree = "<group>"; };
FCAC963E19FEF99A0046DFC5 /* InboxTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = InboxTableViewCell.m; path = "../view controllers/InboxTableViewCell.m"; sourceTree = "<group>"; };
FCAC964F19FF0A6E0046DFC5 /* MessagesViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MessagesViewController.h; sourceTree = "<group>"; };
@ -1078,6 +1077,21 @@
/* End PBXFrameworksBuildPhase section */
/* Begin PBXGroup section */
457F3AB01D1470CF00C51351 /* view controllers */ = {
isa = PBXGroup;
children = (
);
name = "view controllers";
sourceTree = "<group>";
};
457F3AC01D14A0F700C51351 /* Models */ = {
isa = PBXGroup;
children = (
B62D53F41A23CC8B009AAF82 /* TSMessageAdapters */,
);
path = Models;
sourceTree = "<group>";
};
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 = "<group>";
@ -1595,23 +1610,24 @@
path = utilities;
sourceTree = "<group>";
};
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 = "<group>";
};
76EB052B18170B33006006FC /* views */ = {
76EB052B18170B33006006FC /* Views */ = {
isa = PBXGroup;
children = (
A5509ECB1A69B1D600ABA4BC /* CountryCodeTableViewCell.h */,
@ -1624,6 +1640,7 @@
76EB052F18170B33006006FC /* ContactTableViewCell.m */,
76EB053818170B33006006FC /* xibs */,
);
name = Views;
path = views;
sourceTree = "<group>";
};
@ -1670,6 +1687,7 @@
B6D3CBCE1C1376BE00C039DF /* TSContentAdapters.h */,
);
name = TSMessageAdapters;
path = TSMessageAdapaters;
sourceTree = "<group>";
};
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 = "<group>";
@ -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;

@ -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;

@ -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];

@ -1,4 +0,0 @@
//
// Use this file to import your target's public headers that you would like to expose to Swift.
//
Loading…
Cancel
Save