fix error when import file from content uri

app/src/main/java/com/stardust/scriptdroid/external/open/ImportIntentActivity.java

@@ -1,6 +1,7 @@
 package com.stardust.scriptdroid.external.open;
 
 import android.content.Intent;
+import android.net.Uri;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.text.TextUtils;
@@ -10,6 +11,8 @@ import com.stardust.scriptdroid.ui.BaseActivity;
 import com.stardust.scriptdroid.ui.main.MainActivity;
 import com.stardust.scriptdroid.R;
 
+import java.io.FileNotFoundException;
+
 /**
  * Created by Stardust on 2017/2/2.
  */
@@ -30,13 +33,25 @@ public class ImportIntentActivity extends BaseActivity {
 
     @Override
     protected void onNewIntent(Intent intent) {
-        handleIntent(intent);
+        try {
+            handleIntent(intent);
+        } catch (FileNotFoundException e) {
+            e.printStackTrace();
+            Toast.makeText(this, R.string.edit_and_run_handle_intent_error, Toast.LENGTH_LONG).show();
+            finish();
+        }
     }
 
-    private void handleIntent(Intent intent) {
-        final String path = intent.getData().getPath();
-        if (!TextUtils.isEmpty(path))
-            MainActivity.importScriptFile(this, path);
+    private void handleIntent(Intent intent) throws FileNotFoundException {
+        Uri uri = intent.getData();
+        if (uri != null && "content".equals(uri.getScheme())) {
+            MainActivity.importScriptFileByInputStream(this, getContentResolver().openInputStream(uri));
+        } else {
+            final String path = intent.getData().getPath();
+            if (!TextUtils.isEmpty(path)) {
+                MainActivity.importScriptFile(this, path);
+            }
+        }
         finish();
     }
 

app/src/main/java/com/stardust/scriptdroid/ui/main/MainActivity.java

@@ -36,6 +36,7 @@ import com.stardust.scriptdroid.Pref;
 import com.stardust.scriptdroid.R;
 import com.stardust.scriptdroid.autojs.AutoJs;
 import com.stardust.scriptdroid.external.floatingwindow.HoverMenuManger;
+import com.stardust.scriptdroid.external.open.ImportIntentActivity;
 import com.stardust.scriptdroid.script.ScriptFile;
 import com.stardust.scriptdroid.script.StorageScriptProvider;
 import com.stardust.scriptdroid.script.sample.Sample;
@@ -67,6 +68,7 @@ import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 
 import java.io.IOException;
+import java.io.InputStream;
 
 @EActivity(R.layout.activity_main)
 public class MainActivity extends BaseActivity implements OnActivityResultDelegate.DelegateHost {
@@ -82,6 +84,7 @@ public class MainActivity extends BaseActivity implements OnActivityResultDelega
     private static final String ARGUMENT_PATH = "ARGUMENT_PATH";
     private static final String ACTION_IMPORT_SAMPLE = "I cannot find the way back to you...Eating...17.4.29";
     private static final String ARGUMENT_SAMPLE = "Take a chance on me...ok...?";
+    private static final String ARGUMENT_INPUT_STREAM = "17.7.12, Hi...could we start all over again...";
 
 
     @ViewById(R.id.drawer_layout)
@@ -327,10 +330,17 @@ public class MainActivity extends BaseActivity implements OnActivityResultDelega
         if (fragment == null) {
             mIntentToHandle = intent;
         } else {
-            fragment.importFile(intent.getStringExtra(ARGUMENT_PATH));
+            String path = intent.getStringExtra(ARGUMENT_PATH);
+            if (path != null) {
+                fragment.importFile(intent.getStringExtra(ARGUMENT_PATH));
+                return;
+            }
+            InputStream inputStream = IntentExtras.fromIntent(intent).getAndClear(ARGUMENT_INPUT_STREAM);
+            fragment.importFile("", inputStream);
         }
     }
 
+
     private void handleImportSample(Intent intent) {
         mViewPager.setCurrentItem(0, true);
         MyScriptListFragment fragment = getMyScriptListFragment();
@@ -392,6 +402,16 @@ public class MainActivity extends BaseActivity implements OnActivityResultDelega
                 .putExtra(ARGUMENT_PATH, path));
     }
 
+    public static void importScriptFileByInputStream(Context context, InputStream inputStream) {
+        Intent intent = new Intent(context, MainActivity_.class)
+                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_SINGLE_TOP)
+                .putExtra(EXTRA_ACTION, ACTION_IMPORT_SCRIPT);
+        IntentExtras.newExtras()
+                .put(ARGUMENT_INPUT_STREAM, inputStream)
+                .putInIntent(intent);
+        context.startActivity(intent);
+    }
+
     public static void importSample(Context context, Sample sample) {
         context.startActivity(new Intent(context, MainActivity_.class)
                 .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_SINGLE_TOP)
@@ -473,4 +493,6 @@ public class MainActivity extends BaseActivity implements OnActivityResultDelega
     public OnActivityResultDelegate.Mediator getOnActivityResultDelegateMediator() {
         return mActivityResultMediator;
     }
+
+
 }

common/src/main/java/com/stardust/util/IntentExtras.java

@@ -52,6 +52,13 @@ public class IntentExtras implements Serializable {
         return (T) mMap.get(key);
     }
 
+    @SuppressWarnings("unchecked")
+    public <T> T getAndClear(String key) {
+        T value = (T) mMap.get(key);
+        clear();
+        return value;
+    }
+
     public IntentExtras put(String key, Object value) {
         mMap.put(key, value);
         return this;