Break the classes into core classes that deal with handling the backend logic, the fragment and rest.

LaunchVPN, MainActivity, ConfigConvert are public API that is recorded in shortcuts, launchers etc. Moving them would break public API. Also VPNProfile belongs into core but since the reading VPN Profiles depends on the class name keep it in the main package.

--HG--
rename : src/de/blinkt/openvpn/CIDRIP.java => src/de/blinkt/openvpn/core/CIDRIP.java
rename : src/de/blinkt/openvpn/ConfigParser.java => src/de/blinkt/openvpn/core/ConfigParser.java
rename : src/de/blinkt/openvpn/NetworkSateReceiver.java => src/de/blinkt/openvpn/core/NetworkSateReceiver.java
rename : src/de/blinkt/openvpn/OpenVPN.java => src/de/blinkt/openvpn/core/OpenVPN.java
rename : src/de/blinkt/openvpn/OpenVPNMangement.java => src/de/blinkt/openvpn/core/OpenVPNMangement.java
rename : src/de/blinkt/openvpn/OpenVPNThread.java => src/de/blinkt/openvpn/core/OpenVPNThread.java
rename : src/de/blinkt/openvpn/OpenVpnManagementThread.java => src/de/blinkt/openvpn/core/OpenVpnManagementThread.java
rename : src/de/blinkt/openvpn/OpenVpnService.java => src/de/blinkt/openvpn/core/OpenVpnService.java
rename : src/de/blinkt/openvpn/ProfileManager.java => src/de/blinkt/openvpn/core/ProfileManager.java
rename : src/de/blinkt/openvpn/ProxyDetection.java => src/de/blinkt/openvpn/core/ProxyDetection.java
rename : src/de/blinkt/openvpn/VPNLaunchHelper.java => src/de/blinkt/openvpn/core/VPNLaunchHelper.java
rename : src/de/blinkt/openvpn/AboutFragment.java => src/de/blinkt/openvpn/fragments/AboutFragment.java
rename : src/de/blinkt/openvpn/FaqFragment.java => src/de/blinkt/openvpn/fragments/FaqFragment.java
rename : src/de/blinkt/openvpn/FileSelectionFragment.java => src/de/blinkt/openvpn/fragments/FileSelectionFragment.java
rename : src/de/blinkt/openvpn/GeneralSettings.java => src/de/blinkt/openvpn/fragments/GeneralSettings.java
rename : src/de/blinkt/openvpn/InlineFileTab.java => src/de/blinkt/openvpn/fragments/InlineFileTab.java
rename : src/de/blinkt/openvpn/OpenVpnPreferencesFragment.java => src/de/blinkt/openvpn/fragments/OpenVpnPreferencesFragment.java
rename : src/de/blinkt/openvpn/SendDumpFragment.java => src/de/blinkt/openvpn/fragments/SendDumpFragment.java
rename : src/de/blinkt/openvpn/Settings_Authentication.java => src/de/blinkt/openvpn/fragments/Settings_Authentication.java
rename : src/de/blinkt/openvpn/Settings_Basic.java => src/de/blinkt/openvpn/fragments/Settings_Basic.java
rename : src/de/blinkt/openvpn/Settings_IP.java => src/de/blinkt/openvpn/fragments/Settings_IP.java
rename : src/de/blinkt/openvpn/Settings_Obscure.java => src/de/blinkt/openvpn/fragments/Settings_Obscure.java
rename : src/de/blinkt/openvpn/Settings_Routing.java => src/de/blinkt/openvpn/fragments/Settings_Routing.java
rename : src/de/blinkt/openvpn/ShowConfigFragment.java => src/de/blinkt/openvpn/fragments/ShowConfigFragment.java
rename : src/de/blinkt/openvpn/VPNProfileList.java => src/de/blinkt/openvpn/fragments/VPNProfileList.java

1 files changed, 0 insertions, 179 deletions

diff --git a/src/de/blinkt/openvpn/Settings_Authentication.java b/src/de/blinkt/openvpn/Settings_Authentication.java
deleted file mode 100644
index 8f73cd07..00000000
--- a/src/de/blinkt/openvpn/Settings_Authentication.java
+++ /dev/null
@@ -1,179 +0,0 @@
-package de.blinkt.openvpn;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.os.Bundle;
-import android.os.Environment;
-import android.preference.CheckBoxPreference;
-import android.preference.EditTextPreference;
-import android.preference.ListPreference;
-import android.preference.Preference;
-import android.preference.Preference.OnPreferenceChangeListener;
-import android.preference.Preference.OnPreferenceClickListener;
-import android.preference.SwitchPreference;
-import android.util.Pair;
-
-
-public class Settings_Authentication extends OpenVpnPreferencesFragment implements OnPreferenceChangeListener, OnPreferenceClickListener {
-	private static final int SELECT_TLS_FILE = 23223232;
-	private CheckBoxPreference mExpectTLSCert;
-	private CheckBoxPreference mCheckRemoteCN;
-	private RemoteCNPreference mRemoteCN;
-	private ListPreference mTLSAuthDirection;
-	private Preference mTLSAuthFile;
-	private SwitchPreference mUseTLSAuth;
-	private EditTextPreference mCipher;
-	private String mTlsAuthFileData;
-	private EditTextPreference mAuth;
-
-	@Override
-	public void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-
-		// Load the preferences from an XML resource
-		addPreferencesFromResource(R.xml.vpn_authentification);
-
-		mExpectTLSCert = (CheckBoxPreference) findPreference("remoteServerTLS");
-		mCheckRemoteCN = (CheckBoxPreference) findPreference("checkRemoteCN");
-		mRemoteCN = (RemoteCNPreference) findPreference("remotecn");
-		mRemoteCN.setOnPreferenceChangeListener(this);
-
-		mUseTLSAuth = (SwitchPreference) findPreference("useTLSAuth" );
-		mTLSAuthFile = findPreference("tlsAuthFile");
-		mTLSAuthDirection = (ListPreference) findPreference("tls_direction");
-
-
-		mTLSAuthFile.setOnPreferenceClickListener(this);		
-
-		mCipher =(EditTextPreference) findPreference("cipher");
-		mCipher.setOnPreferenceChangeListener(this);
-
-		mAuth =(EditTextPreference) findPreference("auth");
-		mAuth.setOnPreferenceChangeListener(this);
-
-		loadSettings();
-
-	}
-
-	@Override
-	protected void loadSettings() {
-
-		mExpectTLSCert.setChecked(mProfile.mExpectTLSCert);
-		mCheckRemoteCN.setChecked(mProfile.mCheckRemoteCN);
-		mRemoteCN.setDN(mProfile.mRemoteCN);
-		mRemoteCN.setAuthType(mProfile.mX509AuthType);
-		onPreferenceChange(mRemoteCN,
-				new Pair<Integer, String>(mProfile.mX509AuthType, mProfile.mRemoteCN));
-
-		mUseTLSAuth.setChecked(mProfile.mUseTLSAuth);
-		mTlsAuthFileData= mProfile.mTLSAuthFilename;
-		setTlsAuthSummary(mTlsAuthFileData);
-		mTLSAuthDirection.setValue(mProfile.mTLSAuthDirection);
-		mCipher.setText(mProfile.mCipher);
-		onPreferenceChange(mCipher, mProfile.mCipher);
-		mAuth.setText(mProfile.mAuth);
-		onPreferenceChange(mAuth, mProfile.mAuth);
-	}
-
-	@Override
-	protected void saveSettings() {
-		mProfile.mExpectTLSCert=mExpectTLSCert.isChecked();
-		mProfile.mCheckRemoteCN=mCheckRemoteCN.isChecked();
-		mProfile.mRemoteCN=mRemoteCN.getCNText();
-		mProfile.mX509AuthType=mRemoteCN.getAuthtype();
-
-		mProfile.mUseTLSAuth = mUseTLSAuth.isChecked();
-		mProfile.mTLSAuthFilename = mTlsAuthFileData;
-
-		if(mTLSAuthDirection.getValue()==null)
-			mProfile.mTLSAuthDirection=null;
-		else
-			mProfile.mTLSAuthDirection = mTLSAuthDirection.getValue().toString();
-
-		if(mCipher.getText()==null)
-			mProfile.mCipher=null;
-		else
-			mProfile.mCipher = mCipher.getText();
-
-		if(mAuth.getText()==null)
-			mProfile.mAuth = null;
-		else
-			mProfile.mAuth = mAuth.getText();
-
-	}
-
-
-
-	@Override
-	public boolean onPreferenceChange(Preference preference, Object newValue) {
-		if(preference==mRemoteCN) {
-			@SuppressWarnings("unchecked") 
-			int authtype = ((Pair<Integer, String>) newValue).first;
-			@SuppressWarnings("unchecked")
-			String dn = ((Pair<Integer, String>) newValue).second;
-
-			if ("".equals(dn))
-				preference.setSummary(getX509String(VpnProfile.X509_VERIFY_TLSREMOTE_RDN, mProfile.mServerName));
-			else
-				preference.setSummary(getX509String(authtype,dn));
-
-		} else if (preference == mCipher || preference == mAuth) {
-			preference.setSummary((CharSequence) newValue);
-		}
-		return true;
-	}
-	private CharSequence getX509String(int authtype, String dn) {
-		String ret ="";
-		switch (authtype) {
-		case VpnProfile.X509_VERIFY_TLSREMOTE:
-		case VpnProfile.X509_VERIFY_TLSREMOTE_COMPAT_NOREMAPPING:
-			ret+="tls-remote ";
-			break;
-
-		case VpnProfile.X509_VERIFY_TLSREMOTE_DN:
-			ret="dn: ";
-			break;
-
-		case VpnProfile.X509_VERIFY_TLSREMOTE_RDN:
-			ret="rdn: ";
-			break;
-
-		case VpnProfile.X509_VERIFY_TLSREMOTE_RDN_PREFIX:
-			ret="rdn prefix: ";
-			break;
-		}
-		return ret + dn;
-	}
-
-	void startFileDialog() {
-		Intent startFC = new Intent(getActivity(),FileSelect.class);
-		startFC.putExtra(FileSelect.START_DATA, Environment.getExternalStorageDirectory().getPath());
-
-		startActivityForResult(startFC,SELECT_TLS_FILE);
-	}
-	@Override
-	public boolean onPreferenceClick(Preference preference) {
-		startFileDialog();
-		return true;
-
-	}
-
-	@Override
-	public void onActivityResult(int requestCode, int resultCode, Intent data) {
-		super.onActivityResult(requestCode, resultCode, data);
-		if(requestCode==SELECT_TLS_FILE && resultCode == Activity.RESULT_OK){
-			String result = data.getStringExtra(FileSelect.RESULT_DATA);
-			mTlsAuthFileData=result;
-			setTlsAuthSummary(result);
-
-		}
-	}
-
-	private void setTlsAuthSummary(String result) {
-		if(result==null) result = getString(R.string.no_certificate);
-		if(result.startsWith(VpnProfile.INLINE_TAG))
-			mTLSAuthFile.setSummary(R.string.inline_file_data);
-		else
-			mTLSAuthFile.setSummary(result);
-	}
-}
\ No newline at end of file