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

Fixed display of new generated public key in SettingsActivity.

Browse source
This commit is contained in:
Revertron 2024-11-25 16:34:29 +01:00
parent 674c427be2
commit 054e1c9792
2 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/eu/neilalexander/yggdrasil/ConfigurationProxy.kt
View file

@ -55,7 +55,7 @@ object ConfigurationProxy {
json.put("IfMTU", 65535) json.put("IfMTU", 65535)
if (json.getJSONArray("MulticastInterfaces").get(0) is String) { if (json.getJSONArray("MulticastInterfaces").get(0) is String) {
var ar = JSONArray() val ar = JSONArray()
ar.put(0, JSONObject(""" ar.put(0, JSONObject("""
{ {
"Regex": ".*", "Regex": ".*",

10
app/src/main/java/eu/neilalexander/yggdrasil/SettingsActivity.kt
View file

@ -27,6 +27,7 @@ class SettingsActivity : AppCompatActivity() {
private lateinit var deviceNameEntry: EditText private lateinit var deviceNameEntry: EditText
private lateinit var publicKeyLabel: TextView private lateinit var publicKeyLabel: TextView
private lateinit var resetConfigurationRow: LinearLayoutCompat private lateinit var resetConfigurationRow: LinearLayoutCompat
private var publicKeyReset = false
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
@ -85,6 +86,7 @@ class SettingsActivity : AppCompatActivity() {
findViewById<View>(R.id.resetKeysRow).setOnClickListener { findViewById<View>(R.id.resetKeysRow).setOnClickListener {
config.resetKeys() config.resetKeys()
publicKeyReset = true
updateView() updateView()
} }
@ -125,7 +127,11 @@ class SettingsActivity : AppCompatActivity() {
deviceNameEntry.setText("", TextView.BufferType.EDITABLE) deviceNameEntry.setText("", TextView.BufferType.EDITABLE)
} }
publicKeyLabel.text = json.optString("PublicKey") var key = json.optString("PrivateKey")
if (key.isNotEmpty()) {
key = key.substring(key.length / 2)
}
publicKeyLabel.text = key
} }
override fun onResume() { override fun onResume() {
@ -145,7 +151,7 @@ class SettingsActivity : AppCompatActivity() {
// To be able to get public key from running Yggdrasil we use this receiver, as we don't have this field in config // To be able to get public key from running Yggdrasil we use this receiver, as we don't have this field in config
private val receiver: BroadcastReceiver = object : BroadcastReceiver() { private val receiver: BroadcastReceiver = object : BroadcastReceiver() {
override fun onReceive(context: Context?, intent: Intent) { override fun onReceive(context: Context?, intent: Intent) {
if (intent.hasExtra("pubkey")) { if (intent.hasExtra("pubkey") && !publicKeyReset) {
val tree = intent.getStringExtra("pubkey") val tree = intent.getStringExtra("pubkey")
if (tree != null && tree != "null") { if (tree != null && tree != "null") {
publicKeyLabel.text = intent.getStringExtra("pubkey") publicKeyLabel.text = intent.getStringExtra("pubkey")