Moved Log class from linphonecore to mediastreamer + use app name to tag app's logs

src/org/linphone/AboutFragment.java

@@ -24,7 +24,7 @@ import java.io.FileWriter;
 import java.io.IOException;
 import java.io.InputStreamReader;
 
-import org.linphone.core.Log;
+import org.linphone.mediastream.Log;
 
 import android.content.Intent;
 import android.content.SharedPreferences;

src/org/linphone/CallManager.java

@@ -23,7 +23,7 @@ import org.linphone.core.LinphoneCall;
 import org.linphone.core.LinphoneCallParams;
 import org.linphone.core.LinphoneCore;
 import org.linphone.core.LinphoneCoreException;
-import org.linphone.core.Log;
+import org.linphone.mediastream.Log;
 
 
 /**

src/org/linphone/DialerFragment.java

@@ -18,7 +18,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 import org.linphone.core.LinphoneCore;
-import org.linphone.core.Log;
+import org.linphone.mediastream.Log;
 import org.linphone.ui.AddressAware;
 import org.linphone.ui.AddressText;
 import org.linphone.ui.CallButton;

src/org/linphone/InCallActivity.java

@@ -22,14 +22,14 @@ import java.util.List;
 
 import org.linphone.LinphoneSimpleListener.LinphoneOnCallEncryptionChangedListener;
 import org.linphone.LinphoneSimpleListener.LinphoneOnCallStateChangedListener;
+import org.linphone.core.LinphoneAddress;
 import org.linphone.core.LinphoneCall;
 import org.linphone.core.LinphoneCall.State;
-import org.linphone.core.LinphoneAddress;
 import org.linphone.core.LinphoneCallParams;
 import org.linphone.core.LinphoneCore;
 import org.linphone.core.LinphoneCoreException;
 import org.linphone.core.LinphoneCoreFactory;
-import org.linphone.core.Log;
+import org.linphone.mediastream.Log;
 import org.linphone.mediastream.video.capture.hwconf.AndroidCameraConfiguration;
 import org.linphone.ui.AvatarWithShadow;
 import org.linphone.ui.Numpad;

src/org/linphone/IncomingCallActivity.java

@@ -25,7 +25,7 @@ import org.linphone.core.LinphoneAddress;
 import org.linphone.core.LinphoneCall;
 import org.linphone.core.LinphoneCall.State;
 import org.linphone.core.LinphoneCallParams;
-import org.linphone.core.Log;
+import org.linphone.mediastream.Log;
 import org.linphone.ui.AvatarWithShadow;
 import org.linphone.ui.LinphoneSliders;
 import org.linphone.ui.LinphoneSliders.LinphoneSliderTriggered;

src/org/linphone/KeepAliveReceiver.java

@@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 package org.linphone;
 
-import org.linphone.core.Log;
+import org.linphone.mediastream.Log;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;

src/org/linphone/LinphoneActivity.java

@@ -44,8 +44,8 @@ import org.linphone.core.LinphoneCore.RegistrationState;
 import org.linphone.core.LinphoneCoreException;
 import org.linphone.core.LinphoneCoreFactory;
 import org.linphone.core.LinphoneFriend;
-import org.linphone.core.Log;
 import org.linphone.core.OnlineStatus;
+import org.linphone.mediastream.Log;
 import org.linphone.setup.SetupActivity;
 import org.linphone.ui.AddressText;
 

src/org/linphone/LinphoneLauncherActivity.java

@@ -21,6 +21,7 @@ package org.linphone;
 import static android.content.Intent.ACTION_MAIN;
 
 import org.linphone.compatibility.Compatibility;
+import org.linphone.mediastream.Log;
 
 import android.app.Activity;
 import android.content.Intent;
@@ -44,6 +45,9 @@ public class LinphoneLauncherActivity extends Activity {
 	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 		
+		// Used to change for the lifetime of the app the name used to tag the logs
+		new Log(getResources().getString(R.string.app_name));
+		
 		// Hack to avoid to draw twice LinphoneActivity on tablets
         if (getResources().getBoolean(R.bool.isTablet)) {
         	setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);

src/org/linphone/LinphoneManager.java

@@ -67,8 +67,8 @@ import org.linphone.core.LinphoneCoreFactory;
 import org.linphone.core.LinphoneCoreListener;
 import org.linphone.core.LinphoneFriend;
 import org.linphone.core.LinphoneProxyConfig;
-import org.linphone.core.Log;
 import org.linphone.core.PayloadType;
+import org.linphone.mediastream.Log;
 import org.linphone.mediastream.Version;
 import org.linphone.mediastream.video.capture.AndroidVideoApi5JniWrapper;
 import org.linphone.mediastream.video.capture.hwconf.AndroidCameraConfiguration;

src/org/linphone/LinphoneService.java

@@ -35,8 +35,8 @@ import org.linphone.core.LinphoneCore.RegistrationState;
 import org.linphone.core.LinphoneCoreException;
 import org.linphone.core.LinphoneCoreFactoryImpl;
 import org.linphone.core.LinphoneProxyConfig;
-import org.linphone.core.Log;
 import org.linphone.core.OnlineStatus;
+import org.linphone.mediastream.Log;
 import org.linphone.mediastream.Version;
 
 import android.app.Activity;

src/org/linphone/LinphoneUtils.java

@@ -36,7 +36,7 @@ import org.linphone.core.LinphoneAddress;
 import org.linphone.core.LinphoneCall;
 import org.linphone.core.LinphoneCall.State;
 import org.linphone.core.LinphoneCore;
-import org.linphone.core.Log;
+import org.linphone.mediastream.Log;
 import org.linphone.mediastream.Version;
 import org.linphone.mediastream.video.capture.hwconf.Hacks;
 

src/org/linphone/PhoneStateChangedReceiver.java

@@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 package org.linphone;
 
-import org.linphone.core.Log;
+import org.linphone.mediastream.Log;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;

src/org/linphone/PreferencesFragment.java

@@ -38,7 +38,7 @@ import org.linphone.core.LinphoneCore.EcCalibratorStatus;
 import org.linphone.core.LinphoneCore.MediaEncryption;
 import org.linphone.core.LinphoneCoreException;
 import org.linphone.core.LinphoneProxyConfig;
-import org.linphone.core.Log;
+import org.linphone.mediastream.Log;
 import org.linphone.mediastream.Version;
 import org.linphone.mediastream.video.capture.hwconf.AndroidCameraConfiguration;
 import org.linphone.mediastream.video.capture.hwconf.Hacks;

src/org/linphone/VideoCallFragment.java

@@ -21,7 +21,7 @@ import org.linphone.compatibility.Compatibility;
 import org.linphone.compatibility.CompatibilityScaleGestureDetector;
 import org.linphone.compatibility.CompatibilityScaleGestureListener;
 import org.linphone.core.LinphoneCore;
-import org.linphone.core.Log;
+import org.linphone.mediastream.Log;
 import org.linphone.mediastream.video.AndroidVideoWindowImpl;
 import org.linphone.mediastream.video.capture.hwconf.AndroidCameraConfiguration;
 

src/org/linphone/compatibility/ApiEightPlus.java

@@ -1,7 +1,7 @@
 package org.linphone.compatibility;
 
 import org.linphone.R;
-import org.linphone.core.Log;
+import org.linphone.mediastream.Log;
 
 import android.annotation.TargetApi;
 import android.content.Context;

src/org/linphone/gcm/GCMService.java

@@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 import org.linphone.LinphoneManager;
 import org.linphone.R;
 import org.linphone.core.LinphoneCoreException;
-import org.linphone.core.Log;
+import org.linphone.mediastream.Log;
 
 import android.content.Context;
 import android.content.Intent;

src/org/linphone/setup/EchoCancellerCalibrationFragment.java

@@ -22,17 +22,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 import java.net.URL;
 
 import org.linphone.LinphoneManager;
-import org.linphone.LinphoneService;
 import org.linphone.LinphoneManager.EcCalibrationListener;
+import org.linphone.LinphoneService;
 import org.linphone.R;
 import org.linphone.core.LinphoneCore.EcCalibratorStatus;
 import org.linphone.core.LinphoneCoreException;
-import org.linphone.core.Log;
+import org.linphone.mediastream.Log;
-
-import de.timroes.axmlrpc.XMLRPCCallback;
-import de.timroes.axmlrpc.XMLRPCClient;
-import de.timroes.axmlrpc.XMLRPCException;
-import de.timroes.axmlrpc.XMLRPCServerException;
 
 import android.content.Context;
 import android.content.SharedPreferences;
@@ -44,6 +39,10 @@ import android.support.v4.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import de.timroes.axmlrpc.XMLRPCCallback;
+import de.timroes.axmlrpc.XMLRPCClient;
+import de.timroes.axmlrpc.XMLRPCException;
+import de.timroes.axmlrpc.XMLRPCServerException;
 
 /**
  * @author Ghislain MARY

src/org/linphone/setup/SetupActivity.java

@@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 import org.linphone.LinphoneManager;
 import org.linphone.R;
-import org.linphone.core.Log;
+import org.linphone.mediastream.Log;
 import org.linphone.mediastream.video.capture.hwconf.Hacks;
 
 import android.app.Activity;

src/org/linphone/ui/Digit.java

@@ -23,7 +23,7 @@ import org.linphone.LinphoneManager;
 import org.linphone.LinphoneService;
 import org.linphone.R;
 import org.linphone.core.LinphoneCore;
-import org.linphone.core.Log;
+import org.linphone.mediastream.Log;
 
 import android.content.Context;
 import android.util.AttributeSet;

submodules/linphone

@@ -1 +1 @@
-Subproject commit 722a616f6adc85885e3ebd4bfb3eb3ec9fb1817b
+Subproject commit 8afceff48b751faa7680e8a790066b37f864482c