diff --git a/Signal/Signal-Info.plist b/Signal/Signal-Info.plist
index afc7f58d9..6e2416048 100644
--- a/Signal/Signal-Info.plist
+++ b/Signal/Signal-Info.plist
@@ -38,7 +38,7 @@
CFBundleVersion
- 2.0.12
+ 2.0.15
LOGS_EMAIL
support@whispersystems.org
LOGS_URL
diff --git a/Signal/src/AppDelegate.m b/Signal/src/AppDelegate.m
index 20d065287..89100ea45 100644
--- a/Signal/src/AppDelegate.m
+++ b/Signal/src/AppDelegate.m
@@ -57,8 +57,6 @@ static NSString* const kCallSegue = @"2.0_6.0_Call_Segue";
}
}
-
-
-(BOOL) isVersion:(NSString *)thisVersionString atLeast:(NSString *)openLowerBoundVersionString andLessThan:(NSString *)closedUpperBoundVersionString {
return [self isVersion:thisVersionString atLeast:openLowerBoundVersionString] && [self isVersion:thisVersionString lessThan:closedUpperBoundVersionString];
}
diff --git a/Signal/src/environment/DebugLogger.m b/Signal/src/environment/DebugLogger.m
index 7d828de28..2a083c778 100644
--- a/Signal/src/environment/DebugLogger.m
+++ b/Signal/src/environment/DebugLogger.m
@@ -66,7 +66,9 @@ MacrosSingletonImplemention
if (![[NSFileManager defaultManager] fileExistsAtPath:logsDirectory]) {
NSError *error;
- //[[NSFileManager defaultManager] createDirectoryAtPath:logsDirectory withIntermediateDirectories:YES attributes:nil error:nil];
+
+ [[NSFileManager defaultManager] createDirectoryAtPath:logsDirectory withIntermediateDirectories:YES attributes:nil error:nil];
+
if (error) {
DDLogError(@"Log folder couldn't be created. %@", error.description);
}
diff --git a/Signal/src/environment/VersionMigrations.m b/Signal/src/environment/VersionMigrations.m
index 1a6a692fa..89ae93420 100644
--- a/Signal/src/environment/VersionMigrations.m
+++ b/Signal/src/environment/VersionMigrations.m
@@ -37,6 +37,8 @@
[self migrateRecentCallsToVersion2Dot0];
[self migrateKeyingStorageToVersion2Dot0];
+ [UIApplication.sharedApplication setNetworkActivityIndicatorVisible:YES];
+
UIAlertController *waitingController = [UIAlertController alertControllerWithTitle:NSLocalizedString(@"REGISTER_TEXTSECURE_COMPONENT", nil)
message:nil
preferredStyle:UIAlertControllerStyleAlert];
@@ -47,6 +49,7 @@
[PushManager.sharedManager registrationAndRedPhoneTokenRequestWithSuccess:^(NSData *pushToken, NSString *signupToken) {
[TSAccountManager registerWithRedPhoneToken:signupToken pushToken:pushToken success:^{
+ [UIApplication.sharedApplication setNetworkActivityIndicatorVisible:NO];
[Environment.preferences setIsMigratingToVersion2Dot0:NO];
Environment *env = [Environment getCurrent];
PhoneNumberDirectoryFilterManager *manager = [env phoneDirectoryManager];
@@ -63,16 +66,17 @@
}
+ (void)refreshLock:(UIAlertController*)waitingController {
+ [UIApplication.sharedApplication setNetworkActivityIndicatorVisible:NO];
[waitingController dismissViewControllerAnimated:NO completion:^{
- UIAlertController *retryController = [UIAlertController alertControllerWithTitle:NSLocalizedString(@"REGISTER_TEXTSECURE_COMPONENT", nil)
+ UIAlertController *retryController = [UIAlertController alertControllerWithTitle:NSLocalizedString(@"REGISTER_TEXTSECURE_FAILED_TITLE", nil)
message:NSLocalizedString(@"REGISTER_TEXTSECURE_FAILED", nil)
preferredStyle:UIAlertControllerStyleAlert];
[retryController addAction:[UIAlertAction actionWithTitle:NSLocalizedString(@"REGISTER_FAILED_TRY_AGAIN", nil)
style:UIAlertActionStyleDefault
handler:^(UIAlertAction *action) {
- [self migrateFrom1Dot0Dot2ToVersion2Dot0];
- }]];
+ [self migrateFrom1Dot0Dot2ToVersion2Dot0];
+ }]];
[[UIApplication sharedApplication].keyWindow.rootViewController presentViewController:retryController animated:YES completion:nil];
}];
@@ -92,7 +96,7 @@
for (RecentCall* recentCall in allRecents) {
[Environment.getCurrent.recentCallManager addRecentCall:recentCall];
}
-
+
NSString *appDomain = [[NSBundle mainBundle] bundleIdentifier];
[[NSUserDefaults standardUserDefaults] removePersistentDomainForName:appDomain];
}
@@ -111,7 +115,7 @@
BOOL registered = [[NSUserDefaults.standardUserDefaults objectForKey:@"isRegistered"] boolValue];
return registered &&hasPassCounter && hasLocalNumber && hasPassKey && hasSignaling
- && hasCipherKey && hasCipherKey && hasZIDKey && hasSignalingExtra;
+ && hasCipherKey && hasCipherKey && hasZIDKey && hasSignalingExtra;
}
+ (void)migrateKeyingStorageToVersion2Dot0{
diff --git a/Signal/translations/en.lproj/Localizable.strings b/Signal/translations/en.lproj/Localizable.strings
index d31ca037e..48cc5ebd2 100644
--- a/Signal/translations/en.lproj/Localizable.strings
+++ b/Signal/translations/en.lproj/Localizable.strings
@@ -54,8 +54,9 @@
"PUSH_SETTINGS_MESSAGE" = "Signal requires push notification alerts and sounds to be enabled to work properly. Please change it in the Settings app >> Notification Center >> Signal.";
"RECENT_NAV_BAR_TITLE" = "Call Log";
"REGISTER_BUTTON_TITLE" = "REGISTER";
-"REGISTER_TEXTSECURE_COMPONENT" = "Sign up for TextSecure";
-"REGISTER_TEXTSECURE_FAILED" = "We tried to sign you up for TextSecure but we couldn't reach the server. Please try again when connected.";
+"REGISTER_TEXTSECURE_COMPONENT" = "Registering for messaging";
+"REGISTER_TEXTSECURE_FAILED_TITLE" = "No Internet Connection";
+"REGISTER_TEXTSECURE_FAILED" = "To add support for messages, please connect to the internet.";
"REGISTER_FAILED_TRY_AGAIN" = "Try again";
"REGISTER_CC_ERR_ALERT_VIEW_MESSAGE" = "Please enter a valid country code";
"REGISTER_CC_ERR_ALERT_VIEW_TITLE" = "Country Code Error";
@@ -146,8 +147,8 @@
"CONFIRM_ACCOUNT_DESTRUCTION_TITLE" = "Are you sure you want to destroy your account?";
"CONFIRM_ACCOUNT_DESTRUCTION_TEXT" = "This will reset the application by deleting your messages and unregister you with the server. The app will close after deletion of data.";
"PROCEED_BUTTON" = "Proceed";
-"UNREGISTER_REDPHONE_FAIL" = "Failed to unregister RedPhone component of Signal";
-"UNREGISTER_TEXTSECURE_FAIL" = "Failed to unregister TextSecure component of Signal";
+"UNREGISTER_REDPHONE_FAIL" = "Failed to unregister phone component of Signal";
+"UNREGISTER_TEXTSECURE_FAIL" = "Failed to unregister messaging component of Signal";
"NETWORK_STATUS_HEADER" = "Network Status";
"NETWORK_STATUS_TEXT" = "You can check your network status by looking at the colored bar above your inbox.";
"NETWORK_STATUS_CONNECTED" = "Connected";