* Moved package receiver, added log
diff --git a/src/com/savoirfairelinux/sflphone/service/CallManagerCallBack.java b/src/com/savoirfairelinux/sflphone/service/CallManagerCallBack.java
index fd8caa9..ab92b6b 100644
--- a/src/com/savoirfairelinux/sflphone/service/CallManagerCallBack.java
+++ b/src/com/savoirfairelinux/sflphone/service/CallManagerCallBack.java
@@ -11,7 +11,6 @@
private static final String TAG = "CallManagerCallBack";
private Context mContext;
- static public final String SIGNAL_NAME = "signal-name";
static public final String NEW_CALL_CREATED = "new-call-created";
static public final String CALL_STATE_CHANGED = "call-state-changed";
static public final String INCOMING_CALL = "incoming-call";
@@ -71,7 +70,6 @@
bundle.putString("CallID", callID);
bundle.putString("To", to);
Intent intent = new Intent(NEW_CALL_CREATED);
- intent.putExtra(SIGNAL_NAME, NEW_CALL_CREATED);
intent.putExtra("com.savoirfairelinux.sflphone.service.newcall", bundle);
LocalBroadcastManager.getInstance(mContext).sendBroadcast(intent);
}
@@ -91,7 +89,6 @@
bundle.putString("CallID", callID);
bundle.putString("From", from);
Intent intent = new Intent(INCOMING_CALL);
- intent.putExtra(SIGNAL_NAME, INCOMING_CALL);
intent.putExtra("com.savoirfairelinux.sflphone.service.newcall", bundle);
LocalBroadcastManager.getInstance(mContext).sendBroadcast(intent);
}
@@ -102,8 +99,7 @@
bundle.putString("CallID", id);
bundle.putString("From", from);
bundle.putString("Msg", msg);
- Intent intent = new Intent(INCOMING_TEXT);
- intent.putExtra(SIGNAL_NAME, INCOMING_TEXT);
+ Intent intent = new Intent(INCOMING_TEXT);
intent.putExtra("com.savoirfairelinux.sflphone.service.newtext", bundle);
LocalBroadcastManager.getInstance(mContext).sendBroadcast(intent);
diff --git a/src/com/savoirfairelinux/sflphone/service/SipService.java b/src/com/savoirfairelinux/sflphone/service/SipService.java
index 9ab45a8..745c064 100644
--- a/src/com/savoirfairelinux/sflphone/service/SipService.java
+++ b/src/com/savoirfairelinux/sflphone/service/SipService.java
@@ -56,8 +56,8 @@
import com.savoirfairelinux.sflphone.account.HistoryHandler;
import com.savoirfairelinux.sflphone.client.SFLPhoneHomeActivity;
import com.savoirfairelinux.sflphone.client.SFLphoneApplication;
-import com.savoirfairelinux.sflphone.client.receiver.IncomingReceiver;
import com.savoirfairelinux.sflphone.model.SipCall;
+import com.savoirfairelinux.sflphone.receiver.IncomingReceiver;
public class SipService extends Service {
@@ -585,7 +585,6 @@
bundle.putString("CallID", callID);
bundle.putString("State", "HUNGUP");
Intent intent = new Intent(CallManagerCallBack.CALL_STATE_CHANGED);
- intent.putExtra(CallManagerCallBack.SIGNAL_NAME, CallManagerCallBack.CALL_STATE_CHANGED);
intent.putExtra("com.savoirfairelinux.sflphone.service.newstate", bundle);
sendBroadcast(intent);
} else