diff options
author | pacien | 2017-08-24 15:54:31 +0200 |
---|---|---|
committer | pacien | 2017-08-24 16:32:10 +0200 |
commit | cf24442cd7b18ffd7dfe3998ea40d8e5e1d3f16e (patch) | |
tree | f215f87f6b9288ce77bab937570e75cb15e29f2e /app/src/main/java/org/pacien/tincapp/activities/StatusActivity.kt | |
parent | 5bd162da8412d637869b62fe0631106015a11bec (diff) | |
download | tincapp-cf24442cd7b18ffd7dfe3998ea40d8e5e1d3f16e.tar.gz |
Add invitation URL QR code scanning ; Refactor configuration dialogs
Diffstat (limited to 'app/src/main/java/org/pacien/tincapp/activities/StatusActivity.kt')
-rw-r--r-- | app/src/main/java/org/pacien/tincapp/activities/StatusActivity.kt | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/app/src/main/java/org/pacien/tincapp/activities/StatusActivity.kt b/app/src/main/java/org/pacien/tincapp/activities/StatusActivity.kt index 6d97dca..356ff6e 100644 --- a/app/src/main/java/org/pacien/tincapp/activities/StatusActivity.kt +++ b/app/src/main/java/org/pacien/tincapp/activities/StatusActivity.kt | |||
@@ -12,7 +12,7 @@ import android.widget.ArrayAdapter | |||
12 | import android.widget.TextView | 12 | import android.widget.TextView |
13 | import java8.util.concurrent.CompletableFuture | 13 | import java8.util.concurrent.CompletableFuture |
14 | import kotlinx.android.synthetic.main.base.* | 14 | import kotlinx.android.synthetic.main.base.* |
15 | import kotlinx.android.synthetic.main.dialog_text_monopsace.view.* | 15 | import kotlinx.android.synthetic.main.dialog_node_details.view.* |
16 | import kotlinx.android.synthetic.main.fragment_list_view.* | 16 | import kotlinx.android.synthetic.main.fragment_list_view.* |
17 | import kotlinx.android.synthetic.main.fragment_network_status_header.* | 17 | import kotlinx.android.synthetic.main.fragment_network_status_header.* |
18 | import org.pacien.tincapp.R | 18 | import org.pacien.tincapp.R |
@@ -36,7 +36,7 @@ class StatusActivity : BaseActivity(), AdapterView.OnItemClickListener, SwipeRef | |||
36 | override fun onCreate(savedInstanceState: Bundle?) { | 36 | override fun onCreate(savedInstanceState: Bundle?) { |
37 | super.onCreate(savedInstanceState) | 37 | super.onCreate(savedInstanceState) |
38 | 38 | ||
39 | nodeListAdapter = ArrayAdapter<String>(this, R.layout.fragment_list_item) | 39 | nodeListAdapter = ArrayAdapter(this, R.layout.fragment_list_item) |
40 | refreshTimer = Timer(true) | 40 | refreshTimer = Timer(true) |
41 | 41 | ||
42 | layoutInflater.inflate(R.layout.fragment_list_view, main_content) | 42 | layoutInflater.inflate(R.layout.fragment_list_view, main_content) |
@@ -81,7 +81,7 @@ class StatusActivity : BaseActivity(), AdapterView.OnItemClickListener, SwipeRef | |||
81 | getNodeNames().thenAccept { | 81 | getNodeNames().thenAccept { |
82 | runOnUiThread { | 82 | runOnUiThread { |
83 | nodeListAdapter?.setElements(it) | 83 | nodeListAdapter?.setElements(it) |
84 | node_list_placeholder.visibility = if (nodeListAdapter?.isEmpty ?: true) View.VISIBLE else View.GONE | 84 | node_list_placeholder.visibility = if (nodeListAdapter?.isEmpty != false) View.VISIBLE else View.GONE |
85 | list_wrapper.isRefreshing = false | 85 | list_wrapper.isRefreshing = false |
86 | if (!TincVpnService.isConnected()) openStartActivity() | 86 | if (!TincVpnService.isConnected()) openStartActivity() |
87 | } | 87 | } |
@@ -90,10 +90,10 @@ class StatusActivity : BaseActivity(), AdapterView.OnItemClickListener, SwipeRef | |||
90 | 90 | ||
91 | override fun onItemClick(parent: AdapterView<*>?, view: View?, position: Int, id: Long) { | 91 | override fun onItemClick(parent: AdapterView<*>?, view: View?, position: Int, id: Long) { |
92 | val nodeName = (view as TextView).text.toString() | 92 | val nodeName = (view as TextView).text.toString() |
93 | val dialogTextView = layoutInflater.inflate(R.layout.dialog_text_monopsace, main_content, false) | 93 | val dialogTextView = layoutInflater.inflate(R.layout.dialog_node_details, main_content, false) |
94 | Tinc.info(TincVpnService.getCurrentNetName()!!, nodeName).thenAccept { | 94 | Tinc.info(TincVpnService.getCurrentNetName()!!, nodeName).thenAccept { |
95 | runOnUiThread { | 95 | runOnUiThread { |
96 | dialogTextView.dialog_text_monospace.text = it | 96 | dialogTextView.dialog_node_details.text = it |
97 | AlertDialog.Builder(this) | 97 | AlertDialog.Builder(this) |
98 | .setTitle(R.string.title_node_info) | 98 | .setTitle(R.string.title_node_info) |
99 | .setView(dialogTextView) | 99 | .setView(dialogTextView) |