From fa227224986df51d8fb5a4b3e46e39887c9ec8d9 Mon Sep 17 00:00:00 2001
From: TPJ Schikhof <kde@schikhof.eu>
Date: Fri, 27 Dec 2024 18:20:08 +0000
Subject: [PATCH] Allow for debugging on the same device

This change builds separate debugging app with a different
ID which can be installed alongside the release version.
---
 AndroidManifest.xml                              |  2 +-
 build.gradle.kts                                 | 10 ++++++++++
 dbg-res/mipmap-anydpi-v26/ic_launcher.xml        |  6 ++++++
 dbg-res/mipmap-anydpi-v26/ic_launcher_banner.xml |  5 +++++
 dbg-res/mipmap-anydpi-v26/ic_launcher_round.xml  |  6 ++++++
 dbg-res/values/strings.xml                       | 11 +++++++++++
 src/org/kde/kdeconnect/BackgroundService.kt      |  7 ++++---
 7 files changed, 43 insertions(+), 4 deletions(-)
 create mode 100644 dbg-res/mipmap-anydpi-v26/ic_launcher.xml
 create mode 100644 dbg-res/mipmap-anydpi-v26/ic_launcher_banner.xml
 create mode 100644 dbg-res/mipmap-anydpi-v26/ic_launcher_round.xml
 create mode 100644 dbg-res/values/strings.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index ff7b2b12..b55635a9 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -359,7 +359,7 @@ SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted
 
         <provider
             android:name="androidx.core.content.FileProvider"
-            android:authorities="org.kde.kdeconnect_tp.fileprovider"
+            android:authorities="${applicationId}.fileprovider"
             android:exported="false"
             android:grantUriPermissions="true">
             <meta-data
diff --git a/build.gradle.kts b/build.gradle.kts
index 0a669b5b..777c8057 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -27,6 +27,7 @@ plugins {
 }
 
 val licenseResDir = File("$projectDir/build/dependency-license-res")
+val debugSuffix = "debugging_edition"
 
 fun String.runCommand(
     workingDir: File = File("."),
@@ -82,6 +83,13 @@ android {
             res.setSrcDirs(listOf(licenseResDir, "res"))
             assets.setSrcDirs(listOf("assets"))
         }
+        getByName("debug") {
+            manifest.srcFile("AndroidManifest.xml")
+            java.setSrcDirs(listOf("src"))
+            resources.setSrcDirs(listOf("resources"))
+            res.setSrcDirs(listOf(licenseResDir, "dbg-res"))
+            assets.setSrcDirs(listOf("assets"))
+        }
         getByName("test") {
             java.setSrcDirs(listOf("tests"))
         }
@@ -105,6 +113,8 @@ android {
             isMinifyEnabled = false
             isShrinkResources = false
             signingConfig = signingConfigs.getByName("debug")
+            applicationIdSuffix = ".$debugSuffix"
+            versionNameSuffix = "-$debugSuffix"
         }
         getByName("release") {
             isMinifyEnabled = true
diff --git a/dbg-res/mipmap-anydpi-v26/ic_launcher.xml b/dbg-res/mipmap-anydpi-v26/ic_launcher.xml
new file mode 100644
index 00000000..54a164b5
--- /dev/null
+++ b/dbg-res/mipmap-anydpi-v26/ic_launcher.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+<!--    <background android:drawable="@drawable/ic_launcher_background"/>-->
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+    <monochrome android:drawable="@drawable/ic_launcher_monochrome"/>
+</adaptive-icon>
\ No newline at end of file
diff --git a/dbg-res/mipmap-anydpi-v26/ic_launcher_banner.xml b/dbg-res/mipmap-anydpi-v26/ic_launcher_banner.xml
new file mode 100644
index 00000000..d8059729
--- /dev/null
+++ b/dbg-res/mipmap-anydpi-v26/ic_launcher_banner.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+<!--    <background android:drawable="@drawable/ic_launcher_banner_background"/>-->
+    <foreground android:drawable="@drawable/ic_launcher_banner_foreground"/>
+</adaptive-icon>
\ No newline at end of file
diff --git a/dbg-res/mipmap-anydpi-v26/ic_launcher_round.xml b/dbg-res/mipmap-anydpi-v26/ic_launcher_round.xml
new file mode 100644
index 00000000..54a164b5
--- /dev/null
+++ b/dbg-res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+<!--    <background android:drawable="@drawable/ic_launcher_background"/>-->
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+    <monochrome android:drawable="@drawable/ic_launcher_monochrome"/>
+</adaptive-icon>
\ No newline at end of file
diff --git a/dbg-res/values/strings.xml b/dbg-res/values/strings.xml
new file mode 100644
index 00000000..d05cdb7c
--- /dev/null
+++ b/dbg-res/values/strings.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+SPDX-FileCopyrightText: 2024 TPJ Schikhof <kde@schikhof.eu>
+
+SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
+-->
+
+<resources>
+    <string name="kde_connect">KDE Connect Debug</string>
+</resources>
diff --git a/src/org/kde/kdeconnect/BackgroundService.kt b/src/org/kde/kdeconnect/BackgroundService.kt
index 915b2222..0ed0c497 100644
--- a/src/org/kde/kdeconnect/BackgroundService.kt
+++ b/src/org/kde/kdeconnect/BackgroundService.kt
@@ -32,6 +32,7 @@ import org.kde.kdeconnect.Backends.BaseLinkProvider
 import org.kde.kdeconnect.Backends.BaseLinkProvider.ConnectionReceiver
 import org.kde.kdeconnect.Backends.BluetoothBackend.BluetoothLinkProvider
 import org.kde.kdeconnect.Backends.LanBackend.LanLinkProvider
+import org.kde.kdeconnect.Backends.LoopbackBackend.LoopbackLinkProvider
 import org.kde.kdeconnect.Helpers.NotificationHelper
 import org.kde.kdeconnect.Plugins.ClibpoardPlugin.ClipboardFloatingActivity
 import org.kde.kdeconnect.Plugins.RunCommandPlugin.RunCommandActivity
@@ -50,7 +51,7 @@ import org.kde.kdeconnect_tp.R
 class BackgroundService : Service() {
     private lateinit var applicationInstance: KdeConnect
 
-    private val linkProviders = ArrayList<BaseLinkProvider>()
+    private val linkProviders = mutableListOf<BaseLinkProvider>()
 
     private val connectedToNonCellularNetwork = MutableLiveData<Boolean>()
     /** Indicates whether device is connected over wifi / usb / bluetooth / (anything other than cellular) */
@@ -148,8 +149,8 @@ class BackgroundService : Service() {
     private fun createForegroundNotification(): Notification {
         // Why is this needed: https://developer.android.com/guide/components/services#Foreground
 
-        val connectedDevices = ArrayList<String>()
-        val connectedDeviceIds = ArrayList<String>()
+        val connectedDevices = mutableListOf<String>()
+        val connectedDeviceIds = mutableListOf<String>()
         for (device in applicationInstance.devices.values) {
             if (device.isReachable && device.isPaired) {
                 connectedDeviceIds.add(device.deviceId)