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

Added POP3 block sender notice

This commit is contained in:
M66B 2022-03-26 16:55:46 +01:00
parent e31ff84a67
commit ca6ea9a037
3 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/eu/faircode/email/FragmentDialogJunk.java
View File

@ -83,6 +83,7 @@ public class FragmentDialogJunk extends FragmentDialogBase {
final View view = LayoutInflater.from(context).inflate(R.layout.dialog_junk, null);
final TextView tvMessage = view.findViewById(R.id.tvMessage);
final ImageButton ibInfoProvider = view.findViewById(R.id.ibInfoProvider);
final TextView tvPopHint = view.findViewById(R.id.tvPopHint);
final CheckBox cbBlockSender = view.findViewById(R.id.cbBlockSender);
final CheckBox cbBlockDomain = view.findViewById(R.id.cbBlockDomain);
final ImageButton ibMore = view.findViewById(R.id.ibMore);
@ -119,6 +120,8 @@ public class FragmentDialogJunk extends FragmentDialogBase {
}
});
tvPopHint.setVisibility(imap ? View.GONE : View.VISIBLE);
cbBlockSender.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {

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

@ -49,6 +49,18 @@
app:srcCompat="@drawable/twotone_info_24"
app:tint="?attr/colorAccent" />
<eu.faircode.email.FixedTextView
android:id="@+id/tvPopHint"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:text="@string/title_junk_pop_hint"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
android:textStyle="bold"
app:layout_constraintEnd_toStartOf="@+id/ibInfoProvider"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tvJunkHint" />
<CheckBox
android:id="@+id/cbBlockSender"
android:layout_width="wrap_content"
@ -57,7 +69,7 @@
android:text="@string/title_block_sender"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvJunkHint" />
app:layout_constraintTop_toBottomOf="@id/tvPopHint" />
<CheckBox
android:id="@+id/cbBlockDomain"

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

@ -91,6 +91,10 @@
</plurals>
<string name="title_ask_spam_who">Treat message from %1$s as spam?</string>
<string name="title_junk_hint">Your email provider is responsible for filtering spam. An email app does not have all the data needed to do this reliably.</string>
<string name="title_junk_pop_hint">
Messages from blocked senders will not be downloaded.
If "Leave messages on server" is not enabled, these messages will be lost permanently!
</string>
<string name="title_block">Block %1$s</string>
<string name="title_block_sender">Block sender</string>