Merge Merge try number 2

1 files changed, 8 insertions, 1 deletions

diff --git a/src/de/blinkt/openvpn/VpnProfile.java b/src/de/blinkt/openvpn/VpnProfile.java
index 683ba663..18fe59d5 100644
--- a/src/de/blinkt/openvpn/VpnProfile.java
+++ b/src/de/blinkt/openvpn/VpnProfile.java
@@ -422,7 +422,7 @@ public class VpnProfile implements  Serializable{
 		return intent;
 	}
 
-	public String getTemporaryPKCS12Password() {
+	private String getTemporaryPKCS12Password() {
 		if(mTempPKCS12Password!=null)
 			return mTempPKCS12Password;
 
@@ -550,6 +550,13 @@ public class VpnProfile implements  Serializable{
 			return mPassword;
 		}
 	}
+	
+	
+	// Used by the Array Adapter
+	@Override
+	public String toString() {
+		return mName;
+	}