From 902ad01371a47afe6709056ead07877263e9aaa0 Mon Sep 17 00:00:00 2001 From: Riko Sakurauchi Date: Sat, 9 May 2020 19:59:12 +0800 Subject: [PATCH] Fix and improve no quote forward # Conflicts: # TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java --- .../telegram/messenger/ApplicationLoader.java | 1 + .../messenger/SendMessagesHelper.java | 18 ++++++----- .../java/org/telegram/ui/ChatActivity.java | 14 +++++---- .../ui/Components/SharedMediaLayout.java | 28 ++++++++++++++++-- .../java/org/telegram/ui/MediaActivity.java | 15 ++++++++-- .../java/org/telegram/ui/PhotoViewer.java | 22 ++++++++++++-- .../main/res/drawable-hdpi/msg_forward.png | Bin 514 -> 944 bytes .../res/drawable-hdpi/msg_forward_noquote.png | Bin 0 -> 514 bytes .../res/drawable-hdpi/msg_forward_quote.png | Bin 944 -> 0 bytes .../main/res/drawable-mdpi/msg_forward.png | Bin 353 -> 744 bytes .../res/drawable-mdpi/msg_forward_noquote.png | Bin 0 -> 353 bytes .../res/drawable-mdpi/msg_forward_quote.png | Bin 744 -> 0 bytes .../main/res/drawable-xhdpi/msg_forward.png | Bin 618 -> 1056 bytes .../drawable-xhdpi/msg_forward_noquote.png | Bin 0 -> 618 bytes .../res/drawable-xhdpi/msg_forward_quote.png | Bin 1056 -> 0 bytes .../main/res/drawable-xxhdpi/msg_forward.png | Bin 877 -> 1391 bytes .../drawable-xxhdpi/msg_forward_noquote.png | Bin 0 -> 877 bytes .../res/drawable-xxhdpi/msg_forward_quote.png | Bin 1391 -> 0 bytes 18 files changed, 80 insertions(+), 18 deletions(-) create mode 100644 TMessagesProj/src/main/res/drawable-hdpi/msg_forward_noquote.png delete mode 100644 TMessagesProj/src/main/res/drawable-hdpi/msg_forward_quote.png create mode 100644 TMessagesProj/src/main/res/drawable-mdpi/msg_forward_noquote.png delete mode 100644 TMessagesProj/src/main/res/drawable-mdpi/msg_forward_quote.png create mode 100644 TMessagesProj/src/main/res/drawable-xhdpi/msg_forward_noquote.png delete mode 100644 TMessagesProj/src/main/res/drawable-xhdpi/msg_forward_quote.png create mode 100644 TMessagesProj/src/main/res/drawable-xxhdpi/msg_forward_noquote.png delete mode 100644 TMessagesProj/src/main/res/drawable-xxhdpi/msg_forward_quote.png diff --git a/TMessagesProj/src/main/java/org/telegram/messenger/ApplicationLoader.java b/TMessagesProj/src/main/java/org/telegram/messenger/ApplicationLoader.java index e0b208c7d..2118afe08 100644 --- a/TMessagesProj/src/main/java/org/telegram/messenger/ApplicationLoader.java +++ b/TMessagesProj/src/main/java/org/telegram/messenger/ApplicationLoader.java @@ -259,6 +259,7 @@ public class ApplicationLoader extends Application { }).addOnFailureListener(e -> { if (BuildVars.LOGS_ENABLED) { FileLog.d("Failed to get regid"); + FileLog.e(e); } SharedConfig.pushStringStatus = "__FIREBASE_FAILED__"; GcmPushListenerService.sendRegistrationToServer(null); diff --git a/TMessagesProj/src/main/java/org/telegram/messenger/SendMessagesHelper.java b/TMessagesProj/src/main/java/org/telegram/messenger/SendMessagesHelper.java index deb598d30..05017215d 100644 --- a/TMessagesProj/src/main/java/org/telegram/messenger/SendMessagesHelper.java +++ b/TMessagesProj/src/main/java/org/telegram/messenger/SendMessagesHelper.java @@ -991,6 +991,10 @@ public class SendMessagesHelper extends BaseController implements NotificationCe } public void processForwardFromMyName(MessageObject messageObject, long did, boolean nullReply) { + processForwardFromMyName(messageObject, did, nullReply, true, 0); + } + + public void processForwardFromMyName(MessageObject messageObject, long did, boolean nullReply, boolean notify, int scheduleDate) { if (messageObject == null) { return; } @@ -1001,22 +1005,22 @@ public class SendMessagesHelper extends BaseController implements NotificationCe params.put("parentObject", "sent_" + messageObject.messageOwner.to_id.channel_id + "_" + messageObject.getId()); } if (messageObject.messageOwner.media.photo instanceof TLRPC.TL_photo) { - sendMessage((TLRPC.TL_photo) messageObject.messageOwner.media.photo, null, did, nullReply ? null : messageObject.replyMessageObject, messageObject.messageOwner.message, messageObject.messageOwner.entities, null, params, true, 0, messageObject.messageOwner.media.ttl_seconds, messageObject); + sendMessage((TLRPC.TL_photo) messageObject.messageOwner.media.photo, null, did, nullReply ? null : messageObject.replyMessageObject, messageObject.messageOwner.message, messageObject.messageOwner.entities, null, params, notify, scheduleDate, messageObject.messageOwner.media.ttl_seconds, messageObject); } else if (messageObject.messageOwner.media.document instanceof TLRPC.TL_document) { - sendMessage((TLRPC.TL_document) messageObject.messageOwner.media.document, null, messageObject.messageOwner.attachPath, did, nullReply ? null : messageObject.replyMessageObject, messageObject.messageOwner.message, messageObject.messageOwner.entities, null, params, true, 0, messageObject.messageOwner.media.ttl_seconds, messageObject); + sendMessage((TLRPC.TL_document) messageObject.messageOwner.media.document, null, messageObject.messageOwner.attachPath, did, nullReply ? null : messageObject.replyMessageObject, messageObject.messageOwner.message, messageObject.messageOwner.entities, null, params, notify, scheduleDate, messageObject.messageOwner.media.ttl_seconds, messageObject); } else if (messageObject.messageOwner.media instanceof TLRPC.TL_messageMediaVenue || messageObject.messageOwner.media instanceof TLRPC.TL_messageMediaGeo) { - sendMessage(messageObject.messageOwner.media, did, nullReply ? null : messageObject.replyMessageObject, null, null, true, 0); + sendMessage(messageObject.messageOwner.media, did, nullReply ? null : messageObject.replyMessageObject, null, null, notify, scheduleDate); } else if (messageObject.messageOwner.media.phone_number != null) { TLRPC.User user = new TLRPC.TL_userContact_old2(); user.phone = messageObject.messageOwner.media.phone_number; user.first_name = messageObject.messageOwner.media.first_name; user.last_name = messageObject.messageOwner.media.last_name; user.id = messageObject.messageOwner.media.user_id; - sendMessage(user, did, nullReply ? null : messageObject.replyMessageObject, null, null, true, 0); + sendMessage(user, did, nullReply ? null : messageObject.replyMessageObject, null, null, notify, scheduleDate); } else if ((int) did != 0) { ArrayList arrayList = new ArrayList<>(); arrayList.add(messageObject); - sendMessage(arrayList, did, true, 0); + sendMessage(arrayList, did, notify, scheduleDate); } } else if (messageObject.messageOwner.message != null) { TLRPC.WebPage webPage = null; @@ -1039,11 +1043,11 @@ public class SendMessagesHelper extends BaseController implements NotificationCe } else { entities = null; } - sendMessage(messageObject.messageOwner.message, did, nullReply ? null : messageObject.replyMessageObject, webPage, true, entities, null, null, true, 0); + sendMessage(messageObject.messageOwner.message, did, nullReply ? null : messageObject.replyMessageObject, webPage, true, entities, null, null, notify, scheduleDate); } else if ((int) did != 0) { ArrayList arrayList = new ArrayList<>(); arrayList.add(messageObject); - sendMessage(arrayList, did, true, 0); + sendMessage(arrayList, did, notify, scheduleDate); } } diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java index 094ee51c0..2c108bf27 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java @@ -877,6 +877,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not int migrated_to = arguments.getInt("migrated_to", 0); scrollToTopOnResume = arguments.getBoolean("scrollToTopOnResume", false); needRemovePreviousSameChatActivity = arguments.getBoolean("need_remove_previous_same_chat_activity", true); + noForwardQuote = arguments.getBoolean("forward_noquote", false); if (chatId != 0) { currentChat = getMessagesController().getChat(chatId); @@ -1835,8 +1836,8 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not actionModeViews.add(actionMode.addItemWithWidth(edit, R.drawable.msg_edit, AndroidUtilities.dp(54), LocaleController.getString("Edit", R.string.Edit))); actionModeViews.add(actionMode.addItemWithWidth(star, R.drawable.msg_fave, AndroidUtilities.dp(54), LocaleController.getString("AddToFavorites", R.string.AddToFavorites))); actionModeViews.add(actionMode.addItemWithWidth(copy, R.drawable.msg_copy, AndroidUtilities.dp(54), LocaleController.getString("Copy", R.string.Copy))); - actionModeViews.add(actionMode.addItemWithWidth(forward, R.drawable.msg_forward_quote, AndroidUtilities.dp(54), LocaleController.getString("Forward", R.string.Forward))); - actionModeViews.add(actionMode.addItemWithWidth(forward_noquote, R.drawable.msg_forward, AndroidUtilities.dp(54), LocaleController.getString("NoQuoteForward", R.string.NoQuoteForward))); + actionModeViews.add(actionMode.addItemWithWidth(forward_noquote, R.drawable.msg_forward_noquote, AndroidUtilities.dp(54), LocaleController.getString("NoQuoteForward", R.string.NoQuoteForward))); + actionModeViews.add(actionMode.addItemWithWidth(forward, R.drawable.msg_forward, AndroidUtilities.dp(54), LocaleController.getString("Forward", R.string.Forward))); actionModeViews.add(actionMode.addItemWithWidth(delete, R.drawable.msg_delete, AndroidUtilities.dp(54), LocaleController.getString("Delete", R.string.Delete))); } else { actionModeViews.add(actionMode.addItemWithWidth(edit, R.drawable.msg_edit, AndroidUtilities.dp(54), LocaleController.getString("Edit", R.string.Edit))); @@ -7255,7 +7256,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not AlertsCreator.showSendMediaAlert(getSendMessagesHelper().sendMessage(arrayList, did == 0 ? dialog_id : did, notify, scheduleDate), this); } else { for (MessageObject object : arrayList) { - getSendMessagesHelper().processForwardFromMyName(object, did == 0 ? dialog_id : did, true); + getSendMessagesHelper().processForwardFromMyName(object, did == 0 ? dialog_id : did, true, notify, scheduleDate); } } } @@ -14229,10 +14230,10 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not if (!inScheduleMode && !selectedObject.needDrawBluredPreview() && !selectedObject.isLiveLocation() && selectedObject.type != 16) { items.add(LocaleController.getString("Forward", R.string.Forward)); options.add(2); - icons.add(R.drawable.msg_forward_quote); + icons.add(R.drawable.msg_forward); items.add(LocaleController.getString("NoQuoteForward", R.string.NoQuoteForward)); options.add(95); - icons.add(R.drawable.msg_forward); + icons.add(R.drawable.msg_forward_noquote); if (!UserObject.isUserSelf(currentUser) && NekoConfig.showAddToSavedMessages) { items.add(LocaleController.getString("AddToSavedMessages", R.string.AddToSavedMessages)); options.add(93); @@ -15583,6 +15584,9 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not int lower_part = (int) did; int high_part = (int) (did >> 32); Bundle args = new Bundle(); + if (noForwardQuote) { + args.putBoolean("forward_noquote", true); + } args.putBoolean("scrollToTopOnResume", scrollToTopOnResume); if (lower_part != 0) { if (lower_part > 0) { diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Components/SharedMediaLayout.java b/TMessagesProj/src/main/java/org/telegram/ui/Components/SharedMediaLayout.java index a2b7cff88..cd402bff1 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/Components/SharedMediaLayout.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/Components/SharedMediaLayout.java @@ -48,6 +48,7 @@ import org.telegram.messenger.MediaDataController; import org.telegram.messenger.MessageObject; import org.telegram.messenger.NotificationCenter; import org.telegram.messenger.R; +import org.telegram.messenger.SendMessagesHelper; import org.telegram.messenger.UserObject; import org.telegram.messenger.Utilities; import org.telegram.messenger.browser.Browser; @@ -126,6 +127,7 @@ public class SharedMediaLayout extends FrameLayout implements NotificationCenter private MediaPage[] mediaPages = new MediaPage[2]; private ActionBarMenuItem deleteItem; private ActionBarMenuItem searchItem; + private ActionBarMenuItem forwardNoQuoteItem; private ActionBarMenuItem forwardItem; private ActionBarMenuItem gotoItem; private int searchItemState; @@ -638,6 +640,7 @@ public class SharedMediaLayout extends FrameLayout implements NotificationCenter private SharedMediaPreloader sharedMediaPreloader; private final static int forward = 100; + private final static int forward_noquote = 1001; private final static int delete = 101; private final static int gotochat = 102; @@ -900,6 +903,14 @@ public class SharedMediaLayout extends FrameLayout implements NotificationCenter actionModeViews.add(gotoItem); gotoItem.setOnClickListener(v -> onActionBarItemClick(gotochat)); + forwardNoQuoteItem = new ActionBarMenuItem(context, null, Theme.getColor(Theme.key_actionBarActionModeDefaultSelector), Theme.getColor(Theme.key_windowBackgroundWhiteGrayText2), false); + forwardNoQuoteItem.setIcon(R.drawable.msg_forward_noquote); + forwardNoQuoteItem.setContentDescription(LocaleController.getString("NoQuoteForward", R.string.NoQuoteForward)); + forwardNoQuoteItem.setDuplicateParentStateEnabled(false); + actionModeLayout.addView(forwardNoQuoteItem, new LinearLayout.LayoutParams(AndroidUtilities.dp(54), ViewGroup.LayoutParams.MATCH_PARENT)); + actionModeViews.add(forwardNoQuoteItem); + forwardNoQuoteItem.setOnClickListener(v -> onActionBarItemClick(forward_noquote)); + forwardItem = new ActionBarMenuItem(context, null, Theme.getColor(Theme.key_actionBarActionModeDefaultSelector), Theme.getColor(Theme.key_windowBackgroundWhiteGrayText2), false); forwardItem.setIcon(R.drawable.msg_forward); forwardItem.setContentDescription(LocaleController.getString("Forward", R.string.Forward)); @@ -1508,7 +1519,7 @@ public class SharedMediaLayout extends FrameLayout implements NotificationCenter actionBar.closeSearchField(); cantDeleteMessagesCount = 0; }); - } else if (id == forward) { + } else if (id == forward || id == forward_noquote) { Bundle args = new Bundle(); args.putBoolean("onlySelect", true); args.putInt("dialogsType", 3); @@ -1538,7 +1549,13 @@ public class SharedMediaLayout extends FrameLayout implements NotificationCenter if (message != null) { profileActivity.getSendMessagesHelper().sendMessage(message.toString(), did, null, null, true, null, null, null, true, 0); } - profileActivity.getSendMessagesHelper().sendMessage(fmessages, did, true, 0); + if (id == forward_noquote) { + for (MessageObject object : fmessages) { + profileActivity.getSendMessagesHelper().processForwardFromMyName(object, did, true, true, 0); + } + } else { + profileActivity.getSendMessagesHelper().sendMessage(fmessages, did, true, 0); + } } fragment1.finishFragment(); } else { @@ -1546,6 +1563,9 @@ public class SharedMediaLayout extends FrameLayout implements NotificationCenter int lower_part = (int) did; int high_part = (int) (did >> 32); Bundle args1 = new Bundle(); + if (id == forward_noquote) { + args1.putBoolean("forward_noquote", true); + } args1.putBoolean("scrollToTopOnResume", true); if (lower_part != 0) { if (lower_part > 0) { @@ -4110,6 +4130,10 @@ public class SharedMediaLayout extends FrameLayout implements NotificationCenter arrayList.add(new ThemeDescription(gotoItem.getIconView(), ThemeDescription.FLAG_IMAGECOLOR, null, null, null, null, Theme.key_windowBackgroundWhiteGrayText2)); arrayList.add(new ThemeDescription(gotoItem, ThemeDescription.FLAG_BACKGROUNDFILTER, null, null, null, null, Theme.key_actionBarActionModeDefaultSelector)); } + if (forwardNoQuoteItem != null) { + arrayList.add(new ThemeDescription(forwardNoQuoteItem.getIconView(), ThemeDescription.FLAG_IMAGECOLOR, null, null, null, null, Theme.key_windowBackgroundWhiteGrayText2)); + arrayList.add(new ThemeDescription(forwardNoQuoteItem, ThemeDescription.FLAG_BACKGROUNDFILTER, null, null, null, null, Theme.key_actionBarActionModeDefaultSelector)); + } if (forwardItem != null) { arrayList.add(new ThemeDescription(forwardItem.getIconView(), ThemeDescription.FLAG_IMAGECOLOR, null, null, null, null, Theme.key_windowBackgroundWhiteGrayText2)); arrayList.add(new ThemeDescription(forwardItem, ThemeDescription.FLAG_BACKGROUNDFILTER, null, null, null, null, Theme.key_actionBarActionModeDefaultSelector)); diff --git a/TMessagesProj/src/main/java/org/telegram/ui/MediaActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/MediaActivity.java index ad20e9c8b..86404a529 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/MediaActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/MediaActivity.java @@ -271,6 +271,7 @@ public class MediaActivity extends BaseFragment implements NotificationCenter.No private SharedMediaLayout.SharedMediaData[] sharedMediaData = new SharedMediaLayout.SharedMediaData[6]; private final static int forward = 3; + private final static int forward_noquote = 93; private final static int delete = 4; private final static int gotochat = 7; @@ -422,7 +423,7 @@ public class MediaActivity extends BaseFragment implements NotificationCenter.No actionBar.closeSearchField(); cantDeleteMessagesCount = 0; }); - } else if (id == forward) { + } else if (id == forward || id == forward_noquote) { Bundle args = new Bundle(); args.putBoolean("onlySelect", true); args.putInt("dialogsType", 3); @@ -452,7 +453,13 @@ public class MediaActivity extends BaseFragment implements NotificationCenter.No if (message != null) { SendMessagesHelper.getInstance(currentAccount).sendMessage(message.toString(), did, null, null, true, null, null, null, true, 0); } - SendMessagesHelper.getInstance(currentAccount).sendMessage(fmessages, did, true, 0); + if (id == forward_noquote) { + for (MessageObject object : fmessages) { + SendMessagesHelper.getInstance(currentAccount).processForwardFromMyName(object, did, true, true, 0); + } + } else { + SendMessagesHelper.getInstance(currentAccount).sendMessage(fmessages, did, true, 0); + } } fragment1.finishFragment(); } else { @@ -460,6 +467,9 @@ public class MediaActivity extends BaseFragment implements NotificationCenter.No int lower_part = (int) did; int high_part = (int) (did >> 32); Bundle args1 = new Bundle(); + if (id == forward_noquote) { + args1.putBoolean("forward_noquote", true); + } args1.putBoolean("scrollToTopOnResume", true); if (lower_part != 0) { if (lower_part > 0) { @@ -654,6 +664,7 @@ public class MediaActivity extends BaseFragment implements NotificationCenter.No if ((int) dialog_id != 0) { actionModeViews.add(gotoItem = actionMode.addItemWithWidth(gotochat, R.drawable.msg_message, AndroidUtilities.dp(54), LocaleController.getString("AccDescrGoToMessage", R.string.AccDescrGoToMessage))); + actionModeViews.add(actionMode.addItemWithWidth(forward_noquote, R.drawable.msg_forward_noquote, AndroidUtilities.dp(54), LocaleController.getString("NoQuoteForward", R.string.NoQuoteForward))); actionModeViews.add(actionMode.addItemWithWidth(forward, R.drawable.msg_forward, AndroidUtilities.dp(54), LocaleController.getString("Forward", R.string.Forward))); } actionModeViews.add(actionMode.addItemWithWidth(delete, R.drawable.msg_delete, AndroidUtilities.dp(54), LocaleController.getString("Delete", R.string.Delete))); diff --git a/TMessagesProj/src/main/java/org/telegram/ui/PhotoViewer.java b/TMessagesProj/src/main/java/org/telegram/ui/PhotoViewer.java index 12858e7ed..04fc9302e 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/PhotoViewer.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/PhotoViewer.java @@ -223,6 +223,7 @@ public class PhotoViewer implements NotificationCenter.NotificationCenterDelegat private TextView docInfoTextView; private ActionBarMenuItem menuItem; private ActionBarMenuSubItem allMediaItem; + private ActionBarMenuItem sendNoQuoteItem; private ActionBarMenuItem sendItem; private ActionBarMenuItem pipItem; private ActionBarMenuItem masksItem; @@ -691,6 +692,7 @@ public class PhotoViewer implements NotificationCenter.NotificationCenterDelegat private final static int gallery_menu_save = 1; private final static int gallery_menu_showall = 2; private final static int gallery_menu_send = 3; + private final static int gallery_menu_send_noquote = 93; private final static int gallery_menu_showinchat = 4; private final static int gallery_menu_pip = 5; private final static int gallery_menu_delete = 6; @@ -2176,7 +2178,7 @@ public class PhotoViewer implements NotificationCenter.NotificationCenterDelegat launchActivity.presentFragment(new ChatActivity(args), remove, true); currentMessageObject = null; closePhoto(false, false); - } else if (id == gallery_menu_send) { + } else if (id == gallery_menu_send || id == gallery_menu_send_noquote) { if (currentMessageObject == null || parentActivity == null) { return; } @@ -2194,7 +2196,13 @@ public class PhotoViewer implements NotificationCenter.NotificationCenterDelegat if (message != null) { SendMessagesHelper.getInstance(currentAccount).sendMessage(message.toString(), did, null, null, true, null, null, null, true, 0); } - SendMessagesHelper.getInstance(currentAccount).sendMessage(fmessages, did, true, 0); + if (id == gallery_menu_send_noquote) { + for (MessageObject object : fmessages) { + SendMessagesHelper.getInstance(currentAccount).processForwardFromMyName(object, did, true, true, 0); + } + } else { + SendMessagesHelper.getInstance(currentAccount).sendMessage(fmessages, did, true, 0); + } } fragment1.finishFragment(); } else { @@ -2202,6 +2210,9 @@ public class PhotoViewer implements NotificationCenter.NotificationCenterDelegat int lower_part = (int) did; int high_part = (int) (did >> 32); Bundle args1 = new Bundle(); + if (id == gallery_menu_send_noquote) { + args1.putBoolean("forward_noquote", true); + } args1.putBoolean("scrollToTopOnResume", true); if (lower_part != 0) { if (lower_part > 0) { @@ -2445,6 +2456,7 @@ public class PhotoViewer implements NotificationCenter.NotificationCenterDelegat masksItem = menu.addItem(gallery_menu_masks, R.drawable.msg_mask); pipItem = menu.addItem(gallery_menu_pip, R.drawable.ic_goinline); + sendNoQuoteItem = menu.addItem(gallery_menu_send_noquote, R.drawable.msg_forward_noquote); sendItem = menu.addItem(gallery_menu_send, R.drawable.msg_forward); menuItem = menu.addItem(0, R.drawable.ic_ab_other); @@ -2459,6 +2471,7 @@ public class PhotoViewer implements NotificationCenter.NotificationCenterDelegat menuItem.addSubItem(gallery_menu_delete, R.drawable.msg_delete, LocaleController.getString("Delete", R.string.Delete)).setColors(0xfffafafa, 0xfffafafa); menuItem.addSubItem(gallery_menu_cancel_loading, R.drawable.msg_cancel, LocaleController.getString("StopDownload", R.string.StopDownload)).setColors(0xfffafafa, 0xfffafafa); menuItem.redrawPopup(0xf9222222); + sendNoQuoteItem.setContentDescription(LocaleController.getString("NoQuoteForward", R.string.NoQuoteForward)); sendItem.setContentDescription(LocaleController.getString("Forward", R.string.Forward)); bottomLayout = new FrameLayout(actvityContext); @@ -5663,6 +5676,7 @@ public class PhotoViewer implements NotificationCenter.NotificationCenterDelegat sharedMediaType = MediaDataController.MEDIA_PHOTOVIDEO; allMediaItem.setText(LocaleController.getString("ShowAllMedia", R.string.ShowAllMedia)); menuItem.setVisibility(View.VISIBLE); + sendNoQuoteItem.setVisibility(View.GONE); sendItem.setVisibility(View.GONE); pipItem.setVisibility(View.GONE); cameraItem.setVisibility(View.GONE); @@ -5787,12 +5801,14 @@ public class PhotoViewer implements NotificationCenter.NotificationCenterDelegat needSearchImageInArr = false; } else if (currentAnimation != null) { needSearchImageInArr = false; + sendNoQuoteItem.setVisibility(View.VISIBLE); sendItem.setVisibility(View.VISIBLE); } else if (!messageObject.scheduled && !(messageObject.messageOwner.media instanceof TLRPC.TL_messageMediaInvoice) && !(messageObject.messageOwner.media instanceof TLRPC.TL_messageMediaWebPage) && (messageObject.messageOwner.action == null || messageObject.messageOwner.action instanceof TLRPC.TL_messageActionEmpty)) { needSearchImageInArr = true; imagesByIds[0].put(messageObject.getId(), messageObject); menuItem.showSubItem(gallery_menu_showinchat); menuItem.showSubItem(gallery_menu_showall); + sendNoQuoteItem.setVisibility(View.VISIBLE); sendItem.setVisibility(View.VISIBLE); } setImageIndex(0, true); @@ -5837,6 +5853,7 @@ public class PhotoViewer implements NotificationCenter.NotificationCenterDelegat if (!openingObject.scheduled) { opennedFromMedia = true; menuItem.showSubItem(gallery_menu_showinchat); + sendNoQuoteItem.setVisibility(View.VISIBLE); sendItem.setVisibility(View.VISIBLE); if (openingObject.canPreviewDocument()) { sharedMediaType = MediaDataController.MEDIA_FILE; @@ -6121,6 +6138,7 @@ public class PhotoViewer implements NotificationCenter.NotificationCenterDelegat actionBar.setTitle(LocaleController.getString("AttachDocument", R.string.AttachDocument)); } if ((int) currentDialogId == 0) { + sendNoQuoteItem.setVisibility(View.GONE); sendItem.setVisibility(View.GONE); } if (newMessageObject.messageOwner.ttl != 0 && newMessageObject.messageOwner.ttl < 60 * 60) { diff --git a/TMessagesProj/src/main/res/drawable-hdpi/msg_forward.png b/TMessagesProj/src/main/res/drawable-hdpi/msg_forward.png index 5ace7ef56126fc3a02dbae73a90f8b8338b17b35..20c2845fdb265ad1bc269a80f1ba06ab7e04582c 100644 GIT binary patch literal 944 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 Y1Bj6(SqOoxf&c&j07*qoM6N<$f}J6d#sB~S diff --git a/TMessagesProj/src/main/res/drawable-mdpi/msg_forward_noquote.png b/TMessagesProj/src/main/res/drawable-mdpi/msg_forward_noquote.png new file mode 100644 index 0000000000000000000000000000000000000000..b89bc498348346514baa7c43889484de85df6c78 GIT binary patch literal 353 zcmV-n0iOPeP)xie~!@IfZ9(#Gr%Kooj(X6^k!rRiPcc=)mwEc&nZM7 z20>l)12^jAPaAyJax}S8Cw{{qtJP@IQpfWKRZDIHwc?h@2rs|}unt@T3n7HNstK0V z3$?AjCDfDOIOx`__wd;P)_@1#6nHI}AVUWj0p{a(t9V|WjeVS}qkZh*DDpO|mb@J= zPA3Wvsb`V1m6D47;iC;5ZsIE5z&SVHDphd&y-HEJGIWF<>89DZ7|Y zQ7u-%-|7o(U@j)86!{6BBe^P?q=*mj9{{`qh><2)2!XAF00000NkvXXu0mjf83B^5 literal 0 HcmV?d00001 diff --git a/TMessagesProj/src/main/res/drawable-mdpi/msg_forward_quote.png b/TMessagesProj/src/main/res/drawable-mdpi/msg_forward_quote.png deleted file mode 100644 index d46c19b9d979426ce174c21303e11753f86e02ec..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 744 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x}o+VD!!mi71Ki^|4CM&(%vz$xlkv ztH>-n*TA>HIW;5GqpB!1xXLdi zxhgx^GDXSWj?1RP3TQxXYDuC(MQ%=Bu~mhw64+cTAR8pCucQE0Qj%?}lpi<;HsXMd|v6mX?(+s^z9xYV0^eyS3Sucxiiw+84=$cF6~;<)t{i$tj?meAobkD$lcSL;5$}^sTo=m`@)tF5vsp z*nMY9m!D_botb61yLC^kVpza*rQztE9-$hh_i6Qxf%iKg!o0&S#yuZ|6z4LRD$@6`U-U^;?g$|mZox5*IYsh?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&% zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3 z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}!BPbD zzk=sFD+UIp37#&FAsLNtXV_+lIEoyvpRUm~!RgRKCoNA!p@0Aj$BtIcI+3h}KN!U_ z*Ij#+vqiY4BWb2mg8GVx41q;TClXa1H=44sNPl(c)R5TuNB5audtv$ev@-qK2mU4O zxLH~J{@(wydv4xsZfa^W_0>G7p?PkL^a`f<#_qmc>45Hytif8UZBo5UR+NSQuXuH1 z73a1P-99^i-{cu@w#_Wg2{znT({bWRtoC73{@J(7JZ{Z8%JqY5!_6m&n{V5B@_MdU z&Gpniu)X7LJ)|7_A;*Lrj@Z_<9GF)1fm&~DjW%X}5ywsj5p zg6WQ;JMv@SA6b)Rc_dPfY1VIEx7y6Qt4fZ(1U2^T(<_U4VE8%2kJ2KroS=Sz~jT zH{KSNV9H}=-?MoFZ*yT=9t#gczk#{*?8-Bn(p`l&$7-GX!SuoAL~{0RAIsB`(@UJ5 z{W!g=Lw)Z3D*em|O}~YL#~%uN{(fXl3Y1{U<3z_sR`A*w%{hKBH=Xltsf9E(w z4YDow-dp_Ot%~O*e$VPVl?$2dqWk*4D*QO@_kq`Q>WZBUnZ$ITw;S{QYZCr5Y02Nh z&yQbxvADbC*WbjLo4uD%ClZ z_!+ma`6qd1b&A14|HYXzj{MpBiL+wnHDDk!$fZ18aak-X|LbO(R-?nq+5W_9gf;jv oWgRd-GwFJ@yq_Z&9K7|2Us%4nGx^EOP*BG9boFyt=akR{06Z6_+W-In delta 594 zcmV-Y0sJmUoY%bflDtcw zvG;)=Bzd{Z_mjNKB_R+91OkCF6IIGCsVJ>B;4bhI7&eDW(|;(6lA~_%oh}9UfS!1_ zy};G95=k^QK%m81z7k&z|Cql}L3LEpC;iQxTF1&vfdZzwC4F%uZk9>FRIj9EN8);! z1WffwT5%+aD{bdp`H6UrtkvLyX zAnT(<2XF@H1%JALUD;1fO`4nub`3ZdMbUgx!?ceQX1^Q25YSpc=xQ_r{XlMk9l#WD zYQrM0=V_%M(g=(=;lBa1zysi;=b-JtEnvH~?KW^fb5HT0>UIXz3rSrC4d5e^J~)%w zXuWr#X{)n$k`5OXzEjeBC;Ygis9u3rR)@m{g>RR%odhP&}pqd0nX(KPey^Sc@B`kerwY+;B-7W=Asc_ zB`yJPflEj644*qZ4f-zh95~>svqoG2ul&~ni`JcI3HZE0nKDsr3@iWxz;R&gAIu&I gYsJmUoY%bflDtcwvG;)=Bzd{Z_mjNKB_R+91OkCF6IIGC zsVJ>B;4bhI7&eDW(Afn7>d#byU(P z{mq?P$I48B0;akpeQ_jimPx==ucT#1;(D0`O!Y}xaU`ylNx;-eN#8AjUy?4DNx;-u zNvn>;V3`C=U6l0Gk}%8tWfCwoAZg8!IA2X5>!U;ma0ciFx`18TPfbmloC$UfI2J|G zd{V=-j}m6T8^93IT0rP(Gz0xWZh;-Z6mV+8BCqFZr61A=j5y)H0kgmZ;G^fD?Z7Qy zyS42$a6fZT@u2E<2Gt8mT?Gx`Ba%KiliFy#ccE#kvv-mX7Zkoz(t9WTxTL6Ffmc?C z!v%$Jm$c-BpRmK%Bk*T-{1IPb-{B8RT6DrsN@{lZ%_FeY>ePtr^c;Slq&H6ZnWXS} z1x`4f@AeqJP10+p|GD_2CAO(VwO7h*HP-X82Y3t|vf4icE&!`p`^@rA?CUedG|*|S zKLO6=2~S3WuXzrTzsvqoG2ul&~n zi`JcI3HZE0nKDsr3@iWxz;R&gAIu&IY?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&% zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3 z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}!BPbD zzk=sFD+UIp37#&FAsLNtXV_+lIEoyvpRUm~!RgRKCoNA!p@0Aj$BtIcI+3h}KN!U_ z*Ij#+vqiY4BWb2mg8GVx41q;TClXa1H=44sNPl(c)R5TuNB5audtv$ev@-qK2mU4O zxLH~J{@(wydv4xsZfa^W_0>G7p?PkL^a`f<#_qmc>45Hytif8UZBo5UR+NSQuXuH1 z73a1P-99^i-{cu@w#_Wg2{znT({bWRtoC73{@J(7JZ{Z8%JqY5!_6m&n{V5B@_MdU z&Gpniu)X7LJ)|7_A;*Lrj@Z_<9GF)1fm&~DjW%X}5ywsj5p zg6WQ;JMv@SA6b)Rc_dPfY1VIEx7y6Qt4fZ(1U2^T(<_U4VE8%2kJ2KroS=Sz~jT zH{KSNV9H}=-?MoFZ*yT=9t#gczk#{*?8-Bn(p`l&$7-GX!SuoAL~{0RAIsB`(@UJ5 z{W!g=Lw)Z3D*em|O}~YL#~%uN{(fXl3Y1{U<3z_sR`A*w%{hKBH=Xltsf9E(w z4YDow-dp_Ot%~O*e$VPVl?$2dqWk*4D*QO@_kq`Q>WZBUnZ$ITw;S{QYZCr5Y02Nh z&yQbxvADbC*WbjLo4uD%ClZ z_!+ma`6qd1b&A14|HYXzj{MpBiL+wnHDDk!$fZ18aak-X|LbO(R-?nq+5W_9gf;jv oWgRd-GwFJ@yq_Z&9K7|2Us%4nGx^EOP*BG9boFyt=akR{06Z6_+W-In diff --git a/TMessagesProj/src/main/res/drawable-xxhdpi/msg_forward.png b/TMessagesProj/src/main/res/drawable-xxhdpi/msg_forward.png index fe592c16d23dd832f70542f8ded2f9ad9b823411..f4318e2c92b1d9500a060f2e7d29b5f55288f152 100644 GIT binary patch delta 1373 zcmaFM_MU5kay_GWW=KRygs+cPa(=E}VoH8es$NBI0Rsrw*jE%JCTFLXC?ut(XXe=| zz2CiGNg*@ERw>-n*TA>HIW;5GqpB!1xXLdixhgx^GDXSWj?1RP3TQxXYDuC(MQ%=B zu~mhw64+cTAR8pCucQE0Qj%?}RPP9~Q6a)NK*2e`C{@8!&rCPj(AYx3+)~fb)Y8Jp zL`T8Mz|c(Jz*67PMAyL3%D~dfz)%4SlHCStb$zJptb>dwn`Z#B?VUc`sL;2 zdgaD?`9B_#Z{yNo@nihID@~xw>*&wN&y_XbznC0yx%!pl#@Q-= zFAGH1mwMR$czEcD!#^>mQlGaclNna9p4$HQ3yatCw%K#ER3|-l^(*!anrw1cDBAys zt;VX#on{*an*7x4N}}#xP8Yn{GsjDvwKXH@>XDzR$9J?#ZZuP4uxIvfyx(9ccizmG z!|~+4=V{%AnLLcQ8{!fK3s`47o!Mr-&~2leS)!ZiiTZi>zc4oQK6kc!$rmwiKbH>s zyQ*o1Hj=rP-N)?G4AjlmpO^5he79{$|L&dquSD)Me%HPJJo#CI{8r`5Mx47?*RaS% zzN=-5VOrLDZi`P7gIi46y2Q^N}>^4^6{mH?#bG0G!W|0Ucoug~EO+K8z-JqW1P5I5M9Eury z1soC2XN8G>5SbCQGNfq#*Rb?U?2Xn_y!mF#dVA&Atht`&8O|}!H~m?2(dKYS-}TDI zv)2|FPYLHcU?=mW;-Z0*%n1p_e-pkeUQ#(pP1K_6?OBb-{&tIJtX~kRIn!?9me3&o z#-Mw$yN#Z_$?wT+Utm1VXTImJRrTCQ6f)i0<~X1HaiJ+~S<0ThAc5{n(96+(rXOIw&vHCUcy{j2Z|cjQRh$N@ZmRQ~^S^gu z@%n~MH6EvG7Ek^>Pi|&x=kZByDfe`?Oj*XA8uqHW$@to@1x_7JML_gHaLS*#z8BY9 zS~c}An0Vyp*9ojI!)jP+`+r_<{D1G?-)*w2T`thP2BtE5&8KY-a#9ZWzYQueJzf1= J);T3K0RYHuOWgnf delta 855 zcmV-d1E~D(3hf4vBYy)lNkl{K|v%ciipM! z6hZBx7_krqiD0E*X;4TC1x2w87D0&d10smA&?1#zh(RnZL_veW#3WA!r!eR2-tOJ( z?e69MU^s5}cHW!+&D?u$=TH#tWk*SkBDT&b${ct7iS8E($lZ=VW>*f z1J{6Gz)N6hro1yNDCKrVX7W))S}O4=3VGUMKY)2feIvjY;Bz?x*4h^P;OJWp3<3+2 zGMXoWjsagC{j01<3z9IJCxKoAJAvJ)p^lp}Y!&{b4=`OgOIX0Q!K&N{!@M zAnb3>5n$4BZ8y+sGw|feKqej54vWa7xak#<`f@Yr$Yfj~)7nL3DnO(=B2t*`0-1I~ zM5Y5ox=}3BY!t|}GXVk_x>caR?OcdRm*WWJvzlLIOMih@U=y&+N0?2B^FUXWYTk!H z=D}4DurJjq$HOF;&4ogtWe#c8tv!o@%o-=Yww7ITdl`F_uAx5?@p$A7Scw)Am5(4XnN=VCQ00&NB!1sv@> z1KI+Pg#M$}&gKmpfcpXBnDer|QN@W$o>tIW;Az0|^03`@u4CyyYHf>|v-#DI{#U?O z;9J}QYi)}yarC{jD<`%%QOT1)*NfhdSaH6j-~r zs8Gc)Uv*TV5~x5Wh$B$(|8UZN%uyBM2sBjm{&~*kS{88xIu1Mme%jZg8JdTpD2k#e hilQirq9}?1_ygvBn|_jTDQ^G(002ovPDHLkV1nb0lotR1 diff --git a/TMessagesProj/src/main/res/drawable-xxhdpi/msg_forward_noquote.png b/TMessagesProj/src/main/res/drawable-xxhdpi/msg_forward_noquote.png new file mode 100644 index 0000000000000000000000000000000000000000..fe592c16d23dd832f70542f8ded2f9ad9b823411 GIT binary patch literal 877 zcmV-z1CsoSP){K|v%ciipM!6hZBx7_krqiD0E*X;4TC1x2w87D0&d z10smA&?1#zh(RnZL_veW#3WA!r!eR2-tOJ(?e69MU^s5}cHW!+&D?u$=TH#tWk*SkBDT&b>p)aX9|VV)35Vks7llW*MMKZOJHfHyfZ5(<#t78@=-)uD)A`_ zdD>z>fO$oIBfu8mb2$Un+7|oZ=vxj90t=HenkRvd0bd>ctE@;1k}#SlfnEbUf$xrM zYkbk*aeI_uB`_i0&{&D%$q=l7r-81%yDfaFaR|BGL}by3`4+vn-djd zqS`&6$%mo53WWV(J_t-WuI&K&fW}IVZ_W{5(s6A!&}%dBKq&p%~nC$|Yc0xp^14Oz}EYfTg$h0#70vWnhpug>0h)9>? z2;{SxUt~*xR$vpb%tx3_i1R>Klxp6GK<2?!53n!QDaXSkn9YSkq2#w-X&%%Ke9D

We#c8tv!o@%o-=Yww7ITdl`F_uAx5?@p z$FPI8^l?4VpXt2kVl^uQZ3Z3%9PK;<+5(P*{-f5;<_#Nw`vKyZ^Rm5B#feIuR?u4D zX~6OFu-$g9W9dL@ZHt++`PGj8SHM=_TigL_ZHp~&^u4nyC$>0I$&*0Wi{6h|alWMF z&rAaHjcVpSb@o(ZR78d<{rg?5=Rsbm#V}uWRG<>5KqZJHQ1Sn8(tgZQ72*gqRP_FN z&gNPcaRfRJJOO^%*P|JlhoUHoq9}@@D2k#eiUIfo=6#!fl5i<+00000NkvXXu0mjf DO}vxk literal 0 HcmV?d00001 diff --git a/TMessagesProj/src/main/res/drawable-xxhdpi/msg_forward_quote.png b/TMessagesProj/src/main/res/drawable-xxhdpi/msg_forward_quote.png deleted file mode 100644 index f4318e2c92b1d9500a060f2e7d29b5f55288f152..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1391 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1|&n@Zgyv2VD!!mi71Ki^|4CM&(%vz$xlkv ztH>-n*TA>HIW;5GqpB!1xXLdi zxhgx^GDXSWj?1RP3TQxXYDuC(MQ%=Bu~mhw64+cTAR8pCucQE0Qj%?}lpi<;HsXMd|v6mX?azYY;HeIKbezbjbyw+^FW_pH`f{L7NN0-Nu@8_L0{cgQ_w`%6B zmoM-BS`fMG_x(`Q`&Tw+iz!X?P!Z~MIi@ap-NAF+!pn_}4-^Y5)VFczu=p|l-<2lN z<#qJuSpWDOZZm4+qR^C_fGy-BKH}; z>t27J{47C!tMX+d&Rwi)SmYw#)iT8}Eo(iu#ixnEtugdK^69~Y}Q=Q z^9<*h=bQelxoC4Zr0;rVwl6TA<}=^(*DCHK3YqS0bDU59xX_fg zEM?DLkU;mP>5}bN8@ER6SABf@RK?s22N%cB;|>jXv|D^b==4_Q1KRy2w+^N~(D-(~ zi0MYt<2lP!RsN>_EPEyvQ*7o@H7}^RP1W~ImE9JF+tIu4F+E)~O;RCePO;`}Zo6#5 z=q|?k!_QnrjU(sg>n*LC`WH+*^7HEi)|X*5EVcbVuQ&d`_wVmES=KHWXeI+wnZ4%I Wwg)*Whx^|Km6M*XelF{r5}E*AKuM_p