From 6fcd101fcbc7779ffd7239cc35e5c3359ae38fcf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Wed, 28 May 2014 17:15:44 +0200
Subject: Resources merge correctly.

---
 .../java/de/blinkt/openvpn/api/APIVpnProfile.java  | 51 ++++++++++++++++++++++
 .../src/main/res/values/strings-icsopenvpn.xml     | 15 +++++++
 2 files changed, 66 insertions(+)
 create mode 100644 app/remoteExample/src/main/java/de/blinkt/openvpn/api/APIVpnProfile.java
 create mode 100644 app/remoteExample/src/main/res/values/strings-icsopenvpn.xml

(limited to 'app/remoteExample')

diff --git a/app/remoteExample/src/main/java/de/blinkt/openvpn/api/APIVpnProfile.java b/app/remoteExample/src/main/java/de/blinkt/openvpn/api/APIVpnProfile.java
new file mode 100644
index 00000000..a44891ab
--- /dev/null
+++ b/app/remoteExample/src/main/java/de/blinkt/openvpn/api/APIVpnProfile.java
@@ -0,0 +1,51 @@
+package de.blinkt.openvpn.api;
+
+import android.os.Parcel;
+import android.os.Parcelable;
+
+public class APIVpnProfile implements Parcelable {
+
+	public final String mUUID;
+	public final String mName;
+	public final boolean mUserEditable;
+
+	public APIVpnProfile(Parcel in) {
+		mUUID = in.readString();
+		mName = in.readString();
+        mUserEditable = in.readInt() != 0;
+	}
+
+	public APIVpnProfile(String uuidString, String name, boolean userEditable) {
+		mUUID=uuidString;
+		mName = name;
+		mUserEditable=userEditable;
+	}
+
+	@Override
+	public int describeContents() {
+		return 0;
+	}
+
+	@Override
+	public void writeToParcel(Parcel dest, int flags) {
+		dest.writeString(mUUID);
+		dest.writeString(mName);
+		if(mUserEditable)
+			dest.writeInt(0);
+		else
+			dest.writeInt(1);
+	}
+
+	public static final Parcelable.Creator<APIVpnProfile> CREATOR
+	= new Parcelable.Creator<APIVpnProfile>() {
+		public APIVpnProfile createFromParcel(Parcel in) {
+			return new APIVpnProfile(in);
+		}
+
+		public APIVpnProfile[] newArray(int size) {
+			return new APIVpnProfile[size];
+		}
+	};
+
+
+}
diff --git a/app/remoteExample/src/main/res/values/strings-icsopenvpn.xml b/app/remoteExample/src/main/res/values/strings-icsopenvpn.xml
new file mode 100644
index 00000000..bbaee226
--- /dev/null
+++ b/app/remoteExample/src/main/res/values/strings-icsopenvpn.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="app_name">OpenVPN Remote</string>
+    <string name="hello_world">Hello world!</string>
+    <string name="action_settings">Settings</string>
+    <string name="permission_description">Allows another app to control OpenVPN</string>
+    <string name="no_status_yet">No Status yet</string>
+    <string name="no_now">Not now</string>
+    <string name="show_my_ip">Show my IP</string>
+    <string name="disconnect">Disconnect</string>
+    <string name="start_embedded">Start embedded profile</string>
+
+
+</resources>
-- 
cgit v1.2.3


From aba5a16a97b43f95659e0f79f76549b1fe2e9d56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Thu, 29 May 2014 10:05:47 +0200
Subject: No AIDL nor api, logfragment related xml files

api folder and aidl files aren't needed for us. They are used for
external apps that want to use ics-openvpn as an already installed
package, while what we want is to avoid the installation of ics-openvpn
including it (refactored) in bitmask android.
---
 .../java/de/blinkt/openvpn/api/APIVpnProfile.java  | 51 ----------------------
 1 file changed, 51 deletions(-)
 delete mode 100644 app/remoteExample/src/main/java/de/blinkt/openvpn/api/APIVpnProfile.java

(limited to 'app/remoteExample')

diff --git a/app/remoteExample/src/main/java/de/blinkt/openvpn/api/APIVpnProfile.java b/app/remoteExample/src/main/java/de/blinkt/openvpn/api/APIVpnProfile.java
deleted file mode 100644
index a44891ab..00000000
--- a/app/remoteExample/src/main/java/de/blinkt/openvpn/api/APIVpnProfile.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package de.blinkt.openvpn.api;
-
-import android.os.Parcel;
-import android.os.Parcelable;
-
-public class APIVpnProfile implements Parcelable {
-
-	public final String mUUID;
-	public final String mName;
-	public final boolean mUserEditable;
-
-	public APIVpnProfile(Parcel in) {
-		mUUID = in.readString();
-		mName = in.readString();
-        mUserEditable = in.readInt() != 0;
-	}
-
-	public APIVpnProfile(String uuidString, String name, boolean userEditable) {
-		mUUID=uuidString;
-		mName = name;
-		mUserEditable=userEditable;
-	}
-
-	@Override
-	public int describeContents() {
-		return 0;
-	}
-
-	@Override
-	public void writeToParcel(Parcel dest, int flags) {
-		dest.writeString(mUUID);
-		dest.writeString(mName);
-		if(mUserEditable)
-			dest.writeInt(0);
-		else
-			dest.writeInt(1);
-	}
-
-	public static final Parcelable.Creator<APIVpnProfile> CREATOR
-	= new Parcelable.Creator<APIVpnProfile>() {
-		public APIVpnProfile createFromParcel(Parcel in) {
-			return new APIVpnProfile(in);
-		}
-
-		public APIVpnProfile[] newArray(int size) {
-			return new APIVpnProfile[size];
-		}
-	};
-
-
-}
-- 
cgit v1.2.3