Skip to content

Commit

Permalink
Version 2020050801
Browse files Browse the repository at this point in the history
- Fix installation conflict with NetGuard
  • Loading branch information
Konrad Kollnig committed May 8, 2020
1 parent faa2772 commit e305d80
Show file tree
Hide file tree
Showing 6 changed files with 23 additions and 34 deletions.
4 changes: 2 additions & 2 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ android {
applicationId = "net.kollnig.missioncontrol"
minSdkVersion 22
targetSdkVersion 29
versionCode 2020042502
versionName "2020.04.25"
versionCode 2020050801
versionName "2020.05.08"
archivesBaseName = "TrackerControl-$versionName" // name of apk

externalNativeBuild {
Expand Down
12 changes: 6 additions & 6 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@
<!-- http://developer.android.com/guide/topics/security/permissions.html#normal-dangerous -->

<permission
android:name="eu.faircode.netguard.permission.ADMIN"
android:name="net.kollnig.missioncontrol.permission.ADMIN"
android:description="@string/app_description"
android:label="@string/app_name"
android:protectionLevel="signature" />

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

<uses-feature
android:name="android.hardware.wifi"
Expand Down Expand Up @@ -143,7 +143,7 @@
android:name="eu.faircode.netguard.ServiceExternal"
android:label="@string/app_name">
<intent-filter>
<action android:name="eu.faircode.netguard.DOWNLOAD_HOSTS_FILE" />
<action android:name="net.kollnig.missioncontrol.DOWNLOAD_HOSTS_FILE" />
</intent-filter>
</service>

Expand Down Expand Up @@ -198,10 +198,10 @@
<receiver
android:name="eu.faircode.netguard.WidgetAdmin"
android:label="@string/app_name"
android:permission="eu.faircode.netguard.permission.ADMIN">
android:permission="net.kollnig.missioncontrol.permission.ADMIN">
<intent-filter>
<action android:name="eu.faircode.netguard.ON" />
<action android:name="eu.faircode.netguard.OFF" />
<action android:name="net.kollnig.missioncontrol.ON" />
<action android:name="net.kollnig.missioncontrol.OFF" />
</intent-filter>
</receiver>
</application>
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/eu/faircode/netguard/ServiceExternal.java
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@

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

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

public ServiceExternal() {
super(TAG);
Expand Down
7 changes: 2 additions & 5 deletions app/src/main/java/eu/faircode/netguard/WidgetAdmin.java
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,8 @@
public class WidgetAdmin extends ReceiverAutostart {
private static final String TAG = "NetGuard.Widget";

public static final String INTENT_ON = "eu.faircode.netguard.ON";
public static final String INTENT_OFF = "eu.faircode.netguard.OFF";

public static final String INTENT_LOCKDOWN_ON = "eu.faircode.netguard.LOCKDOWN_ON";
public static final String INTENT_LOCKDOWN_OFF = "eu.faircode.netguard.LOCKDOWN_OFF";
public static final String INTENT_ON = "net.kollnig.missioncontrol.ON";
public static final String INTENT_OFF = "net.kollnig.missioncontrol.OFF";

@Override
public void onReceive(Context context, Intent intent) {
Expand Down
1 change: 1 addition & 0 deletions fastlane/metadata/android/en-US/changelogs/2020050801.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
- Fix installation conflict< with NetGuard
29 changes: 10 additions & 19 deletions fastlane/metadata/android/en-US/full_description.txt
Original file line number Diff line number Diff line change
@@ -1,19 +1,10 @@
TrackerControl allows users to monitor and control the widespread,
ongoing, hidden data collection in mobile apps about user behaviour ('tracking').

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.

The app further aims to educate users about their legal rights under
current EU Data Protection Law (i.e. GDPR and the ePrivacy Directive)

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>TrackerControl allows users to monitor and control the widespread, ongoing, hidden data collection in mobile apps about user behaviour ('tracking').</p>
<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>
<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>
<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>
<p><b>Tracker Control provides</b></p><ul>
<li><i>real-time monitoring</i> of app tracking,</li>
<li><i>granular blocking</i> of app tracking,</li>
<li><i>access to apps’ privacy policy websites without trackers</i> (which they often contain), and</li>
<li><i>one-click data requests</i> as granted under EU Data Protection Legislation (to be added soon).</li></ul>
<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 comments on commit e305d80

Please sign in to comment.