From f2a68887738c004e6083e3df840fc6e03c65172d Mon Sep 17 00:00:00 2001
From: Erwan Croze <erwan.croze@belledonne-communications.com>
Date: Tue, 3 Oct 2017 16:49:51 +0200
Subject: [PATCH] Removing useless preference Doze mod

---
 res/xml/preferences.xml                          |  5 -----
 src/android/org/linphone/LinphoneManager.java    | 16 ++++++----------
 .../org/linphone/LinphonePreferences.java        | 10 ----------
 src/android/org/linphone/SettingsFragment.java   | 12 +-----------
 4 files changed, 7 insertions(+), 36 deletions(-)

diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index 43ec3930e..60dc49a79 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -270,11 +270,6 @@
 				    android:key="@string/pref_wifi_only_key"
 					android:persistent="false"/>
 
-				<CheckBoxPreference
-					android:title="@string/pref_doze_mode"
-					android:key="@string/pref_doze_mode_key"
-					android:persistent="false"/>
-
 				<EditTextPreference
 				    android:title="@string/pref_stun_server"
 					android:key="@string/pref_stun_server_key"
diff --git a/src/android/org/linphone/LinphoneManager.java b/src/android/org/linphone/LinphoneManager.java
index 0a969e59e..ccfecb2aa 100644
--- a/src/android/org/linphone/LinphoneManager.java
+++ b/src/android/org/linphone/LinphoneManager.java
@@ -856,15 +856,12 @@ public class LinphoneManager implements LinphoneCoreListener, LinphoneChatMessag
 
 
 
-		if (mPrefs.isDozeModeEnabled()) {
-			if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-				mDozeIntentFilter = new IntentFilter();
-				mDozeIntentFilter.addAction(PowerManager.ACTION_DEVICE_IDLE_MODE_CHANGED);
-				mDozeReceiver = new DozeReceiver();
-				dozeModeEnabled = ((PowerManager) mServiceContext.getSystemService(Context.POWER_SERVICE)).isDeviceIdleMode();
-				if (dozeModeEnabled)
-					mServiceContext.registerReceiver(mDozeReceiver, mDozeIntentFilter);
-			}
+		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+			mDozeIntentFilter = new IntentFilter();
+			mDozeIntentFilter.addAction(PowerManager.ACTION_DEVICE_IDLE_MODE_CHANGED);
+			mDozeReceiver = new DozeReceiver();
+			dozeModeEnabled = ((PowerManager) mServiceContext.getSystemService(Context.POWER_SERVICE)).isDeviceIdleMode();
+			mServiceContext.registerReceiver(mDozeReceiver, mDozeIntentFilter);
 		}
 
 		mHookIntentFilter = new IntentFilter("com.base.module.phone.HOOKEVENT");
@@ -1085,7 +1082,6 @@ public class LinphoneManager implements LinphoneCoreListener, LinphoneChatMessag
 				} catch (IllegalArgumentException e) {
 					e.printStackTrace();
 				}
-
 			}
 			dozeModeEnabled = false;
 		}
diff --git a/src/android/org/linphone/LinphonePreferences.java b/src/android/org/linphone/LinphonePreferences.java
index 3c6fac444..b1a8b6de0 100644
--- a/src/android/org/linphone/LinphonePreferences.java
+++ b/src/android/org/linphone/LinphonePreferences.java
@@ -1553,16 +1553,6 @@ public class LinphonePreferences {
 		return getConfig().getInt("app", "activation_code_length", 0);
 	}
 
-	public boolean isDozeModeEnabled() {
-		if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M)
-			return false;
-		return getConfig().getBool("app", "doze_mode", true);
-	}
-
-	public void enableDozeMode(boolean enable) {
-		getConfig().setBool("app", "doze_mode", enable);
-	}
-
 	public void disableFriendsStorage() {
 		getConfig().setBool("misc", "store_friends", false);
 	}
diff --git a/src/android/org/linphone/SettingsFragment.java b/src/android/org/linphone/SettingsFragment.java
index 0a2c224da..57ad5a43e 100644
--- a/src/android/org/linphone/SettingsFragment.java
+++ b/src/android/org/linphone/SettingsFragment.java
@@ -48,6 +48,7 @@ import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
 import android.media.AudioManager;
 import android.net.Uri;
+import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.preference.CheckBoxPreference;
@@ -1081,8 +1082,6 @@ public class SettingsFragment extends PreferencesListFragment {
 	private void initNetworkSettings() {
 		((CheckBoxPreference) findPreference(getString(R.string.pref_wifi_only_key))).setChecked(mPrefs.isWifiOnlyEnabled());
 
-		((CheckBoxPreference) findPreference(getString(R.string.pref_doze_mode_key))).setChecked(mPrefs.isDozeModeEnabled());
-
 		// Disable UPnP if ICE si enabled, or disable ICE if UPnP is enabled
 		CheckBoxPreference ice = (CheckBoxPreference) findPreference(getString(R.string.pref_ice_enable_key));
 		CheckBoxPreference turn = (CheckBoxPreference) findPreference(getString(R.string.pref_turn_enable_key));
@@ -1123,15 +1122,6 @@ public class SettingsFragment extends PreferencesListFragment {
 			}
 		});
 
-		findPreference(getString(R.string.pref_doze_mode_key)).setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
-			@Override
-			public boolean onPreferenceChange(Preference preference, Object newValue) {
-				mPrefs.enableDozeMode((Boolean) newValue);
-				LinphoneManager.getInstance().dozeManager((Boolean) newValue);
-				return true;
-			}
-		});
-
 		findPreference(getString(R.string.pref_stun_server_key)).setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
 			@Override
 			public boolean onPreferenceChange(Preference preference, Object newValue) {