From c73e6b65eb7a176acc9f7bd6aa83d0e1f7039a92 Mon Sep 17 00:00:00 2001 From: Frederic Jacobs Date: Wed, 30 Jul 2014 02:05:36 -0400 Subject: [PATCH] Transitioning off custom preference files --- Signal.xcodeproj/project.pbxproj | 14 +- Signal/Signal-Info.plist | 4 +- Signal/src/AppDelegate.m | 34 +++- .../processing/DesiredBufferDepthController.m | 4 +- Signal/src/environment/Environment.h | 39 +++-- Signal/src/environment/Environment.m | 54 ++++--- Signal/src/environment/PreferencesUtil.h | 9 -- Signal/src/environment/PreferencesUtil.m | 54 +------ .../src/environment/PropertyListPreferences.h | 7 +- .../src/environment/PropertyListPreferences.m | 54 +------ Signal/src/environment/Release.m | 6 +- Signal/src/environment/VersionMigrations.h | 15 ++ Signal/src/environment/VersionMigrations.m | 39 +++++ .../PhoneNumberDirectoryFilterManager.m | 2 +- Signal/src/util/DateUtil.m | 8 +- .../PreferenceListViewController.h | 26 ---- .../PreferenceListViewController.m | 67 -------- .../view controllers/SettingsViewController.h | 8 - .../view controllers/SettingsViewController.m | 65 +------- .../xibs/SettingsViewController.xib | 145 ------------------ .../translations/en.lproj/Localizable.strings | 2 +- 21 files changed, 160 insertions(+), 496 deletions(-) create mode 100644 Signal/src/environment/VersionMigrations.h create mode 100644 Signal/src/environment/VersionMigrations.m delete mode 100644 Signal/src/view controllers/PreferenceListViewController.h delete mode 100644 Signal/src/view controllers/PreferenceListViewController.m diff --git a/Signal.xcodeproj/project.pbxproj b/Signal.xcodeproj/project.pbxproj index 441f7de4b..2dcf87546 100644 --- a/Signal.xcodeproj/project.pbxproj +++ b/Signal.xcodeproj/project.pbxproj @@ -48,8 +48,6 @@ 765052B3182BF839008313E1 /* HelveticaNeueLTStd-Th.otf in Resources */ = {isa = PBXBuildFile; fileRef = 765052B1182BF839008313E1 /* HelveticaNeueLTStd-Th.otf */; }; 768A1A2B17FC9CD300E00ED8 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 768A1A2A17FC9CD300E00ED8 /* libz.dylib */; }; 76919BF71805D190008C664A /* ContactManagerTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 76919BF61805D190008C664A /* ContactManagerTest.m */; }; - 76B8189E182C39460088060E /* PreferenceListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 76B8189C182C39460088060E /* PreferenceListViewController.m */; }; - 76B8189F182C39460088060E /* PreferenceListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 76B8189C182C39460088060E /* PreferenceListViewController.m */; }; 76B818A1182C39460088060E /* PreferenceListViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 76B8189D182C39460088060E /* PreferenceListViewController.xib */; }; 76C87F13181EE11C00C4ACAB /* InboxFeedFooterCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 76C87F12181EE11C00C4ACAB /* InboxFeedFooterCell.m */; }; 76C87F14181EE11C00C4ACAB /* InboxFeedFooterCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 76C87F12181EE11C00C4ACAB /* InboxFeedFooterCell.m */; }; @@ -380,6 +378,7 @@ A1C32D5017A06538000A904E /* AddressBookUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A1C32D4F17A06537000A904E /* AddressBookUI.framework */; }; A1C32D5117A06544000A904E /* AddressBook.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A1C32D4D17A0652C000A904E /* AddressBook.framework */; }; AA0C8E498E2046B0B81EEE6E /* libPods.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 8313AE91B4954215858A5662 /* libPods.a */; }; + B60C16651988999D00E97A6C /* VersionMigrations.m in Sources */ = {isa = PBXBuildFile; fileRef = B60C16641988999D00E97A6C /* VersionMigrations.m */; }; B67EBF5D19194AC60084CCFD /* Settings.bundle in Resources */ = {isa = PBXBuildFile; fileRef = B67EBF5C19194AC60084CCFD /* Settings.bundle */; }; B69CD25119773E79005CE69A /* XCTest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B69CD25019773E79005CE69A /* XCTest.framework */; }; B6B1013C196D213F007E3930 /* SGNKeychainUtil.m in Sources */ = {isa = PBXBuildFile; fileRef = B6B1013B196D213F007E3930 /* SGNKeychainUtil.m */; }; @@ -719,8 +718,6 @@ 765052B1182BF839008313E1 /* HelveticaNeueLTStd-Th.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "HelveticaNeueLTStd-Th.otf"; sourceTree = ""; }; 768A1A2A17FC9CD300E00ED8 /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; }; 76919BF61805D190008C664A /* ContactManagerTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ContactManagerTest.m; path = contact/ContactManagerTest.m; sourceTree = ""; }; - 76B8189B182C39460088060E /* PreferenceListViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PreferenceListViewController.h; sourceTree = ""; }; - 76B8189C182C39460088060E /* PreferenceListViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PreferenceListViewController.m; sourceTree = ""; }; 76B8189D182C39460088060E /* PreferenceListViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = PreferenceListViewController.xib; path = ../PreferenceListViewController.xib; sourceTree = ""; }; 76C87F11181EE11C00C4ACAB /* InboxFeedFooterCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InboxFeedFooterCell.h; sourceTree = ""; }; 76C87F12181EE11C00C4ACAB /* InboxFeedFooterCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = InboxFeedFooterCell.m; sourceTree = ""; }; @@ -1102,6 +1099,8 @@ A1C32D4D17A0652C000A904E /* AddressBook.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AddressBook.framework; path = System/Library/Frameworks/AddressBook.framework; sourceTree = SDKROOT; }; A1C32D4F17A06537000A904E /* AddressBookUI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AddressBookUI.framework; path = System/Library/Frameworks/AddressBookUI.framework; sourceTree = SDKROOT; }; A1FDCBEE16DAA6C300868894 /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = System/Library/Frameworks/AVFoundation.framework; sourceTree = SDKROOT; }; + B60C16631988999D00E97A6C /* VersionMigrations.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VersionMigrations.h; sourceTree = ""; }; + B60C16641988999D00E97A6C /* VersionMigrations.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VersionMigrations.m; sourceTree = ""; }; B657DDC91911A40500F45B0C /* Signal.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = Signal.entitlements; sourceTree = ""; }; B67EBF5C19194AC60084CCFD /* Settings.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; name = Settings.bundle; path = SettingsBundle/Settings.bundle; sourceTree = SOURCE_ROOT; }; B69CD25019773E79005CE69A /* XCTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = XCTest.framework; path = Library/Frameworks/XCTest.framework; sourceTree = DEVELOPER_DIR; }; @@ -1686,6 +1685,8 @@ 76EB041B18170B33006006FC /* Release.m */, B6B1013A196D213F007E3930 /* SGNKeychainUtil.h */, B6B1013B196D213F007E3930 /* SGNKeychainUtil.m */, + B60C16631988999D00E97A6C /* VersionMigrations.h */, + B60C16641988999D00E97A6C /* VersionMigrations.m */, ); path = environment; sourceTree = ""; @@ -2123,8 +2124,6 @@ 76EB050E18170B33006006FC /* LeftSideMenuViewController.m */, 76EB050F18170B33006006FC /* NextResponderScrollView.h */, 76EB051018170B33006006FC /* NextResponderScrollView.m */, - 76B8189B182C39460088060E /* PreferenceListViewController.h */, - 76B8189C182C39460088060E /* PreferenceListViewController.m */, 76EB051518170B33006006FC /* RegisterViewController.h */, 76EB051618170B33006006FC /* RegisterViewController.m */, 76EB051718170B33006006FC /* SettingsViewController.h */, @@ -3038,6 +3037,7 @@ 76EB066218170B34006006FC /* SettingsViewController.m in Sources */, 76EB054818170B33006006FC /* CancelTokenSource.m in Sources */, 76EB05AC18170B33006006FC /* SrtpSocket.m in Sources */, + B60C16651988999D00E97A6C /* VersionMigrations.m in Sources */, 76EB062A18170B33006006FC /* BadState.m in Sources */, B97940271832BD2400BD66CB /* UIUtil.m in Sources */, 76EB05BE18170B33006006FC /* ConfirmPacket.m in Sources */, @@ -3098,7 +3098,6 @@ 76EB058218170B33006006FC /* Environment.m in Sources */, 76EB064418170B33006006FC /* ThreadManager.m in Sources */, 70B8011A190C55660042E3F0 /* UnknownFieldSet.m in Sources */, - 76B8189E182C39460088060E /* PreferenceListViewController.m in Sources */, 70B80114190C55660042E3F0 /* Field.m in Sources */, E197B61E18BBEC6D00F073E5 /* AudioRouter.m in Sources */, E197B60D18BBEC1A00F073E5 /* AudioSocket.m in Sources */, @@ -3232,7 +3231,6 @@ 76EB05BF18170B33006006FC /* ConfirmPacket.m in Sources */, 76EB05E518170B33006006FC /* UdpSocket.m in Sources */, 76EB05BD18170B33006006FC /* ConfirmAckPacket.m in Sources */, - 76B8189F182C39460088060E /* PreferenceListViewController.m in Sources */, 76EB05DB18170B33006006FC /* LowLatencyConnector.m in Sources */, 76EB060F18170B33006006FC /* DecayingSampleEstimator.m in Sources */, 76EB055318170B33006006FC /* TimeoutFailure.m in Sources */, diff --git a/Signal/Signal-Info.plist b/Signal/Signal-Info.plist index d5b995c51..91f847381 100644 --- a/Signal/Signal-Info.plist +++ b/Signal/Signal-Info.plist @@ -29,11 +29,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.0.2 + 1.0.3 CFBundleSignature ???? CFBundleVersion - 1.0.2 + 1.0.3 LSApplicationCategoryType LSRequiresIPhoneOS diff --git a/Signal/src/AppDelegate.m b/Signal/src/AppDelegate.m index c87e947cd..403eddc16 100644 --- a/Signal/src/AppDelegate.m +++ b/Signal/src/AppDelegate.m @@ -16,6 +16,7 @@ #import "Util.h" #import #import "Environment.h" +#import "VersionMigrations.h" #define kSignalVersionKey @"SignalUpdateVersionKey" @@ -47,18 +48,39 @@ [Environment setCurrent:[Release releaseEnvironmentWithLogging:nil]]; [Environment resetAppData]; // We clean previous keychain entries in case their are some entries remaining. } else if ([currentVersion compare:previousVersion options:NSNumericSearch] == NSOrderedDescending){ - // The application was updated - DDLogWarn(@"Application was updated from %@ to %@", previousVersion, currentVersion); + // Application was updated, let's see if we have a migration scheme for it. + + if ([previousVersion isEqualToString:@"1.0.2"]) { + + } + } [[NSUserDefaults standardUserDefaults] setObject:currentVersion forKey:kSignalVersionKey]; [[NSUserDefaults standardUserDefaults] synchronize]; } -#pragma mark Disable cloud/iTunes syncing of call log -- (void)disableCallLogBackup{ - NSString *preferencesPath = [[NSSearchPathForDirectoriesInDomains(NSLibraryDirectory, NSUserDomainMask, YES) objectAtIndex:0] stringByAppendingString:@"/Preferences"]; +/** + * Protects the preference and logs file with disk encryption and prevents them to leak to iCloud. + */ + +- (void)protectPreferenceFiles{ + + // We have two kind of data to deal with for now, preference files (/Library/Preferences), logs (/Library/Caches) and pr + + NSString *path = [NSSearchPathForDirectoriesInDomains(NSLibraryDirectory, NSUserDomainMask, YES) objectAtIndex:0]; + NSLog(@"PATH: %@", path); + + NSString *path2 = [NSHomeDirectory() stringByAppendingString:@"/Documents"]; + + NSArray *directoryEnum = [[NSFileManager defaultManager] contentsOfDirectoryAtPath:path2 error:nil]; + + NSLog(@"%@",directoryEnum); + + NSLog(@"%@ vs %@", NSHomeDirectory(), [NSSearchPathForDirectoriesInDomains(NSLibraryDirectory, NSUserDomainMask, YES) objectAtIndex:0]); + + NSString *preferencesPath = [NSHomeDirectory() stringByAppendingString:@"/Library/Preferences"]; NSString *userDefaultsString = [NSString stringWithFormat:@"%@/%@.plist", preferencesPath,[[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleIdentifier"]]; NSURL *userDefaultsURL = [NSURL fileURLWithPath:userDefaultsString]; @@ -81,7 +103,7 @@ [DDLog addLogger:self.fileLogger]; [self performUpdateCheck]; - [self disableCallLogBackup]; + [self protectPreferenceFiles]; self.window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]]; self.notificationTracker = [NotificationTracker notificationTracker]; diff --git a/Signal/src/audio/incall_audio/processing/DesiredBufferDepthController.m b/Signal/src/audio/incall_audio/processing/DesiredBufferDepthController.m index 42bc0bdef..3064696a7 100644 --- a/Signal/src/audio/incall_audio/processing/DesiredBufferDepthController.m +++ b/Signal/src/audio/incall_audio/processing/DesiredBufferDepthController.m @@ -17,7 +17,7 @@ NSTimeInterval audioDurationPerPacket = (NSTimeInterval)(AUDIO_FRAMES_PER_PACKET*[SpeexCodec frameSizeInSamples]) / SAMPLE_RATE; - double initialDesiredBufferDepth = [[Environment preferences] getCachedOrDefaultDesiredBufferDepth]; + double initialDesiredBufferDepth = [[[Environment getCurrent]preferences] getCachedOrDefaultDesiredBufferDepth]; DropoutTracker* dropoutTracker = [DropoutTracker dropoutTrackerWithAudioDurationPerPacket:audioDurationPerPacket]; @@ -59,7 +59,7 @@ } -(void) terminate { - [[Environment preferences] setCachedDesiredBufferDepth:[decayingDesiredBufferDepth currentEstimate]]; + [[[Environment getCurrent]preferences] setCachedDesiredBufferDepth:[decayingDesiredBufferDepth currentEstimate]]; } @end diff --git a/Signal/src/environment/Environment.h b/Signal/src/environment/Environment.h index 125ea46a0..99f250370 100644 --- a/Signal/src/environment/Environment.h +++ b/Signal/src/environment/Environment.h @@ -9,7 +9,7 @@ * Environment is a data and data accessor class. * It handles application-level component wiring in order to support mocks for testing. * It also handles network configuration for testing/deployment server configurations. - * + * **/ #define SAMPLE_RATE 8000 @@ -24,7 +24,6 @@ @class PhoneNumberDirectoryFilterManager; @interface Environment : NSObject -@property (nonatomic, readonly) PropertyListPreferences* preferences; @property (nonatomic, readonly) in_port_t serverPort; @property (nonatomic, readonly) id logging; @property (nonatomic, readonly) SecureEndPoint* masterServerSecureEndPoint; @@ -46,27 +45,25 @@ +(SecureEndPoint*) getSecureEndPointToDefaultRelayServer; +(SecureEndPoint*) getSecureEndPointToSignalingServerNamed:(NSString*)name; -+(Environment*) environmentWithPreferences:(PropertyListPreferences*)preferences - andLogging:(id)logging - andErrorNoter:(ErrorHandlerBlock)errorNoter - andServerPort:(in_port_t)serverPort - andMasterServerHostName:(NSString*)masterServerHostName - andDefaultRelayName:(NSString*)defaultRelayName - andRelayServerHostNameSuffix:(NSString*)relayServerHostNameSuffix - andCertificate:(Certificate*)certificate - andCurrentRegionCodeForPhoneNumbers:(NSString*)currentRegionCodeForPhoneNumbers - andSupportedKeyAgreementProtocols:(NSArray*)keyAgreementProtocolsInDescendingPriority - andPhoneManager:(PhoneManager*)phoneManager - andRecentCallManager:(RecentCallManager *)recentCallManager - andTestingAndLegacyOptions:(NSArray*)testingAndLegacyOptions - andZrtpClientId:(NSData*)zrtpClientId - andZrtpVersionId:(NSData*)zrtpVersionId - andContactsManager:(ContactsManager *)contactsManager - andPhoneDirectoryManager:(PhoneNumberDirectoryFilterManager*)phoneDirectoryManager; ++(Environment*) environmentWithLogging:(id)logging + andErrorNoter:(ErrorHandlerBlock)errorNoter + andServerPort:(in_port_t)serverPort + andMasterServerHostName:(NSString*)masterServerHostName + andDefaultRelayName:(NSString*)defaultRelayName + andRelayServerHostNameSuffix:(NSString*)relayServerHostNameSuffix + andCertificate:(Certificate*)certificate +andCurrentRegionCodeForPhoneNumbers:(NSString*)currentRegionCodeForPhoneNumbers + andSupportedKeyAgreementProtocols:(NSArray*)keyAgreementProtocolsInDescendingPriority + andPhoneManager:(PhoneManager*)phoneManager + andRecentCallManager:(RecentCallManager *)recentCallManager + andTestingAndLegacyOptions:(NSArray*)testingAndLegacyOptions + andZrtpClientId:(NSData*)zrtpClientId + andZrtpVersionId:(NSData*)zrtpVersionId + andContactsManager:(ContactsManager *)contactsManager + andPhoneDirectoryManager:(PhoneNumberDirectoryFilterManager*)phoneDirectoryManager; +(Environment*) getCurrent; +(void) setCurrent:(Environment*)curEnvironment; -+(PropertyListPreferences*) preferences; +(id) logging; +(NSString*) relayServerNameToHostName:(NSString*)name; +(ErrorHandlerBlock) errorNoter; @@ -74,6 +71,8 @@ +(bool) hasEnabledTestingOrLegacyOption:(NSString*)flag; +(PhoneManager*) phoneManager; +-(PropertyListPreferences*)preferences; + +(BOOL)isRegistered; +(void)setRegistered:(BOOL)status; +(void)resetAppData; diff --git a/Signal/src/environment/Environment.m b/Signal/src/environment/Environment.m index 5c70fd8b9..2484da6cd 100644 --- a/Signal/src/environment/Environment.m +++ b/Signal/src/environment/Environment.m @@ -16,22 +16,21 @@ static Environment* environment = nil; @implementation Environment @synthesize testingAndLegacyOptions, - currentRegionCodeForPhoneNumbers, - errorNoter, - keyAgreementProtocolsInDescendingPriority, - logging, - masterServerSecureEndPoint, - preferences, - defaultRelayName, - relayServerHostNameSuffix, - certificate, - serverPort, - zrtpClientId, - zrtpVersionId, - phoneManager, - recentCallManager, - contactsManager, - phoneDirectoryManager; +currentRegionCodeForPhoneNumbers, +errorNoter, +keyAgreementProtocolsInDescendingPriority, +logging, +masterServerSecureEndPoint, +defaultRelayName, +relayServerHostNameSuffix, +certificate, +serverPort, +zrtpClientId, +zrtpVersionId, +phoneManager, +recentCallManager, +contactsManager, +phoneDirectoryManager; +(NSString*) currentRegionCodeForPhoneNumbers { return [[self getCurrent] currentRegionCodeForPhoneNumbers]; @@ -71,8 +70,7 @@ static Environment* environment = nil; return [SecureEndPoint secureEndPointForHost:location identifiedByCertificate:env.certificate]; } - +(Environment*) environmentWithPreferences:(PropertyListPreferences*)preferences - andLogging:(id)logging ++(Environment*) environmentWithLogging:(id)logging andErrorNoter:(ErrorHandlerBlock)errorNoter andServerPort:(in_port_t)serverPort andMasterServerHostName:(NSString*)masterServerHostName @@ -88,8 +86,8 @@ static Environment* environment = nil; andZrtpVersionId:(NSData*)zrtpVersionId andContactsManager:(ContactsManager *)contactsManager andPhoneDirectoryManager:(PhoneNumberDirectoryFilterManager*)phoneDirectoryManager { + require(errorNoter != nil); - require(preferences != nil); require(zrtpClientId != nil); require(zrtpVersionId != nil); require(testingAndLegacyOptions != nil); @@ -98,14 +96,13 @@ static Environment* environment = nil; require([keyAgreementProtocolsInDescendingPriority all:^int(id p) { return [p conformsToProtocol:@protocol(KeyAgreementProtocol)]; }]); - + // must support DH3k require([keyAgreementProtocolsInDescendingPriority any:^int(id p) { return [p isKindOfClass:[DH3KKeyAgreementProtocol class]]; }]); - + Environment* e = [Environment new]; - e->preferences = preferences; e->errorNoter = errorNoter; e->logging = logging; e->testingAndLegacyOptions = testingAndLegacyOptions; @@ -124,7 +121,7 @@ static Environment* environment = nil; e->zrtpClientId = zrtpClientId; e->zrtpVersionId = zrtpVersionId; e->contactsManager = contactsManager; - + // @todo: better place for this? if (recentCallManager != nil) { [recentCallManager watchForCallsThrough:phoneManager @@ -132,13 +129,10 @@ static Environment* environment = nil; [recentCallManager watchForContactUpdatesFrom:contactsManager untillCancelled:nil]; } - + return e; - } - -+(PropertyListPreferences*) preferences { - return [[Environment getCurrent] preferences]; } + +(PhoneManager*) phoneManager { return [[Environment getCurrent] phoneManager]; } @@ -165,6 +159,10 @@ static Environment* environment = nil; [[NSUserDefaults standardUserDefaults] setObject:status?@YES:@NO forKey:isRegisteredUserDefaultString]; } +-(PropertyListPreferences*)preferences{ + return [[PropertyListPreferences alloc]init]; +} + +(void)resetAppData{ [SGNKeychainUtil wipeKeychain]; [NSUserDefaults resetStandardUserDefaults]; diff --git a/Signal/src/environment/PreferencesUtil.h b/Signal/src/environment/PreferencesUtil.h index cf2d48f10..5cf08547f 100644 --- a/Signal/src/environment/PreferencesUtil.h +++ b/Signal/src/environment/PreferencesUtil.h @@ -12,24 +12,15 @@ -(void) setSavedPhoneNumberDirectory:(PhoneNumberDirectoryFilter*)phoneNumberDirectoryFilter; -(NSTimeInterval) getCachedOrDefaultDesiredBufferDepth; -(void) setCachedDesiredBufferDepth:(double)value; --(void) setSettingsRowExpandedPrefs:(NSArray *)prefs; --(NSArray *) getOrGenerateSettingsRowExpandedPrefs; --(NSArray *) getAvailableDateFormats; -(BOOL) getFreshInstallTutorialsEnabled; -(BOOL) getContactImagesEnabled; -(BOOL) getAutocorrectEnabled; -(BOOL) getHistoryLogEnabled; --(BOOL) getAnonymousFeedbackEnabled; --(NSString *) getDateFormat; --(void) setDateFormat:(NSString *)format; -(void) setFreshInstallTutorialsEnabled:(BOOL)enabled; -(void) setContactImagesEnabled:(BOOL)enabled; -(void) setAutocorrectEnabled:(BOOL)enabled; -(void) setHistoryLogEnabled:(BOOL)enabled; --(void) setAnonymousFeedbackEnabled:(BOOL)enabled; - --(NSString *)getDateFormatKey; @end diff --git a/Signal/src/environment/PreferencesUtil.m b/Signal/src/environment/PreferencesUtil.m index 7a965c86e..8f9b18354 100644 --- a/Signal/src/environment/PreferencesUtil.m +++ b/Signal/src/environment/PreferencesUtil.m @@ -20,15 +20,6 @@ #define CONTACT_IMAGES_ENABLED_KEY @"Contact Images Enabled Key" #define AUTOCORRECT_ENABLED_KEY @"Autocorrect Enabled Key" #define HISTORY_LOG_ENABLED_KEY @"History Log Enabled Key" -#define ANONYMOUS_FEEDBACK_ENABLED_KEY @"Anonymous Feedback Enabled Key" - -#define DATE_FORMAT_KEY @"Date Format Key" -#define DATE_FORMAT_1 @"dd-MM-yyyy" -#define DATE_FORMAT_2 @"yyyy-MM-dd" -#define DATE_FORMAT_3 @"MM-dd-yyyy" -#define DATE_FORMAT_4 @"dd/MM/yyyy" -#define DATE_FORMAT_5 @"yyyy/MM/dd" -#define DATE_FORMAT_6 @"MM/dd/yyyy" @implementation PropertyListPreferences (PropertyUtil) @@ -42,7 +33,6 @@ andExpirationDate:expiration]; } -(void) setSavedPhoneNumberDirectory:(PhoneNumberDirectoryFilter*)phoneNumberDirectoryFilter { - // note: clearing before setting so that torn reads can be detected [self setValueForKey:PHONE_DIRECTORY_BLOOM_FILTER_DATA_KEY toValue:nil]; [self setValueForKey:PHONE_DIRECTORY_BLOOM_FILTER_HASH_COUNT_KEY toValue:nil]; [self setValueForKey:PHONE_DIRECTORY_EXPIRATION toValue:nil]; @@ -71,34 +61,6 @@ [self setValueForKey:CALL_STREAM_DES_BUFFER_LEVEL_KEY toValue:[NSNumber numberWithDouble:value]]; } --(void) setSettingsRowExpandedPrefs:(NSArray *)prefs { - [self setValueForKey:SETTINGS_EXPANDED_ROW_PREF_DICT_KEY toValue:prefs]; -} - --(NSArray *) getOrGenerateSettingsRowExpandedPrefs { - NSArray *prefs = [self tryGetValueForKey:SETTINGS_EXPANDED_ROW_PREF_DICT_KEY]; - if (!prefs) { - prefs = @[[NSNumber numberWithBool:true], [NSNumber numberWithBool:true], [NSNumber numberWithBool:true], [NSNumber numberWithBool:true]]; - } - return prefs; -} - --(NSArray *) getAvailableDateFormats { - return @[DATE_FORMAT_1, DATE_FORMAT_2, DATE_FORMAT_3, DATE_FORMAT_4, DATE_FORMAT_5, DATE_FORMAT_6]; -} - -- (NSString *)getDateFormat { - NSString *format = [self tryGetValueForKey:DATE_FORMAT_KEY]; - if (format) { - return format; - } else { - return DATE_FORMAT_1; - } -} - -- (NSString *)getDateFormatKey { - return DATE_FORMAT_KEY; -} -(BOOL) getFreshInstallTutorialsEnabled { NSNumber *preference = [self tryGetValueForKey:FRESH_INSTALL_TUTORIALS_ENABLED_KEY]; if (preference) { @@ -131,18 +93,6 @@ return YES; } } --(BOOL) getAnonymousFeedbackEnabled { - NSNumber *preference = [self tryGetValueForKey:ANONYMOUS_FEEDBACK_ENABLED_KEY]; - if (preference) { - return [preference boolValue]; - } else { - return NO; - } -} - --(void) setDateFormat:(NSString *)format { - [self setValueForKey:DATE_FORMAT_KEY toValue:format]; -} -(void) setFreshInstallTutorialsEnabled:(BOOL)enabled { [self setValueForKey:FRESH_INSTALL_TUTORIALS_ENABLED_KEY toValue:[NSNumber numberWithBool:enabled]]; @@ -156,7 +106,5 @@ -(void) setHistoryLogEnabled:(BOOL)enabled { [self setValueForKey:HISTORY_LOG_ENABLED_KEY toValue:[NSNumber numberWithBool:enabled]]; } --(void) setAnonymousFeedbackEnabled:(BOOL)enabled { - [self setValueForKey:ANONYMOUS_FEEDBACK_ENABLED_KEY toValue:[NSNumber numberWithBool:enabled]]; -} + @end diff --git a/Signal/src/environment/PropertyListPreferences.h b/Signal/src/environment/PropertyListPreferences.h index 6aba72c30..8bf828e79 100644 --- a/Signal/src/environment/PropertyListPreferences.h +++ b/Signal/src/environment/PropertyListPreferences.h @@ -1,11 +1,6 @@ #import -@interface PropertyListPreferences : NSObject { -@private NSMutableDictionary* dictionary; -@private NSString* plistName; -} - -+(PropertyListPreferences*) propertyListPreferencesWithName:(NSString*)name; +@interface PropertyListPreferences : NSObject -(id) tryGetValueForKey:(NSString*)key; -(void) setValueForKey:(NSString*)key toValue:(id)value; diff --git a/Signal/src/environment/PropertyListPreferences.m b/Signal/src/environment/PropertyListPreferences.m index 735d7429e..2ee224627 100644 --- a/Signal/src/environment/PropertyListPreferences.m +++ b/Signal/src/environment/PropertyListPreferences.m @@ -4,63 +4,25 @@ @implementation PropertyListPreferences -+(PropertyListPreferences*) propertyListPreferencesWithName:(NSString*)name { - PropertyListPreferences* p = [PropertyListPreferences new]; - p->plistName = name; - p->dictionary = [[PropertyListPreferences readPlist:name] mutableCopy]; - return p; -} - -(void) clear { @synchronized(self) { - dictionary = [NSMutableDictionary dictionary]; - [PropertyListPreferences writePlist:dictionary withName:plistName]; + NSString *appDomain = [[NSBundle mainBundle] bundleIdentifier]; + [[NSUserDefaults standardUserDefaults] removePersistentDomainForName:appDomain]; } } -+(NSDictionary*) readPlist:(NSString*)name {require(name != nil); - NSString* documentsDirectory = [NSHomeDirectory() stringByAppendingPathComponent:@"/Documents/"]; - NSString *path = [NSString stringWithFormat:@"%@/%@.plist", documentsDirectory, name]; - - NSData *plistData = [NSData dataWithContentsOfFile:path]; - // assume empty dictionary, if no data - if (plistData == nil) return @{}; - - NSString *error; - NSPropertyListFormat format; - id plist = [NSPropertyListSerialization propertyListFromData:plistData mutabilityOption:NSPropertyListImmutable format:&format errorDescription:&error]; - checkOperationDescribe(plist != nil, ([NSString stringWithFormat:@"Error parsing plist data: %@", error])); - checkOperationDescribe([plist isKindOfClass:[NSDictionary class]], @"Plist file didn't contain a dictionary"); - - return plist; -} -+(void) writePlist:(NSDictionary*)plist withName:(NSString*)name { - NSString *errorDesc; - NSData* xmlData = [NSPropertyListSerialization dataFromPropertyList:plist format:NSPropertyListXMLFormat_v1_0 errorDescription:&errorDesc]; - checkOperationDescribe(xmlData != nil, ([NSString stringWithFormat:@"Error serializing plist: %@", errorDesc])); - - NSError* error; - NSString* documentsDirectory = [NSHomeDirectory() stringByAppendingPathComponent:@"/Documents/"]; - NSString *path = [NSString stringWithFormat:@"%@/%@.plist",documentsDirectory,name]; - bool written = [xmlData writeToFile:path options:NSDataWritingAtomic error:&error]; - checkOperationDescribe(written, ([NSString stringWithFormat:@"Error atomically writing plist to file: %@", error])); -} -(id) tryGetValueForKey:(NSString *)key { require(key != nil); @synchronized(self) { - return [dictionary objectForKey:key]; + return [[NSUserDefaults standardUserDefaults] objectForKey:key]; } } -(void) setValueForKey:(NSString *)key toValue:(id)value { require(key != nil); @synchronized(self) { - if (value == nil) { - [dictionary removeObjectForKey:key]; - DDLogWarn(@"Removing object for key: %@ ", key); - } else { - [dictionary setObject:value forKey:key]; - } - [PropertyListPreferences writePlist:dictionary withName:plistName]; + NSUserDefaults *userDefaults = [NSUserDefaults standardUserDefaults]; + [userDefaults setObject:value forKey:key]; + [userDefaults synchronize]; } } -(id) adjustAndTryGetNewValueForKey:(NSString *)key afterAdjuster:(id (^)(id))adjuster { @@ -74,7 +36,7 @@ } } -#pragma mark KeyChain store +#pragma mark KeyChain store -(void) secureTrySetValueForKey:(NSString *)key toValue:(id)value { require(key != nil); @@ -125,7 +87,7 @@ @synchronized(self) { NSString *oldValue = [self secureTryGetStringForKey:key]; NSString *newValue = adjuster(oldValue); - [UICKeyChainStore setString:newValue forKey:key]; + [UICKeyChainStore setString:newValue forKey:key]; return newValue; } } diff --git a/Signal/src/environment/Release.m b/Signal/src/environment/Release.m index 33490c2d0..68ef5b92a 100644 --- a/Signal/src/environment/Release.m +++ b/Signal/src/environment/Release.m @@ -49,8 +49,7 @@ static unsigned char DH3K_PRIME[]={ //ErrorHandlerBlock errorDiscarder = ^(id error, id relatedInfo, bool causedTermination) {}; ErrorHandlerBlock errorNoter = ^(id error, id relatedInfo, bool causedTermination) { DDLogError(@"%@: %@, %d", error, relatedInfo, causedTermination); }; - return [Environment environmentWithPreferences:[PropertyListPreferences propertyListPreferencesWithName:@"RedPhone-Data"] - andLogging:logging + return [Environment environmentWithLogging:logging andErrorNoter:errorNoter andServerPort:31337 andMasterServerHostName:@"master.whispersystems.org" @@ -69,8 +68,7 @@ static unsigned char DH3K_PRIME[]={ } +(Environment*) unitTestEnvironment:(NSArray*)testingAndLegacyOptions { - return [Environment environmentWithPreferences:[PropertyListPreferences propertyListPreferencesWithName:@"RedPhone-Test-Data"] - andLogging:[DiscardingLog discardingLog] + return [Environment environmentWithLogging:[DiscardingLog discardingLog] andErrorNoter:^(id error, id relatedInfo, bool causedTermination) {} andServerPort:31337 andMasterServerHostName:@"testing.whispersystems.org" diff --git a/Signal/src/environment/VersionMigrations.h b/Signal/src/environment/VersionMigrations.h new file mode 100644 index 000000000..dd4cec48d --- /dev/null +++ b/Signal/src/environment/VersionMigrations.h @@ -0,0 +1,15 @@ +// +// VersionMigrations.h +// Signal +// +// Created by Frederic Jacobs on 29/07/14. +// Copyright (c) 2014 Open Whisper Systems. All rights reserved. +// + +#import + +@interface VersionMigrations : NSObject + ++ (void)migrationFrom1Dot0Dot2toLarger; + +@end diff --git a/Signal/src/environment/VersionMigrations.m b/Signal/src/environment/VersionMigrations.m new file mode 100644 index 000000000..474643418 --- /dev/null +++ b/Signal/src/environment/VersionMigrations.m @@ -0,0 +1,39 @@ +// +// VersionMigrations.m +// Signal +// +// Created by Frederic Jacobs on 29/07/14. +// Copyright (c) 2014 Open Whisper Systems. All rights reserved. +// + +#import "VersionMigrations.h" + +@implementation VersionMigrations + ++ (void)migrationFrom1Dot0Dot2toLarger{ + // Read everything in preference file, drop into NSUserDefaults + + NSString* documentsDirectory = [NSHomeDirectory() stringByAppendingPathComponent:@"/Documents/"]; + NSString *path = [NSString stringWithFormat:@"%@/%@.plist", documentsDirectory, @"RedPhone-Data"]; + + NSData *plistData = [NSData dataWithContentsOfFile:path]; + + NSString *error; + NSPropertyListFormat format; + NSDictionary *dict = [NSPropertyListSerialization propertyListFromData:plistData mutabilityOption:NSPropertyListImmutable format:&format errorDescription:&error]; + + NSLog(@"%@", dict); + NSArray *entries = [dict allKeys]; + NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults]; + + for (NSUInteger i = 0; i < [entries count]; i++) { + NSString *key = [entries objectAtIndex:i]; + [defaults setObject:[dict objectForKey:key] forKey:key]; + } + + [defaults synchronize]; + + // delete +} + +@end diff --git a/Signal/src/phone/signaling/number directory/PhoneNumberDirectoryFilterManager.m b/Signal/src/phone/signaling/number directory/PhoneNumberDirectoryFilterManager.m index 2024ae1dd..06b104f37 100644 --- a/Signal/src/phone/signaling/number directory/PhoneNumberDirectoryFilterManager.m +++ b/Signal/src/phone/signaling/number directory/PhoneNumberDirectoryFilterManager.m @@ -103,7 +103,7 @@ @synchronized(self) { phoneNumberDirectoryFilter = directory; } - [[Environment preferences] setSavedPhoneNumberDirectory:directory]; + [[[Environment getCurrent]preferences] setSavedPhoneNumberDirectory:directory]; [[NSNotificationCenter defaultCenter] postNotificationName:NOTIFICATION_DIRECTORY_WAS_UPDATED object:nil]; [self scheduleUpdate]; }]; diff --git a/Signal/src/util/DateUtil.m b/Signal/src/util/DateUtil.m index be77b7438..92e220086 100644 --- a/Signal/src/util/DateUtil.m +++ b/Signal/src/util/DateUtil.m @@ -12,20 +12,20 @@ static NSString *const DATE_FORMAT_HOUR_MINUTE = @"h:mm a "; + (NSDateFormatter *)dateFormatter { NSDateFormatter *formatter = [NSDateFormatter new]; - [formatter setDateFormat:[[[Environment getCurrent] preferences] getDateFormat]]; -return formatter; + [formatter setTimeStyle:NSDateFormatterShortStyle]; + return formatter; } + (NSDateFormatter *)weekdayFormatter { NSDateFormatter *formatter = [NSDateFormatter new]; [formatter setDateFormat:DATE_FORMAT_WEEKDAY]; -return formatter; + return formatter; } + (NSDateFormatter *)timeFormatter { NSDateFormatter *formatter = [NSDateFormatter new]; [formatter setDateFormat:DATE_FORMAT_HOUR_MINUTE]; -return formatter; + return formatter; } + (BOOL)dateIsOlderThanOneDay:(NSDate *)date { diff --git a/Signal/src/view controllers/PreferenceListViewController.h b/Signal/src/view controllers/PreferenceListViewController.h deleted file mode 100644 index 622025a2f..000000000 --- a/Signal/src/view controllers/PreferenceListViewController.h +++ /dev/null @@ -1,26 +0,0 @@ -#import - -/** - * - * PreferenceListViewController displays a list of options and highlights a selected one indicated by selectedValueBlock. - * When selected, the selected block is called and the value should be updated manually. - * - */ - -typedef void (^SelectedBlock) (NSString *newValue); -typedef NSString* (^GetSelectedValueBlock) (); - -@interface PreferenceListViewController : UIViewController { - @private SelectedBlock selectedBlock; - @private GetSelectedValueBlock getSelectedValueBlock; - @private NSString *settingsValue; -} - -@property (nonatomic, strong) IBOutlet UITableView *optionTableView; -@property (nonatomic, strong) NSArray *options; - -+ (PreferenceListViewController *)preferenceListViewControllerForSelectedValue:(GetSelectedValueBlock)selectedValueBlock - andOptions:(NSArray *)options - andSelectedBlock:(SelectedBlock)block; - -@end diff --git a/Signal/src/view controllers/PreferenceListViewController.m b/Signal/src/view controllers/PreferenceListViewController.m deleted file mode 100644 index 5ceb4d7ea..000000000 --- a/Signal/src/view controllers/PreferenceListViewController.m +++ /dev/null @@ -1,67 +0,0 @@ -#import "Environment.h" -#import "PreferencesUtil.h" -#import "PreferenceListTableViewCell.h" -#import "PreferenceListViewController.h" -#import "Util.h" - -static NSString *const PREFERENCE_LIST_TABLE_VIEW_CELL = @"PreferenceListTableViewCell"; - -@implementation PreferenceListViewController - -+ (PreferenceListViewController *)preferenceListViewControllerForSelectedValue:(GetSelectedValueBlock)selectedValueBlock - andOptions:(NSArray *)options - andSelectedBlock:(SelectedBlock)block { - require(selectedValueBlock != nil); - require(block != nil); - - PreferenceListViewController *vc = [PreferenceListViewController new]; - vc.options = options; - vc->selectedBlock = block; - vc->getSelectedValueBlock = selectedValueBlock; - return vc; -} - -- (void)viewDidLoad { - [super viewDidLoad]; - self.navigationController.navigationBar.barTintColor = [UIUtil darkBackgroundColor]; - self.navigationController.navigationBar.tintColor = [UIColor whiteColor]; - self.navigationController.navigationBar.translucent = NO; - - settingsValue = getSelectedValueBlock(); - [_optionTableView reloadData]; -} - -#pragma mark - UITableViewDelegate - -- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { - return (NSInteger)[_options count]; -} - -- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { - PreferenceListTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:PREFERENCE_LIST_TABLE_VIEW_CELL]; - if (!cell) { - cell = [[PreferenceListTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault - reuseIdentifier:PREFERENCE_LIST_TABLE_VIEW_CELL]; - } - - if ([settingsValue isEqualToString:_options[(NSUInteger)indexPath.row]]) { - cell.accessoryType = UITableViewCellAccessoryCheckmark; - } else { - cell.accessoryType = UITableViewCellAccessoryNone; - } - - NSString *date = _options[(NSUInteger)indexPath.row]; - cell.preferenceTextLabel.text = [date lowercaseString]; - - return cell; -} - -- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { - [tableView deselectRowAtIndexPath:indexPath animated:YES]; - - selectedBlock(_options[(NSUInteger)indexPath.row]); - settingsValue = getSelectedValueBlock(); - [_optionTableView reloadData]; -} - -@end diff --git a/Signal/src/view controllers/SettingsViewController.h b/Signal/src/view controllers/SettingsViewController.h index d4f170dcb..50950e2ac 100644 --- a/Signal/src/view controllers/SettingsViewController.h +++ b/Signal/src/view controllers/SettingsViewController.h @@ -18,7 +18,6 @@ @property (nonatomic, strong) IBOutlet UITableView *settingsTableView; @property (nonatomic, strong) IBOutlet UILabel *phoneNumberLabel; -@property (nonatomic, strong) IBOutlet UILabel *currentDateFormatLabel; @property (nonatomic, strong) IBOutlet UILabel *titleLabel; @property (nonatomic, strong) IBOutlet SettingsTableHeaderView *privacyAndSecurityHeaderView; @@ -31,14 +30,9 @@ @property (nonatomic, strong) IBOutlet UIButton *disableAutocorrectButton; @property (nonatomic, strong) IBOutlet UIButton *disableHistoryButton; -@property (nonatomic, strong) IBOutlet SettingsTableHeaderView *locationOverridesHeaderView; -@property (nonatomic, strong) IBOutlet UITableViewCell *dateFormatCell; - @property (nonatomic, strong) IBOutlet SettingsTableHeaderView *callQualityHeaderView; -@property (nonatomic, strong) IBOutlet UITableViewCell *feedbackCell; @property (nonatomic, strong) IBOutlet UITableViewCell *directoryUpdateCell; -@property (nonatomic, strong) IBOutlet UIButton *sendFeedbackButton; @property (nonatomic, strong) IBOutlet UITableViewCell *sendDebugLog; @property (nonatomic, assign) FutureSource *apnId; @@ -51,8 +45,6 @@ - (IBAction)disableAutocorrectButtonTapped; - (IBAction)disableHistoryButtonTapped; -- (IBAction)sendFeedbackButtonTapped; - - (IBAction)menuButtonTapped; @end diff --git a/Signal/src/view controllers/SettingsViewController.m b/Signal/src/view controllers/SettingsViewController.m index dcec07103..b4de6ebcf 100644 --- a/Signal/src/view controllers/SettingsViewController.m +++ b/Signal/src/view controllers/SettingsViewController.m @@ -4,7 +4,6 @@ #import "Operation.h" #import "PreferencesUtil.h" #import "PhoneNumber.h" -#import "PreferenceListViewController.h" #import "RecentCallManager.h" #import "RegisterViewController.h" #import "SettingsViewController.h" @@ -15,8 +14,7 @@ #define SECTION_HEADER_VIEW_HEIGHT 27 #define PRIVACY_SECTION_INDEX 0 -#define LOCALIZATION_SECTION_INDEX 1 -#define CALL_QUALITY_SECTION_INDEX 2 +#define CALL_QUALITY_SECTION_INDEX 1 static NSString *const CHECKBOX_CHECKMARK_IMAGE_NAME = @"checkbox_checkmark"; static NSString *const CHECKBOX_EMPTY_IMAGE_NAME = @"checkbox_empty"; @@ -24,7 +22,6 @@ static NSString *const CHECKBOX_EMPTY_IMAGE_NAME = @"checkbox_empty"; @interface SettingsViewController () { NSArray *_sectionHeaderViews; NSArray *_privacyTableViewCells; - NSArray *_localizationTableViewCells; NSArray *_callQualityTableViewCells; NSString *gistURL; @@ -37,8 +34,7 @@ static NSString *const CHECKBOX_EMPTY_IMAGE_NAME = @"checkbox_empty"; - (void)viewDidLoad { [super viewDidLoad]; - _sectionHeaderViews = @[_privacyAndSecurityHeaderView, - _locationOverridesHeaderView]; + _sectionHeaderViews = @[_privacyAndSecurityHeaderView]; _titleLabel.text = SETTINGS_NAV_BAR_TITLE; } @@ -101,8 +97,7 @@ static NSString *const CHECKBOX_EMPTY_IMAGE_NAME = @"checkbox_empty"; - (void)configureCheckboxPreferences { NSArray *buttons = @[_hideContactImagesButton, _disableAutocorrectButton, - _disableHistoryButton, - _sendFeedbackButton]; + _disableHistoryButton]; for (UIButton *button in buttons) { [button setImage:[UIImage imageNamed:CHECKBOX_EMPTY_IMAGE_NAME] @@ -115,22 +110,11 @@ static NSString *const CHECKBOX_EMPTY_IMAGE_NAME = @"checkbox_empty"; _hideContactImagesButton.selected = ![prefs getContactImagesEnabled]; _disableAutocorrectButton.selected = ![prefs getAutocorrectEnabled]; _disableHistoryButton.selected = ![prefs getHistoryLogEnabled]; - _sendFeedbackButton.selected = [prefs getAnonymousFeedbackEnabled]; } - (void)configureAllCells { - PropertyListPreferences *prefs = [[Environment getCurrent] preferences]; - NSArray *expandedSectionPrefs = [prefs getOrGenerateSettingsRowExpandedPrefs]; - - BOOL privacyExpanded = [expandedSectionPrefs[PRIVACY_SECTION_INDEX] boolValue]; - _privacyTableViewCells = privacyExpanded ? [self privacyAndSecurityCells] : nil; - [_privacyAndSecurityHeaderView setColumnStateExpanded:privacyExpanded andIsAnimated:NO]; - - BOOL localizationExpanded = [expandedSectionPrefs[LOCALIZATION_SECTION_INDEX] boolValue]; - _localizationTableViewCells = localizationExpanded ? [self localizationCells] : nil; - [_locationOverridesHeaderView setColumnStateExpanded:localizationExpanded andIsAnimated:NO]; - - _currentDateFormatLabel.text = [[prefs getDateFormat] lowercaseString]; + _privacyTableViewCells = [self privacyAndSecurityCells]; + [_privacyAndSecurityHeaderView setColumnStateExpanded:YES andIsAnimated:NO]; } - (void)saveExpandedSectionPreferences { @@ -139,8 +123,6 @@ static NSString *const CHECKBOX_EMPTY_IMAGE_NAME = @"checkbox_empty"; NSNumber *numberBoolNo = [NSNumber numberWithBool:NO]; [expandedSectionPrefs addObject:(_privacyTableViewCells ? numberBoolYes : numberBoolNo)]; - [expandedSectionPrefs addObject:(_localizationTableViewCells ? numberBoolYes : numberBoolNo)]; - [[[Environment getCurrent] preferences] setSettingsRowExpandedPrefs:expandedSectionPrefs]; } #pragma mark - Table View Helpers @@ -153,10 +135,6 @@ static NSString *const CHECKBOX_EMPTY_IMAGE_NAME = @"checkbox_empty"; _sendDebugLog]; } -- (NSArray *)localizationCells { - return @[_dateFormatCell]; -} - - (NSArray *)indexPathsForCells:(NSArray *)cells forRow:(NSInteger)row { NSMutableArray *indexPaths = [NSMutableArray array]; for (NSUInteger i = 0; i < [cells count]; i++) { @@ -169,8 +147,6 @@ static NSString *const CHECKBOX_EMPTY_IMAGE_NAME = @"checkbox_empty"; - (NSArray *)cellsForRow:(NSInteger)row { if (row == PRIVACY_SECTION_INDEX) { return [self privacyAndSecurityCells]; - } else if(row == LOCALIZATION_SECTION_INDEX) { - return [self localizationCells]; } else { return @[]; } @@ -189,12 +165,6 @@ static NSString *const CHECKBOX_EMPTY_IMAGE_NAME = @"checkbox_empty"; [_privacyAndSecurityHeaderView setColumnStateExpanded:columnExpanded andIsAnimated:YES]; } -- (void)localizationTapped { - [self toggleCells:&_localizationTableViewCells forRow:LOCALIZATION_SECTION_INDEX]; - BOOL columnExpanded = _localizationTableViewCells != nil; - [_locationOverridesHeaderView setColumnStateExpanded:columnExpanded andIsAnimated:YES]; -} - - (void)toggleCells:(NSArray *__strong*)cells forRow:(NSInteger)row { [_settingsTableView beginUpdates]; if (*cells) { @@ -224,11 +194,6 @@ static NSString *const CHECKBOX_EMPTY_IMAGE_NAME = @"checkbox_empty"; [[[Environment getCurrent] preferences] setHistoryLogEnabled:!_disableHistoryButton.selected]; } -- (IBAction)sendFeedbackButtonTapped { - _sendFeedbackButton.selected = !_sendFeedbackButton.selected; - [[[Environment getCurrent] preferences] setAnonymousFeedbackEnabled:_sendFeedbackButton.selected]; -} - - (void)clearHistory { [[[Environment getCurrent] recentCallManager] clearRecentCalls]; UIAlertView *alertView = [[UIAlertView alloc] initWithTitle:SETTINGS_LOG_CLEAR_TITLE @@ -239,18 +204,6 @@ static NSString *const CHECKBOX_EMPTY_IMAGE_NAME = @"checkbox_empty"; [alertView show]; } -- (void)showDateFormatPicker { - NSArray *dateFormats = [[[Environment getCurrent] preferences] getAvailableDateFormats]; - - PreferenceListViewController *prefPicker = [PreferenceListViewController preferenceListViewControllerForSelectedValue:^NSString *{ - return [[Environment preferences] getDateFormat]; - } andOptions:dateFormats andSelectedBlock:^(NSString *newValue) { - [[Environment preferences] setDateFormat:newValue]; - }]; - - [self.navigationController pushViewController:prefPicker animated:YES]; -} - #pragma mark - UITableViewDelegate - (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView { @@ -269,8 +222,6 @@ static NSString *const CHECKBOX_EMPTY_IMAGE_NAME = @"checkbox_empty"; UIView *headerView = _sectionHeaderViews[(NSUInteger)section]; if (headerView == _privacyAndSecurityHeaderView) { return (NSInteger)[_privacyTableViewCells count]; - } else if (headerView == _locationOverridesHeaderView) { - return (NSInteger)[_localizationTableViewCells count]; } else { return 0; } @@ -281,10 +232,7 @@ static NSString *const CHECKBOX_EMPTY_IMAGE_NAME = @"checkbox_empty"; UITableViewCell *cell = nil; if (headerView == _privacyAndSecurityHeaderView) { cell = _privacyTableViewCells[(NSUInteger)indexPath.row]; - } else if (headerView == _locationOverridesHeaderView) { - cell = _localizationTableViewCells[(NSUInteger)indexPath.row]; } - [self findAndLocalizeLabelsForView:cell]; return cell; @@ -297,9 +245,6 @@ static NSString *const CHECKBOX_EMPTY_IMAGE_NAME = @"checkbox_empty"; if (cell == _clearHistoryLogCell) { [self clearHistory]; } - if (cell == _dateFormatCell) { - [self showDateFormatPicker]; - } if (cell == _sendDebugLog) { UIAlertView *alert = [[UIAlertView alloc] initWithTitle:SETTINGS_SENDLOG_WAITING diff --git a/Signal/src/view controllers/xibs/SettingsViewController.xib b/Signal/src/view controllers/xibs/SettingsViewController.xib index 8f9e0665d..259d9202d 100644 --- a/Signal/src/view controllers/xibs/SettingsViewController.xib +++ b/Signal/src/view controllers/xibs/SettingsViewController.xib @@ -8,21 +8,16 @@ - - - - - @@ -298,45 +293,6 @@ - - - - - - - - - - - - - - - - - - - - - @@ -411,58 +367,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -484,55 +388,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Signal/translations/en.lproj/Localizable.strings b/Signal/translations/en.lproj/Localizable.strings index 5afd605a8..b7badc459 100644 --- a/Signal/translations/en.lproj/Localizable.strings +++ b/Signal/translations/en.lproj/Localizable.strings @@ -125,7 +125,7 @@ "SETTINGS_PRIVACY_AND_SECURITY" = "Privacy and Security"; "SETTINGS_RINGTONE" = "Ringtone"; "SETTINGS_SENDLOG" = "Submit Debug Log"; -"SETTINGS_SENDLOGS_WAITING" = "Sending anonymized log file\n Please wait..."; +"SETTINGS_SENDLOGS_WAITING" = "Sending log file\n Please wait..."; "SETTINGS_SENDLOG_ALERT_BODY" = "Bugs can be reported by email or by copying the log in a GitHub Issue (advanced)."; "SETTINGS_SENDLOG_ALERT_PASTE" = "Email"; "SETTINGS_SENDLOG_ALERT_EMAIL" = "GitHub Issue";