inex/famedlysdk
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'soru/remove-trailing-slash' into 'master'

Browse source 
Remove trailing slash in checkServer

Closes ChristianPauly/fluffychat-flutter#130

See merge request famedly/famedlysdk!400
This commit is contained in:
Christian Pauly 2020-07-27 07:40:25 +00:00
parent 1cd430ab3b 6696a8b3ca
commit a28ab5fc60
1 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
lib/src/client.dart
View file

@ -247,7 +247,19 @@ class Client {
/// Throws FormatException, TimeoutException and MatrixException on error. /// Throws FormatException, TimeoutException and MatrixException on error.
Future<bool> checkServer(dynamic serverUrl) async { Future<bool> checkServer(dynamic serverUrl) async {
try { try {
api.homeserver = (serverUrl is Uri) ? serverUrl : Uri.parse(serverUrl); if (serverUrl is Uri) {
api.homeserver = serverUrl;
} else {
// URLs allow to have whitespace surrounding them, see https://www.w3.org/TR/2011/WD-html5-20110525/urls.html
// As we want to strip a trailing slash, though, we have to trim the url ourself
// and thus can't let Uri.parse() deal with it.
serverUrl = serverUrl.trim();
// strip a trailing slash
if (serverUrl.endsWith('/')) {
serverUrl = serverUrl.substring(0, serverUrl.length - 1);
}
api.homeserver = Uri.parse(serverUrl);
}
final versions = await api.requestSupportedVersions(); final versions = await api.requestSupportedVersions();
for (var i = 0; i < versions.versions.length; i++) { for (var i = 0; i < versions.versions.length; i++) {