From bb0f3f455ada2666b83af2bbcfc67f972b3d88d5 Mon Sep 17 00:00:00 2001
From: Erik Johansson <erik@ejohansson.se>
Date: Sun, 30 Sep 2018 20:31:08 +0200
Subject: [PATCH] Make meta URI use MatrixCursor to provide data

---
 .../main/java/com/health/openscale/core/OpenScale.java    | 5 -----
 .../openscale/core/database/ScaleDatabaseProvider.java    | 8 +++++---
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/android_app/app/src/main/java/com/health/openscale/core/OpenScale.java b/android_app/app/src/main/java/com/health/openscale/core/OpenScale.java
index 59e8ca62..619d238b 100644
--- a/android_app/app/src/main/java/com/health/openscale/core/OpenScale.java
+++ b/android_app/app/src/main/java/com/health/openscale/core/OpenScale.java
@@ -607,11 +607,6 @@ 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();
diff --git a/android_app/app/src/main/java/com/health/openscale/core/database/ScaleDatabaseProvider.java b/android_app/app/src/main/java/com/health/openscale/core/database/ScaleDatabaseProvider.java
index 06408076..d9df2e1c 100644
--- a/android_app/app/src/main/java/com/health/openscale/core/database/ScaleDatabaseProvider.java
+++ b/android_app/app/src/main/java/com/health/openscale/core/database/ScaleDatabaseProvider.java
@@ -20,6 +20,7 @@ import android.content.ContentValues;
 import android.content.Context;
 import android.content.UriMatcher;
 import android.database.Cursor;
+import android.database.MatrixCursor;
 import android.net.Uri;
 
 import com.health.openscale.BuildConfig;
@@ -37,7 +38,8 @@ import com.health.openscale.core.OpenScale;
  *
  * The following URIs are supported:
  * <ul>
- *     <li><code>content://com.health.openscale.provider/user</code>: list all users.</li>
+ *     <li><code>content://com.health.openscale.provider/meta</code>: API and openScale version.</li>
+ *     <li><code>content://com.health.openscale.provider/users</code>: list all users.</li>
  *     <li><code>content://com.health.openscale.provider/measurements/$ID</code>:
  *         retrieve all measurements for the supplied user ID.</li>
  * </ul>
@@ -88,8 +90,8 @@ public class ScaleDatabaseProvider extends android.content.ContentProvider {
 
         switch (uriMatcher.match(uri)) {
             case MATCH_TYPE_META:
-                cursor = OpenScale.getInstance().getMetaCursor(
-                        API_VERSION, BuildConfig.VERSION_CODE);
+                cursor = new MatrixCursor(new String[]{"apiVersion", "versionCode"}, 1);
+                ((MatrixCursor) cursor).addRow(new Object[]{API_VERSION, BuildConfig.VERSION_CODE});
                 break;
 
             case MATCH_TYPE_USER_LIST: