This repository has been archived by the owner on Dec 23, 2024. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 657
[WIP][RFC] Introduce a ContentProvider for HR Data #1138
Open
boun
wants to merge
21
commits into
Freeyourgadget:master
Choose a base branch
from
boun:runnerup
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
21 commits
Select commit
Hold shift + click to select a range
86038a7
Fix Gradle Errors
1d1cd00
[WIP] Introduce a ContentProvider for HR Data
597076b
Fix Derp
7c3ee13
Squashed commit of the following:
8a03ff0
Inroduce a CONNECTING state in the state machine
e9b1a39
Extend the Contract Class
c32763d
Rename contentprovider
1fc49e9
Update Copyright Header
ac46be1
Change Logger to slf4j
c7331e5
Remove TODO -- copy it to pull request
9cd2f8e
Repeatedly punch .onEnableRealtimeHeartRateMeasurement
6269b41
[DO NOT MERGE] Comments
253c084
Rename Contentprovider + Introduce Permissions
f80e947
Fix Equals
d01e81b
Really Change Logger to slf4j :-)
26017dc
Use the correct broadcast receiver
89b0a35
Remove Android specific URI from ContractClass
3f451f2
Cleanup
7de5284
Revert "[DO NOT MERGE] Comments"
019edf3
Rename Methods
e51cf66
Remove onCreate guard, as Robolectric seems to have evolved
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
288 changes: 288 additions & 0 deletions
288
...src/main/java/nodomain/freeyourgadget/gadgetbridge/contentprovider/HRContentProvider.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,288 @@ | ||
/* Copyright (C) 2018 Benedikt Elser | ||
|
||
This file is part of Gadgetbridge. | ||
|
||
Gadgetbridge is free software: you can redistribute it and/or modify | ||
it under the terms of the GNU Affero General Public License as published | ||
by the Free Software Foundation, either version 3 of the License, or | ||
(at your option) any later version. | ||
|
||
Gadgetbridge is distributed in the hope that it will be useful, | ||
but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
GNU Affero General Public License for more details. | ||
|
||
You should have received a copy of the GNU Affero General Public License | ||
along with this program. If not, see <http://www.gnu.org/licenses/>. */ | ||
package nodomain.freeyourgadget.gadgetbridge.contentprovider; | ||
|
||
import android.content.BroadcastReceiver; | ||
import android.content.ContentProvider; | ||
import android.content.ContentValues; | ||
import android.content.Context; | ||
import android.content.Intent; | ||
import android.content.IntentFilter; | ||
import android.content.UriMatcher; | ||
import android.database.Cursor; | ||
import android.database.MatrixCursor; | ||
import android.net.Uri; | ||
import android.support.annotation.NonNull; | ||
import android.support.annotation.Nullable; | ||
import android.support.v4.content.LocalBroadcastManager; | ||
|
||
import org.slf4j.Logger; | ||
import org.slf4j.LoggerFactory; | ||
|
||
import java.util.List; | ||
import java.util.Timer; | ||
import java.util.TimerTask; | ||
|
||
import nodomain.freeyourgadget.gadgetbridge.GBApplication; | ||
import nodomain.freeyourgadget.gadgetbridge.devices.DeviceManager; | ||
import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice; | ||
import nodomain.freeyourgadget.gadgetbridge.model.ActivitySample; | ||
import nodomain.freeyourgadget.gadgetbridge.model.DeviceService; | ||
|
||
/** | ||
* A content Provider, which publishes read only RAW @see ActivitySample to other applications | ||
* <p> | ||
*/ | ||
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 REALTIME = 2; | ||
private static final int ACTIVITY_START = 3; | ||
private static final int ACTIVITY_STOP = 4; | ||
|
||
enum provider_state {ACTIVE, CONNECTING, INACTIVE}; | ||
provider_state state = provider_state.INACTIVE; | ||
|
||
private static final UriMatcher URI_MATCHER; | ||
private Timer punchTimer = new Timer(); | ||
|
||
static { | ||
URI_MATCHER = new UriMatcher(UriMatcher.NO_MATCH); | ||
URI_MATCHER.addURI(HRContentProviderContract.AUTHORITY, | ||
"devices", DEVICES_LIST); | ||
URI_MATCHER.addURI(HRContentProviderContract.AUTHORITY, | ||
"realtime", REALTIME); | ||
URI_MATCHER.addURI(HRContentProviderContract.AUTHORITY, | ||
"activity_start", ACTIVITY_START); | ||
URI_MATCHER.addURI(HRContentProviderContract.AUTHORITY, | ||
"activity_stop", ACTIVITY_STOP); | ||
} | ||
|
||
private ActivitySample buffered_sample = null; | ||
|
||
private GBDevice mGBDevice = null; | ||
|
||
private final BroadcastReceiver mReceiver = new BroadcastReceiver() { | ||
@Override | ||
public void onReceive(Context context, Intent intent) { | ||
String action = intent.getAction(); | ||
//LOG.info("Received Event, aciton: " + action); | ||
|
||
switch (action) { | ||
case GBDevice.ACTION_DEVICE_CHANGED: | ||
mGBDevice = intent.getParcelableExtra(GBDevice.EXTRA_DEVICE); | ||
LOG.debug("ACTION DEVICE CHANGED Got Device " + mGBDevice); | ||
|
||
// Rationale: If device was not connected | ||
// it should show up here after being connected | ||
// If the user wanted to switch on realtime traffic, but we first needed to connect it | ||
// we do it here | ||
if (mGBDevice.isConnected() && state == provider_state.CONNECTING) { | ||
LOG.debug("Device connected now, enabling realtime " + mGBDevice); | ||
|
||
enableContinuousRealtimeHeartRateMeasurement(); | ||
} | ||
break; | ||
case DeviceService.ACTION_REALTIME_SAMPLES: | ||
ActivitySample tmp_sample = (ActivitySample) intent.getSerializableExtra(DeviceService.EXTRA_REALTIME_SAMPLE); | ||
//LOG.debug("Got new Sample " + tmp_sample.getHeartRate()); | ||
if (tmp_sample.getHeartRate() == -1) | ||
break; | ||
|
||
buffered_sample = tmp_sample; | ||
// This notifies the observer | ||
getContext(). | ||
getContentResolver(). | ||
notifyChange(Uri.parse(HRContentProviderContract.REALTIME_URL), null); | ||
break; | ||
default: | ||
break; | ||
} | ||
|
||
} | ||
}; | ||
|
||
@Override | ||
public boolean onCreate() { | ||
LOG.info("Creating..."); | ||
IntentFilter filterLocal = new IntentFilter(); | ||
|
||
filterLocal.addAction(GBDevice.ACTION_DEVICE_CHANGED); | ||
filterLocal.addAction(DeviceService.ACTION_REALTIME_SAMPLES); | ||
|
||
LocalBroadcastManager.getInstance(this.getContext()).registerReceiver(mReceiver, filterLocal); | ||
|
||
return true; | ||
} | ||
|
||
@Override | ||
public Cursor query(@NonNull Uri uri, String[] projection, String selection, String[] selectionArgs, String sortOrder) { | ||
//LOG.info("query uri " + uri.toString()); | ||
MatrixCursor mc; | ||
|
||
switch (URI_MATCHER.match(uri)) { | ||
case DEVICES_LIST: | ||
LOG.info("Get DEVICES LIST"); | ||
return getDevicesList(); | ||
|
||
case ACTIVITY_START: | ||
LOG.info("Get ACTIVTY START"); | ||
return startRealtimeSampling(projection, selectionArgs); | ||
|
||
case ACTIVITY_STOP: | ||
LOG.info("Get ACTIVITY STOP"); | ||
return stopRealtimeSampling(projection, selectionArgs); | ||
|
||
case REALTIME: | ||
LOG.info("REALTIME"); | ||
return getRealtimeSample(projection, selectionArgs); | ||
} | ||
return null; | ||
} | ||
|
||
@Nullable | ||
private Cursor getDevicesList() { | ||
MatrixCursor mc; | ||
DeviceManager deviceManager = ((GBApplication) (this.getContext())).getDeviceManager(); | ||
List<GBDevice> l = deviceManager.getDevices(); | ||
if (l == null) { | ||
return null; | ||
} | ||
LOG.info(String.format("listing %d devices", l.size())); | ||
|
||
mc = new MatrixCursor(HRContentProviderContract.deviceColumnNames); | ||
for (GBDevice dev : l) { | ||
mc.addRow(new Object[]{dev.getName(), dev.getModel(), dev.getAddress()}); | ||
} | ||
return mc; | ||
} | ||
|
||
@NonNull | ||
private Cursor startRealtimeSampling(String[] projection, String[] args) { | ||
MatrixCursor mc; | ||
this.state = provider_state.CONNECTING; | ||
|
||
GBDevice targetDevice = getDevice((args != null) ? args[0] : ""); | ||
if (targetDevice != null && targetDevice.isConnected()) { | ||
enableContinuousRealtimeHeartRateMeasurement(); | ||
mc = new MatrixCursor(HRContentProviderContract.activityColumnNames); | ||
mc.addRow(new String[]{"OK", "Connected"}); | ||
} else { | ||
GBApplication.deviceService().connect(targetDevice); | ||
mc = new MatrixCursor(HRContentProviderContract.activityColumnNames); | ||
mc.addRow(new String[]{"OK", "Connecting"}); | ||
} | ||
|
||
return mc; | ||
} | ||
|
||
@NonNull | ||
private Cursor stopRealtimeSampling(String[] projection, String[] args) { | ||
MatrixCursor mc; | ||
this.state = provider_state.INACTIVE; | ||
|
||
GBApplication.deviceService().onEnableRealtimeSteps(false); | ||
GBApplication.deviceService().onEnableRealtimeHeartRateMeasurement(false); | ||
mc = new MatrixCursor(HRContentProviderContract.activityColumnNames); | ||
mc.addRow(new String[]{"OK", "No error"}); | ||
punchTimer.cancel(); | ||
punchTimer = new Timer(); | ||
return mc; | ||
} | ||
|
||
|
||
private void enableContinuousRealtimeHeartRateMeasurement() { | ||
this.state = provider_state.ACTIVE; | ||
GBApplication.deviceService().onEnableRealtimeSteps(true); | ||
GBApplication.deviceService().onEnableRealtimeHeartRateMeasurement(true); | ||
|
||
punchTimer.scheduleAtFixedRate(new TimerTask() { | ||
@Override | ||
public void run() { | ||
LOG.debug("punching the deviceService..."); | ||
// As seen in LiveActivityFragment: | ||
// have to enable it again and again to keep it measureing | ||
GBApplication.deviceService().onEnableRealtimeHeartRateMeasurement(true); | ||
} | ||
|
||
}, 1000 * 10, 1000); | ||
// Start after 10 seconds, repeat each second | ||
} | ||
|
||
@NonNull | ||
private Cursor getRealtimeSample(String[] projection, String[] args) { | ||
MatrixCursor mc; | ||
mc = new MatrixCursor(HRContentProviderContract.realtimeColumnNames); | ||
if (buffered_sample != null) | ||
mc.addRow(new Object[]{"OK", buffered_sample.getHeartRate(), buffered_sample.getSteps(), mGBDevice != null ? mGBDevice.getBatteryLevel() : 99}); | ||
return mc; | ||
} | ||
|
||
// Returns the requested device. If it is not found | ||
// it tries to return the "current" device (if i understand it correctly) | ||
@Nullable | ||
private GBDevice getDevice(String deviceAddress) { | ||
DeviceManager deviceManager; | ||
|
||
if (mGBDevice != null && mGBDevice.getAddress().equals(deviceAddress)) { | ||
LOG.info(String.format("Found device mGBDevice %s", mGBDevice)); | ||
|
||
return mGBDevice; | ||
} | ||
|
||
deviceManager = ((GBApplication) (this.getContext())).getDeviceManager(); | ||
for (GBDevice device : deviceManager.getDevices()) { | ||
if (deviceAddress.equals(device.getAddress())) { | ||
LOG.info(String.format("Found device device %s", device)); | ||
return device; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Please use the slf4j logger instead of Log.i, Log, e, etc. |
||
} | ||
} | ||
LOG.info(String.format("Did not find device returning selected %s", deviceManager.getSelectedDevice())); | ||
return deviceManager.getSelectedDevice(); | ||
} | ||
|
||
@Override | ||
public String getType(@NonNull Uri uri) { | ||
LOG.error("getType uri " + uri); | ||
return null; | ||
} | ||
|
||
@Override | ||
public Uri insert(@NonNull Uri uri, ContentValues values) { | ||
return null; | ||
} | ||
|
||
@Override | ||
public int delete(@NonNull Uri uri, String selection, String[] selectionArgs) { | ||
return 0; | ||
} | ||
|
||
@Override | ||
public int update(@NonNull Uri uri, ContentValues values, String selection, String[] | ||
selectionArgs) { | ||
return 0; | ||
} | ||
|
||
// Das ist eine debugging funktion | ||
@Override | ||
public void shutdown() { | ||
LocalBroadcastManager.getInstance(this.getContext()).unregisterReceiver(mReceiver); | ||
super.shutdown(); | ||
} | ||
|
||
} |
41 changes: 41 additions & 0 deletions
41
.../java/nodomain/freeyourgadget/gadgetbridge/contentprovider/HRContentProviderContract.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,41 @@ | ||
/* Copyright (C) 2018 Benedikt Elser | ||
|
||
This file is part of Gadgetbridge. | ||
|
||
Gadgetbridge is free software: you can redistribute it and/or modify | ||
it under the terms of the GNU Affero General Public License as published | ||
by the Free Software Foundation, either version 3 of the License, or | ||
(at your option) any later version. | ||
|
||
Gadgetbridge is distributed in the hope that it will be useful, | ||
but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
GNU Affero General Public License for more details. | ||
|
||
You should have received a copy of the GNU Affero General Public License | ||
along with this program. If not, see <http://www.gnu.org/licenses/>. */ | ||
package nodomain.freeyourgadget.gadgetbridge.contentprovider; | ||
|
||
public final class HRContentProviderContract { | ||
|
||
public static final String COLUMN_STATUS = "Status"; | ||
public static final String COLUMN_NAME = "Name"; | ||
public static final String COLUMN_ADDRESS = "Address"; | ||
public static final String COLUMN_MODEL = "Model"; | ||
public static final String COLUMN_MESSAGE = "Message"; | ||
public static final String COLUMN_HEARTRATE = "HeartRate"; | ||
public static final String COLUMN_STEPS = "Steps"; | ||
public static final String COLUMN_BATTERY = "Battery"; | ||
|
||
public static final String[] deviceColumnNames = new String[]{COLUMN_NAME, COLUMN_MODEL, COLUMN_ADDRESS}; | ||
public static final String[] activityColumnNames = new String[]{COLUMN_STATUS, COLUMN_MESSAGE}; | ||
public static final String[] realtimeColumnNames = new String[]{COLUMN_STATUS, COLUMN_HEARTRATE, COLUMN_STEPS, COLUMN_BATTERY}; | ||
|
||
public static final String AUTHORITY = "nodomain.freeyourgadget.gadgetbridge.realtimesamples.provider"; | ||
|
||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. com.gadgetbridge again.. |
||
public static final String ACTIVITY_START_URL = "content://" + AUTHORITY + "/activity_start"; | ||
public static final String ACTIVITY_STOP_URL = "content://" + AUTHORITY + "/activity_stop"; | ||
public static final String REALTIME_URL = "content://" + AUTHORITY + "/realtime"; | ||
public static final String DEVICES_URL = "content://" + AUTHORITY + "/devices"; | ||
|
||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Better use HeartRateUtils.isValidHeartRateValue() here.