mirror of
https://github.com/ArcaneChat/android.git
synced 2026-07-03 14:05:24 +02:00
Unify english language: Use 'email' instead of 'e-mail'.
This commit is contained in:
@@ -196,7 +196,7 @@ public class ContactsController {
|
||||
final String email = tempEmail;
|
||||
final String fallbackName = tempName;
|
||||
|
||||
// bind e-mail+name address to view object to detect overwrites and discard loading old images (may happen on fast scrolling)
|
||||
// bind email+name address to view object to detect overwrites and discard loading old images (may happen on fast scrolling)
|
||||
// moreover, check if the avatar is in cache
|
||||
AvtCacheEntry cacheEntry;
|
||||
synchronized (s_sync) {
|
||||
|
||||
@@ -145,7 +145,7 @@ public class MrChat {
|
||||
|
||||
public String getNameNAddr()
|
||||
{
|
||||
// returns name of group chats or name+e-mail-address for normal chats
|
||||
// returns name of group chats or name+email-address for normal chats
|
||||
String name = "ErrGrpNameNAddr";
|
||||
if( getType()==MR_CHAT_GROUP ) {
|
||||
name = getName();
|
||||
|
||||
@@ -439,8 +439,8 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
|
||||
}
|
||||
else if ( id == ID_DELETE_CHAT)
|
||||
{
|
||||
// as the history may be a mix of messenger-messages and e-mails, it is not safe to delete it.
|
||||
// the user can delete explicit messages or use his e-mail programm to delete masses.
|
||||
// as the history may be a mix of messenger-messages and emails, it is not safe to delete it.
|
||||
// the user can delete explicit messages or use his email programm to delete masses.
|
||||
if (getParentActivity() == null) {
|
||||
return;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user