fix:CustomAttachment Exception

xhp · xhp · commit b1166f76f208 · 2017-07-20T14:47:37.000+08:00
diff --git a/android/src/main/java/com/netease/im/ReactCache.java b/android/src/main/java/com/netease/im/ReactCache.java
@@ -208,7 +208,9 @@ public static Object createRecentList(List<RecentContact> recents, int unreadNum
                 }
                 CustomAttachment attachment = null;
                 try {
-                    attachment = (CustomAttachment) contact.getAttachment();
+                    if (contact.getMsgType() == MsgTypeEnum.custom) {
+                        attachment = (CustomAttachment) contact.getAttachment();
+                    }
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
@@ -747,7 +749,7 @@ public static WritableMap createMessage(IMMessage item) {
                         imageObj.putString("thumbPath", imageAttachment.getPath());
                     } else {
                         imageObj.putString("thumbPath2", imageAttachment.getThumbPathForSave());
-                       imageObj.putString("thumbPath", imageAttachment.getThumbPath());
+                        imageObj.putString("thumbPath", imageAttachment.getThumbPath());
                     }
                     imageObj.putString("path2", imageAttachment.getPathForSave());
                     imageObj.putString("path", imageAttachment.getPath());

Original file line number	Diff line number	Diff line change
`@@ -208,7 +208,9 @@ public static Object createRecentList(List<RecentContact> recents, int unreadNum`
`208`	`208`	`}`
`209`	`209`	`CustomAttachment attachment = null;`
`210`	`210`	`try {`
`211`		`- attachment = (CustomAttachment) contact.getAttachment();`
	`211`	`+ if (contact.getMsgType() == MsgTypeEnum.custom) {`
	`212`	`+ attachment = (CustomAttachment) contact.getAttachment();`
	`213`	`+ }`
`212`	`214`	`} catch (Exception e) {`
`213`	`215`	`e.printStackTrace();`
`214`	`216`	`}`
`@@ -747,7 +749,7 @@ public static WritableMap createMessage(IMMessage item) {`
`747`	`749`	`imageObj.putString("thumbPath", imageAttachment.getPath());`
`748`	`750`	`} else {`
`749`	`751`	`imageObj.putString("thumbPath2", imageAttachment.getThumbPathForSave());`
`750`		`- imageObj.putString("thumbPath", imageAttachment.getThumbPath());`
	`752`	`+ imageObj.putString("thumbPath", imageAttachment.getThumbPath());`
`751`	`753`	`}`
`752`	`754`	`imageObj.putString("path2", imageAttachment.getPathForSave());`
`753`	`755`	`imageObj.putString("path", imageAttachment.getPath());`