-
+
@@ -198,10 +198,10 @@
+ android:permission="net.kollnig.missioncontrol.permission.ADMIN">
-
-
+
+
diff --git a/app/src/main/java/eu/faircode/netguard/ServiceExternal.java b/app/src/main/java/eu/faircode/netguard/ServiceExternal.java
index 63d53e44..092f3943 100644
--- a/app/src/main/java/eu/faircode/netguard/ServiceExternal.java
+++ b/app/src/main/java/eu/faircode/netguard/ServiceExternal.java
@@ -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);
diff --git a/app/src/main/java/eu/faircode/netguard/WidgetAdmin.java b/app/src/main/java/eu/faircode/netguard/WidgetAdmin.java
index 52034105..728fd086 100644
--- a/app/src/main/java/eu/faircode/netguard/WidgetAdmin.java
+++ b/app/src/main/java/eu/faircode/netguard/WidgetAdmin.java
@@ -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) {
diff --git a/fastlane/metadata/android/en-US/changelogs/2020050801.txt b/fastlane/metadata/android/en-US/changelogs/2020050801.txt
new file mode 100644
index 00000000..0c0484092
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/2020050801.txt
@@ -0,0 +1 @@
+- Fix installation conflict< with NetGuard
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/full_description.txt b/fastlane/metadata/android/en-US/full_description.txt
index 728b3e0d..20b7e192 100644
--- a/fastlane/metadata/android/en-US/full_description.txt
+++ b/fastlane/metadata/android/en-US/full_description.txt
@@ -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.
+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.
+Tracker Control provides
+- real-time monitoring of app tracking,
+- granular blocking of app tracking,
+- access to apps’ privacy policy websites without trackers (which they often contain), and
+- one-click data requests as granted under EU Data Protection Legislation (to be added soon).
+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.
\ No newline at end of file