LaunchScreens and Screen Security.

Signal.xcodeproj/project.pbxproj

@@ -437,15 +437,6 @@
 		E1370BE418A0686C00826894 /* outring.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = E18AB40B18A05754001A532A /* outring.mp3 */; };
 		E1370BE518A0686C00826894 /* r.caf in Resources */ = {isa = PBXBuildFile; fileRef = E18AB40C18A05754001A532A /* r.caf */; };
 		E1370BE618A0686C00826894 /* sonarping.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = E18AB40D18A05754001A532A /* sonarping.mp3 */; };
-		E1370BEA18A0689000826894 /* AppIcon29x29.jpg in Resources */ = {isa = PBXBuildFile; fileRef = E18AB3F418A05734001A532A /* AppIcon29x29.jpg */; };
-		E1370BEB18A0689000826894 /* AppIcon29x29.png in Resources */ = {isa = PBXBuildFile; fileRef = E18AB3F518A05734001A532A /* AppIcon29x29.png */; };
-		E1370BEC18A0689000826894 /* AppIcon29x29@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = E18AB3F618A05734001A532A /* AppIcon29x29@2x.png */; };
-		E1370BED18A0689000826894 /* AppIcon40x40.png in Resources */ = {isa = PBXBuildFile; fileRef = E18AB3F718A05734001A532A /* AppIcon40x40.png */; };
-		E1370BEE18A0689000826894 /* AppIcon40x40@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = E18AB3F818A05734001A532A /* AppIcon40x40@2x.png */; };
-		E1370BEF18A0689000826894 /* AppIcon60x60.png in Resources */ = {isa = PBXBuildFile; fileRef = E18AB3F918A05734001A532A /* AppIcon60x60.png */; };
-		E1370BF018A0689000826894 /* AppIcon60x60@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = E18AB3FA18A05734001A532A /* AppIcon60x60@2x.png */; };
-		E1370BF118A0689000826894 /* AppIcon76x76.png in Resources */ = {isa = PBXBuildFile; fileRef = E18AB3FB18A05734001A532A /* AppIcon76x76.png */; };
-		E1370BF218A0689000826894 /* AppIcon76x76@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = E18AB3FC18A05734001A532A /* AppIcon76x76@2x.png */; };
 		E14874F818A06951002CC4F3 /* ContactTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 76EB053A18170B33006006FC /* ContactTableViewCell.xib */; };
 		E14874F918A06951002CC4F3 /* CountryCodeTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = B97CBFB018861023008E0DE9 /* CountryCodeTableViewCell.xib */; };
 		E148750018A06966002CC4F3 /* CallAudioManagerDemo.xib in Resources */ = {isa = PBXBuildFile; fileRef = 76EB051D18170B33006006FC /* CallAudioManagerDemo.xib */; };
@@ -1087,15 +1078,6 @@
 		E16E5BEC18AAC40200B7C403 /* EvpKeyAgreement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EvpKeyAgreement.h; sourceTree = "<group>"; };
 		E16E5BED18AAC40200B7C403 /* EvpKeyAgreement.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EvpKeyAgreement.m; sourceTree = "<group>"; };
 		E16E5BF818AAF02100B7C403 /* EC25AgreerTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EC25AgreerTest.m; sourceTree = "<group>"; };
-		E18AB3F418A05734001A532A /* AppIcon29x29.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = AppIcon29x29.jpg; sourceTree = "<group>"; };
-		E18AB3F518A05734001A532A /* AppIcon29x29.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = AppIcon29x29.png; sourceTree = "<group>"; };
-		E18AB3F618A05734001A532A /* AppIcon29x29@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "AppIcon29x29@2x.png"; sourceTree = "<group>"; };
-		E18AB3F718A05734001A532A /* AppIcon40x40.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = AppIcon40x40.png; sourceTree = "<group>"; };
-		E18AB3F818A05734001A532A /* AppIcon40x40@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "AppIcon40x40@2x.png"; sourceTree = "<group>"; };
-		E18AB3F918A05734001A532A /* AppIcon60x60.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = AppIcon60x60.png; sourceTree = "<group>"; };
-		E18AB3FA18A05734001A532A /* AppIcon60x60@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "AppIcon60x60@2x.png"; sourceTree = "<group>"; };
-		E18AB3FB18A05734001A532A /* AppIcon76x76.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = AppIcon76x76.png; sourceTree = "<group>"; };
-		E18AB3FC18A05734001A532A /* AppIcon76x76@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "AppIcon76x76@2x.png"; sourceTree = "<group>"; };
 		E18AB40718A05754001A532A /* busy.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; path = busy.mp3; sourceTree = "<group>"; };
 		E18AB40818A05754001A532A /* completed.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; path = completed.mp3; sourceTree = "<group>"; };
 		E18AB40918A05754001A532A /* failure.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; path = failure.mp3; sourceTree = "<group>"; };
@@ -2492,7 +2474,6 @@
 				B6C6AE521A305ED1006BAF8F /* Certificates */,
 				B6B6C3C419193F5B00C0B76B /* Translations */,
 				E18AB40618A05754001A532A /* AudioFiles */,
-				E18AB3F318A05734001A532A /* Icons */,
 				E108ED13187E34FD0045AEA3 /* iTunesArtwork@2x.png */,
 				D221A099169C9E5E00537ABF /* main.m */,
 				D221A095169C9E5E00537ABF /* Signal-Info.plist */,
@@ -2502,22 +2483,6 @@
 			name = "Supporting Files";
 			sourceTree = "<group>";
 		};
-		E18AB3F318A05734001A532A /* Icons */ = {
-			isa = PBXGroup;
-			children = (
-				E18AB3F418A05734001A532A /* AppIcon29x29.jpg */,
-				E18AB3F518A05734001A532A /* AppIcon29x29.png */,
-				E18AB3F618A05734001A532A /* AppIcon29x29@2x.png */,
-				E18AB3F718A05734001A532A /* AppIcon40x40.png */,
-				E18AB3F818A05734001A532A /* AppIcon40x40@2x.png */,
-				E18AB3F918A05734001A532A /* AppIcon60x60.png */,
-				E18AB3FA18A05734001A532A /* AppIcon60x60@2x.png */,
-				E18AB3FB18A05734001A532A /* AppIcon76x76.png */,
-				E18AB3FC18A05734001A532A /* AppIcon76x76@2x.png */,
-			);
-			path = Icons;
-			sourceTree = "<group>";
-		};
 		E18AB40618A05754001A532A /* AudioFiles */ = {
 			isa = PBXGroup;
 			children = (
@@ -2875,19 +2840,10 @@
 				FCA52AE71A2B676C00CCADFA /* call_failed@2x.png in Resources */,
 				70B8FEE21909FE360042E3F0 /* 171756__nenadsimic__picked-coin-echo-2.wav in Resources */,
 				B633C5801A1D190B0059AC12 /* archive@2x.png in Resources */,
-				E1370BEA18A0689000826894 /* AppIcon29x29.jpg in Resources */,
-				E1370BEB18A0689000826894 /* AppIcon29x29.png in Resources */,
-				E1370BEC18A0689000826894 /* AppIcon29x29@2x.png in Resources */,
 				FC1F90C71A223991004F8253 /* signals_tab@2x.png in Resources */,
-				E1370BED18A0689000826894 /* AppIcon40x40.png in Resources */,
 				B633C5C31A1D190B0059AC12 /* mute_off@2x.png in Resources */,
 				FC1F90C61A223991004F8253 /* settings_tab@2x.png in Resources */,
-				E1370BEE18A0689000826894 /* AppIcon40x40@2x.png in Resources */,
-				E1370BEF18A0689000826894 /* AppIcon60x60.png in Resources */,
 				FCA52AEA1A2B676C00CCADFA /* call_outgoing@2x.png in Resources */,
-				E1370BF018A0689000826894 /* AppIcon60x60@2x.png in Resources */,
-				E1370BF118A0689000826894 /* AppIcon76x76.png in Resources */,
-				E1370BF218A0689000826894 /* AppIcon76x76@2x.png in Resources */,
 				B633C5B61A1D190B0059AC12 /* lock_white@2x.png in Resources */,
 				B633C5DF1A1D190B0059AC12 /* signal@2x.png in Resources */,
 				B633C5831A1D190B0059AC12 /* backspace.png in Resources */,

Signal/Images.xcassets/LaunchImage.launchimage/Contents.json

@@ -4,24 +4,16 @@
       "extent" : "full-screen",
       "idiom" : "iphone",
       "subtype" : "736h",
-      "filename" : "Default-6plus.png",
+      "filename" : "6+.png",
       "minimum-system-version" : "8.0",
       "orientation" : "portrait",
       "scale" : "3x"
     },
-    {
-      "orientation" : "landscape",
-      "idiom" : "iphone",
-      "extent" : "full-screen",
-      "minimum-system-version" : "8.0",
-      "subtype" : "736h",
-      "scale" : "3x"
-    },
     {
       "extent" : "full-screen",
       "idiom" : "iphone",
       "subtype" : "667h",
-      "filename" : "Default-6.png",
+      "filename" : "6.png",
       "minimum-system-version" : "8.0",
       "orientation" : "portrait",
       "scale" : "2x"
@@ -31,112 +23,17 @@
       "idiom" : "iphone",
       "extent" : "full-screen",
       "minimum-system-version" : "7.0",
-      "filename" : "Default@2x.png",
+      "filename" : "Vector 1.png",
       "scale" : "2x"
     },
     {
       "extent" : "full-screen",
       "idiom" : "iphone",
       "subtype" : "retina4",
-      "filename" : "Default-568h@2x.png",
+      "filename" : "5s.png",
       "minimum-system-version" : "7.0",
       "orientation" : "portrait",
       "scale" : "2x"
-    },
-    {
-      "orientation" : "portrait",
-      "idiom" : "ipad",
-      "extent" : "full-screen",
-      "minimum-system-version" : "7.0",
-      "scale" : "1x"
-    },
-    {
-      "orientation" : "landscape",
-      "idiom" : "ipad",
-      "extent" : "full-screen",
-      "minimum-system-version" : "7.0",
-      "scale" : "1x"
-    },
-    {
-      "orientation" : "portrait",
-      "idiom" : "ipad",
-      "extent" : "full-screen",
-      "minimum-system-version" : "7.0",
-      "scale" : "2x"
-    },
-    {
-      "orientation" : "landscape",
-      "idiom" : "ipad",
-      "extent" : "full-screen",
-      "minimum-system-version" : "7.0",
-      "scale" : "2x"
-    },
-    {
-      "orientation" : "portrait",
-      "idiom" : "iphone",
-      "extent" : "full-screen",
-      "scale" : "1x"
-    },
-    {
-      "orientation" : "portrait",
-      "idiom" : "iphone",
-      "extent" : "full-screen",
-      "scale" : "2x"
-    },
-    {
-      "orientation" : "portrait",
-      "idiom" : "iphone",
-      "extent" : "full-screen",
-      "subtype" : "retina4",
-      "scale" : "2x"
-    },
-    {
-      "orientation" : "portrait",
-      "idiom" : "ipad",
-      "extent" : "to-status-bar",
-      "scale" : "1x"
-    },
-    {
-      "orientation" : "portrait",
-      "idiom" : "ipad",
-      "extent" : "full-screen",
-      "scale" : "1x"
-    },
-    {
-      "orientation" : "landscape",
-      "idiom" : "ipad",
-      "extent" : "to-status-bar",
-      "scale" : "1x"
-    },
-    {
-      "orientation" : "landscape",
-      "idiom" : "ipad",
-      "extent" : "full-screen",
-      "scale" : "1x"
-    },
-    {
-      "orientation" : "portrait",
-      "idiom" : "ipad",
-      "extent" : "to-status-bar",
-      "scale" : "2x"
-    },
-    {
-      "orientation" : "portrait",
-      "idiom" : "ipad",
-      "extent" : "full-screen",
-      "scale" : "2x"
-    },
-    {
-      "orientation" : "landscape",
-      "idiom" : "ipad",
-      "extent" : "to-status-bar",
-      "scale" : "2x"
-    },
-    {
-      "orientation" : "landscape",
-      "idiom" : "ipad",
-      "extent" : "full-screen",
-      "scale" : "2x"
     }
   ],
   "info" : {

Signal/src/AppDelegate.m

@@ -268,30 +268,36 @@
 
 - (void)prepareScreenshotProtection{
     self.blankWindow = ({
-        UIWindow *window = [[UIWindow alloc] initWithFrame:self.window.bounds];
+        UIWindow *window              = [[UIWindow alloc] initWithFrame:self.window.bounds];
-        window.hidden = YES;
+        window.hidden                 = YES;
-        window.opaque = YES;
+        window.opaque                 = YES;
         window.userInteractionEnabled = NO;
-        window.windowLevel = CGFLOAT_MAX;
+        window.windowLevel            = CGFLOAT_MAX;
+        
+        // There appears to be no more reliable way to get the launchscreen image from an asset bundle
+        NSDictionary *dict = @{@"320x480" : @"LaunchImage-700", @"320x568" : @"LaunchImage-700-568h", @"375x667" : @"LaunchImage-800-667h", @"414x736" : @"LaunchImage-800-Portrait-736h"};
+        NSString *key = [NSString stringWithFormat:@"%dx%d", (int)[UIScreen mainScreen].bounds.size.width, (int)[UIScreen mainScreen].bounds.size.height];
+        UIImage *launchImage = [UIImage imageNamed:dict[key]];
+        UIImageView *imgView = [[UIImageView alloc] initWithImage:launchImage];
+        UIViewController *vc = [[UIViewController alloc] initWithNibName:nil bundle:nil];
+        vc.view.frame        = [[UIScreen mainScreen] bounds];
+        imgView.frame        = [[UIScreen mainScreen] bounds];
+        [vc.view addSubview:imgView];
+        [vc.view setBackgroundColor:[UIColor blackColor]];
+        window.rootViewController = vc;
+        
         window;
     });
 }
 
 - (void)protectScreen{
-    if (Environment.preferences.screenSecurityIsEnabled) {
+    if (Environment.preferences.screenSecurityIsEnabled){
-        self.blankWindow.rootViewController = [UIViewController new];
-
-        UIImageView *imageView = [[UIImageView alloc] initWithFrame:self.blankWindow.bounds];
-        imageView.backgroundColor = [UIColor whiteColor];
-        imageView.opaque = YES;
-        [self.blankWindow.rootViewController.view addSubview:imageView];
         self.blankWindow.hidden = NO;
     }
 }
 
 - (void)removeScreenProtection{
     if (Environment.preferences.screenSecurityIsEnabled) {
-        self.blankWindow.rootViewController = nil;
         self.blankWindow.hidden = YES;
     }
 }

Signal/src/Storyboard/Storyboard.storyboard

@@ -35,9 +35,6 @@
                                     </tableViewCell>
                                 </prototypes>
                                 <sections/>
-                                <variation key="heightClass=regular-widthClass=compact" misplaced="YES">
-                                    <rect key="frame" x="0.0" y="-44" width="410" height="844"/>
-                                </variation>
                                 <connections>
                                     <outlet property="dataSource" destination="MY2-bB-USa" id="kop-Y6-6DR"/>
                                     <outlet property="delegate" destination="MY2-bB-USa" id="vmj-PA-2Od"/>
@@ -2401,48 +2398,24 @@ Licensed under the GPLv3</string>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="quP-Cu-8LE" id="i03-Ww-QZz">
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
+                                                <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="skL-aj-42C">
+                                                    <rect key="frame" x="-25" y="-15" width="51" height="31"/>
+                                                </switch>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Enable Screen Security" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ExV-2K-JEg">
                                                     <rect key="frame" x="0.0" y="-21" width="42" height="21"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                     <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
                                                     <nil key="highlightedColor"/>
-                                                </label>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="On" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="iPe-St-tVT">
-                                                    <rect key="frame" x="0.0" y="-21" width="42" height="21"/>
-                                                    <constraints>
-                                                        <constraint firstAttribute="height" constant="21" id="s6d-wF-wNd"/>
-                                                        <constraint firstAttribute="width" constant="36" id="yPj-mV-IsZ"/>
-                                                    </constraints>
-                                                    <fontDescription key="fontDescription" name="HelveticaNeue-Thin" family="Helvetica Neue" pointSize="17"/>
-                                                    <color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
-                                                    <nil key="highlightedColor"/>
-                                                    <variation key="default">
-                                                        <mask key="constraints">
-                                                            <exclude reference="s6d-wF-wNd"/>
-                                                            <exclude reference="yPj-mV-IsZ"/>
-                                                        </mask>
-                                                    </variation>
                                                     <variation key="heightClass=regular-widthClass=compact" misplaced="YES">
-                                                        <rect key="frame" x="15" y="30" width="36" height="21"/>
+                                                        <rect key="frame" x="15" y="19" width="307" height="20.5"/>
-                                                        <mask key="constraints">
-                                                            <include reference="s6d-wF-wNd"/>
-                                                            <include reference="yPj-mV-IsZ"/>
-                                                        </mask>
                                                     </variation>
                                                 </label>
-                                                <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="skL-aj-42C">
-                                                    <rect key="frame" x="-25" y="-15" width="51" height="31"/>
-                                                </switch>
                                             </subviews>
                                             <constraints>
                                                 <constraint firstItem="ExV-2K-JEg" firstAttribute="top" secondItem="i03-Ww-QZz" secondAttribute="topMargin" constant="3" id="2lQ-r0-TpV"/>
                                                 <constraint firstItem="skL-aj-42C" firstAttribute="leading" secondItem="ExV-2K-JEg" secondAttribute="trailing" constant="21" id="Ato-ay-iFe">
                                                     <variation key="heightClass=regular-widthClass=compact" constant="8"/>
                                                 </constraint>
-                                                <constraint firstItem="iPe-St-tVT" firstAttribute="leading" secondItem="i03-Ww-QZz" secondAttribute="leadingMargin" constant="7" id="Ivh-ka-fEi"/>
-                                                <constraint firstItem="iPe-St-tVT" firstAttribute="top" secondItem="ExV-2K-JEg" secondAttribute="bottom" constant="-1.5" id="OqC-7a-g2P">
-                                                    <variation key="heightClass=regular-widthClass=compact" constant="-0.5"/>
-                                                </constraint>
                                                 <constraint firstAttribute="trailingMargin" secondItem="ExV-2K-JEg" secondAttribute="trailing" constant="70" id="UfF-zB-xdk"/>
                                                 <constraint firstItem="skL-aj-42C" firstAttribute="trailing" secondItem="i03-Ww-QZz" secondAttribute="trailingMargin" id="cKU-qh-Qkr">
                                                     <variation key="heightClass=regular-widthClass=compact" constant="-13"/>
@@ -2456,16 +2429,13 @@ Licensed under the GPLv3</string>
                                             </constraints>
                                             <variation key="default">
                                                 <mask key="subviews">
-                                                    <exclude reference="ExV-2K-JEg"/>
-                                                    <exclude reference="iPe-St-tVT"/>
                                                     <exclude reference="skL-aj-42C"/>
+                                                    <exclude reference="ExV-2K-JEg"/>
                                                 </mask>
                                                 <mask key="constraints">
                                                     <exclude reference="2lQ-r0-TpV"/>
                                                     <exclude reference="UfF-zB-xdk"/>
                                                     <exclude reference="mEj-Hr-RsU"/>
-                                                    <exclude reference="Ivh-ka-fEi"/>
-                                                    <exclude reference="OqC-7a-g2P"/>
                                                     <exclude reference="Ato-ay-iFe"/>
                                                     <exclude reference="cKU-qh-Qkr"/>
                                                     <exclude reference="dRq-w1-9Ed"/>
@@ -2473,16 +2443,13 @@ Licensed under the GPLv3</string>
                                             </variation>
                                             <variation key="heightClass=regular-widthClass=compact">
                                                 <mask key="subviews">
-                                                    <include reference="ExV-2K-JEg"/>
-                                                    <include reference="iPe-St-tVT"/>
                                                     <include reference="skL-aj-42C"/>
+                                                    <include reference="ExV-2K-JEg"/>
                                                 </mask>
                                                 <mask key="constraints">
                                                     <include reference="2lQ-r0-TpV"/>
                                                     <exclude reference="UfF-zB-xdk"/>
                                                     <include reference="mEj-Hr-RsU"/>
-                                                    <include reference="Ivh-ka-fEi"/>
-                                                    <include reference="OqC-7a-g2P"/>
                                                     <include reference="Ato-ay-iFe"/>
                                                     <include reference="cKU-qh-Qkr"/>
                                                     <include reference="dRq-w1-9Ed"/>
@@ -2554,41 +2521,20 @@ Licensed under the GPLv3</string>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="xqr-ce-rni" id="b4l-um-jXd">
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
+                                                <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="V8I-9d-kbu">
+                                                    <rect key="frame" x="-25" y="-15" width="51" height="31"/>
+                                                </switch>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Disable Debugging Logs" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2iY-pe-fva">
                                                     <rect key="frame" x="0.0" y="-21" width="42" height="21"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                     <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
                                                     <nil key="highlightedColor"/>
-                                                </label>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Enabled" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="g8U-Fp-OSv">
-                                                    <rect key="frame" x="0.0" y="-21" width="42" height="21"/>
-                                                    <constraints>
-                                                        <constraint firstAttribute="height" constant="21" id="KcQ-uK-I5A"/>
-                                                        <constraint firstAttribute="width" constant="83" id="huD-gF-Wt1"/>
-                                                    </constraints>
-                                                    <fontDescription key="fontDescription" name="HelveticaNeue-Thin" family="Helvetica Neue" pointSize="17"/>
-                                                    <color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
-                                                    <nil key="highlightedColor"/>
-                                                    <variation key="default">
-                                                        <mask key="constraints">
-                                                            <exclude reference="KcQ-uK-I5A"/>
-                                                            <exclude reference="huD-gF-Wt1"/>
-                                                        </mask>
-                                                    </variation>
                                                     <variation key="heightClass=regular-widthClass=compact" misplaced="YES">
-                                                        <rect key="frame" x="15" y="29" width="83" height="21"/>
+                                                        <rect key="frame" x="15" y="19" width="307" height="20.5"/>
-                                                        <mask key="constraints">
-                                                            <include reference="KcQ-uK-I5A"/>
-                                                            <include reference="huD-gF-Wt1"/>
-                                                        </mask>
                                                     </variation>
                                                 </label>
-                                                <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="V8I-9d-kbu">
-                                                    <rect key="frame" x="-25" y="-15" width="51" height="31"/>
-                                                </switch>
                                             </subviews>
                                             <constraints>
-                                                <constraint firstItem="g8U-Fp-OSv" firstAttribute="top" secondItem="2iY-pe-fva" secondAttribute="bottom" constant="-1.5" id="6nN-Nh-Kdf"/>
                                                 <constraint firstAttribute="trailingMargin" secondItem="2iY-pe-fva" secondAttribute="trailing" constant="70" id="BKh-xT-hZ0"/>
                                                 <constraint firstItem="V8I-9d-kbu" firstAttribute="trailing" secondItem="b4l-um-jXd" secondAttribute="trailingMargin" id="GK1-fQ-8Ke">
                                                     <variation key="heightClass=regular-widthClass=compact" constant="-13"/>
@@ -2596,7 +2542,6 @@ Licensed under the GPLv3</string>
                                                 <constraint firstItem="2iY-pe-fva" firstAttribute="leading" secondItem="b4l-um-jXd" secondAttribute="leadingMargin" id="TGm-qt-Uiv">
                                                     <variation key="heightClass=regular-widthClass=compact" constant="7"/>
                                                 </constraint>
-                                                <constraint firstItem="g8U-Fp-OSv" firstAttribute="leading" secondItem="b4l-um-jXd" secondAttribute="leadingMargin" constant="7" id="UbN-P7-3pB"/>
                                                 <constraint firstItem="V8I-9d-kbu" firstAttribute="top" secondItem="b4l-um-jXd" secondAttribute="topMargin" constant="-2" id="ZKW-Ii-Gj8">
                                                     <variation key="heightClass=regular-widthClass=compact" constant="6"/>
                                                 </constraint>
@@ -2607,16 +2552,13 @@ Licensed under the GPLv3</string>
                                             </constraints>
                                             <variation key="default">
                                                 <mask key="subviews">
-                                                    <exclude reference="2iY-pe-fva"/>
-                                                    <exclude reference="g8U-Fp-OSv"/>
                                                     <exclude reference="V8I-9d-kbu"/>
+                                                    <exclude reference="2iY-pe-fva"/>
                                                 </mask>
                                                 <mask key="constraints">
                                                     <exclude reference="BKh-xT-hZ0"/>
                                                     <exclude reference="TGm-qt-Uiv"/>
                                                     <exclude reference="cu5-wT-Hnb"/>
-                                                    <exclude reference="6nN-Nh-Kdf"/>
-                                                    <exclude reference="UbN-P7-3pB"/>
                                                     <exclude reference="GK1-fQ-8Ke"/>
                                                     <exclude reference="ZKW-Ii-Gj8"/>
                                                     <exclude reference="iyJ-5o-NUy"/>
@@ -2624,16 +2566,13 @@ Licensed under the GPLv3</string>
                                             </variation>
                                             <variation key="heightClass=regular-widthClass=compact">
                                                 <mask key="subviews">
-                                                    <include reference="2iY-pe-fva"/>
-                                                    <include reference="g8U-Fp-OSv"/>
                                                     <include reference="V8I-9d-kbu"/>
+                                                    <include reference="2iY-pe-fva"/>
                                                 </mask>
                                                 <mask key="constraints">
                                                     <exclude reference="BKh-xT-hZ0"/>
                                                     <include reference="TGm-qt-Uiv"/>
                                                     <include reference="cu5-wT-Hnb"/>
-                                                    <include reference="6nN-Nh-Kdf"/>
-                                                    <include reference="UbN-P7-3pB"/>
                                                     <include reference="GK1-fQ-8Ke"/>
                                                     <include reference="ZKW-Ii-Gj8"/>
                                                     <include reference="iyJ-5o-NUy"/>
@@ -2909,8 +2848,7 @@ Licensed under the GPLv3</string>
                                         <exclude reference="ZIm-Uq-bM8"/>
                                     </mask>
                                 </variation>
-                                <variation key="heightClass=regular-widthClass=compact" misplaced="YES">
+                                <variation key="heightClass=regular-widthClass=compact">
-                                    <rect key="frame" x="0.0" y="20" width="400" height="100"/>
                                     <mask key="subviews">
                                         <include reference="gbm-B5-gCc"/>
                                         <include reference="Ul8-NY-i4c"/>
@@ -2964,9 +2902,6 @@ Licensed under the GPLv3</string>
                                         </tableViewCellContentView>
                                     </tableViewCell>
                                 </prototypes>
-                                <variation key="heightClass=regular-widthClass=compact" misplaced="YES">
-                                    <rect key="frame" x="0.0" y="128" width="400" height="672"/>
-                                </variation>
                                 <connections>
                                     <outlet property="dataSource" destination="bDi-2Q-XOC" id="VPO-ms-bH1"/>
                                     <outlet property="delegate" destination="bDi-2Q-XOC" id="rKM-jX-C39"/>

Signal/src/view controllers/SettingsTableViewCell.h

@@ -12,7 +12,5 @@
 
 //Regular cell
 @property(nonatomic, strong) IBOutlet UISwitch* toggle;
-@property(nonatomic, strong) IBOutlet UILabel* state;
-
 
 @end

Signal/src/view controllers/SettingsTableViewCell.m

@@ -30,9 +30,7 @@
 
 -(void)toggleSetting:(id)sender
 {
-    if ([self.reuseIdentifier isEqualToString:@"enableScreenSecurity"])
+    if ([self.reuseIdentifier isEqualToString:@"enableScreenSecurity"]) {
-    {
-        self.state.text = self.toggle.isOn ? @"Yes" : @"No";
         [Environment.preferences setScreenSecurity:self.toggle.isOn];
     }
 }