X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=src%2Fro%2Fieval%2Ffonbot%2FHttpCallExecutableRunnable.java;h=a513ed63ca8efbf1fe034e3731a317da72a291b0;hb=a646935d0f44af999dca8b068aa9568ed5aab988;hp=621f0bc5187fadfbc404926a19b052aeaf6dbace;hpb=2e5049c9c08b1989b4bfbbfbf479d83dbe2b75a9;p=fonbot.git diff --git a/src/ro/ieval/fonbot/HttpCallExecutableRunnable.java b/src/ro/ieval/fonbot/HttpCallExecutableRunnable.java index 621f0bc..a513ed6 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 @@ -132,7 +137,6 @@ public final class HttpCallExecutableRunnable extends ExecutableRunnable{ 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){ @@ -153,16 +157,23 @@ public final class HttpCallExecutableRunnable extends ExecutableRunnable{ stream.close(); } Log.d(getClass().getName(),"HTTP Response: "+conn.getResponseCode()+" "+conn.getResponseMessage()); - final String message=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) - callback.onResult(conn.getResponseCode(), Utils.parseHttpMessage(message), - toNonNull(conn.getInputStream())); + else if(message != null && callback != null){ + if(message.charAt(message.length()-1) == ')')//message is (something) + message=message.substring(1, message.length()-1); + else + message=message.substring(message.indexOf(')')+2); + callback.onResult(conn.getResponseCode(), message, conn.getResponseCode() == 200 ? conn.getInputStream() : null); + } conn.disconnect(); } catch (Exception e) { e.printStackTrace(); - callback.onError(toNonNull(context.getString(connection_error))); + if(callback != null) + callback.onError(toNonNull(context.getString(connection_error))); + if(mustRetryTask) + retry(); } } }