From fdff771e260de20c9bb4f6b3c8a3caeaab18a68b Mon Sep 17 00:00:00 2001 From: Juraj Hilje Date: Tue, 3 Mar 2020 08:45:37 +0100 Subject: [PATCH 1/2] fix(settings): fix sendLogs method in SettingsViewController --- IVPNClient/Config/servers.json | 2 +- IVPNClient/Scenes/ViewControllers/SettingsViewController.swift | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/IVPNClient/Config/servers.json b/IVPNClient/Config/servers.json index 3803d90be..896bd98be 100644 --- a/IVPNClient/Config/servers.json +++ b/IVPNClient/Config/servers.json @@ -1 +1 @@ -{"wireguard":[{"gateway":"us-tx.wg.ivpn.net","country_code":"US","country":"United States","city":"Dallas, TX","hosts":[{"hostname":"us-tx1.wg.ivpn.net","host":"198.55.124.114","public_key":"JPT1veXLmasj2uQDstX24mpR7VWD+GmV8JDkidkz91Q=","local_ip":"172.16.0.1/12"}]},{"gateway":"nl.wg.ivpn.net","country_code":"NL","country":"Netherlands","city":"Amsterdam","hosts":[{"hostname":"nl1.wg.ivpn.net","host":"185.102.218.104","public_key":"AsMT2FqpkZbjzWeDch6GwufF5odl259W/hIkGytVfWo=","local_ip":"172.16.0.1/12"}]},{"gateway":"de.wg.ivpn.net","country_code":"DE","country":"Germany","city":"Frankfurt","hosts":[{"hostname":"de1.wg.ivpn.net","host":"185.102.219.26","public_key":"mS3/WpXjnMAMmXjSpd4nFzx9HSE3ubv2WyjpyH2REgs=","local_ip":"172.16.0.1/12"}]},{"gateway":"us-il.wg.ivpn.net","country_code":"US","country":"United States","city":"Chicago, IL","hosts":[{"hostname":"us-il1.wg.ivpn.net","host":"89.187.181.197","public_key":"hku9gjamhoii8OvxZgx+TdUDIkOAQYFu39qbav2AyUQ=","local_ip":"172.16.0.1/12"}]},{"gateway":"us-ga.wg.ivpn.net","country_code":"US","country":"United States","city":"Atlanta, GA","hosts":[{"hostname":"us-ga1.wg.ivpn.net","host":"185.93.0.212","public_key":"jD8h+pL5/d6fmYcTzl0lR8AWzQVN5XkwRFSmM/3NcDM=","local_ip":"172.16.0.1/12"}]},{"gateway":"us-ca.wg.ivpn.net","country_code":"US","country":"United States","city":"Los Angeles, CA","hosts":[{"hostname":"us-ca1.wg.ivpn.net","host":"185.180.13.41","public_key":"FGl78s9Ct6xNamQ2/CtAyXwGePrrU0kiZxfM27pm8XA=","local_ip":"172.16.0.1/12"}]},{"gateway":"ca.wg.ivpn.net","country_code":"CA","country":"Canada","city":"Montreal","hosts":[{"hostname":"ca1.wg.ivpn.net","host":"37.120.130.58","public_key":"rg+GGDmjM4Vxo1hURvKmgm9yonb6qcoKbPCP/DNDBnI=","local_ip":"172.16.0.1/12"}]},{"gateway":"us-nj.wg.ivpn.net","country_code":"US","country":"United States","city":"New Jersey, NJ","hosts":[{"hostname":"us-nj1.wg.ivpn.net","host":"194.36.111.50","public_key":"1Te4AfL1yKo2k4jzPALnRPfKE3YSzXKo4XIRHPz5FxI=","local_ip":"172.16.0.1/12"}]},{"gateway":"gb.wg.ivpn.net","country_code":"GB","country":"United Kingdom","city":"London","hosts":[{"hostname":"gb1.wg.ivpn.net","host":"81.92.202.114","public_key":"7+jos+Eg+hMEOQE4Std6OJ+WVnCcmbqS1/EbPwn9w3s=","local_ip":"172.16.0.1/12"}]},{"gateway":"us-ny.wg.ivpn.net","country_code":"US","country":"United States","city":"New York, NY","hosts":[{"hostname":"us-ny1.wg.ivpn.net","host":"91.132.137.170","public_key":"6/tjvgb7HFl7UuvBSegolxa1zKr3iSlDrlCexCmhAGE=","local_ip":"172.16.0.1/12"}]},{"gateway":"se.wg.ivpn.net","country_code":"SE","country":"Sweden","city":"Stockholm","hosts":[{"hostname":"se1.wg.ivpn.net","host":"37.120.153.226","public_key":"2n0nFE1g/+vQr2AOQPm9Igyiy0zh9uTTultvOOSkMRo=","local_ip":"172.16.0.1/12"}]},{"gateway":"sg.wg.ivpn.net","country_code":"SG","country":"Singapore","city":"Singapore","hosts":[{"hostname":"sg1.wg.ivpn.net","host":"37.120.151.122","public_key":"hSg0At4uwuIhmTy5UT4fRbi5AN6JO2ZWTuIvqd4nHCE=","local_ip":"172.16.0.1/12"}]},{"gateway":"ch.wg.ivpn.net","country_code":"CH","country":"Switzerland","city":"Zurich","hosts":[{"hostname":"ch1.wg.ivpn.net","host":"141.255.164.66","public_key":"jVZJ61i1xxkAfriDHpwvF/GDuTvZUqhwoWSjkOJvaUA=","local_ip":"172.16.0.1/12"}]},{"gateway":"it.wg.ivpn.net","country_code":"IT","country":"Italy","city":"Milan","hosts":[{"hostname":"it1.wg.ivpn.net","host":"82.102.21.90","public_key":"Aj6b81yrDk7I913R+fuSW/NAmIl87N73vHgY5/WQY0Q=","local_ip":"172.16.0.1/12"}]}],"openvpn":[{"gateway":"us-ca.gw.ivpn.net","country_code":"US","country":"United States","city":"Los Angeles, CA","ip_addresses":["173.254.196.58","69.12.80.146","209.58.130.196","173.254.204.202"]},{"gateway":"ro.gw.ivpn.net","country_code":"RO","country":"Romania","city":"Bucharest","ip_addresses":["37.120.206.50"]},{"gateway":"de.gw.ivpn.net","country_code":"DE","country":"Germany","city":"Frankfurt","ip_addresses":["178.162.222.40","178.162.211.114"]},{"gateway":"nl.gw.ivpn.net","country_code":"NL","country":"Netherlands","city":"Amsterdam","ip_addresses":["95.211.172.95","95.211.172.68","95.211.187.228","95.211.187.222","95.211.95.22","95.211.172.18"]},{"gateway":"fr.gw.ivpn.net","country_code":"FR","country":"France","city":"Paris","ip_addresses":["185.93.2.167"]},{"gateway":"is.gw.ivpn.net","country_code":"IS","country":"Iceland","city":"Reykjavik","ip_addresses":["82.221.107.178"]},{"gateway":"hk.gw.ivpn.net","country_code":"HK","country":"Hong Kong","city":"Hong Kong","ip_addresses":["119.81.177.3"]},{"gateway":"us-nj.gw.ivpn.net","country_code":"US","country":"United States","city":"New Jersey, NJ","ip_addresses":["209.222.19.250","64.237.40.139","23.226.128.18"]},{"gateway":"us-tx.gw.ivpn.net","country_code":"US","country":"United States","city":"Dallas, TX","ip_addresses":["96.44.189.194","96.44.142.74"]},{"gateway":"gb.gw.ivpn.net","country_code":"GB","country":"United Kingdom","city":"London","ip_addresses":["185.59.221.88","185.59.221.133"]},{"gateway":"us-ut.gw.ivpn.net","country_code":"US","country":"United States","city":"Salt Lake City, UT","ip_addresses":["198.105.216.28"]},{"gateway":"it.gw.ivpn.net","country_code":"IT","country":"Italy","city":"Milan","ip_addresses":["158.58.172.73"]},{"gateway":"se.gw.ivpn.net","country_code":"SE","country":"Sweden","city":"Stockholm","ip_addresses":["80.67.10.138"]},{"gateway":"us-ga.gw.ivpn.net","country_code":"US","country":"United States","city":"Atlanta, GA","ip_addresses":["104.129.24.146","107.150.22.74"]},{"gateway":"us-fl.gw.ivpn.net","country_code":"US","country":"United States","city":"Miami, FL","ip_addresses":["173.44.49.90"]},{"gateway":"ch.gw.ivpn.net","country_code":"CH","country":"Switzerland","city":"Zurich","ip_addresses":["136.0.0.194","141.255.166.194","185.212.170.138"]},{"gateway":"ca.gw.ivpn.net","country_code":"CA","country":"Canada","city":"Toronto","ip_addresses":["172.86.186.170","104.254.90.178"]},{"gateway":"us-dc.gw.ivpn.net","country_code":"US","country":"United States","city":"Washington, DC","ip_addresses":["207.244.108.207"]},{"gateway":"us-ny.gw.ivpn.net","country_code":"US","country":"United States","city":"New York, NY","ip_addresses":["64.120.44.114","173.234.153.130"]},{"gateway":"us-il.gw.ivpn.net","country_code":"US","country":"United States","city":"Chicago, IL","ip_addresses":["107.150.28.82","72.11.137.146"]},{"gateway":"es.gw.ivpn.net","country_code":"ES","country":"Spain","city":"Madrid","ip_addresses":["185.93.3.193"]},{"gateway":"us-wa.gw.ivpn.net","country_code":"US","country":"United States","city":"Seattle, WA","ip_addresses":["23.19.87.209"]},{"gateway":"pl.gw.ivpn.net","country_code":"PL","country":"Poland","city":"Warsaw","ip_addresses":["185.246.208.86"]},{"gateway":"cz.gw.ivpn.net","country_code":"CZ","country":"Czech Republic","city":"Prague","ip_addresses":["195.181.160.167"]},{"gateway":"no.gw.ivpn.net","country_code":"NO","country":"Norway","city":"Oslo","ip_addresses":["194.242.10.150"]},{"gateway":"hu.gw.ivpn.net","country_code":"HU","country":"Hungary","city":"Budapest","ip_addresses":["185.189.114.186"]},{"gateway":"dk.gw.ivpn.net","country_code":"DK","country":"Denmark","city":"Copenhagen","ip_addresses":["185.245.84.226"]},{"gateway":"at.gw.ivpn.net","country_code":"AT","country":"Austria","city":"Vienna","ip_addresses":["185.244.212.66"]},{"gateway":"be.gw.ivpn.net","country_code":"BE","country":"Belgium","city":"Brussels","ip_addresses":["194.187.251.10"]},{"gateway":"bg.gw.ivpn.net","country_code":"BG","country":"Bulgaria","city":"Sofia","ip_addresses":["82.102.23.18"]},{"gateway":"sk.gw.ivpn.net","country_code":"SK","country":"Slovakia","city":"Bratislava","ip_addresses":["185.245.85.250"]},{"gateway":"jp.gw.ivpn.net","country_code":"JP","country":"Japan","city":"Tokyo","ip_addresses":["91.207.174.234"]},{"gateway":"sg.gw.ivpn.net","country_code":"SG","country":"Singapore","city":"Singapore","ip_addresses":["185.128.24.186"]},{"gateway":"ua.gw.ivpn.net","country_code":"UA","country":"Ukraine","city":"Kharkiv","ip_addresses":["193.203.48.54"]},{"gateway":"fi.gw.ivpn.net","country_code":"FI","country":"Finland","city":"Helsinki","ip_addresses":["185.112.82.12"]},{"gateway":"us-az.gw.ivpn.net","country_code":"US","country":"United States","city":"Phoenix, AZ","ip_addresses":["193.37.254.130"]},{"gateway":"us-nv.gw.ivpn.net","country_code":"US","country":"United States","city":"Las Vegas, NV","ip_addresses":["185.242.5.34"]},{"gateway":"au-nsw.gw.ivpn.net","country_code":"AU","country":"Australia","city":"Sydney","ip_addresses":["221.121.158.239"]},{"gateway":"br.gw.ivpn.net","country_code":"BR","country":"Brazil","city":"Franca","ip_addresses":["45.162.229.130"]},{"gateway":"rs.gw.ivpn.net","country_code":"RS","country":"Serbia","city":"Belgrade","ip_addresses":["141.98.103.250"]},{"gateway":"gb-man.gw.ivpn.net","country_code":"GB","country":"United Kingdom","city":"Manchester","ip_addresses":["89.238.141.228"]},{"gateway":"ca-qc.gw.ivpn.net","country_code":"CA","country":"Canada","city":"Montreal","ip_addresses":["87.101.92.26"]},{"gateway":"pt.gw.ivpn.net","country_code":"PT","country":"Portugal","city":"Lisbon","ip_addresses":["94.46.175.112"]},{"gateway":"lu.gw.ivpn.net","country_code":"LU","country":"Luxembourg","city":"Luxemborg","ip_addresses":["92.223.89.53"]},{"gateway":"il.gw.ivpn.net","country_code":"IL","country":"Israel","city":"Holon, Tel Aviv","ip_addresses":["185.191.207.194"]}],"config":{"antitracker":{"default":{"ip":"10.0.254.2","multihop-ip":"10.0.254.102"},"hardcore":{"ip":"10.0.254.3","multihop-ip":"10.0.254.103"}},"api":{"ips":["167.114.18.34","144.217.148.74","192.99.193.251"]}}} +{"wireguard":[{"gateway":"us-tx.wg.ivpn.net","country_code":"US","country":"United States","city":"Dallas, TX","latitude":32.7936,"longitude":-96.7662,"hosts":[{"hostname":"us-tx1.wg.ivpn.net","host":"198.55.124.114","public_key":"JPT1veXLmasj2uQDstX24mpR7VWD+GmV8JDkidkz91Q=","local_ip":"172.16.0.1/12"}]},{"gateway":"nl.wg.ivpn.net","country_code":"NL","country":"Netherlands","city":"Amsterdam","latitude":52.35,"longitude":4.9166,"hosts":[{"hostname":"nl1.wg.ivpn.net","host":"185.102.218.104","public_key":"AsMT2FqpkZbjzWeDch6GwufF5odl259W/hIkGytVfWo=","local_ip":"172.16.0.1/12"}]},{"gateway":"de.wg.ivpn.net","country_code":"DE","country":"Germany","city":"Frankfurt","latitude":50.1,"longitude":8.675,"hosts":[{"hostname":"de1.wg.ivpn.net","host":"185.102.219.26","public_key":"mS3/WpXjnMAMmXjSpd4nFzx9HSE3ubv2WyjpyH2REgs=","local_ip":"172.16.0.1/12"}]},{"gateway":"us-il.wg.ivpn.net","country_code":"US","country":"United States","city":"Chicago, IL","latitude":41.8373,"longitude":-87.6862,"hosts":[{"hostname":"us-il1.wg.ivpn.net","host":"89.187.181.197","public_key":"hku9gjamhoii8OvxZgx+TdUDIkOAQYFu39qbav2AyUQ=","local_ip":"172.16.0.1/12"}]},{"gateway":"us-ga.wg.ivpn.net","country_code":"US","country":"United States","city":"Atlanta, GA","latitude":33.7627,"longitude":-84.4225,"hosts":[{"hostname":"us-ga1.wg.ivpn.net","host":"185.93.0.212","public_key":"jD8h+pL5/d6fmYcTzl0lR8AWzQVN5XkwRFSmM/3NcDM=","local_ip":"172.16.0.1/12"}]},{"gateway":"us-ca.wg.ivpn.net","country_code":"US","country":"United States","city":"Los Angeles, CA","latitude":34.1139,"longitude":-118.4068,"hosts":[{"hostname":"us-ca1.wg.ivpn.net","host":"185.180.13.41","public_key":"FGl78s9Ct6xNamQ2/CtAyXwGePrrU0kiZxfM27pm8XA=","local_ip":"172.16.0.1/12"}]},{"gateway":"ca.wg.ivpn.net","country_code":"CA","country":"Canada","city":"Montreal","latitude":45.5,"longitude":-73.5833,"hosts":[{"hostname":"ca1.wg.ivpn.net","host":"37.120.130.58","public_key":"rg+GGDmjM4Vxo1hURvKmgm9yonb6qcoKbPCP/DNDBnI=","local_ip":"172.16.0.1/12"}]},{"gateway":"us-nj.wg.ivpn.net","country_code":"US","country":"United States","city":"New Jersey, NJ","latitude":40.737764,"longitude":-74.151747,"hosts":[{"hostname":"us-nj1.wg.ivpn.net","host":"194.36.111.50","public_key":"1Te4AfL1yKo2k4jzPALnRPfKE3YSzXKo4XIRHPz5FxI=","local_ip":"172.16.0.1/12"}]},{"gateway":"gb.wg.ivpn.net","country_code":"GB","country":"United Kingdom","city":"London","latitude":51.5,"longitude":-0.1167,"hosts":[{"hostname":"gb1.wg.ivpn.net","host":"81.92.202.114","public_key":"7+jos+Eg+hMEOQE4Std6OJ+WVnCcmbqS1/EbPwn9w3s=","local_ip":"172.16.0.1/12"}]},{"gateway":"us-ny.wg.ivpn.net","country_code":"US","country":"United States","city":"New York, NY","latitude":40.6943,"longitude":-73.9249,"hosts":[{"hostname":"us-ny1.wg.ivpn.net","host":"91.132.137.170","public_key":"6/tjvgb7HFl7UuvBSegolxa1zKr3iSlDrlCexCmhAGE=","local_ip":"172.16.0.1/12"}]},{"gateway":"se.wg.ivpn.net","country_code":"SE","country":"Sweden","city":"Stockholm","latitude":59.3508,"longitude":18.0973,"hosts":[{"hostname":"se1.wg.ivpn.net","host":"37.120.153.226","public_key":"2n0nFE1g/+vQr2AOQPm9Igyiy0zh9uTTultvOOSkMRo=","local_ip":"172.16.0.1/12"}]},{"gateway":"sg.wg.ivpn.net","country_code":"SG","country":"Singapore","city":"Singapore","latitude":1.293,"longitude":103.8558,"hosts":[{"hostname":"sg1.wg.ivpn.net","host":"37.120.151.122","public_key":"hSg0At4uwuIhmTy5UT4fRbi5AN6JO2ZWTuIvqd4nHCE=","local_ip":"172.16.0.1/12"}]},{"gateway":"ch.wg.ivpn.net","country_code":"CH","country":"Switzerland","city":"Zurich","latitude":47.38,"longitude":8.55,"hosts":[{"hostname":"ch1.wg.ivpn.net","host":"141.255.164.66","public_key":"jVZJ61i1xxkAfriDHpwvF/GDuTvZUqhwoWSjkOJvaUA=","local_ip":"172.16.0.1/12"}]},{"gateway":"it.wg.ivpn.net","country_code":"IT","country":"Italy","city":"Milan","latitude":45.47,"longitude":9.205,"hosts":[{"hostname":"it1.wg.ivpn.net","host":"82.102.21.90","public_key":"Aj6b81yrDk7I913R+fuSW/NAmIl87N73vHgY5/WQY0Q=","local_ip":"172.16.0.1/12"}]}],"openvpn":[{"gateway":"us-ca.gw.ivpn.net","country_code":"US","country":"United States","city":"Los Angeles, CA","latitude":34.1139,"longitude":-118.4068,"ip_addresses":["173.254.196.58","69.12.80.146","209.58.130.196","173.254.204.202"]},{"gateway":"ro.gw.ivpn.net","country_code":"RO","country":"Romania","city":"Bucharest","latitude":44.4334,"longitude":26.0999,"ip_addresses":["37.120.206.50"]},{"gateway":"de.gw.ivpn.net","country_code":"DE","country":"Germany","city":"Frankfurt","latitude":50.1,"longitude":8.675,"ip_addresses":["178.162.222.40","178.162.211.114"]},{"gateway":"nl.gw.ivpn.net","country_code":"NL","country":"Netherlands","city":"Amsterdam","latitude":52.35,"longitude":4.9166,"ip_addresses":["95.211.172.95","95.211.172.68","95.211.187.228","95.211.187.222","95.211.95.22","95.211.172.18"]},{"gateway":"fr.gw.ivpn.net","country_code":"FR","country":"France","city":"Paris","latitude":48.8667,"longitude":2.3333,"ip_addresses":["185.93.2.167"]},{"gateway":"is.gw.ivpn.net","country_code":"IS","country":"Iceland","city":"Reykjavik","latitude":64.15,"longitude":-21.95,"ip_addresses":["82.221.107.178"]},{"gateway":"hk.gw.ivpn.net","country_code":"HK","country":"Hong Kong","city":"Hong Kong","latitude":22.305,"longitude":114.185,"ip_addresses":["209.58.189.163"]},{"gateway":"us-nj.gw.ivpn.net","country_code":"US","country":"United States","city":"New Jersey, NJ","latitude":40.737764,"longitude":-74.151747,"ip_addresses":["209.222.19.250","64.237.40.139","23.226.128.18"]},{"gateway":"us-tx.gw.ivpn.net","country_code":"US","country":"United States","city":"Dallas, TX","latitude":32.7936,"longitude":-96.7662,"ip_addresses":["96.44.189.194","96.44.142.74"]},{"gateway":"gb.gw.ivpn.net","country_code":"GB","country":"United Kingdom","city":"London","latitude":51.5,"longitude":-0.1167,"ip_addresses":["185.59.221.88","185.59.221.133"]},{"gateway":"us-ut.gw.ivpn.net","country_code":"US","country":"United States","city":"Salt Lake City, UT","latitude":40.7774,"longitude":-111.93,"ip_addresses":["198.105.216.28"]},{"gateway":"it.gw.ivpn.net","country_code":"IT","country":"Italy","city":"Milan","latitude":45.47,"longitude":9.205,"ip_addresses":["158.58.172.73"]},{"gateway":"se.gw.ivpn.net","country_code":"SE","country":"Sweden","city":"Stockholm","latitude":59.3508,"longitude":18.0973,"ip_addresses":["80.67.10.138"]},{"gateway":"us-fl.gw.ivpn.net","country_code":"US","country":"United States","city":"Miami, FL","latitude":25.7839,"longitude":-80.2102,"ip_addresses":["173.44.49.90"]},{"gateway":"ch.gw.ivpn.net","country_code":"CH","country":"Switzerland","city":"Zurich","latitude":47.38,"longitude":8.55,"ip_addresses":["136.0.0.194","141.255.166.194","185.212.170.138"]},{"gateway":"ca.gw.ivpn.net","country_code":"CA","country":"Canada","city":"Toronto","latitude":43.7,"longitude":-79.42,"ip_addresses":["172.86.186.170","104.254.90.178"]},{"gateway":"us-dc.gw.ivpn.net","country_code":"US","country":"United States","city":"Washington, DC","latitude":38.9047,"longitude":-77.0163,"ip_addresses":["207.244.108.207"]},{"gateway":"us-ny.gw.ivpn.net","country_code":"US","country":"United States","city":"New York, NY","latitude":40.6943,"longitude":-73.9249,"ip_addresses":["64.120.44.114","173.234.153.130"]},{"gateway":"us-il.gw.ivpn.net","country_code":"US","country":"United States","city":"Chicago, IL","latitude":41.8373,"longitude":-87.6862,"ip_addresses":["107.150.28.82","72.11.137.146"]},{"gateway":"es.gw.ivpn.net","country_code":"ES","country":"Spain","city":"Madrid","latitude":40.4,"longitude":-3.6834,"ip_addresses":["185.93.3.193"]},{"gateway":"us-wa.gw.ivpn.net","country_code":"US","country":"United States","city":"Seattle, WA","latitude":47.6211,"longitude":-122.3244,"ip_addresses":["23.19.87.209"]},{"gateway":"pl.gw.ivpn.net","country_code":"PL","country":"Poland","city":"Warsaw","latitude":52.25,"longitude":21,"ip_addresses":["185.246.208.86"]},{"gateway":"cz.gw.ivpn.net","country_code":"CZ","country":"Czech Republic","city":"Prague","latitude":50.0833,"longitude":14.466,"ip_addresses":["195.181.160.167"]},{"gateway":"no.gw.ivpn.net","country_code":"NO","country":"Norway","city":"Oslo","latitude":59.9167,"longitude":10.75,"ip_addresses":["194.242.10.150"]},{"gateway":"hu.gw.ivpn.net","country_code":"HU","country":"Hungary","city":"Budapest","latitude":47.5,"longitude":19.0833,"ip_addresses":["185.189.114.186"]},{"gateway":"dk.gw.ivpn.net","country_code":"DK","country":"Denmark","city":"Copenhagen","latitude":55.6786,"longitude":12.5635,"ip_addresses":["185.245.84.226"]},{"gateway":"at.gw.ivpn.net","country_code":"AT","country":"Austria","city":"Vienna","latitude":48.2,"longitude":16.3666,"ip_addresses":["185.244.212.66"]},{"gateway":"be.gw.ivpn.net","country_code":"BE","country":"Belgium","city":"Brussels","latitude":50.8333,"longitude":4.3333,"ip_addresses":["194.187.251.10"]},{"gateway":"bg.gw.ivpn.net","country_code":"BG","country":"Bulgaria","city":"Sofia","latitude":42.6833,"longitude":23.3167,"ip_addresses":["82.102.23.18"]},{"gateway":"sk.gw.ivpn.net","country_code":"SK","country":"Slovakia","city":"Bratislava","latitude":48.15,"longitude":17.117,"ip_addresses":["185.245.85.250"]},{"gateway":"jp.gw.ivpn.net","country_code":"JP","country":"Japan","city":"Tokyo","latitude":35.685,"longitude":139.7514,"ip_addresses":["91.207.174.234"]},{"gateway":"sg.gw.ivpn.net","country_code":"SG","country":"Singapore","city":"Singapore","latitude":1.293,"longitude":103.8558,"ip_addresses":["185.128.24.186"]},{"gateway":"ua.gw.ivpn.net","country_code":"UA","country":"Ukraine","city":"Kharkiv","latitude":50,"longitude":36.25,"ip_addresses":["193.203.48.54"]},{"gateway":"fi.gw.ivpn.net","country_code":"FI","country":"Finland","city":"Helsinki","latitude":60.1756,"longitude":24.9341,"ip_addresses":["185.112.82.12"]},{"gateway":"us-az.gw.ivpn.net","country_code":"US","country":"United States","city":"Phoenix, AZ","latitude":33.5722,"longitude":-112.0891,"ip_addresses":["193.37.254.130"]},{"gateway":"us-nv.gw.ivpn.net","country_code":"US","country":"United States","city":"Las Vegas, NV","latitude":36.2333,"longitude":-115.2654,"ip_addresses":["185.242.5.34"]},{"gateway":"au-nsw.gw.ivpn.net","country_code":"AU","country":"Australia","city":"Sydney","latitude":-33.92,"longitude":151.1852,"ip_addresses":["221.121.158.239"]},{"gateway":"br.gw.ivpn.net","country_code":"BR","country":"Brazil","city":"Franca","latitude":-20.53,"longitude":-47.39,"ip_addresses":["45.162.229.130"]},{"gateway":"rs.gw.ivpn.net","country_code":"RS","country":"Serbia","city":"Belgrade","latitude":44.8186,"longitude":20.468,"ip_addresses":["141.98.103.250"]},{"gateway":"gb-man.gw.ivpn.net","country_code":"GB","country":"United Kingdom","city":"Manchester","latitude":53.5004,"longitude":-2.248,"ip_addresses":["89.238.141.228"]},{"gateway":"ca-qc.gw.ivpn.net","country_code":"CA","country":"Canada","city":"Montreal","latitude":45.5,"longitude":-73.5833,"ip_addresses":["87.101.92.26"]},{"gateway":"pt.gw.ivpn.net","country_code":"PT","country":"Portugal","city":"Lisbon","latitude":38.7227,"longitude":-9.1449,"ip_addresses":["94.46.175.112"]},{"gateway":"lu.gw.ivpn.net","country_code":"LU","country":"Luxembourg","city":"Luxembourg","latitude":49.6117,"longitude":6.13,"ip_addresses":["92.223.89.53"]},{"gateway":"il.gw.ivpn.net","country_code":"IL","country":"Israel","city":"Holon, Tel Aviv","latitude":32.08,"longitude":34.77,"ip_addresses":["185.191.207.194"]}],"config":{"antitracker":{"default":{"ip":"10.0.254.2","multihop-ip":"10.0.254.102"},"hardcore":{"ip":"10.0.254.3","multihop-ip":"10.0.254.103"}},"api":{"ips":["198.50.177.220","198.50.177.222","198.50.177.223"]}}} diff --git a/IVPNClient/Scenes/ViewControllers/SettingsViewController.swift b/IVPNClient/Scenes/ViewControllers/SettingsViewController.swift index dad8ecfd9..fbba55380 100644 --- a/IVPNClient/Scenes/ViewControllers/SettingsViewController.swift +++ b/IVPNClient/Scenes/ViewControllers/SettingsViewController.swift @@ -474,7 +474,7 @@ extension SettingsViewController { } override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) { - if indexPath.section == 2 && indexPath.row == 4 { + if indexPath.section == 2 && indexPath.row == 6 { tableView.deselectRow(at: indexPath, animated: true) sendLogs() } From b7ebc4735689381526cb1cf648b4ee84e26f8fd6 Mon Sep 17 00:00:00 2001 From: Juraj Hilje Date: Tue, 3 Mar 2020 09:13:33 +0100 Subject: [PATCH 2/2] chrore: update app version --- IVPNClient.xcodeproj/project.pbxproj | 48 ++++++++++++++-------------- UITests/Info.plist | 2 +- UnitTests/Info.plist | 2 +- openvpn-tunnel-provider/Info.plist | 2 +- today-extension/Info.plist | 2 +- wireguard-tunnel-provider/Info.plist | 2 +- 6 files changed, 29 insertions(+), 29 deletions(-) diff --git a/IVPNClient.xcodeproj/project.pbxproj b/IVPNClient.xcodeproj/project.pbxproj index b82425d80..d6df6f91e 100644 --- a/IVPNClient.xcodeproj/project.pbxproj +++ b/IVPNClient.xcodeproj/project.pbxproj @@ -2151,13 +2151,13 @@ CODE_SIGN_ENTITLEMENTS = "today-extension/today-extension.entitlements"; CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 25; + CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = WQXXM75BYN; GCC_C_LANGUAGE_STANDARD = gnu11; INFOPLIST_FILE = "today-extension/Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 13.2; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"; - MARKETING_VERSION = 1.18.0; + MARKETING_VERSION = 1.18.1; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = "net.ivpn.clients.ios.today-extension"; @@ -2180,13 +2180,13 @@ CODE_SIGN_ENTITLEMENTS = "today-extension/today-extension.entitlements"; CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 25; + CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = WQXXM75BYN; GCC_C_LANGUAGE_STANDARD = gnu11; INFOPLIST_FILE = "today-extension/Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 13.2; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"; - MARKETING_VERSION = 1.18.0; + MARKETING_VERSION = 1.18.1; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = "net.ivpn.clients.ios.today-extension"; PRODUCT_NAME = IVPN; @@ -2208,13 +2208,13 @@ CODE_SIGN_ENTITLEMENTS = "today-extension/today-extension.entitlements"; CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 25; + CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = WQXXM75BYN; GCC_C_LANGUAGE_STANDARD = gnu11; INFOPLIST_FILE = "today-extension/Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 13.2; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"; - MARKETING_VERSION = 1.18.0; + MARKETING_VERSION = 1.18.1; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = "net.ivpn.clients.ios.today-extension"; PRODUCT_NAME = IVPN; @@ -2236,7 +2236,7 @@ CODE_SIGN_ENTITLEMENTS = "wireguard-tunnel-provider/wireguard_tunnel_provider.entitlements"; CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 25; + CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = WQXXM75BYN; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( @@ -2251,7 +2251,7 @@ "$(inherited)", "$(PROJECT_DIR)/wireguard-go-bridge", ); - MARKETING_VERSION = 1.18.0; + MARKETING_VERSION = 1.18.1; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = "net.ivpn.clients.ios.wireguard-tunnel-provider"; @@ -2274,7 +2274,7 @@ CODE_SIGN_ENTITLEMENTS = "wireguard-tunnel-provider/wireguard_tunnel_provider.entitlements"; CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 25; + CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = WQXXM75BYN; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( @@ -2289,7 +2289,7 @@ "$(inherited)", "$(PROJECT_DIR)/wireguard-go-bridge", ); - MARKETING_VERSION = 1.18.0; + MARKETING_VERSION = 1.18.1; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = "net.ivpn.clients.ios.wireguard-tunnel-provider"; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -2439,7 +2439,7 @@ CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = IVPNClient/IVPNClient.entitlements; CODE_SIGN_IDENTITY = "iPhone Developer"; - CURRENT_PROJECT_VERSION = 25; + CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = WQXXM75BYN; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -2448,7 +2448,7 @@ INFOPLIST_FILE = "$(SRCROOT)/IVPNClient/Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - MARKETING_VERSION = 1.18.0; + MARKETING_VERSION = 1.18.1; OTHER_LDFLAGS = ( "$(inherited)", "-framework", @@ -2511,7 +2511,7 @@ CODE_SIGN_ENTITLEMENTS = "openvpn-tunnel-provider/openvpn_tunnel_provider.entitlements"; CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 25; + CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = WQXXM75BYN; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -2521,7 +2521,7 @@ INFOPLIST_FILE = "openvpn-tunnel-provider/Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"; - MARKETING_VERSION = 1.18.0; + MARKETING_VERSION = 1.18.1; OTHER_SWIFT_FLAGS = "-D DEBUG"; PRODUCT_BUNDLE_IDENTIFIER = "net.ivpn.clients.ios.openvpn-tunnel-provider"; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -2542,7 +2542,7 @@ CODE_SIGN_ENTITLEMENTS = "wireguard-tunnel-provider/wireguard_tunnel_provider.entitlements"; CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 25; + CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = WQXXM75BYN; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( @@ -2557,7 +2557,7 @@ "$(inherited)", "$(PROJECT_DIR)/wireguard-go-bridge", ); - MARKETING_VERSION = 1.18.0; + MARKETING_VERSION = 1.18.1; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = "net.ivpn.clients.ios.wireguard-tunnel-provider"; @@ -2612,7 +2612,7 @@ CODE_SIGN_ENTITLEMENTS = "openvpn-tunnel-provider/openvpn_tunnel_provider.entitlements"; CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 25; + CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = WQXXM75BYN; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -2622,7 +2622,7 @@ INFOPLIST_FILE = "openvpn-tunnel-provider/Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"; - MARKETING_VERSION = 1.18.0; + MARKETING_VERSION = 1.18.1; OTHER_SWIFT_FLAGS = "-D DEBUG"; PRODUCT_BUNDLE_IDENTIFIER = "net.ivpn.clients.ios.openvpn-tunnel-provider"; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -2653,7 +2653,7 @@ CODE_SIGN_ENTITLEMENTS = "openvpn-tunnel-provider/openvpn_tunnel_provider.entitlements"; CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 25; + CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = WQXXM75BYN; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -2663,7 +2663,7 @@ INFOPLIST_FILE = "openvpn-tunnel-provider/Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"; - MARKETING_VERSION = 1.18.0; + MARKETING_VERSION = 1.18.1; OTHER_SWIFT_FLAGS = "-D RELEASE"; PRODUCT_BUNDLE_IDENTIFIER = "net.ivpn.clients.ios.openvpn-tunnel-provider"; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -2799,7 +2799,7 @@ CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = IVPNClient/IVPNClient.entitlements; CODE_SIGN_IDENTITY = "iPhone Developer"; - CURRENT_PROJECT_VERSION = 25; + CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = WQXXM75BYN; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -2808,7 +2808,7 @@ INFOPLIST_FILE = "$(SRCROOT)/IVPNClient/Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - MARKETING_VERSION = 1.18.0; + MARKETING_VERSION = 1.18.1; OTHER_LDFLAGS = ( "$(inherited)", "-framework", @@ -2834,7 +2834,7 @@ CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = IVPNClient/IVPNClient.entitlements; CODE_SIGN_IDENTITY = "iPhone Developer"; - CURRENT_PROJECT_VERSION = 25; + CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = WQXXM75BYN; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -2843,7 +2843,7 @@ INFOPLIST_FILE = "$(SRCROOT)/IVPNClient/Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks $(SRCROOT)/Carthage/Build/iOS"; - MARKETING_VERSION = 1.18.0; + MARKETING_VERSION = 1.18.1; OTHER_LDFLAGS = ( "$(inherited)", "-framework", diff --git a/UITests/Info.plist b/UITests/Info.plist index 2064bac3b..4a18a905a 100644 --- a/UITests/Info.plist +++ b/UITests/Info.plist @@ -17,6 +17,6 @@ CFBundleShortVersionString 1.0 CFBundleVersion - 25 + 26 diff --git a/UnitTests/Info.plist b/UnitTests/Info.plist index 7b553a30b..cde6a93e5 100644 --- a/UnitTests/Info.plist +++ b/UnitTests/Info.plist @@ -17,6 +17,6 @@ CFBundleShortVersionString 1.0 CFBundleVersion - 25 + 26 diff --git a/openvpn-tunnel-provider/Info.plist b/openvpn-tunnel-provider/Info.plist index 9ecacca66..69f6e41e3 100644 --- a/openvpn-tunnel-provider/Info.plist +++ b/openvpn-tunnel-provider/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString $(MARKETING_VERSION) CFBundleVersion - 25 + $(CURRENT_PROJECT_VERSION) NSExtension NSExtensionPointIdentifier diff --git a/today-extension/Info.plist b/today-extension/Info.plist index b656f77a0..23b2feb48 100644 --- a/today-extension/Info.plist +++ b/today-extension/Info.plist @@ -21,7 +21,7 @@ CFBundleShortVersionString $(MARKETING_VERSION) CFBundleVersion - 25 + $(CURRENT_PROJECT_VERSION) NSExtension NSExtensionMainStoryboard diff --git a/wireguard-tunnel-provider/Info.plist b/wireguard-tunnel-provider/Info.plist index 42ecddecd..58894595e 100644 --- a/wireguard-tunnel-provider/Info.plist +++ b/wireguard-tunnel-provider/Info.plist @@ -21,7 +21,7 @@ CFBundleShortVersionString $(MARKETING_VERSION) CFBundleVersion - 25 + $(CURRENT_PROJECT_VERSION) NSExtension NSExtensionPointIdentifier