1, 修改本地运行时version检查错误。2,修改好友被删除后再次添加好友。3,优化部分流程

This commit is contained in:
heavyrain.lee
2019-04-12 14:37:52 +08:00
parent 24ebe429cc
commit 9560b9c202
3 changed files with 20 additions and 15 deletions
@@ -1481,7 +1481,7 @@ public class MemoryMessagesStore implements IMessagesStore {
}
if (existRequest != null) {
if (System.currentTimeMillis() - existRequest.getUpdateDt() > 7 * 24 * 60 * 60 * 1000) {
if (existRequest.getStatus() != ProtoConstants.FriendRequestStatus.RequestStatus_Accepted && System.currentTimeMillis() - existRequest.getUpdateDt() > 7 * 24 * 60 * 60 * 1000) {
if (existRequest.getStatus() == ProtoConstants.FriendRequestStatus.RequestStatus_Rejected) {
return ErrorCode.ERROR_CODE_FRIEND_REQUEST_BLOCKED;
}
@@ -1761,6 +1761,7 @@ public class MemoryMessagesStore implements IMessagesStore {
userSettingMap.put(userId, settingEntry);
userGlobalSlientMap.remove(userId);
userConvSlientMap.remove(userId);
userPushHiddenDetail.remove(userId);
return updateDt;
}