aboutsummaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorpacien2023-01-02 01:36:54 +0100
committerpacien2023-01-02 01:36:54 +0100
commit37d72b13961b67a329d115291e3a182e3c14d8e3 (patch)
tree8d0b8dce34d016609f4f25525ebb5441ccf5efd7 /app
parent26cce68d6a3441154555228192308d519aa4c644 (diff)
downloadtincapp-37d72b13961b67a329d115291e3a182e3c14d8e3.tar.gz
activity/start: add network trust warning header
The "prominent disclosure" is a new requirement for Google Play: https://support.google.com/googleplay/android-developer/answer/12564964?hl=en
Diffstat (limited to 'app')
-rw-r--r--app/src/main/res/layout/start_network_list.xml7
-rw-r--r--app/src/main/res/values/strings.xml3
2 files changed, 8 insertions, 2 deletions
diff --git a/app/src/main/res/layout/start_network_list.xml b/app/src/main/res/layout/start_network_list.xml
index 02a78d1..10083da 100644
--- a/app/src/main/res/layout/start_network_list.xml
+++ b/app/src/main/res/layout/start_network_list.xml
@@ -2,7 +2,7 @@
2 2
3<!-- 3<!--
4 * Tinc App, an Android binding and user interface for the tinc mesh VPN daemon 4 * Tinc App, an Android binding and user interface for the tinc mesh VPN daemon
5 * Copyright (C) 2017-2018 Pacien TRAN-GIRARD 5 * Copyright (C) 2017-2023 Pacien TRAN-GIRARD
6 * 6 *
7 * This program is free software: you can redistribute it and/or modify 7 * This program is free software: you can redistribute it and/or modify
8 * it under the terms of the GNU General Public License as published by 8 * it under the terms of the GNU General Public License as published by
@@ -25,6 +25,11 @@
25 android:layout_height="match_parent" 25 android:layout_height="match_parent"
26 android:orientation="vertical"> 26 android:orientation="vertical">
27 27
28 <TextView
29 android:id="@+id/start_network_list_warning_text"
30 style="@style/AppTheme.ListBlock.Placeholder"
31 android:text="@string/start_network_list_warning_text"/>
32
28 <ListView 33 <ListView
29 android:id="@+id/start_network_list" 34 android:id="@+id/start_network_list"
30 android:layout_width="match_parent" 35 android:layout_width="match_parent"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 81f0902..70da5b0 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -2,7 +2,7 @@
2 2
3<!-- 3<!--
4 * Tinc App, an Android binding and user interface for the tinc mesh VPN daemon 4 * Tinc App, an Android binding and user interface for the tinc mesh VPN daemon
5 * Copyright (C) 2017-2021 Pacien TRAN-GIRARD 5 * Copyright (C) 2017-2023 Pacien TRAN-GIRARD
6 * 6 *
7 * This program is free software: you can redistribute it and/or modify 7 * This program is free software: you can redistribute it and/or modify
8 * it under the terms of the GNU General Public License as published by 8 * it under the terms of the GNU General Public License as published by
@@ -81,6 +81,7 @@
81 81
82 <!-- Start activity --> 82 <!-- Start activity -->
83 <string name="start_activity_menu_configure">Configure</string> 83 <string name="start_activity_menu_configure">Configure</string>
84 <string name="start_network_list_warning_text">Traffic from this device will be partially or fully routed to and through the selected network in accordance with your configuration. Never connect to a tinc network which you do not trust.</string>
84 <string name="start_network_list_title">Connect to network</string> 85 <string name="start_network_list_title">Connect to network</string>
85 <string name="start_network_list_empty_none_found">Could not find any network configuration.</string> 86 <string name="start_network_list_empty_none_found">Could not find any network configuration.</string>
86 <string name="start_starting_vpn">Starting VPN…</string> 87 <string name="start_starting_vpn">Starting VPN…</string>