tianzixuan/Doric
Archived
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

android: fix npe when create plugin error

Browse Source
This commit is contained in:
pengfei.zhou 2021-04-29 11:13:51 +08:00 committed by osborn
parent bdab13209c
commit 2e3f8f3cea
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
doric-android/doric/src/main/java/pub/doric/DoricContext.java
View File

@ -53,7 +53,7 @@ public class DoricContext {
private final String mContextId; private final String mContextId;
private final Map<String, DoricJavaPlugin> mPluginMap = new HashMap<>(); private final Map<String, DoricJavaPlugin> mPluginMap = new HashMap<>();
private final Context mContext; private final Context mContext;
private RootNode mRootNode = new RootNode(this); private final RootNode mRootNode = new RootNode(this);
private final String source; private final String source;
private String script; private String script;
private String extra; private String extra;
@ -198,7 +198,9 @@ public class DoricContext {
DoricJavaPlugin plugin = mPluginMap.get(doricMetaInfo.getName()); DoricJavaPlugin plugin = mPluginMap.get(doricMetaInfo.getName());
if (plugin == null) { if (plugin == null) {
plugin = doricMetaInfo.createInstance(this); plugin = doricMetaInfo.createInstance(this);
mPluginMap.put(doricMetaInfo.getName(), plugin); if (plugin != null) {
mPluginMap.put(doricMetaInfo.getName(), plugin);
}
} }
return plugin; return plugin;
} }
@ -281,7 +283,9 @@ public class DoricContext {
*/ */
public void onActivityResult(int requestCode, int resultCode, Intent data) { public void onActivityResult(int requestCode, int resultCode, Intent data) {
for (DoricJavaPlugin javaPlugin : mPluginMap.values()) { for (DoricJavaPlugin javaPlugin : mPluginMap.values()) {
javaPlugin.onActivityResult(requestCode, resultCode, data); if (javaPlugin != null) {
javaPlugin.onActivityResult(requestCode, resultCode, data);
}
} }
} }
} }