moparisthebest/k-9
1
0
Fork 0
mirror of https://github.com/moparisthebest/k-9 synced 2024-11-23 18:02:15 -05:00
Code Issues Releases Wiki Activity

Use identity instead of account in MessageCompose, simplify account naming

Browse Source
This commit is contained in:
Dominik Schürmann 2014-04-01 00:16:14 +02:00
parent 71a8ffc2b5
commit 6175c4c72d
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/fsck/k9/activity/MessageCompose.java
View File

@ -2005,8 +2005,7 @@ public class MessageCompose extends K9Activity implements OnClickListener,
intent.putExtra(OpenPgpApi.EXTRA_REQUEST_ASCII_ARMOR, true); intent.putExtra(OpenPgpApi.EXTRA_REQUEST_ASCII_ARMOR, true);
// this follows user id format of OpenPGP to allow key generation based on it // this follows user id format of OpenPGP to allow key generation based on it
// includes account number to make it unique // includes account number to make it unique
String accName = mAccount.getName() + " (" + mAccount.getAccountNumber() + ") <" String accName = mIdentity.getName() + " <" + mIdentity.getEmail() + ">";
+ mAccount.getEmail() + ">";
intent.putExtra(OpenPgpApi.EXTRA_ACCOUNT_NAME, accName); intent.putExtra(OpenPgpApi.EXTRA_ACCOUNT_NAME, accName);
final InputStream is = getOpenPgpInputStream(); final InputStream is = getOpenPgpInputStream();

3
src/com/fsck/k9/view/MessageOpenPgpView.java
View File

@ -268,8 +268,7 @@ public class MessageOpenPgpView extends LinearLayout {
intent.putExtra(OpenPgpApi.EXTRA_REQUEST_ASCII_ARMOR, true); intent.putExtra(OpenPgpApi.EXTRA_REQUEST_ASCII_ARMOR, true);
// this follows user id format of OpenPGP to allow key generation based on it // this follows user id format of OpenPGP to allow key generation based on it
// includes account number to make it unique // includes account number to make it unique
String accName = mAccount.getName() + " (" + mAccount.getAccountNumber() + ") <" String accName = mAccount.getName() + " <" + mAccount.getEmail() + ">";
+ mAccount.getEmail() + ">";
intent.putExtra(OpenPgpApi.EXTRA_ACCOUNT_NAME, accName); intent.putExtra(OpenPgpApi.EXTRA_ACCOUNT_NAME, accName);
InputStream is = null; InputStream is = null;