moxxy/moxxy
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat(service): Mark message if the chat is encrypted while the file isn't

Browse Source
This commit is contained in:
PapaTutuWawa 2022-10-03 21:49:37 +02:00
parent ea9c634a25
commit 214d3250fe
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/service/httpfiletransfer/httpfiletransfer.dart
View File

@ -355,7 +355,10 @@ class HttpFileTransferService {
_log.warning('HTTP GET of ${job.location.url} returned ${response?.statusCode}');
} else {
var integrityCheckPassed = true;
if (job.location.key != null && job.location.iv != null) {
final conv = (await GetIt.I.get<ConversationService>()
.getConversationByJid(job.conversationJid))!;
final decryptionKeysAvailable = job.location.key != null && job.location.iv != null;
if (decryptionKeysAvailable) {
// The file was downloaded and is now being decrypted
sendEvent(
ProgressEvent(
@ -425,6 +428,9 @@ class HttpFileTransferService {
warningType: integrityCheckPassed ?
warningFileIntegrityCheckFailed :
null,
errorType: conv.encrypted && !decryptionKeysAvailable ?
messageChatEncryptedButFileNot :
null,
isDownloading: false,
);
@ -435,7 +441,6 @@ class HttpFileTransferService {
await notification.showNotification(msg, '');
}
final conv = (await GetIt.I.get<ConversationService>().getConversationByJid(job.conversationJid))!;
final sharedMedium = await GetIt.I.get<DatabaseService>().addSharedMediumFromData(
downloadedPath,
msg.timestamp,

1
lib/shared/error_types.dart
View File

@ -11,6 +11,7 @@ const messageInvalidNumber = 6;
const messageFailedToEncrypt = 7;
const messageFailedToDecryptFile = 8;
const messageContactDoesNotSupportOmemo = 9;
const messageChatEncryptedButFileNot = 10;
int errorTypeFromException(dynamic exception) {
if (exception is NoDecryptionKeyException) {