From fb1b1f1a0e8738a3b87ee040794c6cf77a418c73 Mon Sep 17 00:00:00 2001 From: M66B Date: Thu, 2 Nov 2023 21:08:43 +0100 Subject: [PATCH] Fixed back from activities --- app/src/main/java/eu/faircode/email/ActivityAMP.java | 5 ++++- .../main/java/eu/faircode/email/ActivityClear.java | 11 +++++++++++ app/src/main/java/eu/faircode/email/ActivityDSN.java | 11 +++++++++++ .../main/java/eu/faircode/email/ActivityDmarc.java | 11 +++++++++++ app/src/main/java/eu/faircode/email/ActivityEML.java | 5 ++++- .../main/java/eu/faircode/email/ActivityError.java | 11 +++++++++++ .../java/eu/faircode/email/ActivitySignature.java | 5 ++++- 7 files changed, 56 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/ActivityAMP.java b/app/src/main/java/eu/faircode/email/ActivityAMP.java index a0aa6cfe80..d43d87b452 100644 --- a/app/src/main/java/eu/faircode/email/ActivityAMP.java +++ b/app/src/main/java/eu/faircode/email/ActivityAMP.java @@ -159,7 +159,10 @@ public class ActivityAMP extends ActivityBase { @Override public boolean onOptionsItemSelected(@NonNull MenuItem item) { int itemId = item.getItemId(); - if (itemId == R.id.menu_force_light) { + if (itemId == android.R.id.home) { + finish(); + return true; + } else if (itemId == R.id.menu_force_light) { onMenuForceLight(); return true; } diff --git a/app/src/main/java/eu/faircode/email/ActivityClear.java b/app/src/main/java/eu/faircode/email/ActivityClear.java index f7724224b5..5abedd804b 100644 --- a/app/src/main/java/eu/faircode/email/ActivityClear.java +++ b/app/src/main/java/eu/faircode/email/ActivityClear.java @@ -23,6 +23,7 @@ import android.app.PendingIntent; import android.content.Context; import android.content.Intent; import android.os.Bundle; +import android.view.MenuItem; import android.view.View; import android.widget.Button; @@ -56,6 +57,16 @@ public class ActivityClear extends ActivityBase { }); } + @Override + public boolean onOptionsItemSelected(MenuItem item) { + int itemId = item.getItemId(); + if (itemId == android.R.id.home) { + finish(); + return true; + } + return super.onOptionsItemSelected(item); + } + static Intent getIntent(Context context) { return new Intent(context, ActivityClear.class) .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | diff --git a/app/src/main/java/eu/faircode/email/ActivityDSN.java b/app/src/main/java/eu/faircode/email/ActivityDSN.java index de9c917191..32fe6cef9c 100644 --- a/app/src/main/java/eu/faircode/email/ActivityDSN.java +++ b/app/src/main/java/eu/faircode/email/ActivityDSN.java @@ -26,6 +26,7 @@ import android.net.Uri; import android.os.Bundle; import android.text.Spanned; import android.view.LayoutInflater; +import android.view.MenuItem; import android.view.View; import android.widget.TextView; @@ -69,6 +70,16 @@ public class ActivityDSN extends ActivityBase { load(); } + @Override + public boolean onOptionsItemSelected(MenuItem item) { + int itemId = item.getItemId(); + if (itemId == android.R.id.home) { + finish(); + return true; + } + return super.onOptionsItemSelected(item); + } + private void load() { Uri uri = getIntent().getData(); Log.i("DSN uri=" + uri); diff --git a/app/src/main/java/eu/faircode/email/ActivityDmarc.java b/app/src/main/java/eu/faircode/email/ActivityDmarc.java index c04a71c3e4..83ed33fff2 100644 --- a/app/src/main/java/eu/faircode/email/ActivityDmarc.java +++ b/app/src/main/java/eu/faircode/email/ActivityDmarc.java @@ -33,6 +33,7 @@ import android.text.style.StyleSpan; import android.text.style.TypefaceSpan; import android.util.Pair; import android.view.LayoutInflater; +import android.view.MenuItem; import android.view.View; import android.widget.TextView; @@ -86,6 +87,16 @@ public class ActivityDmarc extends ActivityBase { load(); } + @Override + public boolean onOptionsItemSelected(MenuItem item) { + int itemId = item.getItemId(); + if (itemId == android.R.id.home) { + finish(); + return true; + } + return super.onOptionsItemSelected(item); + } + private void load() { Intent intent = getIntent(); Uri uri = intent.getData(); diff --git a/app/src/main/java/eu/faircode/email/ActivityEML.java b/app/src/main/java/eu/faircode/email/ActivityEML.java index 43c6fba283..997bc5dda4 100644 --- a/app/src/main/java/eu/faircode/email/ActivityEML.java +++ b/app/src/main/java/eu/faircode/email/ActivityEML.java @@ -516,7 +516,10 @@ public class ActivityEML extends ActivityBase { @Override public boolean onOptionsItemSelected(@NonNull MenuItem item) { int itemId = item.getItemId(); - if (itemId == R.id.menu_save) { + if (itemId == android.R.id.home) { + finish(); + return true; + } else if (itemId == R.id.menu_save) { onMenuSave(); return true; } else if (itemId == R.id.menu_junk) { diff --git a/app/src/main/java/eu/faircode/email/ActivityError.java b/app/src/main/java/eu/faircode/email/ActivityError.java index af582c216e..c53635a913 100644 --- a/app/src/main/java/eu/faircode/email/ActivityError.java +++ b/app/src/main/java/eu/faircode/email/ActivityError.java @@ -21,6 +21,7 @@ package eu.faircode.email; import android.content.Intent; import android.os.Bundle; +import android.view.MenuItem; import android.view.View; import android.widget.Button; import android.widget.ImageButton; @@ -62,6 +63,16 @@ public class ActivityError extends ActivityBase { load(); } + @Override + public boolean onOptionsItemSelected(MenuItem item) { + int itemId = item.getItemId(); + if (itemId == android.R.id.home) { + finish(); + return true; + } + return super.onOptionsItemSelected(item); + } + private void load() { Intent intent = getIntent(); String type = intent.getStringExtra("type"); diff --git a/app/src/main/java/eu/faircode/email/ActivitySignature.java b/app/src/main/java/eu/faircode/email/ActivitySignature.java index 7a30d5410a..f37c63aa36 100644 --- a/app/src/main/java/eu/faircode/email/ActivitySignature.java +++ b/app/src/main/java/eu/faircode/email/ActivitySignature.java @@ -262,7 +262,10 @@ public class ActivitySignature extends ActivityBase { @Override public boolean onOptionsItemSelected(@NonNull MenuItem item) { int itemId = item.getItemId(); - if (itemId == R.id.menu_help) { + if (itemId == android.R.id.home) { + finish(); + return true; + } else if (itemId == R.id.menu_help) { onMenuHelp(); return true; } else if (itemId == R.id.menu_edit_html) {