diff --git a/src/org/wordpress/android/ui/posts/PostsActivity.java b/src/org/wordpress/android/ui/posts/PostsActivity.java index 58de73892ba3..27bd1d6efca0 100644 --- a/src/org/wordpress/android/ui/posts/PostsActivity.java +++ b/src/org/wordpress/android/ui/posts/PostsActivity.java @@ -680,16 +680,13 @@ protected String doInBackground(Post... params) { || (!isPage && !"publish".equals(contentHash.get( "post_status").toString()))) { if (isPage) { - errorMsg = getResources().getText( - R.string.page_not_published).toString(); + errorMsg = getString(R.string.page_not_published); } else { - errorMsg = getResources().getText( - R.string.post_not_published).toString(); + errorMsg = getString(R.string.post_not_published); } return null; } else { - String postURL = contentHash.get("permaLink") - .toString(); + String postURL = contentHash.get("permaLink").toString(); String shortlink = getShortlinkTagHref(postURL); if (shortlink == null) { result = postURL; diff --git a/src/org/wordpress/android/ui/posts/PostsListFragment.java b/src/org/wordpress/android/ui/posts/PostsListFragment.java index b5eaf5498acf..1b6f386a5b29 100644 --- a/src/org/wordpress/android/ui/posts/PostsListFragment.java +++ b/src/org/wordpress/android/ui/posts/PostsListFragment.java @@ -24,6 +24,7 @@ import android.widget.TextView; import android.widget.Toast; import android.widget.ViewSwitcher; + import org.wordpress.android.R; import org.wordpress.android.WordPress; import org.wordpress.android.models.Blog; @@ -56,6 +57,7 @@ public class PostsListFragment extends ListFragment { private OnPostActionListener mOnPostActionListener; private PostsActivity mParentActivity; private ListScrollPositionManager mListScrollPositionManager; + private int mLoadedBlogID; public boolean inDrafts = false; public List imageUrl = new Vector(); @@ -122,6 +124,10 @@ public void onAttach(Activity activity) { public void onResume() { super.onResume(); mParentActivity = (PostsActivity) getActivity(); + if (mLoadedBlogID != WordPress.getCurrentBlog().getBlogId()) { + WordPress.currentPost = null; + loadPosts(false); + } } public void createSwitcher() { @@ -185,12 +191,11 @@ public void refreshPosts(final boolean loadMore) { public boolean loadPosts(boolean loadMore) { // loads posts from the db List> loadedPosts; + if (WordPress.currentBlog != null) { + mLoadedBlogID = WordPress.currentBlog.getBlogId(); + } try { - if (isPage) { - loadedPosts = WordPress.wpDB.loadUploadedPosts(WordPress.currentBlog.getId(), true); - } else { - loadedPosts = WordPress.wpDB.loadUploadedPosts(WordPress.currentBlog.getId(), false); - } + loadedPosts = WordPress.wpDB.loadUploadedPosts(WordPress.currentBlog.getId(), isPage); } catch (Exception e1) { return false; } @@ -210,6 +215,10 @@ public boolean loadPosts(boolean loadMore) { // loads posts from the db mStatuses = new String[0]; if (mPostListAdapter != null) { mPostListAdapter.notifyDataSetChanged(); + if (WordPress.currentPost != null) { + mOnPostActionListener.onPostAction(PostsActivity.POST_CLEAR, WordPress.currentPost); + WordPress.currentPost = null; + } } } if (loadedPosts != null) { @@ -655,8 +664,7 @@ protected Boolean doInBackground(List... args) { WordPress.wpDB.deleteUploadedPosts( WordPress.currentBlog.getId(), WordPress.currentPost.isPage()); - mOnPostActionListener - .onPostAction(PostsActivity.POST_CLEAR, + mOnPostActionListener.onPostAction(PostsActivity.POST_CLEAR, WordPress.currentPost); } catch (Exception e) { e.printStackTrace();