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

Commit daea2f95 authored by Romain Hunault's avatar Romain Hunault 🚴🏻
Browse files

Merge branch 'features/blocker' into 'master'

Add blocker feature

See merge request e/privacy-central/privacycentralapp!6
parents 97b51f18 f522c461
Loading
Loading
Loading
Loading
Loading
+5 −0
Original line number Diff line number Diff line
@@ -80,10 +80,15 @@ android {
        sourceCompatibility JavaVersion.VERSION_1_8
        targetCompatibility JavaVersion.VERSION_1_8
    }

    aaptOptions {
        additionalParameters '-I', 'app/libs/e-ui-sdk-1.0.1-q.jar'
    }
}

dependencies {
    compileOnly files('libs/e-ui-sdk-1.0.1-q.jar')
    implementation files('libs/lineage-sdk.jar')
    implementation project(":privacymodulesapi")

    // include the google specific version of the modules, just for the google flavor
+420 KiB

File added.

No diff preview for this file type.

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@
    <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS_FULL"
        tools:ignore="ProtectedPermissions"
        />
    <uses-permission android:name="lineageos.permission.ACCESS_BLOCKER" />

    <application
        android:name=".PrivacyCentralApplication"
+3 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import foundation.e.privacymodules.location.FakeLocation
import foundation.e.privacymodules.location.IFakeLocation
import foundation.e.privacymodules.permissions.PermissionsPrivacyModule
import foundation.e.privacymodules.permissions.data.ApplicationDescription
import lineageos.blockers.BlockerInterface

/**
 * Simple container to hold application wide dependencies.
@@ -55,4 +56,6 @@ class DependencyContainer constructor(val app: Application) {
    val fakeLocationViewModelFactory by lazy {
        FakeLocationViewModelFactory(locationApi)
    }

    val blockerService = BlockerInterface.getInstance(context)
}
+8 −0
Original line number Diff line number Diff line
@@ -18,9 +18,17 @@
package foundation.e.privacycentralapp

import android.app.Application
import foundation.e.privacycentralapp.dummy.TrackersDataSource

class PrivacyCentralApplication : Application() {

    // Initialize the dependency container.
    val dependencyContainer: DependencyContainer by lazy { DependencyContainer(this) }

    override fun onCreate() {
        super.onCreate()

        // Inject blocker service in trackers source.
        TrackersDataSource.injectBlockerService(dependencyContainer.blockerService)
    }
}
Loading