SagerNet/sing-box-for-android
1
0
Fork 0
mirror of https://github.com/SagerNet/sing-box-for-android.git synced 2025-04-03 20:07:38 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make Play Store happy

Browse source
This commit is contained in:
世界 2024-02-28 12:25:02 +08:00
parent 57914db97f
commit 39d68dc51d
No known key found for this signature in database
GPG key ID: CD109927C34A63C4
4 changed files with 16 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

31
app/src/main/java/io/nekohasekai/sfa/ui/MainActivity.kt
View file

@ -225,13 +225,11 @@ class MainActivity : AbstractActivity(), ServiceConnection.Callback {
private val locationPermissionLauncher =
registerForActivityResult(ActivityResultContracts.RequestPermission()) {
if (it) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
if (it && Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
requestBackgroundLocationPermission()
} else {
startService()
}
} else {
showPermissionDeniedDescription()
}
}
@ -239,8 +237,6 @@ class MainActivity : AbstractActivity(), ServiceConnection.Callback {
registerForActivityResult(ActivityResultContracts.RequestPermission()) {
if (it) {
startService()
} else {
showPermissionDeniedDescription()
}
}
@ -350,7 +346,7 @@ class MainActivity : AbstractActivity(), ServiceConnection.Callback {
.setPositiveButton(R.string.ok) { _, _ ->
requestFineLocationPermission0()
}
.setNegativeButton(R.string.cancel, null)
.setNegativeButton(R.string.no_thanks, null)
.setCancelable(false)
.show()
}
@ -376,7 +372,7 @@ class MainActivity : AbstractActivity(), ServiceConnection.Callback {
.setPositiveButton(R.string.ok) { _, _ ->
backgroundLocationPermissionLauncher.launch(Manifest.permission.ACCESS_BACKGROUND_LOCATION)
}
.setNegativeButton(R.string.cancel, null)
.setNegativeButton(R.string.no_thanks, null)
.setCancelable(false)
.show()
}
@ -402,27 +398,6 @@ class MainActivity : AbstractActivity(), ServiceConnection.Callback {
}
}
private fun showPermissionDeniedDescription() {
val message = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
Html.fromHtml(
getString(R.string.location_permission_denied_description),
Html.FROM_HTML_MODE_LEGACY
)
} else {
@Suppress("DEPRECATION")
Html.fromHtml(getString(R.string.location_permission_denied_description))
}
MaterialAlertDialogBuilder(this)
.setTitle(R.string.location_permission_title)
.setMessage(message)
.setPositiveButton(R.string.ok, null)
.setNeutralButton(R.string.open_settings) { _, _ ->
openPermissionSettings()
}
.setCancelable(false)
.show()
}
@SuppressLint("PrivateApi")
fun getSystemProperty(key: String?): String? {
try {

3
app/src/main/java/io/nekohasekai/sfa/ui/main/SettingsFragment.kt
View file

@ -73,6 +73,9 @@ class SettingsFragment : Fragment() {
binding.checkUpdateButton.setOnClickListener {
Vendor.checkUpdate(activity, true)
}
binding.openPrivacyPolicyButton.setOnClickListener {
activity.launchCustomTab("https://sing-box.sagernet.org/clients/privacy/")
}
binding.disableMemoryLimit.addTextChangedListener {
lifecycleScope.launch(Dispatchers.IO) {
val newValue = EnabledType.valueOf(it).boolValue

7
app/src/main/res/layout/fragment_settings.xml
View file

@ -82,6 +82,13 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/check_update" />
<Button
android:id="@+id/openPrivacyPolicyButton"
style="@style/Widget.Material3.Button.TextButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/privacy_policy" />
</LinearLayout>
</LinearLayout>

7
app/src/main/res/values/strings.xml
View file

@ -3,7 +3,6 @@
<string name="stop">Stop</string>
<string name="ok">OK</string>
<string name="cancel">Cancel</string>
<string name="no_thanks">No, thanks</string>
<string name="title_dashboard">Dashboard</string>
@ -87,6 +86,7 @@
<string name="core_data_size">Data Size</string>
<string name="check_update_automatic">Automatic Update Check</string>
<string name="check_update">Check Update</string>
<string name="privacy_policy">Privacy Policy</string>
<string name="title_app_settings">App</string>
<string name="memory_limit">Memory Limit</string>
<string name="background_permission">Background permission</string>
@ -147,8 +147,7 @@
<string name="other_methods">Other methods</string>
<string name="action_start">Start</string>
<string name="location_permission_title">Location permission</string>
<string name="location_permission_description"><![CDATA[Your profile contains <strong><tt>wifi_ssid</tt> and <tt>wifi_bssid</tt> routing rules</strong>. To make them work, sing-box uses the <strong>location</strong> permission <strong>in the background</strong> to get information about the connected Wi-Fi network. The information will be used <strong>only for routing purposes</strong>. Please grant the permission to continue.]]></string>
<string name="location_permission_background_description"><![CDATA[On Android 10 and up, <strong>background location</strong> permission is required. Please select <strong>Allow all the time</strong> to grant the permission.]]></string>
<string name="location_permission_denied_description"><![CDATA[It looks like you have denied the required permission. To continue using the app, please <strong>grant the permission</strong> or <strong>remove <tt>wifi_ssid</tt> and <tt>wifi_bssid</tt> routing rules</strong> from your profile.]]></string>
<string name="location_permission_description"><![CDATA[Your profile contains <strong><tt>wifi_ssid</tt> or <tt>wifi_bssid</tt> routing rules</strong>. To make them work, sing-box uses the <strong>location</strong> permission <strong>in the background</strong> to get information about the connected Wi-Fi network. The information will be used <strong>for routing purposes only</strong>.]]></string>
<string name="location_permission_background_description"><![CDATA[On Android 10 and up, <strong>background location</strong> permission is required. Select <strong>Allow all the time</strong> to grant the permission.]]></string>
<string name="open_settings">Open Settings</string>
</resources>