From 94b775af31e3f056df8284ac1e5634d1ea099f9a Mon Sep 17 00:00:00 2001 From: M66B Date: Tue, 16 Jun 2020 10:51:47 +0200 Subject: [PATCH 1/4] Get network state when needed --- app/src/main/java/eu/faircode/email/ServiceSynchronize.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java index 519b14b64f..97db698d63 100644 --- a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java +++ b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java @@ -1808,7 +1808,10 @@ public class ServiceSynchronize extends ServiceBase implements SharedPreferences return; } - if (networkState == null || accountStates == null) + if (networkState == null) + networkState = ConnectionHelper.getNetworkState(ServiceSynchronize.this); + + if (accountStates == null) return; SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(ServiceSynchronize.this); From 74d15a99f43c384a813ac71c638a326ee140397f Mon Sep 17 00:00:00 2001 From: M66B Date: Tue, 16 Jun 2020 10:57:00 +0200 Subject: [PATCH 2/4] Small improvement --- app/src/main/java/eu/faircode/email/FragmentMessages.java | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java index 39d9d037b2..0b0c8beb5f 100644 --- a/app/src/main/java/eu/faircode/email/FragmentMessages.java +++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java @@ -6779,6 +6779,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences. this.across = !folder.account.equals(message.account); this.account = account; this.folder = folder; + this.copy = false; } MessageTarget(EntityMessage message, EntityAccount account, EntityFolder folder, boolean copy) { From 8443fd469dae4d7eff5e5b00ce043259f33b52dc Mon Sep 17 00:00:00 2001 From: M66B Date: Tue, 16 Jun 2020 11:33:28 +0200 Subject: [PATCH 3/4] Removed widget update delay --- .../eu/faircode/email/ServiceSynchronize.java | 27 +++---------------- 1 file changed, 3 insertions(+), 24 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java index 97db698d63..7be28fee07 100644 --- a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java +++ b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java @@ -95,7 +95,6 @@ public class ServiceSynchronize extends ServiceBase implements SharedPreferences private long lastLost = 0; private int lastAccounts = 0; private int lastOperations = 0; - private Handler handler; private Map coreStates = new Hashtable<>(); private MutableLiveData liveNetworkState = new MutableLiveData<>(); @@ -115,7 +114,6 @@ public class ServiceSynchronize extends ServiceBase implements SharedPreferences private static final int ACCOUNT_ERROR_AFTER = 60; // minutes private static final int ACCOUNT_ERROR_AFTER_POLL = 3; // times private static final int BACKOFF_ERROR_AFTER = 16; // seconds - private static final long WIDGET_UPDATE_DELAY = 1500L; // milliseconds private static final String ACTION_NEW_MESSAGE_COUNT = BuildConfig.APPLICATION_ID + ".NEW_MESSAGE_COUNT"; @@ -147,8 +145,6 @@ public class ServiceSynchronize extends ServiceBase implements SharedPreferences else startForeground(Helper.NOTIFICATION_SYNCHRONIZE, getNotificationService(null, null).build()); - handler = new Handler(); - // Listen for network changes ConnectivityManager cm = (ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE); NetworkRequest.Builder builder = new NetworkRequest.Builder(); @@ -530,8 +526,7 @@ public class ServiceSynchronize extends ServiceBase implements SharedPreferences last = stats; - handler.removeCallbacks(refreshWidget); - handler.postDelayed(refreshWidget, WIDGET_UPDATE_DELAY); + Widget.update(ServiceSynchronize.this); boolean badge = prefs.getBoolean("badge", true); boolean unseen_ignored = prefs.getBoolean("unseen_ignored", false); @@ -585,10 +580,8 @@ public class ServiceSynchronize extends ServiceBase implements SharedPreferences break; } - if (changed) { - handler.removeCallbacks(refreshWidgetUnified); - handler.postDelayed(refreshWidgetUnified, WIDGET_UPDATE_DELAY); - } + if (changed) + WidgetUnified.updateData(ServiceSynchronize.this); last = current; } @@ -597,20 +590,6 @@ public class ServiceSynchronize extends ServiceBase implements SharedPreferences prefs.registerOnSharedPreferenceChangeListener(this); } - private final Runnable refreshWidget = new Runnable() { - @Override - public void run() { - Widget.update(ServiceSynchronize.this); - } - }; - - private final Runnable refreshWidgetUnified = new Runnable() { - @Override - public void run() { - WidgetUnified.updateData(ServiceSynchronize.this); - } - }; - @Override public void onSharedPreferenceChanged(SharedPreferences prefs, String key) { if (PREF_EVAL.contains(key)) { From 2e57a53a32e8a168c984d87616d434a34c6552c2 Mon Sep 17 00:00:00 2001 From: M66B Date: Tue, 16 Jun 2020 11:42:39 +0200 Subject: [PATCH 4/4] 1.1206 release --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 1b7af61c0b..9b95ef7d9b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -13,8 +13,8 @@ android { applicationId "eu.faircode.email" minSdkVersion 21 targetSdkVersion 30 - versionCode 1205 - versionName "1.1205" + versionCode 1206 + versionName "1.1206" archivesBaseName = "FairEmail-v$versionName" // https://en.wikipedia.org/wiki/List_of_dinosaur_genera