properly extract/name expert mode key

src/main/java/com/owncloud/android/MainApp.java

@@ -123,7 +123,7 @@ public class MainApp extends MultiDexApplication {
 
 
         if (BuildConfig.DEBUG || getApplicationContext().getResources().getBoolean(R.bool.logger_enabled) ||
-                appPrefs.getBoolean(Preferences.EXPERT_MODE, false)) {
+                appPrefs.getBoolean(Preferences.PREFERENCE_EXPERT_MODE, false)) {
             // use app writable dir, no permissions needed
             Log_OC.startLogging(getAppContext());
             Log_OC.d("Debug", "start logging");

src/main/java/com/owncloud/android/ui/activity/Preferences.java

@@ -86,8 +86,7 @@ public class Preferences extends PreferenceActivity
     private static final String TAG = Preferences.class.getSimpleName();
 
     public final static String PREFERENCE_USE_FINGERPRINT = "use_fingerprint";
-
-    public static final String EXPERT_MODE = "expert_mode";
+    public static final String PREFERENCE_EXPERT_MODE = "expert_mode";
 
     private static final String SCREEN_NAME = "Settings";
 
@@ -377,7 +376,7 @@ public class Preferences extends PreferenceActivity
                 PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
 
         boolean loggerEnabled = getResources().getBoolean(R.bool.logger_enabled) || BuildConfig.DEBUG ||
-                appPrefs.getBoolean(EXPERT_MODE, false);
+                appPrefs.getBoolean(PREFERENCE_EXPERT_MODE, false);
         Preference pLogger = findPreference("logger");
         if (pLogger != null) {
             if (loggerEnabled) {
@@ -517,19 +516,19 @@ public class Preferences extends PreferenceActivity
             preferenceCategoryDetails.removePreference(mShowHiddenFiles);
         }
 
-        mExpertMode = (SwitchPreference) findPreference(EXPERT_MODE);
+        mExpertMode = (SwitchPreference) findPreference(PREFERENCE_EXPERT_MODE);
 
         if (getResources().getBoolean(R.bool.syncedFolder_light)) {
             preferenceCategoryDetails.removePreference(mExpertMode);
         } else {
-            mExpertMode = (SwitchPreference) findPreference(EXPERT_MODE);
+            mExpertMode = (SwitchPreference) findPreference(PREFERENCE_EXPERT_MODE);
             mExpertMode.setOnPreferenceClickListener(new OnPreferenceClickListener() {
                 @Override
                 public boolean onPreferenceClick(Preference preference) {
                     SharedPreferences appPrefs =
                             PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
                     SharedPreferences.Editor editor = appPrefs.edit();
-                    editor.putBoolean(EXPERT_MODE, mExpertMode.isChecked());
+                    editor.putBoolean(PREFERENCE_EXPERT_MODE, mExpertMode.isChecked());
                     editor.apply();
 
                     if (mExpertMode.isChecked()) {

src/main/java/com/owncloud/android/ui/activity/SyncedFoldersActivity.java

@@ -125,7 +125,7 @@ public class SyncedFoldersActivity extends FileActivity implements SyncedFolderA
 
 
         findViewById(R.id.toolbar).post(() -> {
-            if (!appPrefs.getBoolean("expert_mode", false)) {
+            if (!appPrefs.getBoolean(Preferences.PREFERENCE_EXPERT_MODE, false)) {
                 findViewById(R.id.app_bar).getLayoutParams().height = findViewById(R.id.toolbar).getHeight();
 
                 AppBarLayout.LayoutParams p = (AppBarLayout.LayoutParams) mCollapsingToolbarLayout.getLayoutParams();

src/main/java/com/owncloud/android/ui/activity/UploadListActivity.java

@@ -61,7 +61,7 @@ import com.owncloud.android.utils.MimeTypeUtil;
 
 import java.io.File;
 
-import static com.owncloud.android.ui.activity.Preferences.EXPERT_MODE;
+import static com.owncloud.android.ui.activity.Preferences.PREFERENCE_EXPERT_MODE;
 
 /**
  * Activity listing pending, active, and completed uploads. User can delete
@@ -255,7 +255,7 @@ public class UploadListActivity extends FileActivity implements UploadListFragme
     public boolean onCreateOptionsMenu(Menu menu) {
         SharedPreferences appPrefs =
                 PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
-        if (appPrefs.getBoolean(EXPERT_MODE, false)) {
+        if (appPrefs.getBoolean(PREFERENCE_EXPERT_MODE, false)) {
             MenuInflater inflater = getMenuInflater();
             inflater.inflate(R.menu.upload_list_menu, menu);
             mMenu = menu;