ChronosXYZ/crispa-android
1
0
Fork 0
mirror of https://github.com/yggdrasil-network/crispa-android.git synced 2024-11-09 12:01:01 +00:00
Code Issues Projects Releases Wiki Activity

1. ? condition fix after Kotlin upgrade

Browse Source
This commit is contained in:
vadym 2022-11-25 16:19:56 +02:00
parent ae6133f851
commit 5e5de5582a
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/org/yggdrasil/app/crispa/DNSListActivity.kt
View File

@ -117,8 +117,8 @@ class DNSListActivity : AppCompatActivity() {
val item = menu.findItem(R.id.saveItem) as MenuItem val item = menu.findItem(R.id.saveItem) as MenuItem
item.setActionView(R.layout.menu_save) item.setActionView(R.layout.menu_save)
val saveButton = item val saveButton = item
.actionView.findViewById<Button>(R.id.saveButton) .actionView?.findViewById<Button>(R.id.saveButton)
saveButton.setOnClickListener { saveButton?.setOnClickListener {
if(isLoading){ if(isLoading){
return@setOnClickListener return@setOnClickListener
} }

8
app/src/main/java/org/yggdrasil/app/crispa/PeerListActivity.kt
View File

@ -339,8 +339,8 @@ class PeerListActivity : AppCompatActivity() {
val item = menu.findItem(R.id.saveItem) as MenuItem val item = menu.findItem(R.id.saveItem) as MenuItem
item.setActionView(R.layout.menu_save) item.setActionView(R.layout.menu_save)
val saveButton = item val saveButton = item
.actionView.findViewById<Button>(R.id.saveButton) .actionView?.findViewById<Button>(R.id.saveButton)
saveButton.setOnClickListener { saveButton?.setOnClickListener {
saveButton.isClickable = false saveButton.isClickable = false
cancelPeerListPing() cancelPeerListPing()
val result = Intent(this, MainActivity::class.java) val result = Intent(this, MainActivity::class.java)
@ -354,8 +354,8 @@ class PeerListActivity : AppCompatActivity() {
val editUrl = menu.findItem(R.id.editUrlItem) as MenuItem val editUrl = menu.findItem(R.id.editUrlItem) as MenuItem
editUrl.setActionView(R.layout.menu_edit_url) editUrl.setActionView(R.layout.menu_edit_url)
val editUrlButton = editUrl val editUrlButton = editUrl
.actionView.findViewById<Button>(R.id.editUrlButton) .actionView?.findViewById<Button>(R.id.editUrlButton)
editUrlButton.setOnClickListener { editUrlButton?.setOnClickListener {
editPeerListUrl() editPeerListUrl()
} }
return true return true