add cipher option

2 files changed, 24 insertions, 0 deletions

diff --git a/src/de/blinkt/openvpn/Settings_Authentication.java b/src/de/blinkt/openvpn/Settings_Authentication.java
index 57d99417..6d21ca6a 100644
--- a/src/de/blinkt/openvpn/Settings_Authentication.java
+++ b/src/de/blinkt/openvpn/Settings_Authentication.java
@@ -24,6 +24,7 @@ public class Settings_Authentication extends PreferenceFragment implements OnPre
 	private ListPreference mTLSAuthDirection;
 	private Preference mTLSAuthFile;
 	private SwitchPreference mUseTLSAuth;
+	private EditTextPreference mCipher;
 
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
@@ -45,6 +46,8 @@ public class Settings_Authentication extends PreferenceFragment implements OnPre
 		mProfile = ProfileManager.get(profileUUID);
 		mTLSAuthFile.setOnPreferenceClickListener(this);		
 		
+		mCipher =(EditTextPreference) findPreference("cipher"); 
+		
 		loadSettings();
 
 	}
@@ -59,6 +62,8 @@ public class Settings_Authentication extends PreferenceFragment implements OnPre
 		mUseTLSAuth.setChecked(mProfile.mUseTLSAuth);
 		mTLSAuthFile.setSummary(mProfile.mTLSAuthFilename);
 		mTLSAuthDirection.setValue(mProfile.mTLSAuthDirection);
+		mCipher.setText(mProfile.mCipher);
+		onPreferenceChange(mCipher, mProfile.mCipher);
 	}
 	
 	private void saveSettings() {
@@ -76,6 +81,12 @@ public class Settings_Authentication extends PreferenceFragment implements OnPre
 			mProfile.mTLSAuthDirection=null;
 		else
 			mProfile.mTLSAuthDirection = mTLSAuthDirection.getValue().toString();
+		
+		if(mCipher.getText()==null)
+			mProfile.mCipher=null;
+		else
+			mProfile.mCipher = mCipher.getText();
+		
 	}
 	
 	@Override
@@ -91,6 +102,8 @@ public class Settings_Authentication extends PreferenceFragment implements OnPre
 				preference.setSummary(mProfile.mServerName);
 			else
 				preference.setSummary((String)newValue);
+		} else if (preference == mCipher) {
+			preference.setSummary((CharSequence) newValue);
 		}
 		return true;
 	}
diff --git a/src/de/blinkt/openvpn/VpnProfile.java b/src/de/blinkt/openvpn/VpnProfile.java
index c18575da..1b855f5d 100644
--- a/src/de/blinkt/openvpn/VpnProfile.java
+++ b/src/de/blinkt/openvpn/VpnProfile.java
@@ -90,6 +90,7 @@ public class VpnProfile implements  Serializable{
 	public boolean mUseCustomConfig=false;
 	public String mCustomConfigOptions="";
 	public String mVerb="1";
+	public String mCipher="";
 
 
 	public static String openVpnEscape(String unescaped) {
@@ -271,6 +272,9 @@ public class VpnProfile implements  Serializable{
 			cfg += "remote-cert-tls server\n";
 
 
+		if(nonNull(mCipher)){
+			cfg += "cipher " + mCipher + "\n";
+		}
 
 
 		// Obscure Settings dialog
@@ -293,6 +297,13 @@ public class VpnProfile implements  Serializable{
 		return cfg;
 	}
 
+	private boolean nonNull(String val) {
+		if(val == null || val.equals("")) 
+			return false;
+		else
+			return true;
+	}
+
 	private Collection<String> getCustomRoutes() {
 		Vector<String> cidrRoutes=new Vector<String>();
 		if(mCustomRoutes==null) {