Realized there was an issue incrementing the page on first load so ju…

…st moved the increment into the scroll adapter and menu
dbjorge · Mar 2, 2011 · f45acc7 · f45acc7
1 parent ed793d1
commit f45acc7
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/com/ferg/awful/ForumDisplayActivity.java b/src/com/ferg/awful/ForumDisplayActivity.java
@@ -194,7 +194,8 @@ public void onClick(View aView) {
                     break;
 				case R.id.next_page:
                     if (mForum.getCurrentPage() != mForum.getLastPage()) {
-                        mFetchTask = new FetchThreadsTask(mForum.getCurrentPage() + 1);
+                    	mForum.setCurrentPage(mForum.getCurrentPage() + 1);
+                        mFetchTask = new FetchThreadsTask(mForum.getCurrentPage());
                         mFetchTask.execute(mForum.getForumId());
                     }
 					break;
@@ -250,7 +251,6 @@ public ArrayList<AwfulThread> doInBackground(String... aParams) {
 
         public void onPostExecute(ArrayList<AwfulThread> aResult) {
             if (!isCancelled()) {
-            	mForum.setCurrentPage(mForum.getCurrentPage() + 1);
                 mThreads.addAll(aResult);
                 mThreadAdapter.notifyDataSetChanged();
                 mThreadList.setOnItemClickListener(onThreadSelected);
@@ -343,7 +343,8 @@ public void onScroll(AbsListView view, int firstVisibleItem,
     			//load new items in background and add them
     			loading = true;
 				if (mForum.getCurrentPage() != mForum.getLastPage()) {
-					new FetchThreadsTask(mForum.getCurrentPage() + 1).execute(mForum.getForumId());
+					mForum.setCurrentPage(mForum.getCurrentPage() + 1);
+					new FetchThreadsTask(mForum.getCurrentPage()).execute(mForum.getForumId());
 				}
     		}
     	}