From 4b1fb7b358eef95988a8955c5aaae4a3bb142817 Mon Sep 17 00:00:00 2001
From: Florens Douwes <Floens@gmail.com>
Date: Wed, 26 Mar 2014 19:48:15 +0100
Subject: [PATCH] More of last commit

---
 .../org/floens/chan/manager/ThreadManager.java    | 15 ++++++++++-----
 .../floens/chan/view/ThreadWatchCounterView.java  |  4 ++--
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/Chan/src/org/floens/chan/manager/ThreadManager.java b/Chan/src/org/floens/chan/manager/ThreadManager.java
index d5721460..c6e424f2 100644
--- a/Chan/src/org/floens/chan/manager/ThreadManager.java
+++ b/Chan/src/org/floens/chan/manager/ThreadManager.java
@@ -64,13 +64,16 @@ public class ThreadManager implements Loader.LoaderListener {
 
     public void onStart() {
         if (loader != null) {
-            loader.onStart();
+            if (loader.getLoadable().isThreadMode()) {
+                loader.setAutoLoadMore(true);
+                loader.requestMoreDataAndResetTimer();
+            }
         }
     }
 
     public void onStop() {
         if (loader != null) {
-            loader.onStop();
+            loader.setAutoLoadMore(false);
         }
     }
 
@@ -80,12 +83,14 @@ public class ThreadManager implements Loader.LoaderListener {
         }
 
         loader = LoaderPool.getInstance().obtain(loadable, this);
-        loader.activityHasBinded();
+        if (loadable.isThreadMode()) {
+            loader.setAutoLoadMore(true);
+        }
     }
 
     public void unbindLoader() {
         if (loader != null) {
-            loader.onStop();
+            loader.setAutoLoadMore(false);
             LoaderPool.getInstance().release(loader, this);
             loader = null;
         } else {
@@ -117,7 +122,7 @@ public class ThreadManager implements Loader.LoaderListener {
      */
     public void requestNextData() {
         if (loader != null) {
-            loader.requestNextData();
+            loader.requestMoreData();
         } else {
             Logger.e(TAG, "Loader null in requestData");
         }
diff --git a/Chan/src/org/floens/chan/view/ThreadWatchCounterView.java b/Chan/src/org/floens/chan/view/ThreadWatchCounterView.java
index 2e37f799..de7f03f5 100644
--- a/Chan/src/org/floens/chan/view/ThreadWatchCounterView.java
+++ b/Chan/src/org/floens/chan/view/ThreadWatchCounterView.java
@@ -59,7 +59,7 @@ public class ThreadWatchCounterView extends TextView implements View.OnClickList
     public void onClick(View v) {
         Loader loader = tm.getLoader();
         if (loader != null) {
-            loader.requestNextDataResetTimer();
+            loader.requestMoreDataAndResetTimer();
         }
         
         ad.notifyDataSetChanged();
@@ -69,7 +69,7 @@ public class ThreadWatchCounterView extends TextView implements View.OnClickList
         Loader loader = tm.getLoader();
         if (loader == null) return;
         
-        int time = Math.round(loader.getTimeUntilReload() / 1000f);
+        int time = Math.round(loader.getTimeUntilLoadMore() / 1000f);
         
         if (time <= 0) {
             setText("Loading");