Add support for modifying repeater credentials
Credits go to @fxsheep: https://forum.xda-developers.com/showpost.php?p=76298728&postcount=5 Currently it only works on later versions of Android due to usage of `killall`. A workaround is in progress.
This commit is contained in:
@@ -1,9 +0,0 @@
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="24dp"
|
||||
android:height="24dp"
|
||||
android:viewportWidth="24.0"
|
||||
android:viewportHeight="24.0">
|
||||
<path
|
||||
android:fillColor="#FF000000"
|
||||
android:pathData="M12,6v3l4,-4 -4,-4v3c-4.42,0 -8,3.58 -8,8 0,1.57 0.46,3.03 1.24,4.26L6.7,14.8c-0.45,-0.83 -0.7,-1.79 -0.7,-2.8 0,-3.31 2.69,-6 6,-6zM18.76,7.74L17.3,9.2c0.44,0.84 0.7,1.79 0.7,2.8 0,3.31 -2.69,6 -6,6v-3l-4,4 4,4v-3c4.42,0 8,-3.58 8,-8 0,-1.57 -0.46,-3.03 -1.24,-4.26z"/>
|
||||
</vector>
|
||||
9
mobile/src/main/res/drawable/ic_image_edit.xml
Normal file
9
mobile/src/main/res/drawable/ic_image_edit.xml
Normal file
@@ -0,0 +1,9 @@
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="24dp"
|
||||
android:height="24dp"
|
||||
android:viewportWidth="24.0"
|
||||
android:viewportHeight="24.0">
|
||||
<path
|
||||
android:fillColor="#FF000000"
|
||||
android:pathData="M3,17.25V21h3.75L17.81,9.94l-3.75,-3.75L3,17.25zM20.71,7.04c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0l-1.83,1.83 3.75,3.75 1.83,-1.83z"/>
|
||||
</vector>
|
||||
93
mobile/src/main/res/layout/dialog_wifi_ap.xml
Normal file
93
mobile/src/main/res/layout/dialog_wifi_ap.xml
Normal file
@@ -0,0 +1,93 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- Source: https://android.googlesource.com/platform/packages/apps/Settings/+/6b4a31c/res/layout/wifi_ap_dialog.xml -->
|
||||
<!-- Copyright (C) 2010 The Android Open Source Project
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
-->
|
||||
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="300sp"
|
||||
android:layout_height="wrap_content"
|
||||
android:fadeScrollbars="false">
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:descendantFocusability="beforeDescendants"
|
||||
android:focusableInTouchMode="true"
|
||||
android:orientation="vertical">
|
||||
<LinearLayout android:id="@+id/info"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
style="@style/wifi_section" />
|
||||
<LinearLayout android:id="@+id/type"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
style="@style/wifi_section">
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
style="@style/wifi_item">
|
||||
<TextView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
style="@style/wifi_item_label"
|
||||
android:layout_marginTop="8dip"
|
||||
android:text="@string/wifi_ssid" />
|
||||
<EditText android:id="@+id/ssid"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
style="@style/wifi_item_edit_content"
|
||||
android:hint="@string/wifi_ssid_hint"
|
||||
android:inputType="textNoSuggestions"
|
||||
android:maxLength="32" />
|
||||
</LinearLayout>
|
||||
</LinearLayout>
|
||||
<LinearLayout android:id="@+id/fields"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
style="@style/wifi_section">
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
style="@style/wifi_item">
|
||||
<TextView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
style="@style/wifi_item_label"
|
||||
android:layout_marginTop="8dip"
|
||||
android:text="@string/wifi_password" />
|
||||
<EditText android:id="@+id/password"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
style="@style/wifi_item_edit_content"
|
||||
android:singleLine="true"
|
||||
android:inputType="textPassword"
|
||||
android:maxLength="63"
|
||||
android:imeOptions="flagForceAscii" />
|
||||
</LinearLayout>
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
style="@style/wifi_item">
|
||||
<TextView android:id="@+id/hint"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
style="@style/wifi_item_label"
|
||||
android:text="@string/credentials_password_too_short"
|
||||
android:layout_marginTop="8dip"
|
||||
android:layout_marginBottom="10sp"/>
|
||||
<CheckBox android:id="@+id/show_password"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
style="@style/wifi_item_content"
|
||||
android:text="@string/wifi_show_password" />
|
||||
</LinearLayout>
|
||||
</LinearLayout>
|
||||
</LinearLayout>
|
||||
</ScrollView>
|
||||
@@ -40,7 +40,7 @@
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/repeater_ssid"
|
||||
android:text="@string/wifi_ssid"
|
||||
android:textAppearance="@style/TextAppearance.AppCompat.Subhead"/>
|
||||
|
||||
<Space
|
||||
@@ -57,31 +57,13 @@
|
||||
android:focusable="false"
|
||||
android:text="@{data.ssid}"
|
||||
android:textIsSelectable="true"
|
||||
tools:text="DIRECT-rAnd0m"/>
|
||||
tools:text="DIRECT-rA-nd0m"/>
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_column="0"
|
||||
android:layout_row="1"
|
||||
android:text="@string/repeater_password"
|
||||
android:textAppearance="@style/TextAppearance.AppCompat.Subhead"/>
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_column="2"
|
||||
android:layout_row="1"
|
||||
android:focusable="false"
|
||||
android:text="@{data.password}"
|
||||
android:textIsSelectable="true"
|
||||
tools:text="p4ssW0rd"/>
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_column="0"
|
||||
android:layout_row="2"
|
||||
android:text="@string/repeater_addresses"
|
||||
android:textAppearance="@style/TextAppearance.AppCompat.Subhead"/>
|
||||
|
||||
@@ -89,7 +71,7 @@
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_column="2"
|
||||
android:layout_row="2"
|
||||
android:layout_row="1"
|
||||
android:focusable="false"
|
||||
android:text="@{data.addresses}"
|
||||
android:textIsSelectable="true"
|
||||
|
||||
@@ -8,8 +8,8 @@
|
||||
android:title="@string/repeater_wps"
|
||||
app:showAsAction="ifRoom"/>
|
||||
<item
|
||||
android:id="@+id/resetGroup"
|
||||
android:icon="@drawable/ic_action_autorenew"
|
||||
android:id="@+id/edit"
|
||||
android:icon="@drawable/ic_image_edit"
|
||||
android:title="@string/repeater_reset_credentials"
|
||||
app:showAsAction="ifRoom"/>
|
||||
</menu>
|
||||
@@ -5,15 +5,15 @@
|
||||
<string name="title_tethering">系统共享</string>
|
||||
<string name="title_settings">设置选项</string>
|
||||
|
||||
<string name="repeater_ssid">中继名称</string>
|
||||
<string name="repeater_password">中继密码</string>
|
||||
<string name="repeater_addresses">中继地址</string>
|
||||
<string name="repeater_wps_dialog_title">输入 PIN</string>
|
||||
<string name="repeater_wps_dialog_pbc">一键加密</string>
|
||||
<string name="repeater_wps_success_pbc">请在 2 分钟内在需要连接的设备上使用一键加密以连接到此中继。</string>
|
||||
<string name="repeater_wps_success_keypad">成功注册 PIN。</string>
|
||||
<string name="repeater_wps_failure">打开 WPS 失败(原因:%s)</string>
|
||||
<string name="repeater_reset_credentials">重置凭据</string>
|
||||
<string name="repeater_configure">设置 WLAN 中继</string>
|
||||
<string name="repeater_configure_failure">未能找到有效的档案。请尝试先打开中继。</string>
|
||||
<string name="repeater_reset_credentials">重置</string>
|
||||
<string name="repeater_reset_credentials_dialog_message">Android
|
||||
系统将在下次打开中继时生成新的中继名称和密码。该操作不可撤销。</string>
|
||||
<string name="repeater_reset_credentials_dialog_reset">重置</string>
|
||||
@@ -78,4 +78,12 @@
|
||||
<string name="exception_interface_not_found">错误:未找到下游接口</string>
|
||||
<string name="root_unavailable">似乎没有 root</string>
|
||||
<string name="noisy_su_failure">发生异常,详情请查看调试信息。</string>
|
||||
|
||||
<string name="wifi_ssid" msgid="5519636102673067319">"网络名称"</string>
|
||||
<string name="wifi_ssid_hint" msgid="897593601067321355">"输入 SSID"</string>
|
||||
<string name="wifi_password" msgid="5948219759936151048">"密码"</string>
|
||||
<string name="wifi_show_password" msgid="6461249871236968884">"显示密码"</string>
|
||||
<string name="credentials_password_too_short" msgid="7502749986405522663">"密码至少应包含 8 个字符。"</string>
|
||||
<string name="wifi_save" msgid="3331121567988522826">"保存"</string>
|
||||
<string name="wifi_cancel" msgid="6763568902542968964">"取消"</string>
|
||||
</resources>
|
||||
|
||||
@@ -1,12 +1,19 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!--
|
||||
Values copied from:
|
||||
* https://android.googlesource.com/platform/packages/apps/Settings/+/7686ef8/res/xml/tether_prefs.xml
|
||||
* https://android.googlesource.com/platform/packages/apps/Settings/+/e5ed810/res/values/strings.xml
|
||||
* @string/wifi_tether_configure_ap_text
|
||||
* @string/usb_tethering_button_text
|
||||
* @string/wifi_hotspot_checkbox_text
|
||||
* @string/bluetooth_tether_checkbox_text
|
||||
-->
|
||||
<resources>
|
||||
<string name="app_name">VPN Hotspot</string>
|
||||
<string name="title_repeater">Repeater</string>
|
||||
<string name="title_tethering">Tethering</string>
|
||||
<string name="title_settings">Settings</string>
|
||||
|
||||
<string name="repeater_ssid">Network name</string>
|
||||
<string name="repeater_password">Password</string>
|
||||
<string name="repeater_addresses">Addresses</string>
|
||||
<string name="repeater_wps">WPS</string>
|
||||
<string name="repeater_wps_dialog_title">Enter PIN</string>
|
||||
@@ -15,10 +22,9 @@
|
||||
device.</string>
|
||||
<string name="repeater_wps_success_keypad">PIN registered.</string>
|
||||
<string name="repeater_wps_failure">Failed to start WPS (reason: %s)</string>
|
||||
<string name="repeater_reset_credentials">Reset credentials</string>
|
||||
<string name="repeater_reset_credentials_dialog_message">Android system will generate new network name and password
|
||||
next time repeater is activated. This is irreversible.</string>
|
||||
<string name="repeater_reset_credentials_dialog_reset">Reset</string>
|
||||
<string name="repeater_configure">Configure Wi\u2011Fi repeater</string>
|
||||
<string name="repeater_configure_failure">Valid config not found. Please start repeater first.</string>
|
||||
<string name="repeater_reset_credentials">Reset</string>
|
||||
<string name="repeater_reset_credentials_success">Credentials reset.</string>
|
||||
<string name="repeater_reset_credentials_failure">Failed to reset credentials (reason: %s)</string>
|
||||
|
||||
@@ -36,14 +42,6 @@
|
||||
<string name="repeater_failure_reason_unknown">unknown #%d</string>
|
||||
|
||||
<string name="tethering_manage">Manage…</string>
|
||||
<!--
|
||||
Values copied from:
|
||||
* https://android.googlesource.com/platform/packages/apps/Settings/+/7686ef8/res/xml/tether_prefs.xml
|
||||
* https://android.googlesource.com/platform/packages/apps/Settings/+/e5ed810/res/values/strings.xml
|
||||
* @string/usb_tethering_button_text
|
||||
* @string/wifi_hotspot_checkbox_text
|
||||
* @string/bluetooth_tether_checkbox_text
|
||||
-->
|
||||
<string name="tethering_manage_usb">USB tethering</string>
|
||||
<string name="tethering_manage_wifi">Wi\u2011Fi hotspot</string>
|
||||
<string name="tethering_manage_wifi_legacy">Wi\u2011Fi hotspot (legacy)</string>
|
||||
@@ -82,4 +80,12 @@
|
||||
<string name="exception_interface_not_found">Fatal: Downstream interface not found</string>
|
||||
<string name="root_unavailable">Root unavailable</string>
|
||||
<string name="noisy_su_failure">Something went wrong, please check the debug information.</string>
|
||||
|
||||
<string name="wifi_ssid">Network name</string>
|
||||
<string name="wifi_ssid_hint">Enter the SSID</string>
|
||||
<string name="wifi_password">Password</string>
|
||||
<string name="wifi_show_password">Show password</string>
|
||||
<string name="credentials_password_too_short">The password must have at least 8 characters.</string>
|
||||
<string name="wifi_save">Save</string>
|
||||
<string name="wifi_cancel">Cancel</string>
|
||||
</resources>
|
||||
|
||||
@@ -13,4 +13,35 @@
|
||||
<item name="preferenceCategory_marginBottom">8dp</item>
|
||||
</style>
|
||||
|
||||
<!-- https://android.googlesource.com/platform/packages/apps/Settings/+/7efcc35/res/values/styles.xml -->
|
||||
<style name="wifi_item">
|
||||
<item name="android:layout_marginTop">8dip</item>
|
||||
<item name="android:layout_marginStart">8dip</item>
|
||||
<item name="android:layout_marginEnd">8dip</item>
|
||||
<item name="android:paddingStart">8dip</item>
|
||||
<item name="android:paddingEnd">8dip</item>
|
||||
<item name="android:orientation">vertical</item>
|
||||
<item name="android:gravity">start</item>
|
||||
</style>
|
||||
<style name="wifi_item_label">
|
||||
<item name="android:paddingStart">8dip</item>
|
||||
<item name="android:textSize">14sp</item>
|
||||
<item name="android:textAlignment">viewStart</item>
|
||||
<item name="android:textAppearance">@android:style/TextAppearance.Material.Body1</item>
|
||||
<item name="android:textColor">?android:attr/textColorSecondary</item>
|
||||
</style>
|
||||
<style name="wifi_item_edit_content">
|
||||
<item name="android:paddingStart">4dip</item>
|
||||
<item name="android:layout_marginStart">4dip</item>
|
||||
<item name="android:textSize">18sp</item>
|
||||
</style>
|
||||
<style name="wifi_section">
|
||||
<item name="android:orientation">vertical</item>
|
||||
</style>
|
||||
<style name="wifi_item_content">
|
||||
<item name="android:textAlignment">viewStart</item>
|
||||
<item name="android:textAppearance">@android:style/TextAppearance.Material.Subhead</item>
|
||||
<item name="android:textColor">?android:attr/textColorPrimary</item>
|
||||
</style>
|
||||
|
||||
</resources>
|
||||
|
||||
Reference in New Issue
Block a user