mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Disconnect improvements

This commit is contained in:
M66B 2020-07-19 14:31:08 +02:00
parent c530cb1cd0
commit 846c38f9c9
4 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/java/eu/faircode/email/AdapterMessage.java
View File

@ -5773,6 +5773,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
final ImageButton ibDifferent = dview.findViewById(R.id.ibDifferent);
final EditText etLink = dview.findViewById(R.id.etLink);
final TextView tvDisconnect = dview.findViewById(R.id.tvDisconnect);
final TextView tvDisconnectCategories = dview.findViewById(R.id.tvDisconnectCategories);
final ImageButton ibShare = dview.findViewById(R.id.ibShare);
final ImageButton ibCopy = dview.findViewById(R.id.ibCopy);
final CheckBox cbSecure = dview.findViewById(R.id.cbSecure);
@ -5963,6 +5964,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
@Override
protected void onPreExecute(Bundle args) {
tvDisconnect.setVisibility(View.GONE);
tvDisconnectCategories.setVisibility(View.GONE);
}
@Override
@ -5973,8 +5975,11 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
@Override
protected void onExecuted(Bundle args, List<String> data) {
tvDisconnect.setText(data == null ? null : TextUtils.join(", ", data));
tvDisconnect.setVisibility(data == null ? View.GONE : View.VISIBLE);
if (data != null) {
tvDisconnectCategories.setText(TextUtils.join(", ", data));
tvDisconnect.setVisibility(View.VISIBLE);
tvDisconnectCategories.setVisibility(View.VISIBLE);
}
}
@Override

2
app/src/main/java/eu/faircode/email/DisconnectBlacklist.java
View File

@ -38,7 +38,7 @@ import javax.net.ssl.HttpsURLConnection;
public class DisconnectBlacklist {
private final static int FETCH_TIMEOUT = 20 * 1000; // milliseconds
private final static String LIST = "https://raw.githubusercontent.com/mozilla-services/shavar-prod-lists/master/disconnect-blacklist.json";
private final static String LIST = "https://raw.githubusercontent.com/disconnectme/disconnect-tracking-protection/master/services.json";
static void download(Context context) throws IOException, JSONException {
File file = getFile(context);

14
app/src/main/res/layout/dialog_open_link.xml
View File

@ -93,13 +93,23 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:text="Advertising, Content, Analytics, Fingerprinting, Social, Cryptomining"
android:text="@string/title_tracking_link"
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
android:textColor="?attr/colorWarning"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvDifferent" />
<eu.faircode.email.FixedTextView
android:id="@+id/tvDisconnectCategories"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="6dp"
android:text="Advertising, Content, Analytics, Fingerprinting, Social, Cryptomining, Disconnect"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvDisconnect" />
<CheckBox
android:id="@+id/cbSecure"
android:layout_width="wrap_content"
@ -109,7 +119,7 @@
android:textColor="?attr/colorWarning"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvDisconnect" />
app:layout_constraintTop_toBottomOf="@id/tvDisconnectCategories" />
<CheckBox
android:id="@+id/cbSanitize"

1
app/src/main/res/values/strings.xml
View File

@ -1250,6 +1250,7 @@
<string name="title_open_link">Open link</string>
<string name="title_different_link">The title and the link address are different</string>
<string name="title_tracking_link">This website might track you</string>
<string name="title_link_http">Traffic will not be encrypted</string>
<string name="title_link_https">Traffic will be encrypted</string>
<string name="title_sanitize_link">Remove tracking parameters</string>