- Make Ipv6 support complete (minus tun-ipv6 warning)

- Implement byte counter support in the log window
- Fix spelling of secret (closes issue #22)
- Replace "quot; with ", no idea what went wrong there (closes issue #21)

1 files changed, 73 insertions, 0 deletions

diff --git a/src/de/blinkt/openvpn/Settings_Routing.java b/src/de/blinkt/openvpn/Settings_Routing.java
new file mode 100644
index 00000000..8305f4db
--- /dev/null
+++ b/src/de/blinkt/openvpn/Settings_Routing.java
@@ -0,0 +1,73 @@
+package de.blinkt.openvpn;
+import android.os.Bundle;
+import android.preference.CheckBoxPreference;
+import android.preference.EditTextPreference;
+import android.preference.Preference;
+import android.preference.Preference.OnPreferenceChangeListener;
+import android.preference.PreferenceManager;
+
+
+public class Settings_Routing extends OpenVpnPreferencesFragment implements OnPreferenceChangeListener {
+	private EditTextPreference mCustomRoutes;
+	private CheckBoxPreference mUseDefaultRoute;
+	private EditTextPreference mCustomRoutesv6;
+	private CheckBoxPreference mUseDefaultRoutev6;
+	private CheckBoxPreference mRouteNoPull;
+
+	@Override
+	public void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+
+		// Load the preferences from an XML resource
+		addPreferencesFromResource(R.xml.vpn_routing);
+		mCustomRoutes = (EditTextPreference) findPreference("customRoutes");
+		mUseDefaultRoute = (CheckBoxPreference) findPreference("useDefaultRoute");
+		mCustomRoutesv6 = (EditTextPreference) findPreference("customRoutesv6");
+		mUseDefaultRoutev6 = (CheckBoxPreference) findPreference("useDefaultRoutev6");
+		mRouteNoPull = (CheckBoxPreference) findPreference("routenopull");
+
+		mCustomRoutes.setOnPreferenceChangeListener(this);
+		mCustomRoutesv6.setOnPreferenceChangeListener(this);
+
+		loadSettings();
+	}
+
+	@Override
+	protected void loadSettings() {
+
+		mUseDefaultRoute.setChecked(mProfile.mUseDefaultRoute);
+		mUseDefaultRoutev6.setChecked(mProfile.mUseDefaultRoutev6);
+
+		mCustomRoutes.setText(mProfile.mCustomRoutes);
+		mCustomRoutesv6.setText(mProfile.mCustomRoutesv6);
+
+		mRouteNoPull.setChecked(mProfile.mRoutenopull);
+
+		// Sets Summary
+		onPreferenceChange(mCustomRoutes, mCustomRoutes.getText());
+		onPreferenceChange(mCustomRoutesv6, mCustomRoutesv6.getText());
+		mRouteNoPull.setEnabled(mProfile.mUsePull);
+	}
+
+
+	@Override
+	protected void saveSettings() {
+		mProfile.mUseDefaultRoute = mUseDefaultRoute.isChecked();
+		mProfile.mUseDefaultRoutev6 = mUseDefaultRoutev6.isChecked();
+		mProfile.mCustomRoutes = mCustomRoutes.getText();
+		mProfile.mCustomRoutesv6 = mCustomRoutesv6.getText();
+		mProfile.mRoutenopull = mRouteNoPull.isChecked();
+	}
+
+	@Override
+	public boolean onPreferenceChange(Preference preference,
+			Object newValue) {
+		if(	 preference == mCustomRoutes || preference == mCustomRoutesv6 )
+			preference.setSummary((String)newValue);
+
+		saveSettings();
+		return true;
+	}
+
+
+}
\ No newline at end of file