Skip to content

Commit 57ff1f1

Browse files
authored
Only copy roomInfo if its valid and null check safety! (#146)
1 parent aa1ef1f commit 57ff1f1

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

Client/src/main/java/io/github/jwdeveloper/tiktok/TikTokLiveClient.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,14 +124,15 @@ public void tryConnect() {
124124
tikTokEventHandler.publish(this, new TikTokConnectingEvent());
125125
var userDataRequest = new LiveUserData.Request(roomInfo.getHostName());
126126
var userData = httpClient.fetchLiveUserData(userDataRequest);
127-
roomInfo.copy(userData.getRoomInfo());
128127

129128
if (userData.getUserStatus() == LiveUserData.UserStatus.Offline)
130129
throw new TikTokLiveOfflineHostException("User is offline: " + roomInfo.getHostName(), userData, null);
131130

132131
if (userData.getUserStatus() == LiveUserData.UserStatus.NotFound)
133132
throw new TikTokLiveUnknownHostException("User not found: " + roomInfo.getHostName(), userData, null);
134133

134+
roomInfo.copy(userData.getRoomInfo());
135+
135136
var liveDataRequest = new LiveData.Request(userData.getRoomInfo().getRoomId());
136137
var liveData = httpClient.fetchLiveData(liveDataRequest);
137138

Client/src/main/java/io/github/jwdeveloper/tiktok/TikTokRoomInfo.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ public void updateRanking(List<RankingUser> rankingUsers) {
5858

5959
@Override
6060
public void copy(LiveRoomInfo roomInfo) {
61+
if (roomInfo == null) return;
6162
this.roomId = roomInfo.getRoomId();
6263
this.likesCount = roomInfo.getLikesCount();
6364
this.viewersCount = roomInfo.getViewersCount();

0 commit comments

Comments
 (0)