|
|
|
|
@ -124,15 +124,55 @@ final class JoinOpenGroupVC : BaseVC, UIPageViewControllerDataSource, UIPageView
|
|
|
|
|
joinOpenGroup(with: string)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
fileprivate func joinOpenGroup(with url: String) {
|
|
|
|
|
|
|
|
|
|
// TODO: V1 open groups
|
|
|
|
|
fileprivate func joinOpenGroup(with string: String) {
|
|
|
|
|
// A V1 open group URL will look like: https:// + <host>
|
|
|
|
|
// A V2 open group URL will look like: <optional scheme> + <host> + <optional port> + <room> + <public key>
|
|
|
|
|
// The host doesn't parse if no explicit scheme is provided
|
|
|
|
|
if let url = URL(string: string), let host = url.host ?? given(string.split(separator: "/").first, { String($0) }) {
|
|
|
|
|
if let query = url.query {
|
|
|
|
|
// Inputs that should work:
|
|
|
|
|
// https://sessionopengroup.co/main?public_key=658d29b91892a2389505596b135e76a53db6e11d613a51dbd3d0816adffb231c
|
|
|
|
|
// http://sessionopengroup.co/main?public_key=658d29b91892a2389505596b135e76a53db6e11d613a51dbd3d0816adffb231c
|
|
|
|
|
// sessionopengroup.co/main?public_key=658d29b91892a2389505596b135e76a53db6e11d613a51dbd3d0816adffb231c (does NOT go to HTTPS)
|
|
|
|
|
// https://143.198.213.225:443/main?public_key=658d29b91892a2389505596b135e76a53db6e11d613a51dbd3d0816adffb231c
|
|
|
|
|
// 143.198.213.255:80/main?public_key=658d29b91892a2389505596b135e76a53db6e11d613a51dbd3d0816adffb231c
|
|
|
|
|
let useTLS = (url.scheme == "https")
|
|
|
|
|
let room = String(url.path.dropFirst()) // Drop the leading slash
|
|
|
|
|
let queryParts = query.split(separator: "=")
|
|
|
|
|
guard !room.isEmpty && !room.contains("/"), queryParts.count == 2, queryParts[0] == "public_key" else {
|
|
|
|
|
let title = NSLocalizedString("invalid_url", comment: "")
|
|
|
|
|
let message = "Please check the URL you entered and try again."
|
|
|
|
|
return showError(title: title, message: message)
|
|
|
|
|
}
|
|
|
|
|
let publicKey = String(queryParts[1])
|
|
|
|
|
guard publicKey.count == 64 && Hex.isValid(publicKey) else {
|
|
|
|
|
let title = NSLocalizedString("invalid_url", comment: "")
|
|
|
|
|
let message = "Please check the URL you entered and try again."
|
|
|
|
|
return showError(title: title, message: message)
|
|
|
|
|
}
|
|
|
|
|
var server = (useTLS ? "https://" : "http://") + host
|
|
|
|
|
if let port = url.port { server += ":\(port)" }
|
|
|
|
|
joinV2OpenGroup(room: room, server: server, publicKey: publicKey)
|
|
|
|
|
} else {
|
|
|
|
|
// Inputs that should work:
|
|
|
|
|
// loki.opensession.id
|
|
|
|
|
// https://loki.opensession.id
|
|
|
|
|
// http://loki.opensession.id (still goes to HTTPS)
|
|
|
|
|
joinV1OpenGroup("https://" + host)
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
let title = NSLocalizedString("invalid_url", comment: "")
|
|
|
|
|
let message = "Please check the URL you entered and try again."
|
|
|
|
|
showError(title: title, message: message)
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
private func joinV1OpenGroup(_ string: String) {
|
|
|
|
|
guard !isJoining else { return }
|
|
|
|
|
isJoining = true
|
|
|
|
|
ModalActivityIndicatorViewController.present(fromViewController: navigationController!, canCancel: false) { [weak self] _ in
|
|
|
|
|
Storage.shared.write { transaction in
|
|
|
|
|
OpenGroupManagerV2.shared.add(room: "main", server: "https://sessionopengroup.com", publicKey: "658d29b91892a2389505596b135e76a53db6e11d613a51dbd3d0816adffb231b", using: transaction)
|
|
|
|
|
OpenGroupManager.shared.add(with: string, using: transaction)
|
|
|
|
|
.done(on: DispatchQueue.main) { [weak self] _ in
|
|
|
|
|
self?.presentingViewController!.dismiss(animated: true, completion: nil)
|
|
|
|
|
let appDelegate = UIApplication.shared.delegate as! AppDelegate
|
|
|
|
|
@ -140,8 +180,12 @@ final class JoinOpenGroupVC : BaseVC, UIPageViewControllerDataSource, UIPageView
|
|
|
|
|
}
|
|
|
|
|
.catch(on: DispatchQueue.main) { [weak self] error in
|
|
|
|
|
self?.dismiss(animated: true, completion: nil) // Dismiss the loader
|
|
|
|
|
let title = "Couldn't Join"
|
|
|
|
|
let message = error.localizedDescription
|
|
|
|
|
var title = "Couldn't Join"
|
|
|
|
|
var message = ""
|
|
|
|
|
if case OnionRequestAPI.Error.httpRequestFailedAtDestination(let statusCode, _) = error, statusCode == 401 || statusCode == 403 {
|
|
|
|
|
title = "Unauthorized"
|
|
|
|
|
message = "Please ask the open group operator to add you to the group."
|
|
|
|
|
}
|
|
|
|
|
self?.isJoining = false
|
|
|
|
|
self?.showError(title: title, message: message)
|
|
|
|
|
}
|
|
|
|
|
@ -149,7 +193,7 @@ final class JoinOpenGroupVC : BaseVC, UIPageViewControllerDataSource, UIPageView
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
fileprivate func join(_ room: String, on server: String, with publicKey: String) {
|
|
|
|
|
fileprivate func joinV2OpenGroup(room: String, server: String, publicKey: String) {
|
|
|
|
|
guard !isJoining else { return }
|
|
|
|
|
isJoining = true
|
|
|
|
|
ModalActivityIndicatorViewController.present(fromViewController: navigationController!, canCancel: false) { [weak self] _ in
|
|
|
|
|
@ -187,6 +231,7 @@ private final class EnterURLVC : UIViewController, UIGestureRecognizerDelegate,
|
|
|
|
|
let result = TextField(placeholder: NSLocalizedString("vc_enter_chat_url_text_field_hint", comment: ""))
|
|
|
|
|
result.keyboardType = .URL
|
|
|
|
|
result.autocapitalizationType = .none
|
|
|
|
|
result.autocorrectionType = .no
|
|
|
|
|
return result
|
|
|
|
|
}()
|
|
|
|
|
|
|
|
|
|
@ -251,7 +296,7 @@ private final class EnterURLVC : UIViewController, UIGestureRecognizerDelegate,
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
func join(_ room: OpenGroupAPIV2.Info) {
|
|
|
|
|
joinOpenGroupVC.join(room.id, on: OpenGroupAPIV2.defaultServer, with: OpenGroupAPIV2.defaultServerPublicKey)
|
|
|
|
|
joinOpenGroupVC.joinV2OpenGroup(room: room.id, server: OpenGroupAPIV2.defaultServer, publicKey: OpenGroupAPIV2.defaultServerPublicKey)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@objc private func joinOpenGroup() {
|
|
|
|
|
|
Niels Andriesse
4 years ago