Skip to content

Commit f4e2a13

Browse files
committed
NPE fixes
1 parent 73cd4e6 commit f4e2a13

File tree

2 files changed

+27
-5
lines changed

2 files changed

+27
-5
lines changed

libraries/sdk/src/main/java/com/fastcomments/sdk/FastCommentsFeedView.java

Lines changed: 24 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,10 @@ public void setSDK(FastCommentsFeedSDK sdk) {
314314
// Update adapter with the current list from SDK
315315
// This ensures the adapter's list is in sync with the SDK after a post is deleted
316316
if (sdk != null && adapter != null) {
317-
adapter.updatePosts(sdk.getFeedPosts());
317+
List<FeedPost> posts = sdk.getFeedPosts();
318+
if (posts != null) {
319+
adapter.updatePosts(posts);
320+
}
318321
}
319322

320323
// Log for debugging
@@ -363,8 +366,11 @@ public void restoreViewState(ViewState state) {
363366
sdk.restorePaginationState(state.getFeedState());
364367

365368
// Update adapter with restored posts
366-
if (adapter != null && sdk.getFeedPosts() != null && !sdk.getFeedPosts().isEmpty()) {
367-
adapter.updatePosts(sdk.getFeedPosts());
369+
if (adapter != null && sdk != null) {
370+
List<FeedPost> posts = sdk.getFeedPosts();
371+
if (posts != null && !posts.isEmpty()) {
372+
adapter.updatePosts(posts);
373+
}
368374
}
369375
}
370376

@@ -467,6 +473,9 @@ public boolean onSuccess(PublicFeedPostsResponse response) {
467473
swipeRefreshLayout.setRefreshing(false);
468474
hideError();
469475

476+
if (sdk == null) {
477+
return;
478+
}
470479
List<FeedPost> posts = sdk.getFeedPosts();
471480

472481
if (posts.isEmpty()) {
@@ -541,6 +550,9 @@ public boolean onSuccess(PublicFeedPostsResponse response) {
541550
swipeRefreshLayout.setRefreshing(false);
542551
hideError();
543552

553+
if (sdk == null) {
554+
return;
555+
}
544556
List<FeedPost> posts = sdk.getFeedPosts();
545557

546558
if (posts.isEmpty()) {
@@ -789,6 +801,9 @@ public void refreshPost(String postId) {
789801
}
790802

791803
// Get the updated posts list from SDK
804+
if (sdk == null) {
805+
return;
806+
}
792807
List<FeedPost> posts = sdk.getFeedPosts();
793808
if (posts == null || posts.isEmpty()) {
794809
return;
@@ -977,7 +992,12 @@ public boolean onSuccess(APIEmptyResponse response) {
977992

978993
// Update adapter with the current list from SDK
979994
// This ensures the adapter's internal list matches the SDK's list
980-
adapter.updatePosts(sdk.getFeedPosts());
995+
if (sdk != null) {
996+
List<FeedPost> posts = sdk.getFeedPosts();
997+
if (posts != null) {
998+
adapter.updatePosts(posts);
999+
}
1000+
}
9811001
});
9821002
return CONSUME;
9831003
}

libraries/sdk/src/main/java/com/fastcomments/sdk/LiveChatView.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1455,7 +1455,9 @@ private void startDateUpdateTimer() {
14551455
* Stops the timer for updating relative dates
14561456
*/
14571457
private void stopDateUpdateTimer() {
1458-
dateUpdateHandler.removeCallbacks(dateUpdateRunnable);
1458+
if (dateUpdateHandler != null) {
1459+
dateUpdateHandler.removeCallbacks(dateUpdateRunnable);
1460+
}
14591461
}
14601462

14611463
/**

0 commit comments

Comments
 (0)