From 96d1fd7357e04f893765415f11861fc2c6c7e8d6 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Wed, 18 Oct 2017 10:55:50 +0200 Subject: [PATCH] Compilation of Android app is fixed --- src/android/org/linphone/DozeReceiver.java | 3 ++- .../org/linphone/KeepAliveReceiver.java | 3 ++- src/android/org/linphone/LinphoneManager.java | 26 ++----------------- .../org/linphone/LinphonePreferences.java | 3 ++- src/android/org/linphone/LinphoneService.java | 3 ++- src/android/org/linphone/ui/Digit.java | 5 ++-- submodules/linphone | 2 +- 7 files changed, 14 insertions(+), 31 deletions(-) diff --git a/src/android/org/linphone/DozeReceiver.java b/src/android/org/linphone/DozeReceiver.java index 962a52c6d..e66a41ccd 100644 --- a/src/android/org/linphone/DozeReceiver.java +++ b/src/android/org/linphone/DozeReceiver.java @@ -21,6 +21,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. import org.linphone.core.Core; import org.linphone.core.Factory; +import org.linphone.core.LogCollectionState; import org.linphone.mediastream.Log; import android.content.Context; @@ -38,7 +39,7 @@ public class DozeReceiver extends android.content.BroadcastReceiver { if (!LinphoneService.isReady()) return; boolean isDebugEnabled = LinphonePreferences.instance().isDebugEnabled(); - Factory.instance().enableLogCollection(isDebugEnabled); + Factory.instance().enableLogCollection(isDebugEnabled ? LogCollectionState.Enabled : 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/KeepAliveReceiver.java b/src/android/org/linphone/KeepAliveReceiver.java index 072b820c4..172c12e6a 100644 --- a/src/android/org/linphone/KeepAliveReceiver.java +++ b/src/android/org/linphone/KeepAliveReceiver.java @@ -22,6 +22,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. 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; @@ -41,7 +42,7 @@ public class KeepAliveReceiver extends BroadcastReceiver { return; } else { boolean isDebugEnabled = LinphonePreferences.instance().isDebugEnabled(); - Factory.instance().enableLogCollection(isDebugEnabled); + Factory.instance().enableLogCollection(isDebugEnabled ? LogCollectionState.Enabled : 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/LinphoneManager.java b/src/android/org/linphone/LinphoneManager.java index 05439897e..b155d1b33 100644 --- a/src/android/org/linphone/LinphoneManager.java +++ b/src/android/org/linphone/LinphoneManager.java @@ -487,8 +487,7 @@ public class LinphoneManager implements CoreListener, ChatMessageListener, Senso if (isInstanciated() && lc != null && isPresenceModelActivitySet() && lc.getPresenceModel().getActivity().getType() != PresenceActivityType.TV) { lc.getPresenceModel().getActivity().setType(PresenceActivityType.TV); } else if (isInstanciated() && lc != null && !isPresenceModelActivitySet()) { - PresenceModel model = lc.createPresenceModel();//PresenceActivityType.TV, null); - model = model.newWithActivity(PresenceActivityType.TV, null); + PresenceModel model = lc.createPresenceModelWithActivity(PresenceActivityType.TV, null); lc.setPresenceModel(model); } } @@ -498,8 +497,7 @@ public class LinphoneManager implements CoreListener, ChatMessageListener, Senso if (isInstanciated() && isPresenceModelActivitySet() && lc.getPresenceModel().getActivity().getType() != PresenceActivityType.OnThePhone) { lc.getPresenceModel().getActivity().setType(PresenceActivityType.OnThePhone); } else if (isInstanciated() && !isPresenceModelActivitySet()) { - PresenceModel model = lc.createPresenceModel();//PresenceActivityType.OnThePhone, null); - model = model.newWithActivity(PresenceActivityType.OnThePhone, null); + PresenceModel model = lc.createPresenceModelWithActivity(PresenceActivityType.OnThePhone, null); lc.setPresenceModel(model); } } @@ -666,16 +664,6 @@ public class LinphoneManager implements CoreListener, ChatMessageListener, Senso } } - @Override - public void onParticipantAdded(ChatRoom cr, Participant participant) { - - } - - @Override - public void onSubjectChanged(ChatRoom cr, String subject) { - - } - @Override public void onMessageReceived(ChatRoom cr, ChatMessage msg) { @@ -686,16 +674,6 @@ public class LinphoneManager implements CoreListener, ChatMessageListener, Senso } - @Override - public void onParticipantAdminStatusChanged(ChatRoom cr, Participant participant, boolean isAdmin) { - - } - - @Override - public void onParticipantRemoved(ChatRoom cr, Participant participant) { - - } - public static interface AddressType { void setText(CharSequence s); CharSequence getText(); diff --git a/src/android/org/linphone/LinphonePreferences.java b/src/android/org/linphone/LinphonePreferences.java index 82cc44d5d..197da2e87 100644 --- a/src/android/org/linphone/LinphonePreferences.java +++ b/src/android/org/linphone/LinphonePreferences.java @@ -31,6 +31,7 @@ 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; @@ -1191,7 +1192,7 @@ public class LinphonePreferences { // Advanced settings public void setDebugEnabled(boolean enabled) { getConfig().setBool("app", "debug", enabled); - Factory.instance().enableLogCollection(enabled); + Factory.instance().enableLogCollection(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 6c13de01b..c77c2e1d6 100644 --- a/src/android/org/linphone/LinphoneService.java +++ b/src/android/org/linphone/LinphoneService.java @@ -34,6 +34,7 @@ import org.linphone.core.Core.RegistrationState; import org.linphone.core.CoreException; 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; @@ -299,7 +300,7 @@ public final class LinphoneService extends Service { LinphonePreferences.instance().setContext(getBaseContext()); Factory.instance().setLogCollectionPath(getFilesDir().getAbsolutePath()); boolean isDebugEnabled = LinphonePreferences.instance().isDebugEnabled(); - Factory.instance().enableLogCollection(isDebugEnabled); + Factory.instance().enableLogCollection(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/ui/Digit.java b/src/android/org/linphone/ui/Digit.java index 31e773981..7733b02b2 100644 --- a/src/android/org/linphone/ui/Digit.java +++ b/src/android/org/linphone/ui/Digit.java @@ -26,6 +26,7 @@ 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; @@ -138,7 +139,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(false); + Factory.instance().enableLogCollection(LogCollectionState.Disabled); } if(which == 1) { Core lc = LinphoneManager.getLcIfManagerNotDestroyedOrNull(); @@ -154,7 +155,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(true); + Factory.instance().enableLogCollection(LogCollectionState.Enabled); } } }); diff --git a/submodules/linphone b/submodules/linphone index 2a9d4afef..e21f193a5 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 2a9d4afef2530dac32a07dd60180ef3f929e39b1 +Subproject commit e21f193a574ac6616e6c275534a002781293e60c