Removing preferences when user does not have admin privileges

Author: tonyr59h

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

@@ -48,8 +48,6 @@ 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;
@@ -118,8 +116,6 @@ 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);
@@ -190,7 +186,7 @@ public void onClick(View v) {
             }
         });
 
-        mSettingsView.setOnClickListener(new View.OnClickListener() {
+        rootView.findViewById(R.id.row_settings).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 ActivityLauncher.viewBlogSettingsForResult(getActivity(), mBlog);
@@ -308,10 +304,6 @@ private void refreshBlogDetails() {
         mLookAndFeelHeader.setVisibility(themesVisibility);
         mThemesContainer.setVisibility(themesVisibility);
 
-        int settingsVisibility = mBlog.isAdmin() ? 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/SiteSettingsFragment.java

@@ -482,6 +482,7 @@ public void allowEditing(boolean allow) {
     private void setupPreferenceList(ListView prefList, Resources res) {
         if (prefList == null || res == null) return;
 
+        // customize list dividers
         prefList.setDivider(getResources().getDrawable(R.drawable.preferences_divider));
         prefList.setDividerHeight(1);
         // handle long clicks on preferences to display hints
@@ -542,6 +543,16 @@ private void initPreferences() {
             removePreference(R.string.pref_key_site_general, R.string.pref_key_site_language);
             removePreference(R.string.pref_key_site_writing, R.string.pref_key_site_related_posts);
         }
+
+        // hide all options except for Delete site and Enable Location if user is not admin
+        if (!mBlog.isAdmin()) {
+            removePreference(R.string.pref_key_site_screen, R.string.pref_key_site_general);
+            removePreference(R.string.pref_key_site_screen, R.string.pref_key_site_account);
+            removePreference(R.string.pref_key_site_screen, R.string.pref_key_site_discussion);
+            removePreference(R.string.pref_key_site_writing, R.string.pref_key_site_category);
+            removePreference(R.string.pref_key_site_writing, R.string.pref_key_site_format);
+            removePreference(R.string.pref_key_site_writing, R.string.pref_key_site_related_posts);
+        }
     }
 
     private void showRelatedPostsDialog() {
@@ -1157,9 +1168,10 @@ private Preference getPref(int id) {
      */
     private void removePreference(int parentKey, int preference) {
         PreferenceGroup parent = (PreferenceGroup) findPreference(getString(parentKey));
+        Preference child = findPreference(getString(preference));
 
-        if (parent != null) {
-            parent.removePreference(findPreference(getString(preference)));
+        if (parent != null && child != null) {
+            parent.removePreference(child);
         }
     }
 }