Commit Graph

10 Commits

Author SHA1 Message Date
Zorica Stojchevska 30e5087084 Update copyright
MAILAND-2696
2022-05-23 21:01:57 +00:00
Maciej Surmacz 990b6d3b1a Refetches the pgp mime messages to get the attachments
As the pgp/mime messages are encrypted together with the message body,
the handling of those attachments needs to be different. The
LocalAttachment objects will contain all the attachment data and can't
be passed around between the activities.

The blocking call is far from perfect but making it async lead to race
conditions- the attachments sometimes would fail to be uploaded
correctly and not show in the attachments screen. As this is a rather
rare type of message, it should not have too much of an impact.

MAILAND-2894
2022-05-03 11:24:41 +02:00
Zorica Stojchevska 02eed4dc84 Fixes reply and forward with attachments for normal and pgp/mime
messages
2022-01-24 13:55:00 +00:00
Marino Meneghel 3de6686c55 Make messageEncryption field not optional
Since optionality was just used as initial value for this field and all
the logic always assumed the value was there (through force unwrapping
it) we changed it to non-optional to remove the overhead of optional
handling. The initial value is "UNKNOWN".

- Increase MessageDatabase version to 12

MAILAND-1891
2021-09-21 10:13:47 +00:00
Tomasz Giszczak ef1c544787 Fixed big part of detekt formatting errors. Counter lowered to 2052. Removed unused files.
MAILAND-1792
2021-07-07 14:15:11 +00:00
Davide Farella 57eb24854d Replace imports for import ch.protonmail.android.api.models.room..+;
MAILAND-1189

# Conflicts:
#	app/src/androidTest/java/ch/protonmail/android/api/models/room/ContactGroupsDatabaseTest.kt
#	app/src/main/java/ch/protonmail/android/api/segments/contact/ContactEmailsManager.kt
#	app/src/main/java/ch/protonmail/android/api/segments/event/EventHandler.kt
#	app/src/main/java/ch/protonmail/android/contacts/groups/details/ContactGroupDetailsViewModel.kt
#	app/src/main/java/ch/protonmail/android/contacts/groups/list/ContactGroupsFragment.kt
#	app/src/main/java/ch/protonmail/android/contacts/groups/list/ContactGroupsRepository.kt
#	app/src/main/java/ch/protonmail/android/contacts/groups/list/ContactGroupsViewModel.kt
#	app/src/main/java/ch/protonmail/android/contacts/list/listView/ProtonMailContactsLiveData.kt
#	app/src/main/java/ch/protonmail/android/jobs/UpdateContactJob.java
#	app/src/test/java/ch/protonmail/android/contacts/details/ContactDetailsRepositoryTest.kt
#	app/src/test/java/ch/protonmail/android/contacts/details/ContactGroupsRepositoryTest.kt
#	app/src/test/java/ch/protonmail/android/contacts/groups/ContactGroupsViewModelTest.kt
#	app/src/test/java/ch/protonmail/android/contacts/groups/edit/ContactGroupEditCreateRepositoryTest.kt

# Conflicts:
#	app/src/main/java/ch/protonmail/android/activities/messageDetails/viewmodel/MessageDetailsViewModel.kt
#	app/src/main/java/ch/protonmail/android/api/models/messages/receive/ServerAttachment.kt
#	app/src/main/java/ch/protonmail/android/attachments/DownloadEmbeddedAttachmentsWorker.kt
#	app/src/main/java/ch/protonmail/android/jobs/helper/EmbeddedImage.kt
#	app/src/main/java/ch/protonmail/android/jobs/messages/PostMessageJob.java

# Conflicts:
#	app/src/androidTest/java/ch/protonmail/android/api/models/room/contacts/ContactDaoTest.kt

# Conflicts:
#	app/src/main/java/ch/protonmail/android/api/models/factories/PackageFactory.java
#	app/src/main/java/ch/protonmail/android/api/models/factories/SendPreferencesFactory.java
#	app/src/main/java/ch/protonmail/android/attachments/UploadAttachments.kt
#	app/src/main/java/ch/protonmail/android/compose/ComposeMessageViewModel.kt
#	app/src/main/java/ch/protonmail/android/core/ProtonMailApplication.java
#	app/src/main/java/ch/protonmail/android/jobs/messages/PostMessageJob.java
#	app/src/main/java/ch/protonmail/android/usecase/compose/SaveDraft.kt
#	app/src/test/java/ch/protonmail/android/attachments/UploadAttachmentsTest.kt
#	app/src/test/java/ch/protonmail/android/compose/ComposeMessageViewModelTest.kt
#	app/src/test/java/ch/protonmail/android/usecase/compose/SaveDraftTest.kt

# Conflicts:
#	app/src/main/java/ch/protonmail/android/di/ApplicationModule.kt
#	app/src/main/java/ch/protonmail/android/fcm/FcmIntentService.java
2021-03-18 10:46:25 +01:00
Davide Farella c99cbe0dbb Refactor MessageDatabase.kt to use User Id
MAILAND-1186

# Conflicts:
#	app/src/main/java/ch/protonmail/android/activities/AddAttachmentsActivity.java
#	app/src/main/java/ch/protonmail/android/activities/SearchActivity.java
#	app/src/main/java/ch/protonmail/android/api/models/messages/receive/MessageSenderFactory.kt
#	app/src/main/java/ch/protonmail/android/compose/ComposeMessageRepository.kt
#	app/src/main/java/ch/protonmail/android/data/local/model/Attachment.kt
#	app/src/main/java/ch/protonmail/android/data/local/model/Message.kt
#	app/src/main/java/ch/protonmail/android/jobs/CreateAndPostDraftJob.java
#	app/src/main/java/ch/protonmail/android/jobs/UpdateAndPostDraftJob.java
#	app/src/main/java/ch/protonmail/android/worker/DeleteAttachmentWorker.kt

# Conflicts:
#	app/src/main/java/ch/protonmail/android/api/services/MessagesService.kt
#	app/src/main/java/ch/protonmail/android/compose/ComposeMessageRepository.kt
#	app/src/main/java/ch/protonmail/android/compose/ComposeMessageViewModel.kt
#	app/src/main/java/ch/protonmail/android/data/local/model/Message.kt
#	app/src/main/java/ch/protonmail/android/utils/resources/StringResourceResolver.kt

# Conflicts:
#	app/src/main/java/ch/protonmail/android/api/segments/event/EventHandler.kt
#	app/src/main/java/ch/protonmail/android/compose/ComposeMessageRepository.kt
#	app/src/test/java/ch/protonmail/android/usecase/delete/DeleteLabelTest.kt

# Conflicts:
#	app/src/androidTest/java/ch/protonmail/android/api/models/room/messages/MessageDaoTest.kt
#	app/src/main/java/ch/protonmail/android/api/models/messages/receive/ServerAttachment.kt
#	app/src/main/java/ch/protonmail/android/api/models/room/messages/LocalAttachment.kt
#	app/src/main/java/ch/protonmail/android/compose/ComposeMessageRepository.kt
#	app/src/main/java/ch/protonmail/android/data/local/MessageDao.kt
#	app/src/main/java/ch/protonmail/android/data/local/model/Attachment.kt
#	app/src/main/java/ch/protonmail/android/data/local/model/AttachmentHeaders.java
#	app/src/main/java/ch/protonmail/android/data/local/model/AttachmentMetadata.kt
#	app/src/main/java/ch/protonmail/android/data/local/model/AttachmentTypesConverter.kt
#	app/src/main/java/ch/protonmail/android/data/local/model/Message.kt
#	app/src/main/java/ch/protonmail/android/jobs/messages/PostMessageJob.java

# Conflicts:
#	app/src/main/java/ch/protonmail/android/activities/AddAttachmentsActivity.java
#	app/src/main/java/ch/protonmail/android/data/local/MessageDao.kt

# Conflicts:
#	app/src/main/java/ch/protonmail/android/core/ProtonMailApplication.java
#	app/src/main/java/ch/protonmail/android/jobs/messages/PostMessageJob.java
2021-03-18 10:44:46 +01:00
Marino Meneghel 13ff2ff2a2 Revert "Convert message recipient class to kotlin"
This reverts commit ae103b1b16.
2021-01-26 16:24:44 +01:00
Zorica Stojchevska ae103b1b16 Convert message recipient class to kotlin 2020-12-30 15:44:21 +01:00
Zorica Stojchevska 5ce164d00a Initial commit 2020-04-16 17:44:53 +02:00