demus/Gadgetbridge
1
0
Fork 0
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge.git synced 2025-01-26 16:41:43 +01:00
Code Issues 1 Packages Projects Releases Wiki Activity

Change Logger to slf4j

Browse Source
This commit is contained in:
Benedikt Elser 2018-07-09 21:36:37 +02:00
parent 1fc49e9258
commit ac46be1476
2 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/contentprovider/HRContentProvider.java
View File

@ -31,6 +31,9 @@ import android.support.annotation.Nullable;
import android.support.v4.content.LocalBroadcastManager; import android.support.v4.content.LocalBroadcastManager;
import android.util.Log; import android.util.Log;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.List; import java.util.List;
import nodomain.freeyourgadget.gadgetbridge.GBApplication; import nodomain.freeyourgadget.gadgetbridge.GBApplication;
@ -50,6 +53,7 @@ import nodomain.freeyourgadget.gadgetbridge.model.DeviceService;
* (Is the Selected device the current connected device??) * (Is the Selected device the current connected device??)
*/ */
public class HRContentProvider extends ContentProvider { public class HRContentProvider extends ContentProvider {
private static final Logger LOG = LoggerFactory.getLogger(HRContentProvider.class);
private static final int DEVICES_LIST = 1; private static final int DEVICES_LIST = 1;
private static final int REALTIME = 2; private static final int REALTIME = 2;
@ -82,18 +86,18 @@ public class HRContentProvider extends ContentProvider {
@Override @Override
public void onReceive(Context context, Intent intent) { public void onReceive(Context context, Intent intent) {
String action = intent.getAction(); String action = intent.getAction();
//Log.i(HRContentProvider.class.getName(), "Received Event, aciton: " + action); //LOG.info(HRContentProvider.class.getName(), "Received Event, aciton: " + action);
switch (action) { switch (action) {
case GBDevice.ACTION_DEVICE_CHANGED: case GBDevice.ACTION_DEVICE_CHANGED:
mGBDevice = intent.getParcelableExtra(GBDevice.EXTRA_DEVICE); mGBDevice = intent.getParcelableExtra(GBDevice.EXTRA_DEVICE);
Log.d(HRContentProvider.class.toString(), "Got Device " + mGBDevice); LOG.debug(HRContentProvider.class.toString(), "Got Device " + mGBDevice);
// Rationale: If device was not connected // Rationale: If device was not connected
// it should show up here after beeing connected // it should show up here after beeing connected
// If the user wanted to switch on realtime traffic, but we first needed to connect it // If the user wanted to switch on realtime traffic, but we first needed to connect it
// we do it here // we do it here
if (mGBDevice.isConnected() && state == provider_state.CONNECTING) { if (mGBDevice.isConnected() && state == provider_state.CONNECTING) {
Log.d(HRContentProvider.class.toString(), "Device connected now, enabling realtime " + mGBDevice); LOG.debug(HRContentProvider.class.toString(), "Device connected now, enabling realtime " + mGBDevice);
state = provider_state.ACTIVE; state = provider_state.ACTIVE;
GBApplication.deviceService().onEnableRealtimeSteps(true); GBApplication.deviceService().onEnableRealtimeSteps(true);
@ -120,7 +124,7 @@ public class HRContentProvider extends ContentProvider {
@Override @Override
public boolean onCreate() { public boolean onCreate() {
Log.i(HRContentProvider.class.getName(), "Creating..."); LOG.info(HRContentProvider.class.getName(), "Creating...");
IntentFilter filterLocal = new IntentFilter(); IntentFilter filterLocal = new IntentFilter();
filterLocal.addAction(GBDevice.ACTION_DEVICE_CHANGED); filterLocal.addAction(GBDevice.ACTION_DEVICE_CHANGED);
@ -139,7 +143,7 @@ public class HRContentProvider extends ContentProvider {
@Override @Override
public Cursor query(@NonNull Uri uri, String[] projection, String selection, String[] selectionArgs, String sortOrder) { public Cursor query(@NonNull Uri uri, String[] projection, String selection, String[] selectionArgs, String sortOrder) {
//Log.i(HRContentProvider.class.getName(), "query uri " + uri.toString()); //LOG.info(HRContentProvider.class.getName(), "query uri " + uri.toString());
MatrixCursor mc; MatrixCursor mc;
DeviceManager deviceManager; DeviceManager deviceManager;
@ -150,7 +154,7 @@ public class HRContentProvider extends ContentProvider {
if (l == null) { if (l == null) {
return null; return null;
} }
Log.i(HRContentProvider.class.getName(), String.format("listing %d devices", l.size())); LOG.info(HRContentProvider.class.getName(), String.format("listing %d devices", l.size()));
mc = new MatrixCursor(HRContentProviderContract.deviceColumnNames); mc = new MatrixCursor(HRContentProviderContract.deviceColumnNames);
for (GBDevice dev : l) { for (GBDevice dev : l) {
@ -160,7 +164,7 @@ public class HRContentProvider extends ContentProvider {
case ACTIVITY_START: case ACTIVITY_START:
this.state = provider_state.CONNECTING; this.state = provider_state.CONNECTING;
Log.i(HRContentProvider.class.getName(), "Get ACTIVTY START"); LOG.info(HRContentProvider.class.getName(), "Get ACTIVTY START");
GBDevice targetDevice = getDevice((selectionArgs != null) ? selectionArgs[0] : ""); GBDevice targetDevice = getDevice((selectionArgs != null) ? selectionArgs[0] : "");
if (targetDevice != null && targetDevice.isConnected()) { if (targetDevice != null && targetDevice.isConnected()) {
this.state = provider_state.ACTIVE; this.state = provider_state.ACTIVE;
@ -178,7 +182,7 @@ public class HRContentProvider extends ContentProvider {
case ACTIVITY_STOP: case ACTIVITY_STOP:
this.state = provider_state.INACTIVE; this.state = provider_state.INACTIVE;
Log.i(HRContentProvider.class.getName(), "Get ACTIVITY STOP"); LOG.info(HRContentProvider.class.getName(), "Get ACTIVITY STOP");
GBApplication.deviceService().onEnableRealtimeSteps(false); GBApplication.deviceService().onEnableRealtimeSteps(false);
GBApplication.deviceService().onEnableRealtimeHeartRateMeasurement(false); GBApplication.deviceService().onEnableRealtimeHeartRateMeasurement(false);
mc = new MatrixCursor(HRContentProviderContract.activityColumnNames); mc = new MatrixCursor(HRContentProviderContract.activityColumnNames);
@ -186,7 +190,7 @@ public class HRContentProvider extends ContentProvider {
return mc; return mc;
case REALTIME: case REALTIME:
//String sample_string = (buffered_sample == null) ? "" : buffered_sample.toString(); //String sample_string = (buffered_sample == null) ? "" : buffered_sample.toString();
//Log.e(HRContentProvider.class.getName(), String.format("Get REALTIME buffered sample %s", sample_string)); //LOG.error(HRContentProvider.class.getName(), String.format("Get REALTIME buffered sample %s", sample_string));
mc = new MatrixCursor(HRContentProviderContract.realtimeColumnNames); mc = new MatrixCursor(HRContentProviderContract.realtimeColumnNames);
if (buffered_sample != null) if (buffered_sample != null)
mc.addRow(new Object[]{"OK", buffered_sample.getHeartRate(), buffered_sample.getSteps(), mGBDevice != null ? mGBDevice.getBatteryLevel() : 99}); mc.addRow(new Object[]{"OK", buffered_sample.getHeartRate(), buffered_sample.getSteps(), mGBDevice != null ? mGBDevice.getBatteryLevel() : 99});
@ -202,7 +206,7 @@ public class HRContentProvider extends ContentProvider {
DeviceManager deviceManager; DeviceManager deviceManager;
if (mGBDevice != null && mGBDevice.getAddress() == deviceAddress) { if (mGBDevice != null && mGBDevice.getAddress() == deviceAddress) {
Log.i(HRContentProvider.class.getName(), String.format("Found device mGBDevice %s", mGBDevice)); LOG.info(HRContentProvider.class.getName(), String.format("Found device mGBDevice %s", mGBDevice));
return mGBDevice; return mGBDevice;
} }
@ -210,17 +214,17 @@ public class HRContentProvider extends ContentProvider {
deviceManager = ((GBApplication) (this.getContext())).getDeviceManager(); deviceManager = ((GBApplication) (this.getContext())).getDeviceManager();
for (GBDevice device : deviceManager.getDevices()) { for (GBDevice device : deviceManager.getDevices()) {
if (deviceAddress.equals(device.getAddress())) { if (deviceAddress.equals(device.getAddress())) {
Log.i(HRContentProvider.class.getName(), String.format("Found device device %s", device)); LOG.info(HRContentProvider.class.getName(), String.format("Found device device %s", device));
return device; return device;
} }
} }
Log.i(HRContentProvider.class.getName(), String.format("Did not find device returning selected %s", deviceManager.getSelectedDevice())); LOG.info(HRContentProvider.class.getName(), String.format("Did not find device returning selected %s", deviceManager.getSelectedDevice()));
return deviceManager.getSelectedDevice(); return deviceManager.getSelectedDevice();
} }
@Override @Override
public String getType(@NonNull Uri uri) { public String getType(@NonNull Uri uri) {
Log.e(HRContentProvider.class.getName(), "getType uri " + uri); LOG.error(HRContentProvider.class.getName(), "getType uri " + uri);
return null; return null;
} }

10
app/src/test/java/nodomain/freeyourgadget/gadgetbridge/database/SampleProviderTest.java
View File

@ -8,7 +8,6 @@ import android.database.ContentObserver;
import android.database.Cursor; import android.database.Cursor;
import android.net.Uri; import android.net.Uri;
import android.preference.PreferenceManager; import android.preference.PreferenceManager;
import android.util.Log;
import org.junit.Test; import org.junit.Test;
@ -36,9 +35,12 @@ import static org.robolectric.Shadows.shadowOf;
import org.robolectric.RuntimeEnvironment; import org.robolectric.RuntimeEnvironment;
import org.robolectric.shadows.ShadowContentResolver; import org.robolectric.shadows.ShadowContentResolver;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class SampleProviderTest extends TestBase { public class SampleProviderTest extends TestBase {
private static final Logger LOG = LoggerFactory.getLogger(SampleProviderTest.class);
private GBDevice dummyGBDevice; private GBDevice dummyGBDevice;
private ContentResolver mContentResolver; private ContentResolver mContentResolver;
@ -204,7 +206,7 @@ public class SampleProviderTest extends TestBase {
for (int i = 0; i < 10; i++) { for (int i = 0; i < 10; i++) {
MiBandActivitySample sample = createSample(sampleProvider, MiBandSampleProvider.TYPE_ACTIVITY, 100 + i * 50, 10, 60 + i * 5, 1000 * i, user, device); MiBandActivitySample sample = createSample(sampleProvider, MiBandSampleProvider.TYPE_ACTIVITY, 100 + i * 50, 10, 60 + i * 5, 1000 * i, user, device);
//Log.d(SampleProviderTest.class.getName(), "Sending sample " + sample.toString()); //LOG.debug(SampleProviderTest.class.getName(), "Sending sample " + sample.toString());
Intent intent = new Intent(DeviceService.ACTION_REALTIME_SAMPLES) Intent intent = new Intent(DeviceService.ACTION_REALTIME_SAMPLES)
.putExtra(DeviceService.EXTRA_REALTIME_SAMPLE, sample); .putExtra(DeviceService.EXTRA_REALTIME_SAMPLE, sample);
app.sendBroadcast(intent); app.sendBroadcast(intent);
@ -286,7 +288,7 @@ public class SampleProviderTest extends TestBase {
@Override @Override
public void onChange(boolean selfChange, Uri uri) { public void onChange(boolean selfChange, Uri uri) {
super.onChange(selfChange, uri); super.onChange(selfChange, uri);
//Log.e(SampleProviderTest.class.getName(), "Changed " + uri.toString()); //LOG.error(SampleProviderTest.class.getName(), "Changed " + uri.toString());
Cursor cursor = mContentResolver.query(HRContentProviderContract.REALTIME_URI, null, null, null, null); Cursor cursor = mContentResolver.query(HRContentProviderContract.REALTIME_URI, null, null, null, null);
if (cursor.moveToFirst()) { if (cursor.moveToFirst()) {
do { do {
@ -294,7 +296,7 @@ public class SampleProviderTest extends TestBase {
int heartRate = cursor.getInt(1); int heartRate = cursor.getInt(1);
assertEquals("OK", status); assertEquals("OK", status);
assertEquals(60 + 5*numObserved, heartRate); assertEquals(60 + 5*numObserved, heartRate);
Log.i("test", "HeartRate " + heartRate); LOG.info("test", "HeartRate " + heartRate);
} while (cursor.moveToNext()); } while (cursor.moveToNext());
} }
numObserved++; numObserved++;