Zorica Stojchevska
|
30e5087084
|
Update copyright
MAILAND-2696
|
2022-05-23 21:01:57 +00:00 |
Tomasz Giszczak
|
60f6c52f67
|
Moved labels repository and ids to an appropriate package.
MAILAND-1525
|
2021-10-20 14:24:02 +02:00 |
|
Tomasz Giszczak
|
7dac46a329
|
Moved labels related methods from message dao to labels dao and LabelRepository, updated related references.
MAILAND-1525
|
2021-10-20 14:21:44 +02:00 |
Marino Meneghel
|
aef1daf21e
|
Remove unneded 'request pending' boolean flag
MAILAND-1767
|
2021-06-14 17:31:33 +02:00 |
Davide Farella
|
9a0fcf7f41
|
Clean up and fixes after rebase
MAILAND-1189
# Conflicts:
# app/src/main/java/ch/protonmail/android/activities/messageDetails/repository/MessageDetailsRepository.kt
# app/src/main/java/ch/protonmail/android/attachments/DownloadEmbeddedAttachmentsWorker.kt
# app/src/main/java/ch/protonmail/android/attachments/UploadAttachments.kt
# app/src/main/java/ch/protonmail/android/data/local/model/Message.kt
# app/src/main/java/ch/protonmail/android/jobs/messages/PostMessageJob.java
# app/src/main/java/ch/protonmail/android/storage/AttachmentClearingService.java
# Conflicts:
# app/src/main/java/ch/protonmail/android/activities/multiuser/ConnectAccountActivity.kt
# app/src/main/java/ch/protonmail/android/jobs/messages/PostMessageJob.java
# app/src/main/java/ch/protonmail/android/utils/notifier/AndroidErrorNotifier.kt
# app/src/main/java/ch/protonmail/android/worker/drafts/CreateDraftWorker.kt
# Conflicts:
# app/src/main/java/ch/protonmail/android/api/models/factories/SendPreferencesFactory.java
# app/src/main/java/ch/protonmail/android/api/segments/message/MessageApi.kt
# app/src/main/java/ch/protonmail/android/api/services/PostMessageServiceFactory.kt
# app/src/main/java/ch/protonmail/android/attachments/UploadAttachments.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/servers/notification/NotificationServer.kt
# app/src/main/java/ch/protonmail/android/usecase/compose/SaveDraft.kt
# app/src/main/java/ch/protonmail/android/utils/notifier/AndroidUserNotifier.kt
# app/src/main/java/ch/protonmail/android/worker/drafts/CreateDraftWorker.kt
# Conflicts:
# app/src/main/java/ch/protonmail/android/di/ApplicationModule.kt
# app/src/main/java/ch/protonmail/android/servers/notification/NotificationServer.kt
|
2021-03-18 10:47:58 +01: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 |
|
Zorica Stojchevska
|
5ce164d00a
|
Initial commit
|
2020-04-16 17:44:53 +02:00 |