From 748df246b11a8a98f7cfc57f31ed32df23aad3a9 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Wed, 10 Apr 2019 10:41:09 +0200
Subject: [PATCH] Fixed friend list subscription setting not disabling
 subscription if disabled

---
 .../java/org/linphone/contacts/AsyncContactsLoader.java  | 9 +++++----
 .../java/org/linphone/settings/LinphonePreferences.java  | 4 ----
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/org/linphone/contacts/AsyncContactsLoader.java b/app/src/main/java/org/linphone/contacts/AsyncContactsLoader.java
index 4c971c8e4..c74feddf8 100644
--- a/app/src/main/java/org/linphone/contacts/AsyncContactsLoader.java
+++ b/app/src/main/java/org/linphone/contacts/AsyncContactsLoader.java
@@ -66,8 +66,7 @@ class AsyncContactsLoader extends AsyncTask<Void, Void, AsyncContactsLoader.Asyn
             mContext = LinphoneService.instance().getApplicationContext();
         }
 
-        if (LinphonePreferences.instance() != null
-                && LinphonePreferences.instance().isFriendlistsubscriptionEnabled()) {
+        if (LinphonePreferences.instance().isFriendlistsubscriptionEnabled()) {
             String rls = mContext.getString(R.string.rls_uri);
             for (FriendList list : LinphoneManager.getLc().getFriendsLists()) {
                 if (rls != null
@@ -217,8 +216,10 @@ class AsyncContactsLoader extends AsyncTask<Void, Void, AsyncContactsLoader.Asyn
 
         // Now that contact fetching is asynchronous, this is required to ensure
         // presence subscription event will be sent with all friends
-        for (FriendList list : LinphoneManager.getLc().getFriendsLists()) {
-            list.updateSubscriptions();
+        if (LinphonePreferences.instance().isFriendlistsubscriptionEnabled()) {
+            for (FriendList list : LinphoneManager.getLc().getFriendsLists()) {
+                list.updateSubscriptions();
+            }
         }
 
         ContactsManager.getInstance().setContacts(data.contacts);
diff --git a/app/src/main/java/org/linphone/settings/LinphonePreferences.java b/app/src/main/java/org/linphone/settings/LinphonePreferences.java
index 94561f5eb..df6e8326b 100644
--- a/app/src/main/java/org/linphone/settings/LinphonePreferences.java
+++ b/app/src/main/java/org/linphone/settings/LinphonePreferences.java
@@ -701,10 +701,6 @@ public class LinphonePreferences {
         return getConfig().getBool("app", "java_logger", false);
     }
 
-    public boolean isBackgroundModeEnabled() {
-        return getConfig().getBool("app", "background_mode", true);
-    }
-
     public boolean isAutoStartEnabled() {
         return getConfig().getBool("app", "auto_start", false);
     }