diff options
| author | Mikkel Krautz <mikkel@krautz.dk> | 2017-09-03 19:12:18 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-03 19:12:18 +0300 |
| commit | 877e4c6836250fa6c4fdafbd74557d02df2484d7 (patch) | |
| tree | d30ee87d7bbfcd284ddcf06221ef23e518d572c8 | |
| parent | d42c780e56137d3781f8ea904a37a05d85b0d743 (diff) | |
| parent | 4443337f383152b7234920ada5728e4a0c11eb42 (diff) | |
Merge PR #56: MKServices: use HTTPS for publist service.
| -rw-r--r-- | src/MKServices.m | 9 | ||||
| -rw-r--r-- | src/MumbleKit/MKServices.h | 2 |
2 files changed, 5 insertions, 6 deletions
diff --git a/src/MKServices.m b/src/MKServices.m index 9bec157..8cb6ce0 100644 --- a/src/MKServices.m +++ b/src/MKServices.m @@ -7,10 +7,7 @@ @implementation MKServices + (NSString *) regionalServicesHost { - NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults]; - NSArray *languages = [defaults objectForKey:@"AppleLanguages"]; - NSString *locale = [languages objectAtIndex:0]; - return [NSString stringWithFormat:@"http://%@.mumble.info", locale]; + return nil; } /* @@ -18,11 +15,11 @@ */ + (NSString *) regionalServerList { - return [NSString stringWithFormat:@"%@/list2.cgi", [MKServices regionalServicesHost]]; + return @"https://publist.mumble.info/v1/list"; } + (NSURL *) regionalServerListURL { - return [NSURL URLWithString:[MKServices regionalServerList]]; + return [NSURL URLWithString:[MKServices regionalServerList]]; } @end diff --git a/src/MumbleKit/MKServices.h b/src/MumbleKit/MKServices.h index d5d4526..b9e319f 100644 --- a/src/MumbleKit/MKServices.h +++ b/src/MumbleKit/MKServices.h @@ -9,6 +9,8 @@ @interface MKServices : NSObject /// Get the hostname of the closest regional services host. +/// +/// Note: This method is deprecated and always returns nil. + (NSString *) regionalServicesHost; /// Get the URL of the server list on a server near the client's current location. |