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.
---
 app/src/main/res/layout/configure_activity.xml     |  4 +-
 ...nfigure_tools_configuration_access_fragment.xml | 86 ++++++++++++++++++++++
 ...ure_tools_configuration_ftp_server_fragment.xml | 86 ----------------------
 3 files changed, 88 insertions(+), 88 deletions(-)
 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/layout')

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>
-- 
cgit v1.2.3