Option to show messages, folders and accounts on startup

2019-03-19 08:19:12 +00:00 · 2019-03-19 08:19:12 +00:00 · 95a2e6aa00
parent ac11e117a6
commit 95a2e6aa00
27 changed files with 144 additions and 88 deletions
--- a/app/src/main/java/eu/faircode/email/ActivityView.java
+++ b/app/src/main/java/eu/faircode/email/ActivityView.java
@ -93,7 +93,7 @@ import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 import androidx.preference.PreferenceManager;

 public class ActivityView extends ActivityBilling implements FragmentManager.OnBackStackChangedListener {
-    private boolean unified;
+    private String startup;

    private View view;
    private DrawerLayout drawerLayout;
@ -121,6 +121,7 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
    static final int REQUEST_SENDER = 5;
    static final int REQUEST_RECIPIENT = 6;

+    static final String ACTION_VIEW_FOLDERS = BuildConfig.APPLICATION_ID + ".VIEW_FOLDERS";
    static final String ACTION_VIEW_MESSAGES = BuildConfig.APPLICATION_ID + ".VIEW_MESSAGES";
    static final String ACTION_VIEW_THREAD = BuildConfig.APPLICATION_ID + ".VIEW_THREAD";
    static final String ACTION_STORE_RAW = BuildConfig.APPLICATION_ID + ".STORE_RAW";
@ -144,7 +145,7 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
        super.onCreate(savedInstanceState);

        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
-        unified = prefs.getBoolean("unified", true);
+        startup = prefs.getString("startup", "unified");

        view = LayoutInflater.from(this).inflate(R.layout.activity_view, null);
        setContentView(view);
@ -412,8 +413,22 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
    }

    private void init() {
-        FragmentBase fragment = (unified ? new FragmentMessages() : new FragmentFolders());
-        fragment.setArguments(new Bundle());
+        Bundle args = new Bundle();
+
+        FragmentBase fragment;
+        switch (startup) {
+            case "accounts":
+                fragment = new FragmentAccounts();
+                args.putBoolean("settings", false);
+                break;
+            case "folders":
+                fragment = new FragmentFolders();
+                break;
+            default:
+                fragment = new FragmentMessages();
+        }
+
+        fragment.setArguments(args);

        FragmentManager fm = getSupportFragmentManager();
        FragmentTransaction fragmentTransaction = fm.beginTransaction();
@ -545,6 +560,7 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB

        LocalBroadcastManager lbm = LocalBroadcastManager.getInstance(this);
        IntentFilter iff = new IntentFilter();
+        iff.addAction(ACTION_VIEW_FOLDERS);
        iff.addAction(ACTION_VIEW_MESSAGES);
        iff.addAction(ACTION_VIEW_THREAD);
        iff.addAction(ACTION_STORE_RAW);
@ -1056,7 +1072,9 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
            if (getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.RESUMED)) {
                String action = intent.getAction();

-                if (ACTION_VIEW_MESSAGES.equals(action))
+                if (ACTION_VIEW_FOLDERS.equals(action))
+                    onViewFolders(intent);
+                else if (ACTION_VIEW_MESSAGES.equals(action))
                    onViewMessages(intent);
                else if (ACTION_VIEW_THREAD.equals(action))
                    onViewThread(intent);
@ -1084,6 +1102,11 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
        }
    };

+    private void onViewFolders(Intent intent) {
+        long account = intent.getLongExtra("id", -1);
+        onMenuFolders(account);
+    }
+
    private void onViewMessages(Intent intent) {
        if (getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.RESUMED))
            getSupportFragmentManager().popBackStack("messages", FragmentManager.POP_BACK_STACK_INCLUSIVE);
--- a/app/src/main/java/eu/faircode/email/AdapterAccount.java
+++ b/app/src/main/java/eu/faircode/email/AdapterAccount.java
@ -45,6 +45,7 @@ import androidx.recyclerview.widget.RecyclerView;

 public class AdapterAccount extends RecyclerView.Adapter<AdapterAccount.ViewHolder> {
    private Context context;
+    private boolean settings;
    private LayoutInflater inflater;

    private List<EntityAccount> items = new ArrayList<>();
@ -92,6 +93,8 @@ public class AdapterAccount extends RecyclerView.Adapter<AdapterAccount.ViewHold
            ivPrimary.setVisibility(account.primary ? View.VISIBLE : View.INVISIBLE);
            tvName.setText(account.name);
            ivSync.setImageResource(account.synchronize ? R.drawable.baseline_sync_24 : R.drawable.baseline_sync_disabled_24);
+            ivSync.setVisibility(settings ? View.VISIBLE : View.GONE);
+
            tvUser.setText(account.user);

            if ("connected".equals(account.state))
@ -124,13 +127,14 @@ public class AdapterAccount extends RecyclerView.Adapter<AdapterAccount.ViewHold

            LocalBroadcastManager lbm = LocalBroadcastManager.getInstance(context);
            lbm.sendBroadcast(
-                    new Intent(ActivitySetup.ACTION_EDIT_ACCOUNT)
+                    new Intent(settings ? ActivitySetup.ACTION_EDIT_ACCOUNT : ActivityView.ACTION_VIEW_FOLDERS)
                            .putExtra("id", account.id));
        }
    }

-    AdapterAccount(Context context) {
+    AdapterAccount(Context context, boolean settings) {
        this.context = context;
+        this.settings = settings;
        this.inflater = LayoutInflater.from(context);

        setHasStableIds(true);
--- a/app/src/main/java/eu/faircode/email/DaoAccount.java
+++ b/app/src/main/java/eu/faircode/email/DaoAccount.java
@ -38,8 +38,9 @@ public interface DaoAccount {
    @Query("SELECT * FROM account WHERE tbd = 1")
    List<EntityAccount> getAccountsTbd();

-    @Query("SELECT * FROM account")
-    LiveData<List<EntityAccount>> liveAccounts();
+    @Query("SELECT * FROM account" +
+            " WHERE :all OR account.synchronize")
+    LiveData<List<EntityAccount>> liveAccounts(boolean all);

    @Query("SELECT * FROM account WHERE synchronize")
    LiveData<List<EntityAccount>> liveSynchronizingAccounts();
--- a/app/src/main/java/eu/faircode/email/FragmentAccounts.java
+++ b/app/src/main/java/eu/faircode/email/FragmentAccounts.java
@ -40,6 +40,7 @@ import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;

 public class FragmentAccounts extends FragmentBase {
+    private boolean settings;
    private RecyclerView rvAccount;
    private ContentLoadingProgressBar pbWait;
    private Group grpReady;
@ -48,6 +49,13 @@ public class FragmentAccounts extends FragmentBase {

    private AdapterAccount adapter;

+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        Bundle args = getArguments();
+        settings = (args == null || args.getBoolean("settings", true));
+    }
+
    @Override
    @Nullable
    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
@ -67,7 +75,7 @@ public class FragmentAccounts extends FragmentBase {
        LinearLayoutManager llm = new LinearLayoutManager(getContext());
        rvAccount.setLayoutManager(llm);

-        adapter = new AdapterAccount(getContext());
+        adapter = new AdapterAccount(getContext(), settings);
        rvAccount.setAdapter(adapter);

        fab.setOnClickListener(new View.OnClickListener() {
@ -104,22 +112,23 @@ public class FragmentAccounts extends FragmentBase {
        super.onActivityCreated(savedInstanceState);

        // Observe accounts
-        DB.getInstance(getContext()).account().liveAccounts().observe(getViewLifecycleOwner(), new Observer<List<EntityAccount>>() {
-            @Override
-            public void onChanged(@Nullable List<EntityAccount> accounts) {
-                if (accounts == null)
-                    accounts = new ArrayList<>();
+        DB.getInstance(getContext()).account().liveAccounts(settings)
+                .observe(getViewLifecycleOwner(), new Observer<List<EntityAccount>>() {
+                    @Override
+                    public void onChanged(@Nullable List<EntityAccount> accounts) {
+                        if (accounts == null)
+                            accounts = new ArrayList<>();

-                adapter.set(accounts);
+                        adapter.set(accounts);

-                pbWait.setVisibility(View.GONE);
-                grpReady.setVisibility(View.VISIBLE);
+                        pbWait.setVisibility(View.GONE);
+                        grpReady.setVisibility(View.VISIBLE);

-                if (accounts.size() == 0)
-                    animator.start();
-                else
-                    animator.end();
-            }
-        });
+                        if (accounts.size() == 0)
+                            animator.start();
+                        else
+                            animator.end();
+                    }
+                });
    }
 }
--- a/app/src/main/java/eu/faircode/email/FragmentOptions.java
+++ b/app/src/main/java/eu/faircode/email/FragmentOptions.java
@ -72,7 +72,7 @@ public class FragmentOptions extends FragmentBase implements SharedPreferences.O
    private SwitchCompat swMetered;
    private Spinner spDownload;

-    private SwitchCompat swUnified;
+    private Spinner spStartup;
    private SwitchCompat swDate;
    private SwitchCompat swThreading;
    private SwitchCompat swAvatars;
@ -111,7 +111,7 @@ public class FragmentOptions extends FragmentBase implements SharedPreferences.O
    private Group grpNotification;

    static String[] OPTIONS_RESTART = new String[]{
-            "unified", "date", "threading", "avatars", "identicons", "name_email", "subject_italic", "flags", "preview",
+            "startup", "date", "threading", "avatars", "identicons", "name_email", "subject_italic", "flags", "preview",
            "addresses", "autohtml", "autoimages", "actionbar",
            "pull", "swipenav", "autoexpand", "autoclose", "autonext",
            "debug"
@ -120,7 +120,7 @@ public class FragmentOptions extends FragmentBase implements SharedPreferences.O
    private final static String[] ADVANCED_OPTIONS = new String[]{
            "enabled", "schedule_start", "schedule_end",
            "metered", "download",
-            "unified", "date", "threading", "avatars", "identicons", "name_email", "subject_italic", "flags", "preview",
+            "startup", "date", "threading", "avatars", "identicons", "name_email", "subject_italic", "flags", "preview",
            "addresses", "autohtml", "remove_tracking", "autoimages", "actionbar",
            "pull", "swipenav", "autoexpand", "autoclose", "autonext", "collapse", "autoread", "automove",
            "autoresize", "sender", "autosend",
@ -148,7 +148,7 @@ public class FragmentOptions extends FragmentBase implements SharedPreferences.O
        swMetered = view.findViewById(R.id.swMetered);
        spDownload = view.findViewById(R.id.spDownload);

-        swUnified = view.findViewById(R.id.swUnified);
+        spStartup = view.findViewById(R.id.spStartup);
        swDate = view.findViewById(R.id.swDate);
        swThreading = view.findViewById(R.id.swThreading);
        swAvatars = view.findViewById(R.id.swAvatars);
@ -278,10 +278,16 @@ public class FragmentOptions extends FragmentBase implements SharedPreferences.O
            }
        });

-        swUnified.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+        spStartup.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
            @Override
-            public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
-                prefs.edit().putBoolean("unified", checked).apply();
+            public void onItemSelected(AdapterView<?> adapterView, View view, int position, long id) {
+                String[] values = getResources().getStringArray(R.array.startupValues);
+                prefs.edit().putString("startup", values[position]).apply();
+            }
+
+            @Override
+            public void onNothingSelected(AdapterView<?> parent) {
+                prefs.edit().remove("startup").apply();
            }
        });

@ -568,9 +574,9 @@ public class FragmentOptions extends FragmentBase implements SharedPreferences.O
        swMetered.setChecked(prefs.getBoolean("metered", true));

        int download = prefs.getInt("download", 32768);
-        int[] values = getResources().getIntArray(R.array.downloadValues);
-        for (int pos = 0; pos < values.length; pos++)
-            if (values[pos] == download) {
+        int[] downloadValues = getResources().getIntArray(R.array.downloadValues);
+        for (int pos = 0; pos < downloadValues.length; pos++)
+            if (downloadValues[pos] == download) {
                spDownload.setTag(pos);
                spDownload.setSelection(pos);
                break;
@ -578,7 +584,14 @@ public class FragmentOptions extends FragmentBase implements SharedPreferences.O

        boolean compact = prefs.getBoolean("compact", false);

-        swUnified.setChecked(prefs.getBoolean("unified", true));
+        String startup = prefs.getString("startup", "unified");
+        String[] startupValues = getResources().getStringArray(R.array.startupValues);
+        for (int pos = 0; pos < startupValues.length; pos++)
+            if (startupValues[pos].equals(startup)) {
+                spStartup.setSelection(pos);
+                break;
+            }
+
        swDate.setChecked(prefs.getBoolean("date", true));
        swThreading.setChecked(prefs.getBoolean("threading", true));
        swAvatars.setChecked(prefs.getBoolean("avatars", true));
--- a/app/src/main/java/eu/faircode/email/ReceiverAutostart.java
+++ b/app/src/main/java/eu/faircode/email/ReceiverAutostart.java
@ -22,6 +22,9 @@ package eu.faircode.email;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
+import android.content.SharedPreferences;
+
+import androidx.preference.PreferenceManager;

 public class ReceiverAutostart extends BroadcastReceiver {
    @Override
@ -31,6 +34,13 @@ public class ReceiverAutostart extends BroadcastReceiver {
            Log.i("Received " + intent);
            ServiceSynchronize.boot(context);
            ServiceSend.boot(context);
+
+            SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
+            SharedPreferences.Editor editor = prefs.edit();
+            if (!prefs.getBoolean("unified", true))
+                editor.putString("startup", "folders");
+            editor.remove("unified");
+            editor.apply();
        }
    }
 }
--- a/app/src/main/res/layout/fragment_options.xml
+++ b/app/src/main/res/layout/fragment_options.xml
@ -218,30 +218,29 @@
            app:layout_constraintStart_toStartOf="parent"
            app:layout_constraintTop_toBottomOf="@id/tvSectionDisplay" />

-        <androidx.appcompat.widget.SwitchCompat
-            android:id="@+id/swUnified"
-            android:layout_width="match_parent"
+        <TextView
+            android:id="@+id/tvStartup"
+            android:layout_width="0dp"
            android:layout_height="wrap_content"
            android:layout_marginStart="12dp"
            android:layout_marginTop="12dp"
            android:layout_marginEnd="12dp"
-            android:text="@string/title_advanced_unified"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/vSeparatorDisplay"
-            app:switchPadding="12dp" />
-
-        <TextView
-            android:id="@+id/tvUnifiedHint"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="12dp"
-            android:layout_marginEnd="60dp"
-            android:text="@string/title_advanced_unified_hint"
-            android:textAppearance="@style/TextAppearance.AppCompat.Small"
-            android:textStyle="italic"
+            android:text="@string/title_advanced_startup"
+            android:textAppearance="@style/Base.TextAppearance.AppCompat.Small"
+            android:textColor="?android:attr/textColorPrimary"
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/swUnified" />
+            app:layout_constraintTop_toBottomOf="@id/vSeparatorDisplay" />
+
+        <Spinner
+            android:id="@+id/spStartup"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="12dp"
+            android:layout_marginTop="6dp"
+            android:entries="@array/startupNames"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/tvStartup" />

        <androidx.appcompat.widget.SwitchCompat
            android:id="@+id/swDate"
@ -252,7 +251,7 @@
            android:layout_marginEnd="12dp"
            android:text="@string/title_advanced_date_header"
            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tvUnifiedHint"
+            app:layout_constraintTop_toBottomOf="@id/spStartup"
            app:switchPadding="12dp" />

        <androidx.appcompat.widget.SwitchCompat
--- a/app/src/main/res/layout/item_account.xml
+++ b/app/src/main/res/layout/item_account.xml
@ -72,7 +72,7 @@
            android:textAppearance="@style/TextAppearance.AppCompat.Small"
            app:layout_constraintEnd_toStartOf="@+id/ivSync"
            app:layout_constraintStart_toEndOf="@+id/ivPrimary"
-            app:layout_constraintTop_toBottomOf="@id/ivSync" />
+            app:layout_constraintTop_toBottomOf="@id/ivPrimary" />

        <ImageView
            android:id="@+id/ivState"
--- a/app/src/main/res/values-ar-rBH/strings.xml
+++ b/app/src/main/res/values-ar-rBH/strings.xml
@ -105,7 +105,6 @@
    <string name="title_advanced_schedule">برمجة</string>
    <string name="title_advanced_metered">استخدام اتصالات أجهزة الاستنشاق</string>
    <string name="title_advanced_browse">تصفح الرسائل على الخادم</string>
-    <string name="title_advanced_unified">علبة البريد الوارد الموحدة</string>
    <string name="title_advanced_date_header">تجميع بحسب التاريخ</string>
    <string name="title_advanced_threading">مؤشر ترابط المحادثة</string>
    <string name="title_advanced_avatars">إظهار صور جهات الاتصال</string>
--- a/app/src/main/res/values-ar-rEG/strings.xml
+++ b/app/src/main/res/values-ar-rEG/strings.xml
@ -105,7 +105,6 @@
    <string name="title_advanced_schedule">برمجة</string>
    <string name="title_advanced_metered">استخدام اتصالات أجهزة الاستنشاق</string>
    <string name="title_advanced_browse">تصفح الرسائل على الخادم</string>
-    <string name="title_advanced_unified">علبة البريد الوارد الموحدة</string>
    <string name="title_advanced_date_header">تجميع بحسب التاريخ</string>
    <string name="title_advanced_threading">مؤشر ترابط المحادثة</string>
    <string name="title_advanced_avatars">إظهار صور جهات الاتصال</string>
--- a/app/src/main/res/values-ar-rSA/strings.xml
+++ b/app/src/main/res/values-ar-rSA/strings.xml
@ -105,7 +105,6 @@
    <string name="title_advanced_schedule">برمجة</string>
    <string name="title_advanced_metered">استخدام اتصالات أجهزة الاستنشاق</string>
    <string name="title_advanced_browse">تصفح الرسائل على الخادم</string>
-    <string name="title_advanced_unified">علبة البريد الوارد الموحدة</string>
    <string name="title_advanced_date_header">تجميع بحسب التاريخ</string>
    <string name="title_advanced_threading">مؤشر ترابط المحادثة</string>
    <string name="title_advanced_avatars">إظهار صور جهات الاتصال</string>
--- a/app/src/main/res/values-ar-rYE/strings.xml
+++ b/app/src/main/res/values-ar-rYE/strings.xml
@ -105,7 +105,6 @@
    <string name="title_advanced_schedule">برمجة</string>
    <string name="title_advanced_metered">استخدام اتصالات أجهزة الاستنشاق</string>
    <string name="title_advanced_browse">تصفح الرسائل على الخادم</string>
-    <string name="title_advanced_unified">علبة البريد الوارد الموحدة</string>
    <string name="title_advanced_date_header">تجميع بحسب التاريخ</string>
    <string name="title_advanced_threading">مؤشر ترابط المحادثة</string>
    <string name="title_advanced_avatars">إظهار صور جهات الاتصال</string>
--- a/app/src/main/res/values-az-rAZ/strings.xml
+++ b/app/src/main/res/values-az-rAZ/strings.xml
@ -121,7 +121,6 @@
    <string name="title_advanced_metered">Ölçülmüş bağlantıları istifadə et</string>
    <string name="title_advanced_download">Mesajları və qoşmaları ölçülmüş bağlantıda avtomatik endir</string>
    <string name="title_advanced_browse">Serverdəki mesajlara nəzər yetir</string>
-    <string name="title_advanced_unified">Birləşmiş gələn qutusu</string>
    <string name="title_advanced_date_header">Tarixə görə qrup</string>
    <string name="title_advanced_threading">Danışıq sırası</string>
    <string name="title_advanced_avatars">Şəxs fotolarını göstər</string>
@ -153,7 +152,6 @@
    <string name="title_advanced_debug">Sazlama rejimi</string>
    <string name="title_advanced_enabled_hint">Qlobal olaraq mesajların göndərilməsi və alınmasını fəallaşdır və ya ləğv et</string>
    <string name="title_advanced_metered_hint">Ümumiyyətlə ölçülmüş bağlantılar, mobil və ya ödənişli Wi-Fi bağlantılarıdır</string>
-    <string name="title_advanced_unified_hint">Birləşmiş gələn qutusu qovluqları və ya mesajlarını göstər</string>
    <string name="title_advanced_threading_hint">Bir-biri ilə əlaqəli qrup mesajları</string>
    <string name="title_advanced_autoclose_hint">Bütün mesajlar arxivlənəndə, göndəriləndə və tulantı qovluğuna atılanda danışıq mövzularını avtomatik olaraq bağla</string>
    <string name="title_advanced_sender_hint">Bir çox təchizatçı göndərən ünvanını dəyişdirməyə icazə vermir</string>
--- a/app/src/main/res/values-de-rDE/strings.xml
+++ b/app/src/main/res/values-de-rDE/strings.xml
@ -128,7 +128,6 @@
    <string name="title_advanced_metered">Getaktete Verbindungen verwenden</string>
    <string name="title_advanced_download">Automatisches Herunterladen von E-Mails und Anhängen auf getakteten Verbindungen bis zu einer Größe von</string>
    <string name="title_advanced_browse">E-Mails auf dem Server durchsuchen</string>
-    <string name="title_advanced_unified">Sammeleingang</string>
    <string name="title_advanced_date_header">Nach Datum gruppieren</string>
    <string name="title_advanced_threading">Konversationsansicht</string>
    <string name="title_advanced_avatars">Kontaktfotos anzeigen</string>
@ -162,7 +161,6 @@
    <string name="title_advanced_enabled_hint">Vollständiges de-/aktivieren der Empfangs- und Versandfunktion von E-Mails</string>
    <string name="title_advanced_metered_hint">Getaktete Verbindungen sind in der Regel mobile Verbindungen oder bezahlte Wi-Fi Hotspots</string>
    <string name="title_advanced_browse_hint">Durch herunterscrollen weitere E-Mails laden</string>
-    <string name="title_advanced_unified_hint">Zeige die Ordner oder die E-Mails des Sammeleingangs an</string>
    <string name="title_advanced_threading_hint">E-Mails gruppieren, die miteinander verwandt sind</string>
    <string name="title_advanced_name_email_hint">Wenn deaktiviert, werden nur Namen angezeigt, sofern verfügbar</string>
    <string name="title_advanced_flags_hint">Beachten Sie, dass markierte Nachrichten immer lokal gehalten werden</string>
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@ -8,6 +8,7 @@
    <string name="channel_notification">Notificaciones</string>
    <string name="channel_warning">Alertas</string>
    <string name="channel_error">Errores</string>
+    <string name="channel_group_contacts">Contactos</string>
    <string name="tile_synchronize">Sincronizar</string>
    <string name="tile_unseen">Nuevos mensajes</string>
    <string name="shortcut_compose">Redactar</string>
@ -127,7 +128,6 @@
    <string name="title_advanced_metered">Usar conexión de datos</string>
    <string name="title_advanced_download">Descargar automáticamente mensajes y adjuntos usando conexión de datos hasta</string>
    <string name="title_advanced_browse">Explorar mensajes en el servidor</string>
-    <string name="title_advanced_unified">Bandeja de entrada unificada</string>
    <string name="title_advanced_date_header">Agrupar por fecha</string>
    <string name="title_advanced_threading">Hilos de conversación</string>
    <string name="title_advanced_avatars">Mostrar fotos de contactos</string>
@ -161,7 +161,6 @@
    <string name="title_advanced_enabled_hint">Desactivar o activar globalmente la recepción y envío de mensajes</string>
    <string name="title_advanced_metered_hint">Las conexiones medidas son generalmente conexiones móviles o puntos de acceso Wi-Fi de pago</string>
    <string name="title_advanced_browse_hint">Buscar más mensajes al desplazarse hacia abajo</string>
-    <string name="title_advanced_unified_hint">Mostrar carpetas de bandeja de entrada unificada o mensajes de bandeja de entrada unificada</string>
    <string name="title_advanced_threading_hint">Agrupar mensajes relacionados entre sí</string>
    <string name="title_advanced_name_email_hint">Si está desactivado, solo se mostrarán los nombres cuando estén disponibles</string>
    <string name="title_advanced_flags_hint">Tenga en cuenta que los mensajes destacados siempre se almacenarán localmente</string>
@ -247,6 +246,7 @@
    <string name="title_no_operations">No hay operaciones pendientes</string>
    <string name="title_folder_name">Nombre de carpeta</string>
    <string name="title_display_name">Nombre para mostrar</string>
+    <string name="title_hide_folder">Ocultar en los menús</string>
    <string name="title_unified_folder">Mostrar en bandeja de entrada unificada</string>
    <string name="title_synchronize_folder">Sincronizar (recibir mensajes)</string>
    <string name="title_poll_folder">Comprobar periódicamente en lugar de sincronizar continuamente</string>
@ -390,6 +390,7 @@
    <string name="title_rule_enabled">Activada</string>
    <string name="title_rule_stop">Detener procesamiento de reglas después de ejecutar esta regla</string>
    <string name="title_rule_sender">Remitente contiene</string>
+    <string name="title_rule_recipient">El destinatario contiene</string>
    <string name="title_rule_subject">Asunto contiene</string>
    <string name="title_rule_header">Encabezado contiene</string>
    <string name="title_rule_regex">Expresión regular</string>
@ -402,6 +403,8 @@
    <string name="title_rule_cc">Responder a direcciones en CC</string>
    <string name="title_rule_name_missing">Falta nombre de regla</string>
    <string name="title_rule_condition_missing">Falta condición</string>
+    <string name="title_rule_automation">Automatización</string>
+    <string name="title_rule_automation_hint">Esto enviará el intento \'%1$s\' con los extras \'%2$s\'</string>
    <string name="title_action_seen">Marcar como leído</string>
    <string name="title_action_archive">Archivar</string>
    <string name="title_action_trash">Mover a Papelera</string>
--- a/app/src/main/res/values-fa-rIR/strings.xml
+++ b/app/src/main/res/values-fa-rIR/strings.xml
@ -89,7 +89,6 @@
    <string name="title_advanced_metered">استفاده از شبکه موبایل</string>
    <string name="title_advanced_download">دریافت خودکار پیام‌ها و پیوست‌ها روی شبکه موبایل</string>
    <string name="title_advanced_browse">مرور پیام‌های روی سرور</string>
-    <string name="title_advanced_unified">صندوق دریافت یکپارچه</string>
    <string name="title_advanced_date_header">گروه بندی بر اساس تاریخ</string>
    <string name="title_advanced_threading">دسته بندی مکالمه</string>
    <string name="title_advanced_avatars">نمایش تصویر مخاطبین</string>
@ -117,7 +116,6 @@
    <string name="title_advanced_enabled_hint">فعال یا غیرفعال سازی جهانی دریافت و ارسال پیام‌ها</string>
    <string name="title_advanced_metered_hint">اتصال‌های حجمی عموما شبکه‌های موبایل یا یک هات اسپات غیر رایگان می‌باشند</string>
    <string name="title_advanced_browse_hint">گرفتن و دریافت پیام‌های بیشتر پیمایش به سمت پایین</string>
-    <string name="title_advanced_unified_hint">نمایش پوشه‌های صندوق دریافت یکپارچه یا صندوق دریافت یکپارچه پیام‌ها</string>
    <string name="title_advanced_threading_hint">پیام‌های گروهی مرتبط با یکدیگر</string>
    <string name="title_advanced_autoexpand_hint">باز کردن خودکار پیام وقتی فقط یک پیام یا فقط یک پیام خوانده نشده در مکالمه وجود دارد</string>
    <string name="title_advanced_autoclose_hint">بسته شدن خودکار مکالمات زمانی که همه پیام‌ها آرشیو شده، فرستاده شده و یا به به سطل آشغال فرستاده شده است</string>
--- a/app/src/main/res/values-fr-rFR/strings.xml
+++ b/app/src/main/res/values-fr-rFR/strings.xml
@ -128,7 +128,6 @@
    <string name="title_advanced_metered">Utiliser des connexions limitées</string>
    <string name="title_advanced_download">Télécharger automatiquement les messages et les pièces jointes avec une connexion limitée jusqu\'à</string>
    <string name="title_advanced_browse">Lire directement les messages sur le serveur</string>
-    <string name="title_advanced_unified">Boite de réception unifiée</string>
    <string name="title_advanced_date_header">Grouper par date</string>
    <string name="title_advanced_threading">Fil de conversation</string>
    <string name="title_advanced_avatars">Afficher les photos des contacts</string>
@ -162,7 +161,6 @@
    <string name="title_advanced_enabled_hint">Désactiver ou activer globalement la réception et l\'envoi de messages</string>
    <string name="title_advanced_metered_hint">Les connexions limitées sont généralement des connexions mobiles ou des points d\'accès Wi-Fi payants</string>
    <string name="title_advanced_browse_hint">Télécharger plus de messages en faisant défiler vers le bas</string>
-    <string name="title_advanced_unified_hint">Afficher les dossiers de la boîte de réception unifiée ou les messages de la boîte de réception unifiée</string>
    <string name="title_advanced_threading_hint">Groupe de messages liés les uns aux autres</string>
    <string name="title_advanced_name_email_hint">Si désactivé, seuls les noms seront affichés si disponibles</string>
    <string name="title_advanced_flags_hint">Notez que les messages suivis seront toujours conservés localement</string>
--- a/app/src/main/res/values-it-rIT/strings.xml
+++ b/app/src/main/res/values-it-rIT/strings.xml
@ -8,6 +8,7 @@
    <string name="channel_notification">Notifiche</string>
    <string name="channel_warning">Avvertenze</string>
    <string name="channel_error">Errori</string>
+    <string name="channel_group_contacts">Contatti</string>
    <string name="tile_synchronize">Sincronizza</string>
    <string name="tile_unseen">Nuovi messaggi</string>
    <string name="shortcut_compose">Scrivi</string>
@ -127,7 +128,6 @@
    <string name="title_advanced_metered">Usa connessioni a consumo</string>
    <string name="title_advanced_download">Scarica automaticamente i messaggi e gli allegati con una connessione a consumo fino a</string>
    <string name="title_advanced_browse">Sfoglia i messaggi sul server</string>
-    <string name="title_advanced_unified">Posta in arrivo unificata</string>
    <string name="title_advanced_date_header">Raggruppa per data</string>
    <string name="title_advanced_threading">Thread di conversazione</string>
    <string name="title_advanced_avatars">Mostra foto del contatto</string>
@ -161,7 +161,6 @@
    <string name="title_advanced_enabled_hint">Attiva o disattiva a livello globale la ricezione e l\'invio dei messaggi</string>
    <string name="title_advanced_metered_hint">Le connessioni a consumo sono generalmente connessioni mobili o hotspot Wi-Fi a pagamento</string>
    <string name="title_advanced_browse_hint">Scarica più messaggi quando scorri verso il basso</string>
-    <string name="title_advanced_unified_hint">Mostra cartelle in arrivo unificate o messaggi in arrivo unificati</string>
    <string name="title_advanced_threading_hint">Messaggi di gruppo relazionati a vicenda</string>
    <string name="title_advanced_name_email_hint">Quando disabilitati saranno mostrati solo i nomi quando disponibili</string>
    <string name="title_advanced_flags_hint">Nota che i messaggi preferiti saranno sempre conservati localmente</string>
@ -247,6 +246,7 @@
    <string name="title_no_operations">Nessuna operazione in sospeso</string>
    <string name="title_folder_name">Nome cartella</string>
    <string name="title_display_name">Nome visualizzato</string>
+    <string name="title_hide_folder">Nascondi dai menu</string>
    <string name="title_unified_folder">Mostra in posta in arrivo unificata</string>
    <string name="title_synchronize_folder">Sincronizza (ricevi messaggi)</string>
    <string name="title_poll_folder">Controllare periodicamente anziché sincronizzare continuamente</string>
@ -390,6 +390,7 @@
    <string name="title_rule_enabled">Abilitato</string>
    <string name="title_rule_stop">Ferma l\'elaborazione delle regole dopo l\'esecuzione di questa regola</string>
    <string name="title_rule_sender">Il mittente contiene</string>
+    <string name="title_rule_recipient">Il destinatario contiene</string>
    <string name="title_rule_subject">L\'oggetto contiene</string>
    <string name="title_rule_header">L\'intestazione contiene</string>
    <string name="title_rule_regex">Regex</string>
@ -402,6 +403,8 @@
    <string name="title_rule_cc">Rispondi agli indirizzi CC</string>
    <string name="title_rule_name_missing">Nome Regola mancante</string>
    <string name="title_rule_condition_missing">Condizione mancante</string>
+    <string name="title_rule_automation">Automazione</string>
+    <string name="title_rule_automation_hint">Questo invierà l\'intento \'%1$s\' con gli extra \'%2$s\'</string>
    <string name="title_action_seen">Segna come letto</string>
    <string name="title_action_archive">Archivia</string>
    <string name="title_action_trash">Cestina</string>
--- a/app/src/main/res/values-nl-rNL/strings.xml
+++ b/app/src/main/res/values-nl-rNL/strings.xml
@ -128,7 +128,7 @@
    <string name="title_advanced_metered">Gemeten verbindingen gebruiken</string>
    <string name="title_advanced_download">Automatisch downloaden van berichten en bijlagen op een gemeten verbinding tot</string>
    <string name="title_advanced_browse">Blader door berichten op de server</string>
-    <string name="title_advanced_unified">Gecombineerd postvak in</string>
+    <string name="title_advanced_startup">Toon op het startscherm</string>
    <string name="title_advanced_date_header">Op datum groeperen</string>
    <string name="title_advanced_threading">Gesprekken groeperen</string>
    <string name="title_advanced_avatars">Toon foto\'s contacten</string>
@ -162,7 +162,6 @@
    <string name="title_advanced_enabled_hint">Globaal in- of uitschakelen van het ontvangen en verzenden van berichten</string>
    <string name="title_advanced_metered_hint">Gemeten verbindingen zijn over het algemeen mobiele verbindingen of betaalde Wi-Fi hotspots</string>
    <string name="title_advanced_browse_hint">Meer berichten ophalen bij het naar beneden scrollen</string>
-    <string name="title_advanced_unified_hint">Gecombineerd postvak in mappen of gecombineerd postvak in berichten weergeven</string>
    <string name="title_advanced_threading_hint">Groepeer gerelateerde berichten</string>
    <string name="title_advanced_name_email_hint">Indien uitgeschakeld, worden alleen namen weergegeven als deze beschikbaar zijn</string>
    <string name="title_advanced_flags_hint">Merk op dat berichten met een ster altijd lokaal worden bewaard</string>
@ -512,4 +511,9 @@
        <item>2 MB</item>
        <item>&#8734;</item>
    </string-array>
+    <string-array name="startupNames">
+        <item>Gecombineerd postvak in</item>
+        <item>Gecombineerde postvak in mappen</item>
+        <item>Accounts</item>
+    </string-array>
 </resources>
--- a/app/src/main/res/values-pl-rPL/strings.xml
+++ b/app/src/main/res/values-pl-rPL/strings.xml
@ -143,7 +143,6 @@
    <string name="title_advanced_metered">Użyj połączeń taryfowych</string>
    <string name="title_advanced_download">Automatycznie pobieraj wiadomości i załączniki przy połączeniach taryfowych do</string>
    <string name="title_advanced_browse">Przeglądaj wiadomości na serwerze</string>
-    <string name="title_advanced_unified">Wspólna skrzynka odbiorcza</string>
    <string name="title_advanced_date_header">Grupuj według dat</string>
    <string name="title_advanced_threading">Konwersacje w wątkach</string>
    <string name="title_advanced_avatars">Pokaż zdjęcia kontaktu</string>
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@ -128,7 +128,6 @@
    <string name="title_advanced_metered">Usar conexões limitadas</string>
    <string name="title_advanced_download">Fazer download automático de mensagens e anexos em uma conexão limitada até</string>
    <string name="title_advanced_browse">Procurar mensagens no servidor</string>
-    <string name="title_advanced_unified">Caixa de entrada unificada</string>
    <string name="title_advanced_date_header">Agrupar por data</string>
    <string name="title_advanced_threading">Encadeamento de conversas</string>
    <string name="title_advanced_avatars">Mostrar fotos de contatos</string>
@ -162,7 +161,6 @@
    <string name="title_advanced_enabled_hint">Desative ou habilite o recebimento e envio de mensagens globalmente</string>
    <string name="title_advanced_metered_hint">Conexões limitadas são geralmente conexões móveis ou hotspots Wi-Fi pagos</string>
    <string name="title_advanced_browse_hint">Obter mais mensagens ao rolar para baixo</string>
-    <string name="title_advanced_unified_hint">Mostrar as pastas da caixa de entrada unificada ou as mensagens da caixa de entrada unificada</string>
    <string name="title_advanced_threading_hint">Agrupe as mensagens relacionadas entre si</string>
    <string name="title_advanced_name_email_hint">Quando desativado apenas os nomes serão exibidos quando disponíveis</string>
    <string name="title_advanced_flags_hint">Observe que as mensagens favoritadas serão sempre mantidas localmente</string>
--- a/app/src/main/res/values-ro-rRO/strings.xml
+++ b/app/src/main/res/values-ro-rRO/strings.xml
@ -136,7 +136,6 @@
    <string name="title_advanced_metered">Folosește conexiuni contorizate</string>
    <string name="title_advanced_download">Descarcă automat mesajele și atașamentele, folosind o conexiune contorizată, până în</string>
    <string name="title_advanced_browse">Răsfoiește mesajele de pe server</string>
-    <string name="title_advanced_unified">Căsuță poștală comună</string>
    <string name="title_advanced_date_header">Grupare după dată</string>
    <string name="title_advanced_threading">Aranjare mesaje în conversație</string>
    <string name="title_advanced_avatars">Arată pozele contactelor</string>
@ -170,7 +169,6 @@
    <string name="title_advanced_enabled_hint">Control global pentru recepția și trimiterea mesajelor</string>
    <string name="title_advanced_metered_hint">Conexiunile contorizate sunt în general cele mobile sau punctele de acces Wi-Fi cu plată</string>
    <string name="title_advanced_browse_hint">Descarcă mai multe mesaje când se derulează în jos</string>
-    <string name="title_advanced_unified_hint">Arată dosarele unificate sau mesajele primite unificate</string>
    <string name="title_advanced_threading_hint">Grupează mesajele asociate</string>
    <string name="title_advanced_name_email_hint">Dacă este dezactivată, doar numele va fi afișat atunci când este disponibil</string>
    <string name="title_advanced_flags_hint">Rețineți că mesajele marcate vor fi păstrate întotdeauna la nivel local</string>
@ -256,6 +254,7 @@
    <string name="title_no_operations">Nici o operațiune în așteptare</string>
    <string name="title_folder_name">Nume dosar</string>
    <string name="title_display_name">Nume afișat</string>
+    <string name="title_hide_folder">Ascundeți din meniuri</string>
    <string name="title_unified_folder">Arată în căsuța poștală comună</string>
    <string name="title_synchronize_folder">Sincronizare (primire mesaje)</string>
    <string name="title_poll_folder">Verifică periodic în loc de a sincroniza în continuu</string>
--- a/app/src/main/res/values-ru-rRU/strings.xml
+++ b/app/src/main/res/values-ru-rRU/strings.xml
@ -139,7 +139,6 @@
    <string name="title_advanced_metered">Использовать лимитированные подключения</string>
    <string name="title_advanced_download">Автоматически загружать сообщения и вложения для лимитного подключения до</string>
    <string name="title_advanced_browse">Просмотр сообщений на сервере</string>
-    <string name="title_advanced_unified">Единый почтовый ящик</string>
    <string name="title_advanced_date_header">Группировать по дате</string>
    <string name="title_advanced_threading">Связанные диалоги</string>
    <string name="title_advanced_avatars">Показать фотографии контакта</string>
@ -170,7 +169,6 @@
    <string name="title_advanced_enabled_hint">Глобальное включение/отключение получения и отправки сообщений</string>
    <string name="title_advanced_metered_hint">Лимитированные подключения - это обычно мобильные сети или платные Wi-Fi</string>
    <string name="title_advanced_browse_hint">Получите больше сообщений при прокрутке вниз</string>
-    <string name="title_advanced_unified_hint">Показать отдельные папки \"Входящие\" или сообщения в единой папке</string>
    <string name="title_advanced_threading_hint">Группировать сообщения, связанные друг с другом</string>
    <string name="title_advanced_name_email_hint">Если отключено, будут показаны только имена (при наличии)</string>
    <string name="title_advanced_autoexpand_hint">Автоматически открывать сообщение, когда оно только одно или только одно непрочитанное сообщение в диалоге</string>
--- a/app/src/main/res/values-sv-rSE/strings.xml
+++ b/app/src/main/res/values-sv-rSE/strings.xml
@ -125,7 +125,6 @@
    <string name="title_advanced_metered">Använda uppmätta anslutningar</string>
    <string name="title_advanced_download">Automatiskt hämta meddelanden och bilagor på en uppmätt anslutning upp till</string>
    <string name="title_advanced_browse">Bläddra bland meddelanden på servern</string>
-    <string name="title_advanced_unified">Samlad inkorg</string>
    <string name="title_advanced_date_header">Gruppera efter datum</string>
    <string name="title_advanced_threading">Konversationstrådar</string>
    <string name="title_advanced_avatars">Visa kontaktfoton</string>
@ -157,7 +156,6 @@
    <string name="title_advanced_enabled_hint">Inaktivera eller aktivera mottagning och sändning av meddelanden globalt</string>
    <string name="title_advanced_metered_hint">Uppmätta anslutningar är generellt mobila anslutningar eller betalda Wi-Fi-hotspots</string>
    <string name="title_advanced_browse_hint">Hämta fler meddelanden när du rullar ner</string>
-    <string name="title_advanced_unified_hint">Visa samlad inkorg eller kombinerade inkorgsmeddelanden</string>
    <string name="title_advanced_threading_hint">Gruppera meddelanden relaterade till varandra</string>
    <string name="title_advanced_name_email_hint">När inaktiverad visas endast namn när det är tillgängligt</string>
    <string name="title_advanced_flags_hint">Observera att stjärnmärkta meddelanden alltid kommer att lagras lokalt</string>
--- a/app/src/main/res/values-tr-rTR/strings.xml
+++ b/app/src/main/res/values-tr-rTR/strings.xml
@ -125,7 +125,6 @@
    <string name="title_advanced_metered">Ölçülü bağlantıları kullan</string>
    <string name="title_advanced_download">Mesajları ve ekleri ölçülü bir bağlantıya kadar otomatik olarak indir</string>
    <string name="title_advanced_browse">Sunucudaki iletilere göz atın</string>
-    <string name="title_advanced_unified">Birleştirilmiş gelen kutusu</string>
    <string name="title_advanced_date_header">Tarihe göre grup</string>
    <string name="title_advanced_threading">İletişim iş parçacığı</string>
    <string name="title_advanced_avatars">Kişi fotoğraflarını göster</string>
@ -159,7 +158,6 @@
    <string name="title_advanced_enabled_hint">İletileri alma ve göndermeyi toptan devre dışı bırakın veya etkinleştirin</string>
    <string name="title_advanced_metered_hint">Ölçülü bağlantılar genellikle mobil bağlantılar veya ücretli Wi-Fi noktalarıdır</string>
    <string name="title_advanced_browse_hint">Aşağı doğru kaydırdığında daha çok ileti getirir</string>
-    <string name="title_advanced_unified_hint">Birleşik gelen kutusu klasörlerini veya birleşik gelen kutusu iletilerini göster</string>
    <string name="title_advanced_threading_hint">Birbirlerine bağlı grup iletileri</string>
    <string name="title_advanced_name_email_hint">Devre dışı bırakıldığında, yalnızca adlar mevcut olduğunda gösterilecektir</string>
    <string name="title_advanced_flags_hint">Not yıldızlı iletileri her zaman yerel olarak tutulacaktır</string>
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@ -120,7 +120,6 @@
    <string name="title_advanced_metered">使用按流量计费的连接</string>
    <string name="title_advanced_download">在计量的连接下自动下载邮件和附件, 最高可达</string>
    <string name="title_advanced_browse">浏览服务器上的消息</string>
-    <string name="title_advanced_unified">聚合收件箱</string>
    <string name="title_advanced_date_header">按日期分组</string>
    <string name="title_advanced_threading">会话线程</string>
    <string name="title_advanced_avatars">显示联系人头像</string>
@ -154,7 +153,6 @@
    <string name="title_advanced_enabled_hint">全局禁用或启用邮件的接收和发送</string>
    <string name="title_advanced_metered_hint">计量连接通常是指移动连接或付费WiFi热点</string>
    <string name="title_advanced_browse_hint">向下滚动时拉取更多邮件</string>
-    <string name="title_advanced_unified_hint">显示统一收件箱文件夹或统一收件箱邮件</string>
    <string name="title_advanced_threading_hint">对相互关联的邮件进行分组</string>
    <string name="title_advanced_name_email_hint">禁用该选项，将仅显示名称（如果可用）</string>
    <string name="title_advanced_flags_hint">请注意, 加星消息将始终保存在本地</string>
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@ -156,7 +156,7 @@
    <string name="title_advanced_download">Automatically download messages and attachments on a metered connection up to</string>
    <string name="title_advanced_browse">Browse messages on the server</string>

-    <string name="title_advanced_unified">Unified inbox</string>
+    <string name="title_advanced_startup">Show on start screen</string>
    <string name="title_advanced_date_header">Group by date</string>
    <string name="title_advanced_threading">Conversation threading</string>
    <string name="title_advanced_avatars">Show contact photos</string>
@ -193,7 +193,6 @@
    <string name="title_advanced_enabled_hint">Globally disable or enable receiving and sending of messages</string>
    <string name="title_advanced_metered_hint">Metered connections are generally mobile connections or paid Wi-Fi hotspots</string>
    <string name="title_advanced_browse_hint">Fetch more messages when scrolling down</string>
-    <string name="title_advanced_unified_hint">Show unified inbox folders or unified inbox messages</string>
    <string name="title_advanced_threading_hint">Group messages related to each other</string>
    <string name="title_advanced_name_email_hint">When disabled only names will be shown when available</string>
    <string name="title_advanced_flags_hint">Note that starred messages will always be kept locally</string>
@ -585,6 +584,18 @@
        <item>&#8734;</item>
    </string-array>

+    <string-array name="startupValues" translatable="false">
+        <item>unified</item>
+        <item>folders</item>
+        <item>accounts</item>
+    </string-array>
+
+    <string-array name="startupNames">
+        <item>Unified inbox</item>
+        <item>Unified folders</item>
+        <item>Accounts</item>
+    </string-array>
+
    <integer-array name="downloadValues" translatable="false">
        <item>16384</item>
        <item>32768</item>