aboutsummaryrefslogtreecommitdiff
path: root/app/src/main/java/org/pacien/tincapp/activities/start
diff options
context:
space:
mode:
Diffstat (limited to 'app/src/main/java/org/pacien/tincapp/activities/start')
-rw-r--r--app/src/main/java/org/pacien/tincapp/activities/start/ErrorNotificationFragment.kt60
-rw-r--r--app/src/main/java/org/pacien/tincapp/activities/start/StartActivity.kt9
2 files changed, 67 insertions, 2 deletions
diff --git a/app/src/main/java/org/pacien/tincapp/activities/start/ErrorNotificationFragment.kt b/app/src/main/java/org/pacien/tincapp/activities/start/ErrorNotificationFragment.kt
new file mode 100644
index 0000000..ed60d63
--- /dev/null
+++ b/app/src/main/java/org/pacien/tincapp/activities/start/ErrorNotificationFragment.kt
@@ -0,0 +1,60 @@
1/*
2 * Tinc App, an Android binding and user interface for the tinc mesh VPN daemon
3 * Copyright (C) 2017-2023 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
19package org.pacien.tincapp.activities.start
20
21import android.content.SharedPreferences.OnSharedPreferenceChangeListener
22import android.os.Bundle
23import android.view.LayoutInflater
24import android.view.View
25import android.view.ViewGroup
26import org.pacien.tincapp.activities.BaseFragment
27import org.pacien.tincapp.context.App
28import org.pacien.tincapp.context.AppNotificationManager
29import org.pacien.tincapp.databinding.StartErrorNotificationBinding
30
31/**
32 * @author pacien
33 */
34class ErrorNotificationFragment : BaseFragment() {
35 private val notificationManager by lazy { AppNotificationManager(context!!) }
36 private val notificationListener = OnSharedPreferenceChangeListener { _, _ -> updateView() }
37 private lateinit var viewBinding: StartErrorNotificationBinding
38
39 override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
40 viewBinding = StartErrorNotificationBinding.inflate(inflater, container, false)
41 updateView()
42 return viewBinding.root
43 }
44
45 override fun onResume() {
46 super.onResume()
47 notificationManager.registerListener(notificationListener)
48 }
49
50 override fun onPause() {
51 super.onPause()
52 notificationManager.unregisterListener(notificationListener)
53 }
54
55 private fun updateView() {
56 val maybeError = notificationManager.getError()
57 viewBinding.errorNotification = maybeError
58 viewBinding.openManualAction = { App.openURL(maybeError?.manualLink!!) }
59 }
60}
diff --git a/app/src/main/java/org/pacien/tincapp/activities/start/StartActivity.kt b/app/src/main/java/org/pacien/tincapp/activities/start/StartActivity.kt
index 144326d..7db0344 100644
--- a/app/src/main/java/org/pacien/tincapp/activities/start/StartActivity.kt
+++ b/app/src/main/java/org/pacien/tincapp/activities/start/StartActivity.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
@@ -61,7 +61,7 @@ class StartActivity : BaseActivity() {
61 61
62 private fun initNetworkListFragment() { 62 private fun initNetworkListFragment() {
63 val fragment = start_activity_network_list_fragment as NetworkListFragment 63 val fragment = start_activity_network_list_fragment as NetworkListFragment
64 fragment.connectToNetworkAction = { netName -> connectionStarter.tryStart(netName, displayStatus = true) } 64 fragment.connectToNetworkAction = { netName -> connectToNetworkAction(netName) }
65 } 65 }
66 66
67 override fun onCreateOptionsMenu(m: Menu): Boolean { 67 override fun onCreateOptionsMenu(m: Menu): Boolean {
@@ -95,6 +95,11 @@ class StartActivity : BaseActivity() {
95 super.onActivityResult(request, result, data) 95 super.onActivityResult(request, result, data)
96 } 96 }
97 97
98 private fun connectToNetworkAction(netName: String) {
99 if (connectDialog?.isShowing == true) return
100 connectionStarter.tryStart(netName, displayStatus = true)
101 }
102
98 private fun continueConnectionStart(result: Int): Unit = when (result) { 103 private fun continueConnectionStart(result: Int): Unit = when (result) {
99 Activity.RESULT_OK -> connectionStarter.tryStart() 104 Activity.RESULT_OK -> connectionStarter.tryStart()
100 else -> App.alert(R.string.notification_error_title_unable_to_start_tinc, getString(R.string.notification_error_message_could_not_bind_iface)) 105 else -> App.alert(R.string.notification_error_title_unable_to_start_tinc, getString(R.string.notification_error_message_could_not_bind_iface))