diff --git a/.gitignore b/.gitignore
index 7d8c64ff0..f29dd36b6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,19 @@ build/*
# Exclude user-specific XCode 3 and 4 files
xcuserdata
*.xccheckout
+
+*.pbxuser
+!default.pbxuser
+*.mode1v3
+!default.mode1v3
+*.mode2v3
+!default.mode2v3
+*.perspectivev3
+!default.perspectivev3
+xcuserdata
+*.xccheckout
+*.moved-aside
+DerivedData
+*.hmap
+*.ipa
+*.xcuserstate
\ No newline at end of file
diff --git a/Podfile.lock b/Podfile.lock
index 597c7ccb1..d330fff9d 100644
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -83,7 +83,7 @@ EXTERNAL SOURCES:
CHECKOUT OPTIONS:
JSQMessagesViewController:
- :commit: 4049f547891ffa18eaf11f9c15092de38821a590
+ :commit: 7c2cec63f9e05ac7859df786e6ca31af2f0dc583
:git: https://github.com/dtsbourg/JSQMessagesViewController
SocketRocket:
:commit: d0585af165
diff --git a/Signal.xcodeproj/project.pbxproj b/Signal.xcodeproj/project.pbxproj
index 30d395278..a31ae1456 100644
--- a/Signal.xcodeproj/project.pbxproj
+++ b/Signal.xcodeproj/project.pbxproj
@@ -3552,7 +3552,7 @@
LLVM_LTO = NO;
OTHER_LDFLAGS = "$(inherited)";
PRODUCT_NAME = Signal;
- PROVISIONING_PROFILE = "a377b8e6-d43e-485d-8830-bc7bfa3d1731";
+ PROVISIONING_PROFILE = "";
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = 1;
TEST_AFTER_BUILD = YES;
@@ -3787,7 +3787,7 @@
LLVM_LTO = NO;
OTHER_LDFLAGS = "$(inherited)";
PRODUCT_NAME = Signal;
- PROVISIONING_PROFILE = "a377b8e6-d43e-485d-8830-bc7bfa3d1731";
+ PROVISIONING_PROFILE = "";
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = 1;
TEST_AFTER_BUILD = YES;
@@ -3841,7 +3841,7 @@
LLVM_LTO = NO;
OTHER_LDFLAGS = "$(inherited)";
PRODUCT_NAME = Signal;
- PROVISIONING_PROFILE = "a377b8e6-d43e-485d-8830-bc7bfa3d1731";
+ PROVISIONING_PROFILE = "";
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = 1;
TEST_AFTER_BUILD = YES;
diff --git a/Signal.xcodeproj/project.xcworkspace/xcshareddata/Signal.xccheckout b/Signal.xcodeproj/project.xcworkspace/xcshareddata/Signal.xccheckout
deleted file mode 100644
index 7bd48f1a5..000000000
--- a/Signal.xcodeproj/project.xcworkspace/xcshareddata/Signal.xccheckout
+++ /dev/null
@@ -1,53 +0,0 @@
-
-
-
-
- IDESourceControlProjectFavoriteDictionaryKey
-
- IDESourceControlProjectIdentifier
- 3A3A9222-5BC1-48E7-8601-0FB31BE919FB
- IDESourceControlProjectName
- Signal
- IDESourceControlProjectOriginsDictionary
-
- 5D79A077E31B3FE97A3C6613CBFFDD71C314D14C
- github.com:WhisperSystems/Signal-iOS.git
- D74FB800F048CB516BB4BC70047F7CC676D291B9
- https://github.com/FredericJacobs/Precompiled-Signal-Dependencies.git
-
- IDESourceControlProjectPath
- Signal.xcodeproj
- IDESourceControlProjectRelativeInstallPathDictionary
-
- 5D79A077E31B3FE97A3C6613CBFFDD71C314D14C
- ../..
- D74FB800F048CB516BB4BC70047F7CC676D291B9
- ../..Pods/
-
- IDESourceControlProjectURL
- github.com:WhisperSystems/Signal-iOS.git
- IDESourceControlProjectVersion
- 111
- IDESourceControlProjectWCCIdentifier
- 5D79A077E31B3FE97A3C6613CBFFDD71C314D14C
- IDESourceControlProjectWCConfigurations
-
-
- IDESourceControlRepositoryExtensionIdentifierKey
- public.vcs.git
- IDESourceControlWCCIdentifierKey
- D74FB800F048CB516BB4BC70047F7CC676D291B9
- IDESourceControlWCCName
- Pods
-
-
- IDESourceControlRepositoryExtensionIdentifierKey
- public.vcs.git
- IDESourceControlWCCIdentifierKey
- 5D79A077E31B3FE97A3C6613CBFFDD71C314D14C
- IDESourceControlWCCName
- Signal-iOS
-
-
-
-
diff --git a/Signal/src/AppDelegate.m b/Signal/src/AppDelegate.m
index 133686456..7db85c563 100644
--- a/Signal/src/AppDelegate.m
+++ b/Signal/src/AppDelegate.m
@@ -213,8 +213,6 @@
[TSSocketManager becomeActive];
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, 20 * NSEC_PER_SEC),
dispatch_get_main_queue(), ^{
- // Check result of your operation and call completion block with the result
- NSLog(@"Hello");
completionHandler(UIBackgroundFetchResultNewData);
});
}
diff --git a/Signal/src/Storyboard/Storyboard.storyboard b/Signal/src/Storyboard/Storyboard.storyboard
index 7d26baa2b..793f8023d 100755
--- a/Signal/src/Storyboard/Storyboard.storyboard
+++ b/Signal/src/Storyboard/Storyboard.storyboard
@@ -1,7 +1,7 @@
-
+
-
+
@@ -1826,86 +1826,6 @@ Lorem ipsum : Quick explanation of Fingerprints
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -3115,7 +3035,6 @@ Licensed under the GPLv3
-
diff --git a/Signal/src/view controllers/ContactDetailTableViewController.m b/Signal/src/view controllers/ContactDetailTableViewController.m
index 629e47808..c6b1aa9d0 100644
--- a/Signal/src/view controllers/ContactDetailTableViewController.m
+++ b/Signal/src/view controllers/ContactDetailTableViewController.m
@@ -15,14 +15,13 @@
#import "PhoneManager.h"
#define kImageRadius 50.0f
-#define kMinRows 3
-#define kFirstAdaptableCellRow 2
+#define kMinRows 2
+#define kFirstAdaptableCellRow 1
typedef NS_ENUM(NSInteger, CellRow) {
kNameMainNumberCellIndexPath,
kActionCellIndexPath,
- kShareCellIndexPath,
kEmailCellIndexPath,
kAnnexPhoneNumberCellIndexPath,
kNotesCellIndexPath,
@@ -32,7 +31,6 @@ typedef enum {
kNameMainNumberCellHeight = 180,
kNoImageCellHeight = 87,
kActionCellHeight = 60,
- kShareCellHeight = 60,
kEmailCellHeight = 60,
kAnnexPhoneNumberCellHeight = 60,
kNotesCellHeight = 165,
@@ -40,7 +38,6 @@ typedef enum {
static NSString* const kNameMainNumberCell = @"NameMainNumberCell";
static NSString* const kActionCell = @"ActionCell";
-static NSString* const kShareCell = @"ShareCell";
static NSString* const kEmailCell = @"EmailCell";
static NSString* const kAnnexPhoneNumberCell = @"AnnexPhoneNumberCell";
static NSString *const kNotesCell = @"NotesCell";
@@ -51,7 +48,6 @@ static NSString *const kContactDetailSegue = @"DetailSegue";
@interface ContactDetailTableViewController () {
BOOL doesImageExist;
- NSInteger numberOfRows;
}
@end
@@ -91,9 +87,6 @@ static NSString *const kContactDetailSegue = @"DetailSegue";
cell = (ActionContactDetailCell*)[tableView dequeueReusableCellWithIdentifier:kActionCell forIndexPath:indexPath];
[self setUpActionCell:(ActionContactDetailCell*)cell];
break;
- case kShareCellIndexPath:
- cell = [tableView dequeueReusableCellWithIdentifier:kShareCell forIndexPath:indexPath];
- break;
default:
cell = [self adaptableCellAtIndexPath:indexPath];
break;
@@ -115,9 +108,6 @@ static NSString *const kContactDetailSegue = @"DetailSegue";
case kActionCellIndexPath:
cellHeight = kActionCellHeight;
break;
- case kShareCellIndexPath:
- cellHeight = kShareCellHeight;
- break;
default:
cellHeight = [self heightForAdaptableCellAtIndexPath:indexPath];
break;
@@ -125,33 +115,6 @@ static NSString *const kContactDetailSegue = @"DetailSegue";
return cellHeight;
}
--(void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
-{
- switch (indexPath.row) {
- case kShareCellIndexPath:
- [DJWActionSheet showInView:self.tabBarController.view
- withTitle:nil
- cancelButtonTitle:@"Cancel"
- destructiveButtonTitle:nil
- otherButtonTitles:@[@"Mail", @"Message", @"Airdrop", @"Other"]
- tapBlock:^(DJWActionSheet *actionSheet, NSInteger tappedButtonIndex) {
- [tableView deselectRowAtIndexPath:indexPath animated:YES];
- if (tappedButtonIndex == actionSheet.cancelButtonIndex) {
- NSLog(@"User Cancelled");
-
- } else if (tappedButtonIndex == actionSheet.destructiveButtonIndex) {
- NSLog(@"Destructive button tapped");
- }else {
- NSLog(@"The user tapped button at index: %li", (long)tappedButtonIndex);
- }
- }];
-
- break;
-
- }
-}
-
-
#pragma mark - Set Up Cells
-(void)setUpActionCell:(ActionContactDetailCell*)cell