Add trackers counts by app statistic. (f27f6376) · Commits · e / os / PrivacyModule TrackerFilter

demoapp/src/main/java/foudation/e/privacymodules/trackers/demoapp/MainActivity.kt

+11 −10

Original line number	Diff line number	Diff line
		@@ -94,7 +94,8 @@ class MainActivity : AppCompatActivity() {
		}

		mBtnAllTrackers?.setOnClickListener { v: View? ->
		mTvLog?.append("All trackers: ${trackTrackersPrivacyModule.getTrackersCount()}")
		mTvLog?.append("All trackers count: ${trackTrackersPrivacyModule.getTrackersCount()}")
		mTvLog?.append("All trackers count by appUid:\n ${trackTrackersPrivacyModule.getTrackersCountByApp().entries.joinToString("\n") { "App: ${it.key} has ${it.value} trackers"}}")
		}

		mBtnTrackersAppUid?.setOnClickListener { v: View? ->
		@@ -159,8 +160,7 @@ class MainActivity : AppCompatActivity() {
		id = id!!,
		hostnames = hostnames!!.toSet(),
		label = name!!,
		description = description,
		website = website,
		exodusId = exodusId
		)
		}

		@@ -169,13 +169,14 @@ class MainActivity : AppCompatActivity() {
		val id: String?,
		val hostnames: List<String>?,
		val name: String?,

		val description: String?,
		@SerializedName("creation_date") val creationDate: String?,
		@SerializedName("code_signature") val codeSignature: String?,
		@SerializedName("network_signature") val networkSignature: String?,
		val website: String?,
		val categories: List<String>?,
		val exodusId: String?

		// val description: String?,
		// @SerializedName("creation_date") val creationDate: String?,
		// @SerializedName("code_signature") val codeSignature: String?,
		// @SerializedName("network_signature") val networkSignature: String?,
		// val website: String?,
		// val categories: List<String>?,
		)
		}

+2 −2

Original line number	Diff line number	Diff line
		@@ -10,7 +10,7 @@ android {
		targetSdkVersion 30

		versionCode 1
		versionName "0.3.0"
		versionName "0.4.0"
		}

		buildTypes {
		@@ -26,7 +26,7 @@ android {
		}
		}
		dependencies{
		implementation 'foundation.e:privacymodule.api:0.5.0'
		implementation 'foundation.e:privacymodule.api:0.6.0'
		}

		publishing {

+2 −2

Original line number	Diff line number	Diff line
		@@ -48,11 +48,11 @@ public class DNSBlockerService extends Service {

		@Override
		public int onStartCommand(Intent intent, int flags, int startId) {
		if (intent.getBooleanExtra(EXTRA_ENABLE_NOTIFICATION, true)) {
		if (intent != null && intent.getBooleanExtra(EXTRA_ENABLE_NOTIFICATION, true)) {
		ForegroundStarter.startForeground(this);
		}

		if (ACTION_START.equals(intent.getAction())) {
		if (intent != null && ACTION_START.equals(intent.getAction())) {
		stop();
		start();
		}

+0 −5

Original line number	Diff line number	Diff line
		@@ -122,9 +122,4 @@ public class BlockTrackersPrivacyModule implements IBlockTrackersPrivacyModule {
		public void setWhiteListed(int appUid, boolean isWhiteListed) {
		whitelistRepository.setWhiteListed(appUid, isWhiteListed);
		}


		public List<ApplicationDescription> getBlockableApps() {
		return new ArrayList();
		}
		}

+6 −1

Original line number	Diff line number	Diff line
		@@ -28,6 +28,7 @@ import androidx.annotation.NonNull;
		import java.time.temporal.ChronoUnit;
		import java.util.ArrayList;
		import java.util.List;
		import java.util.Map;

		import foundation.e.privacymodules.trackers.DNSBlockerService;
		import foundation.e.privacymodules.trackers.ITrackTrackersPrivacyModule;
		@@ -58,7 +59,6 @@ public class TrackTrackersPrivacyModule implements ITrackTrackersPrivacyModule {
		}

		public void start(List<Tracker> trackers, boolean enableNotification) {
		// TODO stop and start around this.
		TrackersRepository.getInstance().setTrackersList(trackers);

		Intent intent = new Intent(mContext, DNSBlockerService.class);
		@@ -88,6 +88,11 @@ public class TrackTrackersPrivacyModule implements ITrackTrackersPrivacyModule {
		return statsRepository.getContactedTrackersCount();
		}

		@Override
		public Map<Integer, Integer> getTrackersCountByApp() {
		return statsRepository.getContactedTrackersCountByApp();
		}

		@Override
		public List<Tracker> getTrackersForApp(int i) {
		return statsRepository.getAllTrackersOfApp(i);