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

Properly validate folder ID (fixes #156).

Browse source
This commit is contained in:
Felix Ableitner 2014-10-16 11:34:38 +03:00
parent 42c8898c80
commit 322a297c5e
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/com/nutomic/syncthingandroid/fragments/FolderSettingsFragment.java
View file

@ -195,8 +195,8 @@ public class FolderSettingsFragment extends PreferenceFragment
public boolean onOptionsItemSelected(MenuItem item) { public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) { switch (item.getItemId()) {
case R.id.create: case R.id.create:
if (mFolder.ID.equals("")) { if (mFolder.ID.length() > 64 || !mFolder.ID.matches("[a-zA-Z0-9-_\\.]+")) {
Toast.makeText(getActivity(), R.string.folder_id_required, Toast.LENGTH_LONG) Toast.makeText(getActivity(), R.string.folder_id_invalid, Toast.LENGTH_LONG)
.show(); .show();
return true; return true;
} }

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

@ -118,8 +118,8 @@
<!-- Dialog shown when attempting to delete a folder --> <!-- Dialog shown when attempting to delete a folder -->
<string name="delete_folder_confirm">Do you really want to delete this folder?</string> <string name="delete_folder_confirm">Do you really want to delete this folder?</string>
<!-- Toast shown when trying to create a folder with an empty ID --> <!-- Toast shown when trying to create a folder with an invalid ID -->
<string name="folder_id_required">The folder ID must not be empty</string> <string name="folder_id_invalid">The folder ID must be a short identifier (64 characters or less) consisting of letters, numbers and the dot (.), dash (-) and underscode (_) characters only.</string>
<!-- Toast shown when trying to create a folder with an empty path --> <!-- Toast shown when trying to create a folder with an empty path -->
<string name="folder_path_required">The folder path must not be empty</string> <string name="folder_path_required">The folder path must not be empty</string>