diff options
author | pacien | 2018-08-20 16:52:49 +0200 |
---|---|---|
committer | pacien | 2018-08-20 16:52:49 +0200 |
commit | 957826db1e46bffcd99ee52f21101728279521b9 (patch) | |
tree | 4fb7b0a511c9b50dc8f174cd272c8719fcee380b /app/src/main/java/org/pacien/tincapp/activities/status | |
parent | d6ea28ffe132807390721912f2310fd3f43d0405 (diff) | |
download | tincapp-957826db1e46bffcd99ee52f21101728279521b9.tar.gz |
Refactor start activity
Diffstat (limited to 'app/src/main/java/org/pacien/tincapp/activities/status')
-rw-r--r-- | app/src/main/java/org/pacien/tincapp/activities/status/StatusActivity.kt | 2 | ||||
-rw-r--r-- | app/src/main/java/org/pacien/tincapp/activities/status/nodes/NodeListFragment.kt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/src/main/java/org/pacien/tincapp/activities/status/StatusActivity.kt b/app/src/main/java/org/pacien/tincapp/activities/status/StatusActivity.kt index 1ac0e54..6627b61 100644 --- a/app/src/main/java/org/pacien/tincapp/activities/status/StatusActivity.kt +++ b/app/src/main/java/org/pacien/tincapp/activities/status/StatusActivity.kt | |||
@@ -26,8 +26,8 @@ import android.view.MenuItem | |||
26 | import kotlinx.android.synthetic.main.status_activity.* | 26 | import kotlinx.android.synthetic.main.status_activity.* |
27 | import org.pacien.tincapp.R | 27 | import org.pacien.tincapp.R |
28 | import org.pacien.tincapp.activities.BaseActivity | 28 | import org.pacien.tincapp.activities.BaseActivity |
29 | import org.pacien.tincapp.activities.StartActivity | ||
30 | import org.pacien.tincapp.activities.common.ProgressModal | 29 | import org.pacien.tincapp.activities.common.ProgressModal |
30 | import org.pacien.tincapp.activities.start.StartActivity | ||
31 | import org.pacien.tincapp.activities.viewlog.ViewLogActivity | 31 | import org.pacien.tincapp.activities.viewlog.ViewLogActivity |
32 | import org.pacien.tincapp.intent.Actions | 32 | import org.pacien.tincapp.intent.Actions |
33 | import org.pacien.tincapp.intent.BroadcastMapper | 33 | import org.pacien.tincapp.intent.BroadcastMapper |
diff --git a/app/src/main/java/org/pacien/tincapp/activities/status/nodes/NodeListFragment.kt b/app/src/main/java/org/pacien/tincapp/activities/status/nodes/NodeListFragment.kt index 1cfc0f5..115809e 100644 --- a/app/src/main/java/org/pacien/tincapp/activities/status/nodes/NodeListFragment.kt +++ b/app/src/main/java/org/pacien/tincapp/activities/status/nodes/NodeListFragment.kt | |||
@@ -47,7 +47,7 @@ class NodeListFragment : Fragment() { | |||
47 | private val tincCtl = Tinc | 47 | private val tincCtl = Tinc |
48 | private val netName by lazy { vpnService.getCurrentNetName()!! } | 48 | private val netName by lazy { vpnService.getCurrentNetName()!! } |
49 | private val nodeListViewModel by lazy { ViewModelProviders.of(this).get(NodeListViewModel::class.java) } | 49 | private val nodeListViewModel by lazy { ViewModelProviders.of(this).get(NodeListViewModel::class.java) } |
50 | private val nodeListAdapter by lazy { ArrayAdapter<String>(context, R.layout.fragment_list_item) } | 50 | private val nodeListAdapter by lazy { ArrayAdapter<String>(context, R.layout.status_node_list_item) } |
51 | private val nodeListObserver by lazy { Observer<List<String>> { nodeListAdapter.setElements(it) } } | 51 | private val nodeListObserver by lazy { Observer<List<String>> { nodeListAdapter.setElements(it) } } |
52 | 52 | ||
53 | override fun onCreate(savedInstanceState: Bundle?) { | 53 | override fun onCreate(savedInstanceState: Bundle?) { |