Commit Graph

8 Commits

Author SHA1 Message Date
Zorica Stojchevska 30e5087084 Update copyright
MAILAND-2696
2022-05-23 21:01:57 +00:00
Davide Farella 7efa1ad726 Reorganize /details/mailbox/presentation is subpackages 2022-03-25 14:32:10 +00:00
Tomasz Giszczak 912bf719ed Fixed some detekt formatting issues. 2021-07-26 18:24:23 +02:00
Zorica Stojchevska 41986f83e7 Implement getConversation method in conversation repository
- Add method in Conversations Repository that will allow us to get the conversation with it's messages from the Remote or Local source.
- Add a way to save the messages into the Message Table
- Add API call to get conversation with it's messages

MAILAND-1766
2021-05-10 13:38:10 +00: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 381ab2ec68 Clean DatabaseProvider.kt
MAILAND-1186

# Conflicts:
#	app/src/main/java/ch/protonmail/android/compose/ComposeMessageRepository.kt

# Conflicts:
#	app/src/main/java/ch/protonmail/android/jobs/ConvertLocalContactsJob.kt

# Conflicts:
#	app/src/androidTest/java/ch/protonmail/android/api/models/room/ContactGroupsDatabaseTest.kt
#	app/src/androidTest/java/ch/protonmail/android/api/models/room/contacts/ContactDaoTest.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/details/ContactDetailsRepository.kt
#	app/src/main/java/ch/protonmail/android/contacts/groups/edit/ContactGroupEditCreateRepository.kt
#	app/src/main/java/ch/protonmail/android/contacts/groups/list/ContactGroupsRepository.kt
#	app/src/main/java/ch/protonmail/android/contacts/list/viewModel/ContactsListViewModel.kt
#	app/src/main/java/ch/protonmail/android/jobs/ConvertLocalContactsJob.kt
#	app/src/main/java/ch/protonmail/android/jobs/UpdateContactJob.java
#	app/src/main/java/ch/protonmail/android/utils/AppUtil.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/edit/ContactGroupEditCreateRepositoryTest.kt
#	app/src/test/java/ch/protonmail/android/usecase/delete/DeleteLabelTest.kt

# Conflicts:
#	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
#	app/src/main/java/ch/protonmail/android/api/segments/contact/ContactEmailsManager.kt
#	app/src/main/java/ch/protonmail/android/worker/FetchContactsDataWorker.kt
#	app/src/test/java/ch/protonmail/android/worker/FetchContactsDataWorkerTest.kt

# Conflicts:
#	app/src/main/java/ch/protonmail/android/api/models/factories/SendPreferencesFactory.java
#	app/src/main/java/ch/protonmail/android/jobs/messages/PostMessageJob.java
2021-03-18 10:44:46 +01:00
Davide Farella 54efb32f75 Refactor ContactsDatabase.kt to use User Id
MAILAND-1186

# Conflicts:
#	app/src/main/java/ch/protonmail/android/jobs/messages/PostMessageJob.java

# Conflicts:
#	app/src/main/java/ch/protonmail/android/jobs/ConvertLocalContactsJob.kt

# Conflicts:
#	app/src/androidTest/java/ch/protonmail/android/api/models/room/ContactGroupsDatabaseTest.kt
#	app/src/androidTest/java/ch/protonmail/android/api/models/room/contacts/ContactsDaoTest.kt
#	app/src/main/java/ch/protonmail/android/api/models/room/contacts/ContactEmailContactLabelJoin.kt
#	app/src/main/java/ch/protonmail/android/api/models/room/contacts/ContactsDatabase.kt
#	app/src/main/java/ch/protonmail/android/api/segments/event/EventHandler.kt
#	app/src/main/java/ch/protonmail/android/contacts/groups/list/ContactGroupsRepository.kt
#	app/src/main/java/ch/protonmail/android/contacts/list/viewModel/ContactsListViewModel.kt
#	app/src/main/java/ch/protonmail/android/jobs/ConvertLocalContactsJob.kt
#	app/src/main/java/ch/protonmail/android/jobs/UpdateContactJob.java
#	app/src/main/java/ch/protonmail/android/utils/AppUtil.java
#	app/src/test/java/ch/protonmail/android/usecase/delete/DeleteLabelTest.kt

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

# Conflicts:
#	app/src/androidTest/java/ch/protonmail/android/api/models/room/contacts/ContactsDaoTest.kt
#	app/src/main/java/ch/protonmail/android/api/models/room/contacts/ContactsDatabase.kt
#	app/src/main/java/ch/protonmail/android/worker/FetchContactsDataWorker.kt

# Conflicts:
#	app/src/main/java/ch/protonmail/android/api/models/factories/SendPreferencesFactory.java
#	app/src/main/java/ch/protonmail/android/core/ProtonMailApplication.java
#	app/src/main/java/ch/protonmail/android/jobs/contacts/GetSendPreferenceJob.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