diff --git a/src/android/org/linphone/LinphoneManager.java b/src/android/org/linphone/LinphoneManager.java index e87d4642d..33d3977c2 100644 --- a/src/android/org/linphone/LinphoneManager.java +++ b/src/android/org/linphone/LinphoneManager.java @@ -92,8 +92,6 @@ import org.linphone.core.CallStats; import org.linphone.core.ChatMessage; import org.linphone.core.ChatMessageListener; import org.linphone.core.ChatRoom; -import org.linphone.core.ChatRoomListener; -import org.linphone.core.ChatRoomState; import org.linphone.core.Content; import org.linphone.core.Core; import org.linphone.core.Core.AuthMethod; @@ -109,14 +107,12 @@ import org.linphone.core.Event; import org.linphone.core.Friend; import org.linphone.core.FriendList; import org.linphone.core.InfoMessage; +import org.linphone.core.PresenceActivity; import org.linphone.core.ProxyConfig; -import org.linphone.core.VersionUpdateCheckResult; import org.linphone.core.tools.OpenH264DownloadHelperListener; import org.linphone.core.PayloadType; import org.linphone.core.PresenceBasicStatus; -import org.linphone.core.PresenceActivityType; import org.linphone.core.PresenceModel; -import org.linphone.core.PublishState; import org.linphone.core.Reason; import org.linphone.core.SubscriptionState; //import org.linphone.core.TunnelConfig; @@ -492,20 +488,20 @@ public class LinphoneManager implements CoreListener, ChatMessageListener, Senso public void changeStatusToOnline() { Core lc = getLcIfManagerNotDestroyedOrNull(); - if (isInstanciated() && lc != null && isPresenceModelActivitySet() && lc.getPresenceModel().getActivity().getType() != PresenceActivityType.TV) { - lc.getPresenceModel().getActivity().setType(PresenceActivityType.TV); + if (isInstanciated() && lc != null && isPresenceModelActivitySet() && lc.getPresenceModel().getActivity().getType() != PresenceActivity.Type.TV) { + lc.getPresenceModel().getActivity().setType(PresenceActivity.Type.TV); } else if (isInstanciated() && lc != null && !isPresenceModelActivitySet()) { - PresenceModel model = lc.createPresenceModelWithActivity(PresenceActivityType.TV, null); + PresenceModel model = lc.createPresenceModelWithActivity(PresenceActivity.Type.TV, null); lc.setPresenceModel(model); } } public void changeStatusToOnThePhone() { Core lc = getLcIfManagerNotDestroyedOrNull(); - if (isInstanciated() && isPresenceModelActivitySet() && lc.getPresenceModel().getActivity().getType() != PresenceActivityType.OnThePhone) { - lc.getPresenceModel().getActivity().setType(PresenceActivityType.OnThePhone); + if (isInstanciated() && isPresenceModelActivitySet() && lc.getPresenceModel().getActivity().getType() != PresenceActivity.Type.OnThePhone) { + lc.getPresenceModel().getActivity().setType(PresenceActivity.Type.OnThePhone); } else if (isInstanciated() && !isPresenceModelActivitySet()) { - PresenceModel model = lc.createPresenceModelWithActivity(PresenceActivityType.OnThePhone, null); + PresenceModel model = lc.createPresenceModelWithActivity(PresenceActivity.Type.OnThePhone, null); lc.setPresenceModel(model); } } @@ -1804,8 +1800,7 @@ public class LinphoneManager implements CoreListener, ChatMessageListener, Senso if (content!=null) Log.d("with content "+content.getType()+"/"+content.getSubtype()+" data:"+content.getStringBuffer()); } @Override - public void onPublishStateChanged(Core lc, Event ev, - PublishState state) { + public void onPublishStateChanged(Core lc, Event ev, Event.PublishState state) { Log.d("Publish state changed to " + state + " for event name " + ev.getName()); } @@ -1845,7 +1840,7 @@ public class LinphoneManager implements CoreListener, ChatMessageListener, Senso } @Override - public void onVersionUpdateCheckResultReceived(Core lc, VersionUpdateCheckResult result, String version, String url) { + public void onVersionUpdateCheckResultReceived(Core lc, Core.VersionUpdateCheckResult result, String version, String url) { } diff --git a/src/android/org/linphone/LinphonePreferences.java b/src/android/org/linphone/LinphonePreferences.java index b2da51682..4970b3c0b 100644 --- a/src/android/org/linphone/LinphonePreferences.java +++ b/src/android/org/linphone/LinphonePreferences.java @@ -22,7 +22,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. import android.Manifest; import android.content.Context; import android.content.pm.PackageManager; -import android.os.Build; import org.linphone.core.AVPFMode; import org.linphone.core.Address; @@ -31,7 +30,6 @@ import org.linphone.core.AuthInfo; import org.linphone.core.Core; import org.linphone.core.Core.LimeState; import org.linphone.core.Core.MediaEncryption; -import org.linphone.core.LogCollectionState; import org.linphone.core.Transports; import org.linphone.core.CoreException; import org.linphone.core.Factory; @@ -1190,7 +1188,7 @@ public class LinphonePreferences { // Advanced settings public void setDebugEnabled(boolean enabled) { getConfig().setBool("app", "debug", enabled); - Factory.instance().enableLogCollection(LogCollectionState.Enabled); + Factory.instance().enableLogCollection(Core.LogCollectionState.Enabled); Factory.instance().setDebugMode(enabled, getString(R.string.app_name)); } diff --git a/src/android/org/linphone/LinphoneService.java b/src/android/org/linphone/LinphoneService.java index 8c243b05e..862ced1c9 100644 --- a/src/android/org/linphone/LinphoneService.java +++ b/src/android/org/linphone/LinphoneService.java @@ -36,7 +36,6 @@ import org.linphone.core.Core.GlobalState; import org.linphone.core.Core.RegistrationState; import org.linphone.core.Factory; import org.linphone.core.CoreListenerStub; -import org.linphone.core.LogCollectionState; import org.linphone.core.ProxyConfig; import org.linphone.mediastream.Log; import org.linphone.mediastream.Version; @@ -303,7 +302,7 @@ public final class LinphoneService extends Service { LinphonePreferences.instance().setContext(getBaseContext()); Factory.instance().setLogCollectionPath(getFilesDir().getAbsolutePath()); boolean isDebugEnabled = LinphonePreferences.instance().isDebugEnabled(); - Factory.instance().enableLogCollection(LogCollectionState.Enabled); + Factory.instance().enableLogCollection(Core.LogCollectionState.Enabled); Factory.instance().setDebugMode(isDebugEnabled, getString(R.string.app_name)); // Dump some debugging information to the logs diff --git a/src/android/org/linphone/call/CallActivity.java b/src/android/org/linphone/call/CallActivity.java index bbd0f45a3..6b92fa16d 100644 --- a/src/android/org/linphone/call/CallActivity.java +++ b/src/android/org/linphone/call/CallActivity.java @@ -78,7 +78,6 @@ import org.linphone.core.Core; import org.linphone.core.CoreListenerStub; import org.linphone.core.Player; import org.linphone.core.PayloadType; -import org.linphone.core.StreamType; import org.linphone.fragments.StatusFragment; import org.linphone.mediastream.Log; import org.linphone.mediastream.video.capture.hwconf.AndroidCameraConfiguration; @@ -1716,11 +1715,11 @@ public class CallActivity extends LinphoneGenericActivity implements OnClickList if (LinphoneActivity.isInstanciated()) { CallParams params = call.getCurrentParams(); if (params != null) { - CallStats audioStats = call.getStats(StreamType.Audio); + CallStats audioStats = call.getStats(CallStats.StreamType.Audio); CallStats videoStats = null; if (params.videoEnabled()) - videoStats = call.getStats(StreamType.Video); + videoStats = call.getStats(CallStats.StreamType.Video); PayloadType payloadAudio = params.getUsedAudioPayloadType(); PayloadType payloadVideo = params.getUsedVideoPayloadType(); diff --git a/src/android/org/linphone/chat/GroupChatFragment.java b/src/android/org/linphone/chat/GroupChatFragment.java index 7b82e599c..2f17e3ae8 100644 --- a/src/android/org/linphone/chat/GroupChatFragment.java +++ b/src/android/org/linphone/chat/GroupChatFragment.java @@ -46,7 +46,6 @@ import org.linphone.core.ChatMessage; import org.linphone.core.ChatMessageListener; import org.linphone.core.ChatRoom; import org.linphone.core.ChatRoomListener; -import org.linphone.core.ChatRoomState; import org.linphone.core.Content; import org.linphone.core.Core; import org.linphone.core.Participant; diff --git a/src/android/org/linphone/receivers/DozeReceiver.java b/src/android/org/linphone/receivers/DozeReceiver.java index d417920bb..2972d4628 100644 --- a/src/android/org/linphone/receivers/DozeReceiver.java +++ b/src/android/org/linphone/receivers/DozeReceiver.java @@ -25,7 +25,6 @@ import org.linphone.LinphoneService; import org.linphone.R; import org.linphone.core.Core; import org.linphone.core.Factory; -import org.linphone.core.LogCollectionState; import org.linphone.mediastream.Log; import android.content.Context; @@ -43,7 +42,7 @@ public class DozeReceiver extends android.content.BroadcastReceiver { if (!LinphoneService.isReady()) return; boolean isDebugEnabled = LinphonePreferences.instance().isDebugEnabled(); - Factory.instance().enableLogCollection(isDebugEnabled ? LogCollectionState.Enabled : LogCollectionState.Disabled); + Factory.instance().enableLogCollection(isDebugEnabled ? Core.LogCollectionState.Enabled : Core.LogCollectionState.Disabled); Factory.instance().setDebugMode(isDebugEnabled, context.getString(R.string.app_name)); Core lc = LinphoneManager.getLcIfManagerNotDestroyedOrNull(); if (lc == null) return; diff --git a/src/android/org/linphone/receivers/KeepAliveReceiver.java b/src/android/org/linphone/receivers/KeepAliveReceiver.java index 64fa88b67..aaaf45ce3 100644 --- a/src/android/org/linphone/receivers/KeepAliveReceiver.java +++ b/src/android/org/linphone/receivers/KeepAliveReceiver.java @@ -26,7 +26,6 @@ import org.linphone.R; import org.linphone.compatibility.Compatibility; import org.linphone.core.Core; import org.linphone.core.Factory; -import org.linphone.core.LogCollectionState; import org.linphone.mediastream.Log; import android.app.AlarmManager; @@ -46,7 +45,7 @@ public class KeepAliveReceiver extends BroadcastReceiver { return; } else { boolean isDebugEnabled = LinphonePreferences.instance().isDebugEnabled(); - Factory.instance().enableLogCollection(isDebugEnabled ? LogCollectionState.Enabled : LogCollectionState.Disabled); + Factory.instance().enableLogCollection(isDebugEnabled ? Core.LogCollectionState.Enabled : Core.LogCollectionState.Disabled); Factory.instance().setDebugMode(isDebugEnabled, context.getString(R.string.app_name)); Core lc = LinphoneManager.getLcIfManagerNotDestroyedOrNull(); if (lc == null) return; diff --git a/src/android/org/linphone/ui/Digit.java b/src/android/org/linphone/ui/Digit.java index c1b544695..dfe402380 100644 --- a/src/android/org/linphone/ui/Digit.java +++ b/src/android/org/linphone/ui/Digit.java @@ -26,7 +26,6 @@ import org.linphone.LinphoneService; import org.linphone.R; import org.linphone.core.Core; import org.linphone.core.Factory; -import org.linphone.core.LogCollectionState; import org.linphone.mediastream.Log; import android.app.AlertDialog; @@ -139,7 +138,7 @@ public class Digit extends Button implements AddressAware { public void onClick(DialogInterface dialog, int which) { if(which == 0){ LinphonePreferences.instance().setDebugEnabled(false); - Factory.instance().enableLogCollection(LogCollectionState.Disabled); + Factory.instance().enableLogCollection(Core.LogCollectionState.Disabled); } if(which == 1) { Core lc = LinphoneManager.getLcIfManagerNotDestroyedOrNull(); @@ -155,7 +154,7 @@ public class Digit extends Button implements AddressAware { public void onClick(DialogInterface dialog, int which) { if(which == 0) { LinphonePreferences.instance().setDebugEnabled(true); - Factory.instance().enableLogCollection(LogCollectionState.Enabled); + Factory.instance().enableLogCollection(Core.LogCollectionState.Enabled); } } }); diff --git a/submodules/linphone b/submodules/linphone index 8aa93022d..0442a244c 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 8aa93022dd29dcc73a2ba0a29b256568cb7a3f44 +Subproject commit 0442a244c000f4050da1dc9c4ce30ca437135fc2