Skip to content

Commit 50f4fac

Browse files
committed
Fixed up code review changes in iterableRequest
1 parent 2478a82 commit 50f4fac

File tree

1 file changed

+20
-21
lines changed

1 file changed

+20
-21
lines changed

iterableapi/src/main/java/com/iterable/iterableapi/IterableRequest.java

+20-21
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ class IterableRequest extends AsyncTask<IterableApiRequest, Void, String> {
2828
static final int MAX_RETRY_COUNT = 3;
2929

3030
int retryCount = 0;
31-
IterableApiRequest retryRequest;
31+
IterableApiRequest iterableApiRequest;
32+
boolean retryRequest;
3233

3334
/**
3435
* Sends the given request to Iterable using a HttpUserConnection
@@ -37,12 +38,16 @@ class IterableRequest extends AsyncTask<IterableApiRequest, Void, String> {
3738
* @return
3839
*/
3940
protected String doInBackground(IterableApiRequest... params) {
40-
IterableApiRequest iterableApiRequest = params[0];
41+
if (params != null && params.length > 0) {
42+
iterableApiRequest = params[0];
43+
}
4144

42-
try {
43-
Thread.sleep(RETRY_DELAY*retryCount);
44-
} catch (InterruptedException e) {
45-
e.printStackTrace();
45+
if (retryRequest) {
46+
try {
47+
Thread.sleep(RETRY_DELAY * retryCount);
48+
} catch (InterruptedException e) {
49+
e.printStackTrace();
50+
}
4651
}
4752

4853
String requestResult = null;
@@ -86,14 +91,13 @@ protected String doInBackground(IterableApiRequest... params) {
8691
String mess = e.getMessage();
8792
if (mess.equals(AUTHENTICATION_IO_EXCEPTION)) {
8893
Log.d(TAG, "Invalid API Key");
89-
} else
90-
{
91-
retryRequest = iterableApiRequest;
94+
} else {
95+
retryRequest = true;
9296
}
9397
e.printStackTrace();
9498
} catch (Exception e) {
9599
e.printStackTrace();
96-
retryRequest = iterableApiRequest;
100+
retryRequest = true;
97101
} finally {
98102
if (urlConnection != null) {
99103
urlConnection.disconnect();
@@ -105,23 +109,18 @@ protected String doInBackground(IterableApiRequest... params) {
105109

106110
@Override
107111
protected void onPostExecute(String s) {
108-
if (retryRequest != null) {
109-
attemptRequestRetry();
112+
if (retryRequest && retryCount <= MAX_RETRY_COUNT) {
113+
IterableRequest request = new IterableRequest();
114+
request.setRetryCount(retryCount + 1);
115+
request.execute(iterableApiRequest);
110116
}
111117
super.onPostExecute(s);
112118
}
113119

114-
protected void updateRetryCount(int count) {
115-
retryCount = count+1;
120+
protected void setRetryCount(int count) {
121+
retryCount = count;
116122
}
117123

118-
private void attemptRequestRetry() {
119-
if (retryCount <= MAX_RETRY_COUNT) {
120-
IterableRequest request = new IterableRequest();
121-
request.updateRetryCount(retryCount);
122-
request.execute(retryRequest);
123-
}
124-
}
125124
}
126125

127126
class IterableApiRequest {

0 commit comments

Comments
 (0)