msb-public
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Code Issues Projects Releases Wiki Activity

Simplification

Browse Source
pull/147/head
M66B 7 years ago
parent 86fbef7cda
commit 3d1b983bca
2 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File

35
app/src/main/java/eu/faircode/email/ActivityView.java
Unescape View File

@ -1348,25 +1348,22 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
if (encrypted == null) { if (encrypted == null) {
EntityMessage message = db.message().getMessage(id); EntityMessage message = db.message().getMessage(id);
if (message.content) { String body = message.read(context);
String body = message.read(context);
if (body != null) { // https://tools.ietf.org/html/rfc4880#section-6.2
// https://tools.ietf.org/html/rfc4880#section-6.2 int begin = body.indexOf(PGP_BEGIN_MESSAGE);
int begin = body.indexOf(PGP_BEGIN_MESSAGE); int end = body.indexOf(PGP_END_MESSAGE);
int end = body.indexOf(PGP_END_MESSAGE); if (begin >= 0 && begin < end) {
if (begin >= 0 && begin < end) { String section = body.substring(begin, end + PGP_END_MESSAGE.length());
String section = body.substring(begin, end + PGP_END_MESSAGE.length()); String[] lines = section.split("<br />");
String[] lines = section.split("<br />"); List<String> disarmored = new ArrayList<>();
List<String> disarmored = new ArrayList<>(); for (String line : lines)
for (String line : lines) if (!TextUtils.isEmpty(line) && !line.contains(": "))
if (!TextUtils.isEmpty(line) && !line.contains(": ")) disarmored.add(line);
disarmored.add(line); section = TextUtils.join("\n\r", disarmored);
section = TextUtils.join("\n\r", disarmored);
inline = true;
inline = true; encrypted = new ByteArrayInputStream(section.getBytes());
encrypted = new ByteArrayInputStream(section.getBytes());
}
}
} }
} }

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

@ -1392,7 +1392,8 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
popupMenu.getMenu().findItem(R.id.menu_manage_keywords).setVisible(data.message.uid != null); popupMenu.getMenu().findItem(R.id.menu_manage_keywords).setVisible(data.message.uid != null);
popupMenu.getMenu().findItem(R.id.menu_decrypt).setEnabled(data.message.to != null && data.message.to.length > 0); popupMenu.getMenu().findItem(R.id.menu_decrypt).setEnabled(
data.message.content && data.message.to != null && data.message.to.length > 0);
popupMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() { popupMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
@Override @Override

Write Preview
Loading…
Cancel
Save