Skip to content

Commit e305d80

Browse files
author
Konrad Kollnig
committed
Version 2020050801
- Fix installation conflict with NetGuard
1 parent faa2772 commit e305d80

File tree

6 files changed

+23
-34
lines changed

6 files changed

+23
-34
lines changed

app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ android {
88
applicationId = "net.kollnig.missioncontrol"
99
minSdkVersion 22
1010
targetSdkVersion 29
11-
versionCode 2020042502
12-
versionName "2020.04.25"
11+
versionCode 2020050801
12+
versionName "2020.05.08"
1313
archivesBaseName = "TrackerControl-$versionName" // name of apk
1414

1515
externalNativeBuild {

app/src/main/AndroidManifest.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@
1616
<!-- http://developer.android.com/guide/topics/security/permissions.html#normal-dangerous -->
1717

1818
<permission
19-
android:name="eu.faircode.netguard.permission.ADMIN"
19+
android:name="net.kollnig.missioncontrol.permission.ADMIN"
2020
android:description="@string/app_description"
2121
android:label="@string/app_name"
2222
android:protectionLevel="signature" />
2323

24-
<uses-permission android:name="eu.faircode.netguard.permission.ADMIN" />
24+
<uses-permission android:name="net.kollnig.missioncontrol.permission.ADMIN" />
2525

2626
<uses-feature
2727
android:name="android.hardware.wifi"
@@ -143,7 +143,7 @@
143143
android:name="eu.faircode.netguard.ServiceExternal"
144144
android:label="@string/app_name">
145145
<intent-filter>
146-
<action android:name="eu.faircode.netguard.DOWNLOAD_HOSTS_FILE" />
146+
<action android:name="net.kollnig.missioncontrol.DOWNLOAD_HOSTS_FILE" />
147147
</intent-filter>
148148
</service>
149149

@@ -198,10 +198,10 @@
198198
<receiver
199199
android:name="eu.faircode.netguard.WidgetAdmin"
200200
android:label="@string/app_name"
201-
android:permission="eu.faircode.netguard.permission.ADMIN">
201+
android:permission="net.kollnig.missioncontrol.permission.ADMIN">
202202
<intent-filter>
203-
<action android:name="eu.faircode.netguard.ON" />
204-
<action android:name="eu.faircode.netguard.OFF" />
203+
<action android:name="net.kollnig.missioncontrol.ON" />
204+
<action android:name="net.kollnig.missioncontrol.OFF" />
205205
</intent-filter>
206206
</receiver>
207207
</application>

app/src/main/java/eu/faircode/netguard/ServiceExternal.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@
4444

4545
public class ServiceExternal extends IntentService {
4646
private static final String TAG = "NetGuard.External";
47-
private static final String ACTION_DOWNLOAD_HOSTS_FILE = "eu.faircode.netguard.DOWNLOAD_HOSTS_FILE";
47+
private static final String ACTION_DOWNLOAD_HOSTS_FILE = "net.kollnig.missioncontrol.DOWNLOAD_HOSTS_FILE";
4848

49-
// am startservice -a eu.faircode.netguard.DOWNLOAD_HOSTS_FILE
49+
// am startservice -a net.kollnig.missioncontrol.DOWNLOAD_HOSTS_FILE
5050

5151
public ServiceExternal() {
5252
super(TAG);

app/src/main/java/eu/faircode/netguard/WidgetAdmin.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,8 @@
3636
public class WidgetAdmin extends ReceiverAutostart {
3737
private static final String TAG = "NetGuard.Widget";
3838

39-
public static final String INTENT_ON = "eu.faircode.netguard.ON";
40-
public static final String INTENT_OFF = "eu.faircode.netguard.OFF";
41-
42-
public static final String INTENT_LOCKDOWN_ON = "eu.faircode.netguard.LOCKDOWN_ON";
43-
public static final String INTENT_LOCKDOWN_OFF = "eu.faircode.netguard.LOCKDOWN_OFF";
39+
public static final String INTENT_ON = "net.kollnig.missioncontrol.ON";
40+
public static final String INTENT_OFF = "net.kollnig.missioncontrol.OFF";
4441

4542
@Override
4643
public void onReceive(Context context, Intent intent) {
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
- Fix installation conflict< with NetGuard
Lines changed: 10 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,10 @@
1-
TrackerControl allows users to monitor and control the widespread,
2-
ongoing, hidden data collection in mobile apps about user behaviour ('tracking').
3-
4-
To detect tracking, TrackerControl checks all network traffic against the Disconnect blocklist.
5-
This is the same list, that is used by the Firefox browser.
6-
This reveals the companies behind tracking to users
7-
and allows users to block tracking selectively.
8-
This blocklist also allows to expose the purpose of tracking, such as analytics or advertising.
9-
10-
The app further aims to educate users about their legal rights under
11-
current EU Data Protection Law (i.e. GDPR and the ePrivacy Directive)
12-
13-
Under the hood, TrackerControl uses Android's VPN functionality,
14-
to analyse apps' network communications locally on the Android device.
15-
This is accomplished through a local VPN server, through which all network communications
16-
are passed, to enable the analysis by TrackerControl.
17-
In other words,
18-
no external VPN server is used, and hence
19-
no network data leaves the user's device for the purposes of tracker analysis.
1+
<p>TrackerControl allows users to monitor and control the widespread, ongoing, hidden data collection in mobile apps about user behaviour ('tracking').</p>
2+
<p>To detect tracking, TrackerControl checks all network traffic against the Disconnect blocklist. This is the same list, that is used by the Firefox browser. This reveals the companies behind tracking to users and allows users to block tracking selectively. This blocklist also allows to expose the purpose of tracking, such as analytics or advertising.</p>
3+
<p>The app further aims to educate users about their legal rights under current EU Data Protection Law (i.e. GDPR and the ePrivacy Directive)</p>
4+
<p>Under the hood, TrackerControl uses Android's VPN functionality, to analyse apps' network communications locally on the Android device. This is accomplished through a local VPN server, through which all network communications are passed, to enable the analysis by TrackerControl. In other words, no external VPN server is used, and hence no network data leaves the user's device for the purposes of tracker analysis.</p>
5+
<p><b>Tracker Control provides</b></p><ul>
6+
<li><i>real-time monitoring</i> of app tracking,</li>
7+
<li><i>granular blocking</i> of app tracking,</li>
8+
<li><i>access to apps’ privacy policy websites without trackers</i> (which they often contain), and</li>
9+
<li><i>one-click data requests</i> as granted under EU Data Protection Legislation (to be added soon).</li></ul>
10+
<p>Contrary to similar solutions, this application does not intercept SSL connections, minimising privacy risks and allowing for usage on unrooted Android devices. Only the meta data about network communications is logged, and displayed to the users.</p>

0 commit comments

Comments
 (0)