diff options
author | Arne Schwabe <arne@rfc2549.org> | 2014-02-11 23:36:48 +0100 |
---|---|---|
committer | Arne Schwabe <arne@rfc2549.org> | 2014-02-11 23:36:48 +0100 |
commit | c373af42b1a75b0f23c2f0edbf196dfbb1ef0a0e (patch) | |
tree | 1a6957889611f16974de15418ef0257e9f1ba90d /src/de/blinkt/openvpn/fragments/Settings_Authentication.java | |
parent | 3044e321058be2a7b860a7c10c8efa49afabfcb2 (diff) |
Rework and fix config import
Diffstat (limited to 'src/de/blinkt/openvpn/fragments/Settings_Authentication.java')
-rw-r--r-- | src/de/blinkt/openvpn/fragments/Settings_Authentication.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/de/blinkt/openvpn/fragments/Settings_Authentication.java b/src/de/blinkt/openvpn/fragments/Settings_Authentication.java index b153ce4d..236d7947 100644 --- a/src/de/blinkt/openvpn/fragments/Settings_Authentication.java +++ b/src/de/blinkt/openvpn/fragments/Settings_Authentication.java @@ -191,7 +191,7 @@ public class Settings_Authentication extends OpenVpnPreferencesFragment implemen setTlsAuthSummary(result); } else if (requestCode == SELECT_TLS_FILE_KITKAT && resultCode == Activity.RESULT_OK) { try { - mTlsAuthFileData= VpnProfile.INLINE_TAG + Utils.getStringFromFilePickerResult(Utils.FileType.TLS_AUTH_FILE,data,getActivity()); + mTlsAuthFileData= Utils.getFilePickerResult(Utils.FileType.TLS_AUTH_FILE,data,getActivity()); setTlsAuthSummary(mTlsAuthFileData); } catch (IOException e) { VpnStatus.logException(e); @@ -200,9 +200,12 @@ public class Settings_Authentication extends OpenVpnPreferencesFragment implemen } private void setTlsAuthSummary(String result) { - if(result==null) result = getString(R.string.no_certificate); + if(result==null) + result = getString(R.string.no_certificate); if(result.startsWith(VpnProfile.INLINE_TAG)) mTLSAuthFile.setSummary(R.string.inline_file_data); + else if (result.startsWith(VpnProfile.DISPLAYNAME_TAG)) + mExpectTLSCert.setSummary(getString(R.string.imported_from_file, VpnProfile.getDisplayName(result))); else mTLSAuthFile.setSummary(result); } |