* [android] Fix crash due to instanceId is null

apache · Jul 31, 2018 · 2e9a078 · 2e9a078
1 parent 66571ad
commit 2e9a078
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java b/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java
@@ -438,7 +438,7 @@ public ScrollView getScrollView() {
 
   public void setRootScrollView(ScrollView scrollView) {
     mScrollView = scrollView;
-    if (mWXScrollViewListener != null) {
+    if (mWXScrollViewListener != null && mScrollView instanceof WXScrollView) {
       ((WXScrollView) mScrollView).addScrollViewListener(mWXScrollViewListener);
     }
   }

diff --git a/android/sdk/src/main/java/com/taobao/weex/common/WXErrorCode.java b/android/sdk/src/main/java/com/taobao/weex/common/WXErrorCode.java
@@ -236,7 +236,7 @@ public enum WXErrorCode {
   WX_RENDER_ERR_NULL_KEY("-9603", "WX_RENDER_ERR_NULL_KEY", ErrorType.NATIVE_ERROR, ErrorGroup.NATIVE),
   WX_RENDER_ERR_CONTAINER_TYPE("-9611", "WX_RENDER_ERR_CONTAINER_TYPE", ErrorType.JS_ERROR,ErrorGroup.JS),
   WX_RENDER_ERR_TRANSITION("-9616", "WX_RENDER_ERR_TRANSITION", ErrorType.JS_ERROR, ErrorGroup.JS),
-
+  WX_RENDER_ERR_INSTANCE_ID_NULL("-9618", "WX_RENDER_ERR_INSTANCE_ID_NULL", ErrorType.NATIVE_ERROR, ErrorGroup.NATIVE),
 
 
   /**

diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/WXRenderManager.java b/android/sdk/src/main/java/com/taobao/weex/ui/WXRenderManager.java
@@ -24,11 +24,13 @@
 import android.text.TextUtils;
 
 import com.taobao.weex.WXSDKInstance;
+import com.taobao.weex.common.WXErrorCode;
 import com.taobao.weex.common.WXRuntimeException;
 import com.taobao.weex.common.WXThread;
 import com.taobao.weex.dom.RenderContext;
 import com.taobao.weex.ui.action.BasicGraphicAction;
 import com.taobao.weex.ui.component.WXComponent;
+import com.taobao.weex.utils.WXExceptionUtils;
 import com.taobao.weex.utils.WXUtils;
 
 import java.util.ArrayList;
@@ -122,7 +124,15 @@ public void postGraphicAction(final String instanceId, final BasicGraphicAction
   }
 
   public void registerInstance(WXSDKInstance instance) {
-    mRenderContext.put(instance.getInstanceId(), new RenderContextImpl(instance));
+    if (instance.getInstanceId() == null) {
+      WXExceptionUtils.commitCriticalExceptionRT(null,
+              WXErrorCode.WX_RENDER_ERR_INSTANCE_ID_NULL,
+              "registerInstance",
+              WXErrorCode.WX_RENDER_ERR_INSTANCE_ID_NULL.getErrorMsg() + "instanceId is null",
+              null);
+    } else {
+      mRenderContext.put(instance.getInstanceId(), new RenderContextImpl(instance));
+    }
   }
 
   public List<WXSDKInstance> getAllInstances() {