From baad99940a0bfa2e4c27a9cbc0f478e94b6d20ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Parm=C3=A9nides=20GV?= Date: Mon, 19 May 2014 17:44:25 +0200 Subject: Copy necessary activities and fragments. Now we need to decide what's our relationship with LogWindow and LaunchVPN, refactor its classes and fix ours so that we use the currently supported methods. --- .../blinkt/openvpn/fragments/Settings_Routing.java | 88 ---------------------- 1 file changed, 88 deletions(-) delete mode 100644 app/src/main/java/de/blinkt/openvpn/fragments/Settings_Routing.java (limited to 'app/src/main/java/de/blinkt/openvpn/fragments/Settings_Routing.java') diff --git a/app/src/main/java/de/blinkt/openvpn/fragments/Settings_Routing.java b/app/src/main/java/de/blinkt/openvpn/fragments/Settings_Routing.java deleted file mode 100644 index 8163a745..00000000 --- a/app/src/main/java/de/blinkt/openvpn/fragments/Settings_Routing.java +++ /dev/null @@ -1,88 +0,0 @@ -package de.blinkt.openvpn.fragments; -import android.os.Bundle; -import android.preference.CheckBoxPreference; -import android.preference.EditTextPreference; -import android.preference.Preference; -import android.preference.Preference.OnPreferenceChangeListener; -import se.leap.bitmaskclient.R; - - -public class Settings_Routing extends OpenVpnPreferencesFragment implements OnPreferenceChangeListener { - private EditTextPreference mCustomRoutes; - private CheckBoxPreference mUseDefaultRoute; - private EditTextPreference mCustomRoutesv6; - private CheckBoxPreference mUseDefaultRoutev6; - private CheckBoxPreference mRouteNoPull; - private CheckBoxPreference mLocalVPNAccess; - private EditTextPreference mExcludedRoutes; - private EditTextPreference mExcludedRoutesv6; - - @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"); - mExcludedRoutes = (EditTextPreference) findPreference("excludedRoutes"); - mExcludedRoutesv6 = (EditTextPreference) findPreference("excludedRoutesv6"); - - mRouteNoPull = (CheckBoxPreference) findPreference("routenopull"); - mLocalVPNAccess = (CheckBoxPreference) findPreference("unblockLocal"); - - 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); - - mExcludedRoutes.setText(mProfile.mExcludedRoutes); - mExcludedRoutes.setText(mProfile.mExcludedRoutesv6); - - mRouteNoPull.setChecked(mProfile.mRoutenopull); - mLocalVPNAccess.setChecked(mProfile.mAllowLocalLAN); - - // 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(); - mProfile.mAllowLocalLAN =mLocalVPNAccess.isChecked(); - mProfile.mExcludedRoutes = mExcludedRoutes.getText(); - mProfile.mExcludedRoutesv6 = mExcludedRoutesv6.getText(); - } - - @Override - public boolean onPreferenceChange(Preference preference, - Object newValue) { - if( preference == mCustomRoutes || preference == mCustomRoutesv6 - || preference == mExcludedRoutes || preference == mExcludedRoutesv6) - preference.setSummary((String)newValue); - - saveSettings(); - return true; - } - - -} \ No newline at end of file -- cgit v1.2.3