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

Commit 3beeef9a authored by Guillaume Jacquart's avatar Guillaume Jacquart
Browse files

Clean logs, V0.2.0

parent bd8c3024

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

+7 −1
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ import android.widget.TextView 
import com.google.gson.Gson

import com.google.gson.annotations.SerializedName

import foundation.e.privacymodules.trackers.ITrackTrackersPrivacyModule

import foundation.e.privacymodules.trackers.StatsDatabase

import foundation.e.privacymodules.trackers.Tracker

import foundation.e.privacymodules.trackers.api.TrackTrackersPrivacyModule

import java.io.InputStreamReader
@@ -25,6 +24,7 @@ class MainActivity : AppCompatActivity() { 
    private var mBtnMonthsTrackers: Button? = null

    private var mBtnDaysTrackers: Button? = null

    private var mBtnAllTrackers: Button? = null

    private var mBtnTrackersAppUid: Button? = null

    private var mTvLog: TextView? = null

    private var trackers = emptyList<Tracker>()

    override fun onCreate(savedInstanceState: Bundle?) {
@@ -41,6 +41,8 @@ class MainActivity : AppCompatActivity() { 
        mBtnMonthsTrackers = findViewById(R.id.button_months_trackers)

        mBtnDaysTrackers = findViewById(R.id.button_days_trackers)

        mBtnAllTrackers = findViewById(R.id.button_all_trackers)

        mBtnTrackersAppUid = findViewById(R.id.button_trackers_appuid)





        mTvLog = findViewById(R.id.tv_log)
@@ -86,6 +88,10 @@ class MainActivity : AppCompatActivity() { 
        mBtnAllTrackers?.setOnClickListener { v: View? ->

            mTvLog?.append("All trackers: ${trackTrackersPrivacyModule.getTrackersCount()}")

        }



        mBtnTrackersAppUid?.setOnClickListener { v: View? ->

            mTvLog?.append("Trackers of appUid: ${trackTrackersPrivacyModule.getTrackersForApp(10144).map {it.label}.joinToString("; ")}")

        }

        trackTrackersPrivacyModule.addListener(object: ITrackTrackersPrivacyModule.Listener {

            override fun onNewData() {

demoapp/src/main/res/layout/activity_main.xml

+7 −0
Original line number Diff line number Diff line
@@ -73,6 +73,13 @@ 
                android:layout_marginEnd="24dp"

                android:text="All Trackers"

                />

            <Button

                android:id="@+id/button_trackers_appuid"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_marginEnd="24dp"

                android:text="Trackers of 10144"

                />

        </GridLayout>

        <TextView

            android:id="@+id/tv_log"

privacymoduletrackers/build.gradle

+4 −5
Original line number Diff line number Diff line
@@ -6,11 +6,11 @@ android { 
    compileSdkVersion 30



    defaultConfig {

        minSdkVersion 29

        targetSdkVersion 29

        minSdkVersion 26

        targetSdkVersion 30



        versionCode 1

        versionName "0.2.0-dev"

        versionName "0.2.0"

    }



    buildTypes {
@@ -26,8 +26,7 @@ android { 
    }

}

dependencies{

    implementation 'foundation.e:privacymodule.api:0.5.0-dev'

    //implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"

    implementation 'foundation.e:privacymodule.api:0.5.0'

}



publishing {

privacymoduletrackers/src/main/java/foundation/e/privacymodules/trackers/BlockListManager.java

deleted100644 → 0
+0 −9
Original line number Diff line number Diff line 
package foundation.e.privacymodules.trackers;



public class BlockListManager {



    public boolean shouldBlockDomain(){



        return true;

    }

}

privacymoduletrackers/src/main/java/foundation/e/privacymodules/trackers/DNSBlockerRunnable.java

+2 −9
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ public class DNSBlockerRunnable implements Runnable { 


	private int eBrowserAppUid = -1;



	private final String TAG = "TestTrackerModule"; //DNSBlockerRunnable.class.getName();

	private final String TAG = DNSBlockerRunnable.class.getName();



	public DNSBlockerRunnable(Context ct, int port, TrackersLogger trackersLogger, TrackersRepository trackersRepository) {

		this.mContext = ct;
@@ -83,14 +83,10 @@ public class DNSBlockerRunnable implements Runnable { 


		while (!stopped) {

			try {

				Log.d(TAG, "Wating for connection");

				Socket socket = resolverReceiver.accept();

				Log.d(TAG, "Connection accepted");



				BufferedReader reader = new BufferedReader(new InputStreamReader(socket.getInputStream()));

				Log.d(TAG, "Reading buffer");

				String line = reader.readLine();

				Log.d(TAG, "Contexnt: " + line);

				String[] params = line.split(",");

				OutputStream output = socket.getOutputStream();

				PrintWriter writer = new PrintWriter(output, true);
@@ -109,7 +105,6 @@ public class DNSBlockerRunnable implements Runnable { 
								!whitelistRepository.isTrackerWhitelistedForApp(trackerId, appUid)) {

							writer.println("block");

							shouldBlock = true;

							Log.d(TAG, "blocking " + domainName + " for " + appUid);

						}

					}

					trackersLogger.logAccess(trackerId, appUid, shouldBlock);
@@ -117,16 +112,14 @@ public class DNSBlockerRunnable implements Runnable { 


				if (!shouldBlock) {

					writer.println("pass");

					Log.d(TAG, "not blocking " + domainName + " for " + appUid);

				}

				socket.close();

				// Printing bufferedreader data

			} catch (IOException e) {

				Log.d(TAG, "exception " + e.getMessage());

				Log.w(TAG, "exception " + e.getMessage());

			}

		}



		Log.d(TAG, "Stopped");

		try {

			resolverReceiver.close();

		} catch (IOException e) {