Trim titles and tags before checking if empty

Closes #96
pull/384/head
Alexey-V 10 years ago committed by Alex Baker
parent de6fbbcc78
commit e7efefb88d

@ -685,7 +685,7 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener {
shouldSaveState = false; shouldSaveState = false;
// abandon editing in this case // abandon editing in this case
if (title.getText().length() == 0 || TextUtils.isEmpty(model.getTitle())) { if (title.getText().toString().trim().length() == 0 || TextUtils.isEmpty(model.getTitle())) {
if (isNewTask) { if (isNewTask) {
TimerPlugin.updateTimer(notificationManager, taskService, getActivity(), model, false); TimerPlugin.updateTimer(notificationManager, taskService, getActivity(), model, false);
taskDeleter.delete(model); taskDeleter.delete(model);
@ -761,7 +761,7 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener {
deleteButtonClick(); deleteButtonClick();
return true; return true;
case android.R.id.home: case android.R.id.home:
if (title.getText().length() == 0) { if (title.getText().toString().trim().length() == 0) {
discardButtonClick(); discardButtonClick();
} else { } else {
saveButtonClick(); saveButtonClick();

@ -106,6 +106,9 @@ public final class TagsControlSet extends PopupControlSet {
LinkedHashSet<String> tags = getTagSet(); LinkedHashSet<String> tags = getTagSet();
for (String tag : tags) { for (String tag : tags) {
if (tag.trim().length() == 0) {
continue;
}
if (builder.length() != 0) { if (builder.length() != 0) {
builder.append(", "); //$NON-NLS-1$ builder.append(", "); //$NON-NLS-1$
} }
@ -334,6 +337,9 @@ public final class TagsControlSet extends PopupControlSet {
}); });
for (String tag : tags) { for (String tag : tags) {
if (tag.trim().length() == 0) {
continue;
}
TagData tagData = tagDataDao.getTagByName(tag, TagData.NAME, TagData.UUID); TagData tagData = tagDataDao.getTagByName(tag, TagData.NAME, TagData.UUID);
if (tagData == null) { if (tagData == null) {
tagData = new TagData(); tagData = new TagData();

Loading…
Cancel
Save