* Moved package receiver, added log
diff --git a/src/com/savoirfairelinux/sflphone/client/CallActivity.java b/src/com/savoirfairelinux/sflphone/client/CallActivity.java
index de48f9e..2bc177c 100644
--- a/src/com/savoirfairelinux/sflphone/client/CallActivity.java
+++ b/src/com/savoirfairelinux/sflphone/client/CallActivity.java
@@ -53,12 +53,12 @@
import android.widget.Toast;
import com.savoirfairelinux.sflphone.R;
-import com.savoirfairelinux.sflphone.client.receiver.CallReceiver;
import com.savoirfairelinux.sflphone.fragments.CallFragment;
import com.savoirfairelinux.sflphone.fragments.CallListFragment;
import com.savoirfairelinux.sflphone.interfaces.CallInterface;
import com.savoirfairelinux.sflphone.model.SipCall;
import com.savoirfairelinux.sflphone.model.SipCall.state;
+import com.savoirfairelinux.sflphone.receiver.CallReceiver;
import com.savoirfairelinux.sflphone.service.CallManagerCallBack;
import com.savoirfairelinux.sflphone.service.ISipService;
import com.savoirfairelinux.sflphone.service.SipService;
@@ -235,9 +235,9 @@
@Override
public void incomingText(Intent msg) {
- Toast.makeText(this, "New Call incoming", Toast.LENGTH_LONG).show();
-
- // TODO link text message to associate call and display it at the right place
+ Bundle b = msg.getBundleExtra("com.savoirfairelinux.sflphone.service.newtext");
+
+ Toast.makeText(this, b.getString("From") + " : " + b.getString("Msg"), Toast.LENGTH_LONG).show();
}
@@ -248,6 +248,8 @@
@Override
public void onCallSelected(SipCall call) {
+
+ mCurrentCallFragment.getBubbleView().restartDrawing();
mCurrentCallFragment = new CallFragment();
Bundle b = new Bundle();
b.putParcelable("CallInfo", call);
diff --git a/src/com/savoirfairelinux/sflphone/client/SFLPhoneHomeActivity.java b/src/com/savoirfairelinux/sflphone/client/SFLPhoneHomeActivity.java
index bae5c32..5c5b596 100644
--- a/src/com/savoirfairelinux/sflphone/client/SFLPhoneHomeActivity.java
+++ b/src/com/savoirfairelinux/sflphone/client/SFLPhoneHomeActivity.java
@@ -59,8 +59,6 @@
import com.savoirfairelinux.sflphone.R;
import com.savoirfairelinux.sflphone.adapters.AccountSelectionAdapter;
import com.savoirfairelinux.sflphone.adapters.SectionsPagerAdapter;
-import com.savoirfairelinux.sflphone.client.receiver.AccountsReceiver;
-import com.savoirfairelinux.sflphone.client.receiver.CallReceiver;
import com.savoirfairelinux.sflphone.fragments.CallElementListFragment;
import com.savoirfairelinux.sflphone.fragments.ContactListFragment;
import com.savoirfairelinux.sflphone.fragments.DialingFragment;
@@ -70,6 +68,8 @@
import com.savoirfairelinux.sflphone.interfaces.CallInterface;
import com.savoirfairelinux.sflphone.model.CallContact;
import com.savoirfairelinux.sflphone.model.SipCall;
+import com.savoirfairelinux.sflphone.receiver.AccountsReceiver;
+import com.savoirfairelinux.sflphone.receiver.CallReceiver;
import com.savoirfairelinux.sflphone.service.CallManagerCallBack;
import com.savoirfairelinux.sflphone.service.ConfigurationManagerCallback;
import com.savoirfairelinux.sflphone.service.ISipService;
diff --git a/src/com/savoirfairelinux/sflphone/model/BubblesView.java b/src/com/savoirfairelinux/sflphone/model/BubblesView.java
index 367ee9f..8446b2c 100644
--- a/src/com/savoirfairelinux/sflphone/model/BubblesView.java
+++ b/src/com/savoirfairelinux/sflphone/model/BubblesView.java
@@ -161,7 +161,6 @@
}
}
} else {
- Log.i(TAG,"drawing");
c = surfaceHolder.lockCanvas(null);
// for the case the surface is destroyed while already in the loop
diff --git a/src/com/savoirfairelinux/sflphone/client/receiver/AccountsReceiver.java b/src/com/savoirfairelinux/sflphone/receiver/AccountsReceiver.java
similarity index 94%
rename from src/com/savoirfairelinux/sflphone/client/receiver/AccountsReceiver.java
rename to src/com/savoirfairelinux/sflphone/receiver/AccountsReceiver.java
index f3d7fec..3a9424c 100644
--- a/src/com/savoirfairelinux/sflphone/client/receiver/AccountsReceiver.java
+++ b/src/com/savoirfairelinux/sflphone/receiver/AccountsReceiver.java
@@ -1,4 +1,4 @@
-package com.savoirfairelinux.sflphone.client.receiver;
+package com.savoirfairelinux.sflphone.receiver;
import android.content.BroadcastReceiver;
import android.content.Context;
diff --git a/src/com/savoirfairelinux/sflphone/client/receiver/CallReceiver.java b/src/com/savoirfairelinux/sflphone/receiver/CallReceiver.java
similarity index 97%
rename from src/com/savoirfairelinux/sflphone/client/receiver/CallReceiver.java
rename to src/com/savoirfairelinux/sflphone/receiver/CallReceiver.java
index f014e70..a9eff4a 100644
--- a/src/com/savoirfairelinux/sflphone/client/receiver/CallReceiver.java
+++ b/src/com/savoirfairelinux/sflphone/receiver/CallReceiver.java
@@ -28,7 +28,7 @@
* shall include the source code for the parts of OpenSSL used as well
* as that of the covered work.
*/
-package com.savoirfairelinux.sflphone.client.receiver;
+package com.savoirfairelinux.sflphone.receiver;
import android.content.BroadcastReceiver;
import android.content.Context;
diff --git a/src/com/savoirfairelinux/sflphone/client/receiver/IncomingReceiver.java b/src/com/savoirfairelinux/sflphone/receiver/IncomingReceiver.java
similarity index 98%
rename from src/com/savoirfairelinux/sflphone/client/receiver/IncomingReceiver.java
rename to src/com/savoirfairelinux/sflphone/receiver/IncomingReceiver.java
index 2e252c2..922e9fd 100644
--- a/src/com/savoirfairelinux/sflphone/client/receiver/IncomingReceiver.java
+++ b/src/com/savoirfairelinux/sflphone/receiver/IncomingReceiver.java
@@ -1,4 +1,4 @@
-package com.savoirfairelinux.sflphone.client.receiver;
+package com.savoirfairelinux.sflphone.receiver;
import android.content.BroadcastReceiver;
import android.content.Context;
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