diff options
author | Arne Schwabe <arne@rfc2549.org> | 2014-02-06 16:36:55 +0100 |
---|---|---|
committer | Arne Schwabe <arne@rfc2549.org> | 2014-02-06 16:36:55 +0100 |
commit | 062d57b2752ee66537bda74d87cc4c533a08b9ac (patch) | |
tree | 67bb62a2113029dbb4b2477556b15c3f94e074bc /src/de/blinkt/openvpn/activities | |
parent | 32bcede9f5f2e30df913b29d0990a3702bb7dad8 (diff) |
Fix bugs with the ocnfig parser
Diffstat (limited to 'src/de/blinkt/openvpn/activities')
-rw-r--r-- | src/de/blinkt/openvpn/activities/ConfigConverter.java | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/de/blinkt/openvpn/activities/ConfigConverter.java b/src/de/blinkt/openvpn/activities/ConfigConverter.java index 2e24f94f..50253915 100644 --- a/src/de/blinkt/openvpn/activities/ConfigConverter.java +++ b/src/de/blinkt/openvpn/activities/ConfigConverter.java @@ -315,15 +315,20 @@ public class ConfigConverter extends ListActivity implements FileSelectCallback if (mResult!=null) value = mResult.mPKCS12Filename; break; + + case USERPW_FILE: + titleRes = R.string.userpw_file; + return; + } boolean isCert = type == Utils.FileType.CA_CERTIFICATE || type == Utils.FileType.CLIENT_CERTIFICATE; FileSelectLayout fl = new FileSelectLayout(this,getString(titleRes), isCert); - fl.setData(value,this); - fileSelectMap.put(type,fl); + fileSelectMap.put(type, fl); fl.setLayoutParams(new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)); ((LinearLayout) findViewById(R.id.config_convert_root)).addView(fl, 1); + fl.setData(value,this); int i = getFileLayoutOffset(type); fl.setCaller(this, i, type); |