Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 79381874 authored by Romain Hunault's avatar Romain Hunault 💻
Browse files

Merge branch 'tasks_app_fix' into 'master' 

Rename permission name from "org.dmfs" to "foundation.e" to prevent Tasks...

See merge request e/apps/tasks!12
parents f9a45a38 e03ee291

opentasks-provider/src/main/AndroidManifest.xml

+18 −18
Original line number Diff line number Diff line
@@ -3,22 +3,22 @@ 
        package="org.dmfs.tasks.provider">



    <permission-group

            android:name="org.dmfs.tasks.permissiongroup.Tasks"

            android:label="@string/opentasks_provider_label"

            android:name="foundation.e.tasks.permissiongroup.Tasks"

            android:description="@string/opentasks_permission_group_description_tasks"

            android:icon="@drawable/ic_24_opentasks"

            android:description="@string/opentasks_permission_group_description_tasks"/>

            android:label="@string/opentasks_provider_label" />



    <permission

            android:name="org.dmfs.permission.READ_TASKS"

            android:name="foundation.e.permission.READ_TASKS"

            android:description="@string/opentasks_permission_description_read_tasks"

            android:label="@string/opentasks_permission_read_tasks"

            android:permissionGroup="org.dmfs.tasks.permissiongroup.Tasks"

            android:permissionGroup="foundation.e.tasks.permissiongroup.Tasks"

            android:protectionLevel="dangerous" />

    <permission

            android:name="org.dmfs.permission.WRITE_TASKS"

            android:name="foundation.e.permission.WRITE_TASKS"

            android:description="@string/opentasks_permission_description_write_tasks"

            android:label="@string/opentasks_permission_write_tasks"

            android:permissionGroup="org.dmfs.tasks.permissiongroup.Tasks"

            android:permissionGroup="foundation.e.tasks.permissiongroup.Tasks"

            android:protectionLevel="dangerous" />



    <uses-permission android:name="android.permission.GET_ACCOUNTS" />
@@ -33,8 +33,8 @@ 
                android:exported="true"

                android:label="@string/opentasks_provider_label"

                android:multiprocess="false"

                android:readPermission="org.dmfs.permission.READ_TASKS"

                android:writePermission="org.dmfs.permission.WRITE_TASKS"/>

                android:readPermission="foundation.e.permission.READ_TASKS"

                android:writePermission="foundation.e.permission.WRITE_TASKS" />



        <receiver

                android:name="org.dmfs.provider.tasks.TaskProviderBroadcastReceiver"

opentasks/src/main/AndroidManifest.xml

+103 −103
Original line number Diff line number Diff line
@@ -6,8 +6,8 @@ 
    <uses-sdk tools:overrideLibrary="org.dmfs.android.bolts" />



    <uses-permission android:name="android.permission.WAKE_LOCK" />

    <uses-permission android:name="org.dmfs.permission.READ_TASKS"/>

    <uses-permission android:name="org.dmfs.permission.WRITE_TASKS"/>

    <uses-permission android:name="foundation.e.permission.READ_TASKS" />

    <uses-permission android:name="foundation.e.permission.WRITE_TASKS" />

    <uses-permission

            android:name="android.permission.GET_ACCOUNTS"

            android:maxSdkVersion="25" />
@@ -54,9 +54,9 @@ 
                        android:mimeType="vnd.android.cursor.item/org.dmfs.tasks.tasks"

                        android:scheme="content" />

                <data

                        android:scheme="content"

                        android:host="@string/opentasks_authority"

                        android:mimeType="vnd.android.cursor.item/org.dmfs.tasks.instances"/>

                        android:mimeType="vnd.android.cursor.item/org.dmfs.tasks.instances"

                        android:scheme="content" />

            </intent-filter>

        </activity>
@@ -81,9 +81,9 @@ 
                        android:mimeType="vnd.android.cursor.item/org.dmfs.tasks.tasks"

                        android:scheme="content" />

                <data

                        android:scheme="content"

                        android:host="@string/opentasks_authority"

                        android:mimeType="vnd.android.cursor.item/org.dmfs.tasks.instances"/>

                        android:mimeType="vnd.android.cursor.item/org.dmfs.tasks.instances"

                        android:scheme="content" />

            </intent-filter>



            <!-- Voice command "note to self" in google search -->
@@ -113,9 +113,9 @@ 
                        android:mimeType="vnd.android.cursor.dir/org.dmfs.tasks.tasks"

                        android:scheme="content" />

                <data

                        android:scheme="content"

                        android:host="@string/opentasks_authority"

                        android:mimeType="vnd.android.cursor.dir/org.dmfs.tasks.instances"/>

                        android:mimeType="vnd.android.cursor.dir/org.dmfs.tasks.instances"

                        android:scheme="content" />

            </intent-filter>

            <intent-filter android:label="@string/activity_add_task_title">

                <action android:name="android.intent.action.INSERT_OR_EDIT" />
@@ -131,13 +131,13 @@ 
                        android:mimeType="vnd.android.cursor.item/org.dmfs.tasks.tasks"

                        android:scheme="content" />

                <data

                        android:scheme="content"

                        android:host="@string/opentasks_authority"

                        android:mimeType="vnd.android.cursor.dir/org.dmfs.tasks.instances"/>

                        android:mimeType="vnd.android.cursor.dir/org.dmfs.tasks.instances"

                        android:scheme="content" />

                <data

                        android:scheme="content"

                        android:host="@string/opentasks_authority"

                        android:mimeType="vnd.android.cursor.item/org.dmfs.tasks.instances"/>

                        android:mimeType="vnd.android.cursor.item/org.dmfs.tasks.instances"

                        android:scheme="content" />

            </intent-filter>

        </activity>