Removing developer-specific junk.

.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

Podfile.lock

@@ -83,7 +83,7 @@ EXTERNAL SOURCES:
 
 CHECKOUT OPTIONS:
   JSQMessagesViewController:
-    :commit: 4049f547891ffa18eaf11f9c15092de38821a590
+    :commit: 7c2cec63f9e05ac7859df786e6ca31af2f0dc583
     :git: https://github.com/dtsbourg/JSQMessagesViewController
   SocketRocket:
     :commit: d0585af165

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;

Signal.xcodeproj/project.xcworkspace/xcshareddata/Signal.xccheckout

@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>IDESourceControlProjectFavoriteDictionaryKey</key>
-	<false/>
-	<key>IDESourceControlProjectIdentifier</key>
-	<string>3A3A9222-5BC1-48E7-8601-0FB31BE919FB</string>
-	<key>IDESourceControlProjectName</key>
-	<string>Signal</string>
-	<key>IDESourceControlProjectOriginsDictionary</key>
-	<dict>
-		<key>5D79A077E31B3FE97A3C6613CBFFDD71C314D14C</key>
-		<string>github.com:WhisperSystems/Signal-iOS.git</string>
-		<key>D74FB800F048CB516BB4BC70047F7CC676D291B9</key>
-		<string>https://github.com/FredericJacobs/Precompiled-Signal-Dependencies.git</string>
-	</dict>
-	<key>IDESourceControlProjectPath</key>
-	<string>Signal.xcodeproj</string>
-	<key>IDESourceControlProjectRelativeInstallPathDictionary</key>
-	<dict>
-		<key>5D79A077E31B3FE97A3C6613CBFFDD71C314D14C</key>
-		<string>../..</string>
-		<key>D74FB800F048CB516BB4BC70047F7CC676D291B9</key>
-		<string>../..Pods/</string>
-	</dict>
-	<key>IDESourceControlProjectURL</key>
-	<string>github.com:WhisperSystems/Signal-iOS.git</string>
-	<key>IDESourceControlProjectVersion</key>
-	<integer>111</integer>
-	<key>IDESourceControlProjectWCCIdentifier</key>
-	<string>5D79A077E31B3FE97A3C6613CBFFDD71C314D14C</string>
-	<key>IDESourceControlProjectWCConfigurations</key>
-	<array>
-		<dict>
-			<key>IDESourceControlRepositoryExtensionIdentifierKey</key>
-			<string>public.vcs.git</string>
-			<key>IDESourceControlWCCIdentifierKey</key>
-			<string>D74FB800F048CB516BB4BC70047F7CC676D291B9</string>
-			<key>IDESourceControlWCCName</key>
-			<string>Pods</string>
-		</dict>
-		<dict>
-			<key>IDESourceControlRepositoryExtensionIdentifierKey</key>
-			<string>public.vcs.git</string>
-			<key>IDESourceControlWCCIdentifierKey</key>
-			<string>5D79A077E31B3FE97A3C6613CBFFDD71C314D14C</string>
-			<key>IDESourceControlWCCName</key>
-			<string>Signal-iOS</string>
-		</dict>
-	</array>
-</dict>
-</plist>

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);
                        });
     }

Signal/src/Storyboard/Storyboard.storyboard

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="6250" systemVersion="14C68k" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="kts-vO-ui1">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="6254" systemVersion="14B25" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="kts-vO-ui1">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6244"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6247"/>
         <capability name="Alignment constraints with different attributes" minToolsVersion="5.1"/>
         <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
     </dependencies>
@@ -1826,86 +1826,6 @@ Lorem ipsum : Quick explanation of Fingerprints</string>
                                     <outlet property="contactTextButton" destination="cfo-cG-hLC" id="JKY-RT-mn6"/>
                                 </connections>
                             </tableViewCell>
-                            <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="ShareCell" rowHeight="60" id="hSC-7F-dj5" customClass="ContactDetailCell">
-                                <autoresizingMask key="autoresizingMask"/>
-                                <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="hSC-7F-dj5" id="lvR-BE-4Mx">
-                                    <autoresizingMask key="autoresizingMask"/>
-                                    <subviews>
-                                        <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="share.png" translatesAutoresizingMaskIntoConstraints="NO" id="aSe-xF-b09">
-                                            <rect key="frame" x="0.0" y="0.0" width="240" height="128"/>
-                                            <constraints>
-                                                <constraint firstAttribute="height" constant="25" id="2Jh-ad-KNx"/>
-                                                <constraint firstAttribute="width" constant="25" id="IAV-2c-d2w"/>
-                                            </constraints>
-                                            <variation key="default">
-                                                <mask key="constraints">
-                                                    <exclude reference="2Jh-ad-KNx"/>
-                                                    <exclude reference="IAV-2c-d2w"/>
-                                                </mask>
-                                            </variation>
-                                            <variation key="heightClass=regular-widthClass=compact">
-                                                <mask key="constraints">
-                                                    <include reference="2Jh-ad-KNx"/>
-                                                    <include reference="IAV-2c-d2w"/>
-                                                </mask>
-                                            </variation>
-                                        </imageView>
-                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Share Contact" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="YNM-Jz-XEj">
-                                            <rect key="frame" x="0.0" y="-21" width="42" height="21"/>
-                                            <constraints>
-                                                <constraint firstAttribute="height" constant="21" id="3DG-5I-upG"/>
-                                                <constraint firstAttribute="width" constant="111" id="xEg-aq-ZX9"/>
-                                            </constraints>
-                                            <fontDescription key="fontDescription" name="HelveticaNeue-Light" family="Helvetica Neue" pointSize="17"/>
-                                            <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
-                                            <nil key="highlightedColor"/>
-                                            <variation key="default">
-                                                <mask key="constraints">
-                                                    <exclude reference="3DG-5I-upG"/>
-                                                    <exclude reference="xEg-aq-ZX9"/>
-                                                </mask>
-                                            </variation>
-                                            <variation key="heightClass=regular-widthClass=compact">
-                                                <mask key="constraints">
-                                                    <include reference="3DG-5I-upG"/>
-                                                    <include reference="xEg-aq-ZX9"/>
-                                                </mask>
-                                            </variation>
-                                        </label>
-                                    </subviews>
-                                    <constraints>
-                                        <constraint firstItem="YNM-Jz-XEj" firstAttribute="leading" secondItem="lvR-BE-4Mx" secondAttribute="leadingMargin" constant="15" id="4se-Xh-1PH"/>
-                                        <constraint firstItem="aSe-xF-b09" firstAttribute="top" secondItem="lvR-BE-4Mx" secondAttribute="topMargin" constant="9" id="NO6-s6-3y9"/>
-                                        <constraint firstItem="YNM-Jz-XEj" firstAttribute="top" secondItem="lvR-BE-4Mx" secondAttribute="topMargin" constant="11" id="h7u-8P-pkI"/>
-                                        <constraint firstAttribute="trailingMargin" secondItem="aSe-xF-b09" secondAttribute="trailing" constant="23" id="vxa-Nc-UvT"/>
-                                    </constraints>
-                                    <variation key="default">
-                                        <mask key="subviews">
-                                            <exclude reference="aSe-xF-b09"/>
-                                            <exclude reference="YNM-Jz-XEj"/>
-                                        </mask>
-                                        <mask key="constraints">
-                                            <exclude reference="4se-Xh-1PH"/>
-                                            <exclude reference="h7u-8P-pkI"/>
-                                            <exclude reference="NO6-s6-3y9"/>
-                                            <exclude reference="vxa-Nc-UvT"/>
-                                        </mask>
-                                    </variation>
-                                    <variation key="heightClass=regular-widthClass=compact">
-                                        <mask key="subviews">
-                                            <include reference="aSe-xF-b09"/>
-                                            <include reference="YNM-Jz-XEj"/>
-                                        </mask>
-                                        <mask key="constraints">
-                                            <include reference="4se-Xh-1PH"/>
-                                            <include reference="h7u-8P-pkI"/>
-                                            <include reference="NO6-s6-3y9"/>
-                                            <include reference="vxa-Nc-UvT"/>
-                                        </mask>
-                                    </variation>
-                                </tableViewCellContentView>
-                                <inset key="separatorInset" minX="0.0" minY="0.0" maxX="0.0" maxY="0.0"/>
-                            </tableViewCell>
                             <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="EmailCell" rowHeight="60" id="fWm-EM-av7" customClass="ContactDetailCell">
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="fWm-EM-av7" id="yVD-4a-A9L">
@@ -3115,7 +3035,6 @@ Licensed under the GPLv3</string>
         <image name="quit.png" width="50" height="50"/>
         <image name="savephoto.png" width="50" height="50"/>
         <image name="settings_tab.png" width="24" height="24"/>
-        <image name="share.png" width="50" height="50"/>
         <image name="shred.png" width="200" height="200"/>
         <image name="signal.png" width="50" height="50"/>
         <image name="signals_tab.png" width="24" height="24"/>

Signal/src/view controllers/ContactDetailTableViewController.m

@@ -15,14 +15,13 @@
 #import "PhoneManager.h"
 
 #define kImageRadius           50.0f
-#define kMinRows               3
+#define kMinRows               2
-#define kFirstAdaptableCellRow 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