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

Remove UserObject.isDeleted().

Browse Source
This commit is contained in:
B. Petersen
2016-12-03 18:06:52 +01:00
parent 56fb73088e
commit e89b2855ce
6 changed files with 11 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MessengerProj/src/main/java/com/b44t/messenger/LocaleController.java
+1 -1
View File
@@ -902,7 +902,7 @@ public class LocaleController {
return getString("Online", R.string.Online);
}
}
if (user == null || user.status == null || user.status.expires == 0 || UserObject.isDeleted(user) ) {
if (user == null || user.status == null || user.status.expires == 0 ) {
return getString("ALongTimeAgo", R.string.ALongTimeAgo);
} else {
int currentTime = ConnectionsManager.getInstance().getCurrentTime();
MessengerProj/src/main/java/com/b44t/messenger/TLRPC.java
-1
View File
@@ -251,7 +251,6 @@ public class TLRPC {
public boolean self;
public boolean contact;
public final boolean mutual_contact = false;
public final boolean deleted = false;
public final boolean bot = false;
public boolean verified;
public boolean min;
MessengerProj/src/main/java/com/b44t/messenger/UserObject.java
-4
View File
@@ -10,10 +10,6 @@ package com.b44t.messenger;
public class UserObject {
public static boolean isDeleted(TLRPC.User user) {
return user == null || user.deleted;
}
public static boolean isUserSelf(TLRPC.User user) {
return user.self;
}
MessengerProj/src/main/java/com/b44t/ui/Adapters/MentionsAdapter.java
+1 -1
View File
@@ -598,7 +598,7 @@ public class MentionsAdapter extends BaseSearchAdapterRecycler {
continue;
}
if (usernameString.length() == 0) {
if (!user.deleted && (allowNewMentions || !allowNewMentions && user.username != null && user.username.length() != 0)) {
if ( (allowNewMentions || !allowNewMentions && user.username != null && user.username.length() != 0)) {
newResult.add(user);
}
} else {
MessengerProj/src/main/java/com/b44t/ui/ChatActivity.java
+8 -16
View File
@@ -140,7 +140,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
private static final int ROWTYPE_LOADING_CELL = 4;
protected TLRPC.Chat currentChat;
protected TLRPC.User currentUser; // originally currentChat<->currentUser was used to differ between normal or group chats
//private final TLRPC.User currentUser = null; // originally currentChat<->currentUser was used to differ between normal or group chats
public MrChat m_mrChat = new MrChat(0);
@@ -2896,8 +2896,8 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
private void checkActionBarMenu() {
if (/*currentEncryptedChat != null && !(currentEncryptedChat instanceof TLRPC.TL_encryptedChat) ||*/
currentChat != null && ChatObject.isNotInChat(currentChat) ||
currentUser != null && UserObject.isDeleted(currentUser)) {
currentChat != null && ChatObject.isNotInChat(currentChat) /*||
currentUser != null && UserObject.isDeleted(currentUser)*/ ) {
if (menuItem != null) {
menuItem.setVisibility(View.GONE);
}
@@ -3765,9 +3765,6 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
for (int a = 0; a < arr.size(); a++) {
MessageObject obj = arr.get(a);
if (currentUser != null && currentUser.bot && obj.isOut()) {
obj.setIsRead();
}
if (obj.isOut() && obj.isSending()) {
scrollToLastMessage(false);
@@ -3843,9 +3840,6 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
}
}
}
if (currentUser != null && currentUser.bot && obj.isOut()) {
obj.setIsRead();
}
if (obj.type < 0 || messagesDict[0].containsKey(obj.getId())) {
continue;
@@ -4464,9 +4458,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
NotificationCenter.getInstance().setAnimationInProgress(false);
if (isOpen) {
openAnimationEnded = true;
if (currentUser != null) {
//MessagesController.getInstance().loadFullUser(currentUser, classGuid, false);
}
if (Build.VERSION.SDK_INT >= 21) {
createChatAttachView();
}
@@ -4488,8 +4480,8 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
chatActivityEnterView.setVisibility(View.INVISIBLE);
} else {
searchContainer.setVisibility(View.INVISIBLE);
if (currentChat != null && (ChatObject.isNotInChat(currentChat) || !ChatObject.canWriteToChat(currentChat)) ||
currentUser != null && (UserObject.isDeleted(currentUser))) {
if (currentChat != null && (ChatObject.isNotInChat(currentChat) || !ChatObject.canWriteToChat(currentChat)) /*||
currentUser != null && (UserObject.isDeleted(currentUser))*/) {
bottomOverlayChat.setVisibility(View.VISIBLE);
if (muteMenuEntry !=null){
muteMenuEntry.setVisibility(View.GONE);
@@ -5680,7 +5672,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
Bundle args = new Bundle();
args.putInt("user_id", user.id);
ProfileActivity fragment = new ProfileActivity(args);
fragment.setPlayProfileAnimation(currentUser != null && currentUser.id == user.id);
fragment.setPlayProfileAnimation(false/*currentUser != null && currentUser.id == user.id*/);
presentFragment(fragment);
}
}
@@ -5861,7 +5853,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
Bundle args = new Bundle();
args.putInt("user_id", uid);
ProfileActivity fragment = new ProfileActivity(args);
fragment.setPlayProfileAnimation(currentUser != null && currentUser.id == uid);
fragment.setPlayProfileAnimation(false/*currentUser != null && currentUser.id == uid*/);
presentFragment(fragment);
}
}