Commit Graph

12 Commits

Author SHA1 Message Date
Zorica Stojchevska 30e5087084 Update copyright
MAILAND-2696
2022-05-23 21:01:57 +00:00
Zorica Stojchevska 1a3aad6854 Remove unneeded `isDirty` flag from message data builder class 2022-01-24 13:55:00 +00:00
Maciej Surmacz b99804004e Makes sure that the expiration time information is preserved when sending a message
The expiration time would get lost along the way when creating a new message:
- first the expiration time would not get copied to the message object from the
_messageDataResult object upon sending,
- then the CreateDraftWorker would overwrite the message in the db with a 0
after receiving a draft from the BE.

The implemented solution fills is in the missing expiration information in the worker
after receiving a response. A better approach, as the next iteration, would be to
make sure we send the expiration time to the BE when creating a draft to start with.

MAILAND-2364
2021-09-20 13:57:47 +00:00
Davide Farella 15f1abd8a0 Revert "Implement new attachments method to ComposeMessageActivity.java and ComposeMessageViewModel.kt"
This reverts commit 49312d5b63.

# Conflicts:
#	app/src/main/java/ch/protonmail/android/activities/composeMessage/ComposeMessageActivity.java
#	app/src/main/java/ch/protonmail/android/compose/presentation/model/AttachmentsEventUiModel.kt
#	app/src/main/java/ch/protonmail/android/compose/presentation/ui/ComposeMessageKotlinActivity.kt
#	domain/src/main/kotlin/ch/protonmail/android/domain/entity/fields.kt
2021-06-29 15:56:15 +02:00
Zorica Stojchevska c4bc5552c6 Add save button to DisplayNameAndSignatureFragment and discard dialog
Change mobile signature to mobile footer everywhere and add text view with info explaining the feature
Fix display name input field to be single line
Fix title of DisplayNameAndSignatureFragment
2021-06-24 15:56:25 +02:00
Davide Farella b2d00e40cb Fix crash on send when expiration Activity is dismissed without select expiration 2021-06-17 09:10:49 +00:00
Davide Farella 49312d5b63 Implement new attachments method to ComposeMessageActivity.java and ComposeMessageViewModel.kt
MAILAND-1669
2021-06-08 09:51:14 +02:00
Marino Meneghel 0078229871 Remove "isTransient" flag from everywhere
Such flag was used to differentiate between messages that were coming
from "Search" (being the transient ones) and those that weren't.

This conditional being performed in many places was adding a lot of
noise and not really bringing any value, as the same behaviour can be
achieved by not storing messages from search in the first place.
2021-05-17 18:41:05 +02: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 5380a01bc1 Cleanup - Methods renaming and removing unused code
- Removed messageDraftResult LiveData as not used anymore
- Removed setOfflineDraftSaved as value was set but never read
- Rename findMessageByIdBlocking method to change non-blocking method to
  using dispatcher from constructor
2021-01-15 16:12:24 +01:00
Zorica Stojchevska 5ce164d00a Initial commit 2020-04-16 17:44:53 +02:00