Merge branch 'schwabe_master' into ssh_new_masternew_master

3 files changed, 35 insertions, 0 deletions

diff --git a/remoteExample/build.gradle b/remoteExample/build.gradle
index 179555bb..019fa10f 100644
--- a/remoteExample/build.gradle
+++ b/remoteExample/build.gradle
@@ -8,6 +8,9 @@ plugins {
 }
 
 android {
+    buildFeatures {
+        buildConfig true
+    }
     compileSdkVersion 33
 
     defaultConfig {
diff --git a/remoteExample/proguard-rules.pro b/remoteExample/proguard-rules.pro
new file mode 100644
index 00000000..61d69340
--- /dev/null
+++ b/remoteExample/proguard-rules.pro
@@ -0,0 +1,26 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
+
+# Untested but reported to work (https://github.com/schwabe/ics-openvpn/issues/1755#issuecomment-2325652081)
+-keep interface de.blinkt.openvpn.api.IOpenVPNAPIService { *; }
+-keep interface de.blinkt.openvpn.api.IOpenVPNStatusCallback { *; }
+-keep class de.blinkt.openvpn.api.APIVpnProfile { *; }
\ No newline at end of file
diff --git a/remoteExample/src/main/aidl/de/blinkt/openvpn/api/IOpenVPNAPIService.aidl b/remoteExample/src/main/aidl/de/blinkt/openvpn/api/IOpenVPNAPIService.aidl
index 273a0046..1989b771 100644
--- a/remoteExample/src/main/aidl/de/blinkt/openvpn/api/IOpenVPNAPIService.aidl
+++ b/remoteExample/src/main/aidl/de/blinkt/openvpn/api/IOpenVPNAPIService.aidl
@@ -63,4 +63,10 @@ interface IOpenVPNAPIService {
 

     /** Use a profile with all certificates etc. embedded */

     APIVpnProfile addNewVPNProfile (String name, boolean userEditable, String config);

+

+    /** Same as addNewVPNProfile(String, boolean, String) but giving possibility to pass a Bundle like

+    * in startVPNwithExtras(String, Bundle) to apply e.g. "allow vpn bypass" to profile.

+    * up to now the only extra that can be put is a boolean "de.blinkt.openvpn.api.ALLOW_VPN_BYPASS"

+    */

+    APIVpnProfile addNewVPNProfileWithExtras (String name, boolean userEditable, String config, in Bundle extras);

 }
\ No newline at end of file