From 56184ff44e5af0b1fd74a4efd93ca5e4a0340a19 Mon Sep 17 00:00:00 2001
From: Rubenlagus <rberlopez@gmail.com>
Date: Mon, 3 Oct 2016 12:17:56 +0200
Subject: [PATCH] 1. Update Version 2.4.0

---
 pom.xml                                       | 27 +++++--------------
 src/main/java/org/telegram/Main.java          | 11 ++++++--
 .../org/telegram/commands/HelloCommand.java   |  2 +-
 .../org/telegram/commands/HelpCommand.java    |  2 +-
 .../org/telegram/commands/StartCommand.java   |  2 +-
 .../org/telegram/commands/StopCommand.java    |  2 +-
 .../updateshandlers/ChannelHandlers.java      |  2 +-
 .../updateshandlers/CommandsHandler.java      |  2 +-
 .../updateshandlers/DirectionsHandlers.java   |  2 +-
 .../updateshandlers/FilesHandlers.java        |  7 +++--
 .../telegram/updateshandlers/RaeHandlers.java |  2 +-
 .../updateshandlers/TransifexHandlers.java    |  2 +-
 .../updateshandlers/WeatherHandlers.java      |  5 ++--
 13 files changed, 33 insertions(+), 35 deletions(-)

diff --git a/pom.xml b/pom.xml
index cf4cc74..f0294bc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,36 +4,23 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>BotApi</groupId>
-    <artifactId>org.telegram.botapi</artifactId>
+    <groupId>org.telegram</groupId>
+    <artifactId>botapi</artifactId>
     <version>2.1</version>
 
-    <repositories>
-        <repository>
-            <id>central</id>
-            <name>Maven Repository Switchboard</name>
-            <layout>default</layout>
-            <url>http://repo1.maven.org/maven2</url>
-        </repository>
-        <repository>
-            <id>jitpack.io</id>
-            <url>https://jitpack.io</url>
-        </repository>
-    </repositories>
-
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <httpcompontents.version>4.5.2</httpcompontents.version>
-        <telegrambots.version>v2.3.3.4</telegrambots.version>
-        <json.version>20160212</json.version>
-        <mysql.version>5.1.39</mysql.version>
+        <telegrambots.version>2.4.0</telegrambots.version>
+        <json.version>20160810</json.version>
+        <mysql.version>6.0.4</mysql.version>
     </properties>
 
     <dependencies>
         <dependency>
-            <groupId>com.github.rubenlagus</groupId>
-            <artifactId>TelegramBots</artifactId>
+            <groupId>org.telegram</groupId>
+            <artifactId>telegrambots</artifactId>
             <version>${telegrambots.version}</version>
         </dependency>
         <dependency>
diff --git a/src/main/java/org/telegram/Main.java b/src/main/java/org/telegram/Main.java
index f0ce3db..17576c1 100644
--- a/src/main/java/org/telegram/Main.java
+++ b/src/main/java/org/telegram/Main.java
@@ -1,10 +1,17 @@
 package org.telegram;
 
-import org.telegram.telegrambots.TelegramApiException;
 import org.telegram.telegrambots.TelegramBotsApi;
+import org.telegram.telegrambots.exceptions.TelegramApiException;
 import org.telegram.telegrambots.logging.BotLogger;
 import org.telegram.telegrambots.logging.BotsFileHandler;
-import org.telegram.updateshandlers.*;
+import org.telegram.updateshandlers.ChannelHandlers;
+import org.telegram.updateshandlers.CommandsHandler;
+import org.telegram.updateshandlers.DirectionsHandlers;
+import org.telegram.updateshandlers.FilesHandlers;
+import org.telegram.updateshandlers.RaeHandlers;
+import org.telegram.updateshandlers.TransifexHandlers;
+import org.telegram.updateshandlers.WeatherHandlers;
+import org.telegram.updateshandlers.WebHookExampleHandlers;
 
 import java.io.IOException;
 import java.util.logging.ConsoleHandler;
diff --git a/src/main/java/org/telegram/commands/HelloCommand.java b/src/main/java/org/telegram/commands/HelloCommand.java
index 765be27..41f3d94 100644
--- a/src/main/java/org/telegram/commands/HelloCommand.java
+++ b/src/main/java/org/telegram/commands/HelloCommand.java
@@ -1,12 +1,12 @@
 package org.telegram.commands;
 
 import org.telegram.database.DatabaseManager;
-import org.telegram.telegrambots.TelegramApiException;
 import org.telegram.telegrambots.api.methods.send.SendMessage;
 import org.telegram.telegrambots.api.objects.Chat;
 import org.telegram.telegrambots.api.objects.User;
 import org.telegram.telegrambots.bots.AbsSender;
 import org.telegram.telegrambots.bots.commands.BotCommand;
+import org.telegram.telegrambots.exceptions.TelegramApiException;
 import org.telegram.telegrambots.logging.BotLogger;
 
 /**
diff --git a/src/main/java/org/telegram/commands/HelpCommand.java b/src/main/java/org/telegram/commands/HelpCommand.java
index 13a14dc..129a583 100644
--- a/src/main/java/org/telegram/commands/HelpCommand.java
+++ b/src/main/java/org/telegram/commands/HelpCommand.java
@@ -1,13 +1,13 @@
 package org.telegram.commands;
 
 import org.telegram.database.DatabaseManager;
-import org.telegram.telegrambots.TelegramApiException;
 import org.telegram.telegrambots.api.methods.send.SendMessage;
 import org.telegram.telegrambots.api.objects.Chat;
 import org.telegram.telegrambots.api.objects.User;
 import org.telegram.telegrambots.bots.AbsSender;
 import org.telegram.telegrambots.bots.commands.BotCommand;
 import org.telegram.telegrambots.bots.commands.ICommandRegistry;
+import org.telegram.telegrambots.exceptions.TelegramApiException;
 import org.telegram.telegrambots.logging.BotLogger;
 
 /**
diff --git a/src/main/java/org/telegram/commands/StartCommand.java b/src/main/java/org/telegram/commands/StartCommand.java
index 2e4b477..1b1ffc6 100644
--- a/src/main/java/org/telegram/commands/StartCommand.java
+++ b/src/main/java/org/telegram/commands/StartCommand.java
@@ -1,12 +1,12 @@
 package org.telegram.commands;
 
 import org.telegram.database.DatabaseManager;
-import org.telegram.telegrambots.TelegramApiException;
 import org.telegram.telegrambots.api.methods.send.SendMessage;
 import org.telegram.telegrambots.api.objects.Chat;
 import org.telegram.telegrambots.api.objects.User;
 import org.telegram.telegrambots.bots.AbsSender;
 import org.telegram.telegrambots.bots.commands.BotCommand;
+import org.telegram.telegrambots.exceptions.TelegramApiException;
 import org.telegram.telegrambots.logging.BotLogger;
 
 /**
diff --git a/src/main/java/org/telegram/commands/StopCommand.java b/src/main/java/org/telegram/commands/StopCommand.java
index fcb94bc..826c8c5 100644
--- a/src/main/java/org/telegram/commands/StopCommand.java
+++ b/src/main/java/org/telegram/commands/StopCommand.java
@@ -1,12 +1,12 @@
 package org.telegram.commands;
 
 import org.telegram.database.DatabaseManager;
-import org.telegram.telegrambots.TelegramApiException;
 import org.telegram.telegrambots.api.methods.send.SendMessage;
 import org.telegram.telegrambots.api.objects.Chat;
 import org.telegram.telegrambots.api.objects.User;
 import org.telegram.telegrambots.bots.AbsSender;
 import org.telegram.telegrambots.bots.commands.BotCommand;
+import org.telegram.telegrambots.exceptions.TelegramApiException;
 import org.telegram.telegrambots.logging.BotLogger;
 
 /**
diff --git a/src/main/java/org/telegram/updateshandlers/ChannelHandlers.java b/src/main/java/org/telegram/updateshandlers/ChannelHandlers.java
index cdceb9b..ef14283 100644
--- a/src/main/java/org/telegram/updateshandlers/ChannelHandlers.java
+++ b/src/main/java/org/telegram/updateshandlers/ChannelHandlers.java
@@ -1,13 +1,13 @@
 package org.telegram.updateshandlers;
 
 import org.telegram.BotConfig;
-import org.telegram.telegrambots.TelegramApiException;
 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.ReplyKeyboardMarkup;
 import org.telegram.telegrambots.bots.TelegramLongPollingBot;
+import org.telegram.telegrambots.exceptions.TelegramApiException;
 import org.telegram.telegrambots.logging.BotLogger;
 
 import java.io.InvalidObjectException;
diff --git a/src/main/java/org/telegram/updateshandlers/CommandsHandler.java b/src/main/java/org/telegram/updateshandlers/CommandsHandler.java
index 8824efc..dadd33a 100644
--- a/src/main/java/org/telegram/updateshandlers/CommandsHandler.java
+++ b/src/main/java/org/telegram/updateshandlers/CommandsHandler.java
@@ -7,11 +7,11 @@ import org.telegram.commands.StartCommand;
 import org.telegram.commands.StopCommand;
 import org.telegram.database.DatabaseManager;
 import org.telegram.services.Emoji;
-import org.telegram.telegrambots.TelegramApiException;
 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.bots.TelegramLongPollingCommandBot;
+import org.telegram.telegrambots.exceptions.TelegramApiException;
 import org.telegram.telegrambots.logging.BotLogger;
 
 /**
diff --git a/src/main/java/org/telegram/updateshandlers/DirectionsHandlers.java b/src/main/java/org/telegram/updateshandlers/DirectionsHandlers.java
index 3908638..9bd4c51 100644
--- a/src/main/java/org/telegram/updateshandlers/DirectionsHandlers.java
+++ b/src/main/java/org/telegram/updateshandlers/DirectionsHandlers.java
@@ -6,7 +6,6 @@ import org.telegram.Commands;
 import org.telegram.database.DatabaseManager;
 import org.telegram.services.DirectionsService;
 import org.telegram.services.LocalisationService;
-import org.telegram.telegrambots.TelegramApiException;
 import org.telegram.telegrambots.api.methods.BotApiMethod;
 import org.telegram.telegrambots.api.methods.send.SendMessage;
 import org.telegram.telegrambots.api.objects.Message;
@@ -16,6 +15,7 @@ import org.telegram.telegrambots.api.objects.replykeyboard.ReplyKeyboardHide;
 import org.telegram.telegrambots.api.objects.replykeyboard.ReplyKeyboardMarkup;
 import org.telegram.telegrambots.api.objects.replykeyboard.buttons.KeyboardRow;
 import org.telegram.telegrambots.bots.TelegramLongPollingBot;
+import org.telegram.telegrambots.exceptions.TelegramApiException;
 import org.telegram.telegrambots.logging.BotLogger;
 import org.telegram.telegrambots.updateshandlers.SentCallback;
 
diff --git a/src/main/java/org/telegram/updateshandlers/FilesHandlers.java b/src/main/java/org/telegram/updateshandlers/FilesHandlers.java
index 702ce81..84e6a90 100644
--- a/src/main/java/org/telegram/updateshandlers/FilesHandlers.java
+++ b/src/main/java/org/telegram/updateshandlers/FilesHandlers.java
@@ -5,7 +5,6 @@ import org.telegram.Commands;
 import org.telegram.database.DatabaseManager;
 import org.telegram.services.Emoji;
 import org.telegram.services.LocalisationService;
-import org.telegram.telegrambots.TelegramApiException;
 import org.telegram.telegrambots.api.methods.send.SendDocument;
 import org.telegram.telegrambots.api.methods.send.SendMessage;
 import org.telegram.telegrambots.api.objects.Message;
@@ -14,6 +13,8 @@ import org.telegram.telegrambots.api.objects.replykeyboard.ReplyKeyboardHide;
 import org.telegram.telegrambots.api.objects.replykeyboard.ReplyKeyboardMarkup;
 import org.telegram.telegrambots.api.objects.replykeyboard.buttons.KeyboardRow;
 import org.telegram.telegrambots.bots.TelegramLongPollingBot;
+import org.telegram.telegrambots.exceptions.TelegramApiException;
+import org.telegram.telegrambots.exceptions.TelegramApiRequestException;
 import org.telegram.telegrambots.logging.BotLogger;
 
 import java.io.InvalidObjectException;
@@ -48,12 +49,14 @@ public class FilesHandlers extends TelegramLongPollingBot {
             if (update.hasMessage()) {
                 try {
                     handleFileUpdate(update);
-                } catch (TelegramApiException e) {
+                } catch (TelegramApiRequestException e) {
                     if (e.getApiResponse().contains("Bot was blocked by the user")) {
                         if (update.getMessage().getFrom() != null) {
                             DatabaseManager.getInstance().deleteUserForFile(update.getMessage().getFrom().getId());
                         }
                     }
+                } catch (Exception e) {
+                    BotLogger.severe(LOGTAG, e);
                 }
             }
         } catch (Exception e) {
diff --git a/src/main/java/org/telegram/updateshandlers/RaeHandlers.java b/src/main/java/org/telegram/updateshandlers/RaeHandlers.java
index 8a1f004..1c50fc8 100644
--- a/src/main/java/org/telegram/updateshandlers/RaeHandlers.java
+++ b/src/main/java/org/telegram/updateshandlers/RaeHandlers.java
@@ -2,7 +2,6 @@ package org.telegram.updateshandlers;
 
 import org.telegram.BotConfig;
 import org.telegram.services.RaeService;
-import org.telegram.telegrambots.TelegramApiException;
 import org.telegram.telegrambots.api.methods.AnswerInlineQuery;
 import org.telegram.telegrambots.api.methods.send.SendMessage;
 import org.telegram.telegrambots.api.objects.Message;
@@ -12,6 +11,7 @@ import org.telegram.telegrambots.api.objects.inlinequery.inputmessagecontent.Inp
 import org.telegram.telegrambots.api.objects.inlinequery.result.InlineQueryResult;
 import org.telegram.telegrambots.api.objects.inlinequery.result.InlineQueryResultArticle;
 import org.telegram.telegrambots.bots.TelegramLongPollingBot;
+import org.telegram.telegrambots.exceptions.TelegramApiException;
 import org.telegram.telegrambots.logging.BotLogger;
 
 import java.util.ArrayList;
diff --git a/src/main/java/org/telegram/updateshandlers/TransifexHandlers.java b/src/main/java/org/telegram/updateshandlers/TransifexHandlers.java
index 4f780e4..756d612 100644
--- a/src/main/java/org/telegram/updateshandlers/TransifexHandlers.java
+++ b/src/main/java/org/telegram/updateshandlers/TransifexHandlers.java
@@ -6,7 +6,6 @@ import org.telegram.Commands;
 import org.telegram.database.DatabaseManager;
 import org.telegram.services.LocalisationService;
 import org.telegram.services.TransifexService;
-import org.telegram.telegrambots.TelegramApiException;
 import org.telegram.telegrambots.api.methods.send.SendDocument;
 import org.telegram.telegrambots.api.methods.send.SendMessage;
 import org.telegram.telegrambots.api.objects.Message;
@@ -14,6 +13,7 @@ import org.telegram.telegrambots.api.objects.Update;
 import org.telegram.telegrambots.api.objects.replykeyboard.InlineKeyboardMarkup;
 import org.telegram.telegrambots.api.objects.replykeyboard.buttons.InlineKeyboardButton;
 import org.telegram.telegrambots.bots.TelegramLongPollingBot;
+import org.telegram.telegrambots.exceptions.TelegramApiException;
 import org.telegram.telegrambots.logging.BotLogger;
 
 import java.io.InvalidObjectException;
diff --git a/src/main/java/org/telegram/updateshandlers/WeatherHandlers.java b/src/main/java/org/telegram/updateshandlers/WeatherHandlers.java
index ea4d3f2..6f52143 100644
--- a/src/main/java/org/telegram/updateshandlers/WeatherHandlers.java
+++ b/src/main/java/org/telegram/updateshandlers/WeatherHandlers.java
@@ -9,7 +9,6 @@ import org.telegram.services.LocalisationService;
 import org.telegram.services.TimerExecutor;
 import org.telegram.services.WeatherService;
 import org.telegram.structure.WeatherAlert;
-import org.telegram.telegrambots.TelegramApiException;
 import org.telegram.telegrambots.api.methods.send.SendMessage;
 import org.telegram.telegrambots.api.objects.Message;
 import org.telegram.telegrambots.api.objects.Update;
@@ -19,6 +18,8 @@ import org.telegram.telegrambots.api.objects.replykeyboard.ReplyKeyboardHide;
 import org.telegram.telegrambots.api.objects.replykeyboard.ReplyKeyboardMarkup;
 import org.telegram.telegrambots.api.objects.replykeyboard.buttons.KeyboardRow;
 import org.telegram.telegrambots.bots.TelegramLongPollingBot;
+import org.telegram.telegrambots.exceptions.TelegramApiException;
+import org.telegram.telegrambots.exceptions.TelegramApiRequestException;
 import org.telegram.telegrambots.logging.BotLogger;
 
 import java.util.ArrayList;
@@ -112,7 +113,7 @@ public class WeatherHandlers extends TelegramLongPollingBot {
             sendMessage.setText(weather);
             try {
                 sendMessage(sendMessage);
-            } catch (TelegramApiException e) {
+            } catch (TelegramApiRequestException e) {
                 BotLogger.warn(LOGTAG, e);
                 if (e.getApiResponse().contains("Can't access the chat") || e.getApiResponse().contains("Bot was blocked by the user")) {
                     DatabaseManager.getInstance().deleteAlertsForUser(weatherAlert.getUserId());