From 7b388da3508175f7dba75eb7cf9d335110dd0cdd Mon Sep 17 00:00:00 2001 From: Frederic Jacobs Date: Thu, 16 Oct 2014 15:12:36 +0200 Subject: [PATCH] Closes #174 --- Signal.xcodeproj/project.pbxproj | 9 ++-- .../view controllers/SettingsViewController.m | 2 +- .../xibs/SettingsViewController.xib | 49 +++++-------------- 3 files changed, 18 insertions(+), 42 deletions(-) diff --git a/Signal.xcodeproj/project.pbxproj b/Signal.xcodeproj/project.pbxproj index 03c510643..927ea0d5a 100644 --- a/Signal.xcodeproj/project.pbxproj +++ b/Signal.xcodeproj/project.pbxproj @@ -4243,6 +4243,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; CODE_SIGN_IDENTITY = "iPhone Developer"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CURRENT_PROJECT_VERSION = 1; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -4281,7 +4282,7 @@ LLVM_LTO = NO; OTHER_LDFLAGS = "$(inherited)"; PRODUCT_NAME = Signal; - PROVISIONING_PROFILE = "901bceda-ae06-4214-89c0-2aeeea7190cc"; + PROVISIONING_PROFILE = ""; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = 1; TEST_AFTER_BUILD = YES; @@ -4475,6 +4476,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; CODE_SIGN_IDENTITY = "iPhone Developer"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CURRENT_PROJECT_VERSION = 1; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -4512,7 +4514,7 @@ LLVM_LTO = NO; OTHER_LDFLAGS = "$(inherited)"; PRODUCT_NAME = Signal; - PROVISIONING_PROFILE = "f9cba3ff-5957-491b-acd0-c669df5988d9"; + PROVISIONING_PROFILE = ""; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = 1; TEST_AFTER_BUILD = YES; @@ -4528,6 +4530,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; CODE_SIGN_IDENTITY = "iPhone Developer"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CURRENT_PROJECT_VERSION = 1; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -4565,7 +4568,7 @@ LLVM_LTO = NO; OTHER_LDFLAGS = "$(inherited)"; PRODUCT_NAME = Signal; - PROVISIONING_PROFILE = "e732b249-8e64-430a-aca8-e0fccc388be5"; + PROVISIONING_PROFILE = ""; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = 1; TEST_AFTER_BUILD = YES; diff --git a/Signal/src/view controllers/SettingsViewController.m b/Signal/src/view controllers/SettingsViewController.m index 0dc3471c2..8945fcc7a 100644 --- a/Signal/src/view controllers/SettingsViewController.m +++ b/Signal/src/view controllers/SettingsViewController.m @@ -114,7 +114,7 @@ static NSString *const CHECKBOX_EMPTY_IMAGE_NAME = @"checkbox_empty"; _enableScreenSecurityButton.selected = prefs.screenSecurityIsEnabled; _disableAutocorrectButton.selected = !prefs.getAutocorrectEnabled; _disableHistoryButton.selected = !prefs.getHistoryLogEnabled; - _disableLogsCell.selected = !prefs.loggingIsEnabled; + _disableDebugLogsButton.selected = !prefs.loggingIsEnabled; } - (void)configureAllCells { diff --git a/Signal/src/view controllers/xibs/SettingsViewController.xib b/Signal/src/view controllers/xibs/SettingsViewController.xib index 07fa8d031..94df607e4 100644 --- a/Signal/src/view controllers/xibs/SettingsViewController.xib +++ b/Signal/src/view controllers/xibs/SettingsViewController.xib @@ -1,7 +1,7 @@ - + - + @@ -33,7 +33,6 @@ - @@ -45,18 +44,15 @@ - - - + + @@ -263,7 +246,6 @@ - - + + @@ -305,7 +286,6 @@ -