mirror of
https://github.com/moparisthebest/k-9
synced 2024-11-23 18:02:15 -05:00
Use identity instead of account in MessageCompose, simplify account naming
This commit is contained in:
parent
71a8ffc2b5
commit
6175c4c72d
@ -2005,8 +2005,7 @@ public class MessageCompose extends K9Activity implements OnClickListener,
|
||||
intent.putExtra(OpenPgpApi.EXTRA_REQUEST_ASCII_ARMOR, true);
|
||||
// this follows user id format of OpenPGP to allow key generation based on it
|
||||
// includes account number to make it unique
|
||||
String accName = mAccount.getName() + " (" + mAccount.getAccountNumber() + ") <"
|
||||
+ mAccount.getEmail() + ">";
|
||||
String accName = mIdentity.getName() + " <" + mIdentity.getEmail() + ">";
|
||||
intent.putExtra(OpenPgpApi.EXTRA_ACCOUNT_NAME, accName);
|
||||
|
||||
final InputStream is = getOpenPgpInputStream();
|
||||
|
@ -268,8 +268,7 @@ public class MessageOpenPgpView extends LinearLayout {
|
||||
intent.putExtra(OpenPgpApi.EXTRA_REQUEST_ASCII_ARMOR, true);
|
||||
// this follows user id format of OpenPGP to allow key generation based on it
|
||||
// includes account number to make it unique
|
||||
String accName = mAccount.getName() + " (" + mAccount.getAccountNumber() + ") <"
|
||||
+ mAccount.getEmail() + ">";
|
||||
String accName = mAccount.getName() + " <" + mAccount.getEmail() + ">";
|
||||
intent.putExtra(OpenPgpApi.EXTRA_ACCOUNT_NAME, accName);
|
||||
|
||||
InputStream is = null;
|
||||
|
Loading…
Reference in New Issue
Block a user