aboutsummaryrefslogtreecommitdiff
path: root/app/src/main/java/org/pacien/tincapp/activities/status
diff options
context:
space:
mode:
Diffstat (limited to 'app/src/main/java/org/pacien/tincapp/activities/status')
-rw-r--r--app/src/main/java/org/pacien/tincapp/activities/status/networkinfo/NetworkInfoFragment.kt4
-rw-r--r--app/src/main/java/org/pacien/tincapp/activities/status/nodes/NodeListFragment.kt7
2 files changed, 5 insertions, 6 deletions
diff --git a/app/src/main/java/org/pacien/tincapp/activities/status/networkinfo/NetworkInfoFragment.kt b/app/src/main/java/org/pacien/tincapp/activities/status/networkinfo/NetworkInfoFragment.kt
index 5aa37a8..0129b75 100644
--- a/app/src/main/java/org/pacien/tincapp/activities/status/networkinfo/NetworkInfoFragment.kt
+++ b/app/src/main/java/org/pacien/tincapp/activities/status/networkinfo/NetworkInfoFragment.kt
@@ -19,17 +19,17 @@
19package org.pacien.tincapp.activities.status.networkinfo 19package org.pacien.tincapp.activities.status.networkinfo
20 20
21import android.os.Bundle 21import android.os.Bundle
22import android.support.v4.app.Fragment
23import android.view.LayoutInflater 22import android.view.LayoutInflater
24import android.view.View 23import android.view.View
25import android.view.ViewGroup 24import android.view.ViewGroup
25import org.pacien.tincapp.activities.BaseFragment
26import org.pacien.tincapp.databinding.StatusNetworkInfoFragmentBinding 26import org.pacien.tincapp.databinding.StatusNetworkInfoFragmentBinding
27import org.pacien.tincapp.service.TincVpnService 27import org.pacien.tincapp.service.TincVpnService
28 28
29/** 29/**
30 * @author pacien 30 * @author pacien
31 */ 31 */
32class NetworkInfoFragment : Fragment() { 32class NetworkInfoFragment : BaseFragment() {
33 private val vpnService by lazy { TincVpnService } 33 private val vpnService by lazy { TincVpnService }
34 private val interfaceConfiguration by lazy { vpnService.getCurrentInterfaceCfg() } 34 private val interfaceConfiguration by lazy { vpnService.getCurrentInterfaceCfg() }
35 private val listFormatter = VpnInterfaceConfigurationFormatter 35 private val listFormatter = VpnInterfaceConfigurationFormatter
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 cf1c1bc..4d245ef 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
@@ -21,15 +21,14 @@ package org.pacien.tincapp.activities.status.nodes
21import android.arch.lifecycle.Observer 21import android.arch.lifecycle.Observer
22import android.arch.lifecycle.ViewModelProviders 22import android.arch.lifecycle.ViewModelProviders
23import android.os.Bundle 23import android.os.Bundle
24import android.support.v4.app.Fragment
25import android.support.v7.app.AlertDialog 24import android.support.v7.app.AlertDialog
26import android.view.LayoutInflater 25import android.view.LayoutInflater
27import android.view.View 26import android.view.View
28import android.view.ViewGroup 27import android.view.ViewGroup
29import kotlinx.android.synthetic.main.base_activity.*
30import kotlinx.android.synthetic.main.status_node_info_dialog.view.* 28import kotlinx.android.synthetic.main.status_node_info_dialog.view.*
31import kotlinx.android.synthetic.main.status_node_list_fragment.* 29import kotlinx.android.synthetic.main.status_node_list_fragment.*
32import org.pacien.tincapp.R 30import org.pacien.tincapp.R
31import org.pacien.tincapp.activities.BaseFragment
33import org.pacien.tincapp.commands.Tinc 32import org.pacien.tincapp.commands.Tinc
34import org.pacien.tincapp.extensions.hideBottomSeparator 33import org.pacien.tincapp.extensions.hideBottomSeparator
35import org.pacien.tincapp.extensions.hideTopSeparator 34import org.pacien.tincapp.extensions.hideTopSeparator
@@ -39,7 +38,7 @@ import org.pacien.tincapp.service.TincVpnService
39/** 38/**
40 * @author pacien 39 * @author pacien
41 */ 40 */
42class NodeListFragment : Fragment() { 41class NodeListFragment : BaseFragment() {
43 private val vpnService = TincVpnService 42 private val vpnService = TincVpnService
44 private val tincCtl = Tinc 43 private val tincCtl = Tinc
45 private val netName by lazy { vpnService.getCurrentNetName()!! } 44 private val netName by lazy { vpnService.getCurrentNetName()!! }
@@ -67,7 +66,7 @@ class NodeListFragment : Fragment() {
67 showNodeInfo(nodeInfo.name) 66 showNodeInfo(nodeInfo.name)
68 67
69 private fun showNodeInfo(nodeName: String) { 68 private fun showNodeInfo(nodeName: String) {
70 val dialogTextView = layoutInflater.inflate(R.layout.status_node_info_dialog, base_activity_frame, false) 69 val dialogTextView = inflate(R.layout.status_node_info_dialog)
71 70
72 AlertDialog.Builder(context!!) 71 AlertDialog.Builder(context!!)
73 .setTitle(R.string.status_node_info_dialog_title) 72 .setTitle(R.string.status_node_info_dialog_title)