fix:equals 空指针，一对一拆红包，联系人备注

Author: xhp

android/src/main/java/com/netease/im/RNNeteaseImModule.java

@@ -981,7 +981,7 @@ public void onResult(int code, Void aVoid, Throwable throwable) {
     }
 
     boolean string2Boolean(String bool) {
-        return TextUtils.isEmpty(bool) ? false : !bool.equals("0");
+        return TextUtils.isEmpty(bool) ? false : !"0".equals(bool);
     }
 
     /**

android/src/main/java/com/netease/im/ReactCache.java

@@ -356,7 +356,7 @@ public static Object createFriendSet(ContactDataList datas, boolean hasFilter) {
 
                     map.putString("alias", contact.getDisplayName());
                     map.putString("type", Integer.toString(contact.getContactType()));
-                    map.putString("name", NimUserInfoCache.getInstance().getUserName(contact.getContactId()));
+                    map.putString("name", NimUserInfoCache.getInstance().getUserDisplayName(contact.getContactId()));
                     String avatar = NimUserInfoCache.getInstance().getAvatar(contact.getContactId());
                     map.putString("avatar", avatar);
                     map.putString("avatarLocal", ImageLoaderKit.getMemoryCachedAvatar(avatar));

android/src/main/java/com/netease/im/login/RecentContactObserver.java

@@ -7,6 +7,7 @@
 import com.netease.im.ReactCache;
 import com.netease.im.uikit.cache.SimpleCallback;
 import com.netease.im.uikit.cache.TeamDataCache;
+import com.netease.im.uikit.common.util.log.LogUtil;
 import com.netease.nimlib.sdk.NIMClient;
 import com.netease.nimlib.sdk.Observer;
 import com.netease.nimlib.sdk.RequestCallbackWrapper;
@@ -44,6 +45,7 @@ static class InstanceHolder {
     public static RecentContactObserver getInstance() {
         return InstanceHolder.instance;
     }
+
     /*******************************最近会话********************************/
 
     private List<RecentContact> items = new ArrayList<>();
@@ -55,7 +57,12 @@ public void queryRecentContacts() {
             public void onResult(int code, List<RecentContact> recentContacts, Throwable throwable) {
 
                 items.clear();
-                items.addAll(recentContacts);
+                if (recentContacts != null) {
+                    for (RecentContact c : recentContacts) {
+                        doAddDeleteQuitTeamMessage(c, true);
+                    }
+                }
+//                items.addAll(recentContacts);
                 refreshMessages(true);
             }
         });
@@ -74,8 +81,17 @@ public void registerRecentContactObserver(boolean register) {
 
     }
 
-    private void deleteRecentContact(String contactId, SessionTypeEnum sessionTypeEnum) {
-        NIMClient.getService(MsgService.class).deleteRecentContact2(contactId, sessionTypeEnum);
+    private void deleteRecentContactCallback(RecentContact recent, boolean callback) {
+
+        String contactId = recent.getContactId();
+        SessionTypeEnum sessionTypeEnum = recent.getSessionType();
+        LogUtil.i("deleteRecentContactCallback-","---"+contactId);
+        LogUtil.i("deleteRecentContactCallback-","---"+recent.getContent());
+        if (callback) {
+            NIMClient.getService(MsgService.class).deleteRecentContact2(contactId, sessionTypeEnum);
+        } else {
+            NIMClient.getService(MsgService.class).deleteRecentContact(recent);
+        }
         NIMClient.getService(MsgService.class).clearChattingHistory(contactId, sessionTypeEnum);
     }
 
@@ -87,7 +103,7 @@ public boolean deleteRecentContact(String rContactId) {
         for (RecentContact recent : items) {
             String contactId = recent.getContactId();
             if (rContactId.equals(contactId)) {
-                deleteRecentContact(contactId, recent.getSessionType());
+                deleteRecentContactCallback(recent, true);
                 result = true;
                 break;
             }
@@ -127,7 +143,7 @@ void doAddDeleteQuitTeamMessage(final RecentContact r, boolean isDelete) {
                 if (t.isMyTeam()) {
                     items.add(r);
                 } else {
-                    deleteRecentContact(contactId, r.getSessionType());
+                    deleteRecentContactCallback(r, false);
                 }
             } else {
                 TeamDataCache.getInstance().fetchTeamById(contactId, new SimpleCallback<Team>() {
@@ -136,7 +152,7 @@ public void onResult(boolean success, Team result) {
                         if (success && result != null) {
                             if (!result.isMyTeam()) {
                                 items.remove(r);
-                                deleteRecentContact(contactId, SessionTypeEnum.Team);
+                                deleteRecentContactCallback(r, true);
                                 refreshMessages(true);
                             }
                         }

android/src/main/java/com/netease/im/login/SysMessageObserver.java

@@ -131,7 +131,7 @@ private void onIncomingMessage(final SystemMessage message) {
         if (addFriendVerifyFilter(message)) {
             SystemMessage del = null;
             for (SystemMessage m : sysItems) {
-                if (m.getFromAccount().equals(message.getFromAccount()) && m.getType() == SystemMessageType.AddFriend) {
+                if (TextUtils.equals(m.getFromAccount(), message.getFromAccount()) && m.getType() == SystemMessageType.AddFriend) {
                     AddFriendNotify attachData = (AddFriendNotify) m.getAttachObject();
                     if (attachData != null && attachData.getEvent() == AddFriendNotify.Event.RECV_ADD_FRIEND_VERIFY_REQUEST) {
                         del = m;

android/src/main/java/com/netease/im/session/SessionUtil.java

@@ -131,7 +131,7 @@ public static void receiver(NotificationManager manager, CustomNotification cust
 //                LogUtil.i("timestamp",""+data);
                 String sessionId = data.getString("sessionId");
                 String sessionType = data.getString("sessionType");
-                final String id = getSessionType(sessionType) == SessionTypeEnum.P2P ? openId : sessionId;
+                final String id =  sessionId;//getSessionType(sessionType) == SessionTypeEnum.P2P ? openId :
                 sendRedPacketOpenLocal(id, getSessionType(sessionType), sendId, openId, hasRedPacket, serialNo, t);
             }
         }

android/src/main/java/com/netease/im/uikit/cache/NimUserInfoCache.java

@@ -77,7 +77,7 @@ public void getUserInfoFromRemote(final String account, final RequestCallback<Ni
 
             @Override
             public void onResult(int code, List<NimUserInfo> users, Throwable exception) {
-                if (exception != null&&callback != null) {
+                if (exception != null && callback != null) {
                     callback.onException(exception);
                     return;
                 }
@@ -198,7 +198,6 @@ public String getUserDisplayName(String account) {
     }
 
     /**
-     *
      * @param account
      * @return
      */
@@ -230,15 +229,15 @@ public String getUserName(String account) {
     }
 
     public String getUserDisplayNameEx(String account) {
-        if (account.equals(LoginService.getInstance().getAccount())) {
+        if (TextUtils.equals(account, LoginService.getInstance().getAccount())) {
             return "我";
         }
 
         return getUserDisplayName(account);
     }
 
     public String getUserDisplayNameYou(String account) {
-        if (account.equals(LoginService.getInstance().getAccount())) {
+        if (TextUtils.equals(account, LoginService.getInstance().getAccount())) {
             return "你";  // 若为用户自己，显示“你”
         }
 

android/src/main/java/com/netease/im/uikit/cache/TeamDataCache.java

@@ -385,7 +385,7 @@ public TeamMember getTeamMember(String teamId, String account) {
      * @return
      */
     public String getTeamMemberDisplayName(String tid, String account) {
-        if (account.equals(LoginService.getInstance().getAccount())) {
+        if (TextUtils.equals(account, LoginService.getInstance().getAccount())) {
             return "我";
         }
 
@@ -400,7 +400,7 @@ public String getTeamMemberDisplayName(String tid, String account) {
      * @return
      */
     public String getTeamMemberDisplayNameYou(String tid, String account) {
-        if (account.equals(LoginService.getInstance().getAccount())) {
+        if (TextUtils.equals(account, LoginService.getInstance().getAccount())) {
             return "你";
         }