mirror/openscale
1
0
Fork 0
mirror of https://github.com/oliexdev/openScale.git synced 2025-08-28 18:49:56 +02:00
Code Issues Releases Wiki Activity

Publish api version and version code in data provider

Browse Source
This commit is contained in:
Erik Johansson
2018-09-27 21:41:20 +02:00
parent cb348f70f4
commit 12cb1d0faf
2 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
android_app/app/src/main/java/com/health/openscale/core/OpenScale.java
View File

@@ -607,6 +607,11 @@ public class OpenScale {
}
}
public Cursor getMetaCursor(int apiVersion, int versionCode) {
return appDB.query("SELECT ? AS apiVersion, ? as versionCode",
new Object[]{apiVersion, versionCode});
}
// As getScaleUserList(), but as a Cursor for export via a Content Provider.
public Cursor getScaleUserListCursor() {
return userDAO.selectAll();

16
android_app/app/src/main/java/com/health/openscale/core/database/ScaleDatabaseProvider.java
View File

@@ -45,13 +45,17 @@ import com.health.openscale.core.OpenScale;
public class ScaleDatabaseProvider extends android.content.ContentProvider {
private static final UriMatcher uriMatcher = new UriMatcher(UriMatcher.NO_MATCH);
private static final int API_VERSION = 1;
private static final String AUTHORITY = BuildConfig.APPLICATION_ID + ".provider";
private static final int MATCH_TYPE_USER_LIST = 1;
private static final int MATCH_TYPE_MEASUREMENT_LIST = 2;
private static final int MATCH_TYPE_META = 1;
private static final int MATCH_TYPE_USER_LIST = 2;
private static final int MATCH_TYPE_MEASUREMENT_LIST = 3;
static {
uriMatcher.addURI(AUTHORITY, "meta", MATCH_TYPE_META);
uriMatcher.addURI(AUTHORITY, "users", MATCH_TYPE_USER_LIST);
uriMatcher.addURI(AUTHORITY, "measurements/#", MATCH_TYPE_MEASUREMENT_LIST);
}
@@ -59,6 +63,9 @@ public class ScaleDatabaseProvider extends android.content.ContentProvider {
@Override
public String getType(Uri uri) {
switch (uriMatcher.match(uri)) {
case MATCH_TYPE_META:
return "vnd.android.cursor.item/vnd." + AUTHORITY + ".meta";
case MATCH_TYPE_USER_LIST:
return "vnd.android.cursor.dir/vnd." + AUTHORITY + ".user";
@@ -80,6 +87,11 @@ public class ScaleDatabaseProvider extends android.content.ContentProvider {
Cursor cursor;
switch (uriMatcher.match(uri)) {
case MATCH_TYPE_META:
cursor = OpenScale.getInstance().getMetaCursor(
API_VERSION, BuildConfig.VERSION_CODE);
break;
case MATCH_TYPE_USER_LIST:
cursor = OpenScale.getInstance().getScaleUserListCursor();
break;