From f7a1a489fe7989c7e99a96f3ad9c5c6b67225f91 Mon Sep 17 00:00:00 2001 From: Senderman Date: Sat, 7 Apr 2018 02:42:39 +0300 Subject: [PATCH] Now user can't send file with length of 4 sec or less --- .../com/annimon/voicyanski/MainController.java | 18 +++++++++++++----- src/main/resources/locales/Language.properties | 1 + .../resources/locales/Language_ru.properties | 1 + 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/annimon/voicyanski/MainController.java b/src/main/java/com/annimon/voicyanski/MainController.java index 6649379..f42d3f6 100644 --- a/src/main/java/com/annimon/voicyanski/MainController.java +++ b/src/main/java/com/annimon/voicyanski/MainController.java @@ -70,15 +70,23 @@ public class MainController implements Initializable { clipView.initPlayButtons(btnBackward, btnPlay, btnForward); clipView.setIconPlay(iconPlay); btnSend.setOnAction(event -> { - btnSend.setDisable(true); final ClipPartData data = new ClipPartData(); data.metadata = clipView.getMetadata(); data.startTime = clipView.getClipPartStart(); data.endTime = clipView.getClipPartEnd(); - CompletableFuture.completedFuture(data) - .thenApplyAsync(new OpusConvertTask()) - .thenApplyAsync(new SendTelegramVoiceTask()) - .handleAsync(this::handleVoiceSend); + if(data.endTime - data.startTime > 5.0) { + btnSend.setDisable(true); + CompletableFuture.completedFuture(data) + .thenApplyAsync(new OpusConvertTask()) + .thenApplyAsync(new SendTelegramVoiceTask()) + .handleAsync(this::handleVoiceSend); + } else { + Alert alert = new Alert(Alert.AlertType.ERROR); + alert.setTitle(Main.getResources().getString("error")); + alert.setHeaderText(null); + alert.setContentText(Main.getResources().getString("zero_file_length")); + alert.showAndWait(); + } }); } diff --git a/src/main/resources/locales/Language.properties b/src/main/resources/locales/Language.properties index 73174e6..ddf9260 100644 --- a/src/main/resources/locales/Language.properties +++ b/src/main/resources/locales/Language.properties @@ -17,3 +17,4 @@ unable_access_ffmpeg=Unable to access FFmpeg. Please install it or add to PATH e unable_fetch_metadata=Unable to fetch metadata unable_send_message=Unable to send message unable_build_waveform=Unable to build waveform +zero_file_length=Selected audio is too short! \ No newline at end of file diff --git a/src/main/resources/locales/Language_ru.properties b/src/main/resources/locales/Language_ru.properties index 095b8c0..a228e15 100644 --- a/src/main/resources/locales/Language_ru.properties +++ b/src/main/resources/locales/Language_ru.properties @@ -17,3 +17,4 @@ unable_access_ffmpeg=\u041d\u0435\u0442 \u0434\u043e\u0441\u0442\u0443\u043f\u04 unable_fetch_metadata=\u041d\u0435\u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u043f\u043e\u043b\u0443\u0447\u0438\u0442\u044c \u043c\u0435\u0442\u0430\u0434\u0430\u043d\u043d\u044b\u0435 unable_send_message=\u041d\u0435\u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u043e\u0442\u043f\u0440\u0430\u0432\u0438\u0442\u044c \u0441\u043e\u043e\u0431\u0449\u0435\u043d\u0438\u0435 unable_build_waveform=\u041d\u0435\u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u043f\u043e\u0441\u0442\u0440\u043e\u0438\u0442\u044c \u043e\u0441\u0446\u0438\u043b\u043e\u0433\u0440\u0430\u043c\u043c\u0443 +zero_file_length=\u0421\u043b\u0438\u0448\u043a\u043e\u043c \u043a\u043e\u0440\u043e\u0442\u043a\u0438\u0439 \u0432\u043e\u0439\u0441! \ No newline at end of file