From a59f82feeaa76a3823351f558799a85e3020f0b1 Mon Sep 17 00:00:00 2001 From: M66B Date: Thu, 8 Jun 2023 15:06:03 +0200 Subject: [PATCH] Waiting for server --- app/src/main/java/eu/faircode/email/FragmentMessages.java | 4 +++- app/src/main/res/values/strings.xml | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java index 410910fdec..b48036756b 100644 --- a/app/src/main/java/eu/faircode/email/FragmentMessages.java +++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java @@ -6861,10 +6861,12 @@ public class FragmentMessages extends FragmentBase (language_detection && !TextUtils.isEmpty(filter_language) && !outbox)); boolean none = (items == 0 && initialized); + boolean searching = (viewType == AdapterMessage.ViewType.SEARCH && server && loading && items == 0); boolean filtered = (filter_active && viewType != AdapterMessage.ViewType.SEARCH); pbWait.setVisibility(loading || tasks > 0 ? View.VISIBLE : View.GONE); - tvNoEmail.setVisibility(none ? View.VISIBLE : View.GONE); + tvNoEmail.setText(searching ? R.string.title_search_server_wait : R.string.title_no_messages); + tvNoEmail.setVisibility(none || searching ? View.VISIBLE : View.GONE); tvNoEmailHint.setVisibility(none && filtered ? View.VISIBLE : View.GONE); if (BuildConfig.DEBUG) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 4313312993..1c204a78b9 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1775,6 +1775,7 @@ Search on device Search on server + Waiting for server Search in Search for sender