mirror/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2024-12-27 02:07:12 +00:00
Code Issues Releases Wiki Activity

Moved blocked senders button to general

Browse source
This commit is contained in:
M66B 2023-03-12 10:23:07 +01:00
parent 98c7b7c86c
commit 3cf19dafc9
2 changed files with 25 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
app/src/main/java/eu/faircode/email/FragmentOptionsSynchronize.java
View file

@ -69,6 +69,8 @@ public class FragmentOptionsSynchronize extends FragmentBase implements SharedPr
private View view;
private ImageButton ibHelp;
private SwitchCompat swEnabled;
private Button btnBlockedSenders;
private SwitchCompat swOptimize;
private ImageButton ibOptimizeInfo;
private Spinner spPollInterval;
@ -84,7 +86,6 @@ public class FragmentOptionsSynchronize extends FragmentBase implements SharedPr
private CheckBox[] cbDay;
private TextView tvScheduleIgnore;
private ImageButton ibSchedules;
private Button btnBlockedSenders;
private SwitchCompat swQuickSyncImap;
private SwitchCompat swQuickSyncPop;
@ -156,6 +157,8 @@ public class FragmentOptionsSynchronize extends FragmentBase implements SharedPr
ibHelp = view.findViewById(R.id.ibHelp);
swEnabled = view.findViewById(R.id.swEnabled);
btnBlockedSenders = view.findViewById(R.id.btnBlockedSenders);
swOptimize = view.findViewById(R.id.swOptimize);
ibOptimizeInfo = view.findViewById(R.id.ibOptimizeInfo);
spPollInterval = view.findViewById(R.id.spPollInterval);
@ -180,7 +183,6 @@ public class FragmentOptionsSynchronize extends FragmentBase implements SharedPr
};
tvScheduleIgnore = view.findViewById(R.id.tvScheduleIgnore);
ibSchedules = view.findViewById(R.id.ibSchedules);
btnBlockedSenders = view.findViewById(R.id.btnBlockedSenders);
swQuickSyncImap = view.findViewById(R.id.swQuickSyncImap);
swQuickSyncPop = view.findViewById(R.id.swQuickSyncPop);
@ -234,6 +236,15 @@ public class FragmentOptionsSynchronize extends FragmentBase implements SharedPr
}
});
btnBlockedSenders.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
LocalBroadcastManager lbm = LocalBroadcastManager.getInstance(getContext());
lbm.sendBroadcast(new Intent(ActivitySetup.ACTION_MANAGE_LOCAL_CONTACTS)
.putExtra("junk", true));
}
});
swOptimize.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
@ -344,15 +355,6 @@ public class FragmentOptionsSynchronize extends FragmentBase implements SharedPr
}
});
btnBlockedSenders.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
LocalBroadcastManager lbm = LocalBroadcastManager.getInstance(getContext());
lbm.sendBroadcast(new Intent(ActivitySetup.ACTION_MANAGE_LOCAL_CONTACTS)
.putExtra("junk", true));
}
});
swQuickSyncImap.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {

24
app/src/main/res/layout/fragment_options_synchronize.xml
View file

@ -99,6 +99,18 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/swEnabled" />
<Button
android:id="@+id/btnBlockedSenders"
style="?android:attr/buttonStyleSmall"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:drawableEnd="@drawable/twotone_report_24"
android:drawablePadding="6dp"
android:text="@string/title_blocked_senders"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvManualHint" />
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.cardview.widget.CardView>
@ -449,18 +461,6 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/cbDay6" />
<Button
android:id="@+id/btnBlockedSenders"
style="?android:attr/buttonStyleSmall"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:drawableEnd="@drawable/twotone_report_24"
android:drawablePadding="6dp"
android:text="@string/title_blocked_senders"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvScheduleIgnore" />
<androidx.constraintlayout.widget.Group
android:id="@+id/grpExempted"
android:layout_width="0dp"