[jira] [Commented] (OPENMEETINGS-2484) Show that meeting is recorded
[ https://issues.apache.org/jira/browse/OPENMEETINGS-2484?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17215744#comment-17215744 ] Maxim Solodovnik commented on OPENMEETINGS-2484: !recording.png! Actually recording status is already being displayed (please see the screenshot) Room name becomes red and recording info is displayed on hover > Show that meeting is recorded > - > > Key: OPENMEETINGS-2484 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-2484 > Project: Openmeetings > Issue Type: Improvement > Components: UI >Reporter: Uwe Simon >Assignee: Maxim Solodovnik >Priority: Minor > Attachments: recording.png > > > When moderator is recording a meeting this should be visible to the attendees > too. > > > Idea: A recording icon in the attendee list beside the moderator or let the > red moderator indicator flash -- This message was sent by Atlassian Jira (v8.3.4#803005)
[jira] [Updated] (OPENMEETINGS-2484) Show that meeting is recorded
[ https://issues.apache.org/jira/browse/OPENMEETINGS-2484?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Maxim Solodovnik updated OPENMEETINGS-2484: --- Attachment: recording.png > Show that meeting is recorded > - > > Key: OPENMEETINGS-2484 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-2484 > Project: Openmeetings > Issue Type: Improvement > Components: UI >Reporter: Uwe Simon >Assignee: Maxim Solodovnik >Priority: Minor > Attachments: recording.png > > > When moderator is recording a meeting this should be visible to the attendees > too. > > > Idea: A recording icon in the attendee list beside the moderator or let the > red moderator indicator flash -- This message was sent by Atlassian Jira (v8.3.4#803005)
[jira] [Commented] (OPENMEETINGS-2481) event cancelation/deletion email: attached event is not deleting event in calendar tool
[ https://issues.apache.org/jira/browse/OPENMEETINGS-2481?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17215736#comment-17215736 ] ASF subversion and git services commented on OPENMEETINGS-2481: --- Commit adabede9e5f42fec4f804929b682a675cae71bad in openmeetings's branch refs/heads/master from Maxim Solodovnik [ https://gitbox.apache.org/repos/asf?p=openmeetings.git;h=adabede ] [OPENMEETINGS-2481] cancelation email works as expected > event cancelation/deletion email: attached event is not deleting event in > calendar tool > --- > > Key: OPENMEETINGS-2481 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-2481 > Project: Openmeetings > Issue Type: Bug > Components: Email >Affects Versions: 5.0.1, 5.1.0 >Reporter: Uwe Simon >Assignee: Maxim Solodovnik >Priority: Critical > Fix For: 5.1.0 > > > Wenn deleting an event emails with the cancelation of the event are send to > all attendees. > When opening the attached ics-file in ths email, the cancelation is added as > a new event to the calendar. This happens with thunderbird/lightning and with > kalendar tool on smartphone and tablet. > Possible reason: RFC5546 stated that METHODs CANCEL/ADD must increment the > SEQUENCE field. openmeetings sends always SEQUENCE:0 > > Expectation: Opening the event attached to the cancelation email should cause > the deletion of the event in the calender tool. -- This message was sent by Atlassian Jira (v8.3.4#803005)
[jira] [Resolved] (OPENMEETINGS-2481) event cancelation/deletion email: attached event is not deleting event in calendar tool
[ https://issues.apache.org/jira/browse/OPENMEETINGS-2481?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Maxim Solodovnik resolved OPENMEETINGS-2481. Fix Version/s: 5.1.0 Resolution: Fixed > event cancelation/deletion email: attached event is not deleting event in > calendar tool > --- > > Key: OPENMEETINGS-2481 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-2481 > Project: Openmeetings > Issue Type: Bug > Components: Email >Affects Versions: 5.0.1, 5.1.0 >Reporter: Uwe Simon >Assignee: Maxim Solodovnik >Priority: Critical > Fix For: 5.1.0 > > > Wenn deleting an event emails with the cancelation of the event are send to > all attendees. > When opening the attached ics-file in ths email, the cancelation is added as > a new event to the calendar. This happens with thunderbird/lightning and with > kalendar tool on smartphone and tablet. > Possible reason: RFC5546 stated that METHODs CANCEL/ADD must increment the > SEQUENCE field. openmeetings sends always SEQUENCE:0 > > Expectation: Opening the event attached to the cancelation email should cause > the deletion of the event in the calender tool. -- This message was sent by Atlassian Jira (v8.3.4#803005)
[openmeetings] branch master updated: [OPENMEETINGS-2481] cancelation email works as expected
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/master by this push:
new adabede [OPENMEETINGS-2481] cancelation email works as expected
adabede is described below
commit adabede9e5f42fec4f804929b682a675cae71bad
Author: Maxim Solodovnik
AuthorDate: Sat Oct 17 11:05:39 2020 +0700
[OPENMEETINGS-2481] cancelation email works as expected
---
.../apache/openmeetings/core/mail/MailHandler.java | 2 +-
.../db/dao/calendar/AppointmentDao.java| 20 +++
.../db/dao/room/IInvitationManager.java| 2 +-
.../openmeetings/db/entity/basic/MailMessage.java | 27 +--
.../service/room/InvitationManager.java| 19 +-
.../openmeetings/util/OpenmeetingsVariables.java | 2 +-
.../apache/openmeetings/util/mail/IcalHandler.java | 40 +++---
7 files changed, 86 insertions(+), 26 deletions(-)
diff --git
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/mail/MailHandler.java
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/mail/MailHandler.java
index 3fbcc18..5e42772 100644
---
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/mail/MailHandler.java
+++
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/mail/MailHandler.java
@@ -98,7 +98,7 @@ public class MailHandler {
BodyPart iCalContent = new MimeBodyPart();
iCalContent.addHeader("content-class",
"urn:content-classes:calendarmessage");
iCalContent.setDataHandler(new DataHandler(new
ByteArrayDataSource(new ByteArrayInputStream(m.getIcs()),
- "text/calendar; charset=UTF-8;
method=REQUEST")));
+ "text/calendar; charset=UTF-8; method=" +
m.getIcsMethod(;
multiBody.addBodyPart(iCalContent);
BodyPart body = new MimeBodyPart();
body.setContent(multiBody);
diff --git
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentDao.java
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentDao.java
index a4b7c8d..988bc2e 100644
---
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentDao.java
+++
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentDao.java
@@ -34,10 +34,12 @@ import javax.persistence.PersistenceContext;
import javax.persistence.Query;
import javax.persistence.TypedQuery;
+import org.apache.commons.lang3.StringUtils;
import org.apache.openmeetings.db.dao.IDataProviderDao;
import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
import org.apache.openmeetings.db.dao.room.IInvitationManager;
import org.apache.openmeetings.db.dao.room.RoomDao;
+import org.apache.openmeetings.db.dto.calendar.AppointmentDTO;
import org.apache.openmeetings.db.entity.calendar.Appointment;
import org.apache.openmeetings.db.entity.calendar.Appointment.Reminder;
import org.apache.openmeetings.db.entity.calendar.MeetingMember;
@@ -100,10 +102,13 @@ public class AppointmentDao implements
IDataProviderDao{
}
a.setRoom(roomDao.update(r, userId));
final boolean newApp = a.getId() == null;
- Appointment a0 = null;
+ AppointmentDTO a0 = null;
Set mmIds = Set.of();
if (sendmails && !newApp) {
- a0 = get(a.getId());
+ Appointment prev = get(a.getId());
+ if (prev != null) {
+ a0 = new AppointmentDTO(prev);
+ }
mmIds =
meetingMemberDao.getMeetingMemberIdsByAppointment(a.getId());
}
if (newApp) {
@@ -116,11 +121,12 @@ public class AppointmentDao implements
IDataProviderDao{
}
if (sendmails) {
// update meeting members
- boolean sendMail = a0 == null ||
!a0.getTitle().equals(a.getTitle()) ||
- !(a0.getDescription() != null ?
a0.getDescription().equals(a.getDescription()) : true) ||
- !(a0.getLocation() != null ?
a0.getLocation().equals(a.getLocation()) : true) ||
- !a0.getStart().equals(a.getStart()) ||
- !a0.getEnd().equals(a.getEnd());
+ boolean sendMail = a0 == null
+ || !StringUtils.equals(a0.getTitle(),
a.getTitle())
+ ||
!StringUtils.equals(a0.getDescription(), a.getDescription())
+ ||
!StringUtils.equals(a0.getLocation(), a.getLocation())
+
[jira] [Created] (OPENMEETINGS-2484) Show that meeting is recorded
Uwe Simon created OPENMEETINGS-2484: --- Summary: Show that meeting is recorded Key: OPENMEETINGS-2484 URL: https://issues.apache.org/jira/browse/OPENMEETINGS-2484 Project: Openmeetings Issue Type: Improvement Components: UI Reporter: Uwe Simon Assignee: Maxim Solodovnik When moderator is recording a meeting this should be visible to the attendees too. Idea: A recording icon in the attendee list beside the moderator or let the red moderator indicator flash -- This message was sent by Atlassian Jira (v8.3.4#803005)
[jira] [Created] (OPENMEETINGS-2483) Easier postponing a meeting
Uwe Simon created OPENMEETINGS-2483: --- Summary: Easier postponing a meeting Key: OPENMEETINGS-2483 URL: https://issues.apache.org/jira/browse/OPENMEETINGS-2483 Project: Openmeetings Issue Type: Improvement Components: Invitation, UI Affects Versions: 5.0.1, 5.1.0 Reporter: Uwe Simon Assignee: Maxim Solodovnik When postponing a meeting we have to change both starttime and endtime. Typically the duration of the meeting will stay the same even when it is postponed for some hours or a day. So changing the starttime should adjust the endtime too. Alternative: Instead of entring the endtime select a duration (15min, 30 min, ...) -- This message was sent by Atlassian Jira (v8.3.4#803005)
[openmeetings] branch master updated: [OPENMEETINGS-2481] another attempt to fix cancel
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/master by this push:
new 28356c1 [OPENMEETINGS-2481] another attempt to fix cancel
28356c1 is described below
commit 28356c12e267b6f179d20029df0766df47b9503c
Author: Maxim Solodovnik
AuthorDate: Fri Oct 16 23:51:49 2020 +0700
[OPENMEETINGS-2481] another attempt to fix cancel
---
.../src/main/java/org/apache/openmeetings/util/mail/IcalHandler.java| 2 ++
1 file changed, 2 insertions(+)
diff --git
a/openmeetings-util/src/main/java/org/apache/openmeetings/util/mail/IcalHandler.java
b/openmeetings-util/src/main/java/org/apache/openmeetings/util/mail/IcalHandler.java
index bf09304..ff9e558 100644
---
a/openmeetings-util/src/main/java/org/apache/openmeetings/util/mail/IcalHandler.java
+++
b/openmeetings-util/src/main/java/org/apache/openmeetings/util/mail/IcalHandler.java
@@ -47,6 +47,7 @@ import net.fortuna.ical4j.model.property.Method;
import net.fortuna.ical4j.model.property.Organizer;
import net.fortuna.ical4j.model.property.ProdId;
import net.fortuna.ical4j.model.property.Sequence;
+import net.fortuna.ical4j.model.property.Status;
import net.fortuna.ical4j.model.property.Transp;
import net.fortuna.ical4j.model.property.Uid;
import net.fortuna.ical4j.model.property.Version;
@@ -106,6 +107,7 @@ public class IcalHandler {
meeting = new VEvent(start, end, name);
meeting.getProperties().add(Method.CANCEL == method ?
Transp.TRANSPARENT : Transp.OPAQUE);
+ meeting.getProperties().add(Status.VEVENT_CONFIRMED);
return this;
}
[jira] [Commented] (OPENMEETINGS-2481) event cancelation/deletion email: attached event is not deleting event in calendar tool
[ https://issues.apache.org/jira/browse/OPENMEETINGS-2481?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17215508#comment-17215508 ] ASF subversion and git services commented on OPENMEETINGS-2481: --- Commit 28356c12e267b6f179d20029df0766df47b9503c in openmeetings's branch refs/heads/master from Maxim Solodovnik [ https://gitbox.apache.org/repos/asf?p=openmeetings.git;h=28356c1 ] [OPENMEETINGS-2481] another attempt to fix cancel > event cancelation/deletion email: attached event is not deleting event in > calendar tool > --- > > Key: OPENMEETINGS-2481 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-2481 > Project: Openmeetings > Issue Type: Bug > Components: Email >Affects Versions: 5.0.1, 5.1.0 >Reporter: Uwe Simon >Assignee: Maxim Solodovnik >Priority: Critical > > Wenn deleting an event emails with the cancelation of the event are send to > all attendees. > When opening the attached ics-file in ths email, the cancelation is added as > a new event to the calendar. This happens with thunderbird/lightning and with > kalendar tool on smartphone and tablet. > Possible reason: RFC5546 stated that METHODs CANCEL/ADD must increment the > SEQUENCE field. openmeetings sends always SEQUENCE:0 > > Expectation: Opening the event attached to the cancelation email should cause > the deletion of the event in the calender tool. -- This message was sent by Atlassian Jira (v8.3.4#803005)
[jira] [Commented] (OPENMEETINGS-2481) event cancelation/deletion email: attached event is not deleting event in calendar tool
[ https://issues.apache.org/jira/browse/OPENMEETINGS-2481?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17215490#comment-17215490 ] ASF subversion and git services commented on OPENMEETINGS-2481: --- Commit 5e8a6f8340cef65e6f39327d24c886c7e8e78c30 in openmeetings's branch refs/heads/master from Maxim Solodovnik [ https://gitbox.apache.org/repos/asf?p=openmeetings.git;h=5e8a6f8 ] [OPENMEETINGS-2481] another attempt to fix cancel > event cancelation/deletion email: attached event is not deleting event in > calendar tool > --- > > Key: OPENMEETINGS-2481 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-2481 > Project: Openmeetings > Issue Type: Bug > Components: Email >Affects Versions: 5.0.1, 5.1.0 >Reporter: Uwe Simon >Assignee: Maxim Solodovnik >Priority: Critical > > Wenn deleting an event emails with the cancelation of the event are send to > all attendees. > When opening the attached ics-file in ths email, the cancelation is added as > a new event to the calendar. This happens with thunderbird/lightning and with > kalendar tool on smartphone and tablet. > Possible reason: RFC5546 stated that METHODs CANCEL/ADD must increment the > SEQUENCE field. openmeetings sends always SEQUENCE:0 > > Expectation: Opening the event attached to the cancelation email should cause > the deletion of the event in the calender tool. -- This message was sent by Atlassian Jira (v8.3.4#803005)
[openmeetings] branch master updated: [OPENMEETINGS-2481] another attempt to fix cancel
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/master by this push:
new 5e8a6f8 [OPENMEETINGS-2481] another attempt to fix cancel
5e8a6f8 is described below
commit 5e8a6f8340cef65e6f39327d24c886c7e8e78c30
Author: Maxim Solodovnik
AuthorDate: Fri Oct 16 23:37:43 2020 +0700
[OPENMEETINGS-2481] another attempt to fix cancel
---
.../service/room/InvitationManager.java| 9
.../apache/openmeetings/util/mail/IcalHandler.java | 2 +-
.../openmeetings/invitiation/TestInvitation.java | 25 ++
3 files changed, 31 insertions(+), 5 deletions(-)
diff --git
a/openmeetings-service/src/main/java/org/apache/openmeetings/service/room/InvitationManager.java
b/openmeetings-service/src/main/java/org/apache/openmeetings/service/room/InvitationManager.java
index 53a69db..5a36f1f 100644
---
a/openmeetings-service/src/main/java/org/apache/openmeetings/service/room/InvitationManager.java
+++
b/openmeetings-service/src/main/java/org/apache/openmeetings/service/room/InvitationManager.java
@@ -97,10 +97,12 @@ public class InvitationManager implements
IInvitationManager {
@Override
public void sendInvitationLink(Invitation i, MessageType type, String
subject, String message, boolean ical, String baseUrl) throws Exception {
- String invitationLink = null;
+ final String invitationLink;
if (type != MessageType.CANCEL) {
IApplication app = ensureApplication(1L);
invitationLink = app.getOmInvitationLink(i, baseUrl);
+ } else {
+ invitationLink = null;
}
User owner = i.getInvitedBy();
@@ -110,7 +112,6 @@ public class InvitationManager implements
IInvitationManager {
String replyToEmail = owner.getAddress().getEmail();
if (ical) {
- String username = i.getInvitee().getLogin();
boolean isOwner =
owner.getId().equals(i.getInvitee().getId());
Appointment a = i.getAppointment();
String desc = a.getDescription() == null ? "" :
a.getDescription();
@@ -123,8 +124,8 @@ public class InvitationManager implements
IInvitationManager {
.setDescription(desc)
.setUid(a.getIcalId())
.setSequence(0)
- .addOrganizer(replyToEmail,
owner.getLogin())
- .addAttendee(email, username, isOwner)
+ .addOrganizer(replyToEmail,
owner.getDisplayName())
+ .addAttendee(email,
i.getInvitee().getLogin(), isOwner)
.build();
log.debug(handler.toString());
diff --git
a/openmeetings-util/src/main/java/org/apache/openmeetings/util/mail/IcalHandler.java
b/openmeetings-util/src/main/java/org/apache/openmeetings/util/mail/IcalHandler.java
index 42b18a8..bf09304 100644
---
a/openmeetings-util/src/main/java/org/apache/openmeetings/util/mail/IcalHandler.java
+++
b/openmeetings-util/src/main/java/org/apache/openmeetings/util/mail/IcalHandler.java
@@ -105,7 +105,7 @@ public class IcalHandler {
end.setTimeZone(timeZone);
meeting = new VEvent(start, end, name);
- meeting.getProperties().add(Transp.OPAQUE);
+ meeting.getProperties().add(Method.CANCEL == method ?
Transp.TRANSPARENT : Transp.OPAQUE);
return this;
}
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/invitiation/TestInvitation.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/invitiation/TestInvitation.java
index 37194be..ec508a2 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/invitiation/TestInvitation.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/invitiation/TestInvitation.java
@@ -19,14 +19,18 @@
package org.apache.openmeetings.invitiation;
import static org.apache.openmeetings.util.CalendarHelper.getDate;
+import static org.junit.Assert.assertNotNull;
import java.time.LocalDateTime;
+import java.util.Date;
import org.apache.openmeetings.AbstractWicketTester;
import org.apache.openmeetings.db.dao.room.RoomDao;
+import org.apache.openmeetings.db.entity.calendar.Appointment;
import org.apache.openmeetings.db.entity.room.Invitation;
import org.apache.openmeetings.db.entity.room.Invitation.MessageType;
import org.apache.openmeetings.db.entity.room.Invitation.Valid;
+import org.apache.openmeetings.db.entity.room.Room;
import
[jira] [Commented] (OPENMEETINGS-2481) event cancelation/deletion email: attached event is not deleting event in calendar tool
[ https://issues.apache.org/jira/browse/OPENMEETINGS-2481?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17215472#comment-17215472 ] ASF subversion and git services commented on OPENMEETINGS-2481: --- Commit e949dbf5031212cd81b35cb8a0c4367fea050355 in openmeetings's branch refs/heads/master from Maxim Solodovnik [ https://gitbox.apache.org/repos/asf?p=openmeetings.git;h=e949dbf ] [OPENMEETINGS-2481] tests should be fixed > event cancelation/deletion email: attached event is not deleting event in > calendar tool > --- > > Key: OPENMEETINGS-2481 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-2481 > Project: Openmeetings > Issue Type: Bug > Components: Email >Affects Versions: 5.0.1, 5.1.0 >Reporter: Uwe Simon >Assignee: Maxim Solodovnik >Priority: Critical > > Wenn deleting an event emails with the cancelation of the event are send to > all attendees. > When opening the attached ics-file in ths email, the cancelation is added as > a new event to the calendar. This happens with thunderbird/lightning and with > kalendar tool on smartphone and tablet. > Possible reason: RFC5546 stated that METHODs CANCEL/ADD must increment the > SEQUENCE field. openmeetings sends always SEQUENCE:0 > > Expectation: Opening the event attached to the cancelation email should cause > the deletion of the event in the calender tool. -- This message was sent by Atlassian Jira (v8.3.4#803005)
[openmeetings] branch master updated: [OPENMEETINGS-2481] tests should be fixed
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/master by this push:
new e949dbf [OPENMEETINGS-2481] tests should be fixed
e949dbf is described below
commit e949dbf5031212cd81b35cb8a0c4367fea050355
Author: Maxim Solodovnik
AuthorDate: Fri Oct 16 23:01:08 2020 +0700
[OPENMEETINGS-2481] tests should be fixed
---
.../org/apache/openmeetings/util/mail/IcalHandler.java | 2 +-
.../openmeetings/calendar/TestSendIcalMessage.java | 16 +++-
2 files changed, 4 insertions(+), 14 deletions(-)
diff --git
a/openmeetings-util/src/main/java/org/apache/openmeetings/util/mail/IcalHandler.java
b/openmeetings-util/src/main/java/org/apache/openmeetings/util/mail/IcalHandler.java
index 7f10b71..42b18a8 100644
---
a/openmeetings-util/src/main/java/org/apache/openmeetings/util/mail/IcalHandler.java
+++
b/openmeetings-util/src/main/java/org/apache/openmeetings/util/mail/IcalHandler.java
@@ -143,8 +143,8 @@ public class IcalHandler {
public IcalHandler addAttendee(String email, String display, boolean
chair) {
Attendee uno = new Attendee(URI.create(MAILTO + email));
uno.getParameters().add(chair ? Role.CHAIR :
Role.REQ_PARTICIPANT);
- uno.getParameters().add(new Cn(display));
uno.getParameters().add(Method.CANCEL == method ?
PartStat.DECLINED : PartStat.ACCEPTED);
+ uno.getParameters().add(new Cn(display));
meeting.getProperties().add(uno);
return this;
}
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestSendIcalMessage.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestSendIcalMessage.java
index 429e120..7da0ed6 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestSendIcalMessage.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestSendIcalMessage.java
@@ -30,7 +30,6 @@ import javax.activation.DataHandler;
import javax.mail.BodyPart;
import javax.mail.Message;
import javax.mail.Multipart;
-import javax.mail.Transport;
import javax.mail.internet.InternetAddress;
import javax.mail.internet.MimeBodyPart;
import javax.mail.internet.MimeMessage;
@@ -51,8 +50,6 @@ class TestSendIcalMessage extends AbstractJUnitDefaults {
@Autowired
private MailHandler mailHandler;
- private byte[] iCalMimeBody;
-
String subject = "test iCal";
String recipients = "seba.wag...@gmail.com";
String htmlBody = "test";
@@ -81,12 +78,10 @@ class TestSendIcalMessage extends AbstractJUnitDefaults {
log.debug("ICS: {}", handler.toString());
assertNotNull(handler.toString(), "Valid ICS should be
created");
- iCalMimeBody = handler.toByteArray();
-
- sendIcalMessage();
+ sendIcalMessage(handler.toByteArray());
}
- private void sendIcalMessage() throws Exception {
+ private void sendIcalMessage(byte[] iCalMimeBody) throws Exception {
log.debug("sendIcalMessage");
// Building MimeMessage
@@ -114,11 +109,6 @@ class TestSendIcalMessage extends AbstractJUnitDefaults {
mimeMessage.setSentDate(new Date());
mimeMessage.setContent(multipart);
- // -- Set some other header information --
- // mimeMessage.setHeader("X-Mailer", "XML-Mail");
- // mimeMessage.setSentDate(new Date());
-
- // Transport trans = session.getTransport("smtp");
- Transport.send(mimeMessage);
+ assertNotNull(mimeMessage, "Valid MIME message should be
created");
}
}
[jira] [Commented] (OPENMEETINGS-2481) event cancelation/deletion email: attached event is not deleting event in calendar tool
[ https://issues.apache.org/jira/browse/OPENMEETINGS-2481?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17215433#comment-17215433 ] ASF subversion and git services commented on OPENMEETINGS-2481: --- Commit 791c1f39dea96e9291c27d952310d93da2287e99 in openmeetings's branch refs/heads/master from Maxim Solodovnik [ https://gitbox.apache.org/repos/asf?p=openmeetings.git;h=791c1f3 ] [OPENMEETINGS-2481] first attempt to fix cancelation on Mozilla > event cancelation/deletion email: attached event is not deleting event in > calendar tool > --- > > Key: OPENMEETINGS-2481 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-2481 > Project: Openmeetings > Issue Type: Bug > Components: Email >Affects Versions: 5.0.1, 5.1.0 >Reporter: Uwe Simon >Assignee: Maxim Solodovnik >Priority: Critical > > Wenn deleting an event emails with the cancelation of the event are send to > all attendees. > When opening the attached ics-file in ths email, the cancelation is added as > a new event to the calendar. This happens with thunderbird/lightning and with > kalendar tool on smartphone and tablet. > Possible reason: RFC5546 stated that METHODs CANCEL/ADD must increment the > SEQUENCE field. openmeetings sends always SEQUENCE:0 > > Expectation: Opening the event attached to the cancelation email should cause > the deletion of the event in the calender tool. -- This message was sent by Atlassian Jira (v8.3.4#803005)
[openmeetings] branch master updated: [OPENMEETINGS-2481] first attempt to fix cancelation on Mozilla
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/master by this push:
new 791c1f3 [OPENMEETINGS-2481] first attempt to fix cancelation on
Mozilla
791c1f3 is described below
commit 791c1f39dea96e9291c27d952310d93da2287e99
Author: Maxim Solodovnik
AuthorDate: Fri Oct 16 21:53:28 2020 +0700
[OPENMEETINGS-2481] first attempt to fix cancelation on Mozilla
---
.../org/apache/openmeetings/service/room/InvitationManager.java | 6 +-
.../main/java/org/apache/openmeetings/util/mail/IcalHandler.java| 4
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git
a/openmeetings-service/src/main/java/org/apache/openmeetings/service/room/InvitationManager.java
b/openmeetings-service/src/main/java/org/apache/openmeetings/service/room/InvitationManager.java
index a4eae5c..53a69db 100644
---
a/openmeetings-service/src/main/java/org/apache/openmeetings/service/room/InvitationManager.java
+++
b/openmeetings-service/src/main/java/org/apache/openmeetings/service/room/InvitationManager.java
@@ -113,10 +113,14 @@ public class InvitationManager implements
IInvitationManager {
String username = i.getInvitee().getLogin();
boolean isOwner =
owner.getId().equals(i.getInvitee().getId());
Appointment a = i.getAppointment();
+ String desc = a.getDescription() == null ? "" :
a.getDescription();
+ if (invitationLink != null) {
+ desc += (desc.isEmpty() ? "" : "\n\n\n") +
invitationLink;
+ }
IcalHandler handler = new
IcalHandler(MessageType.CANCEL == type ? IcalHandler.ICAL_METHOD_CANCEL :
IcalHandler.ICAL_METHOD_REQUEST)
.createVEvent(getTimeZone(owner).getID(), a.getStart(), a.getEnd(),
a.getTitle())
.setLocation(a.getLocation())
- .setDescription(a.getDescription() +
"\n\n\n" + invitationLink)
+ .setDescription(desc)
.setUid(a.getIcalId())
.setSequence(0)
.addOrganizer(replyToEmail,
owner.getLogin())
diff --git
a/openmeetings-util/src/main/java/org/apache/openmeetings/util/mail/IcalHandler.java
b/openmeetings-util/src/main/java/org/apache/openmeetings/util/mail/IcalHandler.java
index b9fbb9b..7f10b71 100644
---
a/openmeetings-util/src/main/java/org/apache/openmeetings/util/mail/IcalHandler.java
+++
b/openmeetings-util/src/main/java/org/apache/openmeetings/util/mail/IcalHandler.java
@@ -37,6 +37,7 @@ import net.fortuna.ical4j.model.TimeZoneRegistry;
import net.fortuna.ical4j.model.TimeZoneRegistryFactory;
import net.fortuna.ical4j.model.component.VEvent;
import net.fortuna.ical4j.model.parameter.Cn;
+import net.fortuna.ical4j.model.parameter.PartStat;
import net.fortuna.ical4j.model.parameter.Role;
import net.fortuna.ical4j.model.property.Attendee;
import net.fortuna.ical4j.model.property.CalScale;
@@ -66,6 +67,7 @@ public class IcalHandler {
private final Calendar icsCalendar;
private TimeZone timeZone;
private VEvent meeting;
+ private Method method;
/** Creation of a new Event */
public static final Method ICAL_METHOD_REQUEST = Method.REQUEST;
@@ -79,6 +81,7 @@ public class IcalHandler {
*(@see IcalHandler) constants
*/
public IcalHandler(Method method) {
+ this.method = method;
log.debug("Icalhandler method type : {}", method);
icsCalendar = new Calendar();
@@ -141,6 +144,7 @@ public class IcalHandler {
Attendee uno = new Attendee(URI.create(MAILTO + email));
uno.getParameters().add(chair ? Role.CHAIR :
Role.REQ_PARTICIPANT);
uno.getParameters().add(new Cn(display));
+ uno.getParameters().add(Method.CANCEL == method ?
PartStat.DECLINED : PartStat.ACCEPTED);
meeting.getProperties().add(uno);
return this;
}
[jira] [Commented] (OPENMEETINGS-2480) Email for a changed event contains wrong URL
[ https://issues.apache.org/jira/browse/OPENMEETINGS-2480?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17215412#comment-17215412 ] Maxim Solodovnik commented on OPENMEETINGS-2480: Thanks for verification :) > Email for a changed event contains wrong URL > > > Key: OPENMEETINGS-2480 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-2480 > Project: Openmeetings > Issue Type: Bug > Components: Email >Affects Versions: 5.0.1, 5.1.0 >Reporter: Uwe Simon >Assignee: Maxim Solodovnik >Priority: Critical > Fix For: 5.1.0 > > Attachments: Bildschirmfoto vom 2020-10-14 20-02-00.png, > Bildschirmfoto vom 2020-10-14 20-02-34.png > > > When inviting persons via calendar an email with a link like > [http://localhost:8080/openmeetings/hash?invitation=4e0678fd-952a-463d-ba1b-c8aec245f64c=1|http://localhost:8080/openmeetings/hash?invitation=4e0678fd-952a-463d-ba1b-c8aec245f64c=2] > is send which can be used without any login. > !Bildschirmfoto vom 2020-10-14 20-02-00.png! > When changing the event a "change email" is send. Ths email contains the the > room insted of the invitation. > !Bildschirmfoto vom 2020-10-14 20-02-34.png! > Expectation: The "change emails" contain the invitation link too. -- This message was sent by Atlassian Jira (v8.3.4#803005)
