From 86a9a9b74c59447f7b0524c14f6b679ddde50401 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Fri, 6 Apr 2018 14:32:24 +0200
Subject: [PATCH] Added setting for Java logger

---
 res/values/non_localizable_strings.xml                |  1 +
 res/values/strings.xml                                |  1 +
 res/xml/preferences.xml                               |  5 +++++
 src/android/org/linphone/LinphonePreferences.java     |  9 +++++++++
 src/android/org/linphone/LinphoneUtils.java           |  2 +-
 .../org/linphone/fragments/SettingsFragment.java      | 11 +++++++++++
 6 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/res/values/non_localizable_strings.xml b/res/values/non_localizable_strings.xml
index ae91b9e03..539c619b5 100644
--- a/res/values/non_localizable_strings.xml
+++ b/res/values/non_localizable_strings.xml
@@ -58,6 +58,7 @@
     <string name="pref_wizard_key">pref_wizard_key</string>
     <string name="pref_activated_key">pref_activated_key</string>
     <string name="pref_debug_key">pref_debug_key</string>
+    <string name="pref_java_debug_key">pref_java_debug_key</string>
     <string name="first_launch_succeeded_once_key">first_launch_succeeded_once_key</string>
 
     <string name="pref_wifi_only_key">pref_wifi_only_key</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 5ec07acec..521acfdf1 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -426,6 +426,7 @@
     <string name="pref_advanced_title">Advanced</string>
     <string name="pref_debug_title">Debug</string>
     <string name="pref_debug">Debug</string>
+    <string name="pref_java_debug">Use Java logger</string>
     <string name="pref_friendlist_subscribe">Friendlist subscribe</string>
     <string name="pref_background_mode">Background mode</string>
     <string name="pref_animation_enable_title">Enable Animations</string>
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index 60dc49a79..db22cbe4e 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -354,6 +354,11 @@
 					android:key="@string/pref_debug_key"
 					android:persistent="false"/>
 
+                <CheckBoxPreference
+                    android:title="@string/pref_java_debug"
+                    android:key="@string/pref_java_debug_key"
+                    android:persistent="false"/>
+
 			</PreferenceCategory>
 
 		    <PreferenceCategory
diff --git a/src/android/org/linphone/LinphonePreferences.java b/src/android/org/linphone/LinphonePreferences.java
index 81e43f900..bc8dcf49c 100644
--- a/src/android/org/linphone/LinphonePreferences.java
+++ b/src/android/org/linphone/LinphonePreferences.java
@@ -1199,6 +1199,15 @@ public class LinphonePreferences {
 		return getConfig().getBool("app", "debug", false);
 	}
 
+	public void setJavaLogger(boolean enabled) {
+		getConfig().setBool("app", "java_logger", enabled);
+		LinphoneUtils.initLoggingService(isDebugEnabled(), mContext.getString(R.string.app_name));
+	}
+
+	public boolean useJavaLogger() {
+		return getConfig().getBool("app", "java_logger", false);
+	}
+
 	public void setBackgroundModeEnabled(boolean enabled) {
 		getConfig().setBool("app", "background_mode", enabled);
 	}
diff --git a/src/android/org/linphone/LinphoneUtils.java b/src/android/org/linphone/LinphoneUtils.java
index 64df2c09c..2391e4b7f 100644
--- a/src/android/org/linphone/LinphoneUtils.java
+++ b/src/android/org/linphone/LinphoneUtils.java
@@ -103,7 +103,7 @@ public final class LinphoneUtils {
 	}
 
 	public static void initLoggingService(boolean isDebugEnabled, String appName) {
-		if (true) {
+		if (!LinphonePreferences.instance().useJavaLogger()) {
 			Factory.instance().enableLogCollection(LogCollectionState.Enabled);
 			Factory.instance().setDebugMode(isDebugEnabled, appName);
 		} else {
diff --git a/src/android/org/linphone/fragments/SettingsFragment.java b/src/android/org/linphone/fragments/SettingsFragment.java
index 0fe756646..bf8ebad74 100644
--- a/src/android/org/linphone/fragments/SettingsFragment.java
+++ b/src/android/org/linphone/fragments/SettingsFragment.java
@@ -221,6 +221,7 @@ public class SettingsFragment extends PreferencesListFragment {
 
 		if (getResources().getBoolean(R.bool.disable_every_log)) {
 			uncheckAndHidePreference(R.string.pref_debug_key);
+			uncheckAndHidePreference(R.string.pref_java_debug_key);
 		}
 
 		if (!LinphoneManager.getLc().upnpAvailable()) {
@@ -1267,6 +1268,7 @@ public class SettingsFragment extends PreferencesListFragment {
 	private void initAdvancedSettings() {
 		((CheckBoxPreference)findPreference(getString(R.string.pref_friendlist_subscribe_key))).setChecked(mPrefs.isFriendlistsubscriptionEnabled());
 		((CheckBoxPreference)findPreference(getString(R.string.pref_debug_key))).setChecked(mPrefs.isDebugEnabled());
+		((CheckBoxPreference)findPreference(getString(R.string.pref_java_debug_key))).setChecked(mPrefs.useJavaLogger());
 		((CheckBoxPreference)findPreference(getString(R.string.pref_background_mode_key))).setChecked(mPrefs.isBackgroundModeEnabled());
 		((CheckBoxPreference)findPreference(getString(R.string.pref_service_notification_key))).setChecked(mPrefs.getServiceNotificationVisibility());
 		((CheckBoxPreference)findPreference(getString(R.string.pref_autostart_key))).setChecked(mPrefs.isAutoStartEnabled());
@@ -1296,6 +1298,15 @@ public class SettingsFragment extends PreferencesListFragment {
 			}
 		});
 
+		findPreference(getString(R.string.pref_java_debug_key)).setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
+			@Override
+			public boolean onPreferenceChange(Preference preference, Object newValue) {
+				boolean value = (Boolean) newValue;
+				mPrefs.setJavaLogger(value);
+				return true;
+			}
+		});
+
 		findPreference(getString(R.string.pref_background_mode_key)).setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
 			@Override
 			public boolean onPreferenceChange(Preference preference, Object newValue) {