yggdrasil-network/yggdrasil-android
1
0
Fork 0
mirror of https://github.com/yggdrasil-network/yggdrasil-android.git synced 2025-11-04 11:15:08 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

request POST_NOTIFICATIONS permission

Browse source
This commit is contained in:
Alex Akselrod 2023-11-02 10:35:25 -07:00
parent 8dfa2f638a
commit 22886edcb1
No known key found for this signature in database
GPG key ID: 57D7612D178AA487
4 changed files with 38 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

29
app/src/main/java/eu/neilalexander/yggdrasil/MainActivity.kt
View file

@ -1,9 +1,11 @@
package eu.neilalexander.yggdrasil
import android.Manifest
import android.app.Activity
import android.content.*
import android.graphics.Color
import android.net.VpnService
import android.os.Build
import android.os.Bundle
import android.widget.Switch
import android.widget.TextView
@ -14,6 +16,7 @@ import androidx.appcompat.widget.LinearLayoutCompat
import androidx.core.content.edit
import androidx.localbroadcastmanager.content.LocalBroadcastManager
import androidx.preference.PreferenceManager
import com.permissionx.guolindev.PermissionX
import eu.neilalexander.yggdrasil.PacketTunnelProvider.Companion.STATE_INTENT
import mobile.Mobile
import org.json.JSONArray
@ -37,6 +40,31 @@ class MainActivity : AppCompatActivity() {
startService(intent)
}
private fun checkNotificationPermission() {
PermissionX.init(this)
.permissions(
Manifest.permission.POST_NOTIFICATIONS,
)
.onExplainRequestReason { scope, deniedList ->
scope.showRequestReasonDialog(
deniedList,
getString(R.string.explain_ntfn_perms),
getString(R.string.ok),
getString(R.string.cancel),
)
}
.onForwardToSettings { scope, deniedList ->
scope.showForwardToSettingsDialog(
deniedList,
getString(R.string.manual_ntfn_perms),
getString(R.string.ok),
getString(R.string.cancel),
)
}
.request { _, _, _ -> {}
}
}
private var startVpnActivity = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
if (result.resultCode == Activity.RESULT_OK) {
start()
@ -65,6 +93,7 @@ class MainActivity : AppCompatActivity() {
enabledSwitch.setOnCheckedChangeListener { _, isChecked ->
when (isChecked) {
true -> {
checkNotificationPermission()
val vpnIntent = VpnService.prepare(this)
if (vpnIntent != null) {
startVpnActivity.launch(vpnIntent)

4
app/src/main/res/values-ru/strings.xml
View file

@ -42,6 +42,8 @@
<string name="settings_reset">Сброс</string>
<string name="main_status">Состояние</string>
<string name="main_enable_yggdrasil">Включить Yggdrasil</string>
<string name="explain_ntfn_perms">Пожалуйста включите нотификации чтобы видеть статус подключения Yggdrasil</string>
<string name="manual_ntfn_perms">Чтобы видеть статус подключения Yggdrasil, включите нотификации в настройках</string>
<string name="main_statistics">Статистика</string>
<string name="main_not_available">Н/Д</string>
<string name="main_ip">Адрес</string>
@ -83,4 +85,4 @@
<string name="private_key_label">Приватный ключ:</string>
<string name="set_keys">Установить свой ключ</string>
<string name="save">Сохранить</string>
</resources>
</resources>

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

@ -42,6 +42,8 @@
<string name="settings_reset">Reset</string>
<string name="main_status">Status</string>
<string name="main_enable_yggdrasil">Enable Yggdrasil</string>
<string name="explain_ntfn_perms">Please enable notifications to easily see Yggdrasil connection status</string>
<string name="manual_ntfn_perms">To see Yggdrasil connection status, enable notifications in app settings</string>
<string name="main_statistics">Statistics</string>
<string name="main_not_available">N/A</string>
<string name="main_ip">IP</string>
@ -83,4 +85,4 @@
<string name="private_key_label">Private key:</string>
<string name="set_keys">Set your own key</string>
<string name="save">Save</string>
</resources>
</resources>