diff options
Diffstat (limited to 'main')
| -rw-r--r-- | main/src/main/java/de/blinkt/openvpn/fragments/FaqFragment.java | 60 | ||||
| -rwxr-xr-x | main/src/main/res/values/strings.xml | 5 |
2 files changed, 32 insertions, 33 deletions
diff --git a/main/src/main/java/de/blinkt/openvpn/fragments/FaqFragment.java b/main/src/main/java/de/blinkt/openvpn/fragments/FaqFragment.java index 30be7b2a..0bebe98a 100644 --- a/main/src/main/java/de/blinkt/openvpn/fragments/FaqFragment.java +++ b/main/src/main/java/de/blinkt/openvpn/fragments/FaqFragment.java @@ -24,7 +24,7 @@ public class FaqFragment extends Fragment { static class FAQEntry { public FAQEntry(int startVersion, int endVersion, int description) { - this (startVersion, endVersion, -1, description); + this(startVersion, endVersion, -1, description); } public FAQEntry(int startVersion, int endVersion, int title, int description) { @@ -52,7 +52,7 @@ public class FaqFragment extends Fragment { !release.startsWith("4.4.3") && !release.startsWith("4.4.3") && !release.startsWith("4.4.4") && !release.startsWith("4.4.5") && !release.startsWith("4.4.6"); - boolean isAtLeast443 = isAtLeast442 && !release.startsWith("4.4.2"); + boolean isAtLeast443 = isAtLeast442 && !release.startsWith("4.4.2"); if (endVersion == -441 && !isAtLeast442) return true; @@ -72,37 +72,37 @@ public class FaqFragment extends Fragment { return c.getString(R.string.version_upto, getAndroidVersionString(c, endVersion)); } - if (endVersion==-1) + if (endVersion == -1) return getAndroidVersionString(c, startVersion) + " and later"; String startver = getAndroidVersionString(c, startVersion); if (endVersion == startVersion) - return startver; + return startver; return String.format("%s - %s", startver, getAndroidVersionString(c, endVersion)); } - private String getAndroidVersionString(Context c, int versionCode) { - switch (versionCode) { - case Build.VERSION_CODES.ICE_CREAM_SANDWICH: - return "4.0 (Ice Cream Sandwich)"; - case -441: - return "4.4.1 (KitKat)"; - case -442: - return "4.4.2 (KitKat)"; - case Build.VERSION_CODES.JELLY_BEAN_MR2: - return "4.3 (Jelly Bean MR2)"; - case Build.VERSION_CODES.KITKAT: - return "4.4 (KitKat)"; - case Build.VERSION_CODES.LOLLIPOP: - return "5.0 (Lollipop)"; - default: - return "API " + versionCode; + private String getAndroidVersionString(Context c, int versionCode) { + switch (versionCode) { + case Build.VERSION_CODES.ICE_CREAM_SANDWICH: + return "4.0 (Ice Cream Sandwich)"; + case -441: + return "4.4.1 (KitKat)"; + case -442: + return "4.4.2 (KitKat)"; + case Build.VERSION_CODES.JELLY_BEAN_MR2: + return "4.3 (Jelly Bean MR2)"; + case Build.VERSION_CODES.KITKAT: + return "4.4 (KitKat)"; + case Build.VERSION_CODES.LOLLIPOP: + return "5.0 (Lollipop)"; + default: + return "API " + versionCode; + } } - } } @@ -125,10 +125,10 @@ public class FaqFragment extends Fragment { new FAQEntry(Build.VERSION_CODES.ICE_CREAM_SANDWICH, -1, R.string.battery_consumption_title, R.string.baterry_consumption), - new FAQEntry(Build.VERSION_CODES.ICE_CREAM_SANDWICH, Build.VERSION_CODES.KITKAT , R.string.faq_system_dialogs_title, R.string.faq_system_dialogs), + new FAQEntry(Build.VERSION_CODES.ICE_CREAM_SANDWICH, Build.VERSION_CODES.KITKAT, R.string.faq_system_dialogs_title, R.string.faq_system_dialogs), new FAQEntry(Build.VERSION_CODES.ICE_CREAM_SANDWICH, -1, R.string.tap_mode, R.string.faq_tap_mode), - new FAQEntry(Build.VERSION_CODES.JELLY_BEAN_MR2, Build.VERSION_CODES.JELLY_BEAN_MR2, R.string.ab_secondary_users), + new FAQEntry(Build.VERSION_CODES.JELLY_BEAN_MR2, Build.VERSION_CODES.JELLY_BEAN_MR2, R.string.ab_secondary_users_title, R.string.ab_secondary_users), new FAQEntry(Build.VERSION_CODES.JELLY_BEAN_MR2, -1, R.string.faq_vpndialog43_title, R.string.faq_vpndialog43), new FAQEntry(Build.VERSION_CODES.ICE_CREAM_SANDWICH, -1, R.string.faq_security_title, R.string.faq_security), @@ -137,10 +137,10 @@ public class FaqFragment extends Fragment { new FAQEntry(Build.VERSION_CODES.ICE_CREAM_SANDWICH, -1, R.string.tap_mode, R.string.tap_faq2), new FAQEntry(Build.VERSION_CODES.KITKAT, -1, R.string.vpn_tethering_title, R.string.ab_tethering_44), - new FAQEntry(Build.VERSION_CODES.KITKAT, -441, R.string.ab_kitkat_mss), + new FAQEntry(Build.VERSION_CODES.KITKAT, -441, R.string.ab_kitkat_mss_title, R.string.ab_kitkat_mss), new FAQEntry(Build.VERSION_CODES.ICE_CREAM_SANDWICH, -1, R.string.copying_log_entries, R.string.faq_copying), - new FAQEntry(Build.VERSION_CODES.KITKAT, -442, R.string.ab_persist_tun), + new FAQEntry(Build.VERSION_CODES.KITKAT, -442, R.string.ab_persist_tun), new FAQEntry(Build.VERSION_CODES.KITKAT, -1, R.string.faq_routing_title, R.string.faq_routing), new FAQEntry(Build.VERSION_CODES.KITKAT, Build.VERSION_CODES.KITKAT, R.string.ab_kitkat_reconnect), new FAQEntry(Build.VERSION_CODES.KITKAT, Build.VERSION_CODES.KITKAT, R.string.ab_vpn_reachability_44), @@ -149,14 +149,12 @@ public class FaqFragment extends Fragment { new FAQEntry(Build.VERSION_CODES.ICE_CREAM_SANDWICH, -1, R.string.ab_only_cidr_title, R.string.ab_only_cidr), new FAQEntry(Build.VERSION_CODES.ICE_CREAM_SANDWICH, -1, R.string.ab_proxy_title, R.string.ab_proxy), - new FAQEntry(Build.VERSION_CODES.LOLLIPOP, -1, R.string.ab_not_route_to_vpn), + new FAQEntry(Build.VERSION_CODES.LOLLIPOP, -1, R.string.ab_not_route_to_vpn_title, R.string.ab_not_route_to_vpn), new FAQEntry(Build.VERSION_CODES.ICE_CREAM_SANDWICH, -1, R.string.tap_mode, R.string.tap_faq3), }; - - private RecyclerView mRecyclerView; @@ -192,13 +190,11 @@ public class FaqFragment extends Fragment { private FAQEntry[] getFAQEntries() { Vector<FAQEntry> faqItems = new Vector<>(); - for (FAQEntry fe : faqitemsVersionSpecific) - { + for (FAQEntry fe : faqitemsVersionSpecific) { if (fe.runningVersion()) faqItems.add(fe); } - for (FAQEntry fe : faqitemsVersionSpecific) - { + for (FAQEntry fe : faqitemsVersionSpecific) { if (!fe.runningVersion()) faqItems.add(fe); } diff --git a/main/src/main/res/values/strings.xml b/main/src/main/res/values/strings.xml index c7529049..a223ed04 100755 --- a/main/src/main/res/values/strings.xml +++ b/main/src/main/res/values/strings.xml @@ -357,7 +357,7 @@ <string name="ab_proxy">Android will keep using your proxy settings specified for the mobile/Wi-Fi connection when no DNS servers are set. OpenVPN for Android will warn you about this in the log.<p>When a VPN sets a DNS server Android will not a proxy. There is no API to set a proxy for a VPN connection.</p></string> <string name="ab_lollipop_reinstall">VPN apps may stop working when uninstalled and reinstalled again. For details see #80074</string> <string name="ab_not_route_to_vpn">The configured client IP and the IPs in its network mask are not routed to the VPN. OpenVPN works around this bug by explicitly adding a route that corrosponds to the client IP and its netmask</string> - <string name="ab_persist_tun">Opening a tun device while another tun device is active, which is used for persist-tun support, crashes the VPNServices on the device. A reboot is required to make VPN work again. OpenVPN for Android tries to avoid reopening the tun device and if really needed first closes the current TUN before opening the new TUN device to avoid to crash. This may lead to a short window where packets are sent over the non-VPN connection.</string> + <string name="ab_persist_tun">Opening a tun device while another tun device is active, which is used for persist-tun support, crashes the VPNServices on the device. A reboot is required to make VPN work again. OpenVPN for Android tries to avoid reopening the tun device and if really needed first closes the current TUN before opening the new TUN device to avoid to crash. This may lead to a short window where packets are sent over the non-VPN connection. Even with this workaround the VPNServices sometimes crashes and requires a reboot of the device.</string> <string name="ab_secondary_users">VPN does not work at all for secondary users.</string> <string name="ab_kitkat_reconnect">"Multiple users report that the mobile connection/mobile data connection is frequently dropped while using the VPN app. The behaviour seems to affect only some mobile provider/device combination and so far no cause/workaround for the bug could be identified. "</string> <string name="ab_vpn_reachability_44">Only destination can be reached over the VPN that are reachable without VPN. IPv6 VPNs does not work at all.</string> @@ -366,5 +366,8 @@ <string name="ab_lollipop_reinstall_title">Reinstalling VPN apps</string> <string name="version_upto">%s and earlier</string> <string name="copy_of_profile">Copy of %s</string> + <string name="ab_not_route_to_vpn_title">Route to the configured IP address</string> + <string name="ab_kitkat_mss_title">Wrong MSS value for VPN connection</string> + <string name="ab_secondary_users_title">Secondary tablet users</string> </resources> |