Matrix/element-ios
Matrix/element-ios
1
0
Fork 0
mirror of https://github.com/vector-im/element-ios.git synced 2024-09-29 07:42:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

Room creation: Fix Alias and Participants handling in Home screen

Browse source
This commit is contained in:
giomfo 2014-11-28 11:52:58 +01:00
parent 45a4c11eb9
commit 26ca6fa6b1
2 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
matrixConsole/ViewController/HomeViewController.m
View file

@ -187,7 +187,7 @@
- (void)textFieldDidEndEditing:(UITextField *)textField {
if (textField == _roomAliasTextField) {
// Compute the new phone number with this string change
// Compute the new alias with this string change
NSString * alias = textField.text;
if (alias.length) {
// add homeserver as suffix
@ -213,7 +213,9 @@
participants = [participants stringByAppendingString:@" @"];
} else if ([string isEqualToString:@":"]) {
// Add homeserver
participants = [participants stringByAppendingString:[MatrixHandler sharedHandler].homeServer];
if ([MatrixHandler sharedHandler].homeServer) {
participants = [participants stringByAppendingString:[MatrixHandler sharedHandler].homeServer];
}
}
textField.text = participants;

8
matrixConsole/ViewController/LoginViewController.m
View file

@ -203,7 +203,13 @@ NSString* const defaultHomeserver = @"http://matrix.org";
// Report credentials
[matrix setUserId:credentials.userId];
[matrix setAccessToken:credentials.accessToken];
[matrix setHomeServer:credentials.homeServer];
// Extract homeServer name from userId
NSArray *components = [credentials.userId componentsSeparatedByString:@":"];
if (components.count == 2) {
[matrix setHomeServer:[components lastObject]];
} else {
NSLog(@"Unexpected error: the userId is not correctly formatted: %@", credentials.userId);
}
[self dismissViewControllerAnimated:YES completion:nil];
}