Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-03-26 10:55:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Moved password protecting to style menu

Browse Source
This commit is contained in:
M66B
2022-10-17 11:00:49 +02:00
parent d4abad6684
commit 427721d871
5 changed files with 223 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
app/src/main/java/eu/faircode/email/EditTextCompose.java
View File

@@ -58,16 +58,9 @@ import androidx.preference.PreferenceManager;
import org.jsoup.nodes.Document;
import org.jsoup.nodes.Element;
import java.nio.ByteBuffer;
import java.security.SecureRandom;
import java.util.List;
import java.util.concurrent.ExecutorService;
import javax.crypto.Cipher;
import javax.crypto.SecretKey;
import javax.crypto.SecretKeyFactory;
import javax.crypto.spec.GCMParameterSpec;
import javax.crypto.spec.PBEKeySpec;
import javax.mail.internet.AddressException;
import javax.mail.internet.InternetAddress;
@@ -122,7 +115,6 @@ public class EditTextCompose extends FixedEditText {
int order = 1000;
menu.add(Menu.CATEGORY_SECONDARY, R.string.title_insert_brackets, order++, context.getString(R.string.title_insert_brackets));
menu.add(Menu.CATEGORY_SECONDARY, R.string.title_insert_quotes, order++, context.getString(R.string.title_insert_quotes));
menu.add(Menu.CATEGORY_SECONDARY, R.string.title_protect_text, order++, context.getString(R.string.title_protect_text));
} catch (Throwable ex) {
Log.e(ex);
}
@@ -147,8 +139,6 @@ public class EditTextCompose extends FixedEditText {
return surround("(", ")");
else if (id == R.string.title_insert_quotes)
return surround("\"", "\"");
else if (id == R.string.title_protect_text)
return protect();
}
return false;
}
@@ -178,81 +168,6 @@ public class EditTextCompose extends FixedEditText {
}
return selection;
}
private boolean protect() {
Editable edit = getText();
int start = getSelectionStart();
int end = getSelectionEnd();
boolean selection = (edit != null && start >= 0 && start < end);
if (selection)
executor.submit(new Runnable() {
@Override
public void run() {
try {
String password = "FairEmail";
String text = HtmlHelper.toHtml((Spanned) edit.subSequence(start, end), context);
SecureRandom random = new SecureRandom();
byte[] salt = new byte[16]; // 128 bits
random.nextBytes(salt);
byte[] iv = new byte[12]; // 96 bites
random.nextBytes(iv);
// Iterations = 120,000; Keylength = 256 bits = 32 bytes
PBEKeySpec spec = new PBEKeySpec(password.toCharArray(), salt, 120000, 256);
SecretKeyFactory skf = SecretKeyFactory.getInstance("PBKDF2WithHmacSHA512");
SecretKey key = skf.generateSecret(spec);
// Authentication tag length = 128 bits = 16 bytes
GCMParameterSpec parameterSpec = new GCMParameterSpec(128, iv);
final Cipher cipher = Cipher.getInstance("AES/GCM/NoPadding");
cipher.init(Cipher.ENCRYPT_MODE, key, parameterSpec);
byte[] cipherText = cipher.doFinal(text.getBytes());
ByteBuffer out = ByteBuffer.allocate(1 + salt.length + iv.length + cipherText.length);
out.put((byte) 1); //version
out.put(salt);
out.put(iv);
out.put(cipherText);
String fragment = Base64.encodeToString(out.array(), Base64.URL_SAFE | Base64.NO_WRAP);
post(new Runnable() {
@Override
public void run() {
try {
if (getSelectionStart() != start || getSelectionEnd() != end)
return;
String title = context.getString(R.string.title_decrypt);
String url = "https://email.faircode.eu/decrypt/#" + fragment;
edit.delete(start, end);
edit.insert(start, title);
edit.setSpan(new URLSpan(url), start, start + title.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
setSelection(start + title.length());
} catch (Throwable ex) {
Log.e(ex);
}
}
});
} catch (Throwable ex) {
Log.e(ex);
post(new Runnable() {
@Override
public void run() {
ToastEx.makeText(context, ex.toString(), Toast.LENGTH_LONG).show();
}
});
}
}
});
return selection;
}
});
setCustomInsertionActionModeCallback(new ActionMode.Callback() {