From 355251694d63640f028f3e2c17235d12a8573df6 Mon Sep 17 00:00:00 2001
From: pacien
Date: Tue, 8 Dec 2020 18:03:20 +0100
Subject: ConfigurationAccessService: prevent service from being stopped when
 app loses focus

This makes the ConfigurationAccessService (formerly ConfigurationFtpService) start in foreground
through the use of a persistent notification so that it isn't stopped by the system after the app
loses the focus on the user's screen, which happens when the user switches to an FTP client
application on the same device.
---
 .../ic_baseline_folder_open_primary_24dp.xml       | 29 ++++++++
 app/src/main/res/layout/configure_activity.xml     |  4 +-
 ...nfigure_tools_configuration_access_fragment.xml | 86 ++++++++++++++++++++++
 ...ure_tools_configuration_ftp_server_fragment.xml | 86 ----------------------
 app/src/main/res/values/strings.xml                |  6 +-
 5 files changed, 122 insertions(+), 89 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_baseline_folder_open_primary_24dp.xml
 create mode 100644 app/src/main/res/layout/configure_tools_configuration_access_fragment.xml
 delete mode 100644 app/src/main/res/layout/configure_tools_configuration_ftp_server_fragment.xml

(limited to 'app/src/main/res')

diff --git a/app/src/main/res/drawable/ic_baseline_folder_open_primary_24dp.xml b/app/src/main/res/drawable/ic_baseline_folder_open_primary_24dp.xml
new file mode 100644
index 0000000..da24678
--- /dev/null
+++ b/app/src/main/res/drawable/ic_baseline_folder_open_primary_24dp.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+ * Material design icon
+ * Copyright 2017 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+-->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@color/textTitle"
+        android:pathData="M20,6h-8l-2,-2L4,4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,8c0,-1.1 -0.9,-2 -2,-2zM20,18L4,18L4,8h16v10z" />
+</vector>
diff --git a/app/src/main/res/layout/configure_activity.xml b/app/src/main/res/layout/configure_activity.xml
index 2fde4a2..08f29af 100644
--- a/app/src/main/res/layout/configure_activity.xml
+++ b/app/src/main/res/layout/configure_activity.xml
@@ -30,11 +30,11 @@
 
         <TextView
             style="@style/AppTheme.SectionTitle"
-            android:text="@string/configure_activity_title_configuration_server"/>
+            android:text="@string/configure_activity_title_configuration_access"/>
 
         <fragment
             android:id="@+id/configure_activity_configuration_sftp_server_fragment"
-            android:name="org.pacien.tincapp.activities.configure.ConfigurationFtpServerFragment"
+            android:name="org.pacien.tincapp.activities.configure.ConfigurationAccessServerFragment"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"/>
 
diff --git a/app/src/main/res/layout/configure_tools_configuration_access_fragment.xml b/app/src/main/res/layout/configure_tools_configuration_access_fragment.xml
new file mode 100644
index 0000000..24f3c36
--- /dev/null
+++ b/app/src/main/res/layout/configure_tools_configuration_access_fragment.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+ * Tinc App, an Android binding and user interface for the tinc mesh VPN daemon
+ * Copyright (C) 2017-2020 Pacien TRAN-GIRARD
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+-->
+
+<layout xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <data>
+
+        <variable
+            name="ftpEnabled"
+            type="boolean" />
+
+        <variable
+            name="ftpUsername"
+            type="String" />
+
+        <variable
+            name="ftpPassword"
+            type="String" />
+
+        <variable
+            name="ftpPort"
+            type="int" />
+
+        <variable
+            name="toggleFtpState"
+            type="kotlin.jvm.functions.Function0&lt;kotlin.Unit>" />
+
+    </data>
+
+    <LinearLayout style="@style/AppTheme.List">
+
+        <LinearLayout
+            style="@style/AppTheme.ListBlock.Clickable"
+            android:onClick="@{() -> toggleFtpState.invoke()}"
+            android:orientation="horizontal">
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:orientation="vertical">
+
+                <TextView
+                    style="@style/AppTheme.BlockTitle"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/configure_configuration_server_ftp_access" />
+
+                <TextView
+                    style="@style/AppTheme.BlockContent"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@{ftpEnabled ? @string/configure_configuration_server_ftp_access_endpoint_format(ftpUsername, ftpPassword, ftpPort) : @string/configure_configuration_server_ftp_access_not_active}"
+                    android:textIsSelectable="@{ftpEnabled}" />
+
+            </LinearLayout>
+
+            <androidx.appcompat.widget.SwitchCompat
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_weight="0"
+                android:checked="@{ftpEnabled}"
+                android:onClick="@{() -> toggleFtpState.invoke()}" />
+
+        </LinearLayout>
+
+    </LinearLayout>
+
+</layout>
diff --git a/app/src/main/res/layout/configure_tools_configuration_ftp_server_fragment.xml b/app/src/main/res/layout/configure_tools_configuration_ftp_server_fragment.xml
deleted file mode 100644
index 24f3c36..0000000
--- a/app/src/main/res/layout/configure_tools_configuration_ftp_server_fragment.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
- * Tinc App, an Android binding and user interface for the tinc mesh VPN daemon
- * Copyright (C) 2017-2020 Pacien TRAN-GIRARD
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
--->
-
-<layout xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <data>
-
-        <variable
-            name="ftpEnabled"
-            type="boolean" />
-
-        <variable
-            name="ftpUsername"
-            type="String" />
-
-        <variable
-            name="ftpPassword"
-            type="String" />
-
-        <variable
-            name="ftpPort"
-            type="int" />
-
-        <variable
-            name="toggleFtpState"
-            type="kotlin.jvm.functions.Function0&lt;kotlin.Unit>" />
-
-    </data>
-
-    <LinearLayout style="@style/AppTheme.List">
-
-        <LinearLayout
-            style="@style/AppTheme.ListBlock.Clickable"
-            android:onClick="@{() -> toggleFtpState.invoke()}"
-            android:orientation="horizontal">
-
-            <LinearLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:orientation="vertical">
-
-                <TextView
-                    style="@style/AppTheme.BlockTitle"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/configure_configuration_server_ftp_access" />
-
-                <TextView
-                    style="@style/AppTheme.BlockContent"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@{ftpEnabled ? @string/configure_configuration_server_ftp_access_endpoint_format(ftpUsername, ftpPassword, ftpPort) : @string/configure_configuration_server_ftp_access_not_active}"
-                    android:textIsSelectable="@{ftpEnabled}" />
-
-            </LinearLayout>
-
-            <androidx.appcompat.widget.SwitchCompat
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:layout_weight="0"
-                android:checked="@{ftpEnabled}"
-                android:onClick="@{() -> toggleFtpState.invoke()}" />
-
-        </LinearLayout>
-
-    </LinearLayout>
-
-</layout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index cae7fe5..6c1a934 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -75,6 +75,10 @@
 	<string name="notification_error_message_network_config_invalid_format">Invalid network configuration in network.conf:\n%1$s</string>
 	<string name="notification_error_message_could_not_decrypt_private_keys_format">Could not decrypt private keys:\n%1$s</string>
 
+	<string name="notification_config_access_channel_name">Configuration access</string>
+	<string name="notification_config_access_server_running_title">Configuration access server active</string>
+	<string name="notification_config_access_server_running_message">The configuration directory is accessible through FTP.</string>
+
 	<!-- Start activity -->
 	<string name="start_activity_menu_configure">Configure</string>
 	<string name="start_network_list_title">Connect to network</string>
@@ -85,7 +89,7 @@
 	<string name="configure_tools_message_invalid_network_name">Invalid network name.</string>
 	<string name="configure_tools_message_network_configuration_written">Network configuration written.</string>
 
-	<string name="configure_activity_title_configuration_server">Configuration server</string>
+	<string name="configure_activity_title_configuration_access">Configuration access</string>
 	<string name="configure_configuration_server_ftp_access">FTP access</string>
 	<string name="configure_configuration_server_ftp_access_endpoint_format">User: %1$s, password: %2$s, port: %3$d</string>
 	<string name="configure_configuration_server_ftp_access_not_active">Not active</string>
-- 
cgit v1.2.3