More of last commit

captchafix
Florens Douwes 11 years ago
parent e32a5f6816
commit 4b1fb7b358
  1. 15
      Chan/src/org/floens/chan/manager/ThreadManager.java
  2. 4
      Chan/src/org/floens/chan/view/ThreadWatchCounterView.java

@ -64,13 +64,16 @@ public class ThreadManager implements Loader.LoaderListener {
public void onStart() { public void onStart() {
if (loader != null) { if (loader != null) {
loader.onStart(); if (loader.getLoadable().isThreadMode()) {
loader.setAutoLoadMore(true);
loader.requestMoreDataAndResetTimer();
}
} }
} }
public void onStop() { public void onStop() {
if (loader != null) { 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 = LoaderPool.getInstance().obtain(loadable, this);
loader.activityHasBinded(); if (loadable.isThreadMode()) {
loader.setAutoLoadMore(true);
}
} }
public void unbindLoader() { public void unbindLoader() {
if (loader != null) { if (loader != null) {
loader.onStop(); loader.setAutoLoadMore(false);
LoaderPool.getInstance().release(loader, this); LoaderPool.getInstance().release(loader, this);
loader = null; loader = null;
} else { } else {
@ -117,7 +122,7 @@ public class ThreadManager implements Loader.LoaderListener {
*/ */
public void requestNextData() { public void requestNextData() {
if (loader != null) { if (loader != null) {
loader.requestNextData(); loader.requestMoreData();
} else { } else {
Logger.e(TAG, "Loader null in requestData"); Logger.e(TAG, "Loader null in requestData");
} }

@ -59,7 +59,7 @@ public class ThreadWatchCounterView extends TextView implements View.OnClickList
public void onClick(View v) { public void onClick(View v) {
Loader loader = tm.getLoader(); Loader loader = tm.getLoader();
if (loader != null) { if (loader != null) {
loader.requestNextDataResetTimer(); loader.requestMoreDataAndResetTimer();
} }
ad.notifyDataSetChanged(); ad.notifyDataSetChanged();
@ -69,7 +69,7 @@ public class ThreadWatchCounterView extends TextView implements View.OnClickList
Loader loader = tm.getLoader(); Loader loader = tm.getLoader();
if (loader == null) return; if (loader == null) return;
int time = Math.round(loader.getTimeUntilReload() / 1000f); int time = Math.round(loader.getTimeUntilLoadMore() / 1000f);
if (time <= 0) { if (time <= 0) {
setText("Loading"); setText("Loading");

Loading…
Cancel
Save