Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
jurajhilje committed Jun 4, 2024
2 parents b8420ba + 40a488b commit 55b4ef5
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 8 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

All notable changes to this project will be documented in this file.

## 2.12.3 - 2024-06-04

[IMPROVED] Post-Quantum library updated to the latest version

## 2.12.2 - 2024-04-24

[IMPROVED] Support for pending payments
Expand Down
2 changes: 1 addition & 1 deletion IVPNClient/Config/servers.json

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion IVPNClient/Managers/AppKeyManager.swift
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,8 @@ class AppKeyManager {
var interface = Interface()
interface.privateKey = Interface.generatePrivateKey()
var params = ApiService.authParams + [
URLQueryItem(name: "public_key", value: interface.publicKey ?? "")
URLQueryItem(name: "public_key", value: interface.publicKey ?? ""),
URLQueryItem(name: "kem_library_version", value: "0.10.0")
]

var kem = KEM()
Expand Down
5 changes: 4 additions & 1 deletion IVPNClient/Managers/SessionManager.swift
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,10 @@ class SessionManager {

private func sessionNewParams(force: Bool = false, username: String? = nil, confirmation: String? = nil, captcha: String? = nil, captchaId: String? = nil, kem: KEM) -> [URLQueryItem] {
let username = username ?? Application.shared.authentication.getStoredUsername()
var params = [URLQueryItem(name: "username", value: username)]
var params = [
URLQueryItem(name: "username", value: username),
URLQueryItem(name: "kem_library_version", value: "0.10.0")
]

if let wgPublicKey = KeyChain.wgPublicKey {
params.append(URLQueryItem(name: "wg_public_key", value: wgPublicKey))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@ extension ControlPanelViewController {
showActionSheet(title: message, actions: [
"Log out from all devices",
"Visit Device Management",
"Retry",
"Retry"
], cancelAction: "Cancel login", sourceView: self.controlPanelView.connectSwitch) { [self] index in
switch index {
case 0:
Expand All @@ -295,7 +295,7 @@ extension ControlPanelViewController {
showActionSheet(title: message, actions: [
"Log out from all devices",
"Enable Device Management",
"Retry",
"Retry"
], cancelAction: "Cancel login", sourceView: self.controlPanelView.connectSwitch) { [self] index in
switch index {
case 0:
Expand Down
4 changes: 2 additions & 2 deletions IVPNClient/Scenes/Signup/LoginViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -433,7 +433,7 @@ extension LoginViewController {
showActionSheet(title: message, actions: [
"Log out from all devices",
"Visit Device Management",
"Retry",
"Retry"
], cancelAction: "Cancel login", sourceView: self.userName, permittedArrowDirections: [.up]) { [self] index in
switch index {
case 0:
Expand All @@ -455,7 +455,7 @@ extension LoginViewController {
showActionSheet(title: message, actions: [
"Log out from all devices",
"Enable Device Management",
"Retry",
"Retry"
], cancelAction: "Cancel login", sourceView: self.userName, permittedArrowDirections: [.up]) { [self] index in
switch index {
case 0:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ extension NetworkProtectionViewController {
}

override func tableView(_ tableView: UITableView, trailingSwipeActionsConfigurationForRowAt indexPath: IndexPath) -> UISwipeActionsConfiguration? {
let contextItem = UIContextualAction(style: .destructive, title: "Remove") { (contextualAction, view, boolValue) in
let contextItem = UIContextualAction(style: .destructive, title: "Remove") { (_, _, _) in
self.removeNetwork(indexPath: indexPath)
}
let swipeActions = UISwipeActionsConfiguration(actions: [contextItem])
Expand Down

0 comments on commit 55b4ef5

Please sign in to comment.