Revert "Revert "Revert "Revert "Revert temporary changes.""""

This reverts commit d96944498084595afaae3affad67b49d31bbfa63.

Signal/Signal-Info.plist

@@ -128,10 +128,5 @@
 	</array>
 	<key>UIViewControllerBasedStatusBarAppearance</key>
 	<true/>
-		<key>NSAppTransportSecurity</key>
+</dict>
-	  <dict>
-	      <key>NSAllowsArbitraryLoads</key>
-	      <true/>
-	  </dict>
- </dict>
 </plist>

Signal/src/AppDelegate.m

@@ -1108,10 +1108,6 @@ static NSTimeInterval launchStartedAt;
     // Resume lazy restore.
     [OWSBackupLazyRestoreJob runAsync];
 #endif
-
-    if ([TSAccountManager isRegistered]) {
-        [[ContactDiscoveryService sharedService] testService];
-    }
 }
 
 - (void)registrationStateDidChange

SignalServiceKit/src/Security/OWSHTTPSecurityPolicy.m

@@ -20,22 +20,16 @@
     self = [[super class] defaultPolicy];
 
     if (self) {
-        //        self.pinnedCertificates = [NSSet setWithArray:@[
+        self.pinnedCertificates = [NSSet setWithArray:@[
-        //                                                        [self certificateDataForService:@"cacert"],
+            [self certificateDataForService:@"textsecure"],
-        //                                                        ]];
+        ]];
-        //        self.pinnedCertificates = [NSSet setWithArray:@[
-        //            [self certificateDataForService:@"acton-ca"],
-        //        ]];
-        //
-        self.allowInvalidCertificates = YES;
     }
 
     return self;
 }
 
 - (NSArray *)certs {
-    return @[ (__bridge id)[self certificateForService:@"cacert"] ];
+    return @[ (__bridge id)[self certificateForService:@"textsecure"] ];
-    //    return @[ (__bridge id)[self certificateForService:@"acton-ca"] ];
 }
 
 - (NSData *)certificateDataForService:(NSString *)service {
@@ -58,29 +52,28 @@
 
 
 - (BOOL)evaluateServerTrust:(SecTrustRef)serverTrust forDomain:(NSString *)domain {
-    //    NSMutableArray *policies = [NSMutableArray array];
+    NSMutableArray *policies = [NSMutableArray array];
-    //    [policies addObject:(__bridge_transfer id)SecPolicyCreateSSL(true, (__bridge CFStringRef)domain)];
+    [policies addObject:(__bridge_transfer id)SecPolicyCreateSSL(true, (__bridge CFStringRef)domain)];
-    //
+
-    //    if (SecTrustSetPolicies(serverTrust, (__bridge CFArrayRef)policies) != errSecSuccess) {
+    if (SecTrustSetPolicies(serverTrust, (__bridge CFArrayRef)policies) != errSecSuccess) {
-    //        DDLogError(@"The trust policy couldn't be set.");
+        DDLogError(@"The trust policy couldn't be set.");
-    //        return NO;
+        return NO;
-    //    }
+    }
-    //
+
-    //    NSMutableArray *pinnedCertificates = [NSMutableArray array];
+    NSMutableArray *pinnedCertificates = [NSMutableArray array];
-    //    for (NSData *certificateData in self.pinnedCertificates) {
+    for (NSData *certificateData in self.pinnedCertificates) {
-    //        [pinnedCertificates
+        [pinnedCertificates
-    //            addObject:(__bridge_transfer id)SecCertificateCreateWithData(NULL, (__bridge
+            addObject:(__bridge_transfer id)SecCertificateCreateWithData(NULL, (__bridge CFDataRef)certificateData)];
-    //            CFDataRef)certificateData)];
+    }
-    //    }
+
-    //
+    if (SecTrustSetAnchorCertificates(serverTrust, (__bridge CFArrayRef)pinnedCertificates) != errSecSuccess) {
-    //    if (SecTrustSetAnchorCertificates(serverTrust, (__bridge CFArrayRef)pinnedCertificates) != errSecSuccess) {
+        DDLogError(@"The anchor certificates couldn't be set.");
-    //        DDLogError(@"The anchor certificates couldn't be set.");
+        return NO;
-    //        return NO;
+    }
-    //    }
+
-    //
+    if (!AFServerTrustIsValid(serverTrust)) {
-    //    if (!AFServerTrustIsValid(serverTrust)) {
+        return NO;
-    //        return NO;
+    }
-    //    }
 
     return YES;
 }

SignalServiceKit/src/TSConstants.h

@@ -22,27 +22,30 @@ typedef NS_ENUM(NSInteger, TSWhisperMessageType) {
 #define kLegalTermsUrlString @"https://signal.org/legal/"
 #define SHOW_LEGAL_TERMS_LINK
 
-// Production
+#ifdef DEBUG
-//#define textSecureWebSocketAPI @"wss://textsecure-service.whispersystems.org/v1/websocket/"
+#define CONTACT_DISCOVERY_SERVICE
-//#define textSecureServerURL @"https://textsecure-service.whispersystems.org/"
+#endif
-//#define textSecureCDNServerURL @"https://cdn.signal.org"
+
-//// Use same reflector for service and CDN
+//#ifndef DEBUG
-//#define textSecureServiceReflectorHost @"textsecure-service-reflected.whispersystems.org"
-//#define textSecureCDNReflectorHost @"textsecure-service-reflected.whispersystems.org"
 
-// Staging
+// Production
-#define textSecureWebSocketAPI @"wss://textsecure-service-staging.whispersystems.org/v1/websocket/"
+#define textSecureWebSocketAPI @"wss://textsecure-service.whispersystems.org/v1/websocket/"
-#define textSecureServerURL @"https://textsecure-service-staging.whispersystems.org/"
+#define textSecureServerURL @"https://textsecure-service.whispersystems.org/"
-#define textSecureCDNServerURL @"https://cdn-staging.signal.org"
+#define textSecureCDNServerURL @"https://cdn.signal.org"
-#define textSecureServiceReflectorHost @"meek-signal-service-staging.appspot.com";
+// Use same reflector for service and CDN
-#define textSecureCDNReflectorHost @"meek-signal-cdn-staging.appspot.com";
+#define textSecureServiceReflectorHost @"textsecure-service-reflected.whispersystems.org"
+#define textSecureCDNReflectorHost @"textsecure-service-reflected.whispersystems.org"
 
-//// Testing
+//#else
-//#define textSecureWebSocketAPI @"wss://messaging.acton-signal.org/v1/websocket/"
+//
-//#define textSecureServerURL @"https://messaging.acton-signal.org/"
+//// Staging
+//#define textSecureWebSocketAPI @"wss://textsecure-service-staging.whispersystems.org/v1/websocket/"
+//#define textSecureServerURL @"https://textsecure-service-staging.whispersystems.org/"
 //#define textSecureCDNServerURL @"https://cdn-staging.signal.org"
 //#define textSecureServiceReflectorHost @"meek-signal-service-staging.appspot.com";
 //#define textSecureCDNReflectorHost @"meek-signal-cdn-staging.appspot.com";
+//
+//#endif
 
 #define textSecureAccountsAPI @"v1/accounts"
 #define textSecureAttributesAPI @"/attributes/"