30e5087084
Update copyright
...
MAILAND-2696
2022-05-23 21:01:57 +00:00
c5f5555a70
Merge branch 'chore/translations-2022-05-23_062847' into 'develop'
...
i18n: Upgrade translations from crowdin (298b702b
2022-05-23 11:57:08 +00:00
e25ec7da26
i18n: Upgrade translations from crowdin ( 298b702b).
2022-05-23 06:28:47 +00:00
298b702b4c
Merge branch 'chore/translations-2022-05-17_083430' into 'develop'
...
i18n: Upgrade translations from crowdin (8ccfec72
2022-05-17 09:33:47 +00:00
58f533c4f3
i18n: Upgrade translations from crowdin ( 8ccfec72).
2022-05-17 08:34:30 +00:00
8ccfec7261
Change build number
2022-05-06 15:29:21 +02:00
b942e2ba0d
Merge branch 'fix/2894_fix-pgp-mime-with-attachments-crashes' into 'develop'
...
Refetches the pgp mime messages to get the attachments
See merge request android/mail/proton-mail-android!1072
2022-05-06 08:25:35 +00:00
990b6d3b1a
Refetches the pgp mime messages to get the attachments
...
As the pgp/mime messages are encrypted together with the message body,
the handling of those attachments needs to be different. The
LocalAttachment objects will contain all the attachment data and can't
be passed around between the activities.
The blocking call is far from perfect but making it async lead to race
conditions- the attachments sometimes would fail to be uploaded
correctly and not show in the attachments screen. As this is a rather
rare type of message, it should not have too much of an impact.
MAILAND-2894
2022-05-03 11:24:41 +02:00
4b4a92737b
Merge branch 'fix/2892_update-metrics-sent-for-view-in-dark-mode-preference' into 'develop'
...
Update metrics sent when user switches between light/dark mode in details screen
See merge request android/mail/proton-mail-android!1071
2022-04-29 15:22:49 +00:00
845c7b1488
Update metrics sent when user switches between light/dark mode in details screen
...
MAILAND-2892
2022-04-29 14:48:20 +02:00
04e28a4cb7
Merge branch 'fix/2897_update-contact-labels' into 'develop'
...
[2897] Fix duplicated label in Edit Contacts
See merge request android/mail/proton-mail-android!1069
2022-04-29 08:04:44 +00:00
d2a4191332
Remove ProtonInput label from EditContactDetailsActivity.java
...
MAILAND-2897
2022-04-28 18:36:04 +02:00
485c0dfac8
Fix crash on click on Birthday while editing contact
...
MAILAND-2897
2022-04-28 18:36:04 +02:00
eb09dff196
Remove usages of AppUtil.decorInAppIntent from
...
EditContactDetailsActivity.java
MAILAND-2897
2022-04-28 18:36:04 +02:00
5acc471e61
Changed build version
2022-04-27 16:02:23 +02:00
4a7c095dd5
Merge branch 'feat/cp-3695-core_ci_integration' into 'develop'
...
Core CI integration
See merge request android/mail/proton-mail-android!1036
2022-04-22 14:30:57 +00:00
0662240030
Core CI integration (building Mail as part of Core CI pipeline)
2022-04-22 13:18:00 +00:00
6aba12c78c
Changed build version
2022-04-21 16:38:06 +02:00
33e6fca0ac
Merge branch 'fix/2879_retry-the-embedded-image-download-on-failure' into 'develop'
...
Introduces a retry mechanism for embedded image download
See merge request android/mail/proton-mail-android!1064
2022-04-21 14:30:03 +00:00
b57eb65696
Introduces a retry mechanism for embedded image download
...
MAILAND-2879
2022-04-21 13:33:29 +00:00
30abccbfe2
Merge branch 'fix/2847_fix-injecting-dark-style-in-sent-message' into 'develop'
...
Fix injecting dark style in sent messages when the app is in dark mode
See merge request android/mail/proton-mail-android!1063
2022-04-21 12:32:07 +00:00
c72bb87103
Fix injecting dark style in sent messages when the app is in dark mode
...
The problem was that we were sending a message that was styled according
to what we show in the app. Instead, for the sending, we need the clean
HTML message body of the parent message when we reply/forward. Initial
message content is the holder of the quoted text (parent message) and
the solution included setting its value to be the clean HTML body of the
parent message.
MAILAND-2847
2022-04-20 17:45:34 +02:00
9ccf56e1df
Revert "Updated Launcher Icons."
...
This reverts commit 8bb034d3
2022-04-20 10:56:06 +02:00
e555010c37
Changed build version
...
#comment Just increased the version code for a new
release
Affected: nothing
2022-04-19 10:16:34 +02:00
38ba33f7f9
Merge branch 'fix/support_link_for_translations' into 'develop'
...
Fix on the support@ link for some translations
See merge request android/mail/proton-mail-android!1060
2022-04-18 11:32:21 +00:00
f4d52b2c32
Fix on the support@ link for some translations
2022-04-18 12:27:23 +02:00
9762532bb0
Merge branch 'chore/translations-2022-04-18_062900' into 'develop'
...
[i18n@a3768e9f] ~ Upgrade translations from crowdin
See merge request android/mail/proton-mail-android!1059
2022-04-18 10:20:41 +00:00
0cb685c4cb
[i18n@a3768e9f] ~ Upgrade translations from crowdin
2022-04-18 06:29:01 +00:00
a3768e9f06
Change build version
2022-04-15 17:37:21 +02:00
de39dad5ff
Merge branch 'fix/2848_allow-downloading-pgp/mime-message-attachments' into 'develop'
...
Fixes downloading of the pgp/mime message attachments
See merge request android/mail/proton-mail-android!1055
2022-04-15 15:27:56 +00:00
970e334547
Fixes downloading of the pgp/mime message attachments
...
The pgp/mime messages are encrypted together with the attachments.
What that means is once we have decrypted the message, we already
have the attachments in memory, so there's no need to try to fetch
and decrypt them again.
MAILAND-2848
2022-04-15 14:31:49 +00:00
ee9e4225d1
Merge branch 'fix/2867_cannot-scroll-in-contact-group-dialog' into 'develop'
...
Fix list in contact group recipients dialog going over the buttons
See merge request android/mail/proton-mail-android!1058
2022-04-15 14:03:05 +00:00
4d5faaeef7
Fix list in contact group recipients dialog going over the buttons
...
MAILAND-2867
2022-04-15 13:01:32 +00:00
4186c8f413
Merge branch 'fix/2866_contact-suggestions-missing-from-composer' into 'develop'
...
Fixes the contacts not showing in suggestions in composer
See merge request android/mail/proton-mail-android!1057
2022-04-15 13:00:50 +00:00
3449fdea4f
Fixes the contacts not showing in suggestions in composer
...
Observe the 'set up complete' value before fetching the contacts
and don't use a lateinit var for contact groups- as the value would
usually be uninitialised the first time around it was being accessed.
MAILAND-2866
2022-04-15 10:25:14 +02:00
1a7f964868
Merge branch 'fix/crypto/attachment-sending-issue' into 'develop'
...
Use only the primary address key when uploading attachments for sending
See merge request android/mail/proton-mail-android!1056
2022-04-14 16:06:07 +00:00
b2dc0d154a
Use only the primary address key when uploading attachments for sending
...
The code was using all the address keys instead of only the primary key
to encrypt the attachments to upload.
This caused the key packet to contain several key packets (since the change in gopenpgp v2.4.3),
which was not accepted by the backend.
2022-04-14 17:05:00 +02:00
1e573c0c1a
Merge branch 'chore/review-sentry-logs' into 'develop'
...
Reviews the logs and introduces exception filtering
See merge request android/mail/proton-mail-android!1053
2022-04-14 10:54:37 +00:00
72bf6db4e8
Reviews the logs as a first step to clean up sentry
...
Removes some of the logging when not really needed and adds
filtering function to ignore a number of exceptions we do not care about
2022-04-14 09:59:36 +00:00
2245e7558f
Changed build version
...
#comment Just increased the version code for a new
release
Affected: nothing
2022-04-13 20:16:35 +02:00
68545287ee
Merge branch 'fix/2846-sender_defaults_to_wrong_address' into 'develop'
...
Sender defaults to wrong address on reply/forward
See merge request android/mail/proton-mail-android!1054
2022-04-13 18:06:14 +00:00
aa55a9d7cb
Sender defaults to wrong address on reply/forward
...
We were using a wrongly sorted list to choose the correct address from,
now we use the address list inside the correct user and since the keys
start from 1 and positions from 0 that is why we had to subtract 1.
MAILAND-2846
2022-04-13 19:11:12 +02:00
8069aeb6af
Merge branch 'chore/update-core-to-7.1.11' into 'develop'
...
Upate core to version 7.1.11
See merge request android/mail/proton-mail-android!1052
2022-04-13 11:29:28 +00:00
e0eff2d89a
Updates the core submodule pointer
2022-04-13 12:30:21 +02:00
1c02c7aa76
Upate core to version 7.1.11
2022-04-13 12:08:50 +02:00
9a9c8aadc0
Changed build version
...
#comment Just increased the build name and version code for a new
release
Affected: nothing
2022-04-13 09:48:49 +02:00
d7bb7c1b11
Merge branch 'fix/2840-crash_updating_a_contact' into 'develop'
...
Crash updating a contact
See merge request android/mail/proton-mail-android!1051
2022-04-12 18:36:34 +00:00
db61d7a2cc
Crash updating a contact
...
Worker has limitation of how much data can be passed to it and the
encryptedData we were passing has a tendency to be heavy now we get the
encryptedData of the contact from DB from withing the Worker to avoid
having to pass the data..
MAILAND-2840
2022-04-12 17:55:35 +00:00
286ca72add
Merge branch 'chore/change_support_link' into 'develop'
...
Change support@ link everywhere in app
See merge request android/mail/proton-mail-android!1050
2022-04-12 15:45:26 +00:00
574b1caec7
Change support@ link everywhere in app
2022-04-12 14:34:16 +00:00
Zorica Stojchevska
Zorica Stojchevska
proton-ci
Stefanija Boshkovska
Davide Giuseppe Farella
Maciej Surmacz
Davide Farella
Marino Meneghel
Mateusz Armatys
Marin Thiercelin