Skip to content

Commit e7ac4a8

Browse files
committed
- Commented out parsing of HTTP headers for now, seems to be some random
issues at some points which seems to cause crashes
1 parent 1d230e1 commit e7ac4a8

File tree

1 file changed

+27
-18
lines changed

1 file changed

+27
-18
lines changed

https.android.ts

Lines changed: 27 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -162,14 +162,16 @@ export function request(options: Https.HttpsRequestOptions): Promise<Https.Https
162162
const urlBuilder = httpUrl.newBuilder();
163163
console.log("Created newBuilder");
164164
if (options.params) {
165+
console.log('Adding params');
165166
Object.keys(options.params).forEach(param => {
166167
urlBuilder.addQueryParameter(param, options.params[param] as any);
167-
})
168+
});
169+
console.log('Added params');
168170
}
169171

172+
console.log('Creating request builder');
170173
let request = new okhttp3.Request.Builder();
171174
request.url(urlBuilder.build());
172-
173175
if (options.headers) {
174176
Object.keys(options.headers).forEach(function (key) {
175177
request.addHeader(key, options.headers[key] as any)
@@ -210,8 +212,10 @@ export function request(options: Https.HttpsRequestOptions): Promise<Https.Https
210212
// enable our policy
211213
android.os.StrictMode.setThreadPolicy(strictModeThreadPolicyPermitAll);
212214

215+
console.log("Sending OkHttp request");
213216
client.newCall(request.build()).enqueue(new okhttp3.Callback({
214217
onResponse: function (task, response) {
218+
console.log("Handling response!");
215219
// console.log('onResponse')
216220
// console.keys('response', response)
217221
// console.log('onResponse > response.isSuccessful()', response.isSuccessful())
@@ -232,28 +236,33 @@ export function request(options: Https.HttpsRequestOptions): Promise<Https.Https
232236
// } catch (error) {
233237
// return reject(error)
234238
// }
235-
236-
let content = response.body().string();
237239
try {
238-
content = JSON.parse(content)
240+
let content = response.body().string();
241+
try {
242+
content = JSON.parse(content)
243+
} catch (e) {
244+
}
245+
246+
let statusCode = response.code();
247+
248+
let headers = {};
249+
// let heads: okhttp3.Headers = response.headers();
250+
// let i: number, len: number = heads.size();
251+
// for (i = 0; i < len; i++) {
252+
// let key = heads.name(i);
253+
// let value = heads.value(i);
254+
// headers[key] = value
255+
// }
256+
257+
resolve({content, statusCode, headers})
239258
} catch (e) {
259+
console.log('Error trying to parse response', e);
260+
reject('Thew was a problem trying to parse the response');
240261
}
241262

242-
let statusCode = response.code();
243-
244-
let headers = {};
245-
let heads: okhttp3.Headers = response.headers();
246-
let i: number, len: number = heads.size();
247-
for (i = 0; i < len; i++) {
248-
let key = heads.name(i);
249-
let value = heads.value(i);
250-
headers[key] = value
251-
}
252-
253-
resolve({content, statusCode, headers})
254-
255263
},
256264
onFailure: function (task, error) {
265+
console.log("There was an error!");
257266
reject(error)
258267
},
259268
}))

0 commit comments

Comments
 (0)