diff --git a/app/src/main/java/com/nutomic/syncthingandroid/activities/SettingsActivity.java b/app/src/main/java/com/nutomic/syncthingandroid/activities/SettingsActivity.java index 027ff1ce..14c988df 100644 --- a/app/src/main/java/com/nutomic/syncthingandroid/activities/SettingsActivity.java +++ b/app/src/main/java/com/nutomic/syncthingandroid/activities/SettingsActivity.java @@ -78,7 +78,6 @@ public class SettingsActivity extends SyncthingActivity { Preference.OnPreferenceClickListener, SharedPreferences.OnSharedPreferenceChangeListener { private static final String TAG = "SettingsFragment"; - private static final String KEY_STTRACE = "sttrace"; private static final String KEY_EXPORT_CONFIG = "export_config"; private static final String KEY_IMPORT_CONFIG = "import_config"; private static final String KEY_ST_RESET_DATABASE = "st_reset_database"; @@ -193,10 +192,10 @@ public class SettingsActivity extends SyncthingActivity { Preference exportConfig = findPreference("export_config"); Preference importConfig = findPreference("import_config"); - Preference stTrace = findPreference("sttrace"); - Preference environmentVariables = findPreference("environment_variables"); - Preference stResetDatabase = findPreference("st_reset_database"); - Preference stResetDeltas = findPreference("st_reset_deltas"); + Preference debugFacilitiesEnabled = findPreference(Constants.PREF_DEBUG_FACILITIES_ENABLED); + Preference environmentVariables = findPreference("environment_variables"); + Preference stResetDatabase = findPreference("st_reset_database"); + Preference stResetDeltas = findPreference("st_reset_deltas"); mUseRoot = (CheckBoxPreference) findPreference(Constants.PREF_USE_ROOT); mUseWakelock = (CheckBoxPreference) findPreference(Constants.PREF_USE_WAKE_LOCK); @@ -216,7 +215,7 @@ public class SettingsActivity extends SyncthingActivity { exportConfig.setOnPreferenceClickListener(this); importConfig.setOnPreferenceClickListener(this); - stTrace.setOnPreferenceChangeListener(this); + debugFacilitiesEnabled.setOnPreferenceChangeListener(this); environmentVariables.setOnPreferenceChangeListener(this); stResetDatabase.setOnPreferenceClickListener(this); stResetDeltas.setOnPreferenceClickListener(this); @@ -409,7 +408,7 @@ public class SettingsActivity extends SyncthingActivity { case Constants.PREF_SYNC_ONLY_WIFI: mSyncOnlyOnSSIDs.setEnabled((Boolean) o); break; - case KEY_STTRACE: + case Constants.PREF_DEBUG_FACILITIES_ENABLED: mRequireRestart = true; break; case Constants.PREF_ENVIRONMENT_VARIABLES: diff --git a/app/src/main/java/com/nutomic/syncthingandroid/service/Constants.java b/app/src/main/java/com/nutomic/syncthingandroid/service/Constants.java index 24342e34..d902fc51 100644 --- a/app/src/main/java/com/nutomic/syncthingandroid/service/Constants.java +++ b/app/src/main/java/com/nutomic/syncthingandroid/service/Constants.java @@ -18,16 +18,17 @@ public class Constants { public static final String PREF_USE_ROOT = "use_root"; public static final String PREF_NOTIFICATION_TYPE = "notification_type"; public static final String PREF_ENVIRONMENT_VARIABLES = "environment_variables"; + public static final String PREF_DEBUG_FACILITIES_ENABLED = "debug_facilities_enabled"; public static final String PREF_USE_WAKE_LOCK = "wakelock_while_binary_running"; public static final String PREF_USE_TOR = "use_tor"; public static final String PREF_SOCKS_PROXY_ADDRESS = "socks_proxy_address"; public static final String PREF_HTTP_PROXY_ADDRESS = "http_proxy_address"; /** - * Available options cache for preference {@link app_settings#sttrace} + * Available options cache for preference {@link app_settings#debug_facilities_enabled} * Read via REST API call in {@link RestApi#updateDebugFacilitiesCache} after first successful binary startup. */ - public static final String PREF_STTRACE_AVAILABLE_OPTIONS = "sttrace_available_options"; + public static final String PREF_DEBUG_FACILITIES_AVAILABLE = "sttrace_available_options"; /** * On Android 8.1, ACCESS_COARSE_LOCATION is required to access WiFi SSID. diff --git a/app/src/main/java/com/nutomic/syncthingandroid/service/RestApi.java b/app/src/main/java/com/nutomic/syncthingandroid/service/RestApi.java index c999cdfb..a6288543 100644 --- a/app/src/main/java/com/nutomic/syncthingandroid/service/RestApi.java +++ b/app/src/main/java/com/nutomic/syncthingandroid/service/RestApi.java @@ -221,7 +221,7 @@ public class RestApi { facilitiesToStore.add(facilityName); } PreferenceManager.getDefaultSharedPreferences(mContext).edit() - .putStringSet(Constants.PREF_STTRACE_AVAILABLE_OPTIONS, facilitiesToStore) + .putStringSet(Constants.PREF_DEBUG_FACILITIES_AVAILABLE, facilitiesToStore) .apply(); // Store current binary version so we will only store this information again diff --git a/app/src/main/java/com/nutomic/syncthingandroid/service/SyncthingRunnable.java b/app/src/main/java/com/nutomic/syncthingandroid/service/SyncthingRunnable.java index 81b5e029..06f16954 100644 --- a/app/src/main/java/com/nutomic/syncthingandroid/service/SyncthingRunnable.java +++ b/app/src/main/java/com/nutomic/syncthingandroid/service/SyncthingRunnable.java @@ -432,7 +432,8 @@ public class SyncthingRunnable implements Runnable { HashMap targetEnv = new HashMap<>(); // Set home directory to data folder for web GUI folder picker. targetEnv.put("HOME", Environment.getExternalStorageDirectory().getAbsolutePath()); - targetEnv.put("STTRACE", TextUtils.join(" ", mPreferences.getStringSet("sttrace", new HashSet<>()))); + targetEnv.put("STTRACE", TextUtils.join(" ", + mPreferences.getStringSet(Constants.PREF_DEBUG_FACILITIES_ENABLED, new HashSet<>()))); File externalFilesDir = mContext.getExternalFilesDir(null); if (externalFilesDir != null) targetEnv.put("STGUIASSETS", externalFilesDir.getAbsolutePath() + "/gui"); diff --git a/app/src/main/java/com/nutomic/syncthingandroid/views/SttracePreference.java b/app/src/main/java/com/nutomic/syncthingandroid/views/SttracePreference.java index c13113f8..a0a1c394 100644 --- a/app/src/main/java/com/nutomic/syncthingandroid/views/SttracePreference.java +++ b/app/src/main/java/com/nutomic/syncthingandroid/views/SttracePreference.java @@ -75,7 +75,7 @@ public class SttracePreference extends MultiSelectListPreference { */ private CharSequence[] getDebugFacilities() { List retDebugFacilities = new ArrayList(); - Set availableDebugFacilities = getSharedPreferences().getStringSet(Constants.PREF_STTRACE_AVAILABLE_OPTIONS, new HashSet<>()); + Set availableDebugFacilities = getSharedPreferences().getStringSet(Constants.PREF_DEBUG_FACILITIES_AVAILABLE, new HashSet<>()); // from JavaDoc: Note that you must not modify the set instance returned by this call. // therefore required to make a defensive copy of the elements availableDebugFacilities = new HashSet<>(availableDebugFacilities); diff --git a/app/src/main/res/xml/app_settings.xml b/app/src/main/res/xml/app_settings.xml index 3b8164c7..0ee06250 100644 --- a/app/src/main/res/xml/app_settings.xml +++ b/app/src/main/res/xml/app_settings.xml @@ -168,7 +168,7 @@ android:summary="@string/notify_crashes_summary"/>