summaryrefslogtreecommitdiff
path: root/src/de/blinkt/openvpn/ConfigConverter.java
diff options
context:
space:
mode:
authorArne Schwabe <arne@rfc2549.org>2013-03-03 12:33:53 +0100
committerArne Schwabe <arne@rfc2549.org>2013-03-03 12:33:53 +0100
commit7c7acb1a490e2808165d0d1b6ee41d998f2d6dfc (patch)
treeae9100f57ba6cc9e533a93ccb51c2098248696b9 /src/de/blinkt/openvpn/ConfigConverter.java
parent4f0af1a493e5059c1422e214da9c0e4b8710dfde (diff)
- Increase version to 0.5.34a for JB 4.1 only
- When importing OpenVPN Access profiles import username and name
Diffstat (limited to 'src/de/blinkt/openvpn/ConfigConverter.java')
-rw-r--r--src/de/blinkt/openvpn/ConfigConverter.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/de/blinkt/openvpn/ConfigConverter.java b/src/de/blinkt/openvpn/ConfigConverter.java
index 5065436c..d715e8b7 100644
--- a/src/de/blinkt/openvpn/ConfigConverter.java
+++ b/src/de/blinkt/openvpn/ConfigConverter.java
@@ -194,6 +194,10 @@ public class ConfigConverter extends ListActivity {
String newname = mPossibleName;
+ // Default to
+ if(mResult.mName!=null && !ConfigParser.CONVERTED_PROFILE.equals(mResult.mName))
+ newname=mResult.mName;
+
while(vpl.getProfileByName(newname)!=null) {
i++;
if(i==1)