Merge branch 'feature/notifications' into dev
This commit is contained in:
@@ -127,6 +127,7 @@ CREATE TABLE IF NOT EXISTS {0} ( {1} INTEGER PRIMARY KEY, {2} VARCHAR(255) NOT N
|
|||||||
if (rs.next()){
|
if (rs.next()){
|
||||||
var sender = userService().loadUser(rs.getLong(SENDER_USER_ID));
|
var sender = userService().loadUser(rs.getLong(SENDER_USER_ID));
|
||||||
var msg = new TranslatedMessage(sender,rs.getString(SUBJECT),rs.getString(BODY), attachments);
|
var msg = new TranslatedMessage(sender,rs.getString(SUBJECT),rs.getString(BODY), attachments);
|
||||||
|
msg.utcTime(rs.getLong(TIMESTAMP));
|
||||||
envelope = new Envelope<>(messageId, msg, receivers);
|
envelope = new Envelope<>(messageId, msg, receivers);
|
||||||
}
|
}
|
||||||
rs.close();
|
rs.close();
|
||||||
|
|||||||
Reference in New Issue
Block a user