From 7d1714e47a42dfc878b2a13a6868c65788c43574 Mon Sep 17 00:00:00 2001
From: Paul Schaub <vanitasvitae@fsfe.org>
Date: Sat, 21 Dec 2019 03:13:00 +0100
Subject: [PATCH] Improve last commit

---
 .../messenger/MercuryImApplication.java       | 24 +++++++------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/app/src/main/java/org/mercury_im/messenger/MercuryImApplication.java b/app/src/main/java/org/mercury_im/messenger/MercuryImApplication.java
index 37e4bab..7db0992 100644
--- a/app/src/main/java/org/mercury_im/messenger/MercuryImApplication.java
+++ b/app/src/main/java/org/mercury_im/messenger/MercuryImApplication.java
@@ -3,9 +3,8 @@ package org.mercury_im.messenger;
 import android.app.Application;
 import android.content.Intent;
 import android.os.Build;
-import android.util.Log;
 
-import org.mercury_im.messenger.data.repository.Repositories;
+import org.mercury_im.messenger.data.repository.AccountRepository;
 import org.mercury_im.messenger.di.component.AppComponent;
 import org.mercury_im.messenger.di.component.DaggerAppComponent;
 import org.mercury_im.messenger.di.module.AppModule;
@@ -32,7 +31,7 @@ public class MercuryImApplication extends Application {
     private final CompositeDisposable disposable = new CompositeDisposable();
 
     @Inject
-    Repositories repositories;
+    AccountRepository accountRepository;
 
     public static MercuryImApplication getApplication() {
         return INSTANCE;
@@ -49,7 +48,7 @@ public class MercuryImApplication extends Application {
         registerActivityLifecycleCallbacks(clientStateHandler);
         Notifications.initializeNotificationChannels(this);
 
-        observeAccounts();
+        subscribeForegroundServiceToActiveAccounts();
     }
 
     /**
@@ -69,31 +68,26 @@ public class MercuryImApplication extends Application {
         return appComponent;
     }
 
-    private void observeAccounts() {
-        disposable.add(repositories.getAccountRepository().observeAllAccounts()
+    private void subscribeForegroundServiceToActiveAccounts() {
+        disposable.add(accountRepository.observeAllAccounts()
                 .map(this::listContainsActiveAccount)
                 .distinctUntilChanged()
-                .subscribe(foregroundServiceNecessary -> {
-                    if (foregroundServiceNecessary) {
-                        Log.d("MercuryIM", "Enable foreground service.");
+                .subscribe(foregroundServiceNeeded -> {
+                    if (foregroundServiceNeeded) {
                         startForegroundService();
                     } else {
-                        Log.d("MercuryIM", "Disable foreground service.");
                         stopForegroundService();
                     }
                 }));
     }
 
     private boolean listContainsActiveAccount(List<Account> accounts) {
-        Log.d("MercuryIM", "listContainsActiveAccount size: " + accounts.size());
-        boolean containsActiveAccount = false;
         for (Account account : accounts) {
             if (account.isEnabled()) {
-                containsActiveAccount = true;
-                break;
+                return true;
             }
         }
-        return containsActiveAccount;
+        return false;
     }
 
     private void startForegroundService() {