Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Updated the HTTP Client #3

Merged
merged 2 commits into from
May 4, 2019
Merged

Updated the HTTP Client #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e71f539
Merge pull request #1 from nightscout-dl/master
dhermanns May 1, 2019
29a8dd1
Migrated the old apache httpclient to the newer java http client
dhermanns May 1, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .idea/modules.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions .idea/vcs.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ def gitVersionName = { ->
}

android {
compileSdkVersion 26
compileSdkVersion 23
buildToolsVersion '28.0.3'

lintOptions {
Expand All @@ -55,6 +55,6 @@ android {
}

dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation fileTree(include: ['*.jar'], dir: 'libs')
implementation 'com.github.felHR85:UsbSerial:4.5.2'
}
252 changes: 168 additions & 84 deletions app/src/main/java/com/nightscout/android/upload/UploadHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,42 +1,37 @@
package com.nightscout.android.upload;

import java.security.MessageDigest;

import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Locale;

import org.apache.http.client.ResponseHandler;
import org.apache.http.client.methods.HttpPost;
import org.apache.http.entity.StringEntity;
import org.apache.http.impl.client.BasicResponseHandler;
import org.apache.http.impl.client.DefaultHttpClient;
import org.apache.http.params.BasicHttpParams;
import org.apache.http.params.HttpConnectionParams;
import org.apache.http.params.HttpParams;
import org.json.JSONArray;
import org.json.JSONObject;


import android.content.Context;
import android.content.SharedPreferences;
import android.os.AsyncTask;
import android.preference.PreferenceManager;
import android.util.Log;


import com.nightscout.android.dexcom.DexcomG4Activity;
import com.nightscout.android.dexcom.EGVRecord;
import com.nightscout.android.medtronic.MedtronicConstants;

import org.json.JSONObject;

import java.io.BufferedWriter;
import java.io.IOException;
import java.io.OutputStream;
import java.io.OutputStreamWriter;
import java.net.HttpURLConnection;
import java.net.ProtocolException;
import java.net.URL;
import java.nio.charset.StandardCharsets;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.Locale;

public class UploadHelper extends AsyncTask<Record, Integer, Long> {


private static final String TAG = "UploadHelper";
private static final SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss aa", Locale.getDefault());
private static final int SOCKET_TIMEOUT = 60 * 1000;
private SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss aa", Locale.getDefault());
private static final int READ_TIMEOUT = 30 * 1000;
private static final int CONNECTION_TIMEOUT = 30 * 1000;
private String baseURLSettings;

Expand Down Expand Up @@ -68,22 +63,20 @@ protected Long doInBackground(Record... records) {
Log.i(TAG, String.format("Finished upload of %s record using a REST API in %s ms", records.length, System.currentTimeMillis() - start));

} catch (Exception e) {
Log.e(TAG,"ERROR uploading data!!!!!", e);
Log.e(TAG, "ERROR uploading data!!!!!", e);
}


return 1L;
}

protected void onPostExecute(Long result) {
super.onPostExecute(result);
Log.i(TAG, "Post execute, Result: " + result + ", Status: FINISHED");

}

private void doRESTUpload(Record... records) {

ArrayList<String> baseURIs = new ArrayList<String>();
ArrayList<String> baseURIs = new ArrayList<>();

try {
for (String baseURLSetting : baseURLSettings.split(" ")) {
Expand All @@ -101,13 +94,13 @@ private void doRESTUpload(Record... records) {
doRESTUploadTo(baseURI, records);
} catch (Exception e) {
Log.e(TAG, "Unable to do REST API Upload to: " + baseURI, e);
}
}
}
}


private void doRESTUploadTo(String baseURI, Record[] records) throws Exception {
int apiVersion = 1;

if (!baseURI.endsWith("/v1/"))
throw new Exception("REST API URL must start end with /v1/");

Expand Down Expand Up @@ -144,98 +137,189 @@ private void doRESTUploadTo(String baseURI, Record[] records) throws Exception {
throw new Exception(error);
}

HttpParams params = new BasicHttpParams();
HttpConnectionParams.setSoTimeout(params, SOCKET_TIMEOUT);
HttpConnectionParams.setConnectionTimeout(params, CONNECTION_TIMEOUT);
postDeviceStatus(baseURL);

DefaultHttpClient httpclient = new DefaultHttpClient(params);
for (Record record : records) {

postDeviceStatus(baseURL, httpclient);
String postURL = determineUrlForRecord(baseURL, record);
postRecord(postURL, secret, record);
}
} catch (Exception e) {
Log.e(TAG, "Unable to post data", e);
}

}

for (Record record : records) {
String postURL = baseURL;
if (record instanceof GlucometerRecord) {
postURL += "entries";
} else if (record instanceof MedtronicPumpRecord) {
postURL += "deviceentries";
} else {
postURL += "entries";
}
Log.i(TAG, "postURL: " + postURL);
private String determineUrlForRecord(String baseURL, Record record) {

HttpPost post = new HttpPost(postURL);
String postURL;
if (record instanceof GlucometerRecord) {
postURL = baseURL + "entries";
} else if (record instanceof MedtronicPumpRecord) {
postURL = baseURL + "deviceentries";
} else {
postURL = baseURL + "entries";
}
Log.i(TAG, "postURL: " + postURL);
return postURL;
}

MessageDigest digest = MessageDigest.getInstance("SHA-1");
byte[] bytes = secret.getBytes("UTF-8");
digest.update(bytes, 0, bytes.length);
bytes = digest.digest();
StringBuilder sb = new StringBuilder(bytes.length * 2);
for (byte b : bytes) {
sb.append(String.format("%02x", b & 0xff));
}
String token = sb.toString();
post.setHeader("api-secret", token);
private void postRecord(String postURL, String secret, Record record) throws NoSuchAlgorithmException, IOException {

JSONObject json = new JSONObject();
HttpURLConnection urlConnection = null;
OutputStream os = null;
BufferedWriter writer = null;

try {
populateV1APIEntry(json, record);
try {
urlConnection = (HttpURLConnection) new URL(postURL).openConnection();
setPostConnectionProperties(urlConnection);
setAuthenticationToken(secret, urlConnection);

} catch (Exception e) {
Log.w(TAG, "Unable to populate entry, apiVersion: " + apiVersion, e);
continue;
}
String jsonString = convertRecordToJsonString(record);
if (jsonString == null) {
return;
}

String jsonString = json.toString();
try {
urlConnection.setRequestProperty("Accept", "application/json");
urlConnection.setRequestProperty("Content-type", "application/json");

Log.i(TAG, "DEXCOM JSON: " + jsonString);
// stream the body
os = urlConnection.getOutputStream();
writer = new BufferedWriter(
new OutputStreamWriter(os, StandardCharsets.UTF_8));
writer.write(jsonString);

writer.flush();
} catch (Exception e) {
Log.w(TAG, "Unable to post data to: '" + postURL + "'", e);
}
} finally {
if (writer != null) {
try {
writer.close();
} catch (IOException e) {
Log.e(TAG, e.getMessage(), e);
}
}
if (os != null) {
try {
StringEntity se = new StringEntity(jsonString);
post.setEntity(se);
post.setHeader("Accept", "application/json");
post.setHeader("Content-type", "application/json");

ResponseHandler responseHandler = new BasicResponseHandler();
httpclient.execute(post, responseHandler);
} catch (Exception e) {
Log.w(TAG, "Unable to post data to: '" + post.getURI().toString() + "'", e);
os.close();
} catch (IOException e) {
Log.e(TAG, e.getMessage(), e);
}
}

if (urlConnection != null) {
try {
Log.i(TAG, "Post to Url: '" + postURL + "' returned Http-Status " + urlConnection.getResponseCode());
} catch (IOException e) {
Log.e(TAG, e.getMessage(), e);
}
urlConnection.disconnect();
}
}
}

private void setAuthenticationToken(String secret, HttpURLConnection urlConnection) throws NoSuchAlgorithmException {

MessageDigest digest = MessageDigest.getInstance("SHA-1");
byte[] bytes = secret.getBytes(StandardCharsets.UTF_8);
digest.update(bytes, 0, bytes.length);
bytes = digest.digest();
StringBuilder sb = new StringBuilder(bytes.length * 2);
for (byte b : bytes) {
sb.append(String.format("%02x", b & 0xff));
}
String token = sb.toString();

urlConnection.setRequestProperty("api-secret", token);
}

private String convertRecordToJsonString(Record record) {

JSONObject json = new JSONObject();
try {
populateV1APIEntry(json, record);

} catch (Exception e) {
Log.e(TAG, "Unable to post data", e);
Log.w(TAG, "Unable to populate entry.", e);
return null;
}
String jsonString = json.toString();

Log.i(TAG, "JSON: " + jsonString);
return jsonString;
}

private void postDeviceStatus(String baseURL) {

private void postDeviceStatus(String baseURL, DefaultHttpClient httpclient) {
HttpURLConnection urlConnection = null;
OutputStream os = null;
BufferedWriter writer = null;
String devicestatusURL = "";
try {

String devicestatusURL = baseURL + "devicestatus";
devicestatusURL = baseURL + "devicestatus";

Log.i(TAG, "devicestatusURL: " + devicestatusURL);

JSONObject json = new JSONObject();
json.put("uploaderBattery", DexcomG4Activity.batLevel);
String jsonString = json.toString();

HttpPost post = new HttpPost(devicestatusURL);
StringEntity se = new StringEntity(jsonString);
post.setEntity(se);
post.setHeader("Accept", "application/json");
post.setHeader("Content-type", "application/json");
urlConnection = (HttpURLConnection) new URL(devicestatusURL).openConnection();
setPostConnectionProperties(urlConnection);

urlConnection.setRequestProperty("Accept", "application/json");
urlConnection.setRequestProperty("Content-type", "application/json");

ResponseHandler responseHandler = new BasicResponseHandler();
httpclient.execute(post, responseHandler);
// stream the body
os = urlConnection.getOutputStream();
writer = new BufferedWriter(
new OutputStreamWriter(os, StandardCharsets.UTF_8));
writer.write(jsonString);

writer.flush();
} catch (Exception e) {
Log.w(TAG, "Could not send device status", e);

} finally {
if (writer != null) {
try {
writer.close();
} catch (IOException e) {
Log.e(TAG, e.getMessage(), e);
}
}
if (os != null) {
try {
os.close();
} catch (IOException e) {
Log.e(TAG, e.getMessage(), e);
}
}

if (urlConnection != null) {
try {
Log.i(TAG, "Post to Url: '" + devicestatusURL + "' returned Http-Status " + urlConnection.getResponseCode());
} catch (IOException e) {
Log.e(TAG, e.getMessage(), e);
}
urlConnection.disconnect();
}
}

}

private void setPostConnectionProperties(HttpURLConnection urlConnection) throws ProtocolException {
urlConnection.setReadTimeout(READ_TIMEOUT);
urlConnection.setConnectTimeout(CONNECTION_TIMEOUT);
urlConnection.setRequestMethod("POST");
urlConnection.setDoInput(true);
urlConnection.setDoOutput(true);
}

private void populateV1APIEntry(JSONObject json, Record oRecord) throws Exception {
Date date = oRecord.getDate();
json.put("date", date.getTime());
Expand Down