diff options
Diffstat (limited to 'app/src/main/java/org/pacien/tincapp/activities/configure/tools')
-rw-r--r-- | app/src/main/java/org/pacien/tincapp/activities/configure/tools/JoinNetworkTool.kt | 6 |
1 files changed, 3 insertions, 3 deletions
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?) { |