diff --git a/pom.xml b/pom.xml index d47884c..e4917c0 100644 --- a/pom.xml +++ b/pom.xml @@ -11,10 +11,11 @@ UTF-8 UTF-8 - 4.5.2 - 2.4.3 + 4.5.3 + 2.4.4.5 20160810 - 6.0.4 + 1.10.2 + 6.0.5 @@ -51,7 +52,7 @@ org.jsoup jsoup - 1.9.2 + ${jsoup.version} @@ -139,6 +140,24 @@ + + org.apache.maven.plugins + maven-enforcer-plugin + 1.4.1 + + + enforce + + enforce + + + + + + + + + diff --git a/src/main/java/org/telegram/services/WeatherService.java b/src/main/java/org/telegram/services/WeatherService.java index 3c14824..421ac60 100644 --- a/src/main/java/org/telegram/services/WeatherService.java +++ b/src/main/java/org/telegram/services/WeatherService.java @@ -156,7 +156,7 @@ public class WeatherService { * @return userHash to be send to use * @note Forecast for the following 3 days */ - public String fetchWeatherForecastByLocation(Double longitude, Double latitude, Integer userId, String language, String units) { + public String fetchWeatherForecastByLocation(Float longitude, Float latitude, Integer userId, String language, String units) { String cityFound; String responseToUser; try { @@ -236,7 +236,7 @@ public class WeatherService { * @return userHash to be send to use * @note Forecast for the following 3 days */ - public String fetchWeatherCurrentByLocation(Double longitude, Double latitude, Integer userId, String language, String units) { + public String fetchWeatherCurrentByLocation(Float longitude, Float latitude, Integer userId, String language, String units) { String cityFound; String responseToUser; try { diff --git a/src/main/java/org/telegram/updateshandlers/DirectionsHandlers.java b/src/main/java/org/telegram/updateshandlers/DirectionsHandlers.java index 4bb8b7c..28634f7 100644 --- a/src/main/java/org/telegram/updateshandlers/DirectionsHandlers.java +++ b/src/main/java/org/telegram/updateshandlers/DirectionsHandlers.java @@ -10,8 +10,8 @@ import org.telegram.telegrambots.api.methods.send.SendMessage; import org.telegram.telegrambots.api.objects.Message; import org.telegram.telegrambots.api.objects.Update; import org.telegram.telegrambots.api.objects.replykeyboard.ForceReplyKeyboard; -import org.telegram.telegrambots.api.objects.replykeyboard.ReplyKeyboardHide; import org.telegram.telegrambots.api.objects.replykeyboard.ReplyKeyboardMarkup; +import org.telegram.telegrambots.api.objects.replykeyboard.ReplyKeyboardRemove; import org.telegram.telegrambots.api.objects.replykeyboard.buttons.KeyboardRow; import org.telegram.telegrambots.bots.TelegramLongPollingBot; import org.telegram.telegrambots.exceptions.TelegramApiException; @@ -107,9 +107,9 @@ public class DirectionsHandlers extends TelegramLongPollingBot { List directions = DirectionsService.getInstance().getDirections(origin, destiny, language); SendMessage sendMessageRequest = new SendMessage(); sendMessageRequest.setChatId(message.getChatId()); - ReplyKeyboardHide replyKeyboardHide = new ReplyKeyboardHide(); - replyKeyboardHide.setSelective(true); - sendMessageRequest.setReplyMarkup(replyKeyboardHide); + ReplyKeyboardRemove replyKeyboardRemove = new ReplyKeyboardRemove(); + replyKeyboardRemove.setSelective(true); + sendMessageRequest.setReplyMarkup(replyKeyboardRemove); sendMessageRequest.setReplyToMessageId(message.getMessageId()); for (String direction : directions) { sendMessageRequest.setText(direction); @@ -253,9 +253,9 @@ public class DirectionsHandlers extends TelegramLongPollingBot { sendMessageRequest.setText(LocalisationService.getString("errorLanguage")); } sendMessageRequest.setReplyToMessageId(message.getMessageId()); - ReplyKeyboardHide replyKeyboardHide = new ReplyKeyboardHide(); - replyKeyboardHide.setSelective(true); - sendMessageRequest.setReplyMarkup(replyKeyboardHide); + ReplyKeyboardRemove replyKeyboardRemove = new ReplyKeyboardRemove(); + replyKeyboardRemove.setSelective(true); + sendMessageRequest.setReplyMarkup(replyKeyboardRemove); try { sendMessage(sendMessageRequest); languageMessages.remove(message.getFrom().getId()); diff --git a/src/main/java/org/telegram/updateshandlers/FilesHandlers.java b/src/main/java/org/telegram/updateshandlers/FilesHandlers.java index f16d528..444ddef 100644 --- a/src/main/java/org/telegram/updateshandlers/FilesHandlers.java +++ b/src/main/java/org/telegram/updateshandlers/FilesHandlers.java @@ -9,8 +9,8 @@ import org.telegram.telegrambots.api.methods.send.SendDocument; import org.telegram.telegrambots.api.methods.send.SendMessage; import org.telegram.telegrambots.api.objects.Message; import org.telegram.telegrambots.api.objects.Update; -import org.telegram.telegrambots.api.objects.replykeyboard.ReplyKeyboardHide; import org.telegram.telegrambots.api.objects.replykeyboard.ReplyKeyboardMarkup; +import org.telegram.telegrambots.api.objects.replykeyboard.ReplyKeyboardRemove; import org.telegram.telegrambots.api.objects.replykeyboard.buttons.KeyboardRow; import org.telegram.telegrambots.bots.TelegramLongPollingBot; import org.telegram.telegrambots.exceptions.TelegramApiException; @@ -127,8 +127,7 @@ public class FilesHandlers extends TelegramLongPollingBot { sendMessageRequest.setText(LocalisationService.getString("noFiles", language)); } sendMessageRequest.setChatId(message.getChatId()); - ReplyKeyboardHide replyKeyboardHide = new ReplyKeyboardHide(); - sendMessageRequest.setReplyMarkup(replyKeyboardHide); + sendMessageRequest.setReplyMarkup(new ReplyKeyboardRemove()); sendMessage(sendMessageRequest); } @@ -253,9 +252,9 @@ public class FilesHandlers extends TelegramLongPollingBot { sendMessageRequest.setText(LocalisationService.getString("errorLanguage")); } sendMessageRequest.setReplyToMessageId(message.getMessageId()); - ReplyKeyboardHide replyKeyboardHide = new ReplyKeyboardHide(); - replyKeyboardHide.setSelective(true); - sendMessageRequest.setReplyMarkup(replyKeyboardHide); + ReplyKeyboardRemove replyKeyboardRemove = new ReplyKeyboardRemove(); + replyKeyboardRemove.setSelective(true); + sendMessageRequest.setReplyMarkup(replyKeyboardRemove); sendMessage(sendMessageRequest); languageMessages.remove(message.getFrom().getId()); } diff --git a/src/main/java/org/telegram/updateshandlers/WeatherHandlers.java b/src/main/java/org/telegram/updateshandlers/WeatherHandlers.java index 6800c3c..00c0c41 100644 --- a/src/main/java/org/telegram/updateshandlers/WeatherHandlers.java +++ b/src/main/java/org/telegram/updateshandlers/WeatherHandlers.java @@ -14,8 +14,8 @@ import org.telegram.telegrambots.api.objects.Message; import org.telegram.telegrambots.api.objects.Update; import org.telegram.telegrambots.api.objects.replykeyboard.ForceReplyKeyboard; import org.telegram.telegrambots.api.objects.replykeyboard.ReplyKeyboard; -import org.telegram.telegrambots.api.objects.replykeyboard.ReplyKeyboardHide; import org.telegram.telegrambots.api.objects.replykeyboard.ReplyKeyboardMarkup; +import org.telegram.telegrambots.api.objects.replykeyboard.ReplyKeyboardRemove; import org.telegram.telegrambots.api.objects.replykeyboard.buttons.KeyboardRow; import org.telegram.telegrambots.bots.TelegramLongPollingBot; import org.telegram.telegrambots.exceptions.TelegramApiException; @@ -194,9 +194,9 @@ public class WeatherHandlers extends TelegramLongPollingBot { sendMessage.setReplyToMessageId(messageId); sendMessage.setText(Emoji.WAVING_HAND_SIGN.toString()); - ReplyKeyboardHide replyKeyboardHide = new ReplyKeyboardHide(); - replyKeyboardHide.setSelective(true); - sendMessage.setReplyMarkup(replyKeyboardHide); + ReplyKeyboardRemove replyKeyboardRemove = new ReplyKeyboardRemove(); + replyKeyboardRemove.setSelective(true); + sendMessage.setReplyMarkup(replyKeyboardRemove); sendMessage(sendMessage); DatabaseManager.getInstance().insertWeatherState(userId, chatId, STARTSTATE);