From 121a4bec96d2f9b842c6d393d2b9c6356a9a4405 Mon Sep 17 00:00:00 2001 From: Fil Date: Wed, 4 Jul 2018 19:14:17 +0200 Subject: Add full integration with the Connectivity Framework Fixes Issue #1867 "Download app not working". Uses proxy classes to hook into the application framework, solving almost any problem with missing connectivity features, creating a connection that is fully managed by the framework itself. Introduces a background service that performs all backend operations. Cleans up code design, refining structure of classes and entities. --- CHANGELOG | 7 + README.md | 14 +- TODO | 19 +- app/AndroidManifest.xml | 26 +- app/assets/repwifi-logo-0-small.png | Bin 0 -> 51798 bytes app/assets/repwifi-logo-1-small.png | Bin 0 -> 59631 bytes app/assets/repwifi-logo-1.png | Bin 0 -> 104414 bytes app/gen/fil/libre/repwifiapp/R.java | 455 +++++++------ app/lint.xml | 3 + app/res/drawable/top_frame.xml | 13 + app/res/layout-land/activity_input_ssid.xml | 92 +++ app/res/layout-land/activity_ipv4_settings.xml | 147 +++++ app/res/layout-land/activity_main.xml | 128 ++++ app/res/layout-land/activity_network_details.xml | 95 +++ app/res/layout-land/activity_vpn_settings.xml | 92 +++ app/res/layout/activity_input_ssid.xml | 1 - app/res/layout/activity_ipv4_settings.xml | 11 - app/res/layout/activity_main.xml | 87 ++- app/res/layout/activity_show_status.xml | 29 +- app/res/layout/activity_vpn_settings.xml | 27 +- app/res/raw/make_system_app.sh | 93 +++ app/res/values-fr/strings.xml | 34 +- .../values-fr/strings_activity_input_password.xml | 25 - app/res/values-fr/strings_activity_settings.xml | 25 - app/res/values/strings.xml | 46 +- app/res/values/strings_activity_input_password.xml | 8 - app/res/values/strings_activity_settings.xml | 14 - app/res/xml/general_settings.xml | 11 +- app/src/fil/libre/repwifiapp/ActivityLauncher.java | 41 +- app/src/fil/libre/repwifiapp/Commons.java | 295 +-------- app/src/fil/libre/repwifiapp/Prefs.java | 67 ++ .../libre/repwifiapp/RepWifiIntentReceiver.java | 41 +- app/src/fil/libre/repwifiapp/Utils.java | 430 ++++++++++++ .../activities/ConnectionBoundActivity.java | 282 ++++++++ .../repwifiapp/activities/CreditsActivity.java | 6 +- .../activities/InputPasswordActivity.java | 33 +- .../repwifiapp/activities/InputSsidActivity.java | 19 +- .../activities/Ipv4SettingsActivity.java | 38 +- .../repwifiapp/activities/LongTaskActivity.java | 217 ++++--- .../libre/repwifiapp/activities/MainActivity.java | 545 ++++++++++++---- .../repwifiapp/activities/MenuEnabledActivity.java | 13 +- .../activities/NetworkDetailsActivity.java | 33 +- .../activities/SelectNetworkActivity.java | 23 +- .../repwifiapp/activities/SettingsActivity.java | 126 +++- .../repwifiapp/activities/ShowStatusActivity.java | 253 +------- .../activities/VpnAndConnectionBoundActivity.java | 435 +++++++++++++ .../repwifiapp/activities/VpnSettingsActivity.java | 227 +++---- .../fwproxies/ConnectivityManagerProxy.java | 98 +++ .../libre/repwifiapp/fwproxies/FrameworkProxy.java | 126 ++++ .../repwifiapp/fwproxies/LinkAddressProxy.java | 61 ++ .../repwifiapp/fwproxies/LinkPropertiesProxy.java | 90 +++ .../fwproxies/NetworkCapabilitiesProxy.java | 90 +++ .../repwifiapp/fwproxies/NetworkInfoProxy.java | 102 +++ .../repwifiapp/fwproxies/RepWifiNetworkAgent.java | 581 +++++++++++++++++ .../libre/repwifiapp/fwproxies/RouteInfoProxy.java | 59 ++ .../libre/repwifiapp/helpers/AccessPointInfo.java | 370 ----------- .../libre/repwifiapp/helpers/ConnectionStatus.java | 109 ---- .../fil/libre/repwifiapp/helpers/DhcpSettings.java | 205 ------ app/src/fil/libre/repwifiapp/helpers/Engine.java | 132 ---- .../fil/libre/repwifiapp/helpers/Engine6p0.java | 271 -------- app/src/fil/libre/repwifiapp/helpers/IEngine.java | 37 -- app/src/fil/libre/repwifiapp/helpers/Logger.java | 160 +++++ .../libre/repwifiapp/helpers/NetworkButton.java | 39 -- .../libre/repwifiapp/helpers/NetworkManager.java | 387 ----------- .../libre/repwifiapp/helpers/OpenVpnManager.java | 237 ------- .../fil/libre/repwifiapp/helpers/RootCommand.java | 81 ++- .../fil/libre/repwifiapp/helpers/ShellCommand.java | 107 ++- app/src/fil/libre/repwifiapp/helpers/Utils.java | 355 ---------- app/src/fil/libre/repwifiapp/helpers/WpaCli.java | 263 -------- .../libre/repwifiapp/helpers/WpaSupplicant.java | 65 -- .../libre/repwifiapp/network/AccessPointInfo.java | 442 +++++++++++++ .../libre/repwifiapp/network/ConnectionResult.java | 95 +++ .../libre/repwifiapp/network/ConnectionStatus.java | 298 +++++++++ .../fil/libre/repwifiapp/network/DhcpSettings.java | 242 +++++++ app/src/fil/libre/repwifiapp/network/Engine.java | 168 +++++ .../fil/libre/repwifiapp/network/Engine6p0.java | 315 +++++++++ app/src/fil/libre/repwifiapp/network/IEngine.java | 37 ++ .../libre/repwifiapp/network/NetworkButton.java | 39 ++ .../libre/repwifiapp/network/NetworkManager.java | 379 +++++++++++ app/src/fil/libre/repwifiapp/network/WpaCli.java | 252 ++++++++ .../libre/repwifiapp/network/WpaSupplicant.java | 91 +++ app/src/fil/libre/repwifiapp/service/Channel.java | 148 +++++ .../service/ConnectionManagementService.java | 720 +++++++++++++++++++++ .../libre/repwifiapp/service/StatusManager.java | 139 ++++ 84 files changed, 8148 insertions(+), 3868 deletions(-) create mode 100644 app/assets/repwifi-logo-0-small.png create mode 100644 app/assets/repwifi-logo-1-small.png create mode 100644 app/assets/repwifi-logo-1.png create mode 100644 app/lint.xml create mode 100644 app/res/drawable/top_frame.xml create mode 100644 app/res/layout-land/activity_input_ssid.xml create mode 100644 app/res/layout-land/activity_ipv4_settings.xml create mode 100644 app/res/layout-land/activity_main.xml create mode 100644 app/res/layout-land/activity_network_details.xml create mode 100644 app/res/layout-land/activity_vpn_settings.xml create mode 100644 app/res/raw/make_system_app.sh delete mode 100644 app/res/values-fr/strings_activity_input_password.xml delete mode 100644 app/res/values-fr/strings_activity_settings.xml delete mode 100644 app/res/values/strings_activity_input_password.xml delete mode 100644 app/res/values/strings_activity_settings.xml create mode 100644 app/src/fil/libre/repwifiapp/Prefs.java create mode 100644 app/src/fil/libre/repwifiapp/Utils.java create mode 100644 app/src/fil/libre/repwifiapp/activities/ConnectionBoundActivity.java create mode 100644 app/src/fil/libre/repwifiapp/activities/VpnAndConnectionBoundActivity.java create mode 100644 app/src/fil/libre/repwifiapp/fwproxies/ConnectivityManagerProxy.java create mode 100644 app/src/fil/libre/repwifiapp/fwproxies/FrameworkProxy.java create mode 100644 app/src/fil/libre/repwifiapp/fwproxies/LinkAddressProxy.java create mode 100644 app/src/fil/libre/repwifiapp/fwproxies/LinkPropertiesProxy.java create mode 100644 app/src/fil/libre/repwifiapp/fwproxies/NetworkCapabilitiesProxy.java create mode 100644 app/src/fil/libre/repwifiapp/fwproxies/NetworkInfoProxy.java create mode 100644 app/src/fil/libre/repwifiapp/fwproxies/RepWifiNetworkAgent.java create mode 100644 app/src/fil/libre/repwifiapp/fwproxies/RouteInfoProxy.java delete mode 100644 app/src/fil/libre/repwifiapp/helpers/AccessPointInfo.java delete mode 100644 app/src/fil/libre/repwifiapp/helpers/ConnectionStatus.java delete mode 100644 app/src/fil/libre/repwifiapp/helpers/DhcpSettings.java delete mode 100644 app/src/fil/libre/repwifiapp/helpers/Engine.java delete mode 100644 app/src/fil/libre/repwifiapp/helpers/Engine6p0.java delete mode 100644 app/src/fil/libre/repwifiapp/helpers/IEngine.java create mode 100644 app/src/fil/libre/repwifiapp/helpers/Logger.java delete mode 100644 app/src/fil/libre/repwifiapp/helpers/NetworkButton.java delete mode 100644 app/src/fil/libre/repwifiapp/helpers/NetworkManager.java delete mode 100644 app/src/fil/libre/repwifiapp/helpers/OpenVpnManager.java delete mode 100644 app/src/fil/libre/repwifiapp/helpers/Utils.java delete mode 100644 app/src/fil/libre/repwifiapp/helpers/WpaCli.java delete mode 100644 app/src/fil/libre/repwifiapp/helpers/WpaSupplicant.java create mode 100644 app/src/fil/libre/repwifiapp/network/AccessPointInfo.java create mode 100644 app/src/fil/libre/repwifiapp/network/ConnectionResult.java create mode 100644 app/src/fil/libre/repwifiapp/network/ConnectionStatus.java create mode 100644 app/src/fil/libre/repwifiapp/network/DhcpSettings.java create mode 100644 app/src/fil/libre/repwifiapp/network/Engine.java create mode 100644 app/src/fil/libre/repwifiapp/network/Engine6p0.java create mode 100644 app/src/fil/libre/repwifiapp/network/IEngine.java create mode 100644 app/src/fil/libre/repwifiapp/network/NetworkButton.java create mode 100644 app/src/fil/libre/repwifiapp/network/NetworkManager.java create mode 100644 app/src/fil/libre/repwifiapp/network/WpaCli.java create mode 100644 app/src/fil/libre/repwifiapp/network/WpaSupplicant.java create mode 100644 app/src/fil/libre/repwifiapp/service/Channel.java create mode 100644 app/src/fil/libre/repwifiapp/service/ConnectionManagementService.java create mode 100644 app/src/fil/libre/repwifiapp/service/StatusManager.java diff --git a/CHANGELOG b/CHANGELOG index a1b22b7..3adee27 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,10 @@ +## [v0.9-beta] - 2018-07-04 +* FIXED Issue #1867 "Download app not working" (see below) +* NEW: creates a network connection that is fully integrated with android's connectivity framework +* NEW: all backend operations are now managed through a service +* cleaned up code design, refined structure of classes and entities +* massively restyled core logic: approaching version 1.0! + ## [v0.6] - 2017-12-17 * NEW: introduced static IP/gateway settings per network. * NEW: added OpenVPN support via interaction with de.blinkt.openvpn diff --git a/README.md b/README.md index 37c4d8a..edda03a 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ RepWifiApp is free software, released under GPLv3. -Copyright 2017 Filippo "Fil" Bergamo. +Copyright 2017, 2018 Filippo "Fil" Bergamo. All icons and images included in RepWifiApp are licensed under: Creative Commons Attribution-ShareAlike 3.0 Unported license @@ -17,19 +17,23 @@ It exposes basic functions to search for available netwroks and conenct to them. Thank GNUs: -- Tibi "tct" Turbureanu: +- Tiberiu (Technoethical): for having done the initial job of porting libre WiFi to Replicant 4.2. - Wolfgang Wiedmeyer: for porting libre WiFi to Replicant 6.0 and for helping with the scripts. +- Nicola Spanti (RyDroid): +for the French Translation. + To report on bugs, request features, or any help request, please refer to: -Replicant's Forum: "http://redmine.replicant.us/boards/9/topics/14079" +Replicant's Forum: "https://redmine.replicant.us/boards/9/topics/14079" +Replicant's Issue Tracker: "https://redmine.replicant.us/issues" -Compiled APKs are released in the same page linked above. -APKs are signed with this GnuPG key: +Official APKs are released through F-Droid "https://f-droid.org/" +Any unofficial or testing APKs are signed with this GnuPG key: Key ID: CD07CEAD Owner: Filippo Bergamo (AKA Fil) diff --git a/TODO b/TODO index 9d2e86f..9766754 100644 --- a/TODO +++ b/TODO @@ -1,5 +1,18 @@ TODO -as of 2017-12-17 +as of 2018-07-03 -*) turn backend engine into a service -*) introduce support for EAP authentication (if possible at all) +*) Design a better model for preferences using ContentProvider + +*) Control wpa_supplicant directly using documented sockets and commands: + this should be the preferred way of communicating with wpa_supplicant, + allowing a fine-graned control over the authentication process + and giving access to asynchronous events about the connection status. + +*) SQLite database for storing network details: + drop the current JSON/text-file model and build a more consistent, + more secure way of storing data. + +*) Support wpa_supplicant in AP mode to create a Wi-Fi hotspot + +*) Support captive portals (e.g. "public" Wi-Fi systems or on-campus Wi-Fi): + (needs thorough research) diff --git a/app/AndroidManifest.xml b/app/AndroidManifest.xml index b967836..02b0b64 100644 --- a/app/AndroidManifest.xml +++ b/app/AndroidManifest.xml @@ -1,8 +1,8 @@ + android:versionCode="9" + android:versionName="0.9-beta" > + - - + + android:launchMode="singleTop" > @@ -95,7 +93,17 @@ android:name="fil.libre.repwifiapp.activities.VpnSettingsActivity" android:label="@string/title_activity_vpn_settings" > - + + + + + + + diff --git a/app/assets/repwifi-logo-0-small.png b/app/assets/repwifi-logo-0-small.png new file mode 100644 index 0000000..2e865d0 Binary files /dev/null and b/app/assets/repwifi-logo-0-small.png differ diff --git a/app/assets/repwifi-logo-1-small.png b/app/assets/repwifi-logo-1-small.png new file mode 100644 index 0000000..25276d1 Binary files /dev/null and b/app/assets/repwifi-logo-1-small.png differ diff --git a/app/assets/repwifi-logo-1.png b/app/assets/repwifi-logo-1.png new file mode 100644 index 0000000..511d3ab Binary files /dev/null and b/app/assets/repwifi-logo-1.png differ diff --git a/app/gen/fil/libre/repwifiapp/R.java b/app/gen/fil/libre/repwifiapp/R.java index 4874e0a..025ab02 100644 --- a/app/gen/fil/libre/repwifiapp/R.java +++ b/app/gen/fil/libre/repwifiapp/R.java @@ -9,19 +9,19 @@ package fil.libre.repwifiapp; public final class R { public static final class array { - public static final int debug_priority=0x7f050001; - public static final int debug_priority_names=0x7f050000; + public static final int debug_priority=0x7f060001; + public static final int debug_priority_names=0x7f060000; } public static final class attr { } public static final class color { - public static final int Anthracite=0x7f060006; - public static final int ThemeDark=0x7f060001; - public static final int ThemeDarkSecondary=0x7f060002; - public static final int ThemeLight=0x7f060000; - public static final int Transparent=0x7f060005; - public static final int White=0x7f060004; - public static final int black=0x7f060003; + public static final int Anthracite=0x7f070006; + public static final int ThemeDark=0x7f070001; + public static final int ThemeDarkSecondary=0x7f070002; + public static final int ThemeLight=0x7f070000; + public static final int Transparent=0x7f070005; + public static final int White=0x7f070004; + public static final int black=0x7f070003; } public static final class drawable { public static final int button_bg=0x7f020000; @@ -43,64 +43,69 @@ public final class R { public static final int rw_prog_1=0x7f020010; public static final int rw_prog_2=0x7f020011; public static final int rw_prog_3=0x7f020012; + public static final int top_frame=0x7f020013; } public static final class id { - public static final int btn_back=0x7f0a0016; - public static final int btn_delete=0x7f0a0023; - public static final int btn_disconnect=0x7f0a002a; - public static final int btn_hidden_ssid=0x7f0a001c; - public static final int btn_ip_settings=0x7f0a0021; - public static final int btn_manage_nets=0x7f0a001d; - public static final int btn_next_hidden_ssid=0x7f0a000c; - public static final int btn_rescan=0x7f0a0026; - public static final int btn_save_ip_settings=0x7f0a0015; - public static final int btn_save_vpn_settings=0x7f0a002d; - public static final int btn_scan=0x7f0a001b; - public static final int btn_select_hidden_ssid=0x7f0a0008; - public static final int btn_vpn_settings=0x7f0a0022; - public static final int chk_show_pass=0x7f0a0006; - public static final int chk_show_pass_details=0x7f0a0020; - public static final int chk_use_dhcp=0x7f0a000e; - public static final int img_logo=0x7f0a001e; - public static final int img_logo_fil=0x7f0a0001; - public static final int layout=0x7f0a0017; - public static final int layout_selnets=0x7f0a0024; - public static final int lbl_gateway=0x7f0a0013; - public static final int lbl_ip_settings=0x7f0a000d; - public static final int lbl_netmask=0x7f0a0011; - public static final int lbl_static_ip=0x7f0a000f; - public static final int lbl_vpn_settings=0x7f0a002b; - public static final int line=0x7f0a0009; - public static final int login_form=0x7f0a0003; - public static final int menu_btn_closeapp=0x7f0a0035; - public static final int menu_config=0x7f0a0036; - public static final int menu_credits=0x7f0a0037; - public static final int menu_settings=0x7f0a0034; - public static final int pref_autoconnect=0x7f0a0031; - public static final int pref_autostart=0x7f0a0033; - public static final int pref_debug_prio=0x7f0a002e; - public static final int pref_dns1=0x7f0a002f; - public static final int pref_dns2=0x7f0a0030; - public static final int pref_progbar=0x7f0a0032; - public static final int progbar=0x7f0a0018; - public static final int scrollview=0x7f0a0027; - public static final int sign_in_button=0x7f0a0007; - public static final int spin_vpn_profile=0x7f0a002c; - public static final int table_networks=0x7f0a0028; - public static final int txt_credits=0x7f0a0002; - public static final int txt_credits_title=0x7f0a0000; - public static final int txt_gateway=0x7f0a0014; - public static final int txt_insert_pass=0x7f0a0004; - public static final int txt_insert_ssid=0x7f0a000a; - public static final int txt_main=0x7f0a001a; - public static final int txt_msg=0x7f0a0019; - public static final int txt_net_details=0x7f0a001f; - public static final int txt_netmask=0x7f0a0012; - public static final int txt_password=0x7f0a0005; - public static final int txt_selnets=0x7f0a0025; - public static final int txt_ssid=0x7f0a000b; - public static final int txt_static_ip=0x7f0a0010; - public static final int txt_status=0x7f0a0029; + public static final int btn_back=0x7f0b0017; + public static final int btn_delete=0x7f0b0027; + public static final int btn_disconnect=0x7f0b001f; + public static final int btn_hidden_ssid=0x7f0b0021; + public static final int btn_info=0x7f0b001e; + public static final int btn_ip_settings=0x7f0b0025; + public static final int btn_manage_nets=0x7f0b0022; + public static final int btn_next_hidden_ssid=0x7f0b000c; + public static final int btn_rescan=0x7f0b002a; + public static final int btn_save_ip_settings=0x7f0b0016; + public static final int btn_save_vpn_settings=0x7f0b0030; + public static final int btn_scan=0x7f0b0020; + public static final int btn_select_hidden_ssid=0x7f0b0008; + public static final int btn_vpn_settings=0x7f0b0026; + public static final int button_frame=0x7f0b000e; + public static final int chk_show_pass=0x7f0b0006; + public static final int chk_show_pass_details=0x7f0b0024; + public static final int chk_use_dhcp=0x7f0b000f; + public static final int img_logo=0x7f0b001d; + public static final int img_logo_fil=0x7f0b0001; + public static final int layout=0x7f0b0018; + public static final int layout_selnets=0x7f0b0028; + public static final int layout_vpn_profile=0x7f0b002e; + public static final int lbl_gateway=0x7f0b0014; + public static final int lbl_netmask=0x7f0b0012; + public static final int lbl_static_ip=0x7f0b0010; + public static final int lbl_vpn_settings=0x7f0b002d; + public static final int left_frame=0x7f0b000d; + public static final int line=0x7f0b0009; + public static final int login_form=0x7f0b0003; + public static final int menu_btn_closeapp=0x7f0b0039; + public static final int menu_config=0x7f0b003a; + public static final int menu_credits=0x7f0b003b; + public static final int menu_settings=0x7f0b0038; + public static final int pref_autoconnect=0x7f0b0034; + public static final int pref_autostart=0x7f0b0037; + public static final int pref_debug_prio=0x7f0b0031; + public static final int pref_dns1=0x7f0b0032; + public static final int pref_dns2=0x7f0b0033; + public static final int pref_monitor_connection=0x7f0b0035; + public static final int pref_progbar=0x7f0b0036; + public static final int progbar=0x7f0b0019; + public static final int scrollview=0x7f0b002b; + public static final int sign_in_button=0x7f0b0007; + public static final int spin_vpn_profile=0x7f0b002f; + public static final int table_networks=0x7f0b002c; + public static final int top_frame=0x7f0b001b; + public static final int txt_credits=0x7f0b0002; + public static final int txt_credits_title=0x7f0b0000; + public static final int txt_gateway=0x7f0b0015; + public static final int txt_insert_pass=0x7f0b0004; + public static final int txt_insert_ssid=0x7f0b000a; + public static final int txt_msg=0x7f0b001a; + public static final int txt_net_details=0x7f0b0023; + public static final int txt_netmask=0x7f0b0013; + public static final int txt_password=0x7f0b0005; + public static final int txt_selnets=0x7f0b0029; + public static final int txt_ssid=0x7f0b000b; + public static final int txt_static_ip=0x7f0b0011; + public static final int txt_status=0x7f0b001c; } public static final class layout { public static final int activity_credits=0x7f030000; @@ -116,149 +121,18 @@ public final class R { public static final int activity_vpn_settings=0x7f03000a; } public static final class menu { - public static final int activity_input_ssid=0x7f090000; - public static final int activity_ipv4_settings=0x7f090001; - public static final int activity_main=0x7f090002; - public static final int activity_vpn_settings=0x7f090003; + public static final int activity_input_ssid=0x7f0a0000; + public static final int activity_ipv4_settings=0x7f0a0001; + public static final int activity_main=0x7f0a0002; + public static final int activity_vpn_settings=0x7f0a0003; + } + public static final class raw { + public static final int make_system_app=0x7f050000; } public static final class string { /** This file is part of RepWifiApp. - RepWifiApp is Copyright 2017 Filippo "Fil" Bergamo - French translation is Copyright (C) 2017 Nicola Spanti - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with this program. If not, see . - - */ - public static final int app_name=0x7f070000; - public static final int back_main=0x7f07000b; - public static final int button_text_next=0x7f070006; - public static final int confirm_exit_app=0x7f070025; - public static final int confirm_kill_backend=0x7f070026; - public static final int confirm_reset_settings=0x7f070024; - public static final int connect_hidden=0x7f07001c; - public static final int credit_text=0x7f070013; - public static final int delete=0x7f070010; - public static final int disconnect=0x7f07000c; - public static final int dns1_default=0x7f070021; - public static final int dns2_default=0x7f070022; - public static final int force_disconnect=0x7f07000d; - public static final int hello_world=0x7f070070; - public static final int input_ssid=0x7f07001d; - public static final int insert_nets_password=0x7f070007; - public static final int manage_networks=0x7f070011; - public static final int menu_closeapp=0x7f070002; - public static final int menu_config=0x7f070014; - public static final int menu_credits=0x7f070001; - public static final int menu_settings=0x7f07001f; - public static final int msg_autoconnect_error=0x7f070037; - public static final int msg_checking_status=0x7f070030; - public static final int msg_confirm_delete_network=0x7f070016; - public static final int msg_connect_fail=0x7f070034; - public static final int msg_connected_to=0x7f070041; - public static final int msg_connecting_to=0x7f07002d; - public static final int msg_disconnect_fail=0x7f070044; - public static final int msg_disconnected=0x7f070043; - public static final int msg_error_ip_format=0x7f070040; - public static final int msg_interface_not_found=0x7f070015; - public static final int msg_invalid_gateway=0x7f070066; - public static final int msg_invalid_ip=0x7f070064; - public static final int msg_invalid_netmask=0x7f070065; - public static final int msg_log_save_fail=0x7f07003f; - public static final int msg_log_saved=0x7f07003e; - public static final int msg_netinfo_delete_fail=0x7f070036; - public static final int msg_netinfo_deleted=0x7f070035; - public static final int msg_network_list_fail=0x7f07003a; - public static final int msg_network_name_empty=0x7f07002c; - public static final int msg_network_save_fail=0x7f070033; - public static final int msg_network_saved=0x7f070032; - public static final int msg_no_network=0x7f07003b; - public static final int msg_no_saved_network=0x7f070046; - public static final int msg_os_unsupported=0x7f070048; - public static final int msg_password_empty=0x7f07002a; - public static final int msg_please_wait=0x7f070031; - public static final int msg_root_denied=0x7f07001b; - public static final int msg_root_disabled=0x7f07001a; - public static final int msg_scanning_for_nets=0x7f07002f; - public static final int msg_select_network_connect=0x7f07003c; - public static final int msg_select_network_manage=0x7f07003d; - public static final int msg_touch_open=0x7f070047; - public static final int msg_vpn_connect_error=0x7f07006e; - public static final int msg_vpn_disconnect=0x7f070068; - public static final int msg_vpn_disconnect_error=0x7f070067; - public static final int msg_vpn_launched=0x7f070069; - public static final int msg_vpn_no_permission=0x7f07006d; - public static final int msg_vpn_no_profile=0x7f070073; - public static final int msg_vpn_wrong_profile=0x7f07006a; - public static final int no=0x7f070018; - public static final int receiver_description=0x7f070023; - public static final int rescan=0x7f070005; - public static final int retry=0x7f070019; - public static final int scan_networks=0x7f070003; - public static final int select_saved_net=0x7f070020; - public static final int show_password=0x7f070008; - public static final int summary_advanced_settings=0x7f07005a; - public static final int summary_autoconnect=0x7f070051; - public static final int summary_dns1=0x7f07004e; - public static final int summary_dns2=0x7f07004f; - public static final int summary_general_settings=0x7f07005b; - public static final int summary_kill_backend=0x7f070027; - public static final int summary_progbar=0x7f070053; - public static final int summary_restore_default=0x7f070057; - public static final int summary_start_at_boot=0x7f070055; - public static final int summary_vpn_settings=0x7f070072; - public static final int text_gateway=0x7f070060; - public static final int text_ip_address=0x7f070042; - public static final int text_ipv4_settings=0x7f07005d; - public static final int text_netinfo_last_used=0x7f070038; - public static final int text_password=0x7f070039; - public static final int text_presented_by=0x7f070028; - public static final int text_static_ip=0x7f07005e; - public static final int text_status=0x7f070045; - public static final int text_subnet_mask=0x7f07005f; - public static final int text_use_dhcp=0x7f07005c; - public static final int text_vpn_package_missing=0x7f07006c; - public static final int title_activity_connect=0x7f070009; - public static final int title_activity_credits=0x7f070012; - /** - This file is part of RepWifiApp. - RepWifiApp is Copyright 2017 Filippo "Fil" Bergamo - French translation is Copyright (C) 2017 Nicola Spanti - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with this program. If not, see . - - */ - public static final int title_activity_input_password=0x7f070074; - public static final int title_activity_input_ssid=0x7f07001e; - public static final int title_activity_ipv4_settings=0x7f070061; - public static final int title_activity_long_task=0x7f07000e; - public static final int title_activity_manage_networks=0x7f07000f; - public static final int title_activity_select_network=0x7f070004; - /** - This file is part of RepWifiApp. - RepWifiApp is Copyright 2017 Filippo "Fil" Bergamo + RepWifiApp is Copyright 2017, 2018 Filippo "Fil" Bergamo French translation is Copyright (C) 2017 Nicola Spanti This program is free software: you can redistribute it and/or modify @@ -275,28 +149,139 @@ public final class R { along with this program. If not, see . */ - public static final int title_activity_settings=0x7f070075; - public static final int title_activity_show_status=0x7f07000a; - public static final int title_activity_vpn_settings=0x7f07006f; - public static final int title_advanced_settings=0x7f070058; - public static final int title_autoconnect=0x7f070050; - public static final int title_dns_1=0x7f07004c; - public static final int title_dns_2=0x7f07004d; - public static final int title_dump_logs=0x7f07004a; - public static final int title_general_settings=0x7f070059; - public static final int title_input_password=0x7f070029; - public static final int title_input_ssid=0x7f07002b; - public static final int title_log_prio=0x7f070049; - public static final int title_progbar=0x7f070052; - public static final int title_reset_backend=0x7f07004b; - public static final int title_restore_default=0x7f070056; - public static final int title_scanning=0x7f07002e; - public static final int title_start_at_boot=0x7f070054; - public static final int title_vpn_settings=0x7f07006b; - public static final int txt_back=0x7f070063; - public static final int txt_save=0x7f070071; - public static final int txt_save_ip_settings=0x7f070062; - public static final int yes=0x7f070017; + public static final int app_name=0x7f080000; + public static final int back_main=0x7f08000b; + public static final int button_text_next=0x7f080006; + public static final int confirm_exit_app=0x7f080023; + public static final int confirm_kill_backend=0x7f080024; + public static final int confirm_reset_settings=0x7f080022; + public static final int connect_hidden=0x7f08001c; + public static final int credit_text=0x7f080013; + public static final int delete=0x7f080010; + public static final int disconnect=0x7f08000c; + public static final int force_disconnect=0x7f08000d; + public static final int hello_world=0x7f08006e; + public static final int input_ssid=0x7f08001d; + public static final int insert_nets_password=0x7f080007; + public static final int manage_networks=0x7f080011; + public static final int menu_closeapp=0x7f080002; + public static final int menu_config=0x7f080014; + public static final int menu_credits=0x7f080001; + public static final int menu_settings=0x7f08001f; + public static final int msg_autoconnect_error=0x7f080035; + public static final int msg_checking_status=0x7f08002e; + public static final int msg_chose_no_system_app=0x7f08007e; + public static final int msg_confirm_delete_network=0x7f080016; + public static final int msg_confirm_make_system_app=0x7f08007d; + public static final int msg_confirm_stop_job=0x7f080075; + public static final int msg_connect_fail=0x7f080032; + public static final int msg_connected_to=0x7f08003f; + public static final int msg_connecting_to=0x7f08002b; + public static final int msg_connection_timeout=0x7f080074; + public static final int msg_connection_timeout_nopass=0x7f08007b; + public static final int msg_disconnect_fail=0x7f080042; + public static final int msg_disconnected=0x7f080041; + public static final int msg_dns_fail=0x7f080072; + public static final int msg_error_generic=0x7f08007f; + public static final int msg_error_ip_format=0x7f08003e; + public static final int msg_fail_connservice=0x7f080080; + public static final int msg_gw_failed=0x7f080073; + public static final int msg_interface_not_found=0x7f080015; + public static final int msg_invalid_gateway=0x7f080064; + public static final int msg_invalid_ip=0x7f080062; + public static final int msg_invalid_netmask=0x7f080063; + public static final int msg_log_save_fail=0x7f08003d; + public static final int msg_log_saved=0x7f08003c; + public static final int msg_make_system_app=0x7f08007c; + public static final int msg_netinfo_delete_fail=0x7f080034; + public static final int msg_netinfo_deleted=0x7f080033; + public static final int msg_network_list_fail=0x7f080038; + public static final int msg_network_name_empty=0x7f08002a; + public static final int msg_network_save_fail=0x7f080031; + public static final int msg_network_saved=0x7f080030; + public static final int msg_no_network=0x7f080039; + public static final int msg_no_saved_network=0x7f080044; + public static final int msg_os_unsupported=0x7f080046; + public static final int msg_password_empty=0x7f080028; + public static final int msg_please_wait=0x7f08002f; + public static final int msg_root_denied=0x7f08001b; + public static final int msg_root_disabled=0x7f08001a; + public static final int msg_scanning_for_nets=0x7f08002d; + public static final int msg_select_network_connect=0x7f08003a; + public static final int msg_select_network_manage=0x7f08003b; + public static final int msg_touch_open=0x7f080045; + public static final int msg_vpn_connect_error=0x7f08006c; + public static final int msg_vpn_disconnect=0x7f080066; + public static final int msg_vpn_disconnect_error=0x7f080065; + public static final int msg_vpn_error_manual_open=0x7f080077; + public static final int msg_vpn_launched=0x7f080067; + public static final int msg_vpn_no_permission=0x7f08006b; + public static final int msg_vpn_no_profile=0x7f080071; + public static final int msg_vpn_service_error=0x7f080076; + public static final int msg_vpn_wrong_profile=0x7f080068; + public static final int no=0x7f080018; + public static final int receiver_description=0x7f080021; + public static final int rescan=0x7f080005; + public static final int retry=0x7f080019; + public static final int scan_networks=0x7f080003; + public static final int select_saved_net=0x7f080020; + public static final int show_password=0x7f080008; + public static final int summary_advanced_settings=0x7f080058; + public static final int summary_autoconnect=0x7f08004f; + public static final int summary_dns1=0x7f08004c; + public static final int summary_dns2=0x7f08004d; + public static final int summary_general_settings=0x7f080059; + public static final int summary_kill_backend=0x7f080025; + public static final int summary_monitor_connection_state=0x7f080081; + public static final int summary_progbar=0x7f080051; + public static final int summary_restore_default=0x7f080055; + public static final int summary_start_at_boot=0x7f080053; + public static final int summary_vpn_settings=0x7f080070; + public static final int text_broadcast_address=0x7f080078; + public static final int text_connection_info=0x7f08007a; + public static final int text_gateway=0x7f08005e; + public static final int text_hardware_address=0x7f080079; + public static final int text_ip_address=0x7f080040; + public static final int text_ipv4_settings=0x7f08005b; + public static final int text_netinfo_last_used=0x7f080036; + public static final int text_password=0x7f080037; + public static final int text_presented_by=0x7f080026; + public static final int text_static_ip=0x7f08005c; + public static final int text_status=0x7f080043; + public static final int text_subnet_mask=0x7f08005d; + public static final int text_use_dhcp=0x7f08005a; + public static final int text_vpn_package_missing=0x7f08006a; + public static final int title_activity_connect=0x7f080009; + public static final int title_activity_credits=0x7f080012; + public static final int title_activity_input_password=0x7f080083; + public static final int title_activity_input_ssid=0x7f08001e; + public static final int title_activity_ipv4_settings=0x7f08005f; + public static final int title_activity_long_task=0x7f08000e; + public static final int title_activity_manage_networks=0x7f08000f; + public static final int title_activity_select_network=0x7f080004; + public static final int title_activity_settings=0x7f080084; + public static final int title_activity_show_status=0x7f08000a; + public static final int title_activity_vpn_settings=0x7f08006d; + public static final int title_advanced_settings=0x7f080056; + public static final int title_autoconnect=0x7f08004e; + public static final int title_dns_1=0x7f08004a; + public static final int title_dns_2=0x7f08004b; + public static final int title_dump_logs=0x7f080048; + public static final int title_general_settings=0x7f080057; + public static final int title_input_password=0x7f080027; + public static final int title_input_ssid=0x7f080029; + public static final int title_log_prio=0x7f080047; + public static final int title_monitor_connection_state=0x7f080082; + public static final int title_progbar=0x7f080050; + public static final int title_reset_backend=0x7f080049; + public static final int title_restore_default=0x7f080054; + public static final int title_scanning=0x7f08002c; + public static final int title_start_at_boot=0x7f080052; + public static final int title_vpn_settings=0x7f080069; + public static final int txt_back=0x7f080061; + public static final int txt_save=0x7f08006f; + public static final int txt_save_ip_settings=0x7f080060; + public static final int yes=0x7f080017; } public static final class style { /** @@ -320,19 +305,19 @@ public final class R { API 14 theme customizations can go here. */ - public static final int AppBaseTheme=0x7f080000; + public static final int AppBaseTheme=0x7f090000; /** Application theme. */ - public static final int AppTheme=0x7f080001; - public static final int LoginFormContainer=0x7f080008; - public static final int RepWifi_BorderlessButton=0x7f080005; - public static final int RepWifi_ButtonBar_AlertDialog=0x7f080006; - public static final int TextAppearanceMenu=0x7f080002; + public static final int AppTheme=0x7f090001; + public static final int LoginFormContainer=0x7f090008; + public static final int RepWifi_BorderlessButton=0x7f090005; + public static final int RepWifi_ButtonBar_AlertDialog=0x7f090006; + public static final int TextAppearanceMenu=0x7f090002; /** dialog theme */ - public static final int Theme_RepWifiDialogTheme=0x7f080007; - public static final int Theme_SettingsTheme=0x7f080003; - public static final int listViewPrefs=0x7f080004; + public static final int Theme_RepWifiDialogTheme=0x7f090007; + public static final int Theme_SettingsTheme=0x7f090003; + public static final int listViewPrefs=0x7f090004; } public static final class xml { public static final int debug_settings=0x7f040000; diff --git a/app/lint.xml b/app/lint.xml new file mode 100644 index 0000000..ee0eead --- /dev/null +++ b/app/lint.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/app/res/drawable/top_frame.xml b/app/res/drawable/top_frame.xml new file mode 100644 index 0000000..b4438e0 --- /dev/null +++ b/app/res/drawable/top_frame.xml @@ -0,0 +1,13 @@ + + + + + + + + + + \ No newline at end of file diff --git a/app/res/layout-land/activity_input_ssid.xml b/app/res/layout-land/activity_input_ssid.xml new file mode 100644 index 0000000..9be39e6 --- /dev/null +++ b/app/res/layout-land/activity_input_ssid.xml @@ -0,0 +1,92 @@ + + + + + +