nutomic/syncthing-android
1
0
Fork 0
mirror of https://github.com/syncthing/syncthing-android.git synced 2024-11-23 12:51:16 +00:00
Code Releases Activity

Merge pull request #757 from ProactiveServices/ProactiveServices-debugoptions

Browse source 
Permit numbers in debug option
This commit is contained in:
Felix Ableitner 2016-10-08 11:08:43 +02:00 committed by GitHub
commit 1526326412
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/com/nutomic/syncthingandroid/fragments/SettingsFragment.java
View file

@ -264,7 +264,7 @@ public class SettingsFragment extends PreferenceFragment
// Avoid any code injection. // Avoid any code injection.
if (preference.getKey().equals(STTRACE)) { if (preference.getKey().equals(STTRACE)) {
if (((String) o).matches("[a-z, ]*")) if (((String) o).matches("[0-9a-z, ]*"))
requireRestart = true; requireRestart = true;
else { else {
Toast.makeText(getActivity(), R.string.toast_invalid_sttrace, Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), R.string.toast_invalid_sttrace, Toast.LENGTH_SHORT).show();

2
src/main/res/values/strings.xml
View file

@ -326,7 +326,7 @@ Please report any problems you encounter via Github.</string>
<string name="sttrace_title">Debug Options</string> <string name="sttrace_title">Debug Options</string>
<!-- Toast after entering invalid STTRACE params --> <!-- Toast after entering invalid STTRACE params -->
<string name="toast_invalid_sttrace">Only a-z and \',\' are allowed in STTRACE options</string> <string name="toast_invalid_sttrace">Only 0-9, a-z and \',\' are allowed in STTRACE options</string>
<!-- Title for the preference to reset Syncthing indexes --> <!-- Title for the preference to reset Syncthing indexes -->
<string name="streset_title">Reset Database</string> <string name="streset_title">Reset Database</string>