Skip to content

Commit 7ce6739

Browse files
KenChoiKenChoi
authored andcommitted
fix bug
1 parent 186bbb4 commit 7ce6739

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

android/src/io/jchat/android/utils/ResultUtils.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,9 @@ public static WritableMap toJSObject(GroupInfo groupInfo) {
109109
result.putString(Constant.DESC, groupInfo.getGroupDescription());
110110
result.putInt(Constant.LEVEL, groupInfo.getGroupLevel());
111111
result.putString(Constant.OWNER, groupInfo.getGroupOwner());
112-
result.putString(Constant.AVATAR_THUMB_PATH, groupInfo.getAvatarFile().getAbsolutePath());
112+
if (groupInfo.getAvatarFile() != null) {
113+
result.putString(Constant.AVATAR_THUMB_PATH, groupInfo.getAvatarFile().getAbsolutePath());
114+
}
113115
result.putString(Constant.OWNER_APP_KEY, groupInfo.getOwnerAppkey());
114116
result.putInt(Constant.MAX_MEMBER_COUNT, groupInfo.getMaxMemberCount());
115117
result.putBoolean(Constant.IS_NO_DISTURB, groupInfo.getNoDisturb() == 1);

example/android/app/app.iml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -88,18 +88,14 @@
8888
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
8989
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-manifest" />
9090
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
91-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
9291
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
93-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
9492
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaPrecompile" />
9593
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
9694
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
97-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
9895
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/prebuild" />
9996
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
10097
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
10198
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
102-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/sourceFolderJavaResources" />
10399
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/splits-support" />
104100
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
105101
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/tmp" />

example/app/routes/Home/ConversationList/ConversationListStore.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,9 @@ class ConversationListStore {
3535
})
3636
}
3737
} else if (item.type === "group") {
38-
item.appKey = conversation.target.ownerAppKey
38+
if (conversation.target.ownerAppKey != undefined) {
39+
item.appKey = conversation.target.ownerAppKey
40+
}
3941
item.groupId = conversation.target.id
4042
item.displayName = conversation.target.name
4143
item.avatarThumbPath = conversation.target.avatarThumbPath

example/app/routes/Home/ConversationList/index.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -238,10 +238,10 @@ export default class ConversationList extends React.Component {
238238
<Button
239239
onPress={() => {
240240

241-
JMessage.createGroup({ name: this.state.modalText, desc: "" }, (group) => {
241+
JMessage.createGroup({ name: this.state.modalText, desc: "" }, (groupId) => {
242242
var params = {}
243243
params.type = 'group'
244-
params.groupId = group.id
244+
params.groupId = groupId
245245
this.setState({ isShowModal: false })
246246
this.createConversation(params)
247247
}, (error) => {

0 commit comments

Comments
 (0)