Remove the triangle setting from the menu for non-admin users.

Author: mopsalarm

app/src/main/java/com/pr0gramm/app/ui/SettingsActivity.java

@@ -7,6 +7,7 @@
 import android.preference.ListPreference;
 import android.preference.Preference;
 import android.preference.PreferenceFragment;
+import android.preference.PreferenceGroup;
 import android.preference.PreferenceScreen;
 import android.support.annotation.NonNull;
 import android.support.v7.app.AppCompatActivity;
@@ -125,7 +126,26 @@ public void onCreate(Bundle savedInstanceState) {
             }
 
             if (!BuildConfig.DEBUG) {
-                hideDebugPreferences();
+                hidePreferenceByName("prefcat_debug");
+            }
+
+            if (!userService.userIsAdmin()) {
+                hidePreferenceByName("pref_show_content_type_flag");
+            }
+        }
+
+        public void hidePreferenceByName(String pref_show_content_type_flag) {
+            Preference pref = getPreferenceScreen().findPreference(pref_show_content_type_flag);
+            if (pref != null) {
+                getPreferenceScreen().removePreference(pref);
+
+                for (int idx = 0; idx < getPreferenceScreen().getPreferenceCount(); idx++) {
+                    Preference preference = getPreferenceScreen().getPreference(idx);
+                    if (preference instanceof PreferenceGroup) {
+                        if (((PreferenceGroup) preference).removePreference(pref))
+                            break;
+                    }
+                }
             }
         }
 
@@ -163,13 +183,6 @@ private void updateCodecsPreference(String prefName, String mimeType) {
             }
         }
 
-        private void hideDebugPreferences() {
-            Preference pref = findPreference("prefcat_debug");
-            if (pref != null) {
-                getPreferenceScreen().removePreference(pref);
-            }
-        }
-
         private void updatePreloadInfo() {
             Preference preference = getPreferenceManager().findPreference("pref_pseudo_clean_preloaded");
             if (preference != null) {

app/src/main/res/raw/changelog.json

@@ -2,6 +2,10 @@
   {
     "version": 120,
     "changes": [
+      {
+        "type": "Neu",
+        "change": "Neues Usericon für Lebende Legenden."
+      },
       {
         "type": "Neu",
         "change": "Man kann nun direkt zu einem Post springen, indem man seine Nummer in die Suche eingibt. Hat die ID weniger als 6 Ziffern, muss der Prefix 'id:' verwendet werden."