Commit Graph

9 Commits

Author SHA1 Message Date
Zorica Stojchevska 30e5087084 Update copyright
MAILAND-2696
2022-05-23 21:01:57 +00:00
Tomasz Giszczak 912bf719ed Fixed some detekt formatting issues. 2021-07-26 18:24:23 +02:00
Davide Farella 9f97bd7891 Revert "Clean up after removing ImportAttachmentsWorker.kt"
This reverts commit 5db8f021a9.
2021-06-29 15:55:28 +02:00
Davide Farella 5db8f021a9 Clean up after removing ImportAttachmentsWorker.kt
MAILAND-1669
2021-06-08 09:51:15 +02: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
Davide Farella f55137b422 Bump target to 30
MAILAND-841
2020-10-19 14:53:36 +00:00
Davide Farella 2e08a9ee87 Bump target to 29
MAILAND-841
2020-10-19 14:53:36 +00:00
Tomasz Giszczak e6075f7b59 Converted DeleteAttachmentJob to a Worker, added DeleteAttachmentWorkerTest.
MAILAND-927
2020-09-30 15:08:22 +02:00
Zorica Stojchevska 5ce164d00a Initial commit 2020-04-16 17:44:53 +02:00