Filter R and BuildConfig to use ours.

2 files changed, 62 insertions, 62 deletions

diff --git a/app/src/main/aidl/de/blinkt/openvpn/api/IOpenVPNAPIService.aidl b/app/src/main/aidl/de/blinkt/openvpn/api/IOpenVPNAPIService.aidl
index 794e3aad..2e947d8b 100644
--- a/app/src/main/aidl/de/blinkt/openvpn/api/IOpenVPNAPIService.aidl
+++ b/app/src/main/aidl/de/blinkt/openvpn/api/IOpenVPNAPIService.aidl
@@ -1,50 +1,50 @@
-// IOpenVPNAPIService.aidl

-package de.blinkt.openvpn.api;

-

-import de.blinkt.openvpn.api.APIVpnProfile;

-import de.blinkt.openvpn.api.IOpenVPNStatusCallback; 

-

-import android.content.Intent;

-import android.os.ParcelFileDescriptor;

-

-interface IOpenVPNAPIService {

-	List<APIVpnProfile> getProfiles();

-	

-	void startProfile (String profileUUID);

-	

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

-	boolean addVPNProfile (String name, String config);

-	

-	/** start a profile using an config */

-	void startVPN (String inlineconfig);

-	

-	/** This permission framework is used  to avoid confused deputy style attack to the VPN

-	 * calling this will give null if the app is allowed to use the external API and an Intent

-	 * that can be launched to request permissions otherwise */

-	Intent prepare (String packagename);

-	

-	/** Used to trigger to the Android VPN permission dialog (VPNService.prepare()) in advance,

-	 * if this return null OpenVPN for ANdroid already has the permissions otherwise you can start the returned Intent

-	 * to let OpenVPN for Android request the permission */

-	Intent prepareVPNService ();

-

-	/* Disconnect the VPN */

-    void disconnect();

-

-    /* Pause the VPN (same as using the pause feature in the notifcation bar) */

-    void pause();

-

-    /* Resume the VPN (same as using the pause feature in the notifcation bar) */

-    void resume();

-    

-    /**

-      * Registers to receive OpenVPN Status Updates

-      */

-    void registerStatusCallback(IOpenVPNStatusCallback cb);

-    

-    /**

-     * Remove a previously registered callback interface.

-     */

-    void unregisterStatusCallback(IOpenVPNStatusCallback cb);

-		

+// IOpenVPNAPIService.aidl
+package de.blinkt.openvpn.api;
+
+import de.blinkt.openvpn.api.APIVpnProfile;
+import de.blinkt.openvpn.api.IOpenVPNStatusCallback; 
+
+import android.content.Intent;
+import android.os.ParcelFileDescriptor;
+
+interface IOpenVPNAPIService {
+	List<APIVpnProfile> getProfiles();
+	
+	void startProfile (String profileUUID);
+	
+	/** Use a profile with all certificates etc. embedded */
+	boolean addVPNProfile (String name, String config);
+	
+	/** start a profile using an config */
+	void startVPN (String inlineconfig);
+	
+	/** This permission framework is used  to avoid confused deputy style attack to the VPN
+	 * calling this will give null if the app is allowed to use the external API and an Intent
+	 * that can be launched to request permissions otherwise */
+	Intent prepare (String packagename);
+	
+	/** Used to trigger to the Android VPN permission dialog (VPNService.prepare()) in advance,
+	 * if this return null OpenVPN for ANdroid already has the permissions otherwise you can start the returned Intent
+	 * to let OpenVPN for Android request the permission */
+	Intent prepareVPNService ();
+
+	/* Disconnect the VPN */
+    void disconnect();
+
+    /* Pause the VPN (same as using the pause feature in the notifcation bar) */
+    void pause();
+
+    /* Resume the VPN (same as using the pause feature in the notifcation bar) */
+    void resume();
+    
+    /**
+      * Registers to receive OpenVPN Status Updates
+      */
+    void registerStatusCallback(IOpenVPNStatusCallback cb);
+    
+    /**
+     * Remove a previously registered callback interface.
+     */
+    void unregisterStatusCallback(IOpenVPNStatusCallback cb);
+		
 }
\ No newline at end of file
diff --git a/app/src/main/aidl/de/blinkt/openvpn/api/IOpenVPNStatusCallback.aidl b/app/src/main/aidl/de/blinkt/openvpn/api/IOpenVPNStatusCallback.aidl
index 1dfa1381..7de84f56 100644
--- a/app/src/main/aidl/de/blinkt/openvpn/api/IOpenVPNStatusCallback.aidl
+++ b/app/src/main/aidl/de/blinkt/openvpn/api/IOpenVPNStatusCallback.aidl
@@ -1,13 +1,13 @@
-package de.blinkt.openvpn.api;

-

-/**

- * Example of a callback interface used by IRemoteService to send

- * synchronous notifications back to its clients.  Note that this is a

- * one-way interface so the server does not block waiting for the client.

- */

-oneway interface IOpenVPNStatusCallback {

-    /**

-     * Called when the service has a new status for you.

-     */

-    void newStatus(String uuid, String state, String message, String level);

-}

+package de.blinkt.openvpn.api;
+
+/**
+ * Example of a callback interface used by IRemoteService to send
+ * synchronous notifications back to its clients.  Note that this is a
+ * one-way interface so the server does not block waiting for the client.
+ */
+oneway interface IOpenVPNStatusCallback {
+    /**
+     * Called when the service has a new status for you.
+     */
+    void newStatus(String uuid, String state, String message, String level);
+}