From 16b2818064c84f4743ae04d295f4261bd9beba23 Mon Sep 17 00:00:00 2001
From: Erik Johansson <erik@ejohansson.se>
Date: Wed, 19 Sep 2018 18:51:31 +0200
Subject: [PATCH] Don't hard code application id

As commented in review of #304
---
 android_app/app/src/main/AndroidManifest.xml         |  6 +++---
 .../core/database/ScaleDatabaseProvider.java         | 12 +++++++-----
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/android_app/app/src/main/AndroidManifest.xml b/android_app/app/src/main/AndroidManifest.xml
index 1e1d5fdb..afaa2041 100644
--- a/android_app/app/src/main/AndroidManifest.xml
+++ b/android_app/app/src/main/AndroidManifest.xml
@@ -13,7 +13,7 @@
          Marked "dangerous" so that explicit user approval is required to read this data, not
          just the permission implied from installing the app from the Play Store. -->
     <permission
-        android:name="com.health.openscale.READ_DATA"
+        android:name="${applicationId}.READ_DATA"
         android:description="@string/permission_read_data_description"
         android:label="@string/permission_read_data_label"
         android:protectionLevel="dangerous" />
@@ -70,10 +70,10 @@
         </provider>
         <provider
             android:name=".core.database.ScaleDatabaseProvider"
-            android:authorities="com.health.openscale.provider"
+            android:authorities="${applicationId}.provider"
             android:enabled="true"
             android:exported="true"
-            android:readPermission="com.health.openscale.READ_DATA">
+            android:readPermission="${applicationId}.READ_DATA">
         </provider>
     </application>
 
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 fed3f258..85801983 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
@@ -12,7 +12,8 @@
  *
  *    You should have received a copy of the GNU General Public License
  *    along with this program.  If not, see <http://www.gnu.org/licenses/>
- */package com.health.openscale.core.database;
+ */
+package com.health.openscale.core.database;
 
 import android.content.ContentValues;
 import android.content.Context;
@@ -20,6 +21,7 @@ import android.content.UriMatcher;
 import android.database.Cursor;
 import android.net.Uri;
 
+import com.health.openscale.BuildConfig;
 import com.health.openscale.core.OpenScale;
 
 /**
@@ -44,7 +46,7 @@ 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 String AUTHORITY = "com.health.openscale.provider";
+    private static final String AUTHORITY = BuildConfig.APPLICATION_ID + ".provider";
 
     private static final int MATCH_TYPE_USER_LIST = 1;
     private static final int MATCH_TYPE_USER_ENTRY = 2;
@@ -61,13 +63,13 @@ public class ScaleDatabaseProvider extends android.content.ContentProvider {
     public String getType(Uri uri) {
         switch (uriMatcher.match(uri)) {
             case MATCH_TYPE_USER_LIST:
-                return "vnd.android.cursor.dir/vnd.com.health.openscale.provider.user";
+                return "vnd.android.cursor.dir/vnd." + AUTHORITY + ".user";
 
             case MATCH_TYPE_USER_ENTRY:
-                return "vnd.android.cursor.item/vnd.com.health.openscale.provider.user";
+                return "vnd.android.cursor.item/vnd." + AUTHORITY + ".user";
 
             case MATCH_TYPE_USER_MEASUREMENTS:
-                return "vnd.android.cursor.item/vnd.com.health.openscale.provider.measurement";
+                return "vnd.android.cursor.item/vnd." + AUTHORITY + ".measurement";
 
             default:
                 return null;