From 95a2e6aa000df9f5b567a75710314dcce40d002b Mon Sep 17 00:00:00 2001 From: M66B Date: Tue, 19 Mar 2019 08:19:12 +0000 Subject: [PATCH] Option to show messages, folders and accounts on startup --- .../java/eu/faircode/email/ActivityView.java | 33 +++++++++++++--- .../eu/faircode/email/AdapterAccount.java | 8 +++- .../java/eu/faircode/email/DaoAccount.java | 5 ++- .../eu/faircode/email/FragmentAccounts.java | 39 ++++++++++++------- .../eu/faircode/email/FragmentOptions.java | 35 +++++++++++------ .../eu/faircode/email/ReceiverAutostart.java | 10 +++++ app/src/main/res/layout/fragment_options.xml | 37 +++++++++--------- app/src/main/res/layout/item_account.xml | 2 +- app/src/main/res/values-ar-rBH/strings.xml | 1 - app/src/main/res/values-ar-rEG/strings.xml | 1 - app/src/main/res/values-ar-rSA/strings.xml | 1 - app/src/main/res/values-ar-rYE/strings.xml | 1 - app/src/main/res/values-az-rAZ/strings.xml | 2 - app/src/main/res/values-de-rDE/strings.xml | 2 - app/src/main/res/values-es-rES/strings.xml | 7 +++- app/src/main/res/values-fa-rIR/strings.xml | 2 - app/src/main/res/values-fr-rFR/strings.xml | 2 - app/src/main/res/values-it-rIT/strings.xml | 7 +++- app/src/main/res/values-nl-rNL/strings.xml | 8 +++- app/src/main/res/values-pl-rPL/strings.xml | 1 - app/src/main/res/values-pt-rBR/strings.xml | 2 - app/src/main/res/values-ro-rRO/strings.xml | 3 +- app/src/main/res/values-ru-rRU/strings.xml | 2 - app/src/main/res/values-sv-rSE/strings.xml | 2 - app/src/main/res/values-tr-rTR/strings.xml | 2 - app/src/main/res/values-zh-rCN/strings.xml | 2 - app/src/main/res/values/strings.xml | 15 ++++++- 27 files changed, 144 insertions(+), 88 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/ActivityView.java b/app/src/main/java/eu/faircode/email/ActivityView.java index ef87c491bf..26f85ee724 100644 --- 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); diff --git a/app/src/main/java/eu/faircode/email/AdapterAccount.java b/app/src/main/java/eu/faircode/email/AdapterAccount.java index 9c03710542..b734cf6e0a 100644 --- 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 { private Context context; + private boolean settings; private LayoutInflater inflater; private List items = new ArrayList<>(); @@ -92,6 +93,8 @@ public class AdapterAccount extends RecyclerView.Adapter getAccountsTbd(); - @Query("SELECT * FROM account") - LiveData> liveAccounts(); + @Query("SELECT * FROM account" + + " WHERE :all OR account.synchronize") + LiveData> liveAccounts(boolean all); @Query("SELECT * FROM account WHERE synchronize") LiveData> liveSynchronizingAccounts(); diff --git a/app/src/main/java/eu/faircode/email/FragmentAccounts.java b/app/src/main/java/eu/faircode/email/FragmentAccounts.java index d2332ce60b..a9d693e3fb 100644 --- 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>() { - @Override - public void onChanged(@Nullable List accounts) { - if (accounts == null) - accounts = new ArrayList<>(); + DB.getInstance(getContext()).account().liveAccounts(settings) + .observe(getViewLifecycleOwner(), new Observer>() { + @Override + public void onChanged(@Nullable List 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(); + } + }); } } diff --git a/app/src/main/java/eu/faircode/email/FragmentOptions.java b/app/src/main/java/eu/faircode/email/FragmentOptions.java index 42e6011698..cbce254149 100644 --- 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)); diff --git a/app/src/main/java/eu/faircode/email/ReceiverAutostart.java b/app/src/main/java/eu/faircode/email/ReceiverAutostart.java index 32d229fb95..61e15d9de8 100644 --- 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(); } } } diff --git a/app/src/main/res/layout/fragment_options.xml b/app/src/main/res/layout/fragment_options.xml index e6919807b9..98e88204fb 100644 --- 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" /> - - - + app:layout_constraintTop_toBottomOf="@id/vSeparatorDisplay" /> + + + app:layout_constraintTop_toBottomOf="@id/ivPrimary" /> برمجة استخدام اتصالات أجهزة الاستنشاق تصفح الرسائل على الخادم - علبة البريد الوارد الموحدة تجميع بحسب التاريخ مؤشر ترابط المحادثة إظهار صور جهات الاتصال diff --git a/app/src/main/res/values-ar-rEG/strings.xml b/app/src/main/res/values-ar-rEG/strings.xml index 2635373c8c..e46691f399 100644 --- a/app/src/main/res/values-ar-rEG/strings.xml +++ b/app/src/main/res/values-ar-rEG/strings.xml @@ -105,7 +105,6 @@ برمجة استخدام اتصالات أجهزة الاستنشاق تصفح الرسائل على الخادم - علبة البريد الوارد الموحدة تجميع بحسب التاريخ مؤشر ترابط المحادثة إظهار صور جهات الاتصال diff --git a/app/src/main/res/values-ar-rSA/strings.xml b/app/src/main/res/values-ar-rSA/strings.xml index 2635373c8c..e46691f399 100644 --- a/app/src/main/res/values-ar-rSA/strings.xml +++ b/app/src/main/res/values-ar-rSA/strings.xml @@ -105,7 +105,6 @@ برمجة استخدام اتصالات أجهزة الاستنشاق تصفح الرسائل على الخادم - علبة البريد الوارد الموحدة تجميع بحسب التاريخ مؤشر ترابط المحادثة إظهار صور جهات الاتصال diff --git a/app/src/main/res/values-ar-rYE/strings.xml b/app/src/main/res/values-ar-rYE/strings.xml index 2635373c8c..e46691f399 100644 --- a/app/src/main/res/values-ar-rYE/strings.xml +++ b/app/src/main/res/values-ar-rYE/strings.xml @@ -105,7 +105,6 @@ برمجة استخدام اتصالات أجهزة الاستنشاق تصفح الرسائل على الخادم - علبة البريد الوارد الموحدة تجميع بحسب التاريخ مؤشر ترابط المحادثة إظهار صور جهات الاتصال diff --git a/app/src/main/res/values-az-rAZ/strings.xml b/app/src/main/res/values-az-rAZ/strings.xml index 8f11db5681..b5995fa4a4 100644 --- a/app/src/main/res/values-az-rAZ/strings.xml +++ b/app/src/main/res/values-az-rAZ/strings.xml @@ -121,7 +121,6 @@ Ölçülmüş bağlantıları istifadə et Mesajları və qoşmaları ölçülmüş bağlantıda avtomatik endir Serverdəki mesajlara nəzər yetir - Birləşmiş gələn qutusu Tarixə görə qrup Danışıq sırası Şəxs fotolarını göstər @@ -153,7 +152,6 @@ Sazlama rejimi Qlobal olaraq mesajların göndərilməsi və alınmasını fəallaşdır və ya ləğv et Ümumiyyətlə ölçülmüş bağlantılar, mobil və ya ödənişli Wi-Fi bağlantılarıdır - Birləşmiş gələn qutusu qovluqları və ya mesajlarını göstər Bir-biri ilə əlaqəli qrup mesajları 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 Bir çox təchizatçı göndərən ünvanını dəyişdirməyə icazə vermir diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml index 51127a473a..4416f5f496 100644 --- a/app/src/main/res/values-de-rDE/strings.xml +++ b/app/src/main/res/values-de-rDE/strings.xml @@ -128,7 +128,6 @@ Getaktete Verbindungen verwenden Automatisches Herunterladen von E-Mails und Anhängen auf getakteten Verbindungen bis zu einer Größe von E-Mails auf dem Server durchsuchen - Sammeleingang Nach Datum gruppieren Konversationsansicht Kontaktfotos anzeigen @@ -162,7 +161,6 @@ Vollständiges de-/aktivieren der Empfangs- und Versandfunktion von E-Mails Getaktete Verbindungen sind in der Regel mobile Verbindungen oder bezahlte Wi-Fi Hotspots Durch herunterscrollen weitere E-Mails laden - Zeige die Ordner oder die E-Mails des Sammeleingangs an E-Mails gruppieren, die miteinander verwandt sind Wenn deaktiviert, werden nur Namen angezeigt, sofern verfügbar Beachten Sie, dass markierte Nachrichten immer lokal gehalten werden diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml index b5a15a1b5d..cf3c2d217d 100644 --- a/app/src/main/res/values-es-rES/strings.xml +++ b/app/src/main/res/values-es-rES/strings.xml @@ -8,6 +8,7 @@ Notificaciones Alertas Errores + Contactos Sincronizar Nuevos mensajes Redactar @@ -127,7 +128,6 @@ Usar conexión de datos Descargar automáticamente mensajes y adjuntos usando conexión de datos hasta Explorar mensajes en el servidor - Bandeja de entrada unificada Agrupar por fecha Hilos de conversación Mostrar fotos de contactos @@ -161,7 +161,6 @@ Desactivar o activar globalmente la recepción y envío de mensajes Las conexiones medidas son generalmente conexiones móviles o puntos de acceso Wi-Fi de pago Buscar más mensajes al desplazarse hacia abajo - Mostrar carpetas de bandeja de entrada unificada o mensajes de bandeja de entrada unificada Agrupar mensajes relacionados entre sí Si está desactivado, solo se mostrarán los nombres cuando estén disponibles Tenga en cuenta que los mensajes destacados siempre se almacenarán localmente @@ -247,6 +246,7 @@ No hay operaciones pendientes Nombre de carpeta Nombre para mostrar + Ocultar en los menús Mostrar en bandeja de entrada unificada Sincronizar (recibir mensajes) Comprobar periódicamente en lugar de sincronizar continuamente @@ -390,6 +390,7 @@ Activada Detener procesamiento de reglas después de ejecutar esta regla Remitente contiene + El destinatario contiene Asunto contiene Encabezado contiene Expresión regular @@ -402,6 +403,8 @@ Responder a direcciones en CC Falta nombre de regla Falta condición + Automatización + Esto enviará el intento \'%1$s\' con los extras \'%2$s\' Marcar como leído Archivar Mover a Papelera diff --git a/app/src/main/res/values-fa-rIR/strings.xml b/app/src/main/res/values-fa-rIR/strings.xml index 52a2ca645a..b5f4f21475 100644 --- a/app/src/main/res/values-fa-rIR/strings.xml +++ b/app/src/main/res/values-fa-rIR/strings.xml @@ -89,7 +89,6 @@ استفاده از شبکه موبایل دریافت خودکار پیام‌ها و پیوست‌ها روی شبکه موبایل مرور پیام‌های روی سرور - صندوق دریافت یکپارچه گروه بندی بر اساس تاریخ دسته بندی مکالمه نمایش تصویر مخاطبین @@ -117,7 +116,6 @@ فعال یا غیرفعال سازی جهانی دریافت و ارسال پیام‌ها اتصال‌های حجمی عموما شبکه‌های موبایل یا یک هات اسپات غیر رایگان می‌باشند گرفتن و دریافت پیام‌های بیشتر پیمایش به سمت پایین - نمایش پوشه‌های صندوق دریافت یکپارچه یا صندوق دریافت یکپارچه پیام‌ها پیام‌های گروهی مرتبط با یکدیگر باز کردن خودکار پیام وقتی فقط یک پیام یا فقط یک پیام خوانده نشده در مکالمه وجود دارد بسته شدن خودکار مکالمات زمانی که همه پیام‌ها آرشیو شده، فرستاده شده و یا به به سطل آشغال فرستاده شده است diff --git a/app/src/main/res/values-fr-rFR/strings.xml b/app/src/main/res/values-fr-rFR/strings.xml index 29a8e205b8..2efddc517d 100644 --- a/app/src/main/res/values-fr-rFR/strings.xml +++ b/app/src/main/res/values-fr-rFR/strings.xml @@ -128,7 +128,6 @@ Utiliser des connexions limitées Télécharger automatiquement les messages et les pièces jointes avec une connexion limitée jusqu\'à Lire directement les messages sur le serveur - Boite de réception unifiée Grouper par date Fil de conversation Afficher les photos des contacts @@ -162,7 +161,6 @@ Désactiver ou activer globalement la réception et l\'envoi de messages Les connexions limitées sont généralement des connexions mobiles ou des points d\'accès Wi-Fi payants Télécharger plus de messages en faisant défiler vers le bas - Afficher les dossiers de la boîte de réception unifiée ou les messages de la boîte de réception unifiée Groupe de messages liés les uns aux autres Si désactivé, seuls les noms seront affichés si disponibles Notez que les messages suivis seront toujours conservés localement diff --git a/app/src/main/res/values-it-rIT/strings.xml b/app/src/main/res/values-it-rIT/strings.xml index c6d085d8eb..349b81cfd5 100644 --- a/app/src/main/res/values-it-rIT/strings.xml +++ b/app/src/main/res/values-it-rIT/strings.xml @@ -8,6 +8,7 @@ Notifiche Avvertenze Errori + Contatti Sincronizza Nuovi messaggi Scrivi @@ -127,7 +128,6 @@ Usa connessioni a consumo Scarica automaticamente i messaggi e gli allegati con una connessione a consumo fino a Sfoglia i messaggi sul server - Posta in arrivo unificata Raggruppa per data Thread di conversazione Mostra foto del contatto @@ -161,7 +161,6 @@ Attiva o disattiva a livello globale la ricezione e l\'invio dei messaggi Le connessioni a consumo sono generalmente connessioni mobili o hotspot Wi-Fi a pagamento Scarica più messaggi quando scorri verso il basso - Mostra cartelle in arrivo unificate o messaggi in arrivo unificati Messaggi di gruppo relazionati a vicenda Quando disabilitati saranno mostrati solo i nomi quando disponibili Nota che i messaggi preferiti saranno sempre conservati localmente @@ -247,6 +246,7 @@ Nessuna operazione in sospeso Nome cartella Nome visualizzato + Nascondi dai menu Mostra in posta in arrivo unificata Sincronizza (ricevi messaggi) Controllare periodicamente anziché sincronizzare continuamente @@ -390,6 +390,7 @@ Abilitato Ferma l\'elaborazione delle regole dopo l\'esecuzione di questa regola Il mittente contiene + Il destinatario contiene L\'oggetto contiene L\'intestazione contiene Regex @@ -402,6 +403,8 @@ Rispondi agli indirizzi CC Nome Regola mancante Condizione mancante + Automazione + Questo invierà l\'intento \'%1$s\' con gli extra \'%2$s\' Segna come letto Archivia Cestina diff --git a/app/src/main/res/values-nl-rNL/strings.xml b/app/src/main/res/values-nl-rNL/strings.xml index 5308162593..b530ef1f94 100644 --- a/app/src/main/res/values-nl-rNL/strings.xml +++ b/app/src/main/res/values-nl-rNL/strings.xml @@ -128,7 +128,7 @@ Gemeten verbindingen gebruiken Automatisch downloaden van berichten en bijlagen op een gemeten verbinding tot Blader door berichten op de server - Gecombineerd postvak in + Toon op het startscherm Op datum groeperen Gesprekken groeperen Toon foto\'s contacten @@ -162,7 +162,6 @@ Globaal in- of uitschakelen van het ontvangen en verzenden van berichten Gemeten verbindingen zijn over het algemeen mobiele verbindingen of betaalde Wi-Fi hotspots Meer berichten ophalen bij het naar beneden scrollen - Gecombineerd postvak in mappen of gecombineerd postvak in berichten weergeven Groepeer gerelateerde berichten Indien uitgeschakeld, worden alleen namen weergegeven als deze beschikbaar zijn Merk op dat berichten met een ster altijd lokaal worden bewaard @@ -512,4 +511,9 @@ 2 MB ∞ + + Gecombineerd postvak in + Gecombineerde postvak in mappen + Accounts + diff --git a/app/src/main/res/values-pl-rPL/strings.xml b/app/src/main/res/values-pl-rPL/strings.xml index 0e2a005504..46dfb1f38c 100644 --- a/app/src/main/res/values-pl-rPL/strings.xml +++ b/app/src/main/res/values-pl-rPL/strings.xml @@ -143,7 +143,6 @@ Użyj połączeń taryfowych Automatycznie pobieraj wiadomości i załączniki przy połączeniach taryfowych do Przeglądaj wiadomości na serwerze - Wspólna skrzynka odbiorcza Grupuj według dat Konwersacje w wątkach Pokaż zdjęcia kontaktu diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 9b0f8a7c48..6d2417b2dd 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -128,7 +128,6 @@ Usar conexões limitadas Fazer download automático de mensagens e anexos em uma conexão limitada até Procurar mensagens no servidor - Caixa de entrada unificada Agrupar por data Encadeamento de conversas Mostrar fotos de contatos @@ -162,7 +161,6 @@ Desative ou habilite o recebimento e envio de mensagens globalmente Conexões limitadas são geralmente conexões móveis ou hotspots Wi-Fi pagos Obter mais mensagens ao rolar para baixo - Mostrar as pastas da caixa de entrada unificada ou as mensagens da caixa de entrada unificada Agrupe as mensagens relacionadas entre si Quando desativado apenas os nomes serão exibidos quando disponíveis Observe que as mensagens favoritadas serão sempre mantidas localmente diff --git a/app/src/main/res/values-ro-rRO/strings.xml b/app/src/main/res/values-ro-rRO/strings.xml index 0ddb2b1936..1afb9ecb03 100644 --- a/app/src/main/res/values-ro-rRO/strings.xml +++ b/app/src/main/res/values-ro-rRO/strings.xml @@ -136,7 +136,6 @@ Folosește conexiuni contorizate Descarcă automat mesajele și atașamentele, folosind o conexiune contorizată, până în Răsfoiește mesajele de pe server - Căsuță poștală comună Grupare după dată Aranjare mesaje în conversație Arată pozele contactelor @@ -170,7 +169,6 @@ Control global pentru recepția și trimiterea mesajelor Conexiunile contorizate sunt în general cele mobile sau punctele de acces Wi-Fi cu plată Descarcă mai multe mesaje când se derulează în jos - Arată dosarele unificate sau mesajele primite unificate Grupează mesajele asociate Dacă este dezactivată, doar numele va fi afișat atunci când este disponibil Rețineți că mesajele marcate vor fi păstrate întotdeauna la nivel local @@ -256,6 +254,7 @@ Nici o operațiune în așteptare Nume dosar Nume afișat + Ascundeți din meniuri Arată în căsuța poștală comună Sincronizare (primire mesaje) Verifică periodic în loc de a sincroniza în continuu diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml index d22b36009e..6d88a0eb6f 100644 --- a/app/src/main/res/values-ru-rRU/strings.xml +++ b/app/src/main/res/values-ru-rRU/strings.xml @@ -139,7 +139,6 @@ Использовать лимитированные подключения Автоматически загружать сообщения и вложения для лимитного подключения до Просмотр сообщений на сервере - Единый почтовый ящик Группировать по дате Связанные диалоги Показать фотографии контакта @@ -170,7 +169,6 @@ Глобальное включение/отключение получения и отправки сообщений Лимитированные подключения - это обычно мобильные сети или платные Wi-Fi Получите больше сообщений при прокрутке вниз - Показать отдельные папки \"Входящие\" или сообщения в единой папке Группировать сообщения, связанные друг с другом Если отключено, будут показаны только имена (при наличии) Автоматически открывать сообщение, когда оно только одно или только одно непрочитанное сообщение в диалоге diff --git a/app/src/main/res/values-sv-rSE/strings.xml b/app/src/main/res/values-sv-rSE/strings.xml index 4204c5838d..ab7dae9a6a 100644 --- a/app/src/main/res/values-sv-rSE/strings.xml +++ b/app/src/main/res/values-sv-rSE/strings.xml @@ -125,7 +125,6 @@ Använda uppmätta anslutningar Automatiskt hämta meddelanden och bilagor på en uppmätt anslutning upp till Bläddra bland meddelanden på servern - Samlad inkorg Gruppera efter datum Konversationstrådar Visa kontaktfoton @@ -157,7 +156,6 @@ Inaktivera eller aktivera mottagning och sändning av meddelanden globalt Uppmätta anslutningar är generellt mobila anslutningar eller betalda Wi-Fi-hotspots Hämta fler meddelanden när du rullar ner - Visa samlad inkorg eller kombinerade inkorgsmeddelanden Gruppera meddelanden relaterade till varandra När inaktiverad visas endast namn när det är tillgängligt Observera att stjärnmärkta meddelanden alltid kommer att lagras lokalt diff --git a/app/src/main/res/values-tr-rTR/strings.xml b/app/src/main/res/values-tr-rTR/strings.xml index 25b33c37db..4c830626d4 100644 --- a/app/src/main/res/values-tr-rTR/strings.xml +++ b/app/src/main/res/values-tr-rTR/strings.xml @@ -125,7 +125,6 @@ Ölçülü bağlantıları kullan Mesajları ve ekleri ölçülü bir bağlantıya kadar otomatik olarak indir Sunucudaki iletilere göz atın - Birleştirilmiş gelen kutusu Tarihe göre grup İletişim iş parçacığı Kişi fotoğraflarını göster @@ -159,7 +158,6 @@ İletileri alma ve göndermeyi toptan devre dışı bırakın veya etkinleştirin Ölçülü bağlantılar genellikle mobil bağlantılar veya ücretli Wi-Fi noktalarıdır Aşağı doğru kaydırdığında daha çok ileti getirir - Birleşik gelen kutusu klasörlerini veya birleşik gelen kutusu iletilerini göster Birbirlerine bağlı grup iletileri Devre dışı bırakıldığında, yalnızca adlar mevcut olduğunda gösterilecektir Not yıldızlı iletileri her zaman yerel olarak tutulacaktır diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index c2c31a072f..9b6f0548d8 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -120,7 +120,6 @@ 使用按流量计费的连接 在计量的连接下自动下载邮件和附件, 最高可达 浏览服务器上的消息 - 聚合收件箱 按日期分组 会话线程 显示联系人头像 @@ -154,7 +153,6 @@ 全局禁用或启用邮件的接收和发送 计量连接通常是指移动连接或付费WiFi热点 向下滚动时拉取更多邮件 - 显示统一收件箱文件夹或统一收件箱邮件 对相互关联的邮件进行分组 禁用该选项，将仅显示名称（如果可用） 请注意, 加星消息将始终保存在本地 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index e5c3c66c22..77ef73e956 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -156,7 +156,7 @@ Automatically download messages and attachments on a metered connection up to Browse messages on the server - Unified inbox + Show on start screen Group by date Conversation threading Show contact photos @@ -193,7 +193,6 @@ Globally disable or enable receiving and sending of messages Metered connections are generally mobile connections or paid Wi-Fi hotspots Fetch more messages when scrolling down - Show unified inbox folders or unified inbox messages Group messages related to each other When disabled only names will be shown when available Note that starred messages will always be kept locally @@ -585,6 +584,18 @@ ∞ + + unified + folders + accounts + + + + Unified inbox + Unified folders + Accounts + + 16384 32768