Commit Graph

5 Commits

Author SHA1 Message Date
Zorica Stojchevska 30e5087084 Update copyright
MAILAND-2696
2022-05-23 21:01:57 +00:00
Davide Farella bd43abbb83 Fix instrumented tests after rebase
MAILAND-1189
2021-03-19 17:53:25 +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
Marino Meneghel 1715243200 Replace all existing junit.Test imports to use kotlin.Test
For consistency with the Asserting library we're using from
`kotlin.test` as junit one is deprecated

MAILAND-1342
2021-01-13 16:57:38 +01:00
Zorica Stojchevska 5ce164d00a Initial commit 2020-04-16 17:44:53 +02:00