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

Clean-up a bit LinphoneService (removed useless code)

Browse source
This commit is contained in:
Sylvain Berfini 2014-02-26 15:31:37 +01:00
parent de5318f089
commit be569d878c
1 changed files with 20 additions and 80 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

100
src/org/linphone/LinphoneService.java
View file

@ -21,7 +21,6 @@ package org.linphone;
import java.lang.reflect.InvocationTargetException; import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import org.linphone.LinphoneManager.NewOutgoingCallUiListener;
import org.linphone.LinphoneSimpleListener.LinphoneServiceListener; import org.linphone.LinphoneSimpleListener.LinphoneServiceListener;
import org.linphone.compatibility.Compatibility; import org.linphone.compatibility.Compatibility;
import org.linphone.core.LinphoneAddress; import org.linphone.core.LinphoneAddress;
@ -76,14 +75,20 @@ public final class LinphoneService extends Service implements LinphoneServiceLis
/* Listener needs to be implemented in the Service as it calls /* Listener needs to be implemented in the Service as it calls
* setLatestEventInfo and startActivity() which needs a context. * setLatestEventInfo and startActivity() which needs a context.
*/ */
public static final String START_LINPHONE_LOGS = " ==== Phone information dump ====";
public Handler mHandler = new Handler();
private static LinphoneService instance; private static LinphoneService instance;
private final static int NOTIF_ID=1;
private final static int INCALL_NOTIF_ID=2;
private final static int MESSAGE_NOTIF_ID=3;
private final static int CUSTOM_NOTIF_ID=4;
// private boolean mTestDelayElapsed; // add a timer for testing private static final int IC_LEVEL_ORANGE=0;
private boolean mTestDelayElapsed = true; // no timer /*private static final int IC_LEVEL_GREEN=1;
private WifiManager mWifiManager ; private static final int IC_LEVEL_RED=2;*/
private WifiLock mWifiLock ; private static final int IC_LEVEL_OFFLINE=3;
public static boolean isReady() { public static boolean isReady() {
return instance != null && instance.mTestDelayElapsed; return instance != null && instance.mTestDelayElapsed;
} }
@ -97,11 +102,13 @@ public final class LinphoneService extends Service implements LinphoneServiceLis
throw new RuntimeException("LinphoneService not instantiated yet"); throw new RuntimeException("LinphoneService not instantiated yet");
} }
public Handler mHandler = new Handler();
private final static int NOTIF_ID=1;
private final static int INCALL_NOTIF_ID=2; // private boolean mTestDelayElapsed; // add a timer for testing
private final static int MESSAGE_NOTIF_ID=3; private boolean mTestDelayElapsed = true; // no timer
private final static int CUSTOM_NOTIF_ID=4; private WifiManager mWifiManager;
private WifiLock mWifiLock;
private NotificationManager mNM;
private Notification mNotif; private Notification mNotif;
private Notification mIncallNotif; private Notification mIncallNotif;
@ -112,13 +119,6 @@ public final class LinphoneService extends Service implements LinphoneServiceLis
private PendingIntent mkeepAlivePendingIntent; private PendingIntent mkeepAlivePendingIntent;
private String mNotificationTitle; private String mNotificationTitle;
private static final int IC_LEVEL_ORANGE=0;
/*private static final int IC_LEVEL_GREEN=1;
private static final int IC_LEVEL_RED=2;*/
private static final int IC_LEVEL_OFFLINE=3;
public int getMessageNotifCount() { public int getMessageNotifCount() {
return mMsgNotifCount; return mMsgNotifCount;
} }
@ -342,7 +342,6 @@ public final class LinphoneService extends Service implements LinphoneServiceLis
int.class, Notification.class}; int.class, Notification.class};
private static final Class<?>[] mStopFgSign = new Class[] {boolean.class}; private static final Class<?>[] mStopFgSign = new Class[] {boolean.class};
private NotificationManager mNM;
private Method mSetForeground; private Method mSetForeground;
private Method mStartForeground; private Method mStartForeground;
private Method mStopForeground; private Method mStopForeground;
@ -406,11 +405,7 @@ public final class LinphoneService extends Service implements LinphoneServiceLis
invokeMethod(mSetForeground, mSetForegroundArgs); invokeMethod(mSetForeground, mSetForegroundArgs);
} }
} }
public static final String START_LINPHONE_LOGS = " ==== Phone information dump ====";
private void dumpDeviceInformation() { private void dumpDeviceInformation() {
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
sb.append("DEVICE=").append(Build.DEVICE).append("\n"); sb.append("DEVICE=").append(Build.DEVICE).append("\n");
@ -421,8 +416,6 @@ public final class LinphoneService extends Service implements LinphoneServiceLis
Log.i(sb.toString()); Log.i(sb.toString());
} }
private void dumpInstalledLinphoneInformation() { private void dumpInstalledLinphoneInformation() {
PackageInfo info = null; PackageInfo info = null;
try { try {
@ -490,31 +483,12 @@ public final class LinphoneService extends Service implements LinphoneServiceLis
super.onDestroy(); super.onDestroy();
} }
private static final LinphoneGuiListener guiListener() {
return null;
}
public void onDisplayStatus(final String message) { public void onDisplayStatus(final String message) {
mHandler.post(new Runnable() {
public void run() {
if (guiListener() != null) guiListener().onDisplayStatus(message);
}
});
} }
public void onGlobalStateChanged(final GlobalState state, final String message) { public void onGlobalStateChanged(final GlobalState state, final String message) {
if (state == GlobalState.GlobalOn) { if (state == GlobalState.GlobalOn) {
sendNotification(IC_LEVEL_OFFLINE, R.string.notification_started); sendNotification(IC_LEVEL_OFFLINE, R.string.notification_started);
// Slightly delay the propagation of the state change.
// This is to let the linphonecore finish to be created
// in the java part.
mHandler.postDelayed(new Runnable() {
public void run() {
if (guiListener() != null)
guiListener().onGlobalStateChangedToOn(message);
}
}, 50);
} }
} }
@ -607,53 +581,19 @@ public final class LinphoneService extends Service implements LinphoneServiceLis
mWifiLock.release(); mWifiLock.release();
} }
} }
mHandler.post(new Runnable() {
public void run() {
if (guiListener() != null)
guiListener().onCallStateChanged(call, state, message);
}
});
}
public interface LinphoneGuiListener extends NewOutgoingCallUiListener {
void onDisplayStatus(String message);
void onGlobalStateChangedToOn(String message);
void onCallStateChanged(LinphoneCall call, State state, String message);
} }
public void tryingNewOutgoingCallButAlreadyInCall() { public void tryingNewOutgoingCallButAlreadyInCall() {
mHandler.post(new Runnable() {
public void run() {
if (guiListener() != null)
guiListener().onAlreadyInCall();
}
});
} }
public void tryingNewOutgoingCallButCannotGetCallParameters() { public void tryingNewOutgoingCallButCannotGetCallParameters() {
mHandler.post(new Runnable() {
public void run() {
if (guiListener() != null)
guiListener().onCannotGetCallParameters();
}
});
} }
public void tryingNewOutgoingCallButWrongDestinationAddress() { public void tryingNewOutgoingCallButWrongDestinationAddress() {
mHandler.post(new Runnable() {
public void run() {
if (guiListener() != null)
guiListener().onWrongDestinationAddress();
}
});
} }
public void onCallEncryptionChanged(final LinphoneCall call, final boolean encrypted, public void onCallEncryptionChanged(final LinphoneCall call, final boolean encrypted,
final String authenticationToken) { final String authenticationToken) {
// IncallActivity registers itself to this event and handle it.
} }
} }