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

Confirm images/HTML/link more options

This commit is contained in:
M66B 2021-06-23 12:13:59 +02:00
parent 336192f1c7
commit 85e991dacd
6 changed files with 56 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3886,6 +3886,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
full ? R.layout.dialog_show_full : R.layout.dialog_show_images, null);
CheckBox cbNotAgain = dview.findViewById(R.id.cbNotAgain);
CheckBox cbNotAgainDomain = dview.findViewById(R.id.cbNotAgainDomain);
Button btnMore = dview.findViewById(R.id.btnMore);
if (message.from == null || message.from.length == 0) {
cbNotAgain.setVisibility(View.GONE);
@ -3914,6 +3915,17 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
}
});
btnMore.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
Intent privacy = new Intent(v.getContext(), ActivitySetup.class)
.setAction("privacy")
.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
.putExtra("tab", "privacy");
v.getContext().startActivity(privacy);
}
});
if (full) {
TextView tvDark = dview.findViewById(R.id.tvDark);
CheckBox cbDark = dview.findViewById(R.id.cbDark);

12
app/src/main/java/eu/faircode/email/FragmentDialogOpenLink.java
View File

@ -145,6 +145,7 @@ public class FragmentDialogOpenLink extends FragmentDialogBase {
final TextView tvHost = dview.findViewById(R.id.tvHost);
final TextView tvOwner = dview.findViewById(R.id.tvOwner);
final CheckBox cbNotAgain = dview.findViewById(R.id.cbNotAgain);
final Button btnMore = dview.findViewById(R.id.btnMore);
final Group grpDifferent = dview.findViewById(R.id.grpDifferent);
final Group grpOwner = dview.findViewById(R.id.grpOwner);
@ -261,6 +262,17 @@ public class FragmentDialogOpenLink extends FragmentDialogBase {
}
});
btnMore.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
Intent privacy = new Intent(v.getContext(), ActivitySetup.class)
.setAction("privacy")
.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
.putExtra("tab", "privacy");
v.getContext().startActivity(privacy);
}
});
tvOwnerRemark.setMovementMethod(LinkMovementMethod.getInstance());
cbNotAgain.setText(context.getString(R.string.title_no_ask_for_again, uri.getHost()));
cbNotAgain.setVisibility(

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

@ -178,6 +178,8 @@ public class FragmentOptions extends FragmentBase {
pager.setCurrentItem(3);
else if ("display".equals(tab))
pager.setCurrentItem(4);
else if ("privacy".equals(tab))
pager.setCurrentItem(6);
else if ("encryption".equals(tab))
pager.setCurrentItem(7);
else if ("misc".equals(tab))

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

@ -243,6 +243,16 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvOwner" />
<Button
android:id="@+id/btnMore"
style="?android:attr/buttonStyleSmall"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:text="@string/title_advanced_more"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/cbNotAgain" />
<androidx.constraintlayout.widget.Group
android:id="@+id/grpDifferent"
android:layout_width="0dp"

10
app/src/main/res/layout/dialog_show_full.xml
View File

@ -72,5 +72,15 @@
android:textAppearance="@style/TextAppearance.AppCompat.Small"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/cbNotAgain" />
<Button
android:id="@+id/btnMore"
style="?android:attr/buttonStyleSmall"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:text="@string/title_advanced_more"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/cbNotAgainDomain" />
</androidx.constraintlayout.widget.ConstraintLayout>
</eu.faircode.email.ScrollViewEx>

10
app/src/main/res/layout/dialog_show_images.xml
View File

@ -76,6 +76,16 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/cbNotAgain" />
<Button
android:id="@+id/btnMore"
style="?android:attr/buttonStyleSmall"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:text="@string/title_advanced_more"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/cbNotAgainDomain" />
<androidx.constraintlayout.widget.Group
android:id="@+id/grpTracking"
android:layout_width="0dp"