From a793ae52f9be9b2552d9ba984e0fa05718dcaf32 Mon Sep 17 00:00:00 2001 From: "B. Petersen" Date: Mon, 20 Feb 2017 20:43:18 +0100 Subject: [PATCH] Make file selection dialog usable. --- .../com/b44t/messenger/MessageObject.java | 53 +------------------ .../com/b44t/ui/Cells/ChatMessageCell.java | 9 +--- .../main/java/com/b44t/ui/ChatActivity.java | 1 - 3 files changed, 2 insertions(+), 61 deletions(-) diff --git a/MessengerProj/src/main/java/com/b44t/messenger/MessageObject.java b/MessengerProj/src/main/java/com/b44t/messenger/MessageObject.java index 0288ecedf..ba7a8523f 100644 --- a/MessengerProj/src/main/java/com/b44t/messenger/MessageObject.java +++ b/MessengerProj/src/main/java/com/b44t/messenger/MessageObject.java @@ -92,47 +92,7 @@ public class MessageObject { messageOwner = message; - /*if (message.replyMessage != null) { - replyMessageObject = new MessageObject(message.replyMessage, users, chats, false); - }*/ - - if (!isMediaEmpty()) { - /*if (message.media instanceof TLRPC.TL_messageMediaPhoto) { - messageText = mContext.getString(R.string.AttachPhoto); - } else if (isVideo()) { - messageText = mContext.getString(R.string.AttachVideo); - } else if (isVoice()) { - messageText = mContext.getString(R.string.AttachAudio); - } else if (message.media instanceof TLRPC.TL_messageMediaGeo || message.media instanceof TLRPC.TL_messageMediaVenue) { - messageText = mContext.getString(R.string.AttachLocation); - } else if (message.media instanceof TLRPC.TL_messageMediaContact) { - messageText = mContext.getString(R.string.AttachContact); - } else if (message.media instanceof TLRPC.TL_messageMediaDocument) { - if (isSticker()) { - String sch = getStrickerChar(); - if (sch != null && sch.length() > 0) { - // @TODO: This needs plural handling. - messageText = String.format("%s %s", sch, mContext.getString(R.string.AttachSticker)); - } else { - messageText = mContext.getString(R.string.AttachSticker); - } - } else if (isMusic()) { - messageText = mContext.getString(R.string.AttachMusic); - } else if (isGif()) { - messageText = mContext.getString(R.string.AttachGif); - } else { - String name = FileLoader.getDocumentFileName(message.media.document); - if (name != null && name.length() > 0) { - messageText = name; - } else { - messageText = mContext.getString(R.string.AttachDocument); - } - } - }*/ - messageText = ""; // should not be displayed, use MrMsg.getSummarytext() instead - } else { - messageText = message.message; - } + messageText = message.message; if (messageText == null) { messageText = ""; } @@ -858,17 +818,6 @@ public class MessageObject { return null; } - public String getStrickerChar() { - if (messageOwner.media != null && messageOwner.media.document != null) { - for (TLRPC.DocumentAttribute attribute : messageOwner.media.document.attributes) { - if (attribute instanceof TLRPC.TL_documentAttributeSticker) { - return attribute.alt; - } - } - } - return null; - } - public boolean isSelectable() { if (type == 6 || type == 10 || type == 11) { return false; diff --git a/MessengerProj/src/main/java/com/b44t/ui/Cells/ChatMessageCell.java b/MessengerProj/src/main/java/com/b44t/ui/Cells/ChatMessageCell.java index 6230e0afc..e190ce2a3 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/Cells/ChatMessageCell.java +++ b/MessengerProj/src/main/java/com/b44t/ui/Cells/ChatMessageCell.java @@ -85,7 +85,6 @@ public class ChatMessageCell extends BaseCell implements SeekBar.SeekBarDelegate void didPressedCancelSendButton(ChatMessageCell cell); void didLongPressed(ChatMessageCell cell); void didPressedUrl(MessageObject messageObject, ClickableSpan url, boolean longPress); - //void needOpenWebView(String url, String title, String description, String originalUrl, int w, int h); void didPressedImage(ChatMessageCell cell); void didPressedShare(ChatMessageCell cell); void didPressedOther(ChatMessageCell cell); @@ -117,7 +116,6 @@ public class ChatMessageCell extends BaseCell implements SeekBar.SeekBarDelegate private RadialProgress radialProgress; private ImageReceiver photoImage; - private AvatarDrawable contactAvatarDrawable; private boolean disallowLongPress; @@ -357,7 +355,6 @@ public class ChatMessageCell extends BaseCell implements SeekBar.SeekBarDelegate replyImageReceiver = new ImageReceiver(this); TAG = MediaController.getInstance().generateObserverTag(); - contactAvatarDrawable = new AvatarDrawable(); photoImage = new ImageReceiver(this); photoImage.setDelegate(this); radialProgress = new RadialProgress(this); @@ -1165,11 +1162,7 @@ public class ChatMessageCell extends BaseCell implements SeekBar.SeekBarDelegate } else if (documentAttachType == DOCUMENT_ATTACH_TYPE_GIF) { if (buttonState == -1) { TLRPC.WebPage webPage = currentMessageObject.messageOwner.media.webpage; - /*if (Build.VERSION.SDK_INT >= 16 && webPage.embed_url != null && webPage.embed_url.length() != 0) { - delegate.needOpenWebView(webPage.embed_url, webPage.site_name, webPage.description, webPage.url, webPage.embed_width, webPage.embed_height); - } else*/ { - Browser.openUrl(getContext(), webPage.url); - } + Browser.openUrl(getContext(), webPage.url); } } } diff --git a/MessengerProj/src/main/java/com/b44t/ui/ChatActivity.java b/MessengerProj/src/main/java/com/b44t/ui/ChatActivity.java index 71d7ec7a5..549b9b511 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/ChatActivity.java +++ b/MessengerProj/src/main/java/com/b44t/ui/ChatActivity.java @@ -1277,7 +1277,6 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not FileLog.e("messenger", e); } } else if (which == ChatAttachAlert.ATTACH_BUTTON_IDX_FILE ) { - Toast.makeText(getParentActivity(), LocaleController.getString("NotYetImplemented", R.string.NotYetImplemented), Toast.LENGTH_SHORT).show(); if (Build.VERSION.SDK_INT >= 23 && getParentActivity().checkSelfPermission(Manifest.permission.READ_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) { getParentActivity().requestPermissions(new String[]{Manifest.permission.READ_EXTERNAL_STORAGE}, 4); return;