Browse Source

Update version 3.0

master
Ruben Bermudez 9 years ago
parent
commit
8cf7291343
  1. 7
      pom.xml
  2. 2
      src/main/java/org/telegram/updateshandlers/DirectionsHandlers.java
  3. 4
      src/main/java/org/telegram/updateshandlers/FilesHandlers.java
  4. 14
      src/main/java/org/telegram/updateshandlers/WeatherHandlers.java

7
pom.xml

@ -12,10 +12,11 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<httpcompontents.version>4.5.3</httpcompontents.version> <httpcompontents.version>4.5.3</httpcompontents.version>
<telegrambots.version>2.4.4.5</telegrambots.version> <telegrambots.version>3.0</telegrambots.version>
<json.version>20160810</json.version> <json.version>20160810</json.version>
<jsoup.version>1.10.2</jsoup.version> <jsoup.version>1.10.2</jsoup.version>
<mysql.version>6.0.5</mysql.version> <mysql.version>6.0.6</mysql.version>
<commonsio.version>2.5</commonsio.version>
</properties> </properties>
<dependencies> <dependencies>
@ -32,7 +33,7 @@
<dependency> <dependency>
<groupId>commons-io</groupId> <groupId>commons-io</groupId>
<artifactId>commons-io</artifactId> <artifactId>commons-io</artifactId>
<version>2.5</version> <version>${commonsio.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.httpcomponents</groupId> <groupId>org.apache.httpcomponents</groupId>

2
src/main/java/org/telegram/updateshandlers/DirectionsHandlers.java

@ -229,7 +229,7 @@ public class DirectionsHandlers extends TelegramLongPollingBot {
commands.add(commandRow); commands.add(commandRow);
} }
replyKeyboardMarkup.setResizeKeyboard(true); replyKeyboardMarkup.setResizeKeyboard(true);
replyKeyboardMarkup.setOneTimeKeyboad(true); replyKeyboardMarkup.setOneTimeKeyboard(true);
replyKeyboardMarkup.setKeyboard(commands); replyKeyboardMarkup.setKeyboard(commands);
replyKeyboardMarkup.setSelective(true); replyKeyboardMarkup.setSelective(true);
sendMessageRequest.setReplyMarkup(replyKeyboardMarkup); sendMessageRequest.setReplyMarkup(replyKeyboardMarkup);

4
src/main/java/org/telegram/updateshandlers/FilesHandlers.java

@ -156,7 +156,7 @@ public class FilesHandlers extends TelegramLongPollingBot {
commands.add(commandRow); commands.add(commandRow);
} }
replyKeyboardMarkup.setResizeKeyboard(true); replyKeyboardMarkup.setResizeKeyboard(true);
replyKeyboardMarkup.setOneTimeKeyboad(true); replyKeyboardMarkup.setOneTimeKeyboard(true);
replyKeyboardMarkup.setKeyboard(commands); replyKeyboardMarkup.setKeyboard(commands);
} }
sendMessageRequest.setReplyMarkup(replyKeyboardMarkup); sendMessageRequest.setReplyMarkup(replyKeyboardMarkup);
@ -232,7 +232,7 @@ public class FilesHandlers extends TelegramLongPollingBot {
commands.add(commandRow); commands.add(commandRow);
} }
replyKeyboardMarkup.setResizeKeyboard(true); replyKeyboardMarkup.setResizeKeyboard(true);
replyKeyboardMarkup.setOneTimeKeyboad(true); replyKeyboardMarkup.setOneTimeKeyboard(true);
replyKeyboardMarkup.setKeyboard(commands); replyKeyboardMarkup.setKeyboard(commands);
replyKeyboardMarkup.setSelective(true); replyKeyboardMarkup.setSelective(true);
sendMessageRequest.setReplyMarkup(replyKeyboardMarkup); sendMessageRequest.setReplyMarkup(replyKeyboardMarkup);

14
src/main/java/org/telegram/updateshandlers/WeatherHandlers.java

@ -908,7 +908,7 @@ public class WeatherHandlers extends TelegramLongPollingBot {
ReplyKeyboardMarkup replyKeyboardMarkup = new ReplyKeyboardMarkup(); ReplyKeyboardMarkup replyKeyboardMarkup = new ReplyKeyboardMarkup();
replyKeyboardMarkup.setSelective(true); replyKeyboardMarkup.setSelective(true);
replyKeyboardMarkup.setResizeKeyboard(true); replyKeyboardMarkup.setResizeKeyboard(true);
replyKeyboardMarkup.setOneTimeKeyboad(false); replyKeyboardMarkup.setOneTimeKeyboard(false);
List<KeyboardRow> keyboard = new ArrayList<>(); List<KeyboardRow> keyboard = new ArrayList<>();
KeyboardRow keyboardFirstRow = new KeyboardRow(); KeyboardRow keyboardFirstRow = new KeyboardRow();
@ -928,7 +928,7 @@ public class WeatherHandlers extends TelegramLongPollingBot {
ReplyKeyboardMarkup replyKeyboardMarkup = new ReplyKeyboardMarkup(); ReplyKeyboardMarkup replyKeyboardMarkup = new ReplyKeyboardMarkup();
replyKeyboardMarkup.setSelective(true); replyKeyboardMarkup.setSelective(true);
replyKeyboardMarkup.setResizeKeyboard(true); replyKeyboardMarkup.setResizeKeyboard(true);
replyKeyboardMarkup.setOneTimeKeyboad(false); replyKeyboardMarkup.setOneTimeKeyboard(false);
List<KeyboardRow> keyboard = new ArrayList<>(); List<KeyboardRow> keyboard = new ArrayList<>();
for (String languageName : LocalisationService.getSupportedLanguages().stream().map( for (String languageName : LocalisationService.getSupportedLanguages().stream().map(
@ -950,7 +950,7 @@ public class WeatherHandlers extends TelegramLongPollingBot {
ReplyKeyboardMarkup replyKeyboardMarkup = new ReplyKeyboardMarkup(); ReplyKeyboardMarkup replyKeyboardMarkup = new ReplyKeyboardMarkup();
replyKeyboardMarkup.setSelective(true); replyKeyboardMarkup.setSelective(true);
replyKeyboardMarkup.setResizeKeyboard(true); replyKeyboardMarkup.setResizeKeyboard(true);
replyKeyboardMarkup.setOneTimeKeyboad(false); replyKeyboardMarkup.setOneTimeKeyboard(false);
List<KeyboardRow> keyboard = new ArrayList<>(); List<KeyboardRow> keyboard = new ArrayList<>();
KeyboardRow row = new KeyboardRow(); KeyboardRow row = new KeyboardRow();
@ -971,7 +971,7 @@ public class WeatherHandlers extends TelegramLongPollingBot {
ReplyKeyboardMarkup replyKeyboardMarkup = new ReplyKeyboardMarkup(); ReplyKeyboardMarkup replyKeyboardMarkup = new ReplyKeyboardMarkup();
replyKeyboardMarkup.setSelective(true); replyKeyboardMarkup.setSelective(true);
replyKeyboardMarkup.setResizeKeyboard(true); replyKeyboardMarkup.setResizeKeyboard(true);
replyKeyboardMarkup.setOneTimeKeyboad(false); replyKeyboardMarkup.setOneTimeKeyboard(false);
List<KeyboardRow> keyboard = new ArrayList<>(); List<KeyboardRow> keyboard = new ArrayList<>();
KeyboardRow keyboardFirstRow = new KeyboardRow(); KeyboardRow keyboardFirstRow = new KeyboardRow();
@ -995,7 +995,7 @@ public class WeatherHandlers extends TelegramLongPollingBot {
ReplyKeyboardMarkup replyKeyboardMarkup = new ReplyKeyboardMarkup(); ReplyKeyboardMarkup replyKeyboardMarkup = new ReplyKeyboardMarkup();
replyKeyboardMarkup.setSelective(true); replyKeyboardMarkup.setSelective(true);
replyKeyboardMarkup.setResizeKeyboard(true); replyKeyboardMarkup.setResizeKeyboard(true);
replyKeyboardMarkup.setOneTimeKeyboad(true); replyKeyboardMarkup.setOneTimeKeyboard(true);
List<KeyboardRow> keyboard = new ArrayList<>(); List<KeyboardRow> keyboard = new ArrayList<>();
for (String recentWeather : DatabaseManager.getInstance().getRecentWeather(userId)) { for (String recentWeather : DatabaseManager.getInstance().getRecentWeather(userId)) {
@ -1027,7 +1027,7 @@ public class WeatherHandlers extends TelegramLongPollingBot {
ReplyKeyboardMarkup replyKeyboardMarkup = new ReplyKeyboardMarkup(); ReplyKeyboardMarkup replyKeyboardMarkup = new ReplyKeyboardMarkup();
replyKeyboardMarkup.setSelective(true); replyKeyboardMarkup.setSelective(true);
replyKeyboardMarkup.setResizeKeyboard(true); replyKeyboardMarkup.setResizeKeyboard(true);
replyKeyboardMarkup.setOneTimeKeyboad(true); replyKeyboardMarkup.setOneTimeKeyboard(true);
List<KeyboardRow> keyboard = new ArrayList<>(); List<KeyboardRow> keyboard = new ArrayList<>();
@ -1054,7 +1054,7 @@ public class WeatherHandlers extends TelegramLongPollingBot {
replyKeyboardMarkup = new ReplyKeyboardMarkup(); replyKeyboardMarkup = new ReplyKeyboardMarkup();
replyKeyboardMarkup.setSelective(true); replyKeyboardMarkup.setSelective(true);
replyKeyboardMarkup.setResizeKeyboard(true); replyKeyboardMarkup.setResizeKeyboard(true);
replyKeyboardMarkup.setOneTimeKeyboad(true); replyKeyboardMarkup.setOneTimeKeyboard(true);
List<KeyboardRow> keyboard = new ArrayList<>(); List<KeyboardRow> keyboard = new ArrayList<>();
for (String alertCityName: alertCitiesNames) { for (String alertCityName: alertCitiesNames) {

Loading…
Cancel
Save