diff --git a/src/org/linphone/AboutFragment.java b/src/org/linphone/AboutFragment.java index 7b6bbdee5..cedc6390f 100644 --- a/src/org/linphone/AboutFragment.java +++ b/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; diff --git a/src/org/linphone/CallManager.java b/src/org/linphone/CallManager.java index d46b9408f..9009a24d4 100644 --- a/src/org/linphone/CallManager.java +++ b/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; /** diff --git a/src/org/linphone/DialerFragment.java b/src/org/linphone/DialerFragment.java index 914a47fed..af7c578f7 100644 --- a/src/org/linphone/DialerFragment.java +++ b/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; diff --git a/src/org/linphone/InCallActivity.java b/src/org/linphone/InCallActivity.java index a888ab881..dc49d0e28 100644 --- a/src/org/linphone/InCallActivity.java +++ b/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; diff --git a/src/org/linphone/IncomingCallActivity.java b/src/org/linphone/IncomingCallActivity.java index 8dfbaaf4e..362e05fc1 100644 --- a/src/org/linphone/IncomingCallActivity.java +++ b/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; diff --git a/src/org/linphone/KeepAliveReceiver.java b/src/org/linphone/KeepAliveReceiver.java index 4c7f3ace3..ed5c9b980 100644 --- a/src/org/linphone/KeepAliveReceiver.java +++ b/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; diff --git a/src/org/linphone/LinphoneActivity.java b/src/org/linphone/LinphoneActivity.java index 0a51b446b..8bfff5bae 100644 --- a/src/org/linphone/LinphoneActivity.java +++ b/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; diff --git a/src/org/linphone/LinphoneLauncherActivity.java b/src/org/linphone/LinphoneLauncherActivity.java index 1b8b32704..20c5d9420 100644 --- a/src/org/linphone/LinphoneLauncherActivity.java +++ b/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); diff --git a/src/org/linphone/LinphoneManager.java b/src/org/linphone/LinphoneManager.java index 5c583f5f7..7ae41be36 100644 --- a/src/org/linphone/LinphoneManager.java +++ b/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; diff --git a/src/org/linphone/LinphoneService.java b/src/org/linphone/LinphoneService.java index ea2f262a4..05d0150af 100644 --- a/src/org/linphone/LinphoneService.java +++ b/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; diff --git a/src/org/linphone/LinphoneUtils.java b/src/org/linphone/LinphoneUtils.java index dd1a5846a..ed4b7911e 100644 --- a/src/org/linphone/LinphoneUtils.java +++ b/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; diff --git a/src/org/linphone/PhoneStateChangedReceiver.java b/src/org/linphone/PhoneStateChangedReceiver.java index 00d892118..26452669f 100644 --- a/src/org/linphone/PhoneStateChangedReceiver.java +++ b/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; diff --git a/src/org/linphone/PreferencesFragment.java b/src/org/linphone/PreferencesFragment.java index b9185cf0d..419848541 100644 --- a/src/org/linphone/PreferencesFragment.java +++ b/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; diff --git a/src/org/linphone/VideoCallFragment.java b/src/org/linphone/VideoCallFragment.java index a6dcf2b09..5cb9f76ba 100644 --- a/src/org/linphone/VideoCallFragment.java +++ b/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; diff --git a/src/org/linphone/compatibility/ApiEightPlus.java b/src/org/linphone/compatibility/ApiEightPlus.java index d2e31b05e..fb9cc1f63 100644 --- a/src/org/linphone/compatibility/ApiEightPlus.java +++ b/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; diff --git a/src/org/linphone/gcm/GCMService.java b/src/org/linphone/gcm/GCMService.java index bc514eae9..5ca6d11be 100644 --- a/src/org/linphone/gcm/GCMService.java +++ b/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; diff --git a/src/org/linphone/setup/EchoCancellerCalibrationFragment.java b/src/org/linphone/setup/EchoCancellerCalibrationFragment.java index 0d5c38385..50cccb09e 100644 --- a/src/org/linphone/setup/EchoCancellerCalibrationFragment.java +++ b/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 de.timroes.axmlrpc.XMLRPCCallback; -import de.timroes.axmlrpc.XMLRPCClient; -import de.timroes.axmlrpc.XMLRPCException; -import de.timroes.axmlrpc.XMLRPCServerException; +import org.linphone.mediastream.Log; 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 diff --git a/src/org/linphone/setup/SetupActivity.java b/src/org/linphone/setup/SetupActivity.java index a436e9be3..994a4e282 100644 --- a/src/org/linphone/setup/SetupActivity.java +++ b/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; diff --git a/src/org/linphone/ui/Digit.java b/src/org/linphone/ui/Digit.java index c086c7098..623dd1db9 100644 --- a/src/org/linphone/ui/Digit.java +++ b/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; diff --git a/submodules/linphone b/submodules/linphone index 722a616f6..8afceff48 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 722a616f6adc85885e3ebd4bfb3eb3ec9fb1817b +Subproject commit 8afceff48b751faa7680e8a790066b37f864482c