Merge branch 'fix/3078-change-api-endpoint' into 'develop'
Change base and API endpoint to proton.me See merge request android/mail/proton-mail-android!1255
This commit is contained in:
commit
798ec9f9e2
|
@ -27,14 +27,13 @@ import ch.protonmail.android.labels.domain.model.LabelId
|
|||
object Constants {
|
||||
|
||||
// region Urls
|
||||
const val HOST = "protonmail.ch"
|
||||
const val API_HOST = "api.$HOST"
|
||||
const val HOST = "proton.me"
|
||||
const val API_HOST = "mail-api.$HOST"
|
||||
const val BASE_URL = "https://$API_HOST"
|
||||
const val DUMMY_URL_PREFIX = "http://androidlinksfix.protonmail.com"
|
||||
const val HUMAN_VERIFICATION_URL = "https://verify.proton.me"
|
||||
|
||||
// Mail domains
|
||||
const val MAIL_DOMAIN_COM = "protonmail.com"
|
||||
const val MAIL_DOMAIN_PM_ME = "pm.me"
|
||||
//endregion
|
||||
|
||||
|
|
|
@ -18,7 +18,7 @@
|
|||
~ along with Proton Mail. If not, see https://www.gnu.org/licenses/.
|
||||
-->
|
||||
<resources>
|
||||
<string name="support_protonmail" translatable="false">https://protonmail.com/upgrade</string>
|
||||
<string name="eo_info" translatable="false">https://protonmail.com/support/knowledge-base/encrypt-for-outside-users/</string>
|
||||
<string name="limit_reached_learn_more" translatable="false">https://protonmail.com/support/knowledge-base/increase-my-storage-space/</string>
|
||||
<string name="support_protonmail" translatable="false">https://proton.me/mail/pricing</string>
|
||||
<string name="eo_info" translatable="false">https://proton.me/support/password-protected-emails</string>
|
||||
<string name="limit_reached_learn_more" translatable="false">https://proton.me/support/increase-storage-space</string>
|
||||
</resources>
|
||||
|
|
|
@ -20,12 +20,12 @@
|
|||
<network-security-config>
|
||||
|
||||
<domain-config>
|
||||
<domain includeSubdomains="true">api.protonmail.ch</domain>
|
||||
<domain includeSubdomains="true">mail-api.proton.me</domain>
|
||||
|
||||
<trustkit-config
|
||||
disableDefaultReportUri="true"
|
||||
enforcePinning="true">
|
||||
<report-uri>https://reports.protonmail.ch/reports/tls</report-uri>
|
||||
<report-uri>https://reports.proton.me/reports/tls</report-uri>
|
||||
</trustkit-config>
|
||||
|
||||
<!-- Valid pins -->
|
||||
|
@ -33,11 +33,11 @@
|
|||
<!-- Before SwissSign cert -->
|
||||
<pin digest="SHA-256">+0dMG0qG2Ga+dNE8uktwMm7dv6RFEXwBoBjQ43GqsQ0=</pin>
|
||||
<!-- After SwissSign cert -->
|
||||
<pin digest="SHA-256">drtmcR2kFkM8qJClsuWgUzxgBkePfRCkRpqUesyDmeE=</pin>
|
||||
<pin digest="SHA-256">CT56BhOTmj5ZIPgb/xD5mH8rY3BLo/MlhP7oPyJUEDo=</pin>
|
||||
<!-- Hot backup -->
|
||||
<pin digest="SHA-256">YRGlaY0jyJ4Jw2/4M8FIftwbDIQfh8Sdro96CeEel54=</pin>
|
||||
<pin digest="SHA-256">35Dx28/uzN3LeltkCBQ8RHK0tlNSa2kCpCRGNp34Gxc=</pin>
|
||||
<!-- Cold backup -->
|
||||
<pin digest="SHA-256">AfMENBVvOS8MnISprtvyPsjKlPooqh8nMB/pvCrpJpw=</pin>
|
||||
<pin digest="SHA-256">qYIukVc63DEITct8sFT7ebIq5qsWmuscaIKeJx+5J5A=</pin>
|
||||
</pin-set>
|
||||
|
||||
</domain-config>
|
||||
|
|
|
@ -19,12 +19,12 @@
|
|||
<network-security-config>
|
||||
|
||||
<domain-config>
|
||||
<domain includeSubdomains="true">api.protonmail.ch</domain>
|
||||
<domain includeSubdomains="true">mail-api.proton.me</domain>
|
||||
|
||||
<trustkit-config
|
||||
disableDefaultReportUri="true"
|
||||
enforcePinning="true">
|
||||
<report-uri>https://reports.protonmail.ch/reports/tls</report-uri>
|
||||
<report-uri>https://reports.proton.me/reports/tls</report-uri>
|
||||
</trustkit-config>
|
||||
|
||||
<!-- Valid pins -->
|
||||
|
@ -32,11 +32,11 @@
|
|||
<!-- Before SwissSign cert -->
|
||||
<pin digest="SHA-256">+0dMG0qG2Ga+dNE8uktwMm7dv6RFEXwBoBjQ43GqsQ0=</pin>
|
||||
<!-- After SwissSign cert -->
|
||||
<pin digest="SHA-256">drtmcR2kFkM8qJClsuWgUzxgBkePfRCkRpqUesyDmeE=</pin>
|
||||
<pin digest="SHA-256">CT56BhOTmj5ZIPgb/xD5mH8rY3BLo/MlhP7oPyJUEDo=</pin>
|
||||
<!-- Hot backup -->
|
||||
<pin digest="SHA-256">YRGlaY0jyJ4Jw2/4M8FIftwbDIQfh8Sdro96CeEel54=</pin>
|
||||
<pin digest="SHA-256">35Dx28/uzN3LeltkCBQ8RHK0tlNSa2kCpCRGNp34Gxc=</pin>
|
||||
<!-- Cold backup -->
|
||||
<pin digest="SHA-256">AfMENBVvOS8MnISprtvyPsjKlPooqh8nMB/pvCrpJpw=</pin>
|
||||
<pin digest="SHA-256">qYIukVc63DEITct8sFT7ebIq5qsWmuscaIKeJx+5J5A=</pin>
|
||||
</pin-set>
|
||||
|
||||
</domain-config>
|
||||
|
|
Loading…
Reference in New Issue