From bfac316768fda3be94c30a3ca8fe45bf0b398305 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Mon, 29 Jul 2019 16:44:11 +0200
Subject: [PATCH] Refactoring

---
 .../java/eu/faircode/email/ServiceSynchronize.java  | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
index e2eea49e2b..7cb1eff358 100644
--- a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
+++ b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
@@ -1308,8 +1308,7 @@ public class ServiceSynchronize extends ServiceBase {
 
         @Override
         public void onAvailable(Network network) {
-            networkState.update(ConnectionHelper.getNetworkState(ServiceSynchronize.this));
-            updateNotification();
+            updateState();
 
             synchronized (ServiceSynchronize.this) {
                 try {
@@ -1364,8 +1363,7 @@ public class ServiceSynchronize extends ServiceBase {
 
         @Override
         public void onCapabilitiesChanged(Network network, NetworkCapabilities capabilities) {
-            networkState.update(ConnectionHelper.getNetworkState(ServiceSynchronize.this));
-            updateNotification();
+            updateState();
 
             synchronized (ServiceSynchronize.this) {
                 try {
@@ -1382,8 +1380,7 @@ public class ServiceSynchronize extends ServiceBase {
 
         @Override
         public void onLost(Network network) {
-            networkState.update(ConnectionHelper.getNetworkState(ServiceSynchronize.this));
-            updateNotification();
+            updateState();
 
             synchronized (ServiceSynchronize.this) {
                 try {
@@ -1399,7 +1396,9 @@ public class ServiceSynchronize extends ServiceBase {
             }
         }
 
-        private void updateNotification() {
+        private void updateState() {
+            networkState.update(ConnectionHelper.getNetworkState(ServiceSynchronize.this));
+
             if (lastSuitable == null || lastSuitable != networkState.isSuitable()) {
                 lastSuitable = networkState.isSuitable();
                 NotificationManager nm = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);