X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=src%2Fro%2Fieval%2Ffonbot%2FHttpCallExecutableRunnable.java;h=12b1014c672cf4f6e1b3a760e89227471313a58b;hb=46c0afcb1fa2b4688dbb250e9d56e0913a681772;hp=34c5d8d8260265be43ee1e6edee0460d1accf95b;hpb=c33b4990b6f2471803b656d06e206b7a74457496;p=fonbot.git diff --git a/src/ro/ieval/fonbot/HttpCallExecutableRunnable.java b/src/ro/ieval/fonbot/HttpCallExecutableRunnable.java index 34c5d8d..12b1014 100644 --- a/src/ro/ieval/fonbot/HttpCallExecutableRunnable.java +++ b/src/ro/ieval/fonbot/HttpCallExecutableRunnable.java @@ -5,10 +5,10 @@ import static ro.ieval.fonbot.Utils.toNonNull; import java.io.InputStream; import java.io.OutputStream; -import java.net.HttpURLConnection; import java.net.URL; import java.util.Collection; +import java.net.HttpURLConnection; import org.eclipse.jdt.annotation.Nullable; import android.content.Context; @@ -16,8 +16,6 @@ import android.preference.PreferenceManager; import android.util.Base64; import android.util.Log; -import com.google.android.gcm.GCMRegistrar; - /* * Copyright © 2013 Marius Gavrilescu * @@ -38,17 +36,18 @@ import com.google.android.gcm.GCMRegistrar; */ /** - * ExecutableRunnable that makes a HTTP call to the server and hands the response to a callback + * ExecutableRunnable that makes a HTTP(S) call to the server and hands the response to a callback * * @author Marius Gavrilescu */ public final class HttpCallExecutableRunnable extends ExecutableRunnable{ + /** * Callback which is run after a HTTP call. * * @author Marius Gavrilescu */ - public static interface ResultCallback{ + public interface ResultCallback{ /** * Callback invoked if the HTTP call is successful. * @@ -56,13 +55,13 @@ public final class HttpCallExecutableRunnable extends ExecutableRunnable{ * @param responseMessage HTTP response message * @param inputStream HTTP content InputStream */ - public void onResult(final int responseCode, final String responseMessage, final InputStream inputStream); + void onResult(final int responseCode, final String responseMessage, final InputStream inputStream); /** * Callback invoked if the HTTP call is unsuccessful. * * @param error localized error message */ - public void onError(final String error); + void onError(final String error); } /** @@ -85,6 +84,8 @@ public final class HttpCallExecutableRunnable extends ExecutableRunnable{ * Callback to run after the request returns */ private final ResultCallback callback; + /** If true, the task should be retried if it fails */ + private final boolean mustRetryTask; /** * Constructs a SendHttpMessageAsyncTask which sends a binary message. @@ -93,13 +94,15 @@ public final class HttpCallExecutableRunnable extends ExecutableRunnable{ * @param headers the extra headers * @param context the context instance * @param resultCallback {@link ResultCallback} instance + * @param mustRetryTask true if this task should be retried if it fails * @param data the message to send */ - public HttpCallExecutableRunnable(final String path, final @Nullable Collection
headers, final Context context, final @Nullable ResultCallback resultCallback, final byte[] data){//NOPMD array is supposed to be immutable. + public HttpCallExecutableRunnable(final String path, final @Nullable Collection
headers, final Context context, final @Nullable ResultCallback resultCallback, final boolean mustRetryTask, final byte[] data){//NOPMD array is supposed to be immutable. this.path=path; this.headers=headers; this.context=context; this.callback=resultCallback; + this.mustRetryTask=mustRetryTask; this.data=data; } @@ -110,13 +113,15 @@ public final class HttpCallExecutableRunnable extends ExecutableRunnable{ * @param headers the extra headers * @param context the context instance * @param resultCallback {@link ResultCallback} instance + * @param mustRetryTask true if this task should be retried if it fails * @param message message to send */ - public HttpCallExecutableRunnable(final String path, final @Nullable Collection
headers, final Context context, final @Nullable ResultCallback resultCallback, final String... message){ + public HttpCallExecutableRunnable(final String path, final @Nullable Collection
headers, final Context context, final @Nullable ResultCallback resultCallback, final boolean mustRetryTask, final String... message){ this.path=path; this.headers=headers; this.context=context; this.callback=resultCallback; + this.mustRetryTask=mustRetryTask; if(message.length == 0) this.data=null;//NOPMD final field else @@ -124,46 +129,55 @@ public final class HttpCallExecutableRunnable extends ExecutableRunnable{ } @Override - public void run() { + public void run(){ try { - final URL url=Utils.getServerURL(toNonNull(context),toNonNull(path)); - final HttpURLConnection conn=(HttpURLConnection) url.openConnection(); - if(data!=null){ - conn.setDoOutput(true); - conn.setFixedLengthStreamingMode(data.length); - } - conn.setRequestProperty("X-ID", GCMRegistrar.getRegistrationId(context)); - final String user=PreferenceManager.getDefaultSharedPreferences(context).getString("username", null); - final String password=PreferenceManager.getDefaultSharedPreferences(context).getString("password", null); - if(user == null || password == null){ - if(callback!=null) - callback.onError(toNonNull(context.getString(user_or_password_not_set))); - return; - } - - conn.setRequestProperty("Authorization", "Basic "+Base64.encodeToString( - (user+':'+password).getBytes(), Base64.NO_WRAP)); - if(headers != null) - for (final Header header : headers) - conn.setRequestProperty(header.name, header.value); - conn.connect(); - if(data!=null){ - final OutputStream stream=conn.getOutputStream(); - stream.write(data); - stream.close(); - } - Log.d(getClass().getName(),"HTTP Response: "+conn.getResponseCode()+" "+conn.getResponseMessage()); - final String message=conn.getResponseMessage(); - if(message==null && callback != null) - callback.onError(toNonNull(context.getString(no_response_returned_from_server))); - else if(message != null && callback != null) - callback.onResult(conn.getResponseCode(), Utils.parseHttpMessage(message), - toNonNull(conn.getInputStream())); - conn.disconnect(); + doRun(); } catch (Exception e) { e.printStackTrace(); if(callback != null) callback.onError(toNonNull(context.getString(connection_error))); + if(mustRetryTask) + retry(); + } + } + + public void doRun() throws Exception{ + final URL url=Utils.getServerURL(toNonNull(context),toNonNull(path)); + final HttpURLConnection conn=(HttpURLConnection) url.openConnection(); + conn.setReadTimeout(24*60*1000);//24 minutes + if(data!=null){ + conn.setDoOutput(true); + conn.setFixedLengthStreamingMode(data.length); + } + final String user=PreferenceManager.getDefaultSharedPreferences(context).getString("username", null); + final String password=PreferenceManager.getDefaultSharedPreferences(context).getString("password", null); + if(user == null || password == null || user.length() == 0 || password.length() == 0){ + if(callback!=null) + callback.onError(toNonNull(context.getString(user_or_password_not_set))); + return; + } + + conn.setRequestProperty("Authorization", "Basic "+Base64.encodeToString((user+':'+password).getBytes(), Base64.NO_WRAP)); + if(headers != null) + for (final Header header : headers) + conn.setRequestProperty(header.name, header.value); + conn.connect(); + if(data!=null){ + final OutputStream stream=conn.getOutputStream(); + stream.write(data); + stream.close(); + } + Log.d(getClass().getName(),"HTTP Response: "+conn.getResponseCode()+" "+conn.getResponseMessage()); + String message=conn.getResponseMessage(); + if(message==null && callback != null) + callback.onError(toNonNull(context.getString(no_response_returned_from_server))); + else if(message != null && callback != null){ + if(message.charAt(message.length()-1) == ')')//message is (something) + message=message.substring(1, message.length()-1); + else if(message.charAt(0) == '(')//message is (something) something else + message=message.substring(message.indexOf(')')+2); + callback.onResult(conn.getResponseCode(), message, conn.getResponseCode() == 200 ? conn.getInputStream() : null); } + conn.disconnect(); } }