From f95b9fab5041710f1fe43d9b0d6ae250d5e0e41b Mon Sep 17 00:00:00 2001
From: Iordan Iordanov <iiordanov@gmail.com>
Date: Wed, 15 Jan 2025 20:04:33 -0500
Subject: [PATCH] Automatically add namespace to freerdpcore library.

---
 .gitignore                                    |  2 ++
 .idea/deploymentTargetSelector.xml            | 31 +++++++++++++++++++
 .idea/detekt.xml                              |  7 +++++
 .idea/runConfigurations.xml                   | 17 ++++++++++
 ...freerdp_add_namespace_to_freerdpcore.patch | 25 +++++++++++++++
 5 files changed, 82 insertions(+)
 create mode 100644 .idea/deploymentTargetSelector.xml
 create mode 100644 .idea/detekt.xml
 create mode 100644 .idea/runConfigurations.xml
 create mode 100644 remoteClientLib/jni/libs/13_freerdp_add_namespace_to_freerdpcore.patch

diff --git a/.gitignore b/.gitignore
index 9551624a2..a994044d2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -204,6 +204,8 @@ build-*
 upload_*
 trigger-*
 increment_*
+install.sh
+switch-to-*
 
 remote-desktop-clients-libs-*
 
diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
new file mode 100644
index 000000000..16c4d95f0
--- /dev/null
+++ b/.idea/deploymentTargetSelector.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="deploymentTargetSelector">
+    <selectionStates>
+      <SelectionState runConfigName="freebVNC-app">
+        <option name="selectionMode" value="DROPDOWN" />
+      </SelectionState>
+      <SelectionState runConfigName="aRDP-app">
+        <option name="selectionMode" value="DROPDOWN" />
+      </SelectionState>
+      <SelectionState runConfigName="aSPICE-app">
+        <option name="selectionMode" value="DROPDOWN" />
+      </SelectionState>
+      <SelectionState runConfigName="bVNC-app">
+        <option name="selectionMode" value="DROPDOWN" />
+      </SelectionState>
+      <SelectionState runConfigName="freeaSPICE-app">
+        <option name="selectionMode" value="DROPDOWN" />
+      </SelectionState>
+      <SelectionState runConfigName="CustomVnc-app">
+        <option name="selectionMode" value="DROPDOWN" />
+      </SelectionState>
+      <SelectionState runConfigName="Opaque-app">
+        <option name="selectionMode" value="DROPDOWN" />
+      </SelectionState>
+      <SelectionState runConfigName="freeaRDP-app">
+        <option name="selectionMode" value="DROPDOWN" />
+      </SelectionState>
+    </selectionStates>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/detekt.xml b/.idea/detekt.xml
new file mode 100644
index 000000000..ee7289c6b
--- /dev/null
+++ b/.idea/detekt.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="DetektPluginSettings">
+    <option name="enableDetekt" value="true" />
+    <option name="enableForProjectResult" value="Accepted" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
new file mode 100644
index 000000000..16660f1d8
--- /dev/null
+++ b/.idea/runConfigurations.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RunConfigurationProducerService">
+    <option name="ignoredProducers">
+      <set>
+        <option value="com.intellij.execution.junit.AbstractAllInDirectoryConfigurationProducer" />
+        <option value="com.intellij.execution.junit.AllInPackageConfigurationProducer" />
+        <option value="com.intellij.execution.junit.PatternConfigurationProducer" />
+        <option value="com.intellij.execution.junit.TestInClassConfigurationProducer" />
+        <option value="com.intellij.execution.junit.UniqueIdConfigurationProducer" />
+        <option value="com.intellij.execution.junit.testDiscovery.JUnitTestDiscoveryConfigurationProducer" />
+        <option value="org.jetbrains.kotlin.idea.junit.KotlinJUnitRunConfigurationProducer" />
+        <option value="org.jetbrains.kotlin.idea.junit.KotlinPatternConfigurationProducer" />
+      </set>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/remoteClientLib/jni/libs/13_freerdp_add_namespace_to_freerdpcore.patch b/remoteClientLib/jni/libs/13_freerdp_add_namespace_to_freerdpcore.patch
new file mode 100644
index 000000000..09b3a68d9
--- /dev/null
+++ b/remoteClientLib/jni/libs/13_freerdp_add_namespace_to_freerdpcore.patch
@@ -0,0 +1,25 @@
+diff --git a/client/Android/Studio/freeRDPCore/build.gradle b/client/Android/Studio/freeRDPCore/build.gradle
+index e2224c21c..62a573f3b 100644
+--- a/client/Android/Studio/freeRDPCore/build.gradle
++++ b/client/Android/Studio/freeRDPCore/build.gradle
+@@ -2,10 +2,10 @@ apply plugin: 'com.android.library'
+ 
+ android {
+     compileSdkVersion = rootProject.ext.compileApi
+-    buildToolsVersion = rootProject.ext.toolsVersion
++
+ 
+     defaultConfig {
+-        minSdkVersion rootProject.ext.minApi
++        minSdkVersion 14
+         targetSdkVersion rootProject.ext.targetApi
+         vectorDrawables.useSupportLibrary = true
+     }
+@@ -20,6 +20,7 @@ android {
+             renderscriptDebuggable true
+         }
+     }
++    namespace "com.freerdp.freerdpcore"
+ }
+ 
+ dependencies {