diff --git a/app/src/main/java/io/github/chronosx88/yggdrasil/MainActivity.kt b/app/src/main/java/io/github/chronosx88/yggdrasil/MainActivity.kt index 6209ae0..5142a41 100644 --- a/app/src/main/java/io/github/chronosx88/yggdrasil/MainActivity.kt +++ b/app/src/main/java/io/github/chronosx88/yggdrasil/MainActivity.kt @@ -3,8 +3,6 @@ package io.github.chronosx88.yggdrasil import android.app.Activity import android.app.ActivityManager import android.content.* -import android.net.ConnectivityManager -import android.net.Network import android.net.VpnService import android.os.Build import android.os.Bundle @@ -13,12 +11,12 @@ import android.view.Gravity import android.view.View import android.widget.* import androidx.appcompat.app.AppCompatActivity +import androidx.appcompat.widget.SwitchCompat import androidx.preference.PreferenceManager import dalvik.system.DexFile import io.github.chronosx88.yggdrasil.models.DNSInfo import io.github.chronosx88.yggdrasil.models.PeerInfo import io.github.chronosx88.yggdrasil.models.config.DNSInfoListAdapter -import io.github.chronosx88.yggdrasil.models.config.NetworkUtils import io.github.chronosx88.yggdrasil.models.config.PeerInfoListAdapter import io.github.chronosx88.yggdrasil.models.config.Utils.Companion.deserializePeerStringList2PeerInfoSet import io.github.chronosx88.yggdrasil.models.config.Utils.Companion.deserializeStringList2DNSInfoSet @@ -74,7 +72,7 @@ class MainActivity : AppCompatActivity() { setContentView(R.layout.activity_main) setSupportActionBar(findViewById(R.id.toolbar)) isStarted = isYggServiceRunning(this) - val switchOn = findViewById(R.id.switchOn) + val switchOn = findViewById(R.id.switchOn) switchOn.isChecked = isStarted switchOn.setOnCheckedChangeListener { _, isChecked -> @@ -92,12 +90,17 @@ class MainActivity : AppCompatActivity() { //save to shared preferences val preferences = PreferenceManager.getDefaultSharedPreferences(this.baseContext) - val staticIP = findViewById(R.id.staticIP) + val staticIP = findViewById(R.id.staticIP) staticIP.isChecked = preferences.getString(STATIC_IP, null) != null val peersListView = findViewById(R.id.peers) - currentPeers = deserializeStringSet2PeerInfoSet(preferences.getStringSet(CURRENT_PEERS, HashSet())!!) + currentPeers = deserializeStringSet2PeerInfoSet( + preferences.getStringSet( + CURRENT_PEERS, + HashSet() + )!! + ) val adapter = PeerInfoListAdapter(this, currentPeers.sortedWith(compareBy { it.ping })) peersListView.adapter = adapter if(isStarted && this.currentPeers.isEmpty()) { @@ -125,7 +128,12 @@ class MainActivity : AppCompatActivity() { } val listViewDNS = findViewById(R.id.dns) - currentDNS = deserializeStringSet2DNSInfoSet(preferences.getStringSet(CURRENT_DNS, HashSet())!!) + currentDNS = deserializeStringSet2DNSInfoSet( + preferences.getStringSet( + CURRENT_DNS, + HashSet() + )!! + ) val adapterDns = DNSInfoListAdapter(this, currentDNS.sortedWith(compareBy { it.ping })) listViewDNS.adapter = adapterDns val editDnsButton = findViewById