Clean

Signal/src/AppDelegate.m

@@ -329,30 +329,6 @@ static NSTimeInterval launchStartedAt;
     OWSLogInfo(@"application: didFinishLaunchingWithOptions completed.");
 
     [OWSAnalytics appLaunchDidBegin];
-    
-    // Loki
-//    self.lokiP2PServer = [LKP2PServer new];
-    
-    // We try to bind to 8081, if we can't then we just fallback to any random port
-//    NSArray *ports = @[ @8081, @0 ];
-//    for (NSNumber *port in ports) {
-//        if (self.lokiP2PServer.isRunning) { break; }
-//        BOOL isStarted = [self.lokiP2PServer startOnPort:port.unsignedIntegerValue];
-//        if (isStarted) {
-//            NSURL *serverURL = self.lokiP2PServer.serverURL;
-//            [LKP2PAPI setOurP2PAddressWithUrl:self.lokiP2PServer.serverURL];
-//            NSString *serverURLDescription = serverURL.absoluteString;
-//            if ([serverURLDescription hasSuffix:@"/"]) {
-//                serverURLDescription = [serverURLDescription substringToIndex:serverURLDescription.length - 1];
-//            }
-//            NSLog(@"[Loki] Started server at %@.", serverURLDescription);
-//            break;
-//        }
-//    }
-    
-//    if (!self.lokiP2PServer.isRunning) {
-//        NSLog(@"[Loki] Failed to start P2P server.");
-//    }
 
     return YES;
 }

Signal/src/ViewControllers/AppSettings/NotificationSettingsViewController.m

@@ -67,15 +67,15 @@
     OWSTableSection *strategySection = [OWSTableSection new];
     strategySection.headerTitle = NSLocalizedString(@"Notification Strategy", @"");
     [strategySection addItem:[OWSTableItem switchItemWithText:NSLocalizedString(@"Use APNs", @"")
-                               accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME(self, @"push_notification_strategy")
+                              accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME(self, @"push_notification_strategy")
-                               isOnBlock:^{
+                              isOnBlock:^{
-                                   return [NSUserDefaults.standardUserDefaults boolForKey:@"isUsingFullAPNs"];
+                                  return [NSUserDefaults.standardUserDefaults boolForKey:@"isUsingFullAPNs"];
-                               }
+                              }
-                               isEnabledBlock:^{
+                              isEnabledBlock:^{
-                                   return YES;
+                                  return YES;
-                               }
+                              }
-                               target:weakSelf
+                              target:weakSelf
-                               selector:@selector(didToggleAPNsSwitch:)]];
+                              selector:@selector(didToggleAPNsSwitch:)]];
     strategySection.footerTitle = NSLocalizedString(@"Session will use the Apple Push Notification Service to receive push notifications. You’ll be notified of new messages reliably and immediately. Using APNs means that this device will communicate directly with Apple’s servers to retrieve push notifications, which will expose your IP address to Apple. Your messages will still be onion-routed and end-to-end encrypted, so the contents of your messages will remain completely private.", @"");
     [contents addSection:strategySection];