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

Use the correct broadcast receiver

Browse Source 
-.-
This commit is contained in:
Benedikt Elser 2018-07-10 16:15:15 +02:00
parent d01e81b545
commit 26017dce2c
2 changed files with 25 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -40,6 +40,7 @@ import java.util.TimerTask;
import java.util.concurrent.TimeUnit;
import nodomain.freeyourgadget.gadgetbridge.GBApplication;
import nodomain.freeyourgadget.gadgetbridge.GBEnvironment;
import nodomain.freeyourgadget.gadgetbridge.devices.DeviceManager;
import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
import nodomain.freeyourgadget.gadgetbridge.model.ActivitySample;
@ -81,7 +82,7 @@ public class HRContentProvider extends ContentProvider {
private GBDevice mGBDevice = null;
protected final BroadcastReceiver mReceiver = new BroadcastReceiver() {
private final BroadcastReceiver mReceiver = new BroadcastReceiver() {
@Override
public void onReceive(Context context, Intent intent) {
String action = intent.getAction();
@ -132,9 +133,6 @@ public class HRContentProvider extends ContentProvider {
LocalBroadcastManager.getInstance(this.getContext()).registerReceiver(mReceiver, filterLocal);
//TODO Do i need only for testing or also in production?
this.getContext().registerReceiver(mReceiver, filterLocal);
//TODO: This crashes the app. Seems like device Manager is not here yet
//mGBDevice = ((GBApplication) this.getContext()).getDeviceManager().getSelectedDevice();

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

@ -1,6 +1,5 @@
package nodomain.freeyourgadget.gadgetbridge.database;
import android.content.BroadcastReceiver;
import android.content.ContentResolver;
import android.content.Intent;
import android.content.SharedPreferences;
@ -8,13 +7,18 @@ import android.database.ContentObserver;
import android.database.Cursor;
import android.net.Uri;
import android.preference.PreferenceManager;
import android.support.v4.content.LocalBroadcastManager;
import android.util.Log;
import org.junit.Ignore;
import org.junit.Test;
import java.util.List;
import nodomain.freeyourgadget.gadgetbridge.GBApplication;
import nodomain.freeyourgadget.gadgetbridge.contentprovider.HRContentProvider;
import nodomain.freeyourgadget.gadgetbridge.contentprovider.HRContentProviderContract;
import nodomain.freeyourgadget.gadgetbridge.devices.DeviceManager;
import nodomain.freeyourgadget.gadgetbridge.devices.SampleProvider;
import nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandConst;
import nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandSampleProvider;
@ -31,10 +35,9 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
import static org.robolectric.Shadows.shadowOf;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.shadows.ShadowContentResolver;
import org.robolectric.shadows.ShadowLog;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -48,10 +51,13 @@ public class SampleProviderTest extends TestBase {
@Override
public void setUp() throws Exception {
super.setUp();
ShadowLog.stream = System.out; // show logger’s output
dummyGBDevice = createDummyGDevice("00:00:00:00:10");
mContentResolver = app.getContentResolver();
HRContentProvider provider = new HRContentProvider();
// Stuff context into provider
provider.attachInfo(app.getApplicationContext(), null);
@ -209,11 +215,12 @@ public class SampleProviderTest extends TestBase {
//LOG.debug("Sending sample " + sample.getHeartRate());
Intent intent = new Intent(DeviceService.ACTION_REALTIME_SAMPLES)
.putExtra(DeviceService.EXTRA_REALTIME_SAMPLE, sample);
app.sendBroadcast(intent);
LocalBroadcastManager.getInstance(app.getApplicationContext()).sendBroadcast(intent);
}
}
//@Ignore
@Test
public void testContentProvider() {
@ -228,6 +235,7 @@ public class SampleProviderTest extends TestBase {
assertNotNull("The ContentResolver may not be null", mContentResolver);
Cursor cursor;
/*
* Test the device uri
@ -304,20 +312,20 @@ public class SampleProviderTest extends TestBase {
A1 a1 = new A1();
mContentResolver.registerContentObserver(HRContentProviderContract.REALTIME_URI, false, a1);
generateSampleStream(sampleProvider);
List<Intent> l = shadowOf(RuntimeEnvironment.application).getBroadcastIntents();
assertEquals(10, l.size());
for (Intent i : l)
assertEquals(i.getAction(), DeviceService.ACTION_REALTIME_SAMPLES);
List<BroadcastReceiver> r = shadowOf(RuntimeEnvironment.application).getReceiversForIntent(l.get(0));
assertEquals(1, r.size());
assertEquals(a1.numObserved, 10);
}
@Test
public void testDeviceManager() {
DeviceManager manager = ((GBApplication) (this.getContext())).getDeviceManager();
Log.d("---------------", "-----------------------------------");
System.out.println("-----------------------------------------");
assertNotNull(((GBApplication) GBApplication.getContext()).getDeviceManager());
LOG.debug(manager.toString());
}
}