From 29f00a689368e59b69e30b1611fb562c4ddd2814 Mon Sep 17 00:00:00 2001 From: M66B Date: Sat, 29 Oct 2022 16:50:15 +0200 Subject: [PATCH] Protected content requires Android 8 (SDK 26) --- FAQ.md | 10 +++++----- app/src/main/java/eu/faircode/email/StyleHelper.java | 3 ++- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/FAQ.md b/FAQ.md index 93bcec535b..393b46d1d4 100644 --- a/FAQ.md +++ b/FAQ.md @@ -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*~~
@@ -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. diff --git a/app/src/main/java/eu/faircode/email/StyleHelper.java b/app/src/main/java/eu/faircode/email/StyleHelper.java index 39fa1025c5..a0ff00381a 100644 --- a/app/src/main/java/eu/faircode/email/StyleHelper.java +++ b/app/src/main/java/eu/faircode/email/StyleHelper.java @@ -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);