diff options
| author | Sean Leonard <meanderingcode@aetherislands.net> | 2013-10-03 16:38:14 -0700 |
|---|---|---|
| committer | Sean Leonard <meanderingcode@aetherislands.net> | 2013-10-03 16:38:14 -0700 |
| commit | 697e7da6e1379ac23cd8dbb47a1246547abafda6 (patch) | |
| tree | 07f7d05616c4c2d3a0425c96cc6ed8fc83f19d38 /src/se/leap/openvpn/VpnProfile.java | |
| parent | 6112dcbb6a430651f172a7a07f2e9b7633299705 (diff) | |
| parent | 83f18ec709d71d843155a8df853b014e5a599c01 (diff) | |
Merge branch 'feature/move-confighelper-constants' into develop
Diffstat (limited to 'src/se/leap/openvpn/VpnProfile.java')
| -rw-r--r-- | src/se/leap/openvpn/VpnProfile.java | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/se/leap/openvpn/VpnProfile.java b/src/se/leap/openvpn/VpnProfile.java index 2262f565..5752081a 100644 --- a/src/se/leap/openvpn/VpnProfile.java +++ b/src/se/leap/openvpn/VpnProfile.java @@ -22,6 +22,8 @@ import org.spongycastle.util.io.pem.PemObject; import org.spongycastle.util.io.pem.PemWriter; import se.leap.leapclient.ConfigHelper; +import se.leap.leapclient.EIP; +import se.leap.leapclient.Provider; import se.leap.leapclient.R; import android.content.Context; @@ -246,9 +248,9 @@ public class VpnProfile implements Serializable{ cfg+=insertFileData("cert",mClientCertFilename); */ // FIXME This is all we need...The whole switch statement can go... - cfg+="<ca>\n"+ConfigHelper.getStringFromSharedPref(ConfigHelper.MAIN_CERT_KEY)+"\n</ca>\n"; - cfg+="<key>\n"+ConfigHelper.getStringFromSharedPref(ConfigHelper.KEY_KEY)+"\n</key>\n"; - cfg+="<cert>\n"+ConfigHelper.getStringFromSharedPref(ConfigHelper.CERT_KEY)+"\n</cert>\n"; + cfg+="<ca>\n"+ConfigHelper.getStringFromSharedPref(Provider.CA_CERT)+"\n</ca>\n"; + cfg+="<key>\n"+ConfigHelper.getStringFromSharedPref(EIP.PRIVATE_KEY)+"\n</key>\n"; + cfg+="<cert>\n"+ConfigHelper.getStringFromSharedPref(EIP.CERTIFICATE)+"\n</cert>\n"; break; case VpnProfile.TYPE_USERPASS_PKCS12: |