Commit Graph

4544 Commits

Author SHA1 Message Date
Neil Marietta 5c33730239 Replaced Git Submodules by Include Core Build Gradle Plugin. 2022-11-30 14:06:09 +00:00
Zorica Stojchevska 544863df88 Merge branch 'chore/translations-2022-11-28_062938' into 'develop'
i18n: Upgrade translations from crowdin (1727a4b9).

See merge request android/mail/proton-mail-android!1208
2022-11-30 13:40:14 +00:00
proton-ci a66a00ab0d i18n: Upgrade translations from crowdin (1727a4b9). 2022-11-28 06:29:38 +00:00
Zorica Stojchevska 1727a4b9da Merge branch 'fix/remove_button_tag_from_blacklist' into 'develop'
Removes button tag from black list html tags

See merge request android/mail/proton-mail-android!1205
2022-11-17 07:38:58 +00:00
Zorica Stojchevska 47855125ef Removes button tag from black list html tags 2022-11-16 13:30:06 +01:00
Zorica Stojchevska 10bc318b76 Merge branch 'chore/translations-2022-11-14_062934' into 'develop'
i18n: Upgrade translations from crowdin (757e0c15).

See merge request android/mail/proton-mail-android!1202
2022-11-14 09:19:24 +00:00
proton-ci 72c04304bc i18n: Upgrade translations from crowdin (757e0c15). 2022-11-14 06:29:34 +00:00
Zorica Stojchevska 757e0c1505 Merge branch 'fix/hv_url' into 'develop'
fix: Updated HV production url ("verify.proton.me").

See merge request android/mail/proton-mail-android!1198
2022-11-08 14:08:58 +00:00
Neil Marietta 702ebee494 fix: Updated HV production url ("verify.proton.me"). 2022-11-07 19:27:11 +00:00
Zorica Stojchevska 5f020a3c48 Merge branch 'chore/add_dev_suffix_to_version' into 'develop'
Add `-dev` suffix to app version

See merge request android/mail/proton-mail-android!1199
2022-11-07 15:33:51 +00:00
Zorica Stojchevska efd507e9f6 Add `-dev` suffix to app version 2022-11-07 13:40:24 +00:00
Zorica Stojchevska 3f721058e0 Merge branch 'fix/fixes_crash_and_put_logs' into 'develop'
Add default error message when attachment worker fails

See merge request android/mail/proton-mail-android!1193
2022-11-07 13:25:46 +00:00
Zorica Stojchevska 4484890cf4 Add default error message when attachment worker fails 2022-11-07 12:15:08 +00:00
Zorica Stojchevska 5e8a9cc516 Merge branch 'chore/translations-2022-10-31_063859' into 'develop'
i18n: Upgrade translations from crowdin (7fa6499f).

See merge request android/mail/proton-mail-android!1197
2022-11-06 19:14:12 +00:00
proton-ci bf62c3b5d2 i18n: Upgrade translations from crowdin (7fa6499f). 2022-11-06 13:28:33 +00:00
Zorica Stojchevska 9d94d7ce79 Merge branch 'fix/fixes_crash_on_system_label' into 'develop'
Fixes crash on label with unknown type

See merge request android/mail/proton-mail-android!1192
2022-11-06 12:50:56 +00:00
Zorica Stojchevska 28ead3f1ec Fixes crash on label with unknown type
BE recently introduced new label type, and we weren't supporting it.
2022-11-06 11:39:09 +00:00
Zorica Stojchevska c97ee1f645 Merge branch 'fix/crash_on_cut' into 'develop'
Fixes IndexOutOfBoundsException when we cut recipients from the composer

See merge request android/mail/proton-mail-android!1190
2022-11-05 12:08:41 +00:00
Zorica Stojchevska 2749681871 Fixes IndexOutOfBoundsException when we cut recipients from the composer 2022-11-04 18:19:47 +00:00
Zorica Stojchevska a31a201154 Merge branch 'fix/bad_padding_exception_invalid_subject' into 'develop'
Letting the user know saving draft failed because the subject is invalid

See merge request android/mail/proton-mail-android!1185
2022-11-04 18:16:36 +00:00
Zorica Stojchevska dd928f080e Letting the user know saving draft failed because the subject is invalid 2022-11-04 18:16:36 +00:00
Marino Meneghel 7414525c90 Merge branch 'chore/core-9-2-2' into 'develop'
Update Core to 9.2.2

See merge request android/mail/proton-mail-android!1196
2022-10-31 18:01:49 +00:00
Marino Meneghel 537773a777 Disable ui tests stage on CI to avoid flakiness failures 2022-10-31 18:04:29 +01:00
Marino Meneghel 1428bcbf8b Changed build version to 3.0.9 (923) 2022-10-31 14:47:36 +01:00
Marino Meneghel c7c77e034f Remove flaky forward message ui test from smoke test suite 2022-10-31 14:46:51 +01:00
dkadrikj 5454258cd5 Update Core to 9.2.2 2022-10-31 07:29:33 +01:00
Zorica Stojchevska 7fa6499f60 Changed build version
#comment Just changed the version for a new release
Affected: nothing
2022-10-28 11:55:19 +02:00
Dino Kadrikj d696191011 Merge branch 'chore/core-9-2-1' into 'develop'
Update Core to 9.2.1

See merge request android/mail/proton-mail-android!1195
2022-10-28 09:13:25 +00:00
dkadrikj 9a279e253a Update Core to 9.2.1 2022-10-27 23:31:31 +02:00
Zorica Stojchevska cba7dcacf4 Changed build version
#comment Just changed the version for a new release
Affected: nothing
2022-10-26 18:10:31 +02:00
Mateusz Armatys f61348bd15 Merge branch 'chore/core-9-2-0' into 'develop'
Update Core libs to 9.2.0.

See merge request android/mail/proton-mail-android!1194
2022-10-26 15:20:00 +00:00
Mateusz Armatys 1f6152a9d7 Update Core libs to 9.2.0.
Third-party library updates & emulator version update for instrumentation tests.

- Change device for instrumentation tests (due to SIGSEGV crash on API 28, x86)
- Update compileSdk to 32 (required by Compose)
- AGP 7.3.1 (needed to fix jacoco issue for instrumented tests)
- Kotlin 1.6.21 (1.6.20 is required by AGP and 1.6.21 required by Compose)
- Remove `buildToolsVersion` - it's determined by Android Gradle Plugin
- Hilt 2.44
- Android Test 1.4.0
- Android Test Orchestrator 1.4.1
- Dagger 2.44
- Fragment 1.5.4
2022-10-26 13:58:28 +00:00
dkadrikj fea043fc9c Fix LoadLegacyUserTest.kt 2022-10-26 13:58:28 +00:00
dkadrikj ad1fa4f5b6 Fix install private config gradlew 2022-10-26 13:58:28 +00:00
dkadrikj 3ddc387364 Configure Core to latest changes 2022-10-26 13:58:28 +00:00
dkadrikj 48b113c7ef Add exclude MANIFEST.MF 2022-10-26 13:58:28 +00:00
dkadrikj 13dd1f8e75 Update gradlew to 7.4.2 2022-10-26 13:58:28 +00:00
dkadrikj 39b5224d28 Configure to latest core changes 2022-10-26 13:58:28 +00:00
dkadrikj 4fec58b1f0 Update Core to 9.1.2 2022-10-26 13:58:28 +00:00
Zorica Stojchevska 0ba7d9308a Merge branch 'chore/translations-2022-10-24_062746' into 'develop'
i18n: Upgrade translations from crowdin (a9bcc87e).

See merge request android/mail/proton-mail-android!1191
2022-10-24 11:05:39 +00:00
proton-ci d79b353f71 i18n: Upgrade translations from crowdin (a9bcc87e). 2022-10-24 06:27:46 +00:00
Zorica Stojchevska a9bcc87e27 Merge branch 'chore/translations-2022-10-17_062827' into 'develop'
i18n: Upgrade translations from crowdin (727da104).

See merge request android/mail/proton-mail-android!1187
2022-10-17 07:26:07 +00:00
proton-ci 57808ba83b i18n: Upgrade translations from crowdin (727da104). 2022-10-17 06:28:27 +00:00
Zorica Stojchevska 727da10420 Merge branch 'chore/translations-2022-10-10_062836' into 'develop'
i18n: Upgrade translations from crowdin (959bf443).

See merge request android/mail/proton-mail-android!1186
2022-10-12 08:09:33 +00:00
proton-ci 0fa5206fa4 i18n: Upgrade translations from crowdin (959bf443). 2022-10-10 06:28:36 +00:00
Zorica Stojchevska 959bf443b2 Changed build version
#comment Just changed the version for a new release
Affected: nothing
2022-10-04 19:10:41 +02:00
Zorica Stojchevska 96f848a4cf Merge branch 'fix/crash_while_saving_draft' into 'develop'
Fixes a crash while saving draft when no extras exist

See merge request android/mail/proton-mail-android!1184
2022-10-04 16:49:38 +00:00
Zorica Stojchevska c8a6d0c883 Fixes a crash while saving draft when no extras exist 2022-10-04 16:49:37 +00:00
Zorica Stojchevska 66a5d93897 Merge branch 'chore/core_dagger_modules' into 'develop'
Upgraded Core to 9.0.2

See merge request android/mail/proton-mail-android!1127
2022-10-04 14:57:56 +00:00
Marino Meneghel 40de8ba8e4 Adapt unit tests to new coroutines version requirements
- use runTest instead of deprecated runBlockingTest
- Pass the same dispatcher to test and test dependencies
2022-10-04 14:20:21 +02:00