mirror/openscale
1
0
Fork 0
mirror of https://github.com/oliexdev/openScale.git synced 2025-08-26 17:54:50 +02:00
Code Issues Releases Wiki Activity

Don't hard code application id

Browse Source 
As commented in review of #304
This commit is contained in:
Erik Johansson
2018-09-19 18:51:31 +02:00
parent 99cd6e6e1a
commit 16b2818064
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
android_app/app/src/main/AndroidManifest.xml
View File

@@ -13,7 +13,7 @@
Marked "dangerous" so that explicit user approval is required to read this data, not 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. --> just the permission implied from installing the app from the Play Store. -->
<permission <permission
android:name="com.health.openscale.READ_DATA" android:name="${applicationId}.READ_DATA"
android:description="@string/permission_read_data_description" android:description="@string/permission_read_data_description"
android:label="@string/permission_read_data_label" android:label="@string/permission_read_data_label"
android:protectionLevel="dangerous" /> android:protectionLevel="dangerous" />
@@ -70,10 +70,10 @@
</provider> </provider>
<provider <provider
android:name=".core.database.ScaleDatabaseProvider" android:name=".core.database.ScaleDatabaseProvider"
android:authorities="com.health.openscale.provider" android:authorities="${applicationId}.provider"
android:enabled="true" android:enabled="true"
android:exported="true" android:exported="true"
android:readPermission="com.health.openscale.READ_DATA"> android:readPermission="${applicationId}.READ_DATA">
</provider> </provider>
</application> </application>

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

@@ -12,7 +12,8 @@
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/> * 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.ContentValues;
import android.content.Context; import android.content.Context;
@@ -20,6 +21,7 @@ import android.content.UriMatcher;
import android.database.Cursor; import android.database.Cursor;
import android.net.Uri; import android.net.Uri;
import com.health.openscale.BuildConfig;
import com.health.openscale.core.OpenScale; import com.health.openscale.core.OpenScale;
/** /**
@@ -44,7 +46,7 @@ import com.health.openscale.core.OpenScale;
public class ScaleDatabaseProvider extends android.content.ContentProvider { public class ScaleDatabaseProvider extends android.content.ContentProvider {
private static final UriMatcher uriMatcher = new UriMatcher(UriMatcher.NO_MATCH); 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_LIST = 1;
private static final int MATCH_TYPE_USER_ENTRY = 2; 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) { public String getType(Uri uri) {
switch (uriMatcher.match(uri)) { switch (uriMatcher.match(uri)) {
case MATCH_TYPE_USER_LIST: 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: 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: 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: default:
return null; return null;