From e89b2855ceaacade8b78d875cce152e20c3d8a60 Mon Sep 17 00:00:00 2001 From: "B. Petersen" Date: Sat, 3 Dec 2016 18:06:52 +0100 Subject: [PATCH] Remove UserObject.isDeleted(). --- MessengerProj/build.gradle | 2 +- .../com/b44t/messenger/LocaleController.java | 2 +- .../main/java/com/b44t/messenger/TLRPC.java | 1 - .../java/com/b44t/messenger/UserObject.java | 4 ---- .../com/b44t/ui/Adapters/MentionsAdapter.java | 2 +- .../main/java/com/b44t/ui/ChatActivity.java | 24 +++++++------------ 6 files changed, 11 insertions(+), 24 deletions(-) diff --git a/MessengerProj/build.gradle b/MessengerProj/build.gradle index 95c6738e2..c07be8c98 100644 --- a/MessengerProj/build.gradle +++ b/MessengerProj/build.gradle @@ -129,7 +129,7 @@ android { defaultConfig { minSdkVersion 14 // 14: Android 4.0 Ice Cream Sandwich 2011 (Telegram default), 21: Android 5.0 Lollipop 2014 (recommended for InstantRun) targetSdkVersion 23 - versionName "0.1.4" + versionName "0.1.5" } } diff --git a/MessengerProj/src/main/java/com/b44t/messenger/LocaleController.java b/MessengerProj/src/main/java/com/b44t/messenger/LocaleController.java index aa5ec5ee0..798a743c9 100644 --- a/MessengerProj/src/main/java/com/b44t/messenger/LocaleController.java +++ b/MessengerProj/src/main/java/com/b44t/messenger/LocaleController.java @@ -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(); diff --git a/MessengerProj/src/main/java/com/b44t/messenger/TLRPC.java b/MessengerProj/src/main/java/com/b44t/messenger/TLRPC.java index 21e731729..c19d2756a 100644 --- a/MessengerProj/src/main/java/com/b44t/messenger/TLRPC.java +++ b/MessengerProj/src/main/java/com/b44t/messenger/TLRPC.java @@ -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; diff --git a/MessengerProj/src/main/java/com/b44t/messenger/UserObject.java b/MessengerProj/src/main/java/com/b44t/messenger/UserObject.java index 7867de2c4..f9efa36c8 100644 --- a/MessengerProj/src/main/java/com/b44t/messenger/UserObject.java +++ b/MessengerProj/src/main/java/com/b44t/messenger/UserObject.java @@ -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; } diff --git a/MessengerProj/src/main/java/com/b44t/ui/Adapters/MentionsAdapter.java b/MessengerProj/src/main/java/com/b44t/ui/Adapters/MentionsAdapter.java index b8c7203dc..e2be0569b 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/Adapters/MentionsAdapter.java +++ b/MessengerProj/src/main/java/com/b44t/ui/Adapters/MentionsAdapter.java @@ -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 { diff --git a/MessengerProj/src/main/java/com/b44t/ui/ChatActivity.java b/MessengerProj/src/main/java/com/b44t/ui/ChatActivity.java index eefb4aad2..67ad59cda 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/ChatActivity.java +++ b/MessengerProj/src/main/java/com/b44t/ui/ChatActivity.java @@ -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); } }