From f31f5df28ce34a74b02824bcb8c9179bd4b4a2e9 Mon Sep 17 00:00:00 2001 From: Florens Douwes Date: Mon, 26 May 2014 17:54:15 +0200 Subject: [PATCH] Only reset pin.watchLastCount when it is valid. --- Clover/app/src/main/java/org/floens/chan/core/model/Pin.java | 4 ++-- .../src/main/java/org/floens/chan/core/watch/PinWatcher.java | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Clover/app/src/main/java/org/floens/chan/core/model/Pin.java b/Clover/app/src/main/java/org/floens/chan/core/model/Pin.java index 487b39a0..74a23519 100644 --- a/Clover/app/src/main/java/org/floens/chan/core/model/Pin.java +++ b/Clover/app/src/main/java/org/floens/chan/core/model/Pin.java @@ -54,7 +54,7 @@ public class Pin { public int watchLastCount = -1; @DatabaseField - public int watchNewCount = 0; + public int watchNewCount = -1; @DatabaseField public int quoteLastCount = 0; @@ -69,7 +69,7 @@ public class Pin { } public int getNewPostsCount() { - if (watchLastCount < 0) { + if (watchLastCount < 0 || watchNewCount < 0) { return 0; } else { return Math.max(0, watchNewCount - watchLastCount); diff --git a/Clover/app/src/main/java/org/floens/chan/core/watch/PinWatcher.java b/Clover/app/src/main/java/org/floens/chan/core/watch/PinWatcher.java index 764afc32..e3c7ddba 100644 --- a/Clover/app/src/main/java/org/floens/chan/core/watch/PinWatcher.java +++ b/Clover/app/src/main/java/org/floens/chan/core/watch/PinWatcher.java @@ -58,7 +58,10 @@ public class PinWatcher implements Loader.LoaderListener { } public void onViewed() { - pin.watchLastCount = pin.watchNewCount; + if (pin.watchNewCount >= 0) { + pin.watchLastCount = pin.watchNewCount; + } + pin.quoteLastCount = pin.quoteNewCount; wereNewQuotes = false; }