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

Build 8 (improve always-on VPN)

Browse source
This commit is contained in:
Neil Alexander 2021-10-29 23:45:30 +01:00
parent 5887ae47b2
commit d10bb853a6
4 changed files with 27 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,5 +1,6 @@
package eu.neilalexander.yggdrasil
import android.app.Activity
import android.content.BroadcastReceiver
import android.content.Context
import android.content.Intent
@ -10,6 +11,7 @@ import android.os.Bundle
import android.widget.Switch
import android.widget.TableRow
import android.widget.TextView
import androidx.activity.result.contract.ActivityResultContracts
import androidx.appcompat.app.AppCompatActivity
import androidx.localbroadcastmanager.content.LocalBroadcastManager
import mobile.Mobile
@ -27,6 +29,18 @@ class MainActivity : AppCompatActivity() {
private lateinit var peersRow: TableRow
private lateinit var settingsRow: TableRow
private fun start() {
val intent = Intent(this, PacketTunnelProvider::class.java)
intent.action = PacketTunnelProvider.ACTION_START
startService(intent)
}
private var startVpnActivity = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
if (result.resultCode == Activity.RESULT_OK) {
start()
}
}
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_main)
@ -44,16 +58,14 @@ class MainActivity : AppCompatActivity() {
enabledLabel.setTextColor(Color.GRAY)
VpnService.prepare(this)
enabledSwitch.setOnCheckedChangeListener { _, isChecked ->
when (isChecked) {
true -> {
val vpnintent = VpnService.prepare(this)
if (vpnintent != null) {
startActivityForResult(vpnintent, 0)
val vpnIntent = VpnService.prepare(this)
if (vpnIntent != null) {
startVpnActivity.launch(vpnIntent)
} else {
onActivityResult(0, RESULT_OK, vpnintent)
start()
}
}
false -> {
@ -89,6 +101,7 @@ class MainActivity : AppCompatActivity() {
when (intent.getStringExtra("type")) {
"state" -> {
enabledLabel.text = if (intent.getBooleanExtra("started", false)) {
enabledSwitch.isChecked = true
if (state.dhtCount() == 0) {
enabledLabel.setTextColor(Color.RED)
"No connectivity"
@ -97,6 +110,7 @@ class MainActivity : AppCompatActivity() {
"Enabled"
}
} else {
enabledSwitch.isChecked = false
enabledLabel.setTextColor(Color.GRAY)
"Not enabled"
}
@ -117,15 +131,4 @@ class MainActivity : AppCompatActivity() {
super.onPause()
LocalBroadcastManager.getInstance(this).unregisterReceiver(receiver)
}
override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
super.onActivityResult(requestCode, resultCode, data)
when (resultCode) {
RESULT_OK -> {
val intent = Intent(this, PacketTunnelProvider::class.java)
intent.action = PacketTunnelProvider.ACTION_START
startService(intent)
}
}
}
}