diff --git a/FAQ.md b/FAQ.md
index 18c32c53..43f80fed 100644
--- a/FAQ.md
+++ b/FAQ.md
@@ -363,33 +363,6 @@ On most devices, NetGuard will keep running in the background with its foregroun
On some devices (in particular some Samsung models), where there are lots of applications competing for memory, Android may still stop NetGuard as a last resort.
Unfortunately this cannot be fixed from NetGuard, and can be considered a shortcoming of the device and/or as a bug in Android.
-
-**(39) Which usage data will be shared?**
-
-On Android version 5.0 or newer, NetGuard will share anonymized usage data to help improve how NetGuard protects you,
-by understanding how end users work with NetGuard.
-
-The following data will be shared when changing application settings:
-
-* The [SHA256](https://en.wikipedia.org/wiki/SHA-2) hashed [Android ID](https://developer.android.com/reference/android/provider/Settings.Secure.html#ANDROID_ID) (needed to prevent multiple records of the same setting)
-* The [device name](https://developer.android.com/reference/android/os/Build.html#DEVICE) *
-* The [Android version](https://developer.android.com/reference/android/os/Build.VERSION_CODES.html) *
-* The [country](https://developer.android.com/reference/java/util/Locale.html#getCountry()) configured when initializing Android *
-* The application name, version and [installer](https://developer.android.com/reference/android/content/pm/PackageManager.html#getInstallerPackageName(java.lang.String)) and whether an application is a user installed or a system bundled application
-* Whether Wi-Fi and mobile connections will be blocked or allowed and which conditions apply (when screen on, roaming, notify on access, addresses, etc)
-
-This data cannot be used to identify you, so your privacy is guaranteed.
-Data marked with an asterix (*) is being shared by Google in the [Google Play developer console](https://developer.android.com/distribute/googleplay/developer-console.html) as well.
-
-Usage data will be queued for sending over an unmetered connection (mostly Wi-Fi) when settings are being changed.
-Usage data will be anonynized before sending.
-Sending usage data can optionally be disabled per application.
-
-You can see the aggregated data [here](https://crowd.netguard.me).
-
**If you didn't find the answer to your question, you can ask your questions [in this forum](http://forum.xda-developers.com/showthread.php?t=3233012) or contact me directly [by e-mail](mailto:marcel+netguard@faircode.eu)**.
-
-If you want to request a new feature or want to report a bug, please [create an issue on GitHub](https://github.com/M66B/NetGuard/issues/new).
-
diff --git a/README.md b/README.md
index 47a317e1..b3ba60a3 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,8 @@ Features:
* Simple to use
* No root required
* 100% open source
-* No tracking and user profiling
+* No calling home
+* No tracking or analytics
* No advertisements
* Actively developed and supported
* Android 4.0 and later supported
@@ -183,9 +184,6 @@ Frequently Asked Questions (FAQ)
[**(38) Why did NetGuard stop running?**](https://github.com/M66B/NetGuard/blob/master/FAQ.md#FAQ38)
-
-[**(39) Which usage data will be shared?**](https://github.com/M66B/NetGuard/blob/master/FAQ.md#FAQ39)
-
Permissions
-----------
diff --git a/app/app.iml b/app/app.iml
index 91cca5e5..4e989c04 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -104,14 +104,6 @@
-
-
-
-
-
-
-
-
@@ -120,6 +112,14 @@
+
+
+
+
+
+
+
+
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 4e2fe2b9..fd504dae 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -117,11 +117,6 @@
-
-
= Build.VERSION_CODES.LOLLIPOP ? View.VISIBLE : View.GONE);
// Show dialog
dialogFirst = new AlertDialog.Builder(this)
@@ -349,10 +346,8 @@ public class ActivityMain extends AppCompatActivity implements SharedPreferences
.setPositiveButton(R.string.app_agree, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
- if (running) {
+ if (running)
prefs.edit().putBoolean("initialized", true).apply();
- prefs.edit().putBoolean("submitting", true).apply();
- }
}
})
.setNegativeButton(R.string.app_disagree, new DialogInterface.OnClickListener() {
diff --git a/app/src/main/java/eu/faircode/netguard/ActivityPro.java b/app/src/main/java/eu/faircode/netguard/ActivityPro.java
index 962210da..1afb6063 100644
--- a/app/src/main/java/eu/faircode/netguard/ActivityPro.java
+++ b/app/src/main/java/eu/faircode/netguard/ActivityPro.java
@@ -21,10 +21,8 @@ package eu.faircode.netguard;
import android.app.PendingIntent;
import android.content.Intent;
-import android.content.SharedPreferences;
import android.os.Build;
import android.os.Bundle;
-import android.preference.PreferenceManager;
import android.support.v4.app.NavUtils;
import android.support.v7.app.AppCompatActivity;
import android.text.Editable;
@@ -35,8 +33,6 @@ import android.view.MenuItem;
import android.view.View;
import android.view.WindowManager;
import android.widget.Button;
-import android.widget.CheckBox;
-import android.widget.CompoundButton;
import android.widget.EditText;
import android.widget.LinearLayout;
import android.widget.TextView;
@@ -273,7 +269,6 @@ public class ActivityPro extends AppCompatActivity {
TextView tvSpeed = (TextView) findViewById(R.id.tvSpeed);
TextView tvTheme = (TextView) findViewById(R.id.tvTheme);
TextView tvAll = (TextView) findViewById(R.id.tvAll);
- CheckBox cbSubmit = (CheckBox) findViewById(R.id.cbSubmit);
LinearLayout llChallenge = (LinearLayout) findViewById(R.id.llChallenge);
btnLog.setVisibility(IAB.isPurchased(SKU_LOG, this) ? View.GONE : View.VISIBLE);
diff --git a/app/src/main/java/eu/faircode/netguard/ActivitySettings.java b/app/src/main/java/eu/faircode/netguard/ActivitySettings.java
index d4475795..0aaae09f 100644
--- a/app/src/main/java/eu/faircode/netguard/ActivitySettings.java
+++ b/app/src/main/java/eu/faircode/netguard/ActivitySettings.java
@@ -1029,10 +1029,6 @@ public class ActivitySettings extends AppCompatActivity implements SharedPrefere
xmlExport(getSharedPreferences("notify", Context.MODE_PRIVATE), serializer);
serializer.endTag(null, "notify");
- serializer.startTag(null, "submit");
- xmlExport(getSharedPreferences("submit", Context.MODE_PRIVATE), serializer);
- serializer.endTag(null, "submit");
-
serializer.startTag(null, "filter");
filterExport(serializer);
serializer.endTag(null, "filter");
@@ -1170,7 +1166,6 @@ public class ActivitySettings extends AppCompatActivity implements SharedPrefere
xmlImport(handler.roaming, getSharedPreferences("roaming", Context.MODE_PRIVATE));
xmlImport(handler.apply, getSharedPreferences("apply", Context.MODE_PRIVATE));
xmlImport(handler.notify, getSharedPreferences("notify", Context.MODE_PRIVATE));
- xmlImport(handler.submit, getSharedPreferences("submit", Context.MODE_PRIVATE));
// Upgrade imported settings
Receiver.upgrade(true, this);
@@ -1218,7 +1213,6 @@ public class ActivitySettings extends AppCompatActivity implements SharedPrefere
public Map roaming = new HashMap<>();
public Map apply = new HashMap<>();
public Map notify = new HashMap<>();
- public Map submit = new HashMap<>();
private Map current = null;
public XmlImportHandler(Context context) {
@@ -1257,9 +1251,6 @@ public class ActivitySettings extends AppCompatActivity implements SharedPrefere
else if (qName.equals("notify"))
current = notify;
- else if (qName.equals("submit"))
- current = submit;
-
else if (qName.equals("filter")) {
current = null;
Log.i(TAG, "Clearing filters");
diff --git a/app/src/main/java/eu/faircode/netguard/AdapterRule.java b/app/src/main/java/eu/faircode/netguard/AdapterRule.java
index e0ea2cfc..cfc31fec 100644
--- a/app/src/main/java/eu/faircode/netguard/AdapterRule.java
+++ b/app/src/main/java/eu/faircode/netguard/AdapterRule.java
@@ -62,21 +62,9 @@ import android.widget.TextView;
import com.squareup.picasso.Picasso;
-import org.json.JSONArray;
-import org.json.JSONObject;
-
-import java.io.BufferedOutputStream;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.net.URL;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
-import java.util.Date;
import java.util.List;
-import java.util.Locale;
-
-import javax.net.ssl.HttpsURLConnection;
public class AdapterRule extends RecyclerView.Adapter implements Filterable {
private static final String TAG = "NetGuard.Adapter";
@@ -94,10 +82,6 @@ public class AdapterRule extends RecyclerView.Adapter im
private List listAll = new ArrayList<>();
private List listFiltered = new ArrayList<>();
- private static final String cUrl = "https://crowd.netguard.me/";
- private static final int cTimeOutMs = 15000;
- private static final double cConfidence = 0.35;
-
public static class ViewHolder extends RecyclerView.ViewHolder {
public View view;
@@ -127,7 +111,6 @@ public class AdapterRule extends RecyclerView.Adapter im
public CheckBox cbApply;
public Button btnRelated;
- public ImageButton ibFetch;
public ImageButton ibSettings;
public ImageButton ibLaunch;
@@ -146,7 +129,6 @@ public class AdapterRule extends RecyclerView.Adapter im
public ImageButton btnClearAccess;
public CheckBox cbNotify;
- public CheckBox cbSubmit;
public ViewHolder(View itemView) {
super(itemView);
@@ -178,7 +160,6 @@ public class AdapterRule extends RecyclerView.Adapter im
cbApply = (CheckBox) itemView.findViewById(R.id.cbApply);
btnRelated = (Button) itemView.findViewById(R.id.btnRelated);
- ibFetch = (ImageButton) itemView.findViewById(R.id.ibFetch);
ibSettings = (ImageButton) itemView.findViewById(R.id.ibSettings);
ibLaunch = (ImageButton) itemView.findViewById(R.id.ibLaunch);
@@ -197,7 +178,6 @@ public class AdapterRule extends RecyclerView.Adapter im
btnClearAccess = (ImageButton) itemView.findViewById(R.id.btnClearAccess);
cbNotify = (CheckBox) itemView.findViewById(R.id.cbNotify);
- cbSubmit = (CheckBox) itemView.findViewById(R.id.cbSubmit);
final View wifiParent = (View) cbWifi.getParent();
wifiParent.post(new Runnable() {
@@ -446,135 +426,6 @@ public class AdapterRule extends RecyclerView.Adapter im
}
});
- // Fetch settings
- holder.ibFetch.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View view) {
- new AsyncTask