From 6491df3bddbba42ea96c9621c15f4a91c8db583f Mon Sep 17 00:00:00 2001 From: Will Kwon Date: Fri, 5 Jun 2015 12:15:40 -0700 Subject: [PATCH 1/8] Removing null checks and setting search text --- .../android/ui/main/SitePickerSearchAdapter.java | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/main/SitePickerSearchAdapter.java b/WordPress/src/main/java/org/wordpress/android/ui/main/SitePickerSearchAdapter.java index 2fc973b3b922..86010ff07189 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/main/SitePickerSearchAdapter.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/main/SitePickerSearchAdapter.java @@ -5,6 +5,7 @@ import org.wordpress.android.WordPress; import org.wordpress.android.util.AppLog; +import org.wordpress.android.util.StringUtils; import java.util.Collections; import java.util.Comparator; @@ -39,16 +40,9 @@ public void loadSites() { } public void loadSites(String search) { - if (search == null) { - search = ""; - } - if (mIsSearchTaskRunning) { AppLog.w(AppLog.T.UTILS, "site picker > already loading sites"); } else { - if (search == null) { - search = ""; - } new LoadSearchSitesTask().executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, search); } } From 079473627631b6fdd6e100d1c8406ea14221dcad Mon Sep 17 00:00:00 2001 From: Will Kwon Date: Fri, 5 Jun 2015 12:16:44 -0700 Subject: [PATCH 2/8] Removing unused search parameter --- .../android/ui/main/SitePickerSearchAdapter.java | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/main/SitePickerSearchAdapter.java b/WordPress/src/main/java/org/wordpress/android/ui/main/SitePickerSearchAdapter.java index 86010ff07189..5bc562a69b09 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/main/SitePickerSearchAdapter.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/main/SitePickerSearchAdapter.java @@ -36,14 +36,10 @@ public void searchSites(String searchText) { @Override public void loadSites() { - loadSites(""); - } - - public void loadSites(String search) { if (mIsSearchTaskRunning) { AppLog.w(AppLog.T.UTILS, "site picker > already loading sites"); } else { - new LoadSearchSitesTask().executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, search); + new LoadSearchSitesTask().executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); } } @@ -65,7 +61,7 @@ private SiteList filteredSitesByText(SiteList sites, String searchText) { } private boolean mIsSearchTaskRunning; - private class LoadSearchSitesTask extends AsyncTask { + private class LoadSearchSitesTask extends AsyncTask { @Override protected void onPreExecute() { super.onPreExecute(); @@ -79,8 +75,7 @@ protected void onCancelled() { } @Override - protected SiteList doInBackground(String... params) { - String searchText = params[0]; + protected SiteList doInBackground(Void... params) { List> blogs = WordPress.wpDB.getAllBlogs(); SiteList sites = new SiteList(blogs); From 11352901c98b0bf5ba51c67af9fce0ddcf3c7314 Mon Sep 17 00:00:00 2001 From: Will Kwon Date: Tue, 9 Jun 2015 17:00:37 -0700 Subject: [PATCH 3/8] Removing string parameter for enabling search mode --- .../org/wordpress/android/ui/main/SitePickerSearchView.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/main/SitePickerSearchView.java b/WordPress/src/main/java/org/wordpress/android/ui/main/SitePickerSearchView.java index 9e514f8d24c0..f4ea0405c1bd 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/main/SitePickerSearchView.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/main/SitePickerSearchView.java @@ -44,7 +44,7 @@ public void configure(SitePickerActivity sitePickerActivity, Menu menu) { MenuItemCompat.setOnActionExpandListener(menuSearch, new MenuItemCompat.OnActionExpandListener() { @Override public boolean onMenuItemActionExpand(MenuItem item) { - enableSearchMode(mSitePickerActivity.getLastSearch()); + enableSearchMode(); return true; } @@ -61,12 +61,12 @@ public boolean onMenuItemActionCollapse(MenuItem item) { } } - public void enableSearchMode(String string) { + public void enableSearchMode() { mMenuEdit.setVisible(false); mSitePickerActivity.setIsInSearchModeAndNullifyAdapter(true); SitePickerSearchAdapter adapter = (SitePickerSearchAdapter) mSitePickerActivity.getAdapter(); mSitePickerActivity.getRecycleView().swapAdapter(adapter, true); - adapter.loadSites(string); + adapter.loadSites(); } public void disableSearchMode() { From b563da5f8eeb1217d5383a49cb11be93a3ee0289 Mon Sep 17 00:00:00 2001 From: Will Kwon Date: Tue, 9 Jun 2015 17:02:23 -0700 Subject: [PATCH 4/8] Formatting --- .../org/wordpress/android/ui/main/SitePickerSearchAdapter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/main/SitePickerSearchAdapter.java b/WordPress/src/main/java/org/wordpress/android/ui/main/SitePickerSearchAdapter.java index 5bc562a69b09..53316f6a9d1b 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/main/SitePickerSearchAdapter.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/main/SitePickerSearchAdapter.java @@ -5,7 +5,6 @@ import org.wordpress.android.WordPress; import org.wordpress.android.util.AppLog; -import org.wordpress.android.util.StringUtils; import java.util.Collections; import java.util.Comparator; @@ -61,6 +60,7 @@ private SiteList filteredSitesByText(SiteList sites, String searchText) { } private boolean mIsSearchTaskRunning; + private class LoadSearchSitesTask extends AsyncTask { @Override protected void onPreExecute() { From 1b9464a1de8f674c9764b890363697693e6a5e61 Mon Sep 17 00:00:00 2001 From: Will Kwon Date: Tue, 9 Jun 2015 21:02:13 -0700 Subject: [PATCH 5/8] Not caring if blog is visible to be the current one --- .../src/main/java/org/wordpress/android/WordPress.java | 8 -------- .../org/wordpress/android/ui/main/MySiteFragment.java | 2 +- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/WordPress/src/main/java/org/wordpress/android/WordPress.java b/WordPress/src/main/java/org/wordpress/android/WordPress.java index bf3c8d0fdcf1..26f2d3861930 100644 --- a/WordPress/src/main/java/org/wordpress/android/WordPress.java +++ b/WordPress/src/main/java/org/wordpress/android/WordPress.java @@ -383,14 +383,6 @@ public static void registerForCloudMessaging(Context context) { * select the first one. */ public static Blog getCurrentBlog() { - if (currentBlog == null || !wpDB.isDotComBlogVisible(currentBlog.getRemoteBlogId())) { - attemptToRestoreLastActiveBlog(); - } - - return currentBlog; - } - - public static Blog getCurrentBlogEvenIfNotVisible() { if (currentBlog == null) { attemptToRestoreLastActiveBlog(); } diff --git a/WordPress/src/main/java/org/wordpress/android/ui/main/MySiteFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/main/MySiteFragment.java index 7a526bbf06cb..b02b461d0f66 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/main/MySiteFragment.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/main/MySiteFragment.java @@ -205,7 +205,7 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) { case RequestCodes.SITE_PICKER: // RESULT_OK = site picker changed the current blog if (resultCode == Activity.RESULT_OK) { - setBlog(WordPress.getCurrentBlogEvenIfNotVisible()); + setBlog(WordPress.getCurrentBlog()); } // redisplay the hidden fab after a short delay long delayMs = getResources().getInteger(android.R.integer.config_shortAnimTime); From 183288db98e285d5a6dfefb300362b7a58a9f953 Mon Sep 17 00:00:00 2001 From: Will Kwon Date: Thu, 11 Jun 2015 13:02:44 -0700 Subject: [PATCH 6/8] Reverting getCurrentBlog back to checking for visibility --- WordPress/src/main/java/org/wordpress/android/WordPress.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WordPress/src/main/java/org/wordpress/android/WordPress.java b/WordPress/src/main/java/org/wordpress/android/WordPress.java index 26f2d3861930..7790e5dc27ce 100644 --- a/WordPress/src/main/java/org/wordpress/android/WordPress.java +++ b/WordPress/src/main/java/org/wordpress/android/WordPress.java @@ -383,7 +383,7 @@ public static void registerForCloudMessaging(Context context) { * select the first one. */ public static Blog getCurrentBlog() { - if (currentBlog == null) { + if (currentBlog == null || !wpDB.isDotComBlogVisible(currentBlog.getRemoteBlogId())) { attemptToRestoreLastActiveBlog(); } From 5d38f423aedf07f108d903e9511befbf32f4e375 Mon Sep 17 00:00:00 2001 From: Will Kwon Date: Thu, 11 Jun 2015 13:02:59 -0700 Subject: [PATCH 7/8] Setting current blog to visible if currently hidden --- .../src/main/java/org/wordpress/android/WordPress.java | 9 +++++++++ .../wordpress/android/ui/main/SitePickerActivity.java | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/WordPress/src/main/java/org/wordpress/android/WordPress.java b/WordPress/src/main/java/org/wordpress/android/WordPress.java index 7790e5dc27ce..dd857e449c10 100644 --- a/WordPress/src/main/java/org/wordpress/android/WordPress.java +++ b/WordPress/src/main/java/org/wordpress/android/WordPress.java @@ -438,6 +438,15 @@ public static Blog setCurrentBlog(int id) { return currentBlog; } + public static Blog setCurrentBlogAndSetVisible(int id) { + Blog blog = getBlog(id); + + if (blog != null && blog.isHidden()) { + wpDB.setDotComBlogsVisibility(id, true); + } + return setCurrentBlog(id); + } + /** * returns the blogID of the current blog or -1 if current blog is null */ diff --git a/WordPress/src/main/java/org/wordpress/android/ui/main/SitePickerActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/main/SitePickerActivity.java index 7bc1e9a151b0..525762fd9799 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/main/SitePickerActivity.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/main/SitePickerActivity.java @@ -307,7 +307,7 @@ public void onSiteClick(SiteRecord site) { if (mActionMode == null) { mSearchView.hideSoftKeyboard(); AniUtils.showFab(mFabView, false); - WordPress.setCurrentBlog(site.localId); + WordPress.setCurrentBlogAndSetVisible(site.localId); WordPress.wpDB.updateLastBlogId(site.localId); setResult(RESULT_OK); mDidUserSelectSite = true; From aaffae2daa88d2397183ef330fdfb96983428b92 Mon Sep 17 00:00:00 2001 From: Will Kwon Date: Thu, 11 Jun 2015 15:24:11 -0700 Subject: [PATCH 8/8] Removing return values for setCurrentBlog.. and fixing order of call for setCurrentBlogAndSetVisible --- .../main/java/org/wordpress/android/WordPress.java | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/WordPress/src/main/java/org/wordpress/android/WordPress.java b/WordPress/src/main/java/org/wordpress/android/WordPress.java index cf715fa2f09b..f891b3334a74 100644 --- a/WordPress/src/main/java/org/wordpress/android/WordPress.java +++ b/WordPress/src/main/java/org/wordpress/android/WordPress.java @@ -431,20 +431,17 @@ public static Blog setCurrentBlogToLastActive() { * Set the blog with the specified id as the current blog. * * @param id id of the blog to set as current - * @return the current blog */ - public static Blog setCurrentBlog(int id) { - currentBlog = wpDB.instantiateBlogByLocalId(id); - return currentBlog; + public static void setCurrentBlog(int id) { + currentBlog = getBlog(id); } - public static Blog setCurrentBlogAndSetVisible(int id) { - Blog blog = getBlog(id); + public static void setCurrentBlogAndSetVisible(int id) { + setCurrentBlog(id); - if (blog != null && blog.isHidden()) { + if (currentBlog != null && currentBlog.isHidden()) { wpDB.setDotComBlogsVisibility(id, true); } - return setCurrentBlog(id); } /**