mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'master' into android14

This commit is contained in:
M66B 2023-06-11 06:58:38 +02:00
parent b621d92308 a8c07344e8
commit 8fbce1beb0
4 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
FAQ.md
View File

@ -3960,7 +3960,11 @@ so you cannot use FairEmail or any other email client to access Tildamail.
**Criptext** uses a proprietary email protocol
and [does not directly support IMAP](https://www.reddit.com/r/privacy/comments/chs82k/comment/ewrxxcn/),
so you cannot use FairEmail or any other Android email client to access Criptext.
so you cannot use FairEmail or any other email email client to access Criptext.
**OnMail** uses a proprietary email protocol
and [does not support IMAP](https://support.onmail.com/hc/en-us/articles/360048879012-How-do-I-connect-my-OnMail-address-to-a-third-party-email-app-),
so you cannot use FairEmail or any other email client to access OnMail, except for one (but please read the privacy policy carefully).
<br />

2
app/build.gradle
View File

@ -469,7 +469,7 @@ dependencies {
def work_version = "2.8.1"
def exif_version = "1.3.6"
def biometric_version = "1.2.0-alpha05"
def billingclient_version = "4.1.0"
def billingclient_version = "6.0.0"
def javamail_version = "1.6.7"
def jsoup_version = "1.15.3"
def css_version = "0.9.29"

8
app/src/main/assets/public_suffix_list.dat
View File

@ -6650,7 +6650,7 @@ org.zw
// newGTLDs
// List of new gTLDs imported from https://www.icann.org/resources/registries/gtlds/v2/gtlds.json on 2023-06-07T15:13:30Z
// List of new gTLDs imported from https://www.icann.org/resources/registries/gtlds/v2/gtlds.json on 2023-06-10T15:11:57Z
// This list is auto-generated, don't edit it manually.
// aaa : 2015-02-26 American Automobile Association, Inc.
aaa
@ -8689,10 +8689,10 @@ office
// okinawa : 2013-12-05 BRregistry, Inc.
okinawa
// olayan : 2015-05-14 Crescent Holding GmbH
// olayan : 2015-05-14 Competrol (Luxembourg) Sarl
olayan
// olayangroup : 2015-05-14 Crescent Holding GmbH
// olayangroup : 2015-05-14 Competrol (Luxembourg) Sarl
olayangroup
// oldnavy : 2015-07-31 The Gap, Inc.
@ -9925,7 +9925,7 @@ xin
// xn--mgba3a3ejt : 2014-11-20 Aramco Services Company
ارامكو
// xn--mgba7c0bbn0a : 2015-05-14 Crescent Holding GmbH
// xn--mgba7c0bbn0a : 2015-05-14 Competrol (Luxembourg) Sarl
العليان
// xn--mgbaakc7dvf : 2015-09-03 Emirates Telecommunications Corporation (trading as Etisalat)

3
app/src/main/java/eu/faircode/email/EmailProvider.java
View File

@ -125,7 +125,8 @@ public class EmailProvider implements Parcelable {
"cyberfear.com",
"skiff.com",
"tildamail.com",
"criptext.com"
"criptext.com",
"onmail.com"
));
private EmailProvider() {