Merge branch 'master' of github.com:WhisperSystems/TextSecure-iOS into verifyidentitykeys

Author: corbett

CONTRIBUTING.md

@@ -21,6 +21,14 @@ One note, for programmers joining us from Java or similar language communities,
 ###UI conventions
 We prefer to use [Storyboards](https://developer.apple.com/library/ios/documentation/general/conceptual/Devpedia-CocoaApp/Storyboard.html) vs. building UI elements within the code itself. We are not at the stage to provide a .strings localizable file for translating, but the goal is to have translatable strings in a single entry point so that we can reach users in their native language wherever possible. 
 
+Some tips
+- any PR that does not use segues or story board conventions (red flags:   ```[self.navigationController pushViewController:<#(UIViewController *)#> animated:<#(BOOL)#>]``` and/or manual creation of UI elements and/or orphaned ViewControllers in the storyboard) will need to be refactored prior to merge
+- the following are the storyboarder's best friends:
+
+```- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender;```
+
+``` [self performSegueWithIdentifier:<#(NSString *)#> sender:<#(id)#>];```
+
 ## Tabs vs Spaces
 
 It's the eternal debate. We chose to adopt spaces. Please set your default Xcode configuration to 4 spaces for tabs, and 4 spaces for indentation (it's Xcode's default setting).

TextSecureiOS/AppDelegate.m

@@ -22,6 +22,7 @@
 #import "TSWaitingPushMessageDatabase.h"
 #import "TSStorageMasterKey.h"
 #import "IASKSettingsReader.h"
+#import "TSSocketManager.h"
 #import "TSDeregisterAccountRequest.h"
 #define kChangePasswordAlertView 1
 #define kDeregisterAlertView 2
@@ -86,6 +87,8 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(handlePushesQueuedInDB) name:TSDatabaseDidUnlockNotification object:nil];
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(updateBasedOnUserSettings) name:kIASKAppSettingChanged object:nil];
 
+    [TSSocketManager becomeActive];
+    
 	return YES;
 }
 
@@ -143,6 +146,7 @@ - (void)alertView:(UIAlertView *)alertView clickedButtonAtIndex:(NSInteger)butto
     }
 }
 - (void)applicationDidEnterBackground:(UIApplication *)application {
+    [TSSocketManager resignActivity];
     if ([[NSUserDefaults standardUserDefaults] boolForKey:kScreenshotProtection]) {
         self.blankWindow.hidden = NO;
     }
@@ -151,6 +155,7 @@ - (void)applicationDidEnterBackground:(UIApplication *)application {
 - (void)applicationWillEnterForeground:(UIApplication *)application {
     self.blankWindow.hidden = YES;
     [self updateBasedOnUserSettings];
+    [TSSocketManager becomeActive];
 }
 
 

TextSecureiOS/Networking/TSNetworkManager.m

@@ -31,7 +31,8 @@ + (id)sharedManager {
 - (id)init {
     if (self = [super init]) {
         operationManager = [[AFHTTPRequestOperationManager manager] initWithBaseURL:[[NSURL alloc] initWithString:textSecureServer]];
-        operationManager.securityPolicy = [AFSecurityPolicy policyWithPinningMode:AFSSLPinningModePublicKey];
+#warning use pinning with : AFSSLPinningModePublicKey
+        operationManager.securityPolicy = [AFSecurityPolicy policyWithPinningMode:AFSSLPinningModeNone];
         operationManager.securityPolicy.allowInvalidCertificates = YES; // We are not signed by a valid certification authority.
         operationManager.requestSerializer = [AFJSONRequestSerializer serializer];
     }

TextSecureiOS/Networking/TSSocketManager.m

@@ -19,10 +19,11 @@ - (id)init{
     self = [super init];
 
     if (self) {
-        // TO-DO <===
-        NSString *webSocketConnect = [NSString stringWithFormat:@"%@", textSecureWebSocketAPI];
+        NSString *webSocketConnect = [NSString stringWithFormat:@"%@?user=%@&password=%@", textSecureWebSocketAPI, [[TSKeyManager getUsernameToken] stringByReplacingOccurrencesOfString:@"+" withString:@"%2B"],[TSKeyManager getAuthenticationToken]];
         NSURL *webSocketConnectURL = [NSURL URLWithString:webSocketConnect];
+        NSLog(@"WebsocketURL %@", webSocketConnectURL);
         self.websocket = [[SRWebSocket alloc] initWithURL:webSocketConnectURL];
+        self.websocket.delegate = self;
     }
 
     return self;
@@ -40,25 +41,26 @@ + (id)sharedManager {
 #pragma mark - Manage Socket
 
 + (void)becomeActive{
-    
+    DLog(@"Socket resuming activity");
+    [[[self sharedManager] websocket] open];
 }
 
 + (void)resignActivity{
-    
+    DLog(@"Socket resigning activity");
 }
 
 #pragma mark - Delegate methods
 
 - (void) webSocketDidOpen:(SRWebSocket *)webSocket{
-    
+    NSLog(@"WebSocket was sucessfully opened");
 }
 
 - (void) webSocket:(SRWebSocket *)webSocket didReceiveMessage:(id)message{
 
 }
 
 - (void) webSocket:(SRWebSocket *)webSocket didFailWithError:(NSError *)error{
-    
+    DLog(@"Error connecting to socket %@", error);
 }
 
 - (void)webSocket:(SRWebSocket *)webSocket didCloseWithCode:(NSInteger)code reason:(NSString *)reason wasClean:(BOOL)wasClean{

TextSecureiOS/Utility/Constants.m

@@ -18,7 +18,7 @@
 
 #warning Staging environement used. Production: https://textsecure-service.whispersystems.org
 
-NSString* const textSecureWebSocketAPI = @"wws://textsecure-service-staging.whispersystems.org/";
+NSString* const textSecureWebSocketAPI = @"wss://textsecure-service-staging.whispersystems.org/v1/websocket/";
 NSString* const textSecureServer = @"https://textsecure-service-staging.whispersystems.org/";
 
 NSString* const textSecureGeneralAPI = @"v1";