From f952f20d12e5f0c2fd572dbab058f6e3e05561cf Mon Sep 17 00:00:00 2001 From: vivabelarus <74508922+vivabelarus@users.noreply.github.com> Date: Sun, 3 Apr 2022 16:37:38 +0300 Subject: [PATCH] fix partisan telegram session renaming --- .../src/main/java/org/telegram/ui/Cells/SessionCell.java | 4 ++-- .../src/main/java/org/telegram/ui/Components/UndoView.java | 4 +++- .../src/main/java/org/telegram/ui/SessionBottomSheet.java | 4 +++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Cells/SessionCell.java b/TMessagesProj/src/main/java/org/telegram/ui/Cells/SessionCell.java index 298db8607..c6afc3c0d 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/Cells/SessionCell.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/Cells/SessionCell.java @@ -151,7 +151,7 @@ public class SessionCell extends FrameLayout { TLRPC.TL_authorization session = (TLRPC.TL_authorization) object; boolean isSessionOfThisApp = session.api_id == BuildVars.APP_ID; nameTextView.setText(String.format(Locale.US, "%s %s", - isSessionOfThisApp ? "Telegram Android" : session.app_name , session.app_version)); + isSessionOfThisApp ? "Telegram Android" : session.app_name, session.app_version)); imageView.setImageDrawable(createDrawable(session)); @@ -194,7 +194,7 @@ public class SessionCell extends FrameLayout { detailExTextView.setText(spannableStringBuilder); stringBuilder = new StringBuilder(); - stringBuilder.append(session.app_name); + stringBuilder.append(isSessionOfThisApp ? "Telegram Android" : session.app_name); stringBuilder.append(" ").append(session.app_version); detailTextView.setText(stringBuilder); diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Components/UndoView.java b/TMessagesProj/src/main/java/org/telegram/ui/Components/UndoView.java index b23875839..7a001cf18 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/Components/UndoView.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/Components/UndoView.java @@ -39,6 +39,7 @@ import android.widget.TextView; import androidx.annotation.Keep; import org.telegram.messenger.AndroidUtilities; +import org.telegram.messenger.BuildVars; import org.telegram.messenger.ChatObject; import org.telegram.messenger.ContactsController; import org.telegram.messenger.DialogObject; @@ -1193,7 +1194,8 @@ public class UndoView extends FrameLayout { layoutParams.leftMargin = AndroidUtilities.dp(58); layoutParams.topMargin = AndroidUtilities.dp(6); - subinfoTextView.setText(authorization.app_name); + boolean isSessionOfThisApp = authorization.api_id == BuildVars.APP_ID; + subinfoTextView.setText(isSessionOfThisApp ? "Telegram Android" : authorization.app_name); subinfoTextView.setVisibility(VISIBLE); infoTextView.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 14); infoTextView.setTypeface(AndroidUtilities.getTypeface("fonts/rmedium.ttf")); diff --git a/TMessagesProj/src/main/java/org/telegram/ui/SessionBottomSheet.java b/TMessagesProj/src/main/java/org/telegram/ui/SessionBottomSheet.java index fe6906984..8502ce160 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/SessionBottomSheet.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/SessionBottomSheet.java @@ -21,6 +21,7 @@ import androidx.core.graphics.ColorUtils; import org.telegram.messenger.AndroidUtilities; import org.telegram.messenger.ApplicationLoader; +import org.telegram.messenger.BuildVars; import org.telegram.messenger.LocaleController; import org.telegram.messenger.R; import org.telegram.tgnet.ConnectionsManager; @@ -106,7 +107,8 @@ public class SessionBottomSheet extends BottomSheet { ItemView applicationItemView = new ItemView(context, false); stringBuilder = new StringBuilder(); - stringBuilder.append(session.app_name); + boolean isSessionOfThisApp = session.api_id == BuildVars.APP_ID; + stringBuilder.append(isSessionOfThisApp ? "Telegram Android" : session.app_name); stringBuilder.append(" ").append(session.app_version); applicationItemView.valueText.setText(stringBuilder); Drawable drawable = ContextCompat.getDrawable(context, R.drawable.menu_devices).mutate();