diff --git a/MessengerProj/src/main/java/com/b44t/messenger/SendMessagesHelper.java b/MessengerProj/src/main/java/com/b44t/messenger/SendMessagesHelper.java index f97479a0a..c021c4cbf 100644 --- a/MessengerProj/src/main/java/com/b44t/messenger/SendMessagesHelper.java +++ b/MessengerProj/src/main/java/com/b44t/messenger/SendMessagesHelper.java @@ -438,8 +438,17 @@ public class SendMessagesHelper implements NotificationCenter.NotificationCenter { // SEND AUDIO int time_ms = 0; - if( params.get("mr_time_ms") != null ) { - time_ms = Integer.parseInt(params.get("mr_time_ms")); + if( params!=null && params.get("mr_time_ms") != null ) { + time_ms = Integer.parseInt(params.get("mr_time_ms")); // if possible, use a higher resolution + } + else { + for (int i = 0; i < document.attributes.size(); i++) { + TLRPC.DocumentAttribute a = document.attributes.get(i); + if (a instanceof TLRPC.TL_documentAttributeAudio) { + time_ms = a.duration * 1000; + break; + } + } } newMsg_id = mrChat.sendMedia( diff --git a/MessengerProj/src/main/java/com/b44t/ui/ChatActivity.java b/MessengerProj/src/main/java/com/b44t/ui/ChatActivity.java index 894c036db..0e1a3dbc8 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/ChatActivity.java +++ b/MessengerProj/src/main/java/com/b44t/ui/ChatActivity.java @@ -1944,6 +1944,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not else if (id == NotificationCenter.messageSendError) { chatAdapter.notifyDataSetChanged(); + AndroidUtilities.showErrorHint(getParentActivity()); } else if (id == NotificationCenter.contactsDidLoaded) { diff --git a/MessengerProj/src/main/java/com/b44t/ui/Components/ChatActivityEnterView.java b/MessengerProj/src/main/java/com/b44t/ui/Components/ChatActivityEnterView.java index 217522b25..db1edbc86 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/Components/ChatActivityEnterView.java +++ b/MessengerProj/src/main/java/com/b44t/ui/Components/ChatActivityEnterView.java @@ -98,7 +98,7 @@ public class ChatActivityEnterView extends FrameLayout implements NotificationCe public SeekBarWaveformView(Context context) { super(context); seekBarWaveform = new SeekBarWaveform(context); - seekBarWaveform.setColors(0xffa2cef8, 0xffffffff, 0xffa2cef8); + seekBarWaveform.setColors(0xffffffff, Theme.MSG_AUDIO_SEEKBAR_DARK_COLOR, 0xffffffff); seekBarWaveform.setDelegate(new SeekBar.SeekBarDelegate() { @Override public void onSeekBarDrag(float progress) { @@ -915,21 +915,8 @@ public class ChatActivityEnterView extends FrameLayout implements NotificationCe AnimatorSet.start(); } - private void sendMessage() { - if (parentFragment != null) { - String action; - TLRPC.Chat currentChat; - if ((int) dialog_id < 0) { - currentChat = MessagesController.getInstance().getChat(-(int) dialog_id); - /*if (currentChat != null && currentChat.participants_count > MessagesController.getInstance().groupBigSize) { - action = "bigchat_message"; - } else*/ { - action = "chat_message"; - } - } else { - action = "pm_message"; - } - } + private void sendMessage() + { if (audioToSend != null) { MessageObject playing = MediaController.getInstance().getPlayingMessageObject(); if (playing != null && playing == audioToSendMessageObject) { diff --git a/MessengerProj/src/main/java/com/b44t/ui/Components/SeekBarWaveform.java b/MessengerProj/src/main/java/com/b44t/ui/Components/SeekBarWaveform.java index 3d03789ca..84daaeeac 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/Components/SeekBarWaveform.java +++ b/MessengerProj/src/main/java/com/b44t/ui/Components/SeekBarWaveform.java @@ -162,7 +162,7 @@ public class SeekBarWaveform { float barCounter = 0; int nextBarNum = 0; - paintInner.setColor(messageObject != null && !messageObject.isOutOwner() && messageObject.isContentUnread() && messageObject.messageOwner.to_id.channel_id == 0 ? outerColor : (selected ? selectedColor : innerColor)); + paintInner.setColor(messageObject != null && !messageObject.isOutOwner() && messageObject.isContentUnread() ? outerColor : (selected ? selectedColor : innerColor)); paintOuter.setColor(outerColor); int y = (height - AndroidUtilities.dp(14)) / 2; diff --git a/MessengerProj/src/main/res/drawable-hdpi/recorded.9.png b/MessengerProj/src/main/res/drawable-hdpi/recorded.9.png deleted file mode 100644 index 5709cf575..000000000 Binary files a/MessengerProj/src/main/res/drawable-hdpi/recorded.9.png and /dev/null differ diff --git a/MessengerProj/src/main/res/drawable-mdpi/recorded.9.png b/MessengerProj/src/main/res/drawable-mdpi/recorded.9.png deleted file mode 100644 index efe1f2a7f..000000000 Binary files a/MessengerProj/src/main/res/drawable-mdpi/recorded.9.png and /dev/null differ diff --git a/MessengerProj/src/main/res/drawable-xhdpi/recorded.9.png b/MessengerProj/src/main/res/drawable-xhdpi/recorded.9.png index af215a34c..f5cce17d9 100644 Binary files a/MessengerProj/src/main/res/drawable-xhdpi/recorded.9.png and b/MessengerProj/src/main/res/drawable-xhdpi/recorded.9.png differ diff --git a/MessengerProj/src/main/res/drawable-xxhdpi/recorded.9.png b/MessengerProj/src/main/res/drawable-xxhdpi/recorded.9.png deleted file mode 100644 index 0c72100ab..000000000 Binary files a/MessengerProj/src/main/res/drawable-xxhdpi/recorded.9.png and /dev/null differ