From 6431adfe87930e288f2c516724edccb9dc45c66c Mon Sep 17 00:00:00 2001 From: Rubenlagus Date: Thu, 21 Apr 2016 22:36:30 +0200 Subject: [PATCH] Support editing messagess sent "via bot" upon editing, an empty message is returned if successful --- .../api/methods/updatingmessages/EditMessageCaption.java | 7 ++++++- .../methods/updatingmessages/EditMessageReplyMarkup.java | 7 ++++++- .../api/methods/updatingmessages/EditMessageText.java | 7 ++++++- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/telegram/telegrambots/api/methods/updatingmessages/EditMessageCaption.java b/src/main/java/org/telegram/telegrambots/api/methods/updatingmessages/EditMessageCaption.java index ebc8de28..33674c54 100644 --- a/src/main/java/org/telegram/telegrambots/api/methods/updatingmessages/EditMessageCaption.java +++ b/src/main/java/org/telegram/telegrambots/api/methods/updatingmessages/EditMessageCaption.java @@ -4,6 +4,7 @@ import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.SerializerProvider; import com.fasterxml.jackson.databind.jsontype.TypeSerializer; +import org.json.JSONException; import org.json.JSONObject; import org.telegram.telegrambots.Constants; import org.telegram.telegrambots.api.methods.BotApiMethod; @@ -119,7 +120,11 @@ public class EditMessageCaption extends BotApiMethod { @Override public Message deserializeResponse(JSONObject answer) { if (answer.getBoolean(Constants.RESPONSEFIELDOK)) { - return new Message(answer.getJSONObject(Constants.RESPONSEFIELDRESULT)); + try { + return new Message(answer.getJSONObject(Constants.RESPONSEFIELDRESULT)); + } catch (JSONException e) { + return new Message(); + } } return null; } diff --git a/src/main/java/org/telegram/telegrambots/api/methods/updatingmessages/EditMessageReplyMarkup.java b/src/main/java/org/telegram/telegrambots/api/methods/updatingmessages/EditMessageReplyMarkup.java index 3d236fdf..f126e194 100644 --- a/src/main/java/org/telegram/telegrambots/api/methods/updatingmessages/EditMessageReplyMarkup.java +++ b/src/main/java/org/telegram/telegrambots/api/methods/updatingmessages/EditMessageReplyMarkup.java @@ -4,6 +4,7 @@ import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.SerializerProvider; import com.fasterxml.jackson.databind.jsontype.TypeSerializer; +import org.json.JSONException; import org.json.JSONObject; import org.telegram.telegrambots.Constants; import org.telegram.telegrambots.api.methods.BotApiMethod; @@ -105,7 +106,11 @@ public class EditMessageReplyMarkup extends BotApiMethod { @Override public Message deserializeResponse(JSONObject answer) { if (answer.getBoolean(Constants.RESPONSEFIELDOK)) { - return new Message(answer.getJSONObject(Constants.RESPONSEFIELDRESULT)); + try { + return new Message(answer.getJSONObject(Constants.RESPONSEFIELDRESULT)); + } catch (JSONException e) { + return new Message(); + } } return null; } diff --git a/src/main/java/org/telegram/telegrambots/api/methods/updatingmessages/EditMessageText.java b/src/main/java/org/telegram/telegrambots/api/methods/updatingmessages/EditMessageText.java index 3beb6823..14f7a1bf 100644 --- a/src/main/java/org/telegram/telegrambots/api/methods/updatingmessages/EditMessageText.java +++ b/src/main/java/org/telegram/telegrambots/api/methods/updatingmessages/EditMessageText.java @@ -4,6 +4,7 @@ import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.SerializerProvider; import com.fasterxml.jackson.databind.jsontype.TypeSerializer; +import org.json.JSONException; import org.json.JSONObject; import org.telegram.telegrambots.Constants; import org.telegram.telegrambots.api.methods.BotApiMethod; @@ -163,7 +164,11 @@ public class EditMessageText extends BotApiMethod { @Override public Message deserializeResponse(JSONObject answer) { if (answer.getBoolean(Constants.RESPONSEFIELDOK)) { - return new Message(answer.getJSONObject(Constants.RESPONSEFIELDRESULT)); + try { + return new Message(answer.getJSONObject(Constants.RESPONSEFIELDRESULT)); + } catch (JSONException e) { + return new Message(); + } } return null; }