Skip to content

Saercnap/api version detect #3

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

Closed
bewest wants to merge 6 commits into from
Closed

Saercnap/api version detect #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2829daa
detect api version, if v1 use sgv field instead of bg to be compatabl…
Jul 4, 2014
4a58b0e
simplify/future proof api version check
Jul 4, 2014
f9953f3
Update device_filter.xml
saercnap Jul 18, 2014
4a86ef1
Avoid probing USB devices without permission
saercnap Jul 18, 2014
f13db15
Add and use TAG
saercnap Jul 18, 2014
13dd933
s/getCanonicalName/getSimpleName/
saercnap Jul 18, 2014
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
2 changes: 1 addition & 1 deletion res/xml/device_filter.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@
limitations under the License.
-->
<resources>
<usb-device class="2" subclass="0" protocol="0" />
<usb-device vendor-id="8867" product-id="71" class="2" subclass="0" protocol="0" />
</resources>
7 changes: 7 additions & 0 deletions src/com/nightscout/android/dexcom/USB/UsbSerialProber.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import android.hardware.usb.UsbDevice;
import android.hardware.usb.UsbDeviceConnection;
import android.hardware.usb.UsbManager;
import android.util.Log;

import java.util.Map;

Expand Down Expand Up @@ -86,6 +87,8 @@ public UsbSerialDriver getDevice(final UsbManager manager, final UsbDevice usbDe
}
};*/

private static final String TAG = UsbSerialProber.class.getSimpleName();

/**
* Builds a new {@link UsbSerialDriver} instance from the raw device, or
* returns <code>null</code> if it could not be built (for example, if the
Expand Down Expand Up @@ -128,6 +131,10 @@ public static UsbSerialDriver acquire(final UsbManager usbManager) {
* could be acquired
*/
public static UsbSerialDriver acquire(final UsbManager usbManager, final UsbDevice usbDevice) {
if (!usbManager.hasPermission(usbDevice)) {
Log.i(TAG, "No permission for " + usbDevice.getVendorId() + " " + usbDevice.getProductId());
return null;
}
for (final UsbSerialProber prober : values()) {
final UsbSerialDriver probedDevice = prober.getDevice(usbManager, usbDevice);
if (probedDevice != null) {
Expand Down
40 changes: 33 additions & 7 deletions src/com/nightscout/android/upload/UploadHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,13 @@ protected void onPostExecute(Long result) {

private void doRESTUpload(SharedPreferences prefs, EGVRecord... records) {
try {
String baseURL = prefs.getString("API Base URL", "");
String postURL = baseURL + (baseURL.endsWith("/") ? "" : "/") + "entries";
String baseURLSetting = prefs.getString("API Base URL", "");
String baseURL = baseURLSetting + (baseURLSetting.endsWith("/") ? "" : "/");

int apiVersion = 0;
if (baseURL.endsWith("/v1/")) apiVersion = 1;

String postURL = baseURL + "entries";
Log.i(TAG, "postURL: " + postURL);

HttpParams params = new BasicHttpParams();
Expand All @@ -76,12 +81,17 @@ private void doRESTUpload(SharedPreferences prefs, EGVRecord... records) {
HttpPost post = new HttpPost(postURL);

for (EGVRecord record : records) {
Date date = DATE_FORMAT.parse(record.displayTime);
JSONObject json = new JSONObject();
json.put("device", "dexcom");
json.put("timestamp", date.getTime());
json.put("bg", Integer.parseInt(record.bGValue));
json.put("direction", record.trend);

try {
if (apiVersion >= 1)
populateV1APIEntry(json, record);
else
populateLegacyAPIEntry(json, record);
} catch (Exception e) {
Log.w(TAG, "Unable to populate entry, apiVersion: " + apiVersion, e);
continue;
}

String jsonString = json.toString();

Expand All @@ -104,6 +114,22 @@ private void doRESTUpload(SharedPreferences prefs, EGVRecord... records) {
}
}

private void populateV1APIEntry(JSONObject json, EGVRecord record) throws Exception {
Date date = DATE_FORMAT.parse(record.displayTime);
json.put("device", "dexcom");
json.put("timestamp", date.getTime());
json.put("sgv", Integer.parseInt(record.bGValue));
json.put("direction", record.trend);
}

private void populateLegacyAPIEntry(JSONObject json, EGVRecord record) throws Exception {
Date date = DATE_FORMAT.parse(record.displayTime);
json.put("device", "dexcom");
json.put("timestamp", date.getTime());
json.put("bg", Integer.parseInt(record.bGValue));
json.put("direction", record.trend);
}

private void doMongoUpload(SharedPreferences prefs, EGVRecord... records) {

String dbURI = prefs.getString("MongoDB URI", null);
Expand Down