diff options
Diffstat (limited to 'app/src/main/java/org/pacien/tincapp/activities/configure')
3 files changed, 7 insertions, 7 deletions
diff --git a/app/src/main/java/org/pacien/tincapp/activities/configure/PathInfoFragment.kt b/app/src/main/java/org/pacien/tincapp/activities/configure/PathInfoFragment.kt index dae4413..57a6bee 100644 --- a/app/src/main/java/org/pacien/tincapp/activities/configure/PathInfoFragment.kt +++ b/app/src/main/java/org/pacien/tincapp/activities/configure/PathInfoFragment.kt | |||
@@ -18,18 +18,18 @@ | |||
18 | 18 | ||
19 | package org.pacien.tincapp.activities.configure | 19 | package org.pacien.tincapp.activities.configure |
20 | 20 | ||
21 | import android.app.Fragment | ||
22 | import android.os.Bundle | 21 | import android.os.Bundle |
23 | import android.view.LayoutInflater | 22 | import android.view.LayoutInflater |
24 | import android.view.View | 23 | import android.view.View |
25 | import android.view.ViewGroup | 24 | import android.view.ViewGroup |
25 | import org.pacien.tincapp.activities.BaseFragment | ||
26 | import org.pacien.tincapp.context.AppPaths | 26 | import org.pacien.tincapp.context.AppPaths |
27 | import org.pacien.tincapp.databinding.ConfigureToolsPathInfoFragmentBinding | 27 | import org.pacien.tincapp.databinding.ConfigureToolsPathInfoFragmentBinding |
28 | 28 | ||
29 | /** | 29 | /** |
30 | * @author pacien | 30 | * @author pacien |
31 | */ | 31 | */ |
32 | class PathInfoFragment : Fragment() { | 32 | class PathInfoFragment : BaseFragment() { |
33 | private val appPaths = AppPaths | 33 | private val appPaths = AppPaths |
34 | 34 | ||
35 | override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View { | 35 | override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View { |
diff --git a/app/src/main/java/org/pacien/tincapp/activities/configure/ToolsFragment.kt b/app/src/main/java/org/pacien/tincapp/activities/configure/ToolsFragment.kt index 0ad2f19..714a7ae 100644 --- a/app/src/main/java/org/pacien/tincapp/activities/configure/ToolsFragment.kt +++ b/app/src/main/java/org/pacien/tincapp/activities/configure/ToolsFragment.kt | |||
@@ -18,13 +18,13 @@ | |||
18 | 18 | ||
19 | package org.pacien.tincapp.activities.configure | 19 | package org.pacien.tincapp.activities.configure |
20 | 20 | ||
21 | import android.app.Fragment | ||
22 | import android.content.Intent | 21 | import android.content.Intent |
23 | import android.os.Bundle | 22 | import android.os.Bundle |
24 | import android.view.LayoutInflater | 23 | import android.view.LayoutInflater |
25 | import android.view.View | 24 | import android.view.View |
26 | import android.view.ViewGroup | 25 | import android.view.ViewGroup |
27 | import org.pacien.tincapp.activities.BaseActivity | 26 | import org.pacien.tincapp.activities.BaseActivity |
27 | import org.pacien.tincapp.activities.BaseFragment | ||
28 | import org.pacien.tincapp.activities.configure.tools.EncryptDecryptPrivateKeysTool | 28 | import org.pacien.tincapp.activities.configure.tools.EncryptDecryptPrivateKeysTool |
29 | import org.pacien.tincapp.activities.configure.tools.GenerateConfigTool | 29 | import org.pacien.tincapp.activities.configure.tools.GenerateConfigTool |
30 | import org.pacien.tincapp.activities.configure.tools.JoinNetworkTool | 30 | import org.pacien.tincapp.activities.configure.tools.JoinNetworkTool |
@@ -33,7 +33,7 @@ import org.pacien.tincapp.databinding.ConfigureToolsFragmentBinding | |||
33 | /** | 33 | /** |
34 | * @author pacien | 34 | * @author pacien |
35 | */ | 35 | */ |
36 | class ToolsFragment : Fragment() { | 36 | class ToolsFragment : BaseFragment() { |
37 | private val parentActivity by lazy { activity as BaseActivity } | 37 | private val parentActivity by lazy { activity as BaseActivity } |
38 | private val generateConfigTool by lazy { GenerateConfigTool(parentActivity) } | 38 | private val generateConfigTool by lazy { GenerateConfigTool(parentActivity) } |
39 | private val joinNetworkTool by lazy { JoinNetworkTool(this, parentActivity) } | 39 | private val joinNetworkTool by lazy { JoinNetworkTool(this, parentActivity) } |
diff --git a/app/src/main/java/org/pacien/tincapp/activities/configure/tools/JoinNetworkTool.kt b/app/src/main/java/org/pacien/tincapp/activities/configure/tools/JoinNetworkTool.kt index 82a4380..6656d86 100644 --- a/app/src/main/java/org/pacien/tincapp/activities/configure/tools/JoinNetworkTool.kt +++ b/app/src/main/java/org/pacien/tincapp/activities/configure/tools/JoinNetworkTool.kt | |||
@@ -18,7 +18,6 @@ | |||
18 | 18 | ||
19 | package org.pacien.tincapp.activities.configure.tools | 19 | package org.pacien.tincapp.activities.configure.tools |
20 | 20 | ||
21 | import android.app.Fragment | ||
22 | import android.content.Intent | 21 | import android.content.Intent |
23 | import android.view.View | 22 | import android.view.View |
24 | import com.google.zxing.integration.android.IntentIntegrator | 23 | import com.google.zxing.integration.android.IntentIntegrator |
@@ -26,6 +25,7 @@ import com.google.zxing.integration.android.IntentResult | |||
26 | import kotlinx.android.synthetic.main.configure_tools_dialog_network_join.view.* | 25 | import kotlinx.android.synthetic.main.configure_tools_dialog_network_join.view.* |
27 | import org.pacien.tincapp.R | 26 | import org.pacien.tincapp.R |
28 | import org.pacien.tincapp.activities.BaseActivity | 27 | import org.pacien.tincapp.activities.BaseActivity |
28 | import org.pacien.tincapp.activities.BaseFragment | ||
29 | import org.pacien.tincapp.commands.Tinc | 29 | import org.pacien.tincapp.commands.Tinc |
30 | import org.pacien.tincapp.commands.TincApp | 30 | import org.pacien.tincapp.commands.TincApp |
31 | import org.pacien.tincapp.databinding.ConfigureToolsDialogNetworkJoinBinding | 31 | import org.pacien.tincapp.databinding.ConfigureToolsDialogNetworkJoinBinding |
@@ -33,8 +33,8 @@ import org.pacien.tincapp.databinding.ConfigureToolsDialogNetworkJoinBinding | |||
33 | /** | 33 | /** |
34 | * @author pacien | 34 | * @author pacien |
35 | */ | 35 | */ |
36 | class JoinNetworkTool(parentFragment: Fragment, private val parentActivity: BaseActivity) : ConfigurationTool(parentActivity) { | 36 | class JoinNetworkTool(parentFragment: BaseFragment, private val parentActivity: BaseActivity) : ConfigurationTool(parentActivity) { |
37 | private val scanner by lazy { IntentIntegrator(parentFragment) } | 37 | private val scanner by lazy { IntentIntegrator.forSupportFragment(parentFragment) } |
38 | private var joinDialog: View? = null | 38 | private var joinDialog: View? = null |
39 | 39 | ||
40 | fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { | 40 | fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { |