tdlight-team/TDLightTelegramBots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add compatibility with java7

Browse Source 
Merge #21
This commit is contained in:
Rubenlagus 2016-04-17 17:10:09 +02:00
parent a84f073a0a
commit 1c66511bff
1 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/main/java/org/telegram/telegrambots/bots/AbsSender.java
View File

@ -781,25 +781,29 @@ public abstract class AbsSender {
// Simplified methods // Simplified methods
private void sendApiMethodAsync(BotApiMethod method, SentCallback callback) { private void sendApiMethodAsync(BotApiMethod method, SentCallback callback) {
exe.submit(() -> { exe.submit(new Runnable() {
try { @Override
CloseableHttpClient httpclient = HttpClientBuilder.create().setSSLHostnameVerifier(new NoopHostnameVerifier()).build(); public void run() {
String url = getBaseUrl() + method.getPath(); try {
HttpPost httppost = new HttpPost(url); CloseableHttpClient httpclient = HttpClientBuilder.create().setSSLHostnameVerifier(new NoopHostnameVerifier()).build();
httppost.addHeader("charset", StandardCharsets.UTF_8.name()); String url = getBaseUrl() + method.getPath();
httppost.setEntity(new StringEntity(method.toJson().toString(), ContentType.APPLICATION_JSON)); HttpPost httppost = new HttpPost(url);
CloseableHttpResponse response = httpclient.execute(httppost); httppost.addHeader("charset", StandardCharsets.UTF_8.name());
HttpEntity ht = response.getEntity(); httppost.setEntity(new StringEntity(method.toJson().toString(), ContentType.APPLICATION_JSON));
BufferedHttpEntity buf = new BufferedHttpEntity(ht); CloseableHttpResponse response = httpclient.execute(httppost);
String responseContent = EntityUtils.toString(buf, StandardCharsets.UTF_8); HttpEntity ht = response.getEntity();
BufferedHttpEntity buf = new BufferedHttpEntity(ht);
String responseContent = EntityUtils.toString(buf, StandardCharsets.UTF_8);
JSONObject jsonObject = new JSONObject(responseContent); JSONObject jsonObject = new JSONObject(responseContent);
if (!jsonObject.getBoolean(Constants.RESPONSEFIELDOK)) { if (!jsonObject.getBoolean(Constants.RESPONSEFIELDOK)) {
callback.onError(method, jsonObject); callback.onError(method, jsonObject);
}
callback.onResult(method, jsonObject);
} catch (IOException e) {
callback.onException(method, e);
} }
callback.onResult(method, jsonObject);
} catch (IOException e) {
callback.onException(method, e);
} }
}); });
} }