/**
 * Axelor Business Solutions
 *
 * Copyright (C) 2005-2015 Axelor (<http://axelor.com>).
 *
 * This program is free software: you can redistribute it and/or  modify
 * it under the terms of the GNU Affero General Public License, version 3,
 * as published by the Free Software Foundation.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU Affero General Public License for more details.
 *
 * You should have received a copy of the GNU Affero General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
package com.axelor.mail.db.repo;

import java.util.List;

import com.axelor.auth.db.User;
import com.axelor.db.JpaRepository;
import com.axelor.mail.db.MailFlags;
import com.axelor.mail.db.MailMessage;

public class MailFlagsRepository extends JpaRepository<MailFlags> {

	public MailFlagsRepository() {
		super(MailFlags.class);
	}

	public MailFlags findBy(MailMessage message, User user) {
		return all().filter("self.message = :message AND self.user = :user")
				.bind("message", message)
				.bind("user", user).fetchOne();
	}

	@Override
	public MailFlags save(MailFlags entity) {
		final MailFlags flags = super.save(entity);
		final MailMessage message = flags.getMessage();
		final MailMessage root = message.getRoot();

		if (flags.getIsStarred() == Boolean.FALSE) {
			// message is root, so unflag children
			if (root == null) {
				List<MailFlags> childFlags = all().filter("self.message.root.id = ?", message.getId()).fetch();
				for (MailFlags child : childFlags) {
					child.setIsStarred(flags.getIsStarred());
				}
			}
		}

		MailFlags rootFlags = findBy(root, flags.getUser());
		if (rootFlags == null) {
			rootFlags = new MailFlags();
			rootFlags.setMessage(root);
			rootFlags.setUser(flags.getUser());
			super.save(rootFlags);
		}

		rootFlags.setIsStarred(flags.getIsStarred());

		// mark root as unread
		if (root != null && flags.getIsRead() != Boolean.TRUE) {
			rootFlags.setIsRead(false);
		}

		return flags;
	}
}

@@ -1745,16 +1745,60 @@
 %09%7D%0A%09%09%7D%0A%0A
+%09%09if (root == null) %7B%0A%09%09%09return flags;%0A%09%09%7D%0A%0A
 %09%09MailFl
@@ -2088,24 +2088,8 @@
 if (
-root != null && 
 flag

Fix creation of flags for null root message