awesome-bookmarks/arcanechat-android
3
0
Fork 0
mirror of https://github.com/ArcaneChat/android.git synced 2026-07-03 14:05:24 +02:00
Code Issues Packages Projects Releases 3 Wiki Activity

Prefer the term 'contact' over 'user', unify usage.

Browse Source
This commit is contained in:
B. Petersen
2017-02-18 22:26:16 +01:00
parent 50dfe15f09
commit 31ba521244
13 changed files with 62 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MessengerProj/src/main/java/com/b44t/ui/ProfileActivity.java
+2 -2
View File
@@ -446,7 +446,7 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter.
public void didSelectContact(final int added_user_id) {
if( MrMailbox.isContactInChat(chat_id, added_user_id)!=0 )
{
Toast.makeText(getParentActivity(), ApplicationLoader.applicationContext.getString(R.string.UserAlreadyInGroup), Toast.LENGTH_SHORT).show();
Toast.makeText(getParentActivity(), ApplicationLoader.applicationContext.getString(R.string.ContactAlreadyInGroup), Toast.LENGTH_SHORT).show();
}
else {
AlertDialog.Builder builder = new AlertDialog.Builder(getParentActivity());
@@ -1205,7 +1205,7 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter.
}
if (user_id != 0) {
item.addSubItem(ID_STOP_ENCRYPTION_FOR_THIS_USER, LocaleController.getString("ResetUserKey", R.string.ResetUserKey), 0);
item.addSubItem(ID_STOP_ENCRYPTION_FOR_THIS_USER, ApplicationLoader.applicationContext.getString(R.string.ResetContactsKey), 0);
item.addSubItem(ID_BLOCK_CONTACT, userBlocked()? LocaleController.getString("UnblockContact", R.string.UnblockContact) : LocaleController.getString("BlockContact", R.string.BlockContact), 0);
item.addSubItem(ID_DELETE_CONTACT, LocaleController.getString("DeleteContact", R.string.DeleteContact), 0);
}