Not showing DetailListPreferences if there is no list

Author: tonyr59h

WordPress/src/main/java/org/wordpress/android/ui/main/MySiteFragment.java

@@ -48,6 +48,8 @@ public class MySiteFragment extends Fragment
     private WPTextView mBlogSubtitleTextView;
     private LinearLayout mLookAndFeelHeader;
     private RelativeLayout mThemesContainer;
+    private View mConfigurationHeader;
+    private View mSettingsView;
     private View mFabView;
     private LinearLayout mNoSiteView;
     private ScrollView mScrollView;
@@ -116,6 +118,8 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
         mBlogSubtitleTextView = (WPTextView) rootView.findViewById(R.id.my_site_subtitle_label);
         mLookAndFeelHeader = (LinearLayout) rootView.findViewById(R.id.my_site_look_and_feel_header);
         mThemesContainer = (RelativeLayout) rootView.findViewById(R.id.row_themes);
+        mConfigurationHeader = rootView.findViewById(R.id.row_configuration);
+        mSettingsView = rootView.findViewById(R.id.row_settings);
         mScrollView = (ScrollView) rootView.findViewById(R.id.scroll_view);
         mNoSiteView = (LinearLayout) rootView.findViewById(R.id.no_site_view);
         mNoSiteDrakeImageView = (ImageView) rootView.findViewById(R.id.my_site_no_site_view_drake);
@@ -186,7 +190,7 @@ public void onClick(View v) {
             }
         });
 
-        rootView.findViewById(R.id.row_settings).setOnClickListener(new View.OnClickListener() {
+        mSettingsView.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 ActivityLauncher.viewBlogSettingsForResult(getActivity(), mBlog);
@@ -304,6 +308,11 @@ private void refreshBlogDetails() {
         mLookAndFeelHeader.setVisibility(themesVisibility);
         mThemesContainer.setVisibility(themesVisibility);
 
+        // show settings for all self-hosted to expose Delete Site
+        int settingsVisibility = mBlog.isAdmin() || !mBlog.isDotcomFlag() ? View.VISIBLE : View.GONE;
+        mConfigurationHeader.setVisibility(settingsVisibility);
+        mSettingsView.setVisibility(settingsVisibility);
+
         mBlavatarImageView.setImageUrl(GravatarUtils.blavatarFromUrl(mBlog.getUrl(), mBlavatarSz), WPNetworkImageView.ImageType.BLAVATAR);
 
         String blogName = StringUtils.unescapeHTML(mBlog.getBlogName());

WordPress/src/main/java/org/wordpress/android/ui/prefs/SelfHostedSiteSettings.java

@@ -60,7 +60,7 @@ class SelfHostedSiteSettings extends SiteSettingsInterface {
 
     // Requires WordPress 4.5.x or higher
     private static final int REQUIRED_MAJOR_VERSION = 4;
-    private static final int REQUIRED_MINOR_VERSION = 5;
+    private static final int REQUIRED_MINOR_VERSION = 3;
 
     private static final String OPTION_ALLOWED = "open";
     private static final String OPTION_DISALLOWED = "closed";
@@ -133,11 +133,18 @@ public void onFailure(long id, final Exception error) {
      */
     @Override
     protected void fetchRemoteData() {
-        Object[] params = {mBlog.getRemoteBlogId(), mBlog.getUsername(), mBlog.getPassword()};
 
-        // Need two interfaces or the first call gets aborted
-        instantiateInterface().callAsync(mOptionsCallback, ApiHelper.Methods.GET_OPTIONS, params);
-        instantiateInterface().callAsync(mCategoriesCallback, ApiHelper.Methods.GET_CATEGORIES, params);
+        Thread thread = new Thread(new Runnable() {
+            @Override
+            public void run() {
+                Object[] params = {mBlog.getRemoteBlogId(), mBlog.getUsername(), mBlog.getPassword()};
+
+                // Need two interfaces or the first call gets aborted
+                instantiateInterface().callAsync(mOptionsCallback, ApiHelper.Methods.GET_OPTIONS, params);
+                instantiateInterface().callAsync(mCategoriesCallback, ApiHelper.Methods.GET_CATEGORIES, params);
+            }
+        });
+        thread.run();
     }
 
     /**

WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java

@@ -114,6 +114,8 @@ public class SiteSettingsFragment extends PreferenceFragment
      */
     private static final int REGION_SUBSTRING_INDEX = 3;
 
+    private static final long FETCH_DELAY = 1000;
+
     // Reference to blog obtained from passed ID (ARG_LOCAL_BLOG_ID)
     private Blog mBlog;
 
@@ -214,15 +216,17 @@ public void onPause() {
     public void onResume() {
         super.onResume();
 
-        new Handler().postDelayed(new Runnable() {
-            @Override
-            public void run() {
-                // initialize settings with locally cached values, fetch remote on first pass
-                mSiteSettings.init(mShouldFetch);
-                // stop future calls from fetching remote settings
-                mShouldFetch = false;
-            }
-        }, 1000);
+        if (mShouldFetch) {
+            new Handler().postDelayed(new Runnable() {
+                @Override
+                public void run() {
+                    // initialize settings with locally cached values, fetch remote on first pass
+                    mSiteSettings.init(mShouldFetch);
+                    // stop future calls from fetching remote settings
+                }
+            }, FETCH_DELAY);
+            mShouldFetch = false;
+        }
     }
 
     @Override
@@ -328,6 +332,8 @@ public boolean onPreferenceClick(Preference preference) {
         } else if (preference == mPagingPref) {
             showPagingDialog();
             return true;
+        } else if (preference == mCategoryPref || preference == mFormatPref) {
+            return !shouldShowListPreference((DetailListPreference) preference);
         }
 
         return false;
@@ -1096,6 +1102,10 @@ public void onClick(DialogInterface dialog, int whichButton) {
         dialogBuilder.create().show();
     }
 
+    private boolean shouldShowListPreference(DetailListPreference preference) {
+        return preference != null && preference.getEntries() != null && preference.getEntries().length > 0;
+    }
+
     /**
      * Generates display strings for given language codes. Used as entries in language preference.
      */

WordPress/src/main/java/org/xmlrpc/android/ApiHelper.java

@@ -10,13 +10,10 @@
 import com.android.volley.DefaultRetryPolicy;
 import com.android.volley.NetworkResponse;
 import com.android.volley.RedirectError;
-import com.android.volley.Request;
-import com.android.volley.toolbox.JsonObjectRequest;
 import com.android.volley.toolbox.RequestFuture;
 import com.android.volley.toolbox.StringRequest;
 import com.google.gson.Gson;
 
-import org.json.JSONObject;
 import org.wordpress.android.WordPress;
 import org.wordpress.android.analytics.AnalyticsTracker;
 import org.wordpress.android.datasets.CommentTable;
@@ -25,7 +22,6 @@
 import org.wordpress.android.models.Comment;
 import org.wordpress.android.models.CommentList;
 import org.wordpress.android.models.FeatureSet;
-import org.wordpress.android.networking.WPDelayedHurlStack;
 import org.wordpress.android.ui.media.MediaGridFragment.Filter;
 import org.wordpress.android.ui.stats.StatsUtils;
 import org.wordpress.android.ui.stats.StatsWidgetProvider;
@@ -34,20 +30,14 @@
 import org.wordpress.android.util.AppLog.T;
 import org.wordpress.android.util.DateTimeUtils;
 import org.wordpress.android.util.MapUtils;
-import org.wordpress.android.util.UrlUtils;
 import org.wordpress.android.util.helpers.MediaFile;
 import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
 
-import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
 import java.io.StringReader;
-import java.net.URL;
-import java.security.GeneralSecurityException;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -59,7 +49,6 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import javax.net.ssl.HttpsURLConnection;
 import javax.net.ssl.SSLHandshakeException;
 
 public class ApiHelper {