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

Commit 326e59cd authored by Mohammed Althaf T's avatar Mohammed Althaf T 😊
Browse files

Remove hardcoded application id

parent a9ab15b2

app/src/main/AndroidManifest.xml

+3 −3
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<manifest xmlns:android="http://schemas.android.com/apk/res/android">



    <permission android:name="foundation.e.pwaplayer.provider.READ_WRITE" />

    <permission android:name="${applicationId}.provider.READ_WRITE" />



    <!-- Permissions for PWA -->

    <uses-permission android:name="android.permission.INTERNET" />
@@ -21,9 +21,9 @@ 


        <provider

            android:name=".provider.PwaProvider"

            android:authorities="foundation.e.pwaplayer.provider"

            android:authorities="${applicationId}.provider"

            android:exported="true"

            android:permission="foundation.e.pwaplayer.provider.READ_WRITE" />

            android:permission="${applicationId}.provider.READ_WRITE" />



        <activity android:name=".ui.home.HomeActivity"

            android:exported="true">

app/src/main/java/foundation/e/pwaplayer/broadcast/PWAStatusBroadcast.kt

+4 −3
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import android.app.Application 
import android.content.ComponentName

import android.content.Context

import android.content.Intent

import foundation.e.pwaplayer.BuildConfig



/**

 * This class is responsible for sending PWA install / removal status to all apps.
@@ -78,16 +79,16 @@ object PWAStatusBroadcast { 


    fun broadcastPwaAdded(context: Context, shortcutId: String, url: String, pwaId: Long) {

        broadcast(context.applicationContext as Application,

            "foundation.e.pwaplayer.PWA_ADDED", shortcutId, url, pwaId)

            "${BuildConfig.APPLICATION_ID}.PWA_ADDED", shortcutId, url, pwaId)

    }



    fun broadcastPwaChanged(context: Context, shortcutId: String, url: String, pwaId: Long) {

        broadcast(context.applicationContext as Application,

            "foundation.e.pwaplayer.PWA_CHANGED", shortcutId, url, pwaId)

            "${BuildConfig.APPLICATION_ID}.PWA_CHANGED", shortcutId, url, pwaId)

    }



    fun broadcastPwaRemoved(context: Context, shortcutId: String, url: String, pwaId: Long) {

        broadcast(context.applicationContext as Application,

            "foundation.e.pwaplayer.PWA_REMOVED", shortcutId, url, pwaId)

            "${BuildConfig.APPLICATION_ID}.PWA_REMOVED", shortcutId, url, pwaId)

    }

}
 
 No newline at end of file

app/src/main/java/foundation/e/pwaplayer/provider/PwaProvider.kt

+2 −1
Original line number Diff line number Diff line
@@ -7,13 +7,14 @@ import android.content.UriMatcher 
import android.database.Cursor

import android.net.Uri

import android.util.Log

import foundation.e.pwaplayer.BuildConfig

import foundation.e.pwaplayer.broadcast.PWAStatusBroadcast

import foundation.e.pwaplayer.database.PwaDatabase

import foundation.e.pwaplayer.database.mapToPwa

import foundation.e.pwaplayer.provider.PwaConstants.Companion.TABLE_NAME



// Authority of the Content Provider

const val AUTHORITY = "foundation.e.pwaplayer.provider"

const val AUTHORITY = BuildConfig.APPLICATION_ID + ".provider"



// Code to match for multiple rows query

private const val CODE_PWA_DIR = 1