Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit c462cc2b authored by cketti's avatar cketti Committed by GitHub
Browse files

Merge pull request #6081 from Lampotrias/Fix-bug-5983 

Missing back button in settings
parents e1ff582c f0535c62

app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/AccountSetupComposition.java

+17 −0
Original line number Diff line number Diff line
@@ -3,12 +3,15 @@ package com.fsck.k9.activity.setup; 
import android.app.Activity;

import android.content.Intent;

import android.os.Bundle;

import android.view.MenuItem;

import android.view.View;

import android.widget.CompoundButton;

import android.widget.CheckBox;

import android.widget.EditText;

import android.widget.LinearLayout;

import android.widget.RadioButton;



import androidx.annotation.NonNull;

import com.fsck.k9.Account;

import com.fsck.k9.Preferences;

import com.fsck.k9.ui.R;
@@ -48,6 +51,10 @@ public class AccountSetupComposition extends K9Activity { 
        setLayout(R.layout.account_setup_composition);

        setTitle(R.string.account_settings_composition_title);



        if (getSupportActionBar() != null) {

            getSupportActionBar().setDisplayHomeAsUpEnabled(true);

        }



        /*

         * If we're being reloaded we override the original account with the one

         * we saved
@@ -101,6 +108,16 @@ public class AccountSetupComposition extends K9Activity { 
        }

    }



    @Override

    public boolean onOptionsItemSelected(@NonNull MenuItem item) {

        if (item.getItemId() == android.R.id.home) {

            onBackPressed();

            return true;

        }



        return super.onOptionsItemSelected(item);

    }



    private void saveSettings() {

        mAccount.setEmail(mAccountEmail.getText().toString());

        mAccount.setAlwaysBcc(mAccountAlwaysBcc.getText().toString());

app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/AccountSetupIncoming.java

+15 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ import android.os.Bundle; 
import android.text.Editable;

import android.text.TextWatcher;

import android.text.method.DigitsKeyListener;

import android.view.MenuItem;

import android.view.View;

import android.view.View.OnClickListener;

import android.view.ViewGroup;
@@ -181,6 +182,10 @@ public class AccountSetupIncoming extends K9Activity implements OnClickListener 
                    getString(R.string.account_setup_basics_show_password_biometrics_subtitle),

                    getString(R.string.account_setup_basics_show_password_need_lock)

            );



            if (getSupportActionBar() != null) {

                getSupportActionBar().setDisplayHomeAsUpEnabled(true);

            }

        }



        try {
@@ -563,6 +568,16 @@ public class AccountSetupIncoming extends K9Activity implements OnClickListener 
        }

    }



    @Override

    public boolean onOptionsItemSelected(@NonNull MenuItem item) {

        if (item.getItemId() == android.R.id.home) {

            onBackPressed();

            return true;

        }



        return super.onOptionsItemSelected(item);

    }



    protected void onNext() {

        try {

            ConnectionSecurity connectionSecurity = getSelectedSecurity();

app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/AccountSetupOutgoing.java

+15 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ import android.os.Bundle; 
import android.text.Editable;

import android.text.TextWatcher;

import android.text.method.DigitsKeyListener;

import android.view.MenuItem;

import android.view.View;

import android.view.View.OnClickListener;

import android.view.ViewGroup;
@@ -157,6 +158,10 @@ public class AccountSetupOutgoing extends K9Activity implements OnClickListener, 
                    getString(R.string.account_setup_basics_show_password_biometrics_subtitle),

                    getString(R.string.account_setup_basics_show_password_need_lock)

            );



            if (getSupportActionBar() != null) {

                getSupportActionBar().setDisplayHomeAsUpEnabled(true);

            }

        }



        try {
@@ -348,6 +353,16 @@ public class AccountSetupOutgoing extends K9Activity implements OnClickListener, 
        validateFields();

    }



    @Override

    public boolean onOptionsItemSelected(@NonNull MenuItem item) {

        if (item.getItemId() == android.R.id.home) {

            onBackPressed();

            return true;

        }



        return super.onOptionsItemSelected(item);

    }



    /**

     * Shows/hides password field

     */