Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Compilation of Android app is fixed

Browse source
This commit is contained in:
Sylvain Berfini 2017-10-18 10:55:50 +02:00
parent 809a29c8fe
commit 96d1fd7357
7 changed files with 14 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/android/org/linphone/DozeReceiver.java
View file

@ -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;

3
src/android/org/linphone/KeepAliveReceiver.java
View file

@ -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;

26
src/android/org/linphone/LinphoneManager.java
View file

@ -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();

3
src/android/org/linphone/LinphonePreferences.java
View file

@ -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));
}

3
src/android/org/linphone/LinphoneService.java
View file

@ -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

5
src/android/org/linphone/ui/Digit.java
View file

@ -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);
}
}
});

2
submodules/linphone

@ -1 +1 @@
Subproject commit 2a9d4afef2530dac32a07dd60180ef3f929e39b1
Subproject commit e21f193a574ac6616e6c275534a002781293e60c