Update XMPP server list

Author: chrisballinger

ChatSecure/Classes/Model/OTRXMPPServerInfo.h

@@ -48,6 +48,8 @@ NS_ASSUME_NONNULL_BEGIN
 /** Defaults to 5222 */
 @property (nonatomic, readonly) in_port_t portNumber;
 @property (nonatomic, strong, readonly, nullable) NSString *certificate;
+/** If the server has a CAPTCHA challenge when registering. We currently don't support CAPTCHAs, so those results will be filtered out of . */
+@property (nonatomic, readonly) BOOL requiresCaptcha;
 
 /** Return image if loaded from local resource bundle */
 - (nullable UIImage*) logoImage;
@@ -58,8 +60,11 @@ NS_ASSUME_NONNULL_BEGIN
 /** loaded from bundle */
 @property (class, readonly, nullable) NSArray<OTRXMPPServerInfo*> *defaultServerList;
 
-//+ (nullable NSArray<OTRXMPPServerInfo*> *)defaultServerList;
+/** Returns all servers (that don't require CAPTCHAs) */
 + (nullable NSArray<OTRXMPPServerInfo*> *)serverListFromJSONData:(NSData*)jsonData;
 
+/** Returns servers with optional CAPTCHA filtering. filterRequiresCaptcha=YES will remove results. */
++ (nullable NSArray<OTRXMPPServerInfo*> *)serverListFromJSONData:(NSData*)jsonData filterRequiresCaptcha:(BOOL)filterRequiresCaptcha;
+
 @end
 NS_ASSUME_NONNULL_END

ChatSecure/Classes/Model/OTRXMPPServerInfo.m

@@ -30,6 +30,9 @@
 
 @implementation OTRXMPPServerInfo
 @synthesize portNumber = _portNumber;
+@synthesize websiteURL = _websiteURL;
+@synthesize twitterURL = _twitterURL;
+@synthesize privacyPolicyURL = _privacyPolicyURL;
 
 - (instancetype) initWithDomain:(NSString*)domain {
     if (self = [super init]) {
@@ -51,7 +54,8 @@ + (NSDictionary *)JSONKeyPathsByPropertyKey {
              @"server": @"server",
              @"onion": @"onion",
              @"portNumber": @"port",
-             @"certificate": @"certificate"
+             @"certificate": @"certificate",
+             @"requiresCaptcha": @"captcha"
              };
 }
 
@@ -68,16 +72,21 @@ + (NSValueTransformer *)privacyPolicyURLJSONTransformer {
 }
 
 - (UIImage*) logoImage {
+    UIImage *defaultImage = [UIImage imageNamed:@"xmpp" inBundle:[OTRAssets resourcesBundle] compatibleWithTraitCollection:nil]; // load default image
+    NSParameterAssert(defaultImage);
     NSBundle *bundle = [[self class] serverBundle];
     NSArray *pathComponents = [self.logo pathComponents];
+    if (pathComponents.count < 2) {
+        return defaultImage;
+    }
     NSString *folder = pathComponents[0];
     NSString *fileName = pathComponents[1];
     NSString *extension = [fileName pathExtension];
     NSString *resource = [fileName stringByDeletingPathExtension];
     NSString *path = [bundle pathForResource:resource ofType:extension inDirectory:folder];
     UIImage *image = [UIImage imageWithContentsOfFile:path];
     if (!image) {
-        image = [UIImage imageNamed:@"xmpp" inBundle:[OTRAssets resourcesBundle] compatibleWithTraitCollection:nil];
+        image = defaultImage;
     }
     NSParameterAssert(image);
     return image;
@@ -90,6 +99,27 @@ - (in_port_t) portNumber {
     return 5222;
 }
 
+- (NSURL*) websiteURL {
+    if (_websiteURL.absoluteString.length == 0) {
+        return nil;
+    }
+    return _websiteURL;
+}
+
+- (NSURL*) twitterURL {
+    if (_twitterURL.absoluteString.length == 0) {
+        return nil;
+    }
+    return _twitterURL;
+}
+
+- (NSURL*) privacyPolicyURL {
+    if (_privacyPolicyURL.absoluteString.length == 0) {
+        return nil;
+    }
+    return _privacyPolicyURL;
+}
+
 + (NSBundle*)serverBundle {
     NSString *folderName = @"xmpp-server-list";
     NSString *bundlePath = [[[NSBundle mainBundle] resourcePath] stringByAppendingPathComponent:folderName];
@@ -112,7 +142,11 @@ + (NSArray *)defaultServerList
     return _defaultServerList;
 }
 
-+ (NSArray *)serverListFromJSONData:(NSData*)jsonData {
++ (nullable NSArray<OTRXMPPServerInfo*> *)serverListFromJSONData:(NSData*)jsonData {
+    return [self serverListFromJSONData:jsonData filterRequiresCaptcha:YES];
+}
+
++ (nullable NSArray<OTRXMPPServerInfo*> *)serverListFromJSONData:(NSData*)jsonData filterRequiresCaptcha:(BOOL)filterRequiresCaptcha {
     NSParameterAssert(jsonData != nil);
     NSError *error = nil;
     NSDictionary *root = [NSJSONSerialization JSONObjectWithData:jsonData options:0 error:&error];
@@ -128,6 +162,10 @@ + (NSArray *)serverListFromJSONData:(NSData*)jsonData {
         NSLog(@"Error parsing server list JSON: %@", error);
         return nil;
     }
+    NSPredicate *predicate = [NSPredicate predicateWithBlock:^BOOL(OTRXMPPServerInfo *evaluatedObject, NSDictionary<NSString *,id> * _Nullable bindings) {
+        return evaluatedObject.requiresCaptcha != filterRequiresCaptcha;
+    }];
+    servers = [servers filteredArrayUsingPredicate:predicate];
     return servers;
 }
 

ChatSecure/Classes/Views/Cells/XMPPServerInfoCell.m

@@ -59,7 +59,8 @@ - (void) setServerInfo:(OTRXMPPServerInfo*)serverInfo parentViewController:(UIVi
         [serverInfo.privacyPolicyURL  promptToShowURLFromViewController:parentViewController sender:sender];
     }];
     [self setOnionAction:^(XMPPServerInfoCell * _Nonnull cell, id _Nonnull sender) {
-        // TODO: show Tor info
+        NSURL *url = [NSURL URLWithString:@"https://en.wikipedia.org/wiki/.onion"];
+        [url promptToShowURLFromViewController:parentViewController sender:sender];
     }];
     [self setTwitterAction:^(XMPPServerInfoCell * _Nonnull cell, id _Nonnull sender) {
         [serverInfo.twitterURL promptToShowURLFromViewController:parentViewController sender:sender];

OTRResources/Images/OTRCountryImages.xcassets/BE.imageset/BE.png

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "BE.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

OTRResources/Images/OTRCountryImages.xcassets/BE.imageset/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

OTRResources/Images/OTRCountryImages.xcassets/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "DE.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

OTRResources/Images/OTRCountryImages.xcassets/DE.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "FR.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}