From 1b2a70bf41bc6a5f81687c394094e31e45c57dba Mon Sep 17 00:00:00 2001
From: M66B <marcel@faircode.eu>
Date: Fri, 22 Jul 2016 14:12:38 +0200
Subject: [PATCH] Allow importing of virtual files

---
 app/app.iml                                      | 16 ++++++++--------
 .../eu/faircode/netguard/ActivitySettings.java   | 12 ++++++++++--
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/app/app.iml b/app/app.iml
index 16cf64f9..bc39b36e 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -64,14 +64,6 @@
       <sourceFolder url="file://$MODULE_DIR$/src/all/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/all/renderscript" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/all/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestAll/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestAll/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestAll/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestAll/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestAll/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestAll/jni" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestAll/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestAll/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/testAll/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/testAll/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/testAll/assets" type="java-test-resource" />
@@ -80,6 +72,14 @@
       <sourceFolder url="file://$MODULE_DIR$/src/testAll/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/testAll/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/testAll/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestAll/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestAll/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestAll/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestAll/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestAll/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestAll/jni" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestAll/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestAll/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
diff --git a/app/src/main/java/eu/faircode/netguard/ActivitySettings.java b/app/src/main/java/eu/faircode/netguard/ActivitySettings.java
index 6dfddc5d..e5c3b591 100644
--- a/app/src/main/java/eu/faircode/netguard/ActivitySettings.java
+++ b/app/src/main/java/eu/faircode/netguard/ActivitySettings.java
@@ -22,12 +22,14 @@ package eu.faircode.netguard;
 import android.Manifest;
 import android.annotation.TargetApi;
 import android.content.BroadcastReceiver;
+import android.content.ContentResolver;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
+import android.content.res.AssetFileDescriptor;
 import android.database.Cursor;
 import android.net.ConnectivityManager;
 import android.net.Uri;
@@ -903,7 +905,10 @@ public class ActivitySettings extends AppCompatActivity implements SharedPrefere
                 InputStream in = null;
                 try {
                     Log.i(TAG, "Reading URI=" + data.getData());
-                    in = getContentResolver().openInputStream(data.getData());
+                    ContentResolver resolver = getContentResolver();
+                    String[] streamTypes = resolver.getStreamTypes(data.getData(), "*/*");
+                    AssetFileDescriptor descriptor = resolver.openTypedAssetFileDescriptor(data.getData(), streamTypes[0], null);
+                    in = descriptor.createInputStream();
                     out = new FileOutputStream(hosts);
 
                     int len;
@@ -963,7 +968,10 @@ public class ActivitySettings extends AppCompatActivity implements SharedPrefere
                 InputStream in = null;
                 try {
                     Log.i(TAG, "Reading URI=" + data.getData());
-                    in = getContentResolver().openInputStream(data.getData());
+                    ContentResolver resolver = getContentResolver();
+                    String[] streamTypes = resolver.getStreamTypes(data.getData(), "*/*");
+                    AssetFileDescriptor descriptor = resolver.openTypedAssetFileDescriptor(data.getData(), streamTypes[0], null);
+                    in = descriptor.createInputStream();
                     xmlImport(in);
                     return null;
                 } catch (Throwable ex) {