Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-03-30 05:44:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

Added option to block return path

Browse Source
This commit is contained in:
M66B
2022-01-29 13:22:53 +01:00
parent 220eb6dfda
commit 84c94c79db
7 changed files with 112 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -42,7 +42,6 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.appcompat.app.AlertDialog;
import androidx.constraintlayout.widget.Group;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentTransaction;
import androidx.localbroadcastmanager.content.LocalBroadcastManager;
import androidx.preference.PreferenceManager;
@@ -66,6 +65,7 @@ public class FragmentDialogJunk extends FragmentDialogBase {
final long folder = args.getLong("folder");
final String type = args.getString("type");
final Address[] froms = DB.Converters.decodeAddresses(args.getString("from"));
final Address[] return_path = DB.Converters.decodeAddresses(args.getString("return_path"));
final boolean inJunk = args.getBoolean("inJunk");
final Context context = getContext();
@@ -73,6 +73,8 @@ public class FragmentDialogJunk extends FragmentDialogBase {
final TextView tvMessage = view.findViewById(R.id.tvMessage);
final ImageButton ibInfoProvider = view.findViewById(R.id.ibInfoProvider);
final CheckBox cbBlockSender = view.findViewById(R.id.cbBlockSender);
final CheckBox cbBlockReturn = view.findViewById(R.id.cbBlockReturn);
final TextView tvReturnPath = view.findViewById(R.id.tvReturnPath);
final CheckBox cbBlockDomain = view.findViewById(R.id.cbBlockDomain);
final ImageButton ibMore = view.findViewById(R.id.ibMore);
final TextView tvMore = view.findViewById(R.id.tvMore);
@@ -85,6 +87,7 @@ public class FragmentDialogJunk extends FragmentDialogBase {
final ImageButton ibRules = view.findViewById(R.id.ibRules);
final ImageButton ibManage = view.findViewById(R.id.ibManage);
final Group grpInJunk = view.findViewById(R.id.grpInJunk);
final Group grpReturnPath = view.findViewById(R.id.grpReturnPath);
final Group grpMore = view.findViewById(R.id.grpMore);
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
@@ -110,6 +113,7 @@ public class FragmentDialogJunk extends FragmentDialogBase {
cbBlockSender.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
cbBlockReturn.setEnabled(isChecked);
cbBlockDomain.setEnabled(isChecked && ActivityBilling.isPro(context));
}
});
@@ -334,8 +338,19 @@ public class FragmentDialogJunk extends FragmentDialogBase {
? getString(R.string.title_folder_junk)
: getString(R.string.title_ask_spam_who, MessageHelper.formatAddresses(froms)));
cbBlockSender.setEnabled(canBlock);
cbBlockReturn.setEnabled(false);
cbBlockDomain.setEnabled(false);
cbBlockSender.setChecked(canBlock && block_sender);
cbBlockReturn.setChecked(false);
List<Address> returns = MessageHelper.exclusive(return_path, froms);
grpReturnPath.setVisibility(!BuildConfig.PLAY_STORE_RELEASE && returns.size() > 0
? View.VISIBLE : View.GONE);
tvReturnPath.setText(MessageHelper.formatAddresses(
returns.toArray(new Address[0]),
MessageHelper.AddressFormat.EMAIL_ONLY, false));
cbBlockDomain.setText(getString(R.string.title_block_sender_domain, TextUtils.join(",", domains)));
if (common) {
@@ -407,6 +422,7 @@ public class FragmentDialogJunk extends FragmentDialogBase {
public void onClick(DialogInterface dialog, int which) {
prefs.edit().putBoolean("block_sender", cbBlockSender.isChecked()).apply();
getArguments().putBoolean("block_sender", cbBlockSender.isChecked());
getArguments().putBoolean("block_return", cbBlockReturn.isChecked());
getArguments().putBoolean("block_domain", cbBlockDomain.isChecked());
sendResult(Activity.RESULT_OK);
}