diff options
author | Arne Schwabe <arne@rfc2549.org> | 2014-01-21 20:37:05 +0100 |
---|---|---|
committer | Arne Schwabe <arne@rfc2549.org> | 2014-01-21 20:37:05 +0100 |
commit | f3957386eb230ab85fa7d727c96d9ca6fe122ee3 (patch) | |
tree | 1d8c26896b8b0283c740314068f09cbe2f36ee4a /src/de/blinkt/openvpn/fragments/Settings_Basic.java | |
parent | 3dbcc517f0f060c46adf0a54024bff85d54a5982 (diff) |
Move to common code for selecting and embedding files
--HG--
extra : rebase_source : 7e0aa4672ca93e4e3b6a7c056e1004edd12f2fbc
Diffstat (limited to 'src/de/blinkt/openvpn/fragments/Settings_Basic.java')
-rw-r--r-- | src/de/blinkt/openvpn/fragments/Settings_Basic.java | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/de/blinkt/openvpn/fragments/Settings_Basic.java b/src/de/blinkt/openvpn/fragments/Settings_Basic.java index cf4d22d1..f2fab505 100644 --- a/src/de/blinkt/openvpn/fragments/Settings_Basic.java +++ b/src/de/blinkt/openvpn/fragments/Settings_Basic.java @@ -26,7 +26,6 @@ import android.widget.EditText; import android.widget.Spinner; import android.widget.TextView; import android.widget.ToggleButton; -import de.blinkt.openvpn.activities.FileSelect; import de.blinkt.openvpn.views.FileSelectLayout; import de.blinkt.openvpn.R; import de.blinkt.openvpn.VpnProfile; @@ -64,7 +63,7 @@ public class Settings_Basic extends Fragment implements View.OnClickListener, On - private void addFileSelectLayout (FileSelectLayout fsl, FileSelectLayout.FileType type) { + private void addFileSelectLayout (FileSelectLayout fsl, Utils.FileType type) { int i = fileselects.size() + CHOOSE_FILE_OFFSET; fileselects.put(i, fsl); fsl.setFragment(this,i,type); @@ -141,10 +140,10 @@ public class Settings_Basic extends Fragment implements View.OnClickListener, On mPassword = (EditText) mView.findViewById(R.id.auth_password); mKeyPassword = (EditText) mView.findViewById(R.id.key_password); - addFileSelectLayout(mCaCert, FileSelectLayout.FileType.CERTIFICATE); - addFileSelectLayout(mClientCert, FileSelectLayout.FileType.CERTIFICATE); - addFileSelectLayout(mClientKey, FileSelectLayout.FileType.KEYFILE); - addFileSelectLayout(mpkcs12, FileSelectLayout.FileType.PKCS12); + addFileSelectLayout(mCaCert, Utils.FileType.CERTIFICATE); + addFileSelectLayout(mClientCert, Utils.FileType.CERTIFICATE); + addFileSelectLayout(mClientKey, Utils.FileType.KEYFILE); + addFileSelectLayout(mpkcs12, Utils.FileType.PKCS12); mCaCert.setShowClear(); mType.setOnItemSelectedListener(this); |