Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-15 20:29:52 +01:00
Code Issues Projects Releases Wiki Activity

Remove redundant call to getAutoDeleteTimer().

Browse Source
This commit is contained in:
akwizgran
2021-02-26 13:59:21 +00:00
committed by Torsten Grote
parent d84603bce2
commit db5b2ea9b6
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
briar-core/src/main/java/org/briarproject/briar/messaging/MessagingManagerImpl.java
View File

@@ -292,6 +292,7 @@ class MessagingManagerImpl implements MessagingManager, IncomingMessageHook,
public void addLocalMessage(Transaction txn, PrivateMessage m) public void addLocalMessage(Transaction txn, PrivateMessage m)
throws DbException { throws DbException {
try { try {
long timer = m.getAutoDeleteTimer();
BdfDictionary meta = new BdfDictionary(); BdfDictionary meta = new BdfDictionary();
meta.put(MSG_KEY_TIMESTAMP, m.getMessage().getTimestamp()); meta.put(MSG_KEY_TIMESTAMP, m.getMessage().getTimestamp());
meta.put(MSG_KEY_LOCAL, true); meta.put(MSG_KEY_LOCAL, true);
@@ -305,11 +306,9 @@ class MessagingManagerImpl implements MessagingManager, IncomingMessageHook,
BdfList.of(a.getMessageId(), a.getContentType())); BdfList.of(a.getMessageId(), a.getContentType()));
} }
meta.put(MSG_KEY_ATTACHMENT_HEADERS, headers); meta.put(MSG_KEY_ATTACHMENT_HEADERS, headers);
if (m.getFormat() == TEXT_IMAGES_AUTO_DELETE) { if (m.getFormat() == TEXT_IMAGES_AUTO_DELETE
long timer = m.getAutoDeleteTimer(); && timer != NO_AUTO_DELETE_TIMER) {
if (timer != NO_AUTO_DELETE_TIMER) { meta.put(MSG_KEY_AUTO_DELETE_TIMER, timer);
meta.put(MSG_KEY_AUTO_DELETE_TIMER, timer);
}
} }
} }
// Mark attachments as shared and permanent now we're ready to send // Mark attachments as shared and permanent now we're ready to send
@@ -317,7 +316,6 @@ class MessagingManagerImpl implements MessagingManager, IncomingMessageHook,
db.setMessageShared(txn, a.getMessageId()); db.setMessageShared(txn, a.getMessageId());
db.setMessagePermanent(txn, a.getMessageId()); db.setMessagePermanent(txn, a.getMessageId());
} }
long timer = m.getAutoDeleteTimer();
clientHelper.addLocalMessage(txn, m.getMessage(), meta, true, clientHelper.addLocalMessage(txn, m.getMessage(), meta, true,
false); false);
if (timer != NO_AUTO_DELETE_TIMER) { if (timer != NO_AUTO_DELETE_TIMER) {