aboutsummaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authoreuxane2024-09-18 23:41:13 +0200
committereuxane2024-09-18 23:41:13 +0200
commit36dd8ce58c470f101cc603716e1d18bf2f8751b1 (patch)
treeac4c938d0b8ca3ff8deddb38f9655da8d1ae559b /app
parentf88d3d3a95c8b4305dffb4570656939f33c2d416 (diff)
downloadtincapp-36dd8ce58c470f101cc603716e1d18bf2f8751b1.tar.gz
errors: update manual links for mulitple help pages
Diffstat (limited to 'app')
-rw-r--r--app/src/main/java/org/pacien/tincapp/activities/BaseFragment.kt4
-rw-r--r--app/src/main/java/org/pacien/tincapp/service/TincVpnService.kt10
-rw-r--r--app/src/main/res/values/strings.xml2
3 files changed, 8 insertions, 8 deletions
diff --git a/app/src/main/java/org/pacien/tincapp/activities/BaseFragment.kt b/app/src/main/java/org/pacien/tincapp/activities/BaseFragment.kt
index 063680f..9b123bf 100644
--- a/app/src/main/java/org/pacien/tincapp/activities/BaseFragment.kt
+++ b/app/src/main/java/org/pacien/tincapp/activities/BaseFragment.kt
@@ -36,9 +36,9 @@ abstract class BaseFragment : Fragment() {
36 parentActivity.runOnUiThread { 36 parentActivity.runOnUiThread {
37 parentActivity.showErrorDialog( 37 parentActivity.showErrorDialog(
38 R.string.configure_browse_directories_error_no_file_manager, 38 R.string.configure_browse_directories_error_no_file_manager,
39 docTopic = "browse-files", 39 docTopic = "troubleshooting.html#no-file-manager-found",
40 ) 40 )
41 } 41 }
42 } 42 }
43 } 43 }
44} \ No newline at end of file 44}
diff --git a/app/src/main/java/org/pacien/tincapp/service/TincVpnService.kt b/app/src/main/java/org/pacien/tincapp/service/TincVpnService.kt
index 4194224..c453adb 100644
--- a/app/src/main/java/org/pacien/tincapp/service/TincVpnService.kt
+++ b/app/src/main/java/org/pacien/tincapp/service/TincVpnService.kt
@@ -89,13 +89,13 @@ class TincVpnService : VpnService() {
89 89
90 private fun startVpn(netName: String, passphrase: String? = null): Unit = synchronized(this) { 90 private fun startVpn(netName: String, passphrase: String? = null): Unit = synchronized(this) {
91 if (netName.isBlank()) 91 if (netName.isBlank())
92 return reportError(resources.getString(R.string.notification_error_message_no_network_name_provided), docTopic = "intent-api") 92 return reportError(resources.getString(R.string.notification_error_message_no_network_name_provided), docTopic = "doc.html#intent-api")
93 93
94 if (TincKeyring.needsPassphrase(netName) && passphrase == null) 94 if (TincKeyring.needsPassphrase(netName) && passphrase == null)
95 return reportError(resources.getString(R.string.notification_error_message_passphrase_not_provided)) 95 return reportError(resources.getString(R.string.notification_error_message_passphrase_not_provided))
96 96
97 if (!AppPaths.confDir(netName).exists()) 97 if (!AppPaths.confDir(netName).exists())
98 return reportError(resources.getString(R.string.notification_error_message_no_configuration_for_network_format, netName), docTopic = "configuration-files") 98 return reportError(resources.getString(R.string.notification_error_message_no_configuration_for_network_format, netName), docTopic = "doc.html#configuration-files")
99 99
100 log.info("Starting tinc daemon for network \"$netName\".") 100 log.info("Starting tinc daemon for network \"$netName\".")
101 if (isConnected() || getCurrentNetName() != null) stopVpn().join() 101 if (isConnected() || getCurrentNetName() != null) stopVpn().join()
@@ -126,13 +126,13 @@ class TincVpnService : VpnService() {
126 return reportError( 126 return reportError(
127 resources.getString(R.string.notification_error_message_network_config_not_found_format, e.defaultMessage()), 127 resources.getString(R.string.notification_error_message_network_config_not_found_format, e.defaultMessage()),
128 e, 128 e,
129 docTopic = "configuration-files" 129 docTopic = "doc.html#configuration-files"
130 ) 130 )
131 } catch (e: ConversionException) { 131 } catch (e: ConversionException) {
132 return reportError( 132 return reportError(
133 resources.getString(R.string.notification_error_message_network_config_invalid_format, e.defaultMessage()), 133 resources.getString(R.string.notification_error_message_network_config_invalid_format, e.defaultMessage()),
134 e, 134 e,
135 docTopic = "network-interface", 135 docTopic = "doc.html#network-interface",
136 ) 136 )
137 } catch (e: Exception) { 137 } catch (e: Exception) {
138 return reportError( 138 return reportError(
@@ -153,7 +153,7 @@ class TincVpnService : VpnService() {
153 return reportError( 153 return reportError(
154 resources.getString(R.string.notification_error_message_network_config_invalid_format, e.defaultMessage()), 154 resources.getString(R.string.notification_error_message_network_config_invalid_format, e.defaultMessage()),
155 e, 155 e,
156 docTopic = "network-interface", 156 docTopic = "doc.html#network-interface",
157 configDir = netName, 157 configDir = netName,
158 ) 158 )
159 } catch (e: NullPointerException) { 159 } catch (e: NullPointerException) {
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 1c8a2ae..3443b88 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -20,7 +20,7 @@
20 20
21<resources> 21<resources>
22 <string name="app_name" translatable="false">Tinc Mesh VPN</string> 22 <string name="app_name" translatable="false">Tinc Mesh VPN</string>
23 <string name="app_doc_url_format" translatable="false">https://tincapp.euxane.net/doc.html#%1$s</string> 23 <string name="app_doc_url_format" translatable="false">https://tincapp.euxane.net/%1$s</string>
24 24
25 <!-- generic strings --> 25 <!-- generic strings -->
26 <string name="generic_title_error">Error</string> 26 <string name="generic_title_error">Error</string>