Navigation button saves account and list settings

app/src/main/java/org/tasks/activities/BaseListSettingsActivity.java

@@ -21,7 +21,6 @@ import org.tasks.R;
 import org.tasks.dialogs.DialogBuilder;
 import org.tasks.dialogs.IconPickerDialog.IconPickerCallback;
 import org.tasks.injection.ThemedInjectingAppCompatActivity;
-import org.tasks.preferences.Preferences;
 import org.tasks.themes.CustomIcons;
 import org.tasks.themes.ThemeCache;
 import org.tasks.themes.ThemeColor;
@@ -46,7 +45,6 @@ public abstract class BaseListSettingsActivity extends ThemedInjectingAppCompatA
 
   @Inject ThemeCache themeCache;
   @Inject ThemeColor themeColor;
-  @Inject Preferences preferences;
   @Inject DialogBuilder dialogBuilder;
 
   protected int selectedTheme = -1;
@@ -65,22 +63,9 @@ public abstract class BaseListSettingsActivity extends ThemedInjectingAppCompatA
       selectedIcon = savedInstanceState.getInt(EXTRA_SELECTED_ICON);
     }
 
-    final boolean backButtonSavesTask = preferences.backButtonSavesTask();
     toolbar.setTitle(getToolbarTitle());
-    toolbar.setNavigationIcon(
+    toolbar.setNavigationIcon(ContextCompat.getDrawable(this, R.drawable.ic_outline_save_24px));
-        ContextCompat.getDrawable(
+    toolbar.setNavigationOnClickListener(v -> save());
-            this,
-            backButtonSavesTask
-                ? R.drawable.ic_outline_clear_24px
-                : R.drawable.ic_outline_save_24px));
-    toolbar.setNavigationOnClickListener(
-        v -> {
-          if (backButtonSavesTask) {
-            discard();
-          } else {
-            save();
-          }
-        });
     if (!isNew()) {
       toolbar.inflateMenu(R.menu.menu_tag_settings);
     }
@@ -98,11 +83,7 @@ public abstract class BaseListSettingsActivity extends ThemedInjectingAppCompatA
 
   @Override
   public void onBackPressed() {
-    if (preferences.backButtonSavesTask()) {
+    discard();
-      save();
-    } else {
-      discard();
-    }
   }
 
   protected abstract int getLayout();

app/src/main/java/org/tasks/caldav/BaseCaldavAccountSettingsActivity.java

@@ -32,7 +32,6 @@ import org.tasks.databinding.ActivityCaldavAccountSettingsBinding;
 import org.tasks.dialogs.DialogBuilder;
 import org.tasks.etesync.EteSyncAccountSettingsActivity;
 import org.tasks.injection.ThemedInjectingAppCompatActivity;
-import org.tasks.preferences.Preferences;
 import org.tasks.security.Encryption;
 import org.tasks.ui.DisplayableException;
 import org.tasks.ui.MenuColorizer;
@@ -47,7 +46,6 @@ public abstract class BaseCaldavAccountSettingsActivity extends ThemedInjectingA
   @Inject protected CaldavDao caldavDao;
   @Inject protected Encryption encryption;
   @Inject DialogBuilder dialogBuilder;
-  @Inject Preferences preferences;
   @Inject TaskDeleter taskDeleter;
 
   protected CaldavAccount caldavAccount;
@@ -81,23 +79,10 @@ public abstract class BaseCaldavAccountSettingsActivity extends ThemedInjectingA
 
     Toolbar toolbar = binding.toolbar.toolbar;
 
-    final boolean backButtonSavesTask = preferences.backButtonSavesTask();
     toolbar.setTitle(
         caldavAccount == null ? getString(R.string.add_account) : caldavAccount.getName());
-    toolbar.setNavigationIcon(
+    toolbar.setNavigationIcon(ContextCompat.getDrawable(this, R.drawable.ic_outline_save_24px));
-        ContextCompat.getDrawable(
+    toolbar.setNavigationOnClickListener(v -> save());
-            this,
-            backButtonSavesTask
-                ? R.drawable.ic_outline_clear_24px
-                : R.drawable.ic_outline_save_24px));
-    toolbar.setNavigationOnClickListener(
-        v -> {
-          if (backButtonSavesTask) {
-            discard();
-          } else {
-            save();
-          }
-        });
     toolbar.inflateMenu(R.menu.menu_caldav_account_settings);
     toolbar.setOnMenuItemClickListener(this);
     toolbar.showOverflowMenu();
@@ -344,11 +329,7 @@ public abstract class BaseCaldavAccountSettingsActivity extends ThemedInjectingA
 
   @Override
   public void onBackPressed() {
-    if (preferences.backButtonSavesTask()) {
+    discard();
-      save();
-    } else {
-      discard();
-    }
   }
 
   private void removeAccountPrompt() {