1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2025-02-22 06:01:12 +00:00

Protected content requires Android 8 (SDK 26)

This commit is contained in:
M66B 2022-10-29 16:50:15 +02:00
parent 98e1472a0d
commit 29f00a6893
2 changed files with 7 additions and 6 deletions

10
FAQ.md
View file

@ -1848,15 +1848,15 @@ Short version: AES 256 bit
Long version:
*Before version 1.1987*
~~*Before version 1.1987*~~
* A 256 bit key is derived with *PBKDF2WithHmacSHA1* using a 128 bit secure random salt and 65536 iterations
* The used cipher is *AES/CBC/PKCS5Padding*
*Since version 1.1987*
~~*Since version 1.1987*~~
* A 256 bit key is derived with *PBKDF2WithHmacSHA512* using a 128 bit secure random salt and 120000 iterations
* The used cipher is *AES/GCM/NoPadding*
* ~~A 256 bit key is derived with *PBKDF2WithHmacSHA512* using a 128 bit secure random salt and 120000 iterations~~
* ~~The used cipher is *AES/GCM/NoPadding*~~
<br />
@ -5033,7 +5033,7 @@ You can use [PGP](https://en.wikipedia.org/wiki/Pretty_Good_Privacy) or [S/MIME]
[Cross-site scripting](https://en.wikipedia.org/wiki/Cross-site_scripting) is prevented by using [DOMPurify](https://github.com/cure53/DOMPurify) (Apache License Version 2.0).
Protected content is only available in non-Play Store versions of the app (since version 1.1985).
Protected content is only available in non-Play Store versions of the app (since version 1.1985) and requires Android 8 Oreo or later.
Sending protected content is a pro feature, decrypting protected content is a free feature.

View file

@ -215,7 +215,8 @@ public class StyleHelper {
popupMenu.getMenu().findItem(R.id.menu_style_indentation_increase).setEnabled(maxLevel == null);
popupMenu.getMenu().findItem(R.id.menu_style_indentation_decrease).setEnabled(indents.length > 0);
popupMenu.getMenu().findItem(R.id.menu_style_password).setVisible(!BuildConfig.PLAY_STORE_RELEASE);
popupMenu.getMenu().findItem(R.id.menu_style_password)
.setVisible(!BuildConfig.PLAY_STORE_RELEASE && Build.VERSION.SDK_INT >= Build.VERSION_CODES.O);
popupMenu.getMenu().findItem(R.id.menu_style_code).setEnabled(BuildConfig.DEBUG);
popupMenu.insertIcons(context);