Merge pull request #1199 from ChatSecure/remove-server-list

Remove outdated server list for new signups

Author: chrisballinger

ChatSecureCore/Classes/View Controllers/Login View Controllers/OTRBaseLoginViewController.m

@@ -189,11 +189,10 @@ - (void) updateUsernameRow {
     if (!usernameRow) {
         return;
     }
-    XLFormRowDescriptor *serverRow = [self.form formRowWithTag:kOTRXLFormXMPPServerTag];
+    XLFormRowDescriptor *serverRow = [self.form formRowWithTag:kOTRXLFormXMPPServerDomainTag];
     NSString *domain = nil;
     if (serverRow) {
-        OTRXMPPServerInfo *serverInfo = serverRow.value;
-        domain = serverInfo.domain;
+        domain = serverRow.value;
         usernameRow.value = domain;
     } else {
         usernameRow.value = self.account.username;
@@ -238,7 +237,7 @@ - (void)tableView:(UITableView *)tableView accessoryButtonTappedForRowWithIndexP
 -(void)formRowDescriptorValueHasChanged:(XLFormRowDescriptor *)formRow oldValue:(id)oldValue newValue:(id)newValue
 {
     [super formRowDescriptorValueHasChanged:formRow oldValue:oldValue newValue:newValue];
-    if (formRow.tag == kOTRXLFormXMPPServerTag) {
+    if (formRow.tag == kOTRXLFormXMPPServerDomainTag) {
         [self updateUsernameRow];
     }
 }

ChatSecureCore/Classes/View Controllers/Login View Controllers/OTRXLFormCreator.m

@@ -27,7 +27,7 @@
 NSString *const kOTRXLFormHostnameTextFieldTag        = @"kOTRXLFormHostnameTextFieldTag";
 NSString *const kOTRXLFormPortTextFieldTag            = @"kOTRXLFormPortTextFieldTag";
 NSString *const kOTRXLFormResourceTextFieldTag        = @"kOTRXLFormResourceTextFieldTag";
-NSString *const kOTRXLFormXMPPServerTag               = @"kOTRXLFormXMPPServerTag";
+NSString *const kOTRXLFormXMPPServerDomainTag               = @"kOTRXLFormXMPPServerDomainTag";
 
 NSString *const kOTRXLFormShowAdvancedTag               = @"kOTRXLFormShowAdvancedTag";
 
@@ -124,7 +124,7 @@ + (XLFormDescriptor *)formForAccountType:(OTRAccountType)accountType createAccou
         }
 
         serverSection.footerTitle = Server_String_Hint();
-        [serverSection addFormRow:[self serverRowDescriptorWithValue:nil]];
+        [serverSection addFormRow:[self serverRowDescriptor]];
 
         XLFormSectionDescriptor *torSection = [XLFormSectionDescriptor formSectionWithTitle:@"Tor"];
         torSection.footerTitle = TOR_WARNING_MESSAGE_STRING();
@@ -285,16 +285,13 @@ + (XLFormRowDescriptor *)resourceRowDescriptorWithValue:(NSString *)value
     return resourceRowDescriptor;
 }
 
-+ (XLFormRowDescriptor *)serverRowDescriptorWithValue:(OTRXMPPServerInfo *)value
++ (XLFormRowDescriptor *)serverRowDescriptor
 {
-    XLFormRowDescriptor *xmppServerDescriptor = [XLFormRowDescriptor formRowDescriptorWithTag:kOTRXLFormXMPPServerTag rowType:kOTRFormRowDescriptorTypeXMPPServer];
-    if (!value) {
-        value = [[OTRXMPPServerInfo defaultServerList] firstObject];
-    }
-    xmppServerDescriptor.value = value;
-    xmppServerDescriptor.action.viewControllerClass = [OTRXMPPServerListViewController class];
+    XLFormRowDescriptor *serverRowDescriptor = [XLFormRowDescriptor formRowDescriptorWithTag:kOTRXLFormXMPPServerDomainTag rowType:XLFormRowDescriptorTypeURL title:CUSTOM_STRING()];
+    serverRowDescriptor.required = YES;
+    [serverRowDescriptor.cellConfigAtConfigure setObject:@"example.com" forKey:@"textField.placeholder"];
 
-    return xmppServerDescriptor;
+    return serverRowDescriptor;
 }
 
 

ChatSecureCore/Classes/View Controllers/Login View Controllers/OTRXMPPCreateAccountHandler.m

@@ -26,7 +26,7 @@ @implementation OTRXMPPCreateAccountHandler
 - (OTRXMPPAccount *)moveValues:(XLFormDescriptor *)form intoAccount:(OTRXMPPAccount *)account
 {
     account = (OTRXMPPAccount *)[super moveValues:form intoAccount:account];
-    OTRXMPPServerInfo *serverInfo = [[form formRowWithTag:kOTRXLFormXMPPServerTag] value];
+    NSString *serverDomain = [[form formRowWithTag:kOTRXLFormXMPPServerDomainTag] value];
 
     NSString *username = nil;
     if ([account.username containsString:@"@"]) {
@@ -35,11 +35,9 @@ - (OTRXMPPAccount *)moveValues:(XLFormDescriptor *)form intoAccount:(OTRXMPPAcco
     } else {
         username = account.username;
     }
-    
-    NSString *domain = serverInfo.domain;
-    
+        
     //Create valid 'username' which is a bare jid ([email protected])
-    XMPPJID *jid = [XMPPJID jidWithUser:username domain:domain resource:nil];
+    XMPPJID *jid = [XMPPJID jidWithUser:username domain:serverDomain resource:nil];
 
     if (jid) {
         account.username = [jid bare];

ChatSecureCore/Classes/View Controllers/Login View Controllers/OTRXMPPLoginHandler.m

@@ -125,10 +125,9 @@ - (OTRXMPPAccount *)moveValues:(XLFormDescriptor *)form intoAccount:(OTRXMPPAcco
     NSString *resource = [[form formRowWithTag:kOTRXLFormResourceTextFieldTag] value];
 
     if (![hostname length]) {
-        XLFormRowDescriptor *serverRow = [form formRowWithTag:kOTRXLFormXMPPServerTag];
+        XLFormRowDescriptor *serverRow = [form formRowWithTag:kOTRXLFormXMPPServerDomainTag];
         if (serverRow) {
-            OTRXMPPServerInfo *serverInfo = serverRow.value;
-            hostname = serverInfo.domain;
+            hostname = serverRow.value;
         }
     }
     account.domain = hostname;
@@ -161,18 +160,6 @@ - (OTRXMPPAccount *)moveValues:(XLFormDescriptor *)form intoAccount:(OTRXMPPAcco
     account.resource = jid.resource;
     account.displayName = nickname;
 
-    // Use server's .onion if possible, else use FQDN
-    if (account.accountType == OTRAccountTypeXMPPTor) {
-        OTRXMPPServerInfo *serverInfo = [[form formRowWithTag:kOTRXLFormXMPPServerTag] value];
-        OTRXMPPTorAccount *torAccount = (OTRXMPPTorAccount*)account;
-        torAccount.onion = serverInfo.onion;
-        if (torAccount.onion.length) {
-            torAccount.domain = torAccount.onion;
-        } else if (serverInfo.server.length) {
-            torAccount.domain = serverInfo.server;
-        }
-    }
-    
     // Start generating our OTR key here so it's ready when we need it
 
     [OTRProtocolManager.encryptionManager.otrKit generatePrivateKeyForAccountName:account.username protocol:kOTRProtocolTypeXMPP completion:^(OTRFingerprint *fingerprint, NSError *error) {

ChatSecureCore/Public/OTRXLFormCreator.h

@@ -20,7 +20,7 @@ extern NSString *const kOTRXLFormLoginAutomaticallySwitchTag;
 extern NSString *const kOTRXLFormHostnameTextFieldTag;
 extern NSString *const kOTRXLFormPortTextFieldTag;
 extern NSString *const kOTRXLFormResourceTextFieldTag;
-extern NSString *const kOTRXLFormXMPPServerTag;
+extern NSString *const kOTRXLFormXMPPServerDomainTag;
 extern NSString *const kOTRXLFormUseTorTag;
 extern NSString *const kOTRXLFormAutomaticURLFetchTag;