Make file selection dialog usable.

This commit is contained in:
B. Petersen
2017-02-20 20:43:18 +01:00
parent f2349a9bdd
commit a793ae52f9
3 changed files with 2 additions and 61 deletions
@@ -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 = "<media message>"; // 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;