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

Commit 26c1ebf2 authored by Romain Hunault's avatar Romain Hunault 🚴🏻
Browse files

Merge branch 'dev' into 'master' 

[RELEASE] Sprint Freetown

See merge request e/apps/Mail!15
parents 23e9e4f5 cd4762e9

k9mail/src/main/java/foundation/e/mail/activity/setup/AccountConfigImpl.java

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ class AccountConfigImpl implements AccountConfig, Parcelable { 


    private boolean notifyNewMail = true;

    private boolean showOngoing;

    private int automaticCheckIntervalMinutes = -1;

    private int automaticCheckIntervalMinutes = 5;

    private Account.FolderMode folderPushMode = FolderMode.FIRST_CLASS;



    private DeletePolicy deletePolicy = DeletePolicy.ON_DELETE;

k9mail/src/main/java/foundation/e/mail/activity/setup/AccountSetupActivity.java

+2 −2
Original line number Diff line number Diff line
@@ -176,9 +176,9 @@ public class AccountSetupActivity extends AppCompatActivity implements AccountSe 


            makeDefault = savedInstanceState.getBoolean(STATE_MAKE_DEFAULT, makeDefault);

            presenter.onGetMakeDefault(makeDefault);

        }



        } else {

            presenter.onGetAccountUuid(accountUuid);

        }



        if (stage == null) {

            stage = Stage.BASICS;

k9mail/src/main/java/foundation/e/mail/activity/setup/AccountSetupPresenter.java

+6 −1
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ import android.os.Looper; 
import android.support.annotation.NonNull;

import android.support.annotation.Nullable;

import android.util.Log;

import android.widget.Toast;



import foundation.e.mail.Account;

import foundation.e.mail.Account.FolderMode;
@@ -185,7 +186,11 @@ public class AccountSetupPresenter implements AccountSetupContract.Presenter, 


    @Override

    public void onManualSetupButtonClicked(String email, String password) {

        EmailAddressValidator emailValidator = new EmailAddressValidator();

        if(email != null && email.length() > 0 && emailValidator.isValidAddressOnly(email))

            manualSetup(email, password);

        else

            Toast.makeText(context, R.string.account_setup_basics_manual_setup_empty_mail, Toast.LENGTH_LONG).show();

    }



    @Override

k9mail/src/main/res/values-fr/strings.xml

+1 −0
Original line number Diff line number Diff line
@@ -314,6 +314,7 @@ jusqu’à <xliff:g id="messages_to_load">%d</xliff:g> de plus</string> 
  <string name="account_setup_basics_password_hint">Mot de passe</string>

  <string name="account_setup_basics_show_password">Afficher le mot de passe</string>

  <string name="account_setup_basics_manual_setup_action">Configuration manuelle</string>

  <string name="account_setup_basics_manual_setup_empty_mail">L\'adresse email doit être spécifiée</string>

  <string name="account_setup_check_settings_title"/>

  <string name="account_setup_check_settings_retr_info_msg">Récupération des informations de compte\u2026</string>

  <string name="account_setup_check_settings_check_incoming_msg">Vérification des paramètres du serveur entrant\u2026</string>

k9mail/src/main/res/values/strings.xml

+1 −0
Original line number Diff line number Diff line
@@ -379,6 +379,7 @@ Please submit bug reports, contribute new features and ask questions at 
    <string name="account_setup_basics_password_no_password_needed_hint">Please click next</string>

    <string name="account_setup_basics_show_password">Show password</string>

    <string name="account_setup_basics_manual_setup_action">Manual setup</string>

    <string name="account_setup_basics_manual_setup_empty_mail">Mail address cannot be empty</string>



    <string name="account_setup_check_settings_title"/>

    <string name="account_setup_check_settings_retr_info_msg">Retrieving account information\u2026</string>