Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-04-02 23:26:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Refactoring

Browse Source
This commit is contained in:
M66B
2022-03-04 13:35:11 +01:00
parent 3165b9cb19
commit dc37308af0
2 changed files with 46 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
app/src/main/java/eu/faircode/email/FragmentCompose.java
View File

@@ -4616,7 +4616,7 @@ public class FragmentCompose extends FragmentBase {
EntityMessage.SMIME_SIGNENCRYPT.equals(ref.ui_encrypt)) {
if (ActivityBilling.isPro(context) &&
selected.sign_key_alias != null &&
hasSmimeKey(context, recipients))
SmimeHelper.hasSmimeKey(context, recipients))
data.draft.ui_encrypt = ref.ui_encrypt;
}
}
@@ -5847,7 +5847,7 @@ public class FragmentCompose extends FragmentBase {
(draft.ui_encrypt == null ||
EntityMessage.ENCRYPT_NONE.equals(draft.ui_encrypt))) {
args.putBoolean("remind_pgp", PgpHelper.hasPgpKey(context, recipients, MAX_PGP_BIND_DELAY));
args.putBoolean("remind_smime", hasSmimeKey(context, recipients));
args.putBoolean("remind_smime", SmimeHelper.hasSmimeKey(context, recipients));
}
if (TextUtils.isEmpty(draft.subject))
@@ -6502,21 +6502,6 @@ public class FragmentCompose extends FragmentBase {
return -1;
}
private boolean hasSmimeKey(Context context, List<Address> recipients) {
if (recipients == null || recipients.size() == 0)
return false;
DB db = DB.getInstance(context);
for (Address address : recipients) {
String email = ((InternetAddress) address).getAddress();
List<EntityCertificate> certs = db.certificate().getCertificateByEmail(email);
if (certs != null && certs.size() > 0)
return true;
}
return false;
}
private AdapterView.OnItemSelectedListener identitySelected = new AdapterView.OnItemSelectedListener() {
@Override
public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {