Use old native logger as default for now

src/android/org/linphone/LinphonePreferences.java

@@ -1192,7 +1192,7 @@ public class LinphonePreferences {
 	// Advanced settings
 	public void setDebugEnabled(boolean enabled) {
 		getConfig().setBool("app", "debug", enabled);
-		LinphoneUtils.initLoggingService(enabled);
+		LinphoneUtils.initLoggingService(enabled, mContext.getString(R.string.app_name));
 	}
 
 	public boolean isDebugEnabled() {

src/android/org/linphone/LinphoneService.java

@@ -301,7 +301,7 @@ public final class LinphoneService extends Service {
 		LinphonePreferences.instance().setContext(getBaseContext());
 		Factory.instance().setLogCollectionPath(getFilesDir().getAbsolutePath());
 		boolean isDebugEnabled = LinphonePreferences.instance().isDebugEnabled();
-		LinphoneUtils.initLoggingService(isDebugEnabled);
+		LinphoneUtils.initLoggingService(isDebugEnabled, getString(R.string.app_name));
 
 		// Dump some debugging information to the logs
 		Log.i(START_LINPHONE_LOGS);

src/android/org/linphone/LinphoneUtils.java

@@ -23,11 +23,9 @@ import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.ContentResolver;
 import android.content.ContentUris;
-import android.content.ContentValues;
 import android.content.Context;
 import android.content.CursorLoader;
 import android.content.Intent;
-import android.content.res.Resources;
 import android.database.Cursor;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
@@ -41,28 +39,22 @@ import android.os.Looper;
 import android.os.ParcelFileDescriptor;
 import android.provider.DocumentsContract;
 import android.provider.MediaStore;
-import android.provider.MediaStore.Images;
 import android.telephony.TelephonyManager;
 import android.text.Spanned;
 import android.text.TextUtils;
-import android.util.TypedValue;
 import android.view.KeyEvent;
 import android.view.View;
-import android.view.View.OnClickListener;
 import android.webkit.MimeTypeMap;
-import android.widget.Button;
 import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.TextView;
 
 import org.linphone.compatibility.Compatibility;
 import org.linphone.contacts.ContactsManager;
-import org.linphone.core.DialPlan;
 import org.linphone.core.AccountCreator;
 import org.linphone.core.Address;
 import org.linphone.core.Call;
 import org.linphone.core.Call.State;
-import org.linphone.core.ChatMessage;
 import org.linphone.core.Core;
 import org.linphone.core.Factory;
 import org.linphone.core.Friend;
@@ -75,8 +67,6 @@ import org.linphone.core.ProxyConfig;
 import org.linphone.mediastream.Log;
 import org.linphone.mediastream.video.capture.hwconf.Hacks;
 
-import java.io.BufferedOutputStream;
-import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileDescriptor;
 import java.io.FileInputStream;
@@ -85,7 +75,6 @@ import java.io.FileOutputStream;
 import java.io.FileWriter;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.InputStreamReader;
 import java.io.OutputStream;
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -98,8 +87,6 @@ import java.util.Date;
 import java.util.List;
 import java.util.Locale;
 import java.util.regex.Pattern;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipOutputStream;
 
 import static android.view.View.GONE;
 import static android.view.View.VISIBLE;
@@ -115,8 +102,12 @@ public final class LinphoneUtils {
 
 	}
 
-	public static void initLoggingService(boolean isDebugEnabled) {
+	public static void initLoggingService(boolean isDebugEnabled, String appName) {
-		Factory.instance().setDebugMode(isDebugEnabled, "");
+		if (true) {
+			Factory.instance().enableLogCollection(LogCollectionState.Enabled);
+			Factory.instance().setDebugMode(isDebugEnabled, appName);
+		} else {
+			Factory.instance().setDebugMode(isDebugEnabled, appName);
 			Factory.instance().enableLogCollection(LogCollectionState.EnabledWithoutPreviousLogHandler);
 			Factory.instance().getLoggingService().setListener(new LoggingServiceListener() {
 				@Override
@@ -142,6 +133,7 @@ public final class LinphoneUtils {
 				}
 			});
 		}
+	}
 
 	public static void dispatchOnUIThread(Runnable r) {
 		mHandler.post(r);

src/android/org/linphone/receivers/DozeReceiver.java

@@ -44,7 +44,7 @@ public class DozeReceiver extends android.content.BroadcastReceiver {
         if (!LinphoneService.isReady()) return;
 
         boolean isDebugEnabled = LinphonePreferences.instance().isDebugEnabled();
-        LinphoneUtils.initLoggingService(isDebugEnabled);
+        LinphoneUtils.initLoggingService(isDebugEnabled, context.getString(R.string.app_name));
         Core lc = LinphoneManager.getLcIfManagerNotDestroyedOrNull();
         if (lc == null) return;
 

src/android/org/linphone/receivers/KeepAliveReceiver.java

@@ -47,7 +47,7 @@ public class KeepAliveReceiver extends BroadcastReceiver {
 			return;
 		} else {
 			boolean isDebugEnabled = LinphonePreferences.instance().isDebugEnabled();
-			LinphoneUtils.initLoggingService(isDebugEnabled);
+			LinphoneUtils.initLoggingService(isDebugEnabled, context.getString(R.string.app_name));
 			Core lc = LinphoneManager.getLcIfManagerNotDestroyedOrNull();
 			if (lc == null) return;