Fix conflict between different product flavors (#1726)

* Fix conflict between different product flavors so that beta and prod apps could coexist

* Fix category content provider
This commit is contained in:
Vivek Maskara 2018-07-19 21:33:28 +05:30 committed by Josephine Lim
parent 2d831c089d
commit 25b463901f
21 changed files with 120 additions and 101 deletions

View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<account-authenticator xmlns:android="http://schemas.android.com/apk/res/android"
android:accountType="fr.free.nrw.commons"
android:accountType="@string/account_type"
android:icon="@drawable/ic_launcher"
android:label="@string/app_name"
android:smallIcon="@drawable/ic_launcher" />

View file

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<sync-adapter xmlns:android="http://schemas.android.com/apk/res/android"
android:contentAuthority="fr.free.nrw.commons.contributions.contentprovider"
android:accountType="fr.free.nrw.commons"
android:contentAuthority="@string/contribution_authority"
android:accountType="@string/account_type"
android:supportsUploading="false"
android:userVisible="true"
android:isAlwaysSyncable="true"

View file

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<sync-adapter xmlns:android="http://schemas.android.com/apk/res/android"
android:contentAuthority="fr.free.nrw.commons.modifications.contentprovider"
android:accountType="fr.free.nrw.commons"
android:contentAuthority="@string/modification_authority"
android:accountType="@string/account_type"
android:supportsUploading="true"
android:userVisible="true"
android:isAlwaysSyncable="true"