From d98f6c6ba51ae8810bd2d035fa89f6ca24eba8fd Mon Sep 17 00:00:00 2001
From: Arne Schwabe <arne@rfc2549.org>
Date: Mon, 16 Mar 2015 12:55:41 +0100
Subject: Update/cleanup of external API, allow adding of non user editable
 profiles

--HG--
rename : remoteExample/src/main/assets/hd.conf => remoteExample/src/main/assets/test.conf
---
 .../java/de/blinkt/openvpn/api/APIVpnProfile.java  | 87 ++++++++++++----------
 1 file changed, 48 insertions(+), 39 deletions(-)

(limited to 'remoteExample/src/main/java/de/blinkt/openvpn/api')

diff --git a/remoteExample/src/main/java/de/blinkt/openvpn/api/APIVpnProfile.java b/remoteExample/src/main/java/de/blinkt/openvpn/api/APIVpnProfile.java
index f5591764..9d7e3b8e 100644
--- a/remoteExample/src/main/java/de/blinkt/openvpn/api/APIVpnProfile.java
+++ b/remoteExample/src/main/java/de/blinkt/openvpn/api/APIVpnProfile.java
@@ -1,3 +1,8 @@
+/*
+ * Copyright (c) 2012-2015 Arne Schwabe
+ * Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
+ */
+
 package de.blinkt.openvpn.api;
 
 import android.os.Parcel;
@@ -5,47 +10,51 @@ import android.os.Parcelable;
 
 public class APIVpnProfile implements Parcelable {
 
-	public final String mUUID;
-	public final String mName;
-	public final boolean mUserEditable;
+    public final String mUUID;
+    public final String mName;
+    public final boolean mUserEditable;
+    public final String mProfileCreator;
 
-	public APIVpnProfile(Parcel in) {
-		mUUID = in.readString();
-		mName = in.readString();
+    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];
-		}
-	};
+        mProfileCreator = in.readString();
+    }
+
+    public APIVpnProfile(String uuidString, String name, boolean userEditable, String profileCreator) {
+        mUUID = uuidString;
+        mName = name;
+        mUserEditable = userEditable;
+        mProfileCreator = profileCreator;
+    }
+
+    @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);
+        dest.writeString(mProfileCreator);
+    }
+
+    public static final Creator<APIVpnProfile> CREATOR
+            = new Creator<APIVpnProfile>() {
+        public APIVpnProfile createFromParcel(Parcel in) {
+            return new APIVpnProfile(in);
+        }
+
+        public APIVpnProfile[] newArray(int size) {
+            return new APIVpnProfile[size];
+        }
+    };
 
 
 }
-- 
cgit v1.2.3