From 3e5d9bc66b152cfd9d8bcc91452fc072c2d286e5 Mon Sep 17 00:00:00 2001 From: Ryan ZHAO Date: Fri, 7 Feb 2020 16:57:50 +1100 Subject: [PATCH 1/2] enable user to join a public chat without entering "https://" --- Signal/src/Loki/View Controllers/JoinPublicChatVC.swift | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Signal/src/Loki/View Controllers/JoinPublicChatVC.swift b/Signal/src/Loki/View Controllers/JoinPublicChatVC.swift index 06974302c..34f239b8e 100644 --- a/Signal/src/Loki/View Controllers/JoinPublicChatVC.swift +++ b/Signal/src/Loki/View Controllers/JoinPublicChatVC.swift @@ -258,7 +258,10 @@ private final class EnterChatURLVC : UIViewController { // MARK: Interaction @objc private func joinPublicChatIfPossible() { - let chatURL = chatURLTextField.text?.trimmingCharacters(in: .whitespaces) ?? "" + var chatURL = chatURLTextField.text?.trimmingCharacters(in: .whitespaces) ?? "" + if !chatURL.starts(with: "http") { + chatURL = "https://" + chatURL + } joinPublicChatVC.joinPublicChatIfPossible(with: chatURL) } } From c9999e7d844665b3ee93c3f8dd34507276621cb7 Mon Sep 17 00:00:00 2001 From: Ryan ZHAO Date: Mon, 10 Feb 2020 09:28:24 +1100 Subject: [PATCH 2/2] make it case insensitive --- Signal/src/Loki/View Controllers/JoinPublicChatVC.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Signal/src/Loki/View Controllers/JoinPublicChatVC.swift b/Signal/src/Loki/View Controllers/JoinPublicChatVC.swift index 34f239b8e..6c8801304 100644 --- a/Signal/src/Loki/View Controllers/JoinPublicChatVC.swift +++ b/Signal/src/Loki/View Controllers/JoinPublicChatVC.swift @@ -259,7 +259,7 @@ private final class EnterChatURLVC : UIViewController { // MARK: Interaction @objc private func joinPublicChatIfPossible() { var chatURL = chatURLTextField.text?.trimmingCharacters(in: .whitespaces) ?? "" - if !chatURL.starts(with: "http") { + if !chatURL.lowercased().starts(with: "http") { chatURL = "https://" + chatURL } joinPublicChatVC.joinPublicChatIfPossible(with: chatURL)