diff --git a/OSJ Forum/AndroidManifest.xml b/OSJ Forum/AndroidManifest.xml index bf58801..8cba99e 100644 --- a/OSJ Forum/AndroidManifest.xml +++ b/OSJ Forum/AndroidManifest.xml @@ -1,5 +1,5 @@ @layout/activity_topic_twopane + @layout/activity_forum_twopane diff --git a/OSJ Forum/res/values-sw600dp/refs.xml b/OSJ Forum/res/values-sw600dp/refs.xml index d1df037..0b6b0b0 100644 --- a/OSJ Forum/res/values-sw600dp/refs.xml +++ b/OSJ Forum/res/values-sw600dp/refs.xml @@ -1,3 +1,4 @@ @layout/activity_topic_twopane + @layout/activity_forum_twopane diff --git a/OSJ Forum/src/com/RickBarrette/osj/forum/ForumListFragment.java b/OSJ Forum/src/com/RickBarrette/osj/forum/ForumListFragment.java index fdac936..2bc728e 100644 --- a/OSJ Forum/src/com/RickBarrette/osj/forum/ForumListFragment.java +++ b/OSJ Forum/src/com/RickBarrette/osj/forum/ForumListFragment.java @@ -65,18 +65,21 @@ public class ForumListFragment extends ListFragment { public void onCreate(final Bundle savedInstanceState) { super.onCreate(savedInstanceState); - new Thread(new Runnable() { - @Override - public void run() { - ForumContent.getForum(getActivity()); - getActivity().runOnUiThread(new Runnable(){ - @Override - public void run(){ - setListAdapter(new ForumAdapter(getActivity())); - } - }); - } - }).start(); + if(ForumContent.ITEMS.size() == 0) + new Thread(new Runnable() { + @Override + public void run() { + ForumContent.getForum(getActivity()); + getActivity().runOnUiThread(new Runnable(){ + @Override + public void run(){ + setListAdapter(new ForumAdapter(getActivity())); + } + }); + } + }).start(); + else + setListAdapter(new ForumAdapter(getActivity())); }