From 2c062d8d51a4789fa940d28ada4d5c0e4645fe51 Mon Sep 17 00:00:00 2001 From: "B. Petersen" Date: Mon, 27 Feb 2017 22:35:20 +0100 Subject: [PATCH] Select and send audio attachments via the music browser. --- .../java/com/b44t/messenger/SendMessagesHelper.java | 10 ++++------ .../java/com/b44t/ui/Cells/ChatMessageCell.java | 2 +- .../src/main/java/com/b44t/ui/ChatActivity.java | 13 +++++++++---- MessengerProj/src/main/res/values-de/strings.xml | 3 +-- MessengerProj/src/main/res/values-es/strings.xml | 1 - MessengerProj/src/main/res/values-fr/strings.xml | 1 - MessengerProj/src/main/res/values-it/strings.xml | 1 - MessengerProj/src/main/res/values-nl/strings.xml | 1 - MessengerProj/src/main/res/values-pl/strings.xml | 1 - MessengerProj/src/main/res/values-pt/strings.xml | 1 - MessengerProj/src/main/res/values/strings.xml | 1 - 11 files changed, 15 insertions(+), 20 deletions(-) diff --git a/MessengerProj/src/main/java/com/b44t/messenger/SendMessagesHelper.java b/MessengerProj/src/main/java/com/b44t/messenger/SendMessagesHelper.java index 697a4bd45..e1b13d5bb 100644 --- a/MessengerProj/src/main/java/com/b44t/messenger/SendMessagesHelper.java +++ b/MessengerProj/src/main/java/com/b44t/messenger/SendMessagesHelper.java @@ -746,7 +746,7 @@ public class SendMessagesHelper implements NotificationCenter.NotificationCenter prepareSendingDocuments(paths, originalPaths, uris, mine, dialog_id); } - public static void prepareSendingAudioDocuments(final ArrayList messageObjects, final long dialog_id) { + /*public static void prepareSendingAudioDocuments(final ArrayList messageObjects, final long dialog_id) { new Thread(new Runnable() { @Override public void run() { @@ -761,7 +761,7 @@ public class SendMessagesHelper implements NotificationCenter.NotificationCenter } TLRPC.TL_document document = null; - /*if (!isEncrypted)*/ { + if (!isEncrypted) { document = null;//(TLRPC.TL_document) MessagesStorage.getInstance().getSentFile(originalPath, !isEncrypted ? 1 : 4); } if (document == null) { @@ -782,7 +782,7 @@ public class SendMessagesHelper implements NotificationCenter.NotificationCenter } } }).start(); - } + }*/ public static void prepareSendingDocuments(final ArrayList paths, final ArrayList originalPaths, final ArrayList uris, final String mime, final long dialog_id) { if (paths == null && originalPaths == null && uris == null || paths != null && originalPaths != null && paths.size() != originalPaths.size()) { @@ -811,10 +811,8 @@ public class SendMessagesHelper implements NotificationCenter.NotificationCenter @Override public void run() { try { - Toast toast = Toast.makeText(ApplicationLoader.applicationContext, LocaleController.getString("UnsupportedAttachment", R.string.UnsupportedAttachment), Toast.LENGTH_SHORT); - toast.show(); + AndroidUtilities.showErrorHint(ApplicationLoader.applicationContext); // should not happen } catch (Exception e) { - FileLog.e("messenger", e); } } }); 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 a20209387..f41cd0ef1 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/Cells/ChatMessageCell.java +++ b/MessengerProj/src/main/java/com/b44t/ui/Cells/ChatMessageCell.java @@ -1207,7 +1207,7 @@ public class ChatMessageCell extends BaseCell implements SeekBar.SeekBarDelegate maxWidth = maxWidth - dp(86); - CharSequence stringFinal = TextUtils.ellipsize(messageObject.getMusicTitle().replace('\n', ' '), audioTitlePaint, maxWidth - dp(12), TextUtils.TruncateAt.END); + CharSequence stringFinal = TextUtils.ellipsize(messageObject.getMusicTitle().replace('\n', ' '), audioTitlePaint, maxWidth, TextUtils.TruncateAt.MIDDLE); songLayout = new StaticLayout(stringFinal, audioTitlePaint, maxWidth, Layout.Alignment.ALIGN_NORMAL, 1.0f, 0.0f, false); if (songLayout.getLineCount() > 0) { songX = -(int) Math.ceil(songLayout.getLineLeft(0)); diff --git a/MessengerProj/src/main/java/com/b44t/ui/ChatActivity.java b/MessengerProj/src/main/java/com/b44t/ui/ChatActivity.java index 617f0dfae..98082c0ee 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/ChatActivity.java +++ b/MessengerProj/src/main/java/com/b44t/ui/ChatActivity.java @@ -1291,8 +1291,14 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not AudioSelectActivity fragment = new AudioSelectActivity(); fragment.setDelegate(new AudioSelectActivity.AudioSelectActivityDelegate() { @Override - public void didSelectAudio(ArrayList audios) { - SendMessagesHelper.prepareSendingAudioDocuments(audios, dialog_id); + public void didSelectAudio(ArrayList messageObjects) { + ArrayList files = new ArrayList<>(); + int size = messageObjects.size(); + for (int a = 0; a < size; a++) { + MessageObject messageObject = messageObjects.get(a); + files.add(messageObject.messageOwner.attachPath); + } + SendMessagesHelper.prepareSendingDocuments(files, files, null, null, dialog_id); m_mrChat.cleanDraft(); } }); @@ -1669,8 +1675,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not if (getParentActivity() == null) { return; } - Toast toast = Toast.makeText(getParentActivity(), LocaleController.getString("UnsupportedAttachment", R.string.UnsupportedAttachment), Toast.LENGTH_SHORT); - toast.show(); + AndroidUtilities.showErrorHint(getParentActivity()); // should not happen } @Override diff --git a/MessengerProj/src/main/res/values-de/strings.xml b/MessengerProj/src/main/res/values-de/strings.xml index 65a9dd883..cbf64e5d8 100644 --- a/MessengerProj/src/main/res/values-de/strings.xml +++ b/MessengerProj/src/main/res/values-de/strings.xml @@ -55,9 +55,8 @@ WISCHEN UM ABZUBRECHEN In Downloads speichern GIF löschen? - Musik speichern + In Musik speichern Teilen - Nicht unterstützte Datei %1$s senden Zuletzt benutzte Emoji leeren? Auf Startbildschirm platzieren diff --git a/MessengerProj/src/main/res/values-es/strings.xml b/MessengerProj/src/main/res/values-es/strings.xml index 12c7e0b2a..118aa051a 100644 --- a/MessengerProj/src/main/res/values-es/strings.xml +++ b/MessengerProj/src/main/res/values-es/strings.xml @@ -54,7 +54,6 @@ ¿Eliminar GIF? Guardar en música Compartir - Adjunto no soportado Enviar %1$s ¿Borrar los emojis recientes? Añadir acceso directo diff --git a/MessengerProj/src/main/res/values-fr/strings.xml b/MessengerProj/src/main/res/values-fr/strings.xml index da32e6613..246b2f8c6 100644 --- a/MessengerProj/src/main/res/values-fr/strings.xml +++ b/MessengerProj/src/main/res/values-fr/strings.xml @@ -52,7 +52,6 @@ Supprimer GIF ? Enregistrer dans les musiques Partager - Pièce jointe non gérée Envoyer %1$s Vider les emokis récent ? Ajouter le widget à l\'écran d\'accueil diff --git a/MessengerProj/src/main/res/values-it/strings.xml b/MessengerProj/src/main/res/values-it/strings.xml index 72921c03a..d32c6799f 100644 --- a/MessengerProj/src/main/res/values-it/strings.xml +++ b/MessengerProj/src/main/res/values-it/strings.xml @@ -54,7 +54,6 @@ Eliminare GIF? Salva nella musica Condividi - Allegato non supportato Invia %1$s Cancellare le emoji recenti? Aggiungi scorciatoia diff --git a/MessengerProj/src/main/res/values-nl/strings.xml b/MessengerProj/src/main/res/values-nl/strings.xml index 28ac087ee..812c76d59 100644 --- a/MessengerProj/src/main/res/values-nl/strings.xml +++ b/MessengerProj/src/main/res/values-nl/strings.xml @@ -54,7 +54,6 @@ GIF verwijderen? Opslaan in muziek Delen - Bestandstype niet ondersteund %1$s versturen Recente emoji\'s wissen? Snelkoppeling toevoegen diff --git a/MessengerProj/src/main/res/values-pl/strings.xml b/MessengerProj/src/main/res/values-pl/strings.xml index 5ef7b11e3..337057a11 100644 --- a/MessengerProj/src/main/res/values-pl/strings.xml +++ b/MessengerProj/src/main/res/values-pl/strings.xml @@ -57,7 +57,6 @@ Usunąć GIFa? Zapisz w muzyce Udostępnij - Nieobsługiwany załącznik Wyślij %1$s Wyczyścić ostatnie emoji? Dodaj widget do ekranu głównego diff --git a/MessengerProj/src/main/res/values-pt/strings.xml b/MessengerProj/src/main/res/values-pt/strings.xml index 44e5ed4af..ea3f1bdbf 100644 --- a/MessengerProj/src/main/res/values-pt/strings.xml +++ b/MessengerProj/src/main/res/values-pt/strings.xml @@ -54,7 +54,6 @@ Apagar GIF? Salvar em músicas Compartilhar - Anexo não suportado Enviar %1$s Limpar emojis recentes? Adicionar atalho diff --git a/MessengerProj/src/main/res/values/strings.xml b/MessengerProj/src/main/res/values/strings.xml index dec25ab7f..4b62df3c9 100644 --- a/MessengerProj/src/main/res/values/strings.xml +++ b/MessengerProj/src/main/res/values/strings.xml @@ -57,7 +57,6 @@ Delete GIF? Save to music Share - Unsupported attachment Send %1$s Clear recent emoji? Add widget to home screen