Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix typos #112

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
413 changes: 173 additions & 240 deletions app/config/GuestHoleServers.json

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions metadata/en-US/changelogs/604066800.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
What's new
- Improved security and enhanced performance with the latest OpenVPN update - Updated Proton terms and conditions: https://proton.me/legal/terms
95 changes: 56 additions & 39 deletions metadata/en-US/full_description.txt
Original file line number Diff line number Diff line change
@@ -1,39 +1,56 @@
ProtonVPN is a secure and free VPN, now featuring better connection stability, faster speeds, and even more security features.

ProtonVPN is the world's ONLY free VPN service that respects your privacy and is safe to use. Millions of people use ProtonVPN because:
- We do not record your browsing history
- We do not display privacy-invading ads
- We do not sell your data to third parties
- We do not limit how much you can download

ProtonVPN is created by the CERN scientists behind ProtonMail, the world's largest encrypted email service with 20 million users, including many activists and journalists such as Reporters Without Borders.

ProtonVPN’s Free VPN Service includes:

✔ STRONG ENCRYPTION - Your data is protected with AES-256 and 4096 RSA.

✔ SWISS-BASED - Your data is protected by some of the strongest privacy laws in the world.

✔ NO LOGS. EVER - We never log or share user data. Even if authorities request information, we have nothing to share.

✔ PERFECT FORWARD SECRECY - Your encrypted traffic cannot be captured and decrypted later.

✔ MULTI-PROTOCOL SUPPORT - ProtonVPN supports secure VPN protocols: WireGuard and OpenVPN.

✔ DNS LEAK PROTECTION - We encrypt your DNS to ensure your browsing activity cannot be exposed through DNS queries.

✔ ALWAYS-ON VPN/KILL SWITCH - Protect your IP address from being leaked through accidental disconnects.

✔ FULL DISK ENCRYPTION - Our VPN servers are fully encrypted to protect your data.

✔ ANONYMOUS - You do not need to share any personal data to use ProtonVPN.

✔ SPLIT TUNNELING SUPPORT - This advanced feature allows you to select what traffic goes through the VPN tunnel.

✔ BYPASS BLOCKING - Smart protocol selection automatically overcomes VPN bans and unblocks censored content.

✔ TRUSTED - Our code has undergone a security audit and is open source.

✔ MULTIPLE PLATFORM SUPPORT - Easy to use on Android, iOS, Windows, macOS, Linux, and more.

Note: Free users can only connect one device to Free servers in Japan, the Netherlands, and the US.
Proton VPN is the world's ONLY free VPN service that is safe to use and respects your privacy. Proton VPN is created by the CERN scientists behind Proton Mail - the world's largest encrypted email service. Proton’s VPN offers secure and encrypted internet access with advanced security features and access to blocked websites and streaming platforms.

Used by millions worldwide, Proton’s secure no-logs VPN offers 24/7 private internet access, and does not record your browsing history, display ads, sell your data to third parties, or limit downloads.

FREE VPN features available to ALL users:

1. VPN accelerator - increases Proton VPN's speeds by up to 400% to give users an express service
2. Unlimited data with no bandwidth or speed restrictions
3. Strictly NO logs
4. Full disk encrypted servers protect your data
5. Bypass geo-restrictions - smart protocol selection automatically overcomes VPN bans and unblocks censored content
6. Perfect forward secrecy - encrypted traffic cannot be captured and decrypted later
7. DNS leak protection - DNS queries are also encrypted to ensure that your browsing activity cannot be exposed through DNS leaks
8. Split tunneling support allows you to select which apps go through the VPN tunnel
9. Always-on VPN/kill switch offers protection against leaks caused by accidental disconnections

PREMIUM features:

1. 1400+ high speed servers across 60+ countries
2. Fast VPN: High speed servers with connections up to 10 Gbps
3. Connect up to 10 devices to VPN at the same time
4. Stream films, sports events, and videos on any streaming service (Netflix, Hulu, Amazon Prime Video, Disney+ etc)
5. Access to blocked or censored content
6. File-sharing and P2P support
7. Adblocker (NetShield) - a DNS filtering feature that protects users from malware, blocks ads, and prevents website trackers from following you across the web
8. Secure Core servers protect against network-based attacks with multi-hop VPN
9. Tor over VPN provides automatic integration with the Tor anonymity network

Why Proton VPN?

• No personal data required to sign up
• Proton VPN's Secure Core architecture allows our secure VPN service to defend against network-based attacks
• Unique VPN Accelerator technology increases your VPN speeds by over 400%
• Uses only VPN protocols that are proven to be secure: OpenVPN, IKEv2, and WireGuard (no PPTP and L2TP/IPSec).
• Independently audited by SEC Consult with all results published on our website
• Physical data centres accessible only via biometric verification
• Trusted open-source code that can be reviewed for security by anyone
• Data protection using AES-256 and 4096 RSA encryption
• Multi-platform support for use across Android, Linux, Windows, MacOS, iOS and more

Join the privacy revolution
Your support is important as it allows us to continue our mission to bring online freedom and the right to privacy to people around the globe. Get our private VPN free today and enjoy fast VPN connections and a secure internet, from anywhere.

Experts’ opinion:

Mozilla: “There are many VPN vendors out there, but not all of them are created equal. Proton VPN offers a secure, reliable, and easy-to-use VPN service and is operated by the makers of ProtonMail, a respected, privacy-oriented email service... As a company they have a track record of fighting for online privacy and they share our dedication to internet safety and security.”

PCMag: “[Proton VPN’s] focus on exacting security at an affordable price tag makes it a compelling choice. Plus, its free version is the best we've tested so far.”

Follow Proton VPN on social for all the latest news and offers:
Facebook: /proton
Twitter: @protonvpn
Reddit: /protonvpn
Instagram: /protonprivacy

Notice for users in China and UAE - Proton VPN may be blocked due to government restrictions outside our control.
Binary file modified metadata/en-US/images/featureGraphic.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added metadata/en-US/images/icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified metadata/en-US/images/phoneScreenshots/1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified metadata/en-US/images/phoneScreenshots/2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified metadata/en-US/images/phoneScreenshots/3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified metadata/en-US/images/phoneScreenshots/4.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified metadata/en-US/images/phoneScreenshots/5.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified metadata/en-US/images/phoneScreenshots/6.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified metadata/en-US/images/phoneScreenshots/7.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added metadata/en-US/images/tvBanner.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added metadata/en-US/images/tvScreenshots/1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added metadata/en-US/images/tvScreenshots/2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added metadata/en-US/images/tvScreenshots/3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added metadata/en-US/images/tvScreenshots/4.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added metadata/en-US/images/tvScreenshots/5.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions metadata/version_fdroid.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
versionName=2.7.70.0
versionCode=102077000
versionName=4.6.68.0
versionCode=604066800
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@ interface ExternalCertificateProvider {
/**
* @deprecated use {@link #getSignedDataWithExtra} instead
* Requests signing the data with RSA/ECB/PKCS1PADDING
* for RSA certficate and with NONEwithECDSA for EC certificates
* for RSA certificate and with NONEwithECDSA for EC certificates
* @param alias user certificate identifier
*/
byte[] getSignedData(in String alias, in byte[] data);

/**
* Requests the certificate chain for the selected alias
* The first certifcate returned is assumed to be
* The first certificate returned is assumed to be
* the user certificate
*/
byte[] getCertificateChain(in String alias);
Expand All @@ -39,7 +39,7 @@ interface ExternalCertificateProvider {

/**
* Requests signing the data with RSA/ECB/nopadding, RSA/ECB/PKCS1PADDING or PKCS1PSSPADDING
* for RSA certficate and with NONEwithECDSA for EC certificates
* for RSA certificate and with NONEwithECDSA for EC certificates
* @param alias user certificate identifier
* @param data the data to be signed
* @param extra additional information.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ interface IOpenVPNAPIService {
void startProfile (String profileUUID);

/** Use a profile with all certificates etc. embedded,
* old version which does not return the UUID of the addded profile, see
* old version which does not return the UUID of the added profile, see
* below for a version that return the UUID on add */
boolean addVPNProfile (String name, String config);

Expand All @@ -35,10 +35,10 @@ interface IOpenVPNAPIService {
/* Disconnect the VPN */
void disconnect();

/* Pause the VPN (same as using the pause feature in the notifcation bar) */
/* Pause the VPN (same as using the pause feature in the notification bar) */
void pause();

/* Resume the VPN (same as using the pause feature in the notifcation bar) */
/* Resume the VPN (same as using the pause feature in the notification bar) */
void resume();

/**
Expand Down
2 changes: 1 addition & 1 deletion openvpn/src/main/assets/full_licenses.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ <h2 id="ics-openvpn">OpenVPN for Android</h2>
<p>
The name ics-openvpn and OpenVPN for Android refer to the same program.
OpenVPN for Android is distributed under the GPL license version 2 (see Below)
with the following clarification/additional terms of what constitues "deriviate work": </p>
with the following clarification/additional terms of what constitutes "deriviate work": </p>

<p>Using/including any part of ics-openvpn, especially using/including any part of the
de.blinkt.openvpn class hierarchy, creates derivative work of ics-openvpn.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -347,7 +347,7 @@ class basic_datagram_socket
* call will block until the data has been sent successfully or an error
* occurs.
*
* @param buffers One ore more data buffers to be sent on the socket.
* @param buffers One or more data buffers to be sent on the socket.
*
* @returns The number of bytes sent.
*
Expand Down Expand Up @@ -379,7 +379,7 @@ class basic_datagram_socket
* call will block until the data has been sent successfully or an error
* occurs.
*
* @param buffers One ore more data buffers to be sent on the socket.
* @param buffers One or more data buffers to be sent on the socket.
*
* @param flags Flags specifying how the send call is to be made.
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -341,7 +341,7 @@ class basic_raw_socket
* This function is used to send data on the raw socket. The function call
* will block until the data has been sent successfully or an error occurs.
*
* @param buffers One ore more data buffers to be sent on the socket.
* @param buffers One or more data buffers to be sent on the socket.
*
* @returns The number of bytes sent.
*
Expand Down Expand Up @@ -372,7 +372,7 @@ class basic_raw_socket
* This function is used to send data on the raw socket. The function call
* will block until the data has been sent successfully or an error occurs.
*
* @param buffers One ore more data buffers to be sent on the socket.
* @param buffers One or more data buffers to be sent on the socket.
*
* @param flags Flags specifying how the send call is to be made.
*
Expand Down
2 changes: 1 addition & 1 deletion openvpn/src/main/cpp/asio/asio/include/asio/deferred.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -572,7 +572,7 @@ class ASIO_NODISCARD deferred_conditional
{
}

/// Invoke the conditional branch bsaed on the stored alue.
/// Invoke the conditional branch bsaed on the stored value.
template <typename... Args>
auto operator()(ASIO_MOVE_ARG(Args)... args) ASIO_RVALUE_REF_QUAL
-> decltype(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,12 +76,12 @@ class service_registry
bool has_service() const;

private:
// Initalise a service's key when the key_type typedef is not available.
// Initialise a service's key when the key_type typedef is not available.
template <typename Service>
static void init_key(execution_context::service::key& key, ...);

#if !defined(ASIO_NO_TYPEID)
// Initalise a service's key when the key_type typedef is available.
// Initialise a service's key when the key_type typedef is available.
template <typename Service>
static void init_key(execution_context::service::key& key,
typename enable_if<
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ class win_iocp_io_context

// Flag to indicate whether there is an in-flight stop event. Every event
// posted using PostQueuedCompletionStatus consumes non-paged pool, so to
// avoid exhausting this resouce we limit the number of outstanding events.
// avoid exhausting this resource we limit the number of outstanding events.
long stop_event_posted_;

// Flag to indicate whether the service has been shut down.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ struct parallel_group_op_result
bool has_value_;
};

// Proxy completion handler for the group of parallel operatations. Unpacks and
// Proxy completion handler for the group of parallel operations. Unpacks and
// concatenates the individual operations' results, and invokes the user's
// completion handler.
template <typename Handler, typename... Ops>
Expand Down Expand Up @@ -393,7 +393,7 @@ void parallel_group_launch(Condition cancellation_condition, Handler handler,
Condition, Handler, Ops...> >(state);
}

// Proxy completion handler for the ranged group of parallel operatations.
// Proxy completion handler for the ranged group of parallel operations.
// Unpacks and recombines the individual operations' results, and invokes the
// user's completion handler.
template <typename Handler, typename Op, typename Allocator>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ class promise_invoker
typename decay<F>::type f_;
};

// An executor that adapts the system_executor to capture any exeption thrown
// An executor that adapts the system_executor to capture any exception thrown
// by a submitted function object and save it into a promise.
template <typename T, typename Blocking = execution::blocking_t::possibly_t>
class promise_executor
Expand Down
8 changes: 4 additions & 4 deletions openvpn/src/main/cpp/asio/asio/include/asio/io_context.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,7 @@ class io_context
* @note Calling the run() function from a thread that is currently calling
* one of run(), run_one(), run_for(), run_until(), poll() or poll_one() on
* the same io_context object may introduce the potential for deadlock. It is
* the caller's reponsibility to avoid this.
* the caller's responsibility to avoid this.
*
* The poll() function may also be used to dispatch ready handlers, but
* without blocking.
Expand Down Expand Up @@ -331,7 +331,7 @@ class io_context
* @note Calling the run() function from a thread that is currently calling
* one of run(), run_one(), run_for(), run_until(), poll() or poll_one() on
* the same io_context object may introduce the potential for deadlock. It is
* the caller's reponsibility to avoid this.
* the caller's responsibility to avoid this.
*
* The poll() function may also be used to dispatch ready handlers, but
* without blocking.
Expand Down Expand Up @@ -383,7 +383,7 @@ class io_context
* @note Calling the run_one() function from a thread that is currently
* calling one of run(), run_one(), run_for(), run_until(), poll() or
* poll_one() on the same io_context object may introduce the potential for
* deadlock. It is the caller's reponsibility to avoid this.
* deadlock. It is the caller's responsibility to avoid this.
*/
ASIO_DECL count_type run_one();

Expand All @@ -405,7 +405,7 @@ class io_context
* @note Calling the run_one() function from a thread that is currently
* calling one of run(), run_one(), run_for(), run_until(), poll() or
* poll_one() on the same io_context object may introduce the potential for
* deadlock. It is the caller's reponsibility to avoid this.
* deadlock. It is the caller's responsibility to avoid this.
*/
ASIO_DECL count_type run_one(asio::error_code& ec);
#endif // !defined(ASIO_NO_DEPRECATED)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ namespace asio {
namespace ip {
namespace detail {

// Helper class for implementating an IP endpoint.
// Helper class for implementing an IP endpoint.
class endpoint
{
public:
Expand Down
2 changes: 1 addition & 1 deletion openvpn/src/main/cpp/asio/asio/include/asio/use_future.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ class use_future_t
/**
* The @c package function is used to adapt a function object as a packaged
* task. When this adapter is passed as a completion token to an asynchronous
* operation, the result of the function object is retuned via a std::future.
* operation, the result of the function object is returned via a std::future.
*
* @par Example
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ int main(int argc, char* argv[])

// Try to receive a frame from the server on the new data socket. If we
// successfully receive a frame on this new data socket we can consider
// the renegotation complete. In that case we will close the old data
// the renegotiation complete. In that case we will close the old data
// socket, which will cause any outstanding receive operation on it to be
// cancelled.
frame f1;
Expand All @@ -122,7 +122,7 @@ int main(int argc, char* argv[])
bool done = false;
while (!done)
{
// Even though we're performing a renegotation, we want to continue
// Even though we're performing a renegotiation, we want to continue
// receiving data as smoothly as possible. Therefore we will continue to
// try to receive a frame from the server on the old data socket. If we
// receive a frame on this socket we will interrupt the io_context,
Expand Down Expand Up @@ -150,7 +150,7 @@ int main(int argc, char* argv[])
io_context.run();

// If the io_context.run() was interrupted then we have received a frame
// on the old data socket. We need to keep waiting for the renegotation
// on the old data socket. We need to keep waiting for the renegotiation
// operations to complete.
if (!done)
{
Expand All @@ -163,7 +163,7 @@ int main(int argc, char* argv[])
}

// Since the loop has finished, we have either successfully completed
// the renegotation, or an error has occurred. First we'll check for
// the renegotiation, or an error has occurred. First we'll check for
// errors.
if (control_result)
throw asio::system_error(control_result);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ struct time_t_wait_traits
}

// Determine how long until the clock should be next polled to determine
// whether the absoluate time has been reached.
// whether the absolute time has been reached.
static time_t_clock::duration to_wait_duration(
const time_t_clock::time_point& t)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ struct async_write_message_initiation
// A steady timer used for introducing a delay.
std::unique_ptr<asio::steady_timer> delay_timer_;

// To manage the cycle between the multiple underlying asychronous
// To manage the cycle between the multiple underlying asynchronous
// operations, our intermediate completion handler is implemented as a
// state machine.
enum { starting, waiting, writing } state_;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ struct async_write_messages_implementation
// A steady timer used for introducing a delay.
std::unique_ptr<asio::steady_timer> delay_timer_;

// To manage the cycle between the multiple underlying asychronous
// To manage the cycle between the multiple underlying asynchronous
// operations, our implementation is a state machine.
enum { starting, waiting, writing } state_;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ struct time_t_wait_traits
}

// Determine how long until the clock should be next polled to determine
// whether the absoluate time has been reached.
// whether the absolute time has been reached.
static time_t_clock::duration to_wait_duration(
const time_t_clock::time_point& t)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ auto async_write_messages(tcp::socket& socket,
// A steady timer used for introducing a delay.
std::unique_ptr<asio::steady_timer> delay_timer_;

// To manage the cycle between the multiple underlying asychronous
// To manage the cycle between the multiple underlying asynchronous
// operations, our intermediate completion handler is implemented as a
// state machine.
enum { starting, waiting, writing } state_;
Expand Down
Loading