diff --git a/app/src/main/assets/GuestHoleServers.json b/app/src/main/assets/GuestHoleServers.json index 0bb824e75e..ebc6de8e97 100644 --- a/app/src/main/assets/GuestHoleServers.json +++ b/app/src/main/assets/GuestHoleServers.json @@ -1,399 +1 @@ -[ - { - "Name": "NO#17", - "EntryCountry": "NO", - "ExitCountry": "NO", - "Domain": "no-17.protonvpn.net", - "Tier": 1, - "Features": 0, - "Region": null, - "City": "Oslo", - "Score": 2.19324114, - "HostCountry": null, - "ID": "r3cIsp8UYmT9dhDHAIg2-CQMajRRaM4Xb0CwX3cks6FwOHggAfhzPH6SUd2JES9vmPy_3OMSGGPvO07couufdw==", - "Location": { - "Lat": 59.909999999999997, - "Long": 10.75 - }, - "Status": 1, - "Servers": [ - { - "EntryIP": "91.219.215.155", - "ExitIP": "91.219.215.155", - "Domain": "no-17.protonvpn.net", - "ID": "Cvq9Lpq9lgu-i-iugUZf8BOrw4YsTGalssVWMy5Gpgm3F5rHmNO5fK99kKgGmG4Szd6jxsC98DPS9Uq6NqcaWw==", - "Label": "0", - "X25519PublicKey": null, - "Generation": 0, - "Status": 1, - "ServicesDownReason": null - } - ], - "Load": 8 - }, - { - "Name": "NL-FREE#11", - "EntryCountry": "NL", - "ExitCountry": "NL", - "Domain": "nl-free-11.protonvpn.com", - "Tier": 0, - "Features": 0, - "Region": null, - "City": null, - "Score": 3.3690582299999998, - "HostCountry": null, - "ID": "2GXummgWOD9gH120_CGus9Mn24yCso4LTAW12QvQd93k6d2wYk-8LRGkUPx0OwJ_azpQwHcKbk3-OiNQWcXNYw==", - "Location": { - "Lat": 52.369999999999997, - "Long": 4.8899999999999997 - }, - "Status": 1, - "Servers": [ - { - "EntryIP": "185.107.95.225", - "ExitIP": "185.107.95.226", - "Domain": "lxc-nl-21.protonvpn.com", - "ID": "ZBgs_RZxKps6xayd6N0LBGzoKELElbllt3RX03ocDDyrUVd_lRMhQo0iI5Pz3XnjLKN1gkOAv3AmvgiWDOYifQ==", - "Label": "0", - "X25519PublicKey": null, - "Generation": 0, - "Status": 1, - "ServicesDownReason": null - }, - { - "EntryIP": "185.107.95.225", - "ExitIP": "185.107.95.227", - "Domain": "lxc-nl-21.protonvpn.com", - "ID": "9BpPJvBw9sYzrKzh2MH90OWSjAx0OUw9Js-RwAuwNqYTi-9sIdRtlDSwf1VISW68MwGei9OisG4C7iea2lkjFw==", - "Label": "1", - "X25519PublicKey": null, - "Generation": 0, - "Status": 1, - "ServicesDownReason": null - }, - { - "EntryIP": "185.107.95.225", - "ExitIP": "185.107.95.228", - "Domain": "lxc-nl-21.protonvpn.com", - "ID": "ctv52fQ5svlV-rIomJHGWxD0Ppimd2b17Kzb8IoC9WvVtggnljzIR2s3rcNBMQiiA5Gjq43-DdL8PwdyXq7kDQ==", - "Label": "2", - "X25519PublicKey": null, - "Generation": 0, - "Status": 1, - "ServicesDownReason": null - }, - { - "EntryIP": "185.107.95.225", - "ExitIP": "185.107.95.229", - "Domain": "lxc-nl-21.protonvpn.com", - "ID": "V_9Ok43My7ZJmR2eT7Em2SmlEUpRJdIulLRbyO8wexl93EsUKgAfzobsp6OqCXaQy3jKcJAlDpNECpIwvGxsgQ==", - "Label": "3", - "X25519PublicKey": null, - "Generation": 0, - "Status": 1, - "ServicesDownReason": null - }, - { - "EntryIP": "185.107.80.216", - "ExitIP": "185.107.80.217", - "Domain": "lxc-nl-36.protonvpn.com", - "ID": "Kh3etPmEOxjVqDGmlTtpQ6B5vWp8h4G8IgjzOeaPpN355Ynxcu47eIioMhP6R8o06TMOSFni_Hd8YSzADZgiJA==", - "Label": "0", - "X25519PublicKey": "JZB+EhgDp8jaPVI26NY/YsBt087NdmbZtb0ppZJQYHk=", - "Generation": 0, - "Status": 1, - "ServicesDownReason": null - }, - { - "EntryIP": "185.107.80.216", - "ExitIP": "185.107.80.218", - "Domain": "lxc-nl-36.protonvpn.com", - "ID": "A-8upgSfO1uExZf5h7dL3GsEZPB3IZ_nMtdjGAYJLgiMZCVQiVbPVwmGxiaxIaxpIBBws2-zEDzfeoSja7GAzA==", - "Label": "1", - "X25519PublicKey": "JZB+EhgDp8jaPVI26NY/YsBt087NdmbZtb0ppZJQYHk=", - "Generation": 0, - "Status": 1, - "ServicesDownReason": null - }, - { - "EntryIP": "185.107.80.216", - "ExitIP": "185.107.80.219", - "Domain": "lxc-nl-36.protonvpn.com", - "ID": "fbGksHD7EceGw96wwcyclCkbT2LCHOM9XuxCLqtQcKb5V5_g6FZDxwnjoY12-XjGWIJv3ckcHOCaBtfWA630aA==", - "Label": "2", - "X25519PublicKey": "JZB+EhgDp8jaPVI26NY/YsBt087NdmbZtb0ppZJQYHk=", - "Generation": 0, - "Status": 1, - "ServicesDownReason": null - }, - { - "EntryIP": "185.107.80.216", - "ExitIP": "185.107.80.220", - "Domain": "lxc-nl-36.protonvpn.com", - "ID": "-BMuO3iNatuqgK21Z_vzQ683-KkozLe-wHaxFJtESWlC-14gFXEIzG2MQBT2CzKBgFnsRpiLXrSyeJXDrWPN9g==", - "Label": "3", - "X25519PublicKey": "JZB+EhgDp8jaPVI26NY/YsBt087NdmbZtb0ppZJQYHk=", - "Generation": 0, - "Status": 1, - "ServicesDownReason": null - } - ], - "Load": 93 - }, - { - "Name": "US-FL#18", - "EntryCountry": "US", - "ExitCountry": "US", - "Domain": "us-fl-17.protonvpn.net", - "Tier": 1, - "Features": 4, - "Region": null, - "City": "Miami", - "Score": 2.46893282, - "HostCountry": null, - "ID": "jw2nBd6BHrQK-HXkMo3cPuX1pboI4OSrnpd_3z9sSVS3P3krEl70XZwwtJTnSjWy3-6sKcnrJQykz6_6LmVj8A==", - "Location": { - "Lat": 25.77, - "Long": -80.189999999999998 - }, - "Status": 1, - "Servers": [ - { - "EntryIP": "45.87.214.195", - "ExitIP": "45.87.214.196", - "Domain": "us-fl-17.protonvpn.net", - "ID": "AR-mFh4kdfrSbtpzEG_ARQ2sFsSJ117kLd2QYU1VGyU5iLM3FWnK_DJ6osfCd7h7o-xARfQ0Jinhr59cr0JMmA==", - "Label": "1", - "X25519PublicKey": null, - "Generation": 0, - "Status": 1, - "ServicesDownReason": null - } - ], - "Load": 34 - }, - { - "Name": "AU#38", - "EntryCountry": "AU", - "ExitCountry": "AU", - "Domain": "au-38.protonvpn.com", - "Tier": 2, - "Features": 8, - "Region": null, - "City": "Adelaide", - "Score": 1.7451756700000001, - "HostCountry": null, - "ID": "pMiBfuWJWx5fSFYSOSsdphlRSKQWX0KanHY2pS0Kj0DAKFY5-lSOpp7HFcCO-SWtnUd5O0jW9ABJgxbivg2fCg==", - "Location": { - "Lat": -34.93, - "Long": 138.59999999999999 - }, - "Status": 1, - "Servers": [ - { - "EntryIP": "116.206.231.186", - "ExitIP": "116.206.231.188", - "Domain": "lxc-au-09.protonvpn.com", - "ID": "PhrRot836G-etkC_3fIfVL8THHavpnMQgG8uvD9czPRiRPc4fCNr8D7D5IHqwLtVqnWlyHK3J8TenCACpdiRnA==", - "Label": "0", - "X25519PublicKey": null, - "Generation": 0, - "Status": 1, - "ServicesDownReason": null - } - ], - "Load": 69 - }, - { - "Name": "US-FL#9", - "EntryCountry": "US", - "ExitCountry": "US", - "Domain": "us-fl-09.protonvpn.com", - "Tier": 1, - "Features": 0, - "Region": null, - "City": "Miami", - "Score": 2.4573603199999998, - "HostCountry": null, - "ID": "g1t2gCfDnOr7SfVKNZb9Aodj0QjWdTAPHtgXgKbtkFju85tDnuNHiW-d28BwBwX7aF1pVOcc2bpTBkIyvJ6YLQ==", - "Location": { - "Lat": 25.77, - "Long": -80.189999999999998 - }, - "Status": 1, - "Servers": [ - { - "EntryIP": "37.120.215.227", - "ExitIP": "37.120.215.227", - "Domain": "us-fl-09.protonvpn.com", - "ID": "PfFfhiYNeFgIOqwd3lm6BMI_UsKieujQsNYncUKDdvctgb_BLXhLkE9627aUkF9jwTRJMfMzzQFWy43o1I087w==", - "Label": "0", - "X25519PublicKey": null, - "Generation": 0, - "Status": 1, - "ServicesDownReason": null - } - ], - "Load": 9 - }, - { - "Name": "MX#8", - "EntryCountry": "MX", - "ExitCountry": "MX", - "Domain": "node-mx-01.protonvpn.net", - "Tier": 2, - "Features": 0, - "Region": null, - "City": "Chiapas", - "Score": 999.50317835999999, - "HostCountry": null, - "ID": "CWX9YsBLbmBk1hoF3m-W8hM2XFcNuwJjtMPMHq6TjwC5_485C77M_TpWOdaoBKoRieCJ3FLgN8dTqD6ClizUuA==", - "Location": { - "Lat": 16.760000000000002, - "Long": -93.109999999999999 - }, - "Status": 1, - "Servers": [ - { - "EntryIP": "191.96.145.238", - "ExitIP": "191.96.145.246", - "Domain": "node-mx-01.protonvpn.net", - "ID": "Ta2AZ8DN3vZSDSUImW7ebT5zKhTSJGNwVcDiDEshiJ_R7_OblllTgbb8Fojt00evg7Yhdu2OBh7ii94h8PMmvw==", - "Label": "4", - "X25519PublicKey": null, - "Generation": 0, - "Status": 1, - "ServicesDownReason": null - } - ], - "Load": 10 - }, - { - "Name": "AU#26", - "EntryCountry": "AU", - "ExitCountry": "AU", - "Domain": "au-26.protonvpn.com", - "Tier": 2, - "Features": 8, - "Region": null, - "City": "Sydney", - "Score": 1.72291211, - "HostCountry": null, - "ID": "wOx--bv6mvHGl16H9L29Z3tlk98LPso5WXfs8b_dj72kAJ_mummcf1ic6CUF6N-Q5HjkrgbiPCUOSOJciVpPtQ==", - "Location": { - "Lat": -33.859999999999999, - "Long": 151.19999999999999 - }, - "Status": 1, - "Servers": [ - { - "EntryIP": "137.59.253.55", - "ExitIP": "137.59.253.57", - "Domain": "lxc-au-07.protonvpn.com", - "ID": "XZBqLPUCGvnl0au-AV_JCOfb-3VpYuxViLl8fHGZ0MWukpv6ZfSDFt_s7i5AZVTH9HOplNZBpHkyl7K0L6OMLQ==", - "Label": "1", - "X25519PublicKey": null, - "Generation": 0, - "Status": 1, - "ServicesDownReason": null - } - ], - "Load": 58 - }, - { - "Name": "US-FL#46", - "EntryCountry": "US", - "ExitCountry": "US", - "Domain": "node-us-102.protonvpn.net", - "Tier": 2, - "Features": 8, - "Region": null, - "City": "Miami", - "Score": 1.46607892, - "HostCountry": null, - "ID": "RQFcGLh_H4CtmIWn7_yQVJK1P7FM8KJDtnFip_c_2mFIV6FmUpKlV393AHLRav2ICmkLTvPEfcociVPyyVoLrQ==", - "Location": { - "Lat": 25.77, - "Long": -80.189999999999998 - }, - "Status": 1, - "Servers": [ - { - "EntryIP": "89.38.227.138", - "ExitIP": "89.38.227.140", - "Domain": "node-us-102.protonvpn.net", - "ID": "kCVw_2Q3kgdcAPYb-xGLsAaGarLOolKD_9Vn-PdyHX2Z46K0J0sNw_KBA8UWHReR87fDq15FJgeCCxH4SYXxDQ==", - "Label": "0", - "X25519PublicKey": null, - "Generation": 0, - "Status": 1, - "ServicesDownReason": null - } - ], - "Load": 31 - }, - { - "Name": "NL#44", - "EntryCountry": "NL", - "ExitCountry": "NL", - "Domain": "nl-44.protonvpn.com", - "Tier": 2, - "Features": 0, - "Region": null, - "City": "Amsterdam", - "Score": 1.1287636299999999, - "HostCountry": null, - "ID": "aGzmBU9zGouUD-zVIoT1z3Lk9c5xJjC0PHbmRxYYczWSA7O7940onaLEWLUnWYNqgih5HqQYJL83IxgWmkVj9Q==", - "Location": { - "Lat": 52.369999999999997, - "Long": 4.8899999999999997 - }, - "Status": 1, - "Servers": [ - { - "EntryIP": "190.2.132.124", - "ExitIP": "190.2.132.136", - "Domain": "lxc-nl-29.protonvpn.com", - "ID": "dfs0rWMEv0SHX3i5YJHr3dnIpgddqoV585itvVvpZxA7Tmgou0YzZArvomfRBdnvaYEAv0_7QW0y65LLjca9WQ==", - "Label": "3", - "X25519PublicKey": null, - "Generation": 0, - "Status": 1, - "ServicesDownReason": null - } - ], - "Load": 15 - }, - { - "Name": "US-WA#16", - "EntryCountry": "US", - "ExitCountry": "US", - "Domain": "us-wa-16.protonvpn.com", - "Tier": 2, - "Features": 8, - "Region": null, - "City": "Seattle", - "Score": 1.4869068999999999, - "HostCountry": null, - "ID": "L1TMJKnZg3Dns6oJa5QMYZeXu3Xkcd0KrB-OnyA1PxwLWpXy77aqCRv8QQ2DwO578UpgRsGdadzTRiSk6EyJ_w==", - "Location": { - "Lat": 47.607999999999997, - "Long": -122.33499999999999 - }, - "Status": 1, - "Servers": [ - { - "EntryIP": "199.187.211.103", - "ExitIP": "199.187.211.107", - "Domain": "lxc-us-35.protonvpn.com", - "ID": "xUEZ8qdrwuCwpUQKznELEP8L5WKTFrDMgA5a2IE0wVlHepVbCgFnFrpKbHP2wUAkqFhI0p0fO5RBR3IFbZ1Alg==", - "Label": "3", - "X25519PublicKey": null, - "Generation": 0, - "Status": 1, - "ServicesDownReason": null - } - ], - "Load": 35 - } -] \ No newline at end of file +[{"Name": "CH#357", "EntryCountry": "CH", "ExitCountry": "CH", "Domain": "node-ch-08.protonvpn.net", "Tier": 2, "Features": 12, "Region": null, "City": "Zurich", "Score": 2.9422001927, "HostCountry": null, "OrganizationID": null, "VPNGatewayID": null, "ID": "BW0Q1IZ7uynwZlpTz85T-ujJq7Uyiit8eyPgLu14QIYAFIZBuvApSgXeDN5VWHVdrtlfK2-YKpeu2zDhbWacaw==", "Location": {"Lat": 47.37, "Long": 8.54}, "Servers": [{"EntryIP": "51.83.252.66", "ExitIP": "185.159.157.23", "Domain": "node-ch-08.protonvpn.net", "ID": "lkGmBgyS_R4AMtq-M9TEBVZGKYG5c5wJb0B7ijpshS04SoT8NJpeDD9tnEIeF3oOeLbHRytLzh7dJ00ND63kKw==", "Label": "7", "X25519PublicKey": "VNNO5MYorFu1UerHvoXccW6TvotxbJ1GAGJKtzM9HTY=", "Generation": 0, "Status": 1, "ServicesDown": 0, "ServicesDownReason": null}], "Status": 1, "Load": 41}, {"Name": "GR#3", "EntryCountry": "GR", "ExitCountry": "GR", "Domain": "node-gr-01.protonvpn.net", "Tier": 2, "Features": 0, "Region": null, "City": "Athens", "Score": 2.9956973334, "HostCountry": null, "OrganizationID": null, "VPNGatewayID": null, "ID": "g1OOxT9hBXt-zmNzSd7GN7Cyk_VU9CJYM1eJb1hIGCRHg1rAhoiJxHKwPohgf98FXp2EP03V-Kwm1wvWBTP68g==", "Location": {"Lat": 37.97, "Long": 23.72}, "Servers": [{"EntryIP": null, "ExitIP": "185.51.134.194", "Domain": "node-gr-01.protonvpn.net", "ID": "jTo43jfk1RHTkOxhZyYy0cZCzEQNIs1-wiHVmb92VDME6D0Dj-FwwDixQqFqRn1oamNWhwAO5HyxxSR57wUUQw==", "Label": "7", "X25519PublicKey": "DTaJG0Ww2G2Gtv7GVlkiOIv9cv8r9yQ0ghNPQf7kDAw=", "Generation": 0, "Status": 1, "ServicesDown": 0, "ServicesDownReason": null, "EntryPerProtocol": {"WireGuardTCP": {"IPv4": "51.158.231.46"}, "WireGuardTLS": {"IPv4": "51.158.231.46"}}}], "Status": 1, "Load": 29}, {"Name": "US-FL#77", "EntryCountry": "US", "ExitCountry": "US", "Domain": "node-us-178.protonvpn.net", "Tier": 2, "Features": 28, "Region": null, "City": "Miami", "Score": 2.9911520288, "HostCountry": null, "OrganizationID": null, "VPNGatewayID": null, "ID": "d9KkYgSJ-xySCtJ1aWpA9OCo4-Icj9t7I5hck38r8--LRSJ0VsVlbNsDi_Cy20nwLBtnAECW27y-LkgwSKYBRw==", "Location": {"Lat": 25.76, "Long": -80.19}, "Servers": [{"EntryIP": "37.221.112.210", "EntryIPv6": "2a0d:5600:6:111::10", "ExitIP": "37.221.112.210", "Domain": "node-us-178.protonvpn.net", "ID": "RzIBDoqUDU8QdeqN7kA_6BhwbTYDTduKrT2VN7WGBWKuejUybFtdiPXwYesNqyeE-uOvbRjvox6VZSX2ctrzLQ==", "Label": "0", "X25519PublicKey": "sr/YwNGtQzjEi4eJ5fwswkFxuh2Au6NKN5MzUiWV9FY=", "Generation": 0, "Status": 1, "ServicesDown": 0, "ServicesDownReason": null}], "Status": 1, "Load": 8}, {"Name": "US-FREE#2", "EntryCountry": "US", "ExitCountry": "US", "Domain": "node-us-72.protonvpn.net", "Tier": 0, "Features": 16, "Region": null, "City": "Los Angeles", "Score": 4.9870728388, "HostCountry": null, "OrganizationID": null, "VPNGatewayID": null, "ID": "1x63GL5P8rSb3gmdvzmtzFCxEcKw-JTdfJTeQR--a2m_P3yJ7cULd7lxRq3oIQraUJaeAfI0ZflPtDxO9jZoWg==", "Location": {"Lat": 34.05, "Long": -118.24}, "Servers": [{"EntryIP": null, "EntryIPv6": "2a02:6ea0:c822::10", "ExitIP": "89.187.185.161", "Domain": "node-us-72.protonvpn.net", "ID": "nviZcbNdpze77SlvfS-tFySEUZYoDsxnUbIhbZY8xWsipzzdLr2zrOYSkyd2x1vDo96k0ofTS6mFFD1BfN6nEg==", "Label": "0", "X25519PublicKey": "ZEQHDxg/HbjznRvApyBWfUGs6T20Rvy0/DctZk6FvB4=", "Generation": 0, "Status": 1, "ServicesDown": 0, "ServicesDownReason": null, "EntryPerProtocol": {"WireGuardTCP": {"IPv4": "51.75.169.79"}, "WireGuardTLS": {"IPv4": "51.75.169.79"}}}, {"EntryIP": null, "EntryIPv6": "2a02:6ea0:c822::10", "ExitIP": "89.187.185.161", "Domain": "node-us-72.protonvpn.net", "ID": "-LTPiOY-n_xK9fDXbI4gjQI87H7a_dC_6Ns2NtqUkhpWWIyTumjTnO7D3fwkp4QcmSl8GAIC1ooUJgWZMNEOcg==", "Label": "1", "X25519PublicKey": "ZEQHDxg/HbjznRvApyBWfUGs6T20Rvy0/DctZk6FvB4=", "Generation": 0, "Status": 1, "ServicesDown": 0, "ServicesDownReason": null, "EntryPerProtocol": {"WireGuardTCP": {"IPv4": "51.75.169.79"}, "WireGuardTLS": {"IPv4": "51.75.169.79"}}}, {"EntryIP": null, "EntryIPv6": "2a02:6ea0:c822::10", "ExitIP": "89.187.185.161", "Domain": "node-us-72.protonvpn.net", "ID": "td6l1Ho5GfXsYb-vrv0t1g7G3pFdBEM_V28fK-OWcOuOEtJDDH64on-qgWrsO57Fkt-_ipA1b-ZyKMoPXIfpHQ==", "Label": "2", "X25519PublicKey": "ZEQHDxg/HbjznRvApyBWfUGs6T20Rvy0/DctZk6FvB4=", "Generation": 0, "Status": 1, "ServicesDown": 0, "ServicesDownReason": null, "EntryPerProtocol": {"WireGuardTCP": {"IPv4": "51.75.169.79"}, "WireGuardTLS": {"IPv4": "51.75.169.79"}}}, {"EntryIP": null, "EntryIPv6": "2a02:6ea0:c822::10", "ExitIP": "89.187.185.161", "Domain": "node-us-72.protonvpn.net", "ID": "LN4xyc0ymZZP3ej-Fp7fQWVDfbzPZlvYZFA-EzL53CRjKskmXjdZ9CtcnqTnF7FyuhGd7TgNjkdv_SlGz1Zo_A==", "Label": "3", "X25519PublicKey": "ZEQHDxg/HbjznRvApyBWfUGs6T20Rvy0/DctZk6FvB4=", "Generation": 0, "Status": 1, "ServicesDown": 0, "ServicesDownReason": null, "EntryPerProtocol": {"WireGuardTCP": {"IPv4": "51.75.169.79"}, "WireGuardTLS": {"IPv4": "51.75.169.79"}}}], "Status": 1, "Load": 39}, {"Name": "US-FREE#50", "EntryCountry": "US", "ExitCountry": "US", "Domain": "node-us-132.protonvpn.net", "Tier": 0, "Features": 16, "Region": null, "City": "Seattle", "Score": 4.9925148591, "HostCountry": null, "OrganizationID": null, "VPNGatewayID": null, "ID": "GsNU4Fo0OcOwGTo54vgbXxzJWjgcqnVcONex1MwGAOA_uQN5gJOrYIIghHF16-lKxyiU4HJwW5nyOQ7MNUIIyQ==", "Location": {"Lat": 47.6, "Long": -122.33}, "Servers": [{"EntryIP": "156.146.51.129", "EntryIPv6": "2a02:6ea0:d802:2129::10", "ExitIP": "156.146.51.129", "Domain": "node-us-132.protonvpn.net", "ID": "2xHCbkxVUIpZSznai97e85CtQhluV09S2VGDupAXTU1XsUonzX7t-DUF1qNPswmUpV9V4kbRsjr8BrZdncIgCw==", "Label": "0", "X25519PublicKey": "OxA9T+O5ynU0SxUcnUVIsvoitUmMoB8AU0RSi6NQOTo=", "Generation": 0, "Status": 1, "ServicesDown": 0, "ServicesDownReason": null}, {"EntryIP": "156.146.51.129", "EntryIPv6": "2a02:6ea0:d802:2129::10", "ExitIP": "156.146.51.129", "Domain": "node-us-132.protonvpn.net", "ID": "4zT7Y7AFe1JwMvUM7QetL7jZJGe7bNummjDYwq6qfaaxjETxZXvcRtteosS9EA3WJBI-BXSOUcdxlLt4K0jkkA==", "Label": "1", "X25519PublicKey": "OxA9T+O5ynU0SxUcnUVIsvoitUmMoB8AU0RSi6NQOTo=", "Generation": 0, "Status": 1, "ServicesDown": 0, "ServicesDownReason": null}, {"EntryIP": "156.146.51.129", "EntryIPv6": "2a02:6ea0:d802:2129::10", "ExitIP": "156.146.51.129", "Domain": "node-us-132.protonvpn.net", "ID": "PgK52_o2FCL_g9Pao2qICH6c4rx82nh__bxBuMnAq3Nyt2yikfXQmwsaxZzUXdBV1Ax7T2P6kjz7dvoEn1wz9Q==", "Label": "2", "X25519PublicKey": "OxA9T+O5ynU0SxUcnUVIsvoitUmMoB8AU0RSi6NQOTo=", "Generation": 0, "Status": 1, "ServicesDown": 0, "ServicesDownReason": null}, {"EntryIP": "156.146.51.129", "EntryIPv6": "2a02:6ea0:d802:2129::10", "ExitIP": "156.146.51.129", "Domain": "node-us-132.protonvpn.net", "ID": "t9YEtoP6FYQMIsG3HCYBqPRnSS8-yopbkiAYcj5CgwPwNz9OKEtfNlpo91U748j4P3gSf-4GTvJSl0i1ol4BwQ==", "Label": "3", "X25519PublicKey": "OxA9T+O5ynU0SxUcnUVIsvoitUmMoB8AU0RSi6NQOTo=", "Generation": 0, "Status": 1, "ServicesDown": 0, "ServicesDownReason": null}], "Status": 1, "Load": 61}] \ No newline at end of file diff --git a/app/src/main/java/com/protonvpn/android/redesign/home_screen/ui/UpsellCarousel.kt b/app/src/main/java/com/protonvpn/android/redesign/home_screen/ui/UpsellCarousel.kt index 6b9a4107d6..99a1138018 100644 --- a/app/src/main/java/com/protonvpn/android/redesign/home_screen/ui/UpsellCarousel.kt +++ b/app/src/main/java/com/protonvpn/android/redesign/home_screen/ui/UpsellCarousel.kt @@ -41,6 +41,7 @@ import androidx.compose.runtime.remember import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip import androidx.compose.ui.layout.onGloballyPositioned import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.pluralStringResource @@ -179,9 +180,13 @@ fun HomeUpsellCarousel( .heightIn(min = minHeight.dp) val page = pages[pageIndex] with(page) { + val cardShape = ProtonTheme.shapes.medium + pageScope.content( - pageSizeModifier.clickable(onClick = { onOpenUpgradeScreen(upgradeDialogFocusPage, upgradeSource) }) - ) + pageSizeModifier + .clip(cardShape) + .clickable(onClick = { onOpenUpgradeScreen(upgradeDialogFocusPage, upgradeSource) }) + ) } } } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 8578c11eaf..77d901edaf 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -68,7 +68,7 @@ mockk-version = "1.13.13" okhttp3-version = "4.12.0" owasp-dependencycheck-version = "10.0.4" proton-core-env-config-version = "1.3.1" -proton-core-version = "36.6.0" +proton-core-version = "36.6.1" proton-test-fusion-version = "0.9.97" proton-vpn-govpnlib-version = "0.1.87" proton-vpn-core-internal-version = "0.1.55-1.0.37" diff --git a/metadata/en-US/changelogs/605187500.txt b/metadata/en-US/changelogs/605187500.txt new file mode 100644 index 0000000000..bd2fdd2f46 --- /dev/null +++ b/metadata/en-US/changelogs/605187500.txt @@ -0,0 +1,2 @@ +What's new +Made some other minor bug and UI fixes diff --git a/metadata/en-US/changelogs/605187501.txt b/metadata/en-US/changelogs/605187501.txt new file mode 100644 index 0000000000..fe71828563 --- /dev/null +++ b/metadata/en-US/changelogs/605187501.txt @@ -0,0 +1,2 @@ +What's new +Minor stability improvements diff --git a/metadata/version_fdroid.txt b/metadata/version_fdroid.txt index 61b26427d4..8f851ceac4 100644 --- a/metadata/version_fdroid.txt +++ b/metadata/version_fdroid.txt @@ -1,2 +1,2 @@ -versionName=2.7.70.0 -versionCode=102077000 +versionName=5.18.75.1 +versionCode=605187501