diff options
author | Arne Schwabe <arne@rfc2549.org> | 2015-11-02 16:03:34 +0100 |
---|---|---|
committer | Arne Schwabe <arne@rfc2549.org> | 2015-11-02 16:03:34 +0100 |
commit | 2e6a575fb8232fbb652d9f3dadefe90e628a51ca (patch) | |
tree | a9b3f26bdad3af0f3328361024edadaefbde3fb6 /main/src/main/java/de/blinkt/openvpn/activities/ConfigConverter.java | |
parent | 4d6a12b09a2f0524820fb8f0a82eab625e401062 (diff) |
Fix minor bugs, fix lz4, new version, new translationsv0.6.44-productionv0.6.44
Diffstat (limited to 'main/src/main/java/de/blinkt/openvpn/activities/ConfigConverter.java')
-rw-r--r-- | main/src/main/java/de/blinkt/openvpn/activities/ConfigConverter.java | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/main/src/main/java/de/blinkt/openvpn/activities/ConfigConverter.java b/main/src/main/java/de/blinkt/openvpn/activities/ConfigConverter.java index 227a97cd..180dbe64 100644 --- a/main/src/main/java/de/blinkt/openvpn/activities/ConfigConverter.java +++ b/main/src/main/java/de/blinkt/openvpn/activities/ConfigConverter.java @@ -18,6 +18,7 @@ import android.database.Cursor; import android.os.Build; import android.os.Bundle; import android.os.Environment; +import android.os.NetworkOnMainThreadException; import android.provider.OpenableColumns; import android.security.KeyChain; import android.security.KeyChainAliasCallback; @@ -632,7 +633,7 @@ public class ConfigConverter extends Activity implements FileSelectCallback, Vie possibleName = possibleName.substring(possibleName.lastIndexOf('/') + 1); } - InputStream is = getContentResolver().openInputStream(data); + mPathsegments = data.getPathSegments(); Cursor cursor = null; @@ -661,8 +662,12 @@ public class ConfigConverter extends Activity implements FileSelectCallback, Vie possibleName = possibleName.replace(".ovpn", ""); possibleName = possibleName.replace(".conf", ""); } - - doImport(is, possibleName); + try { + InputStream is = getContentResolver().openInputStream(data); + doImport(is, possibleName); + } catch (NetworkOnMainThreadException nom) { + throw new RuntimeException("Network on Main: + " + data); + } } catch (FileNotFoundException e) { log(R.string.import_content_resolve_error); |