diff options
Diffstat (limited to 'app/src/main/java/org/pacien')
15 files changed, 220 insertions, 372 deletions
diff --git a/app/src/main/java/org/pacien/tincapp/activities/configure/ConfigurationAccessServerFragment.kt b/app/src/main/java/org/pacien/tincapp/activities/configure/ConfigurationAccessServerFragment.kt deleted file mode 100644 index c90299a..0000000 --- a/app/src/main/java/org/pacien/tincapp/activities/configure/ConfigurationAccessServerFragment.kt +++ /dev/null | |||
@@ -1,77 +0,0 @@ | |||
1 | /* | ||
2 | * Tinc App, an Android binding and user interface for the tinc mesh VPN daemon | ||
3 | * Copyright (C) 2017-2020 Pacien TRAN-GIRARD | ||
4 | * | ||
5 | * This program is free software: you can redistribute it and/or modify | ||
6 | * it under the terms of the GNU General Public License as published by | ||
7 | * the Free Software Foundation, either version 3 of the License, or | ||
8 | * (at your option) any later version. | ||
9 | * | ||
10 | * This program is distributed in the hope that it will be useful, | ||
11 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
12 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
13 | * GNU General Public License for more details. | ||
14 | * | ||
15 | * You should have received a copy of the GNU General Public License | ||
16 | * along with this program. If not, see <https://www.gnu.org/licenses/>. | ||
17 | */ | ||
18 | |||
19 | package org.pacien.tincapp.activities.configure | ||
20 | |||
21 | import android.content.Intent | ||
22 | import android.os.Bundle | ||
23 | import android.view.LayoutInflater | ||
24 | import android.view.View | ||
25 | import android.view.ViewGroup | ||
26 | import androidx.databinding.Observable | ||
27 | import androidx.databinding.ObservableBoolean | ||
28 | import org.pacien.tincapp.activities.BaseFragment | ||
29 | import org.pacien.tincapp.databinding.ConfigureToolsConfigurationAccessFragmentBinding | ||
30 | import org.pacien.tincapp.service.ConfigurationAccessService | ||
31 | |||
32 | /** | ||
33 | * @author pacien | ||
34 | */ | ||
35 | class ConfigurationAccessServerFragment : BaseFragment() { | ||
36 | private val ftpServerStartListener = object : Observable.OnPropertyChangedCallback() { | ||
37 | override fun onPropertyChanged(sender: Observable, propertyId: Int) { | ||
38 | binding.ftpEnabled = (sender as ObservableBoolean).get() | ||
39 | } | ||
40 | } | ||
41 | |||
42 | private lateinit var binding: ConfigureToolsConfigurationAccessFragmentBinding | ||
43 | |||
44 | override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View { | ||
45 | binding = ConfigureToolsConfigurationAccessFragmentBinding.inflate(inflater, container, false) | ||
46 | binding.toggleFtpState = { toggleServer() } | ||
47 | setConnectionInfo() | ||
48 | return binding.root | ||
49 | } | ||
50 | |||
51 | override fun onResume() { | ||
52 | super.onResume() | ||
53 | setConnectionInfo() | ||
54 | ConfigurationAccessService.runningState.addOnPropertyChangedCallback(ftpServerStartListener) | ||
55 | binding.ftpEnabled = ConfigurationAccessService.runningState.get() | ||
56 | } | ||
57 | |||
58 | override fun onPause() { | ||
59 | ConfigurationAccessService.runningState.removeOnPropertyChangedCallback(ftpServerStartListener) | ||
60 | super.onPause() | ||
61 | } | ||
62 | |||
63 | private fun setConnectionInfo() { | ||
64 | binding.ftpUsername = ConfigurationAccessService.getFtpUsername() | ||
65 | binding.ftpPassword = ConfigurationAccessService.getFtpPassword() | ||
66 | binding.ftpPort = ConfigurationAccessService.getFtpPort() | ||
67 | } | ||
68 | |||
69 | private fun toggleServer() { | ||
70 | val targetServiceIntent = Intent(requireContext(), ConfigurationAccessService::class.java) | ||
71 | |||
72 | if (binding.ftpEnabled) | ||
73 | requireContext().stopService(targetServiceIntent) | ||
74 | else | ||
75 | requireContext().startService(targetServiceIntent) | ||
76 | } | ||
77 | } | ||
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 9d30bee..5850a1c 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 | |||
@@ -1,6 +1,6 @@ | |||
1 | /* | 1 | /* |
2 | * Tinc App, an Android binding and user interface for the tinc mesh VPN daemon | 2 | * Tinc App, an Android binding and user interface for the tinc mesh VPN daemon |
3 | * Copyright (C) 2017-2020 Pacien TRAN-GIRARD | 3 | * Copyright (C) 2017-2023 Pacien TRAN-GIRARD |
4 | * | 4 | * |
5 | * This program is free software: you can redistribute it and/or modify | 5 | * This program is free software: you can redistribute it and/or modify |
6 | * it under the terms of the GNU General Public License as published by | 6 | * it under the terms of the GNU General Public License as published by |
@@ -46,5 +46,5 @@ class ToolsFragment : BaseFragment() { | |||
46 | } | 46 | } |
47 | 47 | ||
48 | private fun openDialog(tool: ConfigurationToolDialogFragment): () -> Unit = | 48 | private fun openDialog(tool: ConfigurationToolDialogFragment): () -> Unit = |
49 | { tool.show(fragmentManager, tool.javaClass.simpleName) } | 49 | { if (!tool.isAdded) tool.show(fragmentManager!!, tool.javaClass.simpleName) } |
50 | } | 50 | } |
diff --git a/app/src/main/java/org/pacien/tincapp/activities/configure/tools/GenerateConfigToolDialogFragment.kt b/app/src/main/java/org/pacien/tincapp/activities/configure/tools/GenerateConfigToolDialogFragment.kt index 96e39ba..c152d54 100644 --- a/app/src/main/java/org/pacien/tincapp/activities/configure/tools/GenerateConfigToolDialogFragment.kt +++ b/app/src/main/java/org/pacien/tincapp/activities/configure/tools/GenerateConfigToolDialogFragment.kt | |||
@@ -1,6 +1,6 @@ | |||
1 | /* | 1 | /* |
2 | * Tinc App, an Android binding and user interface for the tinc mesh VPN daemon | 2 | * Tinc App, an Android binding and user interface for the tinc mesh VPN daemon |
3 | * Copyright (C) 2017-2018 Pacien TRAN-GIRARD | 3 | * Copyright (C) 2017-2024 Pacien TRAN-GIRARD |
4 | * | 4 | * |
5 | * This program is free software: you can redistribute it and/or modify | 5 | * This program is free software: you can redistribute it and/or modify |
6 | * it under the terms of the GNU General Public License as published by | 6 | * it under the terms of the GNU General Public License as published by |
@@ -23,6 +23,8 @@ import kotlinx.android.synthetic.main.configure_tools_dialog_network_generate.vi | |||
23 | import org.pacien.tincapp.R | 23 | import org.pacien.tincapp.R |
24 | import org.pacien.tincapp.commands.Tinc | 24 | import org.pacien.tincapp.commands.Tinc |
25 | import org.pacien.tincapp.commands.TincApp | 25 | import org.pacien.tincapp.commands.TincApp |
26 | import org.pacien.tincapp.context.AppPaths | ||
27 | import org.pacien.tincapp.utils.makePublic | ||
26 | 28 | ||
27 | /** | 29 | /** |
28 | * @author pacien | 30 | * @author pacien |
@@ -47,5 +49,6 @@ class GenerateConfigToolDialogFragment : ConfigurationToolDialogFragment() { | |||
47 | .thenCompose { Tinc.init(netName, nodeName) } | 49 | .thenCompose { Tinc.init(netName, nodeName) } |
48 | .thenCompose { TincApp.removeScripts(netName) } | 50 | .thenCompose { TincApp.removeScripts(netName) } |
49 | .thenCompose { TincApp.generateIfaceCfgTemplate(netName) } | 51 | .thenCompose { TincApp.generateIfaceCfgTemplate(netName) } |
50 | .thenCompose { TincApp.setPassphrase(netName, newPassphrase = passphrase) }) | 52 | .thenCompose { TincApp.setPassphrase(netName, newPassphrase = passphrase) } |
53 | .thenApply { AppPaths.confDir(netName).makePublic() }) | ||
51 | } | 54 | } |
diff --git a/app/src/main/java/org/pacien/tincapp/activities/configure/tools/JoinNetworkToolDialogFragment.kt b/app/src/main/java/org/pacien/tincapp/activities/configure/tools/JoinNetworkToolDialogFragment.kt index 25bdb15..f00b961 100644 --- a/app/src/main/java/org/pacien/tincapp/activities/configure/tools/JoinNetworkToolDialogFragment.kt +++ b/app/src/main/java/org/pacien/tincapp/activities/configure/tools/JoinNetworkToolDialogFragment.kt | |||
@@ -1,6 +1,6 @@ | |||
1 | /* | 1 | /* |
2 | * Tinc App, an Android binding and user interface for the tinc mesh VPN daemon | 2 | * Tinc App, an Android binding and user interface for the tinc mesh VPN daemon |
3 | * Copyright (C) 2017-2018 Pacien TRAN-GIRARD | 3 | * Copyright (C) 2017-2024 Pacien TRAN-GIRARD |
4 | * | 4 | * |
5 | * This program is free software: you can redistribute it and/or modify | 5 | * This program is free software: you can redistribute it and/or modify |
6 | * it under the terms of the GNU General Public License as published by | 6 | * it under the terms of the GNU General Public License as published by |
@@ -27,7 +27,9 @@ import kotlinx.android.synthetic.main.configure_tools_dialog_network_join.view.* | |||
27 | import org.pacien.tincapp.R | 27 | import org.pacien.tincapp.R |
28 | import org.pacien.tincapp.commands.Tinc | 28 | import org.pacien.tincapp.commands.Tinc |
29 | import org.pacien.tincapp.commands.TincApp | 29 | import org.pacien.tincapp.commands.TincApp |
30 | import org.pacien.tincapp.context.AppPaths | ||
30 | import org.pacien.tincapp.databinding.ConfigureToolsDialogNetworkJoinBinding | 31 | import org.pacien.tincapp.databinding.ConfigureToolsDialogNetworkJoinBinding |
32 | import org.pacien.tincapp.utils.makePublic | ||
31 | 33 | ||
32 | /** | 34 | /** |
33 | * @author pacien | 35 | * @author pacien |
@@ -78,5 +80,6 @@ class JoinNetworkToolDialogFragment : ConfigurationToolDialogFragment() { | |||
78 | .thenCompose { TincApp.removeScripts(netName) } | 80 | .thenCompose { TincApp.removeScripts(netName) } |
79 | .thenCompose { TincApp.generateIfaceCfg(netName) } | 81 | .thenCompose { TincApp.generateIfaceCfg(netName) } |
80 | .thenCompose { TincApp.setPassphrase(netName, newPassphrase = passphrase) } |