Skip to content

Commit 9478fe5

Browse files
author
Anirudh S
committed
Show only public-facing Help Center articles in Zendesk
Decided to move the request parameters logic into the calling methods. Future updates will make use of this change.
1 parent faaf7b7 commit 9478fe5

File tree

1 file changed

+50
-40
lines changed

1 file changed

+50
-40
lines changed

‎helpstack/src/com/tenmiles/helpstack/gears/HSZendeskGear.java

Lines changed: 50 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,12 @@ public void onResponse(JSONObject sectionsArray) {
112112
}
113113
}, errorListener);
114114

115-
addRequestAndStartQueue(queue, request);
115+
request.setTag(cancelTag);
116+
request.setRetryPolicy(new DefaultRetryPolicy(ZendeskJsonObjectRequest.TIMEOUT_MS,
117+
ZendeskJsonObjectRequest.MAX_RETRIES, ZendeskJsonObjectRequest.BACKOFF_MULT));
118+
119+
queue.add(request);
120+
queue.start();
116121
}
117122
else {
118123
showArticlesInSection(cancelTag,this.section_id, queue, successListener, errorListener);
@@ -171,7 +176,13 @@ public void onResponse(JSONObject response) {
171176
}
172177
}, errorListener);
173178

174-
addRequestAndStartQueue(queue, fetchRequest);
179+
fetchRequest.addCredential(staff_email_address, api_token);
180+
fetchRequest.setTag(cancelTag);
181+
fetchRequest.setRetryPolicy(new DefaultRetryPolicy(ZendeskJsonObjectRequest.TIMEOUT_MS,
182+
ZendeskJsonObjectRequest.MAX_RETRIES, ZendeskJsonObjectRequest.BACKOFF_MULT));
183+
184+
queue.add(fetchRequest);
185+
queue.start();
175186
}
176187

177188
@Override
@@ -196,11 +207,6 @@ public String getApiUrl() {
196207
return this.instanceUrl.concat("api/v2/");
197208
}
198209

199-
private void addRequestAndStartQueue(RequestQueue queue, Request request) {
200-
queue.add(request);
201-
queue.start();
202-
}
203-
204210
private void createNewTicketWithAttachment(final String cancelTag, final HSUser user, final String message, final String body, HSUploadAttachment[] attachments, final RequestQueue queue,
205211
final OnNewTicketFetchedSuccessListener successListener, final ErrorListener errorListener) {
206212

@@ -230,7 +236,14 @@ public void onResponse(JSONObject jsonObject) {
230236
}
231237
}, errorListener);
232238

233-
addRequestAndStartQueue(queue, attachmentRequest);
239+
240+
attachmentRequest.addCredential(staff_email_address, api_token);
241+
attachmentRequest.setTag(cancelTag);
242+
attachmentRequest.setRetryPolicy(new DefaultRetryPolicy(ZendeskJsonObjectRequest.TIMEOUT_MS,
243+
ZendeskJsonObjectRequest.MAX_RETRIES, ZendeskJsonObjectRequest.BACKOFF_MULT));
244+
245+
queue.add(attachmentRequest);
246+
queue.start();
234247
}
235248

236249
private void createTicket(String cancelTag, final HSUser user, String message, String body, String[] attachmentToken, RequestQueue queue, final OnNewTicketFetchedSuccessListener successListener, final Response.ErrorListener errorListener) {
@@ -259,7 +272,13 @@ public void onResponse(JSONObject response) {
259272
}
260273
}, errorListener);
261274

262-
addRequestAndStartQueue(queue, request);
275+
request.addCredential(staff_email_address, api_token);
276+
request.setTag(cancelTag);
277+
request.setRetryPolicy(new DefaultRetryPolicy(ZendeskJsonObjectRequest.TIMEOUT_MS,
278+
ZendeskJsonObjectRequest.MAX_RETRIES, ZendeskJsonObjectRequest.BACKOFF_MULT));
279+
280+
queue.add(request);
281+
queue.start();
263282
}
264283

265284
private void addReplyToTicketWithAttachment(final String cancelTag, final HSTicket ticket, final HSUser user, final String message, HSUploadAttachment[] attachments, final RequestQueue queue,
@@ -296,7 +315,13 @@ public void onResponse(JSONObject jsonObject) {
296315
}
297316
}, errorListener);
298317

299-
addRequestAndStartQueue(queue, attachmentRequest);
318+
attachmentRequest.addCredential(staff_email_address, api_token);
319+
attachmentRequest.setTag(cancelTag);
320+
attachmentRequest.setRetryPolicy(new DefaultRetryPolicy(ZendeskJsonObjectRequest.TIMEOUT_MS,
321+
ZendeskJsonObjectRequest.MAX_RETRIES, ZendeskJsonObjectRequest.BACKOFF_MULT));
322+
323+
queue.add(attachmentRequest);
324+
queue.start();
300325
}
301326

302327
private String getAttachmentFileName(HSUploadAttachment attachmentObject) {
@@ -352,7 +377,13 @@ public void onResponse(JSONObject response) {
352377
}
353378
}, errorListener);
354379

355-
addRequestAndStartQueue(queue, request);
380+
request.addCredential(staff_email_address, api_token);
381+
request.setTag(cancelTag);
382+
request.setRetryPolicy(new DefaultRetryPolicy(ZendeskJsonObjectRequest.TIMEOUT_MS,
383+
ZendeskJsonObjectRequest.MAX_RETRIES, ZendeskJsonObjectRequest.BACKOFF_MULT));
384+
385+
queue.add(request);
386+
queue.start();
356387
}
357388

358389
private JSONObject retrieveTicketProperties(HSUser user, String body, String[] attachmentToken, String message) throws JSONException {
@@ -552,7 +583,13 @@ public void onResponse(JSONObject sectionsObject) {
552583
}
553584
}, errorListener);
554585

555-
addRequestAndStartQueue(queue, request);
586+
request.addCredential(staff_email_address, api_token);
587+
request.setTag(cancelTag);
588+
request.setRetryPolicy(new DefaultRetryPolicy(ZendeskJsonObjectRequest.TIMEOUT_MS,
589+
ZendeskJsonObjectRequest.MAX_RETRIES, ZendeskJsonObjectRequest.BACKOFF_MULT));
590+
591+
queue.add(request);
592+
queue.start();
556593
}
557594

558595
protected static Date parseTime(String dateString) {
@@ -619,36 +656,18 @@ private class ZendeskJsonObjectRequest extends JsonObjectRequest {
619656

620657
public ZendeskJsonObjectRequest(String cancelTag, int method, String url, JSONObject jsonRequest, Listener<org.json.JSONObject> listener, ErrorListener errorListener) {
621658
super(method, url, jsonRequest, listener, errorListener);
622-
addRequestParameters(cancelTag);
623659
}
624660

625661
public ZendeskJsonObjectRequest(String cancelTag, String email_address, int method, String url, JSONObject jsonRequest, Listener<org.json.JSONObject> listener, Response.ErrorListener errorListener) {
626662
super(method, url, jsonRequest, listener, errorListener);
627-
addRequestParameters(cancelTag, email_address);
628663
}
629664

630665
public ZendeskJsonObjectRequest(String cancelTag, String url, JSONObject ticketJson, Listener<JSONObject> listener, ErrorListener errorListener) {
631666
super(url, ticketJson, listener, errorListener);
632-
addRequestParameters(cancelTag);
633667
}
634668

635669
public ZendeskJsonObjectRequest(String cancelTag, String url, Listener<JSONObject> listener, ErrorListener errorListener) {
636670
super(url, null, listener, errorListener);
637-
addRequestParameters(cancelTag);
638-
}
639-
640-
private void addRequestParameters(String cancelTag) {
641-
this.addCredential(staff_email_address, api_token);
642-
this.setTag(cancelTag);
643-
this.setRetryPolicy(new DefaultRetryPolicy(ZendeskJsonObjectRequest.TIMEOUT_MS,
644-
ZendeskJsonObjectRequest.MAX_RETRIES, ZendeskJsonObjectRequest.BACKOFF_MULT));
645-
}
646-
647-
private void addRequestParameters(String cancelTag, String email_address) {
648-
this.addCredential(email_address, api_token);
649-
this.setTag(cancelTag);
650-
this.setRetryPolicy(new DefaultRetryPolicy(ZendeskJsonObjectRequest.TIMEOUT_MS,
651-
ZendeskJsonObjectRequest.MAX_RETRIES, ZendeskJsonObjectRequest.BACKOFF_MULT));
652671
}
653672

654673
public void addCredential(String name, String api_token) {
@@ -673,8 +692,6 @@ private class ZendeskObjectRequest extends Request<JSONObject> {
673692
public ZendeskObjectRequest(String cancelTag, String attachmentUrl, HSUploadAttachment attachmentObject, Listener<JSONObject> listener, ErrorListener errorListener) {
674693
super(Method.POST, attachmentUrl, errorListener);
675694

676-
addRequestParameters(cancelTag);
677-
678695
mListener = listener;
679696

680697
InputStream inputStream = null;
@@ -700,14 +717,7 @@ public ZendeskObjectRequest(String cancelTag, String attachmentUrl, HSUploadAtta
700717
this.content = output.toByteArray();
701718
}
702719

703-
private void addRequestParameters(String cancelTag) {
704-
this.addCredential(staff_email_address, api_token);
705-
this.setTag(cancelTag);
706-
this.setRetryPolicy(new DefaultRetryPolicy(ZendeskJsonObjectRequest.TIMEOUT_MS,
707-
ZendeskJsonObjectRequest.MAX_RETRIES, ZendeskJsonObjectRequest.BACKOFF_MULT));
708-
}
709-
710-
public void addCredential(String name, String api_token) {
720+
private void addCredential(String name, String api_token) {
711721
String credentials = name.concat("/token:").concat(api_token);
712722
String base64EncodedCredentials = Base64.encodeToString(credentials.getBytes(), Base64.NO_WRAP);
713723
headers.put("Authorization", "Basic ".concat(base64EncodedCredentials));

0 commit comments

Comments
 (0)