tt/AutoJs6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复 app.viewFile等FileUriExposed异常

Browse Source
This commit is contained in:
hyb1996
2018-10-15 00:59:39 +08:00
parent d1fb2c44f2
commit 1094965eb1
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/org/autojs/autojs/autojs/AutoJs.java
View File

@@ -12,6 +12,7 @@ import com.stardust.app.GlobalAppContext;
import com.stardust.autojs.core.console.GlobalStardustConsole; import com.stardust.autojs.core.console.GlobalStardustConsole;
import com.stardust.autojs.runtime.ScriptRuntime; import com.stardust.autojs.runtime.ScriptRuntime;
import com.stardust.autojs.runtime.accessibility.AccessibilityConfig; import com.stardust.autojs.runtime.accessibility.AccessibilityConfig;
import com.stardust.autojs.runtime.api.AppUtils;
import com.stardust.autojs.runtime.exception.ScriptException; import com.stardust.autojs.runtime.exception.ScriptException;
import com.stardust.autojs.runtime.api.Console; import com.stardust.autojs.runtime.api.Console;
import com.stardust.autojs.runtime.exception.ScriptInterruptedException; import com.stardust.autojs.runtime.exception.ScriptInterruptedException;
@@ -20,6 +21,7 @@ import org.autojs.autojs.App;
import org.autojs.autojs.BuildConfig; import org.autojs.autojs.BuildConfig;
import org.autojs.autojs.Pref; import org.autojs.autojs.Pref;
import org.autojs.autojs.R; import org.autojs.autojs.R;
import org.autojs.autojs.external.fileprovider.AppFileProvider;
import org.autojs.autojs.pluginclient.DevPluginService; import org.autojs.autojs.pluginclient.DevPluginService;
import org.autojs.autojs.ui.floating.FloatyWindowManger; import org.autojs.autojs.ui.floating.FloatyWindowManger;
import org.autojs.autojs.ui.floating.FullScreenFloatyWindow; import org.autojs.autojs.ui.floating.FullScreenFloatyWindow;
@@ -97,6 +99,11 @@ public class AutoJs extends com.stardust.autojs.AutoJs {
} }
} }
@Override
protected AppUtils createAppUtils(Context context) {
return new AppUtils(context, AppFileProvider.AUTHORITY);
}
@Override @Override
protected GlobalStardustConsole createGlobalConsole() { protected GlobalStardustConsole createGlobalConsole() {
return new GlobalStardustConsole(getUiHandler()) { return new GlobalStardustConsole(getUiHandler()) {

6
autojs/src/main/java/com/stardust/autojs/AutoJs.java
View File

@@ -61,7 +61,7 @@ public abstract class AutoJs {
mContext = application.getApplicationContext(); mContext = application.getApplicationContext();
mApplication = application; mApplication = application;
mUiHandler = new UiHandler(mContext); mUiHandler = new UiHandler(mContext);
mAppUtils = new AppUtils(mContext); mAppUtils = createAppUtils(mContext);
mGlobalConsole = createGlobalConsole(); mGlobalConsole = createGlobalConsole();
mNotificationObserver = new AccessibilityNotificationObserver(mContext); mNotificationObserver = new AccessibilityNotificationObserver(mContext);
mAccessibilityInfoProvider = new AccessibilityInfoProvider(mContext.getPackageManager()); mAccessibilityInfoProvider = new AccessibilityInfoProvider(mContext.getPackageManager());
@@ -70,6 +70,10 @@ public abstract class AutoJs {
init(); init();
} }
protected AppUtils createAppUtils(Context context) {
return new AppUtils(mContext);
}
protected GlobalStardustConsole createGlobalConsole() { protected GlobalStardustConsole createGlobalConsole() {
return new GlobalStardustConsole(mUiHandler); return new GlobalStardustConsole(mUiHandler);
} }